From db08a0d2031469f63c8520ce604d2cbf2b4b980b Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Thu, 25 Jun 2020 17:07:25 +0200 Subject: hurd-boot: Remove duplicate calls to 'scope'. * gnu/build/hurd-boot.scm (set-hurd-device-translators): Remove duplicate calls to 'scope'. --- gnu/build/hurd-boot.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/build/hurd-boot.scm b/gnu/build/hurd-boot.scm index aea2ac3307..8c4f0ac09b 100644 --- a/gnu/build/hurd-boot.scm +++ b/gnu/build/hurd-boot.scm @@ -232,14 +232,14 @@ (define devices #o666))) (for-each scope-set-translator servers) - (mkdir* (scope "dev/vcs/1")) - (mkdir* (scope "dev/vcs/2")) - (mkdir* (scope "dev/vcs/2")) - (rename-file (scope "/dev/console") (scope "/dev/console-")) + (mkdir* "dev/vcs/1") + (mkdir* "dev/vcs/2") + (mkdir* "dev/vcs/2") + (rename-file (scope "dev/console") (scope "dev/console-")) (for-each scope-set-translator devices) (false-if-EEXIST (symlink "/dev/random" (scope "dev/urandom"))) - (mkdir* (scope "dev/fd")) + (mkdir* "dev/fd") (false-if-EEXIST (symlink "/dev/fd/0" (scope "dev/stdin"))) (false-if-EEXIST (symlink "/dev/fd/1" (scope "dev/stdout"))) (false-if-EEXIST (symlink "/dev/fd/2" (scope "dev/stderr")))) -- cgit v1.2.3 From 65d95e5d852e47343b9acc1717918c9db7364c01 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Thu, 25 Jun 2020 17:07:25 +0200 Subject: hurd-boot: Mount /proc, add /etc/mtab. * gnu/build/hurd-boot.scm (set-hurd-device-translators): Mount /proc. Add symlink to /etc/mtab into /proc/mounts. --- gnu/build/hurd-boot.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gnu/build/hurd-boot.scm b/gnu/build/hurd-boot.scm index 8c4f0ac09b..adc8b4ce16 100644 --- a/gnu/build/hurd-boot.scm +++ b/gnu/build/hurd-boot.scm @@ -191,7 +191,8 @@ (define servers "10.0.2.15" ;the default QEMU guest IP "--netmask" "255.255.255.0" "--gateway" "10.0.2.2" - "--ipv6" "/servers/socket/16")))) + "--ipv6" "/servers/socket/16")) + ("proc" ("/hurd/procfs" "--stat-mode=444")))) (define devices '(("dev/full" ("/hurd/null" "--full") #o666) @@ -242,7 +243,12 @@ (define devices (mkdir* "dev/fd") (false-if-EEXIST (symlink "/dev/fd/0" (scope "dev/stdin"))) (false-if-EEXIST (symlink "/dev/fd/1" (scope "dev/stdout"))) - (false-if-EEXIST (symlink "/dev/fd/2" (scope "dev/stderr")))) + (false-if-EEXIST (symlink "/dev/fd/2" (scope "dev/stderr"))) + + ;; Make sure /etc/mtab is a symlink to /proc/mounts. + (false-if-exception (delete-file (scope "etc/mtab"))) + (mkdir* (scope "etc")) + (symlink "/proc/mounts" (scope "etc/mtab"))) (define* (boot-hurd-system #:key (on-error 'debug)) -- cgit v1.2.3 From 99648ef16e5831f4d698a3a22c1023ee005a6d48 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sat, 27 Jun 2020 14:55:05 +0200 Subject: gnu: emacs-sly: Update to 20200626. * gnu/packages/emacs-xyz.scm (emacs-sly): Update to 20200626. --- gnu/packages/emacs-xyz.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 109475e1fb..8b03ce347c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -8235,8 +8235,9 @@ (define-public emacs-cider ;; There hasn't been a tag or release since 2016, so we take the latest ;; commit. (define-public emacs-sly - (let ((commit "86a63df73360be51529806c7ed9b775b3f02284d") - (revision "4")) + (let ((commit "6a2f543cb21f14104c2253af5a1427b884a987ae") + ;; Update together with sbcl-slynk-boot0. + (revision "5")) (package (name "emacs-sly") (version (git-version "1.0.0" revision commit)) @@ -8249,7 +8250,7 @@ (define-public emacs-sly (file-name (git-file-name name version)) (sha256 (base32 - "0sx6fdckcfcld41db0695svvlvllnfaazwx513686gnykwfd209n")))) + "0wbpg9p9yg2hd62l15pvy50fk3hndq5zzyqlyyf04g368s895144")))) (build-system emacs-build-system) (native-inputs `(("texinfo" ,texinfo))) -- cgit v1.2.3 From c3c633522df75be953e7cec2853fe65ea8508b57 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sat, 27 Jun 2020 15:36:43 +0200 Subject: gnu: slynk: Update to 20200626. * gnu/packages/lisp-xyz.scm (slynk): Update 20200626. [source]: Don't rename slynk-util system since it seems useless for sbcl-slynk but it breaks cl-slynk. [description]: Improve syntax. --- gnu/packages/lisp-xyz.scm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index fd9422a8ba..d4e1ceae09 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -675,8 +675,9 @@ (define-public ecl-cl-ppcre-unicode ;; we expose the union of these as `sbcl-slynk'. The following variable ;; describes the base module. (define sbcl-slynk-boot0 - (let ((revision "2") - (commit "cbf84c36c4eca8b032e3fd16177a7bc02df3ec4c")) + (let ((revision "3") + ;; Update together with emacs-sly. + (commit "6a2f543cb21f14104c2253af5a1427b884a987ae")) (package (name "sbcl-slynk-boot0") (version (string-append "1.0.0-beta-" revision "." (string-take commit 7))) @@ -688,7 +689,7 @@ (define sbcl-slynk-boot0 (url "https://github.com/joaotavora/sly.git") (commit commit))) (sha256 - (base32 "13dyhsravn591p7g6is01mp2ynzjnnj7pwgi57r6xqmd4611y9vh")) + (base32 "0wbpg9p9yg2hd62l15pvy50fk3hndq5zzyqlyyf04g368s895144")) (file-name (string-append "slynk-" version "-checkout")) (modules '((guix build utils) (ice-9 ftw))) @@ -700,9 +701,7 @@ (define sbcl-slynk-boot0 (("\\.\\./contrib") "contrib") (("\\(defsystem :slynk/util") - "(defsystem :slynk/util :depends-on (:slynk)") - ((":depends-on \\(:slynk :slynk/util\\)") - ":depends-on (:slynk :slynk-util)")) + "(defsystem :slynk/util :depends-on (:slynk)")) (substitute* "contrib/slynk-trace-dialog.lisp" (("\\(slynk::reset-inspector\\)") ; Causes problems on load "nil")) @@ -728,7 +727,7 @@ (define sbcl-slynk-boot0 (synopsis "Common Lisp IDE for Emacs") (description "SLY is a fork of SLIME, an IDE backend for Common Lisp. It also features a completely redesigned REPL based on Emacs's own -full-featured comint.el, live code annotations, and a consistent interactive +full-featured @code{comint-mode}, live code annotations, and a consistent interactive button interface. Everything can be copied to the REPL. One can create multiple inspectors with independent history.") (home-page "https://github.com/joaotavora/sly") -- cgit v1.2.3 From 5f7474a2094b916d99f56aeb32cb2dad91fc8f8e Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sat, 27 Jun 2020 16:35:29 +0200 Subject: gnu: Add dhewm3. * gnu/packages/game-development.scm (dhewm3): New variable. --- gnu/packages/game-development.scm | 41 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 74ab51f8b3..fb2c13b743 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -2315,3 +2315,44 @@ (define-public warsow-qfusion shooter video game. The engine is based on qfusion, the id Tech 2 derived game engine. id Tech 2 is the engine originally behind Quake 2.") (license license:gpl2+)))) + +(define-public dhewm3 + (package + (name "dhewm3") + (version "1.5.0") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/dhewm/dhewm3/releases/download/" + version "/dhewm3-" version "-src.tar.xz")) + (sha256 + (base32 + "0dmd1876az5q8gbjrd1jk8zidz11ydj607z3m8m5kvw2yj136jzv")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ; No tests. + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'change-to-build-dir + (lambda _ + (chdir "neo") + #t))))) + (inputs + `(("curl" ,curl) + ("libjpeg" ,libjpeg-turbo) + ("libogg" ,libogg) + ("libvorbis" ,libvorbis) + ("libx11" ,libx11) + ("openal" ,openal) + ("sdl2" ,sdl2) + ("zlib" ,zlib))) + (home-page "https://dhewm3.org/") + (synopsis "Port of the original Doom 3 engine") + (description + "@command{dhewm3} is a source port of the original Doom 3 engine (not +Doom 3: BFG Edition), also known as id Tech 4. Compared to the original +version of the Doom 3 engine, dhewm3 has many bugfixes, supports EAX-like +sound effects on all operating systems and hardware (via OpenAL Softs EFX +support), has much better support for widescreen resolutions and has 64bit +support.") + (license license:gpl3))) -- cgit v1.2.3 From fb6b40b02e1a3bd46d567508c4f00e17834dd5c6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 27 Jun 2020 15:38:11 +0200 Subject: gnu: opusfile: Update to 0.12. * gnu/packages/xiph.scm (opusfile): Update to 0.12. --- gnu/packages/xiph.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm index 7c71bf0a28..a88ea094dd 100644 --- a/gnu/packages/xiph.scm +++ b/gnu/packages/xiph.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2014 Mark H Weaver ;;; Copyright © 2015 Paul van der Walt ;;; Copyright © 2015, 2016, 2017, 2019 Efraim Flashner -;;; Copyright © 2017, 2018, 2019 Marius Bakke +;;; Copyright © 2017, 2018, 2019, 2020 Marius Bakke ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Leo Famulari ;;; Copyright © 2020 Vincent Legoll @@ -410,7 +410,7 @@ (define opus-tools (define opusfile (package (name "opusfile") - (version "0.11") + (version "0.12") (source (origin (method url-fetch) (uri (string-append @@ -418,7 +418,7 @@ (define opusfile ".tar.gz")) (sha256 (base32 - "1gq3aszzl5glgbajw5p1f5a1kdyf23w5vjdmwwrk246syin9pkkl")))) + "02smwc5ah8nb3a67mnkjzqmrzk43j356hgj2a97s9midq40qd38i")))) (build-system gnu-build-system) ;; Required by opusfile.pc and opusurl.pc. (propagated-inputs -- cgit v1.2.3 From 75ebc650c8a4e0f5b51a510891c22e2a39268142 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 27 Jun 2020 15:38:44 +0200 Subject: gnu: opusfile: Do not build static libraries. * gnu/packages/xiph.scm (opusfile)[arguments]: New field. --- gnu/packages/xiph.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm index a88ea094dd..7487858fd3 100644 --- a/gnu/packages/xiph.scm +++ b/gnu/packages/xiph.scm @@ -420,6 +420,8 @@ (define opusfile (base32 "02smwc5ah8nb3a67mnkjzqmrzk43j356hgj2a97s9midq40qd38i")))) (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--disable-static"))) ;; Required by opusfile.pc and opusurl.pc. (propagated-inputs `(("libogg" ,libogg) -- cgit v1.2.3 From 866ce9435176ac2909d81097b5f1d95c65e843c4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 27 Jun 2020 15:39:11 +0200 Subject: gnu: feh: Update to 3.4.1. * gnu/packages/image-viewers.scm (feh): Update to 3.4.1. --- gnu/packages/image-viewers.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 78d7e7c01b..5a7d849ae1 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -74,7 +74,7 @@ (define-module (gnu packages image-viewers) (define-public feh (package (name "feh") - (version "3.4") + (version "3.4.1") (home-page "https://feh.finalrewind.org/") (source (origin (method url-fetch) @@ -82,7 +82,7 @@ (define-public feh name "-" version ".tar.bz2")) (sha256 (base32 - "0r83zincbfnk8g13xwm2qaccml9srnwlsmpc1f0nhwjkqyjmqm0q")))) + "0yvvj1s7ayn0lwils582smwkmckdk0gij5c58g45n4xh981n693q")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases (delete 'configure)) -- cgit v1.2.3 From 25e0083165dad410d85e92284c9746c6de959ea9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 27 Jun 2020 15:43:38 +0200 Subject: gnu: spdlog: Update to 1.6.1. * gnu/packages/logging.scm (spdlog): Update to 1.6.1. [arguments]: Add "-DSPDLOG_BUILD_TESTS=ON" in #:configure-flags. --- gnu/packages/logging.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm index 9139dc440e..c95eadd377 100644 --- a/gnu/packages/logging.scm +++ b/gnu/packages/logging.scm @@ -191,7 +191,7 @@ (define-public multitail (define-public spdlog (package (name "spdlog") - (version "1.5.0") + (version "1.6.1") (source (origin (method git-fetch) @@ -201,13 +201,14 @@ (define-public spdlog (file-name (git-file-name name version)) (sha256 (base32 - "0dn44r3xbw1w0bk9yflnxkh3rzdq2bpxkks44skfmqig0rsj1f1x")))) + "1b1b3zmbyjgqz5yfdgaasi55x03d37z7l2pasvgikx3mm1gabq5a")))) (build-system cmake-build-system) ;; TODO run benchmark. Currently not possible, as adding ;; (gnu packages benchmark) forms a dependency cycle (arguments '(#:configure-flags - (list "-DSPDLOG_BUILD_BENCH=OFF"))) + (list "-DSPDLOG_BUILD_BENCH=OFF" + "-DSPDLOG_BUILD_TESTS=ON"))) (home-page "https://github.com/gabime/spdlog") (synopsis "Fast C++ logging library") (description "Spdlog is a very fast header-only/compiled C++ logging -- cgit v1.2.3 From 07d6003be0c4d1d631a65f36a88cf69685d6c8b1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 27 Jun 2020 15:44:21 +0200 Subject: gnu: libconfuse: Update to 3.3. * gnu/packages/textutils.scm (libconfuse): Update to 3.3. --- gnu/packages/textutils.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index b6732dbae1..99708bbb6b 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2016 Alex Griffin ;;; Copyright © 2016, 2018, 2019 Efraim Flashner ;;; Copyright © 2016 Nikita -;;; Copyright © 2016 Marius Bakke +;;; Copyright © 2016, 2020 Marius Bakke ;;; Copyright © 2017 Eric Bavier ;;; Copyright © 2017 Rene Saavedra ;;; Copyright © 2017,2019 Hartmut Goebel @@ -200,7 +200,7 @@ (define-public utf8proc (define-public libconfuse (package (name "libconfuse") - (version "3.2.2") + (version "3.3") (source (origin (method url-fetch) @@ -208,7 +208,7 @@ (define-public libconfuse "releases/download/v" version "/confuse-" version ".tar.xz")) (sha256 - (base32 "02r1mmzik2m0iigbc2da3y754vj24i18r3ml5p2wzs027mjhn959")))) + (base32 "043hqqykpprgrkw9s2hbdlxr308a7yxwsgxj4m8aadg1401hmm8x")))) (build-system gnu-build-system) (home-page "https://github.com/martinh/libconfuse") (synopsis "Configuration file parser library") -- cgit v1.2.3 From e36c4d0bca0b41fa24c271f4009aacf866b45f47 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 27 Jun 2020 15:45:35 +0200 Subject: gnu: libconfuse: Do not build static libraries. * gnu/packages/textutils.scm (libconfuse)[arguments]: New field. --- gnu/packages/textutils.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 99708bbb6b..090ac1d91c 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -210,6 +210,8 @@ (define-public libconfuse (sha256 (base32 "043hqqykpprgrkw9s2hbdlxr308a7yxwsgxj4m8aadg1401hmm8x")))) (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--disable-static"))) (home-page "https://github.com/martinh/libconfuse") (synopsis "Configuration file parser library") (description "libconfuse is a configuration file parser library. It -- cgit v1.2.3 From edeb6f17f2df9d3bdf29cc9c0486e51e652c33ed Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 27 Jun 2020 15:47:22 +0200 Subject: gnu: dav1d: Update to 0.7.1. * gnu/packages/video.scm (dav1d): Update to 0.7.1. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 406a2ad5a1..c5e4993091 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3739,7 +3739,7 @@ (define-public openshot (define-public dav1d (package (name "dav1d") - (version "0.7.0") + (version "0.7.1") (source (origin (method url-fetch) @@ -3747,7 +3747,7 @@ (define-public dav1d "/dav1d/" version "/dav1d-" version ".tar.xz")) (sha256 (base32 - "0xcykraf42gkymzqx1k1lcdclgk9y5yf7rr56vslrgmr0r849qnk")))) + "1hnkfcg57bv5rib6cnj39dy1jx0q7zi5fb2fz52hf2y0bv8bad1k")))) (build-system meson-build-system) (native-inputs `(("nasm" ,nasm))) (home-page "https://code.videolan.org/videolan/dav1d") -- cgit v1.2.3 From db10d94dcd920f55c133352e677ebd68eb6fc436 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 27 Jun 2020 15:50:26 +0200 Subject: gnu: Add python2-selectors2. * gnu/packages/python-xyz.scm (python2-selectors2): New public variable. --- gnu/packages/python-xyz.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 300277f045..2912d9a723 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11343,6 +11343,29 @@ (define-public python-py3status own code, responding to click events and updating clock every second.") (license license:bsd-3))) +(define-public python2-selectors2 + (package + (name "python2-selectors2") + (version "2.0.1") + (source (origin + (method url-fetch) + (uri (pypi-uri "selectors2" version)) + (sha256 + (base32 + "110qr00b9axz1f1jm12b495jkvrz80smknxvssqlhwk0dx67rdw1")))) + (build-system python-build-system) + (arguments + `(#:python ,python-2)) + (native-inputs + `(("python2-mock" ,python2-mock) + ("python2-psutil" ,python2-psutil))) + (home-page "https://www.github.com/SethMichaelLarson/selectors2") + (synopsis "Backport of the selectors module from Python 3.5+") + (description + "This package provides a drop-in replacement for the @code{selectors} +module in Python 3.5 and later.") + (license license:expat))) + (define-public python-tblib (package (name "python-tblib") -- cgit v1.2.3 From 6be8ac2d81be9defab76290f48f466b55e9ffccb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 27 Jun 2020 15:50:46 +0200 Subject: gnu: python-greenlet: Update to 0.4.16. * gnu/packages/python-xyz.scm (python-greenlet): Update to 0.4.16. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 2912d9a723..d104dfe766 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11412,13 +11412,13 @@ (define-public python2-tblib (define-public python-greenlet (package (name "python-greenlet") - (version "0.4.15") + (version "0.4.16") (source (origin (method url-fetch) (uri (pypi-uri "greenlet" version)) (sha256 (base32 - "1g4g1wwc472ds89zmqlpyan3fbnzpa8qm48z3z1y6mlk44z485ll")))) + "0v2571d0av1hz3yx63gvmnrinyn57nnvibg4zkl9frv74b3yl1kf")))) (build-system python-build-system) (home-page "https://greenlet.readthedocs.io/") (synopsis "Lightweight in-process concurrent programming") -- cgit v1.2.3 From 9001eea9b090dd0f4627a7878b6e374796385749 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 27 Jun 2020 15:51:07 +0200 Subject: gnu: python-gevent: Update to 20.6.2. * gnu/packages/python-xyz.scm (python-gevent): Update to 20.6.2. (python2-gevent)[native-inputs]: Add PYTHON2-SELECTORS2. --- gnu/packages/python-xyz.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d104dfe766..463bfbf3bd 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11462,13 +11462,13 @@ (define-public python2-objgraph (define-public python-gevent (package (name "python-gevent") - (version "20.5.0") + (version "20.6.2") (source (origin (method url-fetch) (uri (pypi-uri "gevent" version)) (sha256 (base32 - "1yppsrs0ccld9j9zfbsd0bxb987b2zkh2ar7whjxcrqzpkvg3iqx")) + "1ldmppgghfphdaazjw6wq2i17xcmsjb2jsizfa4cjlg812zjlg52")) (modules '((guix build utils))) (snippet '(begin @@ -11613,7 +11613,8 @@ (define-public python2-gevent (package (inherit base) (native-inputs `(,@(package-native-inputs base) - ("python-mock" ,python2-mock)))))) + ("python-mock" ,python2-mock) + ("python2-selectors2" ,python2-selectors2)))))) (define-public python-fastimport (package -- cgit v1.2.3 From 28d3f49e355bacff4889b357458ab903ae861da9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 27 Jun 2020 15:52:08 +0200 Subject: gnu: exempi: Update to 2.5.2. * gnu/packages/freedesktop.scm (exempi): Update to 2.5.2. --- gnu/packages/freedesktop.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index f8c2ea298f..1f17485b8d 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -847,7 +847,7 @@ (define-public wev (define-public exempi (package (name "exempi") - (version "2.5.1") + (version "2.5.2") (source (origin (method url-fetch) (uri (string-append @@ -855,7 +855,7 @@ (define-public exempi name "-" version ".tar.bz2")) (sha256 (base32 - "1j4vx054l1c2cggw4aka4iw48jkcf68qk5y064pbqw1k3ddks2qh")))) + "1mdfxb36p8251n5m7l55gx3fcqpk46yz9v568xfr8igxmqa47xaj")))) (build-system gnu-build-system) (arguments `(#:configure-flags (list (string-append "--with-boost=" -- cgit v1.2.3 From cd533cb4976da24bb87d2dffd8a65f72734f7117 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 27 Jun 2020 15:53:21 +0200 Subject: gnu: exempi: Delete the static library. * gnu/packages/freedesktop.scm (exempi)[arguments]: Add phase to delete libexempi.a. --- gnu/packages/freedesktop.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 1f17485b8d..23cd1aabf9 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -859,7 +859,18 @@ (define-public exempi (build-system gnu-build-system) (arguments `(#:configure-flags (list (string-append "--with-boost=" - (assoc-ref %build-inputs "boost"))))) + (assoc-ref %build-inputs "boost"))) + #:phases + (modify-phases %standard-phases + (add-after 'install 'remove-static-library + (lambda* (#:key outputs #:allow-other-keys) + ;; XXX: Some tests fail to build with --disable-static due to + ;; symbols not being visible in the shared library: + ;; . + ;; Simply delete the static library instead to save ~4.3 MiB. + (delete-file (string-append (assoc-ref outputs "out") + "/lib/libexempi.a")) + #t))))) (native-inputs `(("boost" ,boost))) ; tests (inputs -- cgit v1.2.3 From ea60beeb3d36a7fe1d8df57bd9981b98c179b19c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 27 Jun 2020 15:54:09 +0200 Subject: gnu: libzip: Update to 1.7.1. * gnu/packages/compression.scm (libzip): Update to 1.7.1. --- gnu/packages/compression.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index e7d74d808f..21b4b92862 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1612,14 +1612,14 @@ (define-public zziplib (define-public libzip (package (name "libzip") - (version "1.6.1") + (version "1.7.1") (source (origin (method url-fetch) (uri (string-append "https://libzip.org/download/libzip-" version ".tar.xz")) (sha256 (base32 - "0h9nsgkw0dk4srsvmz6xy6f9l4h815xn07j8h40l8gqvcxxaqpbh")))) + "1b4pl3dhva80lg9pmsg82cw40pnn0n35z823irsam7x72wdxq850")))) (native-inputs `(("perl" ,perl))) (inputs -- cgit v1.2.3 From e0bb6391a9bd55f3856fa45f23a7891d29b834ad Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 27 Jun 2020 15:57:12 +0200 Subject: gnu: ilmbase: Update to 2.5.2. * gnu/packages/patches/ilmbase-fix-test-arm.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/graphics.scm (ilmbase): Update to 2.5.2. [source](patches): Remove 'ilmbase-fix-test-arm.patch'. (openexr)[arguments]: Really increase test timeout, as the previous fix was ineffective. --- gnu/local.mk | 1 - gnu/packages/graphics.scm | 15 ++++--- gnu/packages/patches/ilmbase-fix-test-arm.patch | 60 ------------------------- 3 files changed, 9 insertions(+), 67 deletions(-) delete mode 100644 gnu/packages/patches/ilmbase-fix-test-arm.patch diff --git a/gnu/local.mk b/gnu/local.mk index 396629cc93..fb157c0ab1 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1106,7 +1106,6 @@ dist_patch_DATA = \ %D%/packages/patches/id3lib-CVE-2007-4460.patch \ %D%/packages/patches/id3lib-UTF16-writing-bug.patch \ %D%/packages/patches/ilmbase-fix-tests.patch \ - %D%/packages/patches/ilmbase-fix-test-arm.patch \ %D%/packages/patches/inetutils-hurd.patch \ %D%/packages/patches/inkscape-poppler-0.76.patch \ %D%/packages/patches/intltool-perl-compatibility.patch \ diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 0d768b8a0e..e8bff9b86a 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -359,7 +359,7 @@ (define-public cgal (define-public ilmbase (package (name "ilmbase") - (version "2.5.0") + (version "2.5.2") (source (origin (method git-fetch) (uri (git-reference @@ -368,9 +368,8 @@ (define-public ilmbase (file-name (git-file-name "ilmbase" version)) (sha256 (base32 - "1k50cvi3sk6gf6w713lkk2gv5cvs74vkc7s7k4z6nmyhi4g89w4y")) - (patches (search-patches "ilmbase-fix-tests.patch" - "ilmbase-fix-test-arm.patch")))) + "1vf8bqld2bpcdi99jbr043y6vp01cp3fvbiasrn66xn91mf6imbn")) + (patches (search-patches "ilmbase-fix-tests.patch")))) (build-system cmake-build-system) (arguments `(#:phases (modify-phases %standard-phases @@ -589,11 +588,15 @@ (define-public openexr (lambda _ (chdir "OpenEXR") #t)) - (add-before 'check 'increase-test-timeout + (add-after 'change-directory 'increase-test-timeout (lambda _ ;; On armhf-linux, we need to override the CTest default ;; timeout of 1500 seconds for the OpenEXR.IlmImf test. - (setenv "CTEST_TEST_TIMEOUT" "2000") + (substitute* "IlmImfTest/CMakeLists.txt" + (("add_test\\(NAME OpenEXR\\.IlmImf.*" all) + (string-append + all + "set_tests_properties(OpenEXR.IlmImf PROPERTIES TIMEOUT 2000)"))) #t)) ,@(if (not (target-64bit?)) `((add-after 'change-directory 'disable-broken-test diff --git a/gnu/packages/patches/ilmbase-fix-test-arm.patch b/gnu/packages/patches/ilmbase-fix-test-arm.patch deleted file mode 100644 index 2dbc55e8c4..0000000000 --- a/gnu/packages/patches/ilmbase-fix-test-arm.patch +++ /dev/null @@ -1,60 +0,0 @@ -Fix a test failure on ARM platforms: - -https://github.com/AcademySoftwareFoundation/openexr/issues/713 - -Taken from upstream: - -https://github.com/AcademySoftwareFoundation/openexr/commit/76d9839cd1b300398f8b801dfcb4bcf2f8c0096f - -diff --git a/OpenEXR/IlmImfTest/testHuf.cpp b/OpenEXR/IlmImfTest/testHuf.cpp -index 4c887ee8..a93b8ea9 100644 ---- a/OpenEXR/IlmImfTest/testHuf.cpp -+++ b/OpenEXR/IlmImfTest/testHuf.cpp -@@ -181,9 +181,9 @@ compressUncompressSubset(const unsigned short raw[], int n) - // This DEK hash is determined from an aprior initial run of this - // test noting its value from the assert message compressVerify(). - // --#define HUF_COMPRESS_DEK_HASH_FOR_FILL4_USHRT_MAX_PLUS_ONE 2956869585U --#define HUF_COMPRESS_DEK_HASH_FOR_FILL4_N 3414126535U --#define HUF_COMPRESS_DEK_HASH_FOR_FILL5_N 169791374U -+#define HUF_COMPRESS_DEK_HASH_FOR_FILL4_USHRT_MAX_PLUS_ONE 2013380646U -+#define HUF_COMPRESS_DEK_HASH_FOR_FILL4_N 213880353U -+#define HUF_COMPRESS_DEK_HASH_FOR_FILL5_N 2492982090U - - void - compressVerify (const unsigned short raw[], -@@ -200,7 +200,7 @@ compressVerify (const unsigned short raw[], - // under the topic of sorting and search chapter 6.4. - // - unsigned int compressedHash = nCompressed; -- const char* cptr = compressed; -+ const unsigned char* cptr = reinterpret_cast( (const char*) compressed); - for (int i = 0; i < nCompressed; ++i) - { - compressedHash = -@@ -210,6 +210,25 @@ compressVerify (const unsigned short raw[], - cout << "verifying compressed checksum hash = " - << compressedHash << std::endl; - -+ if (compressedHash != dekHash) -+ { -+ cout << "hash verification failed. Got " << compressedHash << " expected " << dekHash << std::endl; -+ const unsigned char* cptr = reinterpret_cast( (const char*) compressed); -+ for(int i = 0 ; i < nCompressed ; ++i ) -+ { -+ cout << std::hex << (0xFF & (int) (*cptr++)); -+ if ( (i & 0xF) ==0 ) -+ { -+ cout << '\n'; -+ } -+ else -+ { -+ cout << ' '; -+ } -+ } -+ cout << "\n"; -+ } -+ - assert (compressedHash == dekHash); - } - -- cgit v1.2.3 From cd03e2cb2f5759e158392b9fe67d805b7b41c574 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 27 Jun 2020 16:14:50 +0200 Subject: gnu: libcyaml: Remove unused input. * gnu/packages/web.scm (libcyaml)[native-inputs]: Remove GIT. --- gnu/packages/web.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index cca722f6e9..c449267f3d 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5041,8 +5041,7 @@ (define-public libcyaml (inputs `(("libyaml" ,libyaml))) (native-inputs - `(("git", git) - ("pkg-config", pkg-config))) + `(("pkg-config", pkg-config))) (synopsis "C library for reading and writing YAML") (description "LibCYAML is a C library written in ISO C11 for reading and writing -- cgit v1.2.3 From afdc16d9041fde77913b6e84679dc581c54df2d6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 27 Jun 2020 16:48:20 +0200 Subject: gnu: x265: Update to 3.4. * gnu/packages/patches/x265-arm-flags.patch: Update patch. * gnu/packages/video.scm (x265): Update to 3.4. [arguments]: Remove obsolete substitution. Disable the newly-added assembly optimizations on AArch64, as they are not implemented for all targets we build. --- gnu/packages/patches/x265-arm-flags.patch | 38 +++++++++++++++---------------- gnu/packages/video.scm | 10 +++----- 2 files changed, 22 insertions(+), 26 deletions(-) diff --git a/gnu/packages/patches/x265-arm-flags.patch b/gnu/packages/patches/x265-arm-flags.patch index f17e26f6f1..342e13270b 100644 --- a/gnu/packages/patches/x265-arm-flags.patch +++ b/gnu/packages/patches/x265-arm-flags.patch @@ -1,4 +1,7 @@ -https://sources.debian.org/src/x265/2.9-3/debian/patches/0001-Fix-arm-flags.patch/ +Fix build flags for ARMv7. + +Taken from Debian: +https://salsa.debian.org/multimedia-team/x265/-/blob/master/debian/patches/0001-Fix-arm-flags.patch From: Sebastian Ramacher Date: Wed, 26 Apr 2017 22:05:06 +0200 @@ -9,28 +12,25 @@ Subject: Fix arm* flags 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt -index 33b6523..25aecbb 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt -@@ -72,7 +72,7 @@ elseif(ARMMATCH GREATER "-1") +@@ -77,7 +77,7 @@ elseif(ARMMATCH GREATER "-1") + add_definitions(-DX265_ARCH_ARM=1 -DX265_ARCH_ARM64=1 -DHAVE_ARMV6=0) + else() + message(STATUS "Detected ARM target processor") +- add_definitions(-DX265_ARCH_ARM=1 -DX265_ARCH_ARM64=0 -DHAVE_ARMV6=1) ++ add_definitions(-DX265_ARCH_ARM=1) endif() - message(STATUS "Detected ARM target processor") - set(ARM 1) -- add_definitions(-DX265_ARCH_ARM=1 -DHAVE_ARMV6=1) -+ # add_definitions(-DX265_ARCH_ARM=1 -DHAVE_ARMV6=1) else() message(STATUS "CMAKE_SYSTEM_PROCESSOR value `${CMAKE_SYSTEM_PROCESSOR}` is unknown") - message(STATUS "Please add this value near ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE}") -@@ -230,12 +230,8 @@ if(GCC) - if(ARM AND CROSS_COMPILE_ARM) - set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm -fPIC) - elseif(ARM) -- find_package(Neon) - if(CPU_HAS_NEON) -- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=neon -marm -fPIC) - add_definitions(-DHAVE_NEON) -- else() -- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=vfp -marm) +@@ -252,10 +252,7 @@ if(GCC) + else() + find_package(Neon) + if(CPU_HAS_NEON) +- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=neon -marm -fPIC) + add_definitions(-DHAVE_NEON) +- else() +- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=vfp -marm) + endif() endif() endif() - add_definitions(${ARM_ARGS}) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index c5e4993091..9c88066c91 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -611,7 +611,7 @@ (define-public straw-viewer (define-public x265 (package (name "x265") - (version "3.3") + (version "3.4") (outputs '("out" "static")) (source (origin @@ -621,7 +621,7 @@ (define-public x265 (string-append "https://download.videolan.org/videolan/x265/" "x265_" version ".tar.gz"))) (sha256 - (base32 "170b61cgpcs5n35qps0p40dqs1q81vkgagzbs4zv7pzls6718vpj")) + (base32 "0wl62hfsdqpf3r3z3s6l9bz7pdb1rcik5ll00b3yaadplqipy162")) (patches (search-patches "x265-arm-flags.patch")) (modules '((guix build utils))) (snippet '(begin @@ -638,8 +638,7 @@ (define-public x265 #:configure-flags ;; Ensure position independent code for everyone. (list "-DENABLE_PIC=TRUE" - ,@(if (string-prefix? "armhf" (or (%current-system) - (%current-target-system))) + ,@(if (target-arm?) '("-DENABLE_ASSEMBLY=OFF") '()) (string-append "-DCMAKE_INSTALL_PREFIX=" @@ -650,9 +649,6 @@ (define-public x265 (lambda _ (delete-file-recursively "build") (chdir "source") - ;; recognize armv8 in 32-bit mode as ARM - (substitute* "CMakeLists.txt" - (("armv6l") "armv8l")) #t)) (add-before 'configure 'build-12-bit (lambda* (#:key (configure-flags '()) #:allow-other-keys) -- cgit v1.2.3 From ecbf47d97df36f475ba81264a557d92d250d9fee Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 27 Jun 2020 22:50:05 +0200 Subject: gnu: Add emacs-browse-kill-ring. * gnu/packages/emacs-xyz.scm (emacs-browse-kill-ring): New variable. --- gnu/packages/emacs-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 8b03ce347c..8b00ebe0f6 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -17883,6 +17883,31 @@ (define-public emacs-wttrin @url{wttr.in}.") (license license:expat)))) +(define-public emacs-browse-kill-ring + (let ((commit "1ef72cc6accd94cd7032c02b1b2c78ae7f1d1965") + (revision "0")) + (package + (name "emacs-browse-kill-ring") + (version (git-version "2.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/browse-kill-ring/browse-kill-ring.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0mil32g7hcw376jibs5hdyv00xbaql3m4a27rwqaafg0x59avxdj")))) + (build-system emacs-build-system) + (home-page "https://github.com/browse-kill-ring/browse-kill-ring") + (synopsis "Interactively insert items from kill-ring") + (description + "Did you ever feel that @code{C-y M-y M-y M-y ...} is not a great way +of trying to find that piece of text you know you killed a while back? Then +@code{browse-kill-ring.el} is for you.") + (license license:gpl2+)))) + (define-public emacs-powerline (package (name "emacs-powerline") -- cgit v1.2.3 From bc3693743127accce674faa70f8b7326f6439eea Mon Sep 17 00:00:00 2001 From: Peter Lo Date: Sun, 28 Jun 2020 01:48:58 +0800 Subject: gnu: Add r-shapforxgboost. * gnu/packages/cran.scm (r-shapforxgboost): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/cran.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index ab5e57c0e2..c057ae36cd 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -22325,3 +22325,36 @@ (define-public r-kmer and clustering large sequence datasets using fast alignment-free k-mer counting and recursive k-means partitioning.") (license license:gpl3))) + +(define-public r-shapforxgboost + (package + (name "r-shapforxgboost") + (version "0.0.4") + (source + (origin + (method url-fetch) + (uri (cran-uri "SHAPforxgboost" version)) + (sha256 + (base32 + "0k6bg27wqnkzv82bcahbapmqhiz6rvnx81m23zbjw58c7lwshgnq")))) + (properties + `((upstream-name . "SHAPforxgboost"))) + (build-system r-build-system) + (propagated-inputs + `(("r-bbmisc" ,r-bbmisc) + ("r-data-table" ,r-data-table) + ("r-ggextra" ,r-ggextra) + ("r-ggforce" ,r-ggforce) + ("r-ggplot2" ,r-ggplot2) + ("r-ggpubr" ,r-ggpubr) + ("r-rcolorbrewer" ,r-rcolorbrewer) + ("r-xgboost" ,r-xgboost))) + (home-page "https://github.com/liuyanguu/SHAPforxgboost") + (synopsis "SHAP Plots for XGBoost") + (description + "The aim of @code{SHAPforxgboost} is to aid in visual data investigations +using @dfn{SHAP} (Shapley additive explanation) visualization plots for +@code{XGBoost}. It provides summary plot, dependence plot, interaction plot, +and force plot. It relies on the @code{XGBoost} package to produce SHAP +values.") + (license license:expat))) -- cgit v1.2.3 From 3f68322e5a0073ffe1209dee430f30168cda2b96 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 27 Jun 2020 00:11:35 +0200 Subject: gnu: python-setproctitle: Fix build. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-setproctitle)[arguments]: Add ‘--embed’ to $PYCONFIG. --- gnu/packages/python-xyz.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 463bfbf3bd..a526fc29b5 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13149,8 +13149,9 @@ (define-public python-setproctitle (replace 'check (lambda _ (setenv "PYTHON" (or (which "python3") (which "python"))) - (setenv "PYCONFIG" (or (which "python3-config") - (which "python-config"))) + (setenv "PYCONFIG" (string-append (or (which "python3-config") + (which "python-config")) + " --embed")) (setenv "CC" "gcc") ;; No need to extend PYTHONPATH to find the built package, since ;; the Makefile will build anyway -- cgit v1.2.3 From 90596f373a7a74f924d120b86a557298069ab8a9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 27 Jun 2020 00:13:18 +0200 Subject: gnu: python-setproctitle: Fix indentation. * gnu/packages/python-xyz.scm (python-setproctitle): Re-indent. --- gnu/packages/python-xyz.scm | 47 ++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a526fc29b5..2410646c22 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13121,21 +13121,21 @@ (define-public python2-snowballstemmer (package-with-python2 python-snowballstemmer)) (define-public python-setproctitle -(package - (name "python-setproctitle") - (version "1.1.10") - (source - (origin - (method url-fetch) - (uri (pypi-uri "setproctitle" version)) - (sha256 + (package + (name "python-setproctitle") + (version "1.1.10") + (source + (origin + (method url-fetch) + (uri (pypi-uri "setproctitle" version)) + (sha256 (base32 - "163kplw9dcrw0lffq1bvli5yws3rngpnvrxrzdw89pbphjjvg0v2")))) - (build-system python-build-system) - (arguments - '(#:phases - (modify-phases %standard-phases - (add-before 'check 'patch-Makefile + "163kplw9dcrw0lffq1bvli5yws3rngpnvrxrzdw89pbphjjvg0v2")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-before 'check 'patch-Makefile ;; Stricly this is only required for the python2 variant. ;; But adding a phase in an inherited package seems to be ;; cumbersum. So we patch even for python3. @@ -13146,7 +13146,7 @@ (define-public python-setproctitle (("\\$\\(PYTHON\\) [^ ]which nosetests[^ ] ") (string-append nose "/bin/nosetests ")))) #t))) - (replace 'check + (replace 'check (lambda _ (setenv "PYTHON" (or (which "python3") (which "python"))) (setenv "PYCONFIG" (string-append (or (which "python3-config") @@ -13156,21 +13156,20 @@ (define-public python-setproctitle ;; No need to extend PYTHONPATH to find the built package, since ;; the Makefile will build anyway (invoke "make" "check")))))) - (native-inputs - `(("procps" ,procps))) ; required for tests - (home-page - "https://github.com/dvarrazzo/py-setproctitle") - (synopsis - "Setproctitle implementation for Python to customize the process title") - (description "The library allows a process to change its title (as displayed + (native-inputs + `(("procps" ,procps))) ; required for tests + (home-page "https://github.com/dvarrazzo/py-setproctitle") + (synopsis + "Setproctitle implementation for Python to customize the process title") + (description "The library allows a process to change its title (as displayed by system tools such as ps and top). Changing the title is mostly useful in multi-process systems, for example when a master process is forked: changing the children's title allows identifying the task each process is busy with. The technique is used by PostgreSQL and the OpenSSH Server for example.") - (license license:bsd-3) - (properties `((python2-variant . ,(delay python2-setproctitle)))))) + (license license:bsd-3) + (properties `((python2-variant . ,(delay python2-setproctitle)))))) (define-public python2-setproctitle (let ((base (package-with-python2 -- cgit v1.2.3 From 5c10200b5499826a2e430a46fdb664d269857278 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Jun 2020 05:10:23 +0200 Subject: gnu: Add autofs. * gnu/packages/file-systems.scm (autofs): New public variable. Co-authored-by: Oleg Pykhalov --- gnu/packages/file-systems.scm | 76 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index dd72152c51..eee218d7bb 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -41,27 +41,103 @@ (define-module (gnu packages file-systems) #:use-module (gnu packages compression) #:use-module (gnu packages crypto) #:use-module (gnu packages curl) + #:use-module (gnu packages cyrus-sasl) #:use-module (gnu packages datastructures) #:use-module (gnu packages documentation) #:use-module (gnu packages docbook) #:use-module (gnu packages flex) #:use-module (gnu packages glib) #:use-module (gnu packages gnupg) + #:use-module (gnu packages kerberos) #:use-module (gnu packages libffi) #:use-module (gnu packages linux) #:use-module (gnu packages nfs) #:use-module (gnu packages onc-rpc) + #:use-module (gnu packages openldap) #:use-module (gnu packages photo) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) #:use-module (gnu packages readline) #:use-module (gnu packages rsync) + #:use-module (gnu packages sssd) #:use-module (gnu packages sqlite) #:use-module (gnu packages tls) #:use-module (gnu packages valgrind) #:use-module (gnu packages xml)) +(define-public autofs + (package + (name "autofs") + (version "5.1.6") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kernel.org/linux/daemons/autofs/" + "v" (version-major version) "/" + "autofs-" version ".tar.xz")) + (sha256 + (base32 "1vya21mb4izj3khcr3flibv7xc15vvx2v0rjfk5yd31qnzcy7pnx")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list "--enable-ignore-busy" ; during shutdown + "--enable-sloppy-mount" ; support mount(8) -s + "--with-libtirpc" + (string-append "--with-openldap=" + (assoc-ref %build-inputs "openldap")) + (string-append "--with-sasl=" + (assoc-ref %build-inputs "cyrus-sasl")) + "HAVE_SSS_AUTOFS=1" ; required to make sssldir click + (string-append "sssldir=" + (assoc-ref %build-inputs "sssd") + "/lib/sssd/modules")) + #:tests? #f ; no test suite + #:phases + (modify-phases %standard-phases + (add-before 'configure 'fix-hard-coded-search-path + (lambda _ + (substitute* "configure" + (("^searchpath=\".*\"") + "searchpath=\"$PATH\"")) + #t)) + (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. + (lambda _ + (substitute* "modules/Makefile" + (("ln -fs lookup_yp.so" match) + (string-append "# " match))) + #t))))) + (native-inputs + `(("bison" ,bison) + ("flex" ,flex) + ("pkg-config" ,pkg-config) + ("rpcsvc-proto" ,rpcsvc-proto))) + (inputs + `(("cyrus-sasl" ,cyrus-sasl) + ("e2fsprogs" ,e2fsprogs) ; for e[234]fsck + ("libtirpc" ,libtirpc) + ("libxml2" ,libxml2) ; needed for LDAP, SASL + ("mit-krb5" ,mit-krb5) ; needed for LDAP, SASL + ("nfs-utils" ,nfs-utils) ; for mount.nfs + ("openldap" ,openldap) + ("openssl" ,openssl) ; needed for SASL + ("sssd" ,sssd) + ("util-linux" ,util-linux))) ; for mount, umount + ;; XXX A directory index is the closest thing this has to a home page. + (home-page "https://www.kernel.org/pub/linux/daemons/autofs/") + (synopsis "Kernel-based automounter for Linux") + (description + "Autofs is a kernel-based automounter for use with the Linux autofs4 +module. It automatically mounts selected file systems when they are used and +unmounts them after a set period of inactivity. This provides +centrally-managed, consistent file names for users and applications, even in a +large and/or frequently changing (network) environment.") + ;; fedfs/ is GPL-2-only but not built. + (license (list license:bsd-3 ; modules/cyrus-sasl.c + license:gpl2+)))) ; the rest + (define-public fsarchiver (package (name "fsarchiver") -- cgit v1.2.3 From 4b4f890cb03d7c5b958fe08553dfad2f39a1d4f2 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 27 Jun 2020 17:18:52 +0200 Subject: bash completion: Complete 'guix environment' properly. * etc/completion/bash/guix (_guix_complete): Add case for "guix environment". --- etc/completion/bash/guix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/etc/completion/bash/guix b/etc/completion/bash/guix index df35919eb2..5aebd074e9 100644 --- a/etc/completion/bash/guix +++ b/etc/completion/bash/guix @@ -222,6 +222,14 @@ _guix_complete () else _guix_complete_available_package "$word_at_point" fi + elif _guix_is_command "environment" + then + if _guix_is_dash_L || _guix_is_dash_m || _guix_is_dash_p + then + _guix_complete_file + else + _guix_complete_available_package "$word_at_point" + fi elif _guix_is_command "download" then _guix_complete_file -- cgit v1.2.3 From 3fb6b8f30444d41963ba5bdd441123a6d2df17bd Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 23 Jun 2020 11:46:05 +0200 Subject: daemon: Map directly to gcrypt hash functions. * nix/libutil/hash.hh (HashType): Map directly to GCRY_MD_ values. (md5HashSize, sha1HashSize, sha256HashSize, sha512HashSize): Remove. * nix/libutil/hash.cc (Hash::Hash): Use 'gcry_md_get_algo_dlen'. --- nix/libutil/hash.cc | 8 +++----- nix/libutil/hash.hh | 17 +++++++++-------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/nix/libutil/hash.cc b/nix/libutil/hash.cc index ea69aa64f9..251f18f60e 100644 --- a/nix/libutil/hash.cc +++ b/nix/libutil/hash.cc @@ -38,11 +38,9 @@ Hash::Hash() Hash::Hash(HashType type) { this->type = type; - if (type == htMD5) hashSize = md5HashSize; - else if (type == htSHA1) hashSize = sha1HashSize; - else if (type == htSHA256) hashSize = sha256HashSize; - else if (type == htSHA512) hashSize = sha512HashSize; - else throw Error("unknown hash type"); + hashSize = gcry_md_get_algo_dlen(type); + + if (hashSize == 0) throw Error("unknown hash type"); assert(hashSize <= maxHashSize); memset(hash, 0, maxHashSize); } diff --git a/nix/libutil/hash.hh b/nix/libutil/hash.hh index 6b5e47cd8a..7357a34e1d 100644 --- a/nix/libutil/hash.hh +++ b/nix/libutil/hash.hh @@ -1,5 +1,7 @@ #pragma once +#include + #include "types.hh" #include "serialise.hh" @@ -7,16 +9,15 @@ namespace nix { -typedef enum { htUnknown, htMD5, htSHA1, htSHA256, htSHA512 } HashType; - - -const int md5HashSize = 16; -const int sha1HashSize = 20; -const int sha256HashSize = 32; -const int sha512HashSize = 64; - extern const string base32Chars; +typedef enum { + htUnknown = 0, + htMD5 = GCRY_MD_MD5, + htSHA1 = GCRY_MD_SHA1, + htSHA256 = GCRY_MD_SHA256, + htSHA512 = GCRY_MD_SHA512 +} HashType; struct Hash { -- cgit v1.2.3 From 8dc6c387852bb9505be44567a5f56913633cc23a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 23 Jun 2020 12:11:00 +0200 Subject: daemon: Remove OpenSSL hash compatibility wrappers. * nix/libutil/hash.cc (struct Ctx): Copy from gcrypt-hash.hh. (start, update, finish): Use gcrypt functions directly instead of OpenSSL-like wrappers. * nix/libutil/gcrypt-hash.cc, nix/libutil/gcrypt-hash.hh, nix/libutil/md5.h, nix/libutil/sha1.h, nix/libutil/sha256.h, nix/libutil/sha512.h: Remove. * nix/local.mk (libutil_a_SOURCES, libutil_headers): Adjust accordingly. --- nix/libutil/gcrypt-hash.cc | 51 -------------------------------------------- nix/libutil/gcrypt-hash.hh | 50 ------------------------------------------- nix/libutil/hash.cc | 53 +++++++++++++++++++++------------------------- nix/libutil/md5.h | 35 ------------------------------ nix/libutil/sha1.h | 35 ------------------------------ nix/libutil/sha256.h | 35 ------------------------------ nix/libutil/sha512.h | 35 ------------------------------ nix/local.mk | 12 +++-------- 8 files changed, 27 insertions(+), 279 deletions(-) delete mode 100644 nix/libutil/gcrypt-hash.cc delete mode 100644 nix/libutil/gcrypt-hash.hh delete mode 100644 nix/libutil/md5.h delete mode 100644 nix/libutil/sha1.h delete mode 100644 nix/libutil/sha256.h delete mode 100644 nix/libutil/sha512.h diff --git a/nix/libutil/gcrypt-hash.cc b/nix/libutil/gcrypt-hash.cc deleted file mode 100644 index c4ae7bfcc2..0000000000 --- a/nix/libutil/gcrypt-hash.cc +++ /dev/null @@ -1,51 +0,0 @@ -/* GNU Guix --- Functional package management for GNU - Copyright (C) 2012, 2013 Ludovic Courtès - - This file is part of GNU Guix. - - GNU Guix is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or (at - your option) any later version. - - GNU Guix is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNU Guix. If not, see . */ - -#include - -#include -#include - -extern "C" { - -void -guix_hash_init (struct guix_hash_context *ctx, int algo) -{ - gcry_error_t err; - - err = gcry_md_open (&ctx->md_handle, algo, 0); - assert (err == GPG_ERR_NO_ERROR); -} - -void -guix_hash_update (struct guix_hash_context *ctx, const void *buffer, size_t len) -{ - gcry_md_write (ctx->md_handle, buffer, len); -} - -void -guix_hash_final (void *resbuf, struct guix_hash_context *ctx, - int algo) -{ - memcpy (resbuf, gcry_md_read (ctx->md_handle, algo), - gcry_md_get_algo_dlen (algo)); - gcry_md_close (ctx->md_handle); - ctx->md_handle = NULL; -} - -} diff --git a/nix/libutil/gcrypt-hash.hh b/nix/libutil/gcrypt-hash.hh deleted file mode 100644 index 11f061159f..0000000000 --- a/nix/libutil/gcrypt-hash.hh +++ /dev/null @@ -1,50 +0,0 @@ -/* GNU Guix --- Functional package management for GNU - Copyright (C) 2012, 2013 Ludovic Courtès - - This file is part of GNU Guix. - - GNU Guix is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or (at - your option) any later version. - - GNU Guix is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNU Guix. If not, see . */ - -/* An OpenSSL-like interface to GNU libgcrypt cryptographic hash - functions. */ - -#pragma once -#include -#include - -struct guix_hash_context -{ - /* This copy constructor is needed in 'HashSink::currentHash()' where we - expect the copy of a 'Ctx' object to yield a truly different context. */ - guix_hash_context (guix_hash_context &ref) - { - if (ref.md_handle == NULL) - md_handle = NULL; - else - gcry_md_copy (&md_handle, ref.md_handle); - } - - /* Make sure 'md_handle' is always initialized. */ - guix_hash_context (): md_handle (NULL) { }; - - gcry_md_hd_t md_handle; -}; - -extern "C" { -extern void guix_hash_init (struct guix_hash_context *ctx, int algo); -extern void guix_hash_update (struct guix_hash_context *ctx, const void *buffer, - size_t len); -extern void guix_hash_final (void *resbuf, struct guix_hash_context *ctx, - int algo); -} diff --git a/nix/libutil/hash.cc b/nix/libutil/hash.cc index 251f18f60e..20d2e4b724 100644 --- a/nix/libutil/hash.cc +++ b/nix/libutil/hash.cc @@ -3,18 +3,6 @@ #include #include -#ifdef HAVE_OPENSSL -#include -#include -#else -extern "C" { -#include "md5.h" -#include "sha1.h" -#include "sha256.h" -#include "sha512.h" -} -#endif - #include "hash.hh" #include "archive.hh" #include "util.hh" @@ -193,41 +181,48 @@ bool isHash(const string & s) return true; } - +/* The "hash context". */ struct Ctx { - MD5_CTX md5; - SHA_CTX sha1; - SHA256_CTX sha256; - SHA512_CTX sha512; + /* This copy constructor is needed in 'HashSink::currentHash()' where we + expect the copy of a 'Ctx' object to yield a truly different context. */ + Ctx(Ctx &ref) + { + if (ref.md_handle == NULL) + md_handle = NULL; + else + gcry_md_copy (&md_handle, ref.md_handle); + } + + /* Make sure 'md_handle' is always initialized. */ + Ctx(): md_handle (NULL) { }; + + gcry_md_hd_t md_handle; }; static void start(HashType ht, Ctx & ctx) { - if (ht == htMD5) MD5_Init(&ctx.md5); - else if (ht == htSHA1) SHA1_Init(&ctx.sha1); - else if (ht == htSHA256) SHA256_Init(&ctx.sha256); - else if (ht == htSHA512) SHA512_Init(&ctx.sha512); + gcry_error_t err; + + err = gcry_md_open (&ctx.md_handle, ht, 0); + assert (err == GPG_ERR_NO_ERROR); } static void update(HashType ht, Ctx & ctx, const unsigned char * bytes, unsigned int len) { - if (ht == htMD5) MD5_Update(&ctx.md5, bytes, len); - else if (ht == htSHA1) SHA1_Update(&ctx.sha1, bytes, len); - else if (ht == htSHA256) SHA256_Update(&ctx.sha256, bytes, len); - else if (ht == htSHA512) SHA512_Update(&ctx.sha512, bytes, len); + gcry_md_write (ctx.md_handle, bytes, len); } static void finish(HashType ht, Ctx & ctx, unsigned char * hash) { - if (ht == htMD5) MD5_Final(hash, &ctx.md5); - else if (ht == htSHA1) SHA1_Final(hash, &ctx.sha1); - else if (ht == htSHA256) SHA256_Final(hash, &ctx.sha256); - else if (ht == htSHA512) SHA512_Final(hash, &ctx.sha512); + memcpy (hash, gcry_md_read (ctx.md_handle, ht), + gcry_md_get_algo_dlen (ht)); + gcry_md_close (ctx.md_handle); + ctx.md_handle = NULL; } diff --git a/nix/libutil/md5.h b/nix/libutil/md5.h deleted file mode 100644 index 4583a458b3..0000000000 --- a/nix/libutil/md5.h +++ /dev/null @@ -1,35 +0,0 @@ -/* GNU Guix --- Functional package management for GNU - Copyright (C) 2012 Ludovic Courtès - - This file is part of GNU Guix. - - GNU Guix is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or (at - your option) any later version. - - GNU Guix is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNU Guix. If not, see . */ - -#include - -#define MD5_CTX guix_hash_context - -static inline void -MD5_Init (struct MD5_CTX *ctx) -{ - guix_hash_init (ctx, GCRY_MD_MD5); -} - -#define MD5_Update guix_hash_update - -static inline void -MD5_Final (void *resbuf, struct MD5_CTX *ctx) -{ - guix_hash_final (resbuf, ctx, GCRY_MD_MD5); -} diff --git a/nix/libutil/sha1.h b/nix/libutil/sha1.h deleted file mode 100644 index d2d071e058..0000000000 --- a/nix/libutil/sha1.h +++ /dev/null @@ -1,35 +0,0 @@ -/* GNU Guix --- Functional package management for GNU - Copyright (C) 2012 Ludovic Courtès - - This file is part of GNU Guix. - - GNU Guix is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or (at - your option) any later version. - - GNU Guix is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNU Guix. If not, see . */ - -#include - -#define SHA_CTX guix_hash_context - -static inline void -SHA1_Init (struct SHA_CTX *ctx) -{ - guix_hash_init (ctx, GCRY_MD_SHA1); -} - -#define SHA1_Update guix_hash_update - -static inline void -SHA1_Final (void *resbuf, struct SHA_CTX *ctx) -{ - guix_hash_final (resbuf, ctx, GCRY_MD_SHA1); -} diff --git a/nix/libutil/sha256.h b/nix/libutil/sha256.h deleted file mode 100644 index ca95d7fea8..0000000000 --- a/nix/libutil/sha256.h +++ /dev/null @@ -1,35 +0,0 @@ -/* GNU Guix --- Functional package management for GNU - Copyright (C) 2012 Ludovic Courtès - - This file is part of GNU Guix. - - GNU Guix is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or (at - your option) any later version. - - GNU Guix is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNU Guix. If not, see . */ - -#include - -#define SHA256_CTX guix_hash_context - -static inline void -SHA256_Init (struct SHA256_CTX *ctx) -{ - guix_hash_init (ctx, GCRY_MD_SHA256); -} - -#define SHA256_Update guix_hash_update - -static inline void -SHA256_Final (void *resbuf, struct SHA256_CTX *ctx) -{ - guix_hash_final (resbuf, ctx, GCRY_MD_SHA256); -} diff --git a/nix/libutil/sha512.h b/nix/libutil/sha512.h deleted file mode 100644 index d2abab4c5f..0000000000 --- a/nix/libutil/sha512.h +++ /dev/null @@ -1,35 +0,0 @@ -/* GNU Guix --- Functional package management for GNU - Copyright (C) 2012, 2015 Ludovic Courtès - - This file is part of GNU Guix. - - GNU Guix is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or (at - your option) any later version. - - GNU Guix is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNU Guix. If not, see . */ - -#include - -#define SHA512_CTX guix_hash_context - -static inline void -SHA512_Init (struct SHA512_CTX *ctx) -{ - guix_hash_init (ctx, GCRY_MD_SHA512); -} - -#define SHA512_Update guix_hash_update - -static inline void -SHA512_Final (void *resbuf, struct SHA512_CTX *ctx) -{ - guix_hash_final (resbuf, ctx, GCRY_MD_SHA512); -} diff --git a/nix/local.mk b/nix/local.mk index c136fb7202..005cde5563 100644 --- a/nix/local.mk +++ b/nix/local.mk @@ -1,5 +1,5 @@ # GNU Guix --- Functional package management for GNU -# Copyright © 2012, 2013, 2014, 2015, 2016, 2018, 2019 Ludovic Courtès +# Copyright © 2012, 2013, 2014, 2015, 2016, 2018, 2019, 2020 Ludovic Courtès # Copyright © 2016 Mathieu Lirzin # Copyright © 2020 Tobias Geerinckx-Rice # @@ -56,8 +56,7 @@ libutil_a_SOURCES = \ %D%/libutil/affinity.cc \ %D%/libutil/serialise.cc \ %D%/libutil/util.cc \ - %D%/libutil/hash.cc \ - %D%/libutil/gcrypt-hash.cc + %D%/libutil/hash.cc libutil_headers = \ %D%/libutil/affinity.hh \ @@ -65,12 +64,7 @@ libutil_headers = \ %D%/libutil/serialise.hh \ %D%/libutil/util.hh \ %D%/libutil/archive.hh \ - %D%/libutil/types.hh \ - %D%/libutil/gcrypt-hash.hh \ - %D%/libutil/md5.h \ - %D%/libutil/sha1.h \ - %D%/libutil/sha256.h \ - %D%/libutil/sha512.h + %D%/libutil/types.hh libutil_a_CPPFLAGS = \ -I$(top_builddir)/nix \ -- cgit v1.2.3 From 8e6c1415d87272c0221ce328715fc0dd1dd3e032 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 23 Jun 2020 16:33:38 +0200 Subject: daemon: Recognize SHA3 and BLAKE2s. * nix/libutil/hash.hh (HashType): Add htSHA3_256, htSHA3_512, and htBLAKE2s_256. * nix/libutil/hash.cc (parseHashType, printHashType): Recognize them. * tests/store.scm ("add-to-store"): Test these algorithms. --- nix/libutil/hash.cc | 6 ++++++ nix/libutil/hash.hh | 5 ++++- tests/store.scm | 4 ++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/nix/libutil/hash.cc b/nix/libutil/hash.cc index 20d2e4b724..7853acdd49 100644 --- a/nix/libutil/hash.cc +++ b/nix/libutil/hash.cc @@ -321,6 +321,9 @@ HashType parseHashType(const string & s) else if (s == "sha1") return htSHA1; else if (s == "sha256") return htSHA256; else if (s == "sha512") return htSHA512; + else if (s == "sha3-256") return htSHA3_256; + else if (s == "sha3-512") return htSHA3_512; + else if (s == "blake2s-256") return htBLAKE2s_256; else return htUnknown; } @@ -331,6 +334,9 @@ string printHashType(HashType ht) else if (ht == htSHA1) return "sha1"; else if (ht == htSHA256) return "sha256"; else if (ht == htSHA512) return "sha512"; + else if (ht == htSHA3_256) return "sha3-256"; + else if (ht == htSHA3_512) return "sha3-512"; + else if (ht == htBLAKE2s_256) return "blake2s-256"; else throw Error("cannot print unknown hash type"); } diff --git a/nix/libutil/hash.hh b/nix/libutil/hash.hh index 7357a34e1d..ac58651a02 100644 --- a/nix/libutil/hash.hh +++ b/nix/libutil/hash.hh @@ -16,7 +16,10 @@ typedef enum { htMD5 = GCRY_MD_MD5, htSHA1 = GCRY_MD_SHA1, htSHA256 = GCRY_MD_SHA256, - htSHA512 = GCRY_MD_SHA512 + htSHA512 = GCRY_MD_SHA512, + htSHA3_256 = GCRY_MD_SHA3_256, + htSHA3_512 = GCRY_MD_SHA3_512, + htBLAKE2s_256 = GCRY_MD_BLAKE2S_256 } HashType; struct Hash diff --git a/tests/store.scm b/tests/store.scm index 06f7939657..ee3e01f33b 100644 --- a/tests/store.scm +++ b/tests/store.scm @@ -116,7 +116,7 @@ (define %shell (list (stat:uid s) (stat:perms s)))) (test-equal "add-to-store" - '("sha1" "sha256" "sha512") + '("sha1" "sha256" "sha512" "sha3-256" "sha3-512" "blake2s-256") (let* ((file (search-path %load-path "guix.scm")) (content (call-with-input-file file get-bytevector-all))) (map (lambda (hash-algo) @@ -125,7 +125,7 @@ (define %shell (bytevector=? (call-with-input-file file get-bytevector-all) content) hash-algo))) - '("sha1" "sha256" "sha512")))) + '("sha1" "sha256" "sha512" "sha3-256" "sha3-512" "blake2s-256")))) (test-equal "add-data-to-store" #vu8(1 2 3 4 5) -- cgit v1.2.3 From 0505eda9c7cf688757f6f8be8bc3e65ad9f0805e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 23 Jun 2020 16:35:58 +0200 Subject: packages: Recognize SHA3 and BLAKE2s for 'content-hash'. * guix/packages.scm (build-content-hash): Add 'sha3-256', 'sha3-512', and 'blake2s-256'. * tests/packages.scm ("package-source-derivation, origin, sha3-512"): New test. --- guix/packages.scm | 5 ++++- tests/packages.scm | 26 ++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/guix/packages.scm b/guix/packages.scm index 1e0ec41b76..68ef718872 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -191,7 +191,10 @@ (define-syntax name (define-content-hash-constructor build-content-hash (sha256 32) - (sha512 64)) + (sha512 64) + (sha3-256 32) + (sha3-512 64) + (blake2s-256 64)) (define-syntax content-hash (lambda (s) diff --git a/tests/packages.scm b/tests/packages.scm index c7b6f669b5..26377b269b 100644 --- a/tests/packages.scm +++ b/tests/packages.scm @@ -524,6 +524,32 @@ (define read-at (build-derivations %store (list drv)) (call-with-input-file output get-string-all))) +(test-equal "package-source-derivation, origin, sha3-512" + "hello, sha3" + (let* ((bash (search-bootstrap-binary "bash" (%current-system))) + (builder (add-text-to-store %store "my-fixed-builder.sh" + "echo -n hello, sha3 > $out" '())) + (method (lambda* (url hash-algo hash #:optional name + #:rest rest) + (and (eq? hash-algo 'sha3-512) + (raw-derivation name bash (list builder) + #:sources (list builder) + #:hash hash + #:hash-algo hash-algo)))) + (source (origin + (method method) + (uri "unused://") + (file-name "origin-sha3") + (hash (content-hash + (gcrypt:bytevector-hash (string->utf8 "hello, sha3") + (gcrypt:lookup-hash-algorithm + 'sha3-512)) + sha3-512)))) + (drv (package-source-derivation %store source)) + (output (derivation->output-path drv))) + (build-derivations %store (list drv)) + (call-with-input-file output get-string-all))) + (unless (network-reachable?) (test-skip 1)) (test-equal "package-source-derivation, snippet" "OK" -- cgit v1.2.3 From 8a35ffd8ad3d1d10f9f84c92a5dee4da36bd45f0 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Fri, 26 Jun 2020 16:23:10 +0200 Subject: gnu: libtiff: Use HTTPS. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/image.scm (libtiff)[source]: Use HTTPS. Signed-off-by: Ludovic Courtès --- gnu/packages/image.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 393ee7e08b..ea1c178bc1 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -553,7 +553,7 @@ (define-public libtiff (source (origin (method url-fetch) - (uri (string-append "http://download.osgeo.org/libtiff/tiff-" + (uri (string-append "https://download.osgeo.org/libtiff/tiff-" version ".tar.gz")) (sha256 (base32 -- cgit v1.2.3 From 0b7c540032e85fdf69547ca18a4f0294c813c72e Mon Sep 17 00:00:00 2001 From: André Batista Date: Fri, 26 Jun 2020 16:30:50 -0300 Subject: gnu: lxqt: Update to 0.15.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lxqt.scm (libstatgrab): Update to 0.92. (lxqt-build-tools): Update to 0.7.0. (libqtxdg): Update to 3.5.0. (liblxqt): Update to 0.15.1. (libsysstat): Update to 0.4.3. (lxqt-about): Update to 0.15.0. (lxqt-admin): Update to 0.15.0. (lxqt-config): Update to 0.15.0. (lxqt-globalkeys): Update to 0.15.0. (lxqt-notificationd): Update to 0.15.0. (lxqt-openssh-askpass): Update to 0.15.0. (lxqt-panel): Update to 0.15.1. (lxqt-policykit): Update to 0.15.0. (lxqt-powermanagement): Update to 0.15.0. (lxqt-qtplugin): Update to 0.15.1. (lxqt-runner): Update to 0.15.0. (lxqt-session): Update to 0.15.0. (lxqt-sudo): Update to 0.15.0. (lxqt-themes): Update to 0.15.0. (libfm-qt): Update to 0.15.1. (pcmanfm-qt): Update to 0.15.1. (compton-conf): Update to 0.15.0. (lximage-qt): Update to 0.15.0. (obconf-qt): Update to 0.15.0. (pavucontrol-qt): Update to 0.15.0. (qps): Update to 2.1.0. (qps)[inputs]: Add kwindowsystem, liblxqt and libqtxdg. (qtermwidget): Update to 0.15.0. (qterminal): Update to 0.15.0. (screengrab): Update to 2.0.1. (lxqt-archiver): Update to 0.2.0. (lxqt-archiver)[origin]: Use tarball release. (lxqt-connman-applet): Update to 0.15.0. (lxqt-connman-applet)[arguments]: Add new patch phase. Signed-off-by: Ludovic Courtès --- gnu/packages/lxqt.scm | 149 ++++++++++++++++++++++++++------------------------ 1 file changed, 79 insertions(+), 70 deletions(-) diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index f9c757a804..46128d2997 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2019, 2020 Reza Alizadeh Majd ;;; Copyright © 2020 Fakhri Sajadi +;;; Copyright © 2020 André Batista ;;; ;;; This file is part of GNU Guix. ;;; @@ -99,14 +100,14 @@ (define-public libdbusmenu-qt (define-public libstatgrab (package (name "libstatgrab") - (version "0.91") + (version "0.92") (source (origin (method url-fetch) (uri (string-append "https://ftp.i-scream.org/pub/i-scream/libstatgrab/" name "-" version ".tar.gz")) (sha256 - (base32 "1azinx2yzs442ycwq6p15skl3mscmqj7fd5hq7fckhjp92735s83")))) + (base32 "15m1sl990l85ijf8pnc6hdfha6fqyiq74mijrzm3xz4zzxm91wav")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--enable-tests"))) @@ -126,7 +127,7 @@ (define-public libstatgrab (define-public lxqt-build-tools (package (name "lxqt-build-tools") - (version "0.6.0") + (version "0.7.0") (source (origin (method url-fetch) @@ -134,7 +135,7 @@ (define-public lxqt-build-tools "/download/" version "/lxqt-build-tools-" version ".tar.xz")) (sha256 - (base32 "0n0p0mf12n9f7zm2592779rpqrbcamfdz87nnjb8j058bc8g3214")))) + (base32 "147vdkc25mrlr0fy785yzwhm4gwjxa5xl3n3hljz4c97m531kzl5")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; no tests @@ -159,7 +160,7 @@ (define-public lxqt-build-tools (define-public libqtxdg (package (name "libqtxdg") - (version "3.4.0") + (version "3.5.0") (source (origin (method url-fetch) @@ -167,7 +168,7 @@ (define-public libqtxdg "https://github.com/lxqt/libqtxdg/releases/download/" version "/libqtxdg-" version ".tar.xz")) (sha256 - (base32 "0vmn59653dmy79mnbnibhdq9jmh11091zkfx0y0qh58rj2xvpdbv")))) + (base32 "0g2mwipgl8737jhgqymjixvk745svh2rlini3qr92lrg60v9paa1")))) (build-system cmake-build-system) (arguments '(#:configure-flags @@ -197,7 +198,7 @@ (define-public libqtxdg (define-public liblxqt (package (name "liblxqt") - (version "0.14.1") + (version "0.15.1") (source (origin (method url-fetch) @@ -205,7 +206,7 @@ (define-public liblxqt "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "1gb922npf6nw4w3nkvh4czk8xmdzzqkzq3zgl1h303fjaib359qs")))) + (base32 "0mg62gypjpmpjd3lr7rrvzmkkhli1vf5pri47hg76byz84vng4a9")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; no tests @@ -243,14 +244,14 @@ (define-public liblxqt (define-public libsysstat (package (name "libsysstat") - (version "0.4.2") + (version "0.4.3") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "0rz9w49khra9kl91kfnd3wxkldy1fqf6755mvlgbsqxb1yv8597w")))) + (base32 "1s5s7skzy3sh4rlnfy7r0cg3r1scvp35ldd28bhnqjya99m7ip37")))) (build-system cmake-build-system) (arguments '(#:tests? #f)) ; no tests (inputs @@ -269,14 +270,14 @@ (define-public libsysstat (define-public lxqt-about (package (name "lxqt-about") - (version "0.14.1") + (version "0.15.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "01xp5ddcxc9wvl7jm4179hjrirj07mpzm9z50936d1fqx34wfbis")))) + (base32 "0p24z1vykyp8dkhwaxxi4hw5150yv9a2ncc55vbwx4c6bmmibmsh")))) (build-system cmake-build-system) (inputs `(("kwindowsystem" ,kwindowsystem) @@ -312,14 +313,14 @@ (define-public lxqt-about (define-public lxqt-admin (package (name "lxqt-admin") - (version "0.14.1") + (version "0.15.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "0f0skkxqyhpidpd5phliax869v4n2whvglg8rahzia2zhw4ylzry")))) + (base32 "1zal37hyzqimwsymmi3w15n1iq78g53754s8abc9ylkzc236xpfc")))) (build-system cmake-build-system) (inputs `(("kwindowsystem" ,kwindowsystem) @@ -358,14 +359,14 @@ (define-public lxqt-admin (define-public lxqt-config (package (name "lxqt-config") - (version "0.14.1") + (version "0.15.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "16k36knv6d72gg8hp7423l3ic43y3l3zbaf3spqn2a354y30myrg")))) + (base32 "18fagd6ynmx74qw0pjkkg2n3v6s18n6lcsbj7lvfd4lkbcfnzqpb")))) (build-system cmake-build-system) (inputs `(("eudev" ,eudev) @@ -427,7 +428,7 @@ (define-public lxqt-config (define-public lxqt-globalkeys (package (name "lxqt-globalkeys") - (version "0.14.3") + (version "0.15.0") (source (origin (method url-fetch) @@ -435,7 +436,7 @@ (define-public lxqt-globalkeys "releases/download/" version "/" "lxqt-globalkeys-" version ".tar.xz")) (sha256 - (base32 "0mgl05qxvq4pdqvcw34i2cbyy87x605wy3np62mrbbb1kdfjrfg6")))) + (base32 "1wfvpvy32p60j7xibfa30skzxx2187qrsqxm1npabj1y5bva2m6f")))) (build-system cmake-build-system) (inputs `(("kwindowsystem" ,kwindowsystem) @@ -476,14 +477,14 @@ (define-public lxqt-globalkeys (define-public lxqt-notificationd (package (name "lxqt-notificationd") - (version "0.14.1") + (version "0.15.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "1kiag3fcx12qmslln6x6lwvm4f1spymwf71389kdya3vwx7hkmcy")))) + (base32 "01fva6q2vb0aframxgm0jslvb3z0dcwmhz0yr239bskvdwpn885w")))) (build-system cmake-build-system) (inputs `(("kwindowsystem" ,kwindowsystem) @@ -522,14 +523,14 @@ (define-public lxqt-notificationd (define-public lxqt-openssh-askpass (package (name "lxqt-openssh-askpass") - (version "0.14.1") + (version "0.15.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "1fvbgjidpifn420avh8n1gym49vcz6zgayz7xygg1x93s4awy1cs")))) + (base32 "1h8nhj4ig8419kfdqjsig16ayf2byrzgrk698aiym544n5ayjwak")))) (build-system cmake-build-system) (inputs `(("kwindowsystem" ,kwindowsystem) @@ -561,14 +562,14 @@ (define-public lxqt-openssh-askpass (define-public lxqt-panel (package (name "lxqt-panel") - (version "0.14.1") + (version "0.15.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "1r3wx0v3jm7j41h7gxr49izc9xa1afvrzq4wcdm0qbj98qa1rgpq")))) + (base32 "1b40l9p31nz96q38vwgd1zj142xcwqnjwljsird4nnzs2smjn1c6")))) (build-system cmake-build-system) (inputs `(("alsa-lib" ,alsa-lib) @@ -626,14 +627,14 @@ (define-public lxqt-panel (define-public lxqt-policykit (package (name "lxqt-policykit") - (version "0.14.1") + (version "0.15.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "127rqb0nprybkc41lk0yq0r0dk5pbbw22gvrm4pwag71qh8wpk5i")))) + (base32 "0kzc9mxl47bz6mifmk4xi9sxh7jl31d55j7cq8vijqg3w1yb5rp2")))) (build-system cmake-build-system) (inputs `(("kwindowsystem" ,kwindowsystem) @@ -675,14 +676,14 @@ (define-public lxqt-policykit (define-public lxqt-powermanagement (package (name "lxqt-powermanagement") - (version "0.14.1") + (version "0.15.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "06bvgbkbl9p9n8ba5cfsynqgmpb5c8yfnsvp7zqhflj8k9p9msip")))) + (base32 "1kal7w6ngs9yrg309p4wacmabpynsrysmbpfkpphg158z548wwl0")))) (build-system cmake-build-system) (inputs `(("kidletime" ,kidletime) @@ -724,14 +725,14 @@ (define-public lxqt-powermanagement (define-public lxqt-qtplugin (package (name "lxqt-qtplugin") - (version "0.14.0") + (version "0.15.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "18y7xfxwyismcycg70q6r8zrcygz1pdcvg6lqc6ba7azqb9806ds")))) + (base32 "17kmpm3nn07xyxz21f86y3hqi6s0jvqyhsc703zy0463sc58vvys")))) (build-system cmake-build-system) (inputs `(("libdbusmenu-qt" ,libdbusmenu-qt) @@ -762,14 +763,14 @@ (define-public lxqt-qtplugin (define-public lxqt-runner (package (name "lxqt-runner") - (version "0.14.1") + (version "0.15.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "1c687shypivkhjrpzs1jcy5l2i8d7xzm31c4is1xx6x9nbkgm4bm")))) + (base32 "02xxpflhh6a8qpnjhl5mrl07ikzl5x21mf0rj8nmm0v28rpkqjk1")))) (build-system cmake-build-system) (inputs `(("kwindowsystem" ,kwindowsystem) @@ -811,14 +812,14 @@ (define-public lxqt-runner (define-public lxqt-session (package (name "lxqt-session") - (version "0.14.1") + (version "0.15.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "11i2vimv3336dvvxb6y5csdybwjncr7cq3kwlj52vkpisnxslvgy")))) + (base32 "17y6l1l2m2hzxlzvr7wbixnldbr7waky97vj6lx72r81l45wqkz4")))) (build-system cmake-build-system) (inputs `(("eudev" ,eudev) @@ -871,14 +872,14 @@ (define-public lxqt-session (define-public lxqt-sudo (package (name "lxqt-sudo") - (version "0.14.1") + (version "0.15.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "0mbygp2kkppwk7sxvpnwavdwrx88mh7ldcg6xm3zw1ndp29danay")))) + (base32 "1v4gzmld3zqi3y9pdy3hb8lq81jwbgi4ia00lbzccg8cm0m8n55w")))) (build-system cmake-build-system) (inputs `(("kwindowsystem" ,kwindowsystem) @@ -913,14 +914,14 @@ (define-public lxqt-sudo (define-public lxqt-themes (package (name "lxqt-themes") - (version "0.14.0") + (version "0.15.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "0p7svdpp0z44hvgrp2aip6hym0gdhbanyxsz6iz8sjnn28c995ia")))) + (base32 "1dzv60q1dhi666ajh218smkp3ybh5vl2mxyvlbyc9zwvhgx3f0d1")))) (build-system cmake-build-system) (native-inputs `(("lxqt-build-tools" ,lxqt-build-tools))) @@ -951,14 +952,14 @@ (define-public lxqt-themes (define-public libfm-qt (package (name "libfm-qt") - (version "0.14.1") + (version "0.15.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "06p3wqpc574v9f94wkq9hqmbbvb9q8phfpq301z55c5r939f4hrp")))) + (base32 "034kc8i571m31fksprih6iiykxj85j98fmm6nrkmlwql45kr6rvs")))) (build-system cmake-build-system) (arguments '(#:tests? #f)) ; no tests @@ -984,14 +985,14 @@ (define-public libfm-qt (define-public pcmanfm-qt (package (name "pcmanfm-qt") - (version "0.14.1") + (version "0.15.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "0x3c25inlxll965xszx37mnl5gp3smm2h7x04f67z0qlh3vsbrjq")))) + (base32 "1izc60hrc16sv2ig9psr3br9iq8nln6a2ycfspzycgpk8rh0f6jd")))) (build-system cmake-build-system) (inputs `(("libfm-qt" ,libfm-qt) @@ -1023,14 +1024,14 @@ (define-public pcmanfm-qt (define-public compton-conf (package (name "compton-conf") - (version "0.14.1") + (version "0.15.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "11n8k59jd0q2x66cispc9dpk139mp6j99hq1yjccxvh21vhc7mbc")))) + (base32 "1ii1bans7wdafm9rmxvsdqp3ad4cj0pa8kf92plbmbm3nycpf1q9")))) (build-system cmake-build-system) (inputs `(("libconfig" ,libconfig) @@ -1058,14 +1059,14 @@ (define-public compton-conf (define-public lximage-qt (package (name "lximage-qt") - (version "0.14.1") + (version "0.15.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "0iiq55rm4z2jp19q1pbd2whifwvxg052q324vrwp4p7nz0wh04za")))) + (base32 "02iyymb8ywlzvv69lga5a86b7kh4v78zw6qzq5kcnjp1rpj2rjrk")))) (build-system cmake-build-system) (inputs `(("libexif" ,libexif) @@ -1088,14 +1089,14 @@ (define-public lximage-qt (define-public obconf-qt (package (name "obconf-qt") - (version "0.14.1") + (version "0.15.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "1kzb7364150b60qd3wcgnw78b9ia5k3b16kq8w3p1y7pg6pddy8m")))) + (base32 "1vcv2y54hgxcf76cr775632kajmvz3v4x1q3r6p1lzs9s7lmrh6q")))) (build-system cmake-build-system) (inputs `(("imlib2" ,imlib2) @@ -1123,14 +1124,14 @@ (define-public obconf-qt (define-public pavucontrol-qt (package (name "pavucontrol-qt") - (version "0.14.1") + (version "0.15.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "18mw5r8grfrf95vxjbqrr790kl5l59qdqcmlxmwa6rwbfgywj1fq")))) + (base32 "15wknwmb4640r5fm4wiq6xa70qa2djay2806wyvajh11xjmqy566")))) (build-system cmake-build-system) (inputs `(("glib" ,glib) @@ -1153,17 +1154,20 @@ (define-public pavucontrol-qt (define-public qps (package (name "qps") - (version "2.0.0") + (version "2.1.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "0ysnh918n9wz2vgjvyix32kx2j0v4lskjacgcychrpb8sch2dbsi")))) + (base32 "0yym1bpglz8vha28x7k21fxx1vlsq19m3fyhk2cq3pwq3nqijwp7")))) (build-system cmake-build-system) (inputs - `(("libxrender" ,libxrender) + `(("kwindowsystem" ,kwindowsystem) + ("libxrender" ,libxrender) + ("liblxqt" ,liblxqt) + ("libqtxdg" ,libqtxdg) ("qtbase" ,qtbase) ("qtx11extras" ,qtx11extras))) (native-inputs @@ -1180,14 +1184,14 @@ (define-public qps (define-public qtermwidget (package (name "qtermwidget") - (version "0.14.1") + (version "0.15.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "0v1vvi8vf9y8nv8y0gzffaqji53s75ab5jypksih0ndcws8ryww4")))) + (base32 "1vn3bbc99py0ak7z9s6p71n9cacpckz57a1p97iwb0p23g4zgjkf")))) (build-system cmake-build-system) (inputs `(("qtbase" ,qtbase) @@ -1205,14 +1209,14 @@ (define-public qtermwidget (define-public qterminal (package (name "qterminal") - (version "0.14.1") + (version "0.15.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "0cgyaskyqginmm85d11inbi0mmxrsrnvgyx6g4l4l4iqpphfq670")))) + (base32 "0r7xmwjpak47ayj7cj37bwrdlv1mx5nhqpccb5pbn2fh8slp8zsm")))) (build-system cmake-build-system) (inputs `(("qtbase" ,qtbase) @@ -1232,14 +1236,14 @@ (define-public qterminal (define-public screengrab (package (name "screengrab") - (version "1.101") + (version "2.0.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/screengrab/releases/download/" version "/screengrab-" version ".tar.xz")) (sha256 - (base32 "05f81xjlmiykd7iwx5xns5vnynjq4js4x1bk8wd648frrksp44fa")))) + (base32 "14znjw3d3gw02fsmhrjcj86l173m2ypl1x8hhba9ld23icr1gqwf")))) (build-system cmake-build-system) (inputs `(("kwindowsystem" ,kwindowsystem) @@ -1262,16 +1266,14 @@ (define-public screengrab (define-public lxqt-archiver (package (name "lxqt-archiver") - (version "0.0.96") + (version "0.2.0") (source (origin - (method git-fetch) - (uri (git-reference - (url (string-append "https://github.com/lxqt/" name ".git")) - (commit version))) - (file-name (git-file-name name version)) + (method url-fetch) + (uri (string-append "https://github.com/lxqt/" name "/releases/download/" + version "/" name "-" version ".tar.xz")) (sha256 - (base32 "09rw774vxj96wcpxxncz6nr9bmw7l4l0kwylmz1saq6rpa2yvn2i")))) + (base32 "1i725zaah0wv18j5fchg6isbh4b601filx549cq2hkzf2sylh9ff")))) (build-system cmake-build-system) (inputs `(("glib" ,glib) @@ -1295,11 +1297,11 @@ (define-public lxqt-archiver (define-public lxqt-connman-applet ;; since the main developers didn't release any version yet, their ;; latest commit on `master` branch at the moment used for this version. - (let ((commit "3db374eebd8d851f68a50fc5d1ef5fa9478c275e") + (let ((commit "8a6cc14371a2f18f963e6a2996446082bb60f17d") (revision "0")) (package (name "lxqt-connman-applet") - (version (git-version "0.14.1" revision commit)) + (version (git-version "0.15.0" revision commit)) (source (origin (method git-fetch) @@ -1307,7 +1309,7 @@ (define-public lxqt-connman-applet (url (string-append "https://github.com/lxqt/" name ".git")) (commit commit))) (file-name (git-file-name name version)) - (sha256 (base32 "1brkyzjmpa7hiv8p8rvmkcgagchh2zn71ry4pjiplga05as3jc11")))) + (sha256 (base32 "0br4bxfrl8k7lq84aq4grznlk8xzzjgkmd19bf9mwjr0a87gg72v")))) (build-system cmake-build-system) (inputs `(("kwindowsystem" ,kwindowsystem) @@ -1330,7 +1332,14 @@ (define-public lxqt-connman-applet (string-append (assoc-ref outputs "out") "/share/lxqt/translations")) (("\\$\\{LXQT_ETC_XDG_DIR\\}") "etc/xdg")) - #t))))) + #t)) + (add-after 'unpack 'remove-definitions + (lambda _ + (substitute* "CMakeLists.txt" + (("include\\(LXQtCompilerSettings NO_POLICY_SCOPE\\)") + "include(LXQtCompilerSettings NO_POLICY_SCOPE) +remove_definitions(-DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII)")) + #t))))) (home-page "https://github.com/lxqt/lxqt-connman-applet") (synopsis "System-tray applet for connman") (description "This package provides a Qt-based system-tray applet for -- cgit v1.2.3 From 4a498d0012204cf6eb56298e6c07040ed46612c3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 27 Jun 2020 23:48:07 +0200 Subject: gnu: dropbear: Update to 2020.80 [fix for CVE-2018-20685]. * gnu/packages/ssh.scm (dropbear): Update to 2020.80. --- gnu/packages/ssh.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index d42971d4f0..ea42e72de2 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -465,7 +465,7 @@ (define-public et (define-public dropbear (package (name "dropbear") - (version "2019.78") + (version "2020.80") (source (origin (method url-fetch) @@ -473,7 +473,7 @@ (define-public dropbear "https://matt.ucc.asn.au/dropbear/releases/" "dropbear-" version ".tar.bz2")) (sha256 - (base32 "19242qlr40pbqfqd0gg6h8qpj38q6lgv03ja6sahj9vj2abnanaj")))) + (base32 "0jbrbpdzyv11x5rkljdimzq9p6a7da5siw9k405ibnpjj4dr89yr")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ; there is no "make check" or anything similar ;; TODO: Investigate unbundling libtommath and libtomcrypt or at least -- cgit v1.2.3 From fa7871af7706c555de8109ad5ce2ee2f4f990518 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 28 Jun 2020 05:37:50 +0200 Subject: gnu: r-dexseq: Update to 1.34.1. * gnu/packages/bioinformatics.scm (r-dexseq): Update to 1.34.1. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 957c88d0c6..0d55764db3 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6986,14 +6986,14 @@ (define-public r-deseq2 (define-public r-dexseq (package (name "r-dexseq") - (version "1.34.0") + (version "1.34.1") (source (origin (method url-fetch) (uri (bioconductor-uri "DEXSeq" version)) (sha256 (base32 - "1inyxb89hd5bn0sl7a9qbv9d1g40z4v1s9qwxkcsx5c79fl04n1h")))) + "1m03awaw06mfv5gszq23k5apsqqzjqa5rcwp20y4xbpl7bywpsyl")))) (properties `((upstream-name . "DEXSeq"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From e66f81cf63902bd99f5461af13616a9f4e03f450 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 28 Jun 2020 05:37:59 +0200 Subject: gnu: r-biocviews: Update to 1.56.1. * gnu/packages/bioinformatics.scm (r-biocviews): Update to 1.56.1. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 0d55764db3..66c751a97a 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7505,13 +7505,13 @@ (define-public bioruby (define-public r-biocviews (package (name "r-biocviews") - (version "1.56.0") + (version "1.56.1") (source (origin (method url-fetch) (uri (bioconductor-uri "biocViews" version)) (sha256 (base32 - "1h4cmfbff79v9xrh271dp3rv0877ris06lmkvc39kqzj7yjsh7c2")))) + "0zcx8gha3x3jc0ra6ii6wwq2vfsmffrrnilknbq8h5xjrl55m6ci")))) (properties `((upstream-name . "biocViews"))) (build-system r-build-system) -- cgit v1.2.3 From fb4804d03d6162132822bf300510a5c33955fe45 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 28 Jun 2020 05:38:02 +0200 Subject: gnu: r-scater: Update to 1.16.2. * gnu/packages/bioinformatics.scm (r-scater): Update to 1.16.2. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 66c751a97a..30a59640d1 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10986,13 +10986,13 @@ (define-public r-singlecellexperiment (define-public r-scater (package (name "r-scater") - (version "1.16.1") + (version "1.16.2") (source (origin (method url-fetch) (uri (bioconductor-uri "scater" version)) (sha256 (base32 - "0pi4mpc3lvskj5biyhc9cskcnz9q2wjmfrz7xdnx8qqd8vpy84g3")))) + "1pa5wvgjb30rw1vsjwbnn07ss3sc5n8ck5d7khdby4r2s9177s33")))) (build-system r-build-system) (propagated-inputs `(("r-beachmat" ,r-beachmat) -- cgit v1.2.3 From 6b9954f649104946278afac98224b46e3a4f6331 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 28 Jun 2020 05:38:06 +0200 Subject: gnu: r-jsonlite: Update to 1.7.0. * gnu/packages/cran.scm (r-jsonlite): Update to 1.7.0. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c057ae36cd..66bea52fb2 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -822,14 +822,16 @@ (define-public r-httpuv (define-public r-jsonlite (package (name "r-jsonlite") - (version "1.6.1") + (version "1.7.0") (source (origin (method url-fetch) (uri (cran-uri "jsonlite" version)) (sha256 (base32 - "0xrki07wc17bkmhz0h7jay784j1sls2i9bf1mfpj6yl59791v4kl")))) + "1izfrk5yahsz6s69wanfspn72qdffjglbr5305akj72ig9fnladq")))) (build-system r-build-system) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://arxiv.org/abs/1403.2805") (synopsis "Robust, high performance JSON parser and generator for R") (description -- cgit v1.2.3 From 308d91d8860a14ec8f827cb379905e43984cf833 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 28 Jun 2020 05:38:09 +0200 Subject: gnu: r-renv: Update to 0.11.0. * gnu/packages/cran.scm (r-renv): Update to 0.11.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 66bea52fb2..3f213ba906 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6037,14 +6037,14 @@ (define-public r-rappdirs (define-public r-renv (package (name "r-renv") - (version "0.10.0") + (version "0.11.0") (source (origin (method url-fetch) (uri (cran-uri "renv" version)) (sha256 (base32 - "0yy24kq60dh9n68my132xhhkbnbs7q91z55b1yd6ymr7rxj32mif")))) + "0dd63jr240pg95a6p058s5kcclfmscihdy89v212msihmwvylwh3")))) (properties `((upstream-name . "renv"))) (build-system r-build-system) (native-inputs -- cgit v1.2.3 From 0d742a0523221a0cf7058d893082ada5669088fd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 28 Jun 2020 05:38:13 +0200 Subject: gnu: r-ggpubr: Update to 0.4.0. * gnu/packages/cran.scm (r-ggpubr): Update to 0.4.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 3f213ba906..6950af5cf5 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6291,14 +6291,14 @@ (define-public r-rstatix (define-public r-ggpubr (package (name "r-ggpubr") - (version "0.3.0") + (version "0.4.0") (source (origin (method url-fetch) (uri (cran-uri "ggpubr" version)) (sha256 (base32 - "1dly74cnn8iq7vsgmcz0czszdsmg5cgzm4w3s0v30k4psmmzqbxq")))) + "0x86lmghr25k8w90yrp360dn42dhp5cjvjpdiv2s2gxfn701xcmb")))) (build-system r-build-system) (propagated-inputs `(("r-cowplot" ,r-cowplot) -- cgit v1.2.3 From e34f98a4a69ee29fdbd2ed3ced51110b5d94b379 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 28 Jun 2020 05:38:16 +0200 Subject: gnu: r-officer: Update to 0.3.12. * gnu/packages/cran.scm (r-officer): Update to 0.3.12. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 6950af5cf5..6610f4fce6 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6632,14 +6632,14 @@ (define-public r-rdpack (define-public r-officer (package (name "r-officer") - (version "0.3.11") + (version "0.3.12") (source (origin (method url-fetch) (uri (cran-uri "officer" version)) (sha256 (base32 - "0nwasra2kb5wplcim7n57kynwhyg4vsk3fz42mbpm0hig1lzl9pp")))) + "1wk9h6bz77s5j6lgksmlrmi1vyaa35c766gq6hgb1dp0dz0x342x")))) (build-system r-build-system) (propagated-inputs `(("r-magrittr" ,r-magrittr) -- cgit v1.2.3 From bfaf6cf1f9952033e0bd3750e36ba20a6aa34a63 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 28 Jun 2020 05:38:19 +0200 Subject: gnu: r-sjlabelled: Update to 1.1.6. * gnu/packages/cran.scm (r-sjlabelled): Update to 1.1.6. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 6610f4fce6..07ce5a87b1 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6927,14 +6927,14 @@ (define-public r-insight (define-public r-sjlabelled (package (name "r-sjlabelled") - (version "1.1.5") + (version "1.1.6") (source (origin (method url-fetch) (uri (cran-uri "sjlabelled" version)) (sha256 (base32 - "0grskmd7wrw31lkf85z6xz0bv246m6grvqkijvqi4q8zkl6p5vb3")))) + "0xvb0yi7c7wiiqjbnbisyb2cjinm11i373jacfv1yzyc9cznzyzq")))) (build-system r-build-system) (propagated-inputs `(("r-insight" ,r-insight))) -- cgit v1.2.3 From 6c8b60acc98a3d9946cbb383ad9fea2bee758296 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 28 Jun 2020 05:38:22 +0200 Subject: gnu: r-raster: Update to 3.3-7. * gnu/packages/cran.scm (r-raster): Update to 3.3-7. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 07ce5a87b1..94adbcac2f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7758,14 +7758,14 @@ (define-public r-mosaicdata (define-public r-raster (package (name "r-raster") - (version "3.1-5") + (version "3.3-7") (source (origin (method url-fetch) (uri (cran-uri "raster" version)) (sha256 (base32 - "010sq00ijpmwac280ip9rryw0pxk0al8g675v2lc9rdrbgaj4rnv")))) + "144mva2dx7ffkq7z0fixr4z76ci1s4lizlyv5r7v07fd4nzg5hby")))) (build-system r-build-system) (propagated-inputs `(("r-rcpp" ,r-rcpp) -- cgit v1.2.3 From 53fd3d5a8fa431af71fa23ed35416a406abdc187 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 28 Jun 2020 05:38:28 +0200 Subject: gnu: r-emmeans: Update to 1.4.8. * gnu/packages/cran.scm (r-emmeans): Update to 1.4.8. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 94adbcac2f..da5c9776c4 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8770,14 +8770,14 @@ (define-public r-multcomp (define-public r-emmeans (package (name "r-emmeans") - (version "1.4.7") + (version "1.4.8") (source (origin (method url-fetch) (uri (cran-uri "emmeans" version)) (sha256 (base32 - "0jh7l1rzsb2ihbnh4r4388kwm629z17rcapvdws1hnkklhr8j74k")))) + "0h884qn4cip03w0h5psrz5y9zkm2wppklrhdz2chm2xk13zqnq5k")))) (build-system r-build-system) (propagated-inputs `(("r-estimability" ,r-estimability) -- cgit v1.2.3 From 53ba82dda1ea0932b0e9740b831ec6aba0490886 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 28 Jun 2020 05:38:32 +0200 Subject: gnu: r-rcppparallel: Update to 5.0.2. * gnu/packages/cran.scm (r-rcppparallel): Update to 5.0.2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index da5c9776c4..4a39543bf1 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -9774,14 +9774,14 @@ (define-public r-rcpphnsw (define-public r-rcppparallel (package (name "r-rcppparallel") - (version "5.0.1") + (version "5.0.2") (source (origin (method url-fetch) (uri (cran-uri "RcppParallel" version)) (sha256 (base32 - "029yyjnixggqmddazwxh1wqid1h7xpwpi4sgixyhbb4kmvqlwfkd")))) + "10bg4fw38m64dhy543rwq2nnjjc9y24iggk343xslrb3ij8018lc")))) (properties `((upstream-name . "RcppParallel"))) (build-system r-build-system) (home-page "https://rcppcore.github.io/RcppParallel/") -- cgit v1.2.3 From 6bbb287a60d6fead7755e7dc3cc1d073ab5bbb1c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 28 Jun 2020 05:38:34 +0200 Subject: gnu: r-flexdashboard: Update to 0.5.2. * gnu/packages/cran.scm (r-flexdashboard): Update to 0.5.2. [source]: Delete minified JavaScript files in a snippet. --- gnu/packages/cran.scm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 4a39543bf1..6a498a8daa 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15159,17 +15159,28 @@ (define-public r-ggcorrplot function for computing a matrix of correlation p-values.") (license license:gpl2))) +;; This package includes minified JavaScript files. When upgrading please +;; check that there are no new minified JavaScript files. (define-public r-flexdashboard (package (name "r-flexdashboard") - (version "0.5.1.1") + (version "0.5.2") (source (origin (method url-fetch) (uri (cran-uri "flexdashboard" version)) (sha256 (base32 - "0fy3nbrr67zqgd44r2mc850s5sp0hzfcw3zqs15m8kxzj1aw067x")))) + "1bh759llp15fxrx2rwvxd8p3w84vjmkid32ism7zg49a127fjib4")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Delete bundled minified JavaScript files + (delete-file "inst/htmlwidgets/lib/raphael/raphael-2.1.4.min.js") + (delete-file "inst/www/sly/sly.min.js") + (delete-file "inst/www/stickytableheaders/jquery.stickytableheaders.min.js") + (delete-file "inst/www/prism/prism.js") + #t)))) (build-system r-build-system) (arguments `(#:modules ((guix build utils) @@ -15212,7 +15223,6 @@ (define-public r-flexdashboard (for-each (lambda (source target) (format #t "Processing ~a --> ~a~%" source target) - (delete-file target) (let ((minified (open-pipe* OPEN_READ "uglify-js" source))) (call-with-output-file target (lambda (port) -- cgit v1.2.3 From e9f02d72d3abfab47fc76581ace7024c25b02aea Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 28 Jun 2020 05:38:41 +0200 Subject: gnu: r-rgdal: Update to 1.5-12. * gnu/packages/cran.scm (r-rgdal): Update to 1.5-12. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 6a498a8daa..89ee0e04d3 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -16554,13 +16554,13 @@ (define-public r-parameters (define-public r-rgdal (package (name "r-rgdal") - (version "1.5-10") + (version "1.5-12") (source (origin (method url-fetch) (uri (cran-uri "rgdal" version)) (sha256 - (base32 "02z7rhpizzmymiqpi90nm15bjdz0411bqlavlk0lhwxb42ilhif6")))) + (base32 "0jvb5ykp539mi0hqs05w4w8wz45blc4nvkhs70aqmzyx27hadfiq")))) (properties `((upstream-name . "rgdal"))) (build-system r-build-system) (inputs -- cgit v1.2.3 From f8c999152e53b7e0fa2e0364cfc45c6b1a62cc6e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 28 Jun 2020 05:38:45 +0200 Subject: gnu: r-directlabels: Update to 2020.6.17. * gnu/packages/cran.scm (r-directlabels): Update to 2020.6.17. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 89ee0e04d3..70af2d30f0 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -22204,17 +22204,19 @@ (define-public r-boruta (define-public r-directlabels (package (name "r-directlabels") - (version "2020.1.31") + (version "2020.6.17") (source (origin (method url-fetch) (uri (cran-uri "directlabels" version)) (sha256 (base32 - "08s1gnwp4bn8xahwjaq0f1qzhwh2dvybzhq3z7xyzn8cnyzmis6c")))) + "1b6v206kizz5rjw03chjvn40a7cqihjpk80h1h79z2x27hp1qi3f")))) (build-system r-build-system) (propagated-inputs `(("r-quadprog" ,r-quadprog))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "http://directlabels.r-forge.r-project.org/") (synopsis "Direct labels for multicolor plots") (description -- cgit v1.2.3 From e07fc640cf82c0b84c553235d46692e62f140d35 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 28 Jun 2020 05:38:49 +0200 Subject: gnu: r-roxygen2: Update to 7.1.1. * gnu/packages/statistics.scm (r-roxygen2): Update to 7.1.1. [native-inputs]: Add r-knitr. --- gnu/packages/statistics.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index dfd26abd5a..a166d198ae 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2282,13 +2282,13 @@ (define-public r-commonmark (define-public r-roxygen2 (package (name "r-roxygen2") - (version "7.1.0") + (version "7.1.1") (source (origin (method url-fetch) (uri (cran-uri "roxygen2" version)) (sha256 (base32 - "00s1wzx5960k8pzgpz4kikjf4k061hyhnd278y65q6n0wzv3d6vy")))) + "0qc8akwfwmaqsjaza87f5fi0zk6sh3l6j3assbs6chvx0gnmvidx")))) (build-system r-build-system) (propagated-inputs `(("r-brew" ,r-brew) @@ -2304,6 +2304,8 @@ (define-public r-roxygen2 ("r-stringi" ,r-stringi) ("r-stringr" ,r-stringr) ("r-xml2" ,r-xml2))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/klutometis/roxygen") (synopsis "In-source documentation system for R") (description -- cgit v1.2.3 From ef20f8305c398105b6744fd8b1c72f89a6e4dbb9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 28 Jun 2020 05:38:54 +0200 Subject: gnu: r-openssl: Update to 1.4.2. * gnu/packages/statistics.scm (r-openssl): Update to 1.4.2. [native-inputs]: Add r-knitr. --- gnu/packages/statistics.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index a166d198ae..bb9ad27b02 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2316,19 +2316,20 @@ (define-public r-roxygen2 (define-public r-openssl (package (name "r-openssl") - (version "1.4.1") + (version "1.4.2") (source (origin (method url-fetch) (uri (cran-uri "openssl" version)) (sha256 (base32 - "1ihz2qi33lhngl19xdanq0pbmfaacy63794mg8ll7z2lab3yryzp")))) + "17fkc6pr8w5z3rpadg692a689p1v4j7xl5ak0y64is7c74cxgljx")))) (build-system r-build-system) (inputs `(("libressl" ,libressl))) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config) + ("r-knitr" ,r-knitr))) (propagated-inputs `(("r-askpass" ,r-askpass))) (home-page "https://github.com/jeroenooms/openssl") -- cgit v1.2.3 From ea33de6d704f30b3c827877173c513f6fce22f1e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 28 Jun 2020 05:38:57 +0200 Subject: gnu: r-fpc: Update to 2.2-7. * gnu/packages/statistics.scm (r-fpc): Update to 2.2-7. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index bb9ad27b02..dfc3d810c0 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4921,14 +4921,14 @@ (define-public r-trimcluster (define-public r-fpc (package (name "r-fpc") - (version "2.2-6") + (version "2.2-7") (source (origin (method url-fetch) (uri (cran-uri "fpc" version)) (sha256 (base32 - "0lpn951gy58039gk2wh8nsw6qss8m3flkawv55yq3l6373ly79if")))) + "1xnp3j36hggfg675v39mnr6rgvp7i11pfng7nmyy3k2ldgklz0j9")))) (build-system r-build-system) (propagated-inputs `(("r-class" ,r-class) -- cgit v1.2.3 From 1e7acfb8ab7fa7c8e8c510a5f0dd64d9618cde02 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Sat, 27 Jun 2020 23:01:39 -0500 Subject: gnu: emacs-idris-mode: Update to 1.0. * gnu/packages/emacs-xyz.scm (emacs-idris-mode): Update to 1.0. [description]: Mention compatibility with Idris 1. --- gnu/packages/emacs-xyz.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 8b00ebe0f6..d62f120e84 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -75,6 +75,7 @@ ;;; Copyright © 2020 Marcin Karpezo ;;; Copyright © 2020 Fredrik Salomonsson ;;; Copyright © 2020 Ryan Desfosses +;;; Copyright © 2020 Eric Bavier ;;; ;;; This file is part of GNU Guix. ;;; @@ -11709,11 +11710,11 @@ (define-public emacs-prop-menu (license license:gpl3+))) (define-public emacs-idris-mode - (let ((commit "acc8835449475d7cd205aba213fdd3d41c38ba40") + (let ((commit "b77eadd8ac2048d5c882b4464bd9673e45dd6a59") (revision "0")) (package (name "emacs-idris-mode") - (version (git-version "0.9.19" revision commit)) + (version (git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -11723,7 +11724,7 @@ (define-public emacs-idris-mode (file-name (git-file-name name commit)) (sha256 (base32 - "0n9xbknc68id0mf8hbfmawi8qpvrs47ix807sk9ffv2g3ik32kk6")))) + "1v8av6jza1j00ln75zjwaca0vmmv0fhhhi94p84rlfzgzykyb9g1")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-prop-menu" ,emacs-prop-menu))) @@ -11731,9 +11732,8 @@ (define-public emacs-idris-mode "https://github.com/idris-hackers/idris-mode") (synopsis "Major mode for editing Idris code") (description - "This is an Emacs mode for editing Idris code. It requires the latest -version of Idris, and some features may rely on the latest Git version of -Idris.") + "This is an Emacs mode for editing Idris code. It is compatible with +the latest versions of Idris 1.") (license license:gpl3+)))) (define-public emacs-browse-at-remote -- cgit v1.2.3 From 8e0767b985a4370e1c94f49e050e17a55a19e654 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 26 Jun 2020 19:22:46 +0300 Subject: gnu: Add rust-md5-asm-0.4. * gnu/packages/crates-io.scm (rust-md5-asm-0.4): New variable. --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index bc29df5871..fe48836f78 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -12498,6 +12498,30 @@ (define-public rust-md5-0.3 (base32 "0j2s8aqdkhwhy7awga2bmv5n8qq8bgy8672iha9f3y871dm6vibr")))))) +(define-public rust-md5-asm-0.4 + (package + (name "rust-md5-asm") + (version "0.4.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "md5-asm" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0gpk5647js1k084jc7pg2gji0cvl6hjkkbfia6lnpk8y4shyairv")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-cc" ,rust-cc-1.0)))) + (home-page "https://github.com/RustCrypto/asm-hashes") + (synopsis "Assembly implementation of MD5 compression function") + (description "This package contains an assembly implementation of MD5 +compression function.") + (supported-systems '("x86_64-linux" "i686-linux")) + (license license:expat))) + (define-public rust-memchr-2.3 (package (name "rust-memchr") -- cgit v1.2.3 From 096a712e429fa803db15801a1a58550a5240c8ee Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 26 Jun 2020 19:27:57 +0300 Subject: gnu: Add rust-md-5-0.8. * gnu/packages/crates-io.scm (rust-md-5-0.8): New variable. --- gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index fe48836f78..8ba1413da9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -12464,6 +12464,34 @@ (define-public rust-maybe-uninit-2.0 "This package provides MaybeUninit for friends of backwards compatibility.") (license (list license:asl2.0 license:expat)))) +(define-public rust-md-5-0.8 + (package + (name "rust-md-5") + (version "0.8.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "md-5" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1j5rfxy2p76xf5f1lgaw85xla0b1bbv2lknvdhv1j0ibmzfg72m1")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-block-buffer" ,rust-block-buffer-0.7) + ("rust-digest" ,rust-digest-0.8) + ("rust-md5-asm" ,rust-md5-asm-0.4) + ("rust-opaque-debug" ,rust-opaque-debug-0.2)) + #:cargo-development-inputs + (("rust-digest" ,rust-digest-0.8) + ("rust-hex-literal" ,rust-hex-literal-0.1)))) + (home-page "https://github.com/RustCrypto/hashes") + (synopsis "MD5 hash function") + (description "MD5 hash function.") + (license (list license:expat license:asl2.0)))) + (define-public rust-md5-0.6 (package (name "rust-md5") -- cgit v1.2.3 From a8b83c6c4470b4c4d3eb8d88b8d2b1b3cba3d6da Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 28 Jun 2020 08:43:24 +0300 Subject: gnu: Add rust-hmac-0.7. * gnu/packages/crates-io.scm (rust-hmac-0.7): New variable. --- gnu/packages/crates-io.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 8ba1413da9..bfc00cf62a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9801,6 +9801,35 @@ (define-public rust-hex-literal-impl-0.1 `(#:cargo-inputs (("rust-proc-macro-hack" ,rust-proc-macro-hack-0.4)))))) +(define-public rust-hmac-0.7 + (package + (name "rust-hmac") + (version "0.7.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "hmac" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "15cnwpssp2n1kdm9x7abir67f2hp3q6rdfj1mcck3hm4rmj5xjsx")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-crypto-mac" ,rust-crypto-mac-0.7) + ("rust-digest" ,rust-digest-0.8)) + #:cargo-development-inputs + (("rust-crypto-mac" ,rust-crypto-mac-0.7) + ("rust-md-5" ,rust-md-5-0.8) + ("rust-sha2" ,rust-sha2-0.8)))) + (home-page "https://github.com/RustCrypto/MACs") + (synopsis "Generic implementation of Hash-based Message Authentication Code") + (description + "This package provides a generic implementation of @acronym{HMAC, +Hash-based Message Authentication Code}.") + (license (list license:expat license:asl2.0)))) + (define-public rust-hostname-0.1 (package (name "rust-hostname") -- cgit v1.2.3 From add00a76863cbef1c42b688f2332488a0b3fef12 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 26 Jun 2020 19:28:52 +0300 Subject: gnu: Add rust-pbkdf2-0.3. * gnu/packages/crates-io.scm (rust-pbkdf2-0.3): New variable. --- gnu/packages/crates-io.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index bfc00cf62a..aacbacc38a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -15619,6 +15619,41 @@ (define-public rust-paste-impl-0.1 "Implementation detail of the paste crate.") (license (list license:asl2.0 license:expat)))) +(define-public rust-pbkdf2-0.3 + (package + (name "rust-pbkdf2") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "pbkdf2" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1na2fmmfcmksz4xk7m0ihl778501c1krx88dcylrand48f506v00")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-base64" ,rust-base64-0.9) + ("rust-byteorder" ,rust-byteorder-1.3) + ("rust-crypto-mac" ,rust-crypto-mac-0.7) + ("rust-hmac" ,rust-hmac-0.7) + ("rust-rand" ,rust-rand-0.5) + ("rust-rayon" ,rust-rayon-1) + ("rust-sha2" ,rust-sha2-0.8) + ("rust-subtle" ,rust-subtle-1.0)) + #:cargo-development-inputs + (("rust-hmac" ,rust-hmac-0.7) + ("rust-sha-1" ,rust-sha-1-0.8) + ("rust-sha2" ,rust-sha2-0.8)))) + (home-page "https://github.com/RustCrypto/password-hashes") + (synopsis "Generic implementation of PBKDF2") + (description "This package contains a collection of password hashing +algorithms, otherwise known as password-based key derivation functions, written +in pure Rust.") + (license (list license:expat license:asl2.0)))) + (define-public rust-pcre2-0.2 (package (name "rust-pcre2") -- cgit v1.2.3 From 1ab5e5b9a1aa4a8d11abe73b2480d9a854b7ba8d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 26 Jun 2020 19:29:58 +0300 Subject: gnu: Add rust-scrypt-0.2. * gnu/packages/crates-io.scm (rust-scrypt-0.2): New variable. --- gnu/packages/crates-io.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index aacbacc38a..ad50f42bce 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -20227,6 +20227,36 @@ (define-public rust-scopeguard-0.3 (base32 "09sy9wbqp409pkwmqni40qmwa99ldqpl48pp95m1xw8sc19qy9cl")))))) +(define-public rust-scrypt-0.2 + (package + (name "rust-scrypt") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "scrypt" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1pfgqgzdjxjf7c8r1wfka0ackfpv1g8w7wvbr25b42hdx787jv35")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-base64" ,rust-base64-0.9) + ("rust-byte-tools" ,rust-byte-tools-0.3) + ("rust-byteorder" ,rust-byteorder-1.3) + ("rust-hmac" ,rust-hmac-0.7) + ("rust-pbkdf2" ,rust-pbkdf2-0.3) + ("rust-rand" ,rust-rand-0.5) + ("rust-sha2" ,rust-sha2-0.8) + ("rust-subtle" ,rust-subtle-1.0)))) + (home-page "https://github.com/RustCrypto/password-hashes") + (synopsis "Scrypt password-based key derivation function") + (description + "Scrypt password-based key derivation function.") + (license (list license:expat license:asl2.0)))) + (define-public rust-scroll-0.10 (package (name "rust-scroll") -- cgit v1.2.3 From 54bb476670521e4af22541863cd8a308776593a6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 28 Jun 2020 10:15:21 +0300 Subject: gnu: r-qtl2: Update to 0.22-8. * gnu/packages/bioinformatics.scm (r-qtl2): Update to 0.22-8. [source]: Download from cran. --- gnu/packages/bioinformatics.scm | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 30a59640d1..4b582a4809 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8532,16 +8532,12 @@ (define-public r-qtl (define-public r-qtl2 (package (name "r-qtl2") - (version "0.20") + (version "0.22-8") (source (origin - (method git-fetch) - ;; Not yet available in cran. - (uri (git-reference - (url "https://github.com/rqtl/qtl2.git") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0l1asr28q25jzbwrbg5490962sg3y4sjrd0qf09p78ws1aq8vfs0")))) + (method url-fetch) + (uri (cran-uri "qtl2" version)) + (sha256 + (base32 "07w74s7lyyrfa1l6q6v8sxnfaqwxb4w1x4wawcngf0hr1rwx9lda")))) (build-system r-build-system) (propagated-inputs `(("r-data-table" ,r-data-table) -- cgit v1.2.3 From 5e5bcba29576698fe50bcf9cc8e4de2576583d2d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 28 Jun 2020 10:18:47 +0300 Subject: gnu: r-qtl2: Update synopsis, description. * gnu/packages/bioinformatics.scm (r-qtl2)[synopsis]: Use upstream's synopsis. [description]: Same. --- gnu/packages/bioinformatics.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 4b582a4809..05397e843a 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8547,11 +8547,12 @@ (define-public r-qtl2 ("r-rsqlite" ,r-rsqlite) ("r-yaml" ,r-yaml))) (home-page "https://kbroman.org/qtl2/") - (synopsis - "QTL analysis software for high-dimensional data and complex cross designs") + (synopsis "Quantitative Trait Locus Mapping in Experimental Crosses") (description - "R/qtl2 (aka qtl2) is a reimplementation of the QTL analysis software -R/qtl, to better handle high-dimensional data and complex cross designs.") + "This package provides a set of tools to perform @dfn{Quantitative Trait +Locus} (QTL) analysis in experimental crosses. It is a reimplementation of the +@code{R/qtl} package to better handle high-dimensional data and complex cross +designs. Broman et al. (2018) .") (license license:gpl3))) (define-public r-zlibbioc -- cgit v1.2.3 From 4cd2dfd9f4d06c5f21cd40ac2e6b2896fe3cf78c Mon Sep 17 00:00:00 2001 From: Simon South Date: Sat, 27 Jun 2020 16:11:15 -0400 Subject: gnu: emacs-nov-el: Use version tag instead of commit. * gnu/packages/emacs-xyz.scm (emacs-nov-el): Remove let binding and associated comment; correct indentation. [source]: Use version tag as commit identifier now that upstream has restored this information. Signed-off-by: Efraim Flashner --- gnu/packages/emacs-xyz.scm | 65 ++++++++++++++++++++++------------------------ 1 file changed, 31 insertions(+), 34 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index d62f120e84..ea94120a0a 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12550,39 +12550,36 @@ (define-public emacs-esxml (license license:gpl3+))) (define-public emacs-nov-el - ;; Upstream does not tag releases. Specify raw commit hash matching the - ;; release. - (let ((commit "ea0c835c1b5e6e70293f4bd64e9c89bdc42f8596")) - (package - (name "emacs-nov-el") - (version "0.3.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://depp.brause.cc/nov.el.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "04phmm14ywgicjsl2bsg6w9rapd71vdkxdp5wp0brj6px27y85jz")))) - (build-system emacs-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'embed-path-to-unzip - (lambda _ - (substitute* "nov.el" - (("\\(executable-find \"unzip\"\\)") - (string-append "\"" (which "unzip") "\""))) - #t))))) - (propagated-inputs - `(("emacs-dash" ,emacs-dash) - ("emacs-esxml" ,emacs-esxml))) - (inputs - `(("unzip" ,unzip))) - (home-page "https://depp.brause.cc/nov.el/") - (synopsis "Major mode for reading EPUBs in Emacs") - (description "@code{nov.el} provides a major mode for reading EPUB + (package + (name "emacs-nov-el") + (version "0.3.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://depp.brause.cc/nov.el.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "04phmm14ywgicjsl2bsg6w9rapd71vdkxdp5wp0brj6px27y85jz")))) + (build-system emacs-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'embed-path-to-unzip + (lambda _ + (substitute* "nov.el" + (("\\(executable-find \"unzip\"\\)") + (string-append "\"" (which "unzip") "\""))) + #t))))) + (propagated-inputs + `(("emacs-dash" ,emacs-dash) + ("emacs-esxml" ,emacs-esxml))) + (inputs + `(("unzip" ,unzip))) + (home-page "https://depp.brause.cc/nov.el/") + (synopsis "Major mode for reading EPUBs in Emacs") + (description "@code{nov.el} provides a major mode for reading EPUB documents. Features: @@ -12599,7 +12596,7 @@ (define-public emacs-nov-el @item Image rescaling @end itemize ") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public epipe (package -- cgit v1.2.3 From 0dfc4612724f26c67ca0796b3e9ae5a4fca1c2a1 Mon Sep 17 00:00:00 2001 From: Simon South Date: Sat, 27 Jun 2020 16:11:16 -0400 Subject: gnu: emacs-nov-el: Update to 0.3.1. * gnu/packages/emacs-xyz.scm (emacs-nov-el): Update to 0.3.1. Signed-off-by: Efraim Flashner --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index ea94120a0a..463cdabdd3 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12552,7 +12552,7 @@ (define-public emacs-esxml (define-public emacs-nov-el (package (name "emacs-nov-el") - (version "0.3.0") + (version "0.3.1") (source (origin (method git-fetch) @@ -12561,7 +12561,7 @@ (define-public emacs-nov-el (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "04phmm14ywgicjsl2bsg6w9rapd71vdkxdp5wp0brj6px27y85jz")))) + (base32 "13r7lvyyyv62m57m4s4xjs4qz2ckhqk6ib514px7qzc7mdzcz9i9")))) (build-system emacs-build-system) (arguments `(#:phases -- cgit v1.2.3 From 8f19e63f760fe02f9969225da2f3f3c36801218f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 21 Jun 2020 16:20:16 +0300 Subject: services: Add rshiny service. * gnu/services/science.scm: New file. (): New record. (rshiny-shepherd-service-type): New variable. * doc/guix.texi (Miscellaneous Services): Document it. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. --- doc/guix.texi | 49 +++++++++++++++++++++++++++++++++++++++++ gnu/local.mk | 1 + gnu/services/science.scm | 57 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 107 insertions(+) create mode 100644 gnu/services/science.scm diff --git a/doc/guix.texi b/doc/guix.texi index de34939248..ffc77cbb8b 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -26612,6 +26612,55 @@ setuid-root (@pxref{Setuid Programs}) such that unprivileged users can invoke @command{singularity run} and similar commands. @end defvr +@cindex rshiny +@subsubheading R-Shiny service + +The @code{(gnu services science)} module provides the following service. + +@defvr {Scheme Variable} rshiny-service-type + +This is a type of service which is used to run a webapp created with +@code{r-shiny}. This service sets the @code{R_LIBS_USER} environment +variable and runs the provided script to call @code{runApp}. + +@deftp {Data Type} rshiny-configuration +This is the data type representing the configuration of rshiny. + +@table @asis + +@item @code{package} (default: @code{r-shiny}) +The package to use. + +@item @code{binary} (defaunlt @code{"rshiny"}) +The name of the binary or shell script located at @code{package/bin/} to +run when the service is run. + +The common way to create this file is as follows: + +@lisp +@dots{} +(let* ((out (assoc-ref %outputs "out")) + (targetdir (string-append out "/share/" ,name)) + (app (string-append out "/bin/" ,name)) + (Rbin (string-append (assoc-ref %build-inputs "r-min") + "/bin/Rscript"))) +@dots{} + (mkdir-p (string-append out "/bin")) + (call-with-output-file app + (lambda (port) + (format port +"#!~a +library(shiny) +setwd(\"~a\") +runApp(launch.browser=0, port=4202)~%\n" + Rbin targetdir))) +@dots{} +@end lisp + +@end table +@end deftp +@end defvr + @cindex Nix @subsubheading Nix service diff --git a/gnu/local.mk b/gnu/local.mk index fb157c0ab1..8bb56010c2 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -599,6 +599,7 @@ GNU_SYSTEM_MODULES = \ %D%/services/nix.scm \ %D%/services/nfs.scm \ %D%/services/pam-mount.scm \ + %D%/services/science.scm \ %D%/services/security-token.scm \ %D%/services/shepherd.scm \ %D%/services/sound.scm \ diff --git a/gnu/services/science.scm b/gnu/services/science.scm new file mode 100644 index 0000000000..94ff0f36f2 --- /dev/null +++ b/gnu/services/science.scm @@ -0,0 +1,57 @@ +(define-module (gnu services science) + #:export ( + rshiny-configuration + rshiny-configuration? + rshiny-configuration-package + rshiny-configuration-binary + rshiny-shepherd-service + rshiny-service-type)) + +(use-modules (gnu) + (guix records) + (ice-9 match)) +(use-service-modules shepherd) +(use-package-modules cran) + +(define-record-type* + rshiny-configuration + make-rshiny-configuration + rshiny-configuration? + (package rshiny-configuration-package ; package + (default r-shiny)) + (binary rshiny-configuration-binary ; string + (default "rshiny"))) + +(define rshiny-shepherd-service + (match-lambda + (($ package binary) + (list + (shepherd-service + (documentation (string-append "R-Shiny service for " binary)) + (provision (list (symbol-append 'rshiny- (string->symbol + (string-take binary 9))))) + (requirement '(networking)) + (start + #~(exec-command + (list + #$(string-append "/run/current-system/profile/bin/" binary)) + ;#:log-file #$(string-append "/var/log/" binary ".log") ; kills shepherd + #:environment-variables + (list "R_LIBS_USER=/run/current-system/profile/site-library/"))) + (stop #~(make-kill-destructor))))))) + +(define rshiny-service-type + (service-type + (name 'rshiny) + (extensions + (list + (service-extension shepherd-root-service-type + rshiny-shepherd-service) + (service-extension profile-service-type + ;; We want the package installed so that it + ;; pulls in the propagated inputs as well. + (lambda (config) + (list + (rshiny-configuration-package config)))))) + (description + "Run an R-Shiny webapp as a Guix Service."))) -- cgit v1.2.3 From f8945734a5abff69644284231cc47fb67456657b Mon Sep 17 00:00:00 2001 From: André Batista Date: Thu, 18 Jun 2020 10:23:23 -0300 Subject: doc: cookbook: Update entry about getting substitutes through Tor. * doc/guix-cookbook.texi (Getting substitutes from Tor): Update section warning to mention the use of torsocks when pulling. --- doc/guix-cookbook.texi | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/doc/guix-cookbook.texi b/doc/guix-cookbook.texi index ec6217c69c..1669cb8666 100644 --- a/doc/guix-cookbook.texi +++ b/doc/guix-cookbook.texi @@ -15,6 +15,7 @@ Copyright @copyright{} 2020 Oleg Pykhalov@* Copyright @copyright{} 2020 Matthew Brooks@* Copyright @copyright{} 2020 Marcin Karpezo@* Copyright @copyright{} 2020 Brice Waegeneire@* +Copyright @copyright{} 2020 Andr Batista@* Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or @@ -1819,10 +1820,16 @@ HTTP/HTTPS will get proxied; FTP, Git protocol, SSH, etc connections will still go through the clearnet. Again, this configuration isn't foolproof some of your traffic won't get routed by Tor at all. Use it at your own risk. + +Also note that the procedure described here applies only to package +substitution. When you update your guix distribution with +@command{guix pull}, you still need to use @command{torsocks} if +you want to route the connection to guix's git repository servers +through Tor. @end quotation Guix's substitute server is available as a Onion service, if you want -to use it to get your substitutes from Tor configure your system as +to use it to get your substitutes through Tor configure your system as follow: @lisp -- cgit v1.2.3 From e39b2363f5b92b9c8dfc0da7d8fbaedb1c172b46 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Fri, 26 Jun 2020 13:54:32 +0200 Subject: doc: Add progress display in 'dd' command lines. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * doc/guix.texi (System Installation): Adjust 'dd' command line to display progress … (System Configuration): … same here. --- doc/guix.texi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index ffc77cbb8b..a4c409ea12 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -1978,7 +1978,7 @@ its device name. Assuming that the USB stick is known as @file{/dev/sdX}, copy the image with: @example -dd if=guix-system-install-@value{VERSION}.x86_64-linux.iso of=/dev/sdX +dd if=guix-system-install-@value{VERSION}.x86_64-linux.iso of=/dev/sdX status=progress sync @end example @@ -27665,7 +27665,7 @@ the device corresponding to a USB stick, one can copy the image to it using the following command: @example -# dd if=$(guix system disk-image my-os.scm) of=/dev/sdc +# dd if=$(guix system disk-image my-os.scm) of=/dev/sdc status=progress @end example When using @code{docker-image}, a Docker image is produced. Guix builds -- cgit v1.2.3 From b9edefbc46da76fea6d56e08462618a398192189 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Fri, 26 Jun 2020 11:48:35 +0200 Subject: .gitignore: Ignore 'etc/committer.scm'. * .gitignore: Add '/etc/committer.scm'. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 05a68b69ff..f420d4228e 100644 --- a/.gitignore +++ b/.gitignore @@ -66,6 +66,7 @@ /doc/stamp-vti /doc/version.texi /doc/version-*.texi +/etc/committer.scm /etc/gnu-store.mount /etc/guix-daemon.cil /etc/guix-daemon.conf -- cgit v1.2.3 From 94b03f82c887ec3751782fbea0f325b1ddcecfe0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 28 Jun 2020 14:09:35 +0300 Subject: gnu: Add rust-opaque-debug-0.3. * gnu/packages/crates-io.scm (rust-opaque-debug-0.3): New variable. (rust-opaque-debug-0.2): Inherit from rust-opaque-debug-0.3. --- gnu/packages/crates-io.scm | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ad50f42bce..30dda3bf06 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14627,8 +14627,29 @@ (define-public rust-oorandom-11.1 "This package provides a tiny, robust PRNG implementation.") (license license:expat))) +(define-public rust-opaque-debug-0.3 + (package + (name "rust-opaque-debug") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "opaque-debug" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1m8kzi4nd6shdqimn0mgb24f0hxslhnqd1whakyq06wcqd086jk2")))) + (build-system cargo-build-system) + (home-page "https://github.com/RustCrypto/utils") + (synopsis "Macro for opaque debug trait implementation") + (description + "This package provides a macro for opaque debug trait implementation.") + (license (list license:expat license:asl2.0)))) + (define-public rust-opaque-debug-0.2 (package + (inherit rust-opaque-debug-0.3) (name "rust-opaque-debug") (version "0.2.2") (source @@ -14639,13 +14660,7 @@ (define-public rust-opaque-debug-0.2 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "02942l2gc7w5r4js7i9063x99szic5mzzk1055j83v4diqpbpxck")))) - (build-system cargo-build-system) - (home-page "https://github.com/RustCrypto/utils") - (synopsis "Macro for opaque Debug trait implementation") - (description - "Macro for opaque Debug trait implementation.") - (license (list license:asl2.0 license:expat)))) + "02942l2gc7w5r4js7i9063x99szic5mzzk1055j83v4diqpbpxck")))))) (define-public rust-openssl-0.10 (package -- cgit v1.2.3 From dd27c276a2e783efed7c79d685098268330fb4ca Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 28 Jun 2020 14:11:18 +0300 Subject: gnu: Add rust-cpuid-bool-0.1. * gnu/packages/crates-io.scm (rust-cpuid-bool-0.1): New variable. --- gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 30dda3bf06..98050abe23 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3848,6 +3848,27 @@ (define-public rust-cpp-demangle-0.2 "This package provides a crate for demangling C++ symbols.") (license (list license:expat license:asl2.0)))) +(define-public rust-cpuid-bool-0.1 + (package + (name "rust-cpuid-bool") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "cpuid-bool" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1r3v22cxly1shvw8qi0153708kggdqvh8jp0g82wbxi06d1mqdvd")))) + (build-system cargo-build-system) + (home-page "https://github.com/RustCrypto/utils") + (synopsis "Lightweight alternative to is_x86_feature_detected") + (description + "This package provides a lightweight @code{no-std} compatible alternative +to @code{is_x86_feature_detected}.") + (license (list license:expat license:asl2.0)))) + (define-public rust-crates-index-0.13 (package (name "rust-crates-index") -- cgit v1.2.3 From e49c34b41852301e2e98a35bc319950d9560355c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 28 Jun 2020 14:13:43 +0300 Subject: gnu: Add rust-block-padding-0.2. * gnu/packages/crates-io.scm (rust-block-padding-0.2): New variable. (rust-block-padding-0.1): Inherit from rust-block-padding-0.2. --- gnu/packages/crates-io.scm | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 98050abe23..bf6785d4be 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1856,8 +1856,29 @@ (define-public rust-block-buffer-0.7 "Fixed size buffer for block processing of data.") (license (list license:asl2.0 license:expat)))) +(define-public rust-block-padding-0.2 + (package + (name "rust-block-padding") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "block-padding" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0x6b2dgink7rc3755r8jl4kmndydy5563h3wz7z9jqrb25ygv2y9")))) + (build-system cargo-build-system) + (home-page "https://github.com/RustCrypto/utils") + (synopsis "Padding and unpadding of messages divided into blocks") + (description + "Padding and unpadding of messages divided into blocks.") + (license (list license:expat license:asl2.0)))) + (define-public rust-block-padding-0.1 (package + (inherit rust-block-padding-0.2) (name "rust-block-padding") (version "0.1.4") (source @@ -1869,16 +1890,10 @@ (define-public rust-block-padding-0.1 (sha256 (base32 "02fz9wx5dmgpc79ndrb9xfxqlrkk7lg5wki2blz2zqg27spw6kbd")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-byte-tools" ,rust-byte-tools-0.3)))) - (home-page "https://github.com/RustCrypto/utils") - (synopsis "Padding and unpadding of messages divided into blocks") - (description - "Padding and unpadding of messages divided into blocks.") - (license (list license:asl1.1 license:expat)))) + (("rust-byte-tools" ,rust-byte-tools-0.3)))))) (define-public rust-bresenham-0.1 (package -- cgit v1.2.3 From 16f9571234f8d0638239f633464e46eb5fbc08e7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 28 Jun 2020 14:14:18 +0300 Subject: gnu: rust-block-padding-0.1: Don't skip build. * gnu/packages/crates-io.scm (rust-block-padding-0.1)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index bf6785d4be..2eb3872644 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1891,8 +1891,7 @@ (define-public rust-block-padding-0.1 (base32 "02fz9wx5dmgpc79ndrb9xfxqlrkk7lg5wki2blz2zqg27spw6kbd")))) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-byte-tools" ,rust-byte-tools-0.3)))))) (define-public rust-bresenham-0.1 -- cgit v1.2.3 From 61521e1a7a1ee403f69130ef54ca00fb37173859 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 28 Jun 2020 14:16:19 +0300 Subject: gnu: Add rust-subtle-2. * gnu/packages/crates-io.scm (rust-subtle-2): New variable. (rust-subtle-1.0): Inherit from rust-subtle-2. --- gnu/packages/crates-io.scm | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2eb3872644..56b38c7452 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -22749,8 +22749,31 @@ (define-public rust-structopt-derive-0.2 "Parse command line argument by defining a struct, derive crate.") (license (list license:asl2.0 license:expat)))) +(define-public rust-subtle-2 + (package + (name "rust-subtle") + (version "2.2.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "subtle" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1h9jd7v0imksyl5mvnjk2rw54sa3xrril76z0md61mq2gh056bah")))) + (build-system cargo-build-system) + (home-page "https://dalek.rs/") + (synopsis + "Pure-Rust traits and utilities for cryptographic implementations") + (description + "This package provides Pure-Rust traits and utilities for constant-time +cryptographic implementations.") + (license license:bsd-3))) + (define-public rust-subtle-1.0 (package + (inherit rust-subtle-2) (name "rust-subtle") (version "1.0.0") (source @@ -22761,15 +22784,7 @@ (define-public rust-subtle-1.0 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1vm80mxbwfj334izwm8x8l65v1xl9hr0kwrg36r1rq565fkaarrd")))) - (build-system cargo-build-system) - (home-page "https://dalek.rs/") - (synopsis - "Pure-Rust traits and utilities for cryptographic implementations") - (description - "This package provides Pure-Rust traits and utilities for constant-time -cryptographic implementations.") - (license license:bsd-3))) + "1vm80mxbwfj334izwm8x8l65v1xl9hr0kwrg36r1rq565fkaarrd")))))) (define-public rust-sval-0.4 (package -- cgit v1.2.3 From 7d9231bb24dbbbcfc0204fcd14dc716e149954cd Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 28 Jun 2020 14:18:22 +0300 Subject: gnu: Add rust-generic-array-0.14. * gnu/packages/crates-io.scm (rust-generic-array-0.14): New variable. (rust-generic-array-0.13): Inherit from rust-generic-array-0.14. --- gnu/packages/crates-io.scm | 40 +++++++++++++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 9 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 56b38c7452..554da27d1c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8008,8 +8008,38 @@ (define-public rust-generator-0.6 (description "Stackfull Generator Library in Rust.") (license (list license:asl2.0 license:expat)))) +(define-public rust-generic-array-0.14 + (package + (name "rust-generic-array") + (version "0.14.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "generic-array" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "107r1fpm8zcab3lzci4x9par6ik8bra390c60rhxvnmz7dgnlx5c")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-serde" ,rust-serde-1.0) + ("rust-typenum" ,rust-typenum-1.10) + ("rust-version-check" ,rust-version-check-0.9)) + #:cargo-development-inputs + (("rust-bincode" ,rust-bincode-1.2) + ("rust-serde-json" ,rust-serde-json-1.0)))) + (home-page "https://github.com/fizyk20/generic-array.git") + (synopsis + "Generic types implementing functionality of arrays") + (description + "Generic types implementing functionality of arrays.") + (license license:expat))) + (define-public rust-generic-array-0.13 (package + (inherit rust-generic-array-0.14) (name "rust-generic-array") (version "0.13.2") (source @@ -8021,7 +8051,6 @@ (define-public rust-generic-array-0.13 (sha256 (base32 "1kddwxpd58y807y1r3lijg7sw3gxm6nczl6wp57gamhv6mhygl8f")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs @@ -8029,14 +8058,7 @@ (define-public rust-generic-array-0.13 ("rust-typenum" ,rust-typenum-1.10)) #:cargo-development-inputs (("rust-bincode" ,rust-bincode-1.1) - ("rust-serde-json" ,rust-serde-json-1.0)))) - (home-page - "https://github.com/fizyk20/generic-array") - (synopsis - "Generic types implementing functionality of arrays") - (description - "Generic types implementing functionality of arrays.") - (license license:expat))) + ("rust-serde-json" ,rust-serde-json-1.0)))))) (define-public rust-generic-array-0.12 (package -- cgit v1.2.3 From a8253655385f37a597c3ae54fdc95b04887636df Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 28 Jun 2020 14:21:03 +0300 Subject: gnu: rust-generic-array-0.13: Don't skip build. * gnu/packages/crates-io.scm (rust-generic-array-0.13)[arguments]: Don't skip build. (rust-generic-array-0.12)[arguments]: Same. --- gnu/packages/crates-io.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 554da27d1c..e7372b7c4a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8052,8 +8052,7 @@ (define-public rust-generic-array-0.13 (base32 "1kddwxpd58y807y1r3lijg7sw3gxm6nczl6wp57gamhv6mhygl8f")))) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-serde" ,rust-serde-1.0) ("rust-typenum" ,rust-typenum-1.10)) #:cargo-development-inputs -- cgit v1.2.3 From 526badd606ffcc1a18cfda4c402568988731c670 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 28 Jun 2020 14:23:37 +0300 Subject: gnu: Add rust-crypto-mac-0.8. * gnu/packages/crates-io.scm (rust-crypto-mac-0.8): New variable. (rust-crypto-mac-0.7): Inherit from rust-crypto-mac-0.8. --- gnu/packages/crates-io.scm | 34 +++++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e7372b7c4a..153742cff9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4417,8 +4417,34 @@ (define-public rust-crossterm-winapi-0.4 around common WinAPI calls.") (license license:expat))) +(define-public rust-crypto-mac-0.8 + (package + (name "rust-crypto-mac") + (version "0.8.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "crypto-mac" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1axfs4zmy74rn9666p92j7nmcv11zdp2d51yrppc2dv26cqa715m")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-blobby" ,rust-blobby-0.1) + ("rust-generic-array" ,rust-generic-array-0.14) + ("rust-subtle" ,rust-subtle-2)))) + (home-page "https://github.com/RustCrypto/traits") + (synopsis "Trait for Message Authentication Code (MAC) algorithms") + (description "This package provides trait for @dfn{Message Authentication +Code} (MAC) algorithms.") + (license (list license:expat license:asl2.0)))) + (define-public rust-crypto-mac-0.7 (package + (inherit rust-crypto-mac-0.8) (name "rust-crypto-mac") (version "0.7.0") (source @@ -4430,17 +4456,11 @@ (define-public rust-crypto-mac-0.7 (sha256 (base32 "1rbrq6qy9dl0pj4ym2zy33miaaa8vpzdss60p9bdb58xy46l0d24")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-blobby" ,rust-blobby-0.1) ("rust-generic-array" ,rust-generic-array-0.12) - ("rust-subtle" ,rust-subtle-1.0)))) - (home-page "https://github.com/RustCrypto/traits") - (synopsis "Trait for Message Authentication Code (MAC) algorithms") - (description "This package provides trait for @dfn{Message Authentication -Code} (MAC) algorithms.") - (license (list license:expat license:asl2.0)))) + ("rust-subtle" ,rust-subtle-1.0)))))) (define-public rust-cssparser-0.25 (package -- cgit v1.2.3 From 3bb18715a9925b37d1b2cbcf2369bff406465c9b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 28 Jun 2020 14:25:07 +0300 Subject: gnu: Add rust-digest-0.9. * gnu/packages/crates-io.scm (rust-digest-0.9): New variable. (rust-digest-0.8): Inherit from rust-digest-0.9. --- gnu/packages/crates-io.scm | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 153742cff9..cfc87f9523 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5156,8 +5156,33 @@ (define-public rust-difference-1 #:cargo-development-inputs (("rust-term" ,rust-term-0.2)))))) +(define-public rust-digest-0.9 + (package + (name "rust-digest") + (version "0.9.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "digest" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0rmhvk33rgvd6ll71z8sng91a52rw14p0drjn1da0mqa138n1pfk")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-blobby" ,rust-blobby-0.1) + ("rust-generic-array" ,rust-generic-array-0.14)))) + (home-page "https://github.com/RustCrypto/traits") + (synopsis "Traits for cryptographic hash functions") + (description + "Traits for cryptographic hash functions.") + (license (list license:expat license:asl2.0)))) + (define-public rust-digest-0.8 (package + (inherit rust-digest-0.9) (name "rust-digest") (version "0.8.1") (source @@ -5169,17 +5194,11 @@ (define-public rust-digest-0.8 (sha256 (base32 "1madjl27f3kj5ql7kwgvb9c8b7yb7bv7yfgx7rqzj4i3fp4cil7k")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-blobby" ,rust-blobby-0.1) - ("rust-generic-array" ,rust-generic-array-0.13)))) - (home-page "https://github.com/RustCrypto/traits") - (synopsis "Traits for cryptographic hash functions") - (description - "Traits for cryptographic hash functions.") - (license (list license:expat license:asl2.0)))) + ("rust-generic-array" ,rust-generic-array-0.13)))))) (define-public rust-dirs-2.0 (package -- cgit v1.2.3 From a662e4ce5ecb3eb28b117da5e227ac0c36c906f4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 28 Jun 2020 14:26:51 +0300 Subject: gnu: Add rust-block-buffer-0.9. * gnu/packages/crates-io.scm (rust-block-buffer-0.9): New variable. (rust-block-buffer-0.7): Inherit from rust-block-buffer-0.9. --- gnu/packages/crates-io.scm | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index cfc87f9523..7d95f64e0a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1829,8 +1829,33 @@ (define-public rust-block-0.1 extension of blocks.") (license license:expat))) +(define-public rust-block-buffer-0.9 + (package + (name "rust-block-buffer") + (version "0.9.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "block-buffer" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1r4pf90s7d7lj1wdjhlnqa26vvbm6pnc33z138lxpnp9srpi2lj1")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-block-padding" ,rust-block-padding-0.2) + ("rust-generic-array" ,rust-generic-array-0.14)))) + (home-page "https://github.com/RustCrypto/utils") + (synopsis "Fixed size buffer for block processing of data") + (description + "Fixed size buffer for block processing of data.") + (license (list license:expat license:asl2.0)))) + (define-public rust-block-buffer-0.7 (package + (inherit rust-block-buffer-0.9) (name "rust-block-buffer") (version "0.7.3") (source @@ -1842,19 +1867,13 @@ (define-public rust-block-buffer-0.7 (sha256 (base32 "12v8wizynqin0hqf140kmp9s38q223mp1b0hkqk8j5pk8720v560")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-block-padding" ,rust-block-padding-0.1) ("rust-byte-tools" ,rust-byte-tools-0.3) ("rust-byteorder" ,rust-byteorder-1.3) - ("rust-generic-array" ,rust-generic-array-0.12)))) - (home-page "https://github.com/RustCrypto/utils") - (synopsis "Fixed size buffer for block processing of data") - (description - "Fixed size buffer for block processing of data.") - (license (list license:asl2.0 license:expat)))) + ("rust-generic-array" ,rust-generic-array-0.12)))))) (define-public rust-block-padding-0.2 (package -- cgit v1.2.3 From 9261d17f76bf4d9d90cb4fc8c664f09b8c22f1a8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 28 Jun 2020 14:27:47 +0300 Subject: gnu: rust-block-buffer-0.7: Don't skip build. * gnu/packages/crates-io.scm (rust-block-buffer-0.7)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7d95f64e0a..d65d981fcb 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1868,8 +1868,7 @@ (define-public rust-block-buffer-0.7 (base32 "12v8wizynqin0hqf140kmp9s38q223mp1b0hkqk8j5pk8720v560")))) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-block-padding" ,rust-block-padding-0.1) ("rust-byte-tools" ,rust-byte-tools-0.3) ("rust-byteorder" ,rust-byteorder-1.3) -- cgit v1.2.3 From 9b4b9c1a3018011d9fc6d12db49f0bf9d34025b9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 28 Jun 2020 14:29:33 +0300 Subject: gnu: Add rust-sha-1-0.9. * gnu/packages/crates-io.scm (rust-sha-1-0.9): New variable. (rust-sha-1-0.8): Inherit from rust-sha-1-0.9. --- gnu/packages/crates-io.scm | 39 +++++++++++++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 6 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d65d981fcb..ac44dbfa6c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -21318,8 +21318,40 @@ (define-public rust-servo-freetype-sys-4 "This package provides a Rust wrapper around the FreeType library.") (license license:mpl2.0))) ; build.rs is mpl2.0 +(define-public rust-sha-1-0.9 + (package + (name "rust-sha-1") + (version "0.9.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "sha-1" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0w37j7swjkbzgi9mf7ihkw0zfik6vl97fs6jdpqs6r68hvm3c2hp")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-block-buffer" ,rust-block-buffer-0.9) + ("rust-cfg-if" ,rust-cfg-if-0.1) + ("rust-cpuid-bool" ,rust-cpuid-bool-0.1) + ("rust-digest" ,rust-digest-0.9) + ("rust-libc" ,rust-libc-0.2) + ("rust-opaque-debug" ,rust-opaque-debug-0.3) + ("rust-sha1-asm" ,rust-sha1-asm-0.4)) + #:cargo-development-inputs + (("rust-digest" ,rust-digest-0.9) + ("rust-hex-literal" ,rust-hex-literal-0.2)))) + (home-page "https://github.com/RustCrypto/hashes") + (synopsis "SHA-1 hash function") + (description "SHA-1 hash function.") + (license (list license:expat license:asl2.0)))) + (define-public rust-sha-1-0.8 (package + (inherit rust-sha-1-0.9) (name "rust-sha-1") (version "0.8.1") (source @@ -21331,7 +21363,6 @@ (define-public rust-sha-1-0.8 (sha256 (base32 "0s6fdy5wp3x4h2z4fcl2d9vjvrpzr87v4h49r51xcq8nm4qj35i3")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs @@ -21342,11 +21373,7 @@ (define-public rust-sha-1-0.8 ("rust-sha1-asm" ,rust-sha1-asm-0.4)) #:cargo-development-inputs (("rust-digest" ,rust-digest-0.8) - ("rust-hex-literal" ,rust-hex-literal-0.2)))) - (home-page "https://github.com/RustCrypto/hashes") - (synopsis "SHA-1 hash function") - (description "SHA-1 hash function.") - (license (list license:asl2.0 license:expat)))) + ("rust-hex-literal" ,rust-hex-literal-0.2)))))) (define-public rust-sha1-0.6 (package -- cgit v1.2.3 From 583acde97a33e9e08e3ffbd63355b3e545b89322 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 28 Jun 2020 14:32:12 +0300 Subject: gnu: rust-sha1-asm-0.4: Don't skip build. * gnu/packages/crates-io.scm (rust-sha1-asm-0.4)[arguments]: Don't skip build. Move rust-cc-1.0 from cargo-development-inputs to cargo-inputs. --- gnu/packages/crates-io.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ac44dbfa6c..fe5ffe2696 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -21446,8 +21446,7 @@ (define-public rust-sha1-asm-0.4 "1i1i8viy6y30mv9v5hwhg9w6b722qkyh9c6n8bn4d27jpv14pg0s")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-development-inputs + `(#:cargo-inputs (("rust-cc" ,rust-cc-1.0)))) (home-page "https://github.com/RustCrypto/asm-hashes") (synopsis "Assembly implementation of SHA-1 compression function") -- cgit v1.2.3 From 2ba5ed731b760a2e85217cc0e3c3d7466b91ac96 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 28 Jun 2020 14:35:03 +0300 Subject: gnu: rust-sha-1-0.8: Update to 0.8.2. * gnu/packages/crates-io.scm (rust-sha-1-0.8): Update to 0.8.2. [arguments]: Don't skip build. Add rust-libc-0.2 to cargo-inputs. Replace rust-hex-literal-0.2 with 0.1 in cargo-development-inputs. --- gnu/packages/crates-io.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index fe5ffe2696..06117be9c3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -21353,7 +21353,7 @@ (define-public rust-sha-1-0.8 (package (inherit rust-sha-1-0.9) (name "rust-sha-1") - (version "0.8.1") + (version "0.8.2") (source (origin (method url-fetch) @@ -21362,18 +21362,18 @@ (define-public rust-sha-1-0.8 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0s6fdy5wp3x4h2z4fcl2d9vjvrpzr87v4h49r51xcq8nm4qj35i3")))) + "1pv387q0r7llk2cqzyq0nivzvkgqgzsiygqzlv7b68z9xl5lvngp")))) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-block-buffer" ,rust-block-buffer-0.7) ("rust-digest" ,rust-digest-0.8) ("rust-fake-simd" ,rust-fake-simd-0.1) ("rust-opaque-debug" ,rust-opaque-debug-0.2) + ("rust-libc" ,rust-libc-0.2) ("rust-sha1-asm" ,rust-sha1-asm-0.4)) #:cargo-development-inputs (("rust-digest" ,rust-digest-0.8) - ("rust-hex-literal" ,rust-hex-literal-0.2)))))) + ("rust-hex-literal" ,rust-hex-literal-0.1)))))) (define-public rust-sha1-0.6 (package -- cgit v1.2.3 From c61ccd3e68c612c911773ebd658cd1a4f602b24f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 28 Jun 2020 14:36:37 +0300 Subject: gnu: Add rust-block-buffer-0.8. * gnu/packages/crates-io.scm (rust-block-buffer-0.8): New variable. --- gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 06117be9c3..d5fa0a494d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1853,6 +1853,27 @@ (define-public rust-block-buffer-0.9 "Fixed size buffer for block processing of data.") (license (list license:expat license:asl2.0)))) +(define-public rust-block-buffer-0.8 + (package + (inherit rust-block-buffer-0.9) + (name "rust-block-buffer") + (version "0.8.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "block-buffer" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0c9x5b8pk25i13bajqjkzf03bm5hx2y8pi9llfvjpy3nhr295kyv")))) + (arguments + `(#:cargo-inputs + (("rust-block-padding" ,rust-block-padding-0.1) + ("rust-byte-tools" ,rust-byte-tools-0.3) + ("rust-byteorder" ,rust-byteorder-1.3) + ("rust-generic-array" ,rust-generic-array-0.14)))))) + (define-public rust-block-buffer-0.7 (package (inherit rust-block-buffer-0.9) -- cgit v1.2.3 From b6cca9aab4acd6e4f6b4ac37b6f78a15c86e5ddd Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 28 Jun 2020 14:38:13 +0300 Subject: gnu: Add rust-md-5-0.9. * gnu/packages/crates-io.scm (rust-md-5-0.9): New variable. (rust-md-5-0.8): Inherit from rust-md-5-0.9. --- gnu/packages/crates-io.scm | 36 ++++++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d5fa0a494d..6a4c30836d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -12627,8 +12627,37 @@ (define-public rust-maybe-uninit-2.0 "This package provides MaybeUninit for friends of backwards compatibility.") (license (list license:asl2.0 license:expat)))) +(define-public rust-md-5-0.9 + (package + (name "rust-md-5") + (version "0.9.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "md-5" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "14x7yxfi4pk4qy3zmn9dj69yc18fg3cyind346kribjd93077qij")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-block-buffer" ,rust-block-buffer-0.8) + ("rust-digest" ,rust-digest-0.9) + ("rust-md5-asm" ,rust-md5-asm-0.4) + ("rust-opaque-debug" ,rust-opaque-debug-0.2)) + #:cargo-development-inputs + (("rust-digest" ,rust-digest-0.9) + ("rust-hex-literal" ,rust-hex-literal-0.2)))) + (home-page "https://github.com/RustCrypto/hashes") + (synopsis "MD5 hash function") + (description "MD5 hash function.") + (license (list license:expat license:asl2.0)))) + (define-public rust-md-5-0.8 (package + (inherit rust-md-5-0.9) (name "rust-md-5") (version "0.8.0") (source @@ -12640,7 +12669,6 @@ (define-public rust-md-5-0.8 (sha256 (base32 "1j5rfxy2p76xf5f1lgaw85xla0b1bbv2lknvdhv1j0ibmzfg72m1")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-block-buffer" ,rust-block-buffer-0.7) @@ -12649,11 +12677,7 @@ (define-public rust-md-5-0.8 ("rust-opaque-debug" ,rust-opaque-debug-0.2)) #:cargo-development-inputs (("rust-digest" ,rust-digest-0.8) - ("rust-hex-literal" ,rust-hex-literal-0.1)))) - (home-page "https://github.com/RustCrypto/hashes") - (synopsis "MD5 hash function") - (description "MD5 hash function.") - (license (list license:expat license:asl2.0)))) + ("rust-hex-literal" ,rust-hex-literal-0.1)))))) (define-public rust-md5-0.6 (package -- cgit v1.2.3 From e2ea9fcf4374af5e33cf10a1236a8ca2337544dc Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 28 Jun 2020 14:40:39 +0300 Subject: gnu: Add rust-sha2-0.9. * gnu/packages/crates-io.scm (rust-sha2-0.9): New variable. (rust-sha2-0.8): Inherit from rust-sha2-0.9. --- gnu/packages/crates-io.scm | 41 +++++++++++++++++++++++++++++++++++------ 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6a4c30836d..8a97fd67a9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -21499,8 +21499,42 @@ (define-public rust-sha1-asm-0.4 "Assembly implementation of SHA-1 compression function.") (license license:expat))) +(define-public rust-sha2-0.9 + (package + (name "rust-sha2") + (version "0.9.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "sha2" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1hdqrx2d9073hgf34y6ilgw6ni5vv3d5nmccyhkfm9zdvy6kfcr9")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-block-buffer" ,rust-block-buffer-0.9) + ("rust-cfg-if" ,rust-cfg-if-0.1) + ("rust-cpuid-bool" ,rust-cpuid-bool-0.1) + ("rust-digest" ,rust-digest-0.9) + ("rust-libc" ,rust-libc-0.2) + ("rust-opaque-debug" ,rust-opaque-debug-0.3) + ("rust-sha2-asm" ,rust-sha2-asm-0.5)) + #:cargo-development-inputs + (("rust-digest" ,rust-digest-0.9) + ("rust-hex-literal" ,rust-hex-literal-0.2)))) + (home-page "https://github.com/RustCrypto/hashes") + (synopsis "SHA-2 hash functions") + (description + "This package provides a pure Rust implementation of the SHA-2 hash +function family including SHA-224, SHA-256, SHA-384, and SHA-512.") + (license (list license:expat license:asl2.0)))) + (define-public rust-sha2-0.8 (package + (inherit rust-sha2-0.9) (name "rust-sha2") (version "0.8.1") (source @@ -21510,7 +21544,6 @@ (define-public rust-sha2-0.8 (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1827pplynq0ahxid1xq281kiv56kj2afp7gm97v7gw71sbgll117")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-block-buffer" ,rust-block-buffer-0.7) @@ -21522,11 +21555,7 @@ (define-public rust-sha2-0.8 #:cargo-development-inputs (("rust-cc" ,rust-cc-1.0) ;; FIXME for rust-sha2-asm, why again? ("rust-digest" ,rust-digest-0.8) - ("rust-hex-literal" ,rust-hex-literal-0.1)))) - (home-page "https://github.com/RustCrypto/hashes") - (synopsis "SHA-2 hash functions") - (description "SHA-2 hash functions") - (license (list license:expat license:asl2.0)))) + ("rust-hex-literal" ,rust-hex-literal-0.1)))))) (define-public rust-sha2-asm-0.5 (package -- cgit v1.2.3 From de9c1e900b56bbdb6f9f897e4cd6c43486026560 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 28 Jun 2020 14:42:43 +0300 Subject: gnu: rust-sha2-0.8: Update to 0.8.2. * gnu/packages/crates-io.scm (rust-sha2-0.8): Update to 0.8.2. [arguments]: Remove rust-cc-1.0 from cargo-development-inputs. --- gnu/packages/crates-io.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 8a97fd67a9..21796a5157 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -21536,14 +21536,14 @@ (define-public rust-sha2-0.8 (package (inherit rust-sha2-0.9) (name "rust-sha2") - (version "0.8.1") + (version "0.8.2") (source (origin (method url-fetch) (uri (crate-uri "sha2" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1827pplynq0ahxid1xq281kiv56kj2afp7gm97v7gw71sbgll117")))) + (base32 "0s9yddvyg6anaikdl86wmwfim25c0d4m0xq0y2ghs34alxpg8mm2")))) (arguments `(#:cargo-inputs (("rust-block-buffer" ,rust-block-buffer-0.7) @@ -21553,8 +21553,7 @@ (define-public rust-sha2-0.8 ("rust-opaque-debug" ,rust-opaque-debug-0.2) ("rust-sha2-asm" ,rust-sha2-asm-0.5)) #:cargo-development-inputs - (("rust-cc" ,rust-cc-1.0) ;; FIXME for rust-sha2-asm, why again? - ("rust-digest" ,rust-digest-0.8) + (("rust-digest" ,rust-digest-0.8) ("rust-hex-literal" ,rust-hex-literal-0.1)))))) (define-public rust-sha2-asm-0.5 -- cgit v1.2.3 From 266fadf0111e6cc7b50fd9eafbba73a84c6c5665 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 28 Jun 2020 14:44:14 +0300 Subject: gnu: rust-sha2-asm-0.5: Update to 0.5.4. * gnu/packages/crates-io.scm (rust-sha2-asm-0.5): Update to 0.5.4. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 21796a5157..c1a4b68f4a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -21559,14 +21559,14 @@ (define-public rust-sha2-0.8 (define-public rust-sha2-asm-0.5 (package (name "rust-sha2-asm") - (version "0.5.3") + (version "0.5.4") (source (origin (method url-fetch) (uri (crate-uri "sha2-asm" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0k3qwv2yl8fyi2i6cprfb8d874ii5kmcmckgnjkwnz2ac9fayyl1")))) + (base32 "0y4n8r4362y2fa6p2j0dgny4zfi194gdf01l6j850n9vf8ha3kwj")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From d1514c9bba6b0991c04dc24e7d688ee57bb604d6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 28 Jun 2020 14:46:08 +0300 Subject: gnu: Add rust-hmac-0.8. * gnu/packages/crates-io.scm (rust-hmac-0.8): New variable. (rust-hmac-0.7): Inherit from rust-hmac-0.8. --- gnu/packages/crates-io.scm | 39 +++++++++++++++++++++++++++++++-------- 1 file changed, 31 insertions(+), 8 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c1a4b68f4a..0fcfffd0e8 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9935,10 +9935,10 @@ (define-public rust-hex-literal-impl-0.1 `(#:cargo-inputs (("rust-proc-macro-hack" ,rust-proc-macro-hack-0.4)))))) -(define-public rust-hmac-0.7 +(define-public rust-hmac-0.8 (package (name "rust-hmac") - (version "0.7.1") + (version "0.8.1") (source (origin (method url-fetch) @@ -9947,16 +9947,16 @@ (define-public rust-hmac-0.7 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "15cnwpssp2n1kdm9x7abir67f2hp3q6rdfj1mcck3hm4rmj5xjsx")))) + "0h48wc7iysh4xd6ci4prh8bb7nszijrh9w3blaaq8a6cilk8hs0j")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-crypto-mac" ,rust-crypto-mac-0.7) - ("rust-digest" ,rust-digest-0.8)) + (("rust-crypto-mac" ,rust-crypto-mac-0.8) + ("rust-digest" ,rust-digest-0.9)) #:cargo-development-inputs - (("rust-crypto-mac" ,rust-crypto-mac-0.7) - ("rust-md-5" ,rust-md-5-0.8) - ("rust-sha2" ,rust-sha2-0.8)))) + (("rust-crypto-mac" ,rust-crypto-mac-0.8) + ("rust-md-5" ,rust-md-5-0.9) + ("rust-sha2" ,rust-sha2-0.9)))) (home-page "https://github.com/RustCrypto/MACs") (synopsis "Generic implementation of Hash-based Message Authentication Code") (description @@ -9964,6 +9964,29 @@ (define-public rust-hmac-0.7 Hash-based Message Authentication Code}.") (license (list license:expat license:asl2.0)))) +(define-public rust-hmac-0.7 + (package + (inherit rust-hmac-0.8) + (name "rust-hmac") + (version "0.7.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "hmac" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "15cnwpssp2n1kdm9x7abir67f2hp3q6rdfj1mcck3hm4rmj5xjsx")))) + (arguments + `(#:cargo-inputs + (("rust-crypto-mac" ,rust-crypto-mac-0.7) + ("rust-digest" ,rust-digest-0.8)) + #:cargo-development-inputs + (("rust-crypto-mac" ,rust-crypto-mac-0.7) + ("rust-md-5" ,rust-md-5-0.8) + ("rust-sha2" ,rust-sha2-0.8)))))) + (define-public rust-hostname-0.1 (package (name "rust-hostname") -- cgit v1.2.3 From 0fe2c226bbeff9c05d7a47fa28849249abbc8f6e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 28 Jun 2020 14:50:23 +0300 Subject: gnu: Add rust-pbdkdf2-0.4. * gnu/packages/crates-io.scm (rust-pbkdf2-0.4): New variable. (rust-pbkdf2-0.3): Inherit from rust-pbkdf2-0.4. --- gnu/packages/crates-io.scm | 45 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 37 insertions(+), 8 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0fcfffd0e8..9998ac9284 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -15815,8 +15815,44 @@ (define-public rust-paste-impl-0.1 "Implementation detail of the paste crate.") (license (list license:asl2.0 license:expat)))) +(define-public rust-pbkdf2-0.4 + (package + (name "rust-pbkdf2") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "pbkdf2" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1g8cm3nwrsydazjc1gjs549hzafgxq8qb49gixrhl3qrd9calvi1")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-base64" ,rust-base64-0.12) + ("rust-crypto-mac" ,rust-crypto-mac-0.8) + ("rust-hmac" ,rust-hmac-0.8) + ("rust-rand" ,rust-rand-0.7) + ("rust-rand-core" ,rust-rand-core-0.5) + ("rust-rayon" ,rust-rayon-1) + ("rust-sha2" ,rust-sha2-0.9) + ("rust-subtle" ,rust-subtle-2)) + #:cargo-development-inputs + (("rust-hmac" ,rust-hmac-0.8) + ("rust-sha-1" ,rust-sha-1-0.9) + ("rust-sha2" ,rust-sha2-0.9)))) + (home-page "https://github.com/RustCrypto/password-hashing") + (synopsis "Generic implementation of PBKDF2") + (description "This package contains a collection of password hashing +algorithms, otherwise known as password-based key derivation functions, written +in pure Rust.") + (license (list license:expat license:asl2.0)))) + (define-public rust-pbkdf2-0.3 (package + (inherit rust-pbkdf2-0.4) (name "rust-pbkdf2") (version "0.3.0") (source @@ -15828,7 +15864,6 @@ (define-public rust-pbkdf2-0.3 (sha256 (base32 "1na2fmmfcmksz4xk7m0ihl778501c1krx88dcylrand48f506v00")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-base64" ,rust-base64-0.9) @@ -15842,13 +15877,7 @@ (define-public rust-pbkdf2-0.3 #:cargo-development-inputs (("rust-hmac" ,rust-hmac-0.7) ("rust-sha-1" ,rust-sha-1-0.8) - ("rust-sha2" ,rust-sha2-0.8)))) - (home-page "https://github.com/RustCrypto/password-hashes") - (synopsis "Generic implementation of PBKDF2") - (description "This package contains a collection of password hashing -algorithms, otherwise known as password-based key derivation functions, written -in pure Rust.") - (license (list license:expat license:asl2.0)))) + ("rust-sha2" ,rust-sha2-0.8)))))) (define-public rust-pcre2-0.2 (package -- cgit v1.2.3 From 73839a19d34e48fffc9eced22ddde0764c953974 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 28 Jun 2020 14:55:51 +0300 Subject: gnu: Add rust-scrypt-0.3. * gnu/packages/crates-io.scm (rust-scrypt-0.3): New variable. (rust-scrypt-0.2): Inherit from rust-scrypt-0.2. --- gnu/packages/crates-io.scm | 38 +++++++++++++++++++++++++++++++------- 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9998ac9284..1d39d40dc2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -20452,8 +20452,38 @@ (define-public rust-scopeguard-0.3 (base32 "09sy9wbqp409pkwmqni40qmwa99ldqpl48pp95m1xw8sc19qy9cl")))))) +(define-public rust-scrypt-0.3 + (package + (name "rust-scrypt") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "scrypt" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1apicbvp7cgc1z2nl5l48g8h3kp7p592r4zbkx9vsri2ivnvgv43")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-base64" ,rust-base64-0.12) + ("rust-hmac" ,rust-hmac-0.8) + ("rust-pbkdf2" ,rust-pbkdf2-0.4) + ("rust-rand" ,rust-rand-0.7) + ("rust-rand-core" ,rust-rand-core-0.5) + ("rust-sha2" ,rust-sha2-0.9) + ("rust-subtle" ,rust-subtle-2)))) + (home-page "https://github.com/RustCrypto/password-hashes") + (synopsis "Scrypt password-based key derivation function") + (description + "Scrypt password-based key derivation function.") + (license (list license:expat license:asl2.0)))) + (define-public rust-scrypt-0.2 (package + (inherit rust-scrypt-0.3) (name "rust-scrypt") (version "0.2.0") (source @@ -20465,7 +20495,6 @@ (define-public rust-scrypt-0.2 (sha256 (base32 "1pfgqgzdjxjf7c8r1wfka0ackfpv1g8w7wvbr25b42hdx787jv35")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-base64" ,rust-base64-0.9) @@ -20475,12 +20504,7 @@ (define-public rust-scrypt-0.2 ("rust-pbkdf2" ,rust-pbkdf2-0.3) ("rust-rand" ,rust-rand-0.5) ("rust-sha2" ,rust-sha2-0.8) - ("rust-subtle" ,rust-subtle-1.0)))) - (home-page "https://github.com/RustCrypto/password-hashes") - (synopsis "Scrypt password-based key derivation function") - (description - "Scrypt password-based key derivation function.") - (license (list license:expat license:asl2.0)))) + ("rust-subtle" ,rust-subtle-1.0)))))) (define-public rust-scroll-0.10 (package -- cgit v1.2.3 From dac41c527990a16bbeaeb6a79bd6093eb5945c96 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 28 Jun 2020 14:56:20 +0300 Subject: gnu: Add rust-minisign. * gnu/packages/crypto.scm (rust-minisign): New variable. --- gnu/packages/crypto.scm | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index be8f8b9f05..e140936d4a 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2016, 2017 Nikita ;;; Copyright © 2016, 2017, 2019 Eric Bavier ;;; Copyright © 2017 Pierre Langlois -;;; Copyright © 2018 Efraim Flashner +;;; Copyright © 2018, 2020 Efraim Flashner ;;; Copyright © 2018 Arun Isaac ;;; Copyright © 2018 Nicolas Goaziou ;;; Copyright © 2018, 2020 Nicolò Balzarotti @@ -41,6 +41,7 @@ (define-module (gnu packages crypto) #:use-module (gnu packages boost) #:use-module (gnu packages check) #:use-module (gnu packages compression) + #:use-module (gnu packages crates-io) #:use-module (gnu packages cryptsetup) #:use-module (gnu packages gettext) #:use-module (gnu packages gnupg) @@ -69,6 +70,7 @@ (define-module (gnu packages crypto) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix build-system cargo) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system perl) @@ -170,6 +172,31 @@ (define-public signify "See base64.c in the distribution for the license from IBM."))))) +(define-public rust-minisign + (package + (name "rust-minisign") + (version "0.5.20") + (source + (origin + (method url-fetch) + (uri (crate-uri "minisign" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0xmcvh2snravghaar8igc6b9r3s1snnmf9qam9l3zyhm4987767y")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-getrandom" ,rust-getrandom-0.1) + ("rust-rpassword" ,rust-rpassword-4) + ("rust-scrypt" ,rust-scrypt-0.3)))) + (home-page "https://github.com/jedisct1/rust-minisign") + (synopsis "Crate to sign files and verify signatures") + (description + "This package provides a crate to sign files and verify signatures.") + (license license:expat))) + (define-public encfs (package (name "encfs") -- cgit v1.2.3 From 5fd60833320506dbc9a2cfb80eaafc2eec172766 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 28 Jun 2020 14:57:42 +0300 Subject: gnu; Add go-minisign. * gnu/packages/crypto.scm (go-minisign): New variable. --- gnu/packages/crypto.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index e140936d4a..859fc9d654 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -45,6 +45,7 @@ (define-module (gnu packages crypto) #:use-module (gnu packages cryptsetup) #:use-module (gnu packages gettext) #:use-module (gnu packages gnupg) + #:use-module (gnu packages golang) #:use-module (gnu packages image) #:use-module (gnu packages kerberos) #:use-module (gnu packages libbsd) @@ -73,6 +74,7 @@ (define-module (gnu packages crypto) #:use-module (guix build-system cargo) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) + #:use-module (guix build-system go) #:use-module (guix build-system perl) #:use-module (guix utils) #:use-module (srfi srfi-1) @@ -197,6 +199,33 @@ (define-public rust-minisign "This package provides a crate to sign files and verify signatures.") (license license:expat))) +(define-public go-minisign + (package + (name "go-minisign") + (version "0.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jedisct1/go-minisign") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0wc0rk5m60yz52f0cncmbgq67yvb1rcx91gvzjg6jpc4mpw2db27")) + (modules '((guix build utils))) + (snippet + '(begin (delete-file-recursively "vendor") #t)))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/jedisct1/go-minisign")) + (propagated-inputs + `(("go-golang-org-x-crypto" ,go-golang-org-x-crypto))) + (home-page "https://github.com/jedisct1/go-minisign") + (synopsis "Minisign verification library for Golang") + (description "A Golang library to verify Minisign signatures.") + (license license:expat))) + (define-public encfs (package (name "encfs") -- cgit v1.2.3 From 9023a664ed80e5ab5b98956a0df2fa54f07c51ea Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 28 Jun 2020 15:01:36 +0300 Subject: gnu: Rename rust-typenum-1.10 to rust-typenum-1. * gnu/packages/crates-io.scm (rust-typenum-1.10): Rename to ... (rust-typenum-1): ... this. (rust-generic-array-0.14, rust-generic-array-0.13, rust-nalgebra-0.18) [arugments]: Adjust accordingly. --- gnu/packages/crates-io.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1d39d40dc2..b0c7019d5e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8103,7 +8103,7 @@ (define-public rust-generic-array-0.14 (arguments `(#:cargo-inputs (("rust-serde" ,rust-serde-1.0) - ("rust-typenum" ,rust-typenum-1.10) + ("rust-typenum" ,rust-typenum-1) ("rust-version-check" ,rust-version-check-0.9)) #:cargo-development-inputs (("rust-bincode" ,rust-bincode-1.2) @@ -8132,7 +8132,7 @@ (define-public rust-generic-array-0.13 (arguments `(#:cargo-inputs (("rust-serde" ,rust-serde-1.0) - ("rust-typenum" ,rust-typenum-1.10)) + ("rust-typenum" ,rust-typenum-1)) #:cargo-development-inputs (("rust-bincode" ,rust-bincode-1.1) ("rust-serde-json" ,rust-serde-json-1.0)))))) @@ -13470,7 +13470,7 @@ (define-public rust-nalgebra-0.18 ("rust-rand" ,rust-rand-0.6) ("rust-serde" ,rust-serde-1.0) ("rust-serde-derive" ,rust-serde-derive-1.0) - ("rust-typenum" ,rust-typenum-1.10)) + ("rust-typenum" ,rust-typenum-1)) #:cargo-development-inputs (("rust-rand-xorshift" ,rust-rand-xorshift-0.1) ("rust-serde-json" ,rust-serde-json-1.0)))) @@ -25425,7 +25425,7 @@ (define-public rust-typemap-0.3 "A typesafe store for many value types.") (license license:expat))) -(define-public rust-typenum-1.10 +(define-public rust-typenum-1 (package (name "rust-typenum") (version "1.10.0") -- cgit v1.2.3 From d8173a8ca5f9a0d9f6ede91ea865321bf200ee35 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 28 Jun 2020 15:03:56 +0300 Subject: gnu: rust-typenum-1: Update to 1.12.0. * gnu/packages/crates-io.scm (rust-typenum-1): Update to 1.12.0. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b0c7019d5e..6fae8abf66 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -25428,7 +25428,7 @@ (define-public rust-typemap-0.3 (define-public rust-typenum-1 (package (name "rust-typenum") - (version "1.10.0") + (version "1.12.0") (source (origin (method url-fetch) @@ -25436,7 +25436,7 @@ (define-public rust-typenum-1 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "0sc1jirllfhdi52z1xv9yqzxzpk6v7vadd13n7wvs1wnjipn6bb1")))) + "0cvbksljz61ian21fnn0h51kphl0pwpzb932bv4s0rwy1wh8lg1p")))) (build-system cargo-build-system) (home-page "https://github.com/paholg/typenum") (synopsis "Rust library for type-level numbers evaluated at compile time") -- cgit v1.2.3 From ed22def6cc89a9295b44423699303df48ff155f4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 28 Jun 2020 15:11:09 +0300 Subject: gnu: Remove rust-unicase-2.4. * gnu/packages/crates-io.scm (rust-unicase-2.4): Remove variable. (rust-unicase-1): Inherit from rust-unicase-2.6. (rust-http-req-0.5, rust-pulldown-cmark-0.4, rust-rusqlite-0.19) [arguments]: Use rust-unicode-2.6. --- gnu/packages/crates-io.scm | 30 ++++-------------------------- 1 file changed, 4 insertions(+), 26 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6fae8abf66..4cdc5127d8 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10164,7 +10164,7 @@ (define-public rust-http-req-0.5 #:cargo-inputs ;; Haven't packaged rustls and webpki because of license (("rust-native-tls" ,rust-native-tls-0.2) - ("rust-unicase" ,rust-unicase-2.4)))) + ("rust-unicase" ,rust-unicase-2.6)))) (home-page "https://github.com/jayjamesjay/http_req") (synopsis "HTTP client with built-in HTTPS support") @@ -17653,7 +17653,7 @@ (define-public rust-pulldown-cmark-0.4 (("rust-bitflags" ,rust-bitflags-1) ("rust-getopts" ,rust-getopts-0.2) ("rust-memchr" ,rust-memchr-2.2) - ("rust-unicase" ,rust-unicase-2.4)) + ("rust-unicase" ,rust-unicase-2.6)) #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.2) ("rust-html5ever" ,rust-html5ever-0.23) @@ -19534,7 +19534,7 @@ (define-public rust-rusqlite-0.19 (("rust-lazy-static" ,rust-lazy-static-1) ("rust-regex" ,rust-regex-1) ("rust-tempdir" ,rust-tempdir-0.3) - ("rust-unicase" ,rust-unicase-2.4) + ("rust-unicase" ,rust-unicase-2.6) ("rust-uuid" ,rust-uuid-0.7)))) (home-page "https://github.com/rusqlite/rusqlite") (synopsis "Wrapper for SQLite") @@ -25561,31 +25561,9 @@ (define-public rust-unicase-2.6 "This package provides a case-insensitive wrapper around strings.") (license (list license:expat license:asl2.0)))) -(define-public rust-unicase-2.4 - (package - (name "rust-unicase") - (version "2.4.0") - (source - (origin - (method url-fetch) - (uri (crate-uri "unicase" version)) - (file-name (string-append name "-" version ".crate")) - (sha256 - (base32 - "1xmpmkakhhblq7dzab1kwyv925kv7fqjkjsxjspg6ix9n88makm8")))) - (build-system cargo-build-system) - (arguments - `(#:cargo-inputs (("rust-version-check" ,rust-version-check-0.1)))) - (home-page "https://github.com/seanmonstar/unicase") - (synopsis "Case-insensitive wrapper around strings") - (description - "A case-insensitive wrapper around strings.") - (license (list license:asl2.0 - license:expat)))) - (define-public rust-unicase-1 (package - (inherit rust-unicase-2.4) + (inherit rust-unicase-2.6) (name "rust-unicase") (version "1.4.2") (source -- cgit v1.2.3 From 862a4f3f92922ddda39f82c495d38f4a02e05f51 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 28 Jun 2020 15:13:07 +0300 Subject: gnu: Rename rust-unicase-2.6 to rust-unicase-2. * gnu/packages/crates-io.scm (rust-unicase-2.6): Rename to ... (rust-unicase-2): ... this. (rust-unicase-1): Inherit from rust-unicase-2. (rust-http-req-0.5, rust-phf-shared-0.8, rust-pulldown-cmark-0.4, rust-rusqlite-0.19)[arguments]: Adjust accordingly. --- gnu/packages/crates-io.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4cdc5127d8..5b1b8262b9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10164,7 +10164,7 @@ (define-public rust-http-req-0.5 #:cargo-inputs ;; Haven't packaged rustls and webpki because of license (("rust-native-tls" ,rust-native-tls-0.2) - ("rust-unicase" ,rust-unicase-2.6)))) + ("rust-unicase" ,rust-unicase-2)))) (home-page "https://github.com/jayjamesjay/http_req") (synopsis "HTTP client with built-in HTTPS support") @@ -16380,7 +16380,7 @@ (define-public rust-phf-shared-0.8 `(#:skip-build? #t #:cargo-inputs (("rust-siphasher" ,rust-siphasher-0.3) - ("rust-unicase" ,rust-unicase-2.6)))) + ("rust-unicase" ,rust-unicase-2)))) (home-page "https://github.com/sfackler/rust-phf") (synopsis "Support code shared by PHF libraries") (description @@ -17653,7 +17653,7 @@ (define-public rust-pulldown-cmark-0.4 (("rust-bitflags" ,rust-bitflags-1) ("rust-getopts" ,rust-getopts-0.2) ("rust-memchr" ,rust-memchr-2.2) - ("rust-unicase" ,rust-unicase-2.6)) + ("rust-unicase" ,rust-unicase-2)) #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.2) ("rust-html5ever" ,rust-html5ever-0.23) @@ -19534,7 +19534,7 @@ (define-public rust-rusqlite-0.19 (("rust-lazy-static" ,rust-lazy-static-1) ("rust-regex" ,rust-regex-1) ("rust-tempdir" ,rust-tempdir-0.3) - ("rust-unicase" ,rust-unicase-2.6) + ("rust-unicase" ,rust-unicase-2) ("rust-uuid" ,rust-uuid-0.7)))) (home-page "https://github.com/rusqlite/rusqlite") (synopsis "Wrapper for SQLite") @@ -25537,7 +25537,7 @@ (define-public rust-unchecked-index-0.2 "Unchecked indexing wrapper using regular index syntax.") (license (list license:asl2.0 license:expat)))) -(define-public rust-unicase-2.6 +(define-public rust-unicase-2 (package (name "rust-unicase") (version "2.6.0") @@ -25563,7 +25563,7 @@ (define-public rust-unicase-2.6 (define-public rust-unicase-1 (package - (inherit rust-unicase-2.6) + (inherit rust-unicase-2) (name "rust-unicase") (version "1.4.2") (source -- cgit v1.2.3 From 75da0b49cf101276944a2b8babbfd2d43c395cba Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 28 Jun 2020 15:30:43 +0300 Subject: gnu: Remove rust-memchr-2.2. * gnu/packages/crates-io.scm (rust-memchr-2.2): Remove variable. (rust-memchr-1.0): Inherit from rust-memchr-2.3. (rust-aho-corasick-0.6, rust-bstr-0.2, rust-futures-util-0.3, rust-futures-util-preview-0.3, rust-grep-matcher-0.1, rust-ignore-0.4, rust-nom-5, rust-nom-4.2, rust-odds-0.3, rust-pulldown-cmark-0.4, rust-regex-0.2, rust-rusqlite-0.19, rust-tokio-0.2)[arguments]: Use rust-memchr-2.3 instead of rust-memchr-2.2. --- gnu/packages/crates-io.scm | 54 ++++++++++++---------------------------------- 1 file changed, 14 insertions(+), 40 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5b1b8262b9..de24af3d9e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -278,7 +278,7 @@ (define-public rust-aho-corasick-0.6 (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-memchr" ,rust-memchr-2.2)) + (("rust-memchr" ,rust-memchr-2.3)) #:cargo-development-inputs (("rust-csv" ,rust-csv-1.1) ("rust-docopt" ,rust-docopt-1.1) @@ -1973,7 +1973,7 @@ (define-public rust-bstr-0.2 `(#:skip-build? #t #:cargo-inputs (("rust-lazy-static" ,rust-lazy-static-1) - ("rust-memchr" ,rust-memchr-2.2) + ("rust-memchr" ,rust-memchr-2.3) ("rust-regex-automata" ,rust-regex-automata-0.1) ("rust-serde" ,rust-serde-1.0)) #:cargo-development-inputs @@ -7864,7 +7864,7 @@ (define-public rust-futures-util-0.3 ("rust-futures-macro" ,rust-futures-macro-0.3) ("rust-futures-sink" ,rust-futures-sink-0.3) ("rust-futures-task" ,rust-futures-task-0.3) - ("rust-memchr" ,rust-memchr-2.2) + ("rust-memchr" ,rust-memchr-2.3) ("rust-pin-utils" ,rust-pin-utils-0.1) ("rust-proc-macro-hack" ,rust-proc-macro-hack-0.5) ("rust-proc-macro-nested" ,rust-proc-macro-nested-0.1) @@ -7900,7 +7900,7 @@ (define-public rust-futures-util-preview-0.3 ("rust-futures-select-macro-preview" ,rust-futures-select-macro-preview-0.3) ("rust-futures-sink-preview" ,rust-futures-sink-preview-0.3) - ("rust-memchr" ,rust-memchr-2.2) + ("rust-memchr" ,rust-memchr-2.3) ("rust-pin-utils" ,rust-pin-utils-0.1) ("rust-proc-macro-hack" ,rust-proc-macro-hack-0.5) ("rust-proc-macro-nested" ,rust-proc-macro-nested-0.1) @@ -9364,7 +9364,7 @@ (define-public rust-grep-matcher-0.1 (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-memchr" ,rust-memchr-2.2)) + (("rust-memchr" ,rust-memchr-2.3)) #:cargo-development-inputs (("rust-regex" ,rust-regex-1)))) (home-page "https://github.com/BurntSushi/ripgrep") @@ -10402,7 +10402,7 @@ (define-public rust-ignore-0.4 ("rust-globset" ,rust-globset-0.4) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-log" ,rust-log-0.4) - ("rust-memchr" ,rust-memchr-2.2) + ("rust-memchr" ,rust-memchr-2.3) ("rust-regex" ,rust-regex-1) ("rust-same-file" ,rust-same-file-1.0) ("rust-thread-local" ,rust-thread-local-1.0) @@ -12784,35 +12784,9 @@ (define-public rust-memchr-2.3 for searching bytes.") (license (list license:unlicense license:expat)))) -(define-public rust-memchr-2.2 - (package - (name "rust-memchr") - (version "2.2.1") - (source - (origin - (method url-fetch) - (uri (crate-uri "memchr" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "13j6ji9x9ydpi9grbss106gqqr3xn3bcfp28aydqfa4751qrfmw8")))) - (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-libc" ,rust-libc-0.2)) - #:cargo-development-inputs - (("rust-quickcheck" ,rust-quickcheck-0.8)))) - (home-page - "https://github.com/BurntSushi/rust-memchr") - (synopsis "Safe interface to memchr") - (description "The @code{memchr} crate provides heavily optimized routines -for searching bytes.") - (license (list license:expat license:unlicense)))) - (define-public rust-memchr-1.0 (package - (inherit rust-memchr-2.2) + (inherit rust-memchr-2.3) (name "rust-memchr") (version "1.0.2") (source @@ -13875,7 +13849,7 @@ (define-public rust-nom-5 #:cargo-inputs (("rust-lazy-static" ,rust-lazy-static-1) ("rust-lexical-core" ,rust-lexical-core-0.7) - ("rust-memchr" ,rust-memchr-2.2) + ("rust-memchr" ,rust-memchr-2.3) ("rust-regex" ,rust-regex-1) ("rust-version-check" ,rust-version-check-0.9)) #:cargo-development-inputs @@ -13918,7 +13892,7 @@ (define-public rust-nom-4.2 `(#:skip-build? #t #:cargo-inputs (("rust-lazy-static" ,rust-lazy-static-1) - ("rust-memchr" ,rust-memchr-2.2) + ("rust-memchr" ,rust-memchr-2.3) ("rust-regex" ,rust-regex-1) ("rust-version-check" ,rust-version-check-0.1)) #:cargo-development-inputs @@ -14668,7 +14642,7 @@ (define-public rust-odds-0.3 #:cargo-development-inputs (("rust-itertools" ,rust-itertools-0.8) ("rust-lazy-static" ,rust-lazy-static-1) - ("rust-memchr" ,rust-memchr-2.2) + ("rust-memchr" ,rust-memchr-2.3) ("rust-quickcheck" ,rust-quickcheck-0.8)))) (home-page "https://github.com/bluss/odds") (synopsis "Extra functionality for slices, strings and other things") @@ -17652,7 +17626,7 @@ (define-public rust-pulldown-cmark-0.4 #:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) ("rust-getopts" ,rust-getopts-0.2) - ("rust-memchr" ,rust-memchr-2.2) + ("rust-memchr" ,rust-memchr-2.3) ("rust-unicase" ,rust-unicase-2)) #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.2) @@ -19146,7 +19120,7 @@ (define-public rust-regex-0.2 `(#:skip-build? #t #:cargo-inputs (("rust-aho-corasick" ,rust-aho-corasick-0.6) - ("rust-memchr" ,rust-memchr-2.2) + ("rust-memchr" ,rust-memchr-2.3) ("rust-regex-syntax" ,rust-regex-syntax-0.5) ("rust-thread-local" ,rust-thread-local-0.3) ("rust-utf8-ranges" ,rust-utf8-ranges-1.0)) @@ -19525,7 +19499,7 @@ (define-public rust-rusqlite-0.19 ("rust-lazy-static" ,rust-lazy-static-1) ("rust-libsqlite3-sys" ,rust-libsqlite3-sys-0.15) ("rust-lru-cache" ,rust-lru-cache-0.1) - ("rust-memchr" ,rust-memchr-2.2) + ("rust-memchr" ,rust-memchr-2.3) ("rust-serde-json" ,rust-serde-json-1.0) ("rust-time" ,rust-time-0.1) ("rust-url" ,rust-url-1.7) @@ -24388,7 +24362,7 @@ (define-public rust-tokio-0.2 ("rust-iovec" ,rust-iovec-0.1) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-libc" ,rust-libc-0.2) - ("rust-memchr" ,rust-memchr-2.2) + ("rust-memchr" ,rust-memchr-2.3) ("rust-mio" ,rust-mio-0.6) ("rust-mio-named-pipes" ,rust-mio-named-pipes-0.1) ("rust-mio-uds" ,rust-mio-uds-0.6) -- cgit v1.2.3 From 8b47490cf4c8ad0cab8b0580b10188b30753b9e3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 28 Jun 2020 15:34:00 +0300 Subject: gnu: Rename rust-memchr-2.3 to rust-memchr-2. * gnu/packages/crates-io.scm (rust-memchr-2.3): Rename to ... (rust-memchr-2): ... this. (rust-memchr-1.0): Inherit from rust-memchr-2. (rust-aho-corasick-0.7, rust-aho-corasick-0.6, rust-bstr-0.2, rust-csv-core-0.1, rust-futures-util-0.3, rust-futures-util-preview-0.3, rust-grep-matcher-0.1, rust-ignore-0.4, rust-nom-5, rust-nom-4.2, rust-odds-0.3, rust-pulldown-cmark-0.4, rust-regex-1, rust-regex-0.2, rust-rusqlite-0.19, rust-tokio-0.2, rust-aho-corasick-0.7, rust-aho-corasick-0.6, rust-bstr-0.2, rust-csv-core-0.1, rust-futures-util-0.3, rust-futures-util-preview-0.3, rust-grep-matcher-0.1, rust-ignore-0.4, rust-nom-5, rust-nom-4.2, rust-odds-0.3, rust-pulldown-cmark-0.4, rust-regex-1, rust-regex-0.2, rust-rusqlite-0.19, rust-tokio-0.2)[arguments]: Adjust accordingly. --- gnu/packages/crates-io.scm | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index de24af3d9e..f2ad551e50 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -252,7 +252,7 @@ (define-public rust-aho-corasick-0.7 "11hfmqf90rdvjdpk0x1lixw1s9n08y3fxfy9zqsk0k2wpbc68c84")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs (("rust-memchr" ,rust-memchr-2.3)) + `(#:cargo-inputs (("rust-memchr" ,rust-memchr-2)) #:cargo-development-inputs (("rust-doc-comment" ,rust-doc-comment-0.3)))) (home-page "https://github.com/BurntSushi/aho-corasick") @@ -278,7 +278,7 @@ (define-public rust-aho-corasick-0.6 (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-memchr" ,rust-memchr-2.3)) + (("rust-memchr" ,rust-memchr-2)) #:cargo-development-inputs (("rust-csv" ,rust-csv-1.1) ("rust-docopt" ,rust-docopt-1.1) @@ -1973,7 +1973,7 @@ (define-public rust-bstr-0.2 `(#:skip-build? #t #:cargo-inputs (("rust-lazy-static" ,rust-lazy-static-1) - ("rust-memchr" ,rust-memchr-2.3) + ("rust-memchr" ,rust-memchr-2) ("rust-regex-automata" ,rust-regex-automata-0.1) ("rust-serde" ,rust-serde-1.0)) #:cargo-development-inputs @@ -4635,7 +4635,7 @@ (define-public rust-csv-core-0.1 (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-memchr" ,rust-memchr-2.3)) + (("rust-memchr" ,rust-memchr-2)) #:cargo-development-inputs (("rust-arrayvec" ,rust-arrayvec-0.4)))) (home-page "https://github.com/BurntSushi/rust-csv") @@ -7864,7 +7864,7 @@ (define-public rust-futures-util-0.3 ("rust-futures-macro" ,rust-futures-macro-0.3) ("rust-futures-sink" ,rust-futures-sink-0.3) ("rust-futures-task" ,rust-futures-task-0.3) - ("rust-memchr" ,rust-memchr-2.3) + ("rust-memchr" ,rust-memchr-2) ("rust-pin-utils" ,rust-pin-utils-0.1) ("rust-proc-macro-hack" ,rust-proc-macro-hack-0.5) ("rust-proc-macro-nested" ,rust-proc-macro-nested-0.1) @@ -7900,7 +7900,7 @@ (define-public rust-futures-util-preview-0.3 ("rust-futures-select-macro-preview" ,rust-futures-select-macro-preview-0.3) ("rust-futures-sink-preview" ,rust-futures-sink-preview-0.3) - ("rust-memchr" ,rust-memchr-2.3) + ("rust-memchr" ,rust-memchr-2) ("rust-pin-utils" ,rust-pin-utils-0.1) ("rust-proc-macro-hack" ,rust-proc-macro-hack-0.5) ("rust-proc-macro-nested" ,rust-proc-macro-nested-0.1) @@ -9364,7 +9364,7 @@ (define-public rust-grep-matcher-0.1 (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-memchr" ,rust-memchr-2.3)) + (("rust-memchr" ,rust-memchr-2)) #:cargo-development-inputs (("rust-regex" ,rust-regex-1)))) (home-page "https://github.com/BurntSushi/ripgrep") @@ -10402,7 +10402,7 @@ (define-public rust-ignore-0.4 ("rust-globset" ,rust-globset-0.4) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-log" ,rust-log-0.4) - ("rust-memchr" ,rust-memchr-2.3) + ("rust-memchr" ,rust-memchr-2) ("rust-regex" ,rust-regex-1) ("rust-same-file" ,rust-same-file-1.0) ("rust-thread-local" ,rust-thread-local-1.0) @@ -12760,7 +12760,7 @@ (define-public rust-md5-asm-0.4 (supported-systems '("x86_64-linux" "i686-linux")) (license license:expat))) -(define-public rust-memchr-2.3 +(define-public rust-memchr-2 (package (name "rust-memchr") (version "2.3.3") @@ -12786,7 +12786,7 @@ (define-public rust-memchr-2.3 (define-public rust-memchr-1.0 (package - (inherit rust-memchr-2.3) + (inherit rust-memchr-2) (name "rust-memchr") (version "1.0.2") (source @@ -13849,7 +13849,7 @@ (define-public rust-nom-5 #:cargo-inputs (("rust-lazy-static" ,rust-lazy-static-1) ("rust-lexical-core" ,rust-lexical-core-0.7) - ("rust-memchr" ,rust-memchr-2.3) + ("rust-memchr" ,rust-memchr-2) ("rust-regex" ,rust-regex-1) ("rust-version-check" ,rust-version-check-0.9)) #:cargo-development-inputs @@ -13892,7 +13892,7 @@ (define-public rust-nom-4.2 `(#:skip-build? #t #:cargo-inputs (("rust-lazy-static" ,rust-lazy-static-1) - ("rust-memchr" ,rust-memchr-2.3) + ("rust-memchr" ,rust-memchr-2) ("rust-regex" ,rust-regex-1) ("rust-version-check" ,rust-version-check-0.1)) #:cargo-development-inputs @@ -14642,7 +14642,7 @@ (define-public rust-odds-0.3 #:cargo-development-inputs (("rust-itertools" ,rust-itertools-0.8) ("rust-lazy-static" ,rust-lazy-static-1) - ("rust-memchr" ,rust-memchr-2.3) + ("rust-memchr" ,rust-memchr-2) ("rust-quickcheck" ,rust-quickcheck-0.8)))) (home-page "https://github.com/bluss/odds") (synopsis "Extra functionality for slices, strings and other things") @@ -17626,7 +17626,7 @@ (define-public rust-pulldown-cmark-0.4 #:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) ("rust-getopts" ,rust-getopts-0.2) - ("rust-memchr" ,rust-memchr-2.3) + ("rust-memchr" ,rust-memchr-2) ("rust-unicase" ,rust-unicase-2)) #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.2) @@ -19087,7 +19087,7 @@ (define-public rust-regex-1 (arguments `(#:cargo-inputs (("rust-aho-corasick" ,rust-aho-corasick-0.7) - ("rust-memchr" ,rust-memchr-2.3) + ("rust-memchr" ,rust-memchr-2) ("rust-regex-syntax" ,rust-regex-syntax-0.6) ("rust-thread-local" ,rust-thread-local-1.0)) #:cargo-development-inputs @@ -19120,7 +19120,7 @@ (define-public rust-regex-0.2 `(#:skip-build? #t #:cargo-inputs (("rust-aho-corasick" ,rust-aho-corasick-0.6) - ("rust-memchr" ,rust-memchr-2.3) + ("rust-memchr" ,rust-memchr-2) ("rust-regex-syntax" ,rust-regex-syntax-0.5) ("rust-thread-local" ,rust-thread-local-0.3) ("rust-utf8-ranges" ,rust-utf8-ranges-1.0)) @@ -19499,7 +19499,7 @@ (define-public rust-rusqlite-0.19 ("rust-lazy-static" ,rust-lazy-static-1) ("rust-libsqlite3-sys" ,rust-libsqlite3-sys-0.15) ("rust-lru-cache" ,rust-lru-cache-0.1) - ("rust-memchr" ,rust-memchr-2.3) + ("rust-memchr" ,rust-memchr-2) ("rust-serde-json" ,rust-serde-json-1.0) ("rust-time" ,rust-time-0.1) ("rust-url" ,rust-url-1.7) @@ -24362,7 +24362,7 @@ (define-public rust-tokio-0.2 ("rust-iovec" ,rust-iovec-0.1) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-libc" ,rust-libc-0.2) - ("rust-memchr" ,rust-memchr-2.3) + ("rust-memchr" ,rust-memchr-2) ("rust-mio" ,rust-mio-0.6) ("rust-mio-named-pipes" ,rust-mio-named-pipes-0.1) ("rust-mio-uds" ,rust-mio-uds-0.6) -- cgit v1.2.3 From eeb5b092194c5642b03bcfad57ebbd141c07ec89 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 28 Jun 2020 15:39:56 +0300 Subject: gnu: rust-csv-core-0.1: Fix build. * gnu/packages/crates-io.scm (rust-csv-core-0.1)[arguments]: Replace rust-arrayvec-0.4 with 0.5 in cargo-development-inputs. --- gnu/packages/crates-io.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f2ad551e50..7428fb8165 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4637,7 +4637,7 @@ (define-public rust-csv-core-0.1 `(#:cargo-inputs (("rust-memchr" ,rust-memchr-2)) #:cargo-development-inputs - (("rust-arrayvec" ,rust-arrayvec-0.4)))) + (("rust-arrayvec" ,rust-arrayvec-0.5)))) (home-page "https://github.com/BurntSushi/rust-csv") (synopsis "Bare bones CSV parsing with no_std support") -- cgit v1.2.3 From def4344cc0626ad8ff9bf15fcb38c710c808fa3c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 28 Jun 2020 19:31:53 +0300 Subject: gnu: Remove rust-bincode-1.1. * gnu/packages/crates-io.scm (rust-bincode-1.1): Remove variable. (rust-encoding-rs-0.8, rust-generic-array-0.13, rust-parking-lot-0.10, rust-parking-lot-0.9, rust-parking-lot-0.8, rust-parking-lot-0.7, rust-rand-0.5, rust-rand-isaac-0.2, rust-rand-isaac-0.1, rust-rand-pcg-0.2, rust-rand-pcg-0.1, rust-rand-xorshift-0.2, rust-rand-xorshift-0.1, rust-rand-xoshiro-0.4, rust-rand-xoshiro-0.3, rust-serde-bytes-0.11, rust-smallvec-1, rust-smallvec-0.6, rust-uuid-0.7) [arguments]: Replace rust-bincode-1.1 with 1.2. --- gnu/packages/crates-io.scm | 62 ++++++++++++++-------------------------------- 1 file changed, 19 insertions(+), 43 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7428fb8165..46d4c6e43a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1278,30 +1278,6 @@ (define-public rust-bincode-1.2 that uses Serde for transforming structs into bytes and vice versa!") (license license:expat))) -(define-public rust-bincode-1.1 - (package - (inherit rust-bincode-1.2) - (name "rust-bincode") - (version "1.1.4") - (source - (origin - (method url-fetch) - (uri (crate-uri "bincode" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1xx6bp39irvsndk6prnmmq8m1l9p6q2qj21j6mfks2y81pjsa14z")))) - (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-autocfg" ,rust-autocfg-0.1) - ("rust-byteorder" ,rust-byteorder-1.3) - ("rust-serde" ,rust-serde-1.0)) - #:cargo-development-inputs - (("rust-serde-bytes" ,rust-serde-bytes-0.11) - ("rust-serde-derive" ,rust-serde-derive-1.0)))))) - (define-public rust-bindgen-0.52 (package (name "rust-bindgen") @@ -6046,7 +6022,7 @@ (define-public rust-encoding-rs-0.8 ("rust-packed-simd" ,rust-packed-simd-0.3) ("rust-serde" ,rust-serde-1.0)) #:cargo-development-inputs - (("rust-bincode" ,rust-bincode-1.1) + (("rust-bincode" ,rust-bincode-1.2) ("rust-serde-derive" ,rust-serde-derive-1.0) ("rust-serde-json" ,rust-serde-json-1.0)))) (home-page "https://docs.rs/encoding_rs/") @@ -8134,7 +8110,7 @@ (define-public rust-generic-array-0.13 (("rust-serde" ,rust-serde-1.0) ("rust-typenum" ,rust-typenum-1)) #:cargo-development-inputs - (("rust-bincode" ,rust-bincode-1.1) + (("rust-bincode" ,rust-bincode-1.2) ("rust-serde-json" ,rust-serde-json-1.0)))))) (define-public rust-generic-array-0.12 @@ -15530,7 +15506,7 @@ (define-public rust-parking-lot-0.10 (("rust-lock-api" ,rust-lock-api-0.3) ("rust-parking-lot-core" ,rust-parking-lot-core-0.7)) #:cargo-development-inputs - (("rust-bincode" ,rust-bincode-1.1) + (("rust-bincode" ,rust-bincode-1.2) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-rand" ,rust-rand-0.7)))) (home-page "https://github.com/Amanieu/parking_lot") @@ -15560,7 +15536,7 @@ (define-public rust-parking-lot-0.9 (("rust-lock-api" ,rust-lock-api-0.3) ("rust-parking-lot-core" ,rust-parking-lot-core-0.6)) #:cargo-development-inputs - (("rust-bincode" ,rust-bincode-1.1) + (("rust-bincode" ,rust-bincode-1.2) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-rand" ,rust-rand-0.4) ("rust-rustc-version" ,rust-rustc-version-0.2)))))) @@ -15585,7 +15561,7 @@ (define-public rust-parking-lot-0.8 (("rust-lock-api" ,rust-lock-api-0.2) ("rust-parking-lot-core" ,rust-parking-lot-core-0.5)) #:cargo-development-inputs - (("rust-bincode" ,rust-bincode-1.1) + (("rust-bincode" ,rust-bincode-1.2) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-rand" ,rust-rand-0.4) ("rust-rustc-version" ,rust-rustc-version-0.2)))))) @@ -15610,7 +15586,7 @@ (define-public rust-parking-lot-0.7 (("rust-lock-api" ,rust-lock-api-0.1) ("rust-parking-lot-core" ,rust-parking-lot-core-0.4)) #:cargo-development-inputs - (("rust-bincode" ,rust-bincode-1.1) + (("rust-bincode" ,rust-bincode-1.2) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-rand" ,rust-rand-0.4) ("rust-rustc-version" ,rust-rustc-version-0.2)))))) @@ -18147,7 +18123,7 @@ (define-public rust-rand-0.5 ("rust-stdweb" ,rust-stdweb-0.4) ("rust-winapi" ,rust-winapi-0.3)) #:cargo-development-inputs - (("rust-bincode" ,rust-bincode-1.1)))))) + (("rust-bincode" ,rust-bincode-1.2)))))) (define-public rust-rand-0.4 (package @@ -18368,7 +18344,7 @@ (define-public rust-rand-isaac-0.2 (("rust-rand-core" ,rust-rand-core-0.5) ("rust-serde" ,rust-serde-1.0)) #:cargo-development-inputs - (("rust-bincode" ,rust-bincode-1.1)))) + (("rust-bincode" ,rust-bincode-1.2)))) (home-page "https://crates.io/crates/rand_isaac") (synopsis "ISAAC random number generator") (description "This package implements the @code{ISAAC} and @code{ISAAC-64} @@ -18395,7 +18371,7 @@ (define-public rust-rand-isaac-0.1 ("rust-serde" ,rust-serde-1.0) ("rust-serde-derive" ,rust-serde-derive-1.0)) #:cargo-development-inputs - (("rust-bincode" ,rust-bincode-1.1)))))) + (("rust-bincode" ,rust-bincode-1.2)))))) (define-public rust-rand-jitter-0.1 (package @@ -18490,7 +18466,7 @@ (define-public rust-rand-pcg-0.2 (("rust-rand-core" ,rust-rand-core-0.5) ("rust-serde" ,rust-serde-1.0)) #:cargo-development-inputs - (("rust-bincode" ,rust-bincode-1.1)))) + (("rust-bincode" ,rust-bincode-1.2)))) (home-page "https://crates.io/crates/rand_pcg") (synopsis "Selected PCG random number generators") @@ -18519,7 +18495,7 @@ (define-public rust-rand-pcg-0.1 ("rust-serde" ,rust-serde-1.0) ("rust-serde-derive" ,rust-serde-derive-1.0)) #:cargo-development-inputs - (("rust-bincode" ,rust-bincode-1.1)))))) + (("rust-bincode" ,rust-bincode-1.2)))))) (define-public rust-rand-xorshift-0.2 (package @@ -18540,7 +18516,7 @@ (define-public rust-rand-xorshift-0.2 (("rust-rand-core" ,rust-rand-core-0.5) ("rust-serde" ,rust-serde-1.0)) #:cargo-development-inputs - (("rust-bincode" ,rust-bincode-1.1)))) + (("rust-bincode" ,rust-bincode-1.2)))) (home-page "https://crates.io/crates/rand-xorshift") (synopsis "Xorshift random number generator") (description @@ -18566,7 +18542,7 @@ (define-public rust-rand-xorshift-0.1 ("rust-serde" ,rust-serde-1.0) ("rust-serde-derive" ,rust-serde-derive-1.0)) #:cargo-development-inputs - (("rust-bincode" ,rust-bincode-1.1)))) + (("rust-bincode" ,rust-bincode-1.2)))) (home-page "https://crates.io/crates/rand-xorshift") (synopsis "Xorshift random number generator") (description @@ -18593,7 +18569,7 @@ (define-public rust-rand-xoshiro-0.4 (("rust-rand-core" ,rust-rand-core-0.5) ("rust-serde" ,rust-serde-1.0)) #:cargo-development-inputs - (("rust-bincode" ,rust-bincode-1.1)))) + (("rust-bincode" ,rust-bincode-1.2)))) (home-page "https://crates.io/crates/rand_xoshiro") (synopsis "Xoshiro, xoroshiro and splitmix64 random number generators") (description "This package provides the xoshiro, xoroshiro and splitmix64 @@ -18620,7 +18596,7 @@ (define-public rust-rand-xoshiro-0.3 ("rust-rand-core" ,rust-rand-core-0.5) ("rust-serde" ,rust-serde-1.0)) #:cargo-development-inputs - (("rust-bincode" ,rust-bincode-1.1)))))) + (("rust-bincode" ,rust-bincode-1.2)))))) (define-public rust-rand-xoshiro-0.1 (package @@ -20956,7 +20932,7 @@ (define-public rust-serde-bytes-0.11 #:cargo-inputs (("rust-serde" ,rust-serde-1.0)) #:cargo-development-inputs - (("rust-bincode" ,rust-bincode-1.1) + (("rust-bincode" ,rust-bincode-1.2) ("rust-serde-derive" ,rust-serde-derive-1.0) ("rust-serde-test" ,rust-serde-test-1.0)))) (home-page "https://github.com/serde-rs/bytes") @@ -22091,7 +22067,7 @@ (define-public rust-smallvec-1 `(#:cargo-inputs (("rust-serde" ,rust-serde-1.0)) #:cargo-development-inputs - (("rust-bincode" ,rust-bincode-1.1)))) + (("rust-bincode" ,rust-bincode-1.2)))) (home-page "https://github.com/servo/rust-smallvec") (synopsis "Small vector optimization") (description @@ -22118,7 +22094,7 @@ (define-public rust-smallvec-0.6 (("rust-maybe-uninit" ,rust-maybe-uninit-2.0) ("rust-serde" ,rust-serde-1.0)) #:cargo-development-inputs - (("rust-bincode" ,rust-bincode-1.1)))))) + (("rust-bincode" ,rust-bincode-1.2)))))) (define-public rust-smithay-client-toolkit-0.6 (package @@ -26138,7 +26114,7 @@ (define-public rust-uuid-0.7 ("rust-slog" ,rust-slog-2.4) ("rust-winapi" ,rust-winapi-0.3)) #:cargo-development-inputs - (("rust-bincode" ,rust-bincode-1.1) + (("rust-bincode" ,rust-bincode-1.2) ("rust-serde-derive" ,rust-serde-derive-1.0) ("rust-serde-json" ,rust-serde-json-1.0) ("rust-serde-test" ,rust-serde-test-1.0)))) -- cgit v1.2.3 From 3d567e7c6bb3061d4a2e47049523999e5362e98f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 28 Jun 2020 19:35:46 +0300 Subject: gnu: Rename rust-bincode-1.2 to rust-bincode-1. * gnu/packages/crates-io.scm (rust-bincode-1.2): Rename to ... (rust-bincode-1): ... this. (rust-encoding-rs-0.8, rust-generic-array-0.14, rust-generic-array-0.13, rust-parking-lot-0.10, rust-parking-lot-0.9, rust-parking-lot-0.8, rust-parking-lot-0.7, rust-rand-0.5, rust-rand-isaac-0.2, rust-rand-isaac-0.1, rust-rand-pcg-0.2, rust-rand-pcg-0.1, rust-rand-xorshift-0.2, rust-rand-xorshift-0.1, rust-rand-xoshiro-0.4, rust-rand-xoshiro-0.3, rust-serde-bytes-0.11, rust-smallvec-1, rust-smallvec-0.6, rust-syntect-3.3, rust-uuid-0.7)[arguments]: Adjust accordingly. --- gnu/packages/crates-io.scm | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 46d4c6e43a..2f253f27e7 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1249,7 +1249,7 @@ (define-public rust-better-panic-0.2 tracebacks.") (license (list license:expat license:asl2.0)))) -(define-public rust-bincode-1.2 +(define-public rust-bincode-1 (package (name "rust-bincode") (version "1.2.1") @@ -6022,7 +6022,7 @@ (define-public rust-encoding-rs-0.8 ("rust-packed-simd" ,rust-packed-simd-0.3) ("rust-serde" ,rust-serde-1.0)) #:cargo-development-inputs - (("rust-bincode" ,rust-bincode-1.2) + (("rust-bincode" ,rust-bincode-1) ("rust-serde-derive" ,rust-serde-derive-1.0) ("rust-serde-json" ,rust-serde-json-1.0)))) (home-page "https://docs.rs/encoding_rs/") @@ -8082,7 +8082,7 @@ (define-public rust-generic-array-0.14 ("rust-typenum" ,rust-typenum-1) ("rust-version-check" ,rust-version-check-0.9)) #:cargo-development-inputs - (("rust-bincode" ,rust-bincode-1.2) + (("rust-bincode" ,rust-bincode-1) ("rust-serde-json" ,rust-serde-json-1.0)))) (home-page "https://github.com/fizyk20/generic-array.git") (synopsis @@ -8110,7 +8110,7 @@ (define-public rust-generic-array-0.13 (("rust-serde" ,rust-serde-1.0) ("rust-typenum" ,rust-typenum-1)) #:cargo-development-inputs - (("rust-bincode" ,rust-bincode-1.2) + (("rust-bincode" ,rust-bincode-1) ("rust-serde-json" ,rust-serde-json-1.0)))))) (define-public rust-generic-array-0.12 @@ -15506,7 +15506,7 @@ (define-public rust-parking-lot-0.10 (("rust-lock-api" ,rust-lock-api-0.3) ("rust-parking-lot-core" ,rust-parking-lot-core-0.7)) #:cargo-development-inputs - (("rust-bincode" ,rust-bincode-1.2) + (("rust-bincode" ,rust-bincode-1) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-rand" ,rust-rand-0.7)))) (home-page "https://github.com/Amanieu/parking_lot") @@ -15536,7 +15536,7 @@ (define-public rust-parking-lot-0.9 (("rust-lock-api" ,rust-lock-api-0.3) ("rust-parking-lot-core" ,rust-parking-lot-core-0.6)) #:cargo-development-inputs - (("rust-bincode" ,rust-bincode-1.2) + (("rust-bincode" ,rust-bincode-1) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-rand" ,rust-rand-0.4) ("rust-rustc-version" ,rust-rustc-version-0.2)))))) @@ -15561,7 +15561,7 @@ (define-public rust-parking-lot-0.8 (("rust-lock-api" ,rust-lock-api-0.2) ("rust-parking-lot-core" ,rust-parking-lot-core-0.5)) #:cargo-development-inputs - (("rust-bincode" ,rust-bincode-1.2) + (("rust-bincode" ,rust-bincode-1) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-rand" ,rust-rand-0.4) ("rust-rustc-version" ,rust-rustc-version-0.2)))))) @@ -15586,7 +15586,7 @@ (define-public rust-parking-lot-0.7 (("rust-lock-api" ,rust-lock-api-0.1) ("rust-parking-lot-core" ,rust-parking-lot-core-0.4)) #:cargo-development-inputs - (("rust-bincode" ,rust-bincode-1.2) + (("rust-bincode" ,rust-bincode-1) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-rand" ,rust-rand-0.4) ("rust-rustc-version" ,rust-rustc-version-0.2)))))) @@ -18123,7 +18123,7 @@ (define-public rust-rand-0.5 ("rust-stdweb" ,rust-stdweb-0.4) ("rust-winapi" ,rust-winapi-0.3)) #:cargo-development-inputs - (("rust-bincode" ,rust-bincode-1.2)))))) + (("rust-bincode" ,rust-bincode-1)))))) (define-public rust-rand-0.4 (package @@ -18344,7 +18344,7 @@ (define-public rust-rand-isaac-0.2 (("rust-rand-core" ,rust-rand-core-0.5) ("rust-serde" ,rust-serde-1.0)) #:cargo-development-inputs - (("rust-bincode" ,rust-bincode-1.2)))) + (("rust-bincode" ,rust-bincode-1)))) (home-page "https://crates.io/crates/rand_isaac") (synopsis "ISAAC random number generator") (description "This package implements the @code{ISAAC} and @code{ISAAC-64} @@ -18371,7 +18371,7 @@ (define-public rust-rand-isaac-0.1 ("rust-serde" ,rust-serde-1.0) ("rust-serde-derive" ,rust-serde-derive-1.0)) #:cargo-development-inputs - (("rust-bincode" ,rust-bincode-1.2)))))) + (("rust-bincode" ,rust-bincode-1)))))) (define-public rust-rand-jitter-0.1 (package @@ -18466,7 +18466,7 @@ (define-public rust-rand-pcg-0.2 (("rust-rand-core" ,rust-rand-core-0.5) ("rust-serde" ,rust-serde-1.0)) #:cargo-development-inputs - (("rust-bincode" ,rust-bincode-1.2)))) + (("rust-bincode" ,rust-bincode-1)))) (home-page "https://crates.io/crates/rand_pcg") (synopsis "Selected PCG random number generators") @@ -18495,7 +18495,7 @@ (define-public rust-rand-pcg-0.1 ("rust-serde" ,rust-serde-1.0) ("rust-serde-derive" ,rust-serde-derive-1.0)) #:cargo-development-inputs - (("rust-bincode" ,rust-bincode-1.2)))))) + (("rust-bincode" ,rust-bincode-1)))))) (define-public rust-rand-xorshift-0.2 (package @@ -18516,7 +18516,7 @@ (define-public rust-rand-xorshift-0.2 (("rust-rand-core" ,rust-rand-core-0.5) ("rust-serde" ,rust-serde-1.0)) #:cargo-development-inputs - (("rust-bincode" ,rust-bincode-1.2)))) + (("rust-bincode" ,rust-bincode-1)))) (home-page "https://crates.io/crates/rand-xorshift") (synopsis "Xorshift random number generator") (description @@ -18542,7 +18542,7 @@ (define-public rust-rand-xorshift-0.1 ("rust-serde" ,rust-serde-1.0) ("rust-serde-derive" ,rust-serde-derive-1.0)) #:cargo-development-inputs - (("rust-bincode" ,rust-bincode-1.2)))) + (("rust-bincode" ,rust-bincode-1)))) (home-page "https://crates.io/crates/rand-xorshift") (synopsis "Xorshift random number generator") (description @@ -18569,7 +18569,7 @@ (define-public rust-rand-xoshiro-0.4 (("rust-rand-core" ,rust-rand-core-0.5) ("rust-serde" ,rust-serde-1.0)) #:cargo-development-inputs - (("rust-bincode" ,rust-bincode-1.2)))) + (("rust-bincode" ,rust-bincode-1)))) (home-page "https://crates.io/crates/rand_xoshiro") (synopsis "Xoshiro, xoroshiro and splitmix64 random number generators") (description "This package provides the xoshiro, xoroshiro and splitmix64 @@ -18596,7 +18596,7 @@ (define-public rust-rand-xoshiro-0.3 ("rust-rand-core" ,rust-rand-core-0.5) ("rust-serde" ,rust-serde-1.0)) #:cargo-development-inputs - (("rust-bincode" ,rust-bincode-1.2)))))) + (("rust-bincode" ,rust-bincode-1)))))) (define-public rust-rand-xoshiro-0.1 (package @@ -20932,7 +20932,7 @@ (define-public rust-serde-bytes-0.11 #:cargo-inputs (("rust-serde" ,rust-serde-1.0)) #:cargo-development-inputs - (("rust-bincode" ,rust-bincode-1.2) + (("rust-bincode" ,rust-bincode-1) ("rust-serde-derive" ,rust-serde-derive-1.0) ("rust-serde-test" ,rust-serde-test-1.0)))) (home-page "https://github.com/serde-rs/bytes") @@ -22067,7 +22067,7 @@ (define-public rust-smallvec-1 `(#:cargo-inputs (("rust-serde" ,rust-serde-1.0)) #:cargo-development-inputs - (("rust-bincode" ,rust-bincode-1.2)))) + (("rust-bincode" ,rust-bincode-1)))) (home-page "https://github.com/servo/rust-smallvec") (synopsis "Small vector optimization") (description @@ -22094,7 +22094,7 @@ (define-public rust-smallvec-0.6 (("rust-maybe-uninit" ,rust-maybe-uninit-2.0) ("rust-serde" ,rust-serde-1.0)) #:cargo-development-inputs - (("rust-bincode" ,rust-bincode-1.2)))))) + (("rust-bincode" ,rust-bincode-1)))))) (define-public rust-smithay-client-toolkit-0.6 (package @@ -23297,7 +23297,7 @@ (define-public rust-syntect-3.3 ("rust-fnv" ,rust-fnv-1.0) ("rust-bitflags" ,rust-bitflags-1) ("rust-lazycell" ,rust-lazycell-1.2) - ("rust-bincode" ,rust-bincode-1.2) + ("rust-bincode" ,rust-bincode-1) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-walkdir" ,rust-walkdir-2.3) ("rust-onig" ,rust-onig-5.0)))) @@ -26114,7 +26114,7 @@ (define-public rust-uuid-0.7 ("rust-slog" ,rust-slog-2.4) ("rust-winapi" ,rust-winapi-0.3)) #:cargo-development-inputs - (("rust-bincode" ,rust-bincode-1.2) + (("rust-bincode" ,rust-bincode-1) ("rust-serde-derive" ,rust-serde-derive-1.0) ("rust-serde-json" ,rust-serde-json-1.0) ("rust-serde-test" ,rust-serde-test-1.0)))) -- cgit v1.2.3 From fa2a4055691984950580ff180abb2c64946bfd71 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 28 Jun 2020 19:42:05 +0300 Subject: gnu: rust-bincode-1: Update to 1.3.1. * gnu/packages/crates-io.scm (rust-bincode-1): Update to 1.3.1. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2f253f27e7..acd0376f38 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1252,7 +1252,7 @@ (define-public rust-better-panic-0.2 (define-public rust-bincode-1 (package (name "rust-bincode") - (version "1.2.1") + (version "1.3.1") (source (origin (method url-fetch) @@ -1261,7 +1261,7 @@ (define-public rust-bincode-1 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1gvxm3n67xv1874fwxmnlircdlphlk1hcw75ykrrnw9l2nky4lsp")))) + "0vc9pjh6hfp9vfq752sa88rxwg93ydhm0dvvy58rcvx2p8wkl3gk")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From 36da62f1b9c78a2729658143a7df1845cd532afa Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 28 Jun 2020 19:44:23 +0300 Subject: gnu: Remove rust-rustc-hash-1.0. * gnu/packages/crates-io.scm (rust-rustc-hash-1.0): Remove variable. (rust-hashbrown-0.5, rust-rusttype-0.8) [arguments]: Replace rust-rustc-hash-1.0 with 1.1. --- gnu/packages/crates-io.scm | 32 +++----------------------------- 1 file changed, 3 insertions(+), 29 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index acd0376f38..e2a2f2ba73 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9650,7 +9650,7 @@ (define-public rust-hashbrown-0.5 (("rust-lazy-static" ,rust-lazy-static-1) ("rust-rand" ,rust-rand-0.5) ("rust-rayon" ,rust-rayon-1) - ("rust-rustc-hash" ,rust-rustc-hash-1.0) + ("rust-rustc-hash" ,rust-rustc-hash-1.1) ("rust-serde-test" ,rust-serde-test-1.0)))) (home-page "https://github.com/rust-lang/hashbrown") (synopsis "Rust port of Google's SwissTable hash map") @@ -19694,37 +19694,11 @@ (define-public rust-rustc-hash-1.1 "1qkc5khrmv5pqi5l5ca9p5nl5hs742cagrndhbrlk3dhlrx3zm08")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t)) - (home-page - "https://github.com/rust-lang-nursery/rustc-hash") - (synopsis - "speed, non-cryptographic hash used in rustc") - (description - "speed, non-cryptographic hash used in rustc") - (license (list license:asl2.0 license:expat)))) - -(define-public rust-rustc-hash-1.0 - (package - (name "rust-rustc-hash") - (version "1.0.1") - (source - (origin - (method url-fetch) - (uri (crate-uri "rustc-hash" version)) - (file-name (string-append name "-" version ".crate")) - (sha256 - (base32 - "1f4cnbcmz2c3zjidqszc9c4fip37ch4xl74nkkp9dw291j5zqh3m")))) - (build-system cargo-build-system) - (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-byteorder" ,rust-byteorder-1.3)))) (home-page "https://github.com/rust-lang/rustc-hash") (synopsis "Speedy, non-cryptographic hash used in rustc") (description "This package provides a speedy, non-cryptographic hash used in rustc.") - (license (list license:asl2.0 - license:expat)))) + (license (list license:asl2.0 license:expat)))) (define-public rust-rustc-serialize-0.3 (package @@ -20037,7 +20011,7 @@ (define-public rust-rusttype-0.8 ("rust-linked-hash-map" ,rust-linked-hash-map-0.5) ("rust-num-cpus" ,rust-num-cpus-1) ("rust-ordered-float" ,rust-ordered-float-1.0) - ("rust-rustc-hash" ,rust-rustc-hash-1.0) + ("rust-rustc-hash" ,rust-rustc-hash-1.1) ("rust-stb-truetype" ,rust-stb-truetype-0.3)))) (home-page "https://gitlab.redox-os.org/redox-os/rusttype") (synopsis "Pure Rust alternative to libraries like FreeType") -- cgit v1.2.3 From ba250300980a0408716c50a4656d9aaf85fcfca4 Mon Sep 17 00:00:00 2001 From: Fredrik Salomonsson Date: Sat, 27 Jun 2020 14:26:57 -0700 Subject: gnu: Add emacs-libyaml. * gnu/packages/emacs-xyz.scm (emacs-libyaml): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 53 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 463cdabdd3..46b546fa2d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -142,6 +142,7 @@ (define-module (gnu packages emacs-xyz) #:use-module (gnu packages version-control) #:use-module (gnu packages imagemagick) #:use-module (gnu packages w3m) + #:use-module (gnu packages web) #:use-module (gnu packages wget) #:use-module (gnu packages autotools) #:use-module (gnu packages base) @@ -19277,6 +19278,58 @@ (define-public emacs-treemacs-extra (lambda _ (copy-recursively "../extra" "."))))))))) +(define-public emacs-libyaml + ;; Upstream made no release so far. + (let ((version "0") + (revision "1") + (commit "703e0d448c7ee24e25b513a3c65980c80e166805")) + (package + (name "emacs-libyaml") + (version (git-version version revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/syohex/emacs-libyaml") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "08l7pm9v50ykd3fkbm0bh2kcd57cadbc5i9r6rj51vd32w3pl2yl")))) + (build-system emacs-build-system) + (arguments + `(#:tests? #f ;no test + #:modules ((guix build emacs-build-system) + (guix build emacs-utils) + (guix build utils)) + #:imported-modules (,@%emacs-build-system-modules + (guix build gnu-build-system)) + #:phases + (modify-phases %standard-phases + (add-before 'add-source-to-load-path 'substitute-libyaml-core-path + (lambda* (#:key outputs #:allow-other-keys) + (chmod "libyaml.el" #o644) + (substitute* "libyaml.el" + (("^\\(require 'libyaml-core\\)") + (string-append "(module-load \"" (assoc-ref outputs "out") + "/lib/libyaml-core.so\")"))) + #t)) + (add-after 'check 'make + ;; Run make. + (lambda* (#:key (make-flags '()) outputs #:allow-other-keys) + ;; Compile the shared object file. + (apply invoke "make" "all" "CPPFLAGS=" make-flags) + ;; Move the file into /lib. + (install-file "libyaml-core.so" + (string-append (assoc-ref outputs "out") "/lib")) + #t))))) + (native-inputs `(("libyaml" ,libyaml))) + (home-page "https://github.com/syohex/emacs-libyaml") + (synopsis "Libyaml bindings for Emacs") + (description + "This package implements bindings for LibYAML to be able to parse YAML +files in Elisp.") + (license license:gpl3+)))) + (define-public emacs-lsp-java (package (name "emacs-lsp-java") -- cgit v1.2.3 From 0dbaaf592b814a95a50acbed8768ebb940ea966e Mon Sep 17 00:00:00 2001 From: Simon South Date: Sat, 27 Jun 2020 14:56:46 -0400 Subject: gnu: emacs-elpher: Update to 2.9.1. * gnu/packages/emacs-xyz.scm (emacs-elpher): Update to 2.9.1. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 46b546fa2d..892182a42b 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -21040,7 +21040,7 @@ (define-public emacs-multi-term (define-public emacs-elpher (package (name "emacs-elpher") - (version "2.7.9") + (version "2.9.1") (source (origin (method git-fetch) @@ -21049,8 +21049,7 @@ (define-public emacs-elpher (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "1vikzia87z5x3wx2qjihv0r2f29b7s9xkm6i1j0y646dwnzn6wzr")))) + (base32 "0vyqmv7dycmad1726yb6yizd21x3kkz5cj33mca11r8nh38f1qzp")))) (build-system emacs-build-system) (native-inputs `(("texinfo" ,texinfo))) -- cgit v1.2.3 From 7dd2005f114f775ea75bc66b580eaca540ba8475 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sat, 27 Jun 2020 13:00:38 +0200 Subject: gnu: warzone2100: Update to 3.4.0. * gnu/packages/games.scm (warzone2100): Update to 3.4.0. --- gnu/packages/games.scm | 57 +++++++++++++++++++++++++++++++++++--------------- 1 file changed, 40 insertions(+), 17 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index a4e1bba5dc..f5a410f2c3 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -36,7 +36,7 @@ ;;; Copyright © 2018 Madalin Ionel-Patrascu ;;; Copyright © 2018 Benjamin Slade ;;; Copyright © 2018 Alex Vong -;;; Copyright © 2019 Pierre Neidhardt +;;; Copyright © 2019, 2020 Pierre Neidhardt ;;; Copyright © 2019, 2020 Oleg Pykhalov ;;; Copyright © 2019 Pierre Langlois ;;; Copyright © 2019 Julien Lepiller @@ -153,6 +153,7 @@ (define-module (gnu packages games) #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages readline) + #:use-module (gnu packages ruby) #:use-module (gnu packages shells) #:use-module (gnu packages sdl) #:use-module (gnu packages serialization) @@ -4138,24 +4139,40 @@ (define-public tennix (define-public warzone2100 (package (name "warzone2100") - (version "3.2.3") + (version "3.4.0") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/warzone2100/archives/" - "unsupported/Warzone2100-" - (version-major+minor version) "/" version - "/warzone2100-" version ".tar.xz")) + (uri (string-append "mirror://sourceforge/warzone2100/releases/" + version + "/warzone2100_src.tar.xz")) (sha256 - (base32 "10kmpr4cby95zwqsl1zwx95d9achli6khq7flv6xmrq30a39xazw")))) - (build-system gnu-build-system) + (base32 "0g4qwi9zw0s4pfgrz3fxhargsj3405rbrh9zy3b2j3arzss2h0gy")) + (modules '((guix build utils))) + (snippet + '(begin + (with-directory-excursion "3rdparty" + (for-each + delete-file-recursively + '("discord-rpc" + "miniupnp" + "utfcpp"))) + #t)))) + (build-system cmake-build-system) (arguments - `(#:configure-flags '("--with-distributor=Guix") + `(#:configure-flags '("-DWZ_DISTRIBUTOR=Guix" + "-DENABLE_DISCORD=off") + #:tests? #f ; TODO: Tests seem to be broken, configure.ac is missing. #:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-utfcpp-include + (lambda _ + (substitute* "lib/framework/wzstring.cpp" + (("") "")) + #t)) (add-after 'unpack 'link-tests-with-qt (lambda _ - (substitute* "tests/Makefile.in" + (substitute* "tests/Makefile.am" (("(framework_linktest_LDADD|maptest_LDADD) = " prefix) (string-append prefix "$(QT5_LIBS) "))) #t)) @@ -4166,32 +4183,38 @@ (define-public warzone2100 (string-append "iV_DrawTextRotated(\"Press ESC to exit.\", " "100, 100, 0.0f, font_regular);"))) #t))))) - (native-inputs `(("gettext" ,gettext-minimal) + (native-inputs `(("asciidoc" ,asciidoc) + ("asciidoctor" ,ruby-asciidoctor) + ("gettext" ,gettext-minimal) ("pkg-config" ,pkg-config) ("unzip" ,unzip) - ("zip" ,zip))) - (inputs `(("fontconfig" ,fontconfig) + ;; 7z is used to create .zip archive, not `zip' as in version 3.2.*. + ("p7zip" ,p7zip))) + (inputs `(("curl" ,curl) + ("fontconfig" ,fontconfig) ("freetype" ,freetype) - ("fribidi" ,fribidi) ("glew" ,glew) ("harfbuzz" ,harfbuzz) ("libtheora" ,libtheora) ("libvorbis" ,libvorbis) ("libxrandr" ,libxrandr) + ("libsodium" ,libsodium) + ("miniupnpc" ,miniupnpc) ("openal" ,openal) ("physfs" ,physfs) ("qtbase" ,qtbase) ("qtscript" ,qtscript) ("openssl" ,openssl) - ("sdl2" ,sdl2))) + ("sdl2" ,sdl2) + ("utfcpp" ,utfcpp))) (home-page "https://wz2100.net") (synopsis "3D Real-time strategy and real-time tactics game") (description "Warzone 2100 offers campaign, multi-player, and single-player skirmish -modes. An extensive tech tree with over 400 different technologies, combined +modes. An extensive tech tree with over 400 different technologies, combined with the unit design system, allows for a wide variety of possible units and tactics.") - ; Everything is GPLv2+ unless otherwise specified in COPYING.NONGPL + ;; Everything is GPLv2+ unless otherwise specified in COPYING.NONGPL (license (list license:bsd-3 license:cc0 license:cc-by-sa3.0 -- cgit v1.2.3 From e1f2f3df84ecdff2b0f67d49ecb667d8c4a1ee26 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Sun, 28 Jun 2020 22:26:39 +0200 Subject: services: virtualization: Export hurd-vm-configuration accessors. * gnu/services/virtualization.scm (hurd-vm-id, hurd-vm-options): Rename export to ... (hurd-vm-configuration-id, hurd-vm-configuration-options): ... these correct accessor names. (hurd-vm-configuration?, hurd-vm-configuration-os, hurd-vm-configuration-qemu, hurd-vm-configuration-image, hurd-vm-configuration-disk-size, hurd-vm-configuration-memory-size, hurd-vm-configuration-options, hurd-vm-configuration-id, hurd-vm-configuration-net-options): Export record predicate and accessors. --- gnu/services/virtualization.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gnu/services/virtualization.scm b/gnu/services/virtualization.scm index 36b1738921..b93ed70099 100644 --- a/gnu/services/virtualization.scm +++ b/gnu/services/virtualization.scm @@ -52,10 +52,17 @@ (define-module (gnu services virtualization) #:export (%hurd-vm-operating-system hurd-vm-configuration + hurd-vm-configuration? + hurd-vm-configuration-os + hurd-vm-configuration-qemu + hurd-vm-configuration-image + hurd-vm-configuration-disk-size + hurd-vm-configuration-memory-size + hurd-vm-configuration-options + hurd-vm-configuration-id + hurd-vm-configuration-net-options hurd-vm-disk-image - hurd-vm-id hurd-vm-net-options - hurd-vm-options hurd-vm-service-type libvirt-configuration -- cgit v1.2.3 From 1acc5e11beb1b8eea9fe931455bf2c9a26a69aa3 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 28 Jun 2020 22:36:43 +0200 Subject: processes: Write to $PAGER. * guix/ui.scm (with-paginated-output-port): Export. * guix/scripts/processes.scm (guix-processes): Use it instead of writing directly to (current-output-port). --- guix/scripts/processes.scm | 11 ++++++----- guix/ui.scm | 1 + 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/guix/scripts/processes.scm b/guix/scripts/processes.scm index a2ab017490..01f7213e8c 100644 --- a/guix/scripts/processes.scm +++ b/guix/scripts/processes.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2018, 2019 Ludovic Courtès +;;; Copyright © 2018, 2019, 2020 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -231,7 +231,8 @@ (define options cons '())) - (for-each (lambda (session) - (daemon-session->recutils session (current-output-port)) - (newline)) - (daemon-sessions))) + (with-paginated-output-port port + (for-each (lambda (session) + (daemon-session->recutils session port) + (newline port)) + (daemon-sessions)))) diff --git a/guix/ui.scm b/guix/ui.scm index 0d3620f96f..d64bb68f05 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -121,6 +121,7 @@ (define-module (guix ui) file-hyperlink location->hyperlink + with-paginated-output-port relevance package-relevance display-search-results -- cgit v1.2.3 From 0a8dd8aae5fad365c2f429d48e4085a3b3388332 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 28 Jun 2020 22:55:51 +0200 Subject: tests: Allow 'tests/git-authenticate.scm' to run when git/gpg is missing. Fixes . Reported by Jan Nieuwenhuizen . The typo was introduced in 7b06781a58326f251c4af6340379d68e3cb98adb. * tests/git-authenticate.scm : Remove call to 'which' around (gpg+git-available?). --- tests/git-authenticate.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/git-authenticate.scm b/tests/git-authenticate.scm index 865481f7c5..d87eacc659 100644 --- a/tests/git-authenticate.scm +++ b/tests/git-authenticate.scm @@ -56,7 +56,7 @@ (define (gpg+git-available?) #:keyring-reference "master") 'failed))))) -(unless (which (gpg+git-available?)) (test-skip 1)) +(unless (gpg+git-available?) (test-skip 1)) (test-assert "signed commits, SHA1 signature" (with-fresh-gnupg-setup (list %ed25519-public-key-file %ed25519-secret-key-file) -- cgit v1.2.3 From ead5c46147ebf352ad4804d52a766dcf105eda4f Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 24 Jun 2020 14:53:08 +0200 Subject: channels: Error out when the 'guix' channel lacks an introduction. * guix/channels.scm (latest-channel-instance): Raise an error instead of warning when 'guix is unauthenticated. * tests/channels.scm ("latest-channel-instances, missing introduction for 'guix'"): New test. --- guix/channels.scm | 13 ++++++++++--- tests/channels.scm | 21 +++++++++++++++++++++ 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/guix/channels.scm b/guix/channels.scm index 3eec5df883..1016b95045 100644 --- a/guix/channels.scm +++ b/guix/channels.scm @@ -406,9 +406,16 @@ (define (dot-git? file stat) ;; TODO: Warn for all the channels once the authentication interface ;; is public. (when (guix-channel? channel) - (warning (G_ "channel '~a' lacks an introduction and \ -cannot be authenticated~%") - (channel-name channel)))) + (raise (condition + (&message + (message (format #f (G_ "channel '~a' lacks an \ +introduction and cannot be authenticated~%") + (channel-name channel)))) + (&fix-hint + (hint (G_ "Add the missing introduction to your +channels file to address the issue. Alternatively, you can pass +@option{--disable-authentication}, at the risk of running unauthenticated and +thus potentially malicious code."))))))) (warning (G_ "channel authentication disabled~%"))) (when (guix-channel? channel) diff --git a/tests/channels.scm b/tests/channels.scm index 3a2c1d429b..d7202f8cbf 100644 --- a/tests/channels.scm +++ b/tests/channels.scm @@ -402,6 +402,27 @@ (define (find-commit* message) (channel-news-for-commit channel commit5 commit1)) '(#f "tag-for-first-news-entry"))))))) +(unless (which (git-command)) (test-skip 1)) +(test-assert "latest-channel-instances, missing introduction for 'guix'" + (with-temporary-git-repository directory + '((add "a.txt" "A") + (commit "first commit") + (add "b.scm" "#t") + (commit "second commit")) + (with-repository directory repository + (let* ((commit1 (find-commit repository "first")) + (commit2 (find-commit repository "second")) + (channel (channel (url (string-append "file://" directory)) + (name 'guix)))) + + (guard (c ((message-condition? c) + (->bool (string-contains (condition-message c) + "introduction")))) + (with-store store + ;; Attempt a downgrade from NEW to OLD. + (latest-channel-instances store (list channel)) + #f)))))) + (unless (gpg+git-available?) (test-skip 1)) (test-equal "authenticate-channel, wrong first commit signer" #t -- cgit v1.2.3 From 22ec89974b82cdfdb8fa619ebf7447cf04103807 Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Thu, 25 Jun 2020 15:46:18 +0200 Subject: gnu: mumble: Fix mumble-overlay. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The canonical mumble-overlay script searches for libmumble.so.1 in various directories, none of which are relevant in Guix installations and additionally does some work to match the architecture of the library to that of the command that will be executed. This work is unnecessary in Guix and only causes the script to fail, so we instead just hardcode the path. * gnu/packages/telephony.scm (mumble)[#:phases]: Add fix-mumble-overlay. Signed-off-by: Ludovic Courtès --- gnu/packages/telephony.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 4c84ddc85a..542d36a841 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -588,6 +588,16 @@ (define-public mumble (substitute* "src/mumble/Settings.cpp" (("bUsage = true;") "bUsage = false;")) #t)) + (add-before 'configure 'fix-mumble-overlay + (lambda* (#:key outputs #:allow-other-keys) + (with-output-to-file "scripts/mumble-overlay" + (lambda () + (format #t "#!~a~%" (which "bash")) + (format #t "export LD_PRELOAD=\"~a $LD_PRELOAD\"~%" + (string-append (assoc-ref outputs "out") + "/lib/mumble/libmumble.so.1")) + (format #t "exec \"${@}\""))) + #t)) (add-before 'install 'disable-murmur-ice (lambda _ (substitute* "scripts/murmur.ini.system" -- cgit v1.2.3 From e3d2e618fe5bbf85911d6c283b34cbd76191536a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 28 Jun 2020 23:28:55 +0200 Subject: doc: cookbook: Fix encoding of "André". MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is a followup to f8945734a5abff69644284231cc47fb67456657b. * doc/guix-cookbook.texi: Encode "André" as UTF-8, not ISO-8859-1. --- doc/guix-cookbook.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/guix-cookbook.texi b/doc/guix-cookbook.texi index 1669cb8666..13ec2976a6 100644 --- a/doc/guix-cookbook.texi +++ b/doc/guix-cookbook.texi @@ -15,7 +15,7 @@ Copyright @copyright{} 2020 Oleg Pykhalov@* Copyright @copyright{} 2020 Matthew Brooks@* Copyright @copyright{} 2020 Marcin Karpezo@* Copyright @copyright{} 2020 Brice Waegeneire@* -Copyright @copyright{} 2020 Andr Batista@* +Copyright @copyright{} 2020 André Batista@* Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or -- cgit v1.2.3 From 9310ad3423aa7b939b07a82bb0ce60c4024ed15e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 28 Jun 2020 14:12:25 +0200 Subject: gnu: git: Update to 2.27.0. * gnu/packages/version-control.scm (git): Update to 2.27.0. [arguments]: Adjust xmlto substitution for upstream changes. --- gnu/packages/version-control.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 99e1a8ccd1..5151e63ee1 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -154,14 +154,14 @@ (define git-cross-configure-flags (define-public git (package (name "git") - (version "2.26.2") + (version "2.27.0") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/software/scm/git/git-" version ".tar.xz")) (sha256 (base32 - "0j685w6pzkn926z5nf5r8fij4ziipvw4c9yb0wc577nzf4j16rbd")))) + "1ybk39ylvs32lywq7ra4l2kdr5izc80r9461hwfnw8pssxs9gjkk")))) (build-system gnu-build-system) (native-inputs `(("native-perl" ,perl) @@ -178,7 +178,7 @@ (define-public git version ".tar.xz")) (sha256 (base32 - "0rb4f4jc31zrcg4gyjg4fi07dw7nggkjg2nqfiq5p1aayw2f2ga3")))) + "176lkcfhjhqin2w8s814j9wwcian9jr6xx6xzn35i5scn14spjz6")))) ;; For subtree documentation. ("asciidoc" ,asciidoc-py3) ("docbook-xsl" ,docbook-xsl) @@ -302,12 +302,12 @@ (define-public git ;; specified in the XML, unlike the above substitution. Instead it ;; uses a hard-coded URL. Work around it here, but if this is ;; common perhaps we should hardcode this path in xmlto itself. - (("\\$\\(XMLTO\\) -m \\$\\(MANPAGE_XSL\\) man") + (("\\$\\(XMLTO\\) -m \\$\\(MANPAGE_XSL\\)") (string-append "$(XMLTO) -x " (string-append (assoc-ref inputs "docbook-xsl") "/xml/xsl/docbook-xsl-" ,(package-version docbook-xsl)) - "/manpages/docbook.xsl -m $(MANPAGE_XSL) man"))) + "/manpages/docbook.xsl -m $(MANPAGE_XSL)"))) (invoke "make") (invoke "make" "install") (invoke "make" "install-doc") -- cgit v1.2.3 From 58670ceedbd6678445b4d9d1943cc88dc60c2bc3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 28 Jun 2020 14:13:09 +0200 Subject: gnu: asciidoc-py3: Update to 9.0.1. * gnu/packages/documentation.scm (asciidoc-py3): Update to 9.0.1. --- gnu/packages/documentation.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm index a3a07f56db..ac3fa7b78c 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -127,7 +127,7 @@ (define-public asciidoc (define-public asciidoc-py3 (package (inherit asciidoc) (name "asciidoc-py3") - (version "9.0.0rc1") + (version "9.0.1") (source (origin (method git-fetch) (uri (git-reference @@ -136,7 +136,7 @@ (define-public asciidoc-py3 (file-name (git-file-name name version)) (sha256 (base32 - "1v815dgab62970m9cr2crwbh4kvlzk6pv3hk4bzv6gfa4lbwfkfl")))) + "1xpws5lgzaqwgbc7sq6bp8adjxy8qb4qb9nj4vvpxamjgx3pny54")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf))) -- cgit v1.2.3 From 6cb2d8c614459732f1f9b1a85243d41291c57540 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 28 Jun 2020 15:17:00 +0200 Subject: gnu: doctest: Update to 2.4.0. * gnu/packages/check.scm (doctest): Update to 2.4.0. --- gnu/packages/check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index c71edc7655..8b7623d1e1 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -445,7 +445,7 @@ (define-public cxxtest (define-public doctest (package (name "doctest") - (version "2.3.8") + (version "2.4.0") (home-page "https://github.com/onqtam/doctest") (source (origin (method git-fetch) @@ -453,7 +453,7 @@ (define-public doctest (file-name (git-file-name name version)) (sha256 (base32 - "16w907750jnp98vdzkn72lzwy1zyryaqvfi80lbdp398pj23rq65")))) + "1yi95saqv8qb3ix6w8d7ffvs7qbwvqmq6wblckhxhicxxdxk85cd")))) (build-system cmake-build-system) (synopsis "C++ test framework") (description -- cgit v1.2.3 From fdbba544d8e05ac715a99267a81a127b91db4f21 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 28 Jun 2020 15:43:26 +0200 Subject: Add more missing (ice-9 format) imports. * gnu/machine/ssh.scm: Import (ice-9 format). * guix/scripts/graph.scm: Likewise. * guix/scripts/system/search.scm: Likewise. * guix/remote.scm: Likewise. --- gnu/machine/ssh.scm | 1 + guix/remote.scm | 1 + guix/scripts/graph.scm | 1 + guix/scripts/system/search.scm | 1 + 4 files changed, 4 insertions(+) diff --git a/gnu/machine/ssh.scm b/gnu/machine/ssh.scm index 7194181681..4148639292 100644 --- a/gnu/machine/ssh.scm +++ b/gnu/machine/ssh.scm @@ -37,6 +37,7 @@ (define-module (gnu machine ssh) #:use-module (guix store) #:use-module (guix utils) #:use-module (gcrypt pk-crypto) + #:use-module (ice-9 format) #:use-module (ice-9 match) #:use-module (ice-9 textual-ports) #:use-module (srfi srfi-1) diff --git a/guix/remote.scm b/guix/remote.scm index c00585de74..a227540728 100644 --- a/guix/remote.scm +++ b/guix/remote.scm @@ -31,6 +31,7 @@ (define-module (guix remote) #:use-module (srfi srfi-1) #:use-module (srfi srfi-34) #:use-module (srfi srfi-35) + #:use-module (ice-9 format) #:use-module (ice-9 match) #:export (remote-eval)) diff --git a/guix/scripts/graph.scm b/guix/scripts/graph.scm index 1d5db3b3cb..489931d5bb 100644 --- a/guix/scripts/graph.scm +++ b/guix/scripts/graph.scm @@ -43,6 +43,7 @@ (define-module (guix scripts graph) #:use-module (srfi srfi-34) #:use-module (srfi srfi-35) #:use-module (srfi srfi-37) + #:use-module (ice-9 format) #:use-module (ice-9 match) #:export (%package-node-type %reverse-package-node-type diff --git a/guix/scripts/system/search.scm b/guix/scripts/system/search.scm index d2eac06cca..bf49ea2341 100644 --- a/guix/scripts/system/search.scm +++ b/guix/scripts/system/search.scm @@ -26,6 +26,7 @@ (define-module (guix scripts system search) #:use-module (srfi srfi-11) #:use-module (srfi srfi-26) #:use-module (srfi srfi-34) + #:use-module (ice-9 format) #:use-module (ice-9 regex) #:use-module (ice-9 match) #:export (service-type->recutils -- cgit v1.2.3 From 5e113cf4424b2746cbf3633cd2106c62b89e5b49 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 28 Jun 2020 17:52:24 +0200 Subject: tests: Do not fail when network interface aliases are present. Fixes . * tests/syscalls.scm ("network-interface-names"): Filter interface names with a colon. --- tests/syscalls.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/syscalls.scm b/tests/syscalls.scm index 6acaa0b131..09aa228e8e 100644 --- a/tests/syscalls.scm +++ b/tests/syscalls.scm @@ -382,7 +382,11 @@ (define perform-container-tests? (member "lo" names)))) (test-assert "network-interface-names" - (match (network-interface-names) + (match (remove (lambda (interface) + ;; Ignore interface aliases since they don't show up in + ;; (all-network-interface-names). + (string-contains interface ":")) + (network-interface-names)) (((? string? names) ..1) (lset<= string=? names (all-network-interface-names))))) -- cgit v1.2.3 From 92ff2a6a918cec51427e584cb9a1794aac9247c5 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Jun 2020 23:44:51 +0200 Subject: gnu: Add python-xlib. * gnu/packages/python-xyz.scm (python-xlib): New variable. --- gnu/packages/python-xyz.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 2410646c22..9cbb7be446 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7371,6 +7371,44 @@ (define-public python-q (define-public python2-q (package-with-python2 python-q)) +(define-public python-xlib + (package + (name "python-xlib") + (version "0.27") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/python-xlib/python-xlib.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "09kimic8rhprx3q8nzalc4aggg42ahqm4v5qcj8dm68yvxfdk986")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'start-xserver + (lambda* (#:key inputs #:allow-other-keys) + (let ((xorg-server (assoc-ref inputs "xorg-server"))) + ;; There must be a running X server and make check doesn't + ;; start one. Therefore we must do it. + (system (format #f "~a/bin/Xvfb :1 &" xorg-server)) + (setenv "DISPLAY" ":1") + #t)))))) + (native-inputs + `(("python-mock" ,python-mock) + ("python2-setuptools-scm" ,python2-setuptools-scm) + ("python-six" ,python-six) + ("xorg-server" ,xorg-server))) + (home-page "https://github.com/python-xlib/python-xlib") + (synopsis "Python X11 client library") + (description + "The Python X Library is intended to be a fully functional +X client library for Python programs. It is useful to implement +low-level X clients. It is written entirely in Python.") + (license license:gpl2+))) + (define-public python2-xlib (package (name "python2-xlib") -- cgit v1.2.3 From 4e47c8fcf09aa57132f5203a5c72cdf1fe576646 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Jun 2020 23:45:27 +0200 Subject: gnu: python2-xlib: Update to 0.27. * gnu/packages/python-xyz.scm (python2-xlib): Update to 0.27. --- gnu/packages/python-xyz.scm | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9cbb7be446..7c5db14859 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7410,28 +7410,7 @@ (define-public python-xlib (license license:gpl2+))) (define-public python2-xlib - (package - (name "python2-xlib") - (version "0.14") - (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/python-xlib/python-xlib" - "/" version "/" - "python-xlib-" version ".tar.gz")) - (sha256 - (base32 - "1sv0447j0rx8cgs3jhjl695p5pv13ihglcjlrrz1kq05lsvb0wa7")))) - (build-system python-build-system) - (arguments - `(#:python ,python-2 ;Python 2 only - #:tests? #f)) ;no tests - (home-page "http://python-xlib.sourceforge.net/") - (synopsis "Python X11 client library") - (description - "The Python X Library is intended to be a fully functional X client -library for Python programs. It is useful to implement low-level X clients. -It is written entirely in Python.") - (license license:gpl2+))) + (package-with-python2 python-xlib)) (define-public python-singledispatch (package -- cgit v1.2.3 From 98145307f7f040605589d33f83c3758612a95fc9 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Jun 2020 23:50:42 +0200 Subject: gnu: python-xlib: Fix native input. * gnu/packages/python-xyz.scm (python-xlib)[native-inputs]: Replace python2-setuptools-scm with python-setuptools-scm. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7c5db14859..f7ef5da62f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7398,7 +7398,7 @@ (define-public python-xlib #t)))))) (native-inputs `(("python-mock" ,python-mock) - ("python2-setuptools-scm" ,python2-setuptools-scm) + ("python-setuptools-scm" ,python-setuptools-scm) ("python-six" ,python-six) ("xorg-server" ,xorg-server))) (home-page "https://github.com/python-xlib/python-xlib") -- cgit v1.2.3 From 93c47bff5d90655d462a8451b1d83265a1beb6b4 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 15 Jun 2020 21:55:33 +0200 Subject: gnu: Add flatzebra. * gnu/packages/game-development.scm (flatzebra): New variable. --- gnu/packages/game-development.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index fb2c13b743..c28234217c 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -2002,6 +2002,43 @@ (define-public openvr specific knowledge of the hardware they are targeting.") (license license:bsd-3))) +(define-public flatzebra + (package + (name "flatzebra") + (version "0.1.7") + (source + (origin + (method url-fetch) + (uri (string-append "http://perso.b2b2c.ca/~sarrazip/dev/" + "flatzebra-" version ".tar.gz")) + (sha256 + (base32 "1x2dy41c8vrq62bn03b82fpmk7x4rzd7qqiwvq0mgcl5rmasc2c8")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-sdl-config + (lambda* (#:key inputs #:allow-other-keys) + ;; XXX: sdl-config in sdl-union is a link to sdl-config from + ;; plain sdl package. As a consequence, the prefix is wrong. + ;; Force correct one with "--prefix" argument. + (let ((sdl-union (assoc-ref inputs "sdl"))) + (setenv "SDL_CONFIG" + (string-append sdl-union + "/bin/sdl-config --prefix=" + sdl-union))) + #t))))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("sdl" ,(sdl-union (list sdl sdl-image sdl-mixer))))) + (home-page "http://perso.b2b2c.ca/~sarrazip/dev/burgerspace.html") + (synopsis "Generic game engine for 2D double-buffering animation") + (description + "Flatzebra is a simple, generic C++ game engine library supporting 2D +double-buffering.") + (license license:gpl2+))) + (define-public fna (package (name "fna") -- cgit v1.2.3 From 19c0280ff7f77d4ed641dd04382b02d4cae0a9ab Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 15 Jun 2020 21:56:36 +0200 Subject: gnu: Add burgerspace. * gnu/packages/games.scm (burgerspace): New variable. --- gnu/packages/games.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index f5a410f2c3..8beb8cd2e3 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -10881,6 +10881,33 @@ (define-public barrage get high scores.") (license license:gpl2+))) +(define-public burgerspace + (package + (name "burgerspace") + (version "1.9.3") + (source + (origin + (method url-fetch) + (uri (string-append "http://perso.b2b2c.ca/~sarrazip/dev/" + "burgerspace-" version ".tar.gz")) + (sha256 + (base32 "1005a04rbn4lzjrpfg0m394k2mfaji63fm2qhdqdsxila8a6kjbv")))) + (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("flatzebra" ,flatzebra))) + (home-page "http://perso.b2b2c.ca/~sarrazip/dev/burgerspace.html") + (synopsis "Avoid evil foodstuffs and make burgers") + (description + "This is a clone of the classic game BurgerTime. In it, you play +the part of a chef who must create burgers by stepping repeatedly on +the ingredients until they fall into place. And to make things more +complicated, you also must avoid evil animate food items while +performing this task, with nothing but your trusty pepper shaker to +protect you.") + (license license:gpl2+))) + (define-public 7kaa (package (name "7kaa") -- cgit v1.2.3 From 4bc71b4eee5b8a7bbeed30fa5562ae8509ab8df1 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Mon, 29 Jun 2020 04:39:48 +0200 Subject: gnu: exercism: Don't install source. * gnu/packages/education.scm (exercism)[arguments]: Set install-source? to #f. --- gnu/packages/education.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index cba061f195..12e1b6f0a0 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -1000,7 +1000,8 @@ (define-public exercism (build-system go-build-system) (arguments `(#:import-path "github.com/exercism/cli/exercism" - #:unpack-path "github.com/exercism/cli")) + #:unpack-path "github.com/exercism/cli" + #:install-source? #f)) (inputs `(("github.com/blang/semver" ,go-github-com-blang-semver) ("github.com/spf13/cobra" ,go-github-com-spf13-cobra) -- cgit v1.2.3 From d282a82cabdbd9fbdd829a749d06c704f9d9925c Mon Sep 17 00:00:00 2001 From: Masaya Tojo Date: Sun, 28 Jun 2020 07:42:03 +0900 Subject: gnu: artanis: Use guile2.2 version of guile-redis. * gnu/packages/guile-xyz.scm (artanis)[propagated-inputs]: Change from guile-redis to guile2.2-redis. Signed-off-by: Efraim Flashner --- gnu/packages/guile-xyz.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index f8e59b0b21..d9b8eeea47 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -28,6 +28,7 @@ ;;; Copyright © 2020 Jack Hill ;;; Copyright © 2020 Julien Lepiler ;;; Copyright © 2020 Marius Bakke +;;; Copyright © 2020 Masaya Tojo ;;; ;;; This file is part of GNU Guix. ;;; @@ -155,9 +156,9 @@ (define-public artanis ;; projects. ;; TODO: Add guile-dbi and guile-dbd optional dependencies. (propagated-inputs - `(("guile-json" ,guile-json-1) + `(("guile-json" ,guile-json-1) ; This ia already using guile-2.2. ("guile-readline" ,guile2.2-readline) - ("guile-redis" ,guile-redis))) + ("guile-redis" ,guile2.2-redis))) (native-inputs `(("bash" ,bash) ;for the `source' builtin ("pkgconfig" ,pkg-config) -- cgit v1.2.3 From 5a88d3dfcb382a9256e5b6d18f1487b597260944 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sun, 7 Jun 2020 20:58:27 +0300 Subject: gnu: Add bats. * gnu/packages/bash.scm (bats): New variable. --- gnu/packages/bash.scm | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index 3ba8a13e40..b331676f7a 100644 --- a/gnu/packages/bash.scm +++ b/gnu/packages/bash.scm @@ -24,11 +24,13 @@ (define-module (gnu packages bash) #:use-module (guix licenses) #:use-module (gnu packages) + #:use-module (gnu packages base) #:use-module (gnu packages bootstrap) #:use-module (gnu packages ncurses) #:use-module (gnu packages readline) #:use-module (gnu packages bison) #:use-module (gnu packages linux) + #:use-module (gnu packages guile) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) @@ -37,6 +39,7 @@ (define-module (gnu packages bash) #:use-module (guix monads) #:use-module (guix store) #:use-module (guix build-system gnu) + #:use-module (guix build-system trivial) #:autoload (guix gnupg) (gnupg-verify*) #:autoload (guix base32) (bytevector->nix-base32-string) @@ -362,3 +365,52 @@ (define-public bash-tap helpers it provides helper functions for mocking commands and in-process output capturing.") (license expat))) + +(define-public bats + (package + (name "bats") + (version "1.2.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/bats-core/bats-core.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0f59zh4d4pa1a7ybs5zl6h0csbqqv11lbnq0jl1dgwm1s6p49bsq")))) + (inputs + `(("bash" ,bash) + ("coreutils" ,coreutils) + ("guile" ,guile-3.0) ;for wrap-script + ("grep" ,grep))) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (copy-recursively (assoc-ref %build-inputs "source") ".") + (setenv "PATH" + (string-append (assoc-ref %build-inputs "bash") "/bin" + ":" (assoc-ref %build-inputs "coreutils") "/bin" + ":" (assoc-ref %build-inputs "grep") "/bin" + ":" (assoc-ref %build-inputs "guile") "/bin" + ":" (getenv "PATH"))) + (for-each (lambda (file) (patch-shebang file)) (find-files ".")) + (substitute* "bin/bats" + (("export BATS_ROOT" line) + (string-append "BATS_ROOT=\"${BATS_ROOT:-" %output "/libexec/bats-core}\"\n" + line))) + ;; Install phase + (invoke "./install.sh" %output) + (wrap-script (string-append %output "/bin/bats") + (list "PATH" 'prefix (string-split (getenv "PATH") + #\:)))))) + (build-system trivial-build-system) + (home-page "https://github.com/bats-core/bats-core/") + (synopsis "Bash Automated Testing System") + (description "Bats is a TAP-compliant testing framework for Bash. It +provides a simple way to verify that the UNIX programs you write behave as +expected. Bats is most useful when testing software written in Bash, but you +can use it to test any UNIX program.") + (license expat))) -- cgit v1.2.3 From 484255f7b4a1490331d0a950b4429c4fcd82f132 Mon Sep 17 00:00:00 2001 From: Matthew Kraai Date: Fri, 26 Jun 2020 09:14:03 -0700 Subject: gnu: python-pytest-flake8: Update to 1.0.6. * gnu/packages/python-check.scm (python-pytest-flake8): Update to 1.0.6. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/python-check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index 7d8647cb44..200bce6ced 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -183,14 +183,14 @@ (define-public python-pytest-checkdocs (define-public python-pytest-flake8 (package (name "python-pytest-flake8") - (version "1.0.4") + (version "1.0.6") (source (origin (method url-fetch) (uri (pypi-uri "pytest-flake8" version)) (sha256 (base32 - "1h30gd21fjsafqxwclf25sdh89vrdz7rsh4lzw11aiw7ww9mq8jd")))) + "09vhn7r77s1yiqnlwfvh5585f904zpyd6620a90dpccfr1cbp0hv")))) (build-system python-build-system) (propagated-inputs `(("python-flake8" ,python-flake8))) -- cgit v1.2.3 From ffd0c918b6eda460aaa4c01485ae864cecee3025 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Mon, 29 Jun 2020 11:51:49 +0200 Subject: gnu: monero: Update to 0.16.0.1. * gnu/packages/finance.scm (monero): Update to 0.16.0.1. --- gnu/packages/finance.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 552c2abed3..3e6322bffb 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -547,7 +547,7 @@ (define-public monero ;; the system's dynamically linked library. (package (name "monero") - (version "0.16.0.0") + (version "0.16.0.1") (source (origin (method git-fetch) @@ -568,7 +568,7 @@ (define-public monero #t)) (sha256 (base32 - "0x74h5z0nxxxip97ibc854pqmrgd8r4d6w62m424f66i8gbzfskh")))) + "0n2cviqm8radpynx70fc0819k1xknjc58cvb4whlc49ilyvh8ky6")))) (build-system cmake-build-system) (native-inputs `(("doxygen" ,doxygen) -- cgit v1.2.3 From 47260205463292bb340ec79255376e9b3f2f1f53 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Mon, 29 Jun 2020 14:22:15 +0200 Subject: gnu: monero-gui: Update to 0.16.0.1. * gnu/packages/finance.scm (monero-gui): Update to 0.16.0.1. --- gnu/packages/finance.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 3e6322bffb..49273d2c8e 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -666,7 +666,7 @@ (define-public monero (define-public monero-gui (package (name "monero-gui") - (version "0.16.0.0") + (version "0.16.0.1") (source (origin (method git-fetch) @@ -676,7 +676,7 @@ (define-public monero-gui (file-name (git-file-name name version)) (sha256 (base32 - "06vdrsj5y9k0zn32hspyxc7sw1kkyrvi3chzkdbnxk9jvyj8k4ld")))) + "0wnrlcf273y233bal5k90v7b7pa8z0ka70awdlxk50afbvkcbr3c")))) (build-system qt-build-system) (native-inputs `(("monero-source" ,(package-source monero)) -- cgit v1.2.3 From ee81abe23c4d17094df3b17e701d22aaccdc87e8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 29 Jun 2020 15:15:12 +0200 Subject: gnu: Add python-click@5. * gnu/packages/python-xyz.scm (python-click-5): New public variable. --- gnu/packages/python-xyz.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f7ef5da62f..f52132ca5b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2431,6 +2431,18 @@ (define-public python-click (define-public python2-click (package-with-python2 python-click)) +(define-public python-click-5 + (package (inherit python-click) + (name "python-click") + (version "5.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "click" version)) + (sha256 + (base32 "0njsm0wn31l21bi118g5825ma5sa3rwn7v2x4wjd7yiiahkri337")))) + (arguments `()))) + (define-public python-wheel (package (name "python-wheel") -- cgit v1.2.3 From 85eec227e1b056e808719b0db7756c4aa9745704 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 29 Jun 2020 15:15:40 +0200 Subject: gnu: vdirsyncer: Update to 0.16.8. * gnu/packages/dav.scm (vdirsyncer): Update to 0.16.8. [propagated-inputs]: Use python-click-5. --- gnu/packages/dav.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/dav.scm b/gnu/packages/dav.scm index 1b837dfe40..dbfa4a660e 100644 --- a/gnu/packages/dav.scm +++ b/gnu/packages/dav.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015, 2016, 2017 Leo Famulari ;;; Copyright © 2018, 2019 Efraim Flashner +;;; Copyright © 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -60,13 +61,14 @@ (define-public radicale (define-public vdirsyncer (package (name "vdirsyncer") - (version "0.16.7") + ;; When updating, check whether python-click-5 can be removed entirely. + (version "0.16.8") (source (origin (method url-fetch) (uri (pypi-uri name version)) (sha256 (base32 - "1vqjhn2bffy2bx45a1r14crsyn2cylf5by567g44c4mhpjwwz6vc")))) + "1i8kp9j99rs8xdhrc1vx749zd9wznlzj0pb3s05xdm71a8pl5nxz")))) (build-system python-build-system) (arguments `(#:tests? #f ; The test suite is very flakey. @@ -107,7 +109,8 @@ (define-public vdirsyncer ("radicale" ,radicale))) (propagated-inputs `(("python-atomicwrites" ,python-atomicwrites) - ("python-click" ,python-click) + ;; XXX https://github.com/mitsuhiko/click/issues/200 + ("python-click" ,python-click-5) ("python-click-log" ,python-click-log) ("python-click-threading" ,python-click-threading) ("python-requests-toolbelt" ,python-requests-toolbelt))) -- cgit v1.2.3 From 9c1324a4164eb7bf3a912b185b2ab9c86447e005 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 29 Jun 2020 15:31:07 +0200 Subject: gnu: xxhash: Cross-compile. * gnu/packages/digest.scm (xxhash)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/digest.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/digest.scm b/gnu/packages/digest.scm index 1a9d58c0d3..53cf261219 100644 --- a/gnu/packages/digest.scm +++ b/gnu/packages/digest.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2019, 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -20,7 +20,8 @@ (define-module (gnu packages digest) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix git-download) - #:use-module (guix build-system gnu)) + #:use-module (guix build-system gnu) + #:use-module (guix utils)) (define-public xxhash (package @@ -38,7 +39,7 @@ (define-public xxhash (build-system gnu-build-system) (arguments `(#:make-flags - (list "CC=gcc" + (list ,(string-append "CC=" (cc-for-target)) "XXH_FORCE_MEMORY_ACCESS=1" ; improved performance with GCC (string-append "prefix=" (assoc-ref %outputs "out"))) #:phases -- cgit v1.2.3 From 8db9300454d067dfa023430e51d7f394f203d849 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 29 Jun 2020 15:31:35 +0200 Subject: gnu: xxhash: Update to 0.7.4. * gnu/packages/digest.scm (xxhash): Update to 0.7.4. --- gnu/packages/digest.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/digest.scm b/gnu/packages/digest.scm index 53cf261219..7adc12e8db 100644 --- a/gnu/packages/digest.scm +++ b/gnu/packages/digest.scm @@ -26,7 +26,7 @@ (define-module (gnu packages digest) (define-public xxhash (package (name "xxhash") - (version "0.7.3") + (version "0.7.4") (source (origin (method git-fetch) @@ -35,7 +35,7 @@ (define-public xxhash (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0bin0jch6lbzl4f8y052a7azfgq2n7iwqihzgqmcccv5vq4vcx5a")))) + (base32 "08j7wxshhzpyrnyilfnvhyv5ycm0yv5m7jf6q4kxcd7j4dcbhmpb")))) (build-system gnu-build-system) (arguments `(#:make-flags -- cgit v1.2.3 From 1d25cfbaf4b707f5af9aafe6ac3d8828c5b89f45 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 29 Jun 2020 15:44:07 +0200 Subject: gnu: xxhash: Detect vector instructions at run time. * gnu/packages/digest.scm (xxhash)[arguments]: Set DISPATCH=1 make flag on x86. --- gnu/packages/digest.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/digest.scm b/gnu/packages/digest.scm index 7adc12e8db..78eeb7e286 100644 --- a/gnu/packages/digest.scm +++ b/gnu/packages/digest.scm @@ -21,7 +21,8 @@ (define-module (gnu packages digest) #:use-module (guix packages) #:use-module (guix git-download) #:use-module (guix build-system gnu) - #:use-module (guix utils)) + #:use-module (guix utils) + #:use-module (ice-9 match)) (define-public xxhash (package @@ -40,6 +41,11 @@ (define-public xxhash (arguments `(#:make-flags (list ,(string-append "CC=" (cc-for-target)) + ,(match (or (%current-target-system) + (%current-system)) + ;; Detect vector instruction set at run time. + ((or "i686-linux" "x86_64-linux") "DISPATCH=1") + (_ "DISPATCH=0")) "XXH_FORCE_MEMORY_ACCESS=1" ; improved performance with GCC (string-append "prefix=" (assoc-ref %outputs "out"))) #:phases -- cgit v1.2.3 From 126f74c7d5d0371fbe381d8aae3823c80a743a3a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 29 Jun 2020 12:04:05 +0200 Subject: gnu: s-tui: Update to 1.0.1. * gnu/packages/admin.scm (s-tui): Update to 1.0.1. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 9d9fd2d95d..ca0dcf85d6 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1864,13 +1864,13 @@ (define-public acpica (define-public s-tui (package (name "s-tui") - (version "1.0.0") + (version "1.0.1") (source (origin (method url-fetch) (uri (pypi-uri "s-tui" version)) (sha256 - (base32 "0r5yhlsi5xiy7ii1w4kqkaxz9069v5bbfwi3x3xnxhk51yjfgr8n")))) + (base32 "1gqrb2xxii43j7kszy7kvv4f6hr8ac4p0m9q8i1xs5fhsqcx186i")))) (build-system python-build-system) (inputs `(("python-psutil" ,python-psutil) -- cgit v1.2.3 From 0dd2dc7923ad783686e33e45eae701851dde19a2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 29 Jun 2020 12:10:37 +0200 Subject: gnu: ansible: Update to 2.9.10. * gnu/packages/admin.scm (ansible): Update to 2.9.10. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index ca0dcf85d6..314e6389d2 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2164,13 +2164,13 @@ (define-public graphios (define-public ansible (package (name "ansible") - (version "2.9.9") + (version "2.9.10") (source (origin (method url-fetch) (uri (pypi-uri "ansible" version)) (sha256 - (base32 "1l99vwkl48iwr8ffd1ihqia995mz8h8hwk4akm4w0cgiifp88gg8")))) + (base32 "1kfaxd7w8qiis2vv96kgrhiqh158qb0z4lspr9c8fsdi5m1z2rh8")))) (build-system python-build-system) (native-inputs `(("python-bcrypt" ,python-bcrypt) -- cgit v1.2.3 From 09fbfe147efa0a77cd1c99f1052225958416c8b0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 29 Jun 2020 12:18:00 +0200 Subject: gnu: stellarium: Update to 0.20.2. * gnu/packages/astronomy.scm (stellarium): Update to 0.20.2. --- gnu/packages/astronomy.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 5b4590945d..72368f12f1 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -159,7 +159,7 @@ (define-public gnuastro (define-public stellarium (package (name "stellarium") - (version "0.20.1") + (version "0.20.2") (source (origin (method url-fetch) @@ -167,7 +167,7 @@ (define-public stellarium "/releases/download/v" version "/stellarium-" version ".tar.gz")) (sha256 - (base32 "034jkrdaaamvbrkfwi3qcl6h8hwfnw2nvf7a82faj55rskcpnkhm")))) + (base32 "16symz212vjvhfabh39a68qf7d0rm574c6djlibj2qd1q9jgj3j0")))) (build-system cmake-build-system) (inputs `(("qtbase" ,qtbase) @@ -178,7 +178,7 @@ (define-public stellarium ("zlib" ,zlib))) (native-inputs `(("gettext" ,gettext-minimal) ; xgettext is used at compile time - ("perl" ,perl) ; For pod2man + ("perl" ,perl) ; for pod2man ("qtbase" ,qtbase) ; Qt MOC is needed at compile time ("qttools" ,qttools))) (arguments @@ -191,7 +191,7 @@ (define-public stellarium #:phases (modify-phases %standard-phases (add-before 'check 'set-offscreen-display (lambda _ - ;; make Qt render "offscreen", required for tests + ;; Make Qt render "offscreen", required for tests. (setenv "QT_QPA_PLATFORM" "offscreen") (setenv "HOME" "/tmp") #t))))) -- cgit v1.2.3 From 17154ad99f399058912a86def3081377acdc79e3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 29 Jun 2020 12:46:17 +0200 Subject: gnu: ccache: Update to 3.7.10. * gnu/packages/ccache.scm (ccache): Update to 3.7.10. --- gnu/packages/ccache.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ccache.scm b/gnu/packages/ccache.scm index fc915965b4..261f84de70 100644 --- a/gnu/packages/ccache.scm +++ b/gnu/packages/ccache.scm @@ -30,14 +30,14 @@ (define-module (gnu packages ccache) (define-public ccache (package (name "ccache") - (version "3.7.9") + (version "3.7.10") (source (origin (method url-fetch) (uri (string-append "https://github.com/ccache/ccache/releases/download/v" version "/ccache-" version ".tar.xz")) (sha256 - (base32 "0jzl9idnjd9jq64qd8kny7gfd0ydvz5kyq2yslmigfdz8dsxm4zq")))) + (base32 "0a7dajdpnh14nmd10ji897rzqn6847lr36hdbig2rv7sxbc6d58c")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl) ; for test/run ("which" ,(@ (gnu packages base) which)))) -- cgit v1.2.3 From b3808d1feb20c5482a620cb78cdd605edcfe5a0d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 29 Jun 2020 12:47:00 +0200 Subject: gnu: sparse: Update to 0.6.2. * gnu/packages/c.scm (sparse): Update to 0.6.2. --- gnu/packages/c.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index 13ca6d06f9..8590b1384e 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -311,7 +311,7 @@ (define-public packcc (define-public sparse (package (name "sparse") - (version "0.6.1") + (version "0.6.2") (source (origin (method url-fetch) (uri @@ -319,7 +319,7 @@ (define-public sparse "sparse-" version ".tar.xz")) (sha256 (base32 - "0qavyryxmhd1rf11akgn1nq3r15k11bqa3qajaq36a56r225rc7x")))) + "1z11chawwcmf5xxx5v52cj7wrr3warz6q5wlcjvxpif1jbga172i")))) (build-system gnu-build-system) (inputs `(("perl" ,perl))) (arguments -- cgit v1.2.3 From ee091ff637c925a51f81489f69e21339b1088b2b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 29 Jun 2020 12:50:51 +0200 Subject: gnu: python-coverage: Update home page. * gnu/packages/check.scm (python-coverage)[home-page]: Update & use HTTPS. --- gnu/packages/check.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 8b7623d1e1..3b946d7482 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1522,7 +1522,7 @@ (define-public python-coverage (arguments ;; FIXME: 95 tests failed, 539 passed, 6 skipped, 2 errors. '(#:tests? #f)) - (home-page "http://nedbatchelder.com/code/coverage") + (home-page "https://coverage.readthedocs.io") (synopsis "Code coverage measurement for Python") (description "Coverage measures code coverage, typically during test execution. It -- cgit v1.2.3 From d0936fd0c695f435de5b456301769c69ca8de00b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 29 Jun 2020 13:01:40 +0200 Subject: gnu: rust-x11-dl: Update to 2.18.5. * gnu/packages/crates-io.scm (rust-x11-dl): Update to 2.18.5. --- gnu/packages/crates-io.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e2a2f2ba73..8e59da1e5e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -27869,7 +27869,7 @@ (define-public rust-x11-clipboard-0.4 (define-public rust-x11-dl-2 (package (name "rust-x11-dl") - (version "2.18.4") + (version "2.18.5") (source (origin (method url-fetch) @@ -27877,8 +27877,7 @@ (define-public rust-x11-dl-2 (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "0n1w837xagxqgwx2880d7c9ks6l3g1kk00yd75afdaiv58sf2rdy")))) + (base32 "1y7yq4sfvv56shk4v3s7gvlrwk9d0migj622fl4i4c5klpiq3y9b")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From 5d01aeba9499ec0439ccfcbcac969899c5c05711 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 29 Jun 2020 13:40:17 +0200 Subject: gnu: Add perl-sql-abstract-classic. * gnu/packages/databases.scm (perl-sql-abstract-classic): New public variable. --- gnu/packages/databases.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index e2eb0f396d..353cd9842d 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1782,6 +1782,42 @@ (define-public perl-sql-abstract time your data changes.") (license license:perl-license))) +(define-public perl-sql-abstract-classic + (package + (name "perl-sql-abstract-classic") + (version "1.91") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://cpan/authors/id/R/RI/RIBASUSHI/" + "SQL-Abstract-Classic-" version ".tar.gz")) + (sha256 + (base32 "0a7g13hs3kdxrjn43sfli09mgsi9d6w0dfw6hlk268av17yisgaf")))) + (build-system perl-build-system) + (native-inputs + `(("perl-test-deep" ,perl-test-deep) + ("perl-test-exception" ,perl-test-exception) + ("perl-test-warn" ,perl-test-warn))) + (propagated-inputs + `(("perl-mro-compat" ,perl-mro-compat) + ("perl-sql-abstract" ,perl-sql-abstract))) + (home-page "https://metacpan.org/release/SQL-Abstract-Classic") + (synopsis "Generate SQL from Perl data structures") + (description + "This module is nearly identical to @code{SQL::Abstract} 1.81, and exists +to preserve the ability of users to opt into the new way of doing things in +later versions according to their own schedules. + +It is an abstract SQL generation module based on the concepts used by +@code{DBIx::Abstract}, with several important differences, especially when it +comes to @code{WHERE} clauses. These concepts were modified to make the SQL +easier to generate from Perl data structures. + +The underlying idea is for this module to do what you mean, based on the data +structures you provide it. You shouldn't have to modify your code every time +your data changes, as this module figures it out.") + (license license:perl-license))) + (define-public perl-sql-splitstatement (package (name "perl-sql-splitstatement") -- cgit v1.2.3 From 23ec2a0e6f8acc256fea1e4d00009c9c03535c4c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 29 Jun 2020 14:01:14 +0200 Subject: gnu: perl-dbix-class: Update to 0.082842. * gnu/packages/databases.scm (perl-dbix-class): Update to 0.082842. [propagated-inputs]: Replace perl-sql-abstract with perl-sql-abstract-classic. --- gnu/packages/databases.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 353cd9842d..951f220d11 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1481,15 +1481,14 @@ (define-public perl-dbi (define-public perl-dbix-class (package (name "perl-dbix-class") - (version "0.082841") + (version "0.082842") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/R/RI/RIBASUSHI/" "DBIx-Class-" version ".tar.gz")) (sha256 - (base32 - "1gf3hgv8f9rnr8bl4ljgsqk4aliphmvljhsk4282kvdc4mcgh1fp")))) + (base32 "1rh7idjjbibc1zmiaaarask434lh0lx7f2xyfwmy37k9fa0xcpmh")))) (build-system perl-build-system) (native-inputs `(("perl-dbd-sqlite" ,perl-dbd-sqlite) @@ -1517,7 +1516,7 @@ (define-public perl-dbix-class ("perl-path-class" ,perl-path-class) ("perl-scalar-list-utils" ,perl-scalar-list-utils) ("perl-scope-guard" ,perl-scope-guard) - ("perl-sql-abstract" ,perl-sql-abstract) + ("perl-sql-abstract-classic" ,perl-sql-abstract-classic) ("perl-sub-name" ,perl-sub-name) ("perl-text-balanced" ,perl-text-balanced) ("perl-try-tiny" ,perl-try-tiny))) -- cgit v1.2.3 From 809a3f72d1c07c322ccf6a51af28647add9ea442 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 29 Jun 2020 14:35:23 +0200 Subject: gnu: mariadb-connector-c: Update to 3.1.9. * gnu/packages/databases.scm (mariadb-connector-c): Update to 3.1.9. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 951f220d11..2e46f9b883 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -938,7 +938,7 @@ (define-public mariadb (define-public mariadb-connector-c (package (name "mariadb-connector-c") - (version "3.1.8") + (version "3.1.9") (source (origin (method url-fetch) (uri (string-append @@ -947,7 +947,7 @@ (define-public mariadb-connector-c version "-src.tar.gz")) (sha256 (base32 - "0yrzhsxmjiwkhchagx8dymzhvxl3k5h40wn9wpicqjvgjb9k8523")))) + "1izjzf7yzjqzlk8dkp327fa9lawsv2hnnlnr7g5lshyx5azrk38h")))) (inputs `(("openssl" ,openssl))) (build-system cmake-build-system) -- cgit v1.2.3 From 9b26efdd2a541036adeb686a54f4093549b8f070 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 29 Jun 2020 14:36:25 +0200 Subject: gnu: marisa: Update to 0.2.6. * gnu/packages/datastructures.scm (marisa): Update to 0.2.6. [source]: Use worse URL. [native-inputs]: Add autoconf, automake, and libtool. --- gnu/packages/datastructures.scm | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/gnu/packages/datastructures.scm b/gnu/packages/datastructures.scm index 0f106b7ce9..b649f9e848 100644 --- a/gnu/packages/datastructures.scm +++ b/gnu/packages/datastructures.scm @@ -21,6 +21,7 @@ (define-module (gnu packages datastructures) #:use-module (gnu packages) + #:use-module (gnu packages autotools) #:use-module (gnu packages perl) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) @@ -55,16 +56,19 @@ (define-public gdsl (define-public marisa (package (name "marisa") - (version "0.2.5") + (version "0.2.6") (source (origin (method url-fetch) - (uri (string-append "https://github.com/s-yata/marisa-trie" - "/releases/download/v" version "/" name "-" - version ".tar.gz")) + (uri (string-append "https://github.com/s-yata/marisa-trie/files/" + "4832504/marisa-" version ".tar.gz")) (sha256 - (base32 "19ifrcmnbr9whaaf4ly3s9ndyiq9sjqhnfkrxbz9zsb44w2n36hf")))) + (base32 "1pk6wmi28pa8srb4szybrwfn71jldb61c5vgxsiayxcyg1ya4qqh")))) (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool))) (home-page "https://github.com/s-yata/marisa-trie") (synopsis "Trie data structure C++ library") (description "Matching Algorithm with Recursively Implemented -- cgit v1.2.3 From c47485b27c1a464dbcc96aa2cf4b4590731320ec Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 29 Jun 2020 14:37:18 +0200 Subject: gnu: marisa: Mark up description. * gnu/packages/datastructures.scm (marisa)[description]: Use @acronym. --- gnu/packages/datastructures.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/datastructures.scm b/gnu/packages/datastructures.scm index b649f9e848..864f1840f3 100644 --- a/gnu/packages/datastructures.scm +++ b/gnu/packages/datastructures.scm @@ -71,8 +71,8 @@ (define-public marisa ("libtool" ,libtool))) (home-page "https://github.com/s-yata/marisa-trie") (synopsis "Trie data structure C++ library") - (description "Matching Algorithm with Recursively Implemented -StorAge (MARISA) is a static and space-efficient trie data structure C++ + (description "@acronym{MARISA, Matching Algorithm with Recursively +Implemented StorAge} is a static and space-efficient trie data structure C++ library.") ;; Dual-licensed, according to docs/readme.en.html (source files lack -- cgit v1.2.3 From 6dd2ad26d0f82b86f0ef0bbff04229b39b165e33 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 16 Jun 2020 22:51:39 +0200 Subject: gnu: Add mednafen. * gnu/packages/emulators.scm (mednafen): New variable. --- gnu/packages/emulators.scm | 61 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 5525b066f4..ae8bf18255 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -414,6 +414,67 @@ (define-public higan V2.") (license license:gpl3+))) +(define-public mednafen + (package + (name "mednafen") + (version "1.24.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://mednafen.github.io/releases/files/" + "mednafen-" version ".tar.xz")) + (sha256 + (base32 "03zplcfvmnnv7grhacmr1zy789pb2wda36wylmzmar23g0zqbsix")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list + ;; "--with-external-mpcdec" + "--with-external-lzo"))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("alsa" ,alsa-lib) + ;; ("libmpcdec" ,libmpcdec) FIXME: not recognized. + ("libsndfile" ,libsndfile) + ("lzo" ,lzo) + ("sdl2" ,sdl2) + ("zlib" ,zlib))) + (home-page "https://mednafen.github.io/") + (synopsis "Multi-system emulator utilizing OpenGL and SDL") + (description + "Mednafen is a portable, utilizing OpenGL and SDL, argument-driven +multi-system emulator. Mednafen has the ability to remap hotkey functions and +virtual system inputs to a keyboard, a joystick, or both simultaneously. Save +states are supported, as is real-time game rewinding. Screen snapshots may be +taken, in the PNG file format, at the press of a button. Mednafen can record +audiovisual movies in the QuickTime file format, with several different +lossless codecs supported. + +The following systems are supported: + +@itemize +@item Apple II/II+ +@item Atari Lynx +@item Neo Geo Pocket (Color) +@item WonderSwan +@item GameBoy (Color) +@item GameBoy Advance +@item Nintendo Entertainment System +@item Super Nintendo Entertainment System/Super Famicom +@item Virtual Boy +@item PC Engine/TurboGrafx 16 (CD) +@item SuperGrafx +@item PC-FX +@item Sega Game Gear +@item Sega Genesis/Megadrive +@item Sega Master System +@item Sega Saturn (experimental, x86_64 only) +@item Sony PlayStation +@end itemize") + ;; Main license is GPL2+. Some parts are BSD-3. + (license (list license:gpl2+ license:bsd-3)))) + (define-public mgba (package (name "mgba") -- cgit v1.2.3 From 880bf7a0946991dc68eaa4a344e24d60072e2672 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 29 Jun 2020 17:22:11 +0200 Subject: ci: Do not limit disk-image size. Installation tests are already checking the disk-image size. Do not set another limit here. * gnu/ci.scm (image-jobs): Do not limit disk-image size. --- gnu/ci.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/ci.scm b/gnu/ci.scm index 834e0f1260..af0bb66775 100644 --- a/gnu/ci.scm +++ b/gnu/ci.scm @@ -229,7 +229,6 @@ (define MiB (build-image (image (inherit efi-disk-image) - (size (* 1500 MiB)) (operating-system installation-os)))) ,(->job 'iso9660-image (build-image -- cgit v1.2.3 From 6ebf300959a58fd1eda875205c75d21137862285 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Mon, 29 Jun 2020 11:52:40 -0400 Subject: gnu: starfighter: Update to 2.2.1. * gnu/packages/games.scm (starfighter): Update to 2.2.1. [source]: Update URI. --- gnu/packages/games.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 8beb8cd2e3..512ec3e327 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4225,16 +4225,16 @@ (define-public warzone2100 (define-public starfighter (package (name "starfighter") - (version "2.2") + (version "2.2.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/pr-starfighter/starfighter/releases" "/download/v" version "/starfighter-" - (version-major+minor version) "-src.tar.gz")) + version "-src.tar.gz")) (sha256 (base32 - "1ldd9cbvl694ps4sapr8213m3zjrci7gii5x3kjjfalkikmndpd2")))) + "0bmrid26z7il42lczfs3j3cv671az9fxi2wkf0s22smmzkhcnnrz")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From e9f9f4df0d8d5403287c488bceed60bfd22095fd Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 29 Jun 2020 21:33:41 +0200 Subject: gnu: emacs-modus-operandi-theme: Update to 0.10.0. * gnu/packages/emacs-xyz.scm (emacs-modus-operandi-theme): Update to 0.10.0. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 892182a42b..1a1c805ad7 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -21610,14 +21610,14 @@ (define-public emacs-doom-themes (define-public emacs-modus-operandi-theme (package (name "emacs-modus-operandi-theme") - (version "0.9.0") + (version "0.10.0") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "modus-operandi-theme-" version ".el")) (sha256 - (base32 "0wzwhzpw5g719xxz58v5bjqb8gdz1xzqwxslgm9cng4y3hwy3igh")))) + (base32 "1r6dkfdd967zw1nw58nlw7y1r9x8lcbr5gvjfbcbrw0agh87wb40")))) (build-system emacs-build-system) (home-page "https://gitlab.com/protesilaos/modus-themes") (synopsis "Accessible light theme (WCAG AAA)") -- cgit v1.2.3 From 02b38c112eb14705f2e1822ae69e89443a031399 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 29 Jun 2020 21:33:52 +0200 Subject: gnu: emacs-modus-vivendi-theme: Update to 0.10.0. * gnu/packages/emacs-xyz.scm (emacs-modus-vivendi-theme): Update to 0.10.0. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 1a1c805ad7..aae9eb25fd 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -21631,14 +21631,14 @@ (define-public emacs-modus-operandi-theme (define-public emacs-modus-vivendi-theme (package (name "emacs-modus-vivendi-theme") - (version "0.9.0") + (version "0.10.0") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "modus-vivendi-theme-" version ".el")) (sha256 - (base32 "0f6cd93q9vrxfmgg6ff85ixcmq6acvrirb3kwgkf7qv16w3ipcir")))) + (base32 "1kk8q5lrl69ysawnk2iymqmmcsad884kx691hjf2zdj6fskd070g")))) (build-system emacs-build-system) (home-page "https://gitlab.com/protesilaos/modus-themes") (synopsis "Accessible dark theme (WCAG AAA)") -- cgit v1.2.3 From b176f69fba492d36a0e0f86f8f1e6e55a7c22376 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 29 Jun 2020 22:18:05 +0300 Subject: gnu: java-guice: Don't use unstable tarball. * gnu/packages/java.scm (java-guice)[source]: Download using git-fetch. [arguments]: Add custom 'make-files-writable phase. (java-guice-servlet)[arguments]: Same. --- gnu/packages/java.scm | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 48f9a52a56..1bec3fe6a8 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -9068,23 +9068,30 @@ (define-public java-guice (name "java-guice") (version "4.1") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/google/guice/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/google/guice") + (commit version))) + (file-name (git-file-name name version)) (modules '((guix build utils))) (snippet `(begin - (for-each delete-file (find-files "." ".*.jar")))) + (for-each delete-file (find-files "." ".*.jar")) #t)) (sha256 (base32 - "0dwmqjzlavb144ywqqglj3h68hqszkff8ai0a42hyb5il0qh4rbp")))) + "18im5hdfl4q1b9chww2s1ii60sn3ydyyar32a2sf2p2g8zlbdswq")))) (build-system ant-build-system) (arguments `(#:jar-name "java-guice.jar" #:jdk ,icedtea-8 - #:tests? #f; FIXME: tests are not in a java sub directory - #:source-dir "core/src")) + #:tests? #f ; FIXME: tests are not in a java sub directory + #:source-dir "core/src" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'make-files-writable + (lambda _ + (for-each make-file-writable (find-files ".")) + #t))))) (inputs `(("guava" ,java-guava) ("java-cglib" ,java-cglib) @@ -9093,7 +9100,7 @@ (define-public java-guice ("java-asm" ,java-asm))) (home-page "https://github.com/google/guice") (synopsis "Lightweight dependency injection framework") - (description "Guice is a lightweight dependency injection framework fo + (description "Guice is a lightweight dependency injection framework for Java 6 and above.") (license license:asl2.0))) @@ -9105,7 +9112,13 @@ (define-public java-guice-servlet `(#:jar-name "guice-servlet.jar" #:source-dir "extensions/servlet/src/" #:jdk ,icedtea-8 - #:tests? #f)); FIXME: not in a java subdir + #:tests? #f ; FIXME: not in a java subdir + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'make-files-writable + (lambda _ + (for-each make-file-writable (find-files ".")) + #t))))) (inputs `(("guice" ,java-guice) ("servlet" ,java-classpathx-servletapi) -- cgit v1.2.3 From 04ca89d8ad58393343700d56448239482a88d930 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 29 Jun 2020 22:25:35 +0300 Subject: gnu: java-assertj: Don't use unstable tarball. * gnu/packages/java.scm (java-asssertj)[source]: Download using git-fetch. --- gnu/packages/java.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 1bec3fe6a8..2cbf99ca1b 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -9129,13 +9129,14 @@ (define-public java-assertj (name "java-assertj") (version "3.8.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/joel-costigliola/" - "assertj-core/archive/" - "assertj-core-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/joel-costigliola/assertj-core") + (commit (string-append "assertj-core-" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1kf124fxskf548rklkg86294w2x6ajqrff94rrhyqns31danqkfz")))) + "1k35cg2in7pzk4pbdjryr0pll5lgk1r6ngrn0j8cdlgi7w8zh2d1")))) (build-system ant-build-system) (arguments `(#:jar-name "java-assertj.jar" -- cgit v1.2.3 From 8b408789043edf787b3d6dc9fb37b5d86611eeb2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 29 Jun 2020 22:34:37 +0300 Subject: gnu: java-jboss-javassist: Don't use unstable tarball. * gnu/packages/java.scm (java-jboss-javassist)[source]: Download using git-fetch. [arguments]: Add custom 'make-files-writable phase. --- gnu/packages/java.scm | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 2cbf99ca1b..03cf740ff2 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -9161,14 +9161,18 @@ (define-public java-jboss-javassist (name "java-jboss-javassist") (version "3.21.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/jboss-javassist/javassist/" - "archive/rel_" - (string-map (lambda (x) (if (eq? x #\.) #\_ x)) version) - "_ga.tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/jboss-javassist/javassist") + (commit + (string-append "rel_" + (string-map + (lambda (x) (if (eq? x #\.) #\_ x)) version) + "_ga")))) + (file-name (git-file-name name version)) (sha256 (base32 - "10lpcr3sbf7y6fq6fc2h2ik7rqrivwcy4747bg0kxhwszil3cfmf")))) + "0h3zlcyqiaq01fspm69h7vki67raw305w89p4ha8vlhpzw02qifm")))) (build-system ant-build-system) (arguments `(#:jar-name "java-jboss-javassist.jar" @@ -9177,6 +9181,10 @@ (define-public java-jboss-javassist #:tests? #f; FIXME: requires junit-awtui and junit-swingui from junit3 #:phases (modify-phases %standard-phases + (add-after 'unpack 'make-files-writable + (lambda _ + (for-each make-file-writable (find-files ".")) + #t)) (add-before 'configure 'remove-binary (lambda _ (delete-file "javassist.jar") -- cgit v1.2.3 From 87ce1fc59690eb925cb9c15652b6a080a35ef915 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 29 Jun 2020 22:37:01 +0300 Subject: gnu: java-jboss-javassist: Remove prebuilt jar in snippet. * gnu/packages/java.scm (java-jboss-javassist)[source]: Add snippet to remove prebuilt jar. [arguments]: Remove custom 'remove-binary phase. --- gnu/packages/java.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 03cf740ff2..a7317af273 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -9172,7 +9172,11 @@ (define-public java-jboss-javassist (file-name (git-file-name name version)) (sha256 (base32 - "0h3zlcyqiaq01fspm69h7vki67raw305w89p4ha8vlhpzw02qifm")))) + "0h3zlcyqiaq01fspm69h7vki67raw305w89p4ha8vlhpzw02qifm")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file "javassist.jar"))))) (build-system ant-build-system) (arguments `(#:jar-name "java-jboss-javassist.jar" @@ -9184,10 +9188,6 @@ (define-public java-jboss-javassist (add-after 'unpack 'make-files-writable (lambda _ (for-each make-file-writable (find-files ".")) - #t)) - (add-before 'configure 'remove-binary - (lambda _ - (delete-file "javassist.jar") #t))))) (native-inputs `(("junit" ,java-junit))) -- cgit v1.2.3 From 4e257acf48a2fc3df183d3f1837e9f4f653fee31 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 29 Jun 2020 22:37:44 +0300 Subject: gnu: java-jcommander: Don't use unstable tarball. * gnu/packages/java.scm (java-jcommander)[source]: Download using git-fetch. --- gnu/packages/java.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index a7317af273..7e017d0d69 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -9204,13 +9204,14 @@ (define-public java-jcommander (name "java-jcommander") (version "1.71") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/cbeust/jcommander/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/cbeust/jcommander") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1f5k2ckay6qjc3d3w3d7bc0p3cx3c7n6p6zxvw1kibqdr0q98wlx")))) + "12vcpc19sd7jhvjgp7xz1qjanfix162xb3x2q5zah93rjklj1h57")))) (build-system ant-build-system) (arguments `(#:jar-name "java-jcommander.jar" -- cgit v1.2.3 From 3e51f9eb3a82db4a327eb707896010917e03112c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 29 Jun 2020 22:38:18 +0300 Subject: gnu: java-bsh: Don't use unstable tarball. * gnu/packages/java.scm (java-bsh)[source]: Download using git-fetch. --- gnu/packages/java.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 7e017d0d69..4dbf27034d 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -9230,13 +9230,14 @@ (define-public java-bsh (name "java-bsh") (version "2.0b6") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/beanshell/beanshell/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/beanshell/beanshell") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1bawkxk6jyc75hxvzkpz689h73cn3f222m0ar3nvb0dal2b85kfv")))) + "0kz3f0xjack6c9syssi4qjw1rbd3q5963sk5pmr143hiibxa9csw")))) (build-system ant-build-system) (arguments `(#:build-target "jarall" -- cgit v1.2.3 From b032d14ebd26e80456e76d60fb946ce232abec94 Mon Sep 17 00:00:00 2001 From: zimoun Date: Mon, 29 Jun 2020 19:18:20 +0200 Subject: build-system/r: bioconductor-uri: Fix archive URL. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * guix/build-system/r.scm (bioconductor-uri): Fix archive URL. Signed-off-by: Ludovic Courtès --- guix/build-system/r.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/build-system/r.scm b/guix/build-system/r.scm index c8ec9abd0d..5ef982d66a 100644 --- a/guix/build-system/r.scm +++ b/guix/build-system/r.scm @@ -61,7 +61,7 @@ (define* (bioconductor-uri name version #:optional type) ;; TODO: use %bioconductor-version from (guix import cran) (string-append "https://bioconductor.org/packages/3.11" type-url-part - "/src/contrib/Archive/" + "/src/contrib/" name "_" version ".tar.gz")))) (define %r-build-system-modules -- cgit v1.2.3 From 4f060bf2fe1dd8bec79cb07907b46e16fca21398 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 29 Jun 2020 22:57:12 +0200 Subject: pack: Dereference symlinks when looking for executables. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . Reported by Andrius Štikonas . * guix/scripts/pack.scm (wrapped-package)[build]: Add trailing slash to the arguments to 'find-files'. --- guix/scripts/pack.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm index e0f9cc1a12..5bd405ade4 100644 --- a/guix/scripts/pack.scm +++ b/guix/scripts/pack.scm @@ -836,9 +836,10 @@ (define (build-wrapper program) (scandir input)) (for-each build-wrapper - (append (find-files (string-append input "/bin")) - (find-files (string-append input "/sbin")) - (find-files (string-append input "/libexec"))))))) + ;; Note: Trailing slash in case these are symlinks. + (append (find-files (string-append input "/bin/")) + (find-files (string-append input "/sbin/")) + (find-files (string-append input "/libexec/"))))))) (computed-file (string-append (cond ((package? package) -- cgit v1.2.3 From badd2161724b6fe7acd1da5144ebfe68ffc2b3b6 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 29 Jun 2020 23:12:13 +0200 Subject: gnu: gcc-toolchain: Remove "glibc:debug" and "glibc:static" from "out". MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With this change, the closure of "gcc-toolchain:out" goes from 1 GiB to 393 MiB, which was the intention. * gnu/packages/commencement.scm (make-gcc-toolchain): Filter out "libc-debug" and "libc-static" from OUT. --- gnu/packages/commencement.scm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 59ef5d078b..ef250e037b 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3828,14 +3828,17 @@ (define* (make-gcc-toolchain gcc '(#:modules ((guix build union)) #:builder (begin (use-modules (ice-9 match) + (srfi srfi-1) (srfi srfi-26) (guix build union)) (let ((out (assoc-ref %outputs "out"))) - - (match %build-inputs - (((names . directories) ...) - (union-build out directories))) + (union-build out + (filter-map (match-lambda + (("libc-debug" . _) #f) + (("libc-static" . _) #f) + ((_ . directory) directory)) + %build-inputs)) (union-build (assoc-ref %outputs "debug") (list (assoc-ref %build-inputs -- cgit v1.2.3 From 9075c6b3b4efd354cc3b9b8979467a16b9dfa1f2 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Fri, 26 Jun 2020 17:32:27 -0300 Subject: gnu: python-imageio: Update home-page, synopsis and description. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-imageio): Update home-page, synopsis and description. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f52132ca5b..45ecad87fc 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5437,11 +5437,12 @@ (define-public python-imageio ("python-psutil" ,python-psutil))) (native-inputs `(("python-pytest" ,python-pytest))) - (home-page "https://github.com/imageio/imageio") - (synopsis "Read and write image, video, scientific, and volumetric data formats") + (home-page "https://imageio.github.io/") + (synopsis "Library for reading and writing a wide range of image data") (description - "This package provides a Python library for reading and writing a wide -range of image, video, scientific, and volumetric data formats.") + "Imageio is a Python library that provides an easy interface to read and +write a wide range of image data, including animated images, video, volumetric +data, and scientific formats.") (license license:bsd-2))) (define-public python-pycparser -- cgit v1.2.3 From 172ca314c3ad866b6dcb0896ef1a0b0b1e558ea0 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Fri, 26 Jun 2020 17:39:04 -0300 Subject: gnu: darktable: Add dependency on GMIC and OpenCL headers. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/photo.scm (darktable)[arguments]: Fix opencl-c.h path. [native-inputs]: Add opencl-headers, make LLVM version specific. [inputs]: Add gmic. Signed-off-by: Ludovic Courtès --- gnu/packages/photo.scm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 75bbc45380..09767f464e 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -55,6 +55,7 @@ (define-module (gnu packages photo) #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages image) + #:use-module (gnu packages image-processing) #:use-module (gnu packages imagemagick) #:use-module (gnu packages iso-codes) #:use-module (gnu packages libcanberra) @@ -63,6 +64,7 @@ (define-module (gnu packages photo) #:use-module (gnu packages lua) #:use-module (gnu packages man) #:use-module (gnu packages maths) + #:use-module (gnu packages opencl) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages popt) @@ -480,7 +482,13 @@ (define-public darktable (modify-phases %standard-phases (add-before 'configure 'prepare-build-environment (lambda* (#:key inputs #:allow-other-keys) - (setenv "CC" "clang") (setenv "CXX" "clang++"))) + (setenv "CC" "clang") (setenv "CXX" "clang++") + ;; Darktable looks for opencl-c.h in the LLVM dir. Guix installs + ;; it to the Clang dir. We fix this by patching CMakeLists.txt. + (substitute* "CMakeLists.txt" + (("\\$\\{LLVM_INSTALL_PREFIX\\}") + (assoc-ref %build-inputs "clang"))) + #t)) (add-before 'configure 'set-LDFLAGS-and-CPATH (lambda* (#:key inputs outputs #:allow-other-keys) (setenv "LDFLAGS" @@ -508,7 +516,8 @@ (define-public darktable ("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) ("intltool" ,intltool) - ("llvm" ,llvm) + ("llvm" ,llvm-9) ;should match the Clang version + ("opencl-headers" ,opencl-headers) ("perl" ,perl) ("pkg-config" ,pkg-config) ("po4a" ,po4a))) @@ -520,6 +529,7 @@ (define-public darktable ("dbus-glib" ,dbus-glib) ("exiv2" ,exiv2) ("freeimage" ,freeimage) + ("gmic" ,gmic) ("graphicsmagick" ,graphicsmagick) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("gtk+" ,gtk+) @@ -539,7 +549,7 @@ (define-public darktable ("libwebp" ,libwebp) ("libxml2" ,libxml2) ("libxslt" ,libxslt) - ("lua" ,lua) + ("lua" ,lua) ;for plugins ("openexr" ,openexr) ("openjpeg" ,openjpeg) ("osm-gps-map" ,osm-gps-map) -- cgit v1.2.3 From e3e757edf936ebd8a86a72afaf4c5383e5ccf17b Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 30 Jun 2020 00:03:50 +0200 Subject: gnu: geeqie: Update to 1.5. * gnu/packages/image-viewers.scm (geeqie): Update to 1.5. [arguments]: Add "--enable-gtk3" to #:configure-flags. Remove #:parallel-build? and #:phases. --- gnu/packages/image-viewers.scm | 101 ++++++++++++++--------------------------- 1 file changed, 35 insertions(+), 66 deletions(-) diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 5a7d849ae1..87159dcc45 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -120,77 +120,46 @@ (define-public feh "See 'COPYING' in the distribution.")))) (define-public geeqie - ;; The latest release, 1.4, fails to build with Exiv2 0.27.1. The upstream - ;; repo has several fixes for that, so take a snapshot. - (let ((commit "c220ddefb1b6b11b54f7598f0d44dd0723325ed4") - (revision "1")) - (package - (name "geeqie") - (version (git-version "1.4" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/BestImageViewer/geeqie") - (commit commit))) - (sha256 - (base32 - "07424nzrnwbksgalgg1a6ig2snd986w79kca1cfnv1q9kc7x2h3x")) - (file-name (git-file-name name version)))) - (build-system gnu-build-system) - (arguments - `( ;; Enable support for a "map" pane using GPS data. - #:configure-flags '("--enable-map") - - ;; Parallel builds fail with something like: - ;; image-load.c:143:9: error: ‘gq_marshal_VOID__INT_INT_INT_INT’ undeclared - ;; due to unexpressed makefile dependencies. - #:parallel-build? #f - - #:phases - (modify-phases %standard-phases - (add-before 'bootstrap 'pre-bootstrap - (lambda _ - (define (write-dummy-changelog port) - (display "See Git history for a change log.\n" port)) - ;; Create ChangeLog{,.html} to placate the makefile, which would - ;; otherwise require access to the Git repo. - (call-with-output-file "ChangeLog" - write-dummy-changelog) - (call-with-output-file "ChangeLog.html" - write-dummy-changelog) - - ;; Don't try to run 'git' for the version number. - (substitute* "configure.ac" - (("m4_esyscmd_s\\([^)]+\\)") - (string-append "[" ,version "]"))) - - ;; Remove references to non-existent files. - (substitute* "po/POTFILES.in" - (("^plugins/import/.*") "")) - #t))))) - (inputs - `(("clutter" ,clutter) - ("libchamplain" ,libchamplain) - ("lcms" ,lcms) - ("exiv2" ,exiv2) - ("libpng" ,libpng) - ("gtk+" ,gtk+))) - (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("glib" ,glib "bin") ; glib-gettextize - ("intltool" ,intltool) - ("pkg-config" ,pkg-config))) - (home-page "http://www.geeqie.org/") - (synopsis "Lightweight GTK+ based image viewer") - (description - "Geeqie is a lightweight GTK+ based image viewer for Unix like operating + (package + (name "geeqie") + (version "1.5") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/BestImageViewer/geeqie") + (commit (string-append "v" version)))) + (sha256 + (base32 + "0nf45sh3pwsv98sppcrqj81b6mdi31n1sbc7gn88m8mhpfp1qq6k")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + (arguments + `( ;; Enable support for a "map" pane using GPS data. + #:configure-flags '("--enable-map" + "--enable-gtk3"))) + (inputs + `(("clutter" ,clutter) + ("libchamplain" ,libchamplain) + ("lcms" ,lcms) + ("exiv2" ,exiv2) + ("libpng" ,libpng) + ("gtk+" ,gtk+))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("glib" ,glib "bin") ; glib-gettextize + ("intltool" ,intltool) + ("pkg-config" ,pkg-config))) + (home-page "http://www.geeqie.org/") + (synopsis "Lightweight GTK+ based image viewer") + (description + "Geeqie is a lightweight GTK+ based image viewer for Unix like operating systems. It features: EXIF, IPTC and XMP metadata browsing and editing interoperability; easy integration with other software; geeqie works on files and directories, there is no need to import images; fast preview for many raw image formats; tools for image comparison, sorting and managing photo collection. Geeqie was initially based on GQview.") - (license license:gpl2+)))) + (license license:gpl2+))) (define-public gpicview (package -- cgit v1.2.3 From cc6dd2981c7e81a3a1750821ba53e63a7a4bc8e9 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 30 Jun 2020 00:15:35 +0200 Subject: swh: Adjust for Guile-JSON 4.0 null handling. * guix/swh.scm (string*): Add clause for 'null. --- guix/swh.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/guix/swh.scm b/guix/swh.scm index ec744fed2f..913f0d1c9d 100644 --- a/guix/swh.scm +++ b/guix/swh.scm @@ -174,7 +174,8 @@ (define string* ;; Converts "string or #nil" coming from JSON to "string or #f". (match-lambda ((? string? str) str) - ((? null?) #f))) + ((? null?) #f) ;Guile-JSON 3.x + ('null #f))) ;Guile-JSON 4.x (define %allow-request? ;; Takes a URL and method (e.g., the 'http-get' procedure) and returns true -- cgit v1.2.3 From d2fde340adf197cc42bc4e0187deaf3a7bd3968d Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 30 Jun 2020 00:17:22 +0200 Subject: lint: Adjust 'swh-error exception handler. * guix/lint.scm (check-archival): Change first clause to match only 'swh-error keys. --- guix/lint.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/lint.scm b/guix/lint.scm index fa507546f5..8a4d27ce05 100644 --- a/guix/lint.scm +++ b/guix/lint.scm @@ -1208,7 +1208,7 @@ (define commit '()))) '())))) (match-lambda* - ((key url method response) + (('swh-error url method response) (response->warning url method response)) ((key . args) (if (eq? key skip-key) -- cgit v1.2.3 From fe09d9ff07f66c17db0f97830937da00f6328bdb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 29 Jun 2020 23:40:01 +0200 Subject: gnu: youtube-dl: Update to 2020.06.16.1. * gnu/packages/video.scm (youtube-dl): Update to 2020.06.16.1. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 9c88066c91..afe520430e 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1645,7 +1645,7 @@ (define-public libvpx (define-public youtube-dl (package (name "youtube-dl") - (version "2020.06.16") + (version "2020.06.16.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/ytdl-org/youtube-dl/" @@ -1653,7 +1653,7 @@ (define-public youtube-dl version ".tar.gz")) (sha256 (base32 - "1fgqi8pvw13p79gl38lnpl7ifa7cwxhzk53c6lmjsk1yhz5455m9")))) + "1q0080cvxpfakgbzigbnl9adnga3jz1sqig2rsiq52rarqbc01px")))) (build-system python-build-system) (arguments ;; The problem here is that the directory for the man page and completion -- cgit v1.2.3 From 8998965adbc348fcc02d2aff6321586d3ff9d57d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 29 Jun 2020 23:40:19 +0200 Subject: gnu: libwacom: Update to 1.4. * gnu/packages/xdisorg.scm (libwacom): Update to 1.4. --- gnu/packages/xdisorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 7cf8cc9a67..cec9bf0799 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -1080,7 +1080,7 @@ (define-public xcape (define-public libwacom (package (name "libwacom") - (version "1.3") + (version "1.4") (source (origin (method url-fetch) (uri (string-append @@ -1088,7 +1088,7 @@ (define-public libwacom "libwacom-" version "/libwacom-" version ".tar.bz2")) (sha256 (base32 - "0g48cdg2qpvrr2nk8ccibjg3iv7iqskdv66izxacqx70w47y1771")))) + "1rk661cymmahak9rw0wcssnfszbngq74vp7zc2cwyg6yrjbif1lh")))) (build-system glib-or-gtk-build-system) (arguments `(#:configure-flags '("--disable-static"))) -- cgit v1.2.3 From 1c217fc360b08dd25bbf1eff661aedb0b12f23dc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 29 Jun 2020 23:46:38 +0200 Subject: gnu: menumaker: Update to 0.99.12. * gnu/packages/wm.scm (menumaker): Update to 0.99.12. --- gnu/packages/wm.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index a4259ced90..def8fdccd2 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1012,14 +1012,14 @@ (define-public awesome (define-public menumaker (package (name "menumaker") - (version "0.99.11") + (version "0.99.12") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/menumaker/" "menumaker-" version ".tar.gz")) (sha256 - (base32 "0dprndnhwm7b803zkp4pisiq06ic9iv8vr42in5is47jmvdim0wx")))) + (base32 "034v5204bsgkzzk6zfa5ia63q95gln47f7hwf96yvad5hrhmd8z3")))) (build-system gnu-build-system) (inputs `(("python" ,python))) -- cgit v1.2.3 From d5255a4fda775c439e9d188a3fa0f37cc95c330c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 30 Jun 2020 01:49:41 +0200 Subject: gnu: wireguard-linux-compat: Update to 1.0.20200623. * gnu/packages/vpn.scm (wireguard-linux-compat): Update to 1.0.20200623. --- gnu/packages/vpn.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index e6a2f42ee3..ed9be6c16d 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -501,7 +501,7 @@ (define-public badvpn (define-public wireguard-linux-compat (package (name "wireguard-linux-compat") - (version "1.0.20200520") + (version "1.0.20200623") (source (origin (method url-fetch) (uri (string-append "https://git.zx2c4.com/wireguard-linux-compat/" @@ -509,7 +509,7 @@ (define-public wireguard-linux-compat ".tar.xz")) (sha256 (base32 - "1hvpbfpdd3v2k27ypa1y1j422irx7hxpz87f50s28jvkxx5sxrqn")))) + "0iclixsqfckaz6kz6a4lhzdary3xhfy1d0pz0pgrwy8m8mr3f28k")))) (build-system linux-module-build-system) (outputs '("out" "kernel-patch")) -- cgit v1.2.3 From 37a4863731e5fbfd77d1c55f7b07e738f68426a3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 30 Jun 2020 01:49:57 +0200 Subject: gnu: wslay: Update to 1.1.1. * gnu/packages/web.scm (wslay): Update to 1.1.1. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index c449267f3d..292ccf5285 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1225,7 +1225,7 @@ (define-public websocketpp (define-public wslay (package (name "wslay") - (version "1.1.0") + (version "1.1.1") (source (origin (method git-fetch) @@ -1234,7 +1234,7 @@ (define-public wslay (commit (string-append "release-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0ak9a6hsanhys40yhv7c2gqkfghpm6jx36j1pnml8ajvgaky5q98")))) + (base32 "1w32iljg4inqf0712w5fxxhggvmjh6ipl2lnz0h36dv1xrj0d964")))) (build-system gnu-build-system) (arguments ;; Parallel builds don't reliably succeed. -- cgit v1.2.3 From a3c5540df37cd8e9027f64e4647a471a46ad0c5e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 30 Jun 2020 09:20:52 +0300 Subject: gnu: mutt: Update to 1.14.5. * gnu/packages/mail.scm (mutt): Update to 1.14.5. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 87388747e4..4fbd10c6a8 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -421,7 +421,7 @@ (define-public fetchmail (define-public mutt (package (name "mutt") - (version "1.14.4") + (version "1.14.5") (source (origin (method url-fetch) (uri (list @@ -431,7 +431,7 @@ (define-public mutt version ".tar.gz"))) (sha256 (base32 - "1hykkq3m7kqic5r7vzg45xaww7415fv5i2d03slzykqb47w5d3na")) + "0p1xiqzmkqlzy5yi4l0dh0lacdq300zdj48zk0fir8j1pp512sri")) (patches (search-patches "mutt-store-references.patch")))) (build-system gnu-build-system) (inputs -- cgit v1.2.3 From 5511395b0511dc6eb724c9a1542e2913a3339982 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 30 Jun 2020 09:31:53 +0300 Subject: gnu: parallel: Update to 20200622. * gnu/packages/parallel.scm (parallel): Update to 20200622. --- gnu/packages/parallel.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index 30b3c1ddda..cad9383769 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -55,14 +55,14 @@ (define-module (gnu packages parallel) (define-public parallel (package (name "parallel") - (version "20200522") + (version "20200622") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/parallel/parallel-" version ".tar.bz2")) (sha256 - (base32 "10is46v5dpccxibby0zikg1q68mdwpmgdpxk796zka93idd6id29")))) + (base32 "0gqxpk1hm323hwvw9isjxy2xv2wg8avav60bckjm0s57jbhsz3zz")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 05b237308bf26dc458bd40d9d0f8c3a89f40256a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 30 Jun 2020 09:43:09 +0300 Subject: gnu: kdeconnect: Update to 20.04.2. * gnu/packages/kde.scm (kdeconnect): Update to 20.04.2. --- gnu/packages/kde.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index cba00b2882..9a80e362b6 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -567,7 +567,7 @@ (define-public snorenotify (define-public kdeconnect (package (name "kdeconnect") - (version "20.04.1") + (version "20.04.2") (source (origin (method url-fetch) @@ -576,7 +576,7 @@ (define-public kdeconnect version ".tar.xz")) (sha256 (base32 - "1knhpjdbffw858dfd9kml91a02fkc0rcjydfavcyr79j9x8mv3bq")))) + "0yq3afbbcc9gmlcachvh3xz3gdj57092fpagp36l5knw8gr0d9ip")))) (build-system qt-build-system) (arguments `(#:configure-flags '("-DBUILD_TESTING=ON" -- cgit v1.2.3 From a9ff5b72a69a9d97a0f0ae59f24956df0600ef3f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 30 Jun 2020 09:45:44 +0300 Subject: gnu: toot: Update to 0.27.0. * gnu/packages/mastodon.scm (toot): Update to 0.27.0. --- gnu/packages/mastodon.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mastodon.scm b/gnu/packages/mastodon.scm index d6b0e25e6b..f7055f796e 100644 --- a/gnu/packages/mastodon.scm +++ b/gnu/packages/mastodon.scm @@ -29,13 +29,13 @@ (define-module (gnu packages mastodon) (define-public toot (package (name "toot") - (version "0.26.0") + (version "0.27.0") (source (origin (method url-fetch) (uri (pypi-uri "toot" version)) (sha256 - (base32 "0h0lqm1q7i32i9n6yx5q2j563vc92h2sjh1ih4n2rxf98p6c5d1b")))) + (base32 "1mfbqmgna7046d134pc5qx1vyfd60vwcn0xr9lxzlmc5rjdbmz8x")))) (build-system python-build-system) (arguments '(#:phases -- cgit v1.2.3 From 8154ba9a592e0e73067b1a7a29565eafa19e97b3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 30 Jun 2020 09:49:28 +0300 Subject: gnu: python-beautifulsoup4: Update to 4.9.1. * gnu/packages/python-xyz.scm (python-beautifulsoup4): Update to 4.9.1. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 45ecad87fc..f071314c7c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6965,14 +6965,14 @@ (define-public python2-notify2 (define-public python-beautifulsoup4 (package (name "python-beautifulsoup4") - (version "4.7.1") + (version "4.9.1") (source (origin (method url-fetch) (uri (pypi-uri "beautifulsoup4" version)) (sha256 (base32 - "0j2kycz2dxgx68xzjm7rxg5xn6v61gq5ifvxyg99slmqkybnal4l")))) + "1mvzlw3pzbhsvl3z8784s5h7iiflm2hggiy1fxyrrxwnbc8lvk3k")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From 2a723eaf1283df444c331a3476ebea0bcf95038a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 30 Jun 2020 09:55:59 +0300 Subject: gnu: python-soupsieve: Update to 2.0.1. * gnu/packages/python-xyz.scm (python-soupsieve): Update to 2.0.1. (python2-soupsieve): Update to 1.9.6. --- gnu/packages/python-xyz.scm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f071314c7c..a9e8858d9c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7008,14 +7008,14 @@ (define-public python2-beautifulsoup4 (define-public python-soupsieve (package (name "python-soupsieve") - (version "1.9.5") + (version "2.0.1") (source (origin (method url-fetch) (uri (pypi-uri "soupsieve" version)) (sha256 (base32 - "1nhd0q0ifwva9wn645s6pn74p1rd97asn3qfg75nphx1wkgcbhg2")))) + "0ch2rhvsbwfpvzm4kzy81rclbzr533yv83hzg1gx55byfa0w37d5")))) (build-system python-build-system) (arguments `(#:tests? #f)) ;;XXX: 2 tests fail currently despite claming they were to be @@ -7032,10 +7032,19 @@ (define-public python-soupsieve (properties `((python2-variant . ,(delay python2-soupsieve)))) (license license:expat))) +;; This is the last version that supports python-2 (define-public python2-soupsieve (let ((base (package-with-python2 (strip-python2-variant python-soupsieve)))) (package (inherit base) + (version "1.9.6") + (source + (origin + (method url-fetch) + (uri (pypi-uri "soupsieve" version)) + (sha256 + (base32 + "1apgqxngi1216h1cyvrvj9gy3wf45mh1lz4n76j26jf3k36bm1br")))) (propagated-inputs `(("python2-backports-functools-lru-cache" ,python2-backports-functools-lru-cache) -- cgit v1.2.3 From 94c3f58d58847d48a95a6b0448a03fb13105896e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 30 Jun 2020 10:11:00 +0300 Subject: gnu: python2-backports-functools-lru-cache: Update to 1.6.1. * gnu/packages/python-xyz.scm (python2-backports-functools-lru-cache): Update to 1.6.1. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a9e8858d9c..08fa6c3f04 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14266,7 +14266,7 @@ (define-public python2-isort (define-public python2-backports-functools-lru-cache (package (name "python2-backports-functools-lru-cache") - (version "1.5") + (version "1.6.1") (source (origin (method url-fetch) @@ -14274,7 +14274,7 @@ (define-public python2-backports-functools-lru-cache (uri (pypi-uri "backports.functools_lru_cache" version)) (sha256 (base32 - "06jgv8gib4fhky0p5cmxdghvsgjyzcdgk48k8pxb1ccf11znk64x")))) + "0jidrkk2w6bhjm197plxiaxrav64mgcrign0bfyr7md2ilc5zplg")))) (build-system python-build-system) (native-inputs `(("python2-setuptools-scm" ,python2-setuptools-scm))) -- cgit v1.2.3 From 9554f5a85e239e5090127d2fa2a07ce10854b83b Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 30 Jun 2020 09:33:57 +0200 Subject: gnu: cuirass: Update to 0.0.1-36.4dd9664. * gnu/packages/ci.scm (cuirass): Update to 0.0.1-36.4dd9664. --- gnu/packages/ci.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index 81b54e8f90..5d4aae7360 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -47,8 +47,8 @@ (define-module (gnu packages ci) #:use-module (guix build-system gnu)) (define-public cuirass - (let ((commit "91204db33ae07ce179dfc5dcf624f43b7b8117f5") - (revision "35")) + (let ((commit "4dd9664bf98b6063a1ea2d0f76fffd5414be456a") + (revision "36")) (package (name "cuirass") (version (git-version "0.0.1" revision commit)) @@ -60,7 +60,7 @@ (define-public cuirass (file-name (git-file-name name version)) (sha256 (base32 - "1n8qlw26jazzc59grdii37dl3pfqyhyybcn2g785vm18gq1j4wd0")))) + "1pd0h1c6djxpq7h63fl21l87w2wwxlp1nawcj6qmrjhb597kncdk")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) -- cgit v1.2.3 From 0681f05486d901c92637c098bb7afddef35068b0 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Mon, 29 Jun 2020 22:43:22 +0200 Subject: gnu: gfortran: Remove unusable versions. The gfortran packages cannot be used without being wrapped with gfortran-toolchain. However, as the comment in (gnu packages commencement) explains, there cannot be more than one gfortran-toolchain package because of ABI issues. Thus, versions of gfortran other than the main one are useless. * gnu/packages/gcc.scm (gfortran-4.8, gfortran-4.9, gfortran-5, gfortran-6, gfortran-7, gfortran-8, gfortran-9): Remove variables. (gfortran): Define the gfortran package based on the gcc variable. --- gnu/packages/gcc.scm | 41 ++--------------------------------------- 1 file changed, 2 insertions(+), 39 deletions(-) diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 0c5be69fbf..31d88f2e0b 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -687,48 +687,11 @@ (define %generic-search-paths (variable "LIBRARY_PATH") (files '("lib" "lib64"))))) -(define-public gfortran-4.8 - (hidden-package - (custom-gcc gcc-4.8 "gfortran" '("fortran") - %generic-search-paths))) - -(define-public gfortran-4.9 - (hidden-package - (custom-gcc gcc-4.9 "gfortran" '("fortran") - %generic-search-paths))) - -(define-public gfortran-5 - (hidden-package - (custom-gcc gcc-5 "gfortran" '("fortran") - %generic-search-paths))) - -(define-public gfortran-6 - (hidden-package - (custom-gcc gcc-6 "gfortran" '("fortran") - %generic-search-paths))) - -(define-public gfortran-7 - (hidden-package - (custom-gcc gcc-7 "gfortran" '("fortran") - %generic-search-paths))) - -(define-public gfortran-8 - (hidden-package - (custom-gcc gcc-8 "gfortran" '("fortran") - %generic-search-paths))) - -(define-public gfortran-9 +(define-public gfortran (hidden-package - (custom-gcc gcc-9 "gfortran" '("fortran") + (custom-gcc gcc "gfortran" '("fortran") %generic-search-paths))) -(define-public gfortran - ;; Note: Update this when GCC changes! We cannot use - ;; (custom-gcc gcc "fortran" …) because that would lead to a package object - ;; that is not 'eq?' with GFORTRAN-5, and thus 'fold-packages' would - ;; report two gfortran@5 that are in fact identical. - gfortran-7) - (define-public libgccjit (package (inherit gcc-9) -- cgit v1.2.3 From 14cce84ca77f11b182ee2d5c3ed99271b2a74b53 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Tue, 30 Jun 2020 13:06:09 +0200 Subject: gnu: Add gcc-{objc,objc++}-{9,10}. * gnu/packages/gcc.scm (%objc-search-paths, %objc++-search-paths): New variables. (gcc-objc-4.8, gcc-objc-4.9, gcc-objc-5, gcc-objc-6, gcc-objc-7, gcc-objc-8, gcc-objc++-4.8, gcc-objc++-4.9, gcc-objc++-5, gcc-objc++-6, gcc-objc++-7, gcc-objc++-8): Don't duplicate the search path list. (gcc-objc-9, gcc-objc-10, gcc-objc++-9, gcc-objc++-10): New variables. --- gnu/packages/gcc.scm | 116 +++++++++++++++++++-------------------------------- 1 file changed, 44 insertions(+), 72 deletions(-) diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 31d88f2e0b..9e881092c9 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -728,115 +728,87 @@ (define-public gccgo-4.9 ;; a cyclic dependency. #:separate-lib-output? #f)) +(define %objc-search-paths + (list (search-path-specification + (variable "OBJC_INCLUDE_PATH") + (files '("include"))) + (search-path-specification + (variable "LIBRARY_PATH") + (files '("lib" "lib64"))))) + (define-public gcc-objc-4.8 (custom-gcc gcc-4.8 "gcc-objc" '("objc") - (list (search-path-specification - (variable "OBJC_INCLUDE_PATH") - (files '("include"))) - (search-path-specification - (variable "LIBRARY_PATH") - (files '("lib" "lib64")))))) + %objc-search-paths)) (define-public gcc-objc-4.9 (custom-gcc gcc-4.9 "gcc-objc" '("objc") - (list (search-path-specification - (variable "OBJC_INCLUDE_PATH") - (files '("include"))) - (search-path-specification - (variable "LIBRARY_PATH") - (files '("lib" "lib64")))))) + %objc-search-paths)) (define-public gcc-objc-5 (custom-gcc gcc-5 "gcc-objc" '("objc") - (list (search-path-specification - (variable "OBJC_INCLUDE_PATH") - (files '("include"))) - (search-path-specification - (variable "LIBRARY_PATH") - (files '("lib" "lib64")))))) + %objc-search-paths)) (define-public gcc-objc-6 (custom-gcc gcc-6 "gcc-objc" '("objc") - (list (search-path-specification - (variable "OBJC_INCLUDE_PATH") - (files '("include"))) - (search-path-specification - (variable "LIBRARY_PATH") - (files '("lib" "lib64")))))) + %objc-search-paths)) (define-public gcc-objc-7 (custom-gcc gcc-7 "gcc-objc" '("objc") - (list (search-path-specification - (variable "OBJC_INCLUDE_PATH") - (files '("include"))) - (search-path-specification - (variable "LIBRARY_PATH") - (files '("lib" "lib64")))))) + %objc-search-paths)) (define-public gcc-objc-8 (custom-gcc gcc-8 "gcc-objc" '("objc") - (list (search-path-specification - (variable "OBJC_INCLUDE_PATH") - (files '("include"))) - (search-path-specification - (variable "LIBRARY_PATH") - (files '("lib" "lib64")))))) + %objc-search-paths)) + +(define-public gcc-objc-9 + (custom-gcc gcc-9 "gcc-objc" '("objc") + %objc-search-paths)) + +(define-public gcc-objc-10 + (custom-gcc gcc-10 "gcc-objc" '("objc") + %objc-search-paths)) (define-public gcc-objc gcc-objc-7) +(define %objc++-search-paths + (list (search-path-specification + (variable "OBJCPLUS_INCLUDE_PATH") + (files '("include"))) + (search-path-specification + (variable "LIBRARY_PATH") + (files '("lib" "lib64"))))) + (define-public gcc-objc++-4.8 (custom-gcc gcc-4.8 "gcc-objc++" '("obj-c++") - (list (search-path-specification - (variable "OBJCPLUS_INCLUDE_PATH") - (files '("include"))) - (search-path-specification - (variable "LIBRARY_PATH") - (files '("lib" "lib64")))))) + %objc++-search-paths)) (define-public gcc-objc++-4.9 (custom-gcc gcc-4.9 "gcc-objc++" '("obj-c++") - (list (search-path-specification - (variable "OBJCPLUS_INCLUDE_PATH") - (files '("include"))) - (search-path-specification - (variable "LIBRARY_PATH") - (files '("lib" "lib64")))))) + %objc++-search-paths)) (define-public gcc-objc++-5 (custom-gcc gcc-5 "gcc-objc++" '("obj-c++") - (list (search-path-specification - (variable "OBJCPLUS_INCLUDE_PATH") - (files '("include"))) - (search-path-specification - (variable "LIBRARY_PATH") - (files '("lib" "lib64")))))) + %objc++-search-paths)) (define-public gcc-objc++-6 (custom-gcc gcc-6 "gcc-objc++" '("obj-c++") - (list (search-path-specification - (variable "OBJCPLUS_INCLUDE_PATH") - (files '("include"))) - (search-path-specification - (variable "LIBRARY_PATH") - (files '("lib" "lib64")))))) + %objc++-search-paths)) (define-public gcc-objc++-7 (custom-gcc gcc-7 "gcc-objc++" '("obj-c++") - (list (search-path-specification - (variable "OBJCPLUS_INCLUDE_PATH") - (files '("include"))) - (search-path-specification - (variable "LIBRARY_PATH") - (files '("lib" "lib64")))))) + %objc++-search-paths)) (define-public gcc-objc++-8 (custom-gcc gcc-8 "gcc-objc++" '("obj-c++") - (list (search-path-specification - (variable "OBJCPLUS_INCLUDE_PATH") - (files '("include"))) - (search-path-specification - (variable "LIBRARY_PATH") - (files '("lib" "lib64")))))) + %objc++-search-paths)) + +(define-public gcc-objc++-9 + (custom-gcc gcc-9 "gcc-objc++" '("obj-c++") + %objc++-search-paths)) + +(define-public gcc-objc++-10 + (custom-gcc gcc-10 "gcc-objc++" '("obj-c++") + %objc++-search-paths)) (define-public gcc-objc++ gcc-objc++-7) -- cgit v1.2.3 From 5e766fe5a2b19a33e1f2589ede37da674aada4c6 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 30 Jun 2020 14:31:45 +0200 Subject: tests: install: Increase image size limit. Commits 0eed77127592323d89f56c215a15374a1aaae110 and 614a1e3fa2d731d4719f03912b1b87fb4fd309cb caused a ~150M increase of the image size. Increase the image size limit by 200M until the situation is addressed. * gnu/tests/install.scm (%simple-installation-script, %extlinux-gpt-installation-script, %simple-installation-script-for-/dev/vda, %raid-root-installation-script, %encrypted-root-installation-script): Increase image size limit by 200M. --- gnu/tests/install.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm index b2edfa5c22..9656e5f41f 100644 --- a/gnu/tests/install.scm +++ b/gnu/tests/install.scm @@ -163,7 +163,7 @@ (define %simple-installation-script guix build isc-dhcp parted --script /dev/vdb mklabel gpt \\ mkpart primary ext2 1M 3M \\ - mkpart primary ext2 3M 1.4G \\ + mkpart primary ext2 3M 1.6G \\ set 1 boot on \\ set 1 bios_grub on mkfs.ext4 -L my-root /dev/vdb2 @@ -188,7 +188,7 @@ (define %extlinux-gpt-installation-script export GUIX_BUILD_OPTIONS=--no-grafts guix build isc-dhcp parted --script /dev/vdb mklabel gpt \\ - mkpart ext2 1M 1.4G \\ + mkpart ext2 1M 1.6G \\ set 1 legacy_boot on mkfs.ext4 -L my-root -O '^64bit' /dev/vdb1 mount /dev/vdb1 /mnt @@ -419,7 +419,7 @@ (define %simple-installation-script-for-/dev/vda guix build isc-dhcp parted --script /dev/vda mklabel gpt \\ mkpart primary ext2 1M 3M \\ - mkpart primary ext2 3M 1.4G \\ + mkpart primary ext2 3M 1.6G \\ set 1 boot on \\ set 1 bios_grub on mkfs.ext4 -L my-root /dev/vda2 @@ -631,8 +631,8 @@ (define %raid-root-installation-script export GUIX_BUILD_OPTIONS=--no-grafts parted --script /dev/vdb mklabel gpt \\ mkpart primary ext2 1M 3M \\ - mkpart primary ext2 3M 1.4G \\ - mkpart primary ext2 1.4G 2.8G \\ + mkpart primary ext2 3M 1.6G \\ + mkpart primary ext2 1.6G 3.2G \\ set 1 boot on \\ set 1 bios_grub on yes | mdadm --create /dev/md0 --verbose --level=mirror --raid-devices=2 \\ @@ -658,7 +658,7 @@ (define %test-raid-root-os %raid-root-os-source #:script %raid-root-installation-script - #:target-size (* 2800 MiB))) + #:target-size (* 3200 MiB))) (command (qemu-command/writable-image image))) (run-basic-test %raid-root-os `(,@command) "raid-root-os"))))) @@ -719,7 +719,7 @@ (define %encrypted-root-installation-script ls -l /run/current-system/gc-roots parted --script /dev/vdb mklabel gpt \\ mkpart primary ext2 1M 3M \\ - mkpart primary ext2 3M 1.4G \\ + mkpart primary ext2 3M 1.6G \\ set 1 boot on \\ set 1 bios_grub on echo -n " %luks-passphrase " | \\ -- cgit v1.2.3 From a7eaaec8c147b099ea9b85d64ef2ba4a3f710b5c Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Tue, 30 Jun 2020 15:04:17 +0200 Subject: gnu: busybox: Accept make-flags. * gnu/packages/busybox.scm (busybox)[arguments]<#:phases>[configure]: Accept MAKE-FLAGS and use them. [check]: Accept MAKE-FLAGS and use them. [install]: Accept MAKE-FLAGS and use them. --- gnu/packages/busybox.scm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/gnu/packages/busybox.scm b/gnu/packages/busybox.scm index 305a61f40b..0a93c6475e 100644 --- a/gnu/packages/busybox.scm +++ b/gnu/packages/busybox.scm @@ -60,7 +60,8 @@ (define-public busybox (("default y") "default n")) #t)) (replace 'configure - (lambda _ (invoke "make" "defconfig"))) + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "defconfig" make-flags))) (add-after 'configure 'dont-install-to-usr (lambda _ (substitute* ".config" @@ -68,7 +69,7 @@ (define-public busybox "CONFIG_INSTALL_NO_USR=y")) #t)) (replace 'check - (lambda _ + (lambda* (#:key make-flags #:allow-other-keys) (substitute* '("testsuite/du/du-s-works" "testsuite/du/du-works") (("/bin") "/etc")) ; there is no /bin but there is a /etc @@ -96,17 +97,17 @@ (define-public busybox (delete-file "testsuite/which/which-uses-default-path") (rmdir "testsuite/which") - (invoke "make" + (apply invoke "make" ;; "V=1" "SKIP_KNOWN_BUGS=1" "SKIP_INTERNET_TESTS=1" - "check"))) + "check" make-flags))) (replace 'install - (lambda* (#:key outputs #:allow-other-keys) + (lambda* (#:key outputs make-flags #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) - (invoke "make" + (apply invoke "make" (string-append "CONFIG_PREFIX=" out) - "install"))))))) + "install" make-flags))))))) (native-inputs `(("perl" ,perl) ; needed to generate the man pages (pod2man) ;; The following are needed by the tests. ("inetutils" ,inetutils) -- cgit v1.2.3 From b1c894b53fa86d39e7860da25852d6de84fe6801 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Sun, 28 Jun 2020 15:22:43 +0200 Subject: gnu: nghttp2: Support for the Hurd. * gnu/packages/web.scm (nghttp2)[inputs]: When compiling for the Hurd, include openssl:static. --- gnu/packages/web.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 292ccf5285..47b0c5c9fb 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -7232,7 +7232,10 @@ (define-public nghttp2 `(("jemalloc" ,jemalloc))) ; fight nghttpd{,x} heap fragmentation ("libev" ,libev) ("libxml2" ,libxml2) ; for ‘nghttp -a’ - ("openssl" ,openssl))) + ("openssl" ,openssl) + ,@(if (hurd-target?) + `(("openssl-static" ,openssl "static")) + '()))) (arguments `(#:configure-flags (list (string-append "--libdir=" (assoc-ref %outputs "lib") "/lib") -- cgit v1.2.3 From 26611f56fb1108de8205667fa9318b61794d0c9c Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Mon, 29 Jun 2020 07:52:59 +0200 Subject: gnu: hurd-core-headers: Strictly include header packages. * gnu/packages/hurd.scm (hurd-core-headers)[arguments]: Strictly include header package inputs in union. --- gnu/packages/hurd.scm | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index f0c4451e80..98fe594b7f 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -264,13 +264,21 @@ (define-public hurd-core-headers (arguments '(#:modules ((guix build union)) #:builder (begin - (use-modules (ice-9 match) + (use-modules (srfi srfi-1) + (srfi srfi-26) + (ice-9 match) (guix build union)) - (match %build-inputs - (((names . directories) ...) - (union-build (assoc-ref %outputs "out") - directories) - #t))))) + (let ((inputs (filter + (compose (cute member <> '("gnumach-headers" + "hurd-headers" + "hurd-minimal")) + car) + %build-inputs))) + (match inputs + (((names . directories) ...) + (union-build (assoc-ref %outputs "out") + directories) + #t)))))) (inputs `(("gnumach-headers" ,gnumach-headers) ("hurd-headers" ,hurd-headers) ("hurd-minimal" ,hurd-minimal))) -- cgit v1.2.3 From b38556ea7f7aca7c625db9dff49888045004168a Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Tue, 30 Jun 2020 15:17:29 +0200 Subject: gnu: guix: Update to 1.1.0-13.26611f56fb. * gnu/packages/package-management.scm (guix): Update to 1.1.0-13.26611f56fb --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index bfecf110ca..068d46566c 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -118,8 +118,8 @@ (define-public guix ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.1.0") - (commit "c00564192a9924ab2218c243342963aba89d67d1") - (revision 12)) + (commit "26611f56fb1108de8205667fa9318b61794d0c9c") + (revision 13)) (package (name "guix") @@ -135,7 +135,7 @@ (define-public guix (commit commit))) (sha256 (base32 - "008ywpdkc5f2jh25x6rr9glzvq4a6qih7v73w5dbxscpddx5c5g2")) + "15m8pamy1hmk3y7yq2da70nmng2xycwpyl2dgnpfp4aif2ynvirv")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From f67ae666896a51fc6edd1b537e43ed44685cb2a3 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sat, 20 Jun 2020 19:26:48 +0200 Subject: gnu: Add tesseract-engine. * gnu/packages/game-development.scm (tesseract-engine): New variable. --- gnu/packages/game-development.scm | 92 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index c28234217c..df9e47ec46 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -2393,3 +2393,95 @@ (define-public dhewm3 support), has much better support for widescreen resolutions and has 64bit support.") (license license:gpl3))) + +(define-public tesseract-engine + (let ((svn-revision 2411)) + (package + (name "tesseract-engine") + (version (string-append "20200615-" (number->string svn-revision))) + (source + (origin + (method svn-fetch) + (uri (svn-reference + (url "svn://svn.tuxfamily.org/svnroot/tesseract/main") + (revision svn-revision))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1av9jhl2ivbl7wfszyhyna84llvh1z2d8khkmadm8d105addj10q")) + (modules '((guix build utils))) + (snippet + '(begin + (for-each delete-file-recursively + '("bin" "bin64" + ;; Remove "media" since some files such as + ;; media/sound/game/soundsnap/info.txt refer to a + ;; non-commercial license. + "media" + "server.bat" + "tesseract.bat" + "src/lib" + "src/lib64")) + #t)))) + (build-system gnu-build-system) + (arguments + `(#:make-flags (list "CC=gcc") + #:tests? #f ; No tests. + #:phases + (modify-phases %standard-phases + (delete 'configure) + (add-after 'unpack 'cd-src + (lambda _ (chdir "src") #t)) + (add-before 'build 'fix-env + (lambda* (#:key inputs #:allow-other-keys) + (setenv "CPATH" + (string-append (assoc-ref inputs "sdl2-union") + "/include/SDL2:" + (or (getenv "CPATH") ""))) + #t)) + (add-after 'install 'really-install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (share (string-append out "/share/tesseract")) + (bin (string-append out "/bin/tesseract")) + (client (string-append out "/bin/tesseract-client"))) + (chdir "..") ; Back to root. + (for-each + (lambda (dir) + (mkdir-p (string-append share "/" dir)) + (copy-recursively dir (string-append share "/" dir))) + '("config")) + (mkdir-p (string-append out "/bin/")) + (copy-file "bin_unix/native_client" client) + (copy-file "bin_unix/native_server" + (string-append out "/bin/tesseract-server")) + (call-with-output-file bin + (lambda (p) + (format p "#!~a +TESS_DATA=~a +TESS_BIN=~a +TESS_OPTIONS=\"-u$HOME/.tesseract\" +cd \"$TESS_DATA\" +exec \"$TESS_BIN\" \"$TESS_OPTIONS\" \"$@\"" + (which "bash") + share + client))) + (chmod bin #o755) + (install-file "src/readme_tesseract.txt" + (string-append out "/share/licenses/tesseract/LICENSE"))) + #t))))) + (inputs + `(("sdl2-union" ,(sdl-union (list sdl2 sdl2-mixer sdl2-image))) + ("zlib" ,zlib) + ("libpng" ,libpng) + ("libgl" ,mesa))) + (home-page "http://tesseract.gg/") + (synopsis "First-person shooter engine with map editing, instagib, DM and CTF") + (description "This package contains the game engine of Tesseract, a +first-person shooter focused on cooperative in-game map editing. + +The engine is derived from @emph{Cube 2: Sauerbraten} technology but with +upgraded modern rendering techniques. The new rendering features include +fully dynamic omnidirectional shadows, global illumination, HDR lighting, +deferred shading, morphological / temporal / multisample anti-aliasing, and +much more.") + (license license:zlib)))) -- cgit v1.2.3 From 68a671abc8ec91e2f656b858edf0f29af8f8932d Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Mon, 29 Jun 2020 12:06:48 +0200 Subject: gnu: Add armips. * gnu/packages/assembly.scm (armips): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/assembly.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm index c9582bc596..62c7e570fa 100644 --- a/gnu/packages/assembly.scm +++ b/gnu/packages/assembly.scm @@ -371,3 +371,36 @@ (define-public xa as 6502A, 6504, 6507, 6510, 7501, 8500, 8501, 8502 ...), CMOS 6502s (65C02 and Rockwell R65C02) and the 65816.") (license license:gpl2))) + +(define-public armips + (package + (name "armips") + (version "0.11.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Kingcom/armips.git") + (commit (string-append "v" version)))) + (sha256 + (base32 "1c4dhjkvynqn9xm2vcvwzymk7yg8h25alnawkz4z1dnn1z1k3r9g")))) + (build-system cmake-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs #:allow-other-keys) + (invoke "./armipstests" "../source/Tests"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (install-file "armips" (string-append (assoc-ref outputs "out") + "/bin")) + #t))))) + (home-page "https://github.com/Kingcom/armips") + (synopsis "Assembler for various ARM and MIPS platforms") + (description + "armips is an assembler with full support for the MIPS R3000, MIPS R4000, +Allegrex and RSP instruction sets, partial support for the EmotionEngine +instruction set, as well as complete support for the ARM7 and ARM9 instruction +sets, both THUMB and ARM mode.") + (license license:expat))) -- cgit v1.2.3 From 0bc6a5796ab75183f658cf4b216b43c33a7801f3 Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Mon, 29 Jun 2020 12:06:49 +0200 Subject: gnu: add spirv-cross. * gnu/packages/vulkan.scm (spirv-cross): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/vulkan.scm | 51 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index d5f5be6816..2e640f502c 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -102,6 +102,57 @@ (define-public spirv-tools parser,disassembler, validator, and optimizer for SPIR-V.") (license license:asl2.0))) +(define-public spirv-cross + (package + (name "spirv-cross") + (version "2020-05-19") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/KhronosGroup/SPIRV-Cross") + (commit version))) + (sha256 + (base32 "0zyijp9zx9wbd4i5lwjap7n793iz6yjkf27la60dsffxl75yy9pd")) + (file-name (git-file-name name version)))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags + (list "-DSPIRV_CROSS_SHARED=YES") + ;; FIXME: The following tests fail: + ;; 15 - spirv-cross-test-opt + ;; 16 - spirv-cross-test-metal-opt + ;; 17 - spirv-cross-test-hlsl-opt + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-tests-to-find-deps + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "CMakeLists.txt" + (("\\$\\{CMAKE_(.*)_DIR\\}/external/glslang(.*)/bin") + (string-append (assoc-ref inputs "glslang") "/bin"))) + (substitute* "CMakeLists.txt" + (("\\$\\{CMAKE_(.*)_DIR\\}/external/spirv-tools(.*)/bin") + (string-append (assoc-ref inputs "spirv-tools") "/bin"))) + #t))))) + (inputs + `(("glslang" ,glslang) + ("spirv-headers" ,spirv-headers) + ("spirv-tools" ,spirv-tools))) + (native-inputs `(("python" ,python))) + (home-page "https://github.com/KhronosGroup/SPIRV-Cross") + (synopsis "Parser for and converter of SPIR-V to other shader languages") + (description + "SPIRV-Cross tries hard to emit readable and clean output from the +SPIR-V. The goal is to emit GLSL or MSL that looks like it was written by +a human and not awkward IR/assembly-like code. + +NOTE: Individual features are expected to be mostly complete, but it is +possible that certain obscure GLSL features are not yet supported. However, +most missing features are expected to be ``trivial'' improvements at this +stage.") + (license license:asl2.0))) + (define-public glslang (package (name "glslang") -- cgit v1.2.3 From 10543ef8e148f5329b41568f92e83dac3930f02b Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Mon, 29 Jun 2020 12:06:50 +0200 Subject: gnu: Add ppsspp. * gnu/packages/emulators.scm (ppsspp): New variable. * gnu/packages/patches/ppsspp-disable-upgrade-and-gold.patch: New file. * gnu/local.mk: Register it. Signed-off-by: Nicolas Goaziou --- gnu/local.mk | 1 + gnu/packages/emulators.scm | 131 ++++++++ .../patches/ppsspp-disable-upgrade-and-gold.patch | 358 +++++++++++++++++++++ 3 files changed, 490 insertions(+) create mode 100644 gnu/packages/patches/ppsspp-disable-upgrade-and-gold.patch diff --git a/gnu/local.mk b/gnu/local.mk index 8bb56010c2..dbeec8be3c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1350,6 +1350,7 @@ dist_patch_DATA = \ %D%/packages/patches/pam-mount-luks2-support.patch \ %D%/packages/patches/pango-skip-libthai-test.patch \ %D%/packages/patches/pciutils-hurd-configure.patch \ + %D%/packages/patches/ppsspp-disable-upgrade-and-gold.patch \ %D%/packages/patches/sdl-pango-api_additions.patch \ %D%/packages/patches/sdl-pango-blit_overflow.patch \ %D%/packages/patches/sdl-pango-fillrect_crash.patch \ diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index ae8bf18255..8b39517e3f 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1839,3 +1839,134 @@ (define-public unicorn "Unicorn is a lightweight, multi-platform, multi-architecture CPU emulator framework based on QEMU.") (license license:gpl2+)))) + +(define-public ppsspp + (package + (name "ppsspp") + (version "1.10") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hrydgard/ppsspp.git") + (commit (string-append "v" version)))) + (sha256 + (base32 "02yx1w0ygclnmdl0imsvgj24lkzi55wvxkf47q617j0jgrqhy8yl")) + (file-name (git-file-name name version)) + (patches + (search-patches "ppsspp-disable-upgrade-and-gold.patch")) + (modules '((guix build utils))) + (snippet + `(begin + ;; Unbundle sources. + (substitute* (list "Common/Vulkan/VulkanContext.cpp" + "ext/native/thin3d/vulkan_utils.cpp" + "GPU/Common/ShaderCommon.cpp" + "GPU/Common/ShaderTranslation.cpp" + "SDL/SDLMain.cpp") + (("ext/glslang/") "") + (("ext/SPIRV-Cross/") "spirv_cross/")) + ;; Patch CMakeLists. + (substitute* "CMakeLists.txt" + (("include_directories\\(ext/glslang\\)") "") + (("spirv-cross-glsl" all) + (string-append all + " spirv-cross-core spirv-cross-cpp" + " spirv-cross-reflect spirv-cross-util"))) + (substitute* "ext/CMakeLists.txt" + (("add_subdirectory\\(glslang\\)") "") + (("add_subdirectory\\(SPIRV-Cross-build\\)") "")) + (delete-file-recursively "ext/cmake") + (substitute* "git-version.cmake" + (("unknown") ,version)))))) + (build-system cmake-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ("python" ,python))) + (inputs + `(("ffmpeg" ,ffmpeg) + ("glew" ,glew) + ("glslang" ,glslang) + ("libpng" ,libpng) + ("mesa" ,mesa) + ("sdl2" ,sdl2) + ("snappy" ,snappy) + ("spirv-cross" ,spirv-cross) + ("zlib" ,zlib) + ;; TODO: unbundle builds. + ("armips-source" ,(package-source armips)) + ("lang" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hrydgard/ppsspp-lang.git") + (commit "d184ba2b607a03435be579406b816c90add334e6"))) + (sha256 + (base32 "0s003x6247nx09qd6a1jz1l2hsk5d6k1zmh8mg3m6hjjhvbvd9j9")))) + ("tests" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hrydgard/pspautotests.git") + (commit "328b839c7243e7f733f9eae88d059485e3d808e7"))) + (sha256 + (base32 "1gj1kr5ijxrqwvz7c41phskjr70ndp8iz0gr8c3xxsd8p9z5gdvm")))))) + (arguments + `(#:out-of-source? #f + #:configure-flags (list "-DUSE_DISCORD=OFF" + "-DUSE_SYSTEM_FFMPEG=ON" + ;; For testing. + "-DUNITTEST=ON" "-DHEADLESS=ON") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'add-external-sources + (lambda* (#:key inputs #:allow-other-keys) + ;; TODO: unbundle builds. Not only should we not copy these + ;; sources in, we should also remove as much from "ext/" as we + ;; can. + (copy-recursively (assoc-ref inputs "armips-source") + "ext/armips") + ;; Some tests are externalised, so we add them here. + (copy-recursively (assoc-ref inputs "tests") + "pspautotests") + ;; i18n is externalised, so we add it here. + (copy-recursively (assoc-ref inputs "lang") + "assets/lang") + #t)) + (replace 'check + (lambda _ + (for-each + (lambda (t) (invoke "./unitTest" t)) + '("Arm64Emitter" "ArmEmitter" "X64Emitter" "VertexJit" "Asin" + "SinCos" "VFPUSinCos" "MathUtil" "Parsers" "Jit" + "MatrixTranspose" "ParseLBN" "QuickTexHash" "CLZ" "MemMap")) + (invoke "python3" "test.py" "-g") + #t)) + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin/ppsspp (string-append out "/bin/ppsspp")) + (share (string-append out "/share/ppsspp"))) + (copy-recursively "icons/hicolor" + (string-append out "/share/icons/hicolor")) + (install-file "PPSSPPSDL" share) + (copy-recursively "assets" (string-append share "/assets")) + + (make-desktop-entry-file + (string-append out "/share/applications/ppsspp.desktop") + #:name "PPSSPP" + #:exec (string-append share "/PPSSPPSDL") + #:icon "ppsspp") + (mkdir-p (string-append out "/bin")) + (with-output-to-file bin/ppsspp + (lambda () + (format #t "#!~a~%exec ~a/PPSSPPSDL \"$@\"" + (which "sh") share))) + (chmod bin/ppsspp #o755) + #t)))))) + (home-page "https://www.ppsspp.org/") + (synopsis "PSP emulator") + (description + "PPSSPP is a ``high-level'' emulator simulating the PSP operating +system.") + (license license:gpl2+))) diff --git a/gnu/packages/patches/ppsspp-disable-upgrade-and-gold.patch b/gnu/packages/patches/ppsspp-disable-upgrade-and-gold.patch new file mode 100644 index 0000000000..9503ab6f31 --- /dev/null +++ b/gnu/packages/patches/ppsspp-disable-upgrade-and-gold.patch @@ -0,0 +1,358 @@ +From 951f2269f67d618d376656db831796c119f4f6b3 Mon Sep 17 00:00:00 2001 +From: Leo Prikler +Date: Fri, 26 Jun 2020 18:20:04 +0200 +Subject: [PATCH] ppsspp: disable upgrade and gold + +--- + Core/Config.cpp | 11 ------- + Core/Config.h | 2 -- + Qt/QtMain.cpp | 6 ---- + SDL/SDLMain.cpp | 6 ---- + UI/DevScreens.cpp | 3 -- + UI/GameSettingsScreen.cpp | 1 - + UI/MainScreen.cpp | 63 +------------------------------------ + UI/MiscScreens.cpp | 31 ++---------------- + UWP/PPSSPP_UWPMain.cpp | 6 ---- + Windows/MainWindowMenu.cpp | 2 +- + Windows/main.cpp | 6 ---- + android/jni/app-android.cpp | 6 ---- + 12 files changed, 5 insertions(+), 138 deletions(-) + +diff --git a/Core/Config.cpp b/Core/Config.cpp +index 214aeb433..04e3b151d 100644 +--- a/Core/Config.cpp ++++ b/Core/Config.cpp +@@ -428,7 +428,6 @@ static ConfigSetting generalSettings[] = { + ConfigSetting("IgnoreBadMemAccess", &g_Config.bIgnoreBadMemAccess, true, true), + ConfigSetting("CurrentDirectory", &g_Config.currentDirectory, ""), + ConfigSetting("ShowDebuggerOnLoad", &g_Config.bShowDebuggerOnLoad, false), +- ConfigSetting("CheckForNewVersion", &g_Config.bCheckForNewVersion, true), + ConfigSetting("Language", &g_Config.sLanguageIni, &DefaultLangRegion), + ConfigSetting("ForceLagSync2", &g_Config.bForceLagSync, false, true, true), + ConfigSetting("DiscordPresence", &g_Config.bDiscordPresence, true, true, false), // Or maybe it makes sense to have it per-game? Race conditions abound... +@@ -1229,16 +1228,6 @@ void Config::Load(const char *iniFileName, const char *controllerIniFilename) { + upgradeMessage = ""; + } + +- // Check for new version on every 10 runs. +- // Sometimes the download may not be finished when the main screen shows (if the user dismisses the +- // splash screen quickly), but then we'll just show the notification next time instead, we store the +- // upgrade number in the ini. +- if (iRunCount % 10 == 0 && bCheckForNewVersion) { +- std::shared_ptr dl = g_DownloadManager.StartDownloadWithCallback( +- "http://www.ppsspp.org/version.json", "", &DownloadCompletedCallback); +- dl->SetHidden(true); +- } +- + INFO_LOG(LOADER, "Loading controller config: %s", controllerIniFilename_.c_str()); + bSaveSettings = true; + +diff --git a/Core/Config.h b/Core/Config.h +index 084eacc94..e7134cab5 100644 +--- a/Core/Config.h ++++ b/Core/Config.h +@@ -99,7 +99,6 @@ struct Config { + bool bIgnoreBadMemAccess; + bool bFastMemory; + int iCpuCore; +- bool bCheckForNewVersion; + bool bForceLagSync; + bool bFuncReplacements; + bool bHideSlowWarnings; +@@ -521,4 +520,3 @@ std::string CreateRandMAC(); + // TODO: Find a better place for this. + extern http::Downloader g_DownloadManager; + extern Config g_Config; +- +diff --git a/Qt/QtMain.cpp b/Qt/QtMain.cpp +index 7713b6587..1d92d1175 100644 +--- a/Qt/QtMain.cpp ++++ b/Qt/QtMain.cpp +@@ -194,12 +194,6 @@ bool System_GetPropertyBool(SystemProperty prop) { + return true; + case SYSPROP_HAS_FILE_BROWSER: + return true; +- case SYSPROP_APP_GOLD: +-#ifdef GOLD +- return true; +-#else +- return false; +-#endif + default: + return false; + } +diff --git a/SDL/SDLMain.cpp b/SDL/SDLMain.cpp +index 52028d087..d8697d210 100644 +--- a/SDL/SDLMain.cpp ++++ b/SDL/SDLMain.cpp +@@ -356,12 +356,6 @@ bool System_GetPropertyBool(SystemProperty prop) { + switch (prop) { + case SYSPROP_HAS_BACK_BUTTON: + return true; +- case SYSPROP_APP_GOLD: +-#ifdef GOLD +- return true; +-#else +- return false; +-#endif + default: + return false; + } +diff --git a/UI/DevScreens.cpp b/UI/DevScreens.cpp +index f146d099e..625ee124c 100644 +--- a/UI/DevScreens.cpp ++++ b/UI/DevScreens.cpp +@@ -603,9 +603,6 @@ void SystemInfoScreen::CreateViews() { + #ifdef _M_SSE + buildConfig->Add(new InfoItem("_M_SSE", StringFromFormat("0x%x", _M_SSE))); + #endif +- if (System_GetPropertyBool(SYSPROP_APP_GOLD)) { +- buildConfig->Add(new InfoItem("GOLD", "")); +- } + + ViewGroup *cpuExtensionsScroll = new ScrollView(ORIENT_VERTICAL, new LinearLayoutParams(FILL_PARENT, FILL_PARENT)); + cpuExtensionsScroll->SetTag("DevSystemInfoCPUExt"); +diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp +index 8202870c7..81112f822 100644 +--- a/UI/GameSettingsScreen.cpp ++++ b/UI/GameSettingsScreen.cpp +@@ -796,7 +796,6 @@ void GameSettingsScreen::CreateViews() { + } + #endif + +- systemSettings->Add(new CheckBox(&g_Config.bCheckForNewVersion, sy->T("VersionCheck", "Check for new versions of PPSSPP"))); + const std::string bgPng = GetSysDirectory(DIRECTORY_SYSTEM) + "background.png"; + const std::string bgJpg = GetSysDirectory(DIRECTORY_SYSTEM) + "background.jpg"; + if (File::Exists(bgPng) || File::Exists(bgJpg)) { +diff --git a/UI/MainScreen.cpp b/UI/MainScreen.cpp +index 43535913d..36834020d 100644 +--- a/UI/MainScreen.cpp ++++ b/UI/MainScreen.cpp +@@ -1054,11 +1054,7 @@ void MainScreen::CreateViews() { + sprintf(versionString, "%s", PPSSPP_GIT_VERSION); + rightColumnItems->SetSpacing(0.0f); + LinearLayout *logos = new LinearLayout(ORIENT_HORIZONTAL); +- if (System_GetPropertyBool(SYSPROP_APP_GOLD)) { +- logos->Add(new ImageView(ImageID("I_ICONGOLD"), IS_DEFAULT, new AnchorLayoutParams(64, 64, 10, 10, NONE, NONE, false))); +- } else { +- logos->Add(new ImageView(ImageID("I_ICON"), IS_DEFAULT, new AnchorLayoutParams(64, 64, 10, 10, NONE, NONE, false))); +- } ++ logos->Add(new ImageView(ImageID("I_ICON"), IS_DEFAULT, new AnchorLayoutParams(64, 64, 10, 10, NONE, NONE, false))); + logos->Add(new ImageView(ImageID("I_LOGO"), IS_DEFAULT, new LinearLayoutParams(Margins(-12, 0, 0, 0)))); + rightColumnItems->Add(logos); + TextView *ver = rightColumnItems->Add(new TextView(versionString, new LinearLayoutParams(Margins(70, -6, 0, 0)))); +@@ -1070,11 +1066,6 @@ void MainScreen::CreateViews() { + rightColumnItems->Add(new Choice(mm->T("Game Settings", "Settings")))->OnClick.Handle(this, &MainScreen::OnGameSettings); + rightColumnItems->Add(new Choice(mm->T("Credits")))->OnClick.Handle(this, &MainScreen::OnCredits); + rightColumnItems->Add(new Choice(mm->T("www.ppsspp.org")))->OnClick.Handle(this, &MainScreen::OnPPSSPPOrg); +- if (!System_GetPropertyBool(SYSPROP_APP_GOLD)) { +- Choice *gold = rightColumnItems->Add(new Choice(mm->T("Buy PPSSPP Gold"))); +- gold->OnClick.Handle(this, &MainScreen::OnSupport); +- gold->SetIcon(ImageID("I_ICONGOLD")); +- } + + #if !PPSSPP_PLATFORM(UWP) + // Having an exit button is against UWP guidelines. +@@ -1099,28 +1090,6 @@ void MainScreen::CreateViews() { + } else if (tabHolder_->GetVisibility() != V_GONE) { + root_->SetDefaultFocusView(tabHolder_); + } +- +- auto u = GetI18NCategory("Upgrade"); +- +- upgradeBar_ = 0; +- if (!g_Config.upgradeMessage.empty()) { +- upgradeBar_ = new LinearLayout(ORIENT_HORIZONTAL, new LinearLayoutParams(FILL_PARENT, WRAP_CONTENT)); +- +- UI::Margins textMargins(10, 5); +- UI::Margins buttonMargins(0, 0); +- UI::Drawable solid(0xFFbd9939); +- upgradeBar_->SetBG(solid); +- upgradeBar_->Add(new TextView(u->T("New version of PPSSPP available") + std::string(": ") + g_Config.upgradeVersion, new LinearLayoutParams(1.0f, textMargins))); +- upgradeBar_->Add(new Button(u->T("Download"), new LinearLayoutParams(buttonMargins)))->OnClick.Handle(this, &MainScreen::OnDownloadUpgrade); +- upgradeBar_->Add(new Button(u->T("Dismiss"), new LinearLayoutParams(buttonMargins)))->OnClick.Handle(this, &MainScreen::OnDismissUpgrade); +- +- // Slip in under root_ +- LinearLayout *newRoot = new LinearLayout(ORIENT_VERTICAL); +- newRoot->Add(root_); +- newRoot->Add(upgradeBar_); +- root_->ReplaceLayoutParams(new LinearLayoutParams(1.0)); +- root_ = newRoot; +- } + } + + UI::EventReturn MainScreen::OnAllowStorage(UI::EventParams &e) { +@@ -1128,27 +1097,6 @@ UI::EventReturn MainScreen::OnAllowStorage(UI::EventParams &e) { + return UI::EVENT_DONE; + } + +-UI::EventReturn MainScreen::OnDownloadUpgrade(UI::EventParams &e) { +-#if PPSSPP_PLATFORM(ANDROID) +- // Go to app store +- if (System_GetPropertyBool(SYSPROP_APP_GOLD)) { +- LaunchBrowser("market://details?id=org.ppsspp.ppssppgold"); +- } else { +- LaunchBrowser("market://details?id=org.ppsspp.ppsspp"); +- } +-#else +- // Go directly to ppsspp.org and let the user sort it out +- LaunchBrowser("https://www.ppsspp.org/downloads.html"); +-#endif +- return UI::EVENT_DONE; +-} +- +-UI::EventReturn MainScreen::OnDismissUpgrade(UI::EventParams &e) { +- g_Config.DismissUpgrade(); +- upgradeBar_->SetVisibility(UI::V_GONE); +- return UI::EVENT_DONE; +-} +- + void MainScreen::sendMessage(const char *message, const char *value) { + // Always call the base class method first to handle the most common messages. + UIScreenWithBackground::sendMessage(message, value); +@@ -1319,15 +1267,6 @@ UI::EventReturn MainScreen::OnCredits(UI::EventParams &e) { + return UI::EVENT_DONE; + } + +-UI::EventReturn MainScreen::OnSupport(UI::EventParams &e) { +-#ifdef __ANDROID__ +- LaunchBrowser("market://details?id=org.ppsspp.ppssppgold"); +-#else +- LaunchBrowser("https://central.ppsspp.org/buygold"); +-#endif +- return UI::EVENT_DONE; +-} +- + UI::EventReturn MainScreen::OnPPSSPPOrg(UI::EventParams &e) { + LaunchBrowser("https://www.ppsspp.org"); + return UI::EVENT_DONE; +diff --git a/UI/MiscScreens.cpp b/UI/MiscScreens.cpp +index a6542c65d..f5f101594 100644 +--- a/UI/MiscScreens.cpp ++++ b/UI/MiscScreens.cpp +@@ -498,11 +498,7 @@ void LogoScreen::render() { + char temp[256]; + // Manually formatting UTF-8 is fun. \xXX doesn't work everywhere. + snprintf(temp, sizeof(temp), "%s Henrik Rydg%c%crd", cr->T("created", "Created by"), 0xC3, 0xA5); +- if (System_GetPropertyBool(SYSPROP_APP_GOLD)) { +- dc.Draw()->DrawImage(ImageID("I_ICONGOLD"), bounds.centerX() - 120, bounds.centerY() - 30, 1.2f, textColor, ALIGN_CENTER); +- } else { +- dc.Draw()->DrawImage(ImageID("I_ICON"), bounds.centerX() - 120, bounds.centerY() - 30, 1.2f, textColor, ALIGN_CENTER); +- } ++ dc.Draw()->DrawImage(ImageID("I_ICON"), bounds.centerX() - 120, bounds.centerY() - 30, 1.2f, textColor, ALIGN_CENTER); + dc.Draw()->DrawImage(ImageID("I_LOGO"), bounds.centerX() + 40, bounds.centerY() - 30, 1.5f, textColor, ALIGN_CENTER); + //dc.Draw()->DrawTextShadow(UBUNTU48, "PPSSPP", xres / 2, yres / 2 - 30, textColor, ALIGN_CENTER); + dc.SetFontScale(1.0f, 1.0f); +@@ -538,10 +534,6 @@ void CreditsScreen::CreateViews() { + // Really need to redo this whole layout with some linear layouts... + + int rightYOffset = 0; +- if (!System_GetPropertyBool(SYSPROP_APP_GOLD)) { +- root_->Add(new Button(cr->T("Buy Gold"), new AnchorLayoutParams(260, 64, NONE, NONE, 10, 84, false)))->OnClick.Handle(this, &CreditsScreen::OnSupport); +- rightYOffset = 74; +- } + root_->Add(new Button(cr->T("PPSSPP Forums"), new AnchorLayoutParams(260, 64, 10, NONE, NONE, 158, false)))->OnClick.Handle(this, &CreditsScreen::OnForums); + root_->Add(new Button(cr->T("Discord"), new AnchorLayoutParams(260, 64, 10, NONE, NONE, 232, false)))->OnClick.Handle(this, &CreditsScreen::OnDiscord); + root_->Add(new Button("www.ppsspp.org", new AnchorLayoutParams(260, 64, 10, NONE, NONE, 10, false)))->OnClick.Handle(this, &CreditsScreen::OnPPSSPPOrg); +@@ -550,20 +542,7 @@ void CreditsScreen::CreateViews() { + #if PPSSPP_PLATFORM(ANDROID) || PPSSPP_PLATFORM(IOS) + root_->Add(new Button(cr->T("Share PPSSPP"), new AnchorLayoutParams(260, 64, NONE, NONE, 10, rightYOffset + 158, false)))->OnClick.Handle(this, &CreditsScreen::OnShare); + #endif +- if (System_GetPropertyBool(SYSPROP_APP_GOLD)) { +- root_->Add(new ImageView(ImageID("I_ICONGOLD"), IS_DEFAULT, new AnchorLayoutParams(100, 64, 10, 10, NONE, NONE, false))); +- } else { +- root_->Add(new ImageView(ImageID("I_ICON"), IS_DEFAULT, new AnchorLayoutParams(100, 64, 10, 10, NONE, NONE, false))); +- } +-} +- +-UI::EventReturn CreditsScreen::OnSupport(UI::EventParams &e) { +-#ifdef __ANDROID__ +- LaunchBrowser("market://details?id=org.ppsspp.ppssppgold"); +-#else +- LaunchBrowser("https://central.ppsspp.org/buygold"); +-#endif +- return UI::EVENT_DONE; ++ root_->Add(new ImageView(ImageID("I_ICON"), IS_DEFAULT, new AnchorLayoutParams(100, 64, 10, 10, NONE, NONE, false))); + } + + UI::EventReturn CreditsScreen::OnTwitter(UI::EventParams &e) { +@@ -747,11 +726,7 @@ void CreditsScreen::render() { + + // TODO: This is kinda ugly, done on every frame... + char temp[256]; +- if (System_GetPropertyBool(SYSPROP_APP_GOLD)) { +- snprintf(temp, sizeof(temp), "PPSSPP Gold %s", PPSSPP_GIT_VERSION); +- } else { +- snprintf(temp, sizeof(temp), "PPSSPP %s", PPSSPP_GIT_VERSION); +- } ++ snprintf(temp, sizeof(temp), "PPSSPP %s", PPSSPP_GIT_VERSION); + credits[0] = (const char *)temp; + + UIContext &dc = *screenManager()->getUIContext(); +diff --git a/UWP/PPSSPP_UWPMain.cpp b/UWP/PPSSPP_UWPMain.cpp +index 24f3b964d..1d66ba7ee 100644 +--- a/UWP/PPSSPP_UWPMain.cpp ++++ b/UWP/PPSSPP_UWPMain.cpp +@@ -399,12 +399,6 @@ bool System_GetPropertyBool(SystemProperty prop) { + return false; + case SYSPROP_HAS_BACK_BUTTON: + return true; +- case SYSPROP_APP_GOLD: +-#ifdef GOLD +- return true; +-#else +- return false; +-#endif + default: + return false; + } +diff --git a/Windows/MainWindowMenu.cpp b/Windows/MainWindowMenu.cpp +index b5e1bb0eb..71b29b48a 100644 +--- a/Windows/MainWindowMenu.cpp ++++ b/Windows/MainWindowMenu.cpp +@@ -1377,7 +1377,7 @@ namespace MainWindow { + { + W32Util::CenterWindow(hDlg); + HWND versionBox = GetDlgItem(hDlg, IDC_VERSION); +- std::string windowText = System_GetPropertyBool(SYSPROP_APP_GOLD) ? "PPSSPP Gold " : "PPSSPP "; ++ std::string windowText = "PPSSPP "; + windowText.append(PPSSPP_GIT_VERSION); + SetWindowText(versionBox, ConvertUTF8ToWString(windowText).c_str()); + } +diff --git a/Windows/main.cpp b/Windows/main.cpp +index 3795597e2..fd98d0453 100644 +--- a/Windows/main.cpp ++++ b/Windows/main.cpp +@@ -268,12 +268,6 @@ bool System_GetPropertyBool(SystemProperty prop) { + return true; + case SYSPROP_HAS_BACK_BUTTON: + return true; +- case SYSPROP_APP_GOLD: +-#ifdef GOLD +- return true; +-#else +- return false; +-#endif + default: + return false; + } +diff --git a/android/jni/app-android.cpp b/android/jni/app-android.cpp +index 086371085..0a340c0ae 100644 +--- a/android/jni/app-android.cpp ++++ b/android/jni/app-android.cpp +@@ -372,12 +372,6 @@ bool System_GetPropertyBool(SystemProperty prop) { + return true; + case SYSPROP_HAS_IMAGE_BROWSER: + return true; +- case SYSPROP_APP_GOLD: +-#ifdef GOLD +- return true; +-#else +- return false; +-#endif + default: + return false; + } +-- +2.26.2 + -- cgit v1.2.3 From 7bd13ed647f9f2b1e4bb89dffe098847db026d90 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 30 Jun 2020 17:02:16 +0200 Subject: gnu: cuirass: Update to 0.0.1-37.882393d. * gnu/packages/ci.scm (cuirass): Update to 0.0.1-37.882393d. --- gnu/packages/ci.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index 5d4aae7360..a783aec1eb 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -47,8 +47,8 @@ (define-module (gnu packages ci) #:use-module (guix build-system gnu)) (define-public cuirass - (let ((commit "4dd9664bf98b6063a1ea2d0f76fffd5414be456a") - (revision "36")) + (let ((commit "882393dee0ae78d98eeb8e571843644d985e4736") + (revision "37")) (package (name "cuirass") (version (git-version "0.0.1" revision commit)) @@ -60,7 +60,7 @@ (define-public cuirass (file-name (git-file-name name version)) (sha256 (base32 - "1pd0h1c6djxpq7h63fl21l87w2wwxlp1nawcj6qmrjhb597kncdk")))) + "1cxhk154f52q019ga1wgd6g99mm64k7skch671fp2bf5h2dvxnd9")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) -- cgit v1.2.3 From 8518266314b5f6b8785ba19e2838d8f5b30fe920 Mon Sep 17 00:00:00 2001 From: Vitaliy Shatrov Date: Tue, 30 Jun 2020 17:15:54 +0200 Subject: gnu: Add taisei. * gnu/packages/games.scm (taisei): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/games.scm | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 512ec3e327..5fd7a58c10 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2234,6 +2234,59 @@ (define-public talkfilters a C library, so they can easily be integrated into other programs.") (license license:gpl2+))) +(define-public taisei + (package + (name "taisei") + (version "1.3.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/taisei-project/" + "taisei/releases/download/v" version + "/taisei-v" version ".tar.xz")) + (sha256 + (base32 "11f9mlqmzy1lszwcc1nsbar9q1hs4ml6pbm52hqfd4q0f4x3ln46")))) + (build-system meson-build-system) + (arguments + `(#:build-type "release" ;comment out for bug-reporting (and cheats) + #:configure-flags + (list "-Dr_default=gles30" + "-Dr_gles20=true" + "-Dr_gles30=true" + "-Dshader_transpiler=true"))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("python" ,python) + ("python-docutils" ,python-docutils) + ("python-pygments" ,python-pygments))) + (inputs + `(("freetype" ,freetype) + ("libpng" ,libpng) + ("libwebp" ,libwebp) + ("libzip" ,libzip) + ("mesa" ,mesa) + ("openssl" ,openssl) + ("opusfile" ,opusfile) + ("sdl2" ,sdl2) + ("sdl2-mixer" ,sdl2-mixer) + ("shaderc" ,shaderc) + ("spirv-cross" ,spirv-cross) + ("zlib" ,zlib))) + (home-page "https://taisei-project.org/") + (synopsis "Shoot'em up fangame and libre clone of Touhou Project") + (description + "The player controls a character (one of three: Good, Bad, and Dead), +dodges the missiles (lots of it cover the screen, but the character's hitbox +is very small), and shoot at the adversaries that keep appear on the screen.") + (license (list ;;game + license:expat + ;;resources/00-taisei.pkgdir/bgm/ + ;;atlas/portraits/ + license:cc-by4.0 + ;;miscellaneous + license:cc0 + license:public-domain)))) + (define-public cmatrix (package (name "cmatrix") -- cgit v1.2.3 From 393190ce1d020c171aad7ac3542674b09ec00625 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 16 Jun 2020 00:49:13 +0200 Subject: gnu: Add astromenace. * gnu/packages/games.scm (astromenace): New variable. --- gnu/packages/games.scm | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 5fd7a58c10..fd6a0c9334 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -405,6 +405,66 @@ (define-public armagetronad physics settings to tweak as well.") (license license:gpl2+))) +(define-public astromenace + (package + (name "astromenace") + (version "1.4.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/viewizard/astromenace.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1ad6l887jxqv8xspwc2rvy8ym9sdlmkqdqhsh0pi076kjarxsyws")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ;no test + #:configure-flags '("-DDATADIR=share/astromenace") + #:phases + (modify-phases %standard-phases + (replace 'install + ;; Upstream provides no install phase. + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (share (string-append out "/share")) + (apps (string-append share "/applications")) + (data (string-append share "/astromenace")) + (icons (string-append share "/icons/hicolor/64x64/apps"))) + (install-file "astromenace" bin) + (install-file "gamedata.vfs" data) + (let ((source (assoc-ref inputs "source"))) + (with-directory-excursion (string-append source "/share") + (install-file "astromenace.desktop" apps) + (mkdir-p icons) + (copy-file "astromenace_64.png" + (string-append icons "/astromenace.png"))))) + #t))))) + (inputs + `(("freealut" ,freealut) + ("freetype" ,freetype) + ("glu" ,glu) + ("libogg" ,libogg) + ("libvorbis" ,libvorbis) + ("openal" ,openal) + ("sdl2" ,sdl2))) + (home-page "https://www.viewizard.com/") + (synopsis "3D space shooter with spaceship upgrade possibilities") + (description + "Space is a vast area, an unbounded territory where it seems there is +a room for everybody, but reversal of fortune put things differently. The +hordes of hostile creatures crawled out from the dark corners of the universe, +craving to conquer your homeland. Their force is compelling, their legions +are interminable. However, humans didn't give up without a final showdown and +put their best pilot to fight back. These malicious invaders chose the wrong +galaxy to conquer and you are to prove it! Go ahead and make alien aggressors +regret their insolence.") + ;; Game is released under GPL3+ terms. Artwork is subject to CC + ;; BY-SA 4.0, and fonts to OFL1.1. + (license (list license:gpl3+ license:cc-by-sa4.0 license:silofl1.1)))) + (define-public bastet (package (name "bastet") -- cgit v1.2.3 From db23a548752b575b9ac62f308d6fefb09d2d873c Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 18 Jun 2020 23:25:16 +0200 Subject: gnu: Add bzflag. * gnu/packages/games.scm (bzflag): New variable. --- gnu/packages/games.scm | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index fd6a0c9334..14deb47854 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -77,6 +77,7 @@ (define-module (gnu packages games) #:use-module (guix svn-download) #:use-module (guix gexp) #:use-module (gnu packages) + #:use-module (gnu packages adns) #:use-module (gnu packages algebra) #:use-module (gnu packages autotools) #:use-module (gnu packages backup) @@ -579,6 +580,71 @@ (define-public blobwars license:lgpl2.1+ license:bsd-2)))) +(define-public bzflag + (package + (name "bzflag") + (version "2.4.20") + (source + (origin + (method url-fetch) + (uri (string-append "https://download.bzflag.org/bzflag/source/" + version "/bzflag-" version ".tar.bz2")) + (sha256 + (base32 "16brxqmfiyz4j4lb8ihzjcbwqmpsms6vm3ijbp34lnw0blbwdjb2")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'install-desktop-file-and-icons + (lambda* (#:key outputs #:allow-other-keys) + (let* ((share (string-append (assoc-ref outputs "out") "/share")) + (data (string-append share "/bzflag")) + (hicolor (string-append share "/icons/hicolor")) + (applications (string-append share "/applications"))) + ;; Move desktop file. + (install-file (string-append data "/bzflag.desktop") + applications) + ;; Install icons. + (for-each (lambda (size) + (let* ((dim (string-append size "x" size)) + (dir (string-append hicolor "/" dim "/apps"))) + (mkdir-p dir) + (copy-file + (string-append data "/bzflag-" dim ".png") + (string-append dir "/bzflag.png")))) + '("48" "256"))) + #t))))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("c-ares" ,c-ares) + ("curl" ,curl) + ("glew" ,glew) + ("glu" ,glu) + ("sdl2" ,sdl2) + ("zlib" ,zlib))) + (home-page "https://www.bzflag.org/") + (synopsis "3D first person tank battle game") + (description + "BZFlag is a 3D multi-player multiplatform tank battle game that +allows users to play against each other in a network environment. +There are five teams: red, green, blue, purple and rogue (rogue tanks +are black). Destroying a player on another team scores a win, while +being destroyed or destroying a teammate scores a loss. Rogues have +no teammates (not even other rogues), so they cannot shoot teammates +and they do not have a team score. + +There are two main styles of play: capture-the-flag and free-for-all. +In capture-the-flag, each team (except rogues) has a team base and +each team with at least one player has a team flag. The object is to +capture an enemy team's flag by bringing it to your team's base. This +destroys every player on the captured team, subtracts one from that +team's score, and adds one to your team's score. In free-for-all, +there are no team flags or team bases. The object is simply to get as +high a score as possible.") + ;; The game is dual-licensed. + (license (list license:lgpl2.1 license:mpl2.0)))) + (define-public cataclysm-dda (package (name "cataclysm-dda") -- cgit v1.2.3 From 9299da1362b0a236cc5ba2651632bf5845fe13d4 Mon Sep 17 00:00:00 2001 From: Alberto Eleuterio Flores Guerrero Date: Wed, 17 Jun 2020 11:45:17 +0200 Subject: gnu: Add widelands. * gnu/local.mk (widelands): New variable. * gnu/packages/patches/widelands-system-wide_minizip.patch: New file. (dist_patch_DATA): Register file above. Co-authored-by: Nicolas Goaziou --- gnu/local.mk | 1 + gnu/packages/games.scm | 108 +++++++++++++++ .../patches/widelands-system-wide_minizip.patch | 153 +++++++++++++++++++++ 3 files changed, 262 insertions(+) create mode 100644 gnu/packages/patches/widelands-system-wide_minizip.patch diff --git a/gnu/local.mk b/gnu/local.mk index dbeec8be3c..3d542024de 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1604,6 +1604,7 @@ dist_patch_DATA = \ %D%/packages/patches/wicd-get-selected-profile-fix.patch \ %D%/packages/patches/wicd-urwid-1.3.patch \ %D%/packages/patches/wicd-wpa2-ttls.patch \ + %D%/packages/patches/widelands-system-wide_minizip.patch \ %D%/packages/patches/wmctrl-64-fix.patch \ %D%/packages/patches/wmfire-update-for-new-gdk-versions.patch \ %D%/packages/patches/wordnet-CVE-2008-2149.patch \ diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 14deb47854..f7ebac6d98 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4401,6 +4401,114 @@ (define-public warzone2100 license:gpl2+ license:lgpl2.1+)))) +(define-public widelands + (package + (name "widelands") + (version "20") + (source + (origin + (method url-fetch) + (uri (string-append "https://launchpad.net/widelands/" + "build" version "/build" version "/+download/" + "widelands-build" version ".tar.bz2")) + (sha256 + (base32 "1cmwfwk7j6yi2pwmm4rm57s23sdzasqf53nx6567sdagqyc4sn9q")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "src/third_party/minizip") + #t)) + (patches + ;; Use system Minizip. Patch is provided by Debian, and discussed + ;; upstream at . + (search-patches "widelands-system-wide_minizip.patch")))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags + (let* ((out (assoc-ref %outputs "out")) + (share (string-append out "/share"))) + (list (string-append "-DCMAKE_INSTALL_PREFIX=" out "/bin") + (string-append "-DWL_INSTALL_BASEDIR=" share "/widelands") + (string-append "-DWL_INSTALL_DATADIR=" share "/widelands") + "-DOPTION_BUILD_WEBSITE_TOOLS=OFF" + ;; CMakeLists.txt does not handle properly RelWithDebInfo build + ;; type. When used, no game data is installed! + "-DCMAKE_BUILD_TYPE=Release")) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'install-desktop-file-and-icons + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((share (string-append (assoc-ref outputs "out") "/share")) + (applications (string-append share "/applications")) + (icons (string-append share "/icons/hicolor"))) + ;; Move desktop entry. + (mkdir-p applications) + (copy-file "debian/org.widelands.widelands.desktop" + (string-append applications "/widelands.desktop")) + ;; Install icons. + (for-each (lambda (size) + (let* ((dim (string-append size "x" size)) + (apps (string-append icons "/" dim "/apps"))) + (mkdir-p apps) + (copy-file (string-append "data/images/logos" + "/wl-ico-" size ".png") + (string-append apps "/widelands.png")))) + '("16" "32" "48" "64" "128")) + #t))) + (add-after 'unpack 'unbundle-fonts + ;; Unbundle fonts already packaged in Guix. XXX: missing fonts are + ;; amiri, Culmus, mmrCensus, Nakula, and Sinhala. + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "data/i18n/fonts" + (for-each (lambda (font) + (delete-file-recursively font) + (symlink (string-append (assoc-ref inputs font) + "/share/fonts/truetype") + font)) + '("DejaVu" "MicroHei"))) + #t))))) + (native-inputs + `(("gettext" ,gettext-minimal) + ("python" ,python-wrapper))) + (inputs + `(("boost" ,boost) + ("glew" ,glew) + ("icu4c" ,icu4c) + ("libpng" ,libpng) + ("minizip" ,minizip) + ("sdl" ,(sdl-union (list sdl2 sdl2-image sdl2-mixer sdl2-ttf))) + ("zlib" ,zlib) + ;; Fonts for the ‘unbundle-fonts’ phase. Case matters in name! + ("DejaVu" ,font-dejavu) + ("MicroHei" ,font-wqy-microhei))) + (home-page "https://www.widelands.org/") + (synopsis "Fantasy real-time strategy game") + (description + "In Widelands, you are the regent of a small clan. You start out with +nothing but your headquarters, where all your resources are stored. + +In the course of the game, you will build an ever growing settlement. Every +member of your clan will do his or her part to produce more resources---wood, +food, iron, gold and more---to further this growth. The economic network is +complex and different in the four tribes (Barbarians, Empire, Atlanteans, and +Frisians). + +As you are not alone in the world, you will meet other clans sooner or later. +Some of them may be friendly and you may eventually trade with them. However, +if you want to rule the world, you will have to train soldiers and fight. + +Widelands offers single-player mode with different campaigns; the campaigns +all tell stories of tribes and their struggle in the Widelands universe! +However, settling really starts when you unite with friends over the Internet +or LAN to build up new empires together---or to crush each other in the dusts +of war. Widelands also offers an Artificial Intelligence to challenge you.") + ;; Game is released as GPL2+. Some parts, e.g., art, are released under + ;; different licenses. + (license (list license:gpl2+ + license:expat ;src/third_party/eris + license:silofl1.1 ;Widelands.ttf + license:cc-by-sa3.0)))) ;some music files + (define-public starfighter (package (name "starfighter") diff --git a/gnu/packages/patches/widelands-system-wide_minizip.patch b/gnu/packages/patches/widelands-system-wide_minizip.patch new file mode 100644 index 0000000000..1fac0d5396 --- /dev/null +++ b/gnu/packages/patches/widelands-system-wide_minizip.patch @@ -0,0 +1,153 @@ +Description: use the system-wide minizip instead of the embeeded one if found. +Forwarded-Upstream: It was provided by upstream: http://bazaar.launchpad.net/~widelands-dev/widelands/b19-debian/revision/8147 + . + Thanks to Fòram na Gàidhlig for the patch. + +I just added this line to make its use easier: + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_HOME_DIRECTORY}/Modules) + +=== modified file 'CMakeLists.txt' +--- + CMakeLists.txt | 3 +++ + Modules/FindMinizip.cmake | 37 +++++++++++++++++++++++++++++++++++++ + cmake/WlFunctions.cmake | 7 +++++++ + src/io/CMakeLists.txt | 2 +- + src/third_party/CMakeLists.txt | 20 +++++++++++--------- + src/third_party/minizip/README.txt | 4 ++++ + 6 files changed, 63 insertions(+), 10 deletions(-) + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -43,6 +43,7 @@ + endif(POLICY CMP0074) + + include("${CMAKE_SOURCE_DIR}/cmake/WlFunctions.cmake") ++set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_HOME_DIRECTORY}/Modules) + + option(OPTION_USE_GLBINDING "Use glbinding instead of GLEW" OFF) + option(OPTION_GLEW_STATIC "Use static GLEW Library" OFF) +@@ -105,6 +106,8 @@ + find_package(SDL2_ttf REQUIRED) + find_package(ZLIB REQUIRED) + find_package(ICU REQUIRED) ++find_package(Minizip) ++ + if(OPTION_USE_GLBINDING) + find_package(glbinding REQUIRED) + else() +--- /dev/null ++++ b/Modules/FindMinizip.cmake +@@ -0,0 +1,37 @@ ++# - Try to find Minizip ++# Once done this will define ++# ++# MINIZIP_FOUND - system has MINIZIP ++# MINIZIP_INCLUDE_DIR - the MINIZIP include directory ++# MINIZIP_LIBRARY_DIR - where the libraries are ++# MINIZIP_LIBRARY - Link these to use MINIZIP ++# ++ ++IF (MINIZIP_INCLUDE_DIR) ++ # Already in cache, be silent ++ SET(MINIZIP_FIND_QUIETLY TRUE) ++ENDIF (MINIZIP_INCLUDE_DIR) ++ ++FIND_PATH( MINIZIP_INCLUDE_DIR ++ NAMES zip.h unzip.h ioapi.h ++ PATHS /usr/local/include /usr/include ++ PATH_SUFFIXES minizip/ ) ++SET( MINIZIP_NAMES minizip MINIZIP ) ++FIND_LIBRARY( MINIZIP_LIBRARY ++ NAMES ${MINIZIP_NAMES} ++ PATHS /usr/lib /usr/local/lib ) ++ ++GET_FILENAME_COMPONENT( MINIZIP_LIBRARY_DIR ${MINIZIP_LIBRARY} PATH ) ++ ++IF (MINIZIP_INCLUDE_DIR AND MINIZIP_LIBRARY) ++ SET(MINIZIP_FOUND TRUE) ++ SET(MINIZIP_LIBRARY_DIR ${MINIZIP_LIBRARY} ) ++ IF (NOT MINIZIP_FIND_QUIETLY) ++ MESSAGE (STATUS "Found Minizip: ${MINIZIP_LIBRARY} ${MINIZIP_INCLUDE_DIR}") ++ ENDIF (NOT MINIZIP_FIND_QUIETLY) ++ELSE (MINIZIP_INCLUDE_DIR AND MINIZIP_LIBRARY) ++ SET( MINIZIP_FOUND FALSE ) ++ SET( MINIZIP_LIBRARY_DIR ) ++ SET( MINIZIP_EXTRA_DEFINITIONS ) ++ENDIF (MINIZIP_INCLUDE_DIR AND MINIZIP_LIBRARY) ++ +--- a/cmake/WlFunctions.cmake ++++ b/cmake/WlFunctions.cmake +@@ -81,6 +81,14 @@ + if(ARG_USES_ZLIB) + wl_include_system_directories(${NAME} ${ZLIB_INCLUDE_DIRS}) + target_link_libraries(${NAME} ${ZLIB_LIBRARY}) ++ if (MINIZIP_FOUND) ++ wl_include_system_directories(${NAME} ${MINIZIP_INCLUDE_DIR}) ++ target_link_libraries(${NAME} ${MINIZIP_LIBRARY}) ++ target_compile_definitions(${NAME} PUBLIC -DHAVE_SYSTEM_MINIZIP) ++ else(MINIZIP_FOUND) ++ target_link_libraries(${NAME} third_party_minizip) ++ message(FATAL_ERROR "You are using widelands-bundled minizip sources. Please install your distribution's minizip dev library or urge your distribution maintainer to include the minizip library in your package repository. Thank you.") ++ endif(MINIZIP_FOUND) + endif() + + # OpenGL and GLEW are one thing for us. If you use the one, you also use the +--- a/src/third_party/CMakeLists.txt ++++ b/src/third_party/CMakeLists.txt +@@ -1,12 +1,14 @@ +-wl_library(third_party_minizip +- THIRD_PARTY +- SRCS +- minizip/ioapi.h +- minizip/unzip.cc +- minizip/unzip.h +- minizip/zip.h +- USES_ZLIB +-) ++if(NOT MINIZIP_FOUND) ++ wl_library(third_party_minizip ++ THIRD_PARTY ++ SRCS ++ ioapi.h ++ unzip.cc ++ unzip.h ++ zip.h ++ USES_ZLIB ++ ) ++endif(NOT MINIZIP_FOUND) + + wl_library(third_party_eris + THIRD_PARTY +--- a/src/io/filesystem/CMakeLists.txt ++++ b/src/io/filesystem/CMakeLists.txt +@@ -12,6 +12,7 @@ + zip_exceptions.h + zip_filesystem.cc + zip_filesystem.h ++ USES_ZLIB + DEPENDS + base_exceptions + base_i18n +@@ -19,5 +20,4 @@ + base_macros + graphic_text_layout + io_stream +- third_party_minizip + ) +--- a/src/io/filesystem/zip_filesystem.h ++++ b/src/io/filesystem/zip_filesystem.h +@@ -28,8 +28,14 @@ + #include "io/filesystem/filesystem.h" + #include "io/streamread.h" + #include "io/streamwrite.h" ++ ++#ifndef HAVE_SYSTEM_MINIZIP + #include "third_party/minizip/unzip.h" + #include "third_party/minizip/zip.h" ++#else ++#include ++#include ++#endif + + class ZipFilesystem : public FileSystem { + public: -- cgit v1.2.3 From 5164d7fd2673cf3b46b2cba9a9a70abc6d57dde6 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Tue, 30 Jun 2020 18:16:10 +0200 Subject: system: hurd: Oops, have 'initrd' default to #f. * gnu/system/hurd.scm (%hurd-default-operating-system)[initrd]: Oops, set to #f. --- gnu/system/hurd.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm index 43d98cc8c2..80fffe8e45 100644 --- a/gnu/system/hurd.scm +++ b/gnu/system/hurd.scm @@ -94,7 +94,7 @@ (define %hurd-default-operating-system (bootloader (bootloader-configuration (bootloader grub-minimal-bootloader) (target "/dev/vda"))) - (initrd (lambda _ '())) + (initrd #f) (initrd-modules (lambda _ '())) (firmware '()) (host-name "guixygnu") -- cgit v1.2.3 From 3d5334c390af118a43b91b2bba97da1fe07c1714 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Jun 2020 18:42:33 +0200 Subject: gnu: blast+: Update to 2.10.1. * gnu/packages/bioinformatics.scm (blast+): Update to 2.10.1. --- gnu/packages/bioinformatics.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 05397e843a..9c81e3c23d 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -1327,15 +1327,15 @@ (define-public bppsuite (define-public blast+ (package (name "blast+") - (version "2.7.1") + (version "2.10.1") (source (origin (method url-fetch) (uri (string-append - "ftp://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/" + "https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/" version "/ncbi-blast-" version "+-src.tar.gz")) (sha256 (base32 - "1jlq0afxxgczpp35k6mxh8mn4jzq7vqcnaixk166sfj10wq8v9qh")) + "11kvrrl0mcwww6530r55hccpg3x3msmhr3051fwnjbq8rzg2j1qi")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 10a8211e0eeeb468447f2e42a27630563ff42853 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 30 Jun 2020 03:08:15 +0200 Subject: gnu: st: Update to 0.8.4. * gnu/packages/suckless.scm (st): Update to 0.8.4. --- gnu/packages/suckless.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm index c10226bb32..51a82a58d9 100644 --- a/gnu/packages/suckless.scm +++ b/gnu/packages/suckless.scm @@ -229,14 +229,14 @@ (define-public slock (define-public st (package (name "st") - (version "0.8.3") + (version "0.8.4") (source (origin (method url-fetch) (uri (string-append "https://dl.suckless.org/st/st-" version ".tar.gz")) (sha256 - (base32 "0ll5wbw1szs70wdf8zy1y2ig5mfbqw2w4ls8d64r8z3y4gdf76lk")))) + (base32 "19j66fhckihbg30ypngvqc9bcva47mp379ch5vinasjdxgn3qbfl")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests -- cgit v1.2.3 From ccbf5f62c631cca2e9235a1d0e8c97aa94d4d40b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 30 Jun 2020 10:34:04 +0200 Subject: gnu: rclone: Update to 1.52.2. * gnu/packages/sync.scm (rclone): Update to 1.52.2. --- gnu/packages/sync.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index c4bc5dd82f..372cea81c1 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -360,14 +360,14 @@ (define-public casync (define-public rclone (package (name "rclone") - (version "1.52.1") + (version "1.52.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/rclone/rclone/releases/download/" "v" version "/rclone-v" version ".tar.gz")) (sha256 - (base32 "0lvmm3qpdix4mnip1dfyawsdvzbcdxw0b0zz7xbgmicbfv1vlpx9")))) + (base32 "1y0ysdbqqb1dj8daziwwhz531c7kfr7f9fsvc7xyg4ysppz1qxfq")))) ;; FIXME: Rclone bundles some libraries Guix already provides. Need to ;; un-bundle them. (build-system go-build-system) -- cgit v1.2.3 From 02583de9febf53af397619ee85287dd5a96a40ea Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 30 Jun 2020 10:34:33 +0200 Subject: gnu: libxls: Update to 1.5.3. * gnu/packages/statistics.scm (libxls): Update to 1.5.3. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index dfc3d810c0..36089ff8aa 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -160,14 +160,14 @@ (define-public jags (define-public libxls (package (name "libxls") - (version "1.5.2") + (version "1.5.3") (source (origin (method url-fetch) (uri (string-append "https://github.com/libxls/libxls/releases/download/" "v" version "/libxls-" version ".tar.gz")) (sha256 - (base32 "1akadsyl10rp101ccjmrxr7933c3v641k377bn74jv6cdkcm4zld")))) + (base32 "0rl513wpq5qh7wkmdk4g9c68rzffv3mcbz48p4xyg4969zrx8lnm")))) (build-system gnu-build-system) (home-page "https://github.com/libxls/libxls") (synopsis "Read binary (.xls) Excel spreadsheet files") -- cgit v1.2.3 From 3468737c21d0f04aad69b1a05d53d264c895c27c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 30 Jun 2020 10:42:23 +0200 Subject: gnu: umoci: Update to 0.4.6. * gnu/packages/virtualization.scm (umoci): Update to 0.4.6. [source, arguments]: Update import path. --- gnu/packages/virtualization.scm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 26c0bb54cb..64cd815bb8 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1024,19 +1024,19 @@ (define-public runc (define-public umoci (package (name "umoci") - (version "0.4.5") - (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/openSUSE/umoci/releases/download/v" - version "/umoci.tar.xz")) - (file-name (string-append "umoci-" version ".tar.xz")) - (sha256 - (base32 - "0x1yyvpllz6fyy9xip6f7b6c94v984n3faf8p50fr9y4ygkgi15a")))) + (version "0.4.6") + (source + (origin + (method url-fetch) + (uri (string-append + "https://github.com/opencontainers/umoci/releases/download/v" + version "/umoci.tar.xz")) + (file-name (string-append "umoci-" version ".tar.xz")) + (sha256 + (base32 "06q7xfwnqysc013hapx31jhlzmyg8qb467qfkynj673qc7p9bd6h")))) (build-system go-build-system) (arguments - '(#:import-path "github.com/openSUSE/umoci" + '(#:import-path "github.com/opencontainers/umoci" #:install-source? #f #:phases (modify-phases %standard-phases -- cgit v1.2.3 From 5a462ea8faca95e05d04a69a2e2b9aec91975b69 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 30 Jun 2020 10:42:45 +0200 Subject: gnu: libaacs: Don't use NAME in source URI. * gnu/packages/video.scm (libaacs)[source]: Hard-code NAME. --- gnu/packages/video.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index afe520430e..742a3a1250 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2747,7 +2747,7 @@ (define-public libaacs (origin (method url-fetch) (uri (string-append "https://ftp.videolan.org/pub/videolan/libaacs/" - version "/" name "-" version ".tar.bz2")) + version "/libaacs-" version ".tar.bz2")) (sha256 (base32 "1kms92i0c7i1yl659kqjf19lm8172pnpik5lsxp19xphr74vvq27")))) (inputs -- cgit v1.2.3 From c0164344b869247fa84a2c1417d9af09a0fd1292 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 30 Jun 2020 10:46:59 +0200 Subject: gnu: libaacs: Update to 0.10.0. * gnu/packages/video.scm (libaacs): Update to 0.10.0. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 742a3a1250..b9a080de76 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2742,14 +2742,14 @@ (define-public libbdplus (define-public libaacs (package (name "libaacs") - (version "0.9.0") + (version "0.10.0") (source (origin (method url-fetch) (uri (string-append "https://ftp.videolan.org/pub/videolan/libaacs/" version "/libaacs-" version ".tar.bz2")) (sha256 - (base32 "1kms92i0c7i1yl659kqjf19lm8172pnpik5lsxp19xphr74vvq27")))) + (base32 "1zhjdcph8sqx7ak35s22kc736icwq135jlypggkp6vqyyygb3xlk")))) (inputs `(("libgcrypt" ,libgcrypt))) (native-inputs -- cgit v1.2.3 From a583d01a8a0571970df6c4506b611a3483535454 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 30 Jun 2020 19:00:36 +0200 Subject: gnu: ceph: Update to 14.2.10 [fixes CVE-2020-10753]. * gnu/packages/storage.scm (ceph): Update to 14.2.10. [source]: Keep required bundled seastar. [inputs]: Add librdkafka. --- gnu/packages/storage.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/storage.scm b/gnu/packages/storage.scm index 481ffade5c..b7d4056635 100644 --- a/gnu/packages/storage.scm +++ b/gnu/packages/storage.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017, 2018, 2019, 2020 Marius Bakke ;;; Copyright © 2017 Rutger Helling +;;; Copyright © 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -40,6 +41,7 @@ (define-module (gnu packages storage) #:use-module (gnu packages linux) #:use-module (gnu packages lua) #:use-module (gnu packages ncurses) + #:use-module (gnu packages networking) #:use-module (gnu packages nss) #:use-module (gnu packages openldap) #:use-module (gnu packages pkg-config) @@ -53,14 +55,14 @@ (define-module (gnu packages storage) (define-public ceph (package (name "ceph") - (version "14.2.9") + (version "14.2.10") (source (origin (method url-fetch) (uri (string-append "https://download.ceph.com/tarballs/ceph-" version ".tar.gz")) (sha256 (base32 - "0zkh1a23v8g1fa5flqa2d53lv08ancab3li57gybpqpnja90k7il")) + "0bbs3ag8zav283qpxrrndhvh2z01ykm6126fmwrbc1c5f9jfjq39")) (patches (search-patches "ceph-disable-cpu-optimizations.patch")) (modules '((guix build utils))) @@ -73,7 +75,7 @@ (define-public ceph ;"src/xxHash" ;"src/zstd" ;"src/civetweb" - "src/seastar/fmt" + ;"src/seastar/fmt" "src/test/downloads" "src/c-ares" "src/googletest" @@ -213,6 +215,7 @@ (define-public ceph ("libatomic-ops" ,libatomic-ops) ("libcap-ng" ,libcap-ng) ("libnl" ,libnl) + ("librdkafka" ,librdkafka) ("lua" ,lua) ("lz4" ,lz4) ("oath-toolkit" ,oath-toolkit) -- cgit v1.2.3 From ceb233bb7642b2a7efec57073bf205b62ebd8f97 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sun, 7 Jun 2020 20:36:33 +0300 Subject: gnu: Add hosts. * gnu/packages/admin.scm (hosts): New variable. --- gnu/packages/admin.scm | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 314e6389d2..865807a3f2 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -85,6 +85,7 @@ (define-module (gnu packages admin) #:use-module (gnu packages elf) #:use-module (gnu packages file) #:use-module (gnu packages flex) + #:use-module (gnu packages gawk) #:use-module (gnu packages gettext) #:use-module (gnu packages gl) #:use-module (gnu packages glib) @@ -3910,3 +3911,76 @@ (define-public jtbl (description "@code{jtbl} accepts piped JSON data from stdin and outputs a text table representation to stdout.") (license license:expat))) + +(define-public hosts + (package + (name "hosts") + (version "3.6.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/xwmx/hosts.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1ni4z89kxzgwm26hhx908g04f2h0fypy7lgfa0rvsz8d0wslgcsn")))) + (build-system trivial-build-system) + (inputs + `(("bats" ,bats) ;for test + ("awk" ,gawk) + ("bash" ,bash) + ("coreutils" ,coreutils) + ("diffutils" ,diffutils) + ("grep" ,grep) + ("ncurses" ,ncurses) ;tput + ("sed" ,sed))) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + ;; copy source + (copy-recursively (assoc-ref %build-inputs "source") ".") + ;; patch-shebang phase + (setenv "PATH" + (string-append (assoc-ref %build-inputs "bash") "/bin" + ":" (assoc-ref %build-inputs "awk") "/bin" + ":" (assoc-ref %build-inputs "coreutils") "/bin" + ":" (assoc-ref %build-inputs "diffutils") "/bin" + ":" (assoc-ref %build-inputs "grep") "/bin" + ":" (assoc-ref %build-inputs "ncurses") "/bin" + ":" (assoc-ref %build-inputs "sed") "/bin" + ":" "/run/setuid-programs" + ":" (getenv "PATH"))) + (substitute* "hosts" + (("#!/usr/bin/env bash") + (string-append "#!" (which "bash") + "\nPATH=" (getenv "PATH")))) + ;; check phase + (setenv "TERM" "linux") ;set to tty for test + (invoke (string-append (assoc-ref %build-inputs "bats") "/bin/bats") + "test") + ;; install phase + (install-file "hosts" (string-append %output "/bin")) + (let ((bash-completion + (string-append %output "/etc/bash_completion.d"))) + (mkdir-p bash-completion) + (copy-file "etc/hosts-completion.bash" + (string-append bash-completion "/hosts"))) + (let ((zsh-completion + (string-append %output "/share/zsh/site-functions"))) + (mkdir-p zsh-completion) + (copy-file "etc/hosts-completion.zsh" + (string-append zsh-completion "/_hosts"))) + (let ((doc (string-append %output "/share/doc/" ,name "-" ,version))) + (mkdir-p doc) + (install-file "LICENSE" doc) + (install-file "README.md" doc)) + #t))) + (home-page "https://github.com/xwmx/hosts/") + (synopsis "Bash script for editing @file{/etc/hosts} file") + (description "Hosts is a command line program for managing +@file{/etc/hosts} entries. @command{hosts} works with existing hosts files +and entries, providing commands to add, remove, comment, and search.") + (license license:expat))) -- cgit v1.2.3 From 13bd54b15da134012d40822c867bc70aa0bb14af Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 30 Jun 2020 18:33:32 +0300 Subject: gnu: Sort package modules alphabetically in (gnu packages pretty-print). * gnu/packages/pretty-print.scm: Sort package module imports alphabetically. --- gnu/packages/pretty-print.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/pretty-print.scm b/gnu/packages/pretty-print.scm index c4bdbe9000..9f9a746844 100644 --- a/gnu/packages/pretty-print.scm +++ b/gnu/packages/pretty-print.scm @@ -32,18 +32,18 @@ (define-module (gnu packages pretty-print) #:use-module (guix build-system gnu) #:use-module (guix utils) #:use-module (gnu packages) - #:use-module (gnu packages ghostscript) - #:use-module (gnu packages groff) - #:use-module (gnu packages imagemagick) - #:use-module (gnu packages gv) - #:use-module (gnu packages boost) #:use-module (gnu packages bison) + #:use-module (gnu packages boost) + #:use-module (gnu packages compression) #:use-module (gnu packages flex) + #:use-module (gnu packages ghostscript) #:use-module (gnu packages gperf) + #:use-module (gnu packages groff) + #:use-module (gnu packages gv) + #:use-module (gnu packages imagemagick) #:use-module (gnu packages lua) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) - #:use-module (gnu packages compression) #:use-module (gnu packages swig)) (define-public a2ps -- cgit v1.2.3 From 634620dbb287390aaeac0db08c8264cd8ebf5b06 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 30 Jun 2020 19:09:49 +0300 Subject: gnu: Add python-pillow-2.9. * gnu/packages/python-xyz.scm (python-pillow-2.9): New package. --- gnu/packages/python-xyz.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 08fa6c3f04..e85cc84ddb 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5335,6 +5335,22 @@ (define-public python-pillow (define-public python2-pillow (package-with-python2 python-pillow)) +(define-public python-pillow-2.9 + (package + (inherit python-pillow) + (version "2.9.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "Pillow" version)) + (sha256 + (base32 + "0ada7lf3lmbdsqm3b7ja920p1pllyfhmqndr85ikpj77fmz9s5qg")))) + (arguments + (substitute-keyword-arguments (package-arguments python-pillow) + ((#:tests? _ #f) #f))) + (properties '((hidden? #t))))) + (define-public python-roifile (package (name "python-roifile") -- cgit v1.2.3 From 7dfe25f57433be9b26b08eb38faaa2560de4743d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 30 Jun 2020 19:10:19 +0300 Subject: gnu: Add presentty. * gnu/packages/presentation.scm (presentty): New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Register it. --- gnu/local.mk | 1 + gnu/packages/presentation.scm | 90 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+) create mode 100644 gnu/packages/presentation.scm diff --git a/gnu/local.mk b/gnu/local.mk index 3d542024de..5e9dba5ab7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -435,6 +435,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/pth.scm \ %D%/packages/pulseaudio.scm \ %D%/packages/pumpio.scm \ + %D%/packages/presentation.scm \ %D%/packages/pretty-print.scm \ %D%/packages/protobuf.scm \ %D%/packages/pure.scm \ diff --git a/gnu/packages/presentation.scm b/gnu/packages/presentation.scm new file mode 100644 index 0000000000..0ad407d36c --- /dev/null +++ b/gnu/packages/presentation.scm @@ -0,0 +1,90 @@ +;;; Copyright © 2020 Efraim Flashner +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages presentation) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix download) + #:use-module (guix packages) + #:use-module (guix utils) + #:use-module (guix build-system python) + #:use-module (gnu packages figlet) + #:use-module (gnu packages games) + #:use-module (gnu packages image) + #:use-module (gnu packages python) + #:use-module (gnu packages python-xyz)) + +(define-public presentty + (package + (name "presentty") + (version "0.2.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "presentty" version)) + (sha256 + (base32 + "1qpy992hyg1amjl0acic3agj20spcpv5m0ncg1283mmxs8cs3xy9")) + (patches + (list + (origin + (method url-fetch) + (uri "https://sources.debian.org/data/main/p/presentty/0.2.1-1/debian/patches/presentty-python3.patch") + (sha256 + (base32 + "03d3ylh1z99g4dqj7aka60spagnwss9mbacd7jbpk1gazflnssz1"))))))) + (build-system python-build-system) + (arguments + `(#:tests? #f ; Test suite hasn't withstood the test of time. + #:phases + (modify-phases %standard-phases + (replace 'wrap + (lambda* (#:key python inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin/")) + (python (assoc-ref inputs "python"))) + (for-each + (lambda (program) + (wrap-program (string-append bin program) + `("PATH" ":" prefix (,(dirname (which "cowsay")) + ,(dirname (which "figlet")) + ,(dirname (which "jp2a")))) + `("PYTHONPATH" prefix + ,(cons (string-append out "/lib/python" + (python-version python) + "/site-packages") + (search-path-as-string->list + (or (getenv "PYTHONPATH") "")))))) + '("presentty" "presentty-console"))) + #t))))) + (inputs + `(("cowsay" ,cowsay) + ("figlet" ,figlet) + ("jp2a" ,jp2a) + ("python-docutils" ,python-docutils) + ("python-pillow" ,python-pillow-2.9) + ("python-six" ,python-six) + ("python-urwid" ,python-urwid))) + (native-inputs + `(("python-pbr" ,python-pbr) + ("python-pygments" ,python-pygments))) + (home-page "http://git.inaugust.com/cgit/presentty/") + (synopsis "Console-based presentation system") + (description "Presentty is a console-based presentation program where slides +are authored in reStructuredText. Its features include, but are not limited to: +Cross-fade animations, progressive list display, panning transitions, syntax +highlighting, Cowsay and figlet integration, ANSI art, JPEG display.") + (license license:gpl3+))) -- cgit v1.2.3 From 3123cdaf7b695f3473ed2bf8c15da911d889cca3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 30 Jun 2020 21:07:05 +0300 Subject: gnu: Add get-iplayer. * gnu/packages/video.scm (get-iplayer): New variable. --- gnu/packages/video.scm | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index b9a080de76..0667c6b65b 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -135,6 +135,7 @@ (define-module (gnu packages video) #:use-module (gnu packages ocr) #:use-module (gnu packages perl) #:use-module (gnu packages perl-check) + #:use-module (gnu packages perl-web) #:use-module (gnu packages pkg-config) #:use-module (gnu packages popt) #:use-module (gnu packages pretty-print) @@ -4165,3 +4166,60 @@ (define-public guvcview ;; 'COPYING' is GPLv3 but source headers say GPLv2+. (license license:gpl2+))) + +(define-public get-iplayer + (package + (name "get-iplayer") + (version "3.26") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/get-iplayer/get_iplayer") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0lsz5hz1ia5j612540rb0f31y7j2k5gf7x5i43l8k06b90wi73d6")))) + (build-system perl-build-system) + (arguments + `(#:tests? #f ; no tests + #:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (man (string-append out "/share/man/man1"))) + (install-file "get_iplayer" bin) + (install-file "get_iplayer.cgi" bin) + (install-file "get_iplayer.1" man)) + #t)) + (add-after 'install 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (perllib (string-append out "/lib/perl5/site_perl/" + ,(package-version perl)))) + (wrap-program (string-append out "/bin/get_iplayer") + `("PERL5LIB" ":" + prefix (,(string-append perllib ":" (getenv "PERL5LIB"))))) + (wrap-program (string-append out "/bin/get_iplayer.cgi") + `("PERL5LIB" ":" + prefix (,(string-append perllib ":" (getenv "PERL5LIB"))))) + #t)))))) + (inputs + `(("perl-mojolicious" ,perl-mojolicious) + ("perl-lwp-protocol-https" ,perl-lwp-protocol-https) + ("perl-xml-libxml" ,perl-xml-libxml))) + (home-page "https://github.com/get-iplayer/get_iplayer") + (synopsis "Download or stream available BBC iPlayer TV and radio programmes") + (description "@code{get_iplayer} lists, searches and records BBC iPlayer +TV/Radio, BBC Podcast programmes. Other third-party plugins may be available. +@code{get_iplayer} has three modes: recording a complete programme for later +playback, streaming a programme directly to a playback application, such as +mplayer; and as a @dfn{Personal Video Recorder} (PVR), subscribing to search +terms and recording programmes automatically. It can also stream or record live +BBC iPlayer output.") + (license license:gpl3+))) -- cgit v1.2.3 From 13cba9b9df34366e3e252a71e1acf183ec30b9e3 Mon Sep 17 00:00:00 2001 From: Andrius Štikonas via Guix-patches via Date: Tue, 30 Jun 2020 19:19:08 +0100 Subject: gnu: python-clyent: Fix typo in description. * gnu/packages/python-xyz.scm (python-clyent)[description]: Fix a typo. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e85cc84ddb..55df2cb08e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -563,8 +563,8 @@ (define-public python-clyent `(("python-mock" ,python-mock))) (home-page "https://github.com/binstar/clyent") (synopsis "Command line client library") - (description "Clyent is a Python command line utiliy library. It is used -by @code{binstar}, @code{binstar-build} and @code{chalmers}.") + (description "Clyent is a Python command line utility library. It is used +by @code{binstar}, @code{binstar-build}, and @code{chalmers}.") (license license:bsd-3))) (define-public python2-clyent -- cgit v1.2.3 From a21d6b63510cc87770f285bd97355ae7fdcd6ed6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 30 Jun 2020 21:36:56 +0300 Subject: gnu: python-clyent: Update home-page. * gnu/packages/python-xyz.scm (python-clyent)[home-page]: Update to new home-page. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 55df2cb08e..5eee00aa44 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -561,7 +561,7 @@ (define-public python-clyent (build-system python-build-system) (native-inputs `(("python-mock" ,python-mock))) - (home-page "https://github.com/binstar/clyent") + (home-page "https://github.com/Anaconda-Platform/clyent") (synopsis "Command line client library") (description "Clyent is a Python command line utility library. It is used by @code{binstar}, @code{binstar-build}, and @code{chalmers}.") -- cgit v1.2.3 From 4a986753813019d3fb770afd038f4d294dad5f23 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Tue, 30 Jun 2020 20:55:40 +0200 Subject: gnu: hosts: Clarify this script only works on a foreign distro. * gnu/packages/admin.scm (hosts)[synopsis, description]: Clarify that this script works only on a foreign distro. --- gnu/packages/admin.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 865807a3f2..acae652bb7 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3979,8 +3979,10 @@ (define-public hosts (install-file "README.md" doc)) #t))) (home-page "https://github.com/xwmx/hosts/") - (synopsis "Bash script for editing @file{/etc/hosts} file") + (synopsis "Script for editing a foreign distro's @file{/etc/hosts} file") (description "Hosts is a command line program for managing -@file{/etc/hosts} entries. @command{hosts} works with existing hosts files -and entries, providing commands to add, remove, comment, and search.") +@file{/etc/hosts} entries. On Guix System, @file{/etc/hosts} is managed from +the system configuration; hosts only works when using the Guix package manager +on a foreign distro. @command{hosts} works with existing hosts files and +entries, providing commands to add, remove, comment, and search.") (license license:expat))) -- cgit v1.2.3 From efc396ef3d34f0f4960bfcb480c08e989d9e5353 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 29 Jun 2020 20:16:19 +0200 Subject: gnu: gexiv2: Update to 0.12.1. * gnu/packages/gnome.scm (gexiv2): Update to 0.12.1. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a105118af1..55191d31bb 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5802,7 +5802,7 @@ (define-public libgee (define-public gexiv2 (package (name "gexiv2") - (version "0.12.0") + (version "0.12.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -5810,7 +5810,7 @@ (define-public gexiv2 name "-" version ".tar.xz")) (sha256 (base32 - "0slj5yj8c90l9pp5i3z74x5r3r4da0xfmbzkfq5k0dkg72q3kxaq")))) + "0xxxq8xdkgkn146my307jgws4qgxx477h0ybg1mqza1ycmczvsla")))) (build-system meson-build-system) (native-inputs `(("gcr" ,gcr) -- cgit v1.2.3 From c8a4e59ac4bafcb06d3f49794aabd11fa0352880 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 29 Jun 2020 20:17:42 +0200 Subject: gnu: Python: Support cross-compiling for the Hurd. * gnu/packages/python.scm (python-3.8): When cross-compiling for Hurd, add substitution for the configure script. --- gnu/packages/python.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 9469f89bcf..e2b254bf6f 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -401,6 +401,17 @@ (define-public python-3.8 ,@(if (hurd-system?) `((delete 'patch-regen-for-hurd)) ;regen was removed after 3.5.9 '()) + ,@(if (hurd-target?) + ;; The build system refuses to cross-compile for unknown targets + ;; even though it works fine. Add GNU/Hurd target. + ;; TODO: Make it a patch in a future rebuild cycle. + '((add-before 'configure 'support-hurd-cross-compile + (lambda _ + (substitute* "configure" + (("\\*-\\*-vxworks.*" all) + (string-append "*-*-gnu)\nac_sys_system=GNU\n;;\n" all))) + #t))) + '()) (add-before 'check 'set-TZDIR (lambda* (#:key inputs native-inputs #:allow-other-keys) ;; test_email requires the Olson time zone database. -- cgit v1.2.3 From ce2603bd1d4c5d84c4148f2fcd0abd1242d61faf Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 1 Jul 2020 00:48:21 +0200 Subject: gnu: inxi-minimal: Update to 3.1.04-1. * gnu/packages/admin.scm (inxi-minimal): Update to 3.1.04-1. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index acae652bb7..d9285d878f 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3474,7 +3474,7 @@ (define-public inxi-minimal (let ((real-name "inxi")) (package (name "inxi-minimal") - (version "3.1.03-1") + (version "3.1.04-1") (source (origin (method git-fetch) @@ -3483,7 +3483,7 @@ (define-public inxi-minimal (commit version))) (file-name (git-file-name real-name version)) (sha256 - (base32 "0539hvlq021wxhbwzdp7qliiq1jgw60mxlwrwx0z2x8qi1zqdzg6")))) + (base32 "1mirnrrqfjyl2r7fwnpjlk37i5hf8f7lxv2yxcbdfjf2b3dfbpvl")))) (build-system trivial-build-system) (inputs `(("bash" ,bash-minimal) -- cgit v1.2.3 From 7c475372d2bd6dc4078dfab6703b4ca12a46dbd8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 1 Jul 2020 00:53:28 +0200 Subject: gnu: premake@5: Update to 5.0.0-alpha15. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/build-tools.scm (premake5): Update to 5.0.0-alpha15. [arguments]: Modify ‘enter-source’ phase. --- gnu/packages/build-tools.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index a0f3ae7f71..bb00cf431e 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -259,7 +259,7 @@ (define-public premake4 (define-public premake5 (package (inherit premake4) - (version "5.0.0-alpha14") + (version "5.0.0-alpha15") (source (origin (method url-fetch) (uri (string-append "https://github.com/premake/premake-core/" @@ -267,11 +267,13 @@ (define-public premake5 "/premake-" version "-src.zip")) (sha256 (base32 - "0236s7bjvxf7x1l5faywmfzjywflpx42ngyhkn0mqqjnh54a97vw")))) + "0lyxfyqxyhjqsb3kmx1fyrxinb26i68hb7w7rg8lajczrgkmc3w8")))) (arguments (substitute-keyword-arguments (package-arguments premake4) ((#:phases phases) `(modify-phases ,phases + (replace 'enter-source + (lambda _ (chdir "build/gmake2.unix") #t)) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (install-file "../../bin/release/premake5" -- cgit v1.2.3 From 2dc0b36958c3e3e1d777db33529f7202d5fc46c8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 1 Jul 2020 00:59:10 +0200 Subject: gnu: rust-crossbeam-queue: Update to 0.2.3. * gnu/packages/crates-io.scm (rust-crossbeam-queue): Update to 0.2.3. --- gnu/packages/crates-io.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 8e59da1e5e..5c25eed46d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4288,7 +4288,7 @@ (define-public rust-crossbeam-epoch-0.7 (define-public rust-crossbeam-queue-0.2 (package (name "rust-crossbeam-queue") - (version "0.2.1") + (version "0.2.3") (source (origin (method url-fetch) @@ -4296,8 +4296,7 @@ (define-public rust-crossbeam-queue-0.2 (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "1nwkjh185bdwjrv1zj2g7an9lglv8sp4459268m4fwvi3v5fx5f6")))) + (base32 "0w15z68nz3ac4f2s4djhwha8vmlwsh9dlfrmsl4x84y2ah5acjvp")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t -- cgit v1.2.3 From 9781013cbe9e771cc4067d6b34dda81a18b6840a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 1 Jul 2020 00:59:51 +0200 Subject: gnu: rust-crossbeam-queue: Fix home page. * gnu/packages/crates-io.scm (rust-crossbeam-queue)[home-page]: Point to the right sub-project. --- gnu/packages/crates-io.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5c25eed46d..8ccb61d380 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4306,7 +4306,7 @@ (define-public rust-crossbeam-queue-0.2 #:cargo-development-inputs (("rust-rand" ,rust-rand-0.6)))) (home-page - "https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-utils") + "https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-queue") (synopsis "Concurrent queues in Rust") (description "This crate provides concurrent queues that can be shared among threads.") -- cgit v1.2.3 From 0e2353731c87f72865394ada225cd6facb1b9cf5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 1 Jul 2020 01:10:44 +0200 Subject: gnu: docker, docker-cli: Update to 19.03.12. * gnu/packages/docker.scm (%docker-version): Update to 19.03.12. (docker, docker-cli): Update hashes. --- gnu/packages/docker.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 3dd706cbe9..8c6a14e662 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -48,7 +48,7 @@ (define-module (gnu packages docker) #:use-module (gnu packages version-control) #:use-module (gnu packages virtualization)) -(define %docker-version "19.03.11") +(define %docker-version "19.03.12") (define-public python-docker-py (package @@ -315,7 +315,7 @@ (define-public docker (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1pmbggxbazipl24hxiaccbj32379zv79xba76l78v5131ihx922h")) + (base32 "1dj6llfcgcbpq9q9j6b4wb0anbn1g5wzm8ikq2lyhg54i3154m93")) (patches (search-patches "docker-fix-tests.patch")))) (build-system gnu-build-system) @@ -605,7 +605,7 @@ (define-public docker-cli (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1y9ymv70r1hndblr64h19q34arxl2f3dqqi2qcrai5zfimcml6lr")))) + (base32 "1bynmnaykhh1m42v6bxparlpm9kajpqsvlrlwgz1b9ivcklf5ik6")))) (build-system go-build-system) (arguments `(#:import-path "github.com/docker/cli" -- cgit v1.2.3 From 435dce1df72c865f521d51bdaaf78049abb888d9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 1 Jul 2020 02:52:54 +0200 Subject: gnu: mame: Update to 0.222. * gnu/packages/emulators.scm (mame): Update to 0.222. --- gnu/packages/emulators.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 8b39517e3f..c0353c69af 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1338,7 +1338,7 @@ (define-public scummvm (define-public mame (package (name "mame") - (version "0.221") + (version "0.222") (source (origin (method git-fetch) @@ -1347,7 +1347,7 @@ (define-public mame (commit (apply string-append "mame" (string-split version #\.))))) (file-name (git-file-name name version)) (sha256 - (base32 "07fl7alj9zlyb93i8lnn4706ndy3qiv0pjvwnwysk5rqa0r3463y")) + (base32 "1bfnwfxsnmza4s77ca0cyx4b290dwadkbbc2lyd7xa0yqrh7vvlx")) (modules '((guix build utils))) (snippet ;; Remove bundled libraries. -- cgit v1.2.3 From 46c26a7313deb3a706c4dacdfd547dbfaaf63eb3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 1 Jul 2020 03:17:16 +0200 Subject: gnu: rmlint: Update to 2.10.1. * gnu/packages/disk.scm (rmlint): Update to 2.10.1. --- gnu/packages/disk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 6b86f6ff76..7b94a95008 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -846,7 +846,7 @@ (define-public libblockdev (define-public rmlint (package (name "rmlint") - (version "2.9.0") + (version "2.10.1") (source (origin (method git-fetch) (uri (git-reference @@ -855,7 +855,7 @@ (define-public rmlint (file-name (git-file-name name version)) (sha256 (base32 - "1b5cziam14h80xrfb285fmfrzz2rligxcpsq1xsig14xf4l2875i")))) + "15xfkcw1bkfyf3z8kl23k3rlv702m0h7ghqxvhniynvlwbgh6j2x")))) (build-system scons-build-system) (arguments `(#:scons ,scons-python2 -- cgit v1.2.3 From 27f56b2c184a3fce02cf56ee72c1d89d9c13f67e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 1 Jul 2020 03:35:53 +0200 Subject: gnu: haveged: Update to 1.9.13. * gnu/packages/linux.scm (haveged): Update to 1.9.13. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index cadfd186a1..54153b45f5 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5366,7 +5366,7 @@ (define-public x86-energy-perf-policy (define-public haveged (package (name "haveged") - (version "1.9.8") + (version "1.9.13") (source (origin (method git-fetch) @@ -5375,7 +5375,7 @@ (define-public haveged (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1znr58fb3faq4nmrvc3c5whkc1f3chivm4vhicdwr9pdsyqqsd51")))) + (base32 "0g3hcvpky76cabgcfqh65fay7nnjkms32sgmlf33q969833hijqz")))) (build-system gnu-build-system) (home-page "https://www.issihosts.com/haveged") (synopsis "Entropy source for the Linux random number generator") -- cgit v1.2.3 From 2ddfcf4be8425416815b6da2cb28b76f9dac7f7a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 1 Jul 2020 03:38:15 +0200 Subject: gnu: nftables: Update to 0.9.6. * gnu/packages/linux.scm (nftables): Update to 0.9.6. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 54153b45f5..839358e763 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -6084,7 +6084,7 @@ (define-public libnftnl (define-public nftables (package (name "nftables") - (version "0.9.5") + (version "0.9.6") (source (origin (method url-fetch) @@ -6093,7 +6093,7 @@ (define-public nftables (string-append "https://www.nftables.org/projects/nftables" "/files/nftables-" version ".tar.bz2"))) (sha256 - (base32 "05kyri19q776mymkbcxq3786l6nrf4xg7f3n8my0aw63mdz9bhgj")))) + (base32 "0vmn6xwqa1nq6crfxshh049b199d0aj6hfgin7k068xhibzgvmk8")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--disable-man-doc"))) ; FIXME: Needs docbook2x. -- cgit v1.2.3 From 639bdf970c6057c8e74f15bf0252d23a7c1731fc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 1 Jul 2020 03:39:52 +0200 Subject: gnu: nvme-cli: Update to 1.12. * gnu/packages/linux.scm (nvme-cli): Update to 1.12. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 839358e763..2aa0945725 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3926,7 +3926,7 @@ (define-public hdparm (define-public nvme-cli (package (name "nvme-cli") - (version "1.11.2") + (version "1.12") (home-page "https://github.com/linux-nvme/nvme-cli") (source (origin (method git-fetch) @@ -3934,7 +3934,7 @@ (define-public nvme-cli (url home-page) (commit (string-append "v" version)))) (sha256 - (base32 "0ngh7zffjf6ac8b22hdi4ry7hjlafih172hrbpw8j17r7c0wjy9i")) + (base32 "0ldky34sn0m5c4hgiip0fkzm465nca69bhxicpd5dg8wxhzxqrp3")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 10075003538971ea2c0c6214008b376d5ede4ccb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 1 Jul 2020 03:45:52 +0200 Subject: gnu: powertop: Update to 2.13. * gnu/packages/linux.scm (powertop): Update to 2.13. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 2aa0945725..0b37382463 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2506,14 +2506,14 @@ (define-public iw (define-public powertop (package (name "powertop") - (version "2.12") + (version "2.13") (source (origin (method url-fetch) (uri (string-append "https://01.org/sites/default/files/downloads/" "powertop-" version ".tar.gz")) (sha256 - (base32 "1kiiwa5p2r7h1lzcf53xq61ckaa4wk565s9fs6vw4bfk84y3mfsw")))) + (base32 "0y1ixw8v17fdb1ima0zshrd0rh4zxdh10r93nrrvq6d4lhn9jpx6")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From 6c4500c4a0e766e0147f4ebe57bae63e9ba99a6f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 1 Jul 2020 03:46:04 +0200 Subject: gnu: inotify-tools: Update to 3.20.2.2. * gnu/packages/linux.scm (inotify-tools): Update to 3.20.2.2. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 0b37382463..c8aaa6afae 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2980,7 +2980,7 @@ (define-public loadkeys-static (define-public inotify-tools (package (name "inotify-tools") - (version "3.20.1") + (version "3.20.2.2") (source (origin (method git-fetch) (uri (git-reference @@ -2989,7 +2989,7 @@ (define-public inotify-tools (file-name (git-file-name name version)) (sha256 (base32 - "14dci1i4mhsd5sa33k8h3ayphk19kizynh5ql9ryibdpmcanfiyq")))) + "1r12bglkb0bkqff6kgxjm81hk6z20nrxq3m7iv15d4nrqf9pm7s0")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) -- cgit v1.2.3 From eee9eab722fbd7e433a94ef0bb4320f333e2495f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 1 Jul 2020 04:19:39 +0200 Subject: gnu: man-db: Update to 2.9.3. * gnu/packages/man.scm (man-db): Update to 2.9.3. --- gnu/packages/man.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm index 2d059baddc..21d7ba63f6 100644 --- a/gnu/packages/man.scm +++ b/gnu/packages/man.scm @@ -62,14 +62,14 @@ (define-public libpipeline (define-public man-db (package (name "man-db") - (version "2.9.2") + (version "2.9.3") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/man-db/man-db-" version ".tar.xz")) (sha256 (base32 - "0z04kwv5ymmd0pzadpaag696jfckg6rbz8x4jrgj09bmqqk3yf3v")))) + "1f4palf5bdyf3f8sa0981cqxn9cjcr2pz53ngrrsybb9n0da2nps")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From e063f0ccc80e0c7e34d181736a27073b034969c0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 1 Jul 2020 04:25:48 +0200 Subject: gnu: fetchmail: Update to 6.4.8. * gnu/packages/mail.scm (fetchmail): Update to 6.4.8. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 4fbd10c6a8..646d437009 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -386,7 +386,7 @@ (define-public nullmailer (define-public fetchmail (package (name "fetchmail") - (version "6.4.6") + (version "6.4.8") (source (origin (method url-fetch) @@ -394,7 +394,7 @@ (define-public fetchmail (version-major+minor version) "/" "fetchmail-" version ".tar.xz")) (sha256 - (base32 "04b0sq1xad6gs1bfhkbmhsn1kq6y4gsx9l9ywjvd5d0rc15yrvqn")))) + (base32 "1g893dr3982vrqzxybmflnqfmd1q6yipd9krvxn0avhlrrp97k96")))) (build-system gnu-build-system) (inputs `(("openssl" ,openssl))) -- cgit v1.2.3 From 21131e9c6d1ff623393bed2e5b41e3c22719edc7 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Tue, 30 Jun 2020 11:11:23 -0400 Subject: gnu: maxima: Update to 5.44.0. * gnu/packages/maths.scm (maxima): Update to 5.44.0. --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 0688650738..48cffba929 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -3078,7 +3078,7 @@ (define-public gsegrafix (define-public maxima (package (name "maxima") - (version "5.43.0") + (version "5.44.0") (source (origin (method url-fetch) @@ -3086,7 +3086,7 @@ (define-public maxima version "-source/" name "-" version ".tar.gz")) (sha256 (base32 - "0xyahp4c6509haxh4n1swiqm3421gplkdisa0zypclh3252sbzfw")) + "1v6jr5s6hhj6r18gfk6hgxk2qd6z1dxkrjq9ss2z1y6sqi45wgyr")) (patches (search-patches "maxima-defsystem-mkdir.patch")))) (build-system gnu-build-system) (inputs -- cgit v1.2.3 From 8ed5d9502dffe6884978fab32398f9c68e38a6c8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 1 Jul 2020 09:30:56 +0300 Subject: gnu: vdirsyncer: Don't propagate python-click-5. This prevents a profile collision when installing the package. * gnu/packages/dav.scm (vdirsyncer)[propagated-inputs]: Move python-click-5 ... [inputs]: ... to here. --- gnu/packages/dav.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/dav.scm b/gnu/packages/dav.scm index dbfa4a660e..b9e210c84b 100644 --- a/gnu/packages/dav.scm +++ b/gnu/packages/dav.scm @@ -107,10 +107,11 @@ (define-public vdirsyncer ("python-urllib3" ,python-urllib3) ("python-wsgi-intercept" ,python-wsgi-intercept) ("radicale" ,radicale))) + (inputs + `(;; XXX https://github.com/mitsuhiko/click/issues/200 + ("python-click" ,python-click-5))) (propagated-inputs `(("python-atomicwrites" ,python-atomicwrites) - ;; XXX https://github.com/mitsuhiko/click/issues/200 - ("python-click" ,python-click-5) ("python-click-log" ,python-click-log) ("python-click-threading" ,python-click-threading) ("python-requests-toolbelt" ,python-requests-toolbelt))) -- cgit v1.2.3 From 1ac4959c6a94a89fc8d3a73239d107cfb1d96240 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 1 Jul 2020 11:02:02 +0200 Subject: gnu: sbcl: Update to 2.0.6. * gnu/packages/lisp.scm (sbcl): Update to 2.0.6. --- gnu/packages/lisp.scm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index a2e0f0724d..8227765dd4 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -372,14 +372,14 @@ (define-public clisp (define-public sbcl (package (name "sbcl") - (version "2.0.5") + (version "2.0.6") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/sbcl/sbcl/" version "/sbcl-" version "-source.tar.bz2")) (sha256 - (base32 "1jz26w1i3riv032aa35vww4cv7cjk2ww7dp70c7wk4r8s66zhl00")))) + (base32 "1bnxmmq2yvwj6hb4d96v3k82bcmwhfqx5jixzr14zk4p3m6dd4px")))) (build-system gnu-build-system) (outputs '("out" "doc")) (native-inputs @@ -397,12 +397,13 @@ (define-public sbcl ;; ABCL and ECL (as well as CCL, CMUCL, CLISP and SBCL itself) ;; ;; CCL is not bootstrappable so it won't do. CLISP 2.49 seems to work. - ;; ECL too. ECL builds SBCL about 20% slower than CLISP. As of - ;; 2019-09-05, ECL was last updated in 2020 while CLISP was last updated - ;; in 2010. + ;; ECL too. As of 2020-07-01, ECL was last updated in 2020 while CLISP + ;; was last updated in 2010, and both take about the same time to build SBCL. ;; - ;; For now we stick to CLISP for all systems. We keep the `match' here to - ;; make it easier to change the host compiler for various architectures. + ;; For now we stick to CLISP for all systems. We keep the `match' here + ;; to make it easier to change the host compiler for various + ;; architectures. Consider switching to ECL if it gets faster than CLISP + ;; (maybe post 2020 release). `(,@(match (%current-system) ((or "x86_64-linux" "i686-linux") `(("clisp" ,clisp))) -- cgit v1.2.3 From d2a9a39c718f8595c68592c99bec56013a0653fb Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 1 Jul 2020 09:58:20 +0200 Subject: gnu: sbcl-ironclad: Update to 0.50. * gnu/packages/lisp-xyz.scm (sbcl-ironclad): Update to 0.50. [inputs]: Remove trivial-garbage. --- gnu/packages/lisp-xyz.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index d4e1ceae09..232635df97 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -1713,7 +1713,7 @@ (define-public ecl-nibbles (define-public sbcl-ironclad (package (name "sbcl-ironclad") - (version "0.49") + (version "0.50") (source (origin (method git-fetch) @@ -1721,7 +1721,7 @@ (define-public sbcl-ironclad (url "https://github.com/sharplispers/ironclad/") (commit (string-append "v" version)))) (sha256 - (base32 "0kbzqg2aasrhjwy3nrzy2ddy809n1j045w4qkyc3r2syqd203d4q")) + (base32 "0k4bib9mbrzalbl9ivkw4a7g4c7bbad1l5jw4pzkifqszy2swkr5")) (file-name (git-file-name name version)))) (build-system asdf-build-system/sbcl) (native-inputs @@ -1729,8 +1729,7 @@ (define-public sbcl-ironclad `(("rt" ,sbcl-rt))) (inputs `(("bordeaux-threads" ,sbcl-bordeaux-threads) - ("flexi-streams" ,sbcl-flexi-streams) - ("trivial-garbage" ,sbcl-trivial-garbage))) + ("flexi-streams" ,sbcl-flexi-streams))) (synopsis "Cryptographic toolkit written in Common Lisp") (description "Ironclad is a cryptography library written entirely in Common Lisp. -- cgit v1.2.3 From 8f1ab4fb4192dc91814c0c0f45cc7a279ff8a334 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 1 Jul 2020 10:36:59 +0200 Subject: gnu: Move some lisp libraries. Move the 3 lisp libraries that are not in lisp-xyz.scm with the others. * gnu/packages/machine-learning.scm (sbcl-cl-libsvm-format, cl-libsvm-format, ecl-cl-libsvm-format, sbcl-cl-online-learning, cl-online-learning, ecl-cl-online-learning, sbcl-cl-random-forest, cl-random-forest, ecl-cl-random-forest): Move to ... * gnu/packages/lisp-xyz.scm (sbcl-cl-libsvm-format, cl-libsvm-format, ecl-cl-libsvm-format, sbcl-cl-online-learning, cl-online-learning, ecl-cl-online-learning, sbcl-cl-random-forest, cl-random-forest, ecl-cl-random-forest): ... here. --- gnu/packages/lisp-xyz.scm | 116 +++++++++++++++++++++++++++++++++++++ gnu/packages/machine-learning.scm | 118 -------------------------------------- 2 files changed, 116 insertions(+), 118 deletions(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 232635df97..20aa82bbb1 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -12121,3 +12121,119 @@ (define-public sbcl-cluffer (define-public cl-cluffer (sbcl-package->cl-source-package sbcl-cluffer)) + +(define-public sbcl-cl-libsvm-format + (let ((commit "3300f84fd8d9f5beafc114f543f9d83417c742fb") + (revision "0")) + (package + (name "sbcl-cl-libsvm-format") + (version (git-version "0.1.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/masatoi/cl-libsvm-format.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0284aj84xszhkhlivaigf9qj855fxad3mzmv3zfr0qzb5k0nzwrg")))) + (build-system asdf-build-system/sbcl) + (native-inputs + `(("prove" ,sbcl-prove) + ("prove-asdf" ,sbcl-prove-asdf))) + (inputs + `(("alexandria" ,sbcl-alexandria))) + (synopsis "LibSVM data format reader for Common Lisp") + (description + "This Common Lisp library provides a fast reader for data in LibSVM +format.") + (home-page "https://github.com/masatoi/cl-libsvm-format") + (license license:expat)))) + +(define-public cl-libsvm-format + (sbcl-package->cl-source-package sbcl-cl-libsvm-format)) + +(define-public ecl-cl-libsvm-format + (sbcl-package->ecl-package sbcl-cl-libsvm-format)) + +(define-public sbcl-cl-online-learning + (let ((commit "fc7a34f4f161cd1c7dd747d2ed8f698947781423") + (revision "0")) + (package + (name "sbcl-cl-online-learning") + (version (git-version "0.5" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/masatoi/cl-online-learning.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "14x95rlg80ay5hv645ki57pqvy12v28hz4k1w0f6bsfi2rmpxchq")))) + (build-system asdf-build-system/sbcl) + (native-inputs + `(("prove" ,sbcl-prove) + ("prove-asdf" ,sbcl-prove-asdf))) + (inputs + `(("cl-libsvm-format" ,sbcl-cl-libsvm-format) + ("cl-store" ,sbcl-cl-store))) + (arguments + `(;; FIXME: Tests pass but then the check phase crashes + #:tests? #f)) + (synopsis "Online Machine Learning for Common Lisp") + (description + "This library contains a collection of machine learning algorithms for +online linear classification written in Common Lisp.") + (home-page "https://github.com/masatoi/cl-online-learning") + (license license:expat)))) + +(define-public cl-online-learning + (sbcl-package->cl-source-package sbcl-cl-online-learning)) + +(define-public ecl-cl-online-learning + (sbcl-package->ecl-package sbcl-cl-online-learning)) + +(define-public sbcl-cl-random-forest + (let ((commit "85fbdd4596d40e824f70f1b7cf239cf544e49d51") + (revision "0")) + (package + (name "sbcl-cl-random-forest") + (version (git-version "0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/masatoi/cl-random-forest.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "097xv60i1ndz68sg9p4pc7c5gvyp9i1xgw966b4wwfq3x6hbz421")))) + (build-system asdf-build-system/sbcl) + (native-inputs + `(("prove" ,sbcl-prove) + ("prove-asdf" ,sbcl-prove-asdf) + ("trivial-garbage" ,sbcl-trivial-garbage))) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("cl-libsvm-format" ,sbcl-cl-libsvm-format) + ("cl-online-learning" ,sbcl-cl-online-learning) + ("lparallel" ,sbcl-lparallel))) + (arguments + `(#:tests? #f)) ; The tests download data from the Internet + (synopsis "Random Forest and Global Refinement for Common Lisp") + (description + "CL-random-forest is an implementation of Random Forest for multiclass +classification and univariate regression written in Common Lisp. It also +includes an implementation of Global Refinement of Random Forest.") + (home-page "https://github.com/masatoi/cl-random-forest") + (license license:expat)))) + +(define-public cl-random-forest + (sbcl-package->cl-source-package sbcl-cl-random-forest)) + +(define-public ecl-cl-random-forest + (sbcl-package->ecl-package sbcl-cl-random-forest)) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 0c02fbcfc7..d6a1064683 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -37,7 +37,6 @@ (define-module (gnu packages machine-learning) #:use-module (guix utils) #:use-module (guix download) #:use-module (guix svn-download) - #:use-module (guix build-system asdf) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system ocaml) @@ -63,7 +62,6 @@ (define-module (gnu packages machine-learning) #:use-module (gnu packages gstreamer) #:use-module (gnu packages image) #:use-module (gnu packages linux) - #:use-module (gnu packages lisp-xyz) #:use-module (gnu packages maths) #:use-module (gnu packages mpi) #:use-module (gnu packages ocaml) @@ -1965,122 +1963,6 @@ (define-public python-keras @end itemize\n") (license license:expat))) -(define-public sbcl-cl-libsvm-format - (let ((commit "3300f84fd8d9f5beafc114f543f9d83417c742fb") - (revision "0")) - (package - (name "sbcl-cl-libsvm-format") - (version (git-version "0.1.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/masatoi/cl-libsvm-format.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0284aj84xszhkhlivaigf9qj855fxad3mzmv3zfr0qzb5k0nzwrg")))) - (build-system asdf-build-system/sbcl) - (native-inputs - `(("prove" ,sbcl-prove) - ("prove-asdf" ,sbcl-prove-asdf))) - (inputs - `(("alexandria" ,sbcl-alexandria))) - (synopsis "LibSVM data format reader for Common Lisp") - (description - "This Common Lisp library provides a fast reader for data in LibSVM -format.") - (home-page "https://github.com/masatoi/cl-libsvm-format") - (license license:expat)))) - -(define-public cl-libsvm-format - (sbcl-package->cl-source-package sbcl-cl-libsvm-format)) - -(define-public ecl-cl-libsvm-format - (sbcl-package->ecl-package sbcl-cl-libsvm-format)) - -(define-public sbcl-cl-online-learning - (let ((commit "fc7a34f4f161cd1c7dd747d2ed8f698947781423") - (revision "0")) - (package - (name "sbcl-cl-online-learning") - (version (git-version "0.5" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/masatoi/cl-online-learning.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "14x95rlg80ay5hv645ki57pqvy12v28hz4k1w0f6bsfi2rmpxchq")))) - (build-system asdf-build-system/sbcl) - (native-inputs - `(("prove" ,sbcl-prove) - ("prove-asdf" ,sbcl-prove-asdf))) - (inputs - `(("cl-libsvm-format" ,sbcl-cl-libsvm-format) - ("cl-store" ,sbcl-cl-store))) - (arguments - `(;; FIXME: Tests pass but then the check phase crashes - #:tests? #f)) - (synopsis "Online Machine Learning for Common Lisp") - (description - "This library contains a collection of machine learning algorithms for -online linear classification written in Common Lisp.") - (home-page "https://github.com/masatoi/cl-online-learning") - (license license:expat)))) - -(define-public cl-online-learning - (sbcl-package->cl-source-package sbcl-cl-online-learning)) - -(define-public ecl-cl-online-learning - (sbcl-package->ecl-package sbcl-cl-online-learning)) - -(define-public sbcl-cl-random-forest - (let ((commit "85fbdd4596d40e824f70f1b7cf239cf544e49d51") - (revision "0")) - (package - (name "sbcl-cl-random-forest") - (version (git-version "0.1" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/masatoi/cl-random-forest.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "097xv60i1ndz68sg9p4pc7c5gvyp9i1xgw966b4wwfq3x6hbz421")))) - (build-system asdf-build-system/sbcl) - (native-inputs - `(("prove" ,sbcl-prove) - ("prove-asdf" ,sbcl-prove-asdf) - ("trivial-garbage" ,sbcl-trivial-garbage))) - (inputs - `(("alexandria" ,sbcl-alexandria) - ("cl-libsvm-format" ,sbcl-cl-libsvm-format) - ("cl-online-learning" ,sbcl-cl-online-learning) - ("lparallel" ,sbcl-lparallel))) - (arguments - `(#:tests? #f)) ; The tests download data from the Internet - (synopsis "Random Forest and Global Refinement for Common Lisp") - (description - "CL-random-forest is an implementation of Random Forest for multiclass -classification and univariate regression written in Common Lisp. It also -includes an implementation of Global Refinement of Random Forest.") - (home-page "https://github.com/masatoi/cl-random-forest") - (license license:expat)))) - -(define-public cl-random-forest - (sbcl-package->cl-source-package sbcl-cl-random-forest)) - -(define-public ecl-cl-random-forest - (sbcl-package->ecl-package sbcl-cl-random-forest)) - (define-public gloo (let ((version "0.0.0") ; no proper version tag (commit "ca528e32fea9ca8f2b16053cff17160290fc84ce") -- cgit v1.2.3 From 4e7d5e323baab4617f0d943b825f6ce81b0c0799 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 1 Jul 2020 10:49:47 +0200 Subject: gnu: sbcl-cl-random-forest: Update to 0.1-1.fedb36c. * gnu/packages/lisp-xyz.scm (sbcl-cl-random-forest): Update to 0.1-1.fedb36c. --- gnu/packages/lisp-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 20aa82bbb1..dd72690b00 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -12197,8 +12197,8 @@ (define-public ecl-cl-online-learning (sbcl-package->ecl-package sbcl-cl-online-learning)) (define-public sbcl-cl-random-forest - (let ((commit "85fbdd4596d40e824f70f1b7cf239cf544e49d51") - (revision "0")) + (let ((commit "fedb36ce99bb6f4d7e3a7dd6d8b058f331308f91") + (revision "1")) (package (name "sbcl-cl-random-forest") (version (git-version "0.1" revision commit)) @@ -12211,7 +12211,7 @@ (define-public sbcl-cl-random-forest (file-name (git-file-name name version)) (sha256 (base32 - "097xv60i1ndz68sg9p4pc7c5gvyp9i1xgw966b4wwfq3x6hbz421")))) + "0wqh4dxy5hrvm14jgyfypwhdw35f24rsksid4blz5a6l2z16rlmq")))) (build-system asdf-build-system/sbcl) (native-inputs `(("prove" ,sbcl-prove) -- cgit v1.2.3 From d2a34ebae0da82d0048307868fff11f899ec7a29 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 1 Jul 2020 11:05:19 +0200 Subject: gnu: sbcl-bordeaux-threads: Update to 0.8.8. * gnu/packages/lisp-xyz.scm (sbcl-bordeaux-threads): Update to 0.8.8. --- gnu/packages/lisp-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index dd72690b00..f5ec0f799e 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -173,14 +173,14 @@ (define-public ecl-fiveam (define-public sbcl-bordeaux-threads (package (name "sbcl-bordeaux-threads") - (version "0.8.7") + (version "0.8.8") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/sionescu/bordeaux-threads.git") (commit (string-append "v" version)))) (sha256 - (base32 "1whpfmyxp2fsw6viqj45fqgsifgr534c575bfh5vaqw5m84b6alp")) + (base32 "19i443fz3488v1pbbr9x24y8h8vlyhny9vj6c9jk5prm702awrp6")) (file-name (git-file-name "bordeaux-threads" version)))) (inputs `(("alexandria" ,sbcl-alexandria))) -- cgit v1.2.3 From 012bdf2e6108d50fd7c27644823fe26c73eb5ed3 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 1 Jul 2020 11:18:42 +0200 Subject: gnu: sbcl-alexandria: Update to 1.1. * gnu/packages/lisp-xyz.scm (sbcl-alexandria): Update to 1.1. --- gnu/packages/lisp-xyz.scm | 43 +++++++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index f5ec0f799e..97b5ec71e9 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -74,30 +74,29 @@ (define-module (gnu packages lisp-xyz) #:use-module (srfi srfi-19)) (define-public sbcl-alexandria - (let ((commit "5e5c7d83090cc0fbf32c4628362ac3ce2c50dc59")) - (package - (name "sbcl-alexandria") - (version "1.0.1") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://gitlab.common-lisp.net/alexandria/alexandria.git") - (commit commit))) - (sha256 - (base32 - "010w8829dq28jf8ajfzas9nfvpxa5bal04mg299xq6y9spihc2iz")) - (file-name (git-file-name name version)))) - (build-system asdf-build-system/sbcl) - (native-inputs - `(("rt" ,sbcl-rt))) - (synopsis "Collection of portable utilities for Common Lisp") - (description - "Alexandria is a collection of portable utilities. It does not contain + (package + (name "sbcl-alexandria") + (version "1.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.common-lisp.net/alexandria/alexandria.git") + (commit (string-append "v" version)))) + (sha256 + (base32 + "1zanb3xa98js0i66iqcmx3gp123p1m2d1fxn8d7bfzyfad5f6xn2")) + (file-name (git-file-name name version)))) + (build-system asdf-build-system/sbcl) + (native-inputs + `(("rt" ,sbcl-rt))) + (synopsis "Collection of portable utilities for Common Lisp") + (description + "Alexandria is a collection of portable utilities. It does not contain conceptual extensions to Common Lisp. It is conservative in scope, and portable between implementations.") - (home-page "https://common-lisp.net/project/alexandria/") - (license license:public-domain)))) + (home-page "https://common-lisp.net/project/alexandria/") + (license license:public-domain))) (define-public cl-alexandria (sbcl-package->cl-source-package sbcl-alexandria)) -- cgit v1.2.3 From 7ff99f4a17b51c40cbba24aa33433a9b1a93a3e2 Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Tue, 30 Jun 2020 11:41:36 +0200 Subject: gnu: spirv-cross: Improve description. * gnu/packages/vulkan.scm (spirv-cross)[description]: Simplify. Signed-off-by: Nicolas Goaziou --- gnu/packages/vulkan.scm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 2e640f502c..fe37b59e26 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -144,13 +144,7 @@ (define-public spirv-cross (synopsis "Parser for and converter of SPIR-V to other shader languages") (description "SPIRV-Cross tries hard to emit readable and clean output from the -SPIR-V. The goal is to emit GLSL or MSL that looks like it was written by -a human and not awkward IR/assembly-like code. - -NOTE: Individual features are expected to be mostly complete, but it is -possible that certain obscure GLSL features are not yet supported. However, -most missing features are expected to be ``trivial'' improvements at this -stage.") +SPIR-V, aiming to emit GLSL or MSL that looks like human-written code.") (license license:asl2.0))) (define-public glslang -- cgit v1.2.3 From bb3ddda25ddfd8892d4b09ef99d6fa4f1bfd8eeb Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Tue, 30 Jun 2020 19:34:38 +0200 Subject: gnu: ppsspp: Unbundle more sources. * gnu/packages/emulators (ppsspp)[source]: Update unbundling snippet. [inputs]: Add cityhash, libzip, vulkan-headers, vulkan-loader, xxhash. [arguments]<#:configure-flags>: Add -DUSE_SYSTEM_LIBZIP=ON. Update comments accordingly. Signed-off-by: Nicolas Goaziou --- gnu/packages/emulators.scm | 79 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 64 insertions(+), 15 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index c0353c69af..35f236dbfe 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -48,6 +48,7 @@ (define-module (gnu packages emulators) #:use-module (gnu packages compression) #:use-module (gnu packages cross-base) #:use-module (gnu packages curl) + #:use-module (gnu packages digest) #:use-module (gnu packages elf) #:use-module (gnu packages fonts) #:use-module (gnu packages fontutils) @@ -1858,25 +1859,69 @@ (define-public ppsspp (modules '((guix build utils))) (snippet `(begin - ;; Unbundle sources. - (substitute* (list "Common/Vulkan/VulkanContext.cpp" - "ext/native/thin3d/vulkan_utils.cpp" - "GPU/Common/ShaderCommon.cpp" - "GPU/Common/ShaderTranslation.cpp" - "SDL/SDLMain.cpp") + ;; The following is quite a heavy-handed way of unbundling PPSSPP. + ;; There are still a number of external sources, that we don't + ;; remove here. Some may be packaged, others are not. + ;; First, we patch existing sources to include the right headers. + (substitute* (append (list "ext/native/thin3d/vulkan_utils.cpp" + "ext/native/thin3d/thin3d_vulkan.cpp") + (find-files "Common" ".*\\.(h|cpp)") + (find-files "Core" ".*\\.(h|cpp)") + (find-files "GPU" ".*\\.(h|cpp)") + (find-files "SDL" ".*\\.(h|cpp)") + (find-files "UI" ".*\\.(h|cpp)")) + ;; These headers are all hard-coded in the original source. + (("ext/cityhash/") "") (("ext/glslang/") "") - (("ext/SPIRV-Cross/") "spirv_cross/")) - ;; Patch CMakeLists. + (("ext/SPIRV-Cross/") "spirv_cross/") + (("ext/vulkan/") "vulkan/") + (("ext/xxhash.h") "xxhash.h") + ;; These definitions do not actually exist in the Vulkan headers, + ;; but PPSSPP defines them in ext/vulkan. + (("VK_FORMAT_BEGIN_RANGE") "VK_FORMAT_UNDEFINED") + (("VK_FORMAT_END_RANGE") "VK_FORMAT_ASTC_12x12_SRGB_BLOCK")) + ;; Next, we patch CMakeLists. (substitute* "CMakeLists.txt" + ;; Drop unnecessary includes and targets. (("include_directories\\(ext/glslang\\)") "") + (("include_directories\\(ext/xxhash\\)") "") + (("include_directories\\(ext/cityhash\\)") "") + (("set_target_properties\\(cityhash .*\\)") "") + ;; Fix linking to GLEW. + (("TARGET Ext::GLEW") "true") + (("target_link_libraries\\(native Ext::GLEW\\)") + "find_package(GLEW)\ntarget_link_libraries(native GLEW::GLEW)") + (("Ext::Snappy") "snappy") + ;; Don't search for cityhash/xxhash, we already have them. + (("add_library\\((city|xx)hash STATIC") "if()\nendif(") + (("ext/xxhash\\.[ch]") "") + (("ext/native/ext/cityhash/.*\\.(cpp|h)") "") + ;; Link all of spirv-cross. (("spirv-cross-glsl" all) (string-append all " spirv-cross-core spirv-cross-cpp" " spirv-cross-reflect spirv-cross-util"))) (substitute* "ext/CMakeLists.txt" + (("add_subdirectory\\(glew\\)") "") (("add_subdirectory\\(glslang\\)") "") + (("add_subdirectory\\(snappy\\)") "") (("add_subdirectory\\(SPIRV-Cross-build\\)") "")) - (delete-file-recursively "ext/cmake") + ;; Finally, we can delete the bundled sources. + (for-each delete-file-recursively + '("ext/cmake" + "ext/glew" + "ext/glslang" "ext/glslang-build" + "ext/native/ext/cityhash" + "ext/native/ext/libpng17" + "ext/native/ext/libzip" + "ext/snappy" + "ext/SPIRV-Cross" "ext/SPIRV-Cross-build" + "ext/vulkan" + "ext/xxhash.c" + "ext/xxhash.h" + "ext/zlib")) + ;; Since we are not including git as an input, PPSSPP is confused + ;; about its version. Let's fix that here. (substitute* "git-version.cmake" (("unknown") ,version)))))) (build-system cmake-build-system) @@ -1884,16 +1929,21 @@ (define-public ppsspp `(("pkg-config" ,pkg-config) ("python" ,python))) (inputs - `(("ffmpeg" ,ffmpeg) + `(("cityhash" ,cityhash) + ("ffmpeg" ,ffmpeg) ("glew" ,glew) ("glslang" ,glslang) ("libpng" ,libpng) + ("libzip" ,libzip) ("mesa" ,mesa) ("sdl2" ,sdl2) ("snappy" ,snappy) ("spirv-cross" ,spirv-cross) + ("vulkan-headers" ,vulkan-headers) + ("vulkan-loader" ,vulkan-loader) + ("xxhash" ,xxhash) ("zlib" ,zlib) - ;; TODO: unbundle builds. + ;; TODO: unbundle armips. ("armips-source" ,(package-source armips)) ("lang" ,(origin @@ -1915,15 +1965,14 @@ (define-public ppsspp `(#:out-of-source? #f #:configure-flags (list "-DUSE_DISCORD=OFF" "-DUSE_SYSTEM_FFMPEG=ON" - ;; For testing. + "-DUSE_SYSTEM_LIBZIP=ON" + ;; for testing "-DUNITTEST=ON" "-DHEADLESS=ON") #:phases (modify-phases %standard-phases (add-after 'unpack 'add-external-sources (lambda* (#:key inputs #:allow-other-keys) - ;; TODO: unbundle builds. Not only should we not copy these - ;; sources in, we should also remove as much from "ext/" as we - ;; can. + ;; TODO: unbundle armips. (copy-recursively (assoc-ref inputs "armips-source") "ext/armips") ;; Some tests are externalised, so we add them here. -- cgit v1.2.3 From eb8a79218d33a513d4673162fd752efb1152a084 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 1 Jul 2020 11:18:45 +0200 Subject: .guix-authorizations: Remove brettgilio's old key. * .guix-authorizations: Remove key "DFC0 C7F7 9EE6 0CA7 AE55 5E19 6722 43C4 A03F 0EEE" (Brett Gilio). See . --- .guix-authorizations | 2 -- 1 file changed, 2 deletions(-) diff --git a/.guix-authorizations b/.guix-authorizations index 2142f88edb..2007e21b3c 100644 --- a/.guix-authorizations +++ b/.guix-authorizations @@ -35,8 +35,6 @@ (name "biscuolo")) ("7988 3B9F 7D6A 4DBF 3719 0367 2506 A96C CF63 0B21" (name "boskovits")) - ("DFC0 C7F7 9EE6 0CA7 AE55 5E19 6722 43C4 A03F 0EEE" - (name "brettgilio")) (;; primary: "8929 BBC5 73CD 9206 3DDD 979D 3D36 CAA0 116F 0F99" "1C9B F005 1A1A 6A44 5257 599A A949 03A1 66A1 8FAE" (name "bricewge")) -- cgit v1.2.3 From 5402f3ed05e72f17509e3e732b67488b4643066d Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 1 Jul 2020 11:21:36 +0200 Subject: .guix-authorizations: Remove former keys that are no longer used. * .guix-authorizations: Remove old keys of dvc, efraim, and janneke. --- .guix-authorizations | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.guix-authorizations b/.guix-authorizations index 2007e21b3c..995147b17f 100644 --- a/.guix-authorizations +++ b/.guix-authorizations @@ -58,12 +58,8 @@ (name "daviwil")) ("6909 6DFD D702 8BED ACC5 884B C5E0 51C7 9C0B ECDB" (name "dvc")) - ("5F43 B681 0437 2F4B A898 A64B 33B9 E9FD E28D 2C23" - (name "dvc (old)")) ("A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351" (name "efraim")) - ("9157 41FE B22F A4E3 3B6E 8F8D F4C1 D391 7EAC EE93" - (name "efraim (old)")) (;; primary: "2453 02B1 BAB1 F867 FDCA 96BC 8F3F 861F 82EB 7A9A" "CBC5 9C66 EC27 B971 7940 6B3E 6BE8 208A DF21 FE3F" (name "glv")) @@ -76,13 +72,8 @@ (;; primary: "66A5 6D9C 9A98 BE7F 719A B401 2652 5665 AE72 7D37" "0325 78A6 8298 94E7 2AA2 66F5 D415 BF25 3B51 5976" (name "iyzsong")) - - ;; https://lists.gnu.org/archive/html/guix-devel/2018-04/msg00229.html - ("DB34 CB51 D25C 9408 156F CDD6 A12F 8797 8D70 1B99" - (name "janneke (old)")) ("1A85 8392 E331 EAFD B8C2 7FFB F3C1 A0D9 C1D6 5273" (name "janneke")) - (;; primary: "1BA4 08C5 8BF2 0EA7 3179 635A 865D C0A3 DED9 B5D0" "E31D 9DDE EBA5 4A14 8A20 4550 DA45 97F9 47B4 1025" (name "jlicht")) -- cgit v1.2.3 From 9f5f3932debc72a57a830fc6ca5ab980f6db4941 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 1 Jul 2020 11:27:28 +0200 Subject: .guix-authorizations: Remove keys of two former contributors. * .guix-authorizations: Remove key of David Craven, who left the project in 2017, and Federico Beffa, whose last commit was in Feb. 2017. --- .guix-authorizations | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.guix-authorizations b/.guix-authorizations index 995147b17f..a5a081857a 100644 --- a/.guix-authorizations +++ b/.guix-authorizations @@ -27,8 +27,6 @@ (;; primary: "34FF 38BC D151 25A6 E340 A0B5 3453 2F9F AFCA 8B8E" "A0C5 E352 2EF8 EF5C 64CD B7F0 FD73 CAC7 19D3 2566" (name "bavier")) - ("3774 8024 880F D3FF DCA2 C9AB 5893 6E0E 2F1B 5A4C" - (name "beffa")) ("BCF8 F737 2CED 080A 67EB 592D 2A6A D9F4 AAC2 0DF6" (name "benwoodcroft")) ("45CC 63B8 5258 C9D5 5F34 B239 D37D 0EA7 CECC 3912" @@ -56,8 +54,6 @@ (name "davexunit (2nd)")) ("53C4 1E6E 41AA FE55 335A CA5E 446A 2ED4 D940 BF14" (name "daviwil")) - ("6909 6DFD D702 8BED ACC5 884B C5E0 51C7 9C0B ECDB" - (name "dvc")) ("A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351" (name "efraim")) (;; primary: "2453 02B1 BAB1 F867 FDCA 96BC 8F3F 861F 82EB 7A9A" -- cgit v1.2.3 From d277c00ec942b7eb52f918b5e17c043e95fef27c Mon Sep 17 00:00:00 2001 From: "B. Wilson" Date: Wed, 1 Jul 2020 12:56:10 +0200 Subject: gnu: Add metamath. * gnu/packages/maths.scm (metamath): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/maths.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 48cffba929..5ea505764a 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -38,6 +38,7 @@ ;;; Copyright © 2020 R Veera Kumar ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020 Nicolò Balzarotti +;;; Copyright © 2020 B. Wilson ;;; ;;; This file is part of GNU Guix. ;;; @@ -2409,6 +2410,42 @@ (define-public python-slepc4py bindings to almost all functions of SLEPc.") (license license:bsd-3))) +(define-public metamath + ;; Upstream pushed a commit on top of v0.182 that fixes a bug in Makefile.am. + ;; Using this commit lets us avoid directly including the patch here. In the + ;; next version bump, we should be able to replace this and directly use the + ;; version tag. + (let ((commit "5df616efe4119ff88daf77e7041d45b6fa39c578") + (revision "0")) + (package + (name "metamath") + (version (git-version "0.182" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/metamath/metamath-exe.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0amjdgy42c7jypf6sz98iczlxcyl9bqx67ws1q8w2zdqk2izsyjp")))) + (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake))) + (home-page "http://us.metamath.org/") + (synopsis "Proof verifier based on a minimalistic formalism") + (description + "Metamath is a tiny formal language and that can express theorems in +abstract mathematics, with an accompyaning @command{metamath} executable that +verifies databases of these proofs. There is a public database, +@url{https://github.com/metamath/set.mm, set.mm}, implementing first-order +logic and Zermelo-Frenkel set theory with Choice, along with a large swath of +associated, high-level theorems, e.g.@: the fundamental theorem of arithmetic, +the Cauchy-Schwarz inequality, Stirling's formula, etc. See the Metamath +book.") + (license license:gpl2+)))) + (define-public mumps (package (name "mumps") -- cgit v1.2.3 From 4e133f4fe4f501c4f94afbeaf2d5907a0c58fc11 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 1 Jul 2020 12:10:40 +0300 Subject: gnu: vim: Update to 8.2.1101. * gnu/packages/vim.scm (vim): Update to 8.2.1101. [arguments]: In 'patch-config-files patch more shell calls. Rename custom 'set-TZDIR phase to 'set-environment-variables phase and also set TERM. Adjust 'skip-failing-tests to skip more tests. --- gnu/packages/vim.scm | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index a1abfd1ad5..97f1414d4a 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -70,7 +70,7 @@ (define-module (gnu packages vim) (define-public vim (package (name "vim") - (version "8.2.0411") + (version "8.2.1101") (source (origin (method git-fetch) (uri (git-reference @@ -79,7 +79,7 @@ (define-public vim (file-name (git-file-name name version)) (sha256 (base32 - "0idjbf15yqk5jz2dqbh2lzj7glxcwn1jl5pp9kk908ps02vzqyai")))) + "170k855vscixnk6rz01i3k22crjiz8b2h83fnm2b2ccha0jyn9mf")))) (build-system gnu-build-system) (arguments `(#:test-target "test" @@ -92,15 +92,21 @@ (define-public vim (("/usr/bin/nawk") (which "gawk"))) (substitute* '("src/testdir/Makefile" "src/testdir/test_normal.vim" + "src/testdir/test_system.vim" "src/testdir/test_terminal.vim") (("/bin/sh") (which "sh"))) + (substitute* "src/testdir/test_autocmd.vim" + (("/bin/kill") (which "kill"))) #t)) - (add-before 'check 'set-TZDIR + (add-before 'check 'set-environment-variables (lambda* (#:key inputs #:allow-other-keys) ;; One of the tests tests timezone-dependent functions. (setenv "TZDIR" (string-append (assoc-ref inputs "tzdata") "/share/zoneinfo")) + + ;; Make sure the TERM environment variable is set for the tests + (setenv "TERM" "xterm") #t)) (add-before 'check 'skip-failing-tests (lambda _ @@ -113,6 +119,14 @@ (define-public vim (substitute* "src/testdir/test_swap.vim" (("if !IsRoot\\(\\)") "if 0")) + ;; These tests fail on upstream's CI on FreeBSD because they are + ;; run as root. They fail for us because PID 1 and the test suite + ;; are run by the same user. + (substitute* '("src/testdir/test_backup.vim" + "src/testdir/test_writefile.vim") + (("CheckNotBSD") "throw 'Skipped: this test fails on Guix'") + (("'bsd'") "'unix'")) + ;; This test checks how the terminal looks after executing some ;; actions. The path of the bash binary is shown, which results in ;; a difference being detected. Patching the expected result is -- cgit v1.2.3 From aa982985e01efc3b0a477b002d6499ef7fd4d62e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 1 Jul 2020 14:38:28 +0300 Subject: gnu: vim-full: Remove unneeded phase. * gnu/packages/vim.scm (vim-full)[arguments]: Remove custom 'skip-previewpopup phase. --- gnu/packages/vim.scm | 7 ------- 1 file changed, 7 deletions(-) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 97f1414d4a..25cf578bb8 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -214,13 +214,6 @@ (define-public vim-full ,@(substitute-keyword-arguments (package-arguments vim) ((#:phases phases) `(modify-phases ,phases - (add-before 'check 'skip-previewpopup - ;; This test fails when the path to the source is long. See: - ;; https://github.com/vim/vim/issues/5615 - (lambda _ - (substitute* "src/testdir/test_popupwin.vim" - ((".*Test_previewpopup.*" line) - (string-append line "return\n"))))) (add-before 'check 'skip-test87 ;; This test fails for unknown reasons after switching ;; to a git checkout. -- cgit v1.2.3 From cdf34eed3302951fec198c1e5ac26d36d91d2440 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 1 Jul 2020 15:49:39 +0200 Subject: guix: build: Fix asdf-build-system/ecl. * guix/build/lisp-utils.scm (make-asd-file): Fix value of 'component?' parameter when using ECL. --- guix/build/lisp-utils.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/guix/build/lisp-utils.scm b/guix/build/lisp-utils.scm index 5bb3d81c9e..f6d9168c48 100644 --- a/guix/build/lisp-utils.scm +++ b/guix/build/lisp-utils.scm @@ -327,8 +327,12 @@ (define registry #:version version #:dependencies dependencies ;; Some .asd don't have components, and thus they don't generate any .fasl. - #:component? (pair? - (find-files (dirname asd-file) "--system\\.fasl$"))) + #:component? (match (%lisp-type) + ("sbcl" (pair? (find-files (dirname asd-file) + "--system\\.fasl$"))) + ("ecl" (pair? (find-files (dirname asd-file) + "\\.fasb$"))) + (_ (error "The LISP provided is not supported at this time.")))) (generate-dependency-links registry system))) port)))) -- cgit v1.2.3 From c28c408e715b45e01286b638e44d257868bc13ef Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 1 Jul 2020 15:37:40 +0200 Subject: gnu: mtxclient: Update to 0.3.1. * gnu/packages/messaging.scm (mtxclient): Update to 0.3.1. --- gnu/packages/messaging.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 8ac03ef6b9..ab7788e1b9 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1856,7 +1856,7 @@ (define-public libqmatrixclient (define-public mtxclient (package (name "mtxclient") - (version "0.3.0") + (version "0.3.1") (source (origin (method git-fetch) @@ -1865,7 +1865,7 @@ (define-public mtxclient (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0vf5xmn6yfi5lvskfgrdmnalvclzrapcrml92bj9qaa8vq8mfsf2")))) + (base32 "1dg4dq20g0ah62j5s3gpsxqq4ny7lxkxdxa9q6g54hdwkrb9ms7x")))) (arguments `(#:configure-flags (list -- cgit v1.2.3 From 77b5498f32e33120308b000d69316a38a78145f5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 1 Jul 2020 15:37:50 +0200 Subject: gnu: nheko: Update to 0.7.2. * gnu/packages/messaging.scm (nheko): Update to 0.7.2. --- gnu/packages/messaging.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index ab7788e1b9..93d25039b0 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1906,7 +1906,7 @@ (define-public mtxclient (define-public nheko (package (name "nheko") - (version "0.7.1") + (version "0.7.2") (source (origin (method git-fetch) @@ -1915,7 +1915,7 @@ (define-public nheko (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "12sxibbrn79sxkf9jrm7jrlj7l5vz15claxrrll7pkv9mv44wady")))) + (base32 "1cbhgaf9klgxdirrxj571fqwspm0byl75c1xc40l727a6qswvp7s")))) (arguments `(#:tests? #f ;no test target #:configure-flags -- cgit v1.2.3 From 36a0228eb8a593100a07dbe739cbf212d5612d15 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 1 Jul 2020 17:16:21 +0200 Subject: gnu: ngircd: Update to 26. * gnu/packages/messaging.scm (ngircd): Update to 26. [native-inputs]: Add openssl. --- gnu/packages/messaging.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 93d25039b0..945257eca1 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -370,20 +370,21 @@ (define-public hexchat (define-public ngircd (package (name "ngircd") - (version "25") + (version "26") (source (origin (method url-fetch) (uri (string-append "https://arthur.barton.de/pub/ngircd/ngircd-" version ".tar.xz")) (sha256 (base32 - "0kpf5qi98m9f833r4rx9n6h9p31biwk798jwc1mgzmix7sp7r6f4")) + "1ijmv18fa648y7apxb9vp4j9iq6fxq850kz5v36rysaq614cdp2n")) (patches (search-patches "ngircd-handle-zombies.patch")))) (build-system gnu-build-system) ;; Needed for the test suite. (native-inputs `(("procps" ,procps) ("expect" ,expect) - ("inetutils" ,inetutils))) + ("inetutils" ,inetutils) + ("openssl" ,openssl))) ;; XXX Add libident. (inputs `(("zlib" ,zlib) ("libwrap" ,tcp-wrappers) -- cgit v1.2.3 From caeb243712d48908c62f2d2e5a6f4cf66c8d394c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 1 Jul 2020 17:17:58 +0200 Subject: gnu: mpd: Update to 0.21.24. * gnu/packages/mpd.scm (mpd): Update to 0.21.24. --- gnu/packages/mpd.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 74c898979e..653eec5b6a 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -92,7 +92,7 @@ (define-public libmpdclient (define-public mpd (package (name "mpd") - (version "0.21.23") + (version "0.21.24") (source (origin (method url-fetch) (uri @@ -101,7 +101,7 @@ (define-public mpd "/mpd-" version ".tar.xz")) (sha256 (base32 - "18q72b9baj5cdpq0yn60qm7q4g8vwqqyqndl9xg3f3w0m4n557s3")))) + "1mjclv7nf42smzry6cswciicsypv0mfsfl8nsykb6wp6h9z2lqw4")))) (build-system meson-build-system) (arguments `(#:configure-flags '("-Ddocumentation=true"))) ;the default is 'false'... -- cgit v1.2.3 From 958258dc205d8755280e46f682c94b492c7615b9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 1 Jul 2020 17:24:28 +0200 Subject: gnu: synthv1: Update to 0.9.15. * gnu/packages/music.scm (synthv1): Update to 0.9.15. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 639cf6d5f2..d5d542e7a2 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1437,7 +1437,7 @@ (define-public jalv-select (define-public synthv1 (package (name "synthv1") - (version "0.9.14") + (version "0.9.15") (source (origin (method url-fetch) (uri @@ -1445,7 +1445,7 @@ (define-public synthv1 "/synthv1-" version ".tar.gz")) (sha256 (base32 - "08n83krkak20924flb9azhm9hn40lyfvn29m63zs3lw3wajf0b40")))) + "047y2l7ipzv00ly54f074v6p043xjml7vz0svc7z81bhx74vs0ix")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ; there are no tests -- cgit v1.2.3 From f4482a6396db8aaacd0b9b66ffc98eecd7f8acac Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 1 Jul 2020 17:24:34 +0200 Subject: gnu: drumkv1: Update to 0.9.15. * gnu/packages/music.scm (drumkv1): Update to 0.9.15. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index d5d542e7a2..f5e53ff57d 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1469,7 +1469,7 @@ (define-public synthv1 (define-public drumkv1 (package (name "drumkv1") - (version "0.9.14") + (version "0.9.15") (source (origin (method url-fetch) (uri @@ -1477,7 +1477,7 @@ (define-public drumkv1 "/drumkv1-" version ".tar.gz")) (sha256 (base32 - "0fr7pkp55zvjxf7p22drs93fsjgvqhbd55vxi0srhp2s2wzz5qak")))) + "108jk8p1sbm99plipf98ssij6dxaip1lmznibg8y2c4x0v2la6ab")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ; there are no tests -- cgit v1.2.3 From 5aed91019adf2786099878d173de7d7957205629 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 1 Jul 2020 17:24:38 +0200 Subject: gnu: samplv1: Update to 0.9.15. * gnu/packages/music.scm (samplv1): Update to 0.9.15. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index f5e53ff57d..4ea2e573f2 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1502,7 +1502,7 @@ (define-public drumkv1 (define-public samplv1 (package (name "samplv1") - (version "0.9.14") + (version "0.9.15") (source (origin (method url-fetch) (uri @@ -1510,7 +1510,7 @@ (define-public samplv1 "/samplv1-" version ".tar.gz")) (sha256 (base32 - "0p3f9wsn1nz93szcl60yxhxdr554zm2z2jlbniwwify765lvasxc")))) + "0r3bz64jqv5j4rqaxkbiqkxdf8n3hlcwjx1p19qfzik1lbwv9nw5")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ; there are no tests -- cgit v1.2.3 From 0b97e8fc9672dea0d1828600dbfd1df8b627b449 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 1 Jul 2020 17:24:43 +0200 Subject: gnu: padthv1: Update to 0.9.15. * gnu/packages/music.scm (padthv1): Update to 0.9.15. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 4ea2e573f2..166c17fd78 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1535,7 +1535,7 @@ (define-public samplv1 (define-public padthv1 (package (name "padthv1") - (version "0.9.14") + (version "0.9.15") (source (origin (method url-fetch) (uri @@ -1543,7 +1543,7 @@ (define-public padthv1 "/padthv1-" version ".tar.gz")) (sha256 (base32 - "079iwwlkl1gscyv70v9ambad8shxbs0ixdfp0vsl6dbh87b09qzh")))) + "18ma429kamifcvjmsv0hysxk7qn2r9br4fia929bvfccapck98y1")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ; there are no tests -- cgit v1.2.3 From 57e0b9e87c37692beb4f37ff668fe3a0b9b1d668 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 1 Jul 2020 17:28:21 +0200 Subject: gnu: ncdu: Update to 1.15.1. * gnu/packages/ncdu.scm (ncdu): Update to 1.15.1. --- gnu/packages/ncdu.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ncdu.scm b/gnu/packages/ncdu.scm index e59e0334b7..feb2baf980 100644 --- a/gnu/packages/ncdu.scm +++ b/gnu/packages/ncdu.scm @@ -28,14 +28,14 @@ (define-module (gnu packages ncdu) (define-public ncdu (package (name "ncdu") - (version "1.15") + (version "1.15.1") (source (origin (method url-fetch) (uri (string-append "https://dev.yorhel.nl/download/ncdu-" version ".tar.gz")) (sha256 (base32 - "1ywpa8yg74a5xa46f0qig92xw5z5s1lmspwzcslr497brk2ksnaa")))) + "1c1zxalm5asyhn4p1hd51h7khw17515gbqmvdz63kc8xpx6xqbdh")))) (build-system gnu-build-system) (inputs `(("ncurses" ,ncurses))) (synopsis "Ncurses based disk usage analyzer") -- cgit v1.2.3 From e75d8234e7184070d20645baf8ab55257a731b25 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 1 Jul 2020 17:29:29 +0200 Subject: gnu: ncdu: Fix up synopsis & description. * gnu/packages/ncdu.scm (ncdu)[synopsis]: Fix typo. [description]: Start with a proper sentence. Double-space. --- gnu/packages/ncdu.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ncdu.scm b/gnu/packages/ncdu.scm index feb2baf980..375b528805 100644 --- a/gnu/packages/ncdu.scm +++ b/gnu/packages/ncdu.scm @@ -38,10 +38,11 @@ (define-public ncdu "1c1zxalm5asyhn4p1hd51h7khw17515gbqmvdz63kc8xpx6xqbdh")))) (build-system gnu-build-system) (inputs `(("ncurses" ,ncurses))) - (synopsis "Ncurses based disk usage analyzer") - (description "A disk usage analyzer with an ncurses interface, aimed to be + (synopsis "Ncurses-based disk usage analyzer") + (description + "Ncdu is a disk usage analyzer with an ncurses interface, aimed to be run on a remote server where you don't have an entire graphical setup, but have -to do with a simple SSH connection. ncdu aims to be fast, simple and easy to +to do with a simple SSH connection. ncdu aims to be fast, simple and easy to use, and should be able to run in any minimal POSIX-like environment with ncurses installed.") (license (x11-style -- cgit v1.2.3 From b3e8e6fdcf5cbe4526423a70f1abee6bbc185844 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 1 Jul 2020 17:29:41 +0200 Subject: gnu: qtractor: Update to 0.9.15. * gnu/packages/music.scm (qtractor): Update to 0.9.15. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 166c17fd78..d0f5bee3a0 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2507,14 +2507,14 @@ (define-public aj-snapshot (define-public qtractor (package (name "qtractor") - (version "0.9.14") + (version "0.9.15") (source (origin (method url-fetch) (uri (string-append "https://downloads.sourceforge.net/qtractor/" "qtractor-" version ".tar.gz")) (sha256 (base32 - "1gh268gdpj7nw19xfh7k2l3aban4yrs1lmx33qswrnngs2izj1fk")))) + "0k7a6llwrzs07flr9mvzvay9ygc2x64syg8npyabsw5a4d85fwsx")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ; no "check" target -- cgit v1.2.3 From 210f5420ed84ed38e9cc4bbae93896dc03ab8346 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 1 Jul 2020 17:35:58 +0200 Subject: gnu: solaar: Fix build. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/admin.scm (solaar)[arguments]: Remove unnecessary custom ‘build’ phase. Set PYTHONPATH earlier, before building. Reported by Robin Templeton (terpri on #guix). --- gnu/packages/admin.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index d9285d878f..9b3bca5482 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3673,10 +3673,7 @@ (define-public solaar (("'--prefix' in sys\\.argv") "len([x.startswith('--prefix=') for x in sys.argv]) > 0")) #t)) - (replace 'build - (lambda _ - (invoke "python" "setup.py" "build"))) - (add-before 'check 'setenv-PATH + (add-before 'build 'setenv-PATH (lambda _ (setenv "PYTHONPATH" (string-append "lib:" (getenv "PYTHONPATH"))) #t))))) -- cgit v1.2.3 From ec3cff2d7f1f5cae5b0fca5dbbf19f91721cc1be Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 1 Jul 2020 17:37:00 +0200 Subject: gnu: haproxy: Update to 2.1.7. * gnu/packages/networking.scm (haproxy): Update to 2.1.7. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index af49b25e7c..836da737c8 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3201,7 +3201,7 @@ (define-public vde2 (define-public haproxy (package (name "haproxy") - (version "2.1.6") + (version "2.1.7") (source (origin (method url-fetch) (uri (string-append "https://www.haproxy.org/download/" @@ -3209,7 +3209,7 @@ (define-public haproxy "/src/haproxy-" version ".tar.gz")) (sha256 (base32 - "1pyz4gckdn8982vpb1iiw9agwp2s5p8wc0nn1qh1ic0wq3lrnpg6")))) + "0fd3c1znid5a9w3gcf77b85hm2a2558w9s02c4b7xzkmivqnqbir")))) (build-system gnu-build-system) (arguments `(#:make-flags -- cgit v1.2.3 From 5ebab403b1f8ba9d87b753b277be168485d9c93a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 1 Jul 2020 17:43:03 +0200 Subject: gnu: libndp: Use HTTPS. * gnu/packages/networking.scm (libndp)[source]: Hard-code NAME. Use HTTPS. [home-page]: Use HTTPS. --- gnu/packages/networking.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 836da737c8..37f6ae23d3 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -603,13 +603,13 @@ (define-public libndp (version "1.7") (source (origin (method url-fetch) - (uri (string-append "http://libndp.org/files/" - name "-" version ".tar.gz")) + (uri (string-append "https://libndp.org/files/" + "libndp-" version ".tar.gz")) (sha256 (base32 "1dlinhl39va00v55qygjc9ap77yqf7xvn4rwmvdr49xhzzxhlj1c")))) (build-system gnu-build-system) - (home-page "http://libndp.org/") + (home-page "https://libndp.org/") (synopsis "Library for Neighbor Discovery Protocol") (description "libndp contains a library which provides a wrapper for IPv6 Neighbor -- cgit v1.2.3 From 78d473aaf9826e5a26969963c7ec17c48eb877d6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 1 Jul 2020 17:48:48 +0200 Subject: gnu: squid: Update to 4.12. * gnu/packages/networking.scm (squid): Update to 4.12. --- gnu/packages/networking.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 37f6ae23d3..d75f524e60 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1127,15 +1127,14 @@ (define-public httpstat (define-public squid (package (name "squid") - (version "4.11") + (version "4.12") (source (origin (method url-fetch) (uri (string-append "http://www.squid-cache.org/Versions/v4/squid-" version ".tar.xz")) (sha256 - (base32 - "0z986kykx539wjqd7mr8y0abf3z6hz8byf8fmmbky9hh4ihlgnaf")))) + (base32 "05z34ysy2zn7as11vd365xxhh36bm1ysiwcbr0i0f0nwng406apl")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From ade0f8ea0cbcabcd94cb4212abebd8c143c7d69d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 1 Jul 2020 19:40:24 +0300 Subject: gnu: gama: Update to 2.09. * gnu/packages/gps.scm (gama): Update to 2.09. --- gnu/packages/gps.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm index 38fa6bea47..5f9dcdbb65 100644 --- a/gnu/packages/gps.scm +++ b/gnu/packages/gps.scm @@ -154,7 +154,7 @@ (define-public gpscorrelate (define-public gama (package (name "gama") - (version "2.08") + (version "2.09") (source (origin (method url-fetch) @@ -162,7 +162,7 @@ (define-public gama version ".tar.gz")) (sha256 (base32 - "0fic6a3a83hgj3gj85bin3wd6ghgi2qg76d6jfwckamab0hlv7wx")))) + "0c1b28frl6109arj09v4zr1xs859krn8871mkvis517g5pb55dc9")))) (build-system gnu-build-system) (arguments '(#:parallel-tests? #f)) ; race condition (native-inputs -- cgit v1.2.3 From f74e9277c186be4bd8101fa3c6924f0cb04e4c13 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 30 Jun 2020 19:12:18 -0400 Subject: gnu: icecat: Update to 68.10.0-guix0-preview1 [security-fixes]. Includes fixes for CVE-2020-12417, CVE-2020-12418, CVE-2020-12419, CVE-2020-12420, and CVE-2020-12421. * gnu/packages/gnuzilla.scm (%icecat-version, %icecat-build-id): Update. (icecat-source): Update gnuzilla commit, base version, and hashes. Remove code that deleted the Onion Browser Button extension, which is no longer bundled upstream. * gnu/packages/patches/icecat-makeicecat.patch: Adapt to new version. --- gnu/packages/gnuzilla.scm | 18 ++++++------------ gnu/packages/patches/icecat-makeicecat.patch | 4 ++-- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 3bffe12577..cc3acd6b9b 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -556,8 +556,8 @@ (define* (computed-origin-method gexp-promise hash-algo hash #:system system #:guile-for-build guile))) -(define %icecat-version "68.9.0-guix0-preview1") -(define %icecat-build-id "20200602000000") ;must be of the form YYYYMMDDhhmmss +(define %icecat-version "68.10.0-guix0-preview1") +(define %icecat-build-id "20200630000000") ;must be of the form YYYYMMDDhhmmss ;; 'icecat-source' is a "computed" origin that generates an IceCat tarball ;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat' @@ -579,11 +579,11 @@ (define icecat-source "firefox-" upstream-firefox-version ".source.tar.xz")) (sha256 (base32 - "01s41p985g6v544lf08zch3myssn5c76jwmkzzd68zd9m3hhalck")))) + "0azdinwqjfv2q37gqpxmfvzsk86pvsi6cjaq1310zs26gric5j1f")))) - (upstream-icecat-base-version "68.9.0") ; maybe older than base-version + (upstream-icecat-base-version "68.10.0") ; maybe older than base-version ;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version)) - (gnuzilla-commit "d7acf32ad905a3382cb2353577a96d29aa58f589") + (gnuzilla-commit "76dced64ce0e72fe3030dc2f7b22cda8e36b165e") (gnuzilla-source (origin (method git-fetch) @@ -595,7 +595,7 @@ (define icecat-source (string-take gnuzilla-commit 8))) (sha256 (base32 - "0m49zm05m3n95diij2zyvpm74q66zxjhv9rp8zvaab0h7v2s09n9")))) + "0xcg6h0da63qyv7h575xjrbkzqqcjhwjd45x9h9qmpxiaibi9g3d")))) (makeicecat-patch (local-file (search-patch "icecat-makeicecat.patch"))) @@ -648,12 +648,6 @@ (define icecat-source "-p1" "--input" #+makeicecat-patch) (invoke "patch" "--force" "--no-backup-if-mismatch" "-p1" "--input" #+gnuzilla-fixes-patch) - - ;; Remove the bundled tortm-browser-button extension, - ;; which doesn't seem to be working properly. - (delete-file-recursively - "data/extensions/tortm-browser-button@jeremybenthum") - (patch-shebang "makeicecat") (substitute* "makeicecat" (("^FFMAJOR=(.*)" all ffmajor) diff --git a/gnu/packages/patches/icecat-makeicecat.patch b/gnu/packages/patches/icecat-makeicecat.patch index d3d95cbf28..cff0b7ad45 100644 --- a/gnu/packages/patches/icecat-makeicecat.patch +++ b/gnu/packages/patches/icecat-makeicecat.patch @@ -25,7 +25,7 @@ index 8be2362..48716f2 100755 -wget -N https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${FFVERSION}esr/source/firefox-${FFVERSION}esr.source.tar.xz.asc -gpg --recv-keys --keyserver keyserver.ubuntu.com 14F26682D0916CDD81E37B6D61B7B526D98F0353 -gpg --verify firefox-${FFVERSION}esr.source.tar.xz.asc --echo -n 935105e1a8a97d64daffb372690e2b566b5f07641f01470929dbbc82d20d4407 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - +-echo -n 2ec8c2627e46e80fc208584966a2ded7a0a9ff76b55ffccec0623b89b98ded2b firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - - -echo Extracting Firefox tarball -tar -xf firefox-${FFVERSION}esr.source.tar.xz @@ -37,7 +37,7 @@ index 8be2362..48716f2 100755 +# wget -N https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${FFVERSION}esr/source/firefox-${FFVERSION}esr.source.tar.xz.asc +# gpg --recv-keys --keyserver keyserver.ubuntu.com 14F26682D0916CDD81E37B6D61B7B526D98F0353 +# gpg --verify firefox-${FFVERSION}esr.source.tar.xz.asc -+# echo -n 935105e1a8a97d64daffb372690e2b566b5f07641f01470929dbbc82d20d4407 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - ++# echo -n 2ec8c2627e46e80fc208584966a2ded7a0a9ff76b55ffccec0623b89b98ded2b firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - +# +# echo Extracting Firefox tarball +# tar -xf firefox-${FFVERSION}esr.source.tar.xz -- cgit v1.2.3 From e2449dfa1dd2201f24f2f5435a8a76b58403a6c3 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 1 Jul 2020 13:27:07 -0400 Subject: gnu: linux-libre@4.4: Update to 4.4.229. * gnu/packages/linux.scm (linux-libre-4.4-version): Update to 4.4.229. (linux-libre-4.4-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index c8aaa6afae..4f6e74f813 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -411,10 +411,10 @@ (define-public linux-libre-4.9-pristine-source (%upstream-linux-source version hash) deblob-scripts-4.9))) -(define-public linux-libre-4.4-version "4.4.228") +(define-public linux-libre-4.4-version "4.4.229") (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) - (hash (base32 "0y1xc5lk8j3p5maarksmh18wy921rgcngzsih7q1a82rah1fsjxr"))) + (hash (base32 "0crrawivri5i0ks7pg3snfjlxily4aimw5xzbzr5nlnsz0rjwhbq"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.4))) -- cgit v1.2.3 From 92ce2a0b5fe78bd6eda953b7acde23d936fd89dc Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 1 Jul 2020 13:28:14 -0400 Subject: gnu: linux-libre@4.9: Update to 4.9.229. * gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.229. (linux-libre-4.9-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 4f6e74f813..95f441e8f1 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -403,10 +403,10 @@ (define-public linux-libre-4.14-pristine-source (%upstream-linux-source version hash) deblob-scripts-4.14))) -(define-public linux-libre-4.9-version "4.9.228") +(define-public linux-libre-4.9-version "4.9.229") (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "0d7w2zzs79ywxzfrh4bmk5lw318qbkcb8mcsyyh3cc25qqlz9gwg"))) + (hash (base32 "1p0g6zya8bdk2fds37x3fg7c5sk3sc18prq3jrrilnnrby1w4mij"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -- cgit v1.2.3 From e5aa0fd4ebca440822520d71656a0eb708441697 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 1 Jul 2020 13:29:02 -0400 Subject: gnu: linux-libre@4.14: Update to 4.14.187. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.187. (linux-libre-4.14-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 95f441e8f1..dff2bd59be 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -395,10 +395,10 @@ (define-public linux-libre-4.19-pristine-source (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.186") +(define-public linux-libre-4.14-version "4.14.187") (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "0q52fmkiqa9hpdkf0wlpcqnc6wqssqz6cgfk1ix1anq0h5hl4ns4"))) + (hash (base32 "1gal2kfyrq8c4dswlwnwmzc3ap6a7cjkyz8jgsm9d8gfx9sk88jv"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit v1.2.3 From a43802bfcac5b5bd4f894211f5edd43538039d74 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 1 Jul 2020 13:29:46 -0400 Subject: gnu: linux-libre@4.19: Update to 4.19.131. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.131. (linux-libre-4.19-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index dff2bd59be..d609fa0371 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -387,10 +387,10 @@ (define-public linux-libre-5.4-pristine-source (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.130") +(define-public linux-libre-4.19-version "4.19.131") (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "03zhsizj53ngwxn7d4mzix9xbxxd5lhbzrvawvbb91f83pkc14m6"))) + (hash (base32 "1fk4i7lkbblfbxyp8rmkihcax920hbbygk2xnq2038sbrkvbkpqr"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From 0cb4f1e6f1a067bc574195a96ae03d3ec1b0926d Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 1 Jul 2020 13:30:22 -0400 Subject: gnu: linux-libre@5.7: Update to 5.7.7. * gnu/packages/linux.scm (linux-libre-5.7-version): Update to 5.7.7. (linux-libre-5.7-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index d609fa0371..1fef98d16b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -371,10 +371,10 @@ (define (%upstream-linux-source version hash) (sha256 hash))) -(define-public linux-libre-5.7-version "5.7.6") +(define-public linux-libre-5.7-version "5.7.7") (define-public linux-libre-5.7-pristine-source (let ((version linux-libre-5.7-version) - (hash (base32 "1rhhys2fvfrfsc6lk0qkq59p83qhwvns4jhk0jlyylyzqqywkm4z"))) + (hash (base32 "0zzff78fjn0a87lr1j11hx97gcpbf0q5qn0nalb3qd43j9kvjh7q"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.7))) -- cgit v1.2.3 From 5db273600531cf51e7169624a7bd916c725ffc74 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 1 Jul 2020 13:31:06 -0400 Subject: gnu: linux-libre: Update to 5.4.50. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.50. (linux-libre-5.4-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 1fef98d16b..b508e1809c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -379,10 +379,10 @@ (define-public linux-libre-5.7-pristine-source (%upstream-linux-source version hash) deblob-scripts-5.7))) -(define-public linux-libre-5.4-version "5.4.49") +(define-public linux-libre-5.4-version "5.4.50") (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "0g2psjf2q10mfc3vv6brjn6s2nkg73ll1s04gpshw907d9irpn2m"))) + (hash (base32 "1qm6m3ww7cxr0mqzma9swq6jax6anjy5vdh397my7x00x70z845d"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit v1.2.3 From 67ba9815c954d6ccef041d5dbbe2b2ba14f37474 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 1 Jul 2020 23:45:23 +0300 Subject: gnu: rust-crossbeam-queue-0.2: Add missing input. * gnu/packages/crates-io.scm (rust-crossbeam-queue-0.2)[arguments]: Add rust-maybe-uninit-2.0 to cargo-inputs. Don't skip build. --- gnu/packages/crates-io.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 8ccb61d380..cf41489182 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4299,10 +4299,10 @@ (define-public rust-crossbeam-queue-0.2 (base32 "0w15z68nz3ac4f2s4djhwha8vmlwsh9dlfrmsl4x84y2ah5acjvp")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-0.1) - ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.7)) + ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.7) + ("rust-maybe-uninit" ,rust-maybe-uninit-2.0)) #:cargo-development-inputs (("rust-rand" ,rust-rand-0.6)))) (home-page -- cgit v1.2.3 From 6577682a6c4885020949e014a536f96e8ae315d0 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 24 Jun 2020 15:58:16 +0200 Subject: channels: Add 'openpgp-fingerprint->bytevector'. * guix/channels.scm (openpgp-fingerprint->bytevector): New procedure. (openpgp-fingerprint): New macro. (%guix-channel-introduction): Use it. --- guix/channels.scm | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/guix/channels.scm b/guix/channels.scm index 1016b95045..02619c253f 100644 --- a/guix/channels.scm +++ b/guix/channels.scm @@ -71,6 +71,9 @@ (define-module (guix channels) channel-introduction? ;; accessors purposefully omitted for now. + openpgp-fingerprint->bytevector + openpgp-fingerprint + %default-channels guix-channel? @@ -134,6 +137,23 @@ (define-record-type (first-commit-signer channel-introduction-first-commit-signer) ;bytevector (signature channel-introduction-signature)) ;string +(define (openpgp-fingerprint->bytevector str) + "Convert STR, an OpenPGP fingerprint (hexadecimal string with whitespace), +to the corresponding bytevector." + (base16-string->bytevector + (string-downcase (string-filter char-set:hex-digit str)))) + +(define-syntax openpgp-fingerprint + (lambda (s) + "Convert STR, an OpenPGP fingerprint (hexadecimal string with whitespace), +to the corresponding bytevector." + (syntax-case s () + ((_ str) + (string? (syntax->datum #'str)) + (openpgp-fingerprint->bytevector (syntax->datum #'str))) + ((_ str) + #'(openpgp-fingerprint->bytevector str))))) + (define %guix-channel-introduction ;; Introduction of the official 'guix channel. The chosen commit is the ;; first one that introduces '.guix-authorizations' on the 'staging' @@ -142,11 +162,8 @@ (define %guix-channel-introduction ;; & co. (make-channel-introduction "9edb3f66fd807b096b48283debdcddccfea34bad" ;2020-05-26 - (base16-string->bytevector - (string-downcase - (string-filter char-set:hex-digit ;mbakke - "BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA"))) - #f)) ;TODO: Add an intro signature so it can be exported. + (openpgp-fingerprint ;mbakke + "BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA"))) (define %default-channel-url ;; URL of the default 'guix' channel. -- cgit v1.2.3 From 8b7d982e6ae090eb5b3938db14a8eb2e2c3a1419 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 25 Jun 2020 00:08:05 +0200 Subject: channels: Make channel introductions public. * guix/channels.scm (): Rename constructor to '%make-channel-introduction'. (make-channel-introduction): New procedure. * tests/channels.scm ("authenticate-channel, wrong first commit signer") ("authenticate-channel, .guix-authorizations"): Use 'make-channel-introduction' without '@@' and without third argument. * doc/guix.texi (Channels)[Channel Authentication, Specifying Channel Authorizations]: New subsections. --- doc/guix.texi | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++++- guix/channels.scm | 14 +++++-- tests/channels.scm | 10 ++--- 3 files changed, 125 insertions(+), 11 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index a4c409ea12..67c86de4b6 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -3975,8 +3975,47 @@ deploys Guix itself from the official GNU@tie{}Guix repository. This can be customized by defining @dfn{channels} in the @file{~/.config/guix/channels.scm} file. A channel specifies a URL and branch of a Git repository to be deployed, and @command{guix pull} can be instructed -to pull from one or more channels. In other words, channels can be used to -@emph{customize} and to @emph{extend} Guix, as we will see below. +to pull from one or more channels. In other words, channels can be used +to @emph{customize} and to @emph{extend} Guix, as we will see below. +Before that, some security considerations. + +@subsection Channel Authentication + +@cindex authentication, of channel code +The @command{guix pull} and @command{guix time-machine} commands +@dfn{authenticate} the code retrieved from channels: they make sure each +commit that is fetched is signed by an authorized developer. The goal +is to protect from unauthorized modifications to the channel that would +lead users to run malicious code. + +As a user, you must provide a @dfn{channel introduction} in your +channels file so that Guix knows how to authenticate its first commit. +A channel specification, including its introduction, looks something +along these lines: + +@lisp +(channel + (name 'my-channel) + (url "https://example.org/my-channel.git") + (introduction + (make-channel-introduction + "6f0d8cc0d88abb59c324b2990bfee2876016bb86" + (openpgp-fingerprint + "CABB A931 C0FF EEC6 900D 0CFB 090B 1199 3D9A EBB5")))) +@end lisp + +The specification above shows the name and URL of the channel. The call +to @code{make-channel-introduction} above specifies that authentication +of this channel starts at commit @code{6f0d8cc@dots{}}, which is signed +by the OpenPGP key with fingerprint @code{CABB A931@dots{}}. + +For the main channel, called @code{guix}, you automatically get that +information from your Guix installation. For other channels, include +the channel introduction provided by the channel authors in your +@file{channels.scm} file. Make sure you retrieve the channel +introduction from a trusted source since that is the root of your trust. + +If you're curious about the authentication mechanics, read on! @subsection Using a Custom Guix Channel @@ -4150,6 +4189,75 @@ add a meta-data file @file{.guix-channel} that contains: (directory "guix")) @end lisp +@cindex channel authorizations +@subsection Specifying Channel Authorizations + +As we saw above, Guix ensures the source code it pulls from channels +comes from authorized developers. As a channel author, you need to +specify the list of authorized developers in the +@file{.guix-authorizations} file in the channel's Git repository. The +authentication rule is simple: each commit must be signed by a key +listed in the @file{.guix-authorizations} file of its parent +commit(s)@footnote{Git commits form a @dfn{directed acyclic graph} +(DAG). Each commit can have zero or more parents; ``regular'' commits +have one parent and merge commits have two parent commits. Read +@uref{https://eagain.net/articles/git-for-computer-scientists/, @i{Git +for Computer Scientists}} for a great overview.} The +@file{.guix-authorizations} file looks like this: + +@lisp +;; Example '.guix-authorizations' file. + +(authorizations + (version 0) ;current file format version + + (("AD17 A21E F8AE D8F1 CC02 DBD9 F8AE D8F1 765C 61E3" + (name "alice")) + ("2A39 3FFF 68F4 EF7A 3D29 12AF 68F4 EF7A 22FB B2D5" + (name "bob")) + ("CABB A931 C0FF EEC6 900D 0CFB 090B 1199 3D9A EBB5" + (name "charlie")))) +@end lisp + +Each fingerprint is followed by optional key/value pairs, as in the +example above. Currently these key/value pairs are ignored. + +This authentication rule creates a chicken-and-egg issue: how do we +authenticate the first commit? Related to that: how do we deal with +channels whose repository history contains unsigned commits and lack +@file{.guix-authorizations}? And how do we fork existing channels? + +@cindex channel introduction +Channel introductions answer these questions by describing the first +commit of a channel that should be authenticated. The first time a +channel is fetched with @command{guix pull} or @command{guix +time-machine}, the command looks up the introductory commit and verifies +that it is signed by the specified OpenPGP key. From then on, it +authenticates commits according to the rule above. + +To summarize, as the author of a channel, there are two things you have +to do to allow users to authenticate your code: + +@enumerate +@item +Introduce an initial @file{.guix-authorizations} in the channel's +repository. Do that in a signed commit (@pxref{Commit Access}, for +information on how to sign Git commits.) + +@item +Advertise the channel introduction, for instance on your channel's web +page. The channel introduction, as we saw above, is the commit/key +pair---i.e., the commit that introduced @file{.guix-authorizations}, and +the fingerprint of the OpenPGP used to sign it. +@end enumerate + +Publishing a signed channel requires discipline: any mistake, such as an +unsigned commit or a commit signed by an unauthorized key, will prevent +users from pulling from your channel---well, that's the whole point of +authentication! Pay attention to merges in particular: merge commits +are considered authentic if and only if they are signed by a key present +in the @file{.guix-authorizations} file of @emph{both} branches. + @cindex primary URL, channels @subsection Primary URL diff --git a/guix/channels.scm b/guix/channels.scm index 02619c253f..5f48e6f04f 100644 --- a/guix/channels.scm +++ b/guix/channels.scm @@ -69,7 +69,9 @@ (define-module (guix channels) channel-location channel-introduction? - ;; accessors purposefully omitted for now. + make-channel-introduction + channel-introduction-first-signed-commit + channel-introduction-first-commit-signer openpgp-fingerprint->bytevector openpgp-fingerprint @@ -130,13 +132,19 @@ (define-record-type* channel make-channel ;; commit so that only them may emit this introduction. Introductions are ;; used to bootstrap trust in a channel. (define-record-type - (make-channel-introduction first-signed-commit first-commit-signer - signature) + (%make-channel-introduction first-signed-commit first-commit-signer + signature) channel-introduction? (first-signed-commit channel-introduction-first-signed-commit) ;hex string (first-commit-signer channel-introduction-first-commit-signer) ;bytevector (signature channel-introduction-signature)) ;string +(define (make-channel-introduction commit signer) + "Return a new channel introduction: COMMIT is the introductory where +authentication starts, and SIGNER is the OpenPGP fingerprint (a bytevector) of +the signer of that commit." + (%make-channel-introduction commit signer #f)) + (define (openpgp-fingerprint->bytevector str) "Convert STR, an OpenPGP fingerprint (hexadecimal string with whitespace), to the corresponding bytevector." diff --git a/tests/channels.scm b/tests/channels.scm index d7202f8cbf..591b7b9749 100644 --- a/tests/channels.scm +++ b/tests/channels.scm @@ -451,12 +451,11 @@ (define (find-commit* message) (with-repository directory repository (let* ((commit1 (find-commit repository "first")) (commit2 (find-commit repository "second")) - (intro ((@@ (guix channels) make-channel-introduction) + (intro (make-channel-introduction (commit-id-string commit1) (openpgp-public-key-fingerprint (read-openpgp-packet - %ed25519bis-public-key-file)) ;different key - #f)) ;no signature + %ed25519bis-public-key-file)))) ;different key (channel (channel (name 'example) (url (string-append "file://" directory)) (introduction intro)))) @@ -507,12 +506,11 @@ (define (find-commit* message) (let* ((commit1 (find-commit repository "first")) (commit2 (find-commit repository "second")) (commit3 (find-commit repository "third")) - (intro ((@@ (guix channels) make-channel-introduction) + (intro (make-channel-introduction (commit-id-string commit1) (openpgp-public-key-fingerprint (read-openpgp-packet - %ed25519-public-key-file)) - #f)) ;no signature + %ed25519-public-key-file)))) (channel (channel (name 'example) (url (string-append "file://" directory)) (introduction intro)))) -- cgit v1.2.3 From 22a969925769dcbe968b224016f5af00079d68ff Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 25 Jun 2020 15:37:02 +0200 Subject: channels: Remove 'signature' from . In the end signing the commit/key pair does not buy us much. Someone publishing a valid but different commit/key pair would effectively be publishing a different channel, which could be a fork (made by a former authorized developer) or simply a mirror. In the latter case, there's nothing to be gained by publishing a different commit/key pair. * guix/channels.scm ()[signature]: Remove. (make-channel-introduction): Adjust accordingly. --- guix/channels.scm | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/guix/channels.scm b/guix/channels.scm index 5f48e6f04f..922c99a967 100644 --- a/guix/channels.scm +++ b/guix/channels.scm @@ -128,22 +128,19 @@ (define-record-type* channel make-channel ;; Channel introductions. A "channel introduction" provides a commit/signer ;; pair that specifies the first commit of the authentication process as well -;; as its signer's fingerprint. The pair must be signed by the signer of that -;; commit so that only them may emit this introduction. Introductions are -;; used to bootstrap trust in a channel. +;; as its signer's fingerprint. Introductions are used to bootstrap trust in +;; a channel. (define-record-type - (%make-channel-introduction first-signed-commit first-commit-signer - signature) + (%make-channel-introduction first-signed-commit first-commit-signer) channel-introduction? - (first-signed-commit channel-introduction-first-signed-commit) ;hex string - (first-commit-signer channel-introduction-first-commit-signer) ;bytevector - (signature channel-introduction-signature)) ;string + (first-signed-commit channel-introduction-first-signed-commit) ;hex string + (first-commit-signer channel-introduction-first-commit-signer)) ;bytevector (define (make-channel-introduction commit signer) "Return a new channel introduction: COMMIT is the introductory where authentication starts, and SIGNER is the OpenPGP fingerprint (a bytevector) of the signer of that commit." - (%make-channel-introduction commit signer #f)) + (%make-channel-introduction commit signer)) (define (openpgp-fingerprint->bytevector str) "Convert STR, an OpenPGP fingerprint (hexadecimal string with whitespace), -- cgit v1.2.3 From 471550c28cb425c15f8f5fa61fdeb885f479e2ae Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 25 Jun 2020 17:36:03 +0200 Subject: channels: Save and interpret 'introduction' field in provenance data. With this change, profiles created by 'guix pull' & co. include channel introductions as part of the channel metadata of each manifest entry. * guix/channels.scm (channel-instances->manifest)[instance->entry]: Add 'introduction' field when CHANNEL has an introduction. (profile-channels)[sexp->channel-introduction]: New procedure. Use it to initialize the 'introduction' field. --- guix/channels.scm | 36 +++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/guix/channels.scm b/guix/channels.scm index 922c99a967..32ada7bbc6 100644 --- a/guix/channels.scm +++ b/guix/channels.scm @@ -851,8 +851,9 @@ (define (channel-instances->manifest instances) "Return a profile manifest with entries for all of INSTANCES, a list of channel instances." (define (instance->entry instance drv) - (let ((commit (channel-instance-commit instance)) - (channel (channel-instance-channel instance))) + (let* ((commit (channel-instance-commit instance)) + (channel (channel-instance-channel instance)) + (intro (channel-introduction channel))) (manifest-entry (name (symbol->string (channel-name channel))) (version (string-take commit 7)) @@ -867,7 +868,19 @@ (define (instance->entry instance drv) (version 0) (url ,(channel-url channel)) (branch ,(channel-branch channel)) - (commit ,commit)))))))) + (commit ,commit) + ,@(if intro + `((introduction + (channel-introduction + (version 0) + (commit + ,(channel-introduction-first-signed-commit + intro)) + (signer + ,(openpgp-format-fingerprint + (channel-introduction-first-commit-signer + intro)))))) + '())))))))) (mlet* %store-monad ((derivations (channel-instance-derivations instances)) (entries -> (map instance->entry instances derivations))) @@ -935,17 +948,30 @@ (define* (latest-channel-derivation #:optional (channels %default-channels) (define (profile-channels profile) "Return the list of channels corresponding to entries in PROFILE. If PROFILE is not a profile created by 'guix pull', return the empty list." + (define sexp->channel-introduction + (match-lambda + (('channel-introduction ('version 0) + ('commit commit) ('signer signer) + _ ...) + (make-channel-introduction commit (openpgp-fingerprint signer))) + (x #f))) + (filter-map (lambda (entry) (match (assq 'source (manifest-entry-properties entry)) (('source ('repository ('version 0) ('url url) ('branch branch) ('commit commit) - _ ...)) + rest ...)) (channel (name (string->symbol (manifest-entry-name entry))) (url url) - (commit commit))) + (commit commit) + (introduction + (match (assq 'introduction rest) + (#f #f) + (('introduction intro) + (sexp->channel-introduction intro)))))) ;; No channel information for this manifest entry. ;; XXX: Pre-0.15.0 Guix did not provide that information, -- cgit v1.2.3 From 6d39f0cb7791ff1a6feb0084dad9851a820a900c Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 25 Jun 2020 17:50:48 +0200 Subject: guix describe: Display channel introductions and add 'channels-sans-intro'. * guix/scripts/describe.scm (%available-formats): Add "channels-sans-intro". (channel->sexp): Add #:include-introduction?. Emit CHANNEL's intro if INCLUDE-INTRODUCTION? is true and CHANNEL has an introduction. (channel->json): Include CHANNEL's introduction, if any. (channel->recutils): Likewise. (display-profile-info): Add 'channels-sans-intro' case. * doc/guix.texi (Invoking guix describe): Add introduction in example. Add 'channels-sans-intro' case. --- doc/guix.texi | 13 ++++++++++- guix/scripts/describe.scm | 56 ++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 58 insertions(+), 11 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 67c86de4b6..c3dd977860 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -4608,7 +4608,12 @@ $ guix describe -f channels (name 'guix) (url "https://git.savannah.gnu.org/git/guix.git") (commit - "e0fa68c7718fffd33d81af415279d6ddb518f727"))) + "e0fa68c7718fffd33d81af415279d6ddb518f727") + (introduction + (make-channel-introduction + "9edb3f66fd807b096b48283debdcddccfea34bad" + (openpgp-fingerprint + "BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA"))))) @end example @noindent @@ -4634,6 +4639,12 @@ produce human-readable output; produce a list of channel specifications that can be passed to @command{guix pull -C} or installed as @file{~/.config/guix/channels.scm} (@pxref{Invoking guix pull}); +@item channels-sans-intro +like @code{channels}, but omit the @code{introduction} field; use it to +produce a channel specification suitable for Guix version 1.1.0 or +earlier---the @code{introduction} field has to do with channel +authentication (@pxref{Channels, Channel Authentication}) and is not +supported by these older versions; @item json @cindex JSON produce a list of channel specifications in JSON format; diff --git a/guix/scripts/describe.scm b/guix/scripts/describe.scm index ea982955da..bc868ffbbf 100644 --- a/guix/scripts/describe.scm +++ b/guix/scripts/describe.scm @@ -26,9 +26,11 @@ (define-module (guix scripts describe) #:use-module (guix scripts) #:use-module (guix describe) #:use-module (guix profiles) + #:autoload (guix openpgp) (openpgp-format-fingerprint) #:use-module (git) #:use-module (json) #:use-module (srfi srfi-1) + #:use-module (srfi srfi-26) #:use-module (srfi srfi-37) #:use-module (ice-9 match) #:use-module (ice-9 format) @@ -43,7 +45,8 @@ (define-module (guix scripts describe) ;;; ;;; Command-line options. ;;; -(define %available-formats '("human" "channels" "json" "recutils")) +(define %available-formats + '("human" "channels" "channels-sans-intro" "json" "recutils")) (define (list-formats) (display (G_ "The available formats are:\n")) @@ -110,21 +113,50 @@ (define (display-package-search-path fmt) (_ (warning (G_ "'GUIX_PACKAGE_PATH' is set but it is not captured~%"))))))) -(define (channel->sexp channel) - `(channel - (name ',(channel-name channel)) - (url ,(channel-url channel)) - (commit ,(channel-commit channel)))) +(define* (channel->sexp channel #:key (include-introduction? #t)) + (let ((intro (and include-introduction? + (channel-introduction channel)))) + `(channel + (name ',(channel-name channel)) + (url ,(channel-url channel)) + (commit ,(channel-commit channel)) + ,@(if intro + `((introduction (make-channel-introduction + ,(channel-introduction-first-signed-commit intro) + (openpgp-fingerprint + ,(openpgp-format-fingerprint + (channel-introduction-first-commit-signer + intro)))))) + '())))) (define (channel->json channel) - (scm->json-string `((name . ,(channel-name channel)) - (url . ,(channel-url channel)) - (commit . ,(channel-commit channel))))) + (scm->json-string + (let ((intro (channel-introduction channel))) + `((name . ,(channel-name channel)) + (url . ,(channel-url channel)) + (commit . ,(channel-commit channel)) + ,@(if intro + `((introduction + . ((commit . ,(channel-introduction-first-signed-commit + intro)) + (signer . ,(openpgp-format-fingerprint + (channel-introduction-first-commit-signer + intro)))))) + '()))))) (define (channel->recutils channel port) + (define intro + (channel-introduction channel)) + (format port "name: ~a~%" (channel-name channel)) (format port "url: ~a~%" (channel-url channel)) - (format port "commit: ~a~%" (channel-commit channel))) + (format port "commit: ~a~%" (channel-commit channel)) + (when intro + (format port "introductioncommit: ~a~%" + (channel-introduction-first-signed-commit intro)) + (format port "introductionsigner: ~a~%" + (openpgp-format-fingerprint + (channel-introduction-first-commit-signer intro))))) (define (display-checkout-info fmt) "Display information about the current checkout according to FMT, a symbol @@ -182,6 +214,10 @@ (define channels (display-profile-content profile number)) ('channels (pretty-print `(list ,@(map channel->sexp channels)))) + ('channels-sans-intro + (pretty-print `(list ,@(map (cut channel->sexp <> + #:include-introduction? #f) + channels)))) ('json (format #t "[~a]~%" (string-join (map channel->json channels) ","))) ('recutils -- cgit v1.2.3 From eb5cf39e66a51eb357ca0c08f4409d00ec3b24a9 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 25 Jun 2020 17:54:55 +0200 Subject: services: provenance: Save channel introductions. * gnu/services.scm (channel->code): Include CHANNEL's introduction, if any, unless CHANNEL is the singleton %DEFAULT-CHANNELS. (channel->sexp): Add comment. * guix/scripts/system.scm (sexp->channel): Change pattern to allow for extensibility. --- gnu/services.scm | 26 ++++++++++++++++++++++---- guix/scripts/system.scm | 4 +++- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/gnu/services.scm b/gnu/services.scm index 27e5558231..f6dc56d940 100644 --- a/gnu/services.scm +++ b/gnu/services.scm @@ -31,6 +31,7 @@ (define-module (gnu services) #:use-module (guix sets) #:use-module (guix ui) #:use-module ((guix utils) #:select (source-properties->location)) + #:autoload (guix openpgp) (openpgp-format-fingerprint) #:use-module (guix modules) #:use-module (gnu packages base) #:use-module (gnu packages bash) @@ -392,14 +393,31 @@ (define (object->pretty-string obj) (define (channel->code channel) "Return code to build CHANNEL, ready to be dropped in a 'channels.scm' file." - `(channel (name ',(channel-name channel)) - (url ,(channel-url channel)) - (branch ,(channel-branch channel)) - (commit ,(channel-commit channel)))) + ;; Since the 'introduction' field is backward-incompatible, and since it's + ;; optional when using the "official" 'guix channel, include it if and only + ;; if we're referring to a different channel. + (let ((intro (and (not (equal? (list channel) %default-channels)) + (channel-introduction channel)))) + `(channel (name ',(channel-name channel)) + (url ,(channel-url channel)) + (branch ,(channel-branch channel)) + (commit ,(channel-commit channel)) + ,@(if intro + `((introduction + (make-channel-introduction + ,(channel-introduction-first-signed-commit intro) + (openpgp-fingerprint + ,(openpgp-format-fingerprint + (channel-introduction-first-commit-signer + intro)))))) + '())))) (define (channel->sexp channel) "Return an sexp describing CHANNEL. The sexp is _not_ code and is meant to be parsed by tools; it's potentially more future-proof than code." + ;; TODO: Add CHANNEL's introduction. Currently we can't do that because + ;; older 'guix system describe' expect exactly name/url/branch/commit + ;; without any additional fields. `(channel (name ,(channel-name channel)) (url ,(channel-url channel)) (branch ,(channel-branch channel)) diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index d9cf45da23..28aaa6e3bc 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -453,7 +453,9 @@ (define (sexp->channel sexp) (('channel ('name name) ('url url) ('branch branch) - ('commit commit)) + ('commit commit) + rest ...) + ;; XXX: In the future REST may include a channel introduction. (channel (name name) (url url) (branch branch) (commit commit))))) -- cgit v1.2.3 From 884df776408caa137456e91ba0f5fd71524cf6c3 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 1 Jul 2020 23:15:36 +0200 Subject: channels: Properly diagnose test failure. This fixes a style issue similar to that of a18d02def9862dfb9b7a5e3d5aa3b541b066d198. * tests/channels.scm ("authenticate-channel, .guix-authorizations"): Change to 'test-equal' so that test failures are properly diagnosed. --- tests/channels.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/channels.scm b/tests/channels.scm index 591b7b9749..7e593b84c4 100644 --- a/tests/channels.scm +++ b/tests/channels.scm @@ -468,7 +468,8 @@ (define (find-commit* message) 'failed)))))) (unless (gpg+git-available?) (test-skip 1)) -(test-assert "authenticate-channel, .guix-authorizations" +(test-equal "authenticate-channel, .guix-authorizations" + #t (with-fresh-gnupg-setup (list %ed25519-public-key-file %ed25519-secret-key-file %ed25519bis-public-key-file -- cgit v1.2.3 From d774c7b1218a3cc20079b19812da119f9ed26b54 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 1 Jul 2020 23:32:25 +0200 Subject: channels: Dependencies listed in '.guix-channel' can have an introduction. Suggested by Ricardo Wurmus and Simon Tournier. * guix/channels.scm (sexp->channel-introduction): New procedure. (read-channel-metadata): Use it. (profile-channels)[sexp->channel-introduction]: Remove. * tests/channels.scm ("latest-channel-instances, authenticate dependency"): New test. * doc/guix.texi (Channels)[Declaring Channel Dependencies]: Augment example. --- doc/guix.texi | 10 +++++++++- guix/channels.scm | 20 +++++++++++--------- tests/channels.scm | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 10 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index c3dd977860..7823367605 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -4160,7 +4160,15 @@ The meta-data file should contain a simple S-expression like this: (dependencies (channel (name some-collection) - (url "https://example.org/first-collection.git")) + (url "https://example.org/first-collection.git") + + ;; The 'introduction' bit below is optional: you would + ;; provide it for dependencies that can be authenticated. + (introduction + (channel-introduction + (version 0) + (commit "a8883b58dc82e167c96506cf05095f37c2c2c6cd") + (signer "CABB A931 C0FF EEC6 900D 0CFB 090B 1199 3D9A EBB5")))) (channel (name some-other-collection) (url "https://example.org/second-collection.git") diff --git a/guix/channels.scm b/guix/channels.scm index 32ada7bbc6..500c956f0f 100644 --- a/guix/channels.scm +++ b/guix/channels.scm @@ -223,6 +223,14 @@ (define (channel-reference channel) (#f `(branch . ,(channel-branch channel))) (commit `(commit . ,(channel-commit channel))))) +(define sexp->channel-introduction + (match-lambda + (('channel-introduction ('version 0) + ('commit commit) ('signer signer) + _ ...) + (make-channel-introduction commit (openpgp-fingerprint signer))) + (x #f))) + (define (read-channel-metadata port) "Read from PORT channel metadata in the format expected for the '.guix-channel' file. Return a record, or raise an error @@ -250,7 +258,9 @@ (define (read-channel-metadata port) (name name) (branch branch) (url url) - (commit (get 'commit)))))) + (commit (get 'commit)) + (introduction (and=> (get 'introduction) + sexp->channel-introduction)))))) dependencies) news-file keyring-reference @@ -948,14 +958,6 @@ (define* (latest-channel-derivation #:optional (channels %default-channels) (define (profile-channels profile) "Return the list of channels corresponding to entries in PROFILE. If PROFILE is not a profile created by 'guix pull', return the empty list." - (define sexp->channel-introduction - (match-lambda - (('channel-introduction ('version 0) - ('commit commit) ('signer signer) - _ ...) - (make-channel-introduction commit (openpgp-fingerprint signer))) - (x #f))) - (filter-map (lambda (entry) (match (assq 'source (manifest-entry-properties entry)) (('source ('repository ('version 0) diff --git a/tests/channels.scm b/tests/channels.scm index 7e593b84c4..cde3b668fb 100644 --- a/tests/channels.scm +++ b/tests/channels.scm @@ -536,4 +536,54 @@ (define (find-commit* message) #:keyring-reference-prefix "") 'failed))))))) +(unless (gpg+git-available?) (test-skip 1)) +(test-equal "latest-channel-instances, authenticate dependency" + #t + ;; Make sure that a channel dependency that has an introduction is + ;; authenticated. This test checks that an authentication error is raised + ;; as it should when authenticating the dependency. + (with-fresh-gnupg-setup (list %ed25519-public-key-file + %ed25519-secret-key-file) + (with-temporary-git-repository dependency-directory + `((add ".guix-channel" + ,(object->string + '(channel (version 0) + (keyring-reference "master")))) + (add ".guix-authorizations" + ,(object->string + `(authorizations (version 0) ()))) + (add "signer.key" ,(call-with-input-file %ed25519-public-key-file + get-string-all)) + (commit "zeroth commit" + (signer ,(key-fingerprint %ed25519-public-key-file))) + (add "foo.txt" "evil") + (commit "unsigned commit")) + (with-repository dependency-directory dependency + (let* ((commit0 (find-commit dependency "zeroth")) + (commit1 (find-commit dependency "unsigned")) + (intro `(channel-introduction + (version 0) + (commit ,(commit-id-string commit0)) + (signer ,(openpgp-format-fingerprint + (openpgp-public-key-fingerprint + (read-openpgp-packet + %ed25519-public-key-file))))))) + (with-temporary-git-repository directory + `((add ".guix-channel" + ,(object->string + `(channel (version 0) + (dependencies + (channel + (name test-channel) + (url ,dependency-directory) + (introduction ,intro)))))) + (commit "single commit")) + (let ((channel (channel (name 'test) (url directory)))) + (guard (c ((unsigned-commit-error? c) + (oid=? (git-authentication-error-commit c) + (commit-id commit1)))) + (with-store store + (latest-channel-instances store (list channel)) + 'failed))))))))) + (test-end "channels") -- cgit v1.2.3 From 5bd803339d664b59eac34e049e944950c526f6e9 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Thu, 2 Jul 2020 01:07:56 +0200 Subject: gnu: deutex: Build with PNG support. * gnu/packages/game-development.scm (deutex)[inputs]: Add libpng. [native-inputs]: Add pkg-config. --- gnu/packages/game-development.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index df9e47ec46..871189933c 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -173,7 +173,11 @@ (define-public deutex (base32 "07w3asqxx89wl2wfv1z3cak8v83h3ys3b39mq9qq4gyf3xdhs76n")))) (build-system gnu-build-system) - (native-inputs `(("asciidoc" ,asciidoc))) + (inputs + `(("libpng" ,libpng))) + (native-inputs + `(("asciidoc" ,asciidoc) + ("pkg-config" ,pkg-config))) (home-page "https://github.com/Doom-Utils/deutex") (synopsis "WAD file composer for Doom and related games") (description -- cgit v1.2.3 From 1bab01c2dbf74ef532b93543ce9c2e3b037eb8f5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 2 Jul 2020 09:58:25 +0300 Subject: gnu: libmicrohttpd: Update to 0.9.71, * gnu/packages/gnunet.scm (libmicrohttpd): Update to 0.9.71. --- gnu/packages/gnunet.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index f2ab3a1c27..90df651090 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -151,14 +151,14 @@ (define-public libextractor (define-public libmicrohttpd (package (name "libmicrohttpd") - (version "0.9.70") + (version "0.9.71") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/libmicrohttpd/libmicrohttpd-" version ".tar.gz")) (sha256 (base32 - "01vkjy89b1ylmh22dy5yza2r414nfwcfixxh3v29nvzrjv9s7l4h")))) + "10mii4mifmfs3v7kgciqml7f0fj7ljp0sngrx64pnwmgbzl4bx78")))) (build-system gnu-build-system) (inputs `(("curl" ,curl) -- cgit v1.2.3 From 6b77e7352d638297cdd43c3f8c4babc3162226c4 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Thu, 2 Jul 2020 09:00:53 +0200 Subject: gnu: guix: Update to 1.1.0-14.5bd8033. * gnu/packages/package-management.scm (guix): Update to 1.1.0-14.5bd8033. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 068d46566c..cee0231b62 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -118,8 +118,8 @@ (define-public guix ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.1.0") - (commit "26611f56fb1108de8205667fa9318b61794d0c9c") - (revision 13)) + (commit "5bd803339d664b59eac34e049e944950c526f6e9") + (revision 14)) (package (name "guix") @@ -135,7 +135,7 @@ (define-public guix (commit commit))) (sha256 (base32 - "15m8pamy1hmk3y7yq2da70nmng2xycwpyl2dgnpfp4aif2ynvirv")) + "0lj8ahy3kq2ijn5dps19gw31kiry4d724bc8cpprxhlpxa834icr")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 09502e0233fd19188a12269b0f8068069b626b82 Mon Sep 17 00:00:00 2001 From: simendsjo Date: Wed, 1 Jul 2020 14:54:10 +0200 Subject: gnu: Update Iosevka fonts from 3.1.1 to 3.2.2. * gnu/packages/fonts.scm (font-iosevka, font-iosevka-slab, font-iosevka-term, font-iosevka-term-slab, font-iosevka-aile, font-iosevka-etoile, font-iosevka-sparkle): Update to 3.2.2. Signed-off-by: Efraim Flashner --- gnu/packages/fonts.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 5a913441e9..ed9b634bc3 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -1172,7 +1172,7 @@ (define-public font-iosevka (package (name "font-iosevka") ;; When updating, also update the hash of the Iosevka variant(s) below. - (version "3.1.1") + (version "3.2.2") (source (origin (method url-fetch/zipbomb) @@ -1180,7 +1180,7 @@ (define-public font-iosevka "/releases/download/v" version "/ttc-iosevka-" version ".zip")) (sha256 - (base32 "1xnkfr11rdjnin2fvgkp9vxxigfbfdncr0wy6n78mlm3p1pqwfrm")))) + (base32 "16iqr4zjlshrgzcs3sjp3gz777gpi069r7p7scqi6vap9acqjvph")))) (build-system font-build-system) (home-page "https://be5invis.github.io/Iosevka/") (synopsis "Coders' typeface, built from code") @@ -1203,7 +1203,7 @@ (define-public font-iosevka-slab "/releases/download/v" version "/ttc-iosevka-slab-" version ".zip")) (sha256 - (base32 "1n3lh015mvsdbyygpg3p3yqjpqdn1fdvjh1bhi2ggjanhifjsgzh")))))) + (base32 "0knsb1b0wqv50r7f9128xvq344x7hnvgm7kh1dxaahlck910z62x")))))) (define-public font-iosevka-term (package @@ -1218,7 +1218,7 @@ (define-public font-iosevka-term "/ttf-iosevka-term-" version ".zip")) (sha256 (base32 - "1mwzwpdppmcf03fgb5q6ksj0kk93wwaz2isk24wj1cm66r8psxk0")))) + "0nyq6iq9xjn9nqwh1fh4v0pvblycmm8ssw7y3vcjv1ymbkdqfqhr")))) (arguments `(#:phases (modify-phases %standard-phases @@ -1240,7 +1240,7 @@ (define-public font-iosevka-term-slab "/ttf-iosevka-term-slab-" version ".zip")) (sha256 (base32 - "0fiwxkf2gv38ia695wh8cvnb58sqs3fixjd33q1pp9cps94wzjpg")))) + "1blhhbnk2hyaxjrz88icd2gwyniq5idxd0h6rqx6vjcack6094z0")))) (arguments `(#:phases (modify-phases %standard-phases @@ -1261,7 +1261,7 @@ (define-public font-iosevka-aile "/releases/download/v" version "/ttc-iosevka-aile-" version ".zip")) (sha256 - (base32 "15kz8ahlynnb79s2d367a1fallc4l3j3957yj43qrymayagkh8sv")))))) + (base32 "1zg0gn4gcf3w8n8jzf93y9ninyn3bci31c5zss3mxzz1lzfm8zd5")))))) (define-public font-iosevka-etoile (package @@ -1275,7 +1275,7 @@ (define-public font-iosevka-etoile "/releases/download/v" version "/ttc-iosevka-etoile-" version ".zip")) (sha256 - (base32 "0q9299mc595m251v9zj9b0zparl2qq8dwx090l0jkfpr2az9xr8q")))))) + (base32 "1061yaf35f19dcym4k552q1yzbsbc98r3glm9frslirra9f33sl2")))))) (define-public font-iosevka-sparkle (package @@ -1289,7 +1289,7 @@ (define-public font-iosevka-sparkle "/releases/download/v" version "/ttc-iosevka-sparkle-" version ".zip")) (sha256 - (base32 "0nhvcnvl11iqmsxsyrxlbnwy9z1vdhqv6p3g7fig9ra6n5j9k5kn")))))) + (base32 "1c1s9j6qgyhn4md0kql0x2201nbs5jx3612jf8q020gm484xqq03")))))) (define-public font-sarasa-gothic (package -- cgit v1.2.3 From 64fc2293ca94a7c94cd30bee4a0207e517c0dfa3 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Wed, 1 Jul 2020 20:50:41 -0400 Subject: gnu: git-annex: Build and install man pages. * gnu/packages/haskell-apps.scm (git-annex)[arguments]: Add phases for building and installing the man pages. [native-inputs]: Add perl. Signed-off-by: Efraim Flashner --- gnu/packages/haskell-apps.scm | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index f8bee424c3..5b6f0401e4 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2018 Arun Isaac ;;; Copyright © 2016, 2017 Leo Famulari ;;; Copyright © 2015 Paul van der Walt -;;; Copyright © 2019 Kyle Meyer +;;; Copyright © 2019, 2020 Kyle Meyer ;;; Copyright © 2015 John Soo ;;; Copyright © 2019, 2020 Efraim Flashner ;;; Copyright © 2019 Alex Griffin @@ -370,8 +370,7 @@ (define-public git-annex ;; Factor out necessary build logic from the provided ;; `Setup.hs' script. The script as-is does not work because ;; it cannot find its dependencies, and there is no obvious way - ;; to tell it where to look. Note that we do not preserve the - ;; code that installs man pages here. + ;; to tell it where to look. (call-with-output-file "PreConf.hs" (lambda (out) (format out "import qualified Build.Configure as Configure~%") @@ -385,6 +384,18 @@ (define-public git-annex (lambda _ (invoke "runhaskell" "PreConf.hs") #t)) + (add-after 'build 'build-manpages + (lambda _ + ;; The Setup.hs rewrite above removed custom code for building + ;; the man pages. In addition to that code, git-annex's source + ;; tree has a file that's not included in the tarball but is used + ;; by the Makefile to build man pages. Copy the core bits here. + (call-with-output-file "Build/MakeMans.hs" + (lambda (out) + (format out "module Main where~%") + (format out "import Build.Mans~%") + (format out "main = buildMansOrWarn~%"))) + (invoke "runhaskell" "Build/MakeMans.hs"))) (replace 'check (lambda _ ;; We need to set the path so that Git recognizes @@ -400,6 +411,14 @@ (define-public git-annex ;; Undo `patch-shell-for-tests'. (copy-file "/tmp/Shell.hs" "Utility/Shell.hs") (apply (assoc-ref %standard-phases 'build) args))) + (add-after 'install 'install-manpages + (lambda* (#:key outputs #:allow-other-keys) + (let ((man (string-append (assoc-ref outputs "out") + "/man/man1/"))) + (mkdir-p man) + (for-each (lambda (file) (install-file file man)) + (find-files "man"))) + #t)) (add-after 'install 'install-symlinks (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -465,7 +484,8 @@ (define-public git-annex `(("ghc-tasty" ,ghc-tasty) ("ghc-tasty-hunit" ,ghc-tasty-hunit) ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) - ("ghc-tasty-rerun" ,ghc-tasty-rerun))) + ("ghc-tasty-rerun" ,ghc-tasty-rerun) + ("perl" ,perl))) (home-page "https://git-annex.branchable.com/") (synopsis "Manage files with Git, without checking in their contents") (description "This package allows managing files with Git, without -- cgit v1.2.3 From 044cffdf34c506d2f9f1fbbc07462f29d3edaf54 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Thu, 2 Jul 2020 09:54:22 +0200 Subject: gnu: guix-minimal: Remove as failing and unused. * gnu/packages/package-management.scm (guix-minimal): Remove it. --- gnu/packages/package-management.scm | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index cee0231b62..ac2842c810 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -478,22 +478,6 @@ (define-public guile2.2-guix (define-public guile3.0-guix (deprecated-package "guile3.0-guix" guix)) -(define-public guix-minimal - ;; A version of Guix which is built with the minimal set of dependencies, as - ;; outlined in the README "Requirements" section. Intended as a CI job, so - ;; marked as hidden. - (hidden-package - (package - (inherit guix) - (name "guix-minimal") - (inputs - `(("guile" ,guile-2.2) - ,@(alist-delete "guile" (package-inputs guix)))) - (propagated-inputs - (fold alist-delete - (package-propagated-inputs guix) - '("guile-ssh")))))) - (define (source-file? file stat) "Return true if FILE is likely a source file, false if it is a typical generated file." -- cgit v1.2.3 From 793ea220459449bf510003bca57309146e00fc1d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 2 Jul 2020 11:05:52 +0300 Subject: gnu: rust-crossbeam-0.7: Update to 0.7.3. * gnu/packages/crates-io.scm (rust-crossbeam-0.7): Update to 0.7.3. [arguments]: Don't skip build. In cargo-inputs replace rust-crossbeam-channel-0.3 with 0.4, rust-crossbeam-epoch-0.7 with 0.8, rust-crossbeam-queue-0.1 with 0.2, rust-crossbeam-utils-0.6 with 0.7. Replace rust-rand-0.4 with 0.6 in cargo-development-inputs. --- gnu/packages/crates-io.scm | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index cf41489182..a4f6d9f7c9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4098,7 +4098,7 @@ (define-public rust-criterion-plot-0.3 (define-public rust-crossbeam-0.7 (package (name "rust-crossbeam") - (version "0.7.2") + (version "0.7.3") (source (origin (method url-fetch) @@ -4107,19 +4107,18 @@ (define-public rust-crossbeam-0.7 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0g5jysq5x4gndc1v5sq9n3f1m97k7qihwdpigw6ar6knj14qm09d")))) + "13kzn2d49n2qn5q42y2dj48kyv6aln2d9smq8x9n675l3zzknck9")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-0.1) - ("rust-crossbeam-channel" ,rust-crossbeam-channel-0.3) + ("rust-crossbeam-channel" ,rust-crossbeam-channel-0.4) ("rust-crossbeam-deque" ,rust-crossbeam-deque-0.7) - ("rust-crossbeam-epoch" ,rust-crossbeam-epoch-0.7) - ("rust-crossbeam-queue" ,rust-crossbeam-queue-0.1) - ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.6)) + ("rust-crossbeam-epoch" ,rust-crossbeam-epoch-0.8) + ("rust-crossbeam-queue" ,rust-crossbeam-queue-0.2) + ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.7)) #:cargo-development-inputs - (("rust-rand" ,rust-rand-0.4)))) + (("rust-rand" ,rust-rand-0.6)))) (home-page "https://github.com/crossbeam-rs/crossbeam") (synopsis "Tools for concurrent programming") (description "Tools for concurrent programming.") -- cgit v1.2.3 From 3679514ae66a4ed54f208a8fa51ffc802b8d427f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 2 Jul 2020 11:15:04 +0300 Subject: gnu: rust-crossbeam-channel-0.4: Update to 0.4.2. * gnu/packages/crates-io.scm (rust-crossbeam-channel-0.4): Update to 0.4.2. [arguments]: Don't skip build. Add rust-maybe-uninit-2.0 to cargo-inputs. --- gnu/packages/crates-io.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a4f6d9f7c9..2e0adfce31 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4127,7 +4127,7 @@ (define-public rust-crossbeam-0.7 (define-public rust-crossbeam-channel-0.4 (package (name "rust-crossbeam-channel") - (version "0.4.0") + (version "0.4.2") (source (origin (method url-fetch) @@ -4136,12 +4136,12 @@ (define-public rust-crossbeam-channel-0.4 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "135ncx9680afs8jkjz8g3iq3naay9rn7942gxrdg2n9m1cxrmv5c")))) + "0qd05n5bcwafkmbzq1lspwrfi29xnzlw46qarg1sl0lwj68qdvfc")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-crossbeam-utils" ,rust-crossbeam-utils-0.7)) + `(#:cargo-inputs + (("rust-crossbeam-utils" ,rust-crossbeam-utils-0.7) + ("rust-maybe-uninit" ,rust-maybe-uninit-2.0)) #:cargo-development-inputs (("rust-num-cpus" ,rust-num-cpus-1) ("rust-rand" ,rust-rand-0.6) -- cgit v1.2.3 From d7cd309a22be4081a750d548abedbac92223f9e3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 2 Jul 2020 11:27:37 +0300 Subject: gnu: rust-crossbeam-channel-0.3: Don't skip build. * gnu/packages/crates-io.scm (rust-crossbeam-channel-0.3)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2e0adfce31..ad5b677145 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4171,8 +4171,7 @@ (define-public rust-crossbeam-channel-0.3 (base32 "1ylyzb1m9qbvd1nd3vy38x9073wdmcy295ncjs7wf7ap476pzv68")))) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-crossbeam-utils" ,rust-crossbeam-utils-0.6)) #:cargo-development-inputs (("rust-num-cpus" ,rust-num-cpus-1) -- cgit v1.2.3 From aa3ccff1f922feb9d0a3cfcb4fa79ee2787aa424 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 2 Jul 2020 11:30:42 +0300 Subject: gnu: rust-crossbeam-deque-0.7: Update to 0.7.3. * gnu/packages/crates-io.scm (rust-crossbeam-deque-0.7): Update to 0.7.3. [arguments]: Don't skip build. Add rust-maybe-unint-2.0 to cargo-inputs. --- gnu/packages/crates-io.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ad5b677145..78ad31920a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4181,7 +4181,7 @@ (define-public rust-crossbeam-channel-0.3 (define-public rust-crossbeam-deque-0.7 (package (name "rust-crossbeam-deque") - (version "0.7.2") + (version "0.7.3") (source (origin (method url-fetch) @@ -4190,13 +4190,13 @@ (define-public rust-crossbeam-deque-0.7 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1jm3rqb3qfpfywrakyy81f61xnl4jsim7lam9digw6w6cdfr9an3")))) + "11c2c0x5grdba3ah3g94yn6b8s47xi8qwm85h8hq5vmf9nbsy0lz")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-crossbeam-epoch" ,rust-crossbeam-epoch-0.8) - ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.7)) + ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.7) + ("rust-maybe-uninit" ,rust-maybe-uninit-2.0)) #:cargo-development-inputs (("rust-rand" ,rust-rand-0.6)))) (home-page -- cgit v1.2.3 From 6d7d7a2d9479afbb6f50d3aee545defac2df986f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 2 Jul 2020 11:53:33 +0300 Subject: gnu: rust-crossbeam-epoch-0.8: Update to 0.8.2. * gnu/packages/crates-io.scm (rust-crossbeam-epoch-0.8): Update to 0.8.2. [arguments]: Don't skip build. In cargo-inputs replace rust-autocfg-0.1 with 1.0. Add rust-maybe-uninit-2.0. --- gnu/packages/crates-io.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 78ad31920a..8deec6c9f7 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4229,7 +4229,7 @@ (define-public rust-crossbeam-deque-0.6 (define-public rust-crossbeam-epoch-0.8 (package (name "rust-crossbeam-epoch") - (version "0.8.0") + (version "0.8.2") (source (origin (method url-fetch) @@ -4238,15 +4238,15 @@ (define-public rust-crossbeam-epoch-0.8 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1b2mgc2gxxvyzyxgd5wvn9k42gr6f9phi2swwjawpqswy3dynr2h")))) + "1knsf0zz7rgzxn0nwz5gajjcrivxpw3zrdcp946gdhdgr9sd53h5")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-autocfg" ,rust-autocfg-0.1) + `(#:cargo-inputs + (("rust-autocfg" ,rust-autocfg-1.0) ("rust-cfg-if" ,rust-cfg-if-0.1) ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.7) ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-maybe-uninit" ,rust-maybe-uninit-2.0) ("rust-memoffset" ,rust-memoffset-0.5) ("rust-scopeguard" ,rust-scopeguard-1.0)) #:cargo-development-inputs -- cgit v1.2.3 From f8f61451fa274cbbb14d0f9a3efd801c94980878 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 2 Jul 2020 11:55:03 +0300 Subject: gnu: rust-crossbeam-epoch-0.7: Update to 0.7.2. * gnu/packages/crates-io.scm (rust-crossbeam-epoch-0.7): Update to 0.7.2. [arguments]: Don't skip build. In cargo-inputs replace rust-memoffset-0.2 with 0.5, rust-scopeguard-0.3 with 1.0. Replace rust-rand-0.4 with 0.6 in cargo-development-inputs. --- gnu/packages/crates-io.scm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 8deec6c9f7..287afedbda 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4261,7 +4261,7 @@ (define-public rust-crossbeam-epoch-0.7 (package (inherit rust-crossbeam-epoch-0.8) (name "rust-crossbeam-epoch") - (version "0.7.1") + (version "0.7.2") (source (origin (method url-fetch) @@ -4270,18 +4270,17 @@ (define-public rust-crossbeam-epoch-0.7 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1d408b9x82mdbnb405gw58v5mmdbj2rl28a1h7b9rmn25h8f7j84")))) + "1a9prma2nalqvys7f8wrazkdzh26w3mi5gzrk8mdmwrp5rvxdp7y")))) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-arrayvec" ,rust-arrayvec-0.4) ("rust-cfg-if" ,rust-cfg-if-0.1) ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.6) ("rust-lazy-static" ,rust-lazy-static-1) - ("rust-memoffset" ,rust-memoffset-0.2) - ("rust-scopeguard" ,rust-scopeguard-0.3)) + ("rust-memoffset" ,rust-memoffset-0.5) + ("rust-scopeguard" ,rust-scopeguard-1.0)) #:cargo-development-inputs - (("rust-rand" ,rust-rand-0.4)))))) + (("rust-rand" ,rust-rand-0.6)))))) (define-public rust-crossbeam-queue-0.2 (package -- cgit v1.2.3 From d636d5b46dfcba119dbeefc87799708d066f1880 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 2 Jul 2020 11:55:47 +0300 Subject: gnu: rust-crossbeam-queue-0.1: Don't skip build. * gnu/packages/crates-io.scm (rust-crossbeam-queue-0.1[arguments]: Don't skip build. Replace rust-rand-0.4 with 0.6 in cargo-development-inputs. --- gnu/packages/crates-io.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 287afedbda..ae63f9d7c0 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4326,11 +4326,10 @@ (define-public rust-crossbeam-queue-0.1 (base32 "0jsa9dbxnwqcxfws09vaschf92d4imlbbikmcn4ka8z7rzb9r5vw")))) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-crossbeam-utils" ,rust-crossbeam-utils-0.6)) #:cargo-development-inputs - (("rust-rand" ,rust-rand-0.4)))))) + (("rust-rand" ,rust-rand-0.6)))))) (define-public rust-crossbeam-utils-0.7 (package -- cgit v1.2.3 From 4ca62836a270f481cda6a43968094cf53094a4f0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 2 Jul 2020 11:56:44 +0300 Subject: gnu: rust-crossbeam-utils-0.6: Update to 0.6.6. * gnu/packages/crates-io.scm (rust-crossbeam-utils-0.6): Update to0.6.6. [arguments]: Don't skip build. Replace rust-rand-0.4 with 0.6 in cargo-development-inputs. --- gnu/packages/crates-io.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ae63f9d7c0..200d91de6d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4363,7 +4363,7 @@ (define-public rust-crossbeam-utils-0.6 (package (inherit rust-crossbeam-utils-0.7) (name "rust-crossbeam-utils") - (version "0.6.5") + (version "0.6.6") (source (origin (method url-fetch) @@ -4372,14 +4372,13 @@ (define-public rust-crossbeam-utils-0.6 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0p5aa8k3wpsn17md4rx038ac2azm9354knbxdfvn7dd7yk76yc7q")))) + "1rk0r9n04bmq4a3g2q5qhvvlmrmx780gc6h9lmc94mwndslkz5q4")))) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-0.1) ("rust-lazy-static" ,rust-lazy-static-1)) #:cargo-development-inputs - (("rust-rand" ,rust-rand-0.4)))))) + (("rust-rand" ,rust-rand-0.6)))))) (define-public rust-crossterm-0.13 (package -- cgit v1.2.3 From 502590f45a689f37d90bb795dfd19a24023e0767 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 2 Jul 2020 12:08:43 +0300 Subject: gnu: rust-bumpalo-2.5: Rename to rust-bumpalo-2. * gnu/packages/crates-io.scm (rust-bumpalo-2.5): Rename to ... (rust-bumpalo-2): ... this. --- gnu/packages/crates-io.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 200d91de6d..7b6e016aa2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2004,7 +2004,7 @@ (define-public rust-bumpalo-3 "This package provides a fast bump allocation arena for Rust.") (license (list license:asl2.0 license:expat)))) -(define-public rust-bumpalo-2.5 +(define-public rust-bumpalo-2 (package (inherit rust-bumpalo-3) (name "rust-bumpalo") -- cgit v1.2.3 From f1f7054bb2cd619691fc0ec8f37d629df9759910 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 2 Jul 2020 12:24:37 +0300 Subject: gnu: rust-bumpalo-2: Update to 2.6.0. * gnu/packages/crates-io.scm (rust-bumpalo-2): Update to 2.6.0. [arguments]: Don't skip build. Skip tests. --- gnu/packages/crates-io.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7b6e016aa2..15a29e0961 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2008,7 +2008,7 @@ (define-public rust-bumpalo-2 (package (inherit rust-bumpalo-3) (name "rust-bumpalo") - (version "2.5.0") + (version "2.6.0") (source (origin (method url-fetch) @@ -2017,9 +2017,9 @@ (define-public rust-bumpalo-2 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "018b5calz3895v04shk9bn7i73r4zf8yf7p1dqg92s3xya13vm1c")))) + "020psxs5dlm0gdbs83rx2rcavibdshdr0fpzk3mmw65zq8ppz05d")))) (arguments - `(#:skip-build? #t + `(#:tests? #f ; cargo_readme_up_to_date test fails #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.2) ("rust-quickcheck" ,rust-quickcheck-0.8)))))) -- cgit v1.2.3 From 7e97137734efd4a19deae047d73ba44d2df2df94 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 2 Jul 2020 12:09:48 +0200 Subject: gnu: emacs-tramp: Update to 2.4.4. * gnu/packages/emacs-xyz.scm (emacs-tramp): Update to 2.4.4. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index aae9eb25fd..1941379dea 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -20546,14 +20546,14 @@ (define-public emacs-counsel-tramp (define-public emacs-tramp (package (name "emacs-tramp") - (version "2.4.3.5") + (version "2.4.4") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "tramp-" version ".tar")) (sha256 - (base32 "14djizi4ivwv4ad4nymday86jbh45w14wdhlm96743ffwr45dd2m")))) + (base32 "0kdpcrg3iqnfvg1a1spkkngygjddmp2dgz0rcvdccdlfr0hn27c2")))) (build-system emacs-build-system) (arguments `(#:emacs ,emacs ;need D-Bus -- cgit v1.2.3 From dba255c033ea907f2be69966c2febedb767c54b1 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 2 Jul 2020 12:10:09 +0200 Subject: gnu: wireshark: Update to 3.2.5. * gnu/packages/networking.scm (wireshark): Update to 3.2.5. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index d75f524e60..a060c63604 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -868,14 +868,14 @@ (define-public whois (define-public wireshark (package (name "wireshark") - (version "3.2.4") + (version "3.2.5") (source (origin (method url-fetch) (uri (string-append "https://www.wireshark.org/download/src/wireshark-" version ".tar.xz")) (sha256 - (base32 "1amqgn94g6h6cfnsccm2zb4c73pfv1qmzi1i6h1hnbcyhhg4czfi")))) + (base32 "0h69m9maq6w5gik4gamv4kfqrr37hmi4kpwh225y1k36awm0b2dx")))) (build-system cmake-build-system) (arguments `(#:phases -- cgit v1.2.3 From 95ccca19dfc2c44df067339c6a6f9f4aeff106f7 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 2 Jul 2020 12:12:54 +0200 Subject: gnu: python-folium: Update to 0.11.0. * gnu/packages/python-xyz.scm (python-folium): Update to 0.11.0. --- gnu/packages/python-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 5eee00aa44..d0d9fb5a23 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -18451,14 +18451,13 @@ (define-public python-cached-property (define-public python-folium (package (name "python-folium") - (version "0.10.1") + (version "0.11.0") (source (origin (method url-fetch) (uri (pypi-uri "folium" version)) (sha256 - (base32 - "0gcc267wxwxr57ry86pqpbiyfvl0g48hfvgy0f2mz9s58g87kgzd")))) + (base32 "19sclsq3xcjfa7bavzjpyn6rl9b15jbc76n5aag4cwhqqamqj1sl")))) (build-system python-build-system) (propagated-inputs `(("python-branca" ,python-branca) -- cgit v1.2.3 From bd978be3ae88b8afaa896cf0b531abf37aacf8b0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 2 Jul 2020 12:32:48 +0200 Subject: gnu: r-annotationdbi: Update to 1.50.1. * gnu/packages/bioinformatics.scm (r-annotationdbi): Update to 1.50.1. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 9c81e3c23d..7e97cdea7c 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7894,13 +7894,13 @@ (define-public r-biobase (define-public r-annotationdbi (package (name "r-annotationdbi") - (version "1.50.0") + (version "1.50.1") (source (origin (method url-fetch) (uri (bioconductor-uri "AnnotationDbi" version)) (sha256 (base32 - "10gplxal0qphcn29azv0i6hiim9q45lmhzvhhhsnwfhwpgja7p05")))) + "00pd8lsdppxlmx0l65phw0jhsm0qkwjc4wsdxpvgc31iiz9yslbj")))) (properties `((upstream-name . "AnnotationDbi"))) (build-system r-build-system) -- cgit v1.2.3 From ddff76aae08839f030e6228ceee8a66e034d3a18 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 2 Jul 2020 12:33:02 +0200 Subject: gnu: r-rdpack: Update to 1.0.0. * gnu/packages/cran.scm (r-rdpack): Update to 1.0.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 70af2d30f0..5a23fa368c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6605,14 +6605,14 @@ (define-public r-rjags (define-public r-rdpack (package (name "r-rdpack") - (version "0.11-1") + (version "1.0.0") (source (origin (method url-fetch) (uri (cran-uri "Rdpack" version)) (sha256 (base32 - "080y15p2hl4jsq91ak2f1y2kx1iqq5c5wzyx3zyhjwp01cahy0jq")))) + "069yh9h57z3gjl5ih1r6wyiwmgmfzkpjxrpxg8mfq7y6zr1mynsw")))) (properties `((upstream-name . "Rdpack"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From aa9cd2d4a3b5bf563606d008f46d18f95ec69eec Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 2 Jul 2020 12:33:05 +0200 Subject: gnu: r-fs: Update to 1.4.2. * gnu/packages/cran.scm (r-fs): Update to 1.4.2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 5a23fa368c..383b5fe723 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -9207,14 +9207,14 @@ (define-public r-gh (define-public r-fs (package (name "r-fs") - (version "1.4.1") + (version "1.4.2") (source (origin (method url-fetch) (uri (cran-uri "fs" version)) (sha256 (base32 - "0kksig9pk8aid9l6r250na8z8j9919jvs20lj0s6m9bcybgh74df")))) + "09rpazjba9jy448j6rq989fw3wv3xhng7fn8p8gr22gyx0n0y1zr")))) (build-system r-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From f74542782bf75fcc57c2a9bfe02aa75ebb658657 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 2 Jul 2020 12:33:08 +0200 Subject: gnu: r-future-apply: Update to 1.6.0. * gnu/packages/cran.scm (r-future-apply): Update to 1.6.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 383b5fe723..8f67338596 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -12218,14 +12218,14 @@ (define-public r-future (define-public r-future-apply (package (name "r-future-apply") - (version "1.5.0") + (version "1.6.0") (source (origin (method url-fetch) (uri (cran-uri "future.apply" version)) (sha256 (base32 - "095a681ngbwbp7v53ladwya7ar8fgwnlgr3r1yklf3vdxwd54xll")))) + "1zbfycjfvxnrigm6l2fd2zgnw96g0apiw426c73gkv3xv7bdy6ms")))) (properties `((upstream-name . "future.apply"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 1a4f3739fafcbdc79d1f99099db4f64258ab368a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 2 Jul 2020 12:33:11 +0200 Subject: gnu: r-blockmodeling: Update to 1.0.0. * gnu/packages/cran.scm (r-blockmodeling): Update to 1.0.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 8f67338596..57cad5b16a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -12353,14 +12353,14 @@ (define-public r-dorng (define-public r-blockmodeling (package (name "r-blockmodeling") - (version "0.3.6") + (version "1.0.0") (source (origin (method url-fetch) (uri (cran-uri "blockmodeling" version)) (sha256 (base32 - "12paf76l3wlxad14bkxn37lw9rg6ka473m86wlcf3yhriw8kbaiz")))) + "1z4w2kq0id0gb5d0lqcdaw3clplhzywarkpvvx3drivdypzl237i")))) (build-system r-build-system) (propagated-inputs `(("r-matrix" ,r-matrix))) -- cgit v1.2.3 From 53ea4ae4ce1c71194cac159308af1b24531e2060 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 2 Jul 2020 12:33:15 +0200 Subject: gnu: r-spdep: Update to 1.1-5. * gnu/packages/cran.scm (r-spdep): Update to 1.1-5. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 57cad5b16a..12579ccd30 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -13724,14 +13724,14 @@ (define-public r-sf (define-public r-spdep (package (name "r-spdep") - (version "1.1-3") + (version "1.1-5") (source (origin (method url-fetch) (uri (cran-uri "spdep" version)) (sha256 (base32 - "1f8cjffqqc6rnb3n4qym70ca6nz2kvrsd3g587wrqdr79nnbwnrk")))) + "0pbd7wrg5v44p2yxsjp774lpyzap3madir5mn5p3ix7ibk7ldjs7")))) (build-system r-build-system) (propagated-inputs `(("r-boot" ,r-boot) @@ -13746,6 +13746,8 @@ (define-public r-spdep ("r-sf" ,r-sf) ("r-sp" ,r-sp) ("r-spdata" ,r-spdata))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/r-spatial/spdep/") (synopsis "Spatial dependence: weighting schemes, statistics and models") (description -- cgit v1.2.3 From 80897f9622481c3bea4b29cab0d82d6af970ba57 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 2 Jul 2020 12:33:18 +0200 Subject: gnu: r-ingredients: Update to 1.3.0. * gnu/packages/cran.scm (r-ingredients): Update to 1.3.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 12579ccd30..47f2d4a033 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15724,14 +15724,14 @@ (define-public r-dqrng (define-public r-ingredients (package (name "r-ingredients") - (version "1.2.0") + (version "1.3.0") (source (origin (method url-fetch) (uri (cran-uri "ingredients" version)) (sha256 (base32 - "1q196y9xzn4wk44fa1bvh0hcbizgm93rwir82nyk31k5pgixk967")))) + "1mp1rgi3nnr8mjddpbyi24zvqcbihz0d8np2j13cbjc089n6jci8")))) (properties `((upstream-name . "ingredients"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 3c45241274f8eed17f7fa29acc76c85b4e9a44dd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 2 Jul 2020 12:33:22 +0200 Subject: gnu: r-mda: Update to 0.5-2. * gnu/packages/cran.scm (r-mda): Update to 0.5-2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 47f2d4a033..b2c70ea118 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -17529,14 +17529,14 @@ (define-public r-accrued (define-public r-mda (package (name "r-mda") - (version "0.5") + (version "0.5-2") (source (origin (method url-fetch) (uri (cran-uri "mda" version)) (sha256 (base32 - "01pjrz9xv1rx78ndy0x9dc32ws8brcvwyb500m1f0dqd42375vmx")))) + "1hq0zhhz9klmp4zcr1w8hyn7s1h9kfg57d2l2mfm7psx459j0krl")))) (properties `((upstream-name . "mda"))) (build-system r-build-system) (propagated-inputs `(("r-class" ,r-class))) -- cgit v1.2.3 From 4be969fb7e79b4c033be3c04dc9b2508f4868c95 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 2 Jul 2020 12:33:25 +0200 Subject: gnu: r-mnormt: Update to 2.0.1. * gnu/packages/statistics.scm (r-mnormt): Update to 2.0.1. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 36089ff8aa..5fb39024e9 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5305,14 +5305,14 @@ (define-public r-tmvnsim (define-public r-mnormt (package (name "r-mnormt") - (version "2.0.0") + (version "2.0.1") (source (origin (method url-fetch) (uri (cran-uri "mnormt" version)) (sha256 (base32 - "1gxhma0zqsx5pkc0871vszq1y7akwdmpm8rhws5b3gr6w9mx4agf")))) + "00nn0b6nksn2jbpg0np5wphryp4f9v95vqxf5v628yysnawgkcwq")))) (build-system r-build-system) (propagated-inputs `(("r-tmvnsim" ,r-tmvnsim))) -- cgit v1.2.3 From 214874e820d08871673006a98220de51a3593feb Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Thu, 2 Jul 2020 12:01:53 +0200 Subject: Fix build without SSH support. * gnu/local.mk (GNU_SYSTEM_MODULES): Only include gnu/machine/digital-ocean.scm and gnu/machine/ssh.scm if HAVE_GUILE_SSH is set. --- gnu/local.mk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gnu/local.mk b/gnu/local.mk index 5e9dba5ab7..deece17539 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -637,8 +637,6 @@ GNU_SYSTEM_MODULES = \ %D%/system/images/hurd.scm \ \ %D%/machine.scm \ - %D%/machine/digital-ocean.scm \ - %D%/machine/ssh.scm \ \ %D%/build/accounts.scm \ %D%/build/activation.scm \ @@ -716,6 +714,14 @@ INSTALLER_MODULES = \ %D%/installer/newt/welcome.scm \ %D%/installer/newt/wifi.scm +if HAVE_GUILE_SSH + +GNU_SYSTEM_MODULES += \ + %D%/machine/digital-ocean.scm \ + %D%/machine/ssh.scm + +endif HAVE_GUILE_SSH + # Always ship the installer modules but compile them only when # ENABLE_INSTALLER is true. if ENABLE_INSTALLER -- cgit v1.2.3 From 6c59eb1da2eec29f730e82f31218f4f3e1b3c6a0 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Thu, 2 Jul 2020 12:01:45 +0200 Subject: Revert "gnu: guix-minimal: Remove as failing and unused." This reverts commit 044cffdf34c506d2f9f1fbbc07462f29d3edaf54. --- gnu/packages/package-management.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index ac2842c810..261a55fa14 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -478,6 +478,23 @@ (define-public guile2.2-guix (define-public guile3.0-guix (deprecated-package "guile3.0-guix" guix)) +(define-public guix-minimal + ;; A version of Guix which is built with the minimal set of dependencies, as + ;; outlined in the README "Requirements" section. Intended as a CI job, so + ;; marked as hidden. + (hidden-package + (package + (inherit guix) + (name "guix-minimal") + (native-inputs + (fold alist-delete + (package-native-inputs guix) + '("guile-ssh"))) + (propagated-inputs + (fold alist-delete + (package-propagated-inputs guix) + '("guile-ssh")))))) + (define (source-file? file stat) "Return true if FILE is likely a source file, false if it is a typical generated file." -- cgit v1.2.3 From d3eee3c0643a20ba06941ba45d9d27146a8b634d Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Thu, 2 Jul 2020 13:01:36 +0200 Subject: gnu: guix: Update to 1.1.0-15.03deb1e. * gnu/packages/package-management.scm (guix): Update to 1.1.0-15.03deb1e. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 261a55fa14..0af4704e52 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -118,8 +118,8 @@ (define-public guix ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.1.0") - (commit "5bd803339d664b59eac34e049e944950c526f6e9") - (revision 14)) + (commit "03deb1e891b8a8b21888e5e047017fd6a3ea7a5f") + (revision 15)) (package (name "guix") @@ -135,7 +135,7 @@ (define-public guix (commit commit))) (sha256 (base32 - "0lj8ahy3kq2ijn5dps19gw31kiry4d724bc8cpprxhlpxa834icr")) + "1c1hf7hnlr4dv05lxqmqfpqdr40cajh1ykrd2rsxjv09iq7yw1q4")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From b919d4048e72f8e5740606cdb3dac0592de21f36 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Thu, 2 Jul 2020 13:50:51 +0200 Subject: gnu: guix: Update to 1.1.0-16.d3eee3c. * gnu/packages/package-management.scm (guix): Update to 1.1.0-16.d3eee3c. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 0af4704e52..44fd0c16b2 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -118,8 +118,8 @@ (define-public guix ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.1.0") - (commit "03deb1e891b8a8b21888e5e047017fd6a3ea7a5f") - (revision 15)) + (commit "d3eee3c0643a20ba06941ba45d9d27146a8b634d") + (revision 16)) (package (name "guix") @@ -135,7 +135,7 @@ (define-public guix (commit commit))) (sha256 (base32 - "1c1hf7hnlr4dv05lxqmqfpqdr40cajh1ykrd2rsxjv09iq7yw1q4")) + "1waw4pggijhxwwdi9v9nq8p2har5cvnbvlxvq8abn4g1qw6xdrz5")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 054153b28cea697d0439127ffdea4aadfd5c2e0a Mon Sep 17 00:00:00 2001 From: Christopher Lemmer Webber Date: Wed, 1 Jul 2020 16:36:29 -0400 Subject: gnu: python-grequests: Fix tests by adding zope dependencies. * gnu/packages/python-web.scm (python-grequests)[native-inputs]: Add python-zope.interface, python-zope.event. --- gnu/packages/python-web.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 030abef9c2..c929e254f7 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2010,7 +2010,9 @@ (define-public python-grequests `(("python-gevent" ,python-gevent) ("python-requests" ,python-requests))) (native-inputs - `(("python-nose" ,python-nose))) + `(("python-nose" ,python-nose) + ("python-zope.interface" ,python-zope-interface) + ("python-zope.event" ,python-zope-event))) (home-page "https://github.com/kennethreitz/grequests") (synopsis "Python library for asynchronous HTTP requests") (description "GRequests is a Python library that allows you to use -- cgit v1.2.3 From aea64acce76135c3d59dc81887eb63abeac2fd67 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Thu, 2 Jul 2020 21:13:52 +0200 Subject: gnu: cuirass: Update to 0.0.1-38.136a829. * gnu/packages/ci.scm (cuirass): Update to 0.0.1-38.136a829. --- gnu/packages/ci.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index a783aec1eb..6b6d051fa8 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -47,8 +47,8 @@ (define-module (gnu packages ci) #:use-module (guix build-system gnu)) (define-public cuirass - (let ((commit "882393dee0ae78d98eeb8e571843644d985e4736") - (revision "37")) + (let ((commit "136a8295e4e09724eccc230c127fb880aa84b57d") + (revision "38")) (package (name "cuirass") (version (git-version "0.0.1" revision commit)) @@ -60,7 +60,7 @@ (define-public cuirass (file-name (git-file-name name version)) (sha256 (base32 - "1cxhk154f52q019ga1wgd6g99mm64k7skch671fp2bf5h2dvxnd9")))) + "04fzc2q8cd02dnlrarzlxq0yfi90735s5f6dw7g2k63rbxlhcq8j")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) -- cgit v1.2.3 From 0ceb7c191d5954658593153d03f043a7f2100cd1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 6 Jan 2020 17:43:38 +0100 Subject: gnu: Add UFO: Alien Invasion. * gnu/packages/games.scm (%ufoai-commit, %ufoai-revision, %ufoai-version, ufoai-source, ufo2map, ufoai-data, ufoai): New variables. --- gnu/packages/games.scm | 245 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 245 insertions(+) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index f7ebac6d98..c062729f89 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2159,6 +2159,251 @@ (define-public superstarfighter (license (list license:expat ; game license:silofl1.1)))) ; fonts +(define %ufoai-commit "a542a87a891f96b1ab2c44d35b2f6f16859a5019") +(define %ufoai-revision "0") +(define %ufoai-version (git-version "2.6.0_dev" %ufoai-revision %ufoai-commit)) +(define ufoai-source + (origin + (method git-fetch) + (uri (git-reference + (url "git://git.code.sf.net/p/ufoai/code") ;HTTPS fails mid-clone + (commit %ufoai-commit))) + (file-name (string-append "ufoai-" %ufoai-version "-checkout")) + (sha256 + (base32 + "024s7b9rcg7iw8i2p72gwnvabk23ljlq0nldws0y4b6hpwzyn1wz")) + (modules '((guix build utils) + (srfi srfi-1) + (ice-9 ftw))) + (snippet + '(begin + ;; Delete ~32MiB of bundled dependencies. + (with-directory-excursion "src/libs" + (for-each delete-file-recursively + (lset-difference equal? (scandir ".") + '("." ".." "gtest" "mumble")))) + + ;; Use relative path to Lua headers. + (substitute* "src/common/scripts_lua.h" + (("\\.\\./libs/lua/") "")) + + ;; Adjust Makefile targets to not depend on 'ufo2map', since we build + ;; it as a separate package. This way we don't need to make the same + ;; adjustments for 'ufoai-data' and 'ufoai' below. + (substitute* "build/maps.mk" + (("\\./ufo2map") "ufo2map") + (("maps: ufo2map") "maps:")) + (substitute* "build/modules/testall.mk" + (("testall: ufo2map") "testall:")) + + ;; If no cURL headers are found, the build system will try to include + ;; the bundled version, even when not required. Prevent that. + (substitute* "build/default.mk" + (("^include src/libs/curl/lib/Makefile\\.inc") + "")) + + ;; While here, improve reproducibility by adding the '-X' flag to the + ;; zip command used to create the map files, in order to prevent time + ;; stamps from making it into the generated archives. + (substitute* "build/data.mk" + (("\\$\\(call ZIP\\)") + "$(call ZIP) -X")) + #t)))) + +(define-public ufo2map + (package + (name "ufo2map") + (version %ufoai-version) + (home-page "https://ufoai.org/") + (source ufoai-source) + (build-system gnu-build-system) + (arguments + '(#:configure-flags '("CC=gcc" "CXX=g++" + "--enable-release" + "--enable-ufo2map" + "--disable-uforadiant" + "--disable-cgame-campaign" + "--disable-cgame-multiplayer" + "--disable-cgame-skirmish" + "--disable-game" + "--disable-memory" + "--disable-testall" + "--disable-ufoded" + "--disable-ufo" + "--disable-ufomodel" + "--disable-ufoslicer") + #:tests? #f ;no tests + #:phases (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key (configure-flags '()) #:allow-other-keys) + ;; The home-made configure script does not understand + ;; some of the default flags of gnu-build-system. + (apply invoke "./configure" configure-flags))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (install-file "ufo2map" (string-append out "/bin")) + (install-file "debian/ufo2map.6" + (string-append out "/share/man/man6")) + #t)))))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("libjpeg" ,libjpeg-turbo) + ("libpng" ,libpng) + ("lua" ,lua-5.1) + ("sdl-union" ,(sdl-union (list sdl2 sdl2-mixer sdl2-ttf))))) + (synopsis "UFO: AI map generator") + (description + "This package provides @command{ufo2map}, a program used to generate +maps for the UFO: Alien Invasion strategy game.") + (license license:gpl2+))) + +(define ufoai-data + (package + (name "ufoai-data") + (version %ufoai-version) + (home-page "https://ufoai.org/") + (source ufoai-source) + (build-system gnu-build-system) + (arguments + '(#:tests? #f + #:configure-flags '("CC=gcc" "CXX=g++") + #:phases (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs (configure-flags '()) #:allow-other-keys) + (apply invoke "./configure" configure-flags))) + (replace 'build + (lambda* (#:key (parallel-build? #t) #:allow-other-keys) + (invoke "make" + "-j" (if parallel-build? + (number->string (parallel-job-count)) + "1") + "maps"))) + (add-after 'build 'pack + (lambda _ + (invoke "make" "pk3"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (for-each (lambda (file) + (install-file file out)) + (find-files "base" "\\.pk3$")) + #t)))))) + (native-inputs + `(("python" ,python-2) + ("ufo2map" ,ufo2map) + ("which" ,which) + ("zip" ,zip))) + (synopsis "UFO: AI data files") + (description + "This package contains maps and other assets for UFO: Alien Invasion.") + ;; Most assets are available under either GPL2 or GPL2+. Some use other + ;; licenses, see LICENSES for details. + (license (list license:gpl2+ license:gpl2 license:cc-by3.0 + license:cc-by-sa3.0 license:public-domain)))) + +(define-public ufoai + (package + (name "ufoai") + (version %ufoai-version) + (home-page "https://ufoai.org/") + (source ufoai-source) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list (string-append "--prefix=" (assoc-ref %outputs "out")) + (string-append "--datadir=" (assoc-ref %outputs "out") + "/share/games/ufo") + "CC=gcc" "CXX=g++" + "--enable-release" + "--enable-game" + "--disable-ufo2map" + "--disable-dependency-tracking" + + ;; Disable hard links to prevent huge NARs. + "--disable-hardlinkedgame" + "--disable-hardlinkedcgame") + #:phases (modify-phases %standard-phases + (add-after 'unpack 'symlink-data-files + (lambda* (#:key inputs #:allow-other-keys) + (let ((data (assoc-ref inputs "ufoai-data"))) + ;; Symlink the data files to where the build system + ;; expects to find them. Ultimately these files are + ;; copied to $out/share/games/ufoai/base, losing the + ;; symlinks; we could fix that after install, but it + ;; does not make a big difference in practice due to + ;; deduplication. + (with-directory-excursion "base" + (for-each (lambda (file) + (symlink file (basename file))) + (find-files data "\\.pk3$"))) + #t))) + (add-before 'configure 'create-language-files + (lambda _ + (invoke "make" "lang"))) + (replace 'configure + (lambda* (#:key outputs (configure-flags '()) #:allow-other-keys) + (apply invoke "./configure" configure-flags))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (if tests? + (invoke "./testall") + (format #t "test suite not run~%")) + #t)) + (add-after 'install 'install-man-pages + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (man6 (string-append out "/share/man/man6"))) + (install-file "debian/ufo.6" man6) + (install-file "debian/ufoded.6" man6) + #t)))) + + ;; TODO: Some map tests occasionally fail because of randomness issues, + ;; e.g. not enough generated aliens. The test runner also fails early + ;; in the build container with 'failed to shutdown server'? + #:tests? #f)) + (native-inputs + `(("gettext" ,gettext-minimal) + ("pkg-config" ,pkg-config) + ("python" ,python-2) + ("ufo2map" ,ufo2map) + ("ufoai-data" ,ufoai-data))) + (inputs + `(("curl" ,curl) + ("libjpeg" ,libjpeg-turbo) + ("libogg" ,libogg) + ("libpng" ,libpng) + ("libtheora" ,libtheora) + ("libvorbis" ,libvorbis) + ("libxml2" ,libxml2) + ("lua" ,lua-5.1) + ("mesa" ,mesa) + ("minixml" ,minixml) + ("sdl-union" ,(sdl-union (list sdl2 sdl2-mixer sdl2-ttf))) + ("zlib" ,zlib))) + (synopsis "Turn-based tactical strategy game") + (description + "UFO: Alien Invasion is a tactical strategy game set in the year 2084. +You control a secret organisation charged with defending Earth from a brutal +alien enemy. Build up your bases, prepare your team, and dive head-first into +the fast and flowing turn-based combat. + +Over the long term you will need to conduct research into the alien threat to +figure out their mysterious goals and use their powerful weapons for your own +ends. You will produce unique items and use them in combat against your +enemies. + +You can also use them against your friends with the multiplayer functionality. + +Warning: This is a pre-release version of UFO: AI! Some things may not work +properly.") + + ;; The game code and most assets are GPL2+, but we use GPL2 only here + ;; because some assets do not use the "or later" clause. Many individual + ;; assets use Creative Commons or Public Domain; see the LICENSE file. + (license (delete license:gpl2+ (package-license ufoai-data))))) + (define-public xshogi (package (name "xshogi") -- cgit v1.2.3 From dd3bd0be24cb99226a5fb3422cbc3039c57e9663 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 19 Jun 2020 02:07:00 +0200 Subject: gnu: Add debianutils. * gnu/packages/debian.scm (debianutils): New public variable. --- gnu/packages/debian.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm index f7bf37efff..1112a90a2e 100644 --- a/gnu/packages/debian.scm +++ b/gnu/packages/debian.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Efraim Flashner ;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,8 +25,10 @@ (define-module (gnu packages debian) #:use-module (guix packages) #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) + #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages compression) + #:use-module (gnu packages gettext) #:use-module (gnu packages gnupg) #:use-module (gnu packages wget) #:use-module (gnu packages perl)) @@ -196,6 +199,46 @@ (define-public debootstrap unpacking them into a directory which can eventually be chrooted into.") (license license:gpl2))) +(define-public debianutils + (package + (name "debianutils") + (version "4.11") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://salsa.debian.org/debian/debianutils.git") + (commit (string-append "debian/" version)))) + (file-name (git-file-name "debianutils" version)) + (sha256 + (base32 + "1fmhzvymajack7kh8g4qjbwd9mq85z6rxl1psd1sm67s5695i9rc")))) + (build-system gnu-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (add-after 'bootstrap 'create-translations + (lambda _ + (with-directory-excursion "po4a" + (invoke "po4a" "--no-backups" "po4a.conf")) + #t))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("gettext" ,gettext-minimal) + ("po4a" ,po4a))) + (home-page "https://packages.debian.org/unstable/debianutils") + (synopsis "Miscellaneous shell utilities") + (description + "This package provides a number of utilities which are mostly for use +in installation scripts of Debian packages. The programs included are +@command{add-shell}, @command{installkernel}, @command{ischroot}, +@command{remove-shell}, @command{run-parts}, @command{savelog}, +@command{tempfile}, and @command{which}.") + (license (list license:gpl2+ + ;; The 'savelog' program is distributed under a + ;; GPL-compatible copyleft license. + (license:fsf-free "file://debian/copyright" + "The SMAIL General Public License, see +debian/copyright for more information."))))) (define-public apt-mirror (let ((commit "e664486a5d8947c2579e16dd793d762ea3de4202") -- cgit v1.2.3 From 6f8f13e941e0743d0c367baa7d5fa683d437f6bc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 2 Jul 2020 23:20:03 +0200 Subject: services: wpa-supplicant: Do not export the record. * gnu/services/networking.scm: Remove from exports. --- gnu/services/networking.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index d6b0aee357..bd01df1ba7 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -130,7 +130,6 @@ (define-module (gnu services networking) usb-modeswitch-configuration-usb-modeswitch-data usb-modeswitch-service-type - wpa-supplicant-configuration wpa-supplicant-configuration? wpa-supplicant-configuration-wpa-supplicant -- cgit v1.2.3 From 4d06076714f03da55d09efede055f0c40da3403e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 25 Jun 2020 00:33:38 +0200 Subject: services: wpa-supplicant: Support specifying additional service dependencies. * gnu/services/networking.scm ()[requirement]: New parameter. (wpa-supplicant-shepherd-service): Use it instead of hard-coded list. * doc/guix.texi (Networking Services): Document accordingly. --- doc/guix.texi | 3 +++ gnu/services/networking.scm | 9 ++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 7823367605..ce17c2de8e 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -14172,6 +14172,9 @@ It takes the following parameters: @item @code{wpa-supplicant} (default: @code{wpa-supplicant}) The WPA Supplicant package to use. +@item @code{requirement} (default: @code{'(user-processes dbus-system loopback syslogd)} +List of services that should be started before WPA Supplicant starts. + @item @code{dbus?} (default: @code{#t}) Whether to listen for requests on D-Bus. diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index bd01df1ba7..348dc369d8 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -133,6 +133,7 @@ (define-module (gnu services networking) wpa-supplicant-configuration wpa-supplicant-configuration? wpa-supplicant-configuration-wpa-supplicant + wpa-supplicant-configuration-requirement wpa-supplicant-configuration-pid-file wpa-supplicant-configuration-dbus? wpa-supplicant-configuration-interface @@ -1319,6 +1320,8 @@ (define-record-type* wpa-supplicant-configuration? (wpa-supplicant wpa-supplicant-configuration-wpa-supplicant ; (default wpa-supplicant)) + (requirement wpa-supplicant-configuration-requirement ;list of symbols + (default '(user-processes dbus-system loopback syslogd))) (pid-file wpa-supplicant-configuration-pid-file ;string (default "/var/run/wpa_supplicant.pid")) (dbus? wpa-supplicant-configuration-dbus? ;Boolean @@ -1332,12 +1335,12 @@ (define-record-type* (define wpa-supplicant-shepherd-service (match-lambda - (($ wpa-supplicant pid-file dbus? interface - config-file extra-options) + (($ wpa-supplicant requirement pid-file dbus? + interface config-file extra-options) (list (shepherd-service (documentation "Run the WPA supplicant daemon") (provision '(wpa-supplicant)) - (requirement '(user-processes dbus-system loopback syslogd)) + (requirement requirement) (start #~(make-forkexec-constructor (list (string-append #$wpa-supplicant "/sbin/wpa_supplicant") -- cgit v1.2.3 From 3162d11e700232bb6d73d4cddd93757f9673d973 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 26 Jun 2020 16:32:57 +0200 Subject: gnu: Add parprouted. * gnu/packages/networking.scm (parprouted): New public variable. --- gnu/packages/networking.scm | 48 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index a060c63604..077ede2f23 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -328,6 +328,54 @@ (define-public ndisc6 ;; The user can choose version 2 or 3 of the GPL, not later versions. (license (list license:gpl2 license:gpl3)))) +(define-public parprouted + (package + (name "parprouted") + (version "0.7") + (source (origin + (method url-fetch) + (uri (string-append "https://www.hazard.maks.net/parprouted/" + "parprouted-" version ".tar.gz")) + (sha256 + (base32 + "1z6yg28i0pv20jivyy82pxb38hsryj95inhj27bs6ja1bp4l6dnn")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ;no tests + #:phases (modify-phases %standard-phases + (add-after 'unpack 'insert-absolute-iproute-reference + (lambda* (#:key inputs #:allow-other-keys) + (let* ((iproute (assoc-ref inputs "iproute")) + (ip (string-append iproute "/sbin/ip"))) + (substitute* "parprouted.c" + (("/sbin/ip") ip)) + #t))) + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (sbin (string-append out "/sbin")) + (man8 (string-append out "/share/man/man8"))) + ;; No configure script; hijack the phase to make + ;; the necessary arrangements. + (setenv "CC" ,(cc-for-target)) + (for-each mkdir-p (list sbin man8)) + (substitute* "Makefile" + (("/usr/local/sbin") sbin) + (("/usr/local/man/man8") man8)) + #t)))))) + (inputs + `(("iproute" ,iproute))) + (home-page "https://www.hazard.maks.net/parprouted/") + (synopsis "Proxy ARP requests to other interfaces") + (description + "@command{parprouted} is a daemon for transparent IP (Layer@tie{}3) +proxy ARP bridging. Unlike standard bridging, proxy ARP bridging can bridge +Ethernet networks behind wireless nodes. Normal layer@tie{}2 bridging does +not work between wireless nodes because wireless does not know about MAC +addresses used in the wired Ethernet networks. This daemon can also be +useful for making transparent firewalls.") + (license license:gpl2))) + (define-public socat (package (name "socat") -- cgit v1.2.3 From 5e0461c6469a0a0517d4f748226474988d45f610 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 1 Jul 2020 19:12:32 +0200 Subject: gnu: audacity: Update to 2.4.1. * gnu/packages/audio.scm (audacity): Update to 2.4.1. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 74ef7111c3..c96476857f 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -395,7 +395,7 @@ (define-public ardour (define-public audacity (package (name "audacity") - (version "2.3.3") + (version "2.4.1") (source (origin (method git-fetch) @@ -405,7 +405,7 @@ (define-public audacity (file-name (git-file-name name version)) (sha256 (base32 - "0707fsnrl4vjalsi21w4blwgz024qhd0w8rdd5j5vpxf5lyk2rbk")) + "1xk0piv72d2xd3p7igr916fhcbrm76fhjr418k1rlqdzzg1hfljn")) (patches (search-patches "audacity-build-with-system-portaudio.patch")) (modules '((guix build utils))) (snippet -- cgit v1.2.3 From 415beccb1d43cc36e03041fe59642929dc3da1e4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 2 Jul 2020 20:22:17 +0200 Subject: gnu: Add drbd-utils. * gnu/packages/cluster.scm (drbd-utils): New variable. --- gnu/packages/cluster.scm | 98 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) diff --git a/gnu/packages/cluster.scm b/gnu/packages/cluster.scm index 296fe94856..5241ed1296 100644 --- a/gnu/packages/cluster.scm +++ b/gnu/packages/cluster.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2018 Sou Bunnbu ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2019 Andrew Miloradovsky +;;; Copyright © 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -25,6 +26,8 @@ (define-module (gnu packages cluster) #:use-module (guix git-download) #:use-module (guix packages) #:use-module (gnu packages autotools) + #:use-module (gnu packages check) + #:use-module (gnu packages flex) #:use-module (gnu packages gettext) #:use-module (gnu packages libevent) #:use-module (gnu packages linux) @@ -33,6 +36,101 @@ (define-module (gnu packages cluster) #:use-module (gnu packages texinfo) #:use-module (gnu packages tls)) +(define-public drbd-utils + (package + (name "drbd-utils") + (version "9.13.1") + (source (origin + (method url-fetch) + ;; Older releases are moved to /archive. List it first because in + ;; practice this URL will be the most current (e.g. time-machine). + (uri (list (string-append "https://www.linbit.com/downloads/drbd" + "/utils/archive/drbd-utils-" version + ".tar.gz") + (string-append "https://www.linbit.com/downloads/drbd" + "/utils/drbd-utils-" version ".tar.gz"))) + (sha256 + (base32 + "0di55y0vzaw8jhcgz0fakww03h1gpg4a5q1zklxhjw3dwzjvysnk")) + (modules '((guix build utils))) + (snippet + '(begin + (substitute* "scripts/global_common.conf" + ;; Do not participate in usage count survey by default. + (("usage-count: yes") + "usage-count: no")) + (substitute* "scripts/Makefile.in" + ;; Install the Pacemaker resource agents to the libdir, + ;; regardless of what the OCF specification says... + (("\\$\\(DESTDIR\\)/usr/lib") + "$(DESTDIR)$(LIBDIR)")) + (substitute* "configure" + ;; Use a sensible default udev rules directory. + (("default_udevdir=/lib/udev") + "default_udevdir='${prefix}/lib/udev'")) + #t)))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags '(;; Do not install sysv or systemd init scripts. + "--with-initscripttype=none" + ;; Use the pre-built manual pages present in release + ;; tarballs instead of generating them from scratch. + "--with-prebuiltman" + ;; Disable support for DRBD 8.3 as it is only for + ;; Linux-Libre versions < 3.8. 8.4 is the latest + ;; kernel driver as of Linux 5.7. + "--without-83support" + "--sysconfdir=/etc" + "--localstatedir=/var") + #:test-target "test" + #:phases + (modify-phases %standard-phases + (add-after 'patch-generated-file-shebangs 'patch-documentation + (lambda _ + ;; The preceding phase misses some Makefiles with unusual file + ;; names, so we handle those here. + (for-each patch-makefile-SHELL (find-files "documentation/common" + "^Makefile")) + #t)) + (add-before 'configure 'use-absolute-/lib/drbd + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + ;; Look for auxiliary executables below exec_prefix instead + ;; of assuming /lib/drbd (see TODO comment in the file). + (substitute* "user/v9/drbdtool_common.c" + (("\"/lib/drbd\"") + (string-append "\"" out "/lib/drbd\""))) + #t))) + (add-after 'configure 'adjust-installation-directories + (lambda _ + ;; Do not attempt to create /etc or /var. + (substitute* "scripts/Makefile" + (("\\$\\(DESTDIR\\)\\$\\(sysconfdir\\)") + "$(DESTDIR)$(prefix)$(sysconfdir)")) + (substitute* "user/v84/Makefile" + (("\\$\\(DESTDIR\\)\\$\\(localstatedir\\)") + "$(DESTDIR)$(prefix)$(localstatedir)") + (("\\$\\(DESTDIR\\)/lib/drbd") + "$(DESTDIR)$(prefix)/lib/drbd")) + (substitute* "user/v9/Makefile" + (("\\$\\(DESTDIR\\)\\$\\(localstatedir\\)") + "$(DESTDIR)$(prefix)$(localstatedir)") + (("\\$\\(DESTDIR\\)\\$\\(DRBD_LIB_DIR\\)") + "$(DESTDIR)$(prefix)$(DRBD_LIB_DIR)")) + #t))))) + (native-inputs + `(("clitest" ,clitest) + ("flex" ,flex) + ("udev" ,eudev))) ;just to satisfy a configure check + (home-page "https://www.linbit.com/drbd/") + (synopsis "Replicate block devices between machines") + (description + "@acronym{DRBD, Distributed Replicated Block Device} is a software-based, +shared-nothing, replicated storage solution mirroring the content of block +devices (hard disks, partitions, logical volumes etc.) over any network +connection. This package contains the userland utilities.") + (license license:gpl2+))) + (define-public keepalived (package (name "keepalived") -- cgit v1.2.3 From 31522dfa1951c655898afb37eda58c048d1c2338 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 2 Jul 2020 11:07:08 +0200 Subject: Revert "ui: Use package-description-string." This reverts commit bd03e99f66be1a038e3a8aeb502f5153fd05cc67. Reported by Ekaitz Zarraga at . That commit broke would prevent "description: " from being taken into account by the 'texi->plain-text' paragraph filling code. --- guix/ui.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/guix/ui.scm b/guix/ui.scm index d64bb68f05..88a046a177 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -1471,8 +1471,12 @@ (define (packagerecutils (string-trim-right (parameterize ((%text-width width*)) - (string-append "description: " - (or (package-description-string p) ""))) + ;; Call 'texi->plain-text' on the concatenated string to account + ;; for the width of "description:" in paragraph filling. + (texi->plain-text + (string-append "description: " + (or (and=> (package-description p) P_) + "")))) #\newline))) (for-each (match-lambda ((field . value) -- cgit v1.2.3 From 1239aabd4c2ac0ebb979d1cf5126281335aa5744 Mon Sep 17 00:00:00 2001 From: André Batista Date: Tue, 16 Jun 2020 19:20:57 -0300 Subject: gnu: Add tor-client. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/tor.scm (tor-client): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/tor.scm | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index 19ab5cf374..8f03dc4dd0 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020 Brice Waegeneire +;;; Copyright © 2020 André Batista ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,6 +29,7 @@ (define-module (gnu packages tor) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) + #:use-module (guix utils) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix build-system gnu) @@ -86,11 +88,37 @@ (define-public tor web browsers, instant messaging clients, remote login, and other applications based on the TCP protocol. +This package is the full featured @code{tor} which is needed for running +relays, bridges or directory authorities. If you just want to access the Tor +network or to setup an onion service you may install @code{tor-client} +instead.") + (license license:bsd-3))) + +(define-public tor-client + (package + (inherit tor) + (name "tor-client") + (arguments + (substitute-keyword-arguments (package-arguments tor) + ((#:configure-flags flags) + (append flags + '("--disable-module-relay"))))) + (synopsis "Client to the anonymous Tor network") + (description + "Tor protects you by bouncing your communications around a distributed +network of relays run by volunteers all around the world: it prevents +somebody watching your Internet connection from learning what sites you +visit, and it prevents the sites you visit from learning your physical +location. Tor works with many of your existing applications, including +web browsers, instant messaging clients, remote login, and other +applications based on the TCP protocol. + To @code{torify} applications (to take measures to ensure that an application, which has not been designed for use with Tor such as ssh, will use only Tor for internet connectivity, and also ensures that there are no leaks from DNS, UDP or -the application layer) you need to install @code{torsocks}.") - (license license:bsd-3))) +the application layer) you need to install @code{torsocks}. + +This package only provides a client to the Tor Network."))) (define-public torsocks (package -- cgit v1.2.3 From 2807a8432aa2aaac6fa7024974be6468ca1160b5 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 2 Jul 2020 17:02:45 +0200 Subject: gnu: network-manager-openconnect: Patch all the 'openconnect' file names. * gnu/packages/gnome.scm (network-manager-openconnect)[arguments]: Make sure all the references to the 'openconnect' executable are patched. --- gnu/packages/gnome.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 55191d31bb..d2e452d8f2 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6788,8 +6788,7 @@ (define-public network-manager-openconnect "/bin/modprobe")) (pretty-ovpn (string-append "\"" openconnect "\""))) (substitute* "src/nm-openconnect-service.c" - (("\"/usr/local/sbin/openconnect\"") pretty-ovpn) - (("\"/usr/sbin/openconnect\"") pretty-ovpn) + (("\"/usr(/local)?/s?bin/openconnect\"") pretty-ovpn) (("/sbin/modprobe") modprobe))) #t))))) (native-inputs -- cgit v1.2.3 From af74c0633aa62d7d4e341920cfa3265f27f793cf Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 2 Jul 2020 23:27:04 +0200 Subject: gnu: gash, gash-utils: Build with Guile 3.0. * gnu/packages/shells.scm (gash)[source]: Add 'modules' and 'snippet'. [inputs]: Change GUILE-2.2 to GUILE-3.0. (gash-utils)[source]: Add 'modules' and 'snippet'. [inputs]: Change GUILE-2.2 to GUILE-3.0. * gnu/packages/commencement.scm (gash-utils-boot)[source]: Remove unneeded 'modules' field, and add 'snippet'. (gash-utils-boot)[source]: New field. * gnu/packages/patches/gash-utils-ls-test.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/commencement.scm | 6 +++++- gnu/packages/patches/gash-utils-ls-test.patch | 25 +++++++++++++++++++++++++ gnu/packages/shells.scm | 24 ++++++++++++++++++++---- 4 files changed, 51 insertions(+), 5 deletions(-) create mode 100644 gnu/packages/patches/gash-utils-ls-test.patch diff --git a/gnu/local.mk b/gnu/local.mk index deece17539..040882192f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -943,6 +943,7 @@ dist_patch_DATA = \ %D%/packages/patches/fontconfig-hurd-path-max.patch \ %D%/packages/patches/freeimage-unbundle.patch \ %D%/packages/patches/fuse-overlapping-headers.patch \ + %D%/packages/patches/gash-utils-ls-test.patch \ %D%/packages/patches/gawk-shell.patch \ %D%/packages/patches/gcc-arm-bug-71399.patch \ %D%/packages/patches/gcc-arm-link-spec-fix.patch \ diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index ef250e037b..d0393ebe25 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -140,7 +140,7 @@ (define gash-boot (name "gash-boot") (source (origin (inherit (package-source gash)) - (modules '()))) + (snippet #f))) ;discard snippet for Guile 3.0 support (arguments `(#:implicit-inputs? #f #:tests? #f @@ -170,6 +170,10 @@ (define gash-utils-boot (package (inherit gash-utils) (name "gash-utils-boot") + (source (origin + (inherit (package-source gash-utils)) + (patches '()) + (snippet #f))) ;discard snippet for Guile 3.0 support (arguments `(#:implicit-inputs? #f #:tests? #f diff --git a/gnu/packages/patches/gash-utils-ls-test.patch b/gnu/packages/patches/gash-utils-ls-test.patch new file mode 100644 index 0000000000..e1dfb9c23b --- /dev/null +++ b/gnu/packages/patches/gash-utils-ls-test.patch @@ -0,0 +1,25 @@ +'ls.scm' monkey-patches (ice-9 getopt-long) to allow it to recognize '-1' +as a valid option. Unfortunately, monkey patching no longer works with +Guile 3.0 due to inlining, so change the test to make do without '-1'. + +diff --git a/tests/core-utils.org b/tests/core-utils.org +index d35ede8..22718e3 100644 +--- a/tests/core-utils.org ++++ b/tests/core-utils.org +@@ -93,14 +93,11 @@ + * ls + :script: + #+begin_src sh +- ls -1 tests/data/star ++ ls tests/data/star + #+end_src + :stdout: + #+begin_example +- 0 +- 1 +- 2 +- 3 ++ 0 1 2 3 + #+end_example + + * test-file diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 109baacc30..b790a0cc18 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -856,12 +856,19 @@ (define-public gash (sha256 (base32 "13m0yz5h9nj3x40mr6wr5xcpq1lscndfwcicw3skrz801025hhgf")) - (modules '((guix build utils))))) + (modules '((guix build utils))) + (snippet + '(begin + ;; Allow builds with Guile 3.0. + (substitute* "configure" + (("search=\"2\\.2 2\\.0\"") + "search=\"3.0 2.2 2.0\"")) + #t)))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (inputs - `(("guile" ,guile-2.2))) + `(("guile" ,guile-3.0))) (arguments '(#:make-flags '("XFAIL_TESTS=tests/redirects.org"))) (home-page "https://savannah.nongnu.org/projects/gash/") @@ -882,12 +889,21 @@ (define-public gash-utils version ".tar.gz")) (sha256 (base32 - "0ib2p52qmbac5n0s5bys4fiwim461ps546976l1n7pwbs0avh7fk")))) + "0ib2p52qmbac5n0s5bys4fiwim461ps546976l1n7pwbs0avh7fk")) + (patches (search-patches "gash-utils-ls-test.patch")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Allow builds with Guile 3.0. + (substitute* "configure" + (("search=\"2\\.2 2\\.0\"") + "search=\"3.0 2.2 2.0\"")) + #t)))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (inputs - `(("guile" ,guile-2.2) + `(("guile" ,guile-3.0) ("gash" ,gash))) (home-page "https://savannah.nongnu.org/projects/gash/") (synopsis "Core POSIX utilities written in Guile Scheme") -- cgit v1.2.3 From f51d836a480761074f76e6a6d883459c5a5ee571 Mon Sep 17 00:00:00 2001 From: Matthew Kraai Date: Mon, 29 Jun 2020 07:27:07 -0700 Subject: gnu: python-gevent: Propagate dependencies. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-gevent)[native-inputs]: Move python-zope-event and python-zone-interface to ... [propagated-inputs]: ... here. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d0d9fb5a23..7079bbda5d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11642,15 +11642,15 @@ (define-public python-gevent "known_failures.py" "--ignore" "skipped_tests.txt")))))) (propagated-inputs `(("python-greenlet" ,python-greenlet) - ("python-objgraph" ,python-objgraph))) + ("python-objgraph" ,python-objgraph) + ("python-zope.event" ,python-zope-event) + ("python-zope.interface" ,python-zope-interface))) (native-inputs `(("python-six" ,python-six) ;; For tests. ("python-dnspython" ,python-dnspython) - ("python-psutil" ,python-psutil) - ("python-zope.event" ,python-zope-event) - ("python-zope.interface" ,python-zope-interface))) + ("python-psutil" ,python-psutil))) (inputs `(("c-ares" ,c-ares) ("libev" ,libev))) -- cgit v1.2.3 From 851a7caf1a1a145a815aa11bf29aeaceca94e8c1 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Sun, 7 Jun 2020 23:25:40 +0200 Subject: gnu: llvm-9: Backport patches to fix miscompilations. * gnu/packages/llvm.scm (llvm-9)[source]: Add new patches. * gnu/packages/patches/llvm-9-fix-lpad-miscompilation.patch, gnu/packages/patches/llvm-9-fix-scev-miscompilation.patch: New files. * gnu/local.mk (dist_patch_DATA): Register new patches. --- gnu/local.mk | 2 + gnu/packages/llvm.scm | 7 +- .../patches/llvm-9-fix-lpad-miscompilation.patch | 97 ++++++++++++++++++ .../patches/llvm-9-fix-scev-miscompilation.patch | 113 +++++++++++++++++++++ 4 files changed, 218 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/llvm-9-fix-lpad-miscompilation.patch create mode 100644 gnu/packages/patches/llvm-9-fix-scev-miscompilation.patch diff --git a/gnu/local.mk b/gnu/local.mk index 040882192f..47180eea9d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1242,6 +1242,8 @@ dist_patch_DATA = \ %D%/packages/patches/lirc-localstatedir.patch \ %D%/packages/patches/lirc-reproducible-build.patch \ %D%/packages/patches/llvm-3.5-fix-clang-build-with-gcc5.patch \ + %D%/packages/patches/llvm-9-fix-lpad-miscompilation.patch \ + %D%/packages/patches/llvm-9-fix-scev-miscompilation.patch \ %D%/packages/patches/lm-sensors-hwmon-attrs.patch \ %D%/packages/patches/lrcalc-includes.patch \ %D%/packages/patches/lrzip-CVE-2017-8842.patch \ diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 11e4cfbe4c..7723ff5bc1 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2019 Mathieu Othacehe ;;; Copyright © 2019 Brett Gilio ;;; Copyright © 2020 Giacomo Leidi +;;; Copyright © 2020 Jakub Kądziołka ;;; ;;; This file is part of GNU Guix. ;;; @@ -510,7 +511,11 @@ (define-public llvm-9 (uri (llvm-download-uri "llvm" version)) (sha256 (base32 - "16hwp3qa54c3a3v7h8nlw0fh5criqh0hlr1skybyk0cz70gyx880")))))) + "16hwp3qa54c3a3v7h8nlw0fh5criqh0hlr1skybyk0cz70gyx880")) + (patch-flags '("-p2")) + (patches (search-patches + "llvm-9-fix-scev-miscompilation.patch" + "llvm-9-fix-lpad-miscompilation.patch")))))) (define-public clang-runtime-9 (clang-runtime-from-llvm diff --git a/gnu/packages/patches/llvm-9-fix-lpad-miscompilation.patch b/gnu/packages/patches/llvm-9-fix-lpad-miscompilation.patch new file mode 100644 index 0000000000..6cfe07e50a --- /dev/null +++ b/gnu/packages/patches/llvm-9-fix-lpad-miscompilation.patch @@ -0,0 +1,97 @@ +From 011fb5bf8b31316472fccb1a19c91912246df9b2 Mon Sep 17 00:00:00 2001 +From: Reid Kleckner +Date: Sat, 28 Mar 2020 11:03:14 -0700 +Subject: [PATCH] [CodeGen] Fix sinking local values in lpads with phis + +There was already a test case for landingpads to handle this case, but I +had forgotten to consider PHI instructions preceding the EH_LABEL in the +landingpad. + +PR45261 +--- + llvm/lib/CodeGen/SelectionDAG/FastISel.cpp | 17 +++++++++- + llvm/test/CodeGen/X86/sink-local-value.ll | 36 ++++++++++++++++++++++ + 2 files changed, 52 insertions(+), 1 deletion(-) + +diff --git a/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp b/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp +index 5ac3606dc662..2638b1e8a05c 100644 +--- a/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp ++++ b/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp +@@ -225,6 +225,21 @@ static bool isRegUsedByPhiNodes(unsigned DefReg, + return false; + } + ++static bool isTerminatingEHLabel(MachineBasicBlock *MBB, MachineInstr &MI) { ++ // Ignore non-EH labels. ++ if (!MI.isEHLabel()) ++ return false; ++ ++ // Any EH label outside a landing pad must be for an invoke. Consider it a ++ // terminator. ++ if (!MBB->isEHPad()) ++ return true; ++ ++ // If this is a landingpad, the first non-phi instruction will be an EH_LABEL. ++ // Don't consider that label to be a terminator. ++ return MI.getIterator() != MBB->getFirstNonPHI(); ++} ++ + /// Build a map of instruction orders. Return the first terminator and its + /// order. Consider EH_LABEL instructions to be terminators as well, since local + /// values for phis after invokes must be materialized before the call. +@@ -233,7 +248,7 @@ void FastISel::InstOrderMap::initialize( + unsigned Order = 0; + for (MachineInstr &I : *MBB) { + if (!FirstTerminator && +- (I.isTerminator() || (I.isEHLabel() && &I != &MBB->front()))) { ++ (I.isTerminator() || isTerminatingEHLabel(MBB, I))) { + FirstTerminator = &I; + FirstTerminatorOrder = Order; + } +diff --git a/llvm/test/CodeGen/X86/sink-local-value.ll b/llvm/test/CodeGen/X86/sink-local-value.ll +index b0e511ac1189..f7d861ac9b6c 100644 +--- a/llvm/test/CodeGen/X86/sink-local-value.ll ++++ b/llvm/test/CodeGen/X86/sink-local-value.ll +@@ -145,6 +145,42 @@ try.cont: ; preds = %entry, %lpad + ; CHECK: retl + + ++define i32 @lpad_phi() personality i32 (...)* @__gxx_personality_v0 { ++entry: ++ store i32 42, i32* @sink_across ++ invoke void @may_throw() ++ to label %try.cont unwind label %lpad ++ ++lpad: ; preds = %entry ++ %p = phi i32 [ 11, %entry ] ; Trivial, but -O0 keeps it ++ %0 = landingpad { i8*, i32 } ++ catch i8* null ++ store i32 %p, i32* @sink_across ++ br label %try.cont ++ ++try.cont: ; preds = %entry, %lpad ++ %r.0 = phi i32 [ 13, %entry ], [ 55, %lpad ] ++ ret i32 %r.0 ++} ++ ++; The constant materialization should be *after* the stores to sink_across, but ++; before any EH_LABEL. ++ ++; CHECK-LABEL: lpad_phi: ++; CHECK: movl $42, sink_across ++; CHECK: movl $13, %{{[a-z]*}} ++; CHECK: .Ltmp{{.*}}: ++; CHECK: calll may_throw ++; CHECK: .Ltmp{{.*}}: ++; CHECK: jmp .LBB{{.*}} ++; CHECK: .LBB{{.*}}: # %lpad ++; CHECK-NEXT: .Ltmp{{.*}}: ++; CHECK: movl {{.*}}, sink_across ++; CHECK: movl $55, %{{[a-z]*}} ++; CHECK: .LBB{{.*}}: # %try.cont ++; CHECK: retl ++ ++ + ; Function Attrs: nounwind readnone speculatable + declare void @llvm.dbg.value(metadata, metadata, metadata) #0 + diff --git a/gnu/packages/patches/llvm-9-fix-scev-miscompilation.patch b/gnu/packages/patches/llvm-9-fix-scev-miscompilation.patch new file mode 100644 index 0000000000..3f16de5a2b --- /dev/null +++ b/gnu/packages/patches/llvm-9-fix-scev-miscompilation.patch @@ -0,0 +1,113 @@ +Guix note: this got detected with the test suite of rustc 1.41.1, but +the issue potentially affects all consumers of LLVM. + +From 58e8c793d0e43150a6452e971a32d7407a8a7401 Mon Sep 17 00:00:00 2001 +From: Tim Northover +Date: Mon, 30 Sep 2019 07:46:52 +0000 +Subject: [PATCH] Revert "[SCEV] add no wrap flag for SCEVAddExpr." + +This reverts r366419 because the analysis performed is within the context of +the loop and it's only valid to add wrapping flags to "global" expressions if +they're always correct. + +llvm-svn: 373184 +--- + llvm/lib/Analysis/ScalarEvolution.cpp | 2 +- + llvm/test/Analysis/ScalarEvolution/limit-depth.ll | 2 +- + llvm/test/Analysis/ScalarEvolution/nsw.ll | 2 +- + llvm/test/Analysis/ScalarEvolution/trip-count12.ll | 2 +- + llvm/test/Analysis/ScalarEvolution/trip-count9.ll | 8 ++++---- + 5 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/llvm/lib/Analysis/ScalarEvolution.cpp b/llvm/lib/Analysis/ScalarEvolution.cpp +index 354ae05bb841..c29fc5dbccfb 100644 +--- a/llvm/lib/Analysis/ScalarEvolution.cpp ++++ b/llvm/lib/Analysis/ScalarEvolution.cpp +@@ -4992,7 +4992,7 @@ const SCEV *ScalarEvolution::createSimpleAffineAddRec(PHINode *PN, + // overflow. + if (auto *BEInst = dyn_cast(BEValueV)) + if (isLoopInvariant(Accum, L) && isAddRecNeverPoison(BEInst, L)) +- (void)getAddRecExpr(getAddExpr(StartVal, Accum, Flags), Accum, L, Flags); ++ (void)getAddRecExpr(getAddExpr(StartVal, Accum), Accum, L, Flags); + + return PHISCEV; + } +diff --git a/llvm/test/Analysis/ScalarEvolution/limit-depth.ll b/llvm/test/Analysis/ScalarEvolution/limit-depth.ll +index db68a4f84c91..6fdf8c5df974 100644 +--- a/llvm/test/Analysis/ScalarEvolution/limit-depth.ll ++++ b/llvm/test/Analysis/ScalarEvolution/limit-depth.ll +@@ -46,7 +46,7 @@ define void @test_mul(i32 %a, i32 %b, i32 %c, i32 %d, i32 %e, i32 %f) { + define void @test_sext(i32 %a, i32 %b, i32 %c, i32 %d, i32 %e, i32 %f) { + ; CHECK-LABEL: @test_sext + ; CHECK: %se2 = sext i64 %iv2.inc to i128 +-; CHECK-NEXT: --> {(1 + (sext i64 {(sext i32 (1 + %a) to i64),+,1}<%loop> to i128)),+,1}<%loop2> ++; CHECK-NEXT: --> {(1 + (sext i64 {(sext i32 (1 + %a) to i64),+,1}<%loop> to i128)),+,1}<%loop2> + entry: + br label %loop + +diff --git a/llvm/test/Analysis/ScalarEvolution/nsw.ll b/llvm/test/Analysis/ScalarEvolution/nsw.ll +index 69427368625d..ca24f9d4a04b 100644 +--- a/llvm/test/Analysis/ScalarEvolution/nsw.ll ++++ b/llvm/test/Analysis/ScalarEvolution/nsw.ll +@@ -163,7 +163,7 @@ bb5: ; preds = %bb2 + declare void @f(i32) + + ; CHECK-LABEL: nswnowrap +-; CHECK: --> {(1 + %v),+,1}<%for.body>{{ U: [^ ]+ S: [^ ]+}}{{ *}}Exits: (2 + %v) ++; CHECK: --> {(1 + %v),+,1}<%for.body>{{ U: [^ ]+ S: [^ ]+}}{{ *}}Exits: (1 + ((1 + %v) smax %v)) + define void @nswnowrap(i32 %v, i32* %buf) { + entry: + %add = add nsw i32 %v, 1 +diff --git a/llvm/test/Analysis/ScalarEvolution/trip-count12.ll b/llvm/test/Analysis/ScalarEvolution/trip-count12.ll +index 5e7d72d5e4f3..d0086ee2e6ac 100644 +--- a/llvm/test/Analysis/ScalarEvolution/trip-count12.ll ++++ b/llvm/test/Analysis/ScalarEvolution/trip-count12.ll +@@ -1,7 +1,7 @@ + ; RUN: opt < %s -analyze -scalar-evolution | FileCheck %s + + ; CHECK: Determining loop execution counts for: @test +-; CHECK: Loop %for.body: backedge-taken count is ((-2 + %len) /u 2) ++; CHECK: Loop %for.body: backedge-taken count is ((-2 + %len) /u 2) + ; CHECK: Loop %for.body: max backedge-taken count is 1073741823 + + define zeroext i16 @test(i16* nocapture %p, i32 %len) nounwind readonly { +diff --git a/llvm/test/Analysis/ScalarEvolution/trip-count9.ll b/llvm/test/Analysis/ScalarEvolution/trip-count9.ll +index c0a1d12fa00e..9a080b34743f 100644 +--- a/llvm/test/Analysis/ScalarEvolution/trip-count9.ll ++++ b/llvm/test/Analysis/ScalarEvolution/trip-count9.ll +@@ -179,7 +179,7 @@ exit: + } + + ; CHECK: Determining loop execution counts for: @nsw_startx +-; CHECK: Loop %loop: backedge-taken count is (-1 + (-1 * %x) + ((1 + %x) smax %n)) ++; CHECK: Loop %loop: backedge-taken count is (-1 + (-1 * %x) + ((1 + %x) smax %n)) + ; CHECK: Loop %loop: max backedge-taken count is -1 + define void @nsw_startx(i4 %n, i4 %x) { + entry: +@@ -195,7 +195,7 @@ exit: + } + + ; CHECK: Determining loop execution counts for: @nsw_startx_step2 +-; CHECK: Loop %loop: backedge-taken count is ((-1 + (-1 * %x) + ((2 + %x) smax %n)) /u 2) ++; CHECK: Loop %loop: backedge-taken count is ((-1 + (-1 * %x) + ((2 + %x) smax %n)) /u 2) + ; CHECK: Loop %loop: max backedge-taken count is 7 + define void @nsw_startx_step2(i4 %n, i4 %x) { + entry: +@@ -381,7 +381,7 @@ exit: + } + + ; CHECK: Determining loop execution counts for: @even_nsw_startx +-; CHECK: Loop %loop: backedge-taken count is (-1 + (-1 * %x) + ((1 + %x) smax (2 * %n))) ++; CHECK: Loop %loop: backedge-taken count is (-1 + (-1 * %x) + ((1 + %x) smax (2 * %n))) + ; CHECK: Loop %loop: max backedge-taken count is -2 + define void @even_nsw_startx(i4 %n, i4 %x) { + entry: +@@ -398,7 +398,7 @@ exit: + } + + ; CHECK: Determining loop execution counts for: @even_nsw_startx_step2 +-; CHECK: Loop %loop: backedge-taken count is ((-1 + (-1 * %x) + ((2 + %x) smax (2 * %n))) /u 2) ++; CHECK: Loop %loop: backedge-taken count is ((-1 + (-1 * %x) + ((2 + %x) smax (2 * %n))) /u 2) + ; CHECK: Loop %loop: max backedge-taken count is 7 + define void @even_nsw_startx_step2(i4 %n, i4 %x) { + entry: -- cgit v1.2.3 From 7befec258c75254a65d393db9a1e70a0a2335cca Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Mon, 9 Mar 2020 09:16:13 +0100 Subject: gnu: rust: Bootstrap up to rustc 1.44. * gnu/packages/rust.scm (rust-1.40, rust-1.41, rust-1.42, rust-1.43, rust-1.44): New variables. --- gnu/packages/rust.scm | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index d139657f39..6fc0fd4f52 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Danny Milosavljevic ;;; Copyright © 2019 Ivan Petkov +;;; Copyright © 2020 Jakub Kądziołka ;;; ;;; This file is part of GNU Guix. ;;; @@ -797,6 +798,7 @@ (define-public rust-1.26 (("fn finds_author_git") "#[ignore]\nfn finds_author_git") (("fn finds_local_author_git") "#[ignore]\nfn finds_local_author_git")) #t)) + ;; TODO(rebuild-rust): Remove this phase in rust-1.28 when rebuilding. (add-after 'patch-cargo-tests 'disable-cargo-test-for-nightly-channel (lambda* _ ;; This test failed to work on "nightly" channel builds @@ -1143,12 +1145,16 @@ (define-public rust-1.37 (setenv "CARGO_HOME" cargo-home) #t)))))))))) +;; TODO(rebuild-rust): Switch to LLVM 9 in 1.38 instead of 1.40. (define-public rust-1.38 (let ((base-rust (rust-bootstrapped-package rust-1.37 "1.38.0" "101dlpsfkq67p0hbwx4acqq6n90dj4bbprndizpgh1kigk566hk4"))) (package (inherit base-rust) + #;(inputs + (alist-replace "llvm" (list llvm-9) + (package-inputs base-rust))) (arguments (substitute-keyword-arguments (package-arguments base-rust) ((#:phases phases) @@ -1183,4 +1189,98 @@ (define-public rust-1.39 (generate-all-checksums "vendor") #t))))))))) +(define-public rust-1.40 + (let ((base-rust + (rust-bootstrapped-package rust-1.39 "1.40.0" + "1ba9llwhqm49w7sz3z0gqscj039m53ky9wxzhaj11z6yg1ah15yx"))) + (package + (inherit base-rust) + (inputs + (alist-replace "llvm" (list llvm-9) + (package-inputs base-rust))) + (source + (origin + (inherit (package-source base-rust)) + ;; llvm-emscripten is no longer bundled, as that codegen backend + ;; got removed. + (snippet '(begin + (delete-file-recursively "src/llvm-project") + (delete-file-recursively "vendor/jemalloc-sys/jemalloc") + #t)))) + (arguments + ;; Rust 1.40 does not ship rustc-internal libraries by default + ;; (see rustc-dev-split). This means that librustc_driver.so is no + ;; longer available in lib/rustlib/$target/lib, which is the directory + ;; included in the runpath of librustc_codegen_llvm-llvm.so. + ;; This is detected by our validate-runpath phase as an error, but it + ;; is harmless as the codegen backend is loaded by librustc_driver.so + ;; itself, which must at that point have been already loaded. + ;; As such, we skip validating the runpath for Rust 1.40. + ;; Rust 1.41 stopped putting the codegen backend in a separate library, + ;; which makes this workaround only necessary for this release. + (cons* #:validate-runpath? #f + (substitute-keyword-arguments (package-arguments base-rust) + ((#:phases phases) + `(modify-phases ,phases + ;; We often need to patch tests with various Guix-specific paths. + ;; This often increases the line length and makes tidy, rustc's + ;; style checker, complain. We could insert additional newlines + ;; or add an "// ignore-tidy-linelength" comment, but as an + ;; ignore comment must be used, both approaches are fragile due + ;; to upstream formatting changes. As such, disable running the + ;; linter during tests, since it's intended for rustc developers + ;; anyway. + ;; + ;; TODO(rebuild-rust): This phase could be added earlier to + ;; simplify a significant amount of code, but it would require + ;; rebuilding the entire rusty universe. + (add-after 'patch-tests 'neuter-tidy + (lambda _ + (substitute* "src/bootstrap/builder.rs" + (("^.*::Tidy,") "")) + #t)) + ;; TODO(rebuild-rust): Adapt the find-files approach for + ;; earlier testsuite patches. + (replace 'patch-command-uid-gid-test + (lambda _ + (match (find-files "src/test" "command-uid-gid\\.rs") + ((file) + (substitute* file + (("/bin/sh") (which "sh"))))) + #t)) + (replace 'patch-command-exec-tests + ,(patch-command-exec-tests-phase + '(match (find-files "src/test" "command-exec\\.rs") + ((file) file)))) + ;; TODO(rebuild-rust): The test in question got fixed long ago. + (delete 'disable-cargo-test-for-nightly-channel) + ;; The test got removed in commit 000fe63b6fc57b09828930cacbab20c2ee6e6d15 + ;; "Remove painful test that is not pulling its weight" + (delete 'remove-unsupported-tests))))))))) + +(define-public rust-1.41 + (let ((base-rust + (rust-bootstrapped-package rust-1.40 "1.41.1" + "0ws5x0fxv57fyllsa6025h3q6j9v3m8nb3syl4x0hgkddq0kvj9q"))) + (package + (inherit base-rust) + (arguments + (substitute-keyword-arguments (package-arguments base-rust) + ((#:validate-runpath? _) #t)))))) + +(define-public rust-1.42 + (rust-bootstrapped-package rust-1.41 "1.42.0" + "0x9lxs82may6c0iln0b908cxyn1cv7h03n5cmbx3j1bas4qzks6j")) + +(define-public rust-1.43 + (rust-bootstrapped-package rust-1.42 "1.43.0" + "18akhk0wz1my6y9vhardriy2ysc482z0fnjdcgs9gy59kmnarxkm")) + +(define-public rust-1.44 + (rust-bootstrapped-package rust-1.43 "1.44.1" + "0ww4z2v3gxgn3zddqzwqya1gln04p91ykbrflnpdbmcd575n8bky")) + +;; NOTE: An update to LLVM 10 is coming in 1.45, make sure not to miss it. + +;; TODO(staging): Bump this variable to the latest packaged rust. (define-public rust rust-1.39) -- cgit v1.2.3 From ff2f86114c0d250351661a81bb95c627141179d8 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Fri, 3 Jul 2020 01:04:49 +0200 Subject: gnu: llvm-9: Backport patch to fix miscompilation for big-endian targets. * gnu/packages/llvm.scm (llvm-9)[source]: Add new patch. * gnu/packages/patches/llvm-9-fix-bitcast-miscompilation.patch: New file. * gnu/local.mk (dist_patch_DATA): Register new file. --- gnu/local.mk | 1 + gnu/packages/llvm.scm | 1 + .../llvm-9-fix-bitcast-miscompilation.patch | 192 +++++++++++++++++++++ 3 files changed, 194 insertions(+) create mode 100644 gnu/packages/patches/llvm-9-fix-bitcast-miscompilation.patch diff --git a/gnu/local.mk b/gnu/local.mk index 47180eea9d..9a691525a2 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1242,6 +1242,7 @@ dist_patch_DATA = \ %D%/packages/patches/lirc-localstatedir.patch \ %D%/packages/patches/lirc-reproducible-build.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 \ %D%/packages/patches/llvm-9-fix-scev-miscompilation.patch \ %D%/packages/patches/lm-sensors-hwmon-attrs.patch \ diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 7723ff5bc1..1a8c69639e 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -514,6 +514,7 @@ (define-public llvm-9 "16hwp3qa54c3a3v7h8nlw0fh5criqh0hlr1skybyk0cz70gyx880")) (patch-flags '("-p2")) (patches (search-patches + "llvm-9-fix-bitcast-miscompilation.patch" "llvm-9-fix-scev-miscompilation.patch" "llvm-9-fix-lpad-miscompilation.patch")))))) diff --git a/gnu/packages/patches/llvm-9-fix-bitcast-miscompilation.patch b/gnu/packages/patches/llvm-9-fix-bitcast-miscompilation.patch new file mode 100644 index 0000000000..fe381acf1b --- /dev/null +++ b/gnu/packages/patches/llvm-9-fix-bitcast-miscompilation.patch @@ -0,0 +1,192 @@ +From f8e146f3430de3a6cd904f3f3f7aa1bfaefee14c Mon Sep 17 00:00:00 2001 +From: Bjorn Pettersson +Date: Thu, 28 Nov 2019 23:18:28 +0100 +Subject: [PATCH] [InstCombine] Fix big-endian miscompile of (bitcast + (zext/trunc (bitcast))) + +Summary: +optimizeVectorResize is rewriting patterns like: + %1 = bitcast vector %src to integer + %2 = trunc/zext %1 + %dst = bitcast %2 to vector + +Since bitcasting between integer an vector types gives +different integer values depending on endianness, we need +to take endianness into account. As it happens the old +implementation only produced the correct result for little +endian targets. + +Fixes: https://bugs.llvm.org/show_bug.cgi?id=44178 + +Reviewers: spatel, lattner, lebedev.ri + +Reviewed By: spatel, lebedev.ri + +Subscribers: lebedev.ri, hiraditya, uabelho, llvm-commits + +Tags: #llvm + +Differential Revision: https://reviews.llvm.org/D70844 + +(cherry picked from commit a9d6b0e5444741d08ff1df7cf71d1559e7fefc1f) +--- + .../InstCombine/InstCombineCasts.cpp | 79 +++++++++++++------ + llvm/test/Transforms/InstCombine/cast.ll | 6 +- + 2 files changed, 60 insertions(+), 25 deletions(-) + +diff --git a/llvm/lib/Transforms/InstCombine/InstCombineCasts.cpp b/llvm/lib/Transforms/InstCombine/InstCombineCasts.cpp +index 2c9ba203fbf3..0af3de300e77 100644 +--- a/llvm/lib/Transforms/InstCombine/InstCombineCasts.cpp ++++ b/llvm/lib/Transforms/InstCombine/InstCombineCasts.cpp +@@ -18,6 +18,7 @@ + #include "llvm/IR/DIBuilder.h" + #include "llvm/IR/PatternMatch.h" + #include "llvm/Support/KnownBits.h" ++#include + using namespace llvm; + using namespace PatternMatch; + +@@ -1820,12 +1821,24 @@ Instruction *InstCombiner::visitPtrToInt(PtrToIntInst &CI) { + } + + /// This input value (which is known to have vector type) is being zero extended +-/// or truncated to the specified vector type. ++/// or truncated to the specified vector type. Since the zext/trunc is done ++/// using an integer type, we have a (bitcast(cast(bitcast))) pattern, ++/// endianness will impact which end of the vector that is extended or ++/// truncated. ++/// ++/// A vector is always stored with index 0 at the lowest address, which ++/// corresponds to the most significant bits for a big endian stored integer and ++/// the least significant bits for little endian. A trunc/zext of an integer ++/// impacts the big end of the integer. Thus, we need to add/remove elements at ++/// the front of the vector for big endian targets, and the back of the vector ++/// for little endian targets. ++/// + /// Try to replace it with a shuffle (and vector/vector bitcast) if possible. + /// + /// The source and destination vector types may have different element types. +-static Instruction *optimizeVectorResize(Value *InVal, VectorType *DestTy, +- InstCombiner &IC) { ++static Instruction *optimizeVectorResizeWithIntegerBitCasts(Value *InVal, ++ VectorType *DestTy, ++ InstCombiner &IC) { + // We can only do this optimization if the output is a multiple of the input + // element size, or the input is a multiple of the output element size. + // Convert the input type to have the same element type as the output. +@@ -1844,31 +1857,53 @@ static Instruction *optimizeVectorResize(Value *InVal, VectorType *DestTy, + InVal = IC.Builder.CreateBitCast(InVal, SrcTy); + } + ++ bool IsBigEndian = IC.getDataLayout().isBigEndian(); ++ unsigned SrcElts = SrcTy->getNumElements(); ++ unsigned DestElts = DestTy->getNumElements(); ++ ++ assert(SrcElts != DestElts && "Element counts should be different."); ++ + // Now that the element types match, get the shuffle mask and RHS of the + // shuffle to use, which depends on whether we're increasing or decreasing the + // size of the input. +- SmallVector ShuffleMask; ++ SmallVector ShuffleMaskStorage; ++ ArrayRef ShuffleMask; + Value *V2; + +- if (SrcTy->getNumElements() > DestTy->getNumElements()) { +- // If we're shrinking the number of elements, just shuffle in the low +- // elements from the input and use undef as the second shuffle input. +- V2 = UndefValue::get(SrcTy); +- for (unsigned i = 0, e = DestTy->getNumElements(); i != e; ++i) +- ShuffleMask.push_back(i); ++ // Produce an identify shuffle mask for the src vector. ++ ShuffleMaskStorage.resize(SrcElts); ++ std::iota(ShuffleMaskStorage.begin(), ShuffleMaskStorage.end(), 0); + ++ if (SrcElts > DestElts) { ++ // If we're shrinking the number of elements (rewriting an integer ++ // truncate), just shuffle in the elements corresponding to the least ++ // significant bits from the input and use undef as the second shuffle ++ // input. ++ V2 = UndefValue::get(SrcTy); ++ // Make sure the shuffle mask selects the "least significant bits" by ++ // keeping elements from back of the src vector for big endian, and from the ++ // front for little endian. ++ ShuffleMask = ShuffleMaskStorage; ++ if (IsBigEndian) ++ ShuffleMask = ShuffleMask.take_back(DestElts); ++ else ++ ShuffleMask = ShuffleMask.take_front(DestElts); + } else { +- // If we're increasing the number of elements, shuffle in all of the +- // elements from InVal and fill the rest of the result elements with zeros +- // from a constant zero. ++ // If we're increasing the number of elements (rewriting an integer zext), ++ // shuffle in all of the elements from InVal. Fill the rest of the result ++ // elements with zeros from a constant zero. + V2 = Constant::getNullValue(SrcTy); +- unsigned SrcElts = SrcTy->getNumElements(); +- for (unsigned i = 0, e = SrcElts; i != e; ++i) +- ShuffleMask.push_back(i); +- +- // The excess elements reference the first element of the zero input. +- for (unsigned i = 0, e = DestTy->getNumElements()-SrcElts; i != e; ++i) +- ShuffleMask.push_back(SrcElts); ++ // Use first elt from V2 when indicating zero in the shuffle mask. ++ uint32_t NullElt = SrcElts; ++ // Extend with null values in the "most significant bits" by adding elements ++ // in front of the src vector for big endian, and at the back for little ++ // endian. ++ unsigned DeltaElts = DestElts - SrcElts; ++ if (IsBigEndian) ++ ShuffleMaskStorage.insert(ShuffleMaskStorage.begin(), DeltaElts, NullElt); ++ else ++ ShuffleMaskStorage.append(DeltaElts, NullElt); ++ ShuffleMask = ShuffleMaskStorage; + } + + return new ShuffleVectorInst(InVal, V2, +@@ -2359,8 +2394,8 @@ Instruction *InstCombiner::visitBitCast(BitCastInst &CI) { + CastInst *SrcCast = cast(Src); + if (BitCastInst *BCIn = dyn_cast(SrcCast->getOperand(0))) + if (isa(BCIn->getOperand(0)->getType())) +- if (Instruction *I = optimizeVectorResize(BCIn->getOperand(0), +- cast(DestTy), *this)) ++ if (Instruction *I = optimizeVectorResizeWithIntegerBitCasts( ++ BCIn->getOperand(0), cast(DestTy), *this)) + return I; + } + +diff --git a/llvm/test/Transforms/InstCombine/cast.ll b/llvm/test/Transforms/InstCombine/cast.ll +index b6d1eda0601d..3ce8de033422 100644 +--- a/llvm/test/Transforms/InstCombine/cast.ll ++++ b/llvm/test/Transforms/InstCombine/cast.ll +@@ -824,7 +824,7 @@ define i64 @test59(i8 %A, i8 %B) { + + define <3 x i32> @test60(<4 x i32> %call4) { + ; CHECK-LABEL: @test60( +-; CHECK-NEXT: [[P10:%.*]] = shufflevector <4 x i32> [[CALL4:%.*]], <4 x i32> undef, <3 x i32> ++; CHECK-NEXT: [[P10:%.*]] = shufflevector <4 x i32> [[CALL4:%.*]], <4 x i32> undef, <3 x i32> + ; CHECK-NEXT: ret <3 x i32> [[P10]] + ; + %p11 = bitcast <4 x i32> %call4 to i128 +@@ -836,7 +836,7 @@ define <3 x i32> @test60(<4 x i32> %call4) { + + define <4 x i32> @test61(<3 x i32> %call4) { + ; CHECK-LABEL: @test61( +-; CHECK-NEXT: [[P10:%.*]] = shufflevector <3 x i32> [[CALL4:%.*]], <3 x i32> , <4 x i32> ++; CHECK-NEXT: [[P10:%.*]] = shufflevector <3 x i32> [[CALL4:%.*]], <3 x i32> , <4 x i32> + ; CHECK-NEXT: ret <4 x i32> [[P10]] + ; + %p11 = bitcast <3 x i32> %call4 to i96 +@@ -848,7 +848,7 @@ define <4 x i32> @test61(<3 x i32> %call4) { + define <4 x i32> @test62(<3 x float> %call4) { + ; CHECK-LABEL: @test62( + ; CHECK-NEXT: [[TMP1:%.*]] = bitcast <3 x float> [[CALL4:%.*]] to <3 x i32> +-; CHECK-NEXT: [[P10:%.*]] = shufflevector <3 x i32> [[TMP1]], <3 x i32> , <4 x i32> ++; CHECK-NEXT: [[P10:%.*]] = shufflevector <3 x i32> [[TMP1]], <3 x i32> , <4 x i32> + ; CHECK-NEXT: ret <4 x i32> [[P10]] + ; + %p11 = bitcast <3 x float> %call4 to i96 +-- +2.26.2 + -- cgit v1.2.3 From 5ce123bd9a1597bdbb8c1a83fb73ae82a0b86f60 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Mon, 29 Jun 2020 18:09:15 +0200 Subject: gnu: Add lld. * gnu/packages/llvm.scm (lld): New variable. --- gnu/packages/llvm.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 1a8c69639e..7cd9543036 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -538,6 +538,30 @@ (define-public clang-runtime clang-runtime-9) (define-public clang clang-9) (define-public clang-toolchain clang-toolchain-9) +(define-public lld + (package + (name "lld") + (version (package-version llvm-10)) + (source (origin + (method url-fetch) + (uri (llvm-download-uri "lld" version)) + (sha256 + (base32 + "026pwcbczcg0j5c9h7hxxrn3ki81ia9m9sfn0sy0bvzffv2xg85r")))) + (build-system cmake-build-system) + (inputs + `(("llvm" ,llvm-10))) + (arguments + `(#:build-type "Release" + ;; TODO: Tests require the lit tool, which isn't installed by the LLVM + ;; package. + #:tests? #f)) + (home-page "https://lld.llvm.org/") + (synopsis "Linker from the LLVM project") + (description "LLD is a high-performance linker, built as a set of reusable +components which highly leverage existing libraries in the larger LLVM Project.") + (license license:asl2.0))) ; With LLVM exception + (define-public llvm-8 (package (inherit llvm) -- cgit v1.2.3 From ce9ea43373d5eb3a9aef8c9b615b98b56b74ba2c Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Thu, 2 Jul 2020 21:46:37 -0500 Subject: gnu: Add ufetch. * gnu/packages/admin.scm (ufetch): New variable. --- gnu/packages/admin.scm | 51 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 9b3bca5482..a4a7f40f29 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2013 Cyril Roelandt ;;; Copyright © 2014, 2015, 2016, 2018, 2019 Mark H Weaver -;;; Copyright © 2014, 2015, 2016, 2017, 2018 Eric Bavier +;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2020 Eric Bavier ;;; Copyright © 2015, 2016 Taylan Ulrich Bayırlı/Kammer ;;; Copyright © 2015 Alex Sassmannshausen ;;; Copyright © 2015 Eric Dvorsak @@ -3253,6 +3253,55 @@ (define-public screenfetch everyone's screenshots nowadays.") (license license:gpl3))) +(define-public ufetch + (let ((commit "98b622023e03fe24dbc137e9a68104dfe1fbd04a") + (revision "1")) + (package + (name "ufetch") + (version (git-version "0.2" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/jschx/ufetch.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "09c4zmikza16xpydinnqbi3hmcibfrrn10wij7j0j1wv1pj2sl2l")))) + (build-system trivial-build-system) + (inputs + `(("bash" ,bash) + ("tput" ,ncurses))) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let* ((source (assoc-ref %build-inputs "source")) + (output (assoc-ref %outputs "out")) + (bindir (string-append output "/bin")) + (docdir (string-append output "/share/doc/ufetch-" ,version)) + (tput (string-append (assoc-ref %build-inputs "tput") "/bin/tput"))) + (install-file (string-append source "/LICENSE") docdir) + (setenv "PATH" (string-append (assoc-ref %build-inputs "bash") "/bin")) + (mkdir-p bindir) + (for-each (lambda (src) + (let ((dst (string-append bindir "/" (basename src)))) + (copy-file src dst) + (patch-shebang dst) + (substitute* dst (("tput") tput)))) + (find-files source "ufetch-[[:alpha:]]*$")) + ;; Note: the `ufetch` we create below will only work if run under + ;; the Guix System. I.e. a user trying to run `ufetch` on a + ;; foreign distro will not get great results. The `screenfetch` + ;; program does actual runtime detection of the operating system, + ;; and would be a better choice in such a situation. + (symlink "ufetch-guix" (string-append bindir "/ufetch")))))) + (home-page "https://gitlab.com/jschx/ufetch") + (synopsis "Tiny system info") + (description "This package provides a tiny system info utility.") + (license license:isc)))) + (define-public nnn (package (name "nnn") -- cgit v1.2.3 From 67d621c56eb3be0e9a5409e70bc5953d5ebf7865 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Thu, 2 Jul 2020 22:45:02 -0500 Subject: gnu: Add pfetch. * gnu/packages/admin.scm (pfetch): New variable. --- gnu/packages/admin.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index a4a7f40f29..6d8d6650ee 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3302,6 +3302,45 @@ (define-public ufetch (description "This package provides a tiny system info utility.") (license license:isc)))) +(define-public pfetch + (let ((commit "e18a0959ab98b963744755ec4687e59dc11db3c5") + (revision "0")) + (package + (name "pfetch") + (version (git-version "0.7.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dylanaraps/pfetch") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1md40av6i3xvvwig5jzhy4kf3s5sgxxk35r0vcyrjd8qyndk927l")))) + (build-system trivial-build-system) + (inputs `(("bash" ,bash))) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let* ((source (lambda (f) + (string-append (assoc-ref %build-inputs "source") "/" f))) + (output (assoc-ref %outputs "out")) + (docdir (string-append output "/share/doc/pfetch-" ,version))) + (install-file (source "LICENSE.md") docdir) + (install-file (source "README.md") docdir) + (install-file (source "pfetch") (string-append output "/bin")) + (patch-shebang + (string-append output "/bin/pfetch") + (list (string-append (assoc-ref %build-inputs "bash") "/bin"))) + #t)))) + (home-page "https://github.com/dylanaraps/pfetch") + (synopsis "System information tool") + (description "This package provides a simple, configurable system +information tool.") + (license license:expat)))) + (define-public nnn (package (name "nnn") -- cgit v1.2.3 From aa864ebdb01a7685401e2b143cb359b12175b46e Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Mon, 29 Jun 2020 15:24:45 +0200 Subject: system: 'read-boot-parameters' bugfix for multiboot. * gnu/system.scm (read-boot-parameters): Oops, only return value for multiboot-modules instead of (key value). --- gnu/system.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/system.scm b/gnu/system.scm index 44baacee7b..6a39931a41 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -353,7 +353,10 @@ (define device-sexp->device (('initrd (? string? file)) file))) - (multiboot-modules (or (assq 'multiboot-modules rest) '())) + (multiboot-modules + (match (assq 'multiboot-modules rest) + ((_ args) args) + (#f '()))) (store-device ;; Linux device names like "/dev/sda1" are not suitable GRUB device -- cgit v1.2.3 From 12906d3e2a79305270ade4a356d8b334d55ac264 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Mon, 29 Jun 2020 15:24:45 +0200 Subject: system: 'read-boot-parameters' allow initrd to be missing. * gnu/system.scm (read-boot-parameters): Allow initrd to be missing. --- gnu/system.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/system.scm b/gnu/system.scm index 6a39931a41..a6a9c958e6 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -351,7 +351,8 @@ (define device-sexp->device (('initrd ('string-append directory file)) ;the old format (string-append directory file)) (('initrd (? string? file)) - file))) + file) + (#f #f))) (multiboot-modules (match (assq 'multiboot-modules rest) -- cgit v1.2.3 From 2b76179ecd951172288f5f6f78402d9304d2da41 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Sun, 28 Jun 2020 18:51:25 +0200 Subject: services: system-service-type: Add entries support for the Hurd. When creating a disk-image using --save-provenance, "guix system describe" now works. * gnu/system.scm (operating-system-directory-base-entries): Add conditional "hurd" parameter, make "initrd" parameter conditional. (hurd-default-essential-services): Use them. (operating-system-boot-parameters-file): Only add 'initrd' when set. --- gnu/system.scm | 71 +++++++++++++++++++++++++++++++++------------------------- 1 file changed, 41 insertions(+), 30 deletions(-) diff --git a/gnu/system.scm b/gnu/system.scm index a6a9c958e6..bfbcb6fbdd 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -537,22 +537,26 @@ (define* (operating-system-directory-base-entries os) value of the SYSTEM-SERVICE-TYPE service." (let* ((locale (operating-system-locale-directory os)) (kernel (operating-system-kernel os)) + (hurd (operating-system-hurd os)) (modules (operating-system-kernel-loadable-modules os)) - (kernel (profile - (content (packages->manifest - (cons kernel - (map (lambda (module) - (if (package? module) - (package-for-kernel kernel - module) - module)) - modules)))) - (hooks (list linux-module-database)))) - (initrd (operating-system-initrd-file os)) + (kernel (if hurd + kernel + (profile + (content (packages->manifest + (cons kernel + (map (lambda (module) + (if (package? module) + (package-for-kernel kernel + module) + module)) + modules)))) + (hooks (list linux-module-database))))) + (initrd (and (not hurd) (operating-system-initrd-file os))) (params (operating-system-boot-parameters-file os))) `(("kernel" ,kernel) + ,@(if hurd `(("hurd" ,hurd)) '()) ("parameters" ,params) - ("initrd" ,initrd) + ,@(if initrd `(("initrd" ,initrd)) '()) ("locale" ,locale)))) ;used by libc (define (operating-system-default-essential-services os) @@ -604,23 +608,24 @@ (define known-fs (operating-system-firmware os))))))) (define (hurd-default-essential-services os) - (list (service system-service-type '()) - %boot-service - %hurd-startup-service - %activation-service - %shepherd-root-service - (service user-processes-service-type) - (account-service (append (operating-system-accounts os) - (operating-system-groups os)) - (operating-system-skeletons os)) - (root-file-system-service) - (service file-system-service-type '()) - (service fstab-service-type - (filter file-system-needed-for-boot? - (operating-system-file-systems os))) - (pam-root-service (operating-system-pam-services os)) - (operating-system-etc-service os) - (service profile-service-type (operating-system-packages os)))) + (let ((entries (operating-system-directory-base-entries os))) + (list (service system-service-type entries) + %boot-service + %hurd-startup-service + %activation-service + %shepherd-root-service + (service user-processes-service-type) + (account-service (append (operating-system-accounts os) + (operating-system-groups os)) + (operating-system-skeletons os)) + (root-file-system-service) + (service file-system-service-type '()) + (service fstab-service-type + (filter file-system-needed-for-boot? + (operating-system-file-systems os))) + (pam-root-service (operating-system-pam-services os)) + (operating-system-etc-service os) + (service profile-service-type (operating-system-packages os))))) (define* (operating-system-services os) "Return all the services of OS, including \"essential\" services." @@ -1276,7 +1281,13 @@ (define* (operating-system-boot-parameters-file os (kernel #$(boot-parameters-kernel params)) (kernel-arguments #$(boot-parameters-kernel-arguments params)) - (initrd #$(boot-parameters-initrd params)) + #$@(if (boot-parameters-initrd params) + #~((initrd #$(boot-parameters-initrd params))) + #~()) + #$@(if (pair? (boot-parameters-multiboot-modules params)) + #~((multiboot-modules + #$(boot-parameters-multiboot-modules params))) + #~()) (bootloader-name #$(boot-parameters-bootloader-name params)) (bootloader-menu-entries #$(map menu-entry->sexp -- cgit v1.2.3 From 28febfafbb23561624cc5c4ac8ed581f1f867f70 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Mon, 29 Jun 2020 15:24:56 +0200 Subject: guix system: "describe" displays multiboot info. * guix/scripts/system.scm (display-system-generation): Display multiboot-modules commands if set. --- guix/scripts/system.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index 28aaa6e3bc..61eeec622b 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -482,6 +482,7 @@ (define (display-channel channel) (uuid->string root) root)) (kernel (boot-parameters-kernel params)) + (multiboot-modules (boot-parameters-multiboot-modules params)) (provenance (catch 'system-error (lambda () (call-with-input-file @@ -511,6 +512,12 @@ (define (display-channel channel) (format #t (G_ " kernel: ~a~%") kernel) + (match multiboot-modules + (() #f) + (((modules . _) ...) + (format #t (G_ " multiboot: ~a~%") + (string-join modules "\n ")))) + (match provenance (#f #t) (('provenance ('version 0) -- cgit v1.2.3 From 5a2997e5a60fdbabc720f88f8e6b2e237989b1b2 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 3 Jul 2020 09:38:11 +0200 Subject: gnu: Add cl-bordeaux-fft. * gnu/packages/lisp-xyz.scm (sbcl-bordeaux-fft, cl-bordeaux-fft, ecl-bordeaux-fft): New variables. --- gnu/packages/lisp-xyz.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 97b5ec71e9..0519ac1532 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -12236,3 +12236,33 @@ (define-public cl-random-forest (define-public ecl-cl-random-forest (sbcl-package->ecl-package sbcl-cl-random-forest)) + +(define-public sbcl-bordeaux-fft + (let ((commit "4a1f5600cae59bdabcb32de4ee2d7d73a9450d6e") + (revision "0")) + (package + (name "sbcl-bordeaux-fft") + (version (git-version "1.0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ahefner/bordeaux-fft.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0j584w6kq2k6r8lp2i14f9605rxhp3r15s33xs08iz1pndn6iwqf")))) + (build-system asdf-build-system/sbcl) + (home-page "http://vintage-digital.com/hefner/software/bordeaux-fft/") + (synopsis "Fast Fourier Transform for Common Lisp") + (description + "The Bordeaux-FFT library provides a reasonably efficient implementation +of the Fast Fourier Transform and its inverse for complex-valued inputs, in +portable Common Lisp.") + (license license:gpl2+)))) + +(define-public cl-bordeaux-fft + (sbcl-package->cl-source-package sbcl-bordeaux-fft)) + +(define-public ecl-bordeaux-fft + (sbcl-package->ecl-package sbcl-bordeaux-fft)) -- cgit v1.2.3 From c7ce30cd5d65d5738ff30505e97aa5dc17081631 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 3 Jul 2020 09:51:24 +0200 Subject: gnu: Add cl-napa-fft3. * gnu/packages/lisp-xyz.scm (sbcl-napa-fft3, cl-napa-fft3): New variables. --- gnu/packages/lisp-xyz.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 0519ac1532..0848603b56 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -12266,3 +12266,30 @@ (define-public cl-bordeaux-fft (define-public ecl-bordeaux-fft (sbcl-package->ecl-package sbcl-bordeaux-fft)) + +(define-public sbcl-napa-fft3 + (let ((commit "f2d9614c7167da327c9ceebefb04ff6eae2d2236") + (revision "0")) + (package + (name "sbcl-napa-fft3") + (version (git-version "0.0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pkhuong/Napa-FFT3.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1hxjf599xgwm28gbryy7q96j9ys6hfszmv0qxpr5698hxnhknscp")))) + (build-system asdf-build-system/sbcl) + (home-page "https://github.com/pkhuong/Napa-FFT3") + (synopsis "Fast Fourier Transform routines in Common Lisp") + (description + "Napa-FFT3 provides Discrete Fourier Transform (DFT) routines, but also +buildings blocks to express common operations that involve DFTs: filtering, +convolutions, etc.") + (license license:bsd-3)))) + +(define-public cl-napa-fft3 + (sbcl-package->cl-source-package sbcl-napa-fft3)) -- cgit v1.2.3 From 809aa3c51c5a0f3d8e3d8133b22684702cb90287 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 3 Jul 2020 10:20:24 +0200 Subject: Revert "gnu: sbcl: Update to 2.0.6." This reverts commit 1ac4959c6a94a89fc8d3a73239d107cfb1d96240. SBCL 2.0.6 breaks named-readtables and consequently many Common Lisp packages. See https://github.com/melisgl/named-readtables/issues/19. --- gnu/packages/lisp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 8227765dd4..4e06efdab7 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -372,14 +372,14 @@ (define-public clisp (define-public sbcl (package (name "sbcl") - (version "2.0.6") + (version "2.0.5") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/sbcl/sbcl/" version "/sbcl-" version "-source.tar.bz2")) (sha256 - (base32 "1bnxmmq2yvwj6hb4d96v3k82bcmwhfqx5jixzr14zk4p3m6dd4px")))) + (base32 "1jz26w1i3riv032aa35vww4cv7cjk2ww7dp70c7wk4r8s66zhl00")))) (build-system gnu-build-system) (outputs '("out" "doc")) (native-inputs -- cgit v1.2.3 From b8fe812fe995c42c0db40fe2fe4a806064488e9c Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Mon, 29 Jun 2020 15:03:02 +0200 Subject: gnu: js8call: Update to 2.2.0. * gnu/packages/radio.scm (js8call): Update to 2.2.0. [inputs]: Use wsjtx-hamlib instead of regular hamlib. --- gnu/packages/radio.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 3f9987d0ae..7e04e91e26 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -896,14 +896,14 @@ (define-public js8call (package (inherit wsjtx) (name "js8call") - (version "2.1.1") + (version "2.2.0") (source (origin (method url-fetch) (uri (string-append "http://files.js8call.com/" version "/js8call-" version ".tgz")) (sha256 - (base32 "034jnv6h172znn9ijl6wpmzx0rqibb69ppg52ndvkxhqlgrbsvyc")) + (base32 "149sjwc4zg6ckgq26af93p4fxappa4k9dh7rdy67g8ajfjad4cd8")) (modules '((guix build utils))) (snippet '(begin @@ -921,7 +921,7 @@ (define-public js8call `(("boost" ,boost) ("fftw" ,fftw) ("fftwf" ,fftwf) - ("hamlib" ,hamlib) + ("hamlib" ,wsjtx-hamlib) ("libusb" ,libusb) ("qtbase" ,qtbase) ("qtmultimedia" ,qtmultimedia) -- cgit v1.2.3 From e643431c126b3fb696ac200c1146c9dd0ae8a668 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Fri, 3 Jul 2020 15:19:33 +0200 Subject: gnu: sbcl: Add comment explaining out-of-date version. Make sure no one repeats this mistake. This is a follow-up to commit 809aa3c51c5a0f3d8e3d8133b22684702cb90287. * gnu/packages/lisp.scm (sbcl): Add a comment advising against updating to 2.0.6. --- gnu/packages/lisp.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 4e06efdab7..4de4e9f9d6 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -369,6 +369,8 @@ (define-public clisp an interpreter, a compiler, a debugger, and much more.") (license license:gpl2+))) +;; NOTE: SBCL 2.0.6 breaks named-readtables and consequently many Common Lisp packages. +;; See https://github.com/melisgl/named-readtables/issues/19. (define-public sbcl (package (name "sbcl") -- cgit v1.2.3 From ec70df7243b8d0892d8cec7a43a87c9740c4bfaa Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 3 Jul 2020 15:35:16 +0200 Subject: gnu: nyxt (formerly 'next'): Update to 20200702. * gnu/packages/web-browsers.scm (next): Deprecate in favour of nyxt. (nyxt): New variable. --- gnu/packages/web-browsers.scm | 359 +++++++++++++++--------------------------- 1 file changed, 124 insertions(+), 235 deletions(-) diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index c30a4ff3a2..2ac93c3ff4 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -452,247 +452,136 @@ (define-public vimb driven and does not detract you from your daily work.") (license license:gpl3+))) -(define next-gtk-webkit - (package - (name "next-gtk-webkit") - (version "1.5.0") - (source - (origin - (method git-fetch) - (uri (git-reference - ;; TODO: Mirror seems to hang, let's fallback to GitHub for now. - ;; (url "https://source.atlas.engineer/public/next") - (url "https://github.com/atlas-engineer/next") - (commit version))) - (sha256 - (base32 - "1gqkp185wcwaxr8py90hqk44nqjblrrdwvig19gizrbzr2gx2zhy")) - (file-name (git-file-name "next" version)))) - (build-system glib-or-gtk-build-system) - (arguments - `(#:tests? #f ; no tests - #:make-flags (list "gtk-webkit" - "CC=gcc" - (string-append "PREFIX=" %output)) - #:phases - (modify-phases %standard-phases - (delete 'configure) - (replace 'install - (lambda* (#:key (make-flags '()) #:allow-other-keys) - (apply invoke "make" "install-gtk-webkit" make-flags)))))) - (inputs - `(("glib-networking" ,glib-networking) - ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) - ("webkitgtk" ,webkitgtk))) - (native-inputs - `(("pkg-config" ,pkg-config))) - (home-page "https://next.atlas.engineer") - (synopsis "Extensible web-browser in Common Lisp") - (description "Next is a keyboard-oriented, extensible web-browser +(define-public nyxt + ;; 1.5.0 does not build anymore, let's use the master which is more stable anyways. + (let ((commit "9440980a9c5f75232b08ca98183b22be4a3d9bc3")) + (package + (name "nyxt") + (version (git-version "1.5.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + ;; TODO: Mirror seems to hang, let's fallback to GitHub for now. + ;; (url "https://source.atlas.engineer/public/nyxt") + (url "https://github.com/atlas-engineer/nyxt") + (commit commit))) + (sha256 + (base32 + "079n5ffsa8136i9ik5mn4rwa3iv0avncw6y973gj3hlf8sf4wv7g")) + (file-name (git-file-name "nyxt" version)))) + (build-system gnu-build-system) + (arguments + `(#:make-flags (list "nyxt" "NYXT_INTERNAL_QUICKLISP=false" + (string-append "DESTDIR=" (assoc-ref %outputs "out")) + "PREFIX=") + #:strip-binaries? #f ; Stripping breaks SBCL binaries. + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-version ; Version is guessed from .git which Guix does not have. + (lambda* (#:key inputs #:allow-other-keys) + (let ((version (format #f "~a" ,version))) + (substitute* "source/global.lisp" + (("version\\)\\)\\)") + (string-append "version)))" + "\n" + "(setf +version+ \"" version "\")")))) + #t)) + (add-before 'build 'make-desktop-version-number + (lambda _ + (with-output-to-file "version" + (lambda _ + (format #t "~a" ,version))))) + + (delete 'configure) + (add-before 'build 'fix-common-lisp-cache-folder + (lambda _ + (setenv "HOME" "/tmp") + #t)) + (add-after 'install 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((bin (string-append (assoc-ref outputs "out") "/bin/nyxt")) + (glib-networking (assoc-ref inputs "glib-networking")) + (libs '("gsettings-desktop-schemas")) + (path (string-join + (map (lambda (lib) + (string-append (assoc-ref inputs lib) "/lib")) + libs) + ":")) + (gi-path (string-join + (map (lambda (lib) + (string-append (assoc-ref inputs lib) "/lib/girepository-1.0")) + libs) + ":")) + (xdg-path (string-join + (map (lambda (lib) + (string-append (assoc-ref inputs lib) "/share")) + libs) + ":"))) + (wrap-program bin + `("GIO_EXTRA_MODULES" prefix + (,(string-append glib-networking "/lib/gio/modules"))) + `("GI_TYPELIB_PATH" prefix (,gi-path)) + `("LD_LIBRARY_PATH" ":" prefix (,path)) + `("XDG_DATA_DIRS" ":" prefix (,xdg-path))) + #t)))))) + (native-inputs + `(("prove" ,sbcl-prove) + ("sbcl" ,sbcl))) + (inputs + ;; We need to avoid sbcl-* inputs (sbcl-cl-cffi-gtk in particular) as they + ;; seem to cause Nyxt to hang into a hogging process in about 10 minutes. + ;; Probably an issue between CFFI and how we build SBCL packages. + ;; See https://github.com/atlas-engineer/nyxt/issues/680. + `(("alexandria" ,cl-alexandria) + ("bordeaux-threads" ,cl-bordeaux-threads) + ("cl-containers" ,cl-containers) + ("cl-css" ,cl-css) + ("cl-json" ,cl-json) + ("cl-markup" ,cl-markup) + ("cl-ppcre" ,cl-ppcre) + ("cl-prevalence" ,cl-prevalence) + ("closer-mop" ,cl-closer-mop) + ("cluffer" ,cl-cluffer) + ("dexador" ,cl-dexador) + ("enchant" ,cl-enchant) + ("fset" ,cl-fset) + ("iolib" ,cl-iolib) + ("local-time" ,cl-local-time) + ("log4cl" ,cl-log4cl) + ("lparallel" ,cl-lparallel) + ("mk-string-metrics" ,cl-mk-string-metrics) + ("moptilities" ,cl-moptilities) + ("osicat" ,sbcl-osicat) ; SBCL version needed for libosicat.so. + ("parenscript" ,cl-parenscript) + ("plump" ,cl-plump) + ("quri" ,cl-quri) + ("serapeum" ,cl-serapeum) + ("str" ,cl-str) + ("swank" ,cl-slime-swank) + ("trivia" ,cl-trivia) + ("trivial-clipboard" ,cl-trivial-clipboard) + ("trivial-features" ,cl-trivial-features) + ("trivial-package-local-nicknames" ,cl-trivial-package-local-nicknames) + ("trivial-types" ,cl-trivial-types) + ("unix-opts" ,cl-unix-opts) + ;; WebKitGTK deps + ("cl-cffi-gtk" ,cl-cffi-gtk) + ("cl-webkit" ,cl-webkit) + ("glib-networking" ,glib-networking) + ("gsettings-desktop-schemas" ,gsettings-desktop-schemas))) + (synopsis "Extensible web-browser in Common Lisp") + (home-page "https://nyxt.atlas.engineer") + (description "Nyxt is a keyboard-oriented, extensible web-browser designed for power users. The application has familiar Emacs and VI key-bindings and is fully configurable and extensible in Common Lisp.") - (license license:bsd-3))) - -(define sbcl-next-download-manager - (package - (inherit next-gtk-webkit) - (name "sbcl-next-download-manager") - (build-system asdf-build-system/sbcl) - (arguments - `(#:tests? #f ; Need online access. - #:asd-file "next.asd" - #:asd-system-name "next/download-manager")) - (inputs - `(("cl-ppcre" ,sbcl-cl-ppcre) - ("dexador" ,sbcl-dexador) - ("log4cl" ,sbcl-log4cl) - ("lparallel" ,sbcl-lparallel) - ("quri" ,sbcl-quri) - ("str" ,sbcl-cl-str))) - (native-inputs - `(("trivial-features" ,sbcl-trivial-features) - ("prove-asdf" ,sbcl-prove-asdf))) - (synopsis "Extensible web-browser in Common Lisp (download manager)"))) - -(define sbcl-next-ring - (package - (inherit next-gtk-webkit) - (name "sbcl-next-ring") - (build-system asdf-build-system/sbcl) - (arguments - `(#:tests? #t - #:asd-file "next.asd" - #:asd-system-name "next/ring")) - (native-inputs - `(("trivial-features" ,sbcl-trivial-features) - ("prove-asdf" ,sbcl-prove-asdf))) - (synopsis "Extensible web-browser in Common Lisp (ring)"))) - -(define sbcl-next-history-tree - (package - (inherit next-gtk-webkit) - (name "sbcl-next-history-tree") - (build-system asdf-build-system/sbcl) - (arguments - `(#:tests? #t - #:asd-file "next.asd" - #:asd-system-name "next/history-tree")) - (native-inputs - `(("trivial-features" ,sbcl-trivial-features) - ("prove-asdf" ,sbcl-prove-asdf))) - (synopsis "Extensible web-browser in Common Lisp (history-tree)"))) - -(define sbcl-next-password-manager - (package - (inherit next-gtk-webkit) - (name "sbcl-next-password-manager") - (build-system asdf-build-system/sbcl) - (arguments - `(#:tests? #t - #:asd-file "next.asd" - #:asd-system-name "next/password-manager")) - (inputs - `(("bordeaux-threads" ,sbcl-bordeaux-threads) - ("cl-annot" ,sbcl-cl-annot) - ("cl-ppcre" ,sbcl-cl-ppcre) - ("str" ,sbcl-cl-str) - ("trivial-clipboard" ,sbcl-trivial-clipboard))) - (native-inputs - `(("trivial-features" ,sbcl-trivial-features) - ("prove-asdf" ,sbcl-prove-asdf))) - (synopsis "Extensible web-browser in Common Lisp (password manager)"))) - -(define sbcl-next-hooks - (package - (inherit next-gtk-webkit) - (name "sbcl-next-hooks") - (build-system asdf-build-system/sbcl) - (arguments - `(#:tests? #t - #:asd-file "next.asd" - #:asd-system-name "next/hooks")) - (inputs - `(("alexandria" ,sbcl-alexandria) - ("serapeum" ,sbcl-serapeum))) - (native-inputs - `(("trivial-features" ,sbcl-trivial-features) - ("prove-asdf" ,sbcl-prove-asdf))) - (synopsis "Infinitely extensible web-browser (hooks)"))) + (license license:bsd-3)))) (define-public next - (let ((version (package-version next-gtk-webkit))) - (package - (inherit next-gtk-webkit) - (name "next") - (build-system asdf-build-system/sbcl) - (outputs '("out" "lib")) - (arguments - `(#:tests? #f ; no tests - #:asd-system-name "next" - #:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-platform-port-path - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "source/ports/gtk-webkit.lisp" - (("\"next-gtk-webkit\"") - (string-append "\"" (assoc-ref inputs "next-gtk-webkit") - "/bin/next-gtk-webkit\""))) - #t)) - (add-after 'patch-platform-port-path 'patch-version - ;; When the version is not just dot-separated numerals - ;; (e.g. a git-commit version), Guix modifies the .asd with - ;; an illegal version number, and then Next fails to query - ;; it. So we hard-code it here. - (lambda* (#:key inputs #:allow-other-keys) - (let ((version (format #f "~a" ,version))) - (substitute* "source/global.lisp" - (("version\\)\\)\\)") - (string-append "version))) -(setf +version+ \"" version "\")")))) - #t)) - (add-before 'cleanup 'move-bundle - (lambda* (#:key outputs #:allow-other-keys) - (define lib (assoc-ref outputs "lib")) - (define actual-fasl (string-append - lib - "/lib/sbcl/next.fasl")) - (define expected-fasl (string-append - lib - "/lib/sbcl/next--system.fasl")) - (copy-file actual-fasl expected-fasl) - #t)) - (add-after 'create-symlinks 'build-program - (lambda* (#:key outputs #:allow-other-keys) - (build-program - (string-append (assoc-ref outputs "out") "/bin/next") - outputs - #:entry-program '((next:entry-point) 0)))) - (add-before 'build 'install-assets - ;; Since the ASDF build system generates a new .asd with a - ;; possibly suffixed and thus illegal version number, assets - ;; should not be installed after the 'build phase or else - ;; the illegal version will result in NIL in the .desktop - ;; file. - (lambda* (#:key outputs #:allow-other-keys) - (with-output-to-file "version" - (lambda _ - (format #t "~a" ,(package-version next-gtk-webkit)))) - (invoke "make" "install-assets" - (string-append "PREFIX=" - (assoc-ref outputs "out"))))) - (add-after 'unpack 'fix-lambda-list - ;; Starting from SBCL 2.0.2, Next 1.5.0 won't build - ;; because of a weird lambda list type. - (lambda _ - (substitute* "source/keymap.lisp" - (("^\\(declaim .* define-key\\)\\)") "")) - (substitute* "source/search-buffer.lisp" - (("define-key :keymap keymap \"C-s\"") "define-key \"C-s\"") - (("\\(update-selection-highlight-hint :follow t :scroll t\\)\\)\\)") - "(update-selection-highlight-hint :follow t :scroll t)) :keymap keymap)"))))))) - (inputs - `(("alexandria" ,sbcl-alexandria) - ("bordeaux-threads" ,sbcl-bordeaux-threads) - ("cl-annot" ,sbcl-cl-annot) - ("cl-ansi-text" ,sbcl-cl-ansi-text) - ("cl-css" ,sbcl-cl-css) - ("cl-json" ,sbcl-cl-json) - ("cl-markup" ,sbcl-cl-markup) - ("cl-ppcre" ,sbcl-cl-ppcre) - ("cl-ppcre-unicode" ,sbcl-cl-ppcre-unicode) - ("cl-prevalence" ,sbcl-cl-prevalence) - ("closer-mop" ,sbcl-closer-mop) - ("dbus" ,cl-dbus) - ("dexador" ,sbcl-dexador) - ("ironclad" ,sbcl-ironclad) - ("local-time" ,sbcl-local-time) - ("log4cl" ,sbcl-log4cl) - ("lparallel" ,sbcl-lparallel) - ("mk-string-metrics" ,sbcl-mk-string-metrics) - ("parenscript" ,sbcl-parenscript) - ("plump" ,sbcl-plump) - ("quri" ,sbcl-quri) - ("serapeum" ,sbcl-serapeum) - ("sqlite" ,sbcl-cl-sqlite) - ("str" ,sbcl-cl-str) - ("swank" ,sbcl-slime-swank) - ("trivia" ,sbcl-trivia) - ("trivial-clipboard" ,sbcl-trivial-clipboard) - ("unix-opts" ,sbcl-unix-opts) - ;; Local deps - ("next-gtk-webkit" ,next-gtk-webkit) - ("next-download-manager" ,sbcl-next-download-manager) - ("next-ring" ,sbcl-next-ring) - ("next-history-tree" ,sbcl-next-history-tree) - ("next-password-manager" ,sbcl-next-password-manager) - ("next-hooks" ,sbcl-next-hooks))) - (native-inputs - `(("trivial-features" ,sbcl-trivial-features) - ("trivial-types" ,sbcl-trivial-types) - ("prove-asdf" ,sbcl-prove-asdf))) - (synopsis "Extensible web-browser in Common Lisp")))) + (deprecated-package "next" nyxt)) (define-public sbcl-next - (deprecated-package "sbcl-next" next)) + (deprecated-package "sbcl-next" nyxt)) (define-public bombadillo (package -- cgit v1.2.3 From 2ca4ae2993e20a1415fa25acf8fd6b993ee48c18 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Fri, 3 Jul 2020 14:05:18 -0500 Subject: gnu: Update synergy to 1.11.1. * gnu/packages/synergy.scm (synergy): Update to 1.11.1. [arguments]: Add "patch-desktop" phase. [native-inputs]: New field. [inputs]: Remove unused "xinput" input. --- gnu/packages/synergy.scm | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/gnu/packages/synergy.scm b/gnu/packages/synergy.scm index 739ea3bd75..4db15527d7 100644 --- a/gnu/packages/synergy.scm +++ b/gnu/packages/synergy.scm @@ -37,17 +37,17 @@ (define-module (gnu packages synergy) (define-public synergy (package (name "synergy") - (version "1.11.0") + (version "1.11.1") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/symless/synergy-core.git") - (commit (string-append version "-stable")))) + (commit (string-append "v" version "-stable")))) (file-name (git-file-name name version)) (sha256 (base32 - "1jk60xw4h6s5crha89wk4y8rrf1f3bixgh5mzh3cq3xyrkba41gh")) + "0dn0h3mdqy0mbg4yyhsh4rhvvsssqlknnln3naplc97my10lk2a0")) (modules '((guix build utils))) (snippet ;; Remove unnecessary bundled source and binaries @@ -65,7 +65,15 @@ (define-public synergy (string-append (assoc-ref inputs "avahi") "/include/avahi-compat-libdns_sd:" (or (getenv "CPLUS_INCLUDE_PATH") ""))) - #t))))) + #t)) + (add-after 'install 'patch-desktop + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* (string-append out "/share/applications/synergy.desktop") + (("/usr") out)) + #t)))))) + (native-inputs + `(("qttools" ,qttools))) ; for Qt5LinguistTools (inputs `(("avahi" ,avahi) ("python" ,python-wrapper) @@ -74,7 +82,6 @@ (define-public synergy ("libxi" ,libxi) ("libx11" ,libx11) ("libxtst" ,libxtst) - ("xinput" ,xinput) ("qtbase" ,qtbase))) (home-page "https://symless.com/synergy") (synopsis "Mouse and keyboard sharing utility") -- cgit v1.2.3 From c11b95af7f5c2c77478353a808ce47627969a779 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 3 Jul 2020 22:43:17 +0200 Subject: gnu: hpcguix-web: Add guix to inputs. * gnu/packages/web.scm (hpcguix-web)[inputs]: Add guix. --- gnu/packages/web.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 47b0c5c9fb..1a7ea54601 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -7372,7 +7372,8 @@ (define-public hpcguix-web ("uglify-js" ,uglify-js) ("pkg-config" ,pkg-config))) (inputs - `(("guile" ,@(assoc-ref (package-native-inputs guix) "guile")))) + `(("guile" ,@(assoc-ref (package-native-inputs guix) "guile")) + ("guix" ,guix))) (propagated-inputs `(("guile" ,@(assoc-ref (package-native-inputs guix) "guile")) ("guile-commonmark" ,guile-commonmark) -- cgit v1.2.3 From 37c3e0bbaf2efe137b434f866ca431803d33e0a9 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 3 Jul 2020 21:18:07 +0200 Subject: lint: Do not assume that a package's source is an origin. * guix/lint.scm (check-source-file-name): Ensure ORIGIN is an origin. (check-patch-file-names)[patches]: Likewise. (check-source): Likewise. --- guix/lint.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/guix/lint.scm b/guix/lint.scm index 8a4d27ce05..445c06f8f4 100644 --- a/guix/lint.scm +++ b/guix/lint.scm @@ -670,8 +670,9 @@ (define (check-patch-file-names package) (%make-warning package (condition-message c) #:field 'patch-file-names)))) (define patches - (or (and=> (package-source package) origin-patches) - '())) + (match (package-source package) + ((? origin? origin) (origin-patches origin)) + (_ '()))) (define (starts-with-package-name? file-name) (and=> (string-contains file-name (package-name package)) @@ -792,7 +793,7 @@ (define (warnings-for-uris uris) (loop rest (cons warning warnings)))))))) (let ((origin (package-source package))) - (if (and origin + (if (and (origin? origin) (eqv? (origin-method origin) url-fetch)) (let* ((uris (append-map (cut maybe-expand-mirrors <> %mirrors) (map string->uri (origin-uris origin)))) @@ -828,7 +829,7 @@ (define (origin-file-name-valid? origin) (not (string-match (string-append "^v?" version) file-name))))) (let ((origin (package-source package))) - (if (or (not origin) (origin-file-name-valid? origin)) + (if (or (not (origin? origin)) (origin-file-name-valid? origin)) '() (list (make-warning package -- cgit v1.2.3 From 00290e7365aed9b34603bfb3cd6e8a4bdc1e7259 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 3 Jul 2020 22:45:21 +0200 Subject: upstream: Define 'url-predicate' and use it. * guix/upstream.scm (url-predicate): New procedure. (url-prefix-predicate): Define in terms of 'url-predicate'. * guix/import/cpan.scm (cpan-package?): Use 'url-predicate'. * guix/import/cran.scm (cran-package?) (bioconductor-package?) (bioconductor-data-package?) (bioconductor-experiment-package?): Likewise. * guix/import/crate.scm (crate-package?): Likewise. * guix/import/elpa.scm (package-from-gnu.org?): Likewise. * guix/import/hackage.scm (hackage-package?): Likewise. * guix/import/pypi.scm (pypi-package?): Likewise. * guix/import/gem.scm (gem-package?): Use 'url-prefix-predicate'. --- guix/import/cpan.scm | 26 +++++++------------------- guix/import/cran.scm | 28 ++++------------------------ guix/import/crate.scm | 12 ++---------- guix/import/elpa.scm | 12 +++++------- guix/import/gem.scm | 16 ++-------------- guix/import/hackage.scm | 19 +++---------------- guix/import/pypi.scm | 24 +++++++----------------- guix/upstream.scm | 31 ++++++++++++++++++------------- 8 files changed, 48 insertions(+), 120 deletions(-) diff --git a/guix/import/cpan.scm b/guix/import/cpan.scm index 6bcd2ce9eb..085467b871 100644 --- a/guix/import/cpan.scm +++ b/guix/import/cpan.scm @@ -316,25 +316,13 @@ (define (cpan->guix-package module-name) (let ((release (cpan-fetch (module->name module-name)))) (and=> release cpan-module->sexp))) -(define (cpan-package? package) - "Return #t if PACKAGE is a package from CPAN." - (define cpan-url? - (let ((cpan-rx (make-regexp (string-append "(" - "mirror://cpan" "|" - "https?://www.cpan.org" "|" - "https?://cpan.metacpan.org" - ")")))) - (lambda (url) - (regexp-exec cpan-rx url)))) - - (let ((source-url (and=> (package-source package) origin-uri)) - (fetch-method (and=> (package-source package) origin-method))) - (and (eq? fetch-method url-fetch) - (match source-url - ((? string?) - (cpan-url? source-url)) - ((source-url ...) - (any cpan-url? source-url)))))) +(define cpan-package? + (let ((cpan-rx (make-regexp (string-append "(" + "mirror://cpan" "|" + "https?://www.cpan.org" "|" + "https?://cpan.metacpan.org" + ")")))) + (url-predicate (cut regexp-exec cpan-rx <>)))) (define (latest-release package) "Return an for the latest release of PACKAGE." diff --git a/guix/import/cran.scm b/guix/import/cran.scm index b822fbc0ae..a1275b4822 100644 --- a/guix/import/cran.scm +++ b/guix/import/cran.scm @@ -661,12 +661,7 @@ (define (cran-package? package) ;; Check if the upstream name can be extracted from package uri. (package->upstream-name package) ;; Check if package uri(s) are prefixed by "mirror://cran". - (match (and=> (package-source package) origin-uri) - ((? string? uri) - (string-prefix? "mirror://cran" uri)) - ((? list? uris) - (any (cut string-prefix? "mirror://cran" <>) uris)) - (_ #f)))) + ((url-predicate (cut string-prefix? "mirror://cran" <>)) package))) (define (bioconductor-package? package) "Return true if PACKAGE is an R package from Bioconductor." @@ -680,12 +675,7 @@ (define (bioconductor-package? package) ;; Experiment packages are in a separate repository. (not (string-contains uri "/data/experiment/")))))) (and (string-prefix? "r-" (package-name package)) - (match (and=> (package-source package) origin-uri) - ((? string? uri) - (predicate uri)) - ((? list? uris) - (any predicate uris)) - (_ #f))))) + ((url-predicate predicate) package)))) (define (bioconductor-data-package? package) "Return true if PACKAGE is an R data package from Bioconductor." @@ -693,12 +683,7 @@ (define (bioconductor-data-package? package) (and (string-prefix? "https://bioconductor.org" uri) (string-contains uri "/data/annotation/"))))) (and (string-prefix? "r-" (package-name package)) - (match (and=> (package-source package) origin-uri) - ((? string? uri) - (predicate uri)) - ((? list? uris) - (any predicate uris)) - (_ #f))))) + ((url-predicate predicate) package)))) (define (bioconductor-experiment-package? package) "Return true if PACKAGE is an R experiment package from Bioconductor." @@ -706,12 +691,7 @@ (define (bioconductor-experiment-package? package) (and (string-prefix? "https://bioconductor.org" uri) (string-contains uri "/data/experiment/"))))) (and (string-prefix? "r-" (package-name package)) - (match (and=> (package-source package) origin-uri) - ((? string? uri) - (predicate uri)) - ((? list? uris) - (any predicate uris)) - (_ #f))))) + ((url-predicate predicate) package)))) (define %cran-updater (upstream-updater diff --git a/guix/import/crate.scm b/guix/import/crate.scm index e3ec11d7f8..796a7641e9 100644 --- a/guix/import/crate.scm +++ b/guix/import/crate.scm @@ -262,16 +262,8 @@ (define (crate-name->package-name name) ;;; Updater ;;; -(define (crate-package? package) - "Return true if PACKAGE is a Rust crate from crates.io." - (let ((source-url (and=> (package-source package) origin-uri)) - (fetch-method (and=> (package-source package) origin-method))) - (and (eq? fetch-method download:url-fetch) - (match source-url - ((? string?) - (crate-url? source-url)) - ((source-url ...) - (any crate-url? source-url)))))) +(define crate-package? + (url-predicate crate-url?)) (define (latest-release package) "Return an for the latest release of PACKAGE." diff --git a/guix/import/elpa.scm b/guix/import/elpa.scm index 2d4487dba0..871b918f88 100644 --- a/guix/import/elpa.scm +++ b/guix/import/elpa.scm @@ -281,13 +281,11 @@ (define name (urls (list url)) (signature-urls (list (string-append url ".sig")))))) -(define (package-from-gnu.org? package) - "Return true if PACKAGE is from elpa.gnu.org." - (match (and=> (package-source package) origin-uri) - ((? string? uri) - (let ((uri (string->uri uri))) - (and uri (string=? (uri-host uri) "elpa.gnu.org")))) - (_ #f))) +(define package-from-gnu.org? + (url-predicate (lambda (url) + (let ((uri (string->uri url))) + (and uri + (string=? (uri-host uri) "elpa.gnu.org")))))) (define %elpa-updater ;; The ELPA updater. We restrict it to packages hosted on elpa.gnu.org diff --git a/guix/import/gem.scm b/guix/import/gem.scm index bd5d5b3569..a2d99ddbca 100644 --- a/guix/import/gem.scm +++ b/guix/import/gem.scm @@ -166,20 +166,8 @@ (define (string->license str) ((or "Apache License, Version 2.0" "Apache 2.0") license:asl2.0) (_ #f))) -(define (gem-package? package) - "Return true if PACKAGE is a gem package from RubyGems." - - (define (rubygems-url? url) - (string-prefix? "https://rubygems.org/downloads/" url)) - - (let ((source-url (and=> (package-source package) origin-uri)) - (fetch-method (and=> (package-source package) origin-method))) - (and (eq? fetch-method download:url-fetch) - (match source-url - ((? string?) - (rubygems-url? source-url)) - ((source-url ...) - (any rubygems-url? source-url)))))) +(define gem-package? + (url-prefix-predicate "https://rubygems.org/downloads/")) (define (latest-release package) "Return an for the latest release of PACKAGE." diff --git a/guix/import/hackage.scm b/guix/import/hackage.scm index dbc1afa4a7..35c67cad8d 100644 --- a/guix/import/hackage.scm +++ b/guix/import/hackage.scm @@ -346,22 +346,9 @@ (define* (hackage-recursive-import package-name . args) (cons name args))) #:guix-name hackage-name->package-name)) -(define (hackage-package? package) - "Return #t if PACKAGE is a Haskell package from Hackage." - - (define haskell-url? - (let ((hackage-rx (make-regexp "https?://hackage.haskell.org"))) - (lambda (url) - (regexp-exec hackage-rx url)))) - - (let ((source-url (and=> (package-source package) origin-uri)) - (fetch-method (and=> (package-source package) origin-method))) - (and (eq? fetch-method url-fetch) - (match source-url - ((? string?) - (haskell-url? source-url)) - ((source-url ...) - (any haskell-url? source-url)))))) +(define hackage-package? + (let ((hackage-rx (make-regexp "https?://hackage.haskell.org"))) + (url-predicate (cut regexp-exec hackage-rx <>)))) (define (latest-release package) "Return an for the latest release of PACKAGE." diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm index f93fa8831f..b20c2300f6 100644 --- a/guix/import/pypi.scm +++ b/guix/import/pypi.scm @@ -510,23 +510,13 @@ (define (string->license str) ("MPL 2.0" license:mpl2.0) (_ #f))) -(define (pypi-package? package) - "Return true if PACKAGE is a Python package from PyPI." - - (define (pypi-url? url) - (or (string-prefix? "https://pypi.org/" url) - (string-prefix? "https://pypi.python.org/" url) - (string-prefix? "https://pypi.org/packages" url) - (string-prefix? "https://files.pythonhosted.org/packages" url))) - - (let ((source-url (and=> (package-source package) origin-uri)) - (fetch-method (and=> (package-source package) origin-method))) - (and (eq? fetch-method download:url-fetch) - (match source-url - ((? string?) - (pypi-url? source-url)) - ((source-url ...) - (any pypi-url? source-url)))))) +(define pypi-package? + (url-predicate + (lambda (url) + (or (string-prefix? "https://pypi.org/" url) + (string-prefix? "https://pypi.python.org/" url) + (string-prefix? "https://pypi.org/packages" url) + (string-prefix? "https://files.pythonhosted.org/packages" url))))) (define (latest-release package) "Return an for the latest release of PACKAGE." diff --git a/guix/upstream.scm b/guix/upstream.scm index 67d0eeefbb..ff33c534fe 100644 --- a/guix/upstream.scm +++ b/guix/upstream.scm @@ -51,6 +51,7 @@ (define-module (guix upstream) upstream-source-archive-types upstream-source-input-changes + url-predicate url-prefix-predicate coalesce-sources @@ -161,24 +162,28 @@ (define (changed-inputs package package-sexp) current-propagated new-propagated)))))) (_ '()))) -(define (url-prefix-predicate prefix) - "Return a predicate that returns true when passed a package where one of its -source URLs starts with PREFIX." +(define* (url-predicate matching-url?) + "Return a predicate that returns true when passed a package whose source is +an with the URL-FETCH method, and one of its URLs passes +MATCHING-URL?." (lambda (package) - (define matching-uri? - (match-lambda - ((? string? uri) - (string-prefix? prefix uri)) - (_ - #f))) - (match (package-source package) ((? origin? origin) - (match (origin-uri origin) - ((? matching-uri?) #t) - (_ #f))) + (and (eq? (origin-method origin) url-fetch) + (match (origin-uri origin) + ((? string? url) + (matching-url? url)) + (((? string? urls) ...) + (any matching-url? urls)) + (_ + #f)))) (_ #f)))) +(define (url-prefix-predicate prefix) + "Return a predicate that returns true when passed a package where one of its +source URLs starts with PREFIX." + (url-predicate (cut string-prefix? prefix <>))) + (define (upstream-source-archive-types release) "Return the available types of archives for RELEASE---a list of strings such as \"gz\" or \"xz\"." -- cgit v1.2.3 From f54cbc0e1b84a5b3785d3b4734600387dde82be9 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 3 Jul 2020 22:48:04 +0200 Subject: import: Do not assume that 'package-source' returns an origin. * guix/gnu-maintenance.scm (gnu-package?): Check whether 'package-source' returns an origin. * guix/import/github.scm (updated-github-url): Likewise. * guix/import/launchpad.scm (updated-launchpad-url): Likewise. --- guix/gnu-maintenance.scm | 21 ++++++++++++--------- guix/import/github.scm | 33 ++++++++++++++++++--------------- guix/import/launchpad.scm | 21 +++++++++++---------- 3 files changed, 41 insertions(+), 34 deletions(-) diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm index ef067704ad..9fe229f680 100644 --- a/guix/gnu-maintenance.scm +++ b/guix/gnu-maintenance.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2012, 2013 Nikita Karetnikov ;;; ;;; This file is part of GNU Guix. @@ -207,14 +207,17 @@ (define (gnu-home-page? package) (member host '("www.gnu.org" "gnu.org")))))) (or (gnu-home-page? package) - (let ((url (and=> (package-source package) origin-uri)) - (name (package-upstream-name package))) - (case (and (string? url) (mirror-type url)) - ((gnu) #t) - ((non-gnu) #f) - (else - (and (member name (map gnu-package-name (official-gnu-packages))) - #t)))))))) + (match (package-source package) + ((? origin? origin) + (let ((url (origin-uri origin)) + (name (package-upstream-name package))) + (case (and (string? url) (mirror-type url)) + ((gnu) #t) + ((non-gnu) #f) + (else + (and (member name (map gnu-package-name (official-gnu-packages))) + #t))))) + (_ #f)))))) ;;; diff --git a/guix/import/github.scm b/guix/import/github.scm index 7136e7a34f..95a792d0ca 100644 --- a/guix/import/github.scm +++ b/guix/import/github.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Ben Woodcroft -;;; Copyright © 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2018 Eric Bavier ;;; Copyright © 2019 Arun Isaac ;;; Copyright © 2019 Efraim Flashner @@ -90,20 +90,23 @@ (define (updated-url url) (#t #f))) ; Some URLs are not recognised. #f)) - (let ((source-uri (and=> (package-source old-package) origin-uri)) - (fetch-method (and=> (package-source old-package) origin-method))) - (cond - ((eq? fetch-method download:url-fetch) - (match source-uri - ((? string?) - (updated-url source-uri)) - ((source-uri ...) - (find updated-url source-uri)))) - ((and (eq? fetch-method download:git-fetch) - (string-prefix? "https://github.com/" - (download:git-reference-url source-uri))) - (download:git-reference-url source-uri)) - (else #f)))) + (match (package-source old-package) + ((? origin? origin) + (let ((source-uri (origin-uri origin)) + (fetch-method (origin-method origin))) + (cond + ((eq? fetch-method download:url-fetch) + (match source-uri + ((? string?) + (updated-url source-uri)) + ((source-uri ...) + (find updated-url source-uri)))) + ((and (eq? fetch-method download:git-fetch) + (string-prefix? "https://github.com/" + (download:git-reference-url source-uri))) + (download:git-reference-url source-uri)) + (else #f)))) + (_ #f))) (define (github-package? package) "Return true if PACKAGE is a package from GitHub, else false." diff --git a/guix/import/launchpad.scm b/guix/import/launchpad.scm index 1a15f28077..c7375837c7 100644 --- a/guix/import/launchpad.scm +++ b/guix/import/launchpad.scm @@ -57,16 +57,17 @@ (define (updated-url url) "/" new-version "/+download/" repo "-" new-version ext)) (#t #f))))) ; Some URLs are not recognised. - (let ((source-uri (and=> (package-source old-package) origin-uri)) - (fetch-method (and=> (package-source old-package) origin-method))) - (cond - ((eq? fetch-method download:url-fetch) - (match source-uri - ((? string?) - (updated-url source-uri)) - ((source-uri ...) - (find updated-url source-uri)))) - (else #f)))) + (match (package-source old-package) + ((? origin? origin) + (let ((source-uri (origin-uri origin)) + (fetch-method (origin-method origin))) + (and (eq? fetch-method download:url-fetch) + (match source-uri + ((? string?) + (updated-url source-uri)) + ((source-uri ...) + (find updated-url source-uri)))))) + (_ #f))) (define (launchpad-package? package) "Return true if PACKAGE is a package from Launchpad, else false." -- cgit v1.2.3 From 21064f095e350be9599ef327e3b1f2991fab196d Mon Sep 17 00:00:00 2001 From: Fredrik Salomonsson Date: Sat, 27 Jun 2020 16:37:57 -0700 Subject: gnu: Add guix-simplyblack-sddm-theme. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/display-managers.scm (guix-simplyblack-sddm-theme): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/display-managers.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm index c96b693dc3..ef6e549d09 100644 --- a/gnu/packages/display-managers.scm +++ b/gnu/packages/display-managers.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2017, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2020 L p R n d n +;;; Copyright © 2020 Fredrik Salomonsson ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,9 +28,11 @@ (define-module (gnu packages display-managers) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix build-system cmake) #:use-module (guix build-system qt) #:use-module (guix build-system gnu) + #:use-module (guix build-system trivial) #:use-module (guix packages) #:use-module (guix utils) #:use-module (gnu packages) @@ -123,6 +126,37 @@ (define-public sddm ;; QML files are MIT licensed and images are CC BY 3.0. (license (list license:gpl2+ license:expat license:cc-by3.0)))) +(define-public guix-simplyblack-sddm-theme + (package + (name "guix-simplyblack-sddm-theme") + (version "0.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/plattfot/guix-simplyblack-sddm") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1fwny6b0xpjs8ad2b16pyxd27gf0sr0nillmhc2h5k0q7dva21vi")))) + (build-system trivial-build-system) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let* ((out (assoc-ref %outputs "out")) + (sddm-themes (string-append out "/share/sddm/themes"))) + (mkdir-p sddm-themes) + (copy-recursively (assoc-ref %build-inputs "source") + (string-append sddm-themes "/guix-simplyblack-sddm")))))) + (home-page "https://github.com/plattfot/guix-simplyblack-sddm") + (synopsis "Guix based theme for SDDM") + (description + "This package provides a simple theme for SDDM, black background with +Guix's logo. Based on Arch linux's archlinux-simplyblack theme.") + ;; Theme under cc-by-sa3.0, guix logo under license:cc-by-sa4.0 + (license (list license:cc-by-sa3.0 license:cc-by-sa4.0)))) + (define-public lightdm (package (name "lightdm") -- cgit v1.2.3 From cce8ab8d80b8ceefaf05fdd701330ccf1ab5f012 Mon Sep 17 00:00:00 2001 From: Dale Mellor Date: Sun, 21 Jun 2020 23:53:07 +0100 Subject: gnu: Add curlpp library. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/curl.scm (curlpp): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/curl.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index bf93639716..b0bdd6ded6 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2018 Roel Janssen ;;; Copyright © 2019 Ricardo Wurmus ;;; Copyright © 2020 Jakub Kądziołka +;;; Copyright © 2020 Dale Mellor ;;; ;;; This file is part of GNU Guix. ;;; @@ -32,6 +33,7 @@ (define-module (gnu packages curl) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix utils) + #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system go) #:use-module (gnu packages) @@ -284,3 +286,34 @@ (define-public guile-curl Guile to do client-side URL transfers, like requesting documents from HTTP or FTP servers. It is based on the curl library.") (license license:gpl3+))) + +(define-public curlpp + (package + (name "curlpp") + (version "0.8.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jpbarrette/curlpp.git") + (commit (string-append "v" version)))) + (sha256 + (base32 "1b0ylnnrhdax4kwjq64r1fk0i24n5ss6zfzf4hxwgslny01xiwrk")) + (file-name (git-file-name name version)))) + (build-system cmake-build-system) + ;; There are no build tests to be had. + (arguments + '(#:tests? #f)) + ;; The installed version needs the header files from the C library. + (propagated-inputs + `(("curl" ,curl))) + (synopsis "C++ wrapper around libcURL") + (description + "This package provides a free and easy-to-use client-side C++ URL +transfer library, supporting FTP, FTPS, HTTP, HTTPS, GOPHER, TELNET, DICT, +FILE and LDAP; in particular it supports HTTPS certificates, HTTP POST, HTTP +PUT, FTP uploading, kerberos, HTTP form based upload, proxies, cookies, +user+password authentication, file transfer resume, http proxy tunneling and +more!") + (home-page "http://www.curlpp.org") + (license license:expat))) -- cgit v1.2.3 From 1ea8160de7c44b4d8675ddca920483ebcfa93795 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 4 Jul 2020 00:13:03 +0200 Subject: gnu: emacs-ivy: Update to 0.13.1. * gnu/packages/emacs-xyz.scm (emacs-ivy): Update to 0.13.1. [source]: Use GNU ELPA repository. [homepage]: Point to GitHub instead of manual. --- gnu/packages/emacs-xyz.scm | 36 +++++------------------------------- 1 file changed, 5 insertions(+), 31 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 1941379dea..2e9a95b500 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -6359,43 +6359,17 @@ (define-public emacs-interleave (define-public emacs-ivy (package (name "emacs-ivy") - (version "0.13.0") + (version "0.13.1") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/abo-abo/swiper.git") - (commit version))) - (file-name (git-file-name name version)) + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/ivy-" version ".tar")) (sha256 - (base32 - "0ghcwrg8a6r5q6fw2x8s08cwlmnz2d8qjhisnjwbnc2l4cgqpd9p")))) + (base32 "0n0ixhdykbdpis4krkqq6zncbby28p34742q96n0l91w0p19slcx")))) (build-system emacs-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'install 'install-doc - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (info (string-append out "/share/info"))) - (with-directory-excursion "doc" - (invoke "makeinfo" "ivy.texi") - (install-file "ivy.info" info) - #t)))) - (add-before 'check 'make-dummy-git-directory - (lambda _ - (mkdir-p ".git"))) - (add-after 'check 'delete-dummy-git-directory - (lambda _ - (delete-file-recursively ".git")))) - #:tests? #t - #:test-command '("make" "test"))) (propagated-inputs `(("emacs-hydra" ,emacs-hydra))) - (native-inputs - `(("texinfo" ,texinfo) - ("emacs-wgrep" ,emacs-wgrep))) - (home-page "http://oremacs.com/swiper/") + (home-page "https://github.com/abo-abo/swiper") (synopsis "Incremental vertical completion for Emacs") (description "This package provides @code{ivy-read} as an alternative to -- cgit v1.2.3 From 3f452712438a5133c692c73b32bf91b5954d2b7b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 4 Jul 2020 00:15:32 +0200 Subject: gnu: emacs-markdown-mode: Update to 2.4. * gnu/packages/emacs-xyz.scm (emacs-markdown-mode): Update to 2.4. --- gnu/packages/emacs-xyz.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 2e9a95b500..0c4f47d68b 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7149,16 +7149,16 @@ (define-public emacs-tide (define-public emacs-markdown-mode (package (name "emacs-markdown-mode") - (version "2.3") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/jrblevin/markdown-mode.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1zm1j4w0f3h01bmmpsv4j4mh6i13nnl8fcqlj2hsa1ncy1lgi8q7")))) + (version "2.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jrblevin/markdown-mode.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1zm1j4w0f3h01bmmpsv4j4mh6i13nnl8fcqlj2hsa1ncy1lgi8q7")))) (build-system emacs-build-system) (home-page "https://jblevins.org/projects/markdown-mode/") (synopsis "Emacs Major mode for Markdown files") -- cgit v1.2.3 From 45058d6678848a3a4bba8747c48cbe7174c39924 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 4 Jul 2020 00:18:21 +0200 Subject: gnu: emacs-markdown-mode: Update hash too. * gnu/packages/emacs-xyz.scm (emacs-markdown-mode): Update hash. This is a followup to 3f452712438a5133c692c73b32bf91b5954d2b7b. --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0c4f47d68b..fccef33c5f 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7158,7 +7158,7 @@ (define-public emacs-markdown-mode (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1zm1j4w0f3h01bmmpsv4j4mh6i13nnl8fcqlj2hsa1ncy1lgi8q7")))) + (base32 "0g0ja4h651yfabm3k6gbw4y8w7wibc9283fyfzb33kjj38ivl5d7")))) (build-system emacs-build-system) (home-page "https://jblevins.org/projects/markdown-mode/") (synopsis "Emacs Major mode for Markdown files") -- cgit v1.2.3 From 5b8b0c78fd54b3d7f3503a34feb967c6df7ea135 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 4 Jul 2020 00:19:23 +0200 Subject: gnu: emacs-auctex: Update to 12.2.4. * gnu/packages/emacs-xyz.scm (emacs-auctex): Update to 12.2.4. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index fccef33c5f..c732c63cc5 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1840,14 +1840,14 @@ (define-public emacs-async (define-public emacs-auctex (package (name "emacs-auctex") - (version "12.2.3") + (version "12.2.4") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "auctex-" version ".tar")) (sha256 - (base32 "1rbn6pghkll5apjv1fyn82v523fch9l5ksi5lnh439nq460wx1yf")))) + (base32 "1yz2h692mr35zgqwlxdq8rzv8n0jixhpaqmbiki00hlysm4zh9py")))) (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 619d164c803b5c3cf540cdab99d99ec8c4eedcf5 Mon Sep 17 00:00:00 2001 From: Morgan Smith Date: Thu, 2 Jul 2020 23:24:51 -0400 Subject: gnu: Add emacs-org-beautify-theme. * gnu/packages/emacs-xyz.scm (emacs-org-beautify-theme): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index c732c63cc5..8b38673f3f 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -76,6 +76,7 @@ ;;; Copyright © 2020 Fredrik Salomonsson ;;; Copyright © 2020 Ryan Desfosses ;;; Copyright © 2020 Eric Bavier +;;; Copyright © 2020 Morgan Smith ;;; ;;; This file is part of GNU Guix. ;;; @@ -3549,6 +3550,31 @@ (define-public emacs-stripe-buffer tables.") (license license:gpl2+))) +(define-public emacs-org-beautify-theme + ;; Latest release (0.4) is not tagged, use commit hash. + (let ((commit "df6a1114fda313e1689363e196c8284fbe2a2738") + (revision "0")) + (package + (name "emacs-org-beautify-theme") + (version "0.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jonnay/org-beautify-theme") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1lkz7736swimad12khwbbqc4gxjydgr1k45p4mx03s25pv1w920y")))) + (build-system emacs-build-system) + (home-page "https://github.com/jonnay/org-beautify-theme") + (synopsis "Theme to make Org mode look more beautiful") + (description + "The theme adds padding between headings, increases the size of titles, +strike through completed TODO headings, changes Org blocks, changes Org check +boxes, and more.") + (license license:gpl3+)))) + (define-public emacs-org-rich-yank (package (name "emacs-org-rich-yank") -- cgit v1.2.3 From 0f524de38af0ad215dd5668807b559337e67d6df Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Fri, 3 Jul 2020 07:36:23 +0200 Subject: gnu: Add emacs-calibredb. * gnu/packages/emacs-xyz.scm (emacs-calibredb): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 8b38673f3f..8b47c52d13 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -20452,6 +20452,38 @@ (define-public emacs-counsel-dash through Dash docsets.") (license license:expat)))) +(define-public emacs-calibredb + (package + (name "emacs-calibredb") + (version "2.4.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/chenyanming/calibredb.el.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0c6y3n51djajhfj4k6g0r58brls0fhyw6d7c6h4zi5jl1hw64vj6")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-dash" ,emacs-dash) + ("emacs-org" ,emacs-org) + ("emacs-s" ,emacs-s) + ("emacs-transient" ,emacs-transient))) + (home-page "https://github.com/chenyanming/calibredb.el") + (synopsis "Yet another calibre client for Emacs") + (description "This package integrates calibre into Emacs. +@enumerate +@item Powerful ebook dashboard. +@item Manage ebooks, actually not only ebooks! +@item Manage Ebook libraries. +@item Another bookmarks solution, by setting the tags and comments. +@item Quick search, filter, make actions on items with ivy and helm. +@item Org-ref support. +@end enumerate") + (license license:gpl3))) + (define-public emacs-el-patch (package (name "emacs-el-patch") -- cgit v1.2.3 From 394ec7158a20dd96490934076e6e7f6534f4fb49 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Fri, 3 Jul 2020 21:47:35 +0000 Subject: gnu: diffoscope: Update to 150. * gnu/packages/diffoscope (diffoscope): Update to 150. --- gnu/packages/diffoscope.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index 49d0f32bbf..6c649e1a0e 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -72,7 +72,7 @@ (define-module (gnu packages diffoscope) (define-public diffoscope (package (name "diffoscope") - (version "148") + (version "150") (source (origin (method git-fetch) (uri (git-reference @@ -81,7 +81,7 @@ (define-public diffoscope (file-name (git-file-name name version)) (sha256 (base32 - "0siv5z8iqgkzl51dmv69ifqids6hqmiir00yyl1aaqbginrwyhyv")))) + "0a3hycbbbpadwcck8zc9q3xsjclb36h2nkn95ff39q37966mm5rz")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 026b1344c38e538f9d22f19fcd3099668f033d4b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 4 Jul 2020 00:48:28 +0200 Subject: gnu: Add emacs-bluetooth. * gnu/packages/emacs-xyz.scm (emacs-bluetooth): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 8b47c52d13..d829a38add 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1666,6 +1666,31 @@ (define-public emacs-bbdb mode, Rmail, Gnus, MH-E, and VM). BBDB is fully customizable.") (license license:gpl3+))) +(define-public emacs-bluetooth + (package + (name "emacs-bluetooth") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/" + "bluetooth-" version ".el")) + (sha256 + (base32 "1vp2vpyq0ybjni35ics1mg1kiwgvc7x12dlmvygy78sqp52sfkcv")))) + (build-system emacs-build-system) + (inputs + `(("bluez" ,bluez))) + (propagated-inputs + `(("emacs-dash" ,emacs-dash))) + (home-page "https://gitlab.com/rstocker/emacs-bluetooth") + (synopsis "Manage Bluetooth devices using Emacs") + (description + "This package implements basic Bluetooth management functionality, such +as connecting and disconnecting devices, setting properties and aliases, +putting the adapter in discovery mode and controlling its power supply. It +also includes a pairing agent.") + (license license:gpl3+))) + (define-public emacs-aggressive-indent (package (name "emacs-aggressive-indent") -- cgit v1.2.3 From c535717b6a16b53049a0c0d6aafe3c92bf265d81 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 4 Jul 2020 11:49:49 +0200 Subject: gnu: r-rsubread: Update to 2.2.3. * gnu/packages/bioconductor.scm (r-rsubread): Update to 2.2.3. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 002f4a0edb..f2d3f155e3 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5781,14 +5781,14 @@ (define-public r-annotatr (define-public r-rsubread (package (name "r-rsubread") - (version "2.2.2") + (version "2.2.3") (source (origin (method url-fetch) (uri (bioconductor-uri "Rsubread" version)) (sha256 (base32 - "1wgilpaw70dwg0zilx5i1pmi4j8wri6wi2ha1d3bapfhlwc6igml")))) + "0406fl5zz8pc8yighkaw13ib3y8p45jsarl5sncgn4myfpl2p3z5")))) (properties `((upstream-name . "Rsubread"))) (build-system r-build-system) (inputs `(("zlib" ,zlib))) -- cgit v1.2.3 From 54e04fed9cca21f5e2fa7ea0ca9f1fad4884dd3c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 4 Jul 2020 11:49:55 +0200 Subject: gnu: r-depecher: Update to 1.4.1. * gnu/packages/bioconductor.scm (r-depecher): Update to 1.4.1. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index f2d3f155e3..2fe8c3998d 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -6374,14 +6374,14 @@ (define-public r-mixomics (define-public r-depecher (package (name "r-depecher") - (version "1.4.0") + (version "1.4.1") (source (origin (method url-fetch) (uri (bioconductor-uri "DepecheR" version)) (sha256 (base32 - "0nmx04qybzf6nhfngmdxwpbbz9x32v34mbnpg8jq7a2cgchzsj9s")))) + "0dscfl6wxpl5538jzkrwisdwbr873d38rzd19vl6z5br71jvpv3v")))) (properties `((upstream-name . "DepecheR"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 5db9a14947190ca5436d6e6f373f09192276c93c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 4 Jul 2020 11:49:58 +0200 Subject: gnu: r-abn: Update to 2.2.2. * gnu/packages/cran.scm (r-abn): Update to 2.2.2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index b2c70ea118..9995b4cb57 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6744,14 +6744,14 @@ (define-public r-entropy (define-public r-abn (package (name "r-abn") - (version "2.2.1") + (version "2.2.2") (source (origin (method url-fetch) (uri (cran-uri "abn" version)) (sha256 (base32 - "11nbg6dwvbj0ac7qvr203vzjnw5zc1a8cibb9l6rzzr7yfg16xzc")))) + "1wwnzv5yir8cyl0f0arxagbsg9ndgs0799m42wbjkpr8cg9sfdhc")))) (build-system r-build-system) (inputs `(("gsl" ,gsl))) -- cgit v1.2.3 From 0c2c1b01da3dca3200c314b0c860274e3e51f098 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 4 Jul 2020 11:50:02 +0200 Subject: gnu: r-glmmtmb: Update to 1.0.2.1. * gnu/packages/cran.scm (r-glmmtmb): Update to 1.0.2.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 9995b4cb57..252fe72d1f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8975,14 +8975,14 @@ (define-public r-sjstats (define-public r-glmmtmb (package (name "r-glmmtmb") - (version "1.0.1") + (version "1.0.2.1") (source (origin (method url-fetch) (uri (cran-uri "glmmTMB" version)) (sha256 (base32 - "0sdx1q7wc7895xh8747r4p0wkij0xjgn5ij62ipi9423zd0sr0mm")))) + "1a35hxcxz1cdm3zd5s7fyjaw2qs00hkacgr7h9130amygc1262ab")))) (properties `((upstream-name . "glmmTMB"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 2e1cfd24adb5522d4e68ea3aa42a0790ae3292a5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 4 Jul 2020 11:50:05 +0200 Subject: gnu: r-spdata: Update to 0.3.8. * gnu/packages/cran.scm (r-spdata): Update to 0.3.8. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 252fe72d1f..c749c8b70e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -13611,14 +13611,14 @@ (define-public r-classint (define-public r-spdata (package (name "r-spdata") - (version "0.3.5") + (version "0.3.8") (source (origin (method url-fetch) (uri (cran-uri "spData" version)) (sha256 (base32 - "09l9j1vjbfyc8mikb8kliqmdjkg4xigq3zhdx98mv51flh5q87lh")))) + "1mlsqy9cbilfc80cbdlbgsngvzdkrd9yjdkxnw2b1gzxnj6jcqbs")))) (properties `((upstream-name . "spData"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 82658db3dfd07bb1d8b2d2d2e4ed1dabbbecfbd1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 4 Jul 2020 11:50:08 +0200 Subject: gnu: r-dalex: Update to 1.3.0. * gnu/packages/cran.scm (r-dalex): Update to 1.3.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c749c8b70e..c32558b0be 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15790,14 +15790,14 @@ (define-public r-ibreakdown (define-public r-dalex (package (name "r-dalex") - (version "1.2.1") + (version "1.3.0") (source (origin (method url-fetch) (uri (cran-uri "DALEX" version)) (sha256 (base32 - "0lx8nasm1zgh1ckz8nw3ysp6xjv3dsj39hzhr6k3xhh6i8pm9rxk")))) + "1azbnykaddsfp2qmxmhpjz76zg78msxv6n2jqkq4gwbgqa5vdfd2")))) (properties `((upstream-name . "DALEX"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 3dcac4be2b669e1c8629efe33e2302371a37c5e0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 4 Jul 2020 11:50:11 +0200 Subject: gnu: r-nloptr: Update to 1.2.2.2. * gnu/packages/statistics.scm (r-nloptr): Update to 1.2.2.2. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 5fb39024e9..8633d1117b 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5117,14 +5117,14 @@ (define-public r-quantreg (define-public r-nloptr (package (name "r-nloptr") - (version "1.2.2.1") + (version "1.2.2.2") (source (origin (method url-fetch) (uri (cran-uri "nloptr" version)) (sha256 (base32 - "1bhh2v14phzndjhiq7yw9vych6vzn5yy3vk9q35zcp3jhjjbwdyh")))) + "0whkilb85k4wixvr3k7rygfw1rcs1fs9h8c18kz4p3y1k9hsj3p8")))) (build-system r-build-system) (native-inputs `(("r-knitr" ,r-knitr) ; for building vignettes -- cgit v1.2.3 From 525e1527c7b06e73baf0afd6a92197a9e9a4c0e0 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 4 Jul 2020 12:27:32 +0200 Subject: gnu: Add emacs-swiper. * gnu/packages/emacs-xyz.scm (emacs-swiper): New variable. --- gnu/packages/emacs-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index d829a38add..5c4861766c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -6431,6 +6431,31 @@ (define-public emacs-ivy expression.") (license license:gpl3+))) +(define-public emacs-swiper + (package + (name "emacs-swiper") + (version "0.13.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/" + "swiper-" version ".el")) + (sha256 + (base32 "06ild7kck0x5ry8bf0al24nh04q01q3jhj6jjl4xz8n2s6jnn70y")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-ivy" ,emacs-ivy))) + (home-page "https://github.com/abo-abo/swiper") + (synopsis "Isearch with an overview") + (description + "This package gives an overview of the current regex search candidates. +The search regex can be split into groups with a space. Each group is +highlighted with a different face. + +It can double as a quick `regex-builder', although only single lines will be +matched.") + (license license:gpl3+))) + (define-public emacs-ivy-xref (let ((commit "1a35fc0f070388701b05b0a455cbe262e924d547") (revision "1")) -- cgit v1.2.3 From e7d11f4fa6c4b3db5ce501165dd3fc82ef94c821 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 4 Jul 2020 13:47:57 +0200 Subject: gnu: Add emacs-counsel. * gnu/packages/emacs-xyz.scm (emacs-counsel): New variable. --- gnu/packages/emacs-xyz.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 5c4861766c..e85ec6ea35 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -6431,6 +6431,39 @@ (define-public emacs-ivy expression.") (license license:gpl3+))) +(define-public emacs-counsel + (package + (name "emacs-counsel") + (version "0.13.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/" + "counsel-" version ".el")) + (sha256 + (base32 "1y3hr3j5bh5mbyh1cqzxx04181qpvj4xyv1gym2gxcjd30nfllli")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-swiper" ,emacs-swiper))) + (home-page "https://github.com/abo-abo/swiper") + (synopsis "Various completion functions using Ivy") + (description + "Just call one of the interactive functions in a file to complete the +corresponding thing using Ivy. + +The following completions are currently available: +@itemize +@item Symbol completion for Elisp, Common Lisp, Python, Clojure, C, C++. +@item Describe functions for Elisp: function, variable, library, command, +@item bindings, theme. +@item Navigation functions: imenu, ace-line, semantic, outline. +@item Git utilities: git-files, git-grep, git-log, git-stash, git-checkout. +@item Grep utilities: grep, ag, pt, recoll, ack, rg. +@item System utilities: process list, rhythmbox, linux-app. +@item Many more. +@end itemize") + (license license:gpl3+))) + (define-public emacs-swiper (package (name "emacs-swiper") -- cgit v1.2.3 From 597bc8218c67320494d995b20b48c64adeb6d9be Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 4 Jul 2020 13:59:03 +0200 Subject: gnu: emacs-counsel-etags: Update to 1.9.11. * gnu/packages/emacs-xyz.scm (emacs-counsel-etags): Update to 1.9.11. [propagated-inputs]: Replace emacs-ivy with emacs-counsel. --- gnu/packages/emacs-xyz.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index e85ec6ea35..fcfa55d9ef 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -20356,7 +20356,7 @@ (define-public emacs-peep-dired (define-public emacs-counsel-etags (package (name "emacs-counsel-etags") - (version "1.8.9") + (version "1.9.11") (source (origin (method git-fetch) @@ -20365,11 +20365,10 @@ (define-public emacs-counsel-etags (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 - "0rmdl93kgyydwa96yclds9vwly41bpk8v18cbqc1x266w6v77dr9")))) + (base32 "0h0br41vkrx9l7bqr55bafqd715drxxwm41qif6iffhgdpvf69ym")))) (build-system emacs-build-system) (propagated-inputs - `(("emacs-ivy" ,emacs-ivy))) + `(("emacs-counsel" ,emacs-counsel))) (arguments `(#:tests? #t #:test-command '("make" "test"))) -- cgit v1.2.3 From c46ceff89c3d001fe1f82f798741e1ccfd8de976 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 4 Jul 2020 13:59:35 +0200 Subject: gnu: emacs-counsel-dash: Update to 0.1.3-4-370d5f6. * gnu/packages/emacs-xyz.scm (emacs-counsel-dash): Update to 0.1.3-4-370d5f6. [arguments]: Remove unnecessary phase. [propagated-inputs]: Replace emacs-ivy with emacs-counsel. --- gnu/packages/emacs-xyz.scm | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index fcfa55d9ef..5a3096c495 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -20500,8 +20500,8 @@ (define-public emacs-helm-dash (license license:gpl3+)))) (define-public emacs-counsel-dash - (let ((commit "7027868d483b51d949b9f20fb8f34b122ca61520") - (revision "3")) + (let ((commit "370d5f6f14b5294d0eb717f7b2a6a8e93df1ed24") + (revision "4")) (package (name "emacs-counsel-dash") (version (git-version "0.1.3" revision commit)) @@ -20513,21 +20513,11 @@ (define-public emacs-counsel-dash (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 - "0h3f5pxnmb21pq4hh7k4w8jzflz1k2ap7nwpjc222w0q6x6jrbjp")))) + (base32 "1fn38vbz46ijarjvhgw7iy7dj9s2a2miy95fyy9f8b5sj8nrdfvz")))) (build-system emacs-build-system) (propagated-inputs - `(("emacs-dash-docs" ,emacs-dash-docs) - ("emacs-ivy" ,emacs-ivy))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'require-ivy - (lambda _ - (substitute* "counsel-dash.el" - (("^\\(require 'cl-lib\\)") - "(require 'cl-lib)\n(require 'ivy)\n(require 'subr-x)")) - #t))))) + `(("emacs-counsel" ,emacs-counsel) + ("emacs-dash-docs" ,emacs-dash-docs))) (home-page "https://github.com/dash-docs-el/counsel-dash") (synopsis "Offline documentation browser for APIs using Dash docsets") (description "This package uses @code{ivy-mode} to install and navigate -- cgit v1.2.3 From 99cf91743c5e81edde738c0b02fb322a4e457f83 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 4 Jul 2020 14:00:31 +0200 Subject: gnu: emacs-counsel-tramp: Update to 0.7.5. * gnu/packages/emacs-xyz.scm (emacs-counsel-tramp): Update to 0.7.5. [propagated-inputs]: Replace emacs-ivy with emacs-counsel. --- gnu/packages/emacs-xyz.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 5a3096c495..b38470e6ff 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -20627,7 +20627,7 @@ (define-public emacs-eval-sexp-fu-el (define-public emacs-counsel-tramp (package (name "emacs-counsel-tramp") - (version "0.6.3") + (version "0.7.5") (source (origin (method git-fetch) @@ -20636,15 +20636,14 @@ (define-public emacs-counsel-tramp (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 - "1qy9lf7cyv6hp9mmpwh92cpdcffbxzyzchx6878d5pmk9qh6xy92")))) + (base32 "18qlwyjqxap2qfbz14ma6yqp4p3v4q2y8idc355s4szjdd2as2lr")))) (build-system emacs-build-system) (propagated-inputs - `(("emacs-ivy" ,emacs-ivy))) + `(("emacs-counsel" ,emacs-counsel))) (home-page "https://github.com/masasam/emacs-counsel-tramp") (synopsis "Ivy interface for TRAMP") - (description "This package allows @code{ivy-mode} to display and filter -SSH servers.") + (description + "This package allows @code{ivy-mode} to display and filter SSH servers.") (license license:gpl3+))) (define-public emacs-tramp -- cgit v1.2.3 From 3fd31f625d78885a647c63bde842818e867a3d84 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 4 Jul 2020 14:00:55 +0200 Subject: gnu: emacs-counsel-projectile: Fix build. * gnu/packages/emacs-xyz.scm (emacs-counsel-projectile)[propagated-inputs]: Replace emacs-ivy with emacs-counsel. --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index b38470e6ff..49e4bb7172 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -6891,7 +6891,7 @@ (define-public emacs-counsel-projectile "1inc4ndl0ysfwvxk4avbgpj4qi9rc93da6476a5c81xmwpsv8wmq")))) (build-system emacs-build-system) (propagated-inputs - `(("emacs-ivy" ,emacs-ivy) + `(("emacs-counsel" ,emacs-counsel) ("emacs-projectile" ,emacs-projectile))) (home-page "https://github.com/ericdanan/counsel-projectile") (synopsis "Enhance Projectile with Ivy") -- cgit v1.2.3 From 0506ed33abcb324ff66122807598eba0af4b4545 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 4 Jul 2020 14:26:54 +0200 Subject: gnu: emacs-lispy: Fix build. * gnu/packages/emacs-xyz.scm (emacs-lispy)[propagated-inputs]: Replace emacs-ivy with emacs-swiper. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 49e4bb7172..0a3da58272 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -6726,9 +6726,9 @@ (define-public emacs-lispy (build-system emacs-build-system) (propagated-inputs `(("emacs-ace-window" ,emacs-ace-window) - ("emacs-iedit" ,emacs-iedit) - ("emacs-ivy" ,emacs-ivy) ("emacs-hydra" ,emacs-hydra) + ("emacs-iedit" ,emacs-iedit) + ("emacs-swiper" ,emacs-swiper) ("emacs-zoutline" ,emacs-zoutline))) (native-inputs `(("emacs-clojure-mode" ,emacs-clojure-mode) -- cgit v1.2.3 From 6f3ede9ae2b2268181ebc0ca3764d865bd06bd63 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 4 Jul 2020 14:29:49 +0200 Subject: gnu: emacs-exwm-x: Fix build. * gnu/packages/emacs-xyz.scm (emacs-exwm-x)[propagated-inputs]: Replace emacs-ivy with emacs-counsel. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0a3da58272..fc73dd205f 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -10791,9 +10791,9 @@ (define-public emacs-exwm-x "03l3dl7s1qys1kkh40rm1sfx7axy1b8sf5f6nyksj9ps6d30p5i4")))) (build-system emacs-build-system) (propagated-inputs - `(("emacs-exwm" ,emacs-exwm) + `(("emacs-counsel" ,emacs-counsel) + ("emacs-exwm" ,emacs-exwm) ("emacs-switch-window" ,emacs-switch-window) - ("emacs-ivy" ,emacs-ivy) ("emacs-use-package" ,emacs-use-package))) (inputs `(("xhost" ,xhost) -- cgit v1.2.3 From 1367ee7a565e7a23fd50c5c6618dc6bf94372d69 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Tue, 16 Jun 2020 02:50:24 +0530 Subject: gnu: Add phockup. * gnu/packages/image.scm (phockup): New variable. --- gnu/packages/image.scm | 55 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 54 insertions(+), 1 deletion(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index ea1c178bc1..865fab1241 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2016 Eric Bavier -;;; Copyright © 2016, 2017 Arun Isaac +;;; Copyright © 2016, 2017, 2020 Arun Isaac ;;; Copyright © 2016, 2017 Kei Kebreau ;;; Copyright © 2017 Nikita ;;; Copyright © 2017,2019,2020 Hartmut Goebel @@ -87,6 +87,7 @@ (define-module (gnu packages image) #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) + #:use-module (guix build-system copy) #:use-module (guix build-system meson) #:use-module (guix build-system python) #:use-module (guix build-system scons) @@ -2120,3 +2121,55 @@ (define-public mtpaint painting and palette manipulation tools. It also handles JPEG, JPEG2000, GIF, TIFF, WEBP, BMP, PNG, XPM formats.") (license license:gpl3+))) + +(define-public phockup + (package + (name "phockup") + (version "1.5.9") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ivandokov/phockup") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "13ajj0xch7yfqaaxbw0awxs0fz17n1rxir4gqh2wcgxjysqk1j2y")))) + (build-system copy-build-system) + (arguments + `(#:install-plan '(("src" "share/phockup/") + ("phockup.py" "share/phockup/")) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'configure + (lambda* (#:key inputs #:allow-other-keys) + (substitute* (list "src/dependency.py" "src/exif.py") + (("exiftool") + (string-append (assoc-ref inputs "perl-image-exiftool") + "/bin/exiftool"))) + #t)) + (add-before 'install 'check + (lambda _ + (invoke "pytest"))) + (add-after 'install 'install-bin + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (mkdir (string-append out "/bin")) + (symlink (string-append out "/share/phockup/phockup.py") + (string-append out "/bin/phockup"))) + #t))))) + (inputs + `(("perl-image-exiftool" ,perl-image-exiftool) + ("python" ,python))) + (native-inputs + `(("python-pytest" ,python-pytest) + ("python-pytest-mock" ,python-pytest-mock))) + (home-page "https://github.com/ivandokov/phockup") + (synopsis "Organize photos and videos in folders") + (description "Phockup is a media sorting tool that uses creation date and +time information in photos and videos to organize them into folders by year, +month and day. All files which are not images or videos or those which do not +have creation date information will be placed in a folder called +@file{unknown}.") + (license license:expat))) -- cgit v1.2.3 From ef0e7a5d332f0947adb3556cc5a8c8836eac0b6c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 4 Jul 2020 19:38:39 +0200 Subject: gnu: hplip: Update source hash. The tarball was modified in place: . * gnu/packages/cups.scm (hplip)[source]: Update hash. --- gnu/packages/cups.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 8bfe96079c..281c2718e8 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -422,7 +422,7 @@ (define-public hplip "/hplip-" version ".tar.gz")) (sha256 (base32 - "0rmk7i28mb0q66i5l9d0fq2j23dkhz5gx5g2xvi16ga0dnprcilp")) + "083w58wpvvm6sir6rf5dwx3r0rman9sv1zpl26chl0a88crjsjy6")) (modules '((guix build utils))) (patches (search-patches "hplip-remove-imageprocessor.patch")) (snippet -- cgit v1.2.3 From 15c29a8a342fe13819f5d96abab796f14f2f7b18 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sun, 5 Jul 2020 03:15:08 +0530 Subject: combinators: Fix typo. * guix/combinators.scm (fold2): Replace "a two lists" with "two lists". --- guix/combinators.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/combinators.scm b/guix/combinators.scm index 4707b59363..88ad09dbe6 100644 --- a/guix/combinators.scm +++ b/guix/combinators.scm @@ -47,7 +47,7 @@ (define fold2 (lambda (result1 result2) (loop result1 result2 (cdr lst))))))) ((proc seed1 seed2 lst1 lst2) - "Like `fold', but with a two lists and two seeds." + "Like `fold', but with two lists and two seeds." (let loop ((result1 seed1) (result2 seed2) (lst1 lst1) -- cgit v1.2.3 From fe743ebb41f0936b378a185beb7c00adc4172d8c Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Sat, 11 Apr 2020 19:11:26 +0200 Subject: gnu: cryptsetup: Update to 2.3.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/cryptsetup.scm (cryptsetup): Update to 2.3.1. Signed-off-by: Jakub Kądziołka --- gnu/packages/cryptsetup.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cryptsetup.scm b/gnu/packages/cryptsetup.scm index bd6e046452..67e40cbc40 100644 --- a/gnu/packages/cryptsetup.scm +++ b/gnu/packages/cryptsetup.scm @@ -35,7 +35,7 @@ (define-module (gnu packages cryptsetup) (define-public cryptsetup (package (name "cryptsetup") - (version "2.2.2") + (version "2.3.1") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/linux/utils/cryptsetup/v" @@ -43,7 +43,7 @@ (define-public cryptsetup "/cryptsetup-" version ".tar.xz")) (sha256 (base32 - "0ija889kfhg4n2fshpq9yh2b1jl2ipvd7sfafh08g75ba6ayrw1a")))) + "1lp7kwakm3ssp8ww1y33plvfmpas5krf14pdz91p1kx2b7as9awj")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 8dca40a3def355725c1d612d4d0caa3e5db72964 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Jul 2020 02:12:02 +0200 Subject: gnu: bcachefs-tools: Display the correct version. * gnu/packages/file-systems.scm (bcachefs-tools)[arguments]: Add VERSION to make-flags. --- gnu/packages/file-systems.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index eee218d7bb..6d395feaf5 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -227,7 +227,8 @@ (define-public bcachefs-tools (build-system gnu-build-system) (arguments `(#:make-flags - (list (string-append "PREFIX=" (assoc-ref %outputs "out")) + (list ,(string-append "VERSION=" version) ; bogus vX.Y-nogit otherwise + (string-append "PREFIX=" (assoc-ref %outputs "out")) "INITRAMFS_DIR=$(PREFIX)/share/initramfs-tools" "CC=gcc" "PYTEST=pytest") -- cgit v1.2.3 From 2b504cc3d1977eacc28ed8a706d6f6606f01d801 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Jul 2020 20:33:44 +0200 Subject: gnu: mosh: Remove ‘/bin/sh’ dependency. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/ssh.scm (mosh)[arguments]: Add ‘patch-FHS-file-names’ phase. --- gnu/packages/ssh.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index ea42e72de2..38b98f1c5b 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -405,6 +405,12 @@ (define-public mosh (arguments '(#:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-FHS-file-names + (lambda _ + (substitute* "scripts/mosh.pl" + (("/bin/sh") + (which "sh"))) + #t)) (add-after 'install 'wrap (lambda* (#:key outputs #:allow-other-keys) ;; Make sure 'mosh' can find 'mosh-client' and -- cgit v1.2.3 From dfb99268b03695c0abdb02e9a9b61ae2c3ebe3c0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 5 Jul 2020 06:47:27 +0200 Subject: gnu: Sort (gnu packages web-browsers) module imports. * gnu/packages/web-browsers.scm: Order module imports alphabetically. --- gnu/packages/web-browsers.scm | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 2ac93c3ff4..e954863be4 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -29,6 +29,14 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages web-browsers) + #:use-module (guix build-system asdf) + #:use-module (guix build-system cmake) + #:use-module (guix build-system glib-or-gtk) + #:use-module (guix build-system gnu) + #:use-module (guix build-system go) + #:use-module (guix build-system python) + #:use-module (guix download) + #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (gnu packages) @@ -38,16 +46,18 @@ (define-module (gnu packages web-browsers) #:use-module (gnu packages fltk) #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) + #:use-module (gnu packages gcc) #:use-module (gnu packages glib) - #:use-module (gnu packages gtk) + #:use-module (gnu packages gnome) + #:use-module (gnu packages gnome-xyz) #:use-module (gnu packages gnupg) + #:use-module (gnu packages gtk) + #:use-module (gnu packages image) #:use-module (gnu packages libevent) #:use-module (gnu packages libidn) #:use-module (gnu packages lisp) #:use-module (gnu packages lisp-xyz) #:use-module (gnu packages lua) - #:use-module (gnu packages gnome) - #:use-module (gnu packages gnome-xyz) #:use-module (gnu packages ncurses) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) @@ -55,20 +65,10 @@ (define-module (gnu packages web-browsers) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) - #:use-module (gnu packages image) #:use-module (gnu packages sqlite) #:use-module (gnu packages tls) #:use-module (gnu packages webkit) - #:use-module (gnu packages xorg) - #:use-module (gnu packages gcc) - #:use-module (guix download) - #:use-module (guix git-download) - #:use-module (guix build-system cmake) - #:use-module (guix build-system gnu) - #:use-module (guix build-system glib-or-gtk) - #:use-module (guix build-system python) - #:use-module (guix build-system asdf) - #:use-module (guix build-system go)) + #:use-module (gnu packages xorg)) (define-public midori (package -- cgit v1.2.3 From 77986a6a99e7c283bdd2b3df93f666e6a166767c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 5 Jul 2020 06:52:18 +0200 Subject: gnu: links: Sort inputs. * gnu/packages/web-browsers.scm (links)[inputs]: Order alphabetically. --- gnu/packages/web-browsers.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index e954863be4..d31648257f 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -188,13 +188,13 @@ (define-public links "--enable-graphics") #t)))))) (native-inputs `(("pkg-config" ,pkg-config))) - (inputs `(("zlib" ,zlib) - ("openssl" ,openssl) + (inputs `(("libevent" ,libevent) ("libjpeg" ,libjpeg-turbo) - ("libtiff" ,libtiff) - ("libevent" ,libevent) ("libpng" ,libpng) - ("libxt" ,libxt))) + ("libtiff" ,libtiff) + ("libxt" ,libxt) + ("openssl" ,openssl) + ("zlib" ,zlib))) (synopsis "Text and graphics mode web browser") (description "Links is a graphics and text mode web browser, with many features including, tables, builtin image display, bookmarks, SSL and more.") -- cgit v1.2.3 From 4cd05788b548d60154f365542fd9446ac4bcfd9f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 5 Jul 2020 06:58:51 +0200 Subject: gnu: links: Enable framebuffer (fb) graphics driver. * gnu/packages/web-browsers.scm (links)[native-inputs]: Add linux-libre-headers. [inputs]: Add gpm. --- gnu/packages/web-browsers.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index d31648257f..2ef09d49c9 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -55,6 +55,7 @@ (define-module (gnu packages web-browsers) #:use-module (gnu packages image) #:use-module (gnu packages libevent) #:use-module (gnu packages libidn) + #:use-module (gnu packages linux) #:use-module (gnu packages lisp) #:use-module (gnu packages lisp-xyz) #:use-module (gnu packages lua) @@ -187,8 +188,10 @@ (define-public links (string-append "--prefix=" out) "--enable-graphics") #t)))))) - (native-inputs `(("pkg-config" ,pkg-config))) - (inputs `(("libevent" ,libevent) + (native-inputs `(("linux-libre-headers" ,linux-libre-headers) + ("pkg-config" ,pkg-config))) + (inputs `(("gpm" ,gpm) + ("libevent" ,libevent) ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libtiff" ,libtiff) -- cgit v1.2.3 From 5733ba7dd875ed0f55e343075887f1d0d6ad8ccb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 5 Jul 2020 08:22:11 +0200 Subject: download: Replace misconfigured Apache mirror. E.g. redirects to a bogus 200 HTML page. * guix/download.scm (%mirrors): Replace apache.belnet.be with ftp.nluug.nl. --- guix/download.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/download.scm b/guix/download.scm index e5df678315..b7931e568f 100644 --- a/guix/download.scm +++ b/guix/download.scm @@ -140,7 +140,7 @@ (define %mirrors (apache ; from http://www.apache.org/mirrors/dist.html "http://www.eu.apache.org/dist/" "http://www.us.apache.org/dist/" - "http://apache.belnet.be/" + "https://ftp.nluug.nl/internet/apache/" "http://apache.mirror.iweb.ca/" "http://mirrors.ircam.fr/pub/apache/" "http://apache.mirrors.ovh.net/ftp.apache.org/dist/" -- cgit v1.2.3 From 395782f235a959868375ef52ec04856a7e8957c9 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sun, 5 Jul 2020 09:40:34 +0200 Subject: system: Do not use "hurd-target?". MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix the following issue, that happens during CI evaluation: In guix/gexp.scm: 782:4 19 (_ _) In guix/store.scm: 1907:12 18 (_ #) 1340:2 17 (map/accumulate-builds # …) In srfi/srfi-1.scm: 586:29 16 (map1 ((# …) …)) 586:29 15 (map1 ((# bindings:…> …) …)) 586:29 14 (map1 ((# …) …)) 586:17 13 (map1 ((#< kernel: #< …) …)) In guix/store.scm: 1299:8 12 (call-with-build-handler # …) 2025:24 11 (run-with-store # …) In guix/gexp.scm: 785:13 10 (_ _) In guix/store.scm: 1859:8 9 (_ _) In guix/gexp.scm: 243:18 8 (_ _) In guix/store.scm: 1894:38 7 (_ #) In gnu/system.scm: 1012:19 6 (_ #) 634:11 5 (operating-system-services #< kernel:…>) 611:17 4 (hurd-default-essential-services #< k…>) 555:18 3 (operating-system-directory-base-entries #<) 1270:18 2 (operating-system-boot-parameters-file #< …) 1225:35 1 (operating-system-boot-parameters #<…> …) 1225:35 0 (operating-system-boot-parameters (#< de…>) …) gnu/system.scm:1225:35: In procedure operating-system-boot-parameters: Wrong type to apply: #f "hurd-target?" is returning false when it should return true in that context. * gnu/system.scm (operating-system-boot-parameters): Check for "hurd" target field of "os" instead of using the "hurd-target?" procedure. --- gnu/system.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/system.scm b/gnu/system.scm index bfbcb6fbdd..f915057f36 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -1221,7 +1221,7 @@ (define* (operating-system-boot-parameters os root-device "Return a monadic record that describes the boot parameters of OS. When SYSTEM-KERNEL-ARGUMENTS? is true, add kernel arguments such as '--root' and '--load' to ." - (let* ((initrd (and (not (hurd-target?)) + (let* ((initrd (and (not (operating-system-hurd os)) (operating-system-initrd-file os))) (store (operating-system-store-file-system os)) (bootloader (bootloader-configuration-bootloader -- cgit v1.2.3 From b9478f333b8501d9e1404530a325ba6de1dde997 Mon Sep 17 00:00:00 2001 From: Allan Adair Date: Thu, 2 Jul 2020 11:25:07 +0200 Subject: gnu: flatpak: Update to 1.8.0. * gnu/packages/package-management.scm (flatpak): Update to 1.8.0, [native-inputs]: add "python-pyparsing". Signed-off-by: Mathieu Othacehe --- gnu/packages/package-management.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 44fd0c16b2..9986976cc6 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1130,7 +1130,7 @@ (define-public libostree (define-public flatpak (package (name "flatpak") - (version "1.6.3") + (version "1.8.0") (source (origin (method url-fetch) @@ -1138,7 +1138,7 @@ (define-public flatpak version "/flatpak-" version ".tar.xz")) (sha256 (base32 - "17s8nqdxd4xdy7ag9bw06adxccha78jmlsa3zpqnl3qh92pg0hji")))) + "0d4x79z96r60rc2gnf415da7z9x1my5hdyjdlklfiwll57jbqr23")))) ;; Wrap 'flatpak' so that GIO_EXTRA_MODULES is set, thereby allowing GIO to ;; find the TLS backend in glib-networking. @@ -1190,6 +1190,7 @@ (define-public flatpak ("libcap" ,libcap) ("pkg-config" ,pkg-config) ("python" ,python) + ("python-pyparsing" ,python-pyparsing) ("socat" ,socat) ("which" ,which))) (propagated-inputs `(("glib-networking" ,glib-networking) -- cgit v1.2.3 From f96c3bbe24557b1969fb4979a61ddf3b2c9caf06 Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Thu, 2 Jul 2020 16:30:50 +0200 Subject: gnu: icedove: Update to 68.10.0. * gnu/packages/gnuzilla.scm (%icedove-build-id): Update. (icedove): Update version and corresponding hg changeset. Signed-off-by: Mathieu Othacehe --- gnu/packages/gnuzilla.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index cc3acd6b9b..fa430837f9 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1137,11 +1137,11 @@ (define-public icecat (cpe-version . ,(first (string-split version #\-))))))) ;; Update this together with icecat! -(define %icedove-build-id "20200602000000") ;must be of the form YYYYMMDDhhmmss +(define %icedove-build-id "20200630000000") ;must be of the form YYYYMMDDhhmmss (define-public icedove (package (name "icedove") - (version "68.9.0") + (version "68.10.0") (source icecat-source) (properties `((cpe-name . "thunderbird_esr"))) @@ -1427,7 +1427,7 @@ (define-public icedove ;; 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 "787d887f43fcbfe254ff0c9650c5517710071b74")) + ,(let ((changeset "6a7c26eb22bfe18295497c720a73e24b29b0604e")) (origin (method hg-fetch) (uri (hg-reference @@ -1436,7 +1436,7 @@ (define-public icedove (file-name (string-append "thunderbird-" version "-checkout")) (sha256 (base32 - "1z1k3r1jilwmsywiyp8gh49f61cl9n085k95x7ihyld3rvgcjm9f"))))) + "1yd73ig2jmzzq9c3ynqav4kh8jiv31xx7vs518b3w1yvmcpj5xsy"))))) ("autoconf" ,autoconf-2.13) ("cargo" ,rust "cargo") ("clang" ,clang) -- cgit v1.2.3 From 5b87bacd548dc3e18218d5dc8c6e4101091b86ea Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Sun, 5 Jul 2020 10:39:16 +0200 Subject: gnu: chessx: Update to 1.5.4. * gnu/packages/games.scm (chessx): Update to 1.5.4, [inputs]: add "qtspeech", [arguments]: fix missing translations. Signed-off-by: Mathieu Othacehe --- gnu/packages/games.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index c062729f89..14dea16543 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -11294,20 +11294,21 @@ (define-public eboard (define-public chessx (package (name "chessx") - (version "1.5.0") + (version "1.5.4") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/chessx/chessx/" version "/chessx-" version ".tgz")) (sha256 - (base32 "09rqyra28w3z9ldw8sx07k5ap3sjlli848p737maj7c240rasc6i")))) + (base32 "1a3541vl5hp6jllgx998w9kjh9kp3wrl80yfwkxmq1bc5bzsrnz2")))) (build-system qt-build-system) (native-inputs `(("qttools" ,qttools))) (inputs `(("qtbase" ,qtbase) ("qtmultimedia" ,qtmultimedia) + ("qtspeech" ,qtspeech) ("qtsvg" ,qtsvg) ("zlib" ,zlib))) (arguments @@ -11318,7 +11319,12 @@ (define-public chessx (lambda* (#:key inputs #:allow-other-keys) (substitute* "chessx.pro" (("\\$\\$\\[QT_INSTALL_BINS\\]/lrelease") - (string-append (assoc-ref inputs "qttools") "/bin/lrelease"))) + (string-append (assoc-ref inputs "qttools") "/bin/lrelease")) + ;; Fix missing translations. + (("TRANSLATIONS = i18n/chessx_de.ts") + "TRANSLATIONS = i18n/chessx_de.ts i18n/chessx_da.ts \\ +i18n/chessx_fr.ts i18n/chessx_it.ts i18n/chessx_cz.ts i18n/chessx_ru.ts \\ +i18n/chessx_es.ts")) #t)) (add-after 'fix-paths 'make-qt-deterministic (lambda _ -- cgit v1.2.3 From 3772d80de71590322f9ec95ea3ae8a02a4eac93f Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Fri, 3 Jul 2020 12:21:56 +0200 Subject: gnu: python-pynvim: Update to 0.4.1. * gnu/packages/vim.scm (python-pynvim): Update to 0.4.1. Signed-off-by: Mathieu Othacehe --- gnu/packages/vim.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 25cf578bb8..44d81bb5f5 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -805,13 +805,13 @@ (define-public vifm (define-public python-pynvim (package (name "python-pynvim") - (version "0.3.2") + (version "0.4.1") (source (origin (method url-fetch) (uri (pypi-uri "pynvim" version)) (sha256 (base32 - "01dybk4vs452pljn1q3il5z2sd313ki0lgiglc0xmjc6wp290r6g")))) + "0n2cx22lrmbq7xk7356lyn6k77ryqvkxplw9k0fglk35ckb1isam")))) (build-system python-build-system) (propagated-inputs `(("python-greenlet" ,python-greenlet) -- cgit v1.2.3 From 60941b94e25853424262931a781c0e90835a40e0 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sun, 5 Jul 2020 15:43:03 +0530 Subject: doc: Fix minor typo in Programming Interface. * doc/guix.texi (Programming Interface): Replace "under a specific build users" with "under specific build users". --- doc/guix.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index ce17c2de8e..b0d31f1bab 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -5616,7 +5616,7 @@ turned into concrete build actions. Build actions are performed by the Guix daemon, on behalf of users. In a standard setup, the daemon has write access to the store---the @file{/gnu/store} directory---whereas users do not. The recommended -setup also has the daemon perform builds in chroots, under a specific +setup also has the daemon perform builds in chroots, under specific build users, to minimize interference with the rest of the system. @cindex derivation -- cgit v1.2.3 From 9e85f652cb9df3393615b3dafcb0f7431b794248 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sun, 5 Jul 2020 03:44:05 +0530 Subject: discovery: Fix typo. * guix/discovery.scm (fold-module-public-variables*): In the docstring, replace (PROC MODULE SYMBOL VARIABLE) with (PROC MODULE SYMBOL VARIABLE RESULT). --- guix/discovery.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/guix/discovery.scm b/guix/discovery.scm index 7c5fed7f0e..b84b9ff370 100644 --- a/guix/discovery.scm +++ b/guix/discovery.scm @@ -153,9 +153,9 @@ (define* (all-modules path #:key (warn (const #f))) (reverse (fold-modules cons '() path #:warn warn))) (define (fold-module-public-variables* proc init modules) - "Call (PROC MODULE SYMBOL VARIABLE) for each variable exported by one of MODULES, -using INIT as the initial value of RESULT. It is guaranteed to never traverse -the same object twice." + "Call (PROC MODULE SYMBOL VARIABLE RESULT) for each variable exported by one +of MODULES, using INIT as the initial value of RESULT. It is guaranteed to +never traverse the same object twice." ;; Here SEEN is populated by variables; if two different variables refer to ;; the same object, we still let them through. (identity ;discard second return value -- cgit v1.2.3 From a2daee843d93abd5cc15a6277b6a3e7118fe047a Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sun, 5 Jul 2020 04:07:35 +0530 Subject: import: pypi: Handle 'null instead of #nil. * guix/import/pypi.scm (non-empty-string-or-false): guile-json now returns 'null instead of #nil for null JSON values. Handle it. --- guix/import/pypi.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm index b20c2300f6..a2b5d995ef 100644 --- a/guix/import/pypi.scm +++ b/guix/import/pypi.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2019 Maxim Cournoyer ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2020 Lars-Dominik Braun +;;; Copyright © 2020 Arun Isaac ;;; ;;; This file is part of GNU Guix. ;;; @@ -63,7 +64,7 @@ (define non-empty-string-or-false (match-lambda ("" #f) ((? string? str) str) - ((or #nil #f) #f))) + ((or 'null #f) #f))) ;; PyPI project. (define-json-mapping make-pypi-project pypi-project? -- cgit v1.2.3 From 81a11883dc9807e87f8686889ad879b1fb64a4f6 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sun, 5 Jul 2020 04:29:46 +0530 Subject: weather: Print 0.0% correctly. * guix/scripts/weather.scm (report-server-coverage): Report 0% coverage as 0.0%, not as .0%. --- guix/scripts/weather.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/scripts/weather.scm b/guix/scripts/weather.scm index 475d989357..3035ff6ca8 100644 --- a/guix/scripts/weather.scm +++ b/guix/scripts/weather.scm @@ -190,7 +190,7 @@ (define MiB (* (expt 2 20) 1.)) narinfos)) (time (+ (time-second time) (/ (time-nanosecond time) 1e9)))) - (format #t (G_ " ~2,1f% substitutes available (~h out of ~h)~%") + (format #t (G_ " ~,1f% substitutes available (~h out of ~h)~%") (* 100. (/ obtained requested 1.)) obtained requested) (let ((total (/ (reduce + 0 sizes) MiB))) -- cgit v1.2.3 From 3d067528b155296001576f564ed279d889951359 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sun, 5 Jul 2020 03:05:09 +0530 Subject: gnu: rubber: Update to 1.5.1. * gnu/packages/tex.scm (rubber): Update to 1.5.1. [build-system]: Switch to python-build-system. [inputs]: Remove python-2 and which. [arguments]: Delete the build phase. Replace the install phase with a custom phase. --- gnu/packages/tex.scm | 39 ++++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 47645a3e34..7b10433269 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2017, 2020 Marius Bakke ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Danny Milosavljevic -;;; Copyright © 2018 Arun Isaac +;;; Copyright © 2018, 2020 Arun Isaac ;;; Copyright © 2020 Vincent Legoll ;;; ;;; This file is part of GNU Guix. @@ -35,6 +35,7 @@ (define-module (gnu packages tex) #:use-module (guix download) #:use-module (guix build-system gnu) #:use-module (guix build-system perl) + #:use-module (guix build-system python) #:use-module (guix build-system qt) #:use-module (guix build-system trivial) #:use-module (guix build-system texlive) @@ -6005,22 +6006,30 @@ (define-public biber (define-public rubber (package (name "rubber") - (version "1.1") + (version "1.5.1") (source (origin - (method url-fetch) - (uri (list (string-append "https://launchpad.net/rubber/trunk/" - version "/+download/rubber-" - version ".tar.gz") - (string-append "http://ebeffara.free.fr/pub/rubber-" - version ".tar.gz"))) - (sha256 - (base32 - "1xbkv8ll889933gyi2a5hj7hhh216k04gn8fwz5lfv5iz8s34gbq")))) - (build-system gnu-build-system) - (arguments '(#:tests? #f)) ; no `check' target + (method url-fetch) + (uri (list (string-append "https://launchpad.net/rubber/trunk/" + version "/+download/rubber-" + version ".tar.gz") + (string-append "http://ebeffara.free.fr/pub/rubber-" + version ".tar.gz"))) + (sha256 + (base32 + "178dmrp0mza5gqjiqgk6dqs0c10s0c517pk6k9pjbam86vf47a1p")))) + (build-system python-build-system) + (arguments + '(#:tests? #f ; no `check' target + #:phases + (modify-phases %standard-phases + (delete 'build) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + ;; texlive is required to build the PDF documentation; do not + ;; build it. + (invoke "python" "setup.py" "build" "--pdf=False" "install" + (string-append "--prefix=" (assoc-ref outputs "out")))))))) (native-inputs `(("texinfo" ,texinfo))) - (inputs `(("python" ,python-2) ; incompatible with Python 3 (print syntax) - ("which" ,which))) (home-page "https://launchpad.net/rubber") (synopsis "Wrapper for LaTeX and friends") (description -- cgit v1.2.3 From a0570377b8a890a13508bb3e9151a78bc7cde84c Mon Sep 17 00:00:00 2001 From: guy fleury iteriteka Date: Sun, 5 Jul 2020 14:06:46 +0300 Subject: gnu: chafa: Update to 1.4.1. * gnu/packages/image-viewers.scm (chafa): Update to 1.4.1. [inputs]: Add freetype, libjpeg-turbo. Signed-off-by: Efraim Flashner --- gnu/packages/image-viewers.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 87159dcc45..8303ba38f9 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2019 Ricardo Wurmus ;;; Copyright © 2019 Nicolas Goaziou -;;; Copyright © 2019 Guy Fleury Iteriteka +;;; Copyright © 2019, 2020 Guy Fleury Iteriteka ;;; Copyright © 2019 Pierre Langlois ;;; Copyright © 2020 Peng Mei Yu ;;; Copyright © 2020 R Veera Kumar @@ -531,19 +531,21 @@ (define-public qview (define-public chafa (package (name "chafa") - (version "1.2.2") + (version "1.4.1") (source (origin (method url-fetch) (uri (string-append "https://hpjansson.org/chafa/releases/chafa-" version ".tar.xz")) (sha256 (base32 - "0aa7119514rhsak5i0kgvwllb9z74lnfzfn7dzfhs27fc8cvx1dg")))) + "18rb82bfqj1sj2g4irazx4lwq9q4b4k7my1r0q714vf9yhs41ls6")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (inputs - `(("glib" ,glib) + `(("freetype" ,freetype) + ("libjpeg" ,libjpeg-turbo) + ("glib" ,glib) ("imagemagick" ,imagemagick))) (synopsis "Convert images to ANSI/Unicode characters") (description -- cgit v1.2.3 From 52a23d8e4872f5cb313d4456fc3e4c56280a2918 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 28 Jun 2020 22:33:21 +0200 Subject: gnu: Add java-junitparams. * gnu/packages/java.scm (java-junitparams): New variable. --- gnu/packages/java.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 4dbf27034d..113108eb58 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -3735,6 +3735,37 @@ (define-public java-junit sharing common test data, and test runners for running tests.") (license license:epl1.0))) +(define-public java-junitparams + (package + (name "java-junitparams") + (version "1.1.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Pragmatists/JUnitParams") + (commit (string-append "JUnitParams-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0rb52xdfp99invyjrras3w0bf0a81cz30yd47rkkiyqcqj0y1q9b")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "junitparams.jar" + #:source-dir "src/main/java" + #:test-dir "src/test" + #:test-exclude (list "**/SuperclassTest.java"))) + (inputs + `(("java-junit" ,java-junit))) + (native-inputs + `(("java-junit" ,java-junit) + ("java-hamcrest-core" ,java-hamcrest-core) + ("java-assertj" ,java-assertj))) + (home-page "https://github.com/Pragmatists/JUnitParams") + (synopsis "Parameterised test support for JUnit") + (description "The JUnitParams project adds a new runner to JUnit and +provides much easier and readable parametrised tests for JUnit.") + (license license:asl2.0))) + (define-public java-plexus-utils (package (name "java-plexus-utils") -- cgit v1.2.3 From ee1dc9b3d19364e17b15a158194cddfff91778c8 Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Tue, 12 May 2020 20:27:59 +0200 Subject: gnu: java-icu4j: Update to 66.1, use full sources. * gnu/packages/icu4c.scm (java-icu4j): Update to 66.1. [source]: Use full sources instead of jar-sources. [arguments]: Add chdir phase, replace install phase. Co-Authored-By: Julien Lepiller --- gnu/packages/icu4c.scm | 59 ++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 48 insertions(+), 11 deletions(-) diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm index 54a65365d7..2fadc2ad8d 100644 --- a/gnu/packages/icu4c.scm +++ b/gnu/packages/icu4c.scm @@ -6,6 +6,8 @@ ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2019, 2020 Marius Bakke ;;; Copyright © 2019 Mathieu Othacehe +;;; Copyright © 2020 Björn Höfling +;;; Copyright © 2020 Julien Lepiller ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,6 +26,7 @@ (define-module (gnu packages icu4c) #:use-module (gnu packages) + #:use-module (gnu packages java) #:use-module (gnu packages perl) #:use-module (gnu packages python) #:use-module (guix licenses) @@ -133,22 +136,56 @@ (define-public icu4c-build-root (define-public java-icu4j (package (name "java-icu4j") - (version "59.1") + (version "66.1") (source (origin (method url-fetch) - (uri (string-append "http://download.icu-project.org/files/icu4j/" - version "/icu4j-" - (string-map (lambda (x) - (if (char=? x #\.) #\_ x)) - version) - "-src.jar")) + (uri (string-append + "https://github.com/unicode-org/icu/releases/download/release-" + (string-map (lambda (x) (if (char=? x #\.) #\- x)) version) + "/icu4j-" + (string-map (lambda (x) (if (char=? x #\.) #\_ x)) version) + ".tgz")) (sha256 - (base32 - "0bgxsvgi0qcwj60pvcxrf7a3fbk7aksyxnfwpbzavyfrfzixqh0c")))) + (base32 "1ahdyz9209lwl7knb2l3gmnkkby221p0vpgx70fj4j02rdzgvw0d")))) (build-system ant-build-system) (arguments - `(#:tests? #f ; no tests included - #:jar-name "icu4j.jar")) + `(#:make-flags + (list (string-append "-Djunit.core.jar=" + (car (find-files + (assoc-ref %build-inputs "java-junit") + ".*.jar$"))) + (string-append "-Djunit.junitparams.jar=" + (car (find-files + (assoc-ref %build-inputs "java-junitparams") + ".*.jar$"))) + (string-append "-Djunit.hamcrest.jar=" + (car (find-files + (assoc-ref %build-inputs "java-hamcrest-core") + ".*.jar$")))) + #:phases + (modify-phases %standard-phases + (add-before 'configure 'chdir + (lambda _ + (chdir "..") + #t)) + (add-before 'build 'remove-ivy + (lambda _ + ;; This target wants to download ivy and use it to download + ;; junit. + (substitute* "build.xml" + (("depends=\"test-init-junit-dependency\"") "")) + #t)) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((share (string-append (assoc-ref outputs "out") + "/share/java/"))) + (mkdir-p share) + (install-file "icu4j.jar" share) + #t)))))) + (native-inputs + `(("java-junit" ,java-junit) + ("java-junitparams" ,java-junitparams) + ("java-hamcrest-core" ,java-hamcrest-core))) (home-page "http://site.icu-project.org/") (synopsis "International Components for Unicode") (description -- cgit v1.2.3 From a5f8d4e0b383edeb34861f0c52c5dcd702a5e078 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 4 Jul 2020 23:53:00 +0200 Subject: gnu: Add java-jetbrains-annotations. * gnu/packages/java.scm (java-jetbrains-annotations): New variable. --- gnu/packages/java.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 113108eb58..170936a0ff 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -12050,3 +12050,28 @@ (define-public java-picocli for the JVM. It supports colors, autocompletion, subcommands, and more. Written in Java, usable from Groovy, Kotlin, Scala, etc.") (license license:asl2.0))) + +(define-public java-jetbrains-annotations + (package + (name "java-jetbrains-annotations") + (version "19.0.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JetBrains/java-annotations") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0z6i1xs60cd5ffz23c49sq68wn5mphhs3xpar1n93ppama2ng80v")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "jetbrains-annotations.jar" + #:source-dir "common/src/main/java:java8/src/main/java" + #:tests? #f)); no tests + (home-page "https://github.com/JetBrains/java-annotations") + (synopsis "Annotations for Java and other JVM languages") + (description "This package contains a set of Java annotations which can be +used in JVM-based languages. They serve as an additional documentation and +can be interpreted by IDEs and static analysis tools to improve code analysis.") + (license license:expat))) -- cgit v1.2.3 From f1abc56655083849e951092342e5df680825cc9d Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 4 Jul 2020 23:54:30 +0200 Subject: gnu: Add java-opening-hours-parser. * gnu/packages/geo.scm (java-opening-hours-parser): New variable. --- gnu/packages/geo.scm | 47 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 1ad6f697a4..cae7f2ddf3 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2018, 2019 Arun Isaac ;;; Copyright © 2018 Joshua Sierles, Nextjournal -;;; Copyright © 2018, 2019 Julien Lepiller +;;; Copyright © 2018, 2019, 2020 Julien Lepiller ;;; Copyright © 2019, 2020 Guillaume Le Vaillant ;;; Copyright © 2019 Efraim Flashner ;;; Copyright © 2019 Wiktor Żelazny @@ -1160,6 +1160,51 @@ (define-public java-jmapviewer an independent project by the JOSM team.") (license license:gpl2))) +(define-public java-opening-hours-parser + (package + (name "java-opening-hours-parser") + (version "0.21.4") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/simonpoole/OpeningHoursParser") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1m8sp0jbjyv1nq3ddj8rk6rf3sva3mkacc6vw7rsj0c2n57k3i50")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "java-opening-hours-parser.jar" + #:source-dir "src/main/java" + #:phases + (modify-phases %standard-phases + (add-before 'build 'copy-resources + (lambda _ + (copy-recursively "src/main/resources" "build/classes") + #t)) + (add-before 'build 'generate-parser + (lambda* _ + (let* ((dir "src/main/java/ch/poole/openinghoursparser") + (file (string-append dir "/OpeningHoursParser.jj"))) + (invoke "javacc" "-DEBUG_PARSER=false" + "-DEBUG_TOKEN_MANAGER=false" "-JDK_VERSION=1.8" + "-GRAMMAR_ENCODING=UTF-8" + (string-append "-OUTPUT_DIRECTORY=" dir) + file)) + #t))))) + (inputs + `(("java-jetbrains-annotations" ,java-jetbrains-annotations))) + (native-inputs + `(("javacc" ,javacc) + ("java-junit" ,java-junit) + ("java-hamcrest-core" ,java-hamcrest-core))) + (home-page "https://github.com/simonpoole/OpeningHoursParser") + (synopsis "Java parser for the OpenStreetMap opening hour format") + (description "This is a very simplistic parser for string values according +to the OSM opening hours specification.") + (license license:expat))) + (define-public josm (package (name "josm") -- cgit v1.2.3 From cfdb6770ef57a745c101388fa708aa327b8cde2b Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 5 Jul 2020 01:06:32 +0200 Subject: gnu: josm: Update to 16731. * gnu/packages/geo.scm (josm): Update to 16731. --- gnu/packages/geo.scm | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index cae7f2ddf3..0834add7d1 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1208,7 +1208,7 @@ (define-public java-opening-hours-parser (define-public josm (package (name "josm") - (version "15937") + (version "16731") (source (origin (method svn-fetch) (uri (svn-reference @@ -1217,7 +1217,7 @@ (define-public josm (recursive? #f))) (sha256 (base32 - "00b8sw0wgkcf7xknmdpn5s521ax8x2660figidcrry37sgq3x946")) + "036kdb1ckhym5f7lj5ydzblli7f1i1pl8z00hxvagf2rczdf5fi3")) (file-name (string-append name "-" version "-checkout")) (modules '((guix build utils))) (snippet @@ -1234,6 +1234,7 @@ (define-public josm ("java-jsonp-api" ,java-jsonp-api) ("java-jsonp-impl" ,java-jsonp-impl); runtime dependency ("java-metadata-extractor" ,java-metadata-extractor) + ("java-opening-hours-parser" ,java-opening-hours-parser) ("java-openjfx-media" ,java-openjfx-media) ("java-signpost-core" ,java-signpost-core) ("java-svg-salamander" ,java-svg-salamander))) @@ -1255,6 +1256,14 @@ (define-public josm "1970-01-01 00:00:00 +0000" "")))) #t)) + (add-before 'build 'fix-jcs + (lambda _ + ;; This version of JOSM uses an unreleased version of commons-jcs, + ;; which has renamed its classes to another namespace. Rename them + ;; back so they can be used with our version of jcs. + (substitute* (find-files "." ".*.java$") + (("jcs3") "jcs")) + #t)) (add-before 'build 'fix-classpath (lambda* (#:key inputs #:allow-other-keys) (setenv "CLASSPATH" @@ -1288,10 +1297,9 @@ (define-public josm (invoke "java" "-cp" "build/classes:scripts:." "BuildProjectionDefinitions" ".") #t)) - (add-after 'generate-epsg 'copy-data + (add-after 'generate-epsg 'copy-resources (lambda _ - (mkdir-p "build/classes") - (rename-file "data" "build/classes/data") + (copy-recursively "resources" "build/classes") #t)) (add-before 'install 'regenerate-jar (lambda _ @@ -1300,16 +1308,6 @@ (define-public josm (invoke "jar" "-cf" "build/jar/josm.jar" "-C" "build/classes" ".") #t)) - (add-before 'build 'copy-styles - (lambda _ - (mkdir-p "build/classes") - (rename-file "styles" "build/classes/styles") - #t)) - (add-before 'build 'copy-images - (lambda _ - (mkdir-p "build/classes") - (rename-file "images" "build/classes/images") - #t)) (add-before 'build 'copy-revision (lambda _ (mkdir-p "build/classes") -- cgit v1.2.3 From dffc82fa55f4a1fd710c84088d118d9e6a8472b3 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sun, 5 Jul 2020 19:33:52 +0530 Subject: doc: Fix minor typo in X Window. * doc/guix.texi (X Window): Replace "not" with "no". --- doc/guix.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index b0d31f1bab..62e8bc9d68 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -15458,7 +15458,7 @@ auto-login session. @cindex Xorg, configuration @deftp {Data Type} xorg-configuration This data type represents the configuration of the Xorg graphical display -server. Note that there is not Xorg service; instead, the X server is started +server. Note that there is no Xorg service; instead, the X server is started by a ``display manager'' such as GDM, SDDM, and SLiM. Thus, the configuration of these display managers aggregates an @code{xorg-configuration} record. -- cgit v1.2.3 From ff814b8f23035565d428a47dfd4766254215c76c Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sun, 5 Jul 2020 17:51:21 +0300 Subject: gnu: Add emacs-fd. * gnu/packages/emacs-xyz.scm (emacs-fd): New variable. --- gnu/packages/emacs-xyz.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index fc73dd205f..a67fe06610 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3253,6 +3253,26 @@ (define-public emacs-grep-a-lot "This Emacs package allows managing multiple grep buffers.") (license license:gpl3+))) +(define-public emacs-fd + (package + (name "emacs-fd") + (version "0.1.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/yqrashawn/fd-dired.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1fas0fpvym2lyzybwm44gly9jz6a2fpp72yxnwfbqqjkfgk9910y")))) + (build-system emacs-build-system) + (home-page "https://github.com/yqrashawn/fd-dired") + (synopsis "Dired-mode interface for fd result") + (description "This package provides a dired-mode interface for fd's +result.") + (license license:gpl3+))) + (define-public emacs-rg (package (name "emacs-rg") -- cgit v1.2.3 From 6ee7468758d7c043692ae8c0b5e130fa4eabe94c Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 5 Jul 2020 16:39:40 +0100 Subject: gnu: python-llvmlite: Use specific commit for llvm patch URLs. As this commit [1] appears to affect the patches, including the v0.30.0 tag (so the tag must have been changed). 1: https://github.com/numba/llvmlite/commit/cdd99deb32f9d48aadb0f7407fb8ad06f6a8ce6c * gnu/packages/llvm.scm (python-llvmlite)[inputs]: Use a specific commit for the patches. --- gnu/packages/llvm.scm | 48 ++++++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 7cd9543036..aee32b0722 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -949,28 +949,32 @@ (define-public python-llvmlite `(#:tests? #f)) (inputs `(("llvm" - ,(package - (inherit llvm-7) - (source (origin - (inherit (package-source llvm-7)) - (patches - (list - (origin - (method url-fetch) - (uri (string-append "https://raw.githubusercontent.com/numba/" - "llvmlite/v" version "/conda-recipes/" - "D47188-svml-VF.patch")) - (sha256 - (base32 - "0wxhgb61k17f0zg2m0726sf3hppm41f8jar2kkg2n8sl5cnjj9mr"))) - (origin - (method url-fetch) - (uri (string-append "https://raw.githubusercontent.com/numba/" - "llvmlite/v" version "/conda-recipes/" - "twine_cfg_undefined_behavior.patch")) - (sha256 - (base32 - "07h71n2m1mn9zcfgw04zglffknplb233zqbcd6pckq0wygkrxflp"))))))))))) + ,(let ((patches-commit "486edd5fb2a6667feb5c865f300c0da73785434a")) + (package + (inherit llvm-7) + (source + (origin + (inherit (package-source llvm-7)) + (patches + (list + (origin + (method url-fetch) + (uri (string-append + "https://raw.githubusercontent.com/numba/" + "llvmlite/" patches-commit "/conda-recipes/" + "D47188-svml-VF.patch")) + (sha256 + (base32 + "0wxhgb61k17f0zg2m0726sf3hppm41f8jar2kkg2n8sl5cnjj9mr"))) + (origin + (method url-fetch) + (uri (string-append + "https://raw.githubusercontent.com/numba/" + "llvmlite/" patches-commit "/conda-recipes/" + "twine_cfg_undefined_behavior.patch")) + (sha256 + (base32 + "07h71n2m1mn9zcfgw04zglffknplb233zqbcd6pckq0wygkrxflp")))))))))))) (home-page "http://llvmlite.pydata.org") (synopsis "Wrapper around basic LLVM functionality") (description -- cgit v1.2.3 From f3a5e5881390be67965ebdd7fd7620e95d771f03 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 5 Jul 2020 17:30:29 -0700 Subject: gnu: opensbi: Update to 0.8. * gnu/packages/firmware (make-opensbi-package): Add name argument. Drop variant argument. (opensbi-qemu-sifive-fu540): Adjust arguments. (opensbi-qemu-generic): New variable. (opensbi-qemu-virt): Change to deprecated variable. --- gnu/packages/firmware.scm | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index e0a162f1b8..91136ab174 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -189,12 +189,10 @@ (define-public openfwwf-firmware by the b43-open driver of Linux-libre.") (license license:gpl2))) -(define* (make-opensbi-package platform variant #:optional (arch "riscv64")) +(define* (make-opensbi-package platform name #:optional (arch "riscv64")) (package - (name (string-replace-substring - (string-append "opensbi-" platform "-" variant) - "_" "-")) - (version "0.6") + (name name) + (version "0.8") (source (origin (method git-fetch) @@ -203,7 +201,7 @@ (define* (make-opensbi-package platform variant #:optional (arch "riscv64")) (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "129ypdga0fzn657n2f42g2a1vx3hf8x7sd78h06d35pgkry0jkl7")))) + (base32 "1y9z0b6q6wpw7mgy31wml4djc6m8ydm71a9f1asnks4ragc7m98b")))) (build-system gnu-build-system) (native-inputs `(,@(if (and (not (string-prefix? "riscv64" (%current-system))) @@ -213,7 +211,7 @@ (define* (make-opensbi-package platform variant #:optional (arch "riscv64")) '()))) (arguments `(#:tests? #f ; no check target - #:make-flags (list (string-append "PLATFORM=" ,platform "/" ,variant) + #:make-flags (list (string-append "PLATFORM=" ,platform) ,@(if (and (not (string-prefix? "riscv64" (%current-system))) (string-prefix? "riscv64" arch)) @@ -243,11 +241,14 @@ (define* (make-opensbi-package platform variant #:optional (arch "riscv64")) ;; platform/ariane-fpga/* is gpl2. license:gpl2)))) +(define-public opensbi-qemu-generic + (make-opensbi-package "generic" "opensbi-qemu-generic")) + (define-public opensbi-qemu-virt - (make-opensbi-package "qemu" "virt")) + (deprecated-package "opensbi-qemu-virt" opensbi-qemu-generic)) (define-public opensbi-sifive-fu540 - (make-opensbi-package "sifive" "fu540")) + (make-opensbi-package "sifive/fu540" "opensbi-sifive-fu540")) (define-public opensbi-qemu-sifive-u ;; Dropped upstream, as all functionality is present in the sifive-fu540 -- cgit v1.2.3 From 31e390f6189f4e5e9dd96dcdd3e578bf77b64536 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 6 Jul 2020 09:49:39 +0300 Subject: Revert "gnu: libmicrohttpd: Update to 0.9.71." This update breaks most of the packages which rely on libmicrohttpd. This reverts commit 1bab01c2dbf74ef532b93543ce9c2e3b037eb8f5. --- gnu/packages/gnunet.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index 90df651090..f2ab3a1c27 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -151,14 +151,14 @@ (define-public libextractor (define-public libmicrohttpd (package (name "libmicrohttpd") - (version "0.9.71") + (version "0.9.70") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/libmicrohttpd/libmicrohttpd-" version ".tar.gz")) (sha256 (base32 - "10mii4mifmfs3v7kgciqml7f0fj7ljp0sngrx64pnwmgbzl4bx78")))) + "01vkjy89b1ylmh22dy5yza2r414nfwcfixxh3v29nvzrjv9s7l4h")))) (build-system gnu-build-system) (inputs `(("curl" ,curl) -- cgit v1.2.3 From 3d80e618ddbd40342ed7e69f898801e8e3a64eaa Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 6 Jul 2020 09:40:12 +0200 Subject: gnu: emacs-lsp-mode: Update home-page. * gnu/packages/emacs-xyz.scm (emacs-lsp-mode)[home-page]: Update to new URL. --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index a67fe06610..b1e9c59585 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19250,7 +19250,7 @@ (define-public emacs-lsp-mode ("emacs-markdown-mode" ,emacs-markdown-mode) ("emacs-spinner" ,emacs-spinner) ("emacs-hydra" ,emacs-hydra))) - (home-page "https://github.com/emacs-lsp/lsp-mode") + (home-page "https://emacs-lsp.github.io/lsp-mode/") (synopsis "Emacs client and library for the Language Server Protocol") (description "@code{LSP-mode} is a client and library implementation for the Language Server Protocol. This mode aims to provide an IDE-like -- cgit v1.2.3 From a07a1b0eab5f739a9beb4284bec4ed5701405663 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 6 Jul 2020 09:45:38 +0200 Subject: gnu: emacs-lsp-mode: Update to 7.0. * gnu/packages/emacs-xyz.scm (emacs-lsp-mode): Update to 7.0. [description]: Slightly improve typography and wording. --- gnu/packages/emacs-xyz.scm | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index b1e9c59585..2fdda96b45 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19232,30 +19232,31 @@ (define-public emacs-dockerfile-mode (define-public emacs-lsp-mode (package (name "emacs-lsp-mode") - (version "6.3.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/emacs-lsp/lsp-mode.git") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "125rpmhlyd6wmq7p71j54x3rzmk07vn1hdcvvdjjip5481raxcwx")))) + (version "7.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emacs-lsp/lsp-mode.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1kw32dcm73i0kg1fncp6vwgar3dwva7dh3gkg5cr45gavn6rq34i")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-dash" ,emacs-dash) ("emacs-f" ,emacs-f) ("emacs-ht" ,emacs-ht) + ("emacs-hydra" ,emacs-hydra) ("emacs-markdown-mode" ,emacs-markdown-mode) - ("emacs-spinner" ,emacs-spinner) - ("emacs-hydra" ,emacs-hydra))) + ("emacs-spinner" ,emacs-spinner))) (home-page "https://emacs-lsp.github.io/lsp-mode/") (synopsis "Emacs client and library for the Language Server Protocol") - (description "@code{LSP-mode} is a client and library implementation for -the Language Server Protocol. This mode aims to provide an IDE-like -experience by providing optional integration with other popular Emacs packages -like @code{company}, @code{flycheck}, and @code{projectile}.") + (description + "LSP mode is a client and library implementation for the Language Server +Protocol. This mode creates an IDE-like experience by providing optional +integration with other popular Emacs packages like Company, Flycheck, and +Projectile.") (license license:gpl3+))) (define-public emacs-pfuture -- cgit v1.2.3 From 7f32c61e9425acdc8175a00e734fe79d5c5b03c9 Mon Sep 17 00:00:00 2001 From: Oskar Köök Date: Sun, 5 Jul 2020 19:56:55 +0200 Subject: gnu: elixir: Update to 1.10.4. * gnu/packages/elixir.scm (elixir): Update to 1.10.4. Signed-off-by: Efraim Flashner --- gnu/packages/elixir.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/elixir.scm b/gnu/packages/elixir.scm index 0613acff27..b034400db8 100644 --- a/gnu/packages/elixir.scm +++ b/gnu/packages/elixir.scm @@ -33,7 +33,7 @@ (define-module (gnu packages elixir) (define-public elixir (package (name "elixir") - (version "1.10.3") + (version "1.10.4") (source (origin (method git-fetch) @@ -42,7 +42,7 @@ (define-public elixir (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "18bqqqzvhr1zj491wc3d36a310mg1wcs12npp70zfmgqrc60q65a")) + (base32 "16j4rmm3ix088fvxhvyjqf1hnfg7wiwa87gml3b2mrwirdycbinv")) (patches (search-patches "elixir-path-length.patch")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 4c93818392fcfce9238816c232b6d58cc64ecd8a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 6 Jul 2020 11:56:17 +0300 Subject: gnu: python-fastimport: Update to 0.9.8. * gnu/packages/python-xyz.scm (python-fastimport): Update to 0.9.8. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7079bbda5d..6d6b60db83 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11674,13 +11674,13 @@ (define-public python2-gevent (define-public python-fastimport (package (name "python-fastimport") - (version "0.9.6") + (version "0.9.8") (source (origin (method url-fetch) (uri (pypi-uri "fastimport" version)) (sha256 - (base32 "1aqjsin4rmqm7ln4j0p73fzxifws6c6ikgyhav7r137m2ixsxl43")))) + (base32 "1fb3b7y3sw55f6wykxx478ybkirz0l52lgdqmbhmc0h0jzmyiwmj")))) (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 25a23a8d4a92150503f7ef8ea577ab7524531247 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 6 Jul 2020 12:02:09 +0300 Subject: gnu: Add python-patiencediff. * gnu/packages/python-xyz.scm (python-patiencediff): New variable. --- gnu/packages/python-xyz.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 6d6b60db83..55860fa57f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4481,6 +4481,26 @@ (define-public python-pygit2 ;; GPL2.0 only, with linking exception. (license license:gpl2))) +(define-public python-patiencediff + (package + (name "python-patiencediff") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "patiencediff" version)) + (sha256 + (base32 + "0yjk50lsd4gnllxls925xbcdxwvmda37w2a1shk0p1nvl3fcha6q")))) + (build-system python-build-system) + (home-page "https://www.breezy-vcs.org/") + (synopsis "Python implementation of the patiencediff algorithm") + (description + "This package contains a Python implementation of the @code{patiencediff} +algorithm. Patiencediff provides a good balance of performance, nice output for +humans, and implementation simplicity.") + (license license:gpl2))) + (define-public python-pyparsing (package (name "python-pyparsing") -- cgit v1.2.3 From b523b034e2b8cc883327a504cd5470c373c2ed7c Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 13 Jun 2020 14:53:50 -0700 Subject: gnu: Add libbpf. * gnu/packages/linux.scm (libbpf): New variable. Signed-off-by: Mathieu Othacehe --- gnu/packages/linux.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b508e1809c..fce6c5037c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -45,6 +45,7 @@ ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2020 Brice Waegeneire ;;; Copyright © 2020 Morgan Smith +;;; Copyright © 2020 John Soo ;;; ;;; This file is part of GNU Guix. ;;; @@ -7139,3 +7140,50 @@ (define-public cachefilesd @code{NFS} to cache data locally on disk. The content of the cache is persistent over reboots.") (license license:gpl2+))) + +(define-public libbpf + (package + (name "libbpf") + (version "0.0.9") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libbpf/libbpf") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "18l0gff7nm841mwhr7bc7x863xcyvwh58zl7mc0amnsjqlbrvqg7")))) + (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("libelf" ,libelf) + ("zlib" ,zlib))) + (arguments + `(#:tests? #f ; No tests + #:make-flags + (list + (string-append "PREFIX=''") + (string-append "DESTDIR=" (assoc-ref %outputs "out")) + (string-append "LIBDIR=/lib") + (string-append + "CC=" (assoc-ref %build-inputs "gcc") "/bin/gcc")) + #:phases + (modify-phases %standard-phases + (delete 'configure) + (add-before 'build 'pre-build + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "scripts/check-reallocarray.sh" + (("/bin/rm" rm) + (string-append (assoc-ref inputs "coreutils") rm))) + (chdir "src") + #t))))) + (home-page "https://github.com/libbpf/libbpf") + (synopsis "BPF CO-RE (Compile Once – Run Everywhere)") + (description + "Libbpf supports building BPF CO-RE-enabled applications, which, in +contrast to BCC, do not require the Clang/LLVM runtime or linux kernel +headers.") + (license `(,license:lgpl2.1 ,license:bsd-2)))) -- cgit v1.2.3 From ef20acae83af8189df3225bdf59c5a0c1ae7da45 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Thu, 14 May 2020 18:44:15 +0200 Subject: services: simulated-wifi: Use 'kernel-module-loader'. * gnu/services/networking.scm (simulated-wifi-shepherd-services): Change 'mac-simulation-module' service to use 'kernel-module-loader'. --- gnu/services/networking.scm | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index 348dc369d8..353fdce2bb 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2019 Maxim Cournoyer ;;; Copyright © 2019 Sou Bunnbu ;;; Copyright © 2019 Alex Griffin +;;; Copyright © 2020 Brice Waegeneire ;;; ;;; This file is part of GNU Guix. ;;; @@ -33,6 +34,7 @@ (define-module (gnu services networking) #:use-module (gnu services) #:use-module (gnu services base) #:use-module (gnu services configuration) + #:use-module (gnu services linux) #:use-module (gnu services shepherd) #:use-module (gnu services dbus) #:use-module (gnu system shadow) @@ -1442,10 +1444,10 @@ (define (simulated-wifi-shepherd-services config) (append (hostapd-shepherd-services config #:requirement '(unblocked-wifi - mac-simulation-module)) + kernel-module-loader)) (list (shepherd-service (provision '(unblocked-wifi)) - (requirement '(file-systems mac-simulation-module)) + (requirement '(file-systems kernel-module-loader)) (documentation "Unblock WiFi devices for use by mac80211_hwsim.") (start #~(lambda _ @@ -1453,21 +1455,6 @@ (define (simulated-wifi-shepherd-services config) "unblock" "0") (invoke #$(file-append util-linux "/sbin/rfkill") "unblock" "1"))) - (one-shot? #t)) - (shepherd-service - (provision '(mac-simulation-module)) - (requirement '(file-systems)) - (modules '((guix build utils))) - (documentation - "Load the mac80211_hwsim Linux kernel module.") - (start (with-imported-modules '((guix build utils)) - #~(lambda _ - ;; XXX: We can't use 'load-linux-module*' here because it - ;; expects a flat module directory. - (setenv "LINUX_MODULE_DIRECTORY" - "/run/booted-system/kernel/lib/modules") - (invoke #$(file-append kmod "/bin/modprobe") - "mac80211_hwsim")))) (one-shot? #t))))) (define simulated-wifi-service-type @@ -1475,7 +1462,9 @@ (define simulated-wifi-service-type (name 'simulated-wifi) (extensions (list (service-extension shepherd-root-service-type - simulated-wifi-shepherd-services))) + simulated-wifi-shepherd-services) + (service-extension kernel-module-loader-service-type + (const '("mac80211_hwsim"))))) (default-value (hostapd-configuration (interface "wlan1") (ssid "Test Network"))) -- cgit v1.2.3 From 78410b0969c888bbde7d0111a275dff1c71f2401 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 13 Jun 2020 22:52:55 -0700 Subject: gnu: Add linux-libre-with-bpf. * gnu/packages/linux (%bpf-extra-linux-options): New variable, (linux-libre-with-bpf): new variable. Signed-off-by: Mathieu Othacehe --- gnu/packages/linux.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index fce6c5037c..94d3b37845 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -75,6 +75,7 @@ (define-module (gnu packages linux) #:use-module (gnu packages bison) #:use-module (gnu packages calendar) #:use-module (gnu packages check) + #:use-module (gnu packages cpio) #:use-module (gnu packages crypto) #:use-module (gnu packages cryptsetup) #:use-module (gnu packages compression) @@ -619,6 +620,30 @@ (define %default-extra-linux-options ("CONFIG_CIFS" . m) ("CONFIG_9P_FS" . m))) +;; See https://github.com/iovisor/bcc/blob/master/INSTALL.md#kernel-configuration +(define %bpf-extra-linux-options + `(;; Needed for probes + ("CONFIG_UPROBE_EVENTS" . #t) + ("CONFIG_KPROBE_EVENTS" . #t) + ;; kheaders module also helpful for tracing + ("CONFIG_IKHEADERS" . #t) + ("CONFIG_BPF" . #t) + ("CONFIG_BPF_SYSCALL" . #t) + ("CONFIG_BPF_JIT_ALWAYS_ON" . #t) + ;; optional, for tc filters + ("CONFIG_NET_CLS_BPF" . m) + ;; optional, for tc actions + ("CONFIG_NET_ACT_BPF" . m) + ("CONFIG_BPF_JIT" . #t) + ;; for Linux kernel versions 4.1 through 4.6 + ;; ("CONFIG_HAVE_BPF_JIT" . y) + ;; for Linux kernel versions 4.7 and later + ("CONFIG_HAVE_EBPF_JIT" . #t) + ;; optional, for kprobes + ("CONFIG_BPF_EVENTS" . #t) + ;; kheaders module + ("CONFIG_IKHEADERS" . #t))) + (define (config->string options) (string-join (map (match-lambda ((option . 'm) @@ -937,6 +962,23 @@ (define-public linux-libre-riscv64-generic '("riscv64-linux") #:extra-version "riscv64-generic")) +(define-public linux-libre-with-bpf + (let ((base-linux-libre + (make-linux-libre* + linux-libre-5.4-version + linux-libre-5.4-source + '("x86_64-linux" "i686-linux" "armhf-linux" + "aarch64-linux" "riscv64-linux") + #:extra-version "bpf" + #:configuration-file kernel-config + #:extra-options + (append %bpf-extra-linux-options + %default-extra-linux-options)))) + (package + (inherit base-linux-libre) + (inputs `(("cpio" ,cpio) ,@(package-inputs base-linux-libre)))))) + + ;;; ;;; Linux kernel modules. -- cgit v1.2.3 From 419db9003f878905e1bee02aaad3d4d0032cf926 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sun, 5 Jul 2020 11:57:18 +0200 Subject: gnu: sbcl-cl-prevalence: Update to 20200704. * gnu/packages/lisp-xyz.scm (sbcl-cl-prevalence): Update to 20200704. --- gnu/packages/lisp-xyz.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 0848603b56..06f1e24ccc 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -6550,8 +6550,8 @@ (define-public ecl-s-sysdeps (sbcl-package->ecl-package sbcl-s-sysdeps)) (define-public sbcl-cl-prevalence - (let ((commit "da3ed6c4594b1c2fca90c178c1993973c4bf16c9") - (revision "2")) + (let ((commit "1e5f030d94237b33d20947a2f6c194abedb10727") + (revision "3")) (package (name "sbcl-cl-prevalence") (build-system asdf-build-system/sbcl) @@ -6566,10 +6566,12 @@ (define-public sbcl-cl-prevalence (file-name (git-file-name name version)) (sha256 (base32 - "0bq905hv1626dl6b7s0zn4lbdh608g1pxaljl1fda6pwp9hmj95a")))) + "13yb8lv2aap5wvqa6hw7ms31xnax58f4m2nxifkssrzkb2w2qf29")))) (inputs `(("s-sysdeps" ,sbcl-s-sysdeps) ("s-xml" ,sbcl-s-xml))) + (native-inputs + `(("fiveam" ,sbcl-fiveam))) (synopsis "Implementation of object prevalence for Common Lisp") (description "This Common Lisp library implements object prevalence (see @url{https://en.wikipedia.org/wiki/System_prevalence}). It allows -- cgit v1.2.3 From 14546abb43e86f040cce7d164f402b6b63d59603 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sun, 5 Jul 2020 11:57:49 +0200 Subject: gnu: sbcl-serapeum: Update to 20200703. * gnu/packages/lisp-xyz.scm (sbcl-serapeum): Update to 20200703. --- gnu/packages/lisp-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 06f1e24ccc..05c85d0274 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -7270,8 +7270,8 @@ (define-public ecl-trivial-macroexpand-all (sbcl-package->ecl-package sbcl-trivial-macroexpand-all)) (define-public sbcl-serapeum - (let ((commit "64f0c4a161bbbda7c275012ca1415b4293b9e169") - (revision "1")) + (let ((commit "a2ca90cbdcb9f76c2822286110c7abe9ba5b76c2") + (revision "2")) (package (name "sbcl-serapeum") (version (git-version "0.0.0" revision commit)) @@ -7285,7 +7285,7 @@ (define-public sbcl-serapeum (file-name (git-file-name name version)) (sha256 (base32 - "0djnj0py8hdjnk5j6shjq2kbmyxqd5sw79cilcfmpfz4dzjdgkx9")))) + "1lrk2kf7qh5g6f8xvyg8wf89frzb5mw6m1jzgy46jy744f459i8q")))) (build-system asdf-build-system/sbcl) (inputs `(("alexandria" ,sbcl-alexandria) -- cgit v1.2.3 From 332f0a4685e1ec837ba4bc7838e26038d8cf69a2 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sun, 5 Jul 2020 13:55:15 +0530 Subject: doc: Fix texinfo identifiers in Version Control Services. * doc/guix.texi (Version Control Services): Use @code, @command, @file, @indicateurl, @samp texinfo identifiers correctly. --- doc/guix.texi | 48 +++++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 62e8bc9d68..992bc303bb 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -52,7 +52,7 @@ Copyright @copyright{} 2017, 2019, 2020 Maxim Cournoyer@* Copyright @copyright{} 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice@* Copyright @copyright{} 2017 George Clemmer@* Copyright @copyright{} 2017 Andy Wingo@* -Copyright @copyright{} 2017, 2018, 2019 Arun Isaac@* +Copyright @copyright{} 2017, 2018, 2019, 2020 Arun Isaac@* Copyright @copyright{} 2017 nee@* Copyright @copyright{} 2018 Rutger Helling@* Copyright @copyright{} 2018 Oleg Pykhalov@* @@ -24926,39 +24926,41 @@ access to exported@footnote{By creating the magic file Data type representing the configuration for @code{git-daemon-service}. @table @asis -@item @code{package} (default: @var{git}) +@item @code{package} (default: @code{git}) Package object of the Git distributed version control system. -@item @code{export-all?} (default: @var{#f}) +@item @code{export-all?} (default: @code{#f}) Whether to allow access for all Git repositories, even if they do not have the @file{git-daemon-export-ok} file. @item @code{base-path} (default: @file{/srv/git}) Whether to remap all the path requests as relative to the given path. -If you run git daemon with @var{(base-path "/srv/git")} on example.com, -then if you later try to pull @code{git://example.com/hello.git}, git -daemon will interpret the path as @code{/srv/git/hello.git}. +If you run @command{git daemon} with @code{(base-path "/srv/git")} on +@samp{example.com}, then if you later try to pull +@indicateurl{git://example.com/hello.git}, git daemon will interpret the +path as @file{/srv/git/hello.git}. -@item @code{user-path} (default: @var{#f}) +@item @code{user-path} (default: @code{#f}) Whether to allow @code{~user} notation to be used in requests. When -specified with empty string, requests to @code{git://host/~alice/foo} is -taken as a request to access @code{foo} repository in the home directory -of user @code{alice}. If @var{(user-path "path")} is specified, the -same request is taken as a request to access @code{path/foo} repository -in the home directory of user @code{alice}. - -@item @code{listen} (default: @var{'()}) +specified with empty string, requests to +@indicateurl{git://host/~alice/foo} is taken as a request to access +@code{foo} repository in the home directory of user @code{alice}. If +@code{(user-path "@var{path}")} is specified, the same request is taken +as a request to access @file{@var{path}/foo} repository in the home +directory of user @code{alice}. + +@item @code{listen} (default: @code{'()}) Whether to listen on specific IP addresses or hostnames, defaults to all. -@item @code{port} (default: @var{#f}) +@item @code{port} (default: @code{#f}) Whether to listen on an alternative port, which defaults to 9418. -@item @code{whitelist} (default: @var{'()}) +@item @code{whitelist} (default: @code{'()}) If not empty, only allow access to this list of directories. -@item @code{extra-options} (default: @var{'()}) -Extra options will be passed to @code{git daemon}, please run +@item @code{extra-options} (default: @code{'()}) +Extra options will be passed to @command{git daemon}, please run @command{man git-daemon} for more information. @end table @@ -24990,14 +24992,14 @@ Package object of the Git distributed version control system. @item @code{git-root} (default: @file{/srv/git}) Directory containing the Git repositories to expose to the world. -@item @code{export-all?} (default: @var{#f}) +@item @code{export-all?} (default: @code{#f}) Whether to expose access for all Git repositories in @var{git-root}, even if they do not have the @file{git-daemon-export-ok} file. -@item @code{uri-path} (default: @file{/git/}) -Path prefix for Git access. With the default @code{/git/} prefix, this -will map @code{http://@var{server}/git/@var{repo}.git} to -@code{/srv/git/@var{repo}.git}. Requests whose URI paths do not begin +@item @code{uri-path} (default: @samp{/git/}) +Path prefix for Git access. With the default @samp{/git/} prefix, this +will map @indicateurl{http://@var{server}/git/@var{repo}.git} to +@file{/srv/git/@var{repo}.git}. Requests whose URI paths do not begin with this prefix are not passed on to this Git instance. @item @code{fcgiwrap-socket} (default: @code{127.0.0.1:9000}) -- cgit v1.2.3 From 28f7ef86cea4dd9399db6c0adc200cd9d2b3b687 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 6 Jul 2020 19:04:38 +0200 Subject: gnu: Add emacs-helm-selector. * gnu/packages/emacs-xyz.scm (emacs-helm-selector): New variable. --- gnu/packages/emacs-xyz.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 2fdda96b45..8ca331efd5 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -22701,6 +22701,37 @@ (define-public emacs-helm-clojuredocs @end itemize\n") (license license:gpl3+)))) +(define-public emacs-helm-selector + (package + (name "emacs-helm-selector") + (version "0.2") + (home-page "https://github.com/emacs-helm/helm-selector") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1c7xhrq1mivldyq3rglpmfypbz44dcm7zrgyha6x09cfixlyfbcp")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-helm" ,emacs-helm))) + (synopsis "Convenient related-buffer selection for Emacs Helm") + (description "Helm Selector is a collection of Helm helper functions for +convenient buffer selection. + +It is especially helpful to create Helm sessions to navigate buffers of a +given mode in a “do what I mean” fashion: + +If current buffer is not of mode X, switch to last buffer of mode X. If +current buffer is of mode X, show a Helm session of all buffers in mode X. In +the Helm session, it’s also possible to input an arbitrary name which will be +used for the creation of a new buffer of mode X.") + (license license:gpl3+))) + (define-public emacs-metal-mercury-mode (let ((commit "99e2d8fb7177cae3bfa2dec2910fc28216d5f5a8") (revision "1") -- cgit v1.2.3 From a5dbc07d38d3ae1a66a478efb959f74cce93b51f Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Mon, 6 Jul 2020 19:15:06 +0200 Subject: gnu: vim: Update to 8.2.1145. * gnu/packages/vim.scm (vim): Update to 8.2.1145. [arguments]: Patch the terminal2 test too, as it has been split from test_terminal. Make the name of the phase more accurate. (vim-full)[arguments]: Remove the skip-test87 phase, as the test no longer exists and its successor passes. --- gnu/packages/vim.scm | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 44d81bb5f5..df6359351f 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -70,7 +70,7 @@ (define-module (gnu packages vim) (define-public vim (package (name "vim") - (version "8.2.1101") + (version "8.2.1145") (source (origin (method git-fetch) (uri (git-reference @@ -79,21 +79,22 @@ (define-public vim (file-name (git-file-name name version)) (sha256 (base32 - "170k855vscixnk6rz01i3k22crjiz8b2h83fnm2b2ccha0jyn9mf")))) + "01z5hgi7m8d63gl1fgfn4p9rsdaqbl5xn4vr247nbxjq5x5hrs7a")))) (build-system gnu-build-system) (arguments `(#:test-target "test" #:parallel-tests? #f #:phases (modify-phases %standard-phases - (add-after 'configure 'patch-config-files + (add-after 'configure 'patch-absolute-paths (lambda _ (substitute* "runtime/tools/mve.awk" (("/usr/bin/nawk") (which "gawk"))) (substitute* '("src/testdir/Makefile" "src/testdir/test_normal.vim" "src/testdir/test_system.vim" - "src/testdir/test_terminal.vim") + "src/testdir/test_terminal.vim" + "src/testdir/test_terminal2.vim") (("/bin/sh") (which "sh"))) (substitute* "src/testdir/test_autocmd.vim" (("/bin/kill") (which "kill"))) @@ -214,19 +215,6 @@ (define-public vim-full ,@(substitute-keyword-arguments (package-arguments vim) ((#:phases phases) `(modify-phases ,phases - (add-before 'check 'skip-test87 - ;; This test fails for unknown reasons after switching - ;; to a git checkout. - (lambda _ - (delete-file "src/testdir/test87.ok") - (delete-file "src/testdir/test87.in") - (substitute* '("src/Makefile" - "src/testdir/Make_vms.mms") - (("test87") "")) - (substitute* "src/testdir/Make_all.mak" - (("test86.out \\\\") "test86") - (("test87.out") "")) - #t)) (add-before 'check 'start-xserver (lambda* (#:key inputs #:allow-other-keys) ;; Some tests require an X server, but does not start one. -- cgit v1.2.3 From a2221c75119e568d41d4c4f8191546a986ba9cda Mon Sep 17 00:00:00 2001 From: John Soo Date: Tue, 16 Jun 2020 18:51:23 -0700 Subject: gnu: Add rust-peg-runtime-0.6. * gnu/packages/crates-io.scm (rust-peg-runtime-0.6): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 15a29e0961..a5c797f88c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -15906,6 +15906,27 @@ (define-public rust-peeking-take-while-0.1 (license (list license:asl2.0 license:expat)))) +(define-public rust-peg-runtime-0.6 + (package + (name "rust-peg-runtime") + (version "0.6.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "peg-runtime" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0r583cq923v0narrpq73qmp780yg4pablzklhrwnr64xwsbjh6hc")))) + (build-system cargo-build-system) + (home-page "https://github.com/kevinmehall/rust-peg") + (synopsis "Runtime support for rust-peg grammars") + (description + "PEG provides a Parsing Expression Grammar. This package provides +runtime support for rust-peg grammars. To use rust-peg, see the peg crate.") + (license license:expat))) + (define-public rust-percent-encoding-2.1 (package (name "rust-percent-encoding") -- cgit v1.2.3 From d5a577070d58901f862a293eb9ce5525c7896359 Mon Sep 17 00:00:00 2001 From: John Soo Date: Tue, 16 Jun 2020 18:52:05 -0700 Subject: gnu: Add rust-peg-macros-0.6. * gnu/packages/crates-io.scm (rust-peg-macros-0.6): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a5c797f88c..fd916cf0e6 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -15906,6 +15906,32 @@ (define-public rust-peeking-take-while-0.1 (license (list license:asl2.0 license:expat)))) +(define-public rust-peg-macros-0.6 + (package + (name "rust-peg-macros") + (version "0.6.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "peg-macros" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0li8qrb8hyqr7v5mhrkym0xp7ijnbksqviqc2i3556cysdgick62")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-peg-runtime" ,rust-peg-runtime-0.6) + ("rust-proc-macro2" ,rust-proc-macro2-1.0) + ("rust-quote" ,rust-quote-1.0)))) + (home-page "https://github.com/kevinmehall/rust-peg") + (synopsis "Procedural macros for rust-peg") + (description + "PEG provides a Parsing Expression Grammar. This package provides +procedural macros for rust-peg. To use rust-peg, see the peg package.") + (license license:expat))) + (define-public rust-peg-runtime-0.6 (package (name "rust-peg-runtime") -- cgit v1.2.3 From 41de2761d4bcc0f84ac8eba9817102738c7d6a3d Mon Sep 17 00:00:00 2001 From: John Soo Date: Tue, 16 Jun 2020 18:52:31 -0700 Subject: gnu: Add rust-peg-0.6. * gnu/packages/crates-io.scm (rust-peg-0.6): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index fd916cf0e6..01e7687dc2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -15906,6 +15906,34 @@ (define-public rust-peeking-take-while-0.1 (license (list license:asl2.0 license:expat)))) +(define-public rust-peg-0.6 + (package + (name "rust-peg") + (version "0.6.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "peg" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "15rfp12dgsynplphp443zfw47m2d5snvdm6a25gz48dv2if8fxch")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f + #:cargo-inputs + (("rust-peg-macros" ,rust-peg-macros-0.6) + ("rust-peg-runtime" ,rust-peg-runtime-0.6)) + #:cargo-development-inputs + (("rust-trybuild" ,rust-trybuild-1.0)))) + (home-page "https://github.com/kevinmehall/rust-peg") + (synopsis "Simple Parsing Expression Grammar (PEG) parser generator") + (description + "PEG provides a simple Parsing Expression Grammar (PEG) parser generator +in Rust.") + (license license:expat))) + (define-public rust-peg-macros-0.6 (package (name "rust-peg-macros") -- cgit v1.2.3 From 8b5e2ca03784f1d637486b757d67ad3ebe106e9f Mon Sep 17 00:00:00 2001 From: John Soo Date: Thu, 18 Jun 2020 15:38:27 -0700 Subject: gnu: rust-unicode-normalization-0.1: update to 0.1.11. * gnu/packages/crates-io.scm (rust-unicode-normalization-0.1): Update to 0.1.11. [arguments]: Replace rust-smallvec-0.6 with 1 in cargo-inputs. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 01e7687dc2..adebafa917 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -25606,7 +25606,7 @@ (define-public rust-unicode-bidi-0.3 (define-public rust-unicode-normalization-0.1 (package (name "rust-unicode-normalization") - (version "0.1.9") + (version "0.1.11") (source (origin (method url-fetch) @@ -25614,12 +25614,12 @@ (define-public rust-unicode-normalization-0.1 (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1kviyqg3bmds4p5hgwf9qgihw8xxvq7ljgyrrk7ygxa2k450gj09")))) + (base32 "1kxxb5ndb5dzyp1flajjdxnbwyjw6ml9xvy0pz7b8srjn9ky4qdm")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-smallvec" ,rust-smallvec-0.6)))) + (("rust-smallvec" ,rust-smallvec-1)))) (home-page "https://github.com/unicode-rs/unicode-normalization") (synopsis "This crate provides functions for normalization of Unicode strings") -- cgit v1.2.3 From 0043e6a63321e319671b83b34ec707d8844d1e92 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 6 Jul 2020 18:39:03 +0300 Subject: gnu: rust-unicode-normalization-0.1: Don't skip build. * gnu/packages/crates-io.scm (rust-unicode-normalization-0.1) [arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index adebafa917..c7c353b1cd 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -25617,8 +25617,7 @@ (define-public rust-unicode-normalization-0.1 (base32 "1kxxb5ndb5dzyp1flajjdxnbwyjw6ml9xvy0pz7b8srjn9ky4qdm")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-smallvec" ,rust-smallvec-1)))) (home-page "https://github.com/unicode-rs/unicode-normalization") (synopsis -- cgit v1.2.3 From 12c5d9bb44b91a14c69324b8e4f93bdda79d7aaa Mon Sep 17 00:00:00 2001 From: John Soo Date: Tue, 16 Jun 2020 18:52:55 -0700 Subject: gnu: Add rust-derive-more-0.99. * gnu/packages/crates-io.scm (rust-derive-more-0.99): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c7c353b1cd..e1e70d1fc4 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5071,6 +5071,44 @@ (define-public rust-derive-builder-core-0.2 (description "Internal helper library for the derive_builder crate.") (license (list license:expat license:asl2.0)))) +(define-public rust-derive-more-0.99 + (package + (name "rust-derive-more") + (version "0.99.9") + (source + (origin + (method url-fetch) + (uri (crate-uri "derive-more" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0xizcpj39rx0474mbbx8m0xww98qh92zsg82gf52qnvbryqri299")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; Some test files missing. + #:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1.0) + ("rust-quote" ,rust-quote-1.0) + ("rust-syn" ,rust-syn-1.0)) + #:cargo-development-inputs + (("rust-peg" ,rust-peg-0.5) + ("rust-rustc-version" ,rust-rustc-version-0.2)))) + (home-page "https://github.com/JelteF/derive_more") + (synopsis "Adds derive macros for more traits") + (description + "Rust has lots of builtin traits that are implemented for its basic +types, such as @code{Add}, @code{Not}, @code{From} or @code{Display}. +However, when wrapping these types inside your own structs or enums you lose +the implementations of these traits and are required to recreate them. This is +especially annoying when your own structures are very simple, such as when +using the commonly advised newtype pattern (e.g. @code{MyInt(i32)}). + +This library tries to remove these annoyances and the corresponding +boilerplate code. It does this by allowing you to derive lots of commonly used +traits for both structs and enums.") + (license license:expat))) + (define-public rust-derive-new-0.5 (package (name "rust-derive-new") -- cgit v1.2.3 From c857320a0eae1077a7567db675d137f0e05f19b8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 6 Jul 2020 18:45:59 +0300 Subject: gnu: Add rust-peg-0.5. * gnu/packages/crates-io.scm (rust-peg-0.5): New variable. --- gnu/packages/crates-io.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e1e70d1fc4..5146ae78ad 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -15972,6 +15972,24 @@ (define-public rust-peg-0.6 in Rust.") (license license:expat))) +(define-public rust-peg-0.5 + (package + (inherit rust-peg-0.6) + (name "rust-peg") + (version "0.5.7") + (source + (origin + (method url-fetch) + (uri (crate-uri "peg" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "11az3bs3ngvfip920xfr0zwblfkyg6cjgz1v9hmfsdnqw7fi5ps0")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-quote" ,rust-quote-0.3)))))) + (define-public rust-peg-macros-0.6 (package (name "rust-peg-macros") -- cgit v1.2.3 From 41f1d5194624a45da75d5bed4c36171cd05a1028 Mon Sep 17 00:00:00 2001 From: John Soo Date: Tue, 16 Jun 2020 19:09:07 -0700 Subject: gnu: Add rust-rls-span-0.5. * gnu/packages/crates-io.scm (rust-rls-span-0.5): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5146ae78ad..d262e6268a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19495,6 +19495,32 @@ (define-public rust-ring-0.13 ;; build dependencies ("rust-cc" ,rust-cc-1.0)))))) +(define-public rust-rls-span-0.5 + (package + (name "rust-rls-span") + (version "0.5.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "rls-span" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0d6rwya5zsyw6vmrj8d8g3fgvic0xyp1lvfhv62vswk2dzavxsgj")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-rustc-serialize" ,rust-rustc-serialize-0.3) + ("rust-serde" ,rust-serde-1.0) + ("rust-serde-derive" ,rust-serde-derive-1.0)))) + (home-page "https://github.com/rust-lang/rls") + (synopsis "Types for identifying code spans/ranges") + (description + "Identify Rust code spans and ranges using these types - for use with the +Rust Language Server.") + (license (list license:expat license:asl2.0)))) + (define-public rust-ron-0.4 (package (name "rust-ron") -- cgit v1.2.3 From 0540201bb31f78aaaf04d70d76290cb6ce086b99 Mon Sep 17 00:00:00 2001 From: John Soo Date: Tue, 16 Jun 2020 19:17:04 -0700 Subject: gnu: Add rust-racer-interner-0.1. * gnu/packages/crates-io.scm (rust-racer-interner-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d262e6268a..9c460e633c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -18154,6 +18154,29 @@ (define-public rust-quote-0.3 "0yhnnix4dzsv8y4wwz4csbnqjfh73al33j35msr10py6cl5r4vks")))) (arguments '()))) +(define-public rust-racer-interner-0.1 + (package + (name "rust-racer-interner") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "racer-interner" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0k7ssjjcr4kr9r1jbz93rglisfsx1m6fkx3wz6yng5rizm528si0")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-serde" ,rust-serde-1.0)))) + (home-page "https://github.com/racer-rust/racer") + (synopsis "Thread-local string interner for Racer") + (description + "This package allows one to intern strings in Rust in a thread-local +fashion. It is mostly used in Racer.") + (license license:expat))) + (define-public rust-rand-0.7 (package (name "rust-rand") -- cgit v1.2.3 From 547bab4e5722c8113b5174e3d721ae130d07a5f3 Mon Sep 17 00:00:00 2001 From: John Soo Date: Tue, 16 Jun 2020 19:17:27 -0700 Subject: gnu: Add rust-racer-cargo-metadata-0.1. * gnu/packages/crates-io.scm (rust-racer-cargo-metadata-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9c460e633c..d60e11f70a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -18154,6 +18154,33 @@ (define-public rust-quote-0.3 "0yhnnix4dzsv8y4wwz4csbnqjfh73al33j35msr10py6cl5r4vks")))) (arguments '()))) +(define-public rust-racer-cargo-metadata-0.1 + (package + (name "rust-racer-cargo-metadata") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "racer-cargo-metadata" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0vvwbfi991gjbk2k9a7yl7fqc8amvwlf7sa9lsx1sr0s55rcsq1b")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f + #:cargo-inputs + (("rust-racer-interner" ,rust-racer-interner-0.1) + ("rust-serde" ,rust-serde-1.0) + ("rust-serde-json" ,rust-serde-json-1.0)))) + (home-page "https://github.com/racer-rust/racer") + (synopsis "Lightweight cargo metadata parser for racer") + (description + "This crate provides parsing for cargo metadata. It is used mostly in +Racer.") + (license license:expat))) + (define-public rust-racer-interner-0.1 (package (name "rust-racer-interner") -- cgit v1.2.3 From 8ea4fa6247fe7e9f9b8501a52cfe9f78fe3c1afb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 6 Jul 2020 19:08:51 +0300 Subject: gnu: Add rust-float-cmp-0.6. * gnu/packages/crates-io.scm (rust-float-cmp-0.6): New variable. (rust-float-cmp-0.5): Inherit from rust-float-cmp-0.6. --- gnu/packages/crates-io.scm | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d60e11f70a..771a87d569 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6812,10 +6812,10 @@ (define-public rust-flate2-1.0 streams.") (license (list license:expat license:asl2.0)))) -(define-public rust-float-cmp-0.5 +(define-public rust-float-cmp-0.6 (package (name "rust-float-cmp") - (version "0.5.3") + (version "0.6.0") (source (origin (method url-fetch) @@ -6824,7 +6824,7 @@ (define-public rust-float-cmp-0.5 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "03hmx3n48hjm0x1ig84n1j87kzp75lzr6cj1sgi6a6pykgn4n8km")))) + "0zb1lv3ga18vsnpjjdg87yazbzvmfwwllj3aiid8660rp3qw8qns")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-num-traits" ,rust-num-traits-0.2)))) @@ -6834,6 +6834,21 @@ (define-public rust-float-cmp-0.5 "Floating point approximate comparison traits in Rust.") (license license:expat))) +(define-public rust-float-cmp-0.5 + (package + (inherit rust-float-cmp-0.6) + (name "rust-float-cmp") + (version "0.5.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "float-cmp" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "03hmx3n48hjm0x1ig84n1j87kzp75lzr6cj1sgi6a6pykgn4n8km")))))) + (define-public rust-float-cmp-0.3 (package (inherit rust-float-cmp-0.5) -- cgit v1.2.3 From 4e242ebf9432212e72be5dfcf131b6976f0a2b1a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 6 Jul 2020 19:52:49 +0300 Subject: gnu: Add rust-rgb-0.8. * gnu/packages/crates-io.scm (rust-rgb-0.8): New variable. --- gnu/packages/crates-io.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 771a87d569..4a79912c17 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19510,6 +19510,35 @@ (define-public rust-resolv-conf-0.6 (license (list license:asl2.0 license:expat)))) +(define-public rust-rgb-0.8 + (package + (name "rust-rgb") + (version "0.8.18") + (source + (origin + (method url-fetch) + (uri (crate-uri "rgb" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "15hrf0gb1l1a8rhx7b6gzrcmb43xlll4r1ym0mq55c7068dhc537")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-serde" ,rust-serde-1.0)) + #:cargo-development-inputs + (("rust-serde-json" ,rust-serde-json-1.0)))) + (home-page "https://lib.rs/crates/rgb") + (synopsis "Struct for sharing pixels between crates") + (description + "This package provides @code{struct RGB/RGBA/etc.} for sharing pixels +between crates + convenience methods for color manipulation. It allows no-copy +high-level interoperability. It also adds common convenience methods and +implements standard Rust traits to make `RGB`/`RGBA` pixels and slices +first-class Rust objects.") + (license license:expat))) + (define-public rust-ring-0.16 (package (name "rust-ring") -- cgit v1.2.3 From 33464ad283ece6e5e8503b06c73e19af45be62e5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 6 Jul 2020 19:54:37 +0300 Subject: gnu: Add rust-nalgebra-0.19. * gnu/packages/crates-io.scm (rust-nalgebra-0.19): New variable. (rust-nalgebra-0.18): Inherit from rust-nalgebra-0.19). --- gnu/packages/crates-io.scm | 51 +++++++++++++++++++++++++++++++++++++++------- 1 file changed, 44 insertions(+), 7 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4a79912c17..03334cea48 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13436,10 +13436,10 @@ (define-public rust-nasm-rs-0.1 (description "Run NASM during your Cargo build.") (license (list license:expat license:asl2.0)))) -(define-public rust-nalgebra-0.18 +(define-public rust-nalgebra-0.19 (package (name "rust-nalgebra") - (version "0.18.1") + (version "0.19.0") (source (origin (method url-fetch) @@ -13448,14 +13448,14 @@ (define-public rust-nalgebra-0.18 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "18i1npny8s45ff67p5qpdwwsn36fp23mal8847fkb32cqgdzvada")))) + "0i87k57nav221lnr9z7ljlwxh8073qsx33bajdm146y00q805fqa")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-abomonation" ,rust-abomonation-0.7) ("rust-alga" ,rust-alga-0.9) ("rust-approx" ,rust-approx-0.3) - ("rust-generic-array" ,rust-generic-array-0.12) + ("rust-generic-array" ,rust-generic-array-0.13) ("rust-matrixmultiply" ,rust-matrixmultiply-0.2) ("rust-mint" ,rust-mint-0.5) ("rust-num-complex" ,rust-num-complex-0.2) @@ -13463,13 +13463,14 @@ (define-public rust-nalgebra-0.18 ("rust-num-traits" ,rust-num-traits-0.2) ("rust-pest" ,rust-pest-2.1) ("rust-pest-derive" ,rust-pest-derive-2.1) - ("rust-quickcheck" ,rust-quickcheck-0.8) - ("rust-rand" ,rust-rand-0.6) + ("rust-quickcheck" ,rust-quickcheck-0.9) + ("rust-rand" ,rust-rand-0.7) + ("rust-rand-distr" ,rust-rand-distr-0.2) ("rust-serde" ,rust-serde-1.0) ("rust-serde-derive" ,rust-serde-derive-1.0) ("rust-typenum" ,rust-typenum-1)) #:cargo-development-inputs - (("rust-rand-xorshift" ,rust-rand-xorshift-0.1) + (("rust-rand-xorshift" ,rust-rand-xorshift-0.2) ("rust-serde-json" ,rust-serde-json-1.0)))) (home-page "https://nalgebra.org") (synopsis "Linear algebra library") @@ -13478,6 +13479,42 @@ (define-public rust-nalgebra-0.18 statically-sized or dynamically-sized matrices.") (license license:bsd-3))) +(define-public rust-nalgebra-0.18 + (package + (inherit rust-nalgebra-0.19) + (name "rust-nalgebra") + (version "0.18.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "nalgebra" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "18i1npny8s45ff67p5qpdwwsn36fp23mal8847fkb32cqgdzvada")))) + (arguments + `(#:cargo-inputs + (("rust-abomonation" ,rust-abomonation-0.7) + ("rust-alga" ,rust-alga-0.9) + ("rust-approx" ,rust-approx-0.3) + ("rust-generic-array" ,rust-generic-array-0.12) + ("rust-matrixmultiply" ,rust-matrixmultiply-0.2) + ("rust-mint" ,rust-mint-0.5) + ("rust-num-complex" ,rust-num-complex-0.2) + ("rust-num-rational" ,rust-num-rational-0.2) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-pest" ,rust-pest-2.1) + ("rust-pest-derive" ,rust-pest-derive-2.1) + ("rust-quickcheck" ,rust-quickcheck-0.8) + ("rust-rand" ,rust-rand-0.6) + ("rust-serde" ,rust-serde-1.0) + ("rust-serde-derive" ,rust-serde-derive-1.0) + ("rust-typenum" ,rust-typenum-1)) + #:cargo-development-inputs + (("rust-rand-xorshift" ,rust-rand-xorshift-0.1) + ("rust-serde-json" ,rust-serde-json-1.0)))))) + (define-public rust-named-pipe-0.4 (package (name "rust-named-pipe") -- cgit v1.2.3 From 1b4e4621d3fe18673d98e625469a68de2f813e45 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 6 Jul 2020 19:56:29 +0300 Subject: gnu: Add rust-serde-big-array-0.2. * gnu/packages/crates-io.scm (rust-serde-big-array-0.2): New variable. (rust-serde-big-array-0.1): Inherit from rust-serde-big-array-0.2. --- gnu/packages/crates-io.scm | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 03334cea48..c5fdfbf0ef 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -21145,19 +21145,19 @@ (define-public rust-serde-0.4 `(#:skip-build? #t #:cargo-inputs (("rust-num" ,rust-num-0.2)))))) -(define-public rust-serde-big-array-0.1 +(define-public rust-serde-big-array-0.2 (package (name "rust-serde-big-array") - (version "0.1.5") + (version "0.2.0") (source - (origin - (method url-fetch) - (uri (crate-uri "serde-big-array" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0gkyqxk760mp1lfcg6lhjk95ajc89nr0qdd0vl4ic0g8pyxcy9mr")))) + (origin + (method url-fetch) + (uri (crate-uri "serde-big-array" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0kj0h99y7ma9nsayv87fj2n680bcrwv2mrcbmc774lgak18ywgl8")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -21170,6 +21170,21 @@ (define-public rust-serde-big-array-0.1 (description "This package provides a big array helper for serde.") (license (list license:asl2.0 license:expat)))) +(define-public rust-serde-big-array-0.1 + (package + (inherit rust-serde-big-array-0.2) + (name "rust-serde-big-array") + (version "0.1.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "serde-big-array" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0gkyqxk760mp1lfcg6lhjk95ajc89nr0qdd0vl4ic0g8pyxcy9mr")))))) + (define-public rust-serde-bytes-0.11 (package (name "rust-serde-bytes") -- cgit v1.2.3 From 13115e0a539207e49edc078640c78ed4f47824da Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 6 Jul 2020 19:59:30 +0300 Subject: gnu: Add rust-cssparser-macros-0.6. * gnu/packages/crates-io.scm (rust-cssparser-macros-0.6): New variable. (rust-cssparser-macros-0.3): Inherit from rust-cssparser-macros-0.6. --- gnu/packages/crates-io.scm | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c5fdfbf0ef..43cc3cd257 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4505,14 +4505,34 @@ (define-public rust-cssparser-0.25 (("rust-difference" ,rust-difference-2.0) ("rust-encoding-rs" ,rust-encoding-rs-0.8) ("rust-serde-json" ,rust-serde-json-1.0)))) + +(define-public rust-cssparser-macros-0.6 + (package + (name "rust-cssparser-macros") + (version "0.6.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "cssparser-macros" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0vp13g4blyjvhg3j4r9b7vrwhnfi1y2fmhv8hxgficpjazg7bbnz")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-quote" ,rust-quote-1.0) + ("rust-syn" ,rust-syn-1.0)))) (home-page "https://github.com/servo/rust-cssparser") - (synopsis "Rust implementation of CSS Syntax Level 3") + (synopsis "Procedural macros for cssparser") (description - "This package contains a Rust implementation of CSS Syntax Level 3.") + "This package provides the procedural macros for rust-cssparser.") (license license:mpl2.0))) (define-public rust-cssparser-macros-0.3 (package + (inherit rust-cssparser-macros-0.6) (name "rust-cssparser-macros") (version "0.3.6") (source @@ -4524,19 +4544,13 @@ (define-public rust-cssparser-macros-0.3 (sha256 (base32 "1vqyc5xm8a4va92vs1nn0cc46c930l2n21gccijnc5y7hx7cicav")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-phf-codegen" ,rust-phf-codegen-0.7) ("rust-proc-macro2" ,rust-proc-macro2-1.0) ("rust-procedural-masquerade" ,rust-procedural-masquerade-0.1) ("rust-quote" ,rust-quote-1.0) - ("rust-syn" ,rust-syn-1.0)))) - (home-page "https://github.com/servo/rust-cssparser") - (synopsis "Procedural macros for cssparser") - (description - "This package provides the procedural macros for rust-cssparser.") - (license license:mpl2.0))) + ("rust-syn" ,rust-syn-1.0)))))) (define-public rust-csv-1.1 (package -- cgit v1.2.3 From 8285f31068b1923364a1447820780a8ff83efec9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 6 Jul 2020 20:00:36 +0300 Subject: gnu: Add rust-cssparser-0.27. * gnu/packages/crates-io.scm (rust-cssparser-0.27): New variable. (rust-cssparser-0.25): Inherit from rust-cssparser-0.27. --- gnu/packages/crates-io.scm | 41 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 43cc3cd257..0f8df3baba 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4471,8 +4471,46 @@ (define-public rust-crypto-mac-0.7 ("rust-generic-array" ,rust-generic-array-0.12) ("rust-subtle" ,rust-subtle-1.0)))))) +(define-public rust-cssparser-0.27 + (package + (name "rust-cssparser") + (version "0.27.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "cssparser" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "02nbm690rmkaz1ca0383qq7mc1g066w3s85f17pdihnda79njjvm")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; Not all files included in the tarball. + #:cargo-inputs + (("rust-cssparser-macros" ,rust-cssparser-macros-0.6) + ("rust-dtoa-short" ,rust-dtoa-short-0.3) + ("rust-itoa" ,rust-itoa-0.4) + ("rust-matches" ,rust-matches-0.1) + ("rust-phf" ,rust-phf-0.8) + ("rust-proc-macro2" ,rust-proc-macro2-1.0) + ("rust-quote" ,rust-quote-1.0) + ("rust-serde" ,rust-serde-1.0) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-syn" ,rust-syn-1.0)) + #:cargo-development-inputs + (("rust-difference" ,rust-difference-2.0) + ("rust-encoding-rs" ,rust-encoding-rs-0.8) + ("rust-serde-json" ,rust-serde-json-1.0)))) + (home-page "https://github.com/servo/rust-cssparser") + (synopsis "Rust implementation of CSS Syntax Level 3") + (description + "This package contains a Rust implementation of CSS Syntax Level 3.") + (license license:mpl2.0))) + (define-public rust-cssparser-0.25 (package + (inherit rust-cssparser-0.27) (name "rust-cssparser") (version "0.25.9") (source @@ -4484,7 +4522,6 @@ (define-public rust-cssparser-0.25 (sha256 (base32 "03klvpdzsk4cyh8k0dbnlngzafv7gqywqrnsqqb3gfmrxyj8rqgv")))) - (build-system cargo-build-system) (arguments `(#:tests? #f ; Some test files missing. #:cargo-inputs @@ -4504,7 +4541,7 @@ (define-public rust-cssparser-0.25 #:cargo-development-inputs (("rust-difference" ,rust-difference-2.0) ("rust-encoding-rs" ,rust-encoding-rs-0.8) - ("rust-serde-json" ,rust-serde-json-1.0)))) + ("rust-serde-json" ,rust-serde-json-1.0)))))) (define-public rust-cssparser-macros-0.6 (package -- cgit v1.2.3 From 4586b7620a6a8c4061b1dea812794892dc9c8616 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 6 Jul 2020 20:02:17 +0300 Subject: gnu: Add rust-gio-0.8. * gnu/packages/crates-io.scm (rust-gio-0.8): New variable. (rust-gio-0.7): Inherit from rust-gio-0.8. --- gnu/packages/crates-io.scm | 50 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 42 insertions(+), 8 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0f8df3baba..cba0adaf48 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8574,10 +8574,10 @@ (define-public rust-gimli-0.18 DWARF debugging format.") (license (list license:asl2.0 license:expat)))) -(define-public rust-gio-0.7 +(define-public rust-gio-0.8 (package (name "rust-gio") - (version "0.7.0") + (version "0.8.1") (source (origin (method url-fetch) @@ -8586,22 +8586,27 @@ (define-public rust-gio-0.7 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1qv0wc1hqyb81c03h81s3xrl9jslrw23fr4yhygxbhih9k9vaqb2")))) + "19cnla2ya0mi6wwaabd5mxbq2kzq46dg6jq2z19rpqyc2na0zl8c")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs + `(#:tests? #f ; Not all files included in the tarball. + #:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) - ("rust-fragile" ,rust-fragile-0.3) - ("rust-futures-preview" ,rust-futures-preview-0.3) + ("rust-futures-channel" ,rust-futures-channel-0.3) + ("rust-futures-core" ,rust-futures-core-0.3) + ("rust-futures-io" ,rust-futures-io-0.3) + ("rust-futures-util" ,rust-futures-util-0.3) ("rust-gio-sys" ,rust-gio-sys-0.9) - ("rust-glib" ,rust-glib-0.8) + ("rust-glib" ,rust-glib-0.9) ("rust-glib-sys" ,rust-glib-sys-0.9) ("rust-gobject-sys" ,rust-gobject-sys-0.9) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-libc" ,rust-libc-0.2) ("rust-gtk-rs-lgpl-docs" ,rust-gtk-rs-lgpl-docs-0.1)) #:cargo-development-inputs - (("rust-gir-format-check" ,rust-gir-format-check-0.1)))) + (("rust-gir-format-check" ,rust-gir-format-check-0.1) + ("rust-serial-test" ,rust-serial-test-0.1) + ("rust-serial-test-derive" ,rust-serial-test-derive-0.1)))) (inputs `(("glib" ,glib))) (home-page "https://gtk-rs.org/") @@ -8609,6 +8614,35 @@ (define-public rust-gio-0.7 (description "Rust bindings for the Gio library.") (license license:expat))) +(define-public rust-gio-0.7 + (package + (inherit rust-gio-0.8) + (name "rust-gio") + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "gio" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1qv0wc1hqyb81c03h81s3xrl9jslrw23fr4yhygxbhih9k9vaqb2")))) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-fragile" ,rust-fragile-0.3) + ("rust-futures-preview" ,rust-futures-preview-0.3) + ("rust-gio-sys" ,rust-gio-sys-0.9) + ("rust-glib" ,rust-glib-0.8) + ("rust-glib-sys" ,rust-glib-sys-0.9) + ("rust-gobject-sys" ,rust-gobject-sys-0.9) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-gtk-rs-lgpl-docs" ,rust-gtk-rs-lgpl-docs-0.1)) + #:cargo-development-inputs + (("rust-gir-format-check" ,rust-gir-format-check-0.1)))))) + (define-public rust-gio-sys-0.9 (package (name "rust-gio-sys") -- cgit v1.2.3 From 2de4d6215efa09930e66172799e50992b49bebbe Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 6 Jul 2020 20:50:23 +0300 Subject: gnu: Add rust-pango-0.8. * gnu/packages/crates-io.scm (rust-pango-0.8): New variable. (rust-pango-0.7): Inherit from rust-pango-0.8. --- gnu/packages/crates-io.scm | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index cba0adaf48..15266c416b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -15446,10 +15446,10 @@ (define-public rust-palette-derive-0.5 "Automatically implement traits from the palette crate.") (license (list license:expat license:asl2.0)))) -(define-public rust-pango-0.7 +(define-public rust-pango-0.8 (package (name "rust-pango") - (version "0.7.0") + (version "0.8.0") (source (origin (method url-fetch) @@ -15458,12 +15458,12 @@ (define-public rust-pango-0.7 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "11np7nxb69g3kid2l78b7k519x1wk1c3f9yy7swgzy24n5qs0grr")))) + "0xq50950il3228grzs4xvc5s6phxcl5l50grz6syvs0vixr6p70y")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) - ("rust-glib" ,rust-glib-0.8) + ("rust-glib" ,rust-glib-0.9) ("rust-glib-sys" ,rust-glib-sys-0.9) ("rust-gobject-sys" ,rust-gobject-sys-0.9) ("rust-lazy-static" ,rust-lazy-static-1) @@ -15480,6 +15480,33 @@ (define-public rust-pango-0.7 "Rust bindings for the Pango library.") (license license:expat))) +(define-public rust-pango-0.7 + (package + (inherit rust-pango-0.8) + (name "rust-pango") + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "pango" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "11np7nxb69g3kid2l78b7k519x1wk1c3f9yy7swgzy24n5qs0grr")))) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-glib" ,rust-glib-0.8) + ("rust-glib-sys" ,rust-glib-sys-0.9) + ("rust-gobject-sys" ,rust-gobject-sys-0.9) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-pango-sys" ,rust-pango-sys-0.9) + ("rust-gtk-rs-lgpl-docs" ,rust-gtk-rs-lgpl-docs-0.1)) + #:cargo-development-inputs + (("rust-gir-format-check" ,rust-gir-format-check-0.1)))))) + (define-public rust-pango-sys-0.9 (package (name "rust-pango-sys") -- cgit v1.2.3 From 18ed7469f2724a097ff123b846fc65932cce3069 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 6 Jul 2020 20:51:29 +0300 Subject: gnu: Add rust-gdk-pixbuf-0.8. * gnu/packages/crates-io.scm (rust-gdk-pixbuf-0.8): New variable. (rust-gdk-pixbuf-0.7): Inherit from rust-gdk-pixbuf-0.8. --- gnu/packages/crates-io.scm | 43 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 35 insertions(+), 8 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 15266c416b..e7c4455f98 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8066,10 +8066,10 @@ (define-public rust-gdi32-sys-0.2 API library @code{gdi32}.") (license license:expat))) -(define-public rust-gdk-pixbuf-0.7 +(define-public rust-gdk-pixbuf-0.8 (package (name "rust-gdk-pixbuf") - (version "0.7.0") + (version "0.8.0") (source (origin (method url-fetch) @@ -8078,16 +8078,14 @@ (define-public rust-gdk-pixbuf-0.7 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1k2g3w2p57m68bi5sldvkmgjgslgqswrjsijjhqaibdvw67409lp")))) + "1mxxca0fkcw2rsd3kl3nvlb8ys4cgxqx4n5isjbv0adk8q624j72")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-fragile" ,rust-fragile-0.3) - ("rust-futures-preview" ,rust-futures-preview-0.3) - ("rust-gdk-pixbuf-sys" ,rust-gdk-pixbuf-sys-0.9) - ("rust-gio" ,rust-gio-0.7) + (("rust-gdk-pixbuf-sys" ,rust-gdk-pixbuf-sys-0.9) + ("rust-gio" ,rust-gio-0.8) ("rust-gio-sys" ,rust-gio-sys-0.9) - ("rust-glib" ,rust-glib-0.8) + ("rust-glib" ,rust-glib-0.9) ("rust-glib-sys" ,rust-glib-sys-0.9) ("rust-gobject-sys" ,rust-gobject-sys-0.9) ("rust-libc" ,rust-libc-0.2) @@ -8102,6 +8100,35 @@ (define-public rust-gdk-pixbuf-0.7 "Rust bindings for the GdkPixbuf library.") (license license:expat))) +(define-public rust-gdk-pixbuf-0.7 + (package + (inherit rust-gdk-pixbuf-0.8) + (name "rust-gdk-pixbuf") + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "gdk-pixbuf" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1k2g3w2p57m68bi5sldvkmgjgslgqswrjsijjhqaibdvw67409lp")))) + (arguments + `(#:cargo-inputs + (("rust-fragile" ,rust-fragile-0.3) + ("rust-futures-preview" ,rust-futures-preview-0.3) + ("rust-gdk-pixbuf-sys" ,rust-gdk-pixbuf-sys-0.9) + ("rust-gio" ,rust-gio-0.7) + ("rust-gio-sys" ,rust-gio-sys-0.9) + ("rust-glib" ,rust-glib-0.8) + ("rust-glib-sys" ,rust-glib-sys-0.9) + ("rust-gobject-sys" ,rust-gobject-sys-0.9) + ("rust-libc" ,rust-libc-0.2) + ("rust-gtk-rs-lgpl-docs" ,rust-gtk-rs-lgpl-docs-0.1)) + #:cargo-development-inputs + (("rust-gir-format-check" ,rust-gir-format-check-0.1)))))) + (define-public rust-gdk-pixbuf-sys-0.9 (package (name "rust-gdk-pixbuf-sys") -- cgit v1.2.3 From 441d4b67dcd77b22e506e39755ca7fcf06b872d5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 6 Jul 2020 20:52:27 +0300 Subject: gnu: Add rust-pangocairo-0.9. * gnu/packages/crates-io.scm (rust-pangocairo-0.9): New variable. (rust-pangocairo-0.8): Inherit from rust-pangocairo-0.9. --- gnu/packages/crates-io.scm | 42 ++++++++++++++++++++++++++++++++++++------ 1 file changed, 36 insertions(+), 6 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e7c4455f98..f13436a416 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -15565,10 +15565,10 @@ (define-public rust-pango-sys-0.9 (description "This package provides FFI bindings to @code{libpango-1.0}.") (license license:expat))) -(define-public rust-pangocairo-0.8 +(define-public rust-pangocairo-0.9 (package (name "rust-pangocairo") - (version "0.8.0") + (version "0.9.0") (source (origin (method url-fetch) @@ -15577,18 +15577,18 @@ (define-public rust-pangocairo-0.8 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0qjiwsp73x3w0493dzycyjzxnzwq7ixwmf1ccr5r41pjhxbnk1kl")))) + "0bap3h78hdqdyln58349qjjbcv45m8a0a16c4n9fprdj1my0gldx")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) - ("rust-cairo-rs" ,rust-cairo-rs-0.7) + ("rust-cairo-rs" ,rust-cairo-rs-0.8) ("rust-cairo-sys-rs" ,rust-cairo-sys-rs-0.9) - ("rust-glib" ,rust-glib-0.8) + ("rust-glib" ,rust-glib-0.9) ("rust-glib-sys" ,rust-glib-sys-0.9) ("rust-gobject-sys" ,rust-gobject-sys-0.9) ("rust-libc" ,rust-libc-0.2) - ("rust-pango" ,rust-pango-0.7) + ("rust-pango" ,rust-pango-0.8) ("rust-pango-sys" ,rust-pango-sys-0.9) ("rust-pangocairo-sys" ,rust-pangocairo-sys-0.10) ("rust-gtk-rs-lgpl-docs" ,rust-gtk-rs-lgpl-docs-0.1)) @@ -15602,6 +15602,36 @@ (define-public rust-pangocairo-0.8 "Rust bindings for the PangoCairo library.") (license license:expat))) +(define-public rust-pangocairo-0.8 + (package + (inherit rust-pangocairo-0.9) + (name "rust-pangocairo") + (version "0.8.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "pangocairo" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0qjiwsp73x3w0493dzycyjzxnzwq7ixwmf1ccr5r41pjhxbnk1kl")))) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-cairo-rs" ,rust-cairo-rs-0.7) + ("rust-cairo-sys-rs" ,rust-cairo-sys-rs-0.9) + ("rust-glib" ,rust-glib-0.8) + ("rust-glib-sys" ,rust-glib-sys-0.9) + ("rust-gobject-sys" ,rust-gobject-sys-0.9) + ("rust-libc" ,rust-libc-0.2) + ("rust-pango" ,rust-pango-0.7) + ("rust-pango-sys" ,rust-pango-sys-0.9) + ("rust-pangocairo-sys" ,rust-pangocairo-sys-0.10) + ("rust-gtk-rs-lgpl-docs" ,rust-gtk-rs-lgpl-docs-0.1)) + #:cargo-development-inputs + (("rust-gir-format-check" ,rust-gir-format-check-0.1)))))) + (define-public rust-pangocairo-sys-0.10 (package (name "rust-pangocairo-sys") -- cgit v1.2.3 From cc3205c1011936ddeeeb1b565b4070c6d15cc9aa Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 6 Jul 2020 20:53:07 +0300 Subject: gnu: Add rust-markup5ever-0.10. * gnu/packages/crates-io.scm (rust-markup5ever-0.10): New variable. (rust-markup5ever-0.9): Inherit from rust-markup5ever-0.10. --- gnu/packages/crates-io.scm | 40 +++++++++++++++++++++++++++++++++------- 1 file changed, 33 insertions(+), 7 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f13436a416..d32e7131a1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -12653,8 +12653,40 @@ (define-public rust-maplit-1.0 (license (list license:asl2.0 license:expat)))) +(define-public rust-markup5ever-0.10 + (package + (name "rust-markup5ever") + (version "0.10.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "markup5ever" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1aqxl1lsc8s6ycsw5ibwynadnb9qpiab4ggwgdq9pjlnjdk8vqxa")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-log" ,rust-log-0.4) + ("rust-phf" ,rust-phf-0.8) + ("rust-string-cache" ,rust-string-cache-0.8) + ("rust-tendril" ,rust-tendril-0.4) + ("rust-phf-codegen" ,rust-phf-codegen-0.8) + ("rust-serde" ,rust-serde-1.0) + ("rust-serde-derive" ,rust-serde-derive-1.0) + ("rust-serde-json" ,rust-serde-json-1.0) + ("rust-string-cache-codegen" ,rust-string-cache-codegen-0.5)))) + (home-page "https://github.com/servo/html5ever") + (synopsis "Common code for xml5ever and html5ever") + (description + "Common code for xml5ever and html5ever.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-markup5ever-0.9 (package + (inherit rust-markup5ever-0.10) (name "rust-markup5ever") (version "0.9.0") (source @@ -12666,7 +12698,6 @@ (define-public rust-markup5ever-0.9 (sha256 (base32 "00wxigkiw8f777pjp7q5kfq77xpwda9zskkwp698assh8yfisf35")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-log" ,rust-log-0.4) @@ -12677,12 +12708,7 @@ (define-public rust-markup5ever-0.9 ("rust-serde" ,rust-serde-1.0) ("rust-serde-derive" ,rust-serde-derive-1.0) ("rust-serde-json" ,rust-serde-json-1.0) - ("rust-string-cache-codegen" ,rust-string-cache-codegen-0.4)))) - (home-page "https://github.com/servo/html5ever") - (synopsis "Common code for xml5ever and html5ever") - (description - "Common code for xml5ever and html5ever.") - (license (list license:asl2.0 license:expat)))) + ("rust-string-cache-codegen" ,rust-string-cache-codegen-0.4)))))) (define-public rust-markup5ever-0.8 (package -- cgit v1.2.3 From 177be3a24df66d0461380c6e258209422f62543c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 6 Jul 2020 20:55:32 +0300 Subject: gnu: Add rust-thin-slice-0.1. * gnu/packages/crates-io.scm (rust-thin-slice-0.1): New variable. --- gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d32e7131a1..f46e82a35b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -24493,6 +24493,27 @@ (define-public rust-textwrap-0.11 (properties '((hidden? . #t))) (license license:expat))) +(define-public rust-thin-slice-0.1 + (package + (name "rust-thin-slice") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "thin-slice" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0g4z51g3yarah89ijpakbwhrrknw6d7k3ry0m1zqcn3hbhiq3alf")))) + (build-system cargo-build-system) + (home-page "https://github.com/heycam/thin-slice") + (synopsis + "Owned slice that packs the slice storage into a single word when possible") + (description + "An owned slice that packs the slice storage into a single word when possible.") + (license license:mpl2.0))) + (define-public rust-thiserror-1.0 (package (name "rust-thiserror") -- cgit v1.2.3 From ca7e1bfb3220c17e9212164f8b9fdc3aec4214a8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 6 Jul 2020 20:56:33 +0300 Subject: gnu: Add rust-xml5ever-0.16. * gnu/packages/crates-io.scm (rust-xml5ever-0.16): New variable. --- gnu/packages/crates-io.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f46e82a35b..895c7eb1e0 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -28514,6 +28514,36 @@ (define-public rust-xml-rs-0.8 (description "An XML library in pure Rust.") (license license:expat))) +(define-public rust-xml5ever-0.16 + (package + (name "rust-xml5ever") + (version "0.16.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "xml5ever" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0nbapmdrn4zqry5p01l2mmbb48fcq0gga377p1c4lkb1x3k546qb")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-log" ,rust-log-0.4) + ("rust-mac" ,rust-mac-0.1) + ("rust-markup5ever" ,rust-markup5ever-0.10) + ("rust-time" ,rust-time-0.1)) + #:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.3) + ("rust-rustc-test" ,rust-rustc-test-0.3)))) + (home-page + "https://github.com/servo/html5ever/blob/master/xml5ever/README.md") + (synopsis "Push based streaming parser for xml") + (description + "Push based streaming parser for xml.") + (license (list license:expat license:asl2.0)))) + (define-public rust-y4m-0.5 (package (name "rust-y4m") -- cgit v1.2.3 From 2bffbeac2b5eaa10b1ba2a1ecf2ac7127354847d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 6 Jul 2020 20:57:29 +0300 Subject: gnu: Add rust-selectors-0.22. * gnu/packages/crates-io.scm (rust-selectors-0.22): New variable. --- gnu/packages/crates-io.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 895c7eb1e0..94fe2595e4 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -21156,6 +21156,40 @@ (define-public rust-security-framework-sys-0.3 (license (list license:asl2.0 license:expat)))) +(define-public rust-selectors-0.22 + (package + (name "rust-selectors") + (version "0.22.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "selectors" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1zhjpvww238lh4nz7kdw4ywlpmjbmzvrm76w1jyacjxci4c0ycnz")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-cssparser" ,rust-cssparser-0.27) + ("rust-derive-more" ,rust-derive-more-0.99) + ("rust-fxhash" ,rust-fxhash-0.2) + ("rust-log" ,rust-log-0.4) + ("rust-matches" ,rust-matches-0.1) + ("rust-phf" ,rust-phf-0.8) + ("rust-precomputed-hash" ,rust-precomputed-hash-0.1) + ("rust-servo-arc" ,rust-servo-arc-0.1) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-thin-slice" ,rust-thin-slice-0.1)) + #:cargo-development-inputs + (("rust-phf-codegen" ,rust-phf-codegen-0.8)))) + (home-page "https://github.com/servo/servo") + (synopsis "CSS Selectors matching for Rust") + (description "This package provides CSS Selectors matching for Rust.") + (license license:mpl2.0))) + (define-public rust-sema-0.1 (package (name "rust-sema") -- cgit v1.2.3 From f174cb5284586a0f6bb9b5347d83c288dda0ad58 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 6 Jul 2020 20:58:29 +0300 Subject: gnu: Add rust-servo-arc-0.1. * gnu/packages/crates-io.scm (rust-servo-arc-0.1): New variable. --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 94fe2595e4..3b3928ab44 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -21796,6 +21796,32 @@ (define-public rust-serde-yaml-0.8 (description "YAML support for Serde.") (license (list license:asl2.0 license:expat)))) +(define-public rust-servo-arc-0.1 + (package + (name "rust-servo-arc") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "servo-arc" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0cjljr9znwahry6p95xvd3p4pmy24wlf6gbfidnmglg002w3i0nr")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-nodrop" ,rust-nodrop-0.1) + ("rust-serde" ,rust-serde-1.0) + ("rust-stable-deref-trait" ,rust-stable-deref-trait-1.1)))) + (home-page "https://github.com/servo/servo") + (synopsis "Fork of std::sync::Arc with some extra functionality") + (description + "This package provides a fork of @code{std::sync::Arc} with some extra +functionality and without weak references.") + (license (list license:expat license:asl2.0)))) + (define-public rust-servo-fontconfig-0.4 (package (name "rust-servo-fontconfig") -- cgit v1.2.3 From 16ab2e5a8a753ea214c7c725c48756b3f8606973 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 6 Jul 2020 20:59:08 +0300 Subject: gnu: Add rust-serial-test-derive-0.1. * gnu/packages/crates-io.scm (rust-serial-test-derive-0.1): New variable. --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3b3928ab44..0c19fd7b2c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -21796,6 +21796,29 @@ (define-public rust-serde-yaml-0.8 (description "YAML support for Serde.") (license (list license:asl2.0 license:expat)))) +(define-public rust-serial-test-derive-0.1 + (package + (name "rust-serial-test-derive") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "serial-test-derive" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "17fkqrba233sjhdak986y4w3z4yjxa4idjkh46l7zxgcgjlvrnic")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-quote" ,rust-quote-0.6) + ("rust-syn" ,rust-syn-0.15)))) + (home-page "https://github.com/palfrey/serial_test/") + (synopsis "Helper crate for serial_test") + (description "This package provides a helper crate for @code{serial_test}.") + (license license:expat))) + (define-public rust-servo-arc-0.1 (package (name "rust-servo-arc") -- cgit v1.2.3 From 370ea0840a2bd76927574a3bae5fb00d02d3cbaf Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 6 Jul 2020 20:59:40 +0300 Subject: gnu: Add rust-serial-test-0.1. * gnu/packages/crates-io.scm (rust-serial-test-0.1): New variable. --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0c19fd7b2c..58a731202f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -21796,6 +21796,29 @@ (define-public rust-serde-yaml-0.8 (description "YAML support for Serde.") (license (list license:asl2.0 license:expat)))) +(define-public rust-serial-test-0.1 + (package + (name "rust-serial-test") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "serial-test" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0qywhzjc4jh6dqqng90maai0mjlmafk9aa5rrl9g3d2g01wdn8ms")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-lazy-static" ,rust-lazy-static-1)))) + (home-page "https://github.com/palfrey/serial_test/") + (synopsis "Serialised Rust tests") + (description + "Allows for the creation of serialised Rust tests.") + (license license:expat))) + (define-public rust-serial-test-derive-0.1 (package (name "rust-serial-test-derive") -- cgit v1.2.3 From 2f9d1b59d12080b75faacc6009e7a03d780c34ee Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 6 Jul 2020 21:00:49 +0300 Subject: gnu: Add rust-string-cache-codegen-0.5. * gnu/packages/crates-io.scm (rust-string-cache-codegen-0.5): New variable. (rust-string-cache-codegen-0.4): Inherit from rust-string-cache-codegen-0.5 --- gnu/packages/crates-io.scm | 36 +++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 58a731202f..762814dd0b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -23300,15 +23300,37 @@ (define-public rust-string-cache-0.7 ("rust-string-cache-shared" ,rust-string-cache-shared-0.3)) #:cargo-development-inputs (("rust-rand" ,rust-rand-0.4)))) + +(define-public rust-string-cache-codegen-0.5 + (package + (name "rust-string-cache-codegen") + (version "0.5.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "string-cache-codegen" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "15vbk5i7kkj5bbx7f0fi477js4svw5py39gi4rk74anj35g8wk7j")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-phf-generator" ,rust-phf-generator-0.8) + ("rust-phf-shared" ,rust-phf-shared-0.8) + ("rust-proc-macro2" ,rust-proc-macro2-1.0) + ("rust-quote" ,rust-quote-1.0)))) (home-page "https://github.com/servo/string-cache") - (synopsis "String interning library for Rust") + (synopsis "Codegen library for string-cache") (description - "This package provides a string interning library for Rust, + "This package provides a codegen library for string-cache, developed as part of the Servo project.") (license (list license:asl2.0 license:expat)))) (define-public rust-string-cache-codegen-0.4 (package + (inherit rust-string-cache-codegen-0.5) (name "rust-string-cache-codegen") (version "0.4.4") (source @@ -23320,21 +23342,13 @@ (define-public rust-string-cache-codegen-0.4 (sha256 (base32 "1ik78h9gs874i24rkyh0myg6x4ni2a9cazbv5yzs9yavnv8mxx7h")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-phf-generator" ,rust-phf-generator-0.7) ("rust-phf-shared" ,rust-phf-shared-0.7) ("rust-proc-macro2" ,rust-proc-macro2-1.0) ("rust-quote" ,rust-quote-1.0) - ("rust-string-cache-shared" - ,rust-string-cache-shared-0.3)))) - (home-page "https://github.com/servo/string-cache") - (synopsis "Codegen library for string-cache") - (description - "This package provides a codegen library for string-cache, -developed as part of the Servo project.") - (license (list license:asl2.0 license:expat)))) + ("rust-string-cache-shared" ,rust-string-cache-shared-0.3)))))) (define-public rust-string-cache-shared-0.3 (package -- cgit v1.2.3 From f3b5d29fcb14edc034d798938b40af45b5895b55 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 6 Jul 2020 21:01:54 +0300 Subject: gnu: Add rust-string-cache-0.8. * gnu/packages/crates-io.scm (rust-string-cache-0.8): New variable. (rust-string-cache-0.7): Inherit from rust-string-cache-0.8. --- gnu/packages/crates-io.scm | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 762814dd0b..9ee8f4341a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -23274,8 +23274,37 @@ (define-public rust-string-0.2 configurable byte storage.") (license license:expat))) +(define-public rust-string-cache-0.8 + (package + (name "rust-string-cache") + (version "0.8.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "string-cache" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "12i0synp8l0qpnzi5qki4pjq3jx28ykikyffjjjg6fsfxddwfh19")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-lazy-static" ,rust-lazy-static-1) + ("rust-new-debug-unreachable" ,rust-new-debug-unreachable-1.0) + ("rust-phf-shared" ,rust-phf-shared-0.8) + ("rust-precomputed-hash" ,rust-precomputed-hash-0.1) + ("rust-serde" ,rust-serde-1.0)))) + (home-page "https://github.com/servo/string-cache") + (synopsis "String interning library for Rust") + (description + "This package provides a string interning library for Rust, +developed as part of the Servo project.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-string-cache-0.7 (package + (inherit rust-string-cache-0.8) (name "rust-string-cache") (version "0.7.5") (source @@ -23287,7 +23316,6 @@ (define-public rust-string-cache-0.7 (sha256 (base32 "0rrdb822gc1fs3qq4camgj3kh4182bs79hpqxhdrpmlz5yl5ih49")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-lazy-static" ,rust-lazy-static-1) @@ -23299,7 +23327,7 @@ (define-public rust-string-cache-0.7 ("rust-string-cache-codegen" ,rust-string-cache-codegen-0.4) ("rust-string-cache-shared" ,rust-string-cache-shared-0.3)) #:cargo-development-inputs - (("rust-rand" ,rust-rand-0.4)))) + (("rust-rand" ,rust-rand-0.4)))))) (define-public rust-string-cache-codegen-0.5 (package -- cgit v1.2.3 From 38adeb6b908274f02c79871b2f21f227abad80b1 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 6 Jul 2020 21:03:17 +0300 Subject: gnu: Add rust-average-0.10, rust-rand-distr-0.2. * gnu/packages/crates-io.scm (rust-average-0.10, rust-rand-distr-0.2): New variables. (rust-average-0.9): Inherit from rust-average-0.10. --- gnu/packages/crates-io.scm | 72 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 65 insertions(+), 7 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9ee8f4341a..39b2c42999 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -991,8 +991,46 @@ (define-public rust-autocfg-0.1 "1chwgimpx5z7xbag7krr9d8asxfqbh683qhgl9kn3hxk2l0djj8x")))) (arguments '(#:skip-build? #t)))) +(define-public rust-average-0.10 + (package + (name "rust-average") + (version "0.10.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "average" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1dmsxqcr1n0i20qr9g2g6j89kkx8dy6w18dbqzx1wi42wj1chgvh")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-conv" ,rust-conv-0.3) + ("rust-float-ord" ,rust-float-ord-0.2) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-serde" ,rust-serde-1.0) + ("rust-serde-big-array" ,rust-serde-big-array-0.2) + ("rust-serde-derive" ,rust-serde-derive-1.0)) + #:cargo-development-inputs + (("rust-bencher" ,rust-bencher-0.1) + ("rust-proptest" ,rust-proptest-0.9) + ("rust-quantiles" ,rust-quantiles-0.7) + ("rust-rand" ,rust-rand-0.7) + ("rust-rand-distr" ,rust-rand-distr-0.2) + ("rust-rand-xoshiro" ,rust-rand-xoshiro-0.4) + ("rust-serde-json" ,rust-serde-json-1.0) + ("rust-streaming-stats" ,rust-streaming-stats-0.2)))) + (home-page "https://github.com/vks/average") + (synopsis "Calculate statistics iteratively") + (description "This crate provides for calculating statistics iteratively +in Rust.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-average-0.9 (package + (inherit rust-average-0.10) (name "rust-average") (version "0.9.4") (source @@ -1003,7 +1041,6 @@ (define-public rust-average-0.9 (sha256 (base32 "1f8ya00bv6qki9m7b4lb3bn845rj473mx02qpm7wgy5qc1yp75xs")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-conv" ,rust-conv-0.3) @@ -1018,12 +1055,7 @@ (define-public rust-average-0.9 ("rust-quantiles" ,rust-quantiles-0.7) ("rust-rand" ,rust-rand-0.6) ("rust-serde-json" ,rust-serde-json-1.0) - ("rust-streaming-stats" ,rust-streaming-stats-0.2)))) - (home-page "https://github.com/vks/average") - (synopsis "Calculate statistics iteratively") - (description "This crate provides for calculating statistics iteratively -in Rust.") - (license (list license:asl2.0 license:expat)))) + ("rust-streaming-stats" ,rust-streaming-stats-0.2)))))) (define-public rust-backtrace-0.3 (package @@ -18708,6 +18740,32 @@ (define-public rust-rand-core-0.2 #:cargo-inputs (("rust-rand-core" ,rust-rand-core-0.3)))))) +(define-public rust-rand-distr-0.2 + (package + (name "rust-rand-distr") + (version "0.2.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "rand-distr" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1cpz577qid09lirjjhhn98yqdwsv0c01jf973pxpcr9svp5pm5wn")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-rand" ,rust-rand-0.7)) + #:cargo-development-inputs + (("rust-average" ,rust-average-0.10) + ("rust-rand-pcg" ,rust-rand-pcg-0.2)))) + (home-page "https://crates.io/crates/rand_distr") + (synopsis "Sampling from random number distributions") + (description + "Sampling from random number distributions.") + (license (list license:expat license:asl2.0)))) + (define-public rust-rand-hc-0.2 (package (name "rust-rand-hc") -- cgit v1.2.3 From 4b16cb646d7afc474d55ea7a4c86e3fd73af4311 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 7 Jul 2020 12:37:16 +0300 Subject: gnu: librsvg-next: Enable vala support. * gnu/packages/gnome.scm (librsvg-next)[arguments]: Adjust custom 'gnu-configure phase to add configure flags. --- gnu/packages/gnome.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d2e452d8f2..7ac4f05a8f 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2438,12 +2438,13 @@ (define-public librsvg-next "gdk_pixbuf_cache_file = $(TMPDIR)/loaders.cache\n")) #t)) (add-after 'configure 'gnu-configure - (assoc-ref gnu:%standard-phases 'configure)) - ;(lambda* (#:key outputs #:allow-other-keys) - ; ((assoc-ref gnu:%standard-phases 'configure) - ; #:outputs outputs - ; #:configure-flags ("--disable-static" - ; "--enable-vala")))) + (lambda* (#:key inputs native-inputs outputs #:allow-other-keys) + ((assoc-ref gnu:%standard-phases 'configure) + #:native-inputs native-inputs + #:inputs inputs + #:outputs outputs + #:configure-flags (list "--disable-static" + "--enable-vala")))) (add-after 'configure 'dont-vendor-self (lambda* (#:key vendor-dir #:allow-other-keys) ;; Don't keep the whole tarball in the vendor directory -- cgit v1.2.3 From 4f9db5693e79db9e1d6c41c10ae1678ca27b2be3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 6 Jul 2020 21:08:19 +0300 Subject: gnu: librsvg-next: Update to 2.48.8. * gnu/packages/gnome.scm (librsvg-next): Update to 2.48.8. [source]: Remove substitute* from snippet. [arguments]: In cargo-inputs replace rust-cairo-rs-0.7 with 0.8, rust-cssparser-0.25 with 0.27, rust-float-cmp-0.5 with 0.6, rust-gdk-pixbuf-0.7 with 0.8, rust-gio-0.7 with 0.8, rust-glib-0.8 with 0.9, rust-markup5ever-0.9 with 0.10, rust-nalgebra-0.18 with 0.19, rust-pango-0.7 with 0.8, rust-pangocairo-0.8 with 0.9. Add rust-cast-0.2, rust-once-cell-1.2, rust-rgb-0.8, rust-xml5ever-0.16. Remove rust-lazy-static-1, rust-phf-0.7, rust-string-cache-0.7, rust-xml-rs-0.8. In cargo-development-inputs replace rust-cairo-rs-0.7 with 0.8, rust-criterion-0.2 with 0.3. In custom 'prepare-for-build phase use cc-for-target. Remove 'remove-failing-tests phase. [inputs]: Replace pango-1.42 with pango. --- gnu/packages/gnome.scm | 68 ++++++++++++++++++-------------------------------- 1 file changed, 24 insertions(+), 44 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 7ac4f05a8f..55ecac2cb3 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2352,7 +2352,7 @@ (define-public librsvg-next (package (inherit librsvg) (name "librsvg") - (version "2.46.4") + (version "2.48.8") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/librsvg/" @@ -2360,13 +2360,10 @@ (define-public librsvg-next "librsvg-" version ".tar.xz")) (sha256 (base32 - "0afc82nsxc6kw136xid4vcq9kmq4rmgzzk8bh2pvln2cnvirwnxl")) + "14i6xzghcidv64cyd3g0wdjbl82rph737yxn9s3x29nzpcjs707l")) (modules '((guix build utils))) (snippet '(begin (delete-file-recursively "vendor") - ;; Don't demand an exact version for string_cache - (substitute* "rsvg_internals/Cargo.toml" - (("\"=") "\"")) #t)))) (build-system cargo-build-system) (arguments @@ -2376,48 +2373,49 @@ (define-public librsvg-next #:vendor-dir "vendor" #:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) - ("rust-cairo-rs" ,rust-cairo-rs-0.7) + ("rust-cairo-rs" ,rust-cairo-rs-0.8) ("rust-cairo-sys-rs" ,rust-cairo-sys-rs-0.9) - ("rust-cssparser" ,rust-cssparser-0.25) + ("rust-cast" ,rust-cast-0.2) + ("rust-cssparser" ,rust-cssparser-0.27) ("rust-data-url" ,rust-data-url-0.1) ("rust-downcast-rs" ,rust-downcast-rs-1.1) ("rust-encoding" ,rust-encoding-0.2) - ("rust-float-cmp" ,rust-float-cmp-0.5) - ("rust-gdk-pixbuf" ,rust-gdk-pixbuf-0.7) + ("rust-float-cmp" ,rust-float-cmp-0.6) + ("rust-gdk-pixbuf" ,rust-gdk-pixbuf-0.8) ("rust-gdk-pixbuf-sys" ,rust-gdk-pixbuf-sys-0.9) - ("rust-gio" ,rust-gio-0.7) + ("rust-gio" ,rust-gio-0.8) ("rust-gio-sys" ,rust-gio-sys-0.9) - ("rust-glib" ,rust-glib-0.8) + ("rust-glib" ,rust-glib-0.9) ("rust-glib-sys" ,rust-glib-sys-0.9) ("rust-gobject-sys" ,rust-gobject-sys-0.9) ("rust-itertools" ,rust-itertools-0.8) ("rust-language-tags" ,rust-language-tags-0.2) - ("rust-lazy-static" ,rust-lazy-static-1) ("rust-libc" ,rust-libc-0.2) ("rust-locale-config" ,rust-locale-config-0.3) - ("rust-markup5ever" ,rust-markup5ever-0.9) - ("rust-nalgebra" ,rust-nalgebra-0.18) + ("rust-markup5ever" ,rust-markup5ever-0.10) + ("rust-nalgebra" ,rust-nalgebra-0.19) ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-once-cell" ,rust-once-cell-1.2) ("rust-pkg-config" ,rust-pkg-config-0.3) - ("rust-pango" ,rust-pango-0.7) + ("rust-pango" ,rust-pango-0.8) ("rust-pango-sys" ,rust-pango-sys-0.9) - ("rust-pangocairo" ,rust-pangocairo-0.8) - ("rust-phf" ,rust-phf-0.7) + ("rust-pangocairo" ,rust-pangocairo-0.9) ("rust-rayon" ,rust-rayon-1) ("rust-rctree" ,rust-rctree-0.3) - ("rust-string-cache" ,rust-string-cache-0.7) + ("rust-rgb" ,rust-rgb-0.8) ("rust-regex" ,rust-regex-1) + ("rust-selectors" ,rust-selectors-0.22) ("rust-url" ,rust-url-2.1) - ("rust-xml-rs" ,rust-xml-rs-0.8)) + ("rust-xml5ever" ,rust-xml5ever-0.16)) #:cargo-development-inputs - (("rust-cairo-rs" ,rust-cairo-rs-0.7) - ("rust-criterion" ,rust-criterion-0.2)) + (("rust-cairo-rs" ,rust-cairo-rs-0.8) + ("rust-criterion" ,rust-criterion-0.3)) #:phases (modify-phases %standard-phases (add-after 'unpack 'prepare-for-build (lambda _ ;; In lieu of #:make-flags - (setenv "CC" "gcc") + (setenv "CC" ,(cc-for-target)) ;; Something about the build environment resists building ;; successfully with the '--locked' flag. (substitute* '("Makefile.am" @@ -2458,28 +2456,10 @@ (define-public librsvg-next ((assoc-ref gnu:%standard-phases 'check) #:test-target "check"))) (replace 'install - (assoc-ref gnu:%standard-phases 'install)) - (add-before 'check 'remove-failing-tests - (lambda _ - (with-directory-excursion "tests/fixtures/reftests" - (for-each delete-file - '(;; The images produced by these tests differ slightly - ;; from their reference counterparts due to differences - ;; in the build environment (missing fonts, etc). See - ;; for details. - ;; These fail on x86_64. - "svg1.1/coords-viewattr-02-b.svg" - "svg1.1/filters-composite-04-f.svg" - "svg1.1/filters-image-01-b.svg" - "svg1.1/filters-conv-02-f.svg" - "svg1.1/filters-conv-04-f.svg" - ;; This test fails on i686: - "svg1.1/masking-path-04-b.svg" - ;; This test fails on armhf: - "svg1.1/masking-mask-01-b.svg" - ;; This test fails on aarch64: - "bugs/777834-empty-text-children.svg"))) - #t))))) + (assoc-ref gnu:%standard-phases 'install))))) + (inputs + `(("pango" ,pango) + ,@(alist-delete "pango" (package-inputs librsvg)))) (license license:lgpl2.1+))) (define-public libidl -- cgit v1.2.3 From 675bca979e30314cdaed31656887ad52460f14e2 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 7 Jul 2020 13:52:28 +0200 Subject: gnu: Add plover. * gnu/local.mk (plover): New variable. (GNU_SYSTEM_MODULES): Add stenography.scm. --- gnu/local.mk | 1 + gnu/packages/stenography.scm | 65 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+) create mode 100644 gnu/packages/stenography.scm diff --git a/gnu/local.mk b/gnu/local.mk index 9a691525a2..a277e63fa4 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -505,6 +505,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/stalonetray.scm \ %D%/packages/statistics.scm \ %D%/packages/stb.scm \ + %D%/packages/stenography.scm \ %D%/packages/storage.scm \ %D%/packages/suckless.scm \ %D%/packages/swig.scm \ diff --git a/gnu/packages/stenography.scm b/gnu/packages/stenography.scm new file mode 100644 index 0000000000..f0193da25f --- /dev/null +++ b/gnu/packages/stenography.scm @@ -0,0 +1,65 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2020 Nicolas Goaziou +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages stenography) + #:use-module (guix build-system python) + #:use-module (guix git-download) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (gnu packages) + #:use-module (gnu packages check) + #:use-module (gnu packages libusb) + #:use-module (gnu packages python) + #:use-module (gnu packages python-xyz) + #:use-module (gnu packages wxwidgets)) + +(define-public plover + (package + (name "plover") + (version "3.1.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/openstenoproject/plover.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "114rlxvq471fyifwcdcgdad79ak7q3w2lk8z9nqhz1i9fg05721c")))) + (build-system python-build-system) + (arguments + `(#:python ,python-2)) + (native-inputs + `(("python2-mock" ,python2-mock) + ("python2-pytest" ,python2-pytest) + ("python2-setuptools-scm" ,python2-setuptools-scm))) + (inputs + `(("python2-appdirs" ,python2-appdirs) + ("python2-dbus" ,python2-dbus) + ("python2-hidapi" ,python2-hidapi) + ("python2-pyserial" ,python2-pyserial) + ("python2-wxpython" ,python2-wxpython) + ("python2-xlib" ,python2-xlib))) + (home-page "https://www.openstenoproject.org/plover/") + (synopsis "Stenography engine") + (description + "Plover (rhymes with @emph{lover}) is a desktop application that +allows anyone to use stenography to write on their computer, up to +speeds of 200WPM and beyond.") + (license license:gpl2+))) + -- cgit v1.2.3 From 6667576b66b34d797c4b5ca4a9ef08ba921b5d2a Mon Sep 17 00:00:00 2001 From: "B. Wilson" Date: Tue, 7 Jul 2020 13:52:30 +0900 Subject: gnu: metamath: Update to 0.183. * gnu/packages/maths.scm (metamath): Update to 0.183. Signed-off-by: Nicolas Goaziou --- gnu/packages/maths.scm | 48 +++++++++++++++++++++--------------------------- 1 file changed, 21 insertions(+), 27 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 5ea505764a..dbc670178a 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2411,32 +2411,26 @@ (define-public python-slepc4py (license license:bsd-3))) (define-public metamath - ;; Upstream pushed a commit on top of v0.182 that fixes a bug in Makefile.am. - ;; Using this commit lets us avoid directly including the patch here. In the - ;; next version bump, we should be able to replace this and directly use the - ;; version tag. - (let ((commit "5df616efe4119ff88daf77e7041d45b6fa39c578") - (revision "0")) - (package - (name "metamath") - (version (git-version "0.182" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/metamath/metamath-exe.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0amjdgy42c7jypf6sz98iczlxcyl9bqx67ws1q8w2zdqk2izsyjp")))) - (build-system gnu-build-system) - (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake))) - (home-page "http://us.metamath.org/") - (synopsis "Proof verifier based on a minimalistic formalism") - (description - "Metamath is a tiny formal language and that can express theorems in + (package + (name "metamath") + (version "0.183") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/metamath/metamath-exe.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1jjf4fy6j53i40dh0yv0f9sngnw4gs24cig99vsg3q0303pwrhg7")))) + (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake))) + (home-page "http://us.metamath.org/") + (synopsis "Proof verifier based on a minimalistic formalism") + (description + "Metamath is a tiny formal language and that can express theorems in abstract mathematics, with an accompyaning @command{metamath} executable that verifies databases of these proofs. There is a public database, @url{https://github.com/metamath/set.mm, set.mm}, implementing first-order @@ -2444,7 +2438,7 @@ (define-public metamath associated, high-level theorems, e.g.@: the fundamental theorem of arithmetic, the Cauchy-Schwarz inequality, Stirling's formula, etc. See the Metamath book.") - (license license:gpl2+)))) + (license license:gpl2+))) (define-public mumps (package -- cgit v1.2.3 From 70dcd7c78bdbe8bacf1b130090be0c788547689e Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Mon, 6 Jul 2020 11:46:56 +0200 Subject: gnu: Add emacs-chess. * gnu/packages/emacs-xyz.scm (emacs-chess): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 8ca331efd5..b1b9bf4a29 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -5905,6 +5905,37 @@ (define-public emacs-2048-game board and goal value can be customized.") (license license:gpl3+))) +(define-public emacs-chess + (package + (name "emacs-chess") + (version "2.0.4") + (source + (origin + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/" + "chess-" version ".tar")) + (sha256 + (base32 "1sq1bjmp513vldfh7hc2bbfc54665abqiz0kqgqq3gijckaxn5js")))) + (build-system emacs-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'install-pieces + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (pieces + (string-append out "/share/emacs/site-lisp/pieces"))) + (mkdir-p site-lisp) + (copy-recursively "pieces" pieces) + #t)))))) + (home-page "https://elpa.gnu.org/packages/chess.html") + (synopsis "Play chess in GNU Emacs") + (description + "Chess is an Emacs Lisp library and several clients on top of the +underlying library functionality for performing various activities related to +the game of chess.") + (license license:gpl3+))) + (define-public emacs-4clojure ;; There is no release. Base version is extracted from Version keyword in ;; the main file. -- cgit v1.2.3 From e3dc149297d967ac17c320e8b7f25f66bdfe0073 Mon Sep 17 00:00:00 2001 From: Peng Mei Yu via Guix-patches via Date: Mon, 6 Jul 2020 15:38:42 +0800 Subject: gnu: Add emacs-rime. * gnu/packages/emacs-xyz.scm (emacs-rime): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 49 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index b1b9bf4a29..1e0b085a63 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -77,6 +77,7 @@ ;;; Copyright © 2020 Ryan Desfosses ;;; Copyright © 2020 Eric Bavier ;;; Copyright © 2020 Morgan Smith +;;; Copyright © 2020 Peng Mei Yu ;;; ;;; This file is part of GNU Guix. ;;; @@ -122,6 +123,7 @@ (define-module (gnu packages emacs-xyz) #:use-module (gnu packages gtk) #:use-module (gnu packages gnome) #:use-module (gnu packages haskell-apps) + #:use-module (gnu packages ibus) #:use-module (gnu packages ncurses) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) @@ -22353,6 +22355,53 @@ (define-public emacs-repl-toggle REPL appropriate to the current major mode.") (license license:gpl3+))) +(define-public emacs-rime + (package + (name "emacs-rime") + (version "1.0.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/DogLooksGood/emacs-rime.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "08rzkiqwcl8j3i2yyibll5lcsj8720plzm9zfdgmxgkw7vhcyix5")))) + (build-system emacs-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-rime-data-path + (lambda* (#:key inputs #:allow-other-keys) + (make-file-writable "rime.el") + (emacs-substitute-variables "rime.el" + ("rime-share-data-dir" + (string-append (assoc-ref inputs "rime-data") + "/share/rime-data"))) + #t)) + (add-before 'install 'build-emacs-module + (lambda _ + (invoke "make" "lib"))) + (add-after 'install 'install-emacs-module + (lambda* (#:key outputs #:allow-other-keys) + (install-file "librime-emacs.so" + (string-append (assoc-ref outputs "out") + "/share/emacs/site-lisp")) + #t))))) + (inputs + `(("librime" ,librime) + ("rime-data" ,rime-data))) + (propagated-inputs + `(("emacs-dash" ,emacs-dash) + ("emacs-popup" ,emacs-popup) + ("emacs-posframe" ,emacs-posframe))) + (home-page "https://github.com/DogLooksGood/emacs-rime") + (synopsis "Rime input method in Emacs") + (description + "Rime is an Emacs input method built upon Rime input method engine.") + (license license:gpl3+))) + (define-public emacs-blackout (let ((commit "4bac44671fca4c98d96aa94c79946bf4d4baf0ee") (revision "1")) -- cgit v1.2.3 From 3903f98379ee58ccabb957a2511125711a500246 Mon Sep 17 00:00:00 2001 From: Matthew Kraai Date: Tue, 7 Jul 2020 03:17:01 -0700 Subject: gnu: python-bandit: Update home-page. * gnu/packages/openstack.scm (python-bandit)[home-page]: Update to new URL. Signed-off-by: Nicolas Goaziou --- gnu/packages/openstack.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index a1e21d8872..d0294cdef3 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -79,7 +79,7 @@ (define-public python-bandit ("python-testrepository" ,python-testrepository) ("python-testscenarios" ,python-testscenarios) ("python-testtools" ,python-testtools))) - (home-page "https://wiki.openstack.org/wiki/Security/Projects/Bandit") + (home-page "https://github.com/PyCQA/bandit") (synopsis "Security oriented static analyser for python code") (description "Bandit is a tool designed to find common security issues in Python code. -- cgit v1.2.3 From 78d28ffc84c7f5dbd2555783ed3db1f332e56eeb Mon Sep 17 00:00:00 2001 From: Christopher Lemmer Webber Date: Mon, 6 Jul 2020 15:57:18 -0400 Subject: gnu: emacs-racket-mode: Update to 20200706. * gnu/packages/emacs-xyz.scm (emacs-racket-mode): Update to 20200706. --- gnu/packages/emacs-xyz.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 1e0b085a63..7772fd142d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -15608,8 +15608,8 @@ (define-public emacs-faceup (license license:gpl3+)))) (define-public emacs-racket-mode - (let ((commit "5f396fa91fc22310f5c519aa658436a1a5251846") - (revision "5")) + (let ((commit "5eb31a284c8db5102bc71b1e2c6ce3a095ae085b") + (revision "6")) (package (name "emacs-racket-mode") (version (git-version "0.0.2" revision commit)) @@ -15622,12 +15622,13 @@ (define-public emacs-racket-mode (file-name (git-file-name name version)) (sha256 (base32 - "1214y08i0c51d1vzw9jzyf79vyfqizdy6m0980qs13qbdwsj32v0")))) + "081h6rd0gv88m0wvnmghi242kl39x1sz34qr4cq9vz04iwvnmgrm")))) (build-system emacs-build-system) (arguments `(#:include '("\\.el$" "\\.rkt$"))) (propagated-inputs `(("emacs-faceup" ,emacs-faceup) + ("emacs-pos-tip" ,emacs-pos-tip) ("emacs-s" ,emacs-s))) (home-page "https://www.racket-mode.com/") (synopsis "Major mode for the Racket language") -- cgit v1.2.3 From bbc358cd923eec5e5d0b288bb028c198c0146b81 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 7 Jul 2020 18:49:38 +0200 Subject: gnu: emacs-chess: Fix build. * gnu/packages/emacs-xyz.scm (emacs-chess): Fix typo introduced just before committing 70dcd7c78bdbe8bacf1b130090be0c788547689e. --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 7772fd142d..37175075de 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -5927,7 +5927,7 @@ (define-public emacs-chess (let* ((out (assoc-ref outputs "out")) (pieces (string-append out "/share/emacs/site-lisp/pieces"))) - (mkdir-p site-lisp) + (mkdir-p pieces) (copy-recursively "pieces" pieces) #t)))))) (home-page "https://elpa.gnu.org/packages/chess.html") -- cgit v1.2.3 From 38c653bc56c1f08f524ec9e5e31afc0c4cd1e81c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 7 Jul 2020 22:39:16 +0300 Subject: gnu: armips: Declare a source file-name. * gnu/packages/assembly.scm (armips)[source]: Add file-name field. --- gnu/packages/assembly.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm index 62c7e570fa..375747a990 100644 --- a/gnu/packages/assembly.scm +++ b/gnu/packages/assembly.scm @@ -382,6 +382,7 @@ (define-public armips (uri (git-reference (url "https://github.com/Kingcom/armips.git") (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 "1c4dhjkvynqn9xm2vcvwzymk7yg8h25alnawkz4z1dnn1z1k3r9g")))) (build-system cmake-build-system) -- cgit v1.2.3 From 127f0f05acfd7344661e0a64fc347033b017e000 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 8 Jul 2020 00:15:44 +0200 Subject: gnu: fet: Update to 5.45.1. * gnu/packages/education.scm (fet): Update to 5.45.1. --- gnu/packages/education.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 12e1b6f0a0..a54145a1ef 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -612,14 +612,14 @@ (define-public omnitux (define-public fet (package (name "fet") - (version "5.45.0") + (version "5.45.1") (source (origin (method url-fetch) (uri (string-append "https://www.lalescu.ro/liviu/fet/download/" "fet-" version ".tar.bz2")) (sha256 - (base32 "04jns6wc20rz6cp410znsllknhp4zlf4rn8wgv712855nffs42c6")))) + (base32 "1pg47jk6fw46fr7m32l1ypm1zyjfz1ik5f333ynqqr705f1c0ij5")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 413c31dc7aabcffc6b180fc0a003f149c9743c08 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Wed, 8 Jul 2020 07:37:24 +0200 Subject: gnu: coreutils: Mark pwd-long tests XFAIL on the Hurd. * gnu/packages/base.scm (coreutils)[arguments]: Add pwd-long as failing test. --- gnu/packages/base.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 71888976e6..7116708743 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -342,6 +342,7 @@ (define-public coreutils (list (string-append "XFAIL_TESTS=tests/misc/env-S.pl" " tests/misc/kill.sh" " tests/misc/nice.sh" + " tests/misc/pwd-long.sh" " tests/split/fail.sh" " test-fdutimensat" " test-futimens" -- cgit v1.2.3 From 54e70a70f2cb6336b02ed3ac4256f6b44da5c769 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Wed, 8 Jul 2020 11:18:18 +0200 Subject: gnu: grub: Fix native compilation of EFI variant on i686-linux. This fixes a regression introduce in d613991a8ebe5d4b3a7706f8f0dd52f16fc1c50a reported on IRC by Mathieu Othacehe . * gnu/packages/patches/grub-cross-system-i686.patch [GRUB_MACHINE_EFI && !__x86_64__]: Add missing .byte alternative to 64-bit instruction. --- gnu/packages/patches/grub-cross-system-i686.patch | 31 ++++++++++++++++++----- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/gnu/packages/patches/grub-cross-system-i686.patch b/gnu/packages/patches/grub-cross-system-i686.patch index a376cae1db..2715345d63 100644 --- a/gnu/packages/patches/grub-cross-system-i686.patch +++ b/gnu/packages/patches/grub-cross-system-i686.patch @@ -2,18 +2,20 @@ Not upstreamed. Fixes cross-build for the Hurd, from i686-linux, see . -From 270667540146f8ef9ea7a44258a71b3837a7af4a Mon Sep 17 00:00:00 2001 +From 17b242e7b80108f1467037e15b605595e4823b2e Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Sun, 21 Jun 2020 15:10:40 +0200 -Subject: [PATCH] grub-core: Build fixes for i386 +Subject: [PATCH v2] grub-core: Build fixes for i386 +Content-Transfer-Encoding: 8bit +Content-Type: text/plain; charset=UTF-8 * grub-core/lib/i386/relocator64.S: Avoid x86_64 instructions on i386. --- - grub-core/lib/i386/relocator64.S | 26 +++++++++++++++++++++++++- - 1 file changed, 25 insertions(+), 1 deletion(-) + grub-core/lib/i386/relocator64.S | 33 +++++++++++++++++++++++++++++++- + 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/grub-core/lib/i386/relocator64.S b/grub-core/lib/i386/relocator64.S -index 148f38adb..45fed9444 100644 +index 148f38adb..ea39908c1 100644 --- a/grub-core/lib/i386/relocator64.S +++ b/grub-core/lib/i386/relocator64.S @@ -63,7 +63,9 @@ VARIABLE(grub_relocator64_cr3) @@ -41,7 +43,22 @@ index 148f38adb..45fed9444 100644 #ifdef GRUB_MACHINE_EFI jmp LOCAL(skip_efi_stack_align) -@@ -95,8 +104,15 @@ LOCAL(skip_efi_stack_align): +@@ -85,7 +94,14 @@ VARIABLE(grub_relocator64_rsp) + */ + VARIABLE(grub_relocator64_efi_start) + /* Align the stack as UEFI spec requires. */ ++#ifndef __x86_64__ ++ .byte 0x48 ++ .byte 0x83 ++ .byte 0xe4 ++ .byte 0xf0 ++#else + andq $~15, %rsp ++#endif + + LOCAL(skip_efi_stack_align): + #endif +@@ -95,8 +111,15 @@ LOCAL(skip_efi_stack_align): VARIABLE(grub_relocator64_rsi) .quad 0 @@ -58,7 +75,7 @@ index 148f38adb..45fed9444 100644 /* mov imm64, %rax */ .byte 0x48 .byte 0xb8 -@@ -128,6 +144,14 @@ VARIABLE(grub_relocator64_rdx) +@@ -128,6 +151,14 @@ VARIABLE(grub_relocator64_rdx) #ifdef __APPLE__ .byte 0xff, 0x25 .quad 0 -- cgit v1.2.3 From fbc15cb953458bbf7f423e84995be7f695f50ef6 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 8 Jul 2020 11:22:07 +0200 Subject: gnu: emacs-exwm-edit: Update to 20200707. * gnu/packages/emacs-xyz.scm (emacs-exwm-edit): Update to 20200707. --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 37175075de..12dd2c3ebe 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -20140,9 +20140,9 @@ (define-public emacs-all-the-icons-dired (license license:gpl3+)))) (define-public emacs-exwm-edit - (let ((commit "bc25ba094b383be3c650ca0b7e1534efe2bb154f") + (let ((commit "e1291e311840f1049106fe98cec032a1c75efd2b") (version "0.0.1") - (revision "2")) + (revision "3")) (package (name "emacs-exwm-edit") (version (git-version version revision commit)) @@ -20155,7 +20155,7 @@ (define-public emacs-exwm-edit (file-name (git-file-name name version)) (sha256 (base32 - "1z1ya9xgknka3dy3b3x8zzfkxdx5jqsi8q5aqkvxjxa6n7mmqdwv")))) + "031cb8fvv5n30djr9lpl6vz3rl15zykfvjlgkjc8l33a3l5mw8j0")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-exwm" ,emacs-exwm))) -- cgit v1.2.3 From bcdacb0072a7666e2c6d440f90aa3c8503afb0ed Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 8 Jul 2020 11:37:35 +0200 Subject: gnu: Add emacs-helm-wordnut. * gnu/packages/emacs-xyz.scm (emacs-helm-wordnut): New variable. --- gnu/packages/emacs-xyz.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 12dd2c3ebe..f7c84f2412 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -22813,6 +22813,48 @@ (define-public emacs-helm-selector used for the creation of a new buffer of mode X.") (license license:gpl3+))) +(define-public emacs-helm-wordnut + (let ((commit "6c64bd1220258d45f1b872cb1edb3071d16b2bc5")) + (package + (name "emacs-helm-wordnut") + (version "0.1") + (home-page "https://github.com/emacs-helm/helm-wordnut") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1a5gfzvc272lxnpzz14dsya387hgy7rrxxmkhmpxyng4rdg6gc4f")))) + (build-system emacs-build-system) + (inputs + `(("wordnet" ,wordnet))) + (propagated-inputs + `(("emacs-helm" ,emacs-helm))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'configure + (lambda* (#:key inputs #:allow-other-keys) + (let ((wn (assoc-ref inputs "wordnet"))) + ;; .el is read-only in git. + (chmod "helm-wordnut.el" #o644) + ;; Specify the absolute file names of the various + ;; programs so that everything works out-of-the-box. + (emacs-substitute-variables "helm-wordnut.el" + ("helm-wordnut-prog" (string-append wn "/bin/wn")) + ("helm-wordnut-wordnet-location" + (string-append wn "/dict"))))))))) + (synopsis "Emacs Helm interface for Wordnet") + (description "This package is merely a combination of two other Emacs +packages: @code{helm-wordnet} and @code{wordnut}. It features word completion +with Helm and displays a buffer of all the different result types available to +Wordnet.") + (license license:gpl3+)))) + (define-public emacs-metal-mercury-mode (let ((commit "99e2d8fb7177cae3bfa2dec2910fc28216d5f5a8") (revision "1") -- cgit v1.2.3 From 34432d5a7808a3e9979e7c32dffb938dd27e79a5 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Wed, 8 Jul 2020 11:46:58 +0200 Subject: gnu: Add python-scikit-fuzzy. * gnu/packages/python-science.scm (python-scikit-fuzzy): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/python-science.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm index 3d6d4e909e..71601c0ea1 100644 --- a/gnu/packages/python-science.scm +++ b/gnu/packages/python-science.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2019 Maxim Cournoyer ;;; Copyright © 2019 Giacomo Leidi ;;; Copyright © 2020 Pierre Langlois +;;; Copyright © 2020 Vinicius Monego ;;; ;;; This file is part of GNU Guix. ;;; @@ -198,6 +199,37 @@ (define-public python2-weave Cython.") (license license:bsd-3))) +(define-public python-scikit-fuzzy + (package + (name "python-scikit-fuzzy") + (version "0.4.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "scikit-fuzzy" version)) + (sha256 + (base32 "0bp1n771fj44kdp7a00bcvfwirvv2rc803b7g6yf3va7v0j29c8s")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "nosetests" "-s" "-v" "skfuzzy") + #t))))) + (native-inputs + `(("python-nose" ,python-nose))) + (propagated-inputs + `(("python-networkx" ,python-networkx) + ("python-numpy" ,python-numpy) + ("python-scipy" ,python-scipy))) + (home-page "https://github.com/scikit-fuzzy/scikit-fuzzy") + (synopsis "Fuzzy logic toolkit for SciPy") + (description + "This package implements many useful tools for projects involving fuzzy +logic, also known as grey logic.") + (license license:bsd-3))) + (define-public python-scikit-image (package (name "python-scikit-image") -- cgit v1.2.3 From 8bebb547d3ad8ea086f029c67cef8d6eafe66805 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Wed, 8 Jul 2020 00:48:41 -0300 Subject: gnu: python-scikit-image: Add dependencies. * gnu/packages/python-science.scm (python-scikit-image)[propagated-inputs]: Add python-imageio and python-tifffile. Signed-off-by: Nicolas Goaziou --- gnu/packages/python-science.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm index 71601c0ea1..88843c1fb2 100644 --- a/gnu/packages/python-science.scm +++ b/gnu/packages/python-science.scm @@ -248,13 +248,15 @@ (define-public python-scikit-image (propagated-inputs `(("python-cloudpickle" ,python-cloudpickle) ("python-dask" ,python-dask) + ("python-imageio" ,python-imageio) ("python-matplotlib" ,python-matplotlib) ("python-networkx" ,python-networkx) ("python-numpy" ,python-numpy) ("python-pillow" ,python-pillow) ("python-pywavelets" ,python-pywavelets) ("python-scipy" ,python-scipy) - ("python-six" ,python-six))) + ("python-six" ,python-six) + ("python-tifffile" ,python-tifffile))) (native-inputs `(("python-cython" ,python-cython))) (home-page "https://scikit-image.org/") -- cgit v1.2.3 From 30b14aa00205905fca75afba1afa1a5127e3190d Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Wed, 8 Jul 2020 00:29:52 -0300 Subject: gnu: Add emacs-scala-mode. * gnu/packages/emacs-xyz.scm (emacs-scala-mode): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f7c84f2412..9167ad1138 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -4950,6 +4950,30 @@ (define-public emacs-company-lsp characters and asynchronous fetching of completion candidates.") (license license:gpl3+))) +(define-public emacs-scala-mode + (package + (name "emacs-scala-mode") + (version "1.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hvesalai/emacs-scala-mode") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1072lsin7dxadc0xyhy42wd0cw549axbbd4dy95wfmfcc1xbzjwv")))) + (build-system emacs-build-system) + (home-page "https://github.com/hvesalai/emacs-scala-mode") + (synopsis "Emacs major mode for Scala") + (description + "This package provides basic Emacs support for the Scala language, +including: local indenting of code, comments and multi-line strings, motion +commands and highlighting.") + ;; There are no copyright headers in the source code. The LICENSE file + ;; indicates GPL3. + (license license:gpl3))) + (define-public emacs-scheme-complete (let ((commit "9b5cf224bf2a5994bc6d5b152ff487517f1a9bb5")) (package -- cgit v1.2.3 From 387bc2154430310f05865f7431070464ffb92f70 Mon Sep 17 00:00:00 2001 From: Peng Mei Yu Date: Wed, 8 Jul 2020 10:00:13 +0800 Subject: gnu: rime-data: Update to 0.38.20200623. * gnu/packages/ibus.scm (rime-data): Update to 0.38.20200623. [native-inputs]: Add rime-cantonese. Signed-off-by: Nicolas Goaziou --- gnu/packages/ibus.scm | 59 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 35 insertions(+), 24 deletions(-) diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 0793635b7d..bce907122d 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2016 Chris Marusich ;;; Copyright © 2017, 2018 Efraim Flashner ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice -;;; Copyright © 2018, 2019 Meiyo Peng +;;; Copyright © 2018, 2019, 2020 Peng Mei Yu ;;; Copyright © 2020 kanichos ;;; Copyright © 2020 Vincent Legoll ;;; @@ -351,16 +351,16 @@ (define-public librime (define-public rime-data (package (name "rime-data") - (version "0.38.20190131") + (version "0.38.20200623") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/rime/plum.git") - (commit "8b48688cd4610d0c9223eb68831a31b6134e4cc8"))) + (commit "397d601dd22cfc857613973724724b8f44db9f9c"))) (file-name "plum-checkout") (sha256 - (base32 "0fv3hv4av9y7afxijh1n8idnyf82v9rxxi2ypmxd7lkj4naa22qh")))) + (base32 "06ad5c4m7xsfr4if5ywshfj2aj5g5b5hwzh38dzccn7c1l2ibi0z")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests @@ -388,6 +388,7 @@ (define-public rime-data '("array" "bopomofo" "cangjie" + "cantonese" "combo-pinyin" "double-pinyin" "emoji" @@ -439,16 +440,26 @@ (define-public rime-data (sha256 (base32 "1gf6r0q593ixar6v0jyvs56cik2gjp7pf9v799rfd2yydyia3bfg")))) + ("rime-cantonese" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rime/rime-cantonese.git") + (commit "e06fe8e79d7d64db2f2b6339aabc004d8cbc1f67"))) + (file-name "rime-cantonese-checkout") + (sha256 + (base32 + "0j6kbhdfj7dx812yzykndzbk53s2v1rsaa2jlyma03hz7qlnnl0s")))) ("rime-combo-pinyin" ,(origin (method git-fetch) (uri (git-reference (url "https://github.com/rime/rime-combo-pinyin.git") - (commit "9bd952b964e9744e5d18e9e31625b50f3585a2cb"))) + (commit "67b29cdc786928ea46b43a9c660dee3db8f1adff"))) (file-name "rime-combo-pinyin-checkout") (sha256 (base32 - "0crafjs39x4j221gb34mxxh3cdpxfhhx3nfw6b6bgkzlrp35a02b")))) + "1v6ax51xll2aizbz1xzjyk6p3lmq8cyzbxkrwcffa723zaj0zz4l")))) ("rime-double-pinyin" ,(origin (method git-fetch) @@ -464,51 +475,51 @@ (define-public rime-data (method git-fetch) (uri (git-reference (url "https://github.com/rime/rime-emoji.git") - (commit "c8d67f9b50bf89a10c57da646d2e6db8799aef38"))) + (commit "c99d34e4a837349e4679a110bb4b94f71fe015ae"))) (file-name "rime-emoji-checkout") (sha256 (base32 - "0ngcm088iyyp3llxvv0m80i7n5928d6cgh256ikhn3ixallxxdxv")))) + "1wiwlxjjml9xfgg7z1wzaf4b1bsg81dkwvsfff2b61fwxq61zkgw")))) ("rime-essay" ,(origin (method git-fetch) (uri (git-reference (url "https://github.com/rime/rime-essay.git") - (commit "71d0b1f3d4f3bfe61ae07581edf07579740c4421"))) + (commit "88055afa3752e4582fa887765d962a30e02bb1fa"))) (file-name "rime-essay-checkout") (sha256 (base32 - "1iwz104k7zfk7lpa257kvpqdr6jhbg3p76n3644ywiz4l7kc678i")))) + "0ap7xqv6v0x6mdkw2cv93cbr6qhpla3803z04522wb8l9hr7iryg")))) ("rime-ipa" ,(origin (method git-fetch) (uri (git-reference (url "https://github.com/rime/rime-ipa.git") - (commit "e420c7bfb07153a2d2484eb2bdccdd719811abbb"))) + (commit "22b71710e029bcb412e9197192a638ab11bc2abf"))) (file-name "rime-ipa-checkout") (sha256 (base32 - "1wfv7lb4y61b3qic5mhw92rn46cckldd9wrkcq03mg5512mbw63z")))) + "0zdk4f9qkfj3q5hmjnairj1lv6f6y27mic12k886n6sxywwbwr2k")))) ("rime-jyutping" ,(origin (method git-fetch) (uri (git-reference (url "https://github.com/rime/rime-jyutping.git") - (commit "04891a298319888e8c6b1a20e0fa81cfaea01264"))) + (commit "6fe0d727b3178feabd0f01e6cd82599202764735"))) (file-name "rime-jyutping-checkout") (sha256 (base32 - "0wsj965khglz36cnvfm4fkv386xvxhmsxgcw88p5qi0b3wlbzzx6")))) + "0wz6d3pmi72ysh2c0nml3rsz9hd2vazsyhnz34gq26yf4j85phfs")))) ("rime-luna-pinyin" ,(origin (method git-fetch) (uri (git-reference (url "https://github.com/rime/rime-luna-pinyin.git") - (commit "c9c405566177cb3898bdb82d7f4157587f2d9c01"))) + (commit "f1268e192ca88b9526467ce04ac3e47c837891ad"))) (file-name "rime-luna-pinyin-checkout") (sha256 (base32 - "0i7f2675lvj9pzwlm8550ifnr3xqi77xlyyvml1wpxpkfqhjr475")))) + "0nxnjp1ybcrsan1mxnzwbkfhwl99kza6i9k1s7m9wzmhv7x7zahg")))) ("rime-middle-chinese" ,(origin (method git-fetch) @@ -524,11 +535,11 @@ (define-public rime-data (method git-fetch) (uri (git-reference (url "https://github.com/rime/rime-pinyin-simp.git") - (commit "bb5a6dfa871669d2f451b477bfff6d131df6f6c6"))) + (commit "b73df7fc0994912ce785462b3be569ae81258ac2"))) (file-name "rime-pinyin-simp-checkout") (sha256 (base32 - "0ss82042k833w5q72h72ghcfchkx00nx6l4z4fb861s2rxr0bkjd")))) + "1m9hchnj1xf5s5185qm66ja0g1324drc98b2jjhnqgcp47bwz9fx")))) ("rime-prelude" ,(origin (method git-fetch) @@ -574,31 +585,31 @@ (define-public rime-data (method git-fetch) (uri (git-reference (url "https://github.com/rime/rime-stenotype.git") - (commit "1d472097c32d943d1096644f4c31f28799a17bd8"))) + (commit "f3e9189d5ce33c55d3936cc58e39d0c88b3f0c88"))) (file-name "rime-stenotype-checkout") (sha256 (base32 - "1dy9qlbyhnshq2k1vcvkqn2624r96iaixhyrx1z7v0vz84fjf6y4")))) + "0dl6px7lrh3xa87knjzwzdcwjj1k1dg4l72q7lb48an4s9f1cy5d")))) ("rime-stroke" ,(origin (method git-fetch) (uri (git-reference (url "https://github.com/rime/rime-stroke.git") - (commit "f802735392b378fb2a56a9b7b53b8ec96a30ccaf"))) + (commit "ea8576d1accd6fda339e96b415caadb56e2a07d1"))) (file-name "rime-stroke-checkout") (sha256 (base32 - "1wlrsskxhldh8369n771gk7sxflzdx0c9qhq1mqm5hhkwc5ig1j0")))) + "07h6nq9867hjrd2v3h1pnr940sdrw4mqrzj43siz1rzjxz3s904r")))) ("rime-terra-pinyin" ,(origin (method git-fetch) (uri (git-reference (url "https://github.com/rime/rime-terra-pinyin.git") - (commit "b9e0edd3182e74b26b03a278c038e669ca538a35"))) + (commit "492aaf914f9de37cc9d26b846dc693116de70ae8"))) (file-name "rime-terra-pinyin-checkout") (sha256 (base32 - "1vzrv2k178bii4ld9rvpdi8zmcwybd8bks0qzjx2v4kbjgwj28zk")))) + "1l4l2w42mc3sf7jwbadx95gzrsq11ld9f6yj2hwaq9accainw3bf")))) ("rime-wubi" ,(origin (method git-fetch) -- cgit v1.2.3 From fa7bd6110b4b6a00dfee4f8772c5499df6696d73 Mon Sep 17 00:00:00 2001 From: Peng Mei Yu Date: Wed, 8 Jul 2020 10:00:14 +0800 Subject: gnu: rime-data: Iterate over inputs to find Rime schemas. * gnu/packages/ibus.scm (rime-data)[arguments]: Iterate over inputs to find Rime schemas rather than using a pre-loaded list. [native-inputs]: Move to ... [inputs]: ... here. Signed-off-by: Nicolas Goaziou --- gnu/packages/ibus.scm | 45 ++++++++++++++------------------------------- 1 file changed, 14 insertions(+), 31 deletions(-) diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index bce907122d..d0b40a6eb2 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -363,7 +363,9 @@ (define-public rime-data (base32 "06ad5c4m7xsfr4if5ywshfj2aj5g5b5hwzh38dzccn7c1l2ibi0z")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; no tests + `(#:modules ((ice-9 match) + ,@%gnu-build-system-modules) + #:tests? #f ; no tests #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) "no_update=1") #:phases @@ -376,40 +378,21 @@ (define-public rime-data (("^\\.DEFAULT_GOAL := preset") ".DEFAULT_GOAL := all")) #t)) - ;; Add schema packages into "package/rime" directory. - (add-after 'unpack 'add-packages + ;; Copy Rime schemas into the "package/rime" directory. + (add-after 'unpack 'copy-rime-schemas (lambda* (#:key inputs #:allow-other-keys) - (let* ((dest-dir "package/rime")) + (let ((dest-dir "package/rime")) (mkdir-p dest-dir) - (for-each (lambda (pkg) - (symlink (assoc-ref inputs - (string-append "rime-" pkg)) - (string-append dest-dir "/" pkg))) - '("array" - "bopomofo" - "cangjie" - "cantonese" - "combo-pinyin" - "double-pinyin" - "emoji" - "essay" - "ipa" - "jyutping" - "luna-pinyin" - "middle-chinese" - "pinyin-simp" - "prelude" - "quick" - "scj" - "soutzoe" - "stenotype" - "stroke" - "terra-pinyin" - "wubi" - "wugniu"))) + (for-each + (match-lambda + ((name . path) + (if (string-prefix? "rime-" name) + (let ((schema (substring name (string-length "rime-")))) + (symlink path (string-append dest-dir "/" schema)))))) + inputs)) #t)) (delete 'configure)))) - (native-inputs + (inputs `(("rime-array" ,(origin (method git-fetch) -- cgit v1.2.3 From 5fc75e858ac0b6cf6e29bdfff52c7ee33a858273 Mon Sep 17 00:00:00 2001 From: Peng Mei Yu Date: Wed, 8 Jul 2020 10:00:15 +0800 Subject: gnu: rime-data: Disable git operations and update comments. * gnu/packages/ibus.scm (rime-data)[arguments]: Disable git operations and update comments. Suppress warnings during build. Signed-off-by: Nicolas Goaziou --- gnu/packages/ibus.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index d0b40a6eb2..426d04e6d7 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -372,11 +372,17 @@ (define-public rime-data (modify-phases %standard-phases (add-after 'unpack 'patch-source (lambda _ - ;; Set .DEFAULT_GOAL to `all'. - ;; Don't build binary schemas. The output is not deterministic. + ;; Don't build binary Rime schema. The binary Rime schema files + ;; are platform dependent and contains timestamp information. + ;; Thus they are not reproducible. + + ;; Change `.DEFAULT_GOAL' to `all'. (substitute* "Makefile" (("^\\.DEFAULT_GOAL := preset") ".DEFAULT_GOAL := all")) + ;; Disable git operations. + (substitute* "scripts/install-packages.sh" + ((".*update-package\\.sh.*") "")) #t)) ;; Copy Rime schemas into the "package/rime" directory. (add-after 'unpack 'copy-rime-schemas -- cgit v1.2.3 From d13c0ed6ae5eddaa555335244eac822a10887f88 Mon Sep 17 00:00:00 2001 From: Peng Mei Yu Date: Wed, 8 Jul 2020 10:00:16 +0800 Subject: gnu: rime-data: Fix license. * gnu/packages/ibus.scm (rime-data)[license]: Change license to LGPLv3. Signed-off-by: Nicolas Goaziou --- gnu/packages/ibus.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 426d04e6d7..1e89e455dd 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -623,7 +623,7 @@ (define-public rime-data (synopsis "Schema data of Rime Input Method Engine") (description "@dfn{rime-data} provides the schema data of Rime Input Method Engine.") - (license lgpl3+))) + (license lgpl3))) (define-public ibus-rime (package -- cgit v1.2.3 From 560540f005cf83b713569cb3a959b547f3840bca Mon Sep 17 00:00:00 2001 From: Peng Mei Yu Date: Wed, 8 Jul 2020 10:00:17 +0800 Subject: gnu: ibus-rime: Fix license. * gnu/packages/ibus.scm (ibus-rime)[license]: Change license to GPLv3. Signed-off-by: Nicolas Goaziou --- gnu/packages/ibus.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 1e89e455dd..b31d60f06c 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -689,7 +689,7 @@ (define-public ibus-rime input methods as well as those for Chinese dialects. It has the ability to compose phrases and sentences intelligently and provide very accurate traditional Chinese output.") - (license gpl3+))) + (license gpl3))) (define-public libhangul (package -- cgit v1.2.3 From c19973280fb8a5b3419e0ebdbd1ce7e1c09559df Mon Sep 17 00:00:00 2001 From: guy fleury iteriteka Date: Sat, 4 Jul 2020 21:31:40 +0200 Subject: gnu: Add python-terminaltables * gnu/packages/python-xyz.scm(python-terminaltables): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/python-xyz.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 55860fa57f..c4e5002073 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -82,6 +82,7 @@ ;;; Copyright © 2020 Yuval Kogman ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020 Vinicius Monego +;;; Copyright © 2020 Guy Fleury Iteriteka ;;; ;;; This file is part of GNU Guix. ;;; @@ -8831,6 +8832,26 @@ (define-public python-termcolor (define-public python2-termcolor (package-with-python2 python-termcolor)) +(define-public python-terminaltables + (package + (name "python-terminaltables") + (version "3.1.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "terminaltables" version)) + (sha256 + (base32 + "109vhldk6nv1z3hzp4dyqf6rjvlhl0y2k5k7qcm9fcrq5swhxszk")))) + (build-system python-build-system) + (home-page "https://github.com/Robpol86/terminaltables") + (synopsis + "Generate simple tables in terminals from a nested list of strings") + (description + "This package makes it easy to draw tables in terminal/console +applications from a list of lists of strings. It supports multi-line rows.") + (license license:expat))) + (define-public python-libarchive-c (package (name "python-libarchive-c") -- cgit v1.2.3 From 35ddc92a27adfbf656a89bc48c68d5b5762a046a Mon Sep 17 00:00:00 2001 From: guy fleury iteriteka Date: Wed, 8 Jul 2020 12:52:18 +0200 Subject: gnu: Add python-cli-helpers. * gnu/packages/python-xyz.scm (python-cli-helpers): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/python-xyz.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c4e5002073..98db6d9e51 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2392,6 +2392,36 @@ (define-public python-pyld (define-public python2-pyld (package-with-python2 python-pyld)) +(define-public python-cli-helpers + (package + (name "python-cli-helpers") + (version "2.0.1") + (source + (origin + ;; There's no source tarball on PyPI. + (method git-fetch) + (uri (git-reference + (url "https://github.com/dbcli/cli_helpers.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1bg2iw9l5dip0kbs00hajdk2v18wvhssbnq8hdf71278qf0wks5l")))) + (build-system python-build-system) + (native-inputs + `(("python-pytest" ,python-pytest))) + (propagated-inputs + `(("python-wcwidth" ,python-wcwidth) + ("python-configobj" ,python-configobj) + ("python-tabulate" ,python-tabulate) + ("python-terminaltables" ,python-terminaltables))) + (home-page "https://github.com/dbcli/cli_helpers") + (synopsis "Helpers for building command-line apps") + (description + "CLI Helpers is a Python package that makes it easy to perform common +tasks when building command-line apps. It's a helper library for command-line +interfaces.") + (license license:bsd-3))) + (define-public python-click (package (name "python-click") -- cgit v1.2.3 From 8de54c63d35b6582ed5666456c5e91640ffd6641 Mon Sep 17 00:00:00 2001 From: guy fleury iteriteka Date: Sat, 4 Jul 2020 21:31:42 +0200 Subject: gnu: Add mycli. * gnu/packages/databases.scm(mycli): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/databases.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 2e46f9b883..d54cbac09b 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -42,6 +42,7 @@ ;;; Copyright © 2020 Nicolò Balzarotti ;;; Copyright © 2020 Tanguy Le Carrour ;;; Copyright © 2020 Lars-Dominik Braun +;;; Copyright © 2020 Guy Fleury Iteriteka ;;; ;;; This file is part of GNU Guix. ;;; @@ -609,6 +610,37 @@ (define-public mongodb ;; Some parts are licensed under the Apache License license:asl2.0)))) +(define-public mycli + (package + (name "mycli") + (version "1.21.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "mycli" version)) + (sha256 + (base32 + "1q9p0yik9cpvpxjs048anvhicfcna84mpl7axv9bwgr48w40lqwg")))) + (build-system python-build-system) + (arguments + `(#:tests? #f)) ; tests expect a running MySQL + (propagated-inputs + `(("python-cli-helpers" ,python-cli-helpers) + ("python-click" ,python-click) + ("python-configobj" ,python-configobj) + ("python-cryptography" ,python-cryptography) + ("python-prompt-toolkit" ,python-prompt-toolkit) + ("python-pygments" ,python-pygments) + ("python-pymysql" ,python-pymysql) + ("python-sqlparse" ,python-sqlparse))) + (home-page "http://mycli.net") + (synopsis + "Terminal Client for MySQL with AutoCompletion and Syntax Highlighting") + (description + "MyCLI is a command line interface for MySQL, MariaDB, and Percona with +auto-completion and syntax highlighting.") + (license license:bsd-3))) + ;; XXX When updating, check whether boost-for-mysql is still needed. ;; It might suffice to patch ‘cmake/boost.cmake’ as done in the past. (define-public mysql -- cgit v1.2.3 From 8252d77f349cdbc4c49e3e7dbf8d2b869c5bacd6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 8 Jul 2020 14:14:54 +0200 Subject: gnu: wine-staging: Fix source URI for patch versions. * gnu/packages/wine.scm (wine-staging)[source]: Handle X.Y.Z patchset versions. --- gnu/packages/wine.scm | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index aeec63a1b9..dd33a1af58 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -375,19 +375,20 @@ (define-public wine-staging (name "wine-staging") (version (package-version wine-staging-patchset-data)) (source - (origin - (method url-fetch) - (uri (let ((dir (string-append - (version-major version) - (if (string-suffix? ".0" (version-major+minor version)) - ".0" - ".x")))) - (string-append - "https://dl.winehq.org/wine/source/" dir - "/wine-" version ".tar.xz"))) - (file-name (string-append name "-" version ".tar.xz")) - (sha256 - (base32 "1krk68lsfvisi0zpx7890cz0z5bp7jl7rka5d70vwyj3c7109bfb")))) + (let* ((wine-version (version-major+minor version)) + (subdirectory (string-append + (version-major version) + (if (string-suffix? ".0" wine-version) + ".0" + ".x")))) + (origin + (method url-fetch) + (uri (string-append "https://dl.winehq.org/wine/source/" + subdirectory "/" + "wine-" wine-version ".tar.xz")) + (file-name (string-append name "-" wine-version ".tar.xz")) + (sha256 + (base32 "1krk68lsfvisi0zpx7890cz0z5bp7jl7rka5d70vwyj3c7109bfb"))))) (inputs `(("autoconf" ,autoconf) ; for autoreconf ("ffmpeg" ,ffmpeg) ("gtk+" ,gtk+) -- cgit v1.2.3 From 4c0bc186223b0ef290dbc8e69081b34ea34eca74 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 8 Jul 2020 14:16:05 +0200 Subject: gnu: wine-staging: Update to 5.12.1. * gnu/packages/wine.scm (wine-staging-patchset-data, wine-staging): Update to 5.12.1. --- gnu/packages/wine.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index dd33a1af58..9cb1cef786 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -328,7 +328,7 @@ (define-public wine-minimal (define-public wine-staging-patchset-data (package (name "wine-staging-patchset-data") - (version "5.8") + (version "5.12.1") (source (origin (method git-fetch) @@ -337,7 +337,7 @@ (define-public wine-staging-patchset-data (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "07i11alcymkfj1vgadcxd6khvjk1ay0x2dddwrvnc4gag9lvkddr")))) + (base32 "135ddf4zsxwbi0nhvjpqfvqjrh18f3c6hmhcsbm5mc8zmpjpmzdj")))) (build-system trivial-build-system) (native-inputs `(("bash" ,bash) @@ -388,7 +388,7 @@ (define-public wine-staging "wine-" wine-version ".tar.xz")) (file-name (string-append name "-" wine-version ".tar.xz")) (sha256 - (base32 "1krk68lsfvisi0zpx7890cz0z5bp7jl7rka5d70vwyj3c7109bfb"))))) + (base32 "0bl4ii4h1w4z8kb6dpdc1pgwk0wrhm61c2q2nzpcckkrqra75wc7"))))) (inputs `(("autoconf" ,autoconf) ; for autoreconf ("ffmpeg" ,ffmpeg) ("gtk+" ,gtk+) -- cgit v1.2.3 From 0dfb340b9e32de3443a663ffc8de31983a15f465 Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Wed, 8 Jul 2020 14:03:07 +0200 Subject: gnu: r-rjava: Update to 0.9-13. * gnu/packages/cran.scm (r-rjava): Update to 0.9-13. Signed-off-by: Efraim Flashner --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c32558b0be..a6bcb5dca8 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -14367,14 +14367,14 @@ (define-public r-r2html (define-public r-rjava (package (name "r-rjava") - (version "0.9-12") + (version "0.9-13") (source (origin (method url-fetch) (uri (cran-uri "rJava" version)) (sha256 (base32 - "03vv0pj6san03c51iyqsyb1rwh3097dfpl2s8iswzzmc7k3shj12")))) + "1x3mihyqzr61j52rwaqciw43mkjzmhib4s6qf57v6xj40ksqh5jv")))) (properties `((upstream-name . "rJava"))) (build-system r-build-system) (arguments -- cgit v1.2.3 From a42d6a99f80f202aac6414d1f691c9b5ddae71ce Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 8 Jul 2020 17:55:55 +0200 Subject: gnu: snap: Update to 6.0.0. * gnu/packages/education.scm (snap): Update to 6.0.0. --- gnu/packages/education.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index a54145a1ef..47d3145ad2 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -274,7 +274,7 @@ (define-public tipp10 (define-public snap (package (name "snap") - (version "5.4.5") + (version "6.0.0") (source (origin (method git-fetch) @@ -283,7 +283,7 @@ (define-public snap (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1z6dbcsgvxxs40p23qysfsk4vzpg8jlrr5pqfnjf8q3kpz1xvzxf")))) + (base32 "1j5hcnms12hpnl2ba7haf00l08rkpb5wpfsgax07p838q5dc7cam")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) -- cgit v1.2.3 From 7af0b6544c5fb1c44805d8921ecf22e29fa6127b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 8 Jul 2020 18:05:23 +0200 Subject: gnu: asymptote: Update to 2.66. * gnu/packages/plotutils.scm (asymptote): Update to 2.66. --- gnu/packages/plotutils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index f6881f6776..8ddc8ebc74 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm @@ -203,14 +203,14 @@ (define-public ploticus (define-public asymptote (package (name "asymptote") - (version "2.65") + (version "2.66") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/asymptote/" version "/asymptote-" version ".src.tgz")) (sha256 - (base32 "0i4qqlvzz69mhdq6kf689sa9rxfb1cwsg1nx88hryb291hddgqqm")))) + (base32 "1l2cv238fjqjkm4gam1aaxri0p3yxfmn067mhixziwybr3g5nq52")))) (build-system gnu-build-system) ;; Note: The 'asy' binary retains a reference to docdir for use with its ;; "help" command in interactive mode, so adding a "doc" output is not -- cgit v1.2.3 From d12798539c82ce7b8daa5e4ae2497320deb1863e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 8 Jul 2020 18:40:04 +0200 Subject: gnu: keepassxc: Update to 2.6.0. * gnu/packages/password-utils.scm (keepassxc): Update to 2.6.0. --- gnu/packages/password-utils.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 6bd1e94c91..5662a1dfe8 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -121,7 +121,7 @@ (define-public pwgen (define-public keepassxc (package (name "keepassxc") - (version "2.5.4") + (version "2.6.0") (source (origin (method url-fetch) @@ -129,11 +129,14 @@ (define-public keepassxc "/releases/download/" version "/keepassxc-" version "-src.tar.xz")) (sha256 - (base32 "0jndssyvpl8bc5i2q3d6kq1ppynchxx9nvp1qhd2pc0qqc0hhpm5")))) + (base32 "0fpx6pq336g1xwjl5yzvsky6vqvaa38zb8pwkgswph9slybkvlnh")))) (build-system cmake-build-system) (arguments '(#:configure-flags '("-DWITH_XC_ALL=YES" "-DWITH_XC_UPDATECHECK=NO"))) + (native-inputs + `(("asciidoctor" ,ruby-asciidoctor) + ("qttools" ,qttools))) (inputs `(("argon2" ,argon2) ("libgcrypt" ,libgcrypt) @@ -149,8 +152,6 @@ (define-public keepassxc ("readline" ,readline) ("yubikey-personalization" ,yubikey-personalization) ; XC_YUBIKEY ("zlib" ,zlib))) - (native-inputs - `(("qttools" ,qttools))) (home-page "https://www.keepassxc.org") (synopsis "Password manager") (description "KeePassXC is a password manager or safe which helps you to -- cgit v1.2.3 From 41c32695e5b8fb93ccb065ce896ddbf864babe7b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 8 Jul 2020 18:42:38 +0200 Subject: gnu: giac: Update to 1.6.0-7. * gnu/packages/algebra.scm (giac): Update to 1.6.0-7. --- gnu/packages/algebra.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 90af1453eb..4fef6d2405 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -351,7 +351,7 @@ (define-public cmh (define-public giac (package (name "giac") - (version "1.5.0-87") + (version "1.6.0-7") (source (origin (method url-fetch) @@ -363,7 +363,7 @@ (define-public giac "~parisse/debian/dists/stable/main/source/" "giac_" version ".tar.gz")) (sha256 - (base32 "1d0h1yb7qvh9x7wwv9yrzmcp712f49w1iljkxp4y6g9pzsmg1mmv")))) + (base32 "1pvgp137zcl0rbhdn1j41xxfml7fp771a7x4ph8qrhhlx0hxzn3p")))) (build-system gnu-build-system) (arguments `(#:modules ((ice-9 ftw) @@ -403,7 +403,7 @@ (define-public giac (delete-file (string-append out "/bin/xcasnew")) #t)))))) (inputs - ;;; TODO: Add libnauty. +;;; TODO: Add libnauty. `(("fltk" ,fltk) ("glpk" ,glpk) ("gmp" ,gmp) -- cgit v1.2.3 From 143188423a727426efdc6289fc87a5e492bcf09d Mon Sep 17 00:00:00 2001 From: Jan Wielkiewicz Date: Wed, 8 Jul 2020 15:33:24 +0200 Subject: gnu: opendht: Update to 2.1.4 * gnu/packages/networking.scm (opendht): Update to 2.1.4. Signed-off-by: Christopher Baines --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 077ede2f23..6f417b48d0 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2911,7 +2911,7 @@ (define-public restinio (define-public opendht (package (name "opendht") - (version "2.0.0") + (version "2.1.4") (source (origin (method git-fetch) (uri (git-reference @@ -2920,7 +2920,7 @@ (define-public opendht (file-name (git-file-name name version)) (sha256 (base32 - "1q1fwk8wwk9r6bp0indpr60ql668lsk16ykslacyhrh7kg97kvhr")))) + "1ax26ri1ifb6s8ppd28jmanka9yf8mw3np65q2h4djhhik0phhal")))) ;; Since 2.0, the gnu-build-system does not seem to work anymore, upstream bug? (build-system cmake-build-system) (inputs -- cgit v1.2.3 From fadc633a02251ddf3cb78bd817d99233b031f62d Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Wed, 8 Jul 2020 16:51:00 +0200 Subject: gnu: python-sqlalchemy: Update to 1.3.18. * gnu/packages/databases.scm (python-sqlalchemy): Update to 1.3.18. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index d54cbac09b..9befa64a16 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2620,13 +2620,13 @@ (define-public python2-pysqlite (define-public python-sqlalchemy (package (name "python-sqlalchemy") - (version "1.3.15") + (version "1.3.18") (source (origin (method url-fetch) (uri (pypi-uri "SQLAlchemy" version)) (sha256 - (base32 "0iglkvymfp35zm5pxy5kzqvcv96kkas0chqdx7xpla86sspa9k64")))) + (base32 "1rwc6ss1cnz3kxx0p9p6xw0w79r8qw03lcc29k31yb3rcigvfbys")))) (build-system python-build-system) (native-inputs `(("python-cython" ,python-cython) ; for C extensions -- cgit v1.2.3 From 10bdd84e69e52eb9d918de43dcb1536b51ed65ef Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 9 Jul 2020 00:01:23 +0200 Subject: gnu: powertabeditor: Update to 2.0.0-alpha12-1.c5d39b2. * gnu/packages/music.scm (powertabeditor): Update to 2.0.0-alpha12-1.c5d39b2. [source]: Remove snippet. [arguments]: Remove #:modules and #:configure-flags; remove obsolete phases. [inputs]: Remove withershins, libiberty, and binutils; add minizip. [native-inputs]: Remove catch-framework; add doctest. [home-page]: Use Github project page. --- gnu/packages/music.scm | 157 ++++++++++++------------------------------------- 1 file changed, 39 insertions(+), 118 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index d0f5bee3a0..fd24188bf8 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1267,125 +1267,46 @@ (define-public solfege (license license:gpl3+))) (define-public powertabeditor - (package - (name "powertabeditor") - (version "2.0.0-alpha10") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/powertab/powertabeditor.git") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1z4fhdp71ck9synr12rg1p6365xnypd8ih40c5icj4si36khvksk")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Remove bundled sources for external libraries - (delete-file-recursively "external") - ;; Use only system libraries - (substitute* "CMakeLists.txt" - (("include\\( PTE_ThirdParty \\)") - "\ -include(third_party/Qt) -include(third_party/boost) -add_library( Catch INTERFACE IMPORTED ) -add_library( rapidjson INTERFACE IMPORTED )")) - #t)))) - (build-system cmake-build-system) - (arguments - `(#:modules ((guix build cmake-build-system) - (guix build utils) - (ice-9 match)) - #:configure-flags - ;; CMake appears to lose the RUNPATH for some reason, so it has to be - ;; explicitly set with CMAKE_INSTALL_RPATH. - (list "-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE" - (string-append "-DCMAKE_INSTALL_RPATH=" - (string-join (map (match-lambda - ((name . directory) - (string-append directory "/lib"))) - %build-inputs) ";")) - "-DPTE_DATA_DIR=share/powertabeditor") - #:phases - (modify-phases %standard-phases - (replace 'check - (lambda _ - (invoke "bin/pte_tests" - ;; FIXME: these tests fail - "exclude:Actions/EditStaff" - "exclude:Formats/PowerTabOldImport/MergeMultiBarRests" - "exclude:Score/ViewFilter/FilterRule" - "exclude:Score/ViewFilter/ViewFilter" - "exclude:Formats/PowerTabOldImport/Directions") - #t)) - ;; FIXME: This bug has been fixed upstream, but no release has been - ;; made yet. See https://github.com/powertab/powertabeditor/issues/257 - (add-after 'unpack 'fix-boost-bug - (lambda _ - (substitute* "source/score/voiceutils.cpp" - (("boost::rational duration\\(4, pos.getDurationType\\(\\)\\);") - "boost::rational duration(4, static_cast(pos.getDurationType()));")) - #t)) - ;; Fix build with Qt 5.11. - (add-after 'unpack 'add-missing-headers - (lambda _ - (substitute* (find-files "source/dialogs/" "\\.h$") - (("#include " m) - (string-append m "\n#include "))) - (substitute* "source/widgets/mixer/mixeritem.h" - (("#include " m) - (string-append m "\n#include "))) - (substitute* "source/widgets/playback/playbackwidget.h" - (("#include " m) - (string-append m "\n#include \n#include "))) - #t)) - ;; FIXME: Finding RtMidi was fixed upstream so we should be able to - ;; remove this hack when a release is made. - ;; See https://github.com/powertab/powertabeditor/issues/255 - (add-after 'unpack 'fix-rtmidi-header - (lambda _ - (substitute* "source/audio/midioutputdevice.cpp" - (("#include ") "#include ")) - #t)) - (add-before 'configure 'remove-third-party-libs - (lambda* (#:key inputs #:allow-other-keys) - ;; Link with required static libraries, because we're not - ;; using the bundled version of withershins. - ;; Also add pthread for fixing a linker error. - (substitute* "source/build/CMakeLists.txt" - (("withershins" line) - (string-append line "\n" - (assoc-ref inputs "binutils") - "/lib/libbfd.a\n" - (assoc-ref inputs "libiberty") - "/lib/libiberty.a\n" - "dl\n" - "pthread\n" - "z\n"))) - #t))))) - (inputs - `(("boost" ,boost) - ("alsa-lib" ,alsa-lib) - ("qtbase" ,qtbase) - ("withershins" ,withershins) - ("libiberty" ,libiberty) ;for withershins - ("binutils" ,binutils) ;for -lbfd and -liberty (for withershins) - ("timidity" ,timidity++) - ("pugixml" ,pugixml) - ("rtmidi" ,rtmidi) - ("rapidjson" ,rapidjson) - ("zlib" ,zlib))) - (native-inputs - `(("catch" ,catch-framework) - ("pkg-config" ,pkg-config))) - (home-page "http://powertabs.net") - (synopsis "Guitar tablature editor") - (description - "Power Tab Editor 2.0 is the successor to the famous original Power Tab + ;; This commit is after the switch from catch2 to doctest; I couldn't build + ;; powertabeditor with catch2. + (let ((commit "c5d39b25b75bf87ec693a3ac5018823b1d87f277") + (revision "1")) + (package + (name "powertabeditor") + (version (git-version "2.0.0-alpha12" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/powertab/powertabeditor.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "16qhqfvk14bp7s8cwr8ds8zfd80pq603d7aymr7967pnb49kic5z")))) + (build-system cmake-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check (lambda _ (invoke "bin/pte_tests")))))) + (inputs + `(("alsa-lib" ,alsa-lib) + ("boost" ,boost) + ("minizip" ,minizip) + ("pugixml" ,pugixml) + ("qtbase" ,qtbase) + ("rapidjson" ,rapidjson) + ("rtmidi" ,rtmidi) + ("timidity" ,timidity++) + ("zlib" ,zlib))) + (native-inputs + `(("doctest" ,doctest) + ("pkg-config" ,pkg-config))) + (home-page "https://github.com/powertab/powertabedito") + (synopsis "Guitar tablature editor") + (description + "Power Tab Editor 2.0 is the successor to the famous original Power Tab Editor. It is compatible with Power Tab Editor 1.7 and Guitar Pro.") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public jalv-select (package -- cgit v1.2.3 From 065a5ed677cdd1a65acae20f185d7c4bd23b1f2c Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Thu, 9 Jul 2020 02:06:50 +0200 Subject: gnu: wine, wine64: Update to 5.12. * gnu/packages/wine.scm (wine, wine64): Update to 5.12. --- gnu/packages/wine.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 9cb1cef786..047542a367 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -76,7 +76,7 @@ (define-module (gnu packages wine) (define-public wine (package (name "wine") - (version "5.3") + (version "5.12") (source (origin (method url-fetch) @@ -88,7 +88,7 @@ (define-public wine (string-append "https://dl.winehq.org/wine/source/" dir "wine-" version ".tar.xz"))) (sha256 - (base32 "1pkzj3656ad0vmc7ciwfzn45lb2kxwbyymfwnqaa105dicicf6wv")))) + (base32 "0bl4ii4h1w4z8kb6dpdc1pgwk0wrhm61c2q2nzpcckkrqra75wc7")))) (build-system gnu-build-system) (native-inputs `(("bison" ,bison) -- cgit v1.2.3 From 1d537c71966756fe4e15c263dea7fb2cfaadfc2b Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 25 Jun 2020 00:31:44 -0400 Subject: gnu: Add ruby-benchmark-ips. * gnu/packages/ruby.scm (ruby-benchmark-ips): New variable. --- gnu/packages/ruby.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index d63600571e..ba76d5019a 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -6021,6 +6021,27 @@ (define-public ruby-middleware (home-page "https://github.com/mitchellh/middleware") (license license:expat))) +(define-public ruby-benchmark-ips + (package + (name "ruby-benchmark-ips") + (version "2.8.2") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "benchmark-ips" version)) + (sha256 + (base32 + "1n9397j7kh4vvikfann1467qgksc679imlr50hax3lk1q3af8kdw")))) + (build-system ruby-build-system) + (native-inputs + `(("ruby-hoe" ,ruby-hoe))) + (synopsis "Iterations per second enhancement for the Ruby Benchmark module") + (description "Benchmark-ips enhances the Ruby Benchmark module with the +iterations per second count. For short snippets of code, it can automatically +figure out how many times to run the code to get interesting data.") + (home-page "https://github.com/evanphx/benchmark-ips") + (license license:expat))) + (define-public ruby-gherkin (package (name "ruby-gherkin") -- cgit v1.2.3 From d7bd7016e87f6690e6b7e3f79bf0c147df7631ac Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 27 Jun 2020 00:33:33 -0400 Subject: gnu: Add ruby-rspec-its-minimal. * gnu/packages/ruby.scm (ruby-rspec-its-minimal): New variable. (ruby-addressable)[native-inputs]: Use it instead of ruby-rspec-its. --- gnu/packages/ruby.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index ba76d5019a..ec5a0fec09 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -679,6 +679,16 @@ (define-public ruby-rspec-its (home-page "https://github.com/rspec/rspec-its") (license license:expat))) +;;; This variant is used to break a cycle with ruby-protobuf. +(define-public ruby-rspec-its-minimal + (hidden-package + (package + (inherit ruby-rspec-its) + (arguments + (substitute-keyword-arguments (package-arguments ruby-rspec-its) + ((#:tests? _ #f) #f))) + (native-inputs '())))) + (define-public ruby-rspec-mocks (package (name "ruby-rspec-mocks") @@ -8197,7 +8207,7 @@ (define-public ruby-addressable ("bundler" ,bundler) ("ruby-idn-ruby" ,ruby-idn-ruby) ("ruby-sporkmonger-rack-mount" ,ruby-sporkmonger-rack-mount) - ("ruby-rspec-its", ruby-rspec-its) + ("ruby-rspec-its", ruby-rspec-its-minimal) ("ruby-yard" ,ruby-yard) ("ruby-simplecov" ,ruby-simplecov))) (propagated-inputs -- cgit v1.2.3 From fc5d1c5aa0f511025e5ee98a916b059f7427b2f5 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 27 Jun 2020 00:36:29 -0400 Subject: gnu: Add ruby-ffi-rzmq-core. * gnu/packages/ruby.scm (ruby-ffi-rzmq-core): New variable. --- gnu/packages/ruby.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index ec5a0fec09..1a5cfb45b9 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -6052,6 +6052,43 @@ (define-public ruby-benchmark-ips (home-page "https://github.com/evanphx/benchmark-ips") (license license:expat))) +(define-public ruby-ffi-rzmq-core + (package + (name "ruby-ffi-rzmq-core") + (version "1.0.7") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "ffi-rzmq-core" version)) + (sha256 + (base32 + "0amkbvljpjfnv0jpdmz71p1i3mqbhyrnhamjn566w0c01xd64hb5")))) + (build-system ruby-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-libzmq-search-path + (lambda* (#:key inputs #:allow-other-keys) + (let ((zeromq (assoc-ref inputs "zeromq"))) + (substitute* "lib/ffi-rzmq-core/libzmq.rb" + (("/usr/local/lib") + (string-append zeromq "/lib"))) + #t))) + (replace 'check + (lambda _ + (invoke "rspec")))))) + (native-inputs + `(("ruby-rspec" ,ruby-rspec))) + (inputs + `(("zeromq" ,zeromq))) + (propagated-inputs `(("ruby-ffi" ,ruby-ffi))) + (synopsis "Low-level Ruby FFI wrapper for the ZeroMQ networking library") + (description "This library only provides the FFI wrapper for the ZeroMQ +networking library. It can be used to implement a Ruby API for the ZeroMQ +library.") + (home-page "https://github.com/chuckremes/ffi-rzmq-core") + (license license:expat))) + (define-public ruby-gherkin (package (name "ruby-gherkin") -- cgit v1.2.3 From 7a5035162b83a7fbaa5027fc877e22ec24a97fbf Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 27 Jun 2020 00:36:43 -0400 Subject: gnu: Add ruby-ffi-rzmq. * gnu/packages/ruby.scm (ruby-ffi-rzmq): New variable. --- gnu/packages/ruby.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 1a5cfb45b9..34f381d17b 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -6089,6 +6089,35 @@ (define-public ruby-ffi-rzmq-core (home-page "https://github.com/chuckremes/ffi-rzmq-core") (license license:expat))) +(define-public ruby-ffi-rzmq + (package + (name "ruby-ffi-rzmq") + (version "2.0.7") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "ffi-rzmq" version)) + (sha256 + (base32 + "14a5kxfnf8l3ngyk8hgmk30z07aj1324ll8i48z67ps6pz2kpsrg")))) + (build-system ruby-build-system) + (arguments '(#:tests? #t + #:phases (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "rspec")))))) + (native-inputs + `(("ruby-rspec" ,ruby-rspec))) + (propagated-inputs + `(("ruby-ffi-rzmq-core" ,ruby-ffi-rzmq-core))) + (synopsis "High-level Ruby wrapper for the ZeroMQ networking library") + (description "This library provides a high-level API that wraps the ZeroMQ +networking library using the Ruby foreign function interface (FFI). It is a +pure Ruby wrapper, hence is compatible with any Ruby runtime that has support +for FFI.") + (home-page "https://github.com/chuckremes/ffi-rzmq") + (license license:expat))) + (define-public ruby-gherkin (package (name "ruby-gherkin") -- cgit v1.2.3 From 03a0f98a8d41627bbaa7b61d4d36bd9936c2e215 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 27 Jun 2020 00:37:04 -0400 Subject: gnu: Add ruby-sawyer. * gnu/packages/ruby.scm (ruby-sawyer): New variable. --- gnu/packages/ruby.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 34f381d17b..9db9353636 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -6118,6 +6118,27 @@ (define-public ruby-ffi-rzmq (home-page "https://github.com/chuckremes/ffi-rzmq") (license license:expat))) +(define-public ruby-sawyer + (package + (name "ruby-sawyer") + (version "0.8.2") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "sawyer" version)) + (sha256 + (base32 + "0yrdchs3psh583rjapkv33mljdivggqn99wkydkjdckcjn43j3cz")))) + (build-system ruby-build-system) + (propagated-inputs + `(("ruby-addressable" ,ruby-addressable) + ("ruby-faraday" ,ruby-faraday))) + (synopsis "Experimental hypermedia agent for Ruby") + (description "Sawyer is an experimental hypermedia agent for Ruby built on +top of Faraday.") + (home-page "https://github.com/lostisland/sawyer") + (license license:expat))) + (define-public ruby-gherkin (package (name "ruby-gherkin") -- cgit v1.2.3 From aa3c76b100d2916b90fb16f9c46e6ea16e9e5d20 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 27 Jun 2020 00:37:22 -0400 Subject: gnu: Add ruby-octokit. * gnu/packages/ruby.scm (ruby-octokit): New variable. --- gnu/packages/ruby.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 9db9353636..17c6fd13ce 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -6139,6 +6139,28 @@ (define-public ruby-sawyer (home-page "https://github.com/lostisland/sawyer") (license license:expat))) +(define-public ruby-octokit + (package + (name "ruby-octokit") + (version "4.18.0") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "octokit" version)) + (sha256 + (base32 + "0zvfr9njmj5svi39fcsi2b0g7pcxb0vamw9dlyas8bg814jlzhi6")))) + (build-system ruby-build-system) + (arguments '(#:tests? #f)) ;no test suite in the gem release + (propagated-inputs + `(("ruby-faraday" ,ruby-faraday) + ("ruby-sawyer" ,ruby-sawyer))) + (synopsis "Ruby toolkit for the GitHub API") + (description "Octokit wraps the GitHub API in a flat API client that +follows Ruby conventions and requires little knowledge of REST.") + (home-page "https://github.com/octokit/octokit.rb") + (license license:expat))) + (define-public ruby-gherkin (package (name "ruby-gherkin") -- cgit v1.2.3 From 1157d2f82c62a60cc180bd727aebc98a2f4a9f09 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 27 Jun 2020 00:45:26 -0400 Subject: gnu: Add ruby-chandler. * gnu/packages/ruby.scm (ruby-chandler): New variable. --- gnu/packages/ruby.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 17c6fd13ce..2537a26a96 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -6161,6 +6161,30 @@ (define-public ruby-octokit (home-page "https://github.com/octokit/octokit.rb") (license license:expat))) +(define-public ruby-chandler + (package + (name "ruby-chandler") + (version "0.9.0") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "chandler" version)) + (sha256 + (base32 + "1n8a4mr2jkcz5vaaps45g2rxa2pzy1wb7cylgw85xmmyyp14lnrr")))) + (build-system ruby-build-system) + (native-inputs + `(("ruby-rubocop" ,ruby-rubocop))) + (propagated-inputs + `(("ruby-netrc" ,ruby-netrc) + ("ruby-octokit" ,ruby-octokit))) + (synopsis "Sync CHANGELOG entries to GitHub's release notes") + (description "Chandler syncs a project's CHANGELOG file entries to +GitHub's release notes to remove the need of manually entering release +notes.") + (home-page "https://github.com/mattbrictson/chandler") + (license license:expat))) + (define-public ruby-gherkin (package (name "ruby-gherkin") -- cgit v1.2.3 From 439d47cdb1ed6bc29a9222a96ebe13f908d2e726 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 28 Jun 2020 16:56:49 -0400 Subject: gnu: Add ruby-kpeg. * gnu/packages/ruby.scm (ruby-kpeg): New variable. --- gnu/packages/ruby.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 2537a26a96..d636561a2e 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -8446,6 +8446,29 @@ (define-public ruby-command-line-reporter-3 (base32 "1h39zqqxp3k4qk49ajpx0jps1vmvxgkh43mqkb6znk583bl0fv71")))))) +(define-public ruby-kpeg + (package + (name "ruby-kpeg") + (version "1.1.0") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "kpeg" version)) + (sha256 + (base32 + "0x2kpfrcagj931masm5y1kwbnc6nxl60cqdcd3lyd1d2hz7kzlia")))) + (build-system ruby-build-system) + (native-inputs + `(("ruby-hoe" ,ruby-hoe))) + (synopsis "PEG library for Ruby") + (description "KPeg is a simple PEG library for Ruby. It provides an API as +well as native grammar to build the grammar. KPeg supports direct left +recursion of rules via the +@uref{http://www.vpri.org/pdf/tr2008003_experimenting.pdf,OMeta memoization} +technique.") + (home-page "https://github.com/evanphx/kpeg") + (license license:expat))) + (define-public ruby-rdoc (package (name "ruby-rdoc") -- cgit v1.2.3 From 9304f989e65b52ab49f6f70f77fc157d2afc6f0b Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 28 Jun 2020 16:57:36 -0400 Subject: gnu: ruby-rdoc: Update to 6.2.0. * gnu/packages/ruby.scm (ruby-rdoc): Update to 6.2.0. [origin]: Fetch sources from git. [phases]{patch-gemspec, generate}: New phases. [native-inputs]{ruby-kpeg, ruby-racc, ruby-rubocop}: New native inputs. --- gnu/packages/ruby.scm | 37 +++++++++++++++++++++++++++++-------- 1 file changed, 29 insertions(+), 8 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index d636561a2e..7a9f4a2256 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -8472,17 +8472,38 @@ (define-public ruby-kpeg (define-public ruby-rdoc (package (name "ruby-rdoc") - (version "6.0.4") + (version "6.2.0") (source - (origin - (method url-fetch) - (uri (rubygems-uri "rdoc" version)) - (sha256 - (base32 - "0anv42cqcdc6g4n386mrva7mgav5i0c2ry3yzvzzc6z6hymkmcr7")))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ruby/rdoc.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0dhk29nidv93b5vnjvlm9gcixgn4i0jcyzrgxdk6pdg019bw4cj6")))) (build-system ruby-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-gemspec + ;; TODO: Remove after next release is tagged. + (lambda _ + (substitute* "rdoc.gemspec" + (("\"lib/rdoc/generator/template/darkfish/js/\ +jquery\\.js\", ") "")) + #t)) + (add-before 'build 'generate + ;; 'gem build' doesn't honor Rakefile dependencies (see: + ;; https://github.com/ruby/rdoc/issues/432#issuecomment-650808977). + (lambda _ + (invoke "rake" "generate")))))) (native-inputs - `(("bundler" ,bundler))) + `(("bundler" ,bundler) + ("ruby-kpeg" ,ruby-kpeg) + ("ruby-racc" ,ruby-racc) + ("ruby-rubocop" ,ruby-rubocop))) (home-page "https://ruby.github.io/rdoc/") (synopsis "HTML and command-line documentation utility") (description "RDoc produces HTML and command-line documentation for Ruby -- cgit v1.2.3 From a0d93c174c9b5755aed9e477414000ebc5c525fb Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 28 Jun 2020 18:27:08 -0400 Subject: gnu: ruby-pry: Update to 0.13.1. * gnu/packages/ruby.scm (ruby-pry): Update to 0.13.1. [home-page]: Update. --- gnu/packages/ruby.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 7a9f4a2256..d4df3aa4d9 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -4472,14 +4472,14 @@ (define-public ruby-progressbar (define-public ruby-pry (package (name "ruby-pry") - (version "0.11.3") + (version "0.13.1") (source (origin (method url-fetch) (uri (rubygems-uri "pry" version)) (sha256 (base32 - "1mh312k3y94sj0pi160wpia0ps8f4kmzvm505i6bvwynfdh7v30g")))) + "0iyw4q4an2wmk8v5rn2ghfy2jaz9vmw2nk8415nnpx2s866934qk")))) (build-system ruby-build-system) (arguments '(#:tests? #f)) ; no tests @@ -4490,7 +4490,7 @@ (define-public ruby-pry (description "Pry is an IRB alternative and runtime developer console for Ruby. It features syntax highlighting, a plugin architecture, runtime invocation, and source and documentation browsing.") - (home-page "https://pryrepl.org") + (home-page "https://cobaltbluemedia.com/pryrepl/") (license license:expat))) (define-public ruby-single-cov -- cgit v1.2.3 From ec08f4697610328727aef95061ce688d1377259a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 28 Jun 2020 22:38:47 -0400 Subject: gnu: ruby-method-source: Update to 1.0.0. * gnu/packages/ruby.scm (ruby-method-source): Update to 1.0.0. --- gnu/packages/ruby.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index d4df3aa4d9..50e8b42a37 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -4184,14 +4184,14 @@ (define-public ruby-nokogiri (define-public ruby-method-source (package (name "ruby-method-source") - (version "0.9.0") + (version "1.0.0") (source (origin (method url-fetch) (uri (rubygems-uri "method_source" version)) (sha256 (base32 - "0xqj21j3vfq4ldia6i2akhn2qd84m0iqcnsl49kfpq3xk6x0dzgn")))) + "1pnyh44qycnf9mzi1j6fywd5fkskv3x7nmsqrrws0rjn5dd4ayfp")))) (build-system ruby-build-system) (arguments `(#:test-target "spec")) -- cgit v1.2.3 From cbee8e319f78a0e63dd2c5ea02f97ceb2fb44443 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 28 Jun 2020 22:42:33 -0400 Subject: gnu: bundler: Update to 2.1.4. * gnu/packages/ruby.scm (bundler): Update to 2.1.4. --- gnu/packages/ruby.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 50e8b42a37..c256e9a17e 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -818,13 +818,13 @@ (define-public ruby-rspec-2 (define-public bundler (package (name "bundler") - (version "1.17.3") + (version "2.1.4") (source (origin (method url-fetch) (uri (rubygems-uri "bundler" version)) (sha256 (base32 - "0ln3gnk7cls81gwsbxvrmlidsfd78s6b2hzlm4d4a9wbaidzfjxw")))) + "12glbb1357x91fvd004jgkw7ihlkpc9dwr349pd7j83isqhls0ah")))) (build-system ruby-build-system) (arguments '(#:tests? #f)) ; avoid dependency cycles -- cgit v1.2.3 From c997403a80963f3edf8ebf8628e75e57ea1b0d79 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 28 Jun 2020 23:24:12 -0400 Subject: gnu: ruby-rake: Update to 13.0.1. * gnu/packages/ruby.scm (ruby-rake): Update to 13.0.1. --- gnu/packages/ruby.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index c256e9a17e..8bc701e42a 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -8228,14 +8228,14 @@ (define-public ruby-org-ruby (define-public ruby-rake (package (name "ruby-rake") - (version "12.3.1") + (version "13.0.1") (source (origin (method url-fetch) (uri (rubygems-uri "rake" version)) (sha256 (base32 - "1idi53jay34ba9j68c3mfr9wwkg3cd9qh0fn9cg42hv72c6q8dyg")))) + "0w6qza25bq1s825faaglkx1k6d59aiyjjk3yw3ip5sb463mhhai9")))) (build-system ruby-build-system) (native-inputs `(("bundler" ,bundler))) -- cgit v1.2.3 From 77d098bf8152b41e7c587c19d406946b7ad57566 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 29 Jun 2020 00:17:23 -0400 Subject: gnu: ruby-ruby-engine: Update to 2.0.0. * gnu/packages/ruby.scm (ruby-ruby-engine): Update to 2.0.0. [phases]: Move the 'clean-up phase after 'extract-gemspec. Use a single backslash for escaping quotes in patterns. Make the phase more lenient to version changes. --- gnu/packages/ruby.scm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 8bc701e42a..5d12e34678 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -6718,19 +6718,19 @@ (define-public ruby-eventmachine (define-public ruby-ruby-engine (package (name "ruby-ruby-engine") - (version "1.0.1") + (version "2.0.0") (source (origin (method url-fetch) (uri (rubygems-uri "ruby_engine" version)) (sha256 (base32 - "1d0sd4q50zkcqhr395wj1wpn2ql52r0fpwhzjfvi1bljml7k546v")))) + "0wqdcv8gxybp1y7kjhh18g3r9dczacs62d4ahcvyhz32bih8c9fm")))) (build-system ruby-build-system) (arguments `(#:phases (modify-phases %standard-phases - (add-before 'check 'clean-up + (add-after 'extract-gemspec 'clean-up (lambda _ (delete-file "Gemfile.lock") (substitute* "ruby_engine.gemspec" @@ -6739,18 +6739,19 @@ (define-public ruby-ruby-engine ((".*.freeze, \\[\\\"~> 10.0\\\"\\]") + (("%q.freeze, \\[\"~> 10.0\"\\]") "%q.freeze, [\">= 10.0\"]") ;; Soften the rspec dependency - (("%q.freeze, \\[\\\"~> 2.4\\\"\\]") + (("%q.freeze, \\[\"~> 2.4\"\\]") "%q.freeze, [\">= 2.4\"]")) (substitute* "Rakefile" (("require 'rubygems/tasks'") "") (("Gem::Tasks.new") "")) ;; Remove extraneous .gem file that otherwise gets installed. - (delete-file "pkg/ruby_engine-1.0.0.gem") + (delete-file-recursively "pkg") #t))))) (native-inputs `(("bundler" ,bundler) -- cgit v1.2.3 From 7aa00628a53648be090b8113a882a94fe3a67637 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 30 Jun 2020 22:28:19 -0400 Subject: gnu: Add ruby-byebug-11. * gnu/packages/ruby.scm (ruby-byebug-11): New variable. --- gnu/packages/ruby.scm | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 5d12e34678..41791db045 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5548,6 +5548,60 @@ (define-public ruby-byebug (home-page "https://github.com/deivid-rodriguez/byebug") (license license:bsd-2))) +;;; TODO: Make it the default byebug in core-updates. +(define-public ruby-byebug-11 + (package + (inherit ruby-byebug) + (name "ruby-byebug") + (version "11.1.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/deivid-rodriguez/byebug.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0vyy3k2s7dcndngj6m8kxhs1vxc2c93dw8b3yyand3srsg9ffpij")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Remove wrappers that try to setup a bundle environment. + (with-directory-excursion "bin" + (for-each delete-file '("bundle" "rake" "rubocop")) + ;; ruby-minitest doesn't come with a launcher, so fix the one + ;; provided. + (substitute* "minitest" + (("load File\\.expand_path\\(\"bundle\".*") "") + (("require \"bundler/setup\".*") ""))) + #t)))) + (arguments + `(#:tests? #t + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'skip-tmp-path-sensitive-test + (lambda _ + (substitute* "test/commands/where_test.rb" + (("unless /cygwin\\|mswin\\|mingw\\|darwin/.*") + "unless true\n")) + #t)) + (add-before 'build 'compile + (lambda _ + (invoke "rake" "compile"))) + (add-before 'check 'set-home + (lambda _ + (setenv "HOME" (getcwd)) + #t))))) + (native-inputs + `(("bundler" ,bundler) + ("ruby-chandler" ,ruby-chandler) + ("ruby-minitest" ,ruby-minitest) + ("ruby-pry" ,ruby-pry) + ("ruby-rake-compiler" ,ruby-rake-compiler) + ("ruby-rubocop" ,ruby-rubocop) + ("ruby-yard" ,ruby-yard))))) + (define-public ruby-netrc (package (name "ruby-netrc") -- cgit v1.2.3 From acb288767bb05396ac986edad8537d68a4322dff Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 1 Jul 2020 00:05:12 -0400 Subject: gnu: Add ruby-pry-byebug. * gnu/packages/ruby.scm (ruby-pry-byebug): New variable. --- gnu/packages/ruby.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 41791db045..eeb3513b1a 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -6239,6 +6239,40 @@ (define-public ruby-chandler (home-page "https://github.com/mattbrictson/chandler") (license license:expat))) +(define-public ruby-pry-byebug + (package + (name "ruby-pry-byebug") + (version "3.9.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/deivid-rodriguez/pry-byebug.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1kchrwccai92068p50zyd6mh524ywqnm0jw5g3lks7iwmf0xkmgc")))) + (build-system ruby-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (add-before 'check 'set-home + (lambda _ + (setenv "HOME" (getcwd)) + #t))))) + (native-inputs + `(("ruby-chandler" ,ruby-chandler) + ("ruby-rubocop" ,ruby-rubocop) + ("ruby-simplecov" ,ruby-simplecov))) + (propagated-inputs + `(("ruby-byebug" ,ruby-byebug-11) + ("ruby-pry" ,ruby-pry))) + (synopsis "Step-by-step debugging and stack navigation in Pry") + (description "This package adds step-by-step debugging and stack +navigation capabilities to @code{pry}, using @code{byebug}.") + (home-page "https://github.com/deivid-rodriguez/pry-byebug") + (license license:expat))) + (define-public ruby-gherkin (package (name "ruby-gherkin") -- cgit v1.2.3 From 4d31fe6b6c5c3758ae93f3d1c599072f5df977c4 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 1 Jul 2020 00:07:17 -0400 Subject: gnu: Add ruby-binding-of-caller. * gnu/packages/ruby.scm (ruby-binding-of-caller): New variable. --- gnu/packages/ruby.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index eeb3513b1a..8fb4115aea 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -6273,6 +6273,30 @@ (define-public ruby-pry-byebug (home-page "https://github.com/deivid-rodriguez/pry-byebug") (license license:expat))) +(define-public ruby-binding-of-caller + (package + (name "ruby-binding-of-caller") + (version "0.8.0") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "binding_of_caller" version)) + (sha256 + (base32 + "05syqlks7463zsy1jdfbbdravdhj9hpj5pv2m74blqpv8bq4vv5g")))) + (build-system ruby-build-system) + ;; Attempting to run the test suite fails with a rake deprecation error + ;; (see: https://github.com/banister/binding_of_caller/issues/76). + (arguments '(#:tests? #f)) + (propagated-inputs + `(("ruby-debug-inspector" ,ruby-debug-inspector))) + (synopsis "Retrieve the binding of a method's caller") + (description "The @code{binding_of_caller} module provides the +@code{Binding#of_caller} method. It allows accessing bindings from upper +frames in the call stack and can evaluate code in that context.") + (home-page "https://github.com/banister/binding_of_caller") + (license license:expat))) + (define-public ruby-gherkin (package (name "ruby-gherkin") -- cgit v1.2.3 From f4699abc26ac0dee46328d5a129fb8fb288418c3 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 1 Jul 2020 00:09:07 -0400 Subject: gnu: Add ruby-pry-stack-explorer. * gnu/packages/ruby.scm (ruby-pry-stack-explorer): New variable. --- gnu/packages/ruby.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 8fb4115aea..668b6924c5 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -6297,6 +6297,28 @@ (define-public ruby-binding-of-caller (home-page "https://github.com/banister/binding_of_caller") (license license:expat))) +(define-public ruby-pry-stack-explorer + (package + (name "ruby-pry-stack-explorer") + (version "0.5.1") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "pry-stack_explorer" version)) + (sha256 + (base32 + "157rd2n9pfvcmmicm0xkq8z4p6famaj13syrpra6b4032qpb1wn0")))) + (build-system ruby-build-system) + (arguments '(#:tests? #f)) ;no test suite in gem release + (propagated-inputs + `(("ruby-binding-of-caller" ,ruby-binding-of-caller) + ("ruby-pry" ,ruby-pry))) + (synopsis "Call-stack navigation plugin for the Pry REPL") + (description "@code{pry-stack_explorer} is a plugin for the Pry REPL that +add support to navigate the call-stack.") + (home-page "https://github.com/pry/pry-stack_explorer") + (license license:expat))) + (define-public ruby-gherkin (package (name "ruby-gherkin") -- cgit v1.2.3 From 1f014c9769f28b7f77a53ac9fdcc2a4ec6c9915e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 1 Jul 2020 00:12:32 -0400 Subject: gnu: Add ruby-varint. * gnu/packages/ruby.scm (ruby-varint): New variable. --- gnu/packages/ruby.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 668b6924c5..e4cfff7cc2 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -6319,6 +6319,25 @@ (define-public ruby-pry-stack-explorer (home-page "https://github.com/pry/pry-stack_explorer") (license license:expat))) +(define-public ruby-varint + (package + (name "ruby-varint") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "varint" version)) + (sha256 + (base32 + "1y0l2qc64cwsyv76ygg9bbjnk86riz2kq73kmn87gdrlmpiyrdac")))) + (build-system ruby-build-system) + (arguments '(#:tests? #f)) ;no test suite + (synopsis "Variable length integers (varint) C extension for Ruby") + (description "This package provides a small C extension to speed up +variable length integers (varint) in Ruby Protocol Buffers.") + (home-page "https://github.com/liquidm/varint") + (license license:bsd-3))) + (define-public ruby-gherkin (package (name "ruby-gherkin") -- cgit v1.2.3 From 1b2141743550aee95acda7b270d7df3fd671350e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 1 Jul 2020 00:17:32 -0400 Subject: gnu: Add ruby-ruby-prof. * gnu/packages/ruby.scm (ruby-ruby-prof): New variable. --- gnu/packages/ruby.scm | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index e4cfff7cc2..08163599f9 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -6338,6 +6338,55 @@ (define-public ruby-varint (home-page "https://github.com/liquidm/varint") (license license:bsd-3))) +(define-public ruby-ruby-prof + (package + (name "ruby-ruby-prof") + (version "1.4.1") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "ruby-prof" version)) + (sha256 + (base32 + "12cd91m08ih0imfpy4k87618hd4mhyz291a6bx2hcskza4nf6d27")))) + (build-system ruby-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-rakefile + ;; This fixes the following error: "NameError: uninitialized + ;; constant Bundler::GemHelper" (see: + ;; https://github.com/ruby-prof/ruby-prof/issues/274). + (lambda _ + (substitute* "Rakefile" + ((".*require \"bundler/setup\".*" all) + (string-append all " require 'bundler/gem_tasks'\n"))) + #t)) + (add-before 'check 'compile + (lambda _ + (invoke "rake" "compile")))))) + (native-inputs + `(("bundler" ,bundler) + ("ruby-minitest" ,ruby-minitest) + ("ruby-rake-compiler" ,ruby-rake-compiler) + ("ruby-rdoc" ,ruby-rdoc))) + (synopsis "Fast code profiler for Ruby") + (description "RubyProf is a fast code profiler for Ruby. Its features +include: +@table @asis +@item Speed +Being a C extension, it is many times faster than the standard Ruby profiler. +@item Measurement Modes +It can measure program wall time, process time, object allocations and memory +usage. +@item Reports +A variety of text and cross-referenced HTML reports can be generated. +@item Threads +Profiling multiple threads simultaneously is supported. +@end table") + (home-page "https://github.com/ruby-prof/ruby-prof") + (license license:bsd-2))) + (define-public ruby-gherkin (package (name "ruby-gherkin") -- cgit v1.2.3 From d59c84f5381de991bcedeabe0ceb5bfc4c50e536 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 6 Jul 2020 22:37:59 -0400 Subject: gnu: Add ruby-protobuf. * gnu/packages/ruby.scm (ruby-protobuf): New variable. --- gnu/packages/protobuf.scm | 88 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 87 insertions(+), 1 deletion(-) diff --git a/gnu/packages/protobuf.scm b/gnu/packages/protobuf.scm index 4ea36a2fba..e676e972e0 100644 --- a/gnu/packages/protobuf.scm +++ b/gnu/packages/protobuf.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2016 Leo Famulari ;;; Copyright © 2017, 2018, 2019 Ricardo Wurmus ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2020 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,13 +29,15 @@ (define-module (gnu packages protobuf) #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (guix build-system emacs) + #:use-module (guix build-system ruby) #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages compression) #:use-module (gnu packages gcc) #:use-module (gnu packages libevent) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) - #:use-module (gnu packages python-xyz)) + #:use-module (gnu packages python-xyz) + #:use-module (gnu packages ruby)) (define-public fstrm (package @@ -254,3 +257,86 @@ (define-public emacs-protobuf-mode "This package provides an Emacs major mode for editing Protocol Buffer source files.") (license license:bsd-3))) + +(define-public ruby-protobuf + (package + (name "ruby-protobuf") + (version "3.10.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ruby-protobuf/protobuf.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1yzz7jgpp6qip5d6qhzbkf5gqaydfk3z3c1ngccwzp6w6wa75g8a")))) + (build-system ruby-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'do-not-use-bundler-for-tests + (lambda _ + (substitute* "spec/spec_helper.rb" + (("Bundler\\.setup.*") "")) + #t)) + (add-after 'unpack 'relax-version-requirements + (lambda _ + (substitute* ((@@ (guix build ruby-build-system) first-gemspec)) + (("'rake',.*") + "'rake'\n") + (("\"rubocop\",.*") + "'rubocop'\n") + (("\"parser\",.*") + "'parser'\n")) + #t)) + (add-after 'unpack 'patch-protoc + (lambda* (#:key inputs #:allow-other-keys) + (let ((protoc (assoc-ref inputs "protobuf"))) + (substitute* "lib/protobuf/tasks/compile.rake" + (("\"protoc\"") + (string-append "\"" protoc "/bin/protoc" "\""))) + #t))) + (add-after 'unpack 'skip-failing-test + ;; See: https://github.com/ruby-protobuf/protobuf/issues/419 + (lambda _ + (substitute* "spec/lib/protobuf/rpc/connectors/ping_spec.rb" + (("expect\\(::IO\\)\\.to receive\\(:select\\).*" all) + (string-append " pending\n" all))) + #t)) + (add-after 'replace-git-ls-files 'replace-more-git-ls-files + (lambda _ + (substitute* ((@@ (guix build ruby-build-system) first-gemspec)) + (("`git ls-files -- \\{test,spec,features\\}/*`") + "`find test spec features -type f | sort`") + (("`git ls-files -- bin/*`") + "`find bin -type f | sort`")) + #t)) + (replace 'check + (lambda _ + (invoke "rspec")))))) + (native-inputs + `(("ruby-benchmark-ips" ,ruby-benchmark-ips) + ("ruby-ffi-rzmq" ,ruby-ffi-rzmq) + ("ruby-parser" ,ruby-parser) + ("ruby-pry-byebug" ,ruby-pry-byebug) + ("ruby-pry-stack-explorer" ,ruby-pry-stack-explorer) + ("ruby-rake" ,ruby-rake) + ("ruby-rspec" ,ruby-rspec) + ("ruby-rubocop" ,ruby-rubocop) + ("ruby-ruby-prof" ,ruby-ruby-prof) + ("ruby-simplecov" ,ruby-simplecov) + ("ruby-timecop" ,ruby-timecop) + ("ruby-varint" ,ruby-varint) + ("ruby-yard" ,ruby-yard))) + (inputs + `(("protobuf" ,protobuf))) + (propagated-inputs + `(("ruby-activesupport" ,ruby-activesupport) + ("ruby-middleware" ,ruby-middleware) + ("ruby-thor" ,ruby-thor))) + (home-page "https://github.com/ruby-protobuf/protobuf") + (synopsis "Implementation of Google's Protocol Buffers in Ruby") + (description "Protobuf is an implementation of Google's Protocol Buffers +in pure Ruby.") + (license license:expat))) -- cgit v1.2.3 From 77f66f53e8fc8853b63047545cfe649cad093138 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 7 Jul 2020 23:17:24 -0400 Subject: gnu: Add ruby-protobuf-cucumber. * gnu/packages/protobuf.scm (ruby-protobuf-cucumber): New variable. --- gnu/packages/protobuf.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/protobuf.scm b/gnu/packages/protobuf.scm index e676e972e0..556bca6042 100644 --- a/gnu/packages/protobuf.scm +++ b/gnu/packages/protobuf.scm @@ -340,3 +340,20 @@ (define-public ruby-protobuf (description "Protobuf is an implementation of Google's Protocol Buffers in pure Ruby.") (license license:expat))) + +;;; This is a modified ruby-protobuf package used by ruby-cucumber-messages +;;; until https://github.com/ruby-protobuf/protobuf/pull/411 and +;;; https://github.com/ruby-protobuf/protobuf/pull/415 are merged upstream. +(define-public ruby-protobuf-cucumber + (hidden-package + (package + (inherit ruby-protobuf) + (name "ruby-protobuf-cucumber") + (version "3.10.8") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "protobuf-cucumber" version)) + (sha256 + (base32 + "1rd6naabhpfb1i5dr6fp5mqwaawsx0mqm73h5ycwkgbm1n2si872"))))))) -- cgit v1.2.3 From dff5392f855c70bdeeb060ca7f4422ba6a91de5e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 7 Jul 2020 15:05:59 -0400 Subject: gnu: Add ruby-cucumber-messages * gnu/packages/ruby.scm (ruby-cucumber-messages): New variable. --- gnu/packages/ruby.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 08163599f9..47951d9d5a 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -60,6 +60,7 @@ (define-module (gnu packages ruby) #:use-module (gnu packages ncurses) #:use-module (gnu packages networking) #:use-module (gnu packages node) + #:use-module (gnu packages protobuf) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) #:use-module (gnu packages ragel) @@ -6387,6 +6388,49 @@ (define-public ruby-ruby-prof (home-page "https://github.com/ruby-prof/ruby-prof") (license license:bsd-2))) +(define-public ruby-cucumber-messages + (package + (name "ruby-cucumber-messages") + (version "12.2.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cucumber/messages-ruby.git") + (commit "12cd07eac87bce7843fd1bb0bf64bc4da09f097c"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "16wwqfpsq7crvxc3q08lphgyh12cl2d83p1c79p312q4jmy9cn5a")))) + (build-system ruby-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-protobuf.rb + (lambda _ + (substitute* "rake/protobuf.rb" + (("load 'protobuf/tasks/compile.rake'") + "require 'protobuf/tasks'")) + #t)) + (add-before 'build 'compile + (lambda _ + (substitute* "Makefile" + (("bundle exec ") "") + (("include default.mk.*" all) + (string-append "#" all))) + (invoke "make"))) + (replace 'check + (lambda _ + (invoke "rspec")))))) + (propagated-inputs + `(("ruby-protobuf" ,ruby-protobuf-cucumber))) + (native-inputs + `(("ruby-rspec" ,ruby-rspec))) + (home-page "https://github.com/cucumber/messages-ruby") + (synopsis "Cucumber Messages for Ruby (Protocol Buffers)") + (description "Cucumber Messages for Ruby is a library which allows +serialization and deserialization of the protocol buffer messages used in +Cucumber.") + (license license:expat))) + (define-public ruby-gherkin (package (name "ruby-gherkin") -- cgit v1.2.3 From cfef316f25b718479569bd23bd8e26c83bf2e7d0 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 7 Jul 2020 23:41:28 -0400 Subject: gnu: ruby-gherkin: Update to 14.0.1. * gnu/packages/ruby.scm (ruby-gherkin): Update to 14.0.1. [native-inputs]: Remove bundler. Add ruby-cucumber-messages and ruby-rspec. [phases]: Delete. [home-page]: Update. --- gnu/packages/ruby.scm | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 47951d9d5a..871ca2a654 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -6434,24 +6434,27 @@ (define-public ruby-cucumber-messages (define-public ruby-gherkin (package (name "ruby-gherkin") - (version "5.1.0") - (source - (origin - (method url-fetch) - (uri (rubygems-uri "gherkin" version)) - (sha256 - (base32 - "1cgcdchwwdm10rsk44frjwqd4ihprhxjbm799nscqy2q1raqfj5s")))) + (version "14.0.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cucumber/gherkin-ruby") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1dwa8632nc6kijv8p257jl64rsjmc0fimlaqvxlkdi2h9n1nympb")))) (build-system ruby-build-system) (native-inputs - `(("bundler" ,bundler))) + `(("ruby-cucumber-messages" ,ruby-cucumber-messages) + ("ruby-rspec" ,ruby-rspec))) (arguments - '(#:tests? #f)) ; needs simplecov, among others + `(#:test-target "spec")) (synopsis "Gherkin parser for Ruby") (description "Gherkin is a parser and compiler for the Gherkin language. It is intended be used by all Cucumber implementations to parse @file{.feature} files.") - (home-page "https://github.com/cucumber-attic/gherkin") + (home-page "https://github.com/cucumber/gherkin-ruby") (license license:expat))) (define-public ruby-gherkin-ruby -- cgit v1.2.3 From f048ef520fe92c114a100e9ace0f9c323119c74c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 8 Jul 2020 11:28:12 -0400 Subject: gnu: Add ruby-coveralls. * gnu/packages/ruby.scm (ruby-coveralls): New variable. --- gnu/packages/ruby.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 871ca2a654..b05f9c069e 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -6617,6 +6617,32 @@ (define ruby-cucumber-without-tests (native-inputs '()))) +(define-public ruby-coveralls + (package + (name "ruby-coveralls") + (version "0.8.23") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "coveralls" version)) + (sha256 + (base32 + "1mv4fn5lfxhy7bc2f1lpnc5yp9mvv97az77j4r7jgrxcqwn8fqxc")))) + (build-system ruby-build-system) + ;; The test suite depends on ruby-vcr, which cannot be included in Guix + ;; because of its nonfree, Hippocratic derived license. + (arguments '(#:tests? #f)) + (propagated-inputs + `(("ruby-json" ,ruby-json) + ("ruby-term-ansicolor" ,ruby-term-ansicolor) + ("ruby-thor" ,ruby-thor) + ("ruby-tins" ,ruby-tins))) + (synopsis "Ruby implementation of the Coveralls API") + (description "This package provides a Ruby implementation of the Coveralls +API.") + (home-page "https://coveralls.io") + (license license:expat))) + (define-public ruby-cucumber-core (package (name "ruby-cucumber-core") -- cgit v1.2.3 From f2a1b7facb975bd20a402d2cc2b24f40a7934942 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 8 Jul 2020 11:28:21 -0400 Subject: gnu: Add ruby-unindent. * gnu/packages/ruby.scm (ruby-unindent): New variable. --- gnu/packages/ruby.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index b05f9c069e..8a732b5eab 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -6643,6 +6643,25 @@ (define-public ruby-coveralls (home-page "https://coveralls.io") (license license:expat))) +(define-public ruby-unindent + (package + (name "ruby-unindent") + (version "1.0") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "unindent" version)) + (sha256 + (base32 + "1wqh3rzv8589yzibigminxx3qpmj2nqj28f90xy1sczk1pijmcrd")))) + (build-system ruby-build-system) + (synopsis "Ruby method to unindent strings") + (description "This module provides a @code{String#unindent} Ruby method to +unindent strings, which can be useful to unindent multiline strings embedded +in already-indented code.") + (home-page "https://github.com/mynyml/unindent") + (license license:expat))) + (define-public ruby-cucumber-core (package (name "ruby-cucumber-core") -- cgit v1.2.3 From 95a5d992deaf7b5e3f422c664ddd76e08108c921 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 8 Jul 2020 11:28:48 -0400 Subject: gnu: ruby-cucumber-core: Update to 7.1.0. * gnu/packages/ruby.scm (ruby-cucumber-core): Update to 7.1.0. [origin]: Use the git-fetch method. [arguments]: Enable tests, by specifying the test target and... [native-inputs]: ...adding ruby-rspec, ruby-rake, ruby-coveralls, ruby-rubocop, ruby-simplecov and ruby-unindent as native inputs. Remove bundler. [phases]{relax-version-requirements}: Add phase. [propagated-inputs]: Remove ruby-backports. Add ruby-cucumber-messages. --- gnu/packages/ruby.scm | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 8a732b5eab..9fbc8b322a 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -6665,24 +6665,38 @@ (define-public ruby-unindent (define-public ruby-cucumber-core (package (name "ruby-cucumber-core") - ;; Stick to major version 3, until version 4 of Cucumber is released. - (version "3.2.1") + (version "7.1.0") (source (origin - (method url-fetch) - (uri (rubygems-uri "cucumber-core" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/cucumber/cucumber-ruby-core.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1iavlh8hqj9lwljbpkw06259gdicbr1bdb6pbj5yy3n8szgr8k3c")))) + "1p5wb6wbggbw37ariyag4kxpiczznvgm3c8cnz1744dmbj79q1rn")))) (build-system ruby-build-system) + (arguments + `(#:test-target "spec" + #:phases + (modify-phases %standard-phases + (add-after 'extract-gemspec 'relax-version-requirements + (lambda _ + (substitute* "cucumber-core.gemspec" + (("'cucumber-tag-expressions',.*") + "'cucumber-tag-expressions', '>=2.0.0'\n")) + #t))))) + (native-inputs + `(("ruby-rspec" ,ruby-rspec) + ("ruby-coveralls" ,ruby-coveralls) + ("ruby-rubocop" ,ruby-rubocop) + ("ruby-simplecov" ,ruby-simplecov) + ("ruby-unindent" ,ruby-unindent))) (propagated-inputs - `(("ruby-backports" ,ruby-backports) + `(("ruby-cucumber-messages" ,ruby-cucumber-messages) ("ruby-gherkin" ,ruby-gherkin) ("ruby-cucumber-tag-expressions" ,ruby-cucumber-tag-expressions))) - (native-inputs - `(("bundler" ,bundler))) - (arguments - '(#:tests? #f)) ; needs simplecov, among others (synopsis "Core library for the Cucumber BDD app") (description "Cucumber is a tool for running automated tests written in plain language. Because they're written in plain language, -- cgit v1.2.3 From 0d2c45ce75fccf112e37403df815d9d98feedfdb Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 8 Jul 2020 13:00:24 -0400 Subject: gnu: ruby-cucumber-tag-expressions: Update to 3.0.0. * gnu/packages/ruby.scm (ruby-cucumber-tag-expressions): Update to 3.0.0. [origin]: Fetch sources from git, to get the latest tag. [arguments]: Use the 'spec' test target instead of using a custom phase. [description]: Reformat. --- gnu/packages/ruby.scm | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 9fbc8b322a..0cd0a133b3 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -6769,28 +6769,25 @@ (define-public ruby-cucumber-wire (define-public ruby-cucumber-tag-expressions (package (name "ruby-cucumber-tag-expressions") - (version "1.1.1") + (version "3.0.0") (source (origin - (method url-fetch) - (uri (rubygems-uri "cucumber-tag_expressions" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/cucumber/tag-expressions-ruby.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0cvmbljybws0qzjs1l67fvr9gqr005l8jk1ni5gcsis9pfmqh3vc")))) + "15dw4w0npd4m6aw7zhqkjxxzngp42kswrkwfygxkxcxnhy5zl1vx")))) (build-system ruby-build-system) (arguments - '(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda _ - (invoke "rspec") - #t))))) + `(#:test-target "spec")) (native-inputs `(("ruby-rspec" ,ruby-rspec))) (synopsis "Cucumber tag expressions for Ruby") - (description - "Cucumber tag expression parser for Ruby. A tag expression is an infix -boolean expression used by Cucumber.") + (description "Cucumber tag expression parser for Ruby. A tag expression +is an infix boolean expression used by Cucumber.") (home-page "https://github.com/cucumber/tag-expressions-ruby") (license license:expat))) -- cgit v1.2.3 From fd6577b4e505975071fabb9eace360e158cf8027 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 8 Jul 2020 13:38:04 -0400 Subject: gnu: Add ruby-sys-uname. * gnu/packages/ruby.scm (ruby-sys-uname): New variable. --- gnu/packages/ruby.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 0cd0a133b3..f1213f750d 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -6558,6 +6558,29 @@ (define ruby-aruba-without-tests (package-propagated-inputs ruby-aruba)))) (native-inputs '()))) +(define-public ruby-sys-uname + (package + (name "ruby-sys-uname") + (version "1.2.1") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "sys-uname" version)) + (sha256 + (base32 + "00p3wwvkdbg6pl38bchaagncv3i4fq4y0ks470imwykjanpy2ic0")))) + (build-system ruby-build-system) + (arguments + `(#:test-target "spec")) + (propagated-inputs `(("ruby-ffi" ,ruby-ffi))) + (native-inputs `(("ruby-rspec" ,ruby-rspec))) + (synopsis "Ruby interface for gathering system information") + (description "The sys-uname library provides an interface for gathering +information about your current platform. It allows retrieving information +such as the OS name, OS version, system name, etc.") + (home-page "https://github.com/djberg96/sys-uname") + (license license:asl2.0))) + (define-public ruby-cucumber (package (name "ruby-cucumber") -- cgit v1.2.3 From ac3ec612c3213005b4fe8316e6340ef91c7aef43 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 8 Jul 2020 14:01:05 -0400 Subject: gnu: Add ruby-cucumber-create-meta. * gnu/packages/ruby.scm (ruby-cucumber-create-meta): New variable. --- gnu/packages/ruby.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index f1213f750d..0a5b6d2129 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -6581,6 +6581,40 @@ (define-public ruby-sys-uname (home-page "https://github.com/djberg96/sys-uname") (license license:asl2.0))) +(define-public ruby-cucumber-create-meta + (package + (name "ruby-cucumber-create-meta") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "cucumber-create-meta" version)) + (sha256 + (base32 + "0i0i3arymjrnjk72mg79w1a11607x4d0lrqafm9sz2gq9l52zasw")))) + (build-system ruby-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (add-after 'extract-gemspec 'relax-version-requirements + (lambda _ + (substitute* ".gemspec" + ((" 12\\.2") + " 12.1")) + #t)) + (replace 'check + (lambda _ + (invoke "rspec")))))) + (native-inputs + `(("ruby-rspec" ,ruby-rspec))) + (propagated-inputs + `(("ruby-cucumber-messages" ,ruby-cucumber-messages) + ("ruby-sys-uname" ,ruby-sys-uname))) + (synopsis "Function to create @code{Meta} messages for Cucumber Ruby") + (description "The @code{createMeta} utility function allows generating +system-specific @code{Meta} messages for Cucumber Ruby.") + (home-page "https://github.com/cucumber/cucumber/tree/master/create-meta/ruby") + (license license:expat))) + (define-public ruby-cucumber (package (name "ruby-cucumber") -- cgit v1.2.3 From 4ada4a429431c8a8b2d1ae249d48c902fa61f032 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 8 Jul 2020 15:01:46 -0400 Subject: gnu: ruby-cucumber-expressions: Update to 10.2.0. * gnu/packages/ruby.scm (ruby-cucumber-expressions): Update to 10.2.0. [origin]: Use git-fetch, as the latest published gem is outdated. [native-inputs]: Remove bundler. --- gnu/packages/ruby.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 0a5b6d2129..660b8d5e0c 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -6766,20 +6766,22 @@ (define-public ruby-cucumber-core (define-public ruby-cucumber-expressions (package (name "ruby-cucumber-expressions") - (version "6.0.1") + (version "10.2.0") (source (origin - (method url-fetch) - (uri (rubygems-uri "cucumber-expressions" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/cucumber/cucumber-expressions-ruby.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0zwmv6hznyz9vk81f5dhwcr9jhxx2vmbk8yyazayvllvhy0fkpdw")))) + "1aivhcpjrmbvp9bg0y7g6zxh2swfvylvg0sapq5jc4i1y74k8npd")))) (build-system ruby-build-system) (arguments '(#:test-target "spec")) (native-inputs - `(("bundler" ,bundler) - ("ruby-rspec" ,ruby-rspec) + `(("ruby-rspec" ,ruby-rspec) ("ruby-simplecov" ,ruby-simplecov))) (synopsis "Simpler alternative to Regular Expressions") (description "Cucumber Expressions offer similar functionality to Regular -- cgit v1.2.3 From 6516827e131780c0b20c2df10c436eb034586e01 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 8 Jul 2020 15:04:46 -0400 Subject: gnu: ruby-cucumber-wire: Update to 3.1.0. * gnu/packages/ruby.scm (ruby-cucumber-wire): Update to 3.1.0. [arguments]: Remove test-target, which is not used. [phases]: Remove set-CUCUMBER_USE_RELEASED_GEMS and add relax-version-requirements. [native-inputs]: Remove. [propagated-inputs]: Add ruby-cucumber-core, ruby-cucumber-expressions and ruby-cucumber-messages. [description]: Reformat. --- gnu/packages/ruby.scm | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 660b8d5e0c..2b56937906 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -6793,35 +6793,31 @@ (define-public ruby-cucumber-expressions (define-public ruby-cucumber-wire (package (name "ruby-cucumber-wire") - ;; Package version 0.0.1 initially, as this is what's needed by Cucumber - ;; 3, and Cucumber 4 hasn't been released yet. - (version "0.0.1") + (version "3.1.0") (source (origin (method url-fetch) (uri (rubygems-uri "cucumber-wire" version)) (sha256 (base32 - "09ymvqb0sbw2if1nxg8rcj33sf0va88ancq5nmp8g01dfwzwma2f")))) + "0z1n13lqv70zb2lcrvs2263lm0gsb3gz8gbv890kxzwp8cvd433k")))) (build-system ruby-build-system) (arguments - '(;; TODO: Currently, the tests can't be run as cucumber is required, - ;; which would lead to a circular dependency. - #:tests? #f - #:test-target "default" + '(#:tests? #f ;tests use cucumber, causing a cycle #:phases (modify-phases %standard-phases - (add-before 'check 'set-CUCUMBER_USE_RELEASED_GEMS + (add-after 'extract-gemspec 'relax-version-requirements (lambda _ - (setenv "CUCUMBER_USE_RELEASED_GEMS" "true") + (substitute* ".gemspec" + ((" 10\\.1") " 10.2")) #t))))) - (native-inputs - `(("bundler" ,bundler) - ("ruby-rspec" ,ruby-rspec))) + (propagated-inputs + `(("ruby-cucumber-core" ,ruby-cucumber-core) + ("ruby-cucumber-expressions" ,ruby-cucumber-expressions) + ("ruby-cucumber-messages" ,ruby-cucumber-messages))) (synopsis "Cucumber wire protocol plugin") - (description - "Cucumber's wire protocol allows step definitions to be implemented and -invoked on any platform.") + (description "Cucumber's wire protocol allows step definitions to be +implemented and invoked on any platform.") (home-page "https://github.com/cucumber/cucumber-ruby-wire") (license license:expat))) -- cgit v1.2.3 From f357462426584d5d6ffb0cc7ea60243577bf246c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 8 Jul 2020 21:47:44 -0400 Subject: gnu: Add ruby-cucumber-html-formatter. * gnu/packages/ruby.scm (ruby-cucumber-html-formatter): New variable. --- gnu/packages/ruby.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 2b56937906..4eda0d17fe 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -6615,6 +6615,36 @@ (define-public ruby-cucumber-create-meta (home-page "https://github.com/cucumber/cucumber/tree/master/create-meta/ruby") (license license:expat))) +(define-public ruby-cucumber-html-formatter + (package + (name "ruby-cucumber-html-formatter") + (version "7.0.0") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "cucumber-html-formatter" version)) + (sha256 + (base32 + "0lshj4sw9jw7687wrhknyb9kffblai3l843zgrznyqij3ga0bc62")))) + (build-system ruby-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "rspec")))))) + (native-inputs + `(("ruby-rspec" ,ruby-rspec))) + (propagated-inputs + `(("ruby-cucumber-messages" ,ruby-cucumber-messages))) + (synopsis "HTML formatter for Cucumber") + (description "Cucumber HTML Formatter produces a HTML report for Cucumber +runs. It is built on top of cucumber-react and works with any Cucumber +implementation with a protocol buffer formatter that outputs Cucumber +messages.") + (home-page "https://github.com/cucumber/cucumber/tree/\ +master/html-formatter/ruby") + (license license:expat))) + (define-public ruby-cucumber (package (name "ruby-cucumber") -- cgit v1.2.3 From 92ebbaad0924dcca8061604384452cd8e09965b3 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 8 Jul 2020 15:08:50 -0400 Subject: gnu: ruby-cucumber: Update to 4.1.0. * gnu/packages/ruby.scm (ruby-cucumber): Update to 4.1.0. [phases]{strip-version-requirements}: New phase. [propagated-inputs]: Add ruby-cucumber-create-meta, ruby-cucumber-html-formatter and ruby-cucumber-messages. Remove ruby-cucumber-expressions. [native-inputs]: Add ruby-rubocop. [description]: Reformat. --- gnu/packages/ruby.scm | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 4eda0d17fe..a9b800acfd 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -6648,7 +6648,7 @@ (define-public ruby-cucumber-html-formatter (define-public ruby-cucumber (package (name "ruby-cucumber") - (version "3.1.2") + (version "4.1.0") (source (origin (method git-fetch) @@ -6658,41 +6658,40 @@ (define-public ruby-cucumber (file-name (git-file-name name version)) (sha256 (base32 - "0764wp2cjg60qa3l69q1dxda5g06a01n5w92szqbf89d2hgl47n3")))) + "0g9rqfslbzkkrq2kvl14fgknrhfbji3bjjpjxff5nc9wzd3hd549")))) (build-system ruby-build-system) (arguments '(#:test-target "spec" #:phases (modify-phases %standard-phases - ;; Don't run or require rubocop, the code linting tool, as this is a - ;; bit unnecessary. - (add-after 'unpack 'dont-run-rubocop + (add-after 'extract-gemspec 'strip-version-requirements (lambda _ - (substitute* "Rakefile" - ((".*rubocop/rake\\_task.*") "") - ((".*RuboCop.*") "")) + (substitute* "cucumber.gemspec" + (("(.*add_.*dependency '[_A-Za-z0-9-]+').*" _ stripped) + (string-append stripped "\n"))) #t))))) (propagated-inputs `(("ruby-builder" ,ruby-builder) ("ruby-cucumber-core" ,ruby-cucumber-core) + ("ruby-cucumber-create-meta" ,ruby-cucumber-create-meta) + ("ruby-cucumber-html-formatter" ,ruby-cucumber-html-formatter) + ("ruby-cucumber-messages" ,ruby-cucumber-messages) ("ruby-cucumber-wire" ,ruby-cucumber-wire) - ("ruby-cucumber-expressions" ,ruby-cucumber-expressions) ("ruby-diff-lcs" ,ruby-diff-lcs) ("ruby-gherkin" ,ruby-gherkin) ("ruby-multi-json" ,ruby-multi-json) ("ruby-multi-test" ,ruby-multi-test))) (native-inputs - `(("bundler" ,bundler) - ;; Use a untested version of aruba, to avoid a circular dependency, as + `(;; Use a untested version of aruba, to avoid a circular dependency, as ;; ruby-aruba depends on ruby-cucumber. ("ruby-aruba", ruby-aruba-without-tests) ("ruby-rspec" ,ruby-rspec) ("ruby-pry" ,ruby-pry) - ("ruby-nokogiri" ,ruby-nokogiri))) + ("ruby-nokogiri" ,ruby-nokogiri) + ("ruby-rubocop" ,ruby-rubocop))) (synopsis "Describe automated tests in plain language") - (description - "Cucumber is a tool for running automated tests written in plain -language. It's designed to support a Behaviour Driven Development (BDD) + (description "Cucumber is a tool for running automated tests written in +plain language. It's designed to support a Behaviour Driven Development (BDD) software development workflow.") (home-page "https://cucumber.io/") (license license:expat))) -- cgit v1.2.3 From 1097fdbea75c2e9cc7c8a72c50a812def6ce62e6 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 8 Jul 2020 21:54:35 -0400 Subject: gnu: ruby_version: Update to 1.0.2. * gnu/packages/ruby.scm (ruby_version): Update to 1.0.2. [phases]: Adapt the fix-dependencies phase. [native-inputs]: Add ruby-rdoc and ruby-rubygems-tasks. Remove bundler. [description]: Reformat. --- gnu/packages/ruby.scm | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index a9b800acfd..172dd4fe60 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -7581,44 +7581,40 @@ (define-public ruby-unicode-display-width (define-public ruby_version (package (name "ruby_version") - (version "1.0.1") + (version "1.0.2") (source (origin (method url-fetch) (uri (rubygems-uri "ruby_version" version)) (sha256 (base32 - "0854i1bjy56176anr05l5m0vc81nl53c7fyfg7sljj62m1d64dgj")))) + "0lvc7bd5ps3w2vq2wb02i0pi3vfcx2rnckx2ix4rjym1qf52kb2j")))) (build-system ruby-build-system) (arguments - '(#:phases + `(#:phases (modify-phases %standard-phases (add-before 'check 'fix-dependencies (lambda _ ;; Remove the Gemfile.lock, as we want to use Guix packages at ;; whatever versions. (delete-file "Gemfile.lock") - ;; Remove the incldued gem file as it's unnecessary. - (delete-file "pkg/ruby_version-1.0.0.gem") + ;; Remove the included gem files as they unnecessary. + (delete-file-recursively "pkg/") + ;; Accept any version of rake, rdoc and rspec (substitute* "ruby_version.gemspec" - ;; Don't require rdoc and rubygems-tasks as they're unnecessary - ((".*rdoc.*") "\n") - ((".*rubygems-tasks.*") "\n") - ;; Accept any version of rake and rspec (("%q)\n") + (("%q)\n") (("%q)\n")) - ;; Remove the use of rubygems-tasks from the Rakefile, as it's - ;; unnecessary. + ;; Do not use bundler. (substitute* "Rakefile" - (("^require 'rubygems/tasks'") "") - (("Gem::Tasks.new") "")) + (("Bundler\\.setup.*") "nil\n")) #t))))) (native-inputs - `(("bundler" ,bundler) - ("ruby-rspec" ,ruby-rspec))) + `(("ruby-rdoc" ,ruby-rdoc) + ("ruby-rspec" ,ruby-rspec) + ("ruby-rubygems-tasks", ruby-rubygems-tasks))) (synopsis "Ruby library to help check the Ruby version") - (description - "@code{ruby_version} provides a @code{RubyVersion} module to simplify + (description "@code{ruby_version} provides a @code{RubyVersion} module to simplify checking for the right Ruby version in software.") (home-page "https://github.com/janlelis/ruby_version") (license license:expat))) -- cgit v1.2.3 From f9083965293117994c56715f0de89ca98a95b81a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 8 Jul 2020 22:22:29 -0400 Subject: gnu: Add ruby-cuke-modeler. * gnu/packages/ruby.scm (ruby-cuke-modeler): New variable. --- gnu/packages/ruby.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 172dd4fe60..2e4ca7b284 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -4226,6 +4226,32 @@ (define-public ruby-coderay (home-page "http://coderay.rubychan.de") (license license:expat))) +(define-public ruby-cuke-modeler + (package + (name "ruby-cuke-modeler") + (version "3.1.0") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "cuke_modeler" version)) + (sha256 + (base32 + "19smj3g3wvz0203l549sadpcxgh0ir350a6k78gq0bmlv9cchmjb")))) + (build-system ruby-build-system) + (arguments `(#:tests? #f)) ;no test suite in gem + (propagated-inputs + `(("ruby-gherkin" ,ruby-gherkin))) + (synopsis "Gherkin test suite analysis tool") + (description "CukeModeler facilitates modeling a test suite that is +written in Gherkin (e.g. Cucumber, SpecFlow, Lettuce, etc.). It does this by +providing an abstraction layer on top of the Abstract Syntax Tree (AST) that +the @code{cucumber-gherkin} generates when parsing features, as well as +providing models for feature files and directories in order to be able to have +a fully traversable model tree of a test suite's structure. These models can +then be analyzed or manipulated more easily than the underlying AST layer.") + (home-page "https://github.com/enkessler/cuke_modeler") + (license license:expat))) + (define-public ruby-parallel-tests (package (name "ruby-parallel-tests") -- cgit v1.2.3 From 8a01e2fa1e36d5f00f664f29308917eb89ecf6b2 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 8 Jul 2020 22:23:41 -0400 Subject: gnu: ruby-parallel-tests: Update to 3.0.0. * gnu/packages/ruby.scm (ruby-parallel-tests): Update to 3.0.0. [native-inputs]: Add ruby-cuke-modeler. --- gnu/packages/ruby.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 2e4ca7b284..f3f56635a5 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -4255,7 +4255,7 @@ (define-public ruby-cuke-modeler (define-public ruby-parallel-tests (package (name "ruby-parallel-tests") - (version "2.32.0") + (version "3.0.0") (home-page "https://github.com/grosser/parallel_tests") (source (origin (method git-fetch) @@ -4265,7 +4265,7 @@ (define-public ruby-parallel-tests (file-name (string-append name version)) (sha256 (base32 - "0l2rjz9fnxv7hvz679v7a75mghsh9x9qpvbyapiavqsx21v42l7m")))) + "08a6ndqn2dqacmc7yg48k0dh2rfrynvhkd5hiay16dl9m1r9q8pz")))) (build-system ruby-build-system) (arguments '(#:test-target "default" @@ -4303,6 +4303,7 @@ (define-public ruby-parallel-tests (native-inputs `(("ruby-bump" ,ruby-bump) ("ruby-cucumber" ,ruby-cucumber) + ("ruby-cuke-modeler" ,ruby-cuke-modeler) ("ruby-minitest" ,ruby-minitest) ("ruby-rake" ,ruby-rake) ("ruby-rspec" ,ruby-rspec) -- cgit v1.2.3 From 6700dc3341bedb70e98bfa9f5eeb8db68a7c31b3 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 8 Jul 2020 22:26:54 -0400 Subject: gnu: ruby-sdoc: Update to 1.1.0. * gnu/packages/ruby.scm (ruby-sdoc): Update to 1.1.0. --- gnu/packages/ruby.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index f3f56635a5..5a41375480 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -4837,13 +4837,13 @@ (define-public ruby-pry-editline (define-public ruby-sdoc (package (name "ruby-sdoc") - (version "0.4.2") + (version "1.1.0") (source (origin (method url-fetch) (uri (rubygems-uri "sdoc" version)) (sha256 (base32 - "0qhvy10vnmrqcgh8494m13kd5ag9c3sczzhfasv8j0294ylk679n")))) + "1am73dldx1fqlw2xny5vyk00pgkisg6bvs0pa8jjd7c19drjczrd")))) (build-system ruby-build-system) (arguments `(#:phases -- cgit v1.2.3 From b441238285d03219b24e26478afcc7d7880621dd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 9 Jul 2020 12:27:13 +0200 Subject: gnu: guile-irc: Build with Guile 3. * gnu/packages/guile-xyz.scm (guile-irc)[inputs]: Replace guile-2.2 with guile-3.0. --- gnu/packages/guile-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index d9b8eeea47..160bf63a48 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -3555,7 +3555,7 @@ (define-public guile-irc ("texinfo" ,texinfo))) (inputs `(("gnutls" ,gnutls) - ("guile" ,guile-2.2))) + ("guile" ,guile-3.0))) (home-page "https://github.com/rekado/guile-irc") (synopsis "IRC library for Guile") (description "This package provides a Guile library for @dfn{Internet -- cgit v1.2.3 From 5abed7ca3c611bbe30b59293f1837d62c08f05f4 Mon Sep 17 00:00:00 2001 From: Tim Van den Langenbergh Date: Tue, 7 Jul 2020 16:38:41 +0200 Subject: gnu: Add font-libertinus. * gnu/packages/fonts.scm (font-libertinus): New variable. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/fonts.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index ed9b634bc3..e8ce8a2ab1 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -36,6 +36,7 @@ ;;; Copyright © 2020 Julien Lepiller ;;; Copyright © 2020 Zhu Zihao ;;; Copyright © 2020 Simen Endsjø +;;; Copyright © 2020 Tim Van den Langenbergh ;;; ;;; This file is part of GNU Guix. ;;; @@ -384,6 +385,35 @@ (define-public font-linuxlibertine ;; The fonts are released under either of these licenses. (license (list license:gpl2+ license:silofl1.1)))) +(define-public font-libertinus + (package + (name "font-libertinus") + (version "6.12") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/alerque/libertinus/releases" + "/download/v" version "/libertinus-" version + ".zip")) + (sha256 + (base32 "06pcsd5pijjid7xjxak35jla089krm5hqnbglv8ldncq475q7kb2")))) + (build-system font-build-system) + (home-page "https://github.com/alerque/libertinus") + (synopsis "Font family based on Linux Libertine") + (description + "The Libertinus font family is a fork of Linux Libertine that addresses +many bugs in the unmaintained original and adds a new mathematical companion +font for use with OpenType math-capable applications like LuaTex or XeTeX. + +The unified Libertinus family consists of: +@enumerate +@item Libertinus Serif, forked from Linux Libertine; +@item Libertinus Sans Serif, forked from Linux Biolinum; +@item Libertinus Mono, forked from Linux Libertine Mono; and +@item Libertinus Math, an original matching OpenType math font. +@end enumerate\n") + (license license:silofl1.1))) + (define-public font-terminus (package (name "font-terminus") -- cgit v1.2.3 From dd77434a37afa287cd861c01e0d7a81c926d3bb9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 9 Jul 2020 14:45:19 +0200 Subject: gnu: ktuberling: Fix typo in description. * gnu/packages/games.scm (ktuberling)[description]: Fix typo. --- gnu/packages/games.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 14dea16543..30688531df 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -9655,7 +9655,7 @@ (define-public ktuberling (synopsis "Stamp drawing toy") (description "KTuberling is a drawing toy intended for small children and adults who remain young at heart. The game has no winner; the only purpose is -to make the funniest faces you can. Several activites are possible, e.g.: +to make the funniest faces you can. Several activities are possible, e.g.: @itemize @item Give the potato a funny face, clothes, and other goodies -- cgit v1.2.3 From 4a1e361086503e7882da8b9785bb06d3c2e8a6ef Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 9 Jul 2020 14:46:34 +0200 Subject: gnu: sbcl-stumpwm-pass: Fix typo in synopsis. * gnu/packages/wm.scm (sbcl-stumpwm-pass)[synopsis]: Fix typo. --- gnu/packages/wm.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index def8fdccd2..8b54376f37 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1743,7 +1743,7 @@ (define-public sbcl-stumpwm-pass (add-after 'unpack 'chdir (lambda _ (chdir "util/pass") #t))))) (home-page "https://github.com/stumpwm/stumpwm-contrib") - (synopsis "Integrate @code{pass} wih StumpWM") + (synopsis "Integrate @code{pass} with StumpWM") (description "This package provides an interface which integrates password-store into StumpWM.") (license (list license:gpl2+ license:gpl3+ license:bsd-2)))) -- cgit v1.2.3 From 1480d212e8292dc71a508f0c1207c911bbb181fc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 9 Jul 2020 14:47:25 +0200 Subject: gnu: qalculate-gtk: Fix typo in description. * gnu/packages/maths.scm (qalculate-gtk)[description]: Fix typo. --- gnu/packages/maths.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index dbc670178a..051164f5c3 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5715,6 +5715,6 @@ (define-public qalculate-gtk multi-purpose GUI desktop calculator. It provides basic and advanced functionality. Features include customizable functions, unit calculations, and conversions, physical constants, symbolic calculations (including -integrals and equations), arbitrary precision, uncertainity propagation, +integrals and equations), arbitrary precision, uncertainty propagation, interval arithmetic, plotting.") (license license:gpl2+))) -- cgit v1.2.3 From 3a888b419b1f00a4a78c029033645c2554920921 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 9 Jul 2020 14:49:00 +0200 Subject: gnu: flamp: Fix typo in description. * gnu/packages/radio.scm (flamp)[description]: Fix typo. --- gnu/packages/radio.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 7e04e91e26..d8bc0bb74d 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -665,7 +665,7 @@ (define-public flamp ("libxft" ,libxft))) (synopsis "Tool for AMP file transfer") (description - "FLAMP is a program for transfering files by radio waves using AMP + "FLAMP is a program for transferring files by radio waves using AMP (Amateur Multicast Protocol).") (home-page "http://www.w1hkj.com/") (license license:gpl3+))) -- cgit v1.2.3 From dc5e529e0661c6ba4edd1ba31711e1bd4b8a1cb0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 9 Jul 2020 14:51:44 +0200 Subject: gnu: rust-wayland-scanner@0.23: Fix bad synopsis & description. * gnu/packages/crates-io.scm (rust-wayland-scanner-0.23) [synopsis, description]: Fix. --- gnu/packages/crates-io.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 39b2c42999..c0a8d16bce 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -27824,13 +27824,12 @@ (define-public rust-wayland-scanner-0.23 ("rust-quote" ,rust-quote-0.6) ("rust-xml-rs" ,rust-xml-rs-0.8)))) (home-page "https://github.com/smithay/wayland-rs") - (synopsis - "Wayland Scanner for generating rust APIs from XML wayland protocol files") + (synopsis "Generate Rust APIs from XML Wayland protocol files") (description - "Wayland Scanner for generating rust APIs from XML wayland protocol files. -Intented for use with wayland-sys. You should only need this crate if -you are working on custom wayland protocol extensions. -Look at the crate wayland-client for usable bindings.") + "Wayland Scanner generates Rust APIs from XML Wayland protocol files. +It is intended for use with wayland-sys. You should only need this crate if +you are working on custom Wayland protocol extensions. +Look at the wayland-client crate for usable bindings.") (license license:expat))) (define-public rust-wayland-scanner-0.21 -- cgit v1.2.3 From 72c2c91f21d14bd10089e8b53380fffd96e15c01 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 9 Jul 2020 14:53:03 +0200 Subject: gnu: iputils: Fix typo in description. * gnu/packages/networking.scm (iputils)[description]: Fix typo. --- gnu/packages/networking.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 6f417b48d0..e6a9e69adf 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -781,7 +781,7 @@ (define-public iputils configuration, troubleshooting, or servers. Utilities included are: @itemize @bullet -@item @command{arping}: Ping hosts using the @dfn{Adress Resolution Protocol}. +@item @command{arping}: Ping hosts using the @dfn{Address Resolution Protocol}. @item @command{clockdiff}: Compute time difference between network hosts using ICMP TSTAMP messages. @item @command{ninfod}: Daemon that responds to IPv6 Node Information Queries. -- cgit v1.2.3 From 10711065621316405df02ca6f358fc90fe6afc1d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Jul 2020 10:26:12 +0300 Subject: gnu: rust-quick-error-1.2: Don't skip build. * gnu/packages/crates-io.scm (rust-quick-error-1.2)[arguments]: Remove field. --- gnu/packages/crates-io.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c0a8d16bce..dc6431bfdb 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -18180,7 +18180,6 @@ (define-public rust-quick-error-1.2 (base32 "1q6za3v78hsspisc197bg3g7rpc989qycy8ypr8ap8igv10ikl51")))) (build-system cargo-build-system) - (arguments `(#:skip-build? #t)) (home-page "https://github.com/tailhook/quick-error") (synopsis "Macro which makes error types pleasant to write") (description "This crate provides a macro which makes error types pleasant -- cgit v1.2.3 From c5f304053f7cab9e0e1f4cfd0f8adac93962b4dd Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Jul 2020 10:28:23 +0300 Subject: gnu: rust-quote-0.5: Don't skip build. * gnu/packages/crates-io.scm (rust-quote-0.5)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index dc6431bfdb..256294b951 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -18412,9 +18412,8 @@ (define-public rust-quote-0.5 (base32 "1s01fh0jl8qv4xggs85yahw0h507nzrxkjbf7vay3zw8d3kcyjcr")))) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-proc-macro2" ,rust-proc-macro2-0.3)))))) + `(#:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-0.3)))))) (define-public rust-quote-0.3 (package -- cgit v1.2.3 From 40a7276bd5b81df8dacc2dcae2820d20993aedb7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Jul 2020 10:30:47 +0300 Subject: gnu: rust-rand-0.7: Don't skip build. * gnu/packages/crates-io.scm (rust-rand-0.7)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 256294b951..789e5910eb 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -18495,8 +18495,7 @@ (define-public rust-rand-0.7 "00sdaimkbz491qgi6qxkv582yivl32m2jd401kzbn94vsiwicsva")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-getrandom" ,rust-getrandom-0.1) ("rust-libc" ,rust-libc-0.2) ("rust-log" ,rust-log-0.4) -- cgit v1.2.3 From 9d5860c76fe82b88237de658bc4691ef77ace438 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Jul 2020 10:37:05 +0300 Subject: gnu: Remove rust-indexmap-1.0. * gnu/packages/crates-io.scm (rust-indexmap-1.0): Remove variable. (rust-envmnt-0.6, rust-gimli-0.18, rust-h2-0.1, rust-http-0.2, rust-http-0.1, rust-toml-0.5)[arguments]: Replace rust-indexmap-1.0 with 1.3. --- gnu/packages/crates-io.scm | 54 ++++++---------------------------------------- 1 file changed, 6 insertions(+), 48 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 789e5910eb..52769fc84a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6320,7 +6320,7 @@ (define-public rust-envmnt-0.6 (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-indexmap" ,rust-indexmap-1.0)))) + (("rust-indexmap" ,rust-indexmap-1.3)))) (home-page "https://github.com/sagiegurari/envmnt") (synopsis "Environment variables utility functions") (description @@ -8614,7 +8614,7 @@ (define-public rust-gimli-0.18 (("rust-arrayvec" ,rust-arrayvec-0.4) ("rust-byteorder" ,rust-byteorder-1.3) ("rust-fallible-iterator" ,rust-fallible-iterator-0.2) - ("rust-indexmap" ,rust-indexmap-1.0) + ("rust-indexmap" ,rust-indexmap-1.3) ("rust-stable-deref-trait" ,rust-stable-deref-trait-1.1)) #:cargo-development-inputs (("rust-crossbeam" ,rust-crossbeam-0.7) @@ -9730,7 +9730,7 @@ (define-public rust-h2-0.1 ("rust-fnv" ,rust-fnv-1.0) ("rust-futures" ,rust-futures-0.1) ("rust-http" ,rust-http-0.1) - ("rust-indexmap" ,rust-indexmap-1.0) + ("rust-indexmap" ,rust-indexmap-1.3) ("rust-log" ,rust-log-0.4) ("rust-slab" ,rust-slab-0.4) ("rust-string" ,rust-string-0.2) @@ -10231,7 +10231,7 @@ (define-public rust-http-0.2 ("rust-itoa" ,rust-itoa-0.4)) #:cargo-development-inputs (("rust-doc-comment" ,rust-doc-comment-0.3) - ("rust-indexmap" ,rust-indexmap-1.0) + ("rust-indexmap" ,rust-indexmap-1.3) ("rust-quickcheck" ,rust-quickcheck-0.9) ("rust-rand" ,rust-rand-0.7) ("rust-seahash" ,rust-seahash-3.0) @@ -10263,7 +10263,7 @@ (define-public rust-http-0.1 ("rust-fnv" ,rust-fnv-1.0) ("rust-itoa" ,rust-itoa-0.4)) #:cargo-development-inputs - (("rust-indexmap" ,rust-indexmap-1.0) + (("rust-indexmap" ,rust-indexmap-1.3) ("rust-quickcheck" ,rust-quickcheck-0.8) ("rust-rand" ,rust-rand-0.4) ("rust-seahash" ,rust-seahash-3.0) @@ -10716,48 +10716,6 @@ (define-public rust-indexmap-1.3 or numerical index. A corresponding hash set type is also provided.") (license (list license:asl2.0 license:expat)))) -(define-public rust-indexmap-1.0 - (package - (name "rust-indexmap") - (version "1.0.2") - (source - (origin - (method url-fetch) - (uri (crate-uri "indexmap" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "13f5k1kl2759y4xfy0vhays35fmrkmhqngbr2ny8smvrbz0ag0by")))) - (build-system cargo-build-system) - (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-serde" ,rust-serde-1.0)) - #:cargo-development-inputs - (("rust-fnv" ,rust-fnv-1.0) - ("rust-itertools" ,rust-itertools-0.8) - ("rust-lazy-static" ,rust-lazy-static-1) - ("rust-quickcheck" ,rust-quickcheck-0.8) - ("rust-rand" ,rust-rand-0.4) - ("rust-serde-test" ,rust-serde-test-1.0)))) - (home-page "https://github.com/bluss/indexmap") - (synopsis - "Hash table with consistent order and fast iteration") - (description - "This package provides a hash table with consistent order and fast iteration. - -The indexmap is a hash table where the iteration order of the -key-value pairs is independent of the hash values of the keys. It has -the usual hash table functionality, it preserves insertion order -except after removals, and it allows lookup of its elements by either -hash table key or numerical index. A corresponding hash set type is -also provided. - -This crate was initially published under the name ordermap, but it was -renamed to indexmap.") - (license (list license:expat license:asl2.0)))) - (define-public rust-inflate-0.4 (package (name "rust-inflate") @@ -25849,7 +25807,7 @@ (define-public rust-toml-0.5 (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-indexmap" ,rust-indexmap-1.0) + (("rust-indexmap" ,rust-indexmap-1.3) ("rust-serde" ,rust-serde-1.0)) #:cargo-development-inputs (("rust-serde-derive" ,rust-serde-derive-1.0) -- cgit v1.2.3 From 9cd6679fedc6d9af67f08b5a47dd276cfb1ab64a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Jul 2020 10:39:28 +0300 Subject: gnu: rust-indexmap-1.3: Rename to rust-indexmap-1. * gnu/packages/crates-io.scm (rust-indexmap-1.3): Rename to ... (rust-indexmap-1): ... this. (rust-envmnt-0.6, rust-gimli-0.20, rust-gimli-0.18, rust-h2-0.1, rust-http-0.2, rust-http-0.1, rust-object-0.17, rust-serde-json-1.0, rust-toml-0.5)[arguments]: Adjust accordingly. --- gnu/packages/crates-io.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 52769fc84a..cb4a3adfc1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6320,7 +6320,7 @@ (define-public rust-envmnt-0.6 (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-indexmap" ,rust-indexmap-1.3)))) + (("rust-indexmap" ,rust-indexmap-1)))) (home-page "https://github.com/sagiegurari/envmnt") (synopsis "Environment variables utility functions") (description @@ -8587,7 +8587,7 @@ (define-public rust-gimli-0.20 ("rust-stable-deref-trait" ,rust-stable-deref-trait-1.1) ("rust-smallvec" ,rust-smallvec-1) - ("rust-indexmap" ,rust-indexmap-1.3) + ("rust-indexmap" ,rust-indexmap-1) ("rust-byteorder" ,rust-byteorder-1.3)))) (home-page "https://github.com/gimli-rs/gimli") (synopsis "Library for reading and writing the DWARF debugging format") @@ -8614,7 +8614,7 @@ (define-public rust-gimli-0.18 (("rust-arrayvec" ,rust-arrayvec-0.4) ("rust-byteorder" ,rust-byteorder-1.3) ("rust-fallible-iterator" ,rust-fallible-iterator-0.2) - ("rust-indexmap" ,rust-indexmap-1.3) + ("rust-indexmap" ,rust-indexmap-1) ("rust-stable-deref-trait" ,rust-stable-deref-trait-1.1)) #:cargo-development-inputs (("rust-crossbeam" ,rust-crossbeam-0.7) @@ -9730,7 +9730,7 @@ (define-public rust-h2-0.1 ("rust-fnv" ,rust-fnv-1.0) ("rust-futures" ,rust-futures-0.1) ("rust-http" ,rust-http-0.1) - ("rust-indexmap" ,rust-indexmap-1.3) + ("rust-indexmap" ,rust-indexmap-1) ("rust-log" ,rust-log-0.4) ("rust-slab" ,rust-slab-0.4) ("rust-string" ,rust-string-0.2) @@ -10231,7 +10231,7 @@ (define-public rust-http-0.2 ("rust-itoa" ,rust-itoa-0.4)) #:cargo-development-inputs (("rust-doc-comment" ,rust-doc-comment-0.3) - ("rust-indexmap" ,rust-indexmap-1.3) + ("rust-indexmap" ,rust-indexmap-1) ("rust-quickcheck" ,rust-quickcheck-0.9) ("rust-rand" ,rust-rand-0.7) ("rust-seahash" ,rust-seahash-3.0) @@ -10263,7 +10263,7 @@ (define-public rust-http-0.1 ("rust-fnv" ,rust-fnv-1.0) ("rust-itoa" ,rust-itoa-0.4)) #:cargo-development-inputs - (("rust-indexmap" ,rust-indexmap-1.3) + (("rust-indexmap" ,rust-indexmap-1) ("rust-quickcheck" ,rust-quickcheck-0.8) ("rust-rand" ,rust-rand-0.4) ("rust-seahash" ,rust-seahash-3.0) @@ -10684,7 +10684,7 @@ (define-public rust-image-0.20 ("rust-num-complex" ,rust-num-complex-0.2) ("rust-quickcheck" ,rust-quickcheck-0.6)))))) -(define-public rust-indexmap-1.3 +(define-public rust-indexmap-1 (package (name "rust-indexmap") (version "1.3.2") @@ -14769,7 +14769,7 @@ (define-public rust-object-0.17 ("rust-uuid" ,rust-uuid-0.8) ("rust-flate2" ,rust-flate2-1.0) ("rust-crc32fast" ,rust-crc32fast-1.2) - ("rust-indexmap" ,rust-indexmap-1.3)))) + ("rust-indexmap" ,rust-indexmap-1)))) (home-page "https://github.com/gimli-rs/object") (synopsis "Unified interface for reading and writing object file formats") (description "This package provides a unified interface for reading and @@ -21626,7 +21626,7 @@ (define-public rust-serde-json-1.0 (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-indexmap" ,rust-indexmap-1.3) + (("rust-indexmap" ,rust-indexmap-1) ("rust-itoa" ,rust-itoa-0.4) ("rust-ryu" ,rust-ryu-1.0) ("rust-serde" ,rust-serde-1.0)) @@ -25807,7 +25807,7 @@ (define-public rust-toml-0.5 (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-indexmap" ,rust-indexmap-1.3) + (("rust-indexmap" ,rust-indexmap-1) ("rust-serde" ,rust-serde-1.0)) #:cargo-development-inputs (("rust-serde-derive" ,rust-serde-derive-1.0) -- cgit v1.2.3 From b36766ecd240e84120bbec7a42699f007e7c553d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Jul 2020 10:47:30 +0300 Subject: gnu: rust-indexmap-1: Update to 1.4.0. * gnu/packages/crates-io.scm (rust-indexmap-1): Update to 1.4.0. [arguments]: Don't skip build. Add rust-fnv-1.0, rust-itertools-0.8, rust-lazy-static-1, rust-quickcheck-0.9, rust-rand-0.7, rust-serde-test-1.0 to cargo-development-inputs. --- gnu/packages/crates-io.scm | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index cb4a3adfc1..bd9674667f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10687,7 +10687,7 @@ (define-public rust-image-0.20 (define-public rust-indexmap-1 (package (name "rust-indexmap") - (version "1.3.2") + (version "1.4.0") (source (origin (method url-fetch) @@ -10696,14 +10696,20 @@ (define-public rust-indexmap-1 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "14i2gmq9pwaafvlxmsc12j6539hjgqk4j4jz40fz763vbcn08vq7")))) + "1ziabh0lc4wwahv3qgv6aqckyydcrczpagpfp770jn5m2fqv5663")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-autocfg" ,rust-autocfg-1.0) ("rust-serde" ,rust-serde-1.0) - ("rust-rayon" ,rust-rayon-1)))) + ("rust-rayon" ,rust-rayon-1)) + #:cargo-development-inputs + (("rust-fnv" ,rust-fnv-1.0) + ("rust-itertools" ,rust-itertools-0.8) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-quickcheck" ,rust-quickcheck-0.9) + ("rust-rand" ,rust-rand-0.7) + ("rust-serde-test" ,rust-serde-test-1.0)))) (home-page "https://github.com/bluss/indexmap") (synopsis "Hash table with consistent order and fast iteration.") (description -- cgit v1.2.3 From a34e081e1513d9aaf68daa34accb00cb381b6319 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Jul 2020 10:55:48 +0300 Subject: gnu: rust-cc-1.0: Update to 1.0.58. * gnu/packages/crates-io.scm (rust-cc-1.0): Update to 1.0.58. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index bd9674667f..5d3bc11d21 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2738,7 +2738,7 @@ (define-public rust-cblas-sys-0.1 (define-public rust-cc-1.0 (package (name "rust-cc") - (version "1.0.50") + (version "1.0.58") (source (origin (method url-fetch) @@ -2746,7 +2746,7 @@ (define-public rust-cc-1.0 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "1kdqm8ka7xg9h56b694pcz29ka33fsz27mzrphqc78gx96h8zqlm")))) + "065m2fphrv5csy8hvv37msi3a739mfkgw7pcg71dfw9jwnr6z87r")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t -- cgit v1.2.3 From 28ca765504926945ac14f8c68ae65b1cb987a138 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Jul 2020 11:00:14 +0300 Subject: gnu: rust-cc-1.0: Don't skip build. * gnu/packages/crates-io.scm (rust-cc-1.0)[arguments]: Don't skip build, skip tests. --- gnu/packages/crates-io.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5d3bc11d21..698f78f2fd 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2749,7 +2749,7 @@ (define-public rust-cc-1.0 "065m2fphrv5csy8hvv37msi3a739mfkgw7pcg71dfw9jwnr6z87r")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t + `(#:tests? #f #:cargo-inputs (("rust-jobserver" ,rust-jobserver-0.1)) #:cargo-development-inputs -- cgit v1.2.3 From a93ceeac8229005d4d2a06987f80c78df07b7225 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Jul 2020 11:10:56 +0300 Subject: gnu: rust-cexpr-0.3: Don't skip build. * gnu/packages/crates-io.scm (rust-cexpr-0.3)[arguments]: Don't skip build. Add custom phase to find clang. [inputs]: Add clang. (rust-cexpr-0.2)[inputs]: Inherit from rust-cexpr-0.3. --- gnu/packages/crates-io.scm | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 698f78f2fd..d73a3bac7e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2778,11 +2778,20 @@ (define-public rust-cexpr-0.3 "07fdfj4ff2974y33yixrb657riq9zl9b9h9lr0h7ridhhvxvbrgw")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-nom" ,rust-nom-4.2)) #:cargo-development-inputs - (("rust-clang-sys" ,rust-clang-sys-0.28)))) + (("rust-clang-sys" ,rust-clang-sys-0.28)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'set-environmental-variable + (lambda* (#:key inputs #:allow-other-keys) + (let ((clang (assoc-ref inputs "libclang"))) + (setenv "LIBCLANG_PATH" + (string-append clang "/lib"))) + #t))))) + (inputs + `(("libclang" ,clang))) (home-page "https://github.com/jethrogb/rust-cexpr") (synopsis "C expression parser and evaluator") (description @@ -2816,9 +2825,7 @@ (define-public rust-cexpr-0.2 (let ((clang (assoc-ref inputs "libclang"))) (setenv "LIBCLANG_PATH" (string-append clang "/lib"))) - #t))))) - (inputs - `(("libclang" ,clang))))) + #t))))))) (define-public rust-cfg-if-0.1 (package -- cgit v1.2.3 From 6c46a74cb70d4d6b7e69d589efeedb6a9588e9c0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Jul 2020 11:12:42 +0300 Subject: gnu: rust-cfg-if-0.1: Don't skip build. * gnu/packages/crates-io.scm (rust-cfg-if-0.1)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d73a3bac7e..b7e2b6f259 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2841,8 +2841,7 @@ (define-public rust-cfg-if-0.1 "08h80ihs74jcyp24cd75wwabygbbdgl05k6p5dmq8akbr78vv1a7")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-compiler-builtins" ,rust-compiler-builtins-0.1) ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1.0)))) (home-page "https://github.com/alexcrichton/cfg-if") -- cgit v1.2.3 From 6380ebde9942f8f14d66107e5df2a1821d2b5faa Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Jul 2020 11:14:43 +0300 Subject: gnu: rust-ci-info-0.3: Don't skip build. * gnu/packages/crates-io.scm (rust-ci-info-0.3)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b7e2b6f259..562d3aa446 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3007,8 +3007,7 @@ (define-public rust-ci-info-0.3 "00pr17g6q6i752acrkycg0hkq3lm0p634anm41g3m6lqg8q83s75")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-serde" ,rust-serde-1.0) ("rust-serde-derive" ,rust-serde-derive-1.0)))) (home-page "https://github.com/sagiegurari/ci_info") -- cgit v1.2.3 From 71c7634a38567c5a03a4941f8d13457a523ac380 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Jul 2020 11:16:36 +0300 Subject: gnu: rust-clicolors-control-1.0: Don't skip build. * gnu/packages/crates-io.scm (rust-clicolors-control-1.0)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 562d3aa446..df2495118b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3204,8 +3204,7 @@ (define-public rust-clicolors-control-1.0 "07klix8nbpwk0cg1k4h0kkiijm1jxvrzndqdkr7dqr6xvkjjw24h")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-atty" ,rust-atty-0.2) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-libc" ,rust-libc-0.2) -- cgit v1.2.3 From c0f5b34e48d8133dc17b4d9fe0ebd06302c38f01 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Jul 2020 11:19:42 +0300 Subject: gnu: rust-cmake-0.1: Update to 0.1.44. * gnu/packages/crates-io.scm (rust-cmake-0.1): Update to 0.1.44. [arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index df2495118b..eeb3a09b96 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3320,7 +3320,7 @@ (define-public rust-cloudflare-zlib-sys-0.2 (define-public rust-cmake-0.1 (package (name "rust-cmake") - (version "0.1.42") + (version "0.1.44") (source (origin (method url-fetch) @@ -3328,11 +3328,10 @@ (define-public rust-cmake-0.1 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "0qkwibkvx5xjazvv9v8gvdlpky2jhjxvcz014nrixgzqfyv2byw1")))) + "1fv346ipxmvff6qrnh78rild0s8k72ilfjkdsrk869562y62cmhf")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs (("rust-cc" ,rust-cc-1.0)))) + `(#:cargo-inputs (("rust-cc" ,rust-cc-1.0)))) (home-page "https://github.com/alexcrichton/cmake-rs") (synopsis "Rust build dependency for running cmake") (description -- cgit v1.2.3 From 3cde2bdaa650bc14901f0cca90ee8aaa1940fb9e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Jul 2020 12:04:23 +0300 Subject: gnu: rust-colored-1.9: Don't skip build. * gnu/packages/crates-io.scm (rust-colored-1.9)[arguments]: Don't skip build. Add rust-rspec-1 to cargo-development-inputs. Add custom phase to use rust-rspec-1. --- gnu/packages/crates-io.scm | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index eeb3a09b96..d79d8cab53 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3421,15 +3421,21 @@ (define-public rust-colored-1.9 "0nbc1czs512h1k696y7glv1kjrb2b914zpxraic6q5fgv80wizzl")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t + `(#:tests? #f #:cargo-inputs (("rust-atty" ,rust-atty-0.2) ("rust-winapi" ,rust-winapi-0.3) ("rust-lazy-static" ,rust-lazy-static-1)) #:cargo-development-inputs (("rust-ansi-term" ,rust-ansi-term-0.12) - ;("rust-rspec" ,rust-rspec-1.0) - ))) + ("rust-rspec" ,rust-rspec-1)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-version-requirements + (lambda _ + (substitute* "Cargo.toml" + (("1.0.0-beta.3") ,(package-version rust-rspec-1))) + #t))))) (home-page "https://github.com/mackwic/colored") (synopsis "Add colors in your terminal") (description @@ -3446,8 +3452,7 @@ (define-public rust-colored-1.9.1 (uri (crate-uri "colored" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0fildacm47g86acmx44yvxx6cka8fdym5qkgfm8x8gh2hsrghc7r")))) - (build-system cargo-build-system))) + (base32 "0fildacm47g86acmx44yvxx6cka8fdym5qkgfm8x8gh2hsrghc7r")))))) ;; This package requires features which are unavailable ;; on the stable releases of Rust. -- cgit v1.2.3 From f3ea6ec1f2f0471f1a09e29a932805bcc31599ac Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Jul 2020 12:19:13 +0300 Subject: gnu: Add rust-afl-0.8. * gnu/packages/crates-io.scm (rust-afl-0.8): New variable. (rust-afl-0.5): Inherit from rust-afl-0.8. --- gnu/packages/crates-io.scm | 42 ++++++++++++++++++++++++++++++++++++------ 1 file changed, 36 insertions(+), 6 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d79d8cab53..4c84735eb8 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -181,10 +181,10 @@ (define-public rust-adler32-1 (license (list license:bsd-3 license:zlib)))) -(define-public rust-afl-0.5 +(define-public rust-afl-0.8 (package (name "rust-afl") - (version "0.5.2") + (version "0.8.0") (source (origin (method url-fetch) @@ -193,15 +193,20 @@ (define-public rust-afl-0.5 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0azpi917l8nhvx25n2v670nvkxkrhcwmddfi85qnr6kchmi6y946")))) + "1rw11hycfjhqbc7z1smn75m0sczq519msjwimxh7b8s6n4pzk5r7")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs + (("rust-cc" ,rust-cc-1.0) + ("rust-clap" ,rust-clap-2) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-rustc-version" ,rust-rustc-version-0.2) + ("rust-xdg" ,rust-xdg-2.2)) + #:cargo-development-inputs (("rust-rustc-version" ,rust-rustc-version-0.2) - ("rust-cc" ,rust-cc-1.0) - ("rust-xdg" ,rust-xdg-2.2) - ("rust-clap" ,rust-clap-2)))) + ("rust-xdg" ,rust-xdg-2.2)))) (home-page "https://github.com/rust-fuzz/afl.rs") (synopsis "Fuzzing Rust code with american-fuzzy-lop") @@ -209,6 +214,31 @@ (define-public rust-afl-0.5 "Fuzz Rust code with american-fuzzy-lop.") (license license:asl2.0))) +(define-public rust-afl-0.5 + (package + (inherit rust-afl-0.8) + (name "rust-afl") + (version "0.5.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "afl" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0azpi917l8nhvx25n2v670nvkxkrhcwmddfi85qnr6kchmi6y946")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-rustc-version" ,rust-rustc-version-0.2) + ("rust-cc" ,rust-cc-1.0) + ("rust-xdg" ,rust-xdg-2.2) + ("rust-clap" ,rust-clap-2)) + #:cargo-development-inputs + (("rust-rustc-version" ,rust-rustc-version-0.2) + ("rust-xdg" ,rust-xdg-2.2)))))) + (define-public rust-afl-0.4 (package (name "rust-afl") -- cgit v1.2.3 From 19cc1c64090456924dea987422374d2879d4e6a2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Jul 2020 12:20:11 +0300 Subject: gnu: rust-afl-0.4: Inherit from rust-afl-0.5. * gnu/packages/crates-io.scm (rust-afl-0.4): Inherit from rust-afl-0.5. --- gnu/packages/crates-io.scm | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4c84735eb8..3452e5d449 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -241,6 +241,7 @@ (define-public rust-afl-0.5 (define-public rust-afl-0.4 (package + (inherit rust-afl-0.5) (name "rust-afl") (version "0.4.3") (source @@ -251,21 +252,7 @@ (define-public rust-afl-0.4 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0g2chc18ji7qxi0d03n2ai140qdcww958v5si6rcjnnhmri1vyfb")))) - (build-system cargo-build-system) - (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-cc" ,rust-cc-1.0) - ("rust-clap" ,rust-clap-2) - ("rust-rustc-version" ,rust-rustc-version-0.2) - ("rust-xdg" ,rust-xdg-2.2)))) - (home-page "https://github.com/rust-fuzz/afl.rs") - (synopsis - "Fuzzing Rust code with american-fuzzy-lop") - (description - "Fuzz Rust code with american-fuzzy-lop.") - (license license:asl2.0))) + "0g2chc18ji7qxi0d03n2ai140qdcww958v5si6rcjnnhmri1vyfb")))))) (define-public rust-aho-corasick-0.7 (package -- cgit v1.2.3 From c679140637db00ab13df4c1b1f3e7e7dacab6179 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Jul 2020 13:40:12 +0300 Subject: gnu: rust-cpp-demangle-0.2: Update to 0.2.16. * gnu/packages/crates-io.scm (rust-cpp-demangle-0.2): Update to 0.2.16. [arguments]: Replace rust-afl-0.4 with 0.8. --- gnu/packages/crates-io.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3452e5d449..5622ef7047 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3908,7 +3908,7 @@ (define-public rust-core-video-sys-0.1 (define-public rust-cpp-demangle-0.2 (package (name "rust-cpp-demangle") - (version "0.2.14") + (version "0.2.16") (source (origin (method url-fetch) @@ -3917,12 +3917,12 @@ (define-public rust-cpp-demangle-0.2 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1mm064x84868q06r4m4b7byf999nrkbhx7iyc4nchyssaxpsy5a1")))) + "0bamx2c78xzjhhvpg6p9bjarl6qm6j8npm6756kiqdh784w29j8k")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-afl" ,rust-afl-0.4) + (("rust-afl" ,rust-afl-0.8) ("rust-cfg-if" ,rust-cfg-if-0.1) ("rust-glob" ,rust-glob-0.3)) #:cargo-development-inputs -- cgit v1.2.3 From 015881e9a8ddb08648ce54dcf9160b6377df7360 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Jul 2020 13:44:37 +0300 Subject: gnu: rust-ctor-0.1: Don't skip build. * gnu/packages/crates-io.scm (rust-ctor-0.1)[arguments]: Don't skip build. Add rust-libc-print-0.1 to cargo-development-inputs. --- gnu/packages/crates-io.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5622ef7047..b069bf5aff 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4759,13 +4759,11 @@ (define-public rust-ctor-0.1 "1qgwkwyxishpp3wkbwq5i27zdxz539ii0sz129xj061ffnnfbia7")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-syn" ,rust-syn-1.0) ("rust-quote" ,rust-quote-1.0)) - ;#:cargo-development-inputs - ;(("rust-libc-print" ,rust-libc-print-0.1)) - )) + #:cargo-development-inputs + (("rust-libc-print" ,rust-libc-print-0.1)))) (home-page "https://github.com/mmastrac/rust-ctor") (synopsis "__attribute__((constructor)) for Rust") (description -- cgit v1.2.3 From 914bfc806a3e2f37723401c00a53c03c26498731 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Jul 2020 13:47:00 +0300 Subject: gnu: rust-ctor-0.1: Update to 0.1.15. * gnu/packages/crates-io.scm (rust-ctor-0.1): Update to 0.1.15. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b069bf5aff..1ed0fc8d87 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4747,7 +4747,7 @@ (define-public rust-ct-logs-0.3 (define-public rust-ctor-0.1 (package (name "rust-ctor") - (version "0.1.13") + (version "0.1.15") (source (origin (method url-fetch) @@ -4756,7 +4756,7 @@ (define-public rust-ctor-0.1 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1qgwkwyxishpp3wkbwq5i27zdxz539ii0sz129xj061ffnnfbia7")))) + "09x2my9x33srjdip8yf4lm5gq7xqis2694abvpa64r60pajqm19r")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From ad96541a4e621a5c4eec8142269a0e1f769b697f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Jul 2020 13:49:51 +0300 Subject: gnu: rust-libc-print-0.1: Update to 0.1.13. * gnu/packages/crates-io.scm (rust-libc-print-0.1): Update to 0.1.13. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1ed0fc8d87..01f6e97f6c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11708,14 +11708,14 @@ (define-public rust-libc-0.2 (define-public rust-libc-print-0.1 (package (name "rust-libc-print") - (version "0.1.11") + (version "0.1.13") (source (origin (method url-fetch) (uri (crate-uri "libc-print" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1sh4l815w7zxg8w17fvwj63y421sjqxxrdamzwyvg90n6mr70phv")))) + (base32 "0cjvz622b9bmf32q3mzmxv9ddxfdla6z2v647v8f3qx7lci9kmji")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2)))) -- cgit v1.2.3 From ea1f63a3177344c5d892240638cb7dbad058f3fc Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Jul 2020 13:54:11 +0300 Subject: gnu: rust-line-wrap-0.1: Don't skip build. * gnu/packages/crates-io.scm (rust-line-wrap-0.1)[arguments]: Don't skip build. Add rust-rand-0.5 to cargo-development-inputs. --- gnu/packages/crates-io.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 01f6e97f6c..8566054761 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -12036,9 +12036,10 @@ (define-public rust-line-wrap-0.1 "1ffa2whkyh9mwvdlpk6v8pjkg8p8mlzyjfymq5adll9a18sl80zk")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-safemem" ,rust-safemem-0.3)))) + `(#:cargo-inputs + (("rust-safemem" ,rust-safemem-0.3)) + #:cargo-development-inputs + (("rust-rand" ,rust-rand-0.5)))) (home-page "https://bitbucket.org/marshallpierce/line-wrap-rs/src") (synopsis "Efficiently insert line separators") (description -- cgit v1.2.3 From 8de0fb17723091fb10a493c309e3633b22b51f67 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Jul 2020 13:56:41 +0300 Subject: gnu: rust-linked-hash-map-0.5: Update to 0.5.3. * gnu/packages/crates-io.scm (rust-linked-hash-map-0.5): Update to 0.5.3. [arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 8566054761..cab5bb02dc 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -12049,7 +12049,7 @@ (define-public rust-line-wrap-0.1 (define-public rust-linked-hash-map-0.5 (package (name "rust-linked-hash-map") - (version "0.5.2") + (version "0.5.3") (source (origin (method url-fetch) @@ -12058,11 +12058,10 @@ (define-public rust-linked-hash-map-0.5 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "10qgbvh00q36ql0jh00rxh2jlq6qvl11n6mig0cvkpf4xf5bd4df")))) + "0jih3za0p1mywlnwcakc462q1byk6z8vnrzdm36hg6cxk7asdmcd")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-clippy" ,rust-clippy-0.0) ("rust-heapsize" ,rust-heapsize-0.4) ("rust-serde" ,rust-serde-1.0) -- cgit v1.2.3 From 6f13177a6ec4f407bbf0ad30c5804a9af862ba89 Mon Sep 17 00:00:00 2001 From: John Soo Date: Tue, 16 Jun 2020 19:50:43 -0700 Subject: gnu: Add rust-measureme-0.7. * gnu/packages/crates-io.scm (rust-measureme-0.7): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index cab5bb02dc..ee625f3b1a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -12940,6 +12940,34 @@ (define-public rust-md5-asm-0.4 (supported-systems '("x86_64-linux" "i686-linux")) (license license:expat))) +(define-public rust-measureme-0.7 + (package + (name "rust-measureme") + (version "0.7.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "measureme" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0cmrrh86b3rvws6d7xp07wfn703yw02cakzirykvn4vh4p9hkxzy")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-byteorder" ,rust-byteorder-1.3) + ("rust-memmap" ,rust-memmap-0.7) + ("rust-parking-lot" ,rust-parking-lot-0.9) + ("rust-rustc-hash" ,rust-rustc-hash-1.1)))) + (home-page "https://github.com/rust-lang/measureme") + (synopsis "Support crate for rustc's self-profiling feature") + (description + "Record rustc compiler events and serializing them to a compact binary +format with this support package. It is integrated into rustc via the +unstable -Z self-profile flag.") + (license (list license:expat license:asl2.0)))) + (define-public rust-memchr-2 (package (name "rust-memchr") -- cgit v1.2.3 From 6540696d6e6479bcb5d3e9eb91a2f5442dd9679d Mon Sep 17 00:00:00 2001 From: John Soo Date: Tue, 16 Jun 2020 20:13:48 -0700 Subject: gnu: Add rust-rustc-ap-rustc-arena-654. * gnu/packages/crates-io.scm (rust-rustc-ap-rustc-arena-654): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ee625f3b1a..d8bf776d8f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -20201,6 +20201,35 @@ (define-public rust-rust-hawktracer-sys-0.4 "This package provides a sys crate for the rust_hawktracer library.") (license (list license:expat license:asl2.0)))) +(define-public rust-rustc-ap-arena-654 + (package + (name "rust-rustc-ap-arena") + (version "654.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rustc-ap-arena" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "18yc4i5m2vf6w8na29i5jv8l4l0yknsf6xn0z2mk7mfz1nxwzpw1")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-rustc-ap-rustc-data-structures" + ,rust-rustc-ap-rustc-data-structures-654) + ("rust-smallvec" ,rust-smallvec-1)))) + (home-page "https://github.com/alexcrichton/rustc-auto-publish") + (synopsis + "Automatically published version of the arena package used in rustc") + (description + "Use the arena library used in the Rust compiler with this crate. +It is automatically published using the compiler repository at +@url{https://www.github.com/rust-lang/rust}") + (license (list license:expat license:asl2.0)))) + (define-public rust-rustc-demangle-0.1 (package (name "rust-rustc-demangle") -- cgit v1.2.3 From e548f359a71f7514fbfda42bad9fc8c08f13423d Mon Sep 17 00:00:00 2001 From: John Soo Date: Tue, 16 Jun 2020 20:21:59 -0700 Subject: gnu: Add rust-rustc-ap-rustc-macros-654. * gnu/packages/crates-io.scm (rust-rustc-ap-macros-654): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d8bf776d8f..4fdbc0a9cf 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -20230,6 +20230,35 @@ (define-public rust-rustc-ap-arena-654 @url{https://www.github.com/rust-lang/rust}") (license (list license:expat license:asl2.0)))) +(define-public rust-rustc-ap-rustc-macros-654 + (package + (name "rust-rustc-ap-rustc-macros") + (version "654.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rustc-ap-rustc_macros" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "03zfp8a10jz43z8lsx1drx7g5jimxmbw4w7hs13yvczismb6qs2r")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1.0) + ("rust-quote" ,rust-quote-1.0) + ("rust-syn" ,rust-syn-1.0) + ("rust-synstructure" ,rust-synstructure-0.12)))) + (home-page "https://github.com/alexcrichton/rustc-auto-publish") + (synopsis "Automatically published versions of rustc macros") + (description + "Use macros used in the Rust compiler with this crate. +It is automatically published using the compiler repository at +@url{https://www.github.com/rust-lang/rust}.") + (license (list license:expat license:asl2.0)))) + (define-public rust-rustc-demangle-0.1 (package (name "rust-rustc-demangle") -- cgit v1.2.3 From 0d1f8b48f6764a6012fda9f29c566e99638d5835 Mon Sep 17 00:00:00 2001 From: John Soo Date: Tue, 16 Jun 2020 20:28:43 -0700 Subject: gnu: Add rust-rustc-ap-rustc-lexer-654. * gnu/packages/crates-io.scm (rust-rustc-ap-rustc-lexer-654): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4fdbc0a9cf..7e55d6032d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -20230,6 +20230,31 @@ (define-public rust-rustc-ap-arena-654 @url{https://www.github.com/rust-lang/rust}") (license (list license:expat license:asl2.0)))) +(define-public rust-rustc-ap-rustc-lexer-654 + (package + (name "rust-rustc-ap-rustc-lexer") + (version "654.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rustc-ap-rustc_lexer" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "19bx2z4gxxzqfjh9m11jp52lgdzz0k5fb0p1ad739bdc5cm4sciv")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-unicode-xid" ,rust-unicode-xid-0.2)))) + (home-page "https://github.com/alexcrichton/rustc-auto-publish") + (synopsis "Automatically published versions of rustc macros") + (description + "Use the lexer used in the Rust compiler with this crate. +It is automatically published using the compiler repository at +@url{https://www.github.com/rust-lang/rust}.") + (license (list license:expat license:asl2.0)))) + (define-public rust-rustc-ap-rustc-macros-654 (package (name "rust-rustc-ap-rustc-macros") -- cgit v1.2.3 From 39662c9ddcb5770d578d64721da798297b5934a0 Mon Sep 17 00:00:00 2001 From: John Soo Date: Tue, 16 Jun 2020 20:29:23 -0700 Subject: gnu: Add rust-rustc-ap-graphviz-654. * gnu/packages/crates-io.scm (rust-rustc-ap-graphviz-654): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7e55d6032d..aea5ebed9a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -20230,6 +20230,29 @@ (define-public rust-rustc-ap-arena-654 @url{https://www.github.com/rust-lang/rust}") (license (list license:expat license:asl2.0)))) +(define-public rust-rustc-ap-graphviz-654 + (package + (name "rust-rustc-ap-graphviz") + (version "654.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rustc-ap-graphviz" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1z8rs3k9zcd1i2clrnzgvfaq1q05m02wjcyy3d9zk9qln03vp43l")))) + (build-system cargo-build-system) + (home-page "https://github.com/alexcrichton/rustc-auto-publish") + (synopsis + "Automatically published versions of the graphviz crate used in rustc") + (description + "Use the graphviz library used in the Rust compiler with this crate. +It is automatically published using the compiler repository at +@url{https://www.github.com/rust-lang/rust}") + (license (list license:expat license:asl2.0)))) + (define-public rust-rustc-ap-rustc-lexer-654 (package (name "rust-rustc-ap-rustc-lexer") -- cgit v1.2.3 From cb123dad5e36b208572ea5acfcaa93c201215e4d Mon Sep 17 00:00:00 2001 From: John Soo Date: Tue, 16 Jun 2020 20:43:55 -0700 Subject: gnu: Add rust-rustc-rayon-core-0.3. * gnu/packages/crates-io.scm (rust-rustc-rayon-core-0.3): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index aea5ebed9a..1dad5d1608 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -20353,6 +20353,42 @@ (define-public rust-rustc-hash-1.1 "This package provides a speedy, non-cryptographic hash used in rustc.") (license (list license:asl2.0 license:expat)))) +(define-public rust-rustc-rayon-core-0.3 + (package + (name "rust-rustc-rayon-core") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rustc-rayon-core" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1cwc50mcclzfmhmi87953fjk6cc9ppmchn9mlwzfllq03y1jf97a")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f + #:cargo-inputs + (("rust-crossbeam-deque" ,rust-crossbeam-deque-0.7) + ("rust-crossbeam-queue" ,rust-crossbeam-queue-0.1) + ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.6) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-num-cpus" ,rust-num-cpus-1)) + #:cargo-development-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-rand" ,rust-rand-0.6) + ("rust-rand-xorshift" ,rust-rand-xorshift-0.1) + ("rust-scoped-tls" ,rust-scoped-tls-1.0)))) + (home-page "https://github.com/rust-lang/rustc-rayon") + (synopsis "Core APIs for Rayon - fork for rustc") + (description + "Note: This package is an unstable fork made for use in rustc + +Rayon-core represents the \"core, stable\" APIs of Rayon: join, scope, and so +forth, as well as the ability to create custom thread-pools with ThreadPool.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-rustc-serialize-0.3 (package (name "rust-rustc-serialize") -- cgit v1.2.3 From 5850a02185c8d72bdce0ba09d67f54be02686cf0 Mon Sep 17 00:00:00 2001 From: John Soo Date: Tue, 16 Jun 2020 20:47:33 -0700 Subject: gnu: Add rust-rustc-rayon-0.3. * gnu/packages/crates-io.scm (rust-rustc-rayon-0.3): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1dad5d1608..efd3c09db1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -20353,6 +20353,45 @@ (define-public rust-rustc-hash-1.1 "This package provides a speedy, non-cryptographic hash used in rustc.") (license (list license:asl2.0 license:expat)))) +(define-public rust-rustc-rayon-0.3 + (package + (name "rust-rustc-rayon") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rustc-rayon" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0fjvy8bf0hd1zq9d3fdxbdp4z4p1k8jfyx51k5qip3wk1pwnf9zk")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f + #:cargo-inputs + (("rust-crossbeam-deque" ,rust-crossbeam-deque-0.7) + ("rust-either" ,rust-either-1.5) + ("rust-rustc-rayon-core" ,rust-rustc-rayon-core-0.3)) + #:cargo-development-inputs + (("rust-doc-comment" ,rust-doc-comment-0.3) + ("rust-docopt" ,rust-docopt-1.1) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-rand" ,rust-rand-0.6) + ("rust-rand-xorshift" ,rust-rand-xorshift-0.1) + ("rust-serde" ,rust-serde-1.0) + ("rust-serde-derive" ,rust-serde-derive-1.0)))) + (home-page "https://github.com/rust-lang/rustc-rayon") + (synopsis + "Simple work-stealing parallelism for Rust - fork for rustc") + (description + "Rustc-rayon is a fork of the Rayon crate. It adds a few \"in progress\" +features that rustc is using, mostly around deadlock detection. These features +are not stable and should not be used by others -- though they may find their +way into rayon proper at some point. In general, if you are not rustc, you +should be using the real rayon crate, not rustc-rayon.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-rustc-rayon-core-0.3 (package (name "rust-rustc-rayon-core") -- cgit v1.2.3 From 51d44ede6c5eba6104b2873b81f74dedf225276e Mon Sep 17 00:00:00 2001 From: John Soo Date: Tue, 16 Jun 2020 20:52:14 -0700 Subject: gnu: Add rust-rustc-ap-serialize-654. * gnu/packages/crates-io.scm (rust-rustc-ap-serialize-654): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index efd3c09db1..8d8cf90470 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -20307,6 +20307,34 @@ (define-public rust-rustc-ap-rustc-macros-654 @url{https://www.github.com/rust-lang/rust}.") (license (list license:expat license:asl2.0)))) +(define-public rust-rustc-ap-serialize-654 + (package + (name "rust-rustc-ap-serialize") + (version "654.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rustc-ap-serialize" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1vwfa3q4f9k0nfryr53jnwmf8vhaq7ijbgw8449nx467dr98yvkm")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-indexmap" ,rust-indexmap-1) + ("rust-smallvec" ,rust-smallvec-1)))) + (home-page "https://github.com/alexcrichton/rustc-auto-publish") + (synopsis + "Automatically published versions of the serialize crate used in rustc") + (description + "Use the serialize library used in the Rust compiler with this crate. +It is automatically published using the compiler repository at +@url{https://www.github.com/rust-lang/rust}") + (license (list license:expat license:asl2.0)))) + (define-public rust-rustc-demangle-0.1 (package (name "rust-rustc-demangle") -- cgit v1.2.3 From 7ed3dc65c46119bfc92870312fca6f635ec3d7f7 Mon Sep 17 00:00:00 2001 From: John Soo Date: Tue, 16 Jun 2020 21:01:36 -0700 Subject: gnu: Add rust-rustc-ap-rustc-index-654. * gnu/packages/crates-io.scm (rust-rustc-ap-rustc-index-654): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 8d8cf90470..b36b554d47 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -20253,6 +20253,34 @@ (define-public rust-rustc-ap-graphviz-654 @url{https://www.github.com/rust-lang/rust}") (license (list license:expat license:asl2.0)))) +(define-public rust-rustc-ap-rustc-index-654 + (package + (name "rust-rustc-ap-rustc-index") + (version "654.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rustc-ap-rustc_index" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0qqnvdn3zbwrn884ziw0nrmi1wqmr9yp8js7whw6y8nzdhz0q8ij")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-rustc-ap-serialize" ,rust-rustc-ap-serialize-654) + ("rust-smallvec" ,rust-smallvec-1)))) + (home-page "https://github.com/alexcrichton/rustc-auto-publish") + (synopsis + "Automatically published version of the types of indexes in rustc") + (description + "Use the types of index used in the Rust compiler with this crate. +It is automatically published using the compiler repository at +@url{https://www.github.com/rust-lang/rust}") + (license (list license:expat license:asl2.0)))) + (define-public rust-rustc-ap-rustc-lexer-654 (package (name "rust-rustc-ap-rustc-lexer") -- cgit v1.2.3 From 8b035ca00a2aa6f20f19f0a305ded925e62de242 Mon Sep 17 00:00:00 2001 From: John Soo Date: Tue, 16 Jun 2020 21:03:00 -0700 Subject: gnu: Add rust-rustc-ap-rustc-data-structures-654. * gnu/packages/crates-io.scm (rust-rustc-ap-rustc-data-structures-654): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b36b554d47..33f4b45b4c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -20253,6 +20253,50 @@ (define-public rust-rustc-ap-graphviz-654 @url{https://www.github.com/rust-lang/rust}") (license (list license:expat license:asl2.0)))) +(define-public rust-rustc-ap-rustc-data-structures-654 + (package + (name "rust-rustc-ap-rustc-data-structures") + (version "654.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rustc-ap-rustc_data_structures" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0fhppy18n1i2iykdihfs05d6s1ivwz882ipc9cpnjcvqcsbhj4yj")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-cfg-if" ,rust-cfg-if-0.1) + ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.7) + ("rust-ena" ,rust-ena-0.13) + ("rust-indexmap" ,rust-indexmap-1) + ("rust-jobserver" ,rust-jobserver-0.1) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-log" ,rust-log-0.4) + ("rust-measureme" ,rust-measureme-0.7) + ("rust-parking-lot" ,rust-parking-lot-0.10) + ("rust-rustc-ap-graphviz" ,rust-rustc-ap-graphviz-654) + ("rust-rustc-ap-rustc-index" ,rust-rustc-ap-rustc-index-654) + ("rust-rustc-ap-serialize" ,rust-rustc-ap-serialize-654) + ("rust-rustc-hash" ,rust-rustc-hash-1.1) + ("rust-rustc-rayon" ,rust-rustc-rayon-0.3) + ("rust-rustc-rayon-core" ,rust-rustc-rayon-core-0.3) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-stable-deref-trait" ,rust-stable-deref-trait-1.1) + ("rust-winapi" ,rust-winapi-0.3)))) + (home-page "https://github.com/alexcrichton/rustc-auto-publish") + (synopsis "Automatically published versions of rustc data structures") + (description + "Use data structures used in the Rust compiler with this crate. +It is automatically published using the compiler repository at +@url{https://www.github.com/rust-lang/rust}.") + (license (list license:expat license:asl2.0)))) + (define-public rust-rustc-ap-rustc-index-654 (package (name "rust-rustc-ap-rustc-index") -- cgit v1.2.3 From cb1096f99274324d205cdb341422bf4f8da3d8b2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Jul 2020 14:20:55 +0300 Subject: gnu: rust-smallvec-1: Update to 1.4.1. * gnu/packages/crates-io.scm (rust-smallvec-1): Update to 1.4.1. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 33f4b45b4c..5e7aac725f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -22975,7 +22975,7 @@ (define-public rust-slog-2.4 (define-public rust-smallvec-1 (package (name "rust-smallvec") - (version "1.2.0") + (version "1.4.1") (source (origin (method url-fetch) @@ -22984,7 +22984,7 @@ (define-public rust-smallvec-1 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1z6f47i3qpg9pdjzzvb0g5i1vvdm2ymk3kqc1mdnl8fdkgnb4bsw")))) + "0gqgmbfj8228lc55xxg331flizzwq6hfyy6gw4j2y6hni6fwnmrp")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From a0efbed33a678b5162d1464c13270b89c44dd2a1 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Jul 2020 14:36:57 +0300 Subject: fixup rust-rustc-ap-rustc-data-structures --- gnu/packages/crates-io.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5e7aac725f..728ecea3a0 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -20268,7 +20268,8 @@ (define-public rust-rustc-ap-rustc-data-structures-654 "0fhppy18n1i2iykdihfs05d6s1ivwz882ipc9cpnjcvqcsbhj4yj")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs + `(#:skip-build? #t + #:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) ("rust-cfg-if" ,rust-cfg-if-0.1) ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.7) -- cgit v1.2.3 From 42f45a500d9841a1e83a4a238a4eed8dd1912479 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Jul 2020 14:39:57 +0300 Subject: gnu: rust-unicode-xid-0.2: Update to 0.2.1. * gnu/packages/crates-io.scm (rust-unicode-xid-0.2): Update to 0.2.1. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 728ecea3a0..453ba0b9a0 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -26639,7 +26639,7 @@ (define-public rust-unicode-width-0.1 (define-public rust-unicode-xid-0.2 (package (name "rust-unicode-xid") - (version "0.2.0") + (version "0.2.1") (source (origin (method url-fetch) @@ -26648,7 +26648,7 @@ (define-public rust-unicode-xid-0.2 (string-append name "-" version ".crate")) (sha256 (base32 - "0z09fn515xm7zyr0mmdyxa9mx2f7azcpv74pqmg611iralwpcvl2")))) + "0r6mknipyy9vpz8mwmxvkx65ff2ha1n2pxqjj6f46lcn8yrhpzpp")))) (build-system cargo-build-system) (home-page "https://github.com/unicode-rs/unicode-xid") (synopsis "Determine Unicode XID related properties") -- cgit v1.2.3 From f179fdb3c260a4b414fb0ecda76fc0e0a8d8b5bc Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Jul 2020 14:40:40 +0300 Subject: gnu: rust-unindent-0.1: Update to 0.1.6. * gnu/packages/crates-io.scm (rust-unindent-0.1): Update to 0.1.6. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 453ba0b9a0..a5b1070cae 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -26688,14 +26688,14 @@ (define-public rust-unicode-xid-0.0 (define-public rust-unindent-0.1 (package (name "rust-unindent") - (version "0.1.5") + (version "0.1.6") (source (origin (method url-fetch) (uri (crate-uri "unindent" version)) (file-name (string-append name "-" version ".crate")) (sha256 - (base32 "14s97blyqgf9hzxk22iazrghj60midajkw2801dfspz3n2iqmwb3")))) + (base32 "0hl9l4w9mhv5qacx7cirm6rarrphw35b5syw2plx13vz884dfhdg")))) (build-system cargo-build-system) (home-page "https://github.com/dtolnay/indoc") (synopsis "Remove a column of leading whitespace from a string") -- cgit v1.2.3 From 537bd1c6ed6236b453d8a8c69f9883a68ec83c58 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Jul 2020 14:42:08 +0300 Subject: gnu: rust-untrusted-0.7: Update to 0.7.1. * gnu/packages/crates-io.scm (rust-untrusted-0.7): Update to 0.7.1. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a5b1070cae..a78b9526b6 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -26776,7 +26776,7 @@ (define-public rust-unsafe-any-0.4 (define-public rust-untrusted-0.7 (package (name "rust-untrusted") - (version "0.7.0") + (version "0.7.1") (source (origin (method url-fetch) @@ -26784,7 +26784,7 @@ (define-public rust-untrusted-0.7 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "1kmfykcwif6ashkwg54gcnhxj03kpba2i9vc7z5rpr0xlgvrwdk0")))) + "0jkbqaj9d3v5a91pp3wp9mffvng1nhycx6sh4qkdd9qyr62ccmm1")))) (build-system cargo-build-system) (home-page "https://github.com/briansmith/untrusted") (synopsis "Zero-allocation parsing of untrusted inputs in Rust") -- cgit v1.2.3 From dac0b1639e84861d76de10e41b2f37198af61322 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Jul 2020 14:43:04 +0300 Subject: gnu: rust-urlocator-0.1: Update to 0.1.3. * gnu/packages/crates-io.scm (rust-urlocator-0.1): Update to 0.1.3. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a78b9526b6..5d5bf6baa9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -26869,7 +26869,7 @@ (define-public rust-url-1.7 (define-public rust-urlocator-0.1 (package (name "rust-urlocator") - (version "0.1.2") + (version "0.1.3") (source (origin (method url-fetch) @@ -26878,7 +26878,7 @@ (define-public rust-urlocator-0.1 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1xzhwmqrqyk8p3s5npqpidrn0gjapqx5fshrx633fk56j7cm8qm1")))) + "0r5ig00np3svjpvb1gha3ni798cwj2w7rnlwrc8jrrw7bvlb2yri")))) (build-system cargo-build-system) (home-page "https://github.com/chrisduerr/urlocator.git") (synopsis "Locate URLs in character streams") -- cgit v1.2.3 From 5a00d0281ecdd51aded0524e2800ea15bfd51744 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Jul 2020 14:45:40 +0300 Subject: gnu: rust-vcpkg-0.2: Update to 0.2.10. * gnu/packages/crates-io.scm (rust-vcpkg-0.2): Update to 0.2.10. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5d5bf6baa9..cffbff4fef 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -27135,7 +27135,7 @@ (define-public rust-uuid-0.5 (define-public rust-vcpkg-0.2 (package (name "rust-vcpkg") - (version "0.2.8") + (version "0.2.10") (source (origin (method url-fetch) @@ -27143,7 +27143,7 @@ (define-public rust-vcpkg-0.2 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "0s1ijdrsg6917imja2hb07l0z4vbx7ydm8m2i1n9g62fg7r3ki1z")))) + "132hlmsc4maava91vl4lh677sl1c7vr8ccl53fnr5w41y6dh4m34")))) (build-system cargo-build-system) (arguments `(#:tests? #f ; Tests want mysql, harfbuzz, graphite2. -- cgit v1.2.3 From a416838d31a0603d061d46843ab3386c70144b91 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Jul 2020 14:47:18 +0300 Subject: gnu: rust-vec-map-0.8: Update to 0.8.2. * gnu/packages/crates-io.scm (rust-vec-map-0.2): Update to 0.8.2. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index cffbff4fef..1863b9ac35 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -27161,7 +27161,7 @@ (define-public rust-vcpkg-0.2 (define-public rust-vec-map-0.8 (package (name "rust-vec-map") - (version "0.8.1") + (version "0.8.2") (source (origin (method url-fetch) @@ -27169,7 +27169,7 @@ (define-public rust-vec-map-0.8 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "06n8hw4hlbcz328a3gbpvmy0ma46vg1lc0r5wf55900szf3qdiq5")))) + "1481w9g1dw9rxp3l6snkdqihzyrd2f8vispzqmwjwsdyhw8xzggi")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From 13b7e191de5067ead1953303a84d8c3154c678b6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Jul 2020 14:51:37 +0300 Subject: gnu: rust-widestring-0.4: Update to 0.4.2. * gnu/packages/crates-io.scm (rust-widestring-0.4): Update to 0.4.2. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1863b9ac35..d55a58f0a5 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -28461,7 +28461,7 @@ (define-public rust-which-1.0 (define-public rust-widestring-0.4 (package (name "rust-widestring") - (version "0.4.0") + (version "0.4.2") (source (origin (method url-fetch) @@ -28469,7 +28469,7 @@ (define-public rust-widestring-0.4 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "1dhx6dndjsz1y7c9w06922412kdxyrrkqblvggm76mh8z17hxz7g")))) + "13565qy4jhpg4x0xw8mwxzzsh0p8c93p5208lh6kpwp0q01y6qx7")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t -- cgit v1.2.3 From d95fbe98c77529031ac62ecec1b8855ae6841141 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Jul 2020 14:52:50 +0300 Subject: gnu: rust-winapi-0.3: Update to 0.3.9. * gnu/packages/crates-io.scm (rust-winapi-0.3): Update to 0.3.9. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d55a58f0a5..c2db56786a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -28487,7 +28487,7 @@ (define-public rust-widestring-0.4 (define-public rust-winapi-0.3 (package (name "rust-winapi") - (version "0.3.8") + (version "0.3.9") (source (origin (method url-fetch) @@ -28495,7 +28495,7 @@ (define-public rust-winapi-0.3 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "1ii9j9lzrhwri0902652awifzx9fpayimbp6hfhhc296xcg0k4w0")))) + "06gl025x418lchw1wxj64ycr7gha83m44cjr5sarhynd9xkrm0sw")))) (build-system cargo-build-system) ;; This package depends unconditionally on these two crates. (arguments -- cgit v1.2.3 From 5eb7531bede1fbc0818086cf495eaf31e6d9d85f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Jul 2020 14:54:08 +0300 Subject: gnu: rust-winapi-util-0.1: Update to 0.1.5. * gnu/packages/crates-io.scm (rust-winapi-0.1): Update to 0.1.5. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c2db56786a..e910674517 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -28567,7 +28567,7 @@ (define-public rust-winapi-i686-pc-windows-gnu-0.4 (define-public rust-winapi-util-0.1 (package (name "rust-winapi-util") - (version "0.1.4") + (version "0.1.5") (source (origin (method url-fetch) @@ -28575,7 +28575,7 @@ (define-public rust-winapi-util-0.1 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "0vj3984cxwnf1ys3fdz6bpl7p0kdsgykpzbhmcmwi759cd8mqlgs")))) + "0y71bp7f6d536czj40dhqk0d55wfbbwqfp2ymqf1an5ibgl6rv3h")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-winapi" ,rust-winapi-0.3)))) -- cgit v1.2.3 From d7b0db6e4e9ca9cd32765fc6bdd3f9933f097d61 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Jul 2020 14:54:55 +0300 Subject: gnu: rust-wincolor-1.0: Update to 1.0.3. * gnu/packages/crates-io.scm (rust-wincolor-1.0): Update to 1.0.3. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e910674517..d881daa925 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -28611,7 +28611,7 @@ (define-public rust-winapi-x86-64-pc-windows-gnu-0.4 (define-public rust-wincolor-1.0 (package (name "rust-wincolor") - (version "1.0.2") + (version "1.0.3") (source (origin (method url-fetch) @@ -28619,7 +28619,7 @@ (define-public rust-wincolor-1.0 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "1agaf3hcav113i86912ajnw6jxcy4rvkrgyf8gdj8kc031mh3xcn")))) + "017x33ljndwc76cp5z9llgndn0nh7v8jcjaykbizkawmwy9n3pyp")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From 8c6d92164db1b8ed5c1e00c1456bbd3b060b6733 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Jul 2020 15:01:39 +0300 Subject: gnu: Add rust-resize-0.3. * gnu/packages/crates-io.scm (rust-resize-0.3): New variable. --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d881daa925..b730fe673d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19787,6 +19787,29 @@ (define-public rust-reopen-0.3 (description "File reopening utility.") (license (list license:asl2.0 license:expat)))) +(define-public rust-resize-0.3 + (package + (name "rust-resize") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "resize" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1ai83laz5yvg4r7z9q8d1m0vq0fqj2ycyprw5fxzxyzaj3im7rmr")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs + (("rust-png" ,rust-png-0.15)))) + (home-page "https://github.com/PistonDevelopers/resize") + (synopsis "Simple image resampling library in pure Rust") + (description + "This package provides a simple image resampling library in pure Rust.") + (license license:expat))) + (define-public rust-resolv-conf-0.6 (package (name "rust-resolv-conf") -- cgit v1.2.3 From a8b60f4269220c8a723687195f488c694637312a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Jul 2020 15:02:25 +0300 Subject: gnu: rust-y4m-0.5: Update to 0.5.3. * gnu/packages/crates-io.scm (rust-y4m-0.5): Update to 0.5.3. [arguments]: Don't skip build. Add rust-resize-0.3 to cargo-development-inputs. --- gnu/packages/crates-io.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b730fe673d..832f324841 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -29069,7 +29069,7 @@ (define-public rust-xml5ever-0.16 (define-public rust-y4m-0.5 (package (name "rust-y4m") - (version "0.5.0") + (version "0.5.3") (source (origin (method url-fetch) @@ -29077,10 +29077,12 @@ (define-public rust-y4m-0.5 (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "06g8c53qk4cla3xczywx5qlklvzsw54x77vm727mhizlsp5n93ar")))) + (base32 + "1933677by64y06zfgip2yq8b2dza8xnljhaksx93czq90b54kscz")))) (build-system cargo-build-system) - (arguments `(#:skip-build? #t)) + (arguments + `(#:cargo-development-inputs + (("rust-resize" ,rust-resize-0.3)))) (home-page "https://github.com/image-rs/y4m") (synopsis "YUV4MPEG2 (.y4m) Encoder/Decoder.") (description "YUV4MPEG2 (.y4m) Encoder/Decoder.") -- cgit v1.2.3 From ad421ff0bc49bf122471136bf1b7d320bfbb871e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Jul 2020 15:04:34 +0300 Subject: gnu: rust-zip-0.5: Update to 0.5.6. * gnu/packages/crates-io.scm (rust-zip-0.5): Update to 0.5.6. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 832f324841..ac848bd5ef 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -29155,7 +29155,7 @@ (define-public rust-zbase32-0.1 (define-public rust-zip-0.5 (package (name "rust-zip") - (version "0.5.4") + (version "0.5.6") (source (origin (method url-fetch) @@ -29164,7 +29164,7 @@ (define-public rust-zip-0.5 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1biv5kh4fl7wpjlsxfczvgrdjlybf0xjaw7s36didql8lxxz67z4")))) + "0zfv0ascxl8gqqxgjck99kypcb0f67lg2k1a3zwza1w5swl7qa2q")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From 69de25bb09ee239cf21aa662c0d4b7d45b836157 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Jul 2020 15:26:51 +0300 Subject: gnu: rust-windestring-0.4: Don't skip build. * gnu/packages/crates-io.scm (rust-widestring-0.4)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ac848bd5ef..3b4788691e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -28495,8 +28495,7 @@ (define-public rust-widestring-0.4 "13565qy4jhpg4x0xw8mwxzzsh0p8c93p5208lh6kpwp0q01y6qx7")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-development-inputs + `(#:cargo-development-inputs (("rust-winapi" ,rust-winapi-0.3)))) (home-page "https://github.com/starkat99/widestring-rs") (synopsis "Wide string Rust FFI library") -- cgit v1.2.3 From 31fd941441e3c86e5ace9292eb104b09689356a8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Jul 2020 15:35:50 +0300 Subject: gnu: rust-podio-0.1: Update to 0.1.7. * gnu/packages/crates-io.scm (rust-podio-0.1): Update to 0.1.7. --- gnu/packages/crates-io.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3b4788691e..31995d6f28 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -17478,7 +17478,7 @@ (define-public rust-pocket-resources-0.3 (define-public rust-podio-0.1 (package (name "rust-podio") - (version "0.1.6") + (version "0.1.7") (source (origin (method url-fetch) @@ -17487,9 +17487,8 @@ (define-public rust-podio-0.1 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1ga5arhwakj5rwrqzf9410zrbwnf24jd59af8kr9rgwbd6vb83vq")))) + "06bzjxrl0h8rp5860n51dlr1g143grg2jmx4g6y1mdn2ignyz2xi")))) (build-system cargo-build-system) - ;(arguments '(#:skip-build? #t)) (home-page "https://github.com/mvdnes/podio.git") (synopsis "Additional trait to read and write Plain Old Data") (description -- cgit v1.2.3 From 65ffe319697046fb4922007d66bc7bddd7030ef2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Jul 2020 15:37:42 +0300 Subject: gnu: rust-ppv-lite86-0.2: Update to 0.2.8. * gnu/packages/crates-io.scm (rust-ppv-lite86): Update to 0.2.8. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 31995d6f28..8c9c2f691b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -17498,7 +17498,7 @@ (define-public rust-podio-0.1 (define-public rust-ppv-lite86-0.2 (package (name "rust-ppv-lite86") - (version "0.2.6") + (version "0.2.8") (source (origin (method url-fetch) @@ -17506,7 +17506,7 @@ (define-public rust-ppv-lite86-0.2 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "06zs492wbms7j5qhy58cs3976c7kyc47rx0d6fn63rgvp580njbl")))) + "1shj4q7jwj0azssr8cg51dk3kh7d4lg9rmbbz1kbqk971vc5wyi3")))) (build-system cargo-build-system) (home-page "https://github.com/cryptocorrosion/cryptocorrosion") (synopsis "Implementation of the crypto-simd API for x86") -- cgit v1.2.3 From 4b4afec8d9080416d9181bfbfe76c4e2b7301744 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Jul 2020 15:40:52 +0300 Subject: gnu: rust-proc-macro-hack-0.5: Update to 0.5.16. * gnu/packages/crates-io.scm (rust-proc-macro-hack-0.5): Update to 0.5.16. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 8c9c2f691b..eb01294b0e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -17698,7 +17698,7 @@ (define-public rust-proc-macro-error-attr-0.4 (define-public rust-proc-macro-hack-0.5 (package (name "rust-proc-macro-hack") - (version "0.5.15") + (version "0.5.16") (source (origin (method url-fetch) @@ -17707,7 +17707,7 @@ (define-public rust-proc-macro-hack-0.5 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0qqbfm1byabjkph56r2rlvv4cliz4960j6hav3ljazyjqvkryr8d")))) + "1r657v7d9vh1ivrvq65rvg9gjb29dpa0l3zg2fgrn5j8znz5c13y")))) (build-system cargo-build-system) (arguments `(#:cargo-development-inputs -- cgit v1.2.3 From 5b912aebd9e285e22867bfd6afff138b7d7557a0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Jul 2020 15:43:55 +0300 Subject: gnu: rust-proc-macro-nested-0.1: Update to 0.1.6. * gnu/packages/crates-io.scm (rust-proc-macro-nested-0.1): Update to 0.1.6. [arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index eb01294b0e..1e1265aec2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -17769,7 +17769,7 @@ (define-public rust-proc-macro-hack-impl-0.4 (define-public rust-proc-macro-nested-0.1 (package (name "rust-proc-macro-nested") - (version "0.1.3") + (version "0.1.6") (source (origin (method url-fetch) @@ -17778,9 +17778,8 @@ (define-public rust-proc-macro-nested-0.1 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0bmlksm8vl44wkwihmwr7jsjznhbg0n7aibcw1cs2jgjcp86x6in")))) + "0nnwm9bvp1fmr8nqjp8ynrkj97yzpsdh3062li8b0f4hzgd818gb")))) (build-system cargo-build-system) - (arguments `(#:skip-build? #t)) (home-page "https://github.com/dtolnay/proc-macro-hack") (synopsis "Support for nested proc-macro-hack invocations") -- cgit v1.2.3 From cbf0cf8e197a4b1af0d21110136abc9f2086dacd Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Jul 2020 15:45:07 +0300 Subject: gnu: rust-procedural-masquerade-0.1: Update to 0.1.7. * gnu/packages/crates-io.scm (rust-procedural-masquerade-0.1): Update to 0.1.7. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1e1265aec2..b9f25361e7 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -17862,7 +17862,7 @@ (define-public rust-proc-macro2-0.3 (define-public rust-procedural-masquerade-0.1 (package (name "rust-procedural-masquerade") - (version "0.1.6") + (version "0.1.7") (source (origin (method url-fetch) @@ -17871,7 +17871,7 @@ (define-public rust-procedural-masquerade-0.1 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1l098px1hwdzqnxl376a9hfxb9q8kmj2n0y0s8k7plrz3jjp85cs")))) + "17dnfdk0qadh2h38bkwcy14cq8a1ild3j3hqmh1yjbq9ykgq64wg")))) (build-system cargo-build-system) (home-page "https://github.com/servo/rust-cssparser") (synopsis "Macro rules for proc-macro-derive") -- cgit v1.2.3 From 3d1a63df517f756fe1dc7e9c88c5721fe453c4bb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Jul 2020 15:46:14 +0300 Subject: gnu: rust-psm-0.1: Update to 0.1.10. * gnu/packages/crates-io.scm (rust-psm-0.1): Update to 0.1.10. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b9f25361e7..57f3d99d38 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -17980,7 +17980,7 @@ (define-public rust-proptest-0.7 (define-public rust-psm-0.1 (package (name "rust-psm") - (version "0.1.6") + (version "0.1.10") (source (origin (method url-fetch) @@ -17989,7 +17989,7 @@ (define-public rust-psm-0.1 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1q1hdbnp2j3zz1vhzp1xhds6ynan3mg5bhjlhfy5m1sg8n5wckxi")))) + "1kr9sal8g9zil4ch8ra0ry96d5cl15xslk1p0wnqk1504ib3hb89")))) (build-system cargo-build-system) (arguments `(#:cargo-development-inputs -- cgit v1.2.3 From d099329c98104c9df1be37d1aceada0f1e4f1661 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Jul 2020 15:49:09 +0300 Subject: gnu: rust-rand-os-0.2: Update to 0.2.2. * gnu/packages/crates-io.scm (rust-rand-os-0.2): Update to 0.2.2. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 57f3d99d38..0431ed2293 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -18892,7 +18892,7 @@ (define-public rust-rand-jitter-0.1 (define-public rust-rand-os-0.2 (package (name "rust-rand-os") - (version "0.2.0") + (version "0.2.2") (source (origin (method url-fetch) @@ -18901,7 +18901,7 @@ (define-public rust-rand-os-0.2 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "06is69f8rfzs620g5b54k6cgy5yaycrsyqg55flyfrsf8g88733f")))) + "12m59l42aa07khcjnhq8lkw2332brj4d7gqr3jxgqv39vczax257")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From 813360e0d64a0fc3c66c3cfc04983f74fb4b0036 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Jul 2020 15:54:08 +0300 Subject: gnu: rust-rawslice-0.1: Update to 0.1.1. * gnu/packages/crates-io.scm (rust-rawslice-0.1): Update to 0.1.1. [arguments]: Don't skip build. In cargo-inputs replace rust-rawpointer-0.1 with 0.2. In cargo-development-inputs replace rust-quickcheck-0.8 with 0.4. --- gnu/packages/crates-io.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0431ed2293..6b45eb7408 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19170,7 +19170,7 @@ (define-public rust-rawpointer-0.1 (define-public rust-rawslice-0.1 (package (name "rust-rawslice") - (version "0.1.0") + (version "0.1.1") (source (origin (method url-fetch) @@ -19179,14 +19179,13 @@ (define-public rust-rawslice-0.1 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "09bympww1rpsd422da3w444q5w1znjbjh7mjninhq9gaaygkpci2")))) + "1kfidydpw770wfzp2c4y7jfq1vr5jbql5sk86xg2wx3an84cj8wf")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-rawpointer" ,rust-rawpointer-0.1)) + `(#:cargo-inputs + (("rust-rawpointer" ,rust-rawpointer-0.2)) #:cargo-development-inputs - (("rust-quickcheck" ,rust-quickcheck-0.8)))) + (("rust-quickcheck" ,rust-quickcheck-0.4)))) (home-page "https://github.com/bluss/rawslice/") (synopsis "Reimplementation of the slice iterators, with extra features") (description -- cgit v1.2.3 From 1e717f19f03d3a19154907f618ac7e5cefc26891 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Jul 2020 15:56:46 +0300 Subject: gnu: rust-ref-cast-1.0: Update to 1.0.2. * gnu/packages/crates-io.scm (rust-ref-cast-1.0): Update to 1.0.2. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6b45eb7408..442940a95a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19446,7 +19446,7 @@ (define-public rust-redox-users-0.3 (define-public rust-ref-cast-1.0 (package (name "rust-ref-cast") - (version "1.0.0") + (version "1.0.2") (source (origin (method url-fetch) @@ -19455,7 +19455,7 @@ (define-public rust-ref-cast-1.0 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1vy378bdzb4kcz13kh96c5n5qw1jinhfrya5j4bf9rxz65x1jzq7")))) + "08r6qz7228k55nlyl5v7ykdzxrasnawgzmb1jrbfbnkx2s3ifp3l")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From 1d8a26efb4d98124c011b92e85fa963dea988a37 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Jul 2020 15:57:40 +0300 Subject: gnu: rust-ref-cast-impl-1.0: Update to 1.0.2. * gnu/packages/crates-io.scm (rust-ref-cast-impl-1.0): Update to 1.0.2. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 442940a95a..c1a7d70af3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19498,7 +19498,7 @@ (define-public rust-ref-cast-0.2 (define-public rust-ref-cast-impl-1.0 (package (name "rust-ref-cast-impl") - (version "1.0.0") + (version "1.0.2") (source (origin (method url-fetch) @@ -19507,7 +19507,7 @@ (define-public rust-ref-cast-impl-1.0 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "07rc752npmkyc5b8xcqk2ydbl3gxi1n4fzrq0wx9wz5qd4mvavn3")))) + "0i1i3an8si070aqg2mvz6yqc6y2pl9zhd6dd2piz17l7mdsv88bx")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From 0b5010336f9add621a8b0c825ecb70b01aeccdb4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Jul 2020 16:03:29 +0300 Subject: gnu: rust-remove-dir-all-0.5: Update to 0.5.3. * gnu/packages/crates-io.scm (rust-remove-dir-all-0.5): Update to 0.5.3. [source]: Add snippet to replace doctest with test. [arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c1a7d70af3..d386d37999 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19736,19 +19736,25 @@ (define-public rust-regex-syntax-0.3 (define-public rust-remove-dir-all-0.5 (package (name "rust-remove-dir-all") - (version "0.5.2") + (version "0.5.3") (source (origin (method url-fetch) (uri (crate-uri "remove_dir_all" version)) - (file-name (string-append name "-" version ".crate")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0bkrlyg26mgizpiy1yb2hhpgscxcag8r5fnckqsvk25608vzm0sa")))) + "1rzqbsgkmr053bxxl04vmvsd1njyz0nxvly97aip6aa2cmb15k9s")) + (modules '((guix build utils))) + (snippet + '(begin + ;; 'doctest' isn't stable until rust-1.40 + (substitute* "src/lib.rs" + (("\\(doctest") "(test")) + #t)))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-winapi" ,rust-winapi-0.3)) #:cargo-development-inputs (("rust-doc-comment" ,rust-doc-comment-0.3)))) -- cgit v1.2.3 From 73858d169131797bd718f5908b51a1c675a9e226 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Jul 2020 16:10:55 +0300 Subject: gnu: Add rust-match-cfg-0.1. * gnu/packages/crates-io.scm (rust-match-cfg-0.1): New variable. --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d386d37999..d4623b1c72 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -12744,6 +12744,29 @@ (define-public rust-markup5ever-0.8 (base32 "08ayl9aqjnmf7ly1ipy6dk3wjvyfn4w51l40jzh1fh984ykldbzi")))))) +(define-public rust-match-cfg-0.1 + (package + (name "rust-match-cfg") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "match-cfg" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1r5j3zqc3qr8ybcx95bk8q57mkizmgmffj5lmicd4i8d9riyigpz")))) + (build-system cargo-build-system) + (home-page "https://github.com/gnzlbg/match_cfg") + (synopsis + "Define an item depending on a large number of `#[cfg]` parameters") + (description + "This package provides a convenience macro to ergonomically define an item +depending on a large number of @code{#[cfg]} parameters. Structured like match +statement, the first matching branch is the item that gets emitted.") + (license (list license:expat license:asl2.0)))) + (define-public rust-matches-0.1 (package (name "rust-matches") -- cgit v1.2.3 From 761357ba2c861250b57e4c6b4075b069a9a08c8b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Jul 2020 16:07:06 +0300 Subject: gnu: Add rust-hostname-0.3. * gnu/packages/crates-io.scm (rust-hostname-0.3): New variable. (rust-hostname-0.1): Inherit from rust-hostname-0.3. --- gnu/packages/crates-io.scm | 36 +++++++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d4623b1c72..2c6b013dc3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10177,30 +10177,52 @@ (define-public rust-hmac-0.7 ("rust-md-5" ,rust-md-5-0.8) ("rust-sha2" ,rust-sha2-0.8)))))) -(define-public rust-hostname-0.1 +(define-public rust-hostname-0.3 (package (name "rust-hostname") - (version "0.1.5") + (version "0.3.1") (source (origin (method url-fetch) (uri (crate-uri "hostname" version)) - (file-name (string-append name "-" version ".crate")) + (file-name + (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0kprf862qaa7lwdms6aw7f3275h0j2rwhs9nz5784pm8hdmb9ki1")))) + "0rz8yf70cvzl3nry71m4bz9w6x4j9kdz3qng6pnwhk2h20z1qwrw")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2) - ("rust-winutil" ,rust-winutil-0.1)))) + ("rust-match-cfg" ,rust-match-cfg-0.1) + ("rust-winapi" ,rust-winapi-0.3)) + #:cargo-development-inputs + (("rust-version-sync" ,rust-version-sync-0.8)))) (home-page "https://github.com/svartalf/hostname") (synopsis "Get hostname for Rust") (description "Get hostname for Rust.") (license license:expat))) +(define-public rust-hostname-0.1 + (package + (inherit rust-hostname-0.3) + (name "rust-hostname") + (version "0.1.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "hostname" version)) + (file-name (string-append name "-" version ".crate")) + (sha256 + (base32 + "0kprf862qaa7lwdms6aw7f3275h0j2rwhs9nz5784pm8hdmb9ki1")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-winutil" ,rust-winutil-0.1)))))) + (define-public rust-html5ever-0.23 (package (name "rust-html5ever") -- cgit v1.2.3 From 0b448c06ed6714893e0e166ef8fe158c63e56251 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Jul 2020 16:08:47 +0300 Subject: gnu: rust-resolv-conf-0.6: Update to 0.6.3. * gnu/packages/crates-io.scm (rust-resolv-conf-0.6): Update to 0.6.3. [arguments]: In cargo-inputs replace rust-hostname-0.1 with 0.3. --- gnu/packages/crates-io.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2c6b013dc3..5a4d790733 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19861,7 +19861,7 @@ (define-public rust-resize-0.3 (define-public rust-resolv-conf-0.6 (package (name "rust-resolv-conf") - (version "0.6.2") + (version "0.6.3") (source (origin (method url-fetch) @@ -19869,13 +19869,13 @@ (define-public rust-resolv-conf-0.6 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "1jvdsmksdf6yiipm3aqahyv8n1cjd7wqc8sa0p0gzsax3fmb8qxj")))) + "0jlzifww1h7j23jnjj49xz8q0fpd9rqpd0ks8c4y651vgw9lx0qi")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-quick-error" ,rust-quick-error-1.2) - ("rust-hostname", rust-hostname-0.1)))) + ("rust-hostname" ,rust-hostname-0.3)))) (home-page "https://github.com/tailhook/resolv-conf") (synopsis "Parser for /etc/resolv.conf") (description -- cgit v1.2.3 From ec25e1febc17b0c0ac8e7497bd5b6691f739543f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Jul 2020 16:15:09 +0300 Subject: gnu: rust-resolv-conf-0.6: Don't skip build. * gnu/packages/crates-io.scm (rust-resolv-conf-0.6)[arguments]: Don't skip build. Skip tests. --- gnu/packages/crates-io.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5a4d790733..9873eb11b0 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19872,7 +19872,7 @@ (define-public rust-resolv-conf-0.6 "0jlzifww1h7j23jnjj49xz8q0fpd9rqpd0ks8c4y651vgw9lx0qi")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t + `(#:tests? #f ; Not all test files included. #:cargo-inputs (("rust-quick-error" ,rust-quick-error-1.2) ("rust-hostname" ,rust-hostname-0.3)))) -- cgit v1.2.3 From 2569d555a31926ad394fe3cc1fe920bfb7b63f59 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Jul 2020 16:20:49 +0300 Subject: gnu: rust-ron-0.4: Update to 0.4.2. * gnu/packages/crates-io.scm (rust-ron-0.4): Update to 0.4.2. [arguments]: Remove rust-serde-nytes-0.11 from cargo-development-inputs. --- gnu/packages/crates-io.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9873eb11b0..e3cd52fba8 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19991,7 +19991,7 @@ (define-public rust-rls-span-0.5 (define-public rust-ron-0.4 (package (name "rust-ron") - (version "0.4.1") + (version "0.4.2") (source (origin (method url-fetch) @@ -20000,7 +20000,7 @@ (define-public rust-ron-0.4 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1mrqdgw3w0yypg24jyq9mphp4zr9lr0ks7yam82m4n34x6njijyr")))) + "13ypx80ac1minrmn9w9sgnbxlknwiv7qhx5n50azh0s484j2mx8p")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -20009,7 +20009,7 @@ (define-public rust-ron-0.4 ("rust-bitflags" ,rust-bitflags-1) ("rust-serde" ,rust-serde-1.0)) #:cargo-development-inputs - (("rust-serde-bytes" ,rust-serde-bytes-0.11) + (;("rust-serde-bytes" ,rust-serde-bytes-0.10) ("rust-serde-json" ,rust-serde-json-1.0)))) (home-page "https://github.com/ron-rs/ron") (synopsis "Rusty Object Notation") -- cgit v1.2.3 From 4e9fd7c81a933de8a89749a160f1f6a0e25dbae0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Jul 2020 16:58:32 +0300 Subject: gnu: rust-urlocator-0.1: Update home-page. * gnu/packages/crates-io.scm (rust-urlocator-0.1)[home-page]: Update to new home-page. --- gnu/packages/crates-io.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e3cd52fba8..d0a54ff8b6 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -26951,7 +26951,7 @@ (define-public rust-urlocator-0.1 (base32 "0r5ig00np3svjpvb1gha3ni798cwj2w7rnlwrc8jrrw7bvlb2yri")))) (build-system cargo-build-system) - (home-page "https://github.com/chrisduerr/urlocator.git") + (home-page "https://github.com/alacritty/urlocator") (synopsis "Locate URLs in character streams") (description "Locate URLs in character streams.") (license (list license:expat license:asl2.0)))) -- cgit v1.2.3 From e3d79da08187a3aa7c5298cb53f35dec60249852 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 9 Jul 2020 16:38:47 +0200 Subject: gnu: Add rust-html5ever-0.24. * gnu/packages/crates-io.scm (rust-html5ever-0.24): New variable. (rust-html5ever-0.23): Inherit from the above. --- gnu/packages/crates-io.scm | 36 ++++++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d0a54ff8b6..fabb81d8c9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Ivan Petkov ;;; Copyright © 2019, 2020 Efraim Flashner -;;; Copyright © 2019 Nicolas Goaziou +;;; Copyright © 2019, 2020 Nicolas Goaziou ;;; Copyright © 2019 Giacomo Leidi ;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019, 2020 John Soo @@ -10223,10 +10223,10 @@ (define-public rust-hostname-0.1 (("rust-libc" ,rust-libc-0.2) ("rust-winutil" ,rust-winutil-0.1)))))) -(define-public rust-html5ever-0.23 +(define-public rust-html5ever-0.24 (package (name "rust-html5ever") - (version "0.23.0") + (version "0.24.1") (source (origin (method url-fetch) @@ -10234,14 +10234,13 @@ (define-public rust-html5ever-0.23 (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "1dx8k7synrmf3fl6gcfm5q1cybfglvhc9xnvly3s5xcc0b45mrjw")))) + (base32 "1js4cr04941ld4r4fqpblvfigy75ds48qcbqhnr7nmz4l6q86m02")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-log" ,rust-log-0.4) ("rust-mac" ,rust-mac-0.1) - ("rust-markup5ever" ,rust-markup5ever-0.8) + ("rust-markup5ever" ,rust-markup5ever-0.9) ("rust-proc-macro2" ,rust-proc-macro2-0.4) ("rust-quote" ,rust-quote-0.6) ("rust-syn" ,rust-syn-0.15)) @@ -10256,6 +10255,31 @@ (define-public rust-html5ever-0.23 "High-performance browser-grade HTML5 parser.") (license (list license:asl2.0 license:expat)))) +(define-public rust-html5ever-0.23 + (package/inherit rust-html5ever-0.24 + (name "rust-html5ever") + (version "0.23.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "html5ever" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1dx8k7synrmf3fl6gcfm5q1cybfglvhc9xnvly3s5xcc0b45mrjw")))) + (arguments + `(#:cargo-inputs + (("rust-log" ,rust-log-0.4) + ("rust-mac" ,rust-mac-0.1) + ("rust-markup5ever" ,rust-markup5ever-0.8) + ("rust-proc-macro2" ,rust-proc-macro2-0.4) + ("rust-quote" ,rust-quote-0.6) + ("rust-syn" ,rust-syn-0.15)) + #:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.2) + ("rust-rustc-serialize" ,rust-rustc-serialize-0.3) + ("rust-rustc-test" ,rust-rustc-test-0.3) + ("rust-typed-arena" ,rust-typed-arena-1.4)))))) + (define-public rust-http-0.2 (package (name "rust-http") -- cgit v1.2.3 From 151fb36a6354f872eae49396d67c227365651887 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 9 Jul 2020 17:07:50 +0200 Subject: gnu: sbcl-cl-webkit: Update to 20200708. * gnu/packages/lisp-xyz.scm (sbcl-cl-webkit): Update to 20200708. --- gnu/packages/lisp-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 05c85d0274..13c065c535 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -3133,10 +3133,10 @@ (define-public cl-cffi-gtk (sbcl-package->cl-source-package sbcl-cl-cffi-gtk)) (define-public sbcl-cl-webkit - (let ((commit "f93cb9697e8813068795fe4dc39ac950d814102d")) + (let ((commit "6c905a5550b58a5b7602da5a087d7dafc5337122")) (package (name "sbcl-cl-webkit") - (version (git-version "2.4" "3" commit)) + (version (git-version "2.4" "4" commit)) (source (origin (method git-fetch) @@ -3146,7 +3146,7 @@ (define-public sbcl-cl-webkit (file-name (git-file-name "cl-webkit" version)) (sha256 (base32 - "1sjcw08kjpd5h83sms7zcq2nymddjygk9hm2rpgzrl524an9ziwc")))) + "0017ijjflqqbgbj5bf7ffkyw5idhxc0ggly2qh5igf3kz886p9rh")))) (build-system asdf-build-system/sbcl) (inputs `(("cffi" ,sbcl-cffi) -- cgit v1.2.3 From 76946be021fd39b902c5d98495f4270549843d80 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 9 Jul 2020 17:08:05 +0200 Subject: gnu: emacs-helm-wordnut: Update to 20200708. * gnu/packages/emacs-xyz.scm (emacs-helm-wordnut): Update to 20200708. --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 9167ad1138..89fed81059 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -22838,10 +22838,10 @@ (define-public emacs-helm-selector (license license:gpl3+))) (define-public emacs-helm-wordnut - (let ((commit "6c64bd1220258d45f1b872cb1edb3071d16b2bc5")) + (let ((commit "9681a9535a839cd5d042c302945ae595852fe7bf")) (package (name "emacs-helm-wordnut") - (version "0.1") + (version (git-version "0.1" "1" commit)) (home-page "https://github.com/emacs-helm/helm-wordnut") (source (origin @@ -22852,7 +22852,7 @@ (define-public emacs-helm-wordnut (file-name (git-file-name name version)) (sha256 (base32 - "1a5gfzvc272lxnpzz14dsya387hgy7rrxxmkhmpxyng4rdg6gc4f")))) + "0msj7nbsb363pxamxi7n2z08cp5jizkpjbwia8f5a161wjglrihs")))) (build-system emacs-build-system) (inputs `(("wordnet" ,wordnet))) -- cgit v1.2.3 From 7077ac80caec9d8421cffe2caf7aebcb191de324 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 9 Jul 2020 16:33:38 +0200 Subject: gnu: giblib: Fix typo in home page URI. * gnu/packages/image.scm (giblib)[home-page]: Fix typo. --- gnu/packages/image.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 865fab1241..75b24ec0a0 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -996,7 +996,7 @@ (define-public giblib (home-page ;; This vanished page is universally accepted as giblib's home despite not ;; mentioning the package once. - (string-append "https://web.archive.org/web/20140907071208" + (string-append "https://web.archive.org/web/20140907071208/" "https://linuxbrit.co.uk/software/")) (synopsis "Wrapper library for imlib2") (description -- cgit v1.2.3 From 3786f2969b08b1d46f4d74fe873b16e20799896c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 9 Jul 2020 16:36:06 +0200 Subject: gnu: giblib: Fix synopsis & description. * gnu/packages/golang.scm (giblib)[synopsis, description]: Fix. --- gnu/packages/golang.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 8163950a26..c0d4b0abf9 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -1243,8 +1243,9 @@ (define-public go-github-com-spf13-afero (propagated-inputs `(("golang.org/x/text" ,go-golang-org-x-text))) (home-page "https://github.com/spf13/afero") - (synopsis "Filesystem abstraction for Go") - (description "Filesystem abstraction for Go") + (synopsis "File system abstraction for Go") + (description + "This package provides a file system abstraction for Go.") (license license:asl2.0))) (define-public go-github-com-spf13-cast -- cgit v1.2.3 From e892b9c3dc7915b77e7aa56a066dfdc856a7d69b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 9 Jul 2020 16:38:37 +0200 Subject: doc: cookbook: Fix ‘file system’ spelling. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * doc/guix-cookbook.texi (Getting help, Customizing the Kernel): Fix ‘file system’ spelling. --- doc/guix-cookbook.texi | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/guix-cookbook.texi b/doc/guix-cookbook.texi index 13ec2976a6..f541592d13 100644 --- a/doc/guix-cookbook.texi +++ b/doc/guix-cookbook.texi @@ -1288,7 +1288,7 @@ version or compilation options. @subsection Getting help Sadly, some applications can be tough to package. Sometimes they need a patch to -work with the non-standard filesystem hierarchy enforced by the store. +work with the non-standard file system hierarchy enforced by the store. Sometimes the tests won't run properly. (They can be skipped but this is not recommended.) Other times the resulting package won't be reproducible. @@ -1501,7 +1501,7 @@ custom kernel: @lisp (define %macbook41-full-config (append %macbook41-config-options - %filesystems + %file-systems %efi-support %emulation (@@@@ (gnu packages linux) %default-extra-linux-options))) @@ -1517,8 +1517,8 @@ custom kernel: #:extra-options %macbook41-config-options)) @end lisp -In the above example @code{%filesystems} is a collection of flags enabling -different filesystem support, @code{%efi-support} enables EFI support and +In the above example @code{%file-systems} is a collection of flags enabling +different file system support, @code{%efi-support} enables EFI support and @code{%emulation} enables a x86_64-linux machine to act in 32-bit mode also. @code{%default-extra-linux-options} are the ones quoted above, which had to be added in since they were replaced in the @code{extra-options} keyword. @@ -1582,7 +1582,7 @@ The second way to setup the kernel configuration makes more use of Guix's features and allows you to share configuration segments between different kernels. For example, all machines using EFI to boot have a number of EFI configuration flags that they need. It is likely that all the kernels will -share a list of filesystems to support. By using variables it is easier to +share a list of file systems to support. By using variables it is easier to see at a glance what features are enabled and to make sure you don't have features in one kernel but missing in another. -- cgit v1.2.3 From 87fd44b0cff8c964b31967f0e0f2d659e52270f3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 9 Jul 2020 16:43:36 +0200 Subject: gnu: go-github-com-rifflock-lfshook: Fix typo in description. * gnu/packages/golang.scm (go-github-com-rifflock-lfshook)[description]: Fix typo. --- gnu/packages/golang.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index c0d4b0abf9..58d6b00fc4 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -1536,7 +1536,7 @@ (define-public go-github-com-rifflock-lfshook (home-page "https://github.com/rifflock/lfshook") (synopsis "Local File System hook for Logrus logger") (description "This package provides a hook for Logrus to write directly to -a file on the filesystem. The log levels are dynamic at instantiation of the +a file on the file system. The log levels are dynamic at instantiation of the hook, so it is capable of logging at some or all levels.") (license license:expat))) -- cgit v1.2.3 From 052117f8b47b0940539cc9a70dc70aceab98582d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 9 Jul 2020 16:44:27 +0200 Subject: gnu: mergerfs: Fix typo in description. * gnu/packages/file-systems.scm (mergerfs)[synopsis, description]: Fix typo. --- gnu/packages/file-systems.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 6d395feaf5..943788a50e 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -801,8 +801,8 @@ (define-public mergerfs ;; mergerfs bundles a heavily modified copy of libfuse. (inputs `(("util-linux" ,util-linux))) (home-page "https://github.com/trapexit/mergerfs") - (synopsis "Featureful union filesystem") - (description "mergerfs is a union filesystem geared towards simplifying + (synopsis "Featureful union file system") + (description "mergerfs is a union file system geared towards simplifying storage and management of files across numerous commodity storage devices. It is similar to mhddfs, unionfs, and aufs.") (license (list -- cgit v1.2.3 From 026959f0557a841cc988a2237f9f86cb8c601c15 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 9 Jul 2020 16:45:12 +0200 Subject: gnu: gphotofs: Fix typo in description. * gnu/packages/file-systems.scm (gphotofs)[synopsis, description]: Fix typo. --- gnu/packages/file-systems.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 943788a50e..f986acc9d4 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -202,10 +202,10 @@ (define-public gphotofs `(("fuse" ,fuse) ("glib" ,glib) ("libgphoto2" ,libgphoto2))) - (synopsis "Virtual filesystem for libgphoto2 using FUSE") - (description "GPhotoFS is a FUSE filesystem module to mount your camera as -a filesystem on Linux. This allow using your camera with any tool able to read -from a mounted filesystem.") + (synopsis "Virtual file system for libgphoto2 using FUSE") + (description "GPhotoFS is a FUSE file system module to mount your camera as +a file system on Linux. This allow using your camera with any tool able to read +from a mounted file system.") (home-page "http://www.gphoto.org/proj/gphotofs/") (license license:gpl2+))) -- cgit v1.2.3 From a04deba2436bc7d127bf08e3621d9d93bfe2f4bf Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 9 Jul 2020 16:45:55 +0200 Subject: gnu: dump: Fix typo in description. * gnu/packages/backup.scm (dump)[synopsis, description]: Fix typo. --- gnu/packages/backup.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 74acd791ac..dacade5884 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -1053,12 +1053,12 @@ (define-public dump ("util-linux" ,util-linux "lib") ("e2fsprogs" ,e2fsprogs))) (home-page "https://dump.sourceforge.io/") - (synopsis "Ext2/3/4 filesystem dump/restore utilities") - (description "Dump examines files in a filesystem, determines which ones + (synopsis "Ext2/3/4 file system dump/restore utilities") + (description "Dump examines files in a file system, determines which ones need to be backed up, and copies those files to a specified disk, tape or other storage medium. Subsequent incremental backups can then be layered on top of the full backup. The restore command performs the inverse function of -dump; it can restore a full backup of a filesystem. Single files and +dump; it can restore a full backup of a file system. Single files and directory subtrees may also be restored from full or partial backups in interractive mode.") (license license:bsd-3))) -- cgit v1.2.3 From 4f4fb2151ef131c4bfccadb362a91319034968c8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 9 Jul 2020 16:49:03 +0200 Subject: doc: Fix typo. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * doc/contributing.texi (The Perfect Setup): Fix spelling & placement of ‘additionally’. --- doc/contributing.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/contributing.texi b/doc/contributing.texi index 2a73d2c47a..4049073b96 100644 --- a/doc/contributing.texi +++ b/doc/contributing.texi @@ -277,7 +277,7 @@ trigger string @code{origin...}, which can be expanded further. The @cindex insert or update copyright @cindex @code{M-x guix-copyright} @cindex @code{M-x copyright-update} -Additionaly we provide insertion and automatic update of a copyright in +We additionally provide insertion and automatic update of a copyright in @file{etc/copyright.el}. You may want to set your full name, mail, and load a file. -- cgit v1.2.3 From 286a3d6f52398cf79eb8c211c830ced57064948c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 9 Jul 2020 16:52:10 +0200 Subject: gnu: python-pathos: Fix typo in description. * gnu/packages/python-xyz.scm (python-pathos)[description]: Fix typo. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 98db6d9e51..074ea394e1 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -19016,9 +19016,9 @@ (define-public python-pathos (synopsis "Parallel graph management and execution in heterogeneous computing") (description - "Python-pathos is a framework for heterogenous computing. It provides a + "Python-pathos is a framework for heterogeneous computing. It provides a consistent high-level interface for configuring and launching parallel -computations across heterogenous resources. Python-pathos provides configurable +computations across heterogeneous resources. Python-pathos provides configurable launchers for parallel and distributed computing, where each launcher contains the syntactic logic to configure and launch jobs in an execution environment.") (license license:bsd-3))) -- cgit v1.2.3 From 71a5a1d1f66282f194b95c42292a9582b301eb91 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 9 Jul 2020 16:53:51 +0200 Subject: gnu: m2-planet: Fix typo in description. * gnu/packages/mes.scm (m2-planet)[description]: Fix typo. --- gnu/packages/mes.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 347aef0a8c..26704ecd58 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -315,7 +315,7 @@ (define-public m2-planet (description "M2-Planet, the PLAtform NEutral Transpiler, when combined with mescc-tools, compiles a subset of the C language into working binaries with -introspective steps inbetween. It is self-hosting and for bootstrapping it +introspective steps in between. It is self-hosting and for bootstrapping it also has an implementation in the M1 macro assembly language. M2-Planet is built as Phase-5 of the full source bootstrapping process and is capable of building GNU Mes.") -- cgit v1.2.3 From a9aa02874d95d481256829c7436c2768e57d697e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 9 Jul 2020 17:20:53 +0200 Subject: gnu: snd: Update to 20.5. * gnu/packages/audio.scm (snd): Update to 20.5. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index c96476857f..1fa11808e2 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3586,14 +3586,14 @@ (define-public bluez-alsa (define-public snd (package (name "snd") - (version "20.4") + (version "20.5") (source (origin (method url-fetch) (uri (string-append "ftp://ccrma-ftp.stanford.edu/pub/Lisp/" "snd-" version ".tar.gz")) (sha256 (base32 - "0irdizlng2s3akmxdbfxcbd93bbjz9543nh7fisszim6v0ks59d9")))) + "1frg64q2d8cia6v7jia7kahzx0apwdl0z252mzlbwqdz5960nv90")))) (build-system glib-or-gtk-build-system) (arguments `(#:tests? #f ; no tests -- cgit v1.2.3 From 5d5d68debcf0d266a27f47c478d5d22aab82de46 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 9 Jul 2020 19:45:08 +0200 Subject: gnu: tor: Update to 0.4.3.6 [fixes CVE-2020-15572]. * gnu/packages/tor.scm (tor): Update to 0.4.3.6. --- gnu/packages/tor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index 8f03dc4dd0..24d10cc417 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -54,14 +54,14 @@ (define-module (gnu packages tor) (define-public tor (package (name "tor") - (version "0.4.3.5") + (version "0.4.3.6") (source (origin (method url-fetch) (uri (string-append "https://dist.torproject.org/tor-" version ".tar.gz")) (sha256 (base32 - "0s6qspi102drn1nk3gfxs51x992xarc44gkfsi8y3l48wr50wsk1")))) + "0qmcrkjip0ywq77232m73pjwqiaj0q2klwklqlpbw575shvhcbba")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 1de23e55cd1b416b26686ce635541f3ea329e1cb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 9 Jul 2020 19:48:00 +0200 Subject: gnu: zutils: Fix test failure. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/compression.scm (zutils)[arguments]: Add a ‘disable-failing-tests’ phase. --- gnu/packages/compression.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 21b4b92862..e5ee5e70c6 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1994,6 +1994,14 @@ (define-public zutils (list "--sysconfdir=/etc") #:phases (modify-phases %standard-phases + (add-before 'check 'disable-failing-tests + ;; XXX ‘zgrep -L’ inverts the exit status too, which the test suite + ;; doesn't expect. Bug report probably stuck in moderation. + (lambda _ + (substitute* "testsuite/check.sh" + (("\"\\$\\{ZGREP\\}\" -N -L \"GNU\"") "true") + (("\"\\$\\{ZGREP\\}\" -N -L \"nx_pattern\"") "false")) + #t)) (replace 'install (lambda* (#:key make-flags outputs #:allow-other-keys) (apply invoke "make" "install" -- cgit v1.2.3 From 297aad07fee3b3562b7a84e0bc0bc49493ce31da Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 9 Jul 2020 19:48:25 +0200 Subject: gnu: dash: Update to 0.5.11.1. * gnu/packages/shells.scm (dash): Update to 0.5.11.1. --- gnu/packages/shells.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index b790a0cc18..2551d62406 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -64,14 +64,14 @@ (define-module (gnu packages shells) (define-public dash (package (name "dash") - (version "0.5.11") + (version "0.5.11.1") (source (origin (method url-fetch) (uri (string-append "http://gondor.apana.org.au/~herbert/dash/files/" "dash-" version ".tar.gz")) (sha256 - (base32 "1jwilfsy249d3q7fagg1ga4bgc2bg1fzw63r2nan0m77bznsdnad")) + (base32 "048n1rbw3v1ffzsw5mkc6zzvvf1csq7pcri7jraaqag38vqq3j3k")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 2f6504735b8f76572edf43c6a25dc6d23e013232 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 9 Jul 2020 19:48:39 +0200 Subject: gnu: zutils: Update to 1.9. * gnu/packages/compression.scm (zutils): Update to 1.9. --- gnu/packages/compression.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index e5ee5e70c6..730d6a53d8 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1980,14 +1980,13 @@ (define-public quazip (define-public zutils (package (name "zutils") - ;; Check and remove the lint-hidden-cve property when updating. - (version "1.8") + (version "1.9") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/zutils/zutils-" version ".tar.lz")) (sha256 - (base32 "0dx35mv78fgqgz6sszs05ng8ipz2xy09ry9vpmka2rmy08b7x907")))) + (base32 "0y2wm8wqr1wi1b1fv45dn50njv4q81p6ifx0279ji1bq56qkrn2r")))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -1995,8 +1994,7 @@ (define-public zutils #:phases (modify-phases %standard-phases (add-before 'check 'disable-failing-tests - ;; XXX ‘zgrep -L’ inverts the exit status too, which the test suite - ;; doesn't expect. Bug report probably stuck in moderation. + ;; XXX https://lists.nongnu.org/archive/html/zutils-bug/2020-07/msg00005.html (lambda _ (substitute* "testsuite/check.sh" (("\"\\$\\{ZGREP\\}\" -N -L \"GNU\"") "true") @@ -2011,7 +2009,6 @@ (define-public zutils (native-inputs ;; Needed to extract the source tarball and run the test suite. `(("lzip" ,lzip))) - (properties `((lint-hidden-cve . ("CVE-2018-1000637")))) (home-page "https://www.nongnu.org/zutils/zutils.html") (synopsis "Utilities that transparently operate on compressed files") (description -- cgit v1.2.3 From 0ff6b01ef26dbe5fc3c3de9697836a65626211b7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Jul 2020 17:13:57 +0300 Subject: gnu: Add rust-pretty-env-logger-0.4. * gnu/packages/crates-io.scm (rust-pretty-env-logger-0.4): New variable. (rust-pretty-env-logger-0.3): Inherit from rust-pretty-env-logger-0.4. --- gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index fabb81d8c9..f9ba452159 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -17657,8 +17657,32 @@ (define-public rust-pretty-assertions-0.2 replacements, adding colorful diffs.") (license (list license:expat license:asl2.0)))) +(define-public rust-pretty-env-logger-0.4 + (package + (name "rust-pretty-env-logger") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "pretty-env-logger" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "17gva1rlf9fhgr0jr19kv39f8bir3f4pa4jz02qbhl9qanwkcvcj")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-env-logger" ,rust-env-logger-0.7) + ("rust-log" ,rust-log-0.4)))) + (home-page "https://github.com/seanmonstar/pretty-env-logger") + (synopsis "Visually pretty env_logger") + (description "This package provides a visually pretty env_logger.") + (license (list license:expat license:asl2.0)))) + (define-public rust-pretty-env-logger-0.3 (package + (inherit rust-pretty-env-logger-0.4) (name "rust-pretty-env-logger") (version "0.3.1") (source @@ -17670,17 +17694,12 @@ (define-public rust-pretty-env-logger-0.3 (sha256 (base32 "0x4hyjlnvvhyk9m74iypzybm22w3dl2k8img4b956239n5vf8zki")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-log" ,rust-log-0.4) ("rust-chrono" ,rust-chrono-0.4) - ("rust-env-logger" ,rust-env-logger-0.6)))) - (home-page "https://github.com/seanmonstar/pretty-env-logger") - (synopsis "Visually pretty env_logger") - (description "This package provides a visually pretty env_logger.") - (license (list license:expat license:asl2.0)))) + ("rust-env-logger" ,rust-env-logger-0.6)))))) (define-public rust-prettytable-rs-0.8 (package -- cgit v1.2.3 From 3a963cdd330f9abb46c08dff6579c3400f4c4c64 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Jul 2020 19:29:59 +0300 Subject: gnu: rust-cbindgen: Update to 0.13.2. * gnu/packages/rust-apps.scm (rust-cbindgen): Update to 0.13.2. --- gnu/packages/rust-apps.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 1cf22f4a79..317d09555d 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -265,7 +265,7 @@ (define-public ripgrep (define-public rust-cbindgen (package (name "rust-cbindgen") - (version "0.13.1") + (version "0.13.2") (source (origin (method url-fetch) @@ -273,7 +273,7 @@ (define-public rust-cbindgen (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "0w70bnwwqyf9fr6z3rcs7m7ad791fmfmhxy828va0dkfwvamp59c")))) + "0673pq96hs7waavkv58v2pakpxpsfyjvbraa5kyl2b44phgdzcid")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From 366a23f8cef71c91c924520b35c39cf3f8a122d0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Jul 2020 19:31:21 +0300 Subject: gnu: rust-cargo-c: Update to 0.5.3. * gnu/packages/rust-apps.scm (rust-cargo-c): Update to 0.5.3. [arguments]: In cargo-inputs replace rust-cbindgen-0.12 with rust-cbindgen, rust-pretty-env-logger-0.3 with 0.4. --- gnu/packages/rust-apps.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 317d09555d..81b30e17c4 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -371,7 +371,7 @@ (define-public tokei (define-public rust-cargo-c (package (name "rust-cargo-c") - (version "0.5.2") + (version "0.5.3") (source (origin (method url-fetch) @@ -380,12 +380,12 @@ (define-public rust-cargo-c (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1is72jm0r73pqx2g3h1n6lvrcirwd91mmajsmb3jjg4jnayfkp0w")))) + "0hsag5g4qngm8alfil2dyvl5sagpqi5nb40c7bhwng2z8mv9r41k")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-cbindgen" ,rust-cbindgen-0.12) - ("rust-pretty-env-logger" ,rust-pretty-env-logger-0.3) + (("rust-cbindgen" ,rust-cbindgen) + ("rust-pretty-env-logger" ,rust-pretty-env-logger-0.4) ("rust-structopt" ,rust-structopt-0.3) ("rust-log" ,rust-log-0.4) ("rust-toml" ,rust-toml-0.5) -- cgit v1.2.3 From 378159375be3c95d0ec00efa557bb0b36f7d3be8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Jul 2020 22:14:26 +0300 Subject: gnu: Add rust-itertools-0.9. * gnu/packages/crates-io.scm (rust-itertools-0.9): New variable. (rust-itertools-0.8): Inherit from rust-itertools-0.9. --- gnu/packages/crates-io.scm | 48 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 39 insertions(+), 9 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f9ba452159..263e00bb40 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11049,8 +11049,46 @@ (define-public rust-iso8601-0.1 (description "Parsing ISO8601 dates using nom.") (license license:expat))) +(define-public rust-itertools-0.9 + (package + (name "rust-itertools") + (version "0.9.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "itertools" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0jyml7ygr7kijkcjdl3fk5f34y5h5jsavclim7l13zjiavw1hkr8")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-either" ,rust-either-1.5)) + #:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.3) + ("rust-permutohedron" ,rust-permutohedron-0.2) + ("rust-quickcheck" ,rust-quickcheck-0.9) + ("rust-rand" ,rust-rand-0.7)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-cargo-toml + (lambda _ + (substitute* "Cargo.toml" + (("=0.3.0") "0.3")) + #t))))) + (home-page + "https://github.com/rust-itertools/itertools") + (synopsis + "Extra iterator adaptors, iterator methods, free functions, and macros") + (description + "Extra iterator adaptors, iterator methods, free functions, and macros.") + (license (list license:expat license:asl2.0)))) + (define-public rust-itertools-0.8 (package + (inherit rust-itertools-0.9) (name "rust-itertools") (version "0.8.2") (source @@ -11062,7 +11100,6 @@ (define-public rust-itertools-0.8 (sha256 (base32 "1154j48aw913v5jnyhpxialxhdn2sfpl4d7bwididyb1r05jsspm")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs @@ -11070,14 +11107,7 @@ (define-public rust-itertools-0.8 #:cargo-development-inputs (("rust-permutohedron" ,rust-permutohedron-0.2) ("rust-quickcheck" ,rust-quickcheck-0.7) - ("rust-rand" ,rust-rand-0.6)))) - (home-page - "https://github.com/rust-itertools/itertools") - (synopsis - "Extra iterator adaptors, iterator methods, free functions, and macros") - (description - "Extra iterator adaptors, iterator methods, free functions, and macros.") - (license (list license:expat license:asl2.0)))) + ("rust-rand" ,rust-rand-0.6)))))) (define-public rust-itertools-0.7 (package -- cgit v1.2.3 From 27f976f4c0470b18dda39b88d23675c29ac4a991 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 9 Jul 2020 16:36:31 -0400 Subject: gnu: linux-libre@4.4: Update to 4.4.230. * gnu/packages/linux.scm (linux-libre-4.4-version): Update to 4.4.230. (linux-libre-4.4-pristine-source): Update hash. (deblob-scripts-4.4): Update to 4.4.230. --- gnu/packages/linux.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 94d3b37845..2e760088c2 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -228,7 +228,7 @@ (define deblob-scripts-4.9 (define deblob-scripts-4.4 (linux-libre-deblob-scripts - "4.4.213" + "4.4.230" (base32 "0x2j1i88am54ih2mk7gyl79g25l9zz4r08xhl482l3fvjj2irwbw") (base32 "0hhin1jpfkd6nwrb6xqxjzl3hdxy4pn8a15hy2d3d83yw6pflbsf"))) @@ -413,10 +413,10 @@ (define-public linux-libre-4.9-pristine-source (%upstream-linux-source version hash) deblob-scripts-4.9))) -(define-public linux-libre-4.4-version "4.4.229") +(define-public linux-libre-4.4-version "4.4.230") (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) - (hash (base32 "0crrawivri5i0ks7pg3snfjlxily4aimw5xzbzr5nlnsz0rjwhbq"))) + (hash (base32 "1qx74qli8yjc2rkb7kig79c1yv7pfqa8zi1wi0rndn4d4yk62cfa"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.4))) -- cgit v1.2.3 From 4b184d6ab4abd6e307117dee53cb3dc205fb4741 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 9 Jul 2020 16:38:04 -0400 Subject: gnu: linux-libre@4.9: Update to 4.9.230. * gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.230. (linux-libre-4.9-pristine-source): Update hash. (deblob-scripts-4.9): Update to 4.9.230. --- gnu/packages/linux.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 2e760088c2..0694675643 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -222,7 +222,7 @@ (define deblob-scripts-4.14 (define deblob-scripts-4.9 (linux-libre-deblob-scripts - "4.9.213" + "4.9.230" (base32 "1wvldzlv7q2xdbadas87dh593nxr4a8p5n0f8zpm72lja6w18hmg") (base32 "0fxajshb75siq39lj5h8xvhdj8lcmddkslwlyj65rhlwk6g2r4b2"))) @@ -405,10 +405,10 @@ (define-public linux-libre-4.14-pristine-source (%upstream-linux-source version hash) deblob-scripts-4.14))) -(define-public linux-libre-4.9-version "4.9.229") +(define-public linux-libre-4.9-version "4.9.230") (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "1p0g6zya8bdk2fds37x3fg7c5sk3sc18prq3jrrilnnrby1w4mij"))) + (hash (base32 "0z03djys7k3z6z55xrw8rj4mv5i4h763lckz2anwxwgbwdb95fnm"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -- cgit v1.2.3 From d27de3ad8fdca9de29824124e51e099058e53ea9 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 9 Jul 2020 16:38:38 -0400 Subject: gnu: linux-libre@4.14: Update to 4.14.188. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.188. (linux-libre-4.14-pristine-source): Update hash. (deblob-scripts-4.14): Update to 4.14.188. --- gnu/packages/linux.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 0694675643..5059faa9e3 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -216,7 +216,7 @@ (define deblob-scripts-4.19 (define deblob-scripts-4.14 (linux-libre-deblob-scripts - "4.14.170" + "4.14.188" (base32 "091jk9jkn9jf39bxpc7395bhcb7p96nkg3a8047380ki06lnfxh6") (base32 "1qij18inijj6c3ma8hv98yjagnzxdxyn134da9fd23ky8q6hbvky"))) @@ -397,10 +397,10 @@ (define-public linux-libre-4.19-pristine-source (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.187") +(define-public linux-libre-4.14-version "4.14.188") (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "1gal2kfyrq8c4dswlwnwmzc3ap6a7cjkyz8jgsm9d8gfx9sk88jv"))) + (hash (base32 "0jq6cyxa0mxnvd33gi66a4x3xlfsih2aaifa6yyvgldihw9y0vvn"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit v1.2.3 From 08dd717f77ec476af72308e95855e6455ad5086e Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 9 Jul 2020 16:39:11 -0400 Subject: gnu: linux-libre@4.19: Update to 4.19.132. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.132. (linux-libre-4.19-pristine-source): Update hash. (deblob-scripts-4.19): Update to 4.19.132. --- gnu/packages/linux.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 5059faa9e3..0193a1b4d1 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -210,7 +210,7 @@ (define deblob-scripts-5.4 (define deblob-scripts-4.19 (linux-libre-deblob-scripts - "4.19.103" + "4.19.132" (base32 "02zs405awaxydbapka4nz8h6lmnc0dahgczqsrs5s2bmzjyyqkcy") (base32 "1w2wgxblpq09i33qmqgw5v3r5rm9vkkygr6m0sgv4zgczk9s29wr"))) @@ -389,10 +389,10 @@ (define-public linux-libre-5.4-pristine-source (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.131") +(define-public linux-libre-4.19-version "4.19.132") (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "1fk4i7lkbblfbxyp8rmkihcax920hbbygk2xnq2038sbrkvbkpqr"))) + (hash (base32 "0i3xka0n26iqslvc8xzxlcig3gjwfprzgdwd1q3wrr1cjsafxmyp"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From 6137ee495633b520feadfd0b4672381e5c02fb45 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 9 Jul 2020 16:39:44 -0400 Subject: gnu: linux-libre@5.7: Update to 5.7.8. * gnu/packages/linux.scm (linux-libre-5.7-version): Update to 5.7.8. (linux-libre-5.7-pristine-source): Update hash. (deblob-scripts-5.7): Update to 5.7.8. --- gnu/packages/linux.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 0193a1b4d1..fd9ae94ccb 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -198,9 +198,9 @@ (define (linux-libre-deblob-scripts version (define deblob-scripts-5.7 (linux-libre-deblob-scripts - "5.7.1" - (base32 "1c0n39wg6xij4x63ppg0m80kfcffkn3iilm3chyiix09n9g7vb78") - (base32 "02is246xaql1br3kizqicrkp982nw4gdwpn7nlzjazvsmyd1hcv2"))) + "5.7.8" + (base32 "1gharhw104wxp9dxjkzzvsqc2xn44mc9yvacc3v7jh7b6bb0a64a") + (base32 "1n198gx18rxc7xflgiwya43inkwayc91pgb129kngfza8sm6v8ks"))) (define deblob-scripts-5.4 (linux-libre-deblob-scripts @@ -373,10 +373,10 @@ (define (%upstream-linux-source version hash) (sha256 hash))) -(define-public linux-libre-5.7-version "5.7.7") +(define-public linux-libre-5.7-version "5.7.8") (define-public linux-libre-5.7-pristine-source (let ((version linux-libre-5.7-version) - (hash (base32 "0zzff78fjn0a87lr1j11hx97gcpbf0q5qn0nalb3qd43j9kvjh7q"))) + (hash (base32 "1ijdhjik5hlaj8w32qf5x4gigf2aa6xkg68hckm5h1s0isw7gddg"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.7))) -- cgit v1.2.3 From 7828fe9d40696cb65102babc006024a509599f26 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 9 Jul 2020 16:40:27 -0400 Subject: gnu: linux-libre: Update to 5.4.51. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.51. (linux-libre-5.4-pristine-source): Update hash. (deblob-scripts-5.4): Update to 5.4.51. --- gnu/packages/linux.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index fd9ae94ccb..d0fe5ee57a 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -204,7 +204,7 @@ (define deblob-scripts-5.7 (define deblob-scripts-5.4 (linux-libre-deblob-scripts - "5.4.37" + "5.4.51" (base32 "0ckxn7k5zgcqk30dq943bnamr6a6zjbw2aqjl3x30f4kvh5f6k25") (base32 "10qb890is4z58vr8czh3xx69q62l3b3j38y410kgiw8nii3zx5lr"))) @@ -381,10 +381,10 @@ (define-public linux-libre-5.7-pristine-source (%upstream-linux-source version hash) deblob-scripts-5.7))) -(define-public linux-libre-5.4-version "5.4.50") +(define-public linux-libre-5.4-version "5.4.51") (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "1qm6m3ww7cxr0mqzma9swq6jax6anjy5vdh397my7x00x70z845d"))) + (hash (base32 "1786l83nwzjazr2rl5fwxpw9dzlggi33nnj9grmp4dnn9j5ym2wy"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit v1.2.3 From d283bb960f927dd5f7bb8b96bc697221e4e8ad39 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 9 Jul 2020 15:52:46 +0200 Subject: maint: Remove traces of "berlin.guixsd.org". The guixsd.org domain is no longer advertised since before in 1.0.0 release in May 2019. * etc/substitutes/berlin.guixsd.org.pub: Rename to... * etc/substitutes/berlin.guix.gnu.org.pub: ... this. * etc/substitutes/ci.guix.gnu.org.pub, etc/substitutes/ci.guix.info.pub: Adjust accordingly. * gnu/services/base.scm (%default-authorized-guix-keys): Likewise. * guix/build/download-nar.scm (urls-for-item): Likewise. * guix/self.scm (miscellaneous-files): Likewise. * Makefile.am (dist_pkgdata_DATA): Likewise. --- Makefile.am | 2 +- etc/substitutes/berlin.guix.gnu.org.pub | 6 ++++++ etc/substitutes/berlin.guixsd.org.pub | 6 ------ etc/substitutes/ci.guix.gnu.org.pub | 2 +- etc/substitutes/ci.guix.info.pub | 2 +- gnu/services/base.scm | 2 +- guix/build/download-nar.scm | 6 +++--- guix/self.scm | 8 ++++---- 8 files changed, 17 insertions(+), 17 deletions(-) create mode 100644 etc/substitutes/berlin.guix.gnu.org.pub delete mode 100644 etc/substitutes/berlin.guixsd.org.pub diff --git a/Makefile.am b/Makefile.am index 8988cdfa12..ee12725d5b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -523,7 +523,7 @@ check-system: $(GOBJECTS) # Public keys used to sign substitutes. dist_pkgdata_DATA = \ - etc/substitutes/berlin.guixsd.org.pub \ + etc/substitutes/berlin.guix.gnu.org.pub \ etc/substitutes/ci.guix.gnu.org.pub \ etc/substitutes/ci.guix.info.pub diff --git a/etc/substitutes/berlin.guix.gnu.org.pub b/etc/substitutes/berlin.guix.gnu.org.pub new file mode 100644 index 0000000000..f156a37b08 --- /dev/null +++ b/etc/substitutes/berlin.guix.gnu.org.pub @@ -0,0 +1,6 @@ +(public-key + (ecc + (curve Ed25519) + (q #8D156F295D24B0D9A86FA5741A840FF2D24F60F7B6C4134814AD55625971B394#) + ) + ) diff --git a/etc/substitutes/berlin.guixsd.org.pub b/etc/substitutes/berlin.guixsd.org.pub deleted file mode 100644 index f156a37b08..0000000000 --- a/etc/substitutes/berlin.guixsd.org.pub +++ /dev/null @@ -1,6 +0,0 @@ -(public-key - (ecc - (curve Ed25519) - (q #8D156F295D24B0D9A86FA5741A840FF2D24F60F7B6C4134814AD55625971B394#) - ) - ) diff --git a/etc/substitutes/ci.guix.gnu.org.pub b/etc/substitutes/ci.guix.gnu.org.pub index b1d1e4d763..0574f6dfab 120000 --- a/etc/substitutes/ci.guix.gnu.org.pub +++ b/etc/substitutes/ci.guix.gnu.org.pub @@ -1 +1 @@ -berlin.guixsd.org.pub \ No newline at end of file +berlin.guix.gnu.org.pub \ No newline at end of file diff --git a/etc/substitutes/ci.guix.info.pub b/etc/substitutes/ci.guix.info.pub index b1d1e4d763..0574f6dfab 120000 --- a/etc/substitutes/ci.guix.info.pub +++ b/etc/substitutes/ci.guix.info.pub @@ -1 +1 @@ -berlin.guixsd.org.pub \ No newline at end of file +berlin.guix.gnu.org.pub \ No newline at end of file diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 6ea7ef8e7e..83dc406aac 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -1481,7 +1481,7 @@ (define keys (define %default-authorized-guix-keys ;; List of authorized substitute keys. - (list (file-append guix "/share/guix/berlin.guixsd.org.pub"))) + (list (file-append guix "/share/guix/berlin.guix.gnu.org.pub"))) (define-record-type* guix-configuration make-guix-configuration diff --git a/guix/build/download-nar.scm b/guix/build/download-nar.scm index cb146038ad..f768a8c6dd 100644 --- a/guix/build/download-nar.scm +++ b/guix/build/download-nar.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017, 2019 Ludovic Courtès +;;; Copyright © 2017, 2019, 2020 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -42,10 +42,10 @@ (define (urls-for-item item) "Return the fallback nar URL for ITEM--e.g., \"/gnu/store/cabbag3…-foo-1.2-checkout\"." ;; Here we hard-code nar URLs without checking narinfos. That's probably OK - ;; though. Use berlin.guixsd.org instead of its ci.guix.gnu.org front end to + ;; though. Use berlin.guix.gnu.org instead of its ci.guix.gnu.org front end to ;; avoid sending these requests to CDN providers without user consent. ;; TODO: Use HTTPS? The downside is the extra dependency. - (let ((bases '("http://berlin.guixsd.org")) + (let ((bases '("http://berlin.guix.gnu.org")) (item (basename item))) (append (map (cut string-append <> "/nar/gzip/" item) bases) (map (cut string-append <> "/nar/" item) bases)))) diff --git a/guix/self.scm b/guix/self.scm index e1350a7403..f70b1ecdd8 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -647,13 +647,13 @@ (define (miscellaneous-files source) ,(file-append* source "/etc/completion/zsh/_guix")) ("share/fish/vendor_completions.d/guix.fish" ,(file-append* source "/etc/completion/fish/guix.fish")) - ("share/guix/berlin.guixsd.org.pub" + ("share/guix/berlin.guix.gnu.org.pub" ,(file-append* source - "/etc/substitutes/berlin.guixsd.org.pub")) + "/etc/substitutes/berlin.guix.gnu.org.pub")) ("share/guix/ci.guix.gnu.org.pub" ;alias - ,(file-append* source "/etc/substitutes/berlin.guixsd.org.pub")) + ,(file-append* source "/etc/substitutes/berlin.guix.gnu.org.pub")) ("share/guix/ci.guix.info.pub" ;alias - ,(file-append* source "/etc/substitutes/berlin.guixsd.org.pub"))))) + ,(file-append* source "/etc/substitutes/berlin.guix.gnu.org.pub"))))) (define* (whole-package name modules dependencies #:key -- cgit v1.2.3 From 722ad41c44a499d2250c79527ef7d069ca728de0 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 9 Jul 2020 17:19:52 +0200 Subject: swh: Allow callers to disable X.509 certificate verification. * guix/swh.scm (%verify-swh-certificate?): New parameter. (http-get*, http-post*): New procedures. (request-rate-limit-reached?): Use 'http-post*' instead of 'http-post'. (update-rate-limit-reset-time!): Likewise. (request-cooking): Likewise. (call): Method defaults to 'http-get*' instead of 'http-get'. Pass #:verify-certificate? to METHOD. (vault-fetch): Likewise. --- guix/swh.scm | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/guix/swh.scm b/guix/swh.scm index 913f0d1c9d..a343ccfdd7 100644 --- a/guix/swh.scm +++ b/guix/swh.scm @@ -35,6 +35,7 @@ (define-module (guix swh) #:use-module (ice-9 popen) #:use-module ((ice-9 ftw) #:select (scandir)) #:export (%swh-base-url + %verify-swh-certificate? %allow-request? request-rate-limit-reached? @@ -126,6 +127,10 @@ (define %swh-base-url ;; Presumably we won't need to change it. (make-parameter "https://archive.softwareheritage.org")) +(define %verify-swh-certificate? + ;; Whether to verify the X.509 HTTPS certificate for %SWH-BASE-URL. + (make-parameter #t)) + (define (swh-url path . rest) ;; URLs returned by the API may be relative or absolute. This has changed ;; without notice before. Handle both cases by detecting whether the path @@ -143,6 +148,13 @@ (define url url (string-append url "/"))) +;; XXX: Work around a bug in Guile 3.0.2 where #:verify-certificate? would +;; be ignored (). +(define* (http-get* uri #:rest rest) + (apply http-request uri #:method 'GET rest)) +(define* (http-post* uri #:rest rest) + (apply http-request uri #:method 'POST rest)) + (define %date-regexp ;; Match strings like "2014-11-17T22:09:38+01:00" or ;; "2018-09-30T23:20:07.815449+00:00"". @@ -179,7 +191,7 @@ (define string* (define %allow-request? ;; Takes a URL and method (e.g., the 'http-get' procedure) and returns true - ;; to keep going. This can be used to disallow a requests when + ;; to keep going. This can be used to disallow requests when ;; 'request-rate-limit-reached?' returns true, for instance. (make-parameter (const #t))) @@ -195,7 +207,7 @@ (define uri (string->uri url)) (define reset-time - (if (and (eq? method http-post) + (if (and (eq? method http-post*) (string-prefix? "/api/1/origin/save/" (uri-path uri))) %save-rate-limit-reset-time %general-rate-limit-reset-time)) @@ -208,21 +220,23 @@ (define (update-rate-limit-reset-time! url method response) (let ((uri (string->uri url))) (match (assq-ref (response-headers response) 'x-ratelimit-reset) ((= string->number (? number? reset)) - (if (and (eq? method http-post) + (if (and (eq? method http-post*) (string-prefix? "/api/1/origin/save/" (uri-path uri))) (set! %save-rate-limit-reset-time reset) (set! %general-rate-limit-reset-time reset))) (_ #f)))) -(define* (call url decode #:optional (method http-get) +(define* (call url decode #:optional (method http-get*) #:key (false-if-404? #t)) "Invoke the endpoint at URL using METHOD. Decode the resulting JSON body using DECODE, a one-argument procedure that takes an input port. When FALSE-IF-404? is true, return #f upon 404 responses." (and ((%allow-request?) url method) (let*-values (((response port) - (method url #:streaming? #t))) + (method url #:streaming? #t + #:verify-certificate? + (%verify-swh-certificate?)))) ;; See . (match (assq-ref (response-headers response) 'x-ratelimit-remaining) (#f #t) @@ -467,7 +481,7 @@ (define (directory-entry-target entry) (define* (save-origin url #:optional (type "git")) "Request URL to be saved." (call (swh-url "/api/1/origin/save" type "url" url) json->save-reply - http-post)) + http-post*)) (define-query (save-origin-status url type) "Return the status of a /save request for URL and TYPE (e.g., \"git\")." @@ -489,7 +503,7 @@ (define (request-cooking id kind) to the vault. Return a ." (call (swh-url "/api/1/vault" (symbol->string kind) id) json->vault-reply - http-post)) + http-post*)) (define* (vault-fetch id kind #:key (log-port (current-error-port))) @@ -508,8 +522,10 @@ (define* (vault-fetch id kind ('done ;; Fetch the bundle. (let-values (((response port) - (http-get (swh-url (vault-reply-fetch-url reply)) - #:streaming? #t))) + (http-get* (swh-url (vault-reply-fetch-url reply)) + #:streaming? #t + #:verify-certificate? + (%verify-swh-certificate?)))) (if (= (response-code response) 200) port (begin ;shouldn't happen -- cgit v1.2.3 From a7696b9733d4ede9817a0a0accb5ce5b85d9a2d3 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 9 Jul 2020 17:24:13 +0200 Subject: git-download: Don't verify X.509 certificate of SWH. Fixes . Regression introduced with the switch to Guile 3.0 in commit b6bee63bed4f013064c0d902e7c8b83ed7514ade. * guix/git-download.scm (git-fetch): Parameterize %VERIFY-SWH-CERTIFICATE. --- guix/git-download.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/guix/git-download.scm b/guix/git-download.scm index a1c1adf760..71ea1031c5 100644 --- a/guix/git-download.scm +++ b/guix/git-download.scm @@ -140,9 +140,11 @@ (define recursive? (download-nar #$output) ;; As a last resort, attempt to download from Software Heritage. + ;; Disable X.509 certificate verification to avoid depending + ;; on nss-certs--we're authenticating the checkout anyway. ;; XXX: Currently recursive checkouts are not supported. (and (not recursive?) - (begin + (parameterize ((%verify-swh-certificate? #f)) (format (current-error-port) "Trying to download from Software Heritage...~%") (swh-download (getenv "git url") (getenv "git commit") -- cgit v1.2.3 From a055604e6f65ee7085a5c1cecaea59ccc0f5acf5 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 9 Jul 2020 23:00:58 +0200 Subject: cve: Fix typos in accessor. * guix/cve.scm ()[references]: Rename accessor to 'cve-references' and fix adjust exported name accordingly. --- guix/cve.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guix/cve.scm b/guix/cve.scm index 903d94a8a6..7dd9005f09 100644 --- a/guix/cve.scm +++ b/guix/cve.scm @@ -45,7 +45,7 @@ (define-module (guix cve) cve-id cve-data-type cve-data-format - cvs-references + cve-references cve-reference? cve-reference-url @@ -88,7 +88,7 @@ (define-json-mapping cve cve? "data_type" string->symbol) (data-format cve-data-format ;'MITRE "data_format" string->symbol) - (references cve-item-references ;list of + (references cve-references ;list of "references" reference-data->cve-references)) (define-json-mapping cve-reference cve-reference? -- cgit v1.2.3 From 8d49c80b69258115da47d868cbd5b45c5d6b2180 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 10 Jul 2020 00:20:09 +0200 Subject: download-nar: Hide colliding 'dump-port*' binding. * guix/build/download-nar.scm: Hide 'dump-port*' from (guix serialization). --- guix/build/download-nar.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/build/download-nar.scm b/guix/build/download-nar.scm index f768a8c6dd..377e428341 100644 --- a/guix/build/download-nar.scm +++ b/guix/build/download-nar.scm @@ -19,7 +19,7 @@ (define-module (guix build download-nar) #:use-module (guix build download) #:use-module (guix build utils) - #:use-module (guix serialization) + #:use-module ((guix serialization) #:hide (dump-port*)) #:use-module (guix zlib) #:use-module (guix progress) #:use-module (web uri) -- cgit v1.2.3 From bce3c9748b4ba47cdb915492e5c7baaf3d3a2511 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Thu, 9 Jul 2020 16:07:30 -0700 Subject: gnu: u-boot: Update to 2020.07. * gnu/packages/bootloaders (u-boot): Update to 2020.07. (u-boot-pinebook-pro-rk3399): Remove patches. * gnu/packages/patches: u-boot-DT-for-Pinebook-Pro.patch, u-boot-add-boe-nv140fhmn49-display.patch, u-boot-gpio-keys-binding-cons.patch, u-boot-leds-common-binding-con.patch, u-boot-support-Pinebook-Pro-laptop.patch, u-boot-video-rockchip-fix-build.patch: Remove patches. u-boot-riscv64-fix-extlinux.patch: Refresh patch. * gnu/local.mk (dist_patch_DATA): Update accordingly. --- gnu/local.mk | 6 - gnu/packages/bootloaders.scm | 13 +- .../patches/u-boot-DT-for-Pinebook-Pro.patch | 1132 -------------------- .../u-boot-add-boe-nv140fhmn49-display.patch | 29 - .../patches/u-boot-gpio-keys-binding-cons.patch | 37 - .../patches/u-boot-leds-common-binding-con.patch | 115 -- .../patches/u-boot-riscv64-fix-extlinux.patch | 14 - .../u-boot-support-Pinebook-Pro-laptop.patch | 367 ------- .../patches/u-boot-video-rockchip-fix-build.patch | 48 - 9 files changed, 2 insertions(+), 1759 deletions(-) delete mode 100644 gnu/packages/patches/u-boot-DT-for-Pinebook-Pro.patch delete mode 100644 gnu/packages/patches/u-boot-add-boe-nv140fhmn49-display.patch delete mode 100644 gnu/packages/patches/u-boot-gpio-keys-binding-cons.patch delete mode 100644 gnu/packages/patches/u-boot-leds-common-binding-con.patch delete mode 100644 gnu/packages/patches/u-boot-support-Pinebook-Pro-laptop.patch delete mode 100644 gnu/packages/patches/u-boot-video-rockchip-fix-build.patch diff --git a/gnu/local.mk b/gnu/local.mk index a277e63fa4..cecc8bc4b1 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1568,12 +1568,6 @@ dist_patch_DATA = \ %D%/packages/patches/tuxpaint-stamps-path.patch \ %D%/packages/patches/twinkle-bcg729.patch \ %D%/packages/patches/u-boot-riscv64-fix-extlinux.patch \ - %D%/packages/patches/u-boot-DT-for-Pinebook-Pro.patch \ - %D%/packages/patches/u-boot-add-boe-nv140fhmn49-display.patch \ - %D%/packages/patches/u-boot-gpio-keys-binding-cons.patch \ - %D%/packages/patches/u-boot-leds-common-binding-con.patch \ - %D%/packages/patches/u-boot-support-Pinebook-Pro-laptop.patch \ - %D%/packages/patches/u-boot-video-rockchip-fix-build.patch \ %D%/packages/patches/ucx-tcp-iface-ioctl.patch \ %D%/packages/patches/udiskie-no-appindicator.patch \ %D%/packages/patches/ungoogled-chromium-system-jsoncpp.patch \ diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 07b406b42a..769238203c 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -446,7 +446,7 @@ (define-public dtc (define u-boot (package (name "u-boot") - (version "2020.04") + (version "2020.07") (source (origin (method url-fetch) (uri (string-append @@ -454,7 +454,7 @@ (define u-boot "u-boot-" version ".tar.bz2")) (sha256 (base32 - "0wjkasnz87q86hx93inspdjfjsinmxi87bcvj30c773x0fpjlwzy")))) + "0sjzy262x93aaqd6z24ziaq19xjjjk5f577ivf768vmvwsgbzxf1")))) (native-inputs `(("bc" ,bc) ("bison" ,bison) @@ -885,15 +885,6 @@ (define-public u-boot-pinebook-pro-rk3399 (let ((base (make-u-boot-package "pinebook-pro-rk3399" "aarch64-linux-gnu"))) (package (inherit base) - (source (origin - (inherit (package-source u-boot)) - (patches - (search-patches "u-boot-add-boe-nv140fhmn49-display.patch" - "u-boot-gpio-keys-binding-cons.patch" - "u-boot-leds-common-binding-con.patch" - "u-boot-DT-for-Pinebook-Pro.patch" - "u-boot-support-Pinebook-Pro-laptop.patch" - "u-boot-video-rockchip-fix-build.patch")))) (arguments (substitute-keyword-arguments (package-arguments base) ((#:phases phases) diff --git a/gnu/packages/patches/u-boot-DT-for-Pinebook-Pro.patch b/gnu/packages/patches/u-boot-DT-for-Pinebook-Pro.patch deleted file mode 100644 index f88d12f1e2..0000000000 --- a/gnu/packages/patches/u-boot-DT-for-Pinebook-Pro.patch +++ /dev/null @@ -1,1132 +0,0 @@ -From b128c2e0b480ee992fabe554d19cd471efb11095 Mon Sep 17 00:00:00 2001 -From: Peter Robinson -Date: Mon, 20 Apr 2020 20:27:35 +0100 -Origin: https://patchwork.ozlabs.org/project/uboot/patch/20200420192736.962307-5-pbrobinson@gmail.com/ -Subject: [PATCH 4/5] arm: dts: rockchip: Add initial DT for Pinebook Pro - -Sync initial support for Pinebook Pro device tree from Linux 5.7-rc1. - -Signed-off-by: Peter Robinson ---- - arch/arm/dts/Makefile | 1 + - arch/arm/dts/rk3399-pinebook-pro.dts | 1096 ++++++++++++++++++++++++++ - 2 files changed, 1097 insertions(+) - create mode 100644 arch/arm/dts/rk3399-pinebook-pro.dts - -diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile -index 820ee9733a..885bf0ef58 100644 ---- a/arch/arm/dts/Makefile -+++ b/arch/arm/dts/Makefile -@@ -125,6 +125,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3399) += \ - rk3399-nanopi-m4.dtb \ - rk3399-nanopi-neo4.dtb \ - rk3399-orangepi.dtb \ -+ rk3399-pinebook-pro.dtb \ - rk3399-puma-ddr1333.dtb \ - rk3399-puma-ddr1600.dtb \ - rk3399-puma-ddr1866.dtb \ -diff --git a/arch/arm/dts/rk3399-pinebook-pro.dts b/arch/arm/dts/rk3399-pinebook-pro.dts -new file mode 100644 -index 0000000000..294d21bf45 ---- /dev/null -+++ b/arch/arm/dts/rk3399-pinebook-pro.dts -@@ -0,0 +1,1096 @@ -+// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -+/* -+ * Copyright (c) 2017 Fuzhou Rockchip Electronics Co., Ltd. -+ * Copyright (c) 2018 Akash Gajjar -+ * Copyright (c) 2020 Tobias Schramm -+ */ -+ -+/dts-v1/; -+#include -+#include -+#include -+#include -+#include -+#include "rk3399.dtsi" -+#include "rk3399-opp.dtsi" -+ -+/ { -+ model = "Pine64 Pinebook Pro"; -+ compatible = "pine64,pinebook-pro", "rockchip,rk3399"; -+ -+ chosen { -+ stdout-path = "serial2:1500000n8"; -+ }; -+ -+ backlight: edp-backlight { -+ compatible = "pwm-backlight"; -+ power-supply = <&vcc_12v>; -+ pwms = <&pwm0 0 740740 0>; -+ }; -+ -+ edp_panel: edp-panel { -+ compatible = "boe,nv140fhmn49"; -+ backlight = <&backlight>; -+ enable-gpios = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&panel_en_gpio>; -+ power-supply = <&vcc3v3_panel>; -+ -+ ports { -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ port@0 { -+ reg = <0>; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ panel_in_edp: endpoint@0 { -+ reg = <0>; -+ remote-endpoint = <&edp_out_panel>; -+ }; -+ }; -+ }; -+ }; -+ -+ /* -+ * Use separate nodes for gpio-keys to allow for selective deactivation -+ * of wakeup sources via sysfs without disabling the whole key -+ */ -+ gpio-key-lid { -+ compatible = "gpio-keys"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&lidbtn_gpio>; -+ -+ lid { -+ debounce-interval = <20>; -+ gpios = <&gpio1 RK_PA1 GPIO_ACTIVE_LOW>; -+ label = "Lid"; -+ linux,code = ; -+ linux,input-type = ; -+ wakeup-event-action = ; -+ wakeup-source; -+ }; -+ }; -+ -+ gpio-key-power { -+ compatible = "gpio-keys"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pwrbtn_gpio>; -+ -+ power { -+ debounce-interval = <20>; -+ gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>; -+ label = "Power"; -+ linux,code = ; -+ wakeup-source; -+ }; -+ }; -+ -+ leds { -+ compatible = "gpio-leds"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pwrled_gpio &slpled_gpio>; -+ -+ green-led { -+ color = ; -+ default-state = "on"; -+ function = LED_FUNCTION_POWER; -+ gpios = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>; -+ label = "green:power"; -+ }; -+ -+ red-led { -+ color = ; -+ default-state = "off"; -+ function = LED_FUNCTION_STANDBY; -+ gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>; -+ label = "red:standby"; -+ panic-indicator; -+ retain-state-suspended; -+ }; -+ }; -+ -+ /* Power sequence for SDIO WiFi module */ -+ sdio_pwrseq: sdio-pwrseq { -+ compatible = "mmc-pwrseq-simple"; -+ clocks = <&rk808 1>; -+ clock-names = "ext_clock"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&wifi_enable_h_gpio>; -+ post-power-on-delay-ms = <100>; -+ power-off-delay-us = <500000>; -+ -+ /* WL_REG_ON on module */ -+ reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>; -+ }; -+ -+ /* Audio components */ -+ es8316-sound { -+ compatible = "simple-audio-card"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&hp_det_gpio>; -+ simple-audio-card,name = "rockchip,es8316-codec"; -+ simple-audio-card,format = "i2s"; -+ simple-audio-card,mclk-fs = <256>; -+ -+ simple-audio-card,widgets = -+ "Microphone", "Mic Jack", -+ "Headphone", "Headphones", -+ "Speaker", "Speaker"; -+ simple-audio-card,routing = -+ "MIC1", "Mic Jack", -+ "Headphones", "HPOL", -+ "Headphones", "HPOR", -+ "Speaker Amplifier INL", "HPOL", -+ "Speaker Amplifier INR", "HPOR", -+ "Speaker", "Speaker Amplifier OUTL", -+ "Speaker", "Speaker Amplifier OUTR"; -+ -+ simple-audio-card,hp-det-gpio = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>; -+ simple-audio-card,aux-devs = <&speaker_amp>; -+ simple-audio-card,pin-switches = "Speaker"; -+ -+ simple-audio-card,cpu { -+ sound-dai = <&i2s1>; -+ }; -+ -+ simple-audio-card,codec { -+ sound-dai = <&es8316>; -+ }; -+ }; -+ -+ speaker_amp: speaker-amplifier { -+ compatible = "simple-audio-amplifier"; -+ enable-gpios = <&gpio4 RK_PD3 GPIO_ACTIVE_HIGH>; -+ sound-name-prefix = "Speaker Amplifier"; -+ VCC-supply = <&pa_5v>; -+ }; -+ -+ /* Power tree */ -+ /* Root power source */ -+ vcc_sysin: vcc-sysin { -+ compatible = "regulator-fixed"; -+ regulator-name = "vcc_sysin"; -+ regulator-always-on; -+ regulator-boot-on; -+ }; -+ -+ /* Regulators supplied by vcc_sysin */ -+ /* LCD backlight supply */ -+ vcc_12v: vcc-12v { -+ compatible = "regulator-fixed"; -+ regulator-name = "vcc_12v"; -+ regulator-always-on; -+ regulator-boot-on; -+ regulator-min-microvolt = <12000000>; -+ regulator-max-microvolt = <12000000>; -+ vin-supply = <&vcc_sysin>; -+ -+ regulator-state-mem { -+ regulator-off-in-suspend; -+ }; -+ }; -+ -+ /* Main 3.3 V supply */ -+ vcc3v3_sys: wifi_bat: vcc3v3-sys { -+ compatible = "regulator-fixed"; -+ regulator-name = "vcc3v3_sys"; -+ regulator-always-on; -+ regulator-boot-on; -+ regulator-min-microvolt = <3300000>; -+ regulator-max-microvolt = <3300000>; -+ vin-supply = <&vcc_sysin>; -+ -+ regulator-state-mem { -+ regulator-on-in-suspend; -+ }; -+ }; -+ -+ /* 5 V USB power supply */ -+ vcc5v0_usb: pa_5v: vcc5v0-usb-regulator { -+ compatible = "regulator-fixed"; -+ enable-active-high; -+ gpio = <&gpio1 RK_PB5 GPIO_ACTIVE_HIGH>; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pwr_5v_gpio>; -+ regulator-name = "vcc5v0_usb"; -+ regulator-always-on; -+ regulator-min-microvolt = <5000000>; -+ regulator-max-microvolt = <5000000>; -+ vin-supply = <&vcc_sysin>; -+ -+ regulator-state-mem { -+ regulator-off-in-suspend; -+ }; -+ }; -+ -+ /* RK3399 logic supply */ -+ vdd_log: vdd-log { -+ compatible = "pwm-regulator"; -+ pwms = <&pwm2 0 25000 1>; -+ regulator-name = "vdd_log"; -+ regulator-always-on; -+ regulator-boot-on; -+ regulator-min-microvolt = <800000>; -+ regulator-max-microvolt = <1400000>; -+ vin-supply = <&vcc_sysin>; -+ -+ regulator-state-mem { -+ regulator-on-in-suspend; -+ }; -+ }; -+ -+ /* Regulators supplied by vcc3v3_sys */ -+ /* 0.9 V supply, always on */ -+ vcc_0v9: vcc-0v9 { -+ compatible = "regulator-fixed"; -+ regulator-name = "vcc_0v9"; -+ regulator-always-on; -+ regulator-boot-on; -+ regulator-min-microvolt = <900000>; -+ regulator-max-microvolt = <900000>; -+ vin-supply = <&vcc3v3_sys>; -+ }; -+ -+ /* S3 1.8 V supply, switched by vcc1v8_s3 */ -+ vcca1v8_s3: vcc1v8-s3 { -+ compatible = "regulator-fixed"; -+ regulator-name = "vcca1v8_s3"; -+ regulator-always-on; -+ regulator-boot-on; -+ regulator-min-microvolt = <1800000>; -+ regulator-max-microvolt = <1800000>; -+ vin-supply = <&vcc3v3_sys>; -+ }; -+ -+ /* micro SD card power */ -+ vcc3v0_sd: vcc3v0-sd { -+ compatible = "regulator-fixed"; -+ enable-active-high; -+ gpio = <&gpio0 RK_PA1 GPIO_ACTIVE_HIGH>; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&sdmmc0_pwr_h_gpio>; -+ regulator-name = "vcc3v0_sd"; -+ regulator-always-on; -+ regulator-min-microvolt = <3000000>; -+ regulator-max-microvolt = <3000000>; -+ vin-supply = <&vcc3v3_sys>; -+ -+ regulator-state-mem { -+ regulator-off-in-suspend; -+ }; -+ }; -+ -+ /* LCD panel power, called VCC3V3_S0 in schematic */ -+ vcc3v3_panel: vcc3v3-panel { -+ compatible = "regulator-fixed"; -+ enable-active-high; -+ gpio = <&gpio1 RK_PC6 GPIO_ACTIVE_HIGH>; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&lcdvcc_en_gpio>; -+ regulator-name = "vcc3v3_panel"; -+ regulator-always-on; -+ regulator-min-microvolt = <3300000>; -+ regulator-max-microvolt = <3300000>; -+ regulator-enable-ramp-delay = <100000>; -+ vin-supply = <&vcc3v3_sys>; -+ -+ regulator-state-mem { -+ regulator-off-in-suspend; -+ }; -+ }; -+ -+ /* M.2 adapter power, switched by vcc1v8_s3 */ -+ vcc3v3_ssd: vcc3v3-ssd { -+ compatible = "regulator-fixed"; -+ regulator-name = "vcc3v3_ssd"; -+ regulator-min-microvolt = <3300000>; -+ regulator-max-microvolt = <3300000>; -+ vin-supply = <&vcc3v3_sys>; -+ }; -+ -+ /* Regulators supplied by vcc5v0_usb */ -+ /* USB 3 port power supply regulator */ -+ vcc5v0_otg: vcc5v0-otg { -+ compatible = "regulator-fixed"; -+ enable-active-high; -+ gpio = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&vcc5v0_host_en_gpio>; -+ regulator-name = "vcc5v0_otg"; -+ regulator-always-on; -+ regulator-min-microvolt = <5000000>; -+ regulator-max-microvolt = <5000000>; -+ vin-supply = <&vcc5v0_usb>; -+ -+ regulator-state-mem { -+ regulator-off-in-suspend; -+ }; -+ }; -+ -+ /* Regulators supplied by vcc5v0_usb */ -+ /* Type C port power supply regulator */ -+ vbus_5vout: vbus_typec: vbus-5vout { -+ compatible = "regulator-fixed"; -+ enable-active-high; -+ gpio = <&gpio1 RK_PA3 GPIO_ACTIVE_HIGH>; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&vcc5v0_typec0_en_gpio>; -+ regulator-name = "vbus_5vout"; -+ regulator-min-microvolt = <5000000>; -+ regulator-max-microvolt = <5000000>; -+ vin-supply = <&vcc5v0_usb>; -+ -+ regulator-state-mem { -+ regulator-off-in-suspend; -+ }; -+ }; -+ -+ /* Regulators supplied by vcc_1v8 */ -+ /* Primary 0.9 V LDO */ -+ vcca0v9_s3: vcca0v9-s3 { -+ compatible = "regulator-fixed"; -+ regulator-name = "vcc0v9_s3"; -+ regulator-min-microvolt = <5000000>; -+ regulator-max-microvolt = <5000000>; -+ vin-supply = <&vcc_1v8>; -+ -+ regulator-state-mem { -+ regulator-on-in-suspend; -+ }; -+ }; -+ -+ mains_charger: dc-charger { -+ compatible = "gpio-charger"; -+ charger-type = "mains"; -+ gpios = <&gpio4 RK_PD0 GPIO_ACTIVE_LOW>; -+ -+ /* Also triggered by USB charger */ -+ pinctrl-names = "default"; -+ pinctrl-0 = <&dc_det_gpio>; -+ }; -+}; -+ -+&cdn_dp { -+ status = "okay"; -+}; -+ -+&cpu_b0 { -+ cpu-supply = <&vdd_cpu_b>; -+}; -+ -+&cpu_b1 { -+ cpu-supply = <&vdd_cpu_b>; -+}; -+ -+&cpu_l0 { -+ cpu-supply = <&vdd_cpu_l>; -+}; -+ -+&cpu_l1 { -+ cpu-supply = <&vdd_cpu_l>; -+}; -+ -+&cpu_l2 { -+ cpu-supply = <&vdd_cpu_l>; -+}; -+ -+&cpu_l3 { -+ cpu-supply = <&vdd_cpu_l>; -+}; -+ -+&edp { -+ force-hpd; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&edp_hpd>; -+ status = "okay"; -+ -+ ports { -+ edp_out: port@1 { -+ reg = <1>; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ edp_out_panel: endpoint@0 { -+ reg = <0>; -+ remote-endpoint = <&panel_in_edp>; -+ }; -+ }; -+ }; -+}; -+ -+&emmc_phy { -+ status = "okay"; -+}; -+ -+&gpu { -+ mali-supply = <&vdd_gpu>; -+ status = "okay"; -+}; -+ -+&hdmi_sound { -+ status = "okay"; -+}; -+ -+&i2c0 { -+ clock-frequency = <400000>; -+ i2c-scl-falling-time-ns = <4>; -+ i2c-scl-rising-time-ns = <168>; -+ status = "okay"; -+ -+ rk808: pmic@1b { -+ compatible = "rockchip,rk808"; -+ reg = <0x1b>; -+ #clock-cells = <1>; -+ clock-output-names = "xin32k", "rk808-clkout2"; -+ interrupt-parent = <&gpio3>; -+ interrupts = <10 IRQ_TYPE_LEVEL_LOW>; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pmic_int_l_gpio>; -+ rockchip,system-power-controller; -+ wakeup-source; -+ -+ vcc1-supply = <&vcc_sysin>; -+ vcc2-supply = <&vcc_sysin>; -+ vcc3-supply = <&vcc_sysin>; -+ vcc4-supply = <&vcc_sysin>; -+ vcc6-supply = <&vcc_sysin>; -+ vcc7-supply = <&vcc_sysin>; -+ vcc8-supply = <&vcc3v3_sys>; -+ vcc9-supply = <&vcc_sysin>; -+ vcc10-supply = <&vcc_sysin>; -+ vcc11-supply = <&vcc_sysin>; -+ vcc12-supply = <&vcc3v3_sys>; -+ vcc13-supply = <&vcc_sysin>; -+ vcc14-supply = <&vcc_sysin>; -+ -+ regulators { -+ /* rk3399 center logic supply */ -+ vdd_center: DCDC_REG1 { -+ regulator-name = "vdd_center"; -+ regulator-always-on; -+ regulator-boot-on; -+ regulator-min-microvolt = <750000>; -+ regulator-max-microvolt = <1350000>; -+ regulator-ramp-delay = <6001>; -+ -+ regulator-state-mem { -+ regulator-off-in-suspend; -+ }; -+ }; -+ -+ vdd_cpu_l: DCDC_REG2 { -+ regulator-name = "vdd_cpu_l"; -+ regulator-always-on; -+ regulator-boot-on; -+ regulator-min-microvolt = <750000>; -+ regulator-max-microvolt = <1350000>; -+ regulator-ramp-delay = <6001>; -+ -+ regulator-state-mem { -+ regulator-off-in-suspend; -+ }; -+ }; -+ -+ vcc_ddr: DCDC_REG3 { -+ regulator-name = "vcc_ddr"; -+ regulator-always-on; -+ regulator-boot-on; -+ -+ regulator-state-mem { -+ regulator-on-in-suspend; -+ }; -+ }; -+ -+ vcc_1v8: vcc_wl: DCDC_REG4 { -+ regulator-name = "vcc_1v8"; -+ regulator-always-on; -+ regulator-boot-on; -+ regulator-min-microvolt = <1800000>; -+ regulator-max-microvolt = <1800000>; -+ -+ regulator-state-mem { -+ regulator-on-in-suspend; -+ regulator-suspend-microvolt = <1800000>; -+ }; -+ }; -+ -+ /* not used */ -+ LDO_REG1 { -+ }; -+ -+ /* not used */ -+ LDO_REG2 { -+ }; -+ -+ vcc1v8_pmupll: LDO_REG3 { -+ regulator-name = "vcc1v8_pmupll"; -+ regulator-always-on; -+ regulator-boot-on; -+ regulator-min-microvolt = <1800000>; -+ regulator-max-microvolt = <1800000>; -+ -+ regulator-state-mem { -+ regulator-on-in-suspend; -+ regulator-suspend-microvolt = <1800000>; -+ }; -+ }; -+ -+ vcc_sdio: LDO_REG4 { -+ regulator-name = "vcc_sdio"; -+ regulator-always-on; -+ regulator-boot-on; -+ regulator-min-microvolt = <1800000>; -+ regulator-max-microvolt = <3000000>; -+ -+ regulator-state-mem { -+ regulator-on-in-suspend; -+ regulator-suspend-microvolt = <3000000>; -+ }; -+ }; -+ -+ vcca3v0_codec: LDO_REG5 { -+ regulator-name = "vcca3v0_codec"; -+ regulator-always-on; -+ regulator-boot-on; -+ regulator-min-microvolt = <3000000>; -+ regulator-max-microvolt = <3000000>; -+ -+ regulator-state-mem { -+ regulator-off-in-suspend; -+ }; -+ }; -+ -+ vcc_1v5: LDO_REG6 { -+ regulator-name = "vcc_1v5"; -+ regulator-always-on; -+ regulator-boot-on; -+ regulator-min-microvolt = <1500000>; -+ regulator-max-microvolt = <1500000>; -+ -+ regulator-state-mem { -+ regulator-on-in-suspend; -+ regulator-suspend-microvolt = <1500000>; -+ }; -+ }; -+ -+ vcca1v8_codec: LDO_REG7 { -+ regulator-name = "vcca1v8_codec"; -+ regulator-always-on; -+ regulator-boot-on; -+ regulator-min-microvolt = <1800000>; -+ regulator-max-microvolt = <1800000>; -+ -+ regulator-state-mem { -+ regulator-off-in-suspend; -+ }; -+ }; -+ -+ vcc_3v0: LDO_REG8 { -+ regulator-name = "vcc_3v0"; -+ regulator-always-on; -+ regulator-boot-on; -+ regulator-min-microvolt = <3000000>; -+ regulator-max-microvolt = <3000000>; -+ -+ regulator-state-mem { -+ regulator-on-in-suspend; -+ regulator-suspend-microvolt = <3000000>; -+ }; -+ }; -+ -+ vcc3v3_s3: SWITCH_REG1 { -+ regulator-name = "vcc3v3_s3"; -+ regulator-always-on; -+ regulator-boot-on; -+ -+ regulator-state-mem { -+ regulator-off-in-suspend; -+ }; -+ }; -+ -+ vcc3v3_s0: SWITCH_REG2 { -+ regulator-name = "vcc3v3_s0"; -+ regulator-always-on; -+ regulator-boot-on; -+ -+ regulator-state-mem { -+ regulator-off-in-suspend; -+ }; -+ }; -+ }; -+ }; -+ -+ vdd_cpu_b: regulator@40 { -+ compatible = "silergy,syr827"; -+ reg = <0x40>; -+ fcs,suspend-voltage-selector = <1>; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&vsel1_gpio>; -+ regulator-name = "vdd_cpu_b"; -+ regulator-always-on; -+ regulator-boot-on; -+ regulator-min-microvolt = <712500>; -+ regulator-max-microvolt = <1500000>; -+ regulator-ramp-delay = <1000>; -+ vin-supply = <&vcc_1v8>; -+ -+ regulator-state-mem { -+ regulator-off-in-suspend; -+ }; -+ }; -+ -+ vdd_gpu: regulator@41 { -+ compatible = "silergy,syr828"; -+ reg = <0x41>; -+ fcs,suspend-voltage-selector = <1>; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&vsel2_gpio>; -+ regulator-name = "vdd_gpu"; -+ regulator-always-on; -+ regulator-boot-on; -+ regulator-min-microvolt = <712500>; -+ regulator-max-microvolt = <1500000>; -+ regulator-ramp-delay = <1000>; -+ vin-supply = <&vcc_1v8>; -+ -+ regulator-state-mem { -+ regulator-off-in-suspend; -+ }; -+ }; -+}; -+ -+&i2c1 { -+ clock-frequency = <100000>; -+ i2c-scl-falling-time-ns = <4>; -+ i2c-scl-rising-time-ns = <168>; -+ status = "okay"; -+ -+ es8316: es8316@11 { -+ compatible = "everest,es8316"; -+ reg = <0x11>; -+ clocks = <&cru SCLK_I2S_8CH_OUT>; -+ clock-names = "mclk"; -+ #sound-dai-cells = <0>; -+ }; -+}; -+ -+&i2c3 { -+ i2c-scl-falling-time-ns = <15>; -+ i2c-scl-rising-time-ns = <450>; -+ status = "okay"; -+}; -+ -+&i2c4 { -+ i2c-scl-falling-time-ns = <20>; -+ i2c-scl-rising-time-ns = <600>; -+ status = "okay"; -+ -+ fusb0: fusb30x@22 { -+ compatible = "fcs,fusb302"; -+ reg = <0x22>; -+ fcs,int_n = <&gpio1 RK_PA2 GPIO_ACTIVE_HIGH>; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&fusb0_int_gpio>; -+ vbus-supply = <&vbus_typec>; -+ -+ connector { -+ compatible = "usb-c-connector"; -+ data-role = "host"; -+ label = "USB-C"; -+ op-sink-microwatt = <1000000>; -+ power-role = "dual"; -+ sink-pdos = -+ ; -+ source-pdos = -+ ; -+ try-power-role = "sink"; -+ -+ ports { -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ port@0 { -+ reg = <0>; -+ -+ usbc_hs: endpoint { -+ remote-endpoint = -+ <&u2phy0_typec_hs>; -+ }; -+ }; -+ -+ port@1 { -+ reg = <1>; -+ -+ usbc_ss: endpoint { -+ remote-endpoint = -+ <&tcphy0_typec_ss>; -+ }; -+ }; -+ -+ port@2 { -+ reg = <2>; -+ -+ usbc_dp: endpoint { -+ remote-endpoint = -+ <&tcphy0_typec_dp>; -+ }; -+ }; -+ }; -+ }; -+ }; -+}; -+ -+&i2s1 { -+ #sound-dai-cells = <0>; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&i2s_8ch_mclk_gpio>, <&i2s1_2ch_bus>; -+ rockchip,capture-channels = <8>; -+ rockchip,playback-channels = <8>; -+ status = "okay"; -+}; -+ -+&io_domains { -+ audio-supply = <&vcc_3v0>; -+ gpio1830-supply = <&vcc_3v0>; -+ sdmmc-supply = <&vcc_sdio>; -+ status = "okay"; -+}; -+ -+&pcie_phy { -+ status = "okay"; -+}; -+ -+&pcie0 { -+ bus-scan-delay-ms = <1000>; -+ ep-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>; -+ max-link-speed = <2>; -+ num-lanes = <4>; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pcie_clkreqn_cpm>; -+ vpcie0v9-supply = <&vcca0v9_s3>; -+ vpcie1v8-supply = <&vcca1v8_s3>; -+ vpcie3v3-supply = <&vcc3v3_ssd>; -+ status = "okay"; -+}; -+ -+&pinctrl { -+ buttons { -+ pwrbtn_gpio: pwrbtn-gpio { -+ rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>; -+ }; -+ -+ lidbtn_gpio: lidbtn-gpio { -+ rockchip,pins = <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>; -+ }; -+ }; -+ -+ dc-charger { -+ dc_det_gpio: dc-det-gpio { -+ rockchip,pins = <4 RK_PD0 RK_FUNC_GPIO &pcfg_pull_up>; -+ }; -+ }; -+ -+ es8316 { -+ hp_det_gpio: hp-det-gpio { -+ rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>; -+ }; -+ }; -+ -+ fusb302x { -+ fusb0_int_gpio: fusb0-int-gpio { -+ rockchip,pins = <1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>; -+ }; -+ }; -+ -+ i2s1 { -+ i2s_8ch_mclk_gpio: i2s-8ch-mclk-gpio { -+ rockchip,pins = <4 RK_PA0 1 &pcfg_pull_none>; -+ }; -+ }; -+ -+ lcd-panel { -+ lcdvcc_en_gpio: lcdvcc-en-gpio { -+ rockchip,pins = <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>; -+ }; -+ -+ panel_en_gpio: panel-en-gpio { -+ rockchip,pins = <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>; -+ }; -+ -+ lcd_panel_reset_gpio: lcd-panel-reset-gpio { -+ rockchip,pins = <4 RK_PD6 RK_FUNC_GPIO &pcfg_pull_up>; -+ }; -+ }; -+ -+ leds { -+ pwrled_gpio: pwrled_gpio { -+ rockchip,pins = <0 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>; -+ }; -+ -+ slpled_gpio: slpled_gpio { -+ rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>; -+ }; -+ }; -+ -+ pmic { -+ pmic_int_l_gpio: pmic-int-l-gpio { -+ rockchip,pins = <3 RK_PB2 RK_FUNC_GPIO &pcfg_pull_up>; -+ }; -+ -+ vsel1_gpio: vsel1-gpio { -+ rockchip,pins = <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>; -+ }; -+ -+ vsel2_gpio: vsel2-gpio { -+ rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>; -+ }; -+ }; -+ -+ sdcard { -+ sdmmc0_pwr_h_gpio: sdmmc0-pwr-h-gpio { -+ rockchip,pins = <0 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>; -+ }; -+ -+ }; -+ -+ sdio-pwrseq { -+ wifi_enable_h_gpio: wifi-enable-h-gpio { -+ rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>; -+ }; -+ }; -+ -+ usb-typec { -+ vcc5v0_typec0_en_gpio: vcc5v0-typec0-en-gpio { -+ rockchip,pins = <1 RK_PA3 RK_FUNC_GPIO &pcfg_pull_up>; -+ }; -+ }; -+ -+ usb2 { -+ pwr_5v_gpio: pwr-5v-gpio { -+ rockchip,pins = <1 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>; -+ }; -+ -+ vcc5v0_host_en_gpio: vcc5v0-host-en-gpio { -+ rockchip,pins = <4 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>; -+ }; -+ }; -+ -+ wireless-bluetooth { -+ bt_wake_gpio: bt-wake-gpio { -+ rockchip,pins = <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>; -+ }; -+ -+ bt_host_wake_gpio: bt-host-wake-gpio { -+ rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>; -+ }; -+ -+ bt_reset_gpio: bt-reset-gpio { -+ rockchip,pins = <0 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>; -+ }; -+ }; -+}; -+ -+&pmu_io_domains { -+ pmu1830-supply = <&vcc_3v0>; -+ status = "okay"; -+}; -+ -+&pwm0 { -+ status = "okay"; -+}; -+ -+&pwm2 { -+ status = "okay"; -+}; -+ -+&saradc { -+ vref-supply = <&vcca1v8_s3>; -+ status = "okay"; -+}; -+ -+&sdmmc { -+ bus-width = <4>; -+ cap-mmc-highspeed; -+ cap-sd-highspeed; -+ cd-gpios = <&gpio0 RK_PA7 GPIO_ACTIVE_LOW>; -+ disable-wp; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_bus4>; -+ sd-uhs-sdr104; -+ vmmc-supply = <&vcc3v0_sd>; -+ vqmmc-supply = <&vcc_sdio>; -+ status = "okay"; -+}; -+ -+&sdio0 { -+ bus-width = <4>; -+ cap-sd-highspeed; -+ cap-sdio-irq; -+ keep-power-in-suspend; -+ mmc-pwrseq = <&sdio_pwrseq>; -+ non-removable; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&sdio0_bus4 &sdio0_cmd &sdio0_clk>; -+ sd-uhs-sdr104; -+ status = "okay"; -+}; -+ -+&sdhci { -+ bus-width = <8>; -+ mmc-hs200-1_8v; -+ non-removable; -+ status = "okay"; -+}; -+ -+&spi1 { -+ max-freq = <10000000>; -+ status = "okay"; -+ -+ spiflash: flash@0 { -+ compatible = "jedec,spi-nor"; -+ reg = <0>; -+ m25p,fast-read; -+ spi-max-frequency = <10000000>; -+ }; -+}; -+ -+&tcphy0 { -+ status = "okay"; -+}; -+ -+&tcphy0_dp { -+ port { -+ tcphy0_typec_dp: endpoint { -+ remote-endpoint = <&usbc_dp>; -+ }; -+ }; -+}; -+ -+&tcphy0_usb3 { -+ port { -+ tcphy0_typec_ss: endpoint { -+ remote-endpoint = <&usbc_ss>; -+ }; -+ }; -+}; -+ -+&tcphy1 { -+ status = "okay"; -+}; -+ -+&tsadc { -+ /* tshut mode 0:CRU 1:GPIO */ -+ rockchip,hw-tshut-mode = <1>; -+ /* tshut polarity 0:LOW 1:HIGH */ -+ rockchip,hw-tshut-polarity = <1>; -+ status = "okay"; -+}; -+ -+&u2phy0 { -+ status = "okay"; -+ -+ u2phy0_otg: otg-port { -+ status = "okay"; -+ }; -+ -+ u2phy0_host: host-port { -+ phy-supply = <&vcc5v0_otg>; -+ status = "okay"; -+ }; -+ -+ port { -+ u2phy0_typec_hs: endpoint { -+ remote-endpoint = <&usbc_hs>; -+ }; -+ }; -+}; -+ -+&u2phy1 { -+ status = "okay"; -+ -+ u2phy1_otg: otg-port { -+ status = "okay"; -+ }; -+ -+ u2phy1_host: host-port { -+ phy-supply = <&vcc5v0_otg>; -+ status = "okay"; -+ }; -+}; -+ -+&uart0 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&uart0_xfer &uart0_cts &uart0_rts>; -+ uart-has-rtscts; -+ status = "okay"; -+ -+ bluetooth { -+ compatible = "brcm,bcm4345c5"; -+ clocks = <&rk808 1>; -+ clock-names = "lpo"; -+ device-wakeup-gpios = <&gpio2 RK_PD3 GPIO_ACTIVE_HIGH>; -+ host-wakeup-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_HIGH>; -+ max-speed = <1500000>; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&bt_host_wake_gpio &bt_wake_gpio &bt_reset_gpio>; -+ shutdown-gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>; -+ vbat-supply = <&wifi_bat>; -+ vddio-supply = <&vcc_wl>; -+ }; -+}; -+ -+&uart2 { -+ status = "okay"; -+}; -+ -+&usb_host0_ehci { -+ status = "okay"; -+}; -+ -+&usb_host0_ohci { -+ status = "okay"; -+}; -+ -+&usb_host1_ehci { -+ status = "okay"; -+}; -+ -+&usb_host1_ohci { -+ status = "okay"; -+}; -+ -+&usbdrd3_0 { -+ status = "okay"; -+}; -+ -+&usbdrd_dwc3_0 { -+ dr_mode = "host"; -+ status = "okay"; -+}; -+ -+&usbdrd3_1 { -+ status = "okay"; -+}; -+ -+&usbdrd_dwc3_1 { -+ dr_mode = "host"; -+ status = "okay"; -+}; -+ -+&vopb { -+ status = "okay"; -+}; -+ -+&vopb_mmu { -+ status = "okay"; -+}; -+ -+&vopl { -+ status = "okay"; -+}; -+ -+&vopl_mmu { -+ status = "okay"; -+}; --- -2.20.1 - diff --git a/gnu/packages/patches/u-boot-add-boe-nv140fhmn49-display.patch b/gnu/packages/patches/u-boot-add-boe-nv140fhmn49-display.patch deleted file mode 100644 index c359522967..0000000000 --- a/gnu/packages/patches/u-boot-add-boe-nv140fhmn49-display.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 00978950fed39b6104b6b4f141450a66cc3400fa Mon Sep 17 00:00:00 2001 -From: Peter Robinson -Date: Mon, 20 Apr 2020 20:27:32 +0100 -Origin: https://patchwork.ozlabs.org/project/uboot/patch/20200420192736.962307-2-pbrobinson@gmail.com/ -Subject: [PATCH 1/5] video: simple_panel: add boe,nv140fhmn49 display - -add "boe,nv140fhmn49" display to compatible node. - -Signed-off-by: Peter Robinson -Cc: Anatolij Gustschin ---- - drivers/video/simple_panel.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/video/simple_panel.c b/drivers/video/simple_panel.c -index c3c0e84732..5722811117 100644 ---- a/drivers/video/simple_panel.c -+++ b/drivers/video/simple_panel.c -@@ -105,6 +105,7 @@ static const struct udevice_id simple_panel_ids[] = { - { .compatible = "auo,b133xtn01" }, - { .compatible = "auo,b116xw03" }, - { .compatible = "auo,b133htn01" }, -+ { .compatible = "boe,nv140fhmn49" }, - { .compatible = "lg,lb070wv8" }, - { } - }; --- -2.20.1 - diff --git a/gnu/packages/patches/u-boot-gpio-keys-binding-cons.patch b/gnu/packages/patches/u-boot-gpio-keys-binding-cons.patch deleted file mode 100644 index aec33a7023..0000000000 --- a/gnu/packages/patches/u-boot-gpio-keys-binding-cons.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 451bd72bf966df7518682cb748a804634ea19424 Mon Sep 17 00:00:00 2001 -From: Peter Robinson -Date: Mon, 20 Apr 2020 20:27:33 +0100 -Origin: https://patchwork.ozlabs.org/project/uboot/patch/20200420192736.962307-3-pbrobinson@gmail.com/ -Subject: [PATCH 2/5] dt-bindings: input: adopt Linux gpio-keys binding - constants - -Sync the gpio-keys input bindings from linux 5.7-rc1. - -Signed-off-by: Peter Robinson ---- - include/dt-bindings/input/gpio-keys.h | 13 +++++++++++++ - 1 file changed, 13 insertions(+) - create mode 100644 include/dt-bindings/input/gpio-keys.h - -diff --git a/include/dt-bindings/input/gpio-keys.h b/include/dt-bindings/input/gpio-keys.h -new file mode 100644 -index 0000000000..8962df79e7 ---- /dev/null -+++ b/include/dt-bindings/input/gpio-keys.h -@@ -0,0 +1,13 @@ -+/* SPDX-License-Identifier: GPL-2.0 */ -+/* -+ * This header provides constants for gpio keys bindings. -+ */ -+ -+#ifndef _DT_BINDINGS_GPIO_KEYS_H -+#define _DT_BINDINGS_GPIO_KEYS_H -+ -+#define EV_ACT_ANY 0x00 /* asserted or deasserted */ -+#define EV_ACT_ASSERTED 0x01 /* asserted */ -+#define EV_ACT_DEASSERTED 0x02 /* deasserted */ -+ -+#endif /* _DT_BINDINGS_GPIO_KEYS_H */ --- -2.20.1 - diff --git a/gnu/packages/patches/u-boot-leds-common-binding-con.patch b/gnu/packages/patches/u-boot-leds-common-binding-con.patch deleted file mode 100644 index 837408120b..0000000000 --- a/gnu/packages/patches/u-boot-leds-common-binding-con.patch +++ /dev/null @@ -1,115 +0,0 @@ -From 282b6ca04abbe1302d04caa05be5fc5afb127141 Mon Sep 17 00:00:00 2001 -From: Peter Robinson -Date: Mon, 20 Apr 2020 20:27:34 +0100 -Origin: https://patchwork.ozlabs.org/project/uboot/patch/20200420192736.962307-4-pbrobinson@gmail.com/ -Subject: [PATCH 3/5] dt-bindings: leds: adopt Linux leds common binding - constants - -Sync the common leds bindings from linux 5.7-rc1. - -Signed-off-by: Peter Robinson ---- - include/dt-bindings/leds/common.h | 91 +++++++++++++++++++++++++++++++ - 1 file changed, 91 insertions(+) - create mode 100644 include/dt-bindings/leds/common.h - -diff --git a/include/dt-bindings/leds/common.h b/include/dt-bindings/leds/common.h -new file mode 100644 -index 0000000000..0ce7dfc00d ---- /dev/null -+++ b/include/dt-bindings/leds/common.h -@@ -0,0 +1,91 @@ -+/* SPDX-License-Identifier: GPL-2.0 */ -+/* -+ * This header provides macros for the common LEDs device tree bindings. -+ * -+ * Copyright (C) 2015, Samsung Electronics Co., Ltd. -+ * Author: Jacek Anaszewski -+ * -+ * Copyright (C) 2019 Jacek Anaszewski -+ * Copyright (C) 2020 Pavel Machek -+ */ -+ -+#ifndef __DT_BINDINGS_LEDS_H -+#define __DT_BINDINGS_LEDS_H -+ -+/* External trigger type */ -+#define LEDS_TRIG_TYPE_EDGE 0 -+#define LEDS_TRIG_TYPE_LEVEL 1 -+ -+/* Boost modes */ -+#define LEDS_BOOST_OFF 0 -+#define LEDS_BOOST_ADAPTIVE 1 -+#define LEDS_BOOST_FIXED 2 -+ -+/* Standard LED colors */ -+#define LED_COLOR_ID_WHITE 0 -+#define LED_COLOR_ID_RED 1 -+#define LED_COLOR_ID_GREEN 2 -+#define LED_COLOR_ID_BLUE 3 -+#define LED_COLOR_ID_AMBER 4 -+#define LED_COLOR_ID_VIOLET 5 -+#define LED_COLOR_ID_YELLOW 6 -+#define LED_COLOR_ID_IR 7 -+#define LED_COLOR_ID_MAX 8 -+ -+/* Standard LED functions */ -+/* Keyboard LEDs, usually it would be input4::capslock etc. */ -+/* Obsolete equivalent: "shift-key-light" */ -+#define LED_FUNCTION_CAPSLOCK "capslock" -+#define LED_FUNCTION_SCROLLLOCK "scrolllock" -+#define LED_FUNCTION_NUMLOCK "numlock" -+/* Obsolete equivalents: "tpacpi::thinklight" (IBM/Lenovo Thinkpads), -+ "lp5523:kb{1,2,3,4,5,6}" (Nokia N900) */ -+#define LED_FUNCTION_KBD_BACKLIGHT "kbd_backlight" -+ -+/* System LEDs, usually found on system body. -+ platform::mute (etc) is sometimes seen, :mute would be better */ -+#define LED_FUNCTION_POWER "power" -+#define LED_FUNCTION_DISK "disk" -+ -+/* Obsolete: "platform:*:charging" (allwinner sun50i) */ -+#define LED_FUNCTION_CHARGING "charging" -+/* Used RGB notification LEDs common on phones. -+ Obsolete equivalents: "status-led:{red,green,blue}" (Motorola Droid 4), -+ "lp5523:{r,g,b}" (Nokia N900) */ -+#define LED_FUNCTION_STATUS "status" -+ -+#define LED_FUNCTION_MICMUTE "micmute" -+#define LED_FUNCTION_MUTE "mute" -+ -+/* Miscelleaus functions. Use functions above if you can. */ -+#define LED_FUNCTION_ACTIVITY "activity" -+#define LED_FUNCTION_ALARM "alarm" -+#define LED_FUNCTION_BACKLIGHT "backlight" -+#define LED_FUNCTION_BLUETOOTH "bluetooth" -+#define LED_FUNCTION_BOOT "boot" -+#define LED_FUNCTION_CPU "cpu" -+#define LED_FUNCTION_DEBUG "debug" -+#define LED_FUNCTION_DISK_ACTIVITY "disk-activity" -+#define LED_FUNCTION_DISK_ERR "disk-err" -+#define LED_FUNCTION_DISK_READ "disk-read" -+#define LED_FUNCTION_DISK_WRITE "disk-write" -+#define LED_FUNCTION_FAULT "fault" -+#define LED_FUNCTION_FLASH "flash" -+#define LED_FUNCTION_HEARTBEAT "heartbeat" -+#define LED_FUNCTION_INDICATOR "indicator" -+#define LED_FUNCTION_LAN "lan" -+#define LED_FUNCTION_MAIL "mail" -+#define LED_FUNCTION_MTD "mtd" -+#define LED_FUNCTION_PANIC "panic" -+#define LED_FUNCTION_PROGRAMMING "programming" -+#define LED_FUNCTION_RX "rx" -+#define LED_FUNCTION_SD "sd" -+#define LED_FUNCTION_STANDBY "standby" -+#define LED_FUNCTION_TORCH "torch" -+#define LED_FUNCTION_TX "tx" -+#define LED_FUNCTION_USB "usb" -+#define LED_FUNCTION_WAN "wan" -+#define LED_FUNCTION_WLAN "wlan" -+#define LED_FUNCTION_WPS "wps" -+ -+#endif /* __DT_BINDINGS_LEDS_H */ --- -2.20.1 - diff --git a/gnu/packages/patches/u-boot-riscv64-fix-extlinux.patch b/gnu/packages/patches/u-boot-riscv64-fix-extlinux.patch index 3feeb1dc5e..29dec4f5e9 100644 --- a/gnu/packages/patches/u-boot-riscv64-fix-extlinux.patch +++ b/gnu/packages/patches/u-boot-riscv64-fix-extlinux.patch @@ -16,7 +16,6 @@ Signed-off-by: David Abdurachmanov --- configs/qemu-riscv64_smode_defconfig | 2 ++ configs/sifive_fu540_defconfig | 2 ++ - include/configs/sifive-fu540.h | 4 ---- 3 files changed, 4 insertions(+), 4 deletions(-) Index: u-boot/configs/qemu-riscv64_smode_defconfig @@ -39,16 +38,3 @@ Index: u-boot/configs/sifive_fu540_defconfig CONFIG_DM_MTD=y +CONFIG_USE_PREBOOT=y +CONFIG_PREBOOT="setenv fdt_addr ${fdtcontroladdr}; fdt addr ${fdtcontroladdr};" -Index: u-boot/include/configs/sifive-fu540.h -=================================================================== ---- u-boot.orig/include/configs/sifive-fu540.h -+++ u-boot/include/configs/sifive-fu540.h -@@ -40,8 +40,4 @@ - "ramdisk_addr_r=0x88300000\0" \ - BOOTENV - --#define CONFIG_PREBOOT \ -- "setenv fdt_addr ${fdtcontroladdr};" \ -- "fdt addr ${fdtcontroladdr};" -- - #endif /* __CONFIG_H */ diff --git a/gnu/packages/patches/u-boot-support-Pinebook-Pro-laptop.patch b/gnu/packages/patches/u-boot-support-Pinebook-Pro-laptop.patch deleted file mode 100644 index c6f91fa65a..0000000000 --- a/gnu/packages/patches/u-boot-support-Pinebook-Pro-laptop.patch +++ /dev/null @@ -1,367 +0,0 @@ -From 60381e4add64dddbd07e78248b2b0f819eb2776e Mon Sep 17 00:00:00 2001 -From: Peter Robinson -Date: Mon, 20 Apr 2020 20:27:36 +0100 -Origin: https://patchwork.ozlabs.org/project/uboot/patch/20200420192736.962307-6-pbrobinson@gmail.com/ -Subject: [PATCH 5/5] Add initial support for the Pinebook Pro laptop from - Pine64. - -Specification: -- Rockchip RK3399 -- 4GB Dual-Channel LPDDR4 -- eMMC socket -- mSD card slot -- 128Mbit (16Mb) SPI Flash -- AP6256 for 11AC WiFi + BT5 -- 14 inch 1920*1080 eDP MiPi display -- Camera -- USB 3.0, 2.0 ports -- Type-C port with alt-mode display (DP 1.2) and 15W charge -- DC 5V/3A -- optional PCIe slot for NVMe SSD drive - -Signed-off-by: Peter Robinson ---- - arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi | 43 ++++++++++ - arch/arm/mach-rockchip/rk3399/Kconfig | 8 ++ - board/pine64/pinebook-pro-rk3399/Kconfig | 15 ++++ - board/pine64/pinebook-pro-rk3399/MAINTAINERS | 8 ++ - board/pine64/pinebook-pro-rk3399/Makefile | 1 + - .../pinebook-pro-rk3399/pinebook-pro-rk3399.c | 76 +++++++++++++++++ - configs/pinebook-pro-rk3399_defconfig | 84 +++++++++++++++++++ - include/configs/pinebook-pro-rk3399.h | 29 +++++++ - 8 files changed, 264 insertions(+) - create mode 100644 arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi - create mode 100644 board/pine64/pinebook-pro-rk3399/Kconfig - create mode 100644 board/pine64/pinebook-pro-rk3399/MAINTAINERS - create mode 100644 board/pine64/pinebook-pro-rk3399/Makefile - create mode 100644 board/pine64/pinebook-pro-rk3399/pinebook-pro-rk3399.c - create mode 100644 configs/pinebook-pro-rk3399_defconfig - create mode 100644 include/configs/pinebook-pro-rk3399.h - -diff --git a/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi b/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi -new file mode 100644 -index 0000000000..1a2e24d3ef ---- /dev/null -+++ b/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi -@@ -0,0 +1,43 @@ -+// SPDX-License-Identifier: GPL-2.0+ -+/* -+ * Copyright (C) 2019 Peter Robinson -+ */ -+ -+#include "rk3399-u-boot.dtsi" -+#include "rk3399-sdram-lpddr4-100.dtsi" -+ -+/ { -+ aliases { -+ spi0 = &spi1; -+ }; -+ -+ chosen { -+ u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc; -+ }; -+}; -+ -+&i2c0 { -+ u-boot,dm-pre-reloc; -+}; -+ -+&rk808 { -+ u-boot,dm-pre-reloc; -+}; -+ -+&sdhci { -+ max-frequency = <25000000>; -+ u-boot,dm-pre-reloc; -+}; -+ -+&sdmmc { -+ max-frequency = <20000000>; -+ u-boot,dm-pre-reloc; -+}; -+ -+&spiflash { -+ u-boot,dm-pre-reloc; -+}; -+ -+&vdd_log { -+ regulator-init-microvolt = <950000>; -+}; -diff --git a/arch/arm/mach-rockchip/rk3399/Kconfig b/arch/arm/mach-rockchip/rk3399/Kconfig -index 927bb62a9f..254b9c5b4d 100644 ---- a/arch/arm/mach-rockchip/rk3399/Kconfig -+++ b/arch/arm/mach-rockchip/rk3399/Kconfig -@@ -19,6 +19,13 @@ config TARGET_EVB_RK3399 - with full function and physical connectors support like Type-C ports, - USB.0 host ports, LVDS, JTAG, MAC, SD card, HDMI, USB-to-serial... - -+config TARGET_PINEBOOK_PRO_RK3399 -+ bool "Pinebook Pro" -+ help -+ Pinebook Pro is a laptop based on the Rockchip rk3399 SoC -+ with 4Gb RAM, onboard eMMC, USB-C, a USB3 and USB2 port, -+ 1920*1080 screen and all the usual laptop features. -+ - config TARGET_PUMA_RK3399 - bool "Theobroma Systems RK3399-Q7 (Puma)" - help -@@ -144,6 +151,7 @@ endif # BOOTCOUNT_LIMIT - - source "board/firefly/roc-pc-rk3399/Kconfig" - source "board/google/gru/Kconfig" -+source "board/pine64/pinebook-pro-rk3399/Kconfig" - source "board/pine64/rockpro64_rk3399/Kconfig" - source "board/rockchip/evb_rk3399/Kconfig" - source "board/theobroma-systems/puma_rk3399/Kconfig" -diff --git a/board/pine64/pinebook-pro-rk3399/Kconfig b/board/pine64/pinebook-pro-rk3399/Kconfig -new file mode 100644 -index 0000000000..3bb7ca448e ---- /dev/null -+++ b/board/pine64/pinebook-pro-rk3399/Kconfig -@@ -0,0 +1,15 @@ -+if TARGET_PINEBOOK_PRO_RK3399 -+ -+config SYS_BOARD -+ default "pinebook-pro-rk3399" -+ -+config SYS_VENDOR -+ default "pine64" -+ -+config SYS_CONFIG_NAME -+ default "pinebook-pro-rk3399" -+ -+config BOARD_SPECIFIC_OPTIONS -+ def_bool y -+ -+endif -diff --git a/board/pine64/pinebook-pro-rk3399/MAINTAINERS b/board/pine64/pinebook-pro-rk3399/MAINTAINERS -new file mode 100644 -index 0000000000..7153eaf2e0 ---- /dev/null -+++ b/board/pine64/pinebook-pro-rk3399/MAINTAINERS -@@ -0,0 +1,8 @@ -+PINEBOOK_PRO -+M: Peter Robinson -+S: Maintained -+F: board/pine64/rk3399-pinebook-pro/ -+F: include/configs/rk3399-pinebook-pro.h -+F: arch/arm/dts/rk3399-pinebook-pro.dts -+F: arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi -+F: configs/pinebook-pro-rk3399_defconfig -diff --git a/board/pine64/pinebook-pro-rk3399/Makefile b/board/pine64/pinebook-pro-rk3399/Makefile -new file mode 100644 -index 0000000000..2f692a12a6 ---- /dev/null -+++ b/board/pine64/pinebook-pro-rk3399/Makefile -@@ -0,0 +1 @@ -+obj-y += pinebook-pro-rk3399.o -diff --git a/board/pine64/pinebook-pro-rk3399/pinebook-pro-rk3399.c b/board/pine64/pinebook-pro-rk3399/pinebook-pro-rk3399.c -new file mode 100644 -index 0000000000..01421cbac2 ---- /dev/null -+++ b/board/pine64/pinebook-pro-rk3399/pinebook-pro-rk3399.c -@@ -0,0 +1,76 @@ -+/* -+ * (C) Copyright 2016 Rockchip Electronics Co., Ltd -+ * (C) Copyright 2020 Peter Robinson -+ * -+ * SPDX-License-Identifier: GPL-2.0+ -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#define GRF_IO_VSEL_BT565_SHIFT 0 -+#define PMUGRF_CON0_VSEL_SHIFT 8 -+ -+#ifndef CONFIG_SPL_BUILD -+int board_early_init_f(void) -+{ -+ struct udevice *regulator; -+ int ret; -+ -+ ret = regulator_get_by_platname("vcc5v0_usb", ®ulator); -+ if (ret) { -+ debug("%s vcc5v0_usb init fail! ret %d\n", __func__, ret); -+ goto out; -+ } -+ -+ ret = regulator_set_enable(regulator, true); -+ if (ret) -+ debug("%s vcc5v0-host-en-gpio set fail! ret %d\n", __func__, ret); -+ -+out: -+ return 0; -+} -+#endif -+ -+#ifdef CONFIG_MISC_INIT_R -+static void setup_iodomain(void) -+{ -+ struct rk3399_grf_regs *grf = -+ syscon_get_first_range(ROCKCHIP_SYSCON_GRF); -+ struct rk3399_pmugrf_regs *pmugrf = -+ syscon_get_first_range(ROCKCHIP_SYSCON_PMUGRF); -+ -+ /* BT565 is in 1.8v domain */ -+ rk_setreg(&grf->io_vsel, 1 << GRF_IO_VSEL_BT565_SHIFT); -+ -+ /* Set GPIO1 1.8v/3.0v source select to PMU1830_VOL */ -+ rk_setreg(&pmugrf->soc_con0, 1 << PMUGRF_CON0_VSEL_SHIFT); -+} -+ -+int misc_init_r(void) -+{ -+ const u32 cpuid_offset = 0x7; -+ const u32 cpuid_length = 0x10; -+ u8 cpuid[cpuid_length]; -+ int ret; -+ -+ setup_iodomain(); -+ -+ ret = rockchip_cpuid_from_efuse(cpuid_offset, cpuid_length, cpuid); -+ if (ret) -+ return ret; -+ -+ ret = rockchip_cpuid_set(cpuid, cpuid_length); -+ if (ret) -+ return ret; -+ -+ return ret; -+} -+#endif -diff --git a/configs/pinebook-pro-rk3399_defconfig b/configs/pinebook-pro-rk3399_defconfig -new file mode 100644 -index 0000000000..0e9f0ec250 ---- /dev/null -+++ b/configs/pinebook-pro-rk3399_defconfig -@@ -0,0 +1,84 @@ -+CONFIG_ARM=y -+CONFIG_ARCH_ROCKCHIP=y -+CONFIG_SYS_TEXT_BASE=0x00200000 -+CONFIG_ENV_OFFSET=0x3F8000 -+CONFIG_ROCKCHIP_RK3399=y -+CONFIG_RAM_RK3399_LPDDR4=y -+CONFIG_NR_DRAM_BANKS=1 -+CONFIG_TARGET_PINEBOOK_PRO_RK3399=y -+CONFIG_BAUDRATE=1500000 -+CONFIG_DEBUG_UART=y -+CONFIG_DEBUG_UART_SHIFT=2 -+CONFIG_DEBUG_UART_BASE=0xFF1A0000 -+CONFIG_DEBUG_UART_CLOCK=24000000 -+CONFIG_SPL_SPI_SUPPORT=y -+CONFIG_SPL_SPI_FLASH_SUPPORT=y -+CONFIG_SPL_MTD_SUPPORT=y -+CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-pinebook-pro.dtb" -+CONFIG_MISC_INIT_R=y -+CONFIG_DISPLAY_BOARDINFO_LATE=y -+# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set -+CONFIG_SPL_STACK_R=y -+CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000 -+CONFIG_TPL=y -+CONFIG_SPL_OF_CONTROL=y -+CONFIG_DEFAULT_DEVICE_TREE="rk3399-pinebook-pro" -+CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y -+CONFIG_CMD_BOOTZ=y -+CONFIG_CMD_GPIO=y -+CONFIG_CMD_GPT=y -+CONFIG_CMD_I2C=y -+CONFIG_CMD_MMC=y -+CONFIG_CMD_MTDPARTS=y -+CONFIG_CMD_PMIC=y -+CONFIG_CMD_REGULATOR=y -+# CONFIG_CMD_SETEXPR is not set -+CONFIG_CMD_SF=y -+CONFIG_CMD_TIME=y -+CONFIG_CMD_USB=y -+CONFIG_ROCKCHIP_GPIO=y -+CONFIG_SYS_I2C_ROCKCHIP=y -+CONFIG_BOOTDELAY=3 -+CONFIG_LED=y -+CONFIG_LED_GPIO=y -+CONFIG_MISC=y -+CONFIG_ROCKCHIP_EFUSE=y -+CONFIG_MMC_DW=y -+CONFIG_MMC_DW_ROCKCHIP=y -+CONFIG_MMC_SDHCI=y -+CONFIG_MMC_SDHCI_SDMA=y -+CONFIG_MMC_SDHCI_ROCKCHIP=y -+CONFIG_ROCKCHIP_SPI=y -+CONFIG_SF_DEFAULT_SPEED=20000000 -+CONFIG_SPI_FLASH=y -+CONFIG_SPI_FLASH_GIGADEVICE=y -+CONFIG_SPI_FLASH_WINBOND=y -+CONFIG_DM_ETH=y -+CONFIG_PMIC_RK8XX=y -+CONFIG_DM_PMIC_FAN53555=y -+CONFIG_REGULATOR_PWM=y -+CONFIG_REGULATOR_RK8XX=y -+CONFIG_PWM_ROCKCHIP=y -+CONFIG_SYSRESET=y -+CONFIG_USB=y -+CONFIG_USB_XHCI_HCD=y -+CONFIG_USB_XHCI_DWC3=y -+# CONFIG_USB_XHCI_ROCKCHIP is not set -+CONFIG_USB_EHCI_HCD=y -+CONFIG_USB_EHCI_GENERIC=y -+CONFIG_USB_DWC3=y -+CONFIG_ROCKCHIP_USB2_PHY=y -+CONFIG_USB_HOST_ETHER=y -+CONFIG_USB_ETHER_ASIX=y -+CONFIG_USB_ETHER_RTL8152=y -+CONFIG_USB_KEYBOARD=y -+CONFIG_USE_TINY_PRINTF=y -+CONFIG_SPL_TINY_MEMSET=y -+CONFIG_ERRNO_STR=y -+CONFIG_DM_VIDEO=y -+CONFIG_VIDEO_BPP16=y -+CONFIG_VIDEO_BPP32=y -+CONFIG_DISPLAY=y -+CONFIG_VIDEO_ROCKCHIP=y -+CONFIG_DISPLAY_ROCKCHIP_EDP=y -diff --git a/include/configs/pinebook-pro-rk3399.h b/include/configs/pinebook-pro-rk3399.h -new file mode 100644 -index 0000000000..423d742a79 ---- /dev/null -+++ b/include/configs/pinebook-pro-rk3399.h -@@ -0,0 +1,29 @@ -+/* -+ * Copyright (C) 2016 Rockchip Electronics Co., Ltd -+ * Copyright (C) 2020 Peter Robinson -+ * -+ * SPDX-License-Identifier: GPL-2.0+ -+ */ -+ -+#ifndef __PINEBOOK_PRO_RK3399_H -+#define __PINEBOOK_PRO_RK3399_H -+ -+#define ROCKCHIP_DEVICE_SETTINGS \ -+ "stdin=serial,usbkbd\0" \ -+ "stdout=serial,vidconsole\0" \ -+ "stderr=serial,vidconsole\0" -+ -+#include -+ -+#if defined(CONFIG_ENV_IS_IN_MMC) -+#define CONFIG_SYS_MMC_ENV_DEV 0 -+#elif defined(CONFIG_ENV_IS_IN_SPI_FLASH) -+#define CONFIG_ENV_SECT_SIZE (8 * 1024) -+#endif -+ -+#undef CONFIG_SYS_SPI_U_BOOT_OFFS -+#define CONFIG_SYS_SPI_U_BOOT_OFFS 1024 * 512 -+ -+#define SDRAM_BANK_SIZE (2UL << 30) -+ -+#endif --- -2.20.1 - diff --git a/gnu/packages/patches/u-boot-video-rockchip-fix-build.patch b/gnu/packages/patches/u-boot-video-rockchip-fix-build.patch deleted file mode 100644 index ca2be8dc22..0000000000 --- a/gnu/packages/patches/u-boot-video-rockchip-fix-build.patch +++ /dev/null @@ -1,48 +0,0 @@ -From ecc69ec25df07e1ce63d7add6b235b37673ed608 Mon Sep 17 00:00:00 2001 -From: Peter Robinson -Date: Mon, 20 Apr 2020 19:18:25 +0100 -Origin: https://patchwork.ozlabs.org/project/uboot/patch/20200420181825.935797-1-pbrobinson@gmail.com/ -Subject: [PATCH 6/6] drivers: video: rockchip: fix building eDP and LVDS - drivers - -The rk_edp.c and rk_lvds.c files reference rk_setreg which is declared in -hardware.h so include it so the drivers build. Adjust rk_lvds.c so -includes are in alphabetical order while updating. - -Signed-off-by: Peter Robinson -Reviewed-by: Anatolij Gustschin ---- - drivers/video/rockchip/rk_edp.c | 1 + - drivers/video/rockchip/rk_lvds.c | 3 ++- - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/drivers/video/rockchip/rk_edp.c b/drivers/video/rockchip/rk_edp.c -index 8703df0ec0..cf84b886e7 100644 ---- a/drivers/video/rockchip/rk_edp.c -+++ b/drivers/video/rockchip/rk_edp.c -@@ -18,6 +18,7 @@ - #include - #include - #include -+#include - #include - - #define MAX_CR_LOOP 5 -diff --git a/drivers/video/rockchip/rk_lvds.c b/drivers/video/rockchip/rk_lvds.c -index cf5c0439b1..79e24baf53 100644 ---- a/drivers/video/rockchip/rk_lvds.c -+++ b/drivers/video/rockchip/rk_lvds.c -@@ -13,8 +13,9 @@ - #include - #include - #include --#include - #include -+#include -+#include - #include - #include - --- -2.20.1 - -- cgit v1.2.3 From dce70d0e355176508c67440207689d8c0ac28c9a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 9 Jul 2020 21:37:40 +0200 Subject: gnu: qbittorrent: Update to 4.2.5. * gnu/packages/bittorrent.scm (qbittorrent): Update to 4.2.5. --- gnu/packages/bittorrent.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index 52160b9025..3314a6a823 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -416,7 +416,7 @@ (define-public libtorrent-rasterbar (define-public qbittorrent (package (name "qbittorrent") - (version "4.2.1") + (version "4.2.5") (source (origin (method git-fetch) @@ -425,7 +425,7 @@ (define-public qbittorrent (commit (string-append "release-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0bz4l7awkx4qf3gh9c8gj8fab989439zj8qy4x9r36wxdjg5cxil")))) + (base32 "1n613ylg6i9gisgk0dbr2kpfasyizrkdjff1r8smd4vri2qrdksn")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From b324c5b2b227e94fa648ae6378e517eb8dd1ff57 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 10 Jul 2020 02:14:48 +0200 Subject: gnu: cryptsetup: Update to 2.3.3. * gnu/packages/cryptsetup.scm (cryptsetup): Update to 2.3.3. [inputs]: Use the default json-c version. --- gnu/packages/cryptsetup.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cryptsetup.scm b/gnu/packages/cryptsetup.scm index 67e40cbc40..57333ea13d 100644 --- a/gnu/packages/cryptsetup.scm +++ b/gnu/packages/cryptsetup.scm @@ -35,7 +35,7 @@ (define-module (gnu packages cryptsetup) (define-public cryptsetup (package (name "cryptsetup") - (version "2.3.1") + (version "2.3.3") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/linux/utils/cryptsetup/v" @@ -43,7 +43,7 @@ (define-public cryptsetup "/cryptsetup-" version ".tar.xz")) (sha256 (base32 - "1lp7kwakm3ssp8ww1y33plvfmpas5krf14pdz91p1kx2b7as9awj")))) + "1pw2bq4nv2z3xyycckxkbp7dp9kkp2n6bspna3plryg277z4zjiv")))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -58,7 +58,7 @@ (define-public cryptsetup `(("pkg-config" ,pkg-config))) (inputs `(("argon2" ,argon2) - ("json-c" ,json-c-0.13) ;XXX update this for cryptsetup >= 2.3 + ("json-c" ,json-c) ("libgcrypt" ,libgcrypt) ("lvm2" ,lvm2) ; device-mapper ("popt" ,popt) -- cgit v1.2.3 From 1e8b8dcf558ef9ba7dbcf59f34cab6c5415df36d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 9 Jul 2020 20:34:19 +0200 Subject: gnu: bats: Define TAP. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/bash.scm (bats)[description]: Use @acronym{TAP, …}. --- gnu/packages/bash.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index b331676f7a..1bc636a10b 100644 --- a/gnu/packages/bash.scm +++ b/gnu/packages/bash.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2014, 2015, 2018 Mark H Weaver ;;; Copyright © 2015, 2017 Leo Famulari ;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. @@ -409,8 +409,9 @@ (define-public bats (build-system trivial-build-system) (home-page "https://github.com/bats-core/bats-core/") (synopsis "Bash Automated Testing System") - (description "Bats is a TAP-compliant testing framework for Bash. It -provides a simple way to verify that the UNIX programs you write behave as -expected. Bats is most useful when testing software written in Bash, but you -can use it to test any UNIX program.") + (description + "Bats is a @acronym{TAP, Test Anything Protocol}-compliant testing +framework for Bash. It provides a simple way to verify that the UNIX programs +you write behave as expected. Bats is most useful when testing software written +in Bash, but you can use it to test any UNIX program.") (license expat))) -- cgit v1.2.3 From 3f4f0770512b286523a398e3f9f3eb6441f44b17 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 10 Jul 2020 00:15:42 -0400 Subject: gnu: linux-libre: Fix regression with Atheros 9271. * gnu/packages/patches/linux-libre-fix-atheros-9271.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/linux.scm (%linux-libre-fix-atheros-9271-patch): New variable. (linux-libre-4.4-source, linux-libre-4.9-source) (linux-libre-4.14-source, linux-libre-4.19-source) (linux-libre-5.4-source, linux-libre-5.7-source): Add the patch. --- gnu/local.mk | 1 + gnu/packages/linux.scm | 19 +- .../patches/linux-libre-fix-atheros-9271.patch | 225 +++++++++++++++++++++ 3 files changed, 240 insertions(+), 5 deletions(-) create mode 100644 gnu/packages/patches/linux-libre-fix-atheros-9271.patch diff --git a/gnu/local.mk b/gnu/local.mk index cecc8bc4b1..5c3b391960 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1238,6 +1238,7 @@ dist_patch_DATA = \ %D%/packages/patches/lierolibre-try-building-other-arch.patch \ %D%/packages/patches/linkchecker-tests-require-network.patch \ %D%/packages/patches/linphoneqt-tabbutton.patch \ + %D%/packages/patches/linux-libre-fix-atheros-9271.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/linux.scm b/gnu/packages/linux.scm index d0fe5ee57a..bd7cbf183f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -443,6 +443,9 @@ (define %linux-libre-arm-export-__sync_icache_dcache-patch (sha256 (base32 "1ifnfhpakzffn4b8n7x7w5cps9mzjxlkcfz9zqak2vaw8nzvl39f")))) +(define %linux-libre-fix-atheros-9271-patch + (search-patch "linux-libre-fix-atheros-9271.patch")) + (define (source-with-patches source patches) (origin (inherit source) @@ -452,12 +455,14 @@ (define (source-with-patches source patches) (define-public linux-libre-5.7-source (source-with-patches linux-libre-5.7-pristine-source (list %boot-logo-patch - %linux-libre-arm-export-__sync_icache_dcache-patch))) + %linux-libre-arm-export-__sync_icache_dcache-patch + %linux-libre-fix-atheros-9271-patch))) (define-public linux-libre-5.4-source (source-with-patches linux-libre-5.4-pristine-source (list %boot-logo-patch %linux-libre-arm-export-__sync_icache_dcache-patch + %linux-libre-fix-atheros-9271-patch ;; Pinebook Pro patch from linux-next, ;; can be dropped for linux-libre 5.7 (search-patch @@ -466,19 +471,23 @@ (define-public linux-libre-5.4-source (define-public linux-libre-4.19-source (source-with-patches linux-libre-4.19-pristine-source (list %boot-logo-patch - %linux-libre-arm-export-__sync_icache_dcache-patch))) + %linux-libre-arm-export-__sync_icache_dcache-patch + %linux-libre-fix-atheros-9271-patch))) (define-public linux-libre-4.14-source (source-with-patches linux-libre-4.14-pristine-source - (list %boot-logo-patch))) + (list %boot-logo-patch + %linux-libre-fix-atheros-9271-patch))) (define-public linux-libre-4.9-source (source-with-patches linux-libre-4.9-pristine-source - (list %boot-logo-patch))) + (list %boot-logo-patch + %linux-libre-fix-atheros-9271-patch))) (define-public linux-libre-4.4-source (source-with-patches linux-libre-4.4-pristine-source - (list %boot-logo-patch))) + (list %boot-logo-patch + %linux-libre-fix-atheros-9271-patch))) ;;; diff --git a/gnu/packages/patches/linux-libre-fix-atheros-9271.patch b/gnu/packages/patches/linux-libre-fix-atheros-9271.patch new file mode 100644 index 0000000000..7527f9fdf0 --- /dev/null +++ b/gnu/packages/patches/linux-libre-fix-atheros-9271.patch @@ -0,0 +1,225 @@ +Revert the following upstream commit, which broke Atheros 9271 support. +See: + https://bugzilla.kernel.org/show_bug.cgi?id=208251 + https://bugzilla.redhat.com/show_bug.cgi?id=1848631 + + +From b5c8896bc14f54e5c4dd5a6e42879f125b8abd2d Mon Sep 17 00:00:00 2001 +From: Qiujun Huang +Date: Sat, 4 Apr 2020 12:18:38 +0800 +Subject: ath9k: Fix general protection fault in ath9k_hif_usb_rx_cb + +commit 2bbcaaee1fcbd83272e29f31e2bb7e70d8c49e05 upstream. + +In ath9k_hif_usb_rx_cb interface number is assumed to be 0. +usb_ifnum_to_if(urb->dev, 0) +But it isn't always true. + +The case reported by syzbot: +https://lore.kernel.org/linux-usb/000000000000666c9c05a1c05d12@google.com +usb 2-1: new high-speed USB device number 2 using dummy_hcd +usb 2-1: config 1 has an invalid interface number: 2 but max is 0 +usb 2-1: config 1 has no interface number 0 +usb 2-1: New USB device found, idVendor=0cf3, idProduct=9271, bcdDevice= +1.08 +usb 2-1: New USB device strings: Mfr=1, Product=2, SerialNumber=3 +general protection fault, probably for non-canonical address +0xdffffc0000000015: 0000 [#1] SMP KASAN +KASAN: null-ptr-deref in range [0x00000000000000a8-0x00000000000000af] +CPU: 0 PID: 0 Comm: swapper/0 Not tainted 5.6.0-rc5-syzkaller #0 + +Call Trace +__usb_hcd_giveback_urb+0x29a/0x550 drivers/usb/core/hcd.c:1650 +usb_hcd_giveback_urb+0x368/0x420 drivers/usb/core/hcd.c:1716 +dummy_timer+0x1258/0x32ae drivers/usb/gadget/udc/dummy_hcd.c:1966 +call_timer_fn+0x195/0x6f0 kernel/time/timer.c:1404 +expire_timers kernel/time/timer.c:1449 [inline] +__run_timers kernel/time/timer.c:1773 [inline] +__run_timers kernel/time/timer.c:1740 [inline] +run_timer_softirq+0x5f9/0x1500 kernel/time/timer.c:1786 +__do_softirq+0x21e/0x950 kernel/softirq.c:292 +invoke_softirq kernel/softirq.c:373 [inline] +irq_exit+0x178/0x1a0 kernel/softirq.c:413 +exiting_irq arch/x86/include/asm/apic.h:546 [inline] +smp_apic_timer_interrupt+0x141/0x540 arch/x86/kernel/apic/apic.c:1146 +apic_timer_interrupt+0xf/0x20 arch/x86/entry/entry_64.S:829 + +Reported-and-tested-by: syzbot+40d5d2e8a4680952f042@syzkaller.appspotmail.com +Signed-off-by: Qiujun Huang +Signed-off-by: Kalle Valo +Link: https://lore.kernel.org/r/20200404041838.10426-6-hqjagain@gmail.com +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/wireless/ath/ath9k/hif_usb.c | 48 ++++++++++++++++++++++++-------- + drivers/net/wireless/ath/ath9k/hif_usb.h | 5 ++++ + 2 files changed, 42 insertions(+), 11 deletions(-) + +diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c +index 6049d3766c64..4ed21dad6a8e 100644 +--- b/drivers/net/wireless/ath/ath9k/hif_usb.c ++++ a/drivers/net/wireless/ath/ath9k/hif_usb.c +@@ -643,9 +643,9 @@ + + static void ath9k_hif_usb_rx_cb(struct urb *urb) + { +- struct rx_buf *rx_buf = (struct rx_buf *)urb->context; +- struct hif_device_usb *hif_dev = rx_buf->hif_dev; +- struct sk_buff *skb = rx_buf->skb; ++ struct sk_buff *skb = (struct sk_buff *) urb->context; ++ struct hif_device_usb *hif_dev = ++ usb_get_intfdata(usb_ifnum_to_if(urb->dev, 0)); + int ret; + + if (!skb) +@@ -685,15 +685,14 @@ + return; + free: + kfree_skb(skb); +- kfree(rx_buf); + } + + static void ath9k_hif_usb_reg_in_cb(struct urb *urb) + { +- struct rx_buf *rx_buf = (struct rx_buf *)urb->context; +- struct hif_device_usb *hif_dev = rx_buf->hif_dev; +- struct sk_buff *skb = rx_buf->skb; ++ struct sk_buff *skb = (struct sk_buff *) urb->context; + struct sk_buff *nskb; ++ struct hif_device_usb *hif_dev = ++ usb_get_intfdata(usb_ifnum_to_if(urb->dev, 0)); + int ret; + + if (!skb) +@@ -751,7 +750,6 @@ + return; + free: + kfree_skb(skb); +- kfree(rx_buf); + urb->context = NULL; + } + +@@ -797,7 +795,7 @@ + init_usb_anchor(&hif_dev->mgmt_submitted); + + for (i = 0; i < MAX_TX_URB_NUM; i++) { +- tx_buf = kzalloc(sizeof(*tx_buf), GFP_KERNEL); ++ tx_buf = kzalloc(sizeof(struct tx_buf), GFP_KERNEL); + if (!tx_buf) + goto err; + +@@ -834,9 +832,8 @@ + + static int ath9k_hif_usb_alloc_rx_urbs(struct hif_device_usb *hif_dev) + { +- struct rx_buf *rx_buf = NULL; ++ struct urb *urb = NULL; + struct sk_buff *skb = NULL; +- struct urb *urb = NULL; + int i, ret; + + init_usb_anchor(&hif_dev->rx_submitted); +@@ -844,12 +841,6 @@ + + for (i = 0; i < MAX_RX_URB_NUM; i++) { + +- rx_buf = kzalloc(sizeof(*rx_buf), GFP_KERNEL); +- if (!rx_buf) { +- ret = -ENOMEM; +- goto err_rxb; +- } +- + /* Allocate URB */ + urb = usb_alloc_urb(0, GFP_KERNEL); + if (urb == NULL) { +@@ -864,14 +855,11 @@ + goto err_skb; + } + +- rx_buf->hif_dev = hif_dev; +- rx_buf->skb = skb; +- + usb_fill_bulk_urb(urb, hif_dev->udev, + usb_rcvbulkpipe(hif_dev->udev, + USB_WLAN_RX_PIPE), + skb->data, MAX_RX_BUF_SIZE, +- ath9k_hif_usb_rx_cb, rx_buf); ++ ath9k_hif_usb_rx_cb, skb); + + /* Anchor URB */ + usb_anchor_urb(urb, &hif_dev->rx_submitted); +@@ -897,8 +885,6 @@ + err_skb: + usb_free_urb(urb); + err_urb: +- kfree(rx_buf); +-err_rxb: + ath9k_hif_usb_dealloc_rx_urbs(hif_dev); + return ret; + } +@@ -910,21 +896,14 @@ + + static int ath9k_hif_usb_alloc_reg_in_urbs(struct hif_device_usb *hif_dev) + { +- struct rx_buf *rx_buf = NULL; ++ struct urb *urb = NULL; + struct sk_buff *skb = NULL; +- struct urb *urb = NULL; + int i, ret; + + init_usb_anchor(&hif_dev->reg_in_submitted); + + for (i = 0; i < MAX_REG_IN_URB_NUM; i++) { + +- rx_buf = kzalloc(sizeof(*rx_buf), GFP_KERNEL); +- if (!rx_buf) { +- ret = -ENOMEM; +- goto err_rxb; +- } +- + /* Allocate URB */ + urb = usb_alloc_urb(0, GFP_KERNEL); + if (urb == NULL) { +@@ -939,14 +918,11 @@ + goto err_skb; + } + +- rx_buf->hif_dev = hif_dev; +- rx_buf->skb = skb; +- + usb_fill_int_urb(urb, hif_dev->udev, + usb_rcvintpipe(hif_dev->udev, + USB_REG_IN_PIPE), + skb->data, MAX_REG_IN_BUF_SIZE, +- ath9k_hif_usb_reg_in_cb, rx_buf, 1); ++ ath9k_hif_usb_reg_in_cb, skb, 1); + + /* Anchor URB */ + usb_anchor_urb(urb, &hif_dev->reg_in_submitted); +@@ -972,8 +948,6 @@ + err_skb: + usb_free_urb(urb); + err_urb: +- kfree(rx_buf); +-err_rxb: + ath9k_hif_usb_dealloc_reg_in_urbs(hif_dev); + return ret; + } +diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.h b/drivers/net/wireless/ath/ath9k/hif_usb.h +index a94e7e1c86e9..5985aa15ca93 100644 +--- b/drivers/net/wireless/ath/ath9k/hif_usb.h ++++ a/drivers/net/wireless/ath/ath9k/hif_usb.h +@@ -86,11 +86,6 @@ + struct list_head list; + }; + +-struct rx_buf { +- struct sk_buff *skb; +- struct hif_device_usb *hif_dev; +-}; +- + #define HIF_USB_TX_STOP BIT(0) + #define HIF_USB_TX_FLUSH BIT(1) + ++- +cgit 1.2.3-1.el7 + -- cgit v1.2.3 From ec4c404c0575b340a04b3922fb828ac5417832dd Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 10 Jul 2020 11:42:35 +0200 Subject: services: guix: Refer to 'berlin.guixsd.org.pub'. This partly reverts d283bb960f927dd5f7bb8b96bc697221e4e8ad39. * gnu/services/base.scm (%default-authorized-guix-keys): Refer to berlin.guixsd.org.pub. --- gnu/services/base.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 83dc406aac..0b82a90507 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -1481,7 +1481,9 @@ (define keys (define %default-authorized-guix-keys ;; List of authorized substitute keys. - (list (file-append guix "/share/guix/berlin.guix.gnu.org.pub"))) + ;; TODO: Change to "berlin.guix.gnu.org.pub" when the 'guix' package is + ;; updated. + (list (file-append guix "/share/guix/berlin.guixsd.org.pub"))) (define-record-type* guix-configuration make-guix-configuration -- cgit v1.2.3 From 152f0207daf08037e3b03e546bb6a99de23ccf2f Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 9 Jul 2020 16:33:34 -0400 Subject: gnu: webkitgtk: Update to 2.28.3 [security fixes]. Includes fixes for CVE-2020-9802, CVE-2020-9803, CVE-2020-9805, CVE-2020-9806, CVE-2020-9807, CVE-2020-9843, CVE-2020-9850, and CVE-2020-13753. * gnu/packages/webkit.scm (webkitgtk): Update to 2.28.3. --- gnu/packages/webkit.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 3804209841..fd70ad435a 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -121,14 +121,14 @@ (define-public wpebackend-fdo (define-public webkitgtk (package (name "webkitgtk") - (version "2.28.2") + (version "2.28.3") (source (origin (method url-fetch) (uri (string-append "https://www.webkitgtk.org/releases/" "webkitgtk-" version ".tar.xz")) (sha256 (base32 - "1g9hik3bprki5s9d7y5288q5irwckbzajr6rnlvjrlnqrwjkblmr")) + "08imj2q6h975mz7714dqdrmbav0s884990gf98xf2862fb08m2gh")) (patches (search-patches "webkitgtk-share-store.patch")))) (build-system cmake-build-system) (outputs '("out" "doc")) -- cgit v1.2.3 From cc7b170db2e1ab4c9d9f30403bb2aca1cc7fb05e Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Fri, 10 Jul 2020 22:04:53 +0200 Subject: gnu: minetest: Update to 5.3.0. * gnu/packages/games.scm (minetest, minetest-data): Update to 5.3.0. (minetest-data): Specify version with (package-version minetest) --- gnu/packages/games.scm | 72 +++++++++++++++++++++++++------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 30688531df..7946391cda 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3024,44 +3024,10 @@ (define-public mars match, cannon keep, and grave-itation pit.") (license license:gpl3+)))) -(define minetest-data - (package - (name "minetest-data") - (version "5.1.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/minetest/minetest_game") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1r9fxz2j24q74a9injvbxbf2xk67fzabv616i676zw2cvgv9hn39")))) - (build-system trivial-build-system) - (native-inputs - `(("source" ,source))) - (arguments - `(#:modules ((guix build utils)) - #:builder (begin - (use-modules (guix build utils)) - (let ((install-dir (string-append - %output - "/share/minetest/games/minetest_game"))) - (mkdir-p install-dir) - (copy-recursively - (assoc-ref %build-inputs "source") - install-dir) - #t)))) - (synopsis "Main game data for the Minetest game engine") - (description - "Game data for the Minetest infinite-world block sandbox game.") - (home-page "https://www.minetest.net/") - (license license:lgpl2.1+))) - (define-public minetest (package (name "minetest") - (version "5.1.1") + (version "5.3.0") (source (origin (method git-fetch) (uri (git-reference @@ -3070,7 +3036,7 @@ (define-public minetest (file-name (git-file-name name version)) (sha256 (base32 - "0cjj63333b7j4ydfq0h9yc6d2jvmyjd7n7zbd08yrf0rcibrj2k0")) + "03ga3j3cg38w4lg4d4qxasmnjdl8n3lbizidrinanvyfdyvznyh6")) (modules '((guix build utils))) (snippet '(begin @@ -3126,6 +3092,40 @@ (define-public minetest (home-page "https://www.minetest.net/") (license license:lgpl2.1+))) +(define minetest-data + (package + (name "minetest-data") + (version (package-version minetest)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/minetest/minetest_game") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1liciwlh013z5h08ib0psjbwn5wkvlr937ir7kslfk4vly984cjx")))) + (build-system trivial-build-system) + (native-inputs + `(("source" ,source))) + (arguments + `(#:modules ((guix build utils)) + #:builder (begin + (use-modules (guix build utils)) + (let ((install-dir (string-append + %output + "/share/minetest/games/minetest_game"))) + (mkdir-p install-dir) + (copy-recursively + (assoc-ref %build-inputs "source") + install-dir) + #t)))) + (synopsis "Main game data for the Minetest game engine") + (description + "Game data for the Minetest infinite-world block sandbox game.") + (home-page "https://www.minetest.net/") + (license license:lgpl2.1+))) + (define glkterm (package (name "glkterm") -- cgit v1.2.3 From 16e34f7598574bd79aee646deaebfeb878ef7f6e Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Mon, 8 Jun 2020 01:51:52 +0200 Subject: gnu: flint: Update to 2.6.0. * gnu/packages/algebra.scm (flint): Update to 2.6.0. * gnu/packages/patches/flint-ldconfig.patch: Remove the patch as it got applied upstream. * gnu/local.mk (dist_patch_DATA): Deregister the removed file. --- gnu/local.mk | 1 - gnu/packages/algebra.scm | 5 ++--- gnu/packages/patches/flint-ldconfig.patch | 26 -------------------------- 3 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 gnu/packages/patches/flint-ldconfig.patch diff --git a/gnu/local.mk b/gnu/local.mk index 5c3b391960..d2728a7fff 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -937,7 +937,6 @@ dist_patch_DATA = \ %D%/packages/patches/findutils-localstatedir.patch \ %D%/packages/patches/findutils-test-rwlock-threads.patch \ %D%/packages/patches/flann-cmake-3.11.patch \ - %D%/packages/patches/flint-ldconfig.patch \ %D%/packages/patches/foobillard++-pkg-config.patch \ %D%/packages/patches/foomatic-filters-CVE-2015-8327.patch \ %D%/packages/patches/foomatic-filters-CVE-2015-8560.patch \ diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 4fef6d2405..a804982c17 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -440,15 +440,14 @@ (define-public giac (define-public flint (package (name "flint") - (version "2.5.2") + (version "2.6.0") (source (origin (method url-fetch) (uri (string-append "http://flintlib.org/flint-" version ".tar.gz")) (sha256 (base32 - "11syazv1a8rrnac3wj3hnyhhflpqcmq02q8pqk2m6g2k6h0gxwfb")) - (patches (search-patches "flint-ldconfig.patch")))) + "0h08a71kn8347zsqjamqnmrxjpsnnzpmhvxb6d2xmfrcs6nyv2ch")))) (build-system gnu-build-system) (propagated-inputs `(("gmp" ,gmp) diff --git a/gnu/packages/patches/flint-ldconfig.patch b/gnu/packages/patches/flint-ldconfig.patch deleted file mode 100644 index d7c66e17ab..0000000000 --- a/gnu/packages/patches/flint-ldconfig.patch +++ /dev/null @@ -1,26 +0,0 @@ -Patch by Andreas Enge . -Remedy the absence of ldconfig and explicitly create an additional symbolic -link to the flint library, as discussed privately with upstream. - -diff -r -u flint-2.5.2.orig/configure flint-2.5.2/configure ---- flint-2.5.2.orig/configure 2015-08-13 18:16:22.000000000 +0200 -+++ flint-2.5.2/configure 2015-08-14 17:38:14.316284437 +0200 -@@ -714,6 +714,7 @@ - echo "FLINT_SHARED=$SHARED" >> Makefile - echo "FLINT_LIB=$FLINT_LIB" >> Makefile - echo "FLINT_LIBNAME=$FLINT_LIBNAME" >> Makefile -+echo "FLINT_MAJOR=$FLINT_MAJOR" >> Makefile - echo "FLINT_SOLIB=$FLINT_SOLIB" >> Makefile - echo "EXEEXT=$EXEEXT" >> Makefile - echo "PREFIX=$PREFIX" >> Makefile -diff -r -u flint-2.5.2.orig/Makefile.in flint-2.5.2/Makefile.in ---- flint-2.5.2.orig/Makefile.in 2015-08-13 18:16:22.000000000 +0200 -+++ flint-2.5.2/Makefile.in 2015-08-14 17:38:50.584774817 +0200 -@@ -118,6 +118,7 @@ - $(LDCONFIG) -n "$(CURDIR)"; \ - fi - ln -sf "$(FLINT_LIB)" "$(FLINT_LIBNAME)"; \ -+ ln -sf "$(FLINT_LIB)" "$(FLINT_LIBNAME).$(FLINT_MAJOR)"; \ - - libflint.a: $(OBJS) $(LIB_SOURCES) $(EXT_SOURCES) $(HEADERS) $(EXT_HEADERS) | build build/interfaces - $(AT)$(foreach ext, $(EXTENSIONS), $(foreach dir, $(filter-out %templates, $(patsubst $(ext)/%.h, %, $(wildcard $(ext)/*.h))), mkdir -p build/$(dir); BUILD_DIR=$(CURDIR)/build/$(dir); export BUILD_DIR; MOD_DIR=$(dir); export MOD_DIR; $(MAKE) -f $(CURDIR)/Makefile.subdirs -C $(ext)/$(dir) static || exit $$?;)) -- cgit v1.2.3 From d7c8bcc47cd399d6825159de5c2c056ad01f4965 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Sun, 29 Mar 2020 22:28:24 +0200 Subject: gnu: flint: Build with ntl. * gnu/packages/algebra.scm (flint)[inputs]: Add ntl. [arguments]: Pass --with-ntl to configure. --- gnu/packages/algebra.scm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index a804982c17..048c31d017 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -449,6 +449,8 @@ (define-public flint (sha256 (base32 "0h08a71kn8347zsqjamqnmrxjpsnnzpmhvxb6d2xmfrcs6nyv2ch")))) (build-system gnu-build-system) + (inputs + `(("ntl" ,ntl))) (propagated-inputs `(("gmp" ,gmp) ("mpfr" ,mpfr))) ; header files from both are included by flint/arith.h @@ -456,17 +458,24 @@ (define-public flint `(#:parallel-tests? #f ; seems to be necessary on arm #:phases (modify-phases %standard-phases + (add-before 'configure 'newer-c++ + (lambda _ + (substitute* "configure" + (("-ansi") "")) + #t)) (replace 'configure (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) (gmp (assoc-ref inputs "gmp")) - (mpfr (assoc-ref inputs "mpfr"))) + (mpfr (assoc-ref inputs "mpfr")) + (ntl (assoc-ref inputs "ntl"))) ;; do not pass "--enable-fast-install", which makes the ;; homebrew configure process fail (invoke "./configure" (string-append "--prefix=" out) (string-append "--with-gmp=" gmp) - (string-append "--with-mpfr=" mpfr)) + (string-append "--with-mpfr=" mpfr) + (string-append "--with-ntl=" ntl)) #t)))))) (synopsis "Fast library for number theory") (description -- cgit v1.2.3 From 417eaa88dc8bac3e0e0f7f74d1782629f5eb2150 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Mon, 8 Jun 2020 13:01:16 +0200 Subject: gnu: arb: Build with flint 2.6. Backport an upstream patch to fix a compatibility issue with flint 2.6. * gnu/packages/algebra.scm (arb): Add patch. * gnu/packages/patches/arb-flint-2.6.patch: New file. * gnu/local.mk (dist_patch_DATA): Register new file. --- gnu/local.mk | 1 + gnu/packages/algebra.scm | 3 +- gnu/packages/patches/arb-flint-2.6.patch | 48 ++++++++++++++++++++++++++++++++ 3 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/arb-flint-2.6.patch diff --git a/gnu/local.mk b/gnu/local.mk index d2728a7fff..215b75f771 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -772,6 +772,7 @@ dist_patch_DATA = \ %D%/packages/patches/antlr3-3_1-fix-java8-compilation.patch \ %D%/packages/patches/antlr3-3_3-fix-java8-compilation.patch \ %D%/packages/patches/apr-skip-getservbyname-test.patch \ + %D%/packages/patches/arb-flint-2.6.patch \ %D%/packages/patches/aspell-default-dict-dir.patch \ %D%/packages/patches/ath9k-htc-firmware-binutils.patch \ %D%/packages/patches/ath9k-htc-firmware-gcc.patch \ diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 048c31d017..9041178d21 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -504,7 +504,8 @@ (define-public arb (file-name (git-file-name name version)) (sha256 (base32 - "05lpy3hkl5f8ik19aw40cqydrb932xaf2n8hbq9ib5dnk7f010p1")))) + "05lpy3hkl5f8ik19aw40cqydrb932xaf2n8hbq9ib5dnk7f010p1")) + (patches (search-patches "arb-flint-2.6.patch")))) (build-system gnu-build-system) (propagated-inputs `(("flint" ,flint))) ; flint.h is included by arf.h diff --git a/gnu/packages/patches/arb-flint-2.6.patch b/gnu/packages/patches/arb-flint-2.6.patch new file mode 100644 index 0000000000..98ff5e95b4 --- /dev/null +++ b/gnu/packages/patches/arb-flint-2.6.patch @@ -0,0 +1,48 @@ +From d3d9983231e0f034e86a1e75761627eb8213b704 Mon Sep 17 00:00:00 2001 +From: fredrik +Date: Wed, 29 Apr 2020 13:41:36 +0200 +Subject: [PATCH] handle flint incompatibilities + +--- + fmpr.h | 4 ++++ + fmpz_extras.h | 4 ++++ + 2 files changed, 8 insertions(+) + +diff --git a/fmpr.h b/fmpr.h +index 2204d72e..c6a8c342 100644 +--- a/fmpr.h ++++ b/fmpr.h +@@ -22,7 +22,11 @@ + #include "flint/flint.h" + #include "flint/fmpz.h" + #include "flint/fmpq.h" ++#if __FLINT_RELEASE < 20600 + #include "flint/config.h" ++#else ++#include "flint/flint-config.h" ++#endif + #include "fmpz_extras.h" + + #ifndef flint_abort +diff --git a/fmpz_extras.h b/fmpz_extras.h +index 4fd0538f..486e28c8 100644 +--- a/fmpz_extras.h ++++ b/fmpz_extras.h +@@ -43,6 +43,8 @@ fmpz_add_inline(fmpz_t z, const fmpz_t x, const fmpz_t y) + fmpz_add(z, x, y); + } + ++#if __FLINT_RELEASE < 20600 ++ + static __inline__ void + fmpz_add_si(fmpz_t z, const fmpz_t x, slong y) + { +@@ -61,6 +63,8 @@ fmpz_sub_si(fmpz_t z, const fmpz_t x, slong y) + fmpz_add_ui(z, x, -y); + } + ++#endif ++ + static __inline__ void + fmpz_add_si_inline(fmpz_t z, const fmpz_t x, slong y) + { -- cgit v1.2.3 From 781d03f135c9390d565f16558fd38e7595442745 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Tue, 16 Jun 2020 21:08:20 +0200 Subject: gnu: linbox: Fix linking of dependant packages. * gnu/packages/algebra.scm (linbox)[source]: Add a patch. [inputs]: Move fflas-ffpack to... [propagated-inputs]: ...here. * gnu/packages/patches/linbox-fix-pkgconfig.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + gnu/packages/algebra.scm | 5 +++-- gnu/packages/patches/linbox-fix-pkgconfig.patch | 23 +++++++++++++++++++++++ 3 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/linbox-fix-pkgconfig.patch diff --git a/gnu/local.mk b/gnu/local.mk index 215b75f771..1ad8249d77 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1236,6 +1236,7 @@ dist_patch_DATA = \ %D%/packages/patches/lierolibre-newer-libconfig.patch \ %D%/packages/patches/lierolibre-remove-arch-warning.patch \ %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/linux-libre-fix-atheros-9271.patch \ diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 9041178d21..c9ff1b8948 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -1365,14 +1365,15 @@ (define-public linbox (file-name (git-file-name name version)) (sha256 (base32 - "10j6dspbsq7d2l4q3y0c1l1xwmaqqba2fxg59q5bhgk9h5d7q571")))) + "10j6dspbsq7d2l4q3y0c1l1xwmaqqba2fxg59q5bhgk9h5d7q571")) + (patches (search-patches "linbox-fix-pkgconfig.patch")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) ("libtool" ,libtool) ("pkg-config" ,pkg-config))) - (inputs + (propagated-inputs `(("fflas-ffpack" ,fflas-ffpack))) (synopsis "C++ library for linear algebra over exact rings") (description diff --git a/gnu/packages/patches/linbox-fix-pkgconfig.patch b/gnu/packages/patches/linbox-fix-pkgconfig.patch new file mode 100644 index 0000000000..c93915fb1b --- /dev/null +++ b/gnu/packages/patches/linbox-fix-pkgconfig.patch @@ -0,0 +1,23 @@ +Backported from: + +From 426eb97ba762c7663884f57ead0909f2aa3cd6a5 Mon Sep 17 00:00:00 2001 +From: Cyril Bouvier +Date: Thu, 17 Jan 2019 16:32:19 +0100 +Subject: [PATCH] Remove @LINBOXSAGE_LIBS@ from linbox.pc.in + +--- + linbox.pc.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/linbox.pc.in b/linbox.pc.in +index 278f127e4..c6b8091eb 100644 +--- a/linbox.pc.in ++++ b/linbox.pc.in +@@ -9,6 +9,6 @@ Description: Exact Linear Algebra library + URL: http://github.com/linbox-team/linbox + Version: @VERSION@ + Requires: fflas-ffpack >= 2.4.0, givaro >= 4.1.0 +-Libs: -L${libdir} -llinbox @LINBOXSAGE_LIBS@ @NTL_LIBS@ @MPFR_LIBS@ @FPLLL_LIBS@ @IML_LIBS@ @FLINT_LIBS@ @OCL_LIBS@ ++Libs: -L${libdir} -llinbox @NTL_LIBS@ @MPFR_LIBS@ @FPLLL_LIBS@ @IML_LIBS@ @FLINT_LIBS@ @OCL_LIBS@ + Cflags: @DEFAULT_CFLAGS@ -DDISABLE_COMMENTATOR -I${includedir} @NTL_CFLAGS@ @MPFR_CFLAGS@ @FPLLL_CFLAGS@ @IML_CFLAGS@ @FLINT_CFLAGS@ + \------------------------------------------------------- -- cgit v1.2.3 From 71153712a2499d0425a709e9bc57dd3f917567ea Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Wed, 17 Jun 2020 00:02:23 +0200 Subject: gnu: sagemath: Remove unnecessary old versions of packages Sage has updated givaro, fflas-ffpack and linbox since the comment was written. * gnu/packages/sagemath.scm (givaro, fflas-ffpack, linbox): Remove variables. --- gnu/packages/sagemath.scm | 54 ----------------------------------------------- 1 file changed, 54 deletions(-) diff --git a/gnu/packages/sagemath.scm b/gnu/packages/sagemath.scm index b96cb6b96e..34fe9e524c 100644 --- a/gnu/packages/sagemath.scm +++ b/gnu/packages/sagemath.scm @@ -184,60 +184,6 @@ (define-public libhomfly (license license:public-domain) (home-page "https://github.com/miguelmarco/libhomfly"))) -;; The following three packages from the Linbox group are needed in -;; an outdated version for Sage. - -(define-public givaro-4.0.4 - (package (inherit givaro) - (name "givaro") - (version "4.0.4") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/linbox-team/givaro") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "199p8wyj5i63jbnk7j8qbdbfp5rm2lpmcxyk3mdjy9bz7ygx3hhy")))))) - -(define-public fflas-ffpack-2.3.2 - (package (inherit fflas-ffpack) - (name "fflas-ffpack") - (version "2.3.2") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/linbox-team/fflas-ffpack") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1cqhassj2dny3gx0iywvmnpq8ca0d6m82xl5rz4mb8gaxr2kwddl")))) - (propagated-inputs - `(("givaro" ,givaro-4.0.4))) - ;; A test fails, but since all tests pass in the latest version, - ;; there is not much point in investigating. - (arguments - (substitute-keyword-arguments (package-arguments fflas-ffpack) - ((#:tests? _ #f) #f))))) - -(define-public linbox-1.5.2 - (package (inherit linbox) - (version "1.5.2") - (name "linbox") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/linbox-team/linbox") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1wfivlwp30mzdy1697w7rzb8caajim50mc8h27k82yipn2qc5n4i")))) - (inputs - `(("fflas-ffpack" ,fflas-ffpack-2.3.2))))) - (define-public pynac (package (name "pynac") -- cgit v1.2.3 From 5b9822cf43f0e568fc42a0a60a7ed4d77e5e9832 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Wed, 17 Jun 2020 02:08:04 +0200 Subject: gnu: Add ECL 16.1.3 for Sage. * gnu/packages/sagemath.scm (ecl-16): New variable. * gnu/packages/patches/ecl-16-format-directive-limit.patch, gnu/packages/patches/ecl-16-ignore-stderr-write-error.patch, gnu/packages/patches/ecl-16-libffi.patch: New files. * gnu/local.mk (dist_patch_DATA): Register the patches. --- gnu/local.mk | 3 + .../patches/ecl-16-format-directive-limit.patch | 83 ++++++++++++++++++++++ .../patches/ecl-16-ignore-stderr-write-error.patch | 17 +++++ gnu/packages/patches/ecl-16-libffi.patch | 16 +++++ gnu/packages/sagemath.scm | 23 ++++++ 5 files changed, 142 insertions(+) create mode 100644 gnu/packages/patches/ecl-16-format-directive-limit.patch create mode 100644 gnu/packages/patches/ecl-16-ignore-stderr-write-error.patch create mode 100644 gnu/packages/patches/ecl-16-libffi.patch diff --git a/gnu/local.mk b/gnu/local.mk index 1ad8249d77..2fc9d7a0c7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -894,6 +894,9 @@ dist_patch_DATA = \ %D%/packages/patches/dstat-skip-devices-without-io.patch \ %D%/packages/patches/dune-istl-2.7-fix-non-mpi-tests.patch \ %D%/packages/patches/dvd+rw-tools-add-include.patch \ + %D%/packages/patches/ecl-16-format-directive-limit.patch \ + %D%/packages/patches/ecl-16-ignore-stderr-write-error.patch \ + %D%/packages/patches/ecl-16-libffi.patch \ %D%/packages/patches/eigen-stabilise-sparseqr-test.patch \ %D%/packages/patches/einstein-build.patch \ %D%/packages/patches/elfutils-tests-ptrace.patch \ diff --git a/gnu/packages/patches/ecl-16-format-directive-limit.patch b/gnu/packages/patches/ecl-16-format-directive-limit.patch new file mode 100644 index 0000000000..237db92722 --- /dev/null +++ b/gnu/packages/patches/ecl-16-format-directive-limit.patch @@ -0,0 +1,83 @@ +Patch backported by Sage. + +Fix from upstream that happens to work around +https://trac.sagemath.org/ticket/23011 +diff --git a/src/lsp/format.lsp b/src/lsp/format.lsp +index 77ca799..53b887c 100644 +--- a/src/lsp/format.lsp ++++ b/src/lsp/format.lsp +@@ -307,11 +307,13 @@ + :start (format-directive-start struct) + :end (format-directive-end struct)))) + ++(defconstant +format-directive-limit+ (1+ (char-code #\~))) ++ + #+formatter + (defparameter *format-directive-expanders* +- (make-array char-code-limit :initial-element nil)) ++ (make-array +format-directive-limit+ :initial-element nil)) + (defparameter *format-directive-interpreters* +- (make-array char-code-limit :initial-element nil)) ++ (make-array +format-directive-limit+ :initial-element nil)) + + (defparameter *default-format-error-control-string* nil) + (defparameter *default-format-error-offset* nil) +@@ -550,24 +552,24 @@ + (write-string directive stream) + (interpret-directive-list stream (cdr directives) orig-args args)) + (#-ecl format-directive #+ecl vector ++ (multiple-value-bind ++ (new-directives new-args) ++ (let* ((code (char-code (format-directive-character directive))) ++ (function ++ (and (< code +format-directive-limit+) ++ (svref *format-directive-interpreters* code))) ++ (*default-format-error-offset* ++ (1- (format-directive-end directive)))) ++ (unless function ++ (error 'format-error ++ :complaint "Unknown format directive.")) + (multiple-value-bind + (new-directives new-args) +- (let ((function +- (svref *format-directive-interpreters* +- (char-code (format-directive-character +- directive)))) +- (*default-format-error-offset* +- (1- (format-directive-end directive)))) +- (unless function +- (error 'format-error +- :complaint "Unknown format directive.")) +- (multiple-value-bind +- (new-directives new-args) +- (funcall function stream directive +- (cdr directives) orig-args args) +- (values new-directives new-args))) +- (interpret-directive-list stream new-directives +- orig-args new-args))))) ++ (funcall function stream directive ++ (cdr directives) orig-args args) ++ (values new-directives new-args))) ++ (interpret-directive-list stream new-directives ++ orig-args new-args))))) + args)) + + +@@ -639,11 +641,12 @@ + (values `(write-string ,directive stream) + more-directives)) + (format-directive +- (let ((expander +- (aref *format-directive-expanders* +- (char-code (format-directive-character directive)))) +- (*default-format-error-offset* +- (1- (format-directive-end directive)))) ++ (let* ((code (char-code (format-directive-character directive))) ++ (expander ++ (and (< code +format-directive-limit+) ++ (svref *format-directive-expanders* code))) ++ (*default-format-error-offset* ++ (1- (format-directive-end directive)))) + (if expander + (funcall expander directive more-directives) + (error 'format-error diff --git a/gnu/packages/patches/ecl-16-ignore-stderr-write-error.patch b/gnu/packages/patches/ecl-16-ignore-stderr-write-error.patch new file mode 100644 index 0000000000..42d213c0e9 --- /dev/null +++ b/gnu/packages/patches/ecl-16-ignore-stderr-write-error.patch @@ -0,0 +1,17 @@ +Patch adapted from Sage. +diff -Naur ecl-16.1.2.orig/src/c/file.d ecl-16.1.2/src/c/file.d +--- ecl-16.1.2.orig/src/c/file.d 2016-05-11 13:10:51.867673867 +1200 ++++ ecl-16.1.2/src/c/file.d 2016-05-11 14:44:48.121907307 +1200 +@@ -3354,8 +3354,10 @@ + ecl_disable_interrupts(); + do { + out = fwrite(c, sizeof(char), n, IO_STREAM_FILE(strm)); +- } while (out < n && restartable_io_error(strm, "fwrite")); +- ecl_enable_interrupts(); ++ /* Ignore write errors to stderr to avoid an infinite loop */ ++ } while (out < n && (IO_STREAM_FILE(strm) != stderr) && restartable_io_error(strm, "fwrite")); ++ ++ ecl_enable_interrupts(); + return out; + } + diff --git a/gnu/packages/patches/ecl-16-libffi.patch b/gnu/packages/patches/ecl-16-libffi.patch new file mode 100644 index 0000000000..fc06a07606 --- /dev/null +++ b/gnu/packages/patches/ecl-16-libffi.patch @@ -0,0 +1,16 @@ +Patch adapted from Sage. Allows building ECL on libffi 3.3. +diff --git a/src/c/ffi.d b/src/c/ffi.d +index 8861303e..8a959c23 100644 +--- a/src/c/ffi.d ++++ b/src/c/ffi.d +@@ -133,8 +133,8 @@ static struct { + #elif defined(X86_WIN64) + {@':win64', FFI_WIN64}, + #elif defined(X86_ANY) || defined(X86) || defined(X86_64) +- {@':cdecl', FFI_SYSV}, +- {@':sysv', FFI_SYSV}, ++ {@':cdecl', FFI_UNIX64}, ++ {@':sysv', FFI_UNIX64}, + {@':unix64', FFI_UNIX64}, + #endif + }; diff --git a/gnu/packages/sagemath.scm b/gnu/packages/sagemath.scm index 34fe9e524c..c94020f13e 100644 --- a/gnu/packages/sagemath.scm +++ b/gnu/packages/sagemath.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2019 Andreas Enge ;;; Copyright © 2019 Nicolas Goaziou ;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2020 Jakub Kądziołka ;;; ;;; This file is part of GNU Guix. ;;; @@ -33,6 +34,7 @@ (define-module (gnu packages sagemath) #:use-module (gnu packages boost) #:use-module (gnu packages compression) #:use-module (gnu packages image) + #:use-module (gnu packages lisp) #:use-module (gnu packages multiprecision) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -184,6 +186,27 @@ (define-public libhomfly (license license:public-domain) (home-page "https://github.com/miguelmarco/libhomfly"))) +;; Sage 9.1 doesn't build with ECL 20. This won't be necessary once 9.2 is +;; released. See https://trac.sagemath.org/ticket/22191 +(define-public ecl-16 + (package + (inherit ecl) + (version "16.1.3") + (source + (origin + (method url-fetch) + (uri (string-append + "https://common-lisp.net/project/ecl/static/files/release/ecl" + "-" version ".tgz")) + (sha256 + (base32 "0m0j24w5d5a9dwwqyrg0d35c0nys16ijb4r0nyk87yp82v38b9bn")) + (patches (search-patches + "ecl-16-libffi.patch" + "ecl-16-ignore-stderr-write-error.patch" + "ecl-16-format-directive-limit.patch")))) + ;; Current ECL uses LGPL 2.1+ + (license license:lgpl2.0+))) + (define-public pynac (package (name "pynac") -- cgit v1.2.3 From db7f74d2eb4878c0a9ed8bb33853090752277370 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Wed, 17 Jun 2020 02:10:52 +0200 Subject: gnu: lcalc: Don't rename the include directory. Sage no longer renames the directory, so we shouldn't either. * gnu/packages/sagemath.scm (lcalc)[arguments]: Remove a substitution from the prepare-build phase. --- gnu/packages/sagemath.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gnu/packages/sagemath.scm b/gnu/packages/sagemath.scm index c94020f13e..8c837fdaeb 100644 --- a/gnu/packages/sagemath.scm +++ b/gnu/packages/sagemath.scm @@ -368,10 +368,7 @@ (define-public lcalc (let ((out (assoc-ref outputs "out"))) (substitute* "Makefile" (("^INSTALL_DIR= /usr/local") - (string-append "INSTALL_DIR=" out)) - ;; Sage renames the include directory, so we do it also. - (("include/Lfunction") - "include/libLfunction"))) + (string-append "INSTALL_DIR=" out)))) #t)) (add-before 'install 'make-output-dirs (lambda* (#:key outputs #:allow-other-keys) -- cgit v1.2.3 From dcb4f7b737ca7c97de3f71689e027037d7d15e47 Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Fri, 3 Jul 2020 12:37:12 +0200 Subject: gnu: Add sysprof. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome.scm (sysprof): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/gnome.scm | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 55ecac2cb3..4b63b7cf6d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10446,3 +10446,48 @@ (define-public feedbackd (home-page "https://source.puri.sm/Librem5/feedbackd") (license (list license:lgpl2.1+ ; libfeedbackd license:lgpl3+)))) ; the rest + +(define-public sysprof + (package + (name "sysprof") + (version "3.34.1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1l4kr1av7933vb4zql9c5lgzivlw64hyky4nr8xin1v5if6vnjw4")))) + (build-system meson-build-system) + (arguments + `(#:configure-flags + (list (string-append "-Dsystemdunitdir=" + %output + "/share/systemd")) + #:tests? #f ; 3/4 test-model-filter barfs some dbus nonsense + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-install-script + (lambda _ + (substitute* "build-aux/meson/post_install.sh" + (("gtk-update-icon-cache") "true") + (("update-desktop-database") "true")) + #t))))) + (inputs + `(("glib" ,glib) + ("gtk+" ,gtk+) + ("libdazzle" ,libdazzle) + ("polkit" ,polkit))) + (native-inputs + `(("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") ; for gdbus-codegen, etc. + ("itstool" ,itstool) + ("pkg-config" ,pkg-config) + ("xmllint" ,libxml2))) + (home-page "http://www.sysprof.com/") + (synopsis "System-wide performance profiler") + (description "Sysprof is a sampling profiler that uses a kernel module +to generate stacktraces which are then interpreted by the userspace program +@command{sysprof}.") + (license license:gpl3+))) -- cgit v1.2.3 From 683cac584e3c32a29eb4ca18cd0ddf25955723a6 Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Fri, 3 Jul 2020 12:37:14 +0200 Subject: gnu: Add gnome-builder. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome.scm (gnome-builder): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/gnome.scm | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4b63b7cf6d..4dc0d1e606 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10491,3 +10491,69 @@ (define-public sysprof to generate stacktraces which are then interpreted by the userspace program @command{sysprof}.") (license license:gpl3+))) + +(define-public gnome-builder + (package + (name "gnome-builder") + (version "3.36.1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "17pvmd5jypar8dkr6w56hvf7jnq4l1wih2wwgkrv7sblr7rkkar2")))) + (build-system meson-build-system) + (arguments + `(#:configure-flags (list "-Dnetwork_tests=false" + ;; TODO: Enable all plugins... + "-Dplugin_clang=false" + "-Dplugin_flatpak=false" + "-Dplugin_glade=false" + ;; ... except this one. + "-Dplugin_update_manager=false") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-meson + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "build-aux/meson/post_install.py" + (("gtk-update-icon-cache") "true") + (("update-desktop-database") "true")) + (substitute* "src/libide/meson.build" + (("/usr/lib") + (string-append (assoc-ref inputs "python-pygobject") + "/lib"))) + #t)) + (add-before 'check 'pre-check + (lambda _ + (system "Xvfb :1 &") + (setenv "DISPLAY" ":1") + #t))))) + (inputs + `(("devhelp" ,devhelp) + ("gspell" ,gspell) + ("gtk+" ,gtk+) + ("json-glib" ,json-glib) + ("jsonrpc-glib" ,jsonrpc-glib) + ("libdazzle" ,libdazzle) + ("libgit2-glib" ,libgit2-glib) + ("libpeas" ,libpeas) + ("python-pygobject" ,python-pygobject) + ("sysprof" ,sysprof) + ("template-glib" ,template-glib) + ("vte" ,vte) + ("webkitgtk" ,webkitgtk))) + (propagated-inputs + `(("gtksourceview" ,gtksourceview))) ;needed for settings + (native-inputs + `(("desktop-file-utils" ,desktop-file-utils) ;for desktop-file-validate + ("glib:bin" ,glib "bin") + ("gettext" ,gettext-minimal) + ("pkg-config" ,pkg-config) + ("vala" ,vala) + ("xorg-server" ,xorg-server-for-tests))) + (home-page "https://wiki.gnome.org/Apps/Builder") + (synopsis "Toolsmith for GNOME-based applications") + (description "Builder aims to be an IDE for writing GNOME-based software.") + (license license:gpl3+))) -- cgit v1.2.3 From 876d022c03fb9e961c0e199b9b7c7e4edcec491c Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 10 Jul 2020 23:24:39 +0200 Subject: gnu: gnome-builder: Expound description. * gnu/packages/gnome.scm (gnome-builder)[description]: Expound. --- gnu/packages/gnome.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4dc0d1e606..2f390c6955 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10555,5 +10555,8 @@ (define-public gnome-builder ("xorg-server" ,xorg-server-for-tests))) (home-page "https://wiki.gnome.org/Apps/Builder") (synopsis "Toolsmith for GNOME-based applications") - (description "Builder aims to be an IDE for writing GNOME-based software.") + (description "Builder aims to be an integrated development +environment (IDE) for writing GNOME-based software. It features fuzzy search, +auto-completion, a mini code map, documentation browsing, Git integration, an +integrated profiler via Sysprof, debugging support, and more.") (license license:gpl3+))) -- cgit v1.2.3 From 838f2bdfa862c5017ee93156cf0d42a16d0290e2 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 5 Jul 2020 16:47:32 +0200 Subject: git-authenticate: Factorize 'authenticate-repository'. * guix/git-authenticate.scm (repository-cache-key) (verify-introductory-commit, authenticate-repository): New procedures. * guix/channels.scm (verify-introductory-commit): Remove. (authenticate-channel): Rewrite in terms of 'authenticate-repository'. --- guix/channels.scm | 118 ++++++++++++---------------------------------- guix/git-authenticate.scm | 101 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 131 insertions(+), 88 deletions(-) diff --git a/guix/channels.scm b/guix/channels.scm index 500c956f0f..bbabf654a9 100644 --- a/guix/channels.scm +++ b/guix/channels.scm @@ -315,100 +315,44 @@ (define (apply-patches checkout commit patches) (define commit-short-id (compose (cut string-take <> 7) oid->string commit-id)) -(define (verify-introductory-commit repository introduction keyring) - "Raise an exception if the first commit described in INTRODUCTION doesn't -have the expected signer." - (define commit-id - (channel-introduction-first-signed-commit introduction)) - - (define actual-signer - (openpgp-public-key-fingerprint - (commit-signing-key repository (string->oid commit-id) - keyring))) - - (define expected-signer - (channel-introduction-first-commit-signer introduction)) - - (unless (bytevector=? expected-signer actual-signer) - (raise (condition - (&message - (message (format #f (G_ "initial commit ~a is signed by '~a' \ -instead of '~a'") - commit-id - (openpgp-format-fingerprint actual-signer) - (openpgp-format-fingerprint expected-signer)))))))) - (define* (authenticate-channel channel checkout commit #:key (keyring-reference-prefix "origin/")) "Authenticate the given COMMIT of CHANNEL, available at CHECKOUT, a directory containing a CHANNEL checkout. Raise an error if authentication fails." + (define intro + (channel-introduction channel)) + + (define cache-key + (string-append "channels/" (symbol->string (channel-name channel)))) + + (define keyring-reference + (channel-metadata-keyring-reference + (read-channel-metadata-from-source checkout))) + + (define (make-reporter start-commit end-commit commits) + (format (current-error-port) + (G_ "Authenticating channel '~a', commits ~a to ~a (~h new \ +commits)...~%") + (channel-name channel) + (commit-short-id start-commit) + (commit-short-id end-commit) + (length commits)) + + (progress-reporter/bar (length commits))) + ;; XXX: Too bad we need to re-open CHECKOUT. (with-repository checkout repository - (define start-commit - (commit-lookup repository - (string->oid - (channel-introduction-first-signed-commit - (channel-introduction channel))))) - - (define end-commit - (commit-lookup repository (string->oid commit))) - - (define cache-key - (string-append "channels/" (symbol->string (channel-name channel)))) - - (define keyring-reference - (channel-metadata-keyring-reference - (read-channel-metadata-from-source checkout))) - - (define keyring - (load-keyring-from-reference repository - (string-append keyring-reference-prefix - keyring-reference))) - - (define authenticated-commits - ;; Previously-authenticated commits that don't need to be checked again. - (filter-map (lambda (id) - (false-if-exception - (commit-lookup repository (string->oid id)))) - (previously-authenticated-commits cache-key))) - - (define commits - ;; Commits to authenticate, excluding the closure of - ;; AUTHENTICATED-COMMITS. - (commit-difference end-commit start-commit - authenticated-commits)) - - (define reporter - (progress-reporter/bar (length commits))) - - ;; When COMMITS is empty, it's because END-COMMIT is in the closure of - ;; START-COMMIT and/or AUTHENTICATED-COMMITS, in which case it's known to - ;; be authentic already. - (unless (null? commits) - (format (current-error-port) - (G_ "Authenticating channel '~a', \ -commits ~a to ~a (~h new commits)...~%") - (channel-name channel) - (commit-short-id start-commit) - (commit-short-id end-commit) - (length commits)) - - ;; If it's our first time, verify CHANNEL's introductory commit. - (when (null? authenticated-commits) - (verify-introductory-commit repository - (channel-introduction channel) - keyring)) - - (call-with-progress-reporter reporter - (lambda (report) - (authenticate-commits repository commits - #:keyring keyring - #:report-progress report))) - - (cache-authenticated-commit cache-key - (oid->string - (commit-id end-commit)))))) + (authenticate-repository repository + (string->oid + (channel-introduction-first-signed-commit intro)) + (channel-introduction-first-commit-signer intro) + #:end (string->oid commit) + #:keyring-reference + (string-append keyring-reference-prefix + keyring-reference) + #:make-reporter make-reporter + #:cache-key cache-key))) (define* (latest-channel-instance store channel #:key (patches %patches) diff --git a/guix/git-authenticate.scm b/guix/git-authenticate.scm index 082c44ee06..99fd9c3594 100644 --- a/guix/git-authenticate.scm +++ b/guix/git-authenticate.scm @@ -18,14 +18,18 @@ (define-module (guix git-authenticate) #:use-module (git) + #:autoload (gcrypt hash) (sha256) #:use-module (guix base16) - #:use-module ((guix git) #:select (false-if-git-not-found)) + #:autoload (guix base64) (base64-encode) + #:use-module ((guix git) + #:select (commit-difference false-if-git-not-found)) #:use-module (guix i18n) #:use-module (guix openpgp) #:use-module ((guix utils) #:select (cache-directory with-atomic-file-output)) #:use-module ((guix build utils) #:select (mkdir-p)) + #:use-module (guix progress) #:use-module (srfi srfi-1) #:use-module (srfi srfi-11) #:use-module (srfi srfi-26) @@ -44,6 +48,9 @@ (define-module (guix git-authenticate) previously-authenticated-commits cache-authenticated-commit + repository-cache-key + authenticate-repository + git-authentication-error? git-authentication-error-commit unsigned-commit-error? @@ -339,3 +346,95 @@ (define %max-cache-length (display ";; List of previously-authenticated commits.\n\n" port) (pretty-print lst port)))))) + + +;;; +;;; High-level interface. +;;; + +(define (repository-cache-key repository) + "Return a unique key to store the authenticate commit cache for REPOSITORY." + (string-append "checkouts/" + (base64-encode + (sha256 (string->utf8 (repository-directory repository)))))) + +(define (verify-introductory-commit repository keyring commit expected-signer) + "Look up COMMIT in REPOSITORY, and raise an exception if it is not signed by +EXPECTED-SIGNER." + (define actual-signer + (openpgp-public-key-fingerprint + (commit-signing-key repository (commit-id commit) keyring))) + + (unless (bytevector=? expected-signer actual-signer) + (raise (condition + (&message + (message (format #f (G_ "initial commit ~a is signed by '~a' \ +instead of '~a'") + (oid->string (commit-id commit)) + (openpgp-format-fingerprint actual-signer) + (openpgp-format-fingerprint expected-signer)))))))) + +(define* (authenticate-repository repository start signer + #:key + (keyring-reference "keyring") + (cache-key (repository-cache-key repository)) + (end (reference-target + (repository-head repository))) + (historical-authorizations '()) + (make-reporter + (const progress-reporter/silent))) + "Authenticate REPOSITORY up to commit END, an OID. Authentication starts +with commit START, an OID, which must be signed by SIGNER; an exception is +raised if that is not the case. Return an alist mapping OpenPGP public keys +to the number of commits signed by that key that have been traversed. + +The OpenPGP keyring is loaded from KEYRING-REFERENCE in REPOSITORY, where +KEYRING-REFERENCE is the name of a branch. The list of authenticated commits +is cached in the authentication cache under CACHE-KEY. + +HISTORICAL-AUTHORIZATIONS must be a list of OpenPGP fingerprints (bytevectors) +denoting the authorized keys for commits whose parent lack the +'.guix-authorizations' file." + (define start-commit + (commit-lookup repository start)) + (define end-commit + (commit-lookup repository end)) + + (define keyring + (load-keyring-from-reference repository keyring-reference)) + + (define authenticated-commits + ;; Previously-authenticated commits that don't need to be checked again. + (filter-map (lambda (id) + (false-if-git-not-found + (commit-lookup repository (string->oid id)))) + (previously-authenticated-commits cache-key))) + + (define commits + ;; Commits to authenticate, excluding the closure of + ;; AUTHENTICATED-COMMITS. + (commit-difference end-commit start-commit + authenticated-commits)) + + ;; When COMMITS is empty, it's because END-COMMIT is in the closure of + ;; START-COMMIT and/or AUTHENTICATED-COMMITS, in which case it's known to + ;; be authentic already. + (if (null? commits) + '() + (let ((reporter (make-reporter start-commit end-commit commits))) + ;; If it's our first time, verify START-COMMIT's signature. + (when (null? authenticated-commits) + (verify-introductory-commit repository keyring + start-commit signer)) + + (let ((stats (call-with-progress-reporter reporter + (lambda (report) + (authenticate-commits repository commits + #:keyring keyring + #:default-authorizations + historical-authorizations + #:report-progress report))))) + (cache-authenticated-commit cache-key + (oid->string (commit-id end-commit))) + + stats)))) -- cgit v1.2.3 From 4b9b8b2ec23e59af2275a6d2829e6e0f915b44b3 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 5 Jul 2020 23:41:35 +0200 Subject: Add 'etc/historical-authorizations'. * etc/historical-authorizations: New file. Data extracted from 'build-aux/git-authenticate.scm'. * Makefile.am (EXTRA_DIST): Add it. --- Makefile.am | 1 + etc/historical-authorizations | 179 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 180 insertions(+) create mode 100644 etc/historical-authorizations diff --git a/Makefile.am b/Makefile.am index ee12725d5b..47699351b9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -552,6 +552,7 @@ EXTRA_DIST += \ etc/news.scm \ etc/release-manifest.scm \ etc/system-tests.scm \ + etc/historical-authorizations \ build-aux/build-self.scm \ build-aux/compile-all.scm \ build-aux/hydra/evaluate.scm \ diff --git a/etc/historical-authorizations b/etc/historical-authorizations new file mode 100644 index 0000000000..429054c9a5 --- /dev/null +++ b/etc/historical-authorizations @@ -0,0 +1,179 @@ +;; List of "historical" committers---people once authorized committers before +;; the '.guix-authorizations' file was created. +;; +;; This file is provided for historical and auditing purposes. It is known +;; good starting at least at 'v1.0.0'. +;; +;; The format is the same as for '.guix-authorizations'. User names are those +;; found on along +;; with the fingerprint of the signing (sub)key. + +(authorizations + (version 0) + + (("AD17 A21E F8AE D8F1 CC02 DBD9 F7D5 C9BF 765C 61E3" + (name "andreas")) + ("2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5" + (name "ajgrf")) + ("306F CB8F 2C01 C25D 29D3 0556 61EF 502E F602 52F2" + (name "alexvong1995")) + ("4FB9 9F49 2B12 A365 7997 E664 8246 0C08 2A0E E98F" + (name "alezost")) + ("50F3 3E2E 5B0C 3D90 0424 ABE8 9BDC F497 A4BB CC7F" + (name "ambrevar")) + ("27D5 86A4 F890 0854 329F F09F 1260 E464 82E6 3562" + (name "apteryx")) + ("7F73 0343 F2F0 9F3C 77BF 79D3 2E25 EE8B 6180 2BB3" + (name "arunisaac")) + (;; primary: "3B12 9196 AE30 0C3C 0E90 A26F A715 5567 3271 9948" + "9A2B 401E D001 0650 1584 BAAC 8BC4 F447 6E8A 8E00" + (name "atheia")) + (;; primary: "BE62 7373 8E61 6D6D 1B3A 08E8 A21A 0202 4881 6103" + "39B3 3C8D 9448 0D2D DCC2 A498 8B44 A0CD C7B9 56F2" + (name "bandali")) + (;; primary: "34FF 38BC D151 25A6 E340 A0B5 3453 2F9F AFCA 8B8E" + "A0C5 E352 2EF8 EF5C 64CD B7F0 FD73 CAC7 19D3 2566" + (name "bavier")) + ("3774 8024 880F D3FF DCA2 C9AB 5893 6E0E 2F1B 5A4C" + (name "beffa")) + ("BCF8 F737 2CED 080A 67EB 592D 2A6A D9F4 AAC2 0DF6" + (name "benwoodcroft")) + ("45CC 63B8 5258 C9D5 5F34 B239 D37D 0EA7 CECC 3912" + (name "biscuolo")) + ("7988 3B9F 7D6A 4DBF 3719 0367 2506 A96C CF63 0B21" + (name "boskovits")) + ("DFC0 C7F7 9EE6 0CA7 AE55 5E19 6722 43C4 A03F 0EEE" + (name "brettgilio")) + (;; primary: "0401 7A2A 6D9A 0CCD C81D 8EC2 96AB 007F 1A7E D999" + "09CD D25B 5244 A376 78F6 EEA8 0CC5 2153 1979 91A5" + (name "carl")) + ("3E89 EEE7 458E 720D 9754 E0B2 5E28 A33B 0B84 F577" + (name "cbaines")) + ("3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5" + (name "civodul")) + ("510A 8628 E2A7 7678 8F8C 709C 4BC0 2592 5FF8 F4D3" + (name "cwebber")) + (;; primary: "295A F991 6F46 F8A1 34B0 29DA 8086 3842 F0FE D83B" + "76CE C6B1 7274 B465 C02D B3D9 E71A 3554 2C30 BAA5" + (name "dannym")) + ("B3C0 DB4D AD73 BA5D 285E 19AE 5143 0234 CEFD 87C3" + (name "davexunit")) + ( ;FIXME: to be confirmed! + "8CCB A7F5 52B9 CBEA E1FB 2915 8328 C747 0FF1 D807" + (name "davexunit (2nd)")) + ("53C4 1E6E 41AA FE55 335A CA5E 446A 2ED4 D940 BF14" + (name "daviwil")) + ("6909 6DFD D702 8BED ACC5 884B C5E0 51C7 9C0B ECDB" + (name "dvc")) + ("5F43 B681 0437 2F4B A898 A64B 33B9 E9FD E28D 2C23" + (name "dvc (old)")) + ("A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351" + (name "efraim")) + ("9157 41FE B22F A4E3 3B6E 8F8D F4C1 D391 7EAC EE93" + (name "efraim (old)")) + (;; primary: "2453 02B1 BAB1 F867 FDCA 96BC 8F3F 861F 82EB 7A9A" + "CBC5 9C66 EC27 B971 7940 6B3E 6BE8 208A DF21 FE3F" + (name "glv")) + ("2219 43F4 9E9F 276F 9499 3382 BF28 6CB6 593E 5FFD" + (name "hoebjo")) + ("B943 509D 633E 80DD 27FC 4EED 634A 8DFF D3F6 31DF" + (name "htgoebel")) + ("7440 26BA 7CA3 C668 E940 1D53 0B43 1E98 3705 6942" + (name "ipetkov")) + (;; primary: "66A5 6D9C 9A98 BE7F 719A B401 2652 5665 AE72 7D37" + "0325 78A6 8298 94E7 2AA2 66F5 D415 BF25 3B51 5976" + (name "iyzsong")) + + ;; https://lists.gnu.org/archive/html/guix-devel/2018-04/msg00229.html + ("DB34 CB51 D25C 9408 156F CDD6 A12F 8797 8D70 1B99" + (name "janneke (old)")) + ("1A85 8392 E331 EAFD B8C2 7FFB F3C1 A0D9 C1D6 5273" + (name "janneke")) + + (;; primary: "1BA4 08C5 8BF2 0EA7 3179 635A 865D C0A3 DED9 B5D0" + "E31D 9DDE EBA5 4A14 8A20 4550 DA45 97F9 47B4 1025" + (name "jlicht")) + ("8797 A26D 0854 2EAB 0285 A290 8A67 719C 2DE8 27B3" + (name "jmd")) + ("83B6 703A DCCA 3B69 4BCE 2DA6 E6A5 EE3C 1946 7A0D" + (name "kkebreau")) + ("45E5 75FA 53EA 8BD6 1BCE 0B4E 3ADC 75F0 13D6 78F9" + (name "leungbk")) + (;; primary: "4F71 6F9A 8FA2 C80E F1B5 E1BA 5E35 F231 DE1A C5E0" + "B051 5948 F1E7 D3C1 B980 38A0 2646 FA30 BACA 7F08" + (name "lfam")) + ("2AE3 1395 932B E642 FC0E D99C 9BED 6EDA 32E5 B0BC" + (name "lsl88")) + ("CBF5 9755 CBE7 E7EF EF18 3FB1 DD40 9A15 D822 469D" + (name "marusich")) + ("BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA" + (name "mbakke")) + ("D919 0965 CE03 199E AF28 B3BE 7CEF 2984 7562 C516" + (name "mhw")) + ("4008 6A7E 0252 9B60 31FB 8607 8354 7635 3176 9CA6" + (name "mothacehe")) + ("F2A3 8D7E EB2B 6640 5761 070D 0ADE E100 9460 4D37" + (name "mthl")) + (;; primary: "F5BC 5534 C36F 0087 B39D 36EF 1C9D C4FE B9DB 7C4B" + "F5DA 2032 4B87 3D0B 7A38 7672 0DB0 FF88 4F55 6D79" + (name "nckx")) + (;; primary: "F5BC 5534 C36F 0087 B39D 36EF 1C9D C4FE B9DB 7C4B" + "7E8F AED0 0944 78EF 72E6 4D16 D889 B0F0 18C5 493C" + (name "nckx (revoked; not compromised)")) + ("E576 BFB2 CF6E B13D F571 33B9 E315 A758 4613 1564" + (name "niedzejkob")) + ("ED0E F1C8 E126 BA83 1B48 5FE9 DA00 B4F0 48E9 2F2D" + (name "ngz")) + ("CEF4 CB91 4856 BA38 0A20 A7E2 3008 88CB 39C6 3817" + (name "pelzflorian")) + (;; primary: "B68B DF22 73F9 DA0E 63C1 8A32 515B F416 9242 D600" + "C699 ED09 E51B CE89 FD1D A078 AAC7 E891 896B 568A" + (name "pgarlick")) + ("3A86 380E 58A8 B942 8D39 60E1 327C 1EF3 8DF5 4C32" + (name "phant0mas")) + ("74D6 A930 F44B 9B84 9EA5 5606 C166 AA49 5F7F 189C" + (name "reepca")) + ("BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC" + (name "rekado")) + ("0154 E1B9 1CC9 D9EF 7764 8DE7 F3A7 27DB 44FC CA36" + (name "rhelling")) + ("17CB 2812 EB63 3DFF 2C7F 0452 C3EC 1DCA 8430 72E1" + (name "roelj (old)")) + (;; From commit cc51c03ff867d4633505354819c6d88af88bf919 (March 2020). + ;; See . + "F556 FD94 FB8F 8B87 79E3 6832 CBD0 CD51 38C1 9AFC" + (name "roelj")) + ("B5FA E628 5B41 3728 B2A0 FAED 4311 1F45 2008 6A0C" + (name "roptat (old)")) + (;; From commit 2cbede5935eb6a40173bbdf30a9ad22bf7574c22 (Jan. 2020). See + ;; . + "1EFB 0909 1F17 D28C CBF9 B13A 53D4 57B2 D636 EE82" + (name "roptat")) + (;; primary: "D6B0 C593 DA8C 5EDC A44C 7A58 C336 91F7 1188 B004" + "A02C 2D82 0EF4 B25B A6B5 1D90 2AC6 A5EC 1C35 7C59" + (name "samplet")) + ("77DD AD2D 97F5 31BB C0F3 C7FD DFB5 EB09 AA62 5423" + (name "sleep_walker")) + ("F494 72F4 7A59 00D5 C235 F212 89F9 6D48 08F3 59C7" + (name "snape")) + ("4E26 CCE9 578E 0828 9855 BDD4 1C79 95D2 D5A3 8336" + (name "steap")) + ("9ADE 9ECF 2B19 C180 9C99 5CEA A1F4 CFCC 5283 6BAC" + (name "taylanub")) + + ;; https://lists.gnu.org/archive/html/guix-devel/2017-03/msg00826.html + (;; primary: "1DD1 681F E285 E07F 11DC 0C59 2E15 A6BC D77D 54FD" + "3D2C DA58 819C 08C2 A649 D43D 5C3B 064C 724A 5726" + (name "thomasd")) + ("A5C5 92EA 606E 7106 A6A3 BC08 98B2 1575 91E1 2B08" + (name "thomasd (old)")) + + ("D712 1D73 A40A 7264 9E43 ED7D F284 6B1A 0D32 C442" + (name "toothbrush")) + ("6580 7361 3BFC C5C7 E2E4 5D45 DC51 8FC8 7F97 16AA" + (name "vagrantc")) + (;; primary: "C955 CC5D C048 7FB1 7966 40A9 199A F6A3 67E9 4ABB" + "7238 7123 8EAC EB63 4548 5857 167F 8EA5 001A FA9C" + (name "wigust")) + ("FF47 8FB2 64DE 32EC 2967 25A3 DDC0 F535 8812 F8F2" + (name "wingo")))) -- cgit v1.2.3 From 69db2993b58579e7b0990f5c35f9a289844f22e5 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 6 Jul 2020 10:10:01 +0200 Subject: git: Add 'with-git-error-handling'. * guix/scripts/pull.scm (report-git-error, with-git-error-handling): Move to... * guix/git.scm: ... here. * guix/scripts/time-machine.scm: Adjust accordingly. --- guix/git.scm | 19 +++++++++++++++++++ guix/scripts/pull.scm | 18 ------------------ guix/scripts/time-machine.scm | 4 +++- 3 files changed, 22 insertions(+), 19 deletions(-) diff --git a/guix/git.scm b/guix/git.scm index 0d8e617cc9..19c1cb59d3 100644 --- a/guix/git.scm +++ b/guix/git.scm @@ -29,6 +29,7 @@ (define-module (guix git) #:use-module (guix records) #:use-module (guix gexp) #:use-module (guix sets) + #:use-module ((guix diagnostics) #:select (leave)) #:use-module (rnrs bytevectors) #:use-module (ice-9 match) #:use-module (srfi srfi-1) @@ -39,6 +40,7 @@ (define-module (guix git) honor-system-x509-certificates! with-repository + with-git-error-handling false-if-git-not-found update-cached-checkout url+commit->name @@ -209,6 +211,23 @@ (define-syntax-rule (with-repository directory repository exp ...) (call-with-repository directory (lambda (repository) exp ...))) +(define (report-git-error error) + "Report the given Guile-Git error." + ;; Prior to Guile-Git commit b6b2760c2fd6dfaa5c0fedb43eeaff06166b3134, + ;; errors would be represented by integers. + (match error + ((? integer? error) ;old Guile-Git + (leave (G_ "Git error ~a~%") error)) + ((? git-error? error) ;new Guile-Git + (leave (G_ "Git error: ~a~%") (git-error-message error))))) + +(define-syntax-rule (with-git-error-handling body ...) + (catch 'git-error + (lambda () + body ...) + (lambda (key err) + (report-git-error err)))) + (define (load-git-submodules) "Attempt to load (git submodules), which was missing until Guile-Git 0.2.0. Return true on success, false on failure." diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm index f953957161..807daec593 100644 --- a/guix/scripts/pull.scm +++ b/guix/scripts/pull.scm @@ -63,7 +63,6 @@ (define-module (guix scripts pull) #:re-export (display-profile-content channel-commit-hyperlink) #:export (channel-list - with-git-error-handling guix-pull)) @@ -464,23 +463,6 @@ (define (honor-x509-certificates store) (unless (honor-system-x509-certificates!) (honor-lets-encrypt-certificates! store))) -(define (report-git-error error) - "Report the given Guile-Git error." - ;; Prior to Guile-Git commit b6b2760c2fd6dfaa5c0fedb43eeaff06166b3134, - ;; errors would be represented by integers. - (match error - ((? integer? error) ;old Guile-Git - (leave (G_ "Git error ~a~%") error)) - ((? git-error? error) ;new Guile-Git - (leave (G_ "Git error: ~a~%") (git-error-message error))))) - -(define-syntax-rule (with-git-error-handling body ...) - (catch 'git-error - (lambda () - body ...) - (lambda (key err) - (report-git-error err)))) - ;;; ;;; Profile. diff --git a/guix/scripts/time-machine.scm b/guix/scripts/time-machine.scm index f9bcec651a..441673b780 100644 --- a/guix/scripts/time-machine.scm +++ b/guix/scripts/time-machine.scm @@ -24,10 +24,12 @@ (define-module (guix scripts time-machine) #:use-module (guix channels) #:use-module (guix store) #:use-module (guix status) + #:use-module ((guix git) + #:select (with-git-error-handling)) #:use-module ((guix utils) #:select (%current-system)) #:use-module ((guix scripts pull) - #:select (with-git-error-handling channel-list)) + #:select (channel-list)) #:use-module ((guix scripts build) #:select (%standard-build-options show-build-options-help -- cgit v1.2.3 From a98712785e0b042a290420fd74e5a4a5da4fc68f Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 5 Jul 2020 23:40:29 +0200 Subject: Add 'guix git authenticate'. * guix/scripts/git.scm, guix/scripts/git/authenticate.scm, tests/guix-git-authenticate.sh: New files. * Makefile.am (MODULES): Add the *.scm files. (SH_TESTS): Add 'tests/guix-git-authenticate.sh'. * doc/guix.texi (Channels)[Specifying Channel Authorizations]: Mention 'guix git authenticate'. (Invoking guix git authenticate): New node. * po/guix/POTFILES.in: Add 'guix/scripts/git.scm' and 'guix/scripts/git/authenticate.scm'. --- Makefile.am | 3 + doc/guix.texi | 83 +++++++++++++++++- guix/scripts/git.scm | 63 ++++++++++++++ guix/scripts/git/authenticate.scm | 179 ++++++++++++++++++++++++++++++++++++++ po/guix/POTFILES.in | 2 + tests/guix-git-authenticate.sh | 56 ++++++++++++ 6 files changed, 383 insertions(+), 3 deletions(-) create mode 100644 guix/scripts/git.scm create mode 100644 guix/scripts/git/authenticate.scm create mode 100644 tests/guix-git-authenticate.sh diff --git a/Makefile.am b/Makefile.am index 47699351b9..20bfaba88b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -281,6 +281,8 @@ MODULES = \ guix/scripts/publish.scm \ guix/scripts/edit.scm \ guix/scripts/size.scm \ + guix/scripts/git.scm \ + guix/scripts/git/authenticate.scm \ guix/scripts/graph.scm \ guix/scripts/weather.scm \ guix/scripts/container.scm \ @@ -463,6 +465,7 @@ SH_TESTS = \ tests/guix-build-branch.sh \ tests/guix-download.sh \ tests/guix-gc.sh \ + tests/guix-git-authenticate.sh \ tests/guix-hash.sh \ tests/guix-pack.sh \ tests/guix-pack-localstatedir.sh \ diff --git a/doc/guix.texi b/doc/guix.texi index 992bc303bb..17338ed764 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -3981,6 +3981,7 @@ Before that, some security considerations. @subsection Channel Authentication +@anchor{channel-authentication} @cindex authentication, of channel code The @command{guix pull} and @command{guix time-machine} commands @dfn{authenticate} the code retrieved from channels: they make sure each @@ -4200,6 +4201,7 @@ add a meta-data file @file{.guix-channel} that contains: @cindex channel authorizations @subsection Specifying Channel Authorizations +@anchor{channel-authorizations} As we saw above, Guix ensures the source code it pulls from channels comes from authorized developers. As a channel author, you need to specify the list of authorized developers in the @@ -4259,6 +4261,18 @@ pair---i.e., the commit that introduced @file{.guix-authorizations}, and the fingerprint of the OpenPGP used to sign it. @end enumerate +Before pushing to your public Git repository, you can run @command{guix +git-authenticate} to verify that you did sign all the commits you are +about to push with an authorized key: + +@example +guix git authenticate @var{commit} @var{signer} +@end example + +@noindent +where @var{commit} and @var{signer} are your channel introduction. +@xref{Invoking guix git authenticate}, for details. + Publishing a signed channel requires discipline: any mistake, such as an unsigned commit or a commit signed by an unauthorized key, will prevent users from pulling from your channel---well, that's the whole point of @@ -4862,9 +4876,10 @@ pack} command allows you to create @dfn{application bundles} that can be easily distributed to users who do not run Guix. @menu -* Invoking guix environment:: Setting up development environments. -* Invoking guix pack:: Creating software bundles. -* The GCC toolchain:: Working with languages supported by GCC. +* Invoking guix environment:: Setting up development environments. +* Invoking guix pack:: Creating software bundles. +* The GCC toolchain:: Working with languages supported by GCC. +* Invoking guix git authenticate:: Authenticating Git repositories. @end menu @node Invoking guix environment @@ -5602,6 +5617,68 @@ The package @code{gfortran-toolchain} provides a complete GCC toolchain for Fortran development. For other languages, please use @samp{guix search gcc toolchain} (@pxref{guix-search,, Invoking guix package}). + +@node Invoking guix git authenticate +@section Invoking @command{guix git authenticate} + +The @command{guix git authenticate} command authenticates a Git checkout +following the same rule as for channels (@pxref{channel-authentication, +channel authentication}). That is, starting from a given commit, it +ensures that all subsequent commits are signed by an OpenPGP key whose +fingerprint appears in the @file{.guix-authorizations} file of its +parent commit(s). + +You will find this command useful if you maintain a channel. But in +fact, this authentication mechanism is useful in a broader context, so +you might want to use it for Git repositories that have nothing to do +with Guix. + +The general syntax is: + +@example +guix git authenticate @var{commit} @var{signer} [@var{options}@dots{}] +@end example + +By default, this command authenticates the Git checkout in the current +directory; it outputs nothing and exits with exit code zero on success +and non-zero on failure. @var{commit} above denotes the first commit +where authentication takes place, and @var{signer} is the OpenPGP +fingerprint of public key used to sign @var{commit}. Together, they +form a ``channel introduction'' (@pxref{channel-authentication, channel +introduction}). The options below allow you to fine-tune the process. + +@table @code +@item --repository=@var{directory} +@itemx -r @var{directory} +Open the Git repository in @var{directory} instead of the current +directory. + +@item --keyring=@var{reference} +@itemx -k @var{reference} +Load OpenPGP keyring from @var{reference}, the reference of a branch +such as @code{origin/keyring} or @code{my-keyring}. The branch must +contain OpenPGP public keys in @file{.key} files, either in binary form +or ``ASCII-armored''. By default the keyring is loaded from the branch +named @code{keyring}. + +@item --stats +Display commit signing statistics upon completion. + +@item --cache-key=@var{key} +Previously-authenticated commits are cached in a file under +@file{~/.cache/guix/authentication}. This option forces the cache to be +stored in file @var{key} in that directory. + +@item --historical-authorizations=@var{file} +By default, any commit whose parent commit(s) lack the +@file{.guix-authorizations} file is considered inauthentic. In +contrast, this option considers the authorizations in @var{file} for any +commit that lacks @file{.guix-authorizations}. The format of @var{file} +is the same as that of @file{.guix-authorizations} +(@pxref{channel-authorizations, @file{.guix-authorizations} format}). +@end table + + @c ********************************************************************* @node Programming Interface @chapter Programming Interface diff --git a/guix/scripts/git.scm b/guix/scripts/git.scm new file mode 100644 index 0000000000..bc829cbe99 --- /dev/null +++ b/guix/scripts/git.scm @@ -0,0 +1,63 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2020 Ludovic Courtès +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (guix scripts git) + #:use-module (ice-9 match) + #:use-module (guix ui) + #:export (guix-git)) + +(define (show-help) + (display (G_ "Usage: guix git COMMAND ARGS... +Operate on Git repositories.\n")) + (newline) + (display (G_ "The valid values for ACTION are:\n")) + (newline) + (display (G_ "\ + authenticate verify commit signatures and authorizations\n")) + (newline) + (display (G_ " + -h, --help display this help and exit")) + (display (G_ " + -V, --version display version information and exit")) + (newline) + (show-bug-report-information)) + +(define %sub-commands '("authenticate")) + +(define (resolve-sub-command name) + (let ((module (resolve-interface + `(guix scripts git ,(string->symbol name)))) + (proc (string->symbol (string-append "guix-git-" name)))) + (module-ref module proc))) + +(define (guix-git . args) + (with-error-handling + (match args + (() + (format (current-error-port) + (G_ "guix git: missing sub-command~%"))) + ((or ("-h") ("--help")) + (show-help) + (exit 0)) + ((or ("-V") ("--version")) + (show-version-and-exit "guix git")) + ((sub-command args ...) + (if (member sub-command %sub-commands) + (apply (resolve-sub-command sub-command) args) + (format (current-error-port) + (G_ "guix git: invalid sub-command~%"))))))) diff --git a/guix/scripts/git/authenticate.scm b/guix/scripts/git/authenticate.scm new file mode 100644 index 0000000000..5f5d423f28 --- /dev/null +++ b/guix/scripts/git/authenticate.scm @@ -0,0 +1,179 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2020 Ludovic Courtès +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (guix scripts git authenticate) + #:use-module (git) + #:use-module (guix ui) + #:use-module (guix scripts) + #:use-module (guix git-authenticate) + #:autoload (guix openpgp) (openpgp-format-fingerprint + openpgp-public-key-fingerprint) + #:use-module ((guix channels) #:select (openpgp-fingerprint)) + #:use-module ((guix git) #:select (with-git-error-handling)) + #:use-module (guix progress) + #:use-module (guix base64) + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-26) + #:use-module (srfi srfi-37) + #:use-module (ice-9 format) + #:use-module (ice-9 match) + #:export (guix-git-authenticate)) + +;;; Commentary: +;;; +;;; Authenticate a Git checkout by reading '.guix-authorizations' files and +;;; following the "authorizations invariant" also used by (guix channels). +;;; +;;; Code: + +(define %options + ;; Specifications of the command-line options. + (list (option '(#\h "help") #f #f + (lambda args + (show-help) + (exit 0))) + (option '(#\V "version") #f #f + (lambda args + (show-version-and-exit "guix git authenticate"))) + + (option '(#\r "repository") #t #f + (lambda (opt name arg result) + (alist-cons 'directory arg result))) + (option '(#\e "end") #t #f + (lambda (opt name arg result) + (alist-cons 'end-commit (string->oid arg) result))) + (option '(#\k "keyring") #t #f + (lambda (opt name arg result) + (alist-cons 'keyring-reference arg result))) + (option '("cache-key") #t #f + (lambda (opt name arg result) + (alist-cons 'cache-key arg result))) + (option '("historical-authorizations") #t #f + (lambda (opt name arg result) + (alist-cons 'historical-authorizations arg + result))) + (option '("stats") #f #f + (lambda (opt name arg result) + (alist-cons 'show-stats? #t result))))) + +(define %default-options + '((directory . ".") + (keyring-reference . "keyring"))) + +(define (show-stats stats) + "Display STATS, an alist containing commit signing stats as returned by +'authenticate-repository'." + (format #t (G_ "Signing statistics:~%")) + (for-each (match-lambda + ((signer . count) + (format #t " ~a ~10d~%" + (openpgp-format-fingerprint + (openpgp-public-key-fingerprint signer)) + count))) + (sort stats + (match-lambda* + (((_ . count1) (_ . count2)) + (> count1 count2)))))) + +(define (show-help) + (display (G_ "Usage: guix git authenticate COMMIT SIGNER [OPTIONS...] +Authenticate the given Git checkout using COMMIT/SIGNER as its introduction.\n")) + (display (G_ " + -r, --repository=DIRECTORY + open the Git repository at DIRECTORY")) + (display (G_ " + -k, --keyring=REFERENCE + load keyring from REFERENCE, a Git branch")) + (display (G_ " + --stats display commit signing statistics upon completion")) + (display (G_ " + --cache-key=KEY cache authenticated commits under KEY")) + (display (G_ " + --historical-authorizations=FILE + read historical authorizations from FILE")) + (newline) + (display (G_ " + -h, --help display this help and exit")) + (display (G_ " + -V, --version display version information and exit")) + (newline) + (show-bug-report-information)) + + +;;; +;;; Entry point. +;;; + +(define (guix-git-authenticate . args) + (define options + (parse-command-line args %options (list %default-options) + #:build-options? #f)) + + (define (command-line-arguments lst) + (reverse (filter-map (match-lambda + (('argument . arg) arg) + (_ #f)) + lst))) + + (define commit-short-id + (compose (cut string-take <> 7) oid->string commit-id)) + + (define (make-reporter start-commit end-commit commits) + (format (current-error-port) + (G_ "Authenticating commits ~a to ~a (~h new \ +commits)...~%") + (commit-short-id start-commit) + (commit-short-id end-commit) + (length commits)) + + (if (isatty? (current-error-port)) + (progress-reporter/bar (length commits)) + progress-reporter/silent)) + + (with-error-handling + (with-git-error-handling + (match (command-line-arguments options) + ((commit signer) + (let* ((directory (assoc-ref options 'directory)) + (show-stats? (assoc-ref options 'show-stats?)) + (keyring (assoc-ref options 'keyring-reference)) + (repository (repository-open directory)) + (end (match (assoc-ref options 'end-commit) + (#f (reference-target + (repository-head repository))) + (oid oid))) + (history (match (assoc-ref options 'historical-authorizations) + (#f '()) + (file (call-with-input-file file + read-authorizations)))) + (cache-key (or (assoc-ref options 'cache-key) + (repository-cache-key repository)))) + (define stats + (authenticate-repository repository (string->oid commit) + (openpgp-fingerprint signer) + #:end end + #:keyring-reference keyring + #:historical-authorizations history + #:cache-key cache-key + #:make-reporter make-reporter)) + + (when (and show-stats? (not (null? stats))) + (show-stats stats)))) + (_ + (leave (G_ "wrong number of arguments; \ +expected COMMIT and SIGNER~%"))))))) diff --git a/po/guix/POTFILES.in b/po/guix/POTFILES.in index 62b3cbf4e4..f4d020782c 100644 --- a/po/guix/POTFILES.in +++ b/po/guix/POTFILES.in @@ -53,6 +53,8 @@ guix/scripts/upgrade.scm guix/scripts/search.scm guix/scripts/show.scm guix/scripts/gc.scm +guix/scripts/git.scm +guix/scripts/git/authenticate.scm guix/scripts/hash.scm guix/scripts/import.scm guix/scripts/import/cran.scm diff --git a/tests/guix-git-authenticate.sh b/tests/guix-git-authenticate.sh new file mode 100644 index 0000000000..1c76e240b5 --- /dev/null +++ b/tests/guix-git-authenticate.sh @@ -0,0 +1,56 @@ +# GNU Guix --- Functional package management for GNU +# Copyright © 2020 Ludovic Courtès +# +# This file is part of GNU Guix. +# +# GNU Guix is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or (at +# your option) any later version. +# +# GNU Guix is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Guix. If not, see . + +# +# Test the 'guix git authenticate' command-line utility. +# + +# Skip if we're not in a Git checkout. +[ -d "$abs_top_srcdir/.git" ] || exit 77 + +# Skip if there's no 'keyring' branch. +guile -c '(use-modules (git)) + (member "refs/heads/keyring" (branch-list (repository-open ".")))' || \ + exit 77 + +# Keep in sync with '%default-channels' in (guix channels)! +intro_commit="9edb3f66fd807b096b48283debdcddccfea34bad" +intro_signer="BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA" + +cache_key="test-$$" + +guix git authenticate "$intro_commit" "$intro_signer" \ + --cache-key="$cache_key" --stats \ + --end=9549f0283a78fe36f2d4ff2a04ef8ad6b0c02604 + +rm "$XDG_CACHE_HOME/guix/authentication/$cache_key" + +# Commit and signer of the 'v1.0.0' tag. +v1_0_0_commit="6298c3ffd9654d3231a6f25390b056483e8f407c" +v1_0_0_signer="3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5" # civodul +v1_0_1_commit="d68de958b60426798ed62797ff7c96c327a672ac" + +# This should fail because these commits lack '.guix-authorizations'. +if guix git authenticate "$v1_0_0_commit" "$v1_0_0_signer" \ + --cache-key="$cache_key" --end="$v1_0_1_commit"; +then false; else true; fi + +# This should work thanks to '--historical-authorizations'. +guix git authenticate "$v1_0_0_commit" "$v1_0_0_signer" \ + --cache-key="$cache_key" --end="$v1_0_1_commit" --stats \ + --historical-authorizations="$abs_top_srcdir/etc/historical-authorizations" -- cgit v1.2.3 From 96bf434c70c4346c6402658d3ec57ef64a8e521e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 6 Jul 2020 10:18:05 +0200 Subject: maint: Remove 'build-aux/git-authenticate.scm'. * Makefile.am (channel_intro_commit, channel_intro_signer): New variables. (authenticate): Use it. (EXTRA_DIST): Remove 'build-aux/git-authenticate.scm'. * build-aux/git-authenticate.scm: Remove. --- Makefile.am | 12 +- build-aux/git-authenticate.scm | 322 ----------------------------------------- 2 files changed, 7 insertions(+), 327 deletions(-) delete mode 100644 build-aux/git-authenticate.scm diff --git a/Makefile.am b/Makefile.am index 20bfaba88b..20d43cd130 100644 --- a/Makefile.am +++ b/Makefile.am @@ -569,7 +569,6 @@ EXTRA_DIST += \ build-aux/check-channel-news.scm \ build-aux/compile-as-derivation.scm \ build-aux/generate-authors.scm \ - build-aux/git-authenticate.scm \ build-aux/test-driver.scm \ build-aux/update-guix-package.scm \ build-aux/update-NEWS.scm \ @@ -641,14 +640,17 @@ install-data-hook: # Commit corresponding to the 'v1.0.0' tag. commit_v1_0_0 = 6298c3ffd9654d3231a6f25390b056483e8f407c +# Introduction of the 'guix' channel. Keep in sync with (guix channels)! +channel_intro_commit = 9edb3f66fd807b096b48283debdcddccfea34bad +channel_intro_signer = BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA + # Authenticate the current Git checkout by checking signatures on every commit # starting from $(commit_v1_0_0). authenticate: guix/openpgp.go guix/git-authenticate.go guix/git.go $(AM_V_at)echo "Authenticating Git checkout..." ; \ - "$(top_builddir)/pre-inst-env" $(GUILE) \ - --no-auto-compile -e git-authenticate \ - "$(top_srcdir)/build-aux/git-authenticate.scm" \ - "$(commit_v1_0_0)" + "$(top_builddir)/pre-inst-env" guix git authenticate \ + --cache-key=channels/guix --stats \ + "$(channel_intro_commit)" "$(channel_intro_signer)" # Assuming Guix is already installed and the daemon is up and running, this # rule builds from $(srcdir), creating and building derivations. diff --git a/build-aux/git-authenticate.scm b/build-aux/git-authenticate.scm deleted file mode 100644 index e670264f28..0000000000 --- a/build-aux/git-authenticate.scm +++ /dev/null @@ -1,322 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2019, 2020 Ludovic Courtès -;;; Copyright © 2020 Tobias Geerinckx-Rice -;;; -;;; 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 . - -;;; -;;; Authenticate a range of commits. -;;; - -(use-modules (git) - (guix base16) - (guix git) - (guix git-authenticate) - (guix i18n) - ((guix openpgp) - #:select (openpgp-public-key-fingerprint - openpgp-format-fingerprint)) - (guix progress) - (srfi srfi-1) - (srfi srfi-26) - (ice-9 match) - (ice-9 format) - (ice-9 pretty-print)) - - -(define %historical-committers - ;; List of "historical" committers---people once authorized committers - ;; before the '.guix-authorizations' file was created. - ;; - ;; These are the user names found on - ;; along with - ;; the fingerprint of the signing (sub)key. - '(("andreas" - "AD17 A21E F8AE D8F1 CC02 DBD9 F7D5 C9BF 765C 61E3") - ("ajgrf" - "2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5") - ("alexvong1995" - "306F CB8F 2C01 C25D 29D3 0556 61EF 502E F602 52F2") - ("alezost" - "4FB9 9F49 2B12 A365 7997 E664 8246 0C08 2A0E E98F") - ("ambrevar" - "50F3 3E2E 5B0C 3D90 0424 ABE8 9BDC F497 A4BB CC7F") - ("apteryx" - "27D5 86A4 F890 0854 329F F09F 1260 E464 82E6 3562") - ("arunisaac" - "7F73 0343 F2F0 9F3C 77BF 79D3 2E25 EE8B 6180 2BB3") - ("atheia" - ;; primary: "3B12 9196 AE30 0C3C 0E90 A26F A715 5567 3271 9948" - "9A2B 401E D001 0650 1584 BAAC 8BC4 F447 6E8A 8E00") - ("bandali" - ;; primary: "BE62 7373 8E61 6D6D 1B3A 08E8 A21A 0202 4881 6103" - "39B3 3C8D 9448 0D2D DCC2 A498 8B44 A0CD C7B9 56F2") - ("bavier" - ;; primary: "34FF 38BC D151 25A6 E340 A0B5 3453 2F9F AFCA 8B8E" - "A0C5 E352 2EF8 EF5C 64CD B7F0 FD73 CAC7 19D3 2566") - ("beffa" - "3774 8024 880F D3FF DCA2 C9AB 5893 6E0E 2F1B 5A4C") - ("benwoodcroft" - "BCF8 F737 2CED 080A 67EB 592D 2A6A D9F4 AAC2 0DF6") - ("biscuolo" - "45CC 63B8 5258 C9D5 5F34 B239 D37D 0EA7 CECC 3912") - ("boskovits" - "7988 3B9F 7D6A 4DBF 3719 0367 2506 A96C CF63 0B21") - ("brettgilio" - "DFC0 C7F7 9EE6 0CA7 AE55 5E19 6722 43C4 A03F 0EEE") - ("carl" - ;; primary: "0401 7A2A 6D9A 0CCD C81D 8EC2 96AB 007F 1A7E D999" - "09CD D25B 5244 A376 78F6 EEA8 0CC5 2153 1979 91A5") - ("cbaines" - "3E89 EEE7 458E 720D 9754 E0B2 5E28 A33B 0B84 F577") - ("civodul" - "3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5") - ("cwebber" - "510A 8628 E2A7 7678 8F8C 709C 4BC0 2592 5FF8 F4D3") - ("dannym" - ;; primary: "295A F991 6F46 F8A1 34B0 29DA 8086 3842 F0FE D83B" - "76CE C6B1 7274 B465 C02D B3D9 E71A 3554 2C30 BAA5") - ("davexunit" - "B3C0 DB4D AD73 BA5D 285E 19AE 5143 0234 CEFD 87C3") - ("davexunit (2nd)" ;FIXME: to be confirmed! - "8CCB A7F5 52B9 CBEA E1FB 2915 8328 C747 0FF1 D807") - ("daviwil" - "53C4 1E6E 41AA FE55 335A CA5E 446A 2ED4 D940 BF14") - ("dvc" - "6909 6DFD D702 8BED ACC5 884B C5E0 51C7 9C0B ECDB") - ("dvc (old)" - "5F43 B681 0437 2F4B A898 A64B 33B9 E9FD E28D 2C23") - ("efraim" - "A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351") - ("efraim (old)" - "9157 41FE B22F A4E3 3B6E 8F8D F4C1 D391 7EAC EE93") - ("glv" - ;; primary: "2453 02B1 BAB1 F867 FDCA 96BC 8F3F 861F 82EB 7A9A" - "CBC5 9C66 EC27 B971 7940 6B3E 6BE8 208A DF21 FE3F") - ("hoebjo" - "2219 43F4 9E9F 276F 9499 3382 BF28 6CB6 593E 5FFD") - ("htgoebel" - "B943 509D 633E 80DD 27FC 4EED 634A 8DFF D3F6 31DF") - ("ipetkov" - "7440 26BA 7CA3 C668 E940 1D53 0B43 1E98 3705 6942") - ("iyzsong" - ;; primary: "66A5 6D9C 9A98 BE7F 719A B401 2652 5665 AE72 7D37" - "0325 78A6 8298 94E7 2AA2 66F5 D415 BF25 3B51 5976") - - ;; https://lists.gnu.org/archive/html/guix-devel/2018-04/msg00229.html - ("janneke (old)" - "DB34 CB51 D25C 9408 156F CDD6 A12F 8797 8D70 1B99") - ("janneke" - "1A85 8392 E331 EAFD B8C2 7FFB F3C1 A0D9 C1D6 5273") - - ("jlicht" - ;; primary: "1BA4 08C5 8BF2 0EA7 3179 635A 865D C0A3 DED9 B5D0" - "E31D 9DDE EBA5 4A14 8A20 4550 DA45 97F9 47B4 1025") - ("jmd" - "8797 A26D 0854 2EAB 0285 A290 8A67 719C 2DE8 27B3") - ("kkebreau" - "83B6 703A DCCA 3B69 4BCE 2DA6 E6A5 EE3C 1946 7A0D") - ("leungbk" - "45E5 75FA 53EA 8BD6 1BCE 0B4E 3ADC 75F0 13D6 78F9") - ("lfam" - ;; primary: "4F71 6F9A 8FA2 C80E F1B5 E1BA 5E35 F231 DE1A C5E0" - "B051 5948 F1E7 D3C1 B980 38A0 2646 FA30 BACA 7F08") - ("lsl88" - "2AE3 1395 932B E642 FC0E D99C 9BED 6EDA 32E5 B0BC") - ("marusich" - "CBF5 9755 CBE7 E7EF EF18 3FB1 DD40 9A15 D822 469D") - ("mbakke" - "BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA") - ("mhw" - "D919 0965 CE03 199E AF28 B3BE 7CEF 2984 7562 C516") - ("mothacehe" - "4008 6A7E 0252 9B60 31FB 8607 8354 7635 3176 9CA6") - ("mthl" - "F2A3 8D7E EB2B 6640 5761 070D 0ADE E100 9460 4D37") - ("nckx" - ;; primary: "F5BC 5534 C36F 0087 B39D 36EF 1C9D C4FE B9DB 7C4B" - "F5DA 2032 4B87 3D0B 7A38 7672 0DB0 FF88 4F55 6D79") - ("nckx (revoked; not compromised)" - ;; primary: "F5BC 5534 C36F 0087 B39D 36EF 1C9D C4FE B9DB 7C4B" - "7E8F AED0 0944 78EF 72E6 4D16 D889 B0F0 18C5 493C") - ("niedzejkob" - "E576 BFB2 CF6E B13D F571 33B9 E315 A758 4613 1564") - ("ngz" - "ED0E F1C8 E126 BA83 1B48 5FE9 DA00 B4F0 48E9 2F2D") - ("pelzflorian" - "CEF4 CB91 4856 BA38 0A20 A7E2 3008 88CB 39C6 3817") - ("pgarlick" - ;; primary: "B68B DF22 73F9 DA0E 63C1 8A32 515B F416 9242 D600" - "C699 ED09 E51B CE89 FD1D A078 AAC7 E891 896B 568A") - ("phant0mas" - "3A86 380E 58A8 B942 8D39 60E1 327C 1EF3 8DF5 4C32") - ("reepca" - "74D6 A930 F44B 9B84 9EA5 5606 C166 AA49 5F7F 189C") - ("rekado" - "BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC") - ("rhelling" - "0154 E1B9 1CC9 D9EF 7764 8DE7 F3A7 27DB 44FC CA36") - ("roelj (old)" - "17CB 2812 EB63 3DFF 2C7F 0452 C3EC 1DCA 8430 72E1") - ("roelj" - ;; From commit cc51c03ff867d4633505354819c6d88af88bf919 (March 2020). - ;; See . - "F556 FD94 FB8F 8B87 79E3 6832 CBD0 CD51 38C1 9AFC") - ("roptat (old)" - "B5FA E628 5B41 3728 B2A0 FAED 4311 1F45 2008 6A0C") - ("roptat" - ;; From commit 2cbede5935eb6a40173bbdf30a9ad22bf7574c22 (Jan. 2020). See - ;; . - "1EFB 0909 1F17 D28C CBF9 B13A 53D4 57B2 D636 EE82") - ("samplet" - ;; primary: "D6B0 C593 DA8C 5EDC A44C 7A58 C336 91F7 1188 B004" - "A02C 2D82 0EF4 B25B A6B5 1D90 2AC6 A5EC 1C35 7C59") - ("sleep_walker" - "77DD AD2D 97F5 31BB C0F3 C7FD DFB5 EB09 AA62 5423") - ("snape" - "F494 72F4 7A59 00D5 C235 F212 89F9 6D48 08F3 59C7") - ("steap" - "4E26 CCE9 578E 0828 9855 BDD4 1C79 95D2 D5A3 8336") - ("taylanub" - "9ADE 9ECF 2B19 C180 9C99 5CEA A1F4 CFCC 5283 6BAC") - - ;; https://lists.gnu.org/archive/html/guix-devel/2017-03/msg00826.html - ("thomasd" - ;; primary: "1DD1 681F E285 E07F 11DC 0C59 2E15 A6BC D77D 54FD" - "3D2C DA58 819C 08C2 A649 D43D 5C3B 064C 724A 5726") - ("thomasd (old)" - "A5C5 92EA 606E 7106 A6A3 BC08 98B2 1575 91E1 2B08") - - ("toothbrush" - "D712 1D73 A40A 7264 9E43 ED7D F284 6B1A 0D32 C442") - ("vagrantc" - "6580 7361 3BFC C5C7 E2E4 5D45 DC51 8FC8 7F97 16AA") - ("wigust" - ;; primary: "C955 CC5D C048 7FB1 7966 40A9 199A F6A3 67E9 4ABB" - "7238 7123 8EAC EB63 4548 5857 167F 8EA5 001A FA9C") - ("wingo" - "FF47 8FB2 64DE 32EC 2967 25A3 DDC0 F535 8812 F8F2"))) - -(define %historical-authorized-signing-keys - ;; Fingerprint of historically authorized signing keys. - (map (match-lambda - ((name fingerprint) - (base16-string->bytevector - (string-downcase (string-filter char-set:graphic fingerprint))))) - %historical-committers)) - -(define %use-historical-authorizations? - ;; Whether to allow authentication of past commits using - ;; %HISTORICAL-AUTHORIZED-SIGNING-KEYS for when '.guix-authorizations' was - ;; missing. - (getenv "GUIX_USE_HISTORICAL_AUTHORIZATIONS")) - -(define %introductory-commit - ;; This is the commit that appears in the official 'guix' channel - ;; introduction. XXX: Keep in sync with (guix channels)! - "9edb3f66fd807b096b48283debdcddccfea34bad") - -(define %commits-with-bad-signature - ;; Commits with a known-bad signature. - '("6a34f4ccc8a5d4a48e25ad3c9c512f8634928b91")) ;2016-12-29 - -(define %unsigned-commits - ;; Commits lacking a signature. - '()) - -(define commit-short-id - (compose (cut string-take <> 7) oid->string commit-id)) - - -;;; -;;; Entry point. -;;; - -(define (git-authenticate args) - (define repository - (repository-open ".")) - - (let loop ((args args)) - (match args - ((_ start end) - (define start-commit - (commit-lookup repository - (string->oid (if %use-historical-authorizations? - start - %introductory-commit)))) - (define end-commit - (commit-lookup repository (string->oid end))) - - (define authenticated-commits - ;; Previously-authenticated commits that don't need to be checked - ;; again. - (filter-map (lambda (id) - (false-if-exception - (commit-lookup repository (string->oid id)))) - (previously-authenticated-commits "channels/guix"))) - - (define commits - ;; Commits to authenticate, excluding the closure of - ;; AUTHENTICATED-COMMITS. - (commit-difference end-commit start-commit - authenticated-commits)) - - (define reporter - (progress-reporter/bar (length commits))) - - (define historical-authorizations - ;; List of authorizations in effect before '.guix-authorizations' was - ;; introduced. By default, assume there were no authorizations; this - ;; is what 'guix pull' does. - (if %use-historical-authorizations? - %historical-authorized-signing-keys - '())) - - (format #t (G_ "Authenticating ~a to ~a (~a commits)...~%") - (commit-short-id start-commit) - (commit-short-id end-commit) - (length commits)) - - (let ((stats (call-with-progress-reporter reporter - (lambda (report) - (authenticate-commits repository commits - #:default-authorizations - historical-authorizations - #:report-progress report))))) - (cache-authenticated-commit "channels/guix" - (oid->string (commit-id end-commit))) - - (unless (null? stats) - (format #t (G_ "Signing statistics:~%")) - (for-each (match-lambda - ((signer . count) - (format #t " ~a ~10d~%" - (openpgp-format-fingerprint - (openpgp-public-key-fingerprint signer)) - count))) - (sort stats - (match-lambda* - (((_ . count1) (_ . count2)) - (> count1 count2)))))))) - ((command start) - (let* ((head (repository-head repository)) - (end (reference-target head))) - (loop (list command start (oid->string end))))) - (_ - (format (current-error-port) - (G_ "Usage: git-authenticate START [END] - -Authenticate commits START to END or the current head.\n")))))) -- cgit v1.2.3 From 62b8bbc2c2dd3c42ac5fff7bde846ff5047612bf Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 11 Jul 2020 12:42:58 +0200 Subject: news: Add entry for 'guix git authenticate'. * etc/news.scm: Add entry. --- etc/news.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/etc/news.scm b/etc/news.scm index 62ec68bab2..3279099ca2 100644 --- a/etc/news.scm +++ b/etc/news.scm @@ -13,6 +13,22 @@ (channel-news (version 0) + (entry (commit "a98712785e0b042a290420fd74e5a4a5da4fc68f") + (title (en "New @command{guix git authenticate} command")) + (body + (en "The new @command{guix git authenticate} command authenticates a +Git repository by verifying commit signatures and ensuring they all come from +authorized parties, exactly like @command{guix pull} now does. + +This command is primarily useful to developers of channels. It allows them to +ensure, before pushing, that the channel only contains commits signed with +authorized keys. But this command is also useful anytime you use Git and want +to allow people to authenticate code fetched from your repository. + +Run @command{info \"(guix) Invoking guix git authenticate\"} for more info, +and see @uref{https://guix.gnu.org/blog/2020/securing-updates/} for details on +these mechanisms."))) + (entry (commit "43badf261f4688c8a7a7a9004a4bff8acb205835") (title (en "@command{guix pull} authenticates channels") (de "@command{guix pull} authentifiziert Kanäle") -- cgit v1.2.3 From 00466df44aea3eab412ff0895064a8b17dbdcd55 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 10 Jul 2020 15:09:55 +0200 Subject: gnu: xwallpaper: Update to 0.6.5. * gnu/packages/xdisorg.scm (xwallpaper): Update to 0.6.5. --- gnu/packages/xdisorg.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index cec9bf0799..dafc63b5ca 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -2108,7 +2108,7 @@ (define-public jgmenu (define-public xwallpaper (package (name "xwallpaper") - (version "0.6.4") + (version "0.6.5") (source (origin (method git-fetch) @@ -2117,8 +2117,7 @@ (define-public xwallpaper (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "175fzifvia58vah2x7509drvfn3xfv5d9szgh9x1w1a1w8rcs2hx")))) + (base32 "121ai4dc0v65qk12gn9w62ixly8hc8a5qrygkbb82vy8ck4jqxj7")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) -- cgit v1.2.3 From 9debba20256a59942a1cb26e4a1bbd37f3735e31 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 10 Jul 2020 15:23:18 +0200 Subject: gnu: r-htmltable: Update to 2.0.1. * gnu/packages/cran.scm (r-htmltable): Update to 2.0.1. --- gnu/packages/cran.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a6bcb5dca8..4f44b68e9b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -916,14 +916,13 @@ (define-public r-htmlwidgets (define-public r-htmltable (package (name "r-htmltable") - (version "2.0.0") + (version "2.0.1") (source (origin (method url-fetch) (uri (cran-uri "htmlTable" version)) (sha256 - (base32 - "1a1al4kld7lrapc2i086crr78kbgrskahs221iy9v77x0nhin2q3")))) + (base32 "0ma52kajzxfg9w811d6ldhghzn9xhyr8bh7k5v265k82bzx7rac6")))) (properties `((upstream-name . "htmlTable"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From b18647db49e13645c570f7cb4588fcebf07f84b5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 10 Jul 2020 15:23:24 +0200 Subject: gnu: r-processx: Update to 3.4.3. * gnu/packages/cran.scm (r-processx): Update to 3.4.3. --- gnu/packages/cran.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 4f44b68e9b..160e775adc 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4209,14 +4209,13 @@ (define-public r-debugme (define-public r-processx (package (name "r-processx") - (version "3.4.2") + (version "3.4.3") (source (origin (method url-fetch) (uri (cran-uri "processx" version)) (sha256 - (base32 - "02awswxq6wh3rl99dncw5n6c1xmd0v81xcdp2dfyi6vm6b3gz84l")))) + (base32 "07dhzijqnj2zkm3qrk4ppsv8wscn8ysdsjbidlg9zrbj1wcg4izj")))) (build-system r-build-system) (propagated-inputs `(("r-ps" ,r-ps) -- cgit v1.2.3 From a8d5ac0384d7443b7253c319fbd0ba5f0f6d1d61 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 10 Jul 2020 21:29:47 +0200 Subject: gnu: 7kaa: Update to 2.15.4. * gnu/packages/games.scm (7kaa): Update to 2.15.4. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 7946391cda..fccb0a9707 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -11449,7 +11449,7 @@ (define-public burgerspace (define-public 7kaa (package (name "7kaa") - (version "2.15.3") + (version "2.15.4") (source (origin (method url-fetch) @@ -11457,7 +11457,7 @@ (define-public 7kaa "releases/download/v" version "/" "7kaa-" version ".tar.xz")) (sha256 - (base32 "0blj47mcsfw1sn3465j6iham8m6ki07iggnq4q8nnaqnryx710jc")))) + (base32 "0n0bn6xshv3cwk8j0lkl65a1vqd1xkkzlhvwxm32va80nc16d5ds")))) (build-system gnu-build-system) (native-inputs `(("gettext" ,gettext-minimal) -- cgit v1.2.3 From a7ca42ff087cc0b31c8c50dc5ef2ef914b29d8c7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 10 Jul 2020 21:30:01 +0200 Subject: gnu: chocolate-doom: Update to 3.0.1. * gnu/packages/games.scm (chocolate-doom): Update to 3.0.1. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index fccb0a9707..655b890e55 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -7035,7 +7035,7 @@ (define-public odamex (define-public chocolate-doom (package (name "chocolate-doom") - (version "3.0.0") + (version "3.0.1") (source (origin (method url-fetch) (uri (string-append "https://www.chocolate-doom.org/downloads/" @@ -7045,7 +7045,7 @@ (define-public chocolate-doom ".tar.gz")) (sha256 (base32 - "1f6sw6qa9z0a70dsjh5cs45fkyyxw68s7vkqlykihz8cjcisdbkk")))) + "1iy8rx7kjvi1zjiw4zh77szzmd1sgpqajvbhprh1sj93fhbxcdfl")))) (build-system gnu-build-system) (inputs `(("sdl2-net" ,sdl2-net) ("sdl2-mixer" , sdl2-mixer) -- cgit v1.2.3 From 0ac915008a77989603c4771225d9cfc08c62a1ef Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 11 Jul 2020 14:38:09 +0200 Subject: gnu: maradns: Update to 3.5.0007. * gnu/packages/dns.scm (maradns): Update to 3.5.0007. --- gnu/packages/dns.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 98dd425562..93bf9f4741 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -952,7 +952,7 @@ (define-public public-suffix-list (define-public maradns (package (name "maradns") - (version "3.5.0004") + (version "3.5.0007") (source (origin (method url-fetch) @@ -960,11 +960,10 @@ (define-public maradns (version-major+minor version) "/" version "/maradns-" version ".tar.xz")) (sha256 - (base32 - "1zv0i6m4m05ay5zlhwq1h88hgjq2d81cjanpnb3gyhr0xhmjwk6a")))) + (base32 "0bc19xylg4whww9qaj5i4izwxcrh0c0ja7l1pfcn2la02hlvg1a6")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; need to be root to run tests + `(#:tests? #f ; need to be root to run tests #:make-flags (list (string-append "CC=" -- cgit v1.2.3 From de53ddb54a5dc4c529169cc578e76bde999c296b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 11 Jul 2020 14:40:03 +0200 Subject: gnu: maradns: Use CC-FOR-TARGET. * gnu/packages/dns.scm (maradns)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/dns.scm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 93bf9f4741..f96eeda029 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -966,11 +966,7 @@ (define-public maradns `(#:tests? #f ; need to be root to run tests #:make-flags (list - (string-append "CC=" - (if ,(%current-target-system) - (string-append (assoc-ref %build-inputs "cross-gcc") - "/bin/" ,(%current-target-system) "-gcc") - "gcc")) + ,(string-append "CC=" (cc-for-target)) (string-append "PREFIX=" %output) (string-append "RPM_BUILD_ROOT=" %output)) #:phases -- cgit v1.2.3 From af96b5845ef10bb0cf2b0a04544365ba064c605f Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Sat, 11 Jul 2020 14:44:57 +0200 Subject: gnu: monero-gui: Update to 0.16.0.2. * gnu/packages/finance.scm (monero-gui): Update to 0.16.0.2. --- gnu/packages/finance.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 49273d2c8e..d8d3817f7e 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -666,7 +666,7 @@ (define-public monero (define-public monero-gui (package (name "monero-gui") - (version "0.16.0.1") + (version "0.16.0.2") (source (origin (method git-fetch) @@ -676,7 +676,7 @@ (define-public monero-gui (file-name (git-file-name name version)) (sha256 (base32 - "0wnrlcf273y233bal5k90v7b7pa8z0ka70awdlxk50afbvkcbr3c")))) + "1b1m8vhs0hdh81ysm8s8vfwqskqsihylb51wz16kc98ba40r9gqg")))) (build-system qt-build-system) (native-inputs `(("monero-source" ,(package-source monero)) -- cgit v1.2.3 From 1649c7d69ae3fe4a3b94b6173431411a2c238168 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Wed, 1 Jul 2020 12:07:15 +0200 Subject: gnu: sqlite: Add locking-mode fix for the Hurd. * gnu/packages/patches/sqlite-hurd.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/sqlite.scm (sqlite)[native-inputs]: Add it when building for the Hurd. [arguments]: Apply it when building for the Hurd. --- gnu/local.mk | 1 + gnu/packages/patches/sqlite-hurd.patch | 58 ++++++++++++++++++++++++++++++++++ gnu/packages/sqlite.scm | 19 +++++++++++ 3 files changed, 78 insertions(+) create mode 100644 gnu/packages/patches/sqlite-hurd.patch diff --git a/gnu/local.mk b/gnu/local.mk index 2fc9d7a0c7..3046a840c9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1374,6 +1374,7 @@ dist_patch_DATA = \ %D%/packages/patches/sdl-pango-header-guard.patch \ %D%/packages/patches/sdl-pango-matrix_declarations.patch \ %D%/packages/patches/sdl-pango-sans-serif.patch \ + %D%/packages/patches/sqlite-hurd.patch \ %D%/packages/patches/patchutils-test-perms.patch \ %D%/packages/patches/patch-hurd-path-max.patch \ %D%/packages/patches/perl-autosplit-default-time.patch \ diff --git a/gnu/packages/patches/sqlite-hurd.patch b/gnu/packages/patches/sqlite-hurd.patch new file mode 100644 index 0000000000..d80a2c5be8 --- /dev/null +++ b/gnu/packages/patches/sqlite-hurd.patch @@ -0,0 +1,58 @@ +Adapted from Debian: https://sources.debian.org/patches/sqlite3/3.32.3-1/20-hurd-locking-style.patch +Upstream status: Not upstreamed. + +This patch is needed to get offloading to work. + +Sqlite can use simple file locking mode, but that does not work for the Hurd; +a second sqlite process fails with a "locking protocol" error. + +See also: https://bugs.debian.org/529734. + +diff -purN sqlite-autoconf-3310100/sqlite3.c sqlite-autoconf-3310100-/sqlite3.c +--- sqlite-autoconf-3310100/sqlite3.c 2020-01-27 21:25:19.000000000 +0100 ++++ sqlite-autoconf-3310100-/sqlite3.c 2020-07-01 11:50:13.768333806 +0200 +@@ -33189,7 +33189,7 @@ SQLITE_PRIVATE const char *sqlite3Opcode + # include + #endif + +-#if SQLITE_ENABLE_LOCKING_STYLE ++#if SQLITE_ENABLE_LOCKING_STYLE || defined(__GNU__) + /* # include */ + # include + # include +@@ -35676,7 +35676,7 @@ static int dotlockClose(sqlite3_file *id + ** + ** Omit this section if SQLITE_ENABLE_LOCKING_STYLE is turned off + */ +-#if SQLITE_ENABLE_LOCKING_STYLE ++#if SQLITE_ENABLE_LOCKING_STYLE || defined(__GNU__) + + /* + ** Retry flock() calls that fail with EINTR +@@ -38586,7 +38586,7 @@ IOMETHODS( + 0 /* xShmMap method */ + ) + +-#if SQLITE_ENABLE_LOCKING_STYLE ++#if SQLITE_ENABLE_LOCKING_STYLE || defined(__GNU__) + IOMETHODS( + flockIoFinder, /* Finder function name */ + flockIoMethods, /* sqlite3_io_methods object name */ +@@ -41142,6 +41142,8 @@ SQLITE_API int sqlite3_os_init(void){ + UNIXVFS("unix", autolockIoFinder ), + #elif OS_VXWORKS + UNIXVFS("unix", vxworksIoFinder ), ++#elif defined(__GNU__) ++ UNIXVFS("unix", flockIoFinder ), + #else + UNIXVFS("unix", posixIoFinder ), + #endif +@@ -41151,7 +41153,7 @@ SQLITE_API int sqlite3_os_init(void){ + #if OS_VXWORKS + UNIXVFS("unix-namedsem", semIoFinder ), + #endif +-#if SQLITE_ENABLE_LOCKING_STYLE || OS_VXWORKS ++#if SQLITE_ENABLE_LOCKING_STYLE || OS_VXWORKS || defined(__GNU__) + UNIXVFS("unix-posix", posixIoFinder ), + #endif + #if SQLITE_ENABLE_LOCKING_STYLE diff --git a/gnu/packages/sqlite.scm b/gnu/packages/sqlite.scm index 8468131ddf..eeb77749d8 100644 --- a/gnu/packages/sqlite.scm +++ b/gnu/packages/sqlite.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2017 Jelle Licht ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Alex Vong +;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -29,6 +30,7 @@ (define-module (gnu packages sqlite) #:use-module (gnu packages) + #:use-module (gnu packages hurd) #:use-module (gnu packages readline) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) @@ -65,6 +67,11 @@ (define-public sqlite "1bj936svd8i5g25xd1bj52hj4zca01fgl3sqkj86z9q5pkz4wa32")))) (build-system gnu-build-system) (inputs `(("readline" ,readline))) + (native-inputs (if (hurd-target?) + ;; TODO move into origin on the next rebuild cycle. + `(("hurd-locking-mode.patch" + ,@(search-patches "sqlite-hurd.patch"))) + '())) (outputs '("out" "static")) (arguments `(#:configure-flags @@ -79,6 +86,18 @@ (define-public sqlite ;; Column metadata is required by GNU Jami and Qt, et.al. "-DSQLITE_ENABLE_COLUMN_METADATA")) #:phases (modify-phases %standard-phases + ;; TODO: remove in the next rebuild cycle + ,@(if (hurd-target?) + `((add-after 'unpack 'patch-sqlite/hurd + (lambda* (#:key inputs native-inputs + #:allow-other-keys) + (let ((patch (assoc-ref + (if ,(%current-target-system) + native-inputs + inputs) + "hurd-locking-mode.patch"))) + (invoke "patch" "-p1" "--force" "-i" patch))))) + '()) (add-after 'install 'move-static-library (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From 4b9eecd322e566783369795ebea63a479b51f486 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Fri, 3 Jul 2020 23:45:20 +0200 Subject: image: Do not set journal_model=WAL for the Hurd. This fixes . * gnu/system/images/hurd.scm (hurd-initialize-root-partition): Use #:wal-mode #f in call to ... * gnu/build/image.scm (initialize-root-partition): ... this, add #:wal-mode? parameter, pass it to ... (register-closure): ... this, add #:wal-mode? parameter, pass it to ... * guix/store/database.scm (with-database): ... this, add #:wal-mode? parameter, pass it to ... (call-with-database): ... this, add #:wal-mode? parameter; when set to #f, do not set journal_model=WAL. --- gnu/build/image.scm | 26 ++++++++++++++++---------- gnu/system/images/hurd.scm | 8 ++++++-- guix/store/database.scm | 29 ++++++++++++++++++++--------- 3 files changed, 42 insertions(+), 21 deletions(-) diff --git a/gnu/build/image.scm b/gnu/build/image.scm index e7b0418182..d8efa73f16 100644 --- a/gnu/build/image.scm +++ b/gnu/build/image.scm @@ -131,20 +131,23 @@ (define* (genimage config target) (define* (register-closure prefix closure #:key (deduplicate? #t) (reset-timestamps? #t) - (schema (sql-schema))) + (schema (sql-schema)) + (wal-mode? #t)) "Register CLOSURE in PREFIX, where PREFIX is the directory name of the target store and CLOSURE is the name of a file containing a reference graph as produced by #:references-graphs.. As a side effect, if RESET-TIMESTAMPS? is true, reset timestamps on store files and, if DEDUPLICATE? is true, -deduplicates files common to CLOSURE and the rest of PREFIX." +deduplicates files common to CLOSURE and the rest of PREFIX. Pass WAL-MODE? +to call-with-database." (let ((items (call-with-input-file closure read-reference-graph))) (parameterize ((sql-schema schema)) (with-database (store-database-file #:prefix prefix) db - (register-items db items - #:prefix prefix - #:deduplicate? deduplicate? - #:reset-timestamps? reset-timestamps? - #:registration-time %epoch))))) + #:wal-mode? wal-mode? + (register-items db items + #:prefix prefix + #:deduplicate? deduplicate? + #:reset-timestamps? reset-timestamps? + #:registration-time %epoch))))) (define* (initialize-efi-partition root #:key @@ -164,14 +167,16 @@ (define* (initialize-root-partition root (register-closures? #t) system-directory make-device-nodes + (wal-mode? #t) #:allow-other-keys) "Initialize the given ROOT directory. Use BOOTCFG and BOOTCFG-LOCATION to install the bootloader configuration. If REGISTER-CLOSURES? is true, register REFERENCES-GRAPHS in the store. If DEDUPLICATE? is true, then also deduplicate files common to CLOSURES and the -rest of the store when registering the closures. SYSTEM-DIRECTORY is the name -of the directory of the 'system' derivation." +rest of the store when registering the closures. SYSTEM-DIRECTORY is the name +of the directory of the 'system' derivation. Pass WAL-MODE? to +register-closure." (populate-root-file-system system-directory root) (populate-store references-graphs root) @@ -184,7 +189,8 @@ (define* (initialize-root-partition root (register-closure root closure #:reset-timestamps? #t - #:deduplicate? deduplicate?)) + #:deduplicate? deduplicate? + #:wal-mode? wal-mode?)) references-graphs)) (when bootloader-installer diff --git a/gnu/system/images/hurd.scm b/gnu/system/images/hurd.scm index 31942e7386..d87640e8e3 100644 --- a/gnu/system/images/hurd.scm +++ b/gnu/system/images/hurd.scm @@ -61,8 +61,12 @@ (define hurd-initialize-root-partition #~(lambda* (#:rest args) (apply initialize-root-partition (append args - (list #:make-device-nodes - make-hurd-device-nodes))))) + (list #:make-device-nodes make-hurd-device-nodes + ;; XXX Creating a db.sqlite with journal_mode=WAL + ;; yields "unable to open database file" on GNU/Hurd + ;; for an sqlite with the hurd-locking-mode.patch; + ;; see . + #:wal-mode? #f))))) (define hurd-disk-image (image diff --git a/guix/store/database.scm b/guix/store/database.scm index a38e4d7e52..50b66ce282 100644 --- a/guix/store/database.scm +++ b/guix/store/database.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017, 2019 Caleb Ristvedt ;;; Copyright © 2018, 2020 Ludovic Courtès +;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -20,6 +21,7 @@ (define-module (guix store database) #:use-module (sqlite3) #:use-module (guix config) + #:use-module (guix gexp) #:use-module (guix serialization) #:use-module (guix store deduplication) #:use-module (guix base16) @@ -27,6 +29,7 @@ (define-module (guix store database) #:use-module (guix build syscalls) #:use-module ((guix build utils) #:select (mkdir-p executable-file?)) + #:use-module (guix utils) #:use-module (guix build store-copy) #:use-module (srfi srfi-1) #:use-module (srfi srfi-11) @@ -97,17 +100,20 @@ (define schema (sqlite-exec db (call-with-input-file schema get-string-all))) -(define (call-with-database file proc) +(define* (call-with-database file proc #:key (wal-mode? #t)) "Pass PROC a database record corresponding to FILE. If FILE doesn't exist, -create it and initialize it as a new database." +create it and initialize it as a new database. Unless WAL-MODE? is set to #f, +set journal_mode=WAL." (let ((new? (and (not (file-exists? file)) (begin (mkdir-p (dirname file)) #t))) (db (sqlite-open file))) - ;; Turn DB in "write-ahead log" mode, which should avoid SQLITE_LOCKED - ;; errors when we have several readers: . - (sqlite-exec db "PRAGMA journal_mode=WAL;") + ;; Using WAL breaks for the Hurd . + (when wal-mode? + ;; Turn DB in "write-ahead log" mode, which should avoid SQLITE_LOCKED + ;; errors when we have several readers: . + (sqlite-exec db "PRAGMA journal_mode=WAL;")) ;; Install a busy handler such that, when the database is locked, sqlite ;; retries until 30 seconds have passed, at which point it gives up and @@ -200,10 +206,15 @@ (define %default-database-file ;; Default location of the store database. (string-append %store-database-directory "/db.sqlite")) -(define-syntax-rule (with-database file db exp ...) - "Open DB from FILE and close it when the dynamic extent of EXP... is left. -If FILE doesn't exist, create it and initialize it as a new database." - (call-with-database file (lambda (db) exp ...))) +(define-syntax with-database + (syntax-rules () + "Open DB from FILE and close it when the dynamic extent of EXP... is left. +If FILE doesn't exist, create it and initialize it as a new database. Pass +#:wal-mode? to call-with-database." + ((_ file db #:wal-mode? wal-mode? exp ...) + (call-with-database file (lambda (db) exp ...) #:wal-mode? wal-mode?)) + ((_ file db exp ...) + (call-with-database file (lambda (db) exp ...))))) (define (sqlite-finalize stmt) ;; As of guile-sqlite3 0.1.0, cached statements aren't reset when -- cgit v1.2.3 From f2dce740b29a07c08f3b78348f4ec93237e65311 Mon Sep 17 00:00:00 2001 From: Florian Pelz Date: Sat, 11 Jul 2020 16:26:00 +0200 Subject: news: Add ‘de’ translation. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * etc/news.scm: Add a ‘de’ translation. --- etc/news.scm | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/etc/news.scm b/etc/news.scm index 3279099ca2..e239fae840 100644 --- a/etc/news.scm +++ b/etc/news.scm @@ -14,7 +14,8 @@ (version 0) (entry (commit "a98712785e0b042a290420fd74e5a4a5da4fc68f") - (title (en "New @command{guix git authenticate} command")) + (title (en "New @command{guix git authenticate} command") + (de "Neuer Befehl @command{guix git authenticate}")) (body (en "The new @command{guix git authenticate} command authenticates a Git repository by verifying commit signatures and ensuring they all come from @@ -27,7 +28,22 @@ Run @command{info \"(guix) Invoking guix git authenticate\"} for more info, and see @uref{https://guix.gnu.org/blog/2020/securing-updates/} for details on -these mechanisms."))) +these mechanisms.") + (de "Mit dem neuen Befehl @command{guix git authenticate} können Sie +ein Git-Repository authentifizieren. Dazu werden alle Commit-Signaturen +verifiziert und geprüft, dass jede von einer autorisierten Quelle kommt, genau +wie es @command{guix pull} nun tut. + +Dieser Befehl hilft in erster Linie den Entwicklern von Kanälen. Mit ihm kann +vor einem Push sichergestellt werden, dass der Kanal nur Commits enthält, die +mit autorisierten Schlüsseln signiert worden sind. Aber der Befehl kann auch +helfen, wann immer Sie Git verwenden und ermöglichen wollen, dass Nutzer von +Ihrem Repository geladenen Code authentifizieren können. + +Führen Sie @command{info \"(guix) Invoking guix git authenticate\"} aus, um +mehr Informationen zu erhalten, und lesen Sie +@uref{https://guix.gnu.org/blog/2020/securing-updates/} für die Details dieser +Mechanismen."))) (entry (commit "43badf261f4688c8a7a7a9004a4bff8acb205835") (title (en "@command{guix pull} authenticates channels") -- cgit v1.2.3 From cc0aaf2052111e7ab5442ffe6c53a5fe6d1d51db Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Fri, 10 Jul 2020 17:52:05 +0200 Subject: gnu: qutebrowser: Update to 1.13.0. * gnu/packages/web-browsers.scm (qutebrowser): Update to 1.13.0. Signed-off-by: Julien Lepiller --- gnu/packages/web-browsers.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 2ef09d49c9..a38959feac 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2019 Brett Gilio ;;; Copyright © 2020 Raghav Gururajan ;;; Copyright © 2020 B. Wilson +;;; Copyright © 2020 Michael Rohleder ;;; ;;; This file is part of GNU Guix. ;;; @@ -343,7 +344,7 @@ (define-public lynx (define-public qutebrowser (package (name "qutebrowser") - (version "1.12.0") + (version "1.13.0") (source (origin (method url-fetch) @@ -351,7 +352,7 @@ (define-public qutebrowser "qutebrowser/releases/download/v" version "/" "qutebrowser-" version ".tar.gz")) (sha256 - (base32 "0pywyhi4v6ymxpn85grrdr1agmcxsnm5jfqf3rlxqx5swbnxbfs1")))) + (base32 "1xq0a0mcssc1ss4fvhhwr75dhlh3nr9w46i2gmqczzh5cynk1sfk")))) (build-system python-build-system) (native-inputs `(("python-attrs" ,python-attrs))) ; for tests -- cgit v1.2.3 From ee56de8b5b18d9f5d0e583704bc935fd6443dcac Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Thu, 9 Jul 2020 01:12:07 +0300 Subject: gnu: Add hss. * gnu/packages/admin.scm (hss): New variable. --- gnu/packages/admin.scm | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 6d8d6650ee..3646aa1e46 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1238,6 +1238,53 @@ (define-public clusterssh over ssh connections.") (license license:gpl2+))) +(define-public hss + (package + (name "hss") + (version "1.8") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/six-ddc/hss.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1rpysj65j9ls30bf2c5k5hykzzjfknrihs58imp178bx1wqzw4jl")))) + (inputs + `(("readline" ,readline))) + (arguments + `(#:tests? #f ;no tests + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'set-env + (lambda* (#:key inputs outputs #:allow-other-keys) + (substitute* "Makefile" + (("/usr/local/bin") + (string-append (assoc-ref outputs "out") "/bin")) + (("/usr/local/opt/readline") + (assoc-ref inputs "readline"))) + (setenv "CC" "gcc"))) + (delete 'configure)))) + (build-system gnu-build-system) + (home-page "https://github.com/six-ddc/hss/") + (synopsis "Interactive SSH client for multiple servers") + (description "@command{hss} is an interactive SSH client for multiple +servers. It will provide almost the same experience as in the Bash +environment. It supports: + +@itemize @bullet +@item interactive input: based on @code{libreadline}. +@item history: responding to the @key{C-r} key. +@item auto-completion: completion from remote server on the @key{TAB} key, for +commands and paths. +@end itemize + +Command is executed on all servers in parallel. Execution on one server does +not need to wait for that on another server to finish before starting. So we +can run a command on hundreds of servers at the same time.") + (license license:expat))) + (define-public rename (package (name "rename") -- cgit v1.2.3 From 3e26bec042119611b751be2816f3cfe5c17e0b79 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 10 Jul 2020 16:02:09 -0400 Subject: gnu: rtl-sdr: Use HTTPS URL. * gnu/packages/radio.scm (rtl-sdr)[source]: Use HTTPS URL. --- gnu/packages/radio.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index d8bc0bb74d..d1cf6651f2 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -113,7 +113,7 @@ (define-public rtl-sdr (origin (method git-fetch) (uri (git-reference - (url "git://git.osmocom.org/rtl-sdr.git") + (url "https://git.osmocom.org/rtl-sdr/") (commit version))) (file-name (git-file-name name version)) (sha256 -- cgit v1.2.3 From b17a48d0353e6b4b6b327564f984e354074a638b Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 9 Jul 2020 01:54:41 -0400 Subject: gnu: ruby-asciimath: Update to 2.0.1. * gnu/packages/maths.scm (ruby-asciimath): Update to 2.0.1. [arguments]: Remove. [native-inputs]: Remove bundler, add ruby-nokogiri. --- gnu/packages/maths.scm | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 051164f5c3..e5b336ac3b 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2616,28 +2616,17 @@ (define-public mumps-metis-openmpi (define-public ruby-asciimath (package (name "ruby-asciimath") - (version "1.0.4") + (version "2.0.1") (source (origin (method url-fetch) (uri (rubygems-uri "asciimath" version)) (sha256 (base32 - "1d80kiph5mc78zps7si1hv48kv4k12mzaq8jk5kb3pqpjdr72qmc")))) + "1aapydwwkydbwgz07n7ma3a5jy9n3v0shy6q6j8mi4wr3crhx45a")))) (build-system ruby-build-system) - (arguments - '(#:phases - (modify-phases %standard-phases - ;; Apply this patch - ;; https://github.com/asciidoctor/asciimath/commit/1c06fdc8086077f4785479f78b0823a4a72d7948 - (add-after 'unpack 'patch-remove-spurious-backslashes - (lambda _ - (substitute* "spec/parser_spec.rb" - (("\\\\\"") - "\"")) - #t))))) (native-inputs - `(("bundler" ,bundler) + `(("ruby-nokogiri" ,ruby-nokogiri) ("ruby-rspec" ,ruby-rspec))) (synopsis "AsciiMath parsing and conversion library") (description -- cgit v1.2.3 From 65a61239517f6b45a8728657d55102d2373fe915 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 9 Jul 2020 11:49:49 -0400 Subject: gnu: ruby-yard: Disable tests. YARD is a common dependency in the Ruby world; having it carry extra test dependencies is prone to cause dependency cycles. For example, YARD depends on Asciidoctor, but the latest Asciidoctor requires ruby-cucumber for its test suite, which pulls YARD through many of its dependencies. * gnu/packages/ruby.scm (ruby-yard)[arguments]: Disable tests. [native-inputs]: Remove. --- gnu/packages/ruby.scm | 32 ++++++++++---------------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 5a41375480..72cdeced43 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -6994,35 +6994,23 @@ (define-public ruby-yard (method git-fetch) ;; Tests do not pass if we build from the distributed gem. (uri (git-reference - (url "https://github.com/lsegal/yard") - (commit (string-append "v" version)))) + (url "https://github.com/lsegal/yard") + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 "1v48zz8hzazrg79jksj9siys21d2axvzijvkxw2j42zh86syi1wi")))) (build-system ruby-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda _ - ;; Delete the Gemfile to avoid errors relating to it - (delete-file "Gemfile") - ;; $HOME needs to be set to somewhere writeable for tests to run - (setenv "HOME" "/tmp") - ;; Run tests without using 'rake' to avoid dependencies. - (invoke "rspec")))))) - (native-inputs - `(("ruby-rspec" ,ruby-rspec) - ("ruby-rack" ,ruby-rack) - ("ruby-redcloth" ,ruby-redcloth) - ("ruby-asciidoc" ,ruby-asciidoctor))) + ;; Note: Tests are willfully disabled to alleviate dependency cycle + ;; problems. + `(#:tests? #f)) (synopsis "Documentation generation tool for Ruby") - (description - "YARD is a documentation generation tool for the Ruby programming -language. It enables the user to generate consistent, usable documentation -that can be exported to a number of formats very easily, and also supports -extending for custom Ruby constructs such as custom class level definitions.") + (description "YARD is a documentation generation tool for the Ruby +programming language. It enables the user to generate consistent, usable +documentation that can be exported to a number of formats very easily, and +also supports extending for custom Ruby constructs such as custom class level +definitions.") (home-page "https://yardoc.org") (license license:expat))) -- cgit v1.2.3 From df32ab1196e69c8d769de5effb5b485c780bff96 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 9 Jul 2020 12:01:36 -0400 Subject: gnu: Add ruby-yard-with-tests. * gnu/packages/ruby.scm (ruby-yard-with-tests): New variable. --- gnu/packages/ruby.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 72cdeced43..7071fb3dab 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -7014,6 +7014,33 @@ (define-public ruby-yard (home-page "https://yardoc.org") (license license:expat))) +(define-public ruby-yard-with-tests + (package + (inherit ruby-yard) + (name "ruby-yard-with-tests") + (arguments + (substitute-keyword-arguments (package-arguments ruby-yard) + ((#:tests? _ #t) #t) + ((#:test-target _ "default") "default") + ((#:phases phases '%standard-phases) + `(modify-phases ,phases + (add-before 'check 'prepare-for-tests + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (substitute* "Rakefile" + ((".*[Ss]amus.*") "")) + ;; Delete the Gemfile to avoid errors relating to it. + (delete-file "Gemfile") + ;; $HOME needs to be set to somewhere writeable for tests to + ;; run. + (setenv "HOME" "/tmp")) + #t)))))) + (native-inputs + `(("ruby-rspec" ,ruby-rspec) + ("ruby-rack" ,ruby-rack) + ("ruby-redcloth" ,ruby-redcloth) + ("ruby-asciidoc" ,ruby-asciidoctor))))) + (define-public ruby-clap (package (name "ruby-clap") -- cgit v1.2.3 From 7eb8ff0b21d0654f39094824ccabd3685cabdd40 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 10 Jul 2020 23:48:58 -0400 Subject: gnu: ruby-yard: Update to 0.9.25. * gnu/packages/ruby.scm (ruby-yard): Update to 0.9.25. --- gnu/packages/ruby.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 7071fb3dab..142b79fe1f 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -6988,7 +6988,7 @@ (define-public ruby-yajl-ruby (define-public ruby-yard (package (name "ruby-yard") - (version "0.9.20") + (version "0.9.25") (source (origin (method git-fetch) @@ -6999,7 +6999,7 @@ (define-public ruby-yard (file-name (git-file-name name version)) (sha256 (base32 - "1v48zz8hzazrg79jksj9siys21d2axvzijvkxw2j42zh86syi1wi")))) + "1x7y4s557hrnq439lih7nqg1y7ximardw75jx9i92x3yzpviqqwa")))) (build-system ruby-build-system) (arguments ;; Note: Tests are willfully disabled to alleviate dependency cycle -- cgit v1.2.3 From 7af929249da3687b30337b4e30a1596e6dc317dc Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 9 Jul 2020 14:08:07 -0400 Subject: gnu: ruby-sinatra: Update to 2.0.8.1. * gnu/packages/ruby.scm (ruby-sinatra): Update to 2.0.8.1. [phases]{fix-slow-doc-generation}: Add phase. --- gnu/packages/ruby.scm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 142b79fe1f..685ee0489a 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -9961,15 +9961,25 @@ (define-public ruby-htmlentities (define-public ruby-sinatra (package (name "ruby-sinatra") - (version "2.0.5") + (version "2.0.8.1") (source (origin (method url-fetch) (uri (rubygems-uri "sinatra" version)) (sha256 (base32 - "1gasgn5f15myv08k10i16p326pchxjsy37pgqfw0xm66kcc5d7ry")))) + "0riy3hwjab1mr73jcqx3brmbmwspnw3d193j06a5f0fy1w35z15q")))) (build-system ruby-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; See: https://github.com/sinatra/sinatra/issues/1578. + (add-after 'extract-gemspec 'fix-slow-doc-generation + (lambda _ + (substitute* "sinatra.gemspec" + (("\"README.rdoc\"\\.freeze," all) + (string-append all " \"--exclude=.*\\.md\".freeze,"))) + #t))))) (propagated-inputs `(("ruby-mustermann" ,ruby-mustermann) ("ruby-rack" ,ruby-rack) -- cgit v1.2.3 From fa8e4dbf38d018006f0d8ab3eb8a56942609d1f9 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 9 Jul 2020 21:44:10 -0400 Subject: gnu: ruby-cucumber: Enable more tests. * gnu/packages/ruby.scm (ruby-cucumber)[test-target]: Use the default test-target, which includes the cucumber tests target. [phases]: Add the 'disable-rubocop and 'set-home phases. Delete Gemfile as part of the 'strip-version-requirements phase. --- gnu/packages/ruby.scm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 685ee0489a..18da48a948 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -6688,14 +6688,26 @@ (define-public ruby-cucumber "0g9rqfslbzkkrq2kvl14fgknrhfbji3bjjpjxff5nc9wzd3hd549")))) (build-system ruby-build-system) (arguments - '(#:test-target "spec" + '(#:test-target "default" #:phases (modify-phases %standard-phases + (add-after 'unpack 'disable-rubocop + ;; Rubocop lint check fails with our more recent version. + (lambda _ + (substitute* "Rakefile" + (("spec cucumber rubocop") + "spec cucumber")) + #t)) (add-after 'extract-gemspec 'strip-version-requirements (lambda _ + (delete-file "Gemfile") ;do not use Bundler (substitute* "cucumber.gemspec" (("(.*add_.*dependency '[_A-Za-z0-9-]+').*" _ stripped) (string-append stripped "\n"))) + #t)) + (add-before 'check 'set-home + (lambda _ + (setenv "HOME" (getcwd)) #t))))) (propagated-inputs `(("ruby-builder" ,ruby-builder) -- cgit v1.2.3 From c84dd8d49c754ee723b8fe8fee04cd0464402303 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 9 Jul 2020 22:37:08 -0400 Subject: gnu: Add ruby-pandoc-ruby. * gnu/packages/ruby.scm (ruby-pandoc-ruby): New variable. --- gnu/packages/ruby.scm | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 18da48a948..f906590ba2 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -51,6 +51,7 @@ (define-module (gnu packages ruby) #:use-module (gnu packages rails) #:use-module (gnu packages readline) #:use-module (gnu packages autotools) + #:use-module (gnu packages haskell-xyz) #:use-module (gnu packages java) #:use-module (gnu packages libffi) #:use-module (gnu packages libidn) @@ -984,6 +985,69 @@ (define-public ruby-atoulme-saikuro ;; of the Expat license. (license license:bsd-3))) +(define-public ruby-pandoc-ruby + (package + (name "ruby-pandoc-ruby") + (version "2.1.4") + (source + (origin + (method git-fetch) ;the gem lacks many test files + (uri (git-reference + (url "https://github.com/xwmx/pandoc-ruby.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "03a11clhycyn0jhc7g9davpqd83sn60jqwjy1y145ag9sq6sp935")))) + (build-system ruby-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'disable-failing-tests + ;; TODO: Remove this phase after ghc-pandoc gets upgraded to 2.9.2+ + ;; (see: https://github.com/xwmx/pandoc-ruby/issues/39). + (lambda _ + (substitute* "test/test_conversions.rb" + (("next if from == to.*" all) + (string-append + all + " next if ['plain', 'beamer'].include? to\n"))) + #t)) + (add-after 'unpack 'patch-pandoc-path + (lambda* (#:key inputs #:allow-other-keys) + (let ((pandoc (string-append (assoc-ref inputs "ghc-pandoc") + "/bin/pandoc"))) + (substitute* "lib/pandoc-ruby.rb" + (("@@pandoc_path = 'pandoc'") + (format #f "@@pandoc_path = '~a'" pandoc))) + (substitute* "test/test_pandoc_ruby.rb" + (("('|\")pandoc" _ quote) + (string-append quote pandoc)) + (("\\^pandoc") + ".*pandoc")) + #t))) + (add-after 'extract-gemspec 'remove-Gemfile.lock + (lambda _ + (delete-file "Gemfile.lock") + (substitute* "pandoc-ruby.gemspec" + (("Gemfile\\.lock") "")) + #t))))) + (native-inputs + `(("ruby-mocha" ,ruby-mocha))) + (inputs + `(("ghc-pandoc" ,ghc-pandoc))) + (synopsis "Ruby wrapper for Pandoc") + (description "PandocRuby is a wrapper for Pandoc, a Haskell library with +command line tools for converting one markup format to another. Pandoc can +convert documents from a variety of formats including markdown, +reStructuredText, textile, HTML, DocBook, LaTeX, and MediaWiki markup to a +variety of other formats, including markdown, reStructuredText, HTML, LaTeX, +ConTeXt, PDF, RTF, DocBook XML, OpenDocument XML, ODT, GNU Texinfo, MediaWiki +markup, groff man pages, HTML slide shows, EPUB, Microsoft Word docx, and +more.") + (home-page "https://github.com/xwmx/pandoc-ruby") + (license license:expat))) + (define-public ruby-asciidoctor (package (name "ruby-asciidoctor") -- cgit v1.2.3 From c3f15f541a6b8a77fd9baa7a562979b328e5e802 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 10 Jul 2020 00:22:38 -0400 Subject: gnu: ruby-tilt: Update to 2.0.10. * gnu/packages/ruby.scm (ruby-tilt): Update to 2.0.10. --- gnu/packages/ruby.scm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index f906590ba2..6db1c1cb08 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -4720,14 +4720,17 @@ (define-public ruby-spinach (define-public ruby-tilt (package (name "ruby-tilt") - (version "2.0.9") + (version "2.0.10") (source (origin - (method url-fetch) - (uri (rubygems-uri "tilt" version)) + (method git-fetch) ;the distributed gem lacks tests + (uri (git-reference + (url "https://github.com/rtomayko/tilt.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0ca4k0clwf0rkvy7726x4nxpjxkpv67w043i39saxgldxd97zmwz")))) + "0adb7fg7925n2rd9a8kkqz3mgylw2skp9hkh9qc1rnph72mqsm6r")))) (build-system ruby-build-system) (arguments '(#:phases -- cgit v1.2.3 From cfa4a318ea2ee486c7383e3d1dd10d86bd1b3c21 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 9 Jul 2020 22:41:21 -0400 Subject: gnu: ruby-tilt: Add pandoc, sassc support. * gnu/packages/ruby.scm (ruby-guard)[native-inputs]: Move ruby-sassc from here... [propagated-inputs]: ...to here. Add ruby-pandoc-ruby. --- gnu/packages/ruby.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 6db1c1cb08..cda9df051d 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -4752,13 +4752,15 @@ (define-public ruby-tilt ;; the Gemfile instead. (("group :secondary") "[].each")) #t))))) + (propagated-inputs + `(("ruby-pandoc-ruby" ,ruby-pandoc-ruby) + ("ruby-sassc" ,ruby-sassc))) (native-inputs `(("bundler" ,bundler) ("ruby-yard" ,ruby-yard) ("ruby-builder" ,ruby-builder) ("ruby-erubis" ,ruby-erubis) - ("ruby-markaby" ,ruby-markaby) - ("ruby-sassc" ,ruby-sassc))) + ("ruby-markaby" ,ruby-markaby))) (synopsis "Generic interface to multiple Ruby template engines") (description "Tilt is a thin interface over a number of different Ruby template -- cgit v1.2.3 From b1c79cab1fe626853afc49ecec13de83d2ead0af Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 9 Jul 2020 22:47:54 -0400 Subject: gnu: ruby-temple: Update to 0.8.2. * gnu/packages/ruby.scm (ruby-temple): Update to 0.8.2. --- gnu/packages/ruby.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index cda9df051d..ce5b71bd42 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2725,14 +2725,14 @@ (define-public ruby-locale (define-public ruby-temple (package (name "ruby-temple") - (version "0.8.1") + (version "0.8.2") (source (origin (method url-fetch) (uri (rubygems-uri "temple" version)) (sha256 (base32 - "158d7ygbwcifqnvrph219p7m78yjdjazhykv5darbkms7bxm5y09")))) + "060zzj7c2kicdfk6cpnn40n9yjnhfrr13d0rsbdhdij68chp2861")))) (build-system ruby-build-system) (native-inputs `(("ruby-tilt" ,ruby-tilt) -- cgit v1.2.3 From fef0564c6fc8b18af0ab0151c70ed8ecc9137da1 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 9 Jul 2020 23:40:21 -0400 Subject: gnu: Add ruby-slim. * gnu/packages/ruby.scm (ruby-slim): New variable. --- gnu/packages/ruby.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index ce5b71bd42..8377bbf77b 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1048,6 +1048,52 @@ (define-public ruby-pandoc-ruby (home-page "https://github.com/xwmx/pandoc-ruby") (license license:expat))) +(define-public ruby-slim + (package + (name "ruby-slim") + (version "4.1.0") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "slim" version)) + (sha256 + (base32 + "0gjx30g84c82qzg32bd7giscvb4206v7mvg56kc839w9wjagn36n")))) + (build-system ruby-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; See: https://github.com/slim-template/slim/issues/857 and + ;; https://github.com/slim-template/slim/issues/858. + (add-after 'unpack 'skip-broken-tests + (lambda _ + (substitute* "test/core/test_embedded_engines.rb" + (("def test_render_with_markdown") + "def skipped_test_render_with_markdown")) + (substitute* "test/translator/test_translator.rb" + (("raise (\"Missing test for.*)" _ tail) + (string-append "print " tail))) + #t)) + ;; See: https://salsa.debian.org/ruby-team/ruby-slim/-/commit/ + ;; 824862bd99d1675bc699d8fc71ba965a785c1f44. + (add-after 'unpack 'prevent-bundler-interference + (lambda _ + (substitute* "Rakefile" + (("require 'bundler/setup'") "nil") + (("Bundler::GemHelper\\.install_tasks") "nil")) + #t))))) + (native-inputs + `(("ruby-rack-test" ,ruby-rack-test) + ("ruby-sinatra" ,ruby-sinatra))) + (propagated-inputs + `(("ruby-temple" ,ruby-temple) + ("ruby-tilt" ,ruby-tilt))) + (synopsis "Minimalist template language for Ruby") + (description "Slim is a template language for Ruby that aims to reduce the +syntax to the minimum while remaining clear.") + (home-page "http://slim-lang.com/") + (license license:expat))) + (define-public ruby-asciidoctor (package (name "ruby-asciidoctor") -- cgit v1.2.3 From 751bf33d478eabb17ae8c39be5b658378f8f852f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 9 Jul 2020 13:17:57 -0400 Subject: gnu: ruby-asciidoctor: Re-indent. * gnu/packages/ruby.scm (ruby-asciidoctor): Re-indent. --- gnu/packages/ruby.scm | 62 +++++++++++++++++++++++++-------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 8377bbf77b..cde014b2f6 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1096,38 +1096,38 @@ (define-public ruby-slim (define-public ruby-asciidoctor (package - (name "ruby-asciidoctor") - (version "1.5.7.1") - (source - (origin - (method url-fetch) - (uri (rubygems-uri "asciidoctor" version)) - (sha256 + (name "ruby-asciidoctor") + (version "1.5.7.1") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "asciidoctor" version)) + (sha256 (base32 - "0v52bzc72cvg7zfgq27pa4mgyf29dx9m20fghrw1xmvwgd519n1w")))) - (build-system ruby-build-system) - (arguments - `(#:test-target "test:all" - #:phases - (modify-phases %standard-phases - (add-before 'check 'remove-circular-tests - (lambda _ - ;; Remove tests that require circular dependencies to load or pass. - (delete-file "test/invoker_test.rb") - (delete-file "test/converter_test.rb") - (delete-file "test/options_test.rb") - #t))))) - (native-inputs - `(("ruby-minitest" ,ruby-minitest) - ("ruby-nokogiri" ,ruby-nokogiri) - ("ruby-asciimath" ,ruby-asciimath) - ("ruby-coderay" ,ruby-coderay))) - (synopsis "Converter from AsciiDoc content to other formats") - (description - "Asciidoctor is a text processor and publishing toolchain for converting -AsciiDoc content to HTML5, DocBook 5 (or 4.5), PDF, and other formats.") - (home-page "https://asciidoctor.org") - (license license:expat))) + "0v52bzc72cvg7zfgq27pa4mgyf29dx9m20fghrw1xmvwgd519n1w")))) + (build-system ruby-build-system) + (arguments + `(#:test-target "test:all" + #:phases + (modify-phases %standard-phases + (add-before 'check 'remove-circular-tests + (lambda _ + ;; Remove tests that require circular dependencies to load or pass. + (delete-file "test/invoker_test.rb") + (delete-file "test/converter_test.rb") + (delete-file "test/options_test.rb") + #t))))) + (native-inputs + `(("ruby-minitest" ,ruby-minitest) + ("ruby-nokogiri" ,ruby-nokogiri) + ("ruby-asciimath" ,ruby-asciimath) + ("ruby-coderay" ,ruby-coderay))) + (synopsis "Converter from AsciiDoc content to other formats") + (description "Asciidoctor is a text processor and publishing toolchain for +converting AsciiDoc content to HTML5, DocBook 5 (or 4.5), PDF, and other +formats.") + (home-page "https://asciidoctor.org") + (license license:expat))) (define-public ruby-ast (package -- cgit v1.2.3 From 5df1126c3adf557f3a5b386e391e7cb56b9c1d63 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 9 Jul 2020 13:27:56 -0400 Subject: gnu: ruby-asciidoctor: Update to 2.0.10. * gnu/packages/ruby.scm (ruby-asciidoctor): Update to 2.0.10. [origin]: Use git-fetch. [phases]: Remove 'remove-circular-tests. Add 'strip-version-requirements. [native-inputs]: Add ruby-erubis, ruby-cucumber, ruby-haml, ruby-rouge, ruby-rspec-expectations, ruby-simplecov, ruby-slim and ruby-tilt. --- gnu/packages/ruby.scm | 41 ++++++++++++++++++++++++++++++----------- 1 file changed, 30 insertions(+), 11 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index cde014b2f6..84b3b72913 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1097,31 +1097,50 @@ (define-public ruby-slim (define-public ruby-asciidoctor (package (name "ruby-asciidoctor") - (version "1.5.7.1") + (version "2.0.10") (source (origin - (method url-fetch) - (uri (rubygems-uri "asciidoctor" version)) + (method git-fetch) ;the gem release lacks a Rakefile + (uri (git-reference + (url "https://github.com/asciidoctor/asciidoctor.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0v52bzc72cvg7zfgq27pa4mgyf29dx9m20fghrw1xmvwgd519n1w")))) + "0jaxpnsdnx3qyjw5p2lsx1swny12q1i2vxw2kgdp4vlsyjv95z95")))) (build-system ruby-build-system) (arguments `(#:test-target "test:all" #:phases (modify-phases %standard-phases - (add-before 'check 'remove-circular-tests + (replace 'replace-git-ls-files + (lambda _ + ;; TODO: Remove after the fix of using 'cut' to better mimic the + ;; git ls-files output is merged in ruby-build-system. + (substitute* "asciidoctor.gemspec" + (("`git ls-files -z`") + "`find . -type f -print0 |sort -z|cut -zc3-`")) + #t)) + (add-after 'extract-gemspec 'strip-version-requirements (lambda _ - ;; Remove tests that require circular dependencies to load or pass. - (delete-file "test/invoker_test.rb") - (delete-file "test/converter_test.rb") - (delete-file "test/options_test.rb") + (delete-file "Gemfile") + (substitute* "asciidoctor.gemspec" + (("(.*add_.*dependency '[_A-Za-z0-9-]+').*" _ stripped) + (string-append stripped "\n"))) #t))))) (native-inputs - `(("ruby-minitest" ,ruby-minitest) + `(("ruby-erubis" ,ruby-erubis) + ("ruby-minitest" ,ruby-minitest) ("ruby-nokogiri" ,ruby-nokogiri) ("ruby-asciimath" ,ruby-asciimath) - ("ruby-coderay" ,ruby-coderay))) + ("ruby-coderay" ,ruby-coderay) + ("ruby-cucumber" ,ruby-cucumber) + ("ruby-haml" ,ruby-haml) + ("ruby-rouge" ,ruby-rouge) + ("ruby-rspec-expectations" ,ruby-rspec-expectations) + ("ruby-simplecov" ,ruby-simplecov) + ("ruby-slim" ,ruby-slim) + ("ruby-tilt" ,ruby-tilt))) (synopsis "Converter from AsciiDoc content to other formats") (description "Asciidoctor is a text processor and publishing toolchain for converting AsciiDoc content to HTML5, DocBook 5 (or 4.5), PDF, and other -- cgit v1.2.3 From 908df675a84cfdf80901a1cb25bd83cf576a1a99 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 10 Jul 2020 23:49:32 -0400 Subject: gnu: Add ruby-spectroscope. * gnu/packages/ruby.scm (ruby-spectroscope): New variable. --- gnu/packages/ruby.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 84b3b72913..dd651ddf19 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -7187,6 +7187,49 @@ (define-public ruby-yard-with-tests ("ruby-redcloth" ,ruby-redcloth) ("ruby-asciidoc" ,ruby-asciidoctor))))) +(define-public ruby-spectroscope + (package + (name "ruby-spectroscope") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "spectroscope" version)) + (sha256 + (base32 + "0iiid9sm110qhx0i1zkds710cvsnmhd308wbqa7slkzbq2akrb3y")))) + (build-system ruby-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (with-output-to-file ".test" + (lambda _ + (display + "\ +require 'ae/should' +require 'rspec' + +include RSpec + +Test.run :default do |run| + run.files << 'spec/*_spec.rb' +end"))) + (invoke "ruby" "-Ilib" "-rrubytest" ".test")))))) + (native-inputs + `(("ruby-ae" ,ruby-ae) + ("ruby-rspec" ,ruby-rspec))) + (propagated-inputs + `(("ruby-rubytest" ,ruby-rubytest))) + (synopsis "Behavior-Driven Development (BDD) framework built on RubyTest") + (description "Spectroscope is a Behavior-Driven Development (BDD) +framework built on RubyTest, designed to emulate RSpec in most respects. It +is assertion framework independent so any number of assertion systems can be +used, such as Assay or AE.") + (home-page "http://rubyworks.github.com/spectroscope/") + (license license:bsd-2))) + (define-public ruby-clap (package (name "ruby-clap") -- cgit v1.2.3 From 24ffd91bc257a4ebddd8359f4f32c4fb60fc90e1 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 10 Jul 2020 00:37:58 -0400 Subject: gnu: Add ruby-tomparse. * gnu/packages/ruby.scm (ruby-tomparse): New variable. --- gnu/packages/ruby.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index dd651ddf19..07e23a0113 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -7230,6 +7230,29 @@ (define-public ruby-spectroscope (home-page "http://rubyworks.github.com/spectroscope/") (license license:bsd-2))) +(define-public ruby-tomparse + (package + (name "ruby-tomparse") + (version "0.4.2") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "tomparse" version)) + (sha256 + (base32 + "06xakk41f1kgj6j1ahkwn4r6cvidixvm4phhlrvmwb7c3pr8ygc8")))) + (build-system ruby-build-system) + ;; TODO: Tests require citron and rulebow, not yet packaged. + (arguments '(#:tests? #f)) + (synopsis "TomDoc parser for Ruby") + (description "TomParse is a TomDoc parser for Ruby. It takes a code +comment as input and parses it into a convenient object-oriented structure in +accordance with the TomDoc standard. See +@url{https://github.com/mojombo/tomdoc, TomDoc} for more information about the +TomDoc format.") + (home-page "http://rubyworks.github.com/tomparse/") + (license license:bsd-2))) + (define-public ruby-clap (package (name "ruby-clap") -- cgit v1.2.3 From 257dee505e0fe9722a019fda3687fe44c5aa4c39 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 10 Jul 2020 00:47:19 -0400 Subject: gnu: Add ruby-yard-tomdoc. * gnu/packages/ruby.scm (ruby-yard-tomdoc): New variable. --- gnu/packages/ruby.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 07e23a0113..e1c242a083 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -7253,6 +7253,36 @@ (define-public ruby-tomparse (home-page "http://rubyworks.github.com/tomparse/") (license license:bsd-2))) +(define-public ruby-yard-tomdoc + (package + (name "ruby-yard-tomdoc") + (version "0.7.1") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "yard-tomdoc" version)) + (sha256 + (base32 + "1725gs8b8klpwhrvnf2wwp7dw3zxs9vz2la983l2d8c4r4fn1j2z")))) + (build-system ruby-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "rubytest" "-Ilib" "-Itest" "test/")))))) + (native-inputs + `(("ruby-rubytest-cli" ,ruby-rubytest-cli) + ("ruby-spectroscope" ,ruby-spectroscope) + ("ruby-ae" ,ruby-ae))) + (propagated-inputs + `(("ruby-tomparse" ,ruby-tomparse) + ("ruby-yard" ,ruby-yard))) + (synopsis "TomDoc syntax for YARD") + (description "This module adds support for the TomDoc documentation format +to YARD, a documentation generation tool for Ruby.") + (home-page "http://rubyworks.github.com/yard-tomdoc/") + (license license:expat))) + (define-public ruby-clap (package (name "ruby-clap") -- cgit v1.2.3 From 661ad8d7c50c6ab8cff83cf6613d982c93d06c5a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 10 Jul 2020 15:19:38 -0400 Subject: gnu: ruby-ruby-prof: Disable a flaky test. A test was found to fail non-deterministically. * gnu/packages/ruby.scm (ruby-ruby-prof)[phases]: Add the 'delete-flaky-test phase. --- gnu/packages/ruby.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index e1c242a083..1ade88a624 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -6524,6 +6524,14 @@ (define-public ruby-ruby-prof ((".*require \"bundler/setup\".*" all) (string-append all " require 'bundler/gem_tasks'\n"))) #t)) + ;; The LineNumbersTest test fails non-deterministically (see: + ;; https://github.com/ruby-prof/ruby-prof/issues/276). + (add-after 'extract-gemspec 'delete-flaky-test + (lambda _ + (delete-file "test/line_number_test.rb") + (substitute* "ruby-prof.gemspec" + (("\"test/line_number_test\\.rb\"\\.freeze, ") "")) + #t)) (add-before 'check 'compile (lambda _ (invoke "rake" "compile")))))) -- cgit v1.2.3 From 6018d1ee600787d36ccc39af3fe35e5b167e310b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 11 Jul 2020 18:57:53 +0200 Subject: gnu: libglvnd: Update to 1.3.2. * gnu/packages/gl.scm (libglvnd): Update to 1.3.2. --- gnu/packages/gl.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 41fc8ae697..d7a6082189 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2017 Arun Isaac ;;; Copyright © 2017, 2018, 2019 Rutger Helling -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019 Pierre Neidhardt ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 Giacomo Leidi @@ -701,7 +701,7 @@ (define-public libepoxy (define-public libglvnd (package (name "libglvnd") - (version "1.3.1") + (version "1.3.2") (home-page "https://gitlab.freedesktop.org/glvnd/libglvnd") (source (origin (method git-fetch) @@ -711,7 +711,7 @@ (define-public libglvnd (file-name (git-file-name name version)) (sha256 (base32 - "0mkzdzdxjxjl794rblq4mq33wmb8ikqmfswbqdbr8gw2kw4wlhdl")))) + "10x7fgb114r4gikdg6flszl3kwzcb9y5qa7sj9936mk0zxhjaylz")))) (build-system meson-build-system) (arguments '(#:configure-flags '("-Dx11=enabled") -- cgit v1.2.3 From 96fe62d80e18da54a0989643ac53849c45d1f89e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 11 Jul 2020 19:14:17 +0200 Subject: gnu: hss: Move to (gnu packages ssh). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/admin.scm (hss): Move… * gnu/packages/ssh.scm (hss): …here. --- gnu/packages/admin.scm | 47 ----------------------------------------------- gnu/packages/ssh.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 47 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 3646aa1e46..6d8d6650ee 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1238,53 +1238,6 @@ (define-public clusterssh over ssh connections.") (license license:gpl2+))) -(define-public hss - (package - (name "hss") - (version "1.8") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/six-ddc/hss.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1rpysj65j9ls30bf2c5k5hykzzjfknrihs58imp178bx1wqzw4jl")))) - (inputs - `(("readline" ,readline))) - (arguments - `(#:tests? #f ;no tests - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'set-env - (lambda* (#:key inputs outputs #:allow-other-keys) - (substitute* "Makefile" - (("/usr/local/bin") - (string-append (assoc-ref outputs "out") "/bin")) - (("/usr/local/opt/readline") - (assoc-ref inputs "readline"))) - (setenv "CC" "gcc"))) - (delete 'configure)))) - (build-system gnu-build-system) - (home-page "https://github.com/six-ddc/hss/") - (synopsis "Interactive SSH client for multiple servers") - (description "@command{hss} is an interactive SSH client for multiple -servers. It will provide almost the same experience as in the Bash -environment. It supports: - -@itemize @bullet -@item interactive input: based on @code{libreadline}. -@item history: responding to the @key{C-r} key. -@item auto-completion: completion from remote server on the @key{TAB} key, for -commands and paths. -@end itemize - -Command is executed on all servers in parallel. Execution on one server does -not need to wait for that on another server to finish before starting. So we -can run a command on hundreds of servers at the same time.") - (license license:expat))) - (define-public rename (package (name "rename") diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 38b98f1c5b..1ffb74be3f 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2019 Gábor Boskovits ;;; Copyright © 2019, 2020 Mathieu Othacehe ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2020 Oleg Pykhalov ;;; ;;; This file is part of GNU Guix. ;;; @@ -70,6 +71,53 @@ (define-module (gnu packages ssh) #:use-module (guix utils) #:use-module (srfi srfi-1)) +(define-public hss + (package + (name "hss") + (version "1.8") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/six-ddc/hss.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1rpysj65j9ls30bf2c5k5hykzzjfknrihs58imp178bx1wqzw4jl")))) + (inputs + `(("readline" ,readline))) + (arguments + `(#:tests? #f ;no tests + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'set-env + (lambda* (#:key inputs outputs #:allow-other-keys) + (substitute* "Makefile" + (("/usr/local/bin") + (string-append (assoc-ref outputs "out") "/bin")) + (("/usr/local/opt/readline") + (assoc-ref inputs "readline"))) + (setenv "CC" "gcc"))) + (delete 'configure)))) + (build-system gnu-build-system) + (home-page "https://github.com/six-ddc/hss/") + (synopsis "Interactive SSH client for multiple servers") + (description "@command{hss} is an interactive SSH client for multiple +servers. It will provide almost the same experience as in the Bash +environment. It supports: + +@itemize @bullet +@item interactive input: based on @code{libreadline}. +@item history: responding to the @key{C-r} key. +@item auto-completion: completion from remote server on the @key{TAB} key, for +commands and paths. +@end itemize + +Command is executed on all servers in parallel. Execution on one server does +not need to wait for that on another server to finish before starting. So we +can run a command on hundreds of servers at the same time.") + (license license:expat))) + (define-public libssh (package (name "libssh") -- cgit v1.2.3 From 16f6889b74fe9437ce020152cae9c550b77e390f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 11 Jul 2020 19:24:07 +0200 Subject: gnu: hss: Edit description. * gnu/packages/ssh.scm (hss)[description]: Edit. --- gnu/packages/ssh.scm | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 1ffb74be3f..8d2f1d57b3 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -102,20 +102,20 @@ (define-public hss (build-system gnu-build-system) (home-page "https://github.com/six-ddc/hss/") (synopsis "Interactive SSH client for multiple servers") - (description "@command{hss} is an interactive SSH client for multiple -servers. It will provide almost the same experience as in the Bash -environment. It supports: + (description + "@command{hss} is an interactive SSH client for multiple servers. Commands +are executed on all servers in parallel. Execution on one server does not need +to wait for that on another server to finish before starting. One can run a +command on hundreds of servers at the same time, with almost the same experience +as a local Bash shell. +It supports: @itemize @bullet -@item interactive input: based on @code{libreadline}. -@item history: responding to the @key{C-r} key. -@item auto-completion: completion from remote server on the @key{TAB} key, for -commands and paths. -@end itemize - -Command is executed on all servers in parallel. Execution on one server does -not need to wait for that on another server to finish before starting. So we -can run a command on hundreds of servers at the same time.") +@item interactive input: based on GNU readline. +@item history: responding to the @kbd{C-r} key. +@item auto-completion: @key{TAB}-completion from remote servers for commands and +file names. +@end itemize\n") (license license:expat))) (define-public libssh -- cgit v1.2.3 From f718c0a05d64ac8f86c83ea099e68944254b1959 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 11 Jul 2020 19:48:12 +0200 Subject: gnu: hss: Fix cross-compilation. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/ssh.scm (hss)[arguments]: Move $CC to MAKE-FLAGS and use CC-FOR-TARGET. Rename ‘pre-env’ to the more accurate ‘patch-file-names’. --- gnu/packages/ssh.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 8d2f1d57b3..330675f8f3 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -87,17 +87,18 @@ (define-public hss (inputs `(("readline" ,readline))) (arguments - `(#:tests? #f ;no tests + `(#:make-flags + (list ,(string-append "CC=" (cc-for-target))) + #:tests? #f ; no tests #:phases (modify-phases %standard-phases - (add-after 'unpack 'set-env + (add-after 'unpack 'patch-file-names (lambda* (#:key inputs outputs #:allow-other-keys) (substitute* "Makefile" (("/usr/local/bin") (string-append (assoc-ref outputs "out") "/bin")) (("/usr/local/opt/readline") (assoc-ref inputs "readline"))) - (setenv "CC" "gcc"))) (delete 'configure)))) (build-system gnu-build-system) (home-page "https://github.com/six-ddc/hss/") -- cgit v1.2.3 From 3b6b337eac9c730fa01719f51f7a7b01513623e5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 11 Jul 2020 19:49:32 +0200 Subject: gnu: hss: Return #t from phase. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/ssh.scm (hss)[arguments]: End ‘patch-file-names’ with #t. --- gnu/packages/ssh.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 330675f8f3..67ea9dfa91 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -99,7 +99,8 @@ (define-public hss (string-append (assoc-ref outputs "out") "/bin")) (("/usr/local/opt/readline") (assoc-ref inputs "readline"))) - (delete 'configure)))) + #t)) + (delete 'configure)))) ; no configure script (build-system gnu-build-system) (home-page "https://github.com/six-ddc/hss/") (synopsis "Interactive SSH client for multiple servers") -- cgit v1.2.3 From 845f5a03062e0facfd80d717ead2cf4a153fb562 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 11 Jul 2020 19:53:29 +0200 Subject: gnu: hss: Patch less. * gnu/packages/ssh.scm (hss)[arguments]: Set INSTALL_BIN make flag instead of patching the Makefile. --- gnu/packages/ssh.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 67ea9dfa91..aaa552bfd6 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -88,15 +88,14 @@ (define-public hss `(("readline" ,readline))) (arguments `(#:make-flags - (list ,(string-append "CC=" (cc-for-target))) + (list ,(string-append "CC=" (cc-for-target)) + (string-append "INSTALL_BIN=" (assoc-ref %outputs "out") "/bin")) #:tests? #f ; no tests #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-file-names (lambda* (#:key inputs outputs #:allow-other-keys) (substitute* "Makefile" - (("/usr/local/bin") - (string-append (assoc-ref outputs "out") "/bin")) (("/usr/local/opt/readline") (assoc-ref inputs "readline"))) #t)) -- cgit v1.2.3 From 4ec610af2c3e9cab3a3545047c140eb30b22992c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 11 Jul 2020 20:23:58 +0200 Subject: gnu: gperftools: Update to 2.8. * gnu/packages/cpp.scm (gperftools): Update to 2.8. --- gnu/packages/cpp.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index a1d82ccbc1..6b29dfc53f 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -328,7 +328,7 @@ (define-public ccls (define-public gperftools (package (name "gperftools") - (version "2.7") + (version "2.8") (source (origin (method git-fetch) @@ -336,14 +336,14 @@ (define-public gperftools (url "https://github.com/gperftools/gperftools") (commit (string-append "gperftools-" version)))) (sha256 - (base32 "0amvwrzn5qc0b0jpxpy5g6zkmj97zjh4hhjrd130hsg2lwwcwhy1")) + (base32 "1rnc53kaxlljgbpsff906vdsry9jl9gcvcnmxgkprwzxq1wipyd0")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) ("libtool" ,libtool) - ;; For tests: + ;; For tests. ("perl" ,perl))) (home-page "https://github.com/gperftools/gperftools") (synopsis "Multi-threaded malloc() and performance analysis tools for C++") -- cgit v1.2.3 From 59668de42385c8b21a20fbaa3f70844b1e59c5ee Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 11 Jul 2020 21:07:16 +0200 Subject: gnu: bitcoin-abc: Update to 0.21.10. * gnu/packages/finance.scm (bitcoin-abc): Update to 0.21.10. [inputs]: Add jemalloc. --- gnu/packages/finance.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index d8d3817f7e..edace82db5 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -72,6 +72,7 @@ (define-module (gnu packages finance) #:use-module (gnu packages graphviz) #:use-module (gnu packages groff) #:use-module (gnu packages gtk) + #:use-module (gnu packages jemalloc) #:use-module (gnu packages libedit) #:use-module (gnu packages libevent) #:use-module (gnu packages libunwind) @@ -1239,7 +1240,7 @@ (define-public trezord (define-public bitcoin-abc (package (name "bitcoin-abc") - (version "0.21.6") + (version "0.21.10") (source (origin (method url-fetch) (uri (string-append "https://download.bitcoinabc.org/" @@ -1247,7 +1248,7 @@ (define-public bitcoin-abc version ".tar.gz")) (sha256 (base32 - "1w3c397h2mxsi9471fwyc3yjxw7s4jgvr4q3w2qfh49bhr4wygqj")))) + "0cgr416cp7p14mlnfryxfjfcxys5hksfjhi0i4amxl4fbnpgjwk0")))) (build-system cmake-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -1257,6 +1258,7 @@ (define-public bitcoin-abc (inputs `(("bdb" ,bdb-5.3) ("boost" ,boost) + ("jemalloc" ,jemalloc) ("libevent" ,libevent) ("miniupnpc" ,miniupnpc) ("openssl" ,openssl) -- cgit v1.2.3 From 2cd765116c4abb7c52cddc8bba6b8dafaf5e8f47 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 11 Jul 2020 21:11:27 +0200 Subject: gnu: xfce4-eyes-plugin: Update to 4.5.1. * gnu/packages/xfce.scm (xfce4-eyes-plugin): Update to 4.5.1. --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 89a4206363..0c38be5b5a 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -1284,7 +1284,7 @@ (define-public xfce4-cpugraph-plugin (define-public xfce4-eyes-plugin (package (name "xfce4-eyes-plugin") - (version "4.5.0") + (version "4.5.1") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/panel-plugins/" @@ -1293,7 +1293,7 @@ (define-public xfce4-eyes-plugin "/xfce4-eyes-plugin-" version ".tar.bz2")) (sha256 (base32 - "17gj6fbvvrdzvz61czmia8hqynllsnmhk61fs4aml443cc1h1bpx")))) + "1iaszzkagl1mb0cdafrvlfjnjklhhs9y90517par34sjiqbq1dsd")))) (build-system gnu-build-system) (native-inputs `(("intltool" ,intltool) -- cgit v1.2.3 From 349f2a9db461b14b72c28c9eead9240eabc5a75d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 11 Jul 2020 21:21:07 +0200 Subject: gnu: svt-av1: Update to 0.8.4. * gnu/packages/video.scm (svt-av1): Update to 0.8.4. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 0667c6b65b..6c4afa4ba9 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3917,7 +3917,7 @@ (define-public dvdbackup (define-public svt-av1 (package (name "svt-av1") - (version "0.8.3") + (version "0.8.4") (source (origin (method git-fetch) (uri (git-reference @@ -3926,7 +3926,7 @@ (define-public svt-av1 (file-name (git-file-name name version)) (sha256 (base32 - "1rh4sz1bmrsxyxfxajsffw5jd17djcrymhwsi877v02fgln027qr")))) + "0xad35q9sv5w0iihcf9q1f1m7br5anl3vsyx9svnx128iqf0n997")))) (build-system cmake-build-system) ;; SVT-AV1 only supports Intel-compatible CPUs. (supported-systems '("x86_64-linux" "i686-linux")) -- cgit v1.2.3 From 22ca0e6ac3da2c18a27e0daf7820aad855417cae Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 11 Jul 2020 21:23:00 +0200 Subject: gnu: s6-linux-init: Update to 1.0.4.2. * gnu/packages/skarnet.scm (s6-linux-init): Update to 1.0.4.2. --- gnu/packages/skarnet.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/skarnet.scm b/gnu/packages/skarnet.scm index cef5eb90ee..67cf3b3d20 100644 --- a/gnu/packages/skarnet.scm +++ b/gnu/packages/skarnet.scm @@ -295,7 +295,7 @@ (define-public s6-portable-utils (define-public s6-linux-init (package (name "s6-linux-init") - (version "1.0.4.0") + (version "1.0.4.2") (source (origin (method url-fetch) @@ -303,7 +303,7 @@ (define-public s6-linux-init "https://skarnet.org/software/s6-linux-init/s6-linux-init-" version ".tar.gz")) (sha256 - (base32 "176mgkqxlp6gb6my66dv73xsp7adfxbjp5hjyh35sykqkr4kfyfy")))) + (base32 "0rp4k78555r38ir57a8w9qlxss4x487jqmhpn40ankpidwjs04gm")))) (build-system gnu-build-system) (inputs `(("execline" ,execline) -- cgit v1.2.3 From 131cc178e3d33671a9c732ad7b2b4745faec5c0f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 11 Jul 2020 21:33:40 +0200 Subject: gnu: flrig: Update to 1.3.51. * gnu/packages/radio.scm (flrig): Update to 1.3.51. --- gnu/packages/radio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index d1cf6651f2..f513f2bb29 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -618,14 +618,14 @@ (define-public fldigi (define-public flrig (package (name "flrig") - (version "1.3.50") + (version "1.3.51") (source (origin (method url-fetch) (uri (string-append "http://www.w1hkj.com/files/flrig/flrig-" version ".tar.gz")) (sha256 - (base32 "0fzrknzzi8kmzmrcfpc8rxr7v4a4ny6z6z5q5qwh95sp2kn2qzp9")))) + (base32 "0aq4x0ai9q08ypfhzfj2inc4z3q39zq1l6h9as1kil9yn4zbay61")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 183f0698580a80d4eb602d54cc3e61efcb9197da Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 11 Jul 2020 21:51:00 +0200 Subject: gnu: wsjtx: Update to 2.2.2. * gnu/packages/radio.scm (wsjtx-hamlib, wsjtx): Update to 2.2.2. --- gnu/packages/radio.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index f513f2bb29..890c6f63fd 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -801,7 +801,7 @@ (define wsjtx-hamlib (package (inherit hamlib) (name "wsjtx-hamlib") - (version "2.2.1") + (version "2.2.2") (source (origin (method git-fetch) @@ -835,7 +835,7 @@ (define wsjtx-hamlib (define-public wsjtx (package (name "wsjtx") - (version "2.2.1") + (version "2.2.2") (source (origin (method git-fetch) @@ -844,7 +844,7 @@ (define-public wsjtx (commit (string-append "wsjtx-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "12i8ch2yhxlbd7lbpl4s4y37ks4i00wasah4j44g104rxrzdny57")) + (base32 "0fhws44gg05d9y2al0pcdnxwxwh4bazcfl0g5mq2ks1r7w23wi5x")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From bc332f07173a277cdad17b30021dad0299a858f3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 11 Jul 2020 22:57:52 +0200 Subject: gnu: ntp: Update to 4.2.8p15 [security fixes]. * gnu/packages/ntp.scm (ntp): Update to 4.2.8p15. [source]: Swap order of URIs. --- gnu/packages/ntp.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gnu/packages/ntp.scm b/gnu/packages/ntp.scm index e37bf30a7d..82754cbf36 100644 --- a/gnu/packages/ntp.scm +++ b/gnu/packages/ntp.scm @@ -107,20 +107,20 @@ (define-public chrony (define-public ntp (package (name "ntp") - (version "4.2.8p14") + (version "4.2.8p15") (source (origin (method url-fetch) (uri (list (string-append - "http://archive.ntp.org/ntp4/ntp-" - (version-major+minor version) - "/ntp-" version ".tar.gz") + "https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-" + (version-major+minor version) + "/ntp-" version ".tar.gz") (string-append - "https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-" - (version-major+minor version) - "/ntp-" version ".tar.gz"))) + "http://archive.ntp.org/ntp4/ntp-" + (version-major+minor version) + "/ntp-" version ".tar.gz"))) (sha256 - (base32 "1dsfbrad5adwjnm3k0y0ip8dzs7r2nmw66vjil8gvapnh7qf8q0r")) + (base32 "06cwhimm71safmwvp6nhxp6hvxsg62whnbgbgiflsqb8mgg40n7n")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 7ed0eeb0113f4fe7c56ca649c05b08df8ecd66fb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 11 Jul 2020 23:24:18 +0200 Subject: gnu: php: Update to 7.4.8. * gnu/packages/php.scm (php): Update to 7.4.8. --- gnu/packages/php.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm index 6d9f46e960..7e6a646c0c 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm @@ -60,7 +60,7 @@ (define-module (gnu packages php) (define-public php (package (name "php") - (version "7.4.7") + (version "7.4.8") (home-page "https://secure.php.net/") (source (origin (method url-fetch) @@ -68,7 +68,7 @@ (define-public php "php-" version ".tar.xz")) (sha256 (base32 - "1brgnp11vpy1619cx0cncih02rg2k20wllm21vxbd2nd4j7qymak")) + "0i9j0yykm6ww021iq89g83qjliq1mqiyhqdn3kq8lbkk1f4l6a34")) (modules '((guix build utils))) (snippet '(with-directory-excursion "ext" -- cgit v1.2.3 From 1abf205d11c8b941d7d89855cb55a9cfde078838 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 11 Jul 2020 23:27:56 +0200 Subject: Revert "vm: Use virtio network driver." This allows users to specify network interface settings with 'guix system vm' without having to create a new NIC. Fixes . Reported by Christopher Lemmer Webber . This reverts commit 5379392731b52eef22b4936637eb592b93e04318. --- gnu/system/vm.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index f2b6b71b4d..861f2a427a 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -819,7 +819,6 @@ (define (virtfs-option fs) '()) "-no-reboot" - "-nic" "user,model=virtio-net-pci" "-object" "rng-random,filename=/dev/urandom,id=guixsd-vm-rng" "-device" "virtio-rng-pci,rng=guixsd-vm-rng" -- cgit v1.2.3 From 54461153dac6096a018e35a1d959e45b2c9dbb82 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 11 Jul 2020 23:32:28 +0200 Subject: tests: networking: Use 'net.ifnames=0' for the Open vSwitch test. * gnu/tests/networking.scm (%openvswitch-os): Override KERNEL-ARGUMENTS. --- gnu/tests/networking.scm | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/gnu/tests/networking.scm b/gnu/tests/networking.scm index ca18b2f452..022663aa67 100644 --- a/gnu/tests/networking.scm +++ b/gnu/tests/networking.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Thomas Danckaert -;;; Copyright © 2017 Marius Bakke +;;; Copyright © 2017, 2020 Marius Bakke ;;; Copyright © 2018 Chris Marusich ;;; Copyright © 2018 Arun Isaac ;;; @@ -174,12 +174,15 @@ (define openvswitch-configuration-service (respawn? #f))))) (define %openvswitch-os - (simple-operating-system - (static-networking-service "ovs0" "10.1.1.1" - #:netmask "255.255.255.252" - #:requirement '(openvswitch-configuration)) - (service openvswitch-service-type) - openvswitch-configuration-service)) + (operating-system + (inherit (simple-operating-system + (static-networking-service "ovs0" "10.1.1.1" + #:netmask "255.255.255.252" + #:requirement '(openvswitch-configuration)) + (service openvswitch-service-type) + openvswitch-configuration-service)) + ;; Ensure the interface name does not change depending on the driver. + (kernel-arguments (cons "net.ifnames=0" %default-kernel-arguments)))) (define (run-openvswitch-test) (define os -- cgit v1.2.3 From 12d69fc5745759b11d6e19cdcdad64d34ecd9dd4 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Sat, 20 Jun 2020 17:11:10 +0200 Subject: gnu: tomb: Add 'getent' to PATH. * gnu/packages/crypto.scm (tomb)[arguments]: In 'wrap' phase add 'getent' to the PATH. Signed-off-by: Julien Lepiller --- gnu/packages/crypto.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 859fc9d654..01018933cb 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -16,6 +16,7 @@ ;;; Copyright © 2019 Tanguy Le Carrour ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 Jakub Kądziołka +;;; Copyright © 2020 Brice Waegeneire ;;; ;;; This file is part of GNU Guix. ;;; @@ -445,7 +446,7 @@ (define-public tomb (error "program not found:" program))) '("seq" "mkfs.ext4" "pinentry" "gpg" "cryptsetup" "gettext" "lsof" - "qrencode" "steghide" "findmnt"))))) + "qrencode" "steghide" "findmnt" "getent"))))) #t))) (delete 'check) (add-after 'wrap 'check -- cgit v1.2.3 From 89c9e647489d9114861082f27f4deb1f00fdf871 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 11 Jul 2020 23:16:27 +0200 Subject: gnu: Add kcov. * gnu/packages/code.scm (kcov): New variable. --- gnu/packages/code.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index 6334c97ef2..7a1dfa5c8c 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2019 Hartmut Goebel ;;; Copyright © 2020 Maxim Cournoyer ;;; Copyright © 2020 Marius Bakke +;;; Copyright © 2020 Julien Lepiller ;;; ;;; This file is part of GNU Guix. ;;; @@ -47,6 +48,8 @@ (define-module (gnu packages code) #:use-module (gnu packages c) #:use-module (gnu packages compression) #:use-module (gnu packages cpp) + #:use-module (gnu packages curl) + #:use-module (gnu packages elf) #:use-module (gnu packages emacs) #:use-module (gnu packages gcc) #:use-module (gnu packages graphviz) @@ -522,6 +525,47 @@ (define-public lcov functionality such as HTML output.") (license license:gpl2+)))) +(define-public kcov + (package + (name "kcov") + (version "38") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/SimonKagstrom/kcov") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0zqg21xwivi16csl6a5wby6679ny01bjaw4am3y4qcgjdyihifp8")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ;no test target + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-/bin/bash-references + (lambda _ + (substitute* (find-files "src" ".*\\.cc?$") + (("/bin/bash") (which "bash")) + (("/bin/sh") (which "sh"))) + #t))))) + (inputs + `(("curl" ,curl) + ("elfutils" ,elfutils) + ("libelf" ,libelf) + ("zlib" ,zlib))) + (native-inputs + `(("python" ,python))) + (home-page "https://github.com/SimonKagstrom/kcov") + (synopsis "Code coverage tester for compiled languages, Python and Bash") + (description "Kcov is a FreeBSD/Linux/OSX code coverage tester for compiled +languages, Python and Bash. Kcov was originally a fork of Bcov, but has since +evolved to support a large feature set in addition to that of Bcov. + +Kcov uses DWARF debugging information for compiled programs to make it +possible to collect coverage information without special compiler switches.") + (license license:gpl2+))) + (define-public rtags (package (name "rtags") -- cgit v1.2.3 From 36a1925f21ee6787d8b80025f1b96238309f4b96 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Sat, 20 Jun 2020 17:11:11 +0200 Subject: gnu: Add 'pass-tomb'. * gnu/packages/password-utils.scm (pass-tomb): New variable. Signed-off-by: Julien Lepiller --- gnu/packages/password-utils.scm | 43 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 5662a1dfe8..b7f9689862 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -1211,3 +1211,46 @@ (define-public makepasswd encryption algorithm if so desired.") (home-page "https://github.com/khorben/makepasswd") (license license:gpl3)))) + +(define-public pass-tomb + (package + (name "pass-tomb") + (version "1.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/roddhjav/pass-tomb") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1qj7vx7svk1ljwihj3kv310k17mafnf919n30n4qn1yxmmsvj924")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags + (let ((out (assoc-ref %outputs "out"))) + (list (string-append "PREFIX=" out) + (string-append "BASHCOMPDIR=" out "/etc/bash_completion.d"))) + #:test-target "tests" + ;; tests are very dependent on system state (swap partition) and require + ;; access to /tmp/zsh which is not in the build container. + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'set-tomb-path + (lambda* (#:key inputs #:allow-other-keys) + (let ((tomb (assoc-ref inputs "tomb"))) + (substitute* "tomb.bash" + ((":-tomb") + (string-append ":-" tomb "/bin/tomb")))))) + (delete 'configure)))) + (inputs + `(("tomb" ,tomb))) + (home-page "https://github.com/roddhjav/pass-tomb") + (synopsis "Pass extension keeping the tree of passwords encrypted") + (description "Pass-tomb provides a convenient solution to put your +password store in a Tomb and then keep your password tree encrypted when you +are not using it. It uses the same GPG key to encrypt passwords and tomb, +therefore you don't need to manage more key or secret. Moreover, you can ask +pass-tomb to automatically close your store after a given time.") + (license license:gpl3+))) -- cgit v1.2.3 From 6680880f9b8dceb4f2f3f91bd2b13c659b53835e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 12 Jul 2020 00:16:02 +0200 Subject: gnu: guix: Update to 1.1.0-17.36a1925. * gnu/packages/package-management.scm (guix): Update to 1.1.0-17.36a1925. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 9986976cc6..6e86305504 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -118,8 +118,8 @@ (define-public guix ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.1.0") - (commit "d3eee3c0643a20ba06941ba45d9d27146a8b634d") - (revision 16)) + (commit "36a1925f21ee6787d8b80025f1b96238309f4b96") + (revision 17)) (package (name "guix") @@ -135,7 +135,7 @@ (define-public guix (commit commit))) (sha256 (base32 - "1waw4pggijhxwwdi9v9nq8p2har5cvnbvlxvq8abn4g1qw6xdrz5")) + "05f7w6hyl1bw58q1fph9ws17rx0zgs638mrsxwz026bwjyy2xxr0")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From ea4915a74bc4c03495d4910c1e32a92c790b6626 Mon Sep 17 00:00:00 2001 From: Christopher Lemmer Webber Date: Sat, 11 Jul 2020 21:42:04 -0400 Subject: services: guix: Refer to 'berlin.guix.gnu.org.pub'. Commit 6680880f9b8dceb4f2f3f91bd2b13c659b53835e pushes out a new guix package with a new key location, so we need to update to the new key in order for systems to build correctly. * gnu/services/base.scm (%default-authorized-guix-keys): Refer to berlin.guix.gnu.org.pub. --- gnu/services/base.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 0b82a90507..9b4cd13214 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -1483,7 +1483,7 @@ (define %default-authorized-guix-keys ;; List of authorized substitute keys. ;; TODO: Change to "berlin.guix.gnu.org.pub" when the 'guix' package is ;; updated. - (list (file-append guix "/share/guix/berlin.guixsd.org.pub"))) + (list (file-append guix "/share/guix/berlin.guix.gnu.org.pub"))) (define-record-type* guix-configuration make-guix-configuration -- cgit v1.2.3 From d59a98d359a60cf0ad4f4cad5feca24f57774a48 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 11 Jul 2020 22:36:50 -0400 Subject: gnu: emacs-debbugs: Update to 0.25. * gnu/packages/emacs-xyz.scm (emacs-debbugs): Update to 0.25. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 89fed81059..f90f2c4e4f 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -4293,14 +4293,14 @@ (define-public emacs-ob-ipython (define-public emacs-debbugs (package (name "emacs-debbugs") - (version "0.24") + (version "0.25") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/debbugs-" version ".tar")) (sha256 - (base32 "1b8qwdvf3jvw0chrdgbymb2ci9ms45mf90nrljxx7jql2lsr3x63")))) + (base32 "0h0pxav170yzfpjf4vb8simiw67x9dkcjx9m4ghdk6wia25y8jni")))) (build-system emacs-build-system) (arguments '(#:include '("\\.el$" "\\.wsdl$" "\\.info$"))) (propagated-inputs -- cgit v1.2.3 From 83b5ea9d18772334a47c3d76c6ca73a123cac12c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 11 Jul 2020 23:46:01 -0400 Subject: gnu: isc-bind: List included utilities in the description. A frequent question was: "Which package contained the 'dig' utility?" This change should make the question answerable through 'guix search'. * gnu/packages/dns.scm (isc-bind)[synopsis]: Remove leading article. [description]: Add a table listing the utilities contained in the 'utils' output and insert a missing space between two sentences. [home-page]: Update. --- gnu/packages/dns.scm | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index f96eeda029..cb850745ca 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -177,14 +177,28 @@ (define-public isc-bind (with-directory-excursion "fuzz" (invoke "make" "check")) #t))))) - (synopsis "An implementation of the Domain Name System") + (synopsis "Domain Name System (DNS) implementation") (description "BIND is an implementation of the @dfn{Domain Name System} (DNS) protocols for the Internet. It is a reference implementation of those protocols, but it is also production-grade software, suitable for use in -high-volume and high-reliability applications. The name BIND stands for -\"Berkeley Internet Name Domain\", because the software originated in the early -1980s at the University of California at Berkeley.") - (home-page "https://www.isc.org/downloads/bind") +high-volume and high-reliability applications. The name BIND stands for +\"Berkeley Internet Name Domain\", because the software originated in the +early 1980s at the University of California at Berkeley. The @code{utils} +output of this package contains the following DNS name servers related command +line utilities: +@table @code +@item delv +DNS lookup and validation utility +@item dig +DNS lookup utility +@item host +DNS lookup utility +@item nslookup +Internet name servers interactive query utility +@item nsupdate +Dynamic DNS update utility +@end table") + (home-page "https://www.isc.org/bind/") (license (list license:mpl2.0)))) (define-public dnscrypt-proxy -- cgit v1.2.3 From fdef0d85ce5da48a15b6e32edb2cf98cc146248f Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Sun, 12 Jul 2020 09:21:44 +0200 Subject: scripts: Typo in args-fold*. * guix/scripts.scm (args-fold*): Add missing 'args' parameter so that the all parameter names match their value. --- guix/scripts.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/guix/scripts.scm b/guix/scripts.scm index 3e19e38957..8534948892 100644 --- a/guix/scripts.scm +++ b/guix/scripts.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2013, 2014, 2015, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2014 Deck Pickard ;;; Copyright © 2015, 2016 Alex Kost +;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -49,12 +50,12 @@ (define-module (guix scripts) ;;; ;;; Code: -(define (args-fold* options unrecognized-option-proc operand-proc . seeds) +(define (args-fold* args options unrecognized-option-proc operand-proc . seeds) "A wrapper on top of `args-fold' that does proper user-facing error reporting." (catch 'misc-error (lambda () - (apply args-fold options unrecognized-option-proc + (apply args-fold args options unrecognized-option-proc operand-proc seeds)) (lambda (key proc msg args . rest) ;; XXX: MSG is not i18n'd. -- cgit v1.2.3 From d67826a810be547d7ce7fe11a3bbbb5960d1df87 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 12 Jul 2020 13:06:41 +0200 Subject: services: Remove obsolete comment. This TODO was resolved in ea4915a74bc4c03495d4910c1e32a92c790b6626. * gnu/services/base.scm (%default-authorized-guix-keys): Remove TODO comment. --- gnu/services/base.scm | 2 -- 1 file changed, 2 deletions(-) diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 9b4cd13214..83dc406aac 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -1481,8 +1481,6 @@ (define keys (define %default-authorized-guix-keys ;; List of authorized substitute keys. - ;; TODO: Change to "berlin.guix.gnu.org.pub" when the 'guix' package is - ;; updated. (list (file-append guix "/share/guix/berlin.guix.gnu.org.pub"))) (define-record-type* -- cgit v1.2.3 From d23f0db6f9796e5d1cd463ffa170e4f71c965911 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 10 Jul 2020 17:34:55 +0300 Subject: gnu: Add rust-cexpr-0.4. * gnu/packages/crates-io.scm (rust-cexpr-0.4): New variable. (ruxt-cexpr-0.3): Inherit from rust-cexpr-0.4. --- gnu/packages/crates-io.scm | 46 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 37 insertions(+), 9 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 263e00bb40..e44d198dd3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2780,8 +2780,44 @@ (define-public rust-cc-1.0 (license (list license:asl2.0 license:expat)))) +(define-public rust-cexpr-0.4 + (package + (name "rust-cexpr") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "cexpr" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "09qd1k1mrhcqfhqmsz4y1bya9gcs29si7y3w96pqkgid4y2dpbpl")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-nom" ,rust-nom-5)) + #:cargo-development-inputs + (("rust-clang-sys" ,rust-clang-sys-0.28)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'set-environmental-variable + (lambda* (#:key inputs #:allow-other-keys) + (let ((clang (assoc-ref inputs "libclang"))) + (setenv "LIBCLANG_PATH" + (string-append clang "/lib"))) + #t))))) + (inputs + `(("libclang" ,clang))) + (home-page "https://github.com/jethrogb/rust-cexpr") + (synopsis "C expression parser and evaluator") + (description + "This package provides a C expression parser and evaluator.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-cexpr-0.3 (package + (inherit rust-cexpr-0.4) (name "rust-cexpr") (version "0.3.6") (source @@ -2793,7 +2829,6 @@ (define-public rust-cexpr-0.3 (sha256 (base32 "07fdfj4ff2974y33yixrb657riq9zl9b9h9lr0h7ridhhvxvbrgw")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-nom" ,rust-nom-4.2)) @@ -2806,14 +2841,7 @@ (define-public rust-cexpr-0.3 (let ((clang (assoc-ref inputs "libclang"))) (setenv "LIBCLANG_PATH" (string-append clang "/lib"))) - #t))))) - (inputs - `(("libclang" ,clang))) - (home-page "https://github.com/jethrogb/rust-cexpr") - (synopsis "C expression parser and evaluator") - (description - "This package provides a C expression parser and evaluator.") - (license (list license:asl2.0 license:expat)))) + #t))))))) (define-public rust-cexpr-0.2 (package -- cgit v1.2.3 From b158ff87bf9457f50522752a4e62bf1bcfdc0ae8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 10 Jul 2020 17:40:26 +0300 Subject: gnu: Add rust-clang-sys-0.29. * gnu/packages/crates-io.scm (rust-clang-sys-0.29): New variable. (rust-clang-sys-0.28): Inherit from rust-clang-sys-0.29. --- gnu/packages/crates-io.scm | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e44d198dd3..755e313b20 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3061,10 +3061,10 @@ (define-public rust-ci-info-0.3 "This package provides current CI environment information.") (license license:asl2.0))) -(define-public rust-clang-sys-0.28 +(define-public rust-clang-sys-0.29 (package (name "rust-clang-sys") - (version "0.28.1") + (version "0.29.3") (source (origin (method url-fetch) @@ -3072,7 +3072,7 @@ (define-public rust-clang-sys-0.28 (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0ls8zcqi5bmmrvrk3b6r1ym4wlivinbv590d2dvg2xn9f44mbpl1")))) + "02nibl74zbz5x693iy5vdbhnfckja47m7j1mp2bj7fjw3pgkfs7y")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -3095,6 +3095,20 @@ (define-public rust-clang-sys-0.28 "This package provides Rust bindings for @code{libclang}.") (license license:asl2.0))) +(define-public rust-clang-sys-0.28 + (package + (inherit rust-clang-sys-0.29) + (name "rust-clang-sys") + (version "0.28.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "clang-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0ls8zcqi5bmmrvrk3b6r1ym4wlivinbv590d2dvg2xn9f44mbpl1")))))) + (define-public rust-clang-sys-0.26 (package (inherit rust-clang-sys-0.28) -- cgit v1.2.3 From bc4b2bd4954bffec3870a3981becb8cd182bacb0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 10 Jul 2020 17:56:57 +0300 Subject: gnu: Add rust-bindgen-0.53. * gnu/packages/crates-io.scm (rust-bindgen-0.53): New variable. (rust-bindgen-0.52): Inherit from rust-bindgen-0.53. --- gnu/packages/crates-io.scm | 65 +++++++++++++++++++++++++++++++++++++++------- 1 file changed, 55 insertions(+), 10 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 755e313b20..017bc1d531 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1327,8 +1327,62 @@ (define-public rust-bincode-1 that uses Serde for transforming structs into bytes and vice versa!") (license license:expat))) +(define-public rust-bindgen-0.53 + (package + (name "rust-bindgen") + (version "0.53.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "bindgen" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1rc9grfd25bk5b2acmqljhx55ndbzmh7w8b3x6q707cb4s6rfan7")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-cexpr" ,rust-cexpr-0.4) + ("rust-cfg-if" ,rust-cfg-if-0.1) + ("rust-clang-sys" ,rust-clang-sys-0.29) + ("rust-clap" ,rust-clap-2) + ("rust-env-logger" ,rust-env-logger-0.7) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-lazycell" ,rust-lazycell-1.2) + ("rust-log" ,rust-log-0.4) + ("rust-peeking-take-while" ,rust-peeking-take-while-0.1) + ("rust-proc-macro2" ,rust-proc-macro2-1.0) + ("rust-quote" ,rust-quote-1.0) + ("rust-regex" ,rust-regex-1) + ("rust-rustc-hash" ,rust-rustc-hash-1.1) + ("rust-shlex" ,rust-shlex-0.1) + ("rust-which" ,rust-which-3.1)) + #:cargo-development-inputs + (("rust-clap" ,rust-clap-2) + ("rust-diff" ,rust-diff-0.1) + ("rust-shlex" ,rust-shlex-0.1)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'set-environmental-variable + (lambda* (#:key inputs #:allow-other-keys) + (let ((clang (assoc-ref inputs "libclang"))) + (setenv "LIBCLANG_PATH" + (string-append clang "/lib"))) + #t))))) + (inputs + `(("libclang" ,clang))) + (home-page "https://rust-lang.github.io/rust-bindgen/") + (synopsis + "Automatically generates Rust FFI bindings to C and C++ libraries") + (description + "Automatically generates Rust FFI bindings to C and C++ libraries.") + (license license:bsd-3))) + (define-public rust-bindgen-0.52 (package + (inherit rust-bindgen-0.53) (name "rust-bindgen") (version "0.52.0") (source @@ -1340,7 +1394,6 @@ (define-public rust-bindgen-0.52 (sha256 (base32 "0mzy2gjiaggl602yn4a11xzrxfj18kl7pwqa5yv32njkxd257j7i")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-shlex" ,rust-shlex-0.1) @@ -1371,15 +1424,7 @@ (define-public rust-bindgen-0.52 (let ((clang (assoc-ref inputs "libclang"))) (setenv "LIBCLANG_PATH" (string-append clang "/lib"))) - #t))))) - (inputs - `(("libclang" ,clang))) - (home-page "https://rust-lang.github.io/rust-bindgen/") - (synopsis - "Automatically generates Rust FFI bindings to C and C++ libraries") - (description - "Automatically generates Rust FFI bindings to C and C++ libraries.") - (license license:bsd-3))) + #t))))))) (define-public rust-bindgen-0.51 (package -- cgit v1.2.3 From 3241878c85601d9a3d8f1fde2eaf9427aa408c30 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 10 Jul 2020 18:49:39 +0300 Subject: gnu: rust-aos-sys-0.1: Update to 0.1.4. * gnu/packages/crates-io.scm (rust-aom-sys-0.1): Update to 0.1.4. [arguments]: In cargo-inputs replace rust-bindgen-0.51 with 0.53. --- gnu/packages/crates-io.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 017bc1d531..7967785f25 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -540,7 +540,7 @@ (define-public rust-anyhow-1.0 (define-public rust-aom-sys-0.1 (package (name "rust-aom-sys") - (version "0.1.3") + (version "0.1.4") (source (origin (method url-fetch) @@ -549,12 +549,11 @@ (define-public rust-aom-sys-0.1 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0ix3djcf84kk53h6fac73n7jc614745n7kbmikxwi3s73b6vzgsr")))) + "1bqcpkycv1d67r6jcl9npfbw6rkl829rdq9w6vlpb0rjqxp0xzsn")))) (build-system cargo-build-system) (arguments - `(;#:skip-build? #t - #:cargo-inputs - (("rust-bindgen" ,rust-bindgen-0.51) + `(#:cargo-inputs + (("rust-bindgen" ,rust-bindgen-0.53) ("rust-metadeps" ,rust-metadeps-1.1)) #:phases (modify-phases %standard-phases -- cgit v1.2.3 From 018a1d291d193ef45dcbe5f23a70c33efae96e28 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 12 Jul 2020 09:58:20 +0300 Subject: gnu: Add rust-bindgen-0.54. * gnu/packages/crates-io.scm (rust-bindgen-0.54): New variable. (rust-bindgen-0.53): Inherit from rust-bindgen-0.54. --- gnu/packages/crates-io.scm | 54 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 50 insertions(+), 4 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7967785f25..79323bb08f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1326,10 +1326,10 @@ (define-public rust-bincode-1 that uses Serde for transforming structs into bytes and vice versa!") (license license:expat))) -(define-public rust-bindgen-0.53 +(define-public rust-bindgen-0.54 (package (name "rust-bindgen") - (version "0.53.3") + (version "0.54.1") (source (origin (method url-fetch) @@ -1338,10 +1338,11 @@ (define-public rust-bindgen-0.53 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1rc9grfd25bk5b2acmqljhx55ndbzmh7w8b3x6q707cb4s6rfan7")))) + "0dn7dlwa0abjlqbl2kvwfdy6k6kgcqg6ixcjmk6pc3dpps09pm7l")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs + `(#:tests? #f ; not all test files included + #:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) ("rust-cexpr" ,rust-cexpr-0.4) ("rust-cfg-if" ,rust-cfg-if-0.1) @@ -1379,6 +1380,51 @@ (define-public rust-bindgen-0.53 "Automatically generates Rust FFI bindings to C and C++ libraries.") (license license:bsd-3))) +(define-public rust-bindgen-0.53 + (package + (inherit rust-bindgen-0.54) + (name "rust-bindgen") + (version "0.53.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "bindgen" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1rc9grfd25bk5b2acmqljhx55ndbzmh7w8b3x6q707cb4s6rfan7")))) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-cexpr" ,rust-cexpr-0.4) + ("rust-cfg-if" ,rust-cfg-if-0.1) + ("rust-clang-sys" ,rust-clang-sys-0.29) + ("rust-clap" ,rust-clap-2) + ("rust-env-logger" ,rust-env-logger-0.7) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-lazycell" ,rust-lazycell-1.2) + ("rust-log" ,rust-log-0.4) + ("rust-peeking-take-while" ,rust-peeking-take-while-0.1) + ("rust-proc-macro2" ,rust-proc-macro2-1.0) + ("rust-quote" ,rust-quote-1.0) + ("rust-regex" ,rust-regex-1) + ("rust-rustc-hash" ,rust-rustc-hash-1.1) + ("rust-shlex" ,rust-shlex-0.1) + ("rust-which" ,rust-which-3.1)) + #:cargo-development-inputs + (("rust-clap" ,rust-clap-2) + ("rust-diff" ,rust-diff-0.1) + ("rust-shlex" ,rust-shlex-0.1)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'set-environmental-variable + (lambda* (#:key inputs #:allow-other-keys) + (let ((clang (assoc-ref inputs "libclang"))) + (setenv "LIBCLANG_PATH" + (string-append clang "/lib"))) + #t))))))) + (define-public rust-bindgen-0.52 (package (inherit rust-bindgen-0.53) -- cgit v1.2.3 From f485daf3cbca8fdace4ff3ef42712c244822a753 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 12 Jul 2020 10:27:45 +0300 Subject: gnu: rust-dav1d-sys-0.3: Update to 0.3.2. * gnu/packages/crates-io.scm (rust-dav1d-sys-0.3): Update to 0.3.2. [arguments]: In cargo-inputs replace rust-bindgen-0.52 with 0.54. Remove rust-png-config-0.3. [description]: Appease 'guix lint'. --- gnu/packages/crates-io.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 79323bb08f..2d493c0c24 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5083,7 +5083,7 @@ (define-public rust-datetime-0.4 (define-public rust-dav1d-sys-0.3 (package (name "rust-dav1d-sys") - (version "0.3.0") + (version "0.3.2") (source (origin (method url-fetch) @@ -5092,12 +5092,11 @@ (define-public rust-dav1d-sys-0.3 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1022czzp3s54r42x6rhr870w1fwzyp7b6qn0zirpz55zmqjpgnwa")))) + "1jdxhnlxcml6jd67lx78ifzkn1xm18zfk4li7vjdh3fa61i073kx")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-pkg-config" ,rust-pkg-config-0.3) - ("rust-bindgen" ,rust-bindgen-0.52) + (("rust-bindgen" ,rust-bindgen-0.54) ("rust-metadeps" ,rust-metadeps-1.1)) #:phases (modify-phases %standard-phases @@ -5114,7 +5113,7 @@ (define-public rust-dav1d-sys-0.3 ("llvm" ,llvm))) (home-page "https://github.com/rust-av/dav1d-rs") (synopsis "FFI bindings to dav1d") - (description "FFI bindings to dav1d") + (description "This package provides FFI bindings to dav1d.") (license license:expat))) (define-public rust-decimal-2.0 -- cgit v1.2.3 From d695ebb6609fb62827d4ece0f8765977f7c76656 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 12 Jul 2020 11:36:39 +0300 Subject: gnu: Add rust-terminal-size-0.1. * gnu/packages/crates-io.scm (rust-terminal-size-0.1): New variable. --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2d493c0c24..6bfc5b1ec7 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -25115,6 +25115,31 @@ (define-public rust-termcolor-1 (license (list license:unlicense license:expat)))) +(define-public rust-terminal-size-0.1 + (package + (name "rust-terminal-size") + (version "0.1.13") + (source + (origin + (method url-fetch) + (uri (crate-uri "terminal-size" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "04qy9i0k3qkhl749xk30xga0l7w61rf4bj5zy0r44w3jijgws54s")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; Tests expect access to /dev/stderr + #:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-winapi" ,rust-winapi-0.3)))) + (home-page "https://github.com/eminence/terminal-size") + (synopsis "Gets the size of your Linux or Windows terminal") + (description + "This package gets the size of your Linux or Windows terminal.") + (license (list license:expat license:asl2.0)))) + (define-public rust-terminfo-0.6 (package (name "rust-terminfo") -- cgit v1.2.3 From b625a6c696f4e5fc9ef01539375742c0ca2c99a6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 12 Jul 2020 11:39:15 +0300 Subject: gnu: Add rust-console-0.11. * gnu/packages/crates-io.scm (rust-console-0.11): New variable. (rust-console-0.9): Inherit from rust-console-0.11. --- gnu/packages/crates-io.scm | 40 +++++++++++++++++++++++++++++++++------- 1 file changed, 33 insertions(+), 7 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6bfc5b1ec7..2f10af7afc 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3711,8 +3711,40 @@ (define-public rust-compiletest-rs-0.2 ("rust-rustc-serialize" ,rust-rustc-serialize-0.3) ("rust-tempdir" ,rust-tempdir-0.3)))))) +(define-public rust-console-0.11 + (package + (name "rust-console") + (version "0.11.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "console" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0nmwkbb1j1zjb2z4akk83rqgnbv7j3dla4nxv0ibk9xvavk982cc")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-encode-unicode" ,rust-encode-unicode-0.3) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-regex" ,rust-regex-1) + ("rust-terminal-size" ,rust-terminal-size-0.1) + ("rust-termios" ,rust-termios-0.3) + ("rust-unicode-width" ,rust-unicode-width-0.1) + ("rust-winapi" ,rust-winapi-0.3) + ("rust-winapi-util" ,rust-winapi-util-0.1)))) + (home-page "https://github.com/mitsuhiko/console") + (synopsis "Terminal and console abstraction for Rust") + (description + "This package provides a terminal and console abstraction for Rust") + (license license:expat))) + (define-public rust-console-0.9 (package + (inherit rust-console-0.11) (name "rust-console") (version "0.9.2") (source @@ -3724,7 +3756,6 @@ (define-public rust-console-0.9 (sha256 (base32 "1h765951c9mywff534f0191slazykmif4290g2yarcwhd2cg7q25")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-unicode-width" ,rust-unicode-width-0.1) @@ -3734,12 +3765,7 @@ (define-public rust-console-0.9 ("rust-winapi" ,rust-winapi-0.3) ("rust-clicolors-control" ,rust-clicolors-control-1.0) ("rust-regex" ,rust-regex-1) - ("rust-lazy-static" ,rust-lazy-static-1)))) - (home-page "https://github.com/mitsuhiko/console") - (synopsis "Terminal and console abstraction for Rust") - (description - "This package provides a terminal and console abstraction for Rust") - (license license:expat))) + ("rust-lazy-static" ,rust-lazy-static-1)))))) (define-public rust-console-0.7 (package -- cgit v1.2.3 From 7ef82dfd78fa25c2e0eba939e297386cef904bac Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 12 Jul 2020 12:26:57 +0300 Subject: gnu: Add rust-fern-0.6. * gnu/packages/crates-io.scm (rust-fern-0.6): New variable. (rust-fern-0.5): Inherit from rust-fern-0.6. --- gnu/packages/crates-io.scm | 42 +++++++++++++++++++++++++++++++++++------- 1 file changed, 35 insertions(+), 7 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2f10af7afc..dfc73c3b1b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6869,8 +6869,42 @@ (define-public rust-fallible-streaming-iterator-0.1 (description "Fallible streaming iteration") (license (list license:expat license:asl2.0)))) +(define-public rust-fern-0.6 + (package + (name "rust-fern") + (version "0.6.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "fern" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0rghkbmpm7ckchd2fr2ifahprc7ll3qs0fbwsspsgj6cy0h4i6lc")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-chrono" ,rust-chrono-0.4) + ("rust-colored" ,rust-colored-1.9) + ("rust-libc" ,rust-libc-0.2) + ("rust-log" ,rust-log-0.4) + ("rust-reopen" ,rust-reopen-0.3) + ("rust-syslog" ,rust-syslog-3.3) + ("rust-syslog" ,rust-syslog-4.0)) + #:cargo-development-inputs + (("rust-chrono" ,rust-chrono-0.4) + ("rust-clap" ,rust-clap-2) + ("rust-tempdir" ,rust-tempdir-0.3)))) + (home-page "https://github.com/daboross/fern") + (synopsis "Simple, efficient logging") + (description + "This package provides a simple, efficient logging system for Rust.") + (license license:expat))) + (define-public rust-fern-0.5 (package + (inherit rust-fern-0.6) (name "rust-fern") (version "0.5.9") (source @@ -6882,7 +6916,6 @@ (define-public rust-fern-0.5 (sha256 (base32 "1anslk0hx9an4ypcaxqff080hgbcxm7ji7d4qf4f6qx1mkav16p6")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2) @@ -6894,12 +6927,7 @@ (define-public rust-fern-0.5 ("rust-syslog" ,rust-syslog-4.0)) #:cargo-development-inputs (("rust-clap" ,rust-clap-2) - ("rust-tempdir" ,rust-tempdir-0.3)))) - (home-page "https://github.com/daboross/fern") - (synopsis "Simple, efficient logging") - (description - "This package provides a simple, efficient logging system for Rust.") - (license license:expat))) + ("rust-tempdir" ,rust-tempdir-0.3)))))) (define-public rust-filetime-0.2 (package -- cgit v1.2.3 From 83b68205c403d1a0f9215452e56325b505c77d93 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 12 Jul 2020 12:37:08 +0300 Subject: gnu: Add rust-num-bigint-0.3. * gnu/packages/crates-io.scm (rust-num-bigint-0.3): New variable. (rust-num-bigint-0.2): Inherit from rust-num-bigint-0.3. --- gnu/packages/crates-io.scm | 37 ++++++++++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 7 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index dfc73c3b1b..f62255f0d4 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14579,8 +14579,37 @@ (define-public rust-num-0.1 ("rust-num-rational" ,rust-num-rational-0.1) ("rust-num-traits" ,rust-num-traits-0.2)))))) +(define-public rust-num-bigint-0.3 + (package + (name "rust-num-bigint") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "num-bigint" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "186glgapg71zicah3wjld3sr5kx6rkcf6rf43gxmjw39wdszrwxp")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-num-integer" ,rust-num-integer-0.1) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-quickcheck" ,rust-quickcheck-0.9) + ("rust-rand" ,rust-rand-0.7) + ("rust-serde" ,rust-serde-1.0) + ("rust-autocfg" ,rust-autocfg-1.0)))) + (home-page "https://github.com/rust-num/num-bigint") + (synopsis "Big integer implementation for Rust") + (description + "Big integer implementation for Rust.") + (license (list license:expat license:asl2.0)))) + (define-public rust-num-bigint-0.2 (package + (inherit rust-num-bigint-0.3) (name "rust-num-bigint") (version "0.2.6") (source @@ -14592,7 +14621,6 @@ (define-public rust-num-bigint-0.2 (sha256 (base32 "015k3wixdi4w698sappvy43pf8bvkw0f88xplmdgc3zfk2cpy309")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-num-integer" ,rust-num-integer-0.1) @@ -14603,12 +14631,7 @@ (define-public rust-num-bigint-0.2 ("rust-serde" ,rust-serde-1.0) ("rust-autocfg" ,rust-autocfg-1.0)) #:cargo-development-inputs - (("rust-serde-test" ,rust-serde-test-1.0)))) - (home-page "https://github.com/rust-num/num-bigint") - (synopsis "Big integer implementation for Rust") - (description - "Big integer implementation for Rust.") - (license (list license:expat license:asl2.0)))) + (("rust-serde-test" ,rust-serde-test-1.0)))))) (define-public rust-num-bigint-0.1 (package -- cgit v1.2.3 From 4be1d5d8eca92203e3ce6d4920c1b53f58369346 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 12 Jul 2020 12:42:05 +0300 Subject: gnu: Add rust-num-rational-0.3. * gnu/packages/crates-io.scm (rust-num-rational-0.3): New variable. (rust-num-rational-0.2): Inherit from rust-num-rational-0.3. --- gnu/packages/crates-io.scm | 36 +++++++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f62255f0d4..f2fdad9bf2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14833,8 +14833,36 @@ (define-public rust-num-iter-0.1 (license (list license:asl2.0 license:expat)))) +(define-public rust-num-rational-0.3 + (package + (name "rust-num-rational") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "num-rational" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0f41j1l1kn5jj36a8xdy8kv242wlwq0ka578vm8gnb1n1wvdgd55")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-num-bigint" ,rust-num-bigint-0.3) + ("rust-num-integer" ,rust-num-integer-0.1) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-serde" ,rust-serde-1.0) + ("rust-autocfg" ,rust-autocfg-1.0)))) + (home-page "https://github.com/rust-num/num-rational") + (synopsis "Rational numbers implementation for Rust") + (description + "Rational numbers implementation for Rust.") + (license (list license:expat license:asl2.0)))) + (define-public rust-num-rational-0.2 (package + (inherit rust-num-rational-0.3) (name "rust-num-rational") (version "0.2.3") (source @@ -14846,19 +14874,13 @@ (define-public rust-num-rational-0.2 (sha256 (base32 "18q3vq3xldhaj0z3f92am8f59m1awywgdj28c7wvx0bcksgwfkfs")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-num-bigint" ,rust-num-bigint-0.2) ("rust-num-integer" ,rust-num-integer-0.1) ("rust-num-traits" ,rust-num-traits-0.2) ("rust-serde" ,rust-serde-1.0) - ("rust-autocfg" ,rust-autocfg-1.0)))) - (home-page "https://github.com/rust-num/num-rational") - (synopsis "Rational numbers implementation for Rust") - (description - "Rational numbers implementation for Rust.") - (license (list license:expat license:asl2.0)))) + ("rust-autocfg" ,rust-autocfg-1.0)))))) (define-public rust-num-rational-0.1 (package -- cgit v1.2.3 From 561af003cbf6c9b9fff7aa35a156e74f99c9de0c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 12 Jul 2020 12:45:20 +0300 Subject: gnu: Add rust-bytemuck-1. * gnu/packages/crates-io.scm (rust-bytemuck-1): New variable. --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f2fdad9bf2..1ffce52a6d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2255,6 +2255,26 @@ (define-public rust-bytecount-0.4 ("rust-quickcheck" ,rust-quickcheck-0.6) ("rust-rand" ,rust-rand-0.4)))))) +(define-public rust-bytemuck-1 + (package + (name "rust-bytemuck") + (version "1.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "bytemuck" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0cclc9v10hc1abqrxgirg3qbwa3ra3s0dai3xiwv9v4j4bgi7yip")))) + (build-system cargo-build-system) + (home-page "https://github.com/Lokathor/bytemuck") + (synopsis "crate for mucking around with piles of bytes") + (description + "This package provides a crate for mucking around with piles of bytes.") + (license license:zlib))) + (define-public rust-byteorder-1.3 (package (name "rust-byteorder") -- cgit v1.2.3 From ab30646bbea4bb318d9ada1a478659ef4b3286e7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 12 Jul 2020 12:57:46 +0300 Subject: gnu: Add rust-deflate-0.8. * gnu/packages/crates-io.scm (rust-deflate-0.8): New variable. (rust-deflate-0.7): Inherit from rust-deflate-0.8. --- gnu/packages/crates-io.scm | 37 ++++++++++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 7 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1ffce52a6d..836b751a5b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5192,8 +5192,37 @@ (define-public rust-decimal-2.0 "Decimal floating point arithmetic for Rust.") (license license:asl2.0))) +(define-public rust-deflate-0.8 + (package + (name "rust-deflate") + (version "0.8.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "deflate" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0x6iqlayg129w63999kz97m279m0jj4x4sm6gkqlvmp73y70yxvk")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; not all test files included + #:cargo-inputs + (("rust-adler32" ,rust-adler32-1) + ("rust-byteorder" ,rust-byteorder-1.3) + ("rust-gzip-header" ,rust-gzip-header-0.3)) + #:cargo-development-inputs + (("rust-miniz-oxide" ,rust-miniz-oxide-0.3)))) + (home-page "https://github.com/image-rs/deflate-rs") + (synopsis "DEFLATE, zlib and gzip encoder written in rust") + (description + "This package provides a DEFLATE, zlib and gzip encoder written in rust.") + (license (list license:expat license:asl2.0)))) + (define-public rust-deflate-0.7 (package + (inherit rust-deflate-0.8) (name "rust-deflate") (version "0.7.20") (source @@ -5205,18 +5234,12 @@ (define-public rust-deflate-0.7 (sha256 (base32 "1d7d9fpmgjnznrksmd3vlv3dyw01wsrm11ifil6ag22871xnlyvh")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-adler32" ,rust-adler32-1) ("rust-byteorder" ,rust-byteorder-1.3) ("rust-gzip-header" ,rust-gzip-header-0.3) - ("rust-flate2" ,rust-flate2-1.0)))) - (home-page "https://github.com/image-rs/deflate-rs") - (synopsis "DEFLATE, zlib and gzip encoder written in rust") - (description - "This package provides a DEFLATE, zlib and gzip encoder written in rust.") - (license (list license:expat license:asl2.0)))) + ("rust-flate2" ,rust-flate2-1.0)))))) (define-public rust-defmac-0.2 (package -- cgit v1.2.3 From 4c1d1d7d0d35ed81360c64f32994d7d55f6f2064 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 12 Jul 2020 13:03:19 +0300 Subject: gnu: Add rust-png-0.16. * gnu/packages/crates-io.scm (rust-png-0.16): New variable. (rust-png-0.15): Inherit from rust-png-0.16. --- gnu/packages/crates-io.scm | 44 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 836b751a5b..acc4f4ffa3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -17737,8 +17737,44 @@ (define-public rust-pnacl-build-helper-1.4 "Build script helper for building PNaCl/NaCl C/CXX libraries from source") (license license:mpl2.0))) +(define-public rust-png-0.16 + (package + (name "rust-png") + (version "0.16.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "png" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1393s3v3kg4bxnn86d7yn2vyz8xj6g64ighdfkc3vzpsg5sbyl61")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-crc32fast" ,rust-crc32fast-1.2) + ("rust-deflate" ,rust-deflate-0.8) + ("rust-miniz-oxide" ,rust-miniz-oxide-0.3)) + #:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.3) + ("rust-getopts" ,rust-getopts-0.2) + ;; TODO: glium has many cyclic dependencies with other packages + ;; ("rust-glium" ,rust-glium-0.24) + ("rust-glob" ,rust-glob-0.3) + ("rust-rand" ,rust-rand-0.7) + ("rust-term" ,rust-term-0.6)))) + (home-page "https://github.com/image-rs/image-png.git") + (synopsis "PNG decoding and encoding library in pure Rust") + (description + "PNG decoding and encoding library in pure Rust.") + (license (list license:expat license:asl2.0)))) + (define-public rust-png-0.15 (package + (inherit rust-png-0.16) (name "rust-png") (version "0.15.3") (source @@ -17750,7 +17786,6 @@ (define-public rust-png-0.15 (sha256 (base32 "10x2qkhyfnm3si5vgx77r2ik811gaap7ahi825wfxgsb0lirm1gg")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs @@ -17764,12 +17799,7 @@ (define-public rust-png-0.15 ;;("rust-glium" ,rust-glium-0.24) ("rust-glob" ,rust-glob-0.3) ("rust-rand" ,rust-rand-0.7) - ("rust-term" ,rust-term-0.6)))) - (home-page "https://github.com/image-rs/image-png.git") - (synopsis "PNG decoding and encoding library in pure Rust") - (description - "PNG decoding and encoding library in pure Rust.") - (license (list license:expat license:asl2.0)))) + ("rust-term" ,rust-term-0.6)))))) (define-public rust-png-0.14 (package -- cgit v1.2.3 From 41359cea8c0daca98d5b83863f1b99c7cf126a59 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 12 Jul 2020 13:14:30 +0300 Subject: gnu: Add rust-num-complex-0.3. * gnu/packages/crates-io.scm (rust-num-complex-0.3): New variable. (rust-num-complex-0.2): Inherit from rust-num-complex-0.3. --- gnu/packages/crates-io.scm | 38 +++++++++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index acc4f4ffa3..77ebde8339 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14700,8 +14700,36 @@ (define-public rust-num-bigint-0.1 #:cargo-development-inputs (("rust-rand" ,rust-rand-0.4)))))) +(define-public rust-num-complex-0.3 + (package + (name "rust-num-complex") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "num-complex" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1dczd81f2xb092dhb0brbdbf19pyfn0v9xmkf6qm0w4pv1dx0nmh")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-num-traits" ,rust-num-traits-0.2) + ("rust-rand" ,rust-rand-0.7) + ("rust-serde" ,rust-serde-1.0)))) + (home-page + "https://github.com/rust-num/num-complex") + (synopsis + "Complex numbers implementation for Rust") + (description + "Complex numbers implementation for Rust.") + (license (list license:expat license:asl2.0)))) + (define-public rust-num-complex-0.2 (package + (inherit rust-num-complex-0.3) (name "rust-num-complex") (version "0.2.4") (source @@ -14713,20 +14741,12 @@ (define-public rust-num-complex-0.2 (sha256 (base32 "15dwaksw729r3v14sgzc9723s3fnfixiir8jzwx7b7kim48r9cdn")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-num-traits" ,rust-num-traits-0.2) ("rust-rand" ,rust-rand-0.5) ("rust-serde" ,rust-serde-1.0) - ("rust-autocfg" ,rust-autocfg-1.0)))) - (home-page - "https://github.com/rust-num/num-complex") - (synopsis - "Complex numbers implementation for Rust") - (description - "Complex numbers implementation for Rust.") - (license (list license:expat license:asl2.0)))) + ("rust-autocfg" ,rust-autocfg-1.0)))))) (define-public rust-num-complex-0.1 (package -- cgit v1.2.3 From 5abca05dcc9d55f60eae4f328f3c201efbc95e66 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 12 Jul 2020 13:15:07 +0300 Subject: gnu: Add rust-tiff-0.5. * gnu/packages/crates-io.scm (rust-tiff-0.5): New variable. (rust-tiff-0.3): Inherit from rust-tiff-0.5. --- gnu/packages/crates-io.scm | 37 +++++++++++++++++++++++++++++-------- 1 file changed, 29 insertions(+), 8 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 77ebde8339..706bb22284 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -25686,8 +25686,36 @@ (define-public rust-threadpool-1.7 (license (list license:asl2.0 license:expat)))) +(define-public rust-tiff-0.5 + (package + (name "rust-tiff") + (version "0.5.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "tiff" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0bzzvxcx21pzryxgd7x7a1himiqs2y4k55754wzlr56sqj3qlfrz")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; not all test files included + #:cargo-inputs + (("rust-byteorder" ,rust-byteorder-1.3) + ("rust-lzw" ,rust-lzw-0.10) + ("rust-miniz-oxide" ,rust-miniz-oxide-0.3)))) + (home-page "https://github.com/image-rs/image-tiff") + (synopsis + "TIFF decoding and encoding library in pure Rust") + (description + "TIFF decoding and encoding library in pure Rust.") + (license license:expat))) + (define-public rust-tiff-0.3 (package + (inherit rust-tiff-0.5) (name "rust-tiff") (version "0.3.1") (source @@ -25699,7 +25727,6 @@ (define-public rust-tiff-0.3 (sha256 (base32 "0zgmbny2f8rssqmjdfvnysy0vqwcvlwl6q9f5yixhavlqk7w5dyp")))) - (build-system cargo-build-system) (arguments `(#:tests? #f ; Tests images not included with release. #:cargo-inputs @@ -25708,13 +25735,7 @@ (define-public rust-tiff-0.3 ("rust-num-derive" ,rust-num-derive-0.2) ("rust-num-traits" ,rust-num-traits-0.2)) #:cargo-development-inputs - (("rust-tempfile" ,rust-tempfile-3)))) - (home-page "https://github.com/image-rs/image-tiff") - (synopsis - "TIFF decoding and encoding library in pure Rust") - (description - "TIFF decoding and encoding library in pure Rust.") - (license license:expat))) + (("rust-tempfile" ,rust-tempfile-3)))))) (define-public rust-tiff-0.2 (package -- cgit v1.2.3 From cac43cce40154b63605e465d55dd7a58dde9ecb5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 12 Jul 2020 13:22:25 +0300 Subject: gnu: Add rust-image-0.23. * gnu/packages/crates-io.scm (rust-image-0.23): New variable. (rust-image-0.22): Inherit from rust-image-0.23. --- gnu/packages/crates-io.scm | 50 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 42 insertions(+), 8 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 706bb22284..538471276f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10881,8 +10881,49 @@ (define-public rust-ignore-0.4 ignore files such as .gitignore against file paths.") (license (list license:unlicense license:expat)))) +(define-public rust-image-0.23 + (package + (name "rust-image") + (version "0.23.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "image" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1d2a80k7pwqshliqi5fw1dwkz7q9zd6pjnwpw8zxc1v4xhzmbc5m")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; Some test images are missing from the release. + #:cargo-inputs + (("rust-bytemuck" ,rust-bytemuck-1) + ("rust-byteorder" ,rust-byteorder-1.3) + ("rust-gif" ,rust-gif-0.10) + ("rust-jpeg-decoder" ,rust-jpeg-decoder-0.1) + ("rust-num-iter" ,rust-num-iter-0.1) + ("rust-num-rational" ,rust-num-rational-0.3) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-png" ,rust-png-0.16) + ("rust-scoped-threadpool" ,rust-scoped-threadpool-0.1) + ("rust-tiff" ,rust-tiff-0.5)) + #:cargo-development-inputs + (("rust-crc32fast" ,rust-crc32fast-1.2) + ("rust-criterion" ,rust-criterion-0.3) + ("rust-glob" ,rust-glob-0.3) + ("rust-num-complex" ,rust-num-complex-0.3) + ("rust-quickcheck" ,rust-quickcheck-0.9)))) + (home-page "https://github.com/image-rs/image") + (synopsis "Imaging library written in Rust") + (description + "Imaging library written in Rust. Provides basic filters and decoders +for the most common image formats.") + (license license:expat))) + (define-public rust-image-0.22 (package + (inherit rust-image-0.23) (name "rust-image") (version "0.22.5") (source @@ -10894,7 +10935,6 @@ (define-public rust-image-0.22 (sha256 (base32 "0jpbd0p1q7xx6395ba9ikz2k4cfp26qczisa8m2v15w3hzd2mv88")))) - (build-system cargo-build-system) (arguments `(#:tests? #f ; Some test images are missing from the release. #:cargo-inputs @@ -10911,13 +10951,7 @@ (define-public rust-image-0.22 (("rust-crc32fast" ,rust-crc32fast-1.2) ("rust-glob" ,rust-glob-0.3) ("rust-num-complex" ,rust-num-complex-0.2) - ("rust-quickcheck" ,rust-quickcheck-0.9)))) - (home-page "https://github.com/image-rs/image") - (synopsis "Imaging library written in Rust") - (description - "Imaging library written in Rust. Provides basic filters and decoders -for the most common image formats.") - (license license:expat))) + ("rust-quickcheck" ,rust-quickcheck-0.9)))))) (define-public rust-image-0.21 (package -- cgit v1.2.3 From 4cd67b69b338e1ed526e0fec82863ea4d30ef5fe Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 12 Jul 2020 13:42:11 +0300 Subject: gnu: Add rust-predicates-core-1. * gnu/packages/crates-io.scm (rust-predicates-core-1): New variable. --- gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 538471276f..0d33dc9a29 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -17995,6 +17995,27 @@ (define-public rust-precomputed-hash-0.1 dependency to expose a precomputed hash.") (license license:expat))) +(define-public rust-predicates-core-1 + (package + (name "rust-predicates-core") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "predicates-core" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0y3ingf2i4xx7r61f1a8wizs57j8hh32hylyjbw9ymcj7qx5q1q6")))) + (build-system cargo-build-system) + (home-page + "https://github.com/assert-rs/predicates-rs/tree/master/predicates-core") + (synopsis "API for boolean-valued predicate functions") + (description + "An API for boolean-valued predicate functions.") + (license (list license:expat license:asl2.0)))) + (define-public rust-pretty-assertions-0.6 (package (name "rust-pretty-assertions") -- cgit v1.2.3 From 5638fa15f03c568deff115c6d6f36bd9cfde8c27 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 12 Jul 2020 13:43:50 +0300 Subject: gnu: Add rust-treeline-0.1. * gnu/packages/crates-io.scm (rust-treeline-0.1): New variable. --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0d33dc9a29..a1ed94d13b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -26799,6 +26799,26 @@ (define-public rust-traitobject-0.1 (license (list license:asl2.0 license:expat)))) +(define-public rust-treeline-0.1 + (package + (name "rust-treeline") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "treeline" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0hcdgyk5xzcx2ylm0fr9czzs9cjznm7l9q5qz51qi97i82r43xx7")))) + (build-system cargo-build-system) + (home-page "https://github.com/softprops/treeline") + (synopsis "Library for visualizing tree structured data") + (description + "This package provides a library for visualizing tree structured data.") + (license license:expat))) + (define-public rust-try-from-0.3 (package (name "rust-try-from") -- cgit v1.2.3 From 69d4435caefc94a472bb332c0fd237881f37f10a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 12 Jul 2020 13:47:04 +0300 Subject: gnu: Add rust-predicates-tree-1. * gnu/packages/crates-io.scm (rust-predicates-tree-1): New variable. --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a1ed94d13b..531cf36f80 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -18016,6 +18016,32 @@ (define-public rust-predicates-core-1 "An API for boolean-valued predicate functions.") (license (list license:expat license:asl2.0)))) +(define-public rust-predicates-tree-1 + (package + (name "rust-predicates-tree") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "predicates-tree" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "090148qjilm2c722l873z7g31fhzj5j4qhd2xiv8mcqkj22w8qwf")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-predicates-core" ,rust-predicates-core-1) + ("rust-treeline" ,rust-treeline-0.1)))) + (home-page + "https://github.com/assert-rs/predicates-rs/tree/master/predicates-tree") + (synopsis + "Render boolean-valued predicate functions results as a tree") + (description + "Render boolean-valued predicate functions results as a tree.") + (license (list license:expat license:asl2.0)))) + (define-public rust-pretty-assertions-0.6 (package (name "rust-pretty-assertions") -- cgit v1.2.3 From fa66e7da0ec60ca44d5ee680c4b4578576943ca5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 12 Jul 2020 13:52:57 +0300 Subject: gnu: Add rust-normalize-line-endings-0.3. * gnu/packages/crates-io.scm (rust-normalize-line-endings-0.3): New variable. --- gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 531cf36f80..7fa301b631 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14569,6 +14569,28 @@ (define-public rust-noop-proc-macro-0.2 "No-op proc_macro, literally does nothing") (license license:expat))) +(define-public rust-normalize-line-endings-0.3 + (package + (name "rust-normalize-line-endings") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "normalize-line-endings" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1gp52dfn2glz26a352zra8h04351icf0fkqzw1shkwrgh1vpz031")))) + (build-system cargo-build-system) + (home-page "https://github.com/derekdreery/normalize-line-endings") + (synopsis + "Iterate over chars and returns a new iterator with all line endings") + (description + "This package takes an iterator over characters and returns a new iterator +with all line endings.") + (license license:asl2.0))) + (define-public rust-notify-4 (package (name "rust-notify") -- cgit v1.2.3 From 4f12c69c96751de92381ff337d1b7e9c3b360b7e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 12 Jul 2020 13:57:02 +0300 Subject: gnu: Add rust-predicates-1. * gnu/packages/crates-io.scm (rust-predicates-1): New variable. --- gnu/packages/crates-io.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7fa301b631..a15a61d0df 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -18017,6 +18017,36 @@ (define-public rust-precomputed-hash-0.1 dependency to expose a precomputed hash.") (license license:expat))) +(define-public rust-predicates-1 + (package + (name "rust-predicates") + (version "1.0.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "predicates" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0c0hafd7z7v97218na8nampmy64f7fw61yvjk2y3dri11dpinyil")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-difference" ,rust-difference-2.0) + ("rust-float-cmp" ,rust-float-cmp-0.6) + ("rust-normalize-line-endings" ,rust-normalize-line-endings-0.3) + ("rust-predicates-core" ,rust-predicates-core-1) + ("rust-regex" ,rust-regex-1)) + #:cargo-development-inputs + (("rust-predicates-tree" ,rust-predicates-tree-1)))) + (home-page "https://github.com/assert-rs/predicates-rs") + (synopsis + "Implementation of boolean-valued predicate functions") + (description + "An implementation of boolean-valued predicate functions.") + (license (list license:expat license:asl2.0)))) + (define-public rust-predicates-core-1 (package (name "rust-predicates-core") -- cgit v1.2.3 From e3d2d6a098ed627b02525f0f3153d596f7c1b0d5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 12 Jul 2020 14:18:45 +0300 Subject: gnu: Add rust-globwalk-0.5. * gnu/packages/crates-io.scm (rust-globwalk-0.5): New variable. --- gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a15a61d0df..c9fb9db7db 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9410,6 +9410,33 @@ (define-public rust-globset-0.4 path simultaneously, and returning all of the globs that matched.") (license (list license:expat license:unlicense)))) +(define-public rust-globwalk-0.5 + (package + (name "rust-globwalk") + (version "0.5.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "globwalk" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "09axyql26s09z60sgi3y3lkin9swy2b5km3b0v6mm84xhlljxyl9")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-ignore" ,rust-ignore-0.4) + ("rust-walkdir" ,rust-walkdir-2.2)) + #:cargo-development-inputs + (("rust-docmatic" ,rust-docmatic-0.1) + ("rust-tempdir" ,rust-tempdir-0.3)))) + (home-page "https://github.com/gilnaa/globwalk") + (synopsis "Glob-matched recursive file system walking") + (description + "Glob-matched recursive file system walking.") + (license license:expat))) + (define-public rust-glutin-0.22 (package (name "rust-glutin") -- cgit v1.2.3 From 0e7e41b61a849841b027d46f2acd77000da6511f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 12 Jul 2020 14:19:52 +0300 Subject: gnu: Add rust-assert-fs-0.11. * gnu/packages/crates-io.scm (rust-assert-fs-0.11): New variable. --- gnu/packages/crates-io.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c9fb9db7db..b09401de63 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -901,6 +901,35 @@ (define-public rust-assert-cli-0.6 (description "This package helps testing CLI Applications.") (license (list license:expat license:asl2.0)))) +(define-public rust-assert-fs-0.11 + (package + (name "rust-assert-fs") + (version "0.11.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "assert-fs" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1h1q90qskbylv4g3jyizdanj73835q7vvq7q10y555x4gnavmrjc")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-globwalk" ,rust-globwalk-0.5) + ("rust-predicates" ,rust-predicates-1) + ("rust-predicates-core" ,rust-predicates-core-1) + ("rust-predicates-tree" ,rust-predicates-tree-1) + ("rust-tempfile" ,rust-tempfile-3)) + #:cargo-development-inputs + (("rust-docmatic" ,rust-docmatic-0.1)))) + (home-page "https://github.com/assert-rs/assert_fs") + (synopsis "Filesystem fixtures and assertions for testing") + (description + "Filesystem fixtures and assertions for testing.") + (license (list license:expat license:asl2.0)))) + (define-public rust-assert-matches-1.3 (package (name "rust-assert-matches") -- cgit v1.2.3 From ce36fa72623dd94e0d8011170d21835f3532648f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 12 Jul 2020 14:20:20 +0300 Subject: gnu: Add rust-escargot-0.5. * gnu/packages/crates-io.scm (rust-escargot-0.5): New variable. --- gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b09401de63..9b2f6610cc 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6751,6 +6751,34 @@ (define-public rust-error-chain-0.10 `(#:cargo-inputs (("rust-backtrace" ,rust-backtrace-0.3)))))) +(define-public rust-escargot-0.5 + (package + (name "rust-escargot") + (version "0.5.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "escargot" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0vd9phbpd6yrnsksn2as8flvq8ykzvck2zlz143xpp42qaz9dkvl")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; not all test files included + #:cargo-inputs + (("rust-lazy-static" ,rust-lazy-static-1) + ("rust-log" ,rust-log-0.4) + ("rust-serde" ,rust-serde-1.0) + ("rust-serde-json" ,rust-serde-json-1.0)) + #:cargo-development-inputs + (("rust-assert-fs" ,rust-assert-fs-0.11)))) + (home-page "https://github.com/crate-ci/escargot") + (synopsis "Cargo API written in Paris") + (description "Cargo API written in Paris.") + (license (list license:expat license:asl2.0)))) + (define-public rust-euclid-0.20 (package (name "rust-euclid") -- cgit v1.2.3 From 6b12c5e9b72ffed3ba231cab9d7c421b2a4a42bf Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 12 Jul 2020 14:30:27 +0300 Subject: gnu: Add rust-assert-cmd-1. * gnu/pacakges/crates-io.scm (rust-assert-cmd-1): New variable. --- gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9b2f6610cc..0f24f8b9c3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -901,6 +901,34 @@ (define-public rust-assert-cli-0.6 (description "This package helps testing CLI Applications.") (license (list license:expat license:asl2.0)))) +(define-public rust-assert-cmd-1 + (package + (name "rust-assert-cmd") + (version "1.0.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "assert-cmd" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1nhqr0zimizcnqfggccfznyrmvklgqwhklsh0f1yq5lwdyi9r2y8")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-doc-comment" ,rust-doc-comment-0.3) + ("rust-predicates" ,rust-predicates-1) + ("rust-predicates-core" ,rust-predicates-core-1) + ("rust-predicates-tree" ,rust-predicates-tree-1) + ("rust-wait-timeout" ,rust-wait-timeout-0.2)) + #:cargo-development-inputs + (("rust-escargot" ,rust-escargot-0.5)))) + (home-page "https://github.com/assert-rs/assert_cmd") + (synopsis "Test CLI Applications") + (description "Test CLI Applications.") + (license (list license:expat license:asl2.0)))) + (define-public rust-assert-fs-0.11 (package (name "rust-assert-fs") -- cgit v1.2.3 From e26d6cc707c1c5ad38a6f73769f69977b373311d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 12 Jul 2020 15:04:46 +0300 Subject: gnu: rav1e: Sort inputs alphabetically. * gnu/packages/video.scm (rav1e)[arguments]: Sort inputs alphabetically in cargo-inputs and cargo-development-inputs. --- gnu/packages/video.scm | 72 +++++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 39 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 6c4afa4ba9..413f83d79b 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3995,56 +3995,50 @@ (define-public rav1e (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-simd-helpers" ,rust-simd-helpers-0.1) - ("rust-ivf" ,rust-ivf-0.1) - ("rust-cfg-if" ,rust-cfg-if-0.1) - ("rust-paste" ,rust-paste-0.1) - ("rust-signal-hook" ,rust-signal-hook-0.1) - ("rust-aom-sys" ,rust-aom-sys-0.1) - ("rust-nasm-rs" ,rust-nasm-rs-0.1) + (("rust-aom-sys" ,rust-aom-sys-0.1) ("rust-arbitrary" ,rust-arbitrary-0.2) + ("rust-arg-enum-proc-macro" ,rust-arg-enum-proc-macro-0.3) + ("rust-arrayvec" ,rust-arrayvec-0.5) + ("rust-backtrace" ,rust-backtrace-0.3) ("rust-better-panic" ,rust-better-panic-0.2) - ("rust-noop-proc-macro" - ,rust-noop-proc-macro-0.2) - ("rust-num-traits" ,rust-num-traits-0.2) - ("rust-rand-chacha" ,rust-rand-chacha-0.2) + ("rust-bitstream-io" ,rust-bitstream-io-0.8) + ("rust-byteorder" ,rust-byteorder-1.3) + ("rust-cfg-if" ,rust-cfg-if-0.1) + ("rust-clap" ,rust-clap-2) + ("rust-console" ,rust-console-0.9) + ("rust-dav1d-sys" ,rust-dav1d-sys-0.3) ("rust-err-derive" ,rust-err-derive-0.2) - ("rust-interpolate-name" - ,rust-interpolate-name-0.2) - ("rust-rustc-version" ,rust-rustc-version-0.2) - ("rust-scan-fmt" ,rust-scan-fmt-0.2) - ("rust-libc" ,rust-libc-0.2) + ("rust-fern" ,rust-fern-0.5) ("rust-image" ,rust-image-0.22) - ("rust-arg-enum-proc-macro" - ,rust-arg-enum-proc-macro-0.3) - ("rust-num-derive" ,rust-num-derive-0.3) - ("rust-dav1d-sys" ,rust-dav1d-sys-0.3) - ("rust-backtrace" ,rust-backtrace-0.3) + ("rust-interpolate-name" ,rust-interpolate-name-0.2) + ("rust-itertools" ,rust-itertools-0.8) + ("rust-ivf" ,rust-ivf-0.1) + ("rust-libc" ,rust-libc-0.2) ("rust-log" ,rust-log-0.4) - ("rust-y4m" ,rust-y4m-0.5) - ("rust-arrayvec" ,rust-arrayvec-0.5) - ("rust-toml" ,rust-toml-0.5) - ("rust-fern" ,rust-fern-0.5) - ("rust-rust-hawktracer" - ,rust-rust-hawktracer-0.7) + ("rust-noop-proc-macro" ,rust-noop-proc-macro-0.2) + ("rust-num-derive" ,rust-num-derive-0.3) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-paste" ,rust-paste-0.1) ("rust-rand" ,rust-rand-0.7) - ("rust-itertools" ,rust-itertools-0.8) - ("rust-bitstream-io" ,rust-bitstream-io-0.8) - ("rust-console" ,rust-console-0.9) + ("rust-rand-chacha" ,rust-rand-chacha-0.2) + ("rust-rayon" ,rust-rayon-1) + ("rust-rust-hawktracer" ,rust-rust-hawktracer-0.7) + ("rust-scan-fmt" ,rust-scan-fmt-0.2) ("rust-serde" ,rust-serde-1.0) + ("rust-signal-hook" ,rust-signal-hook-0.1) + ("rust-simd-helpers" ,rust-simd-helpers-0.1) + ("rust-toml" ,rust-toml-0.5) + ("rust-y4m" ,rust-y4m-0.5) ("rust-cc" ,rust-cc-1.0) - ("rust-rayon" ,rust-rayon-1) - ("rust-byteorder" ,rust-byteorder-1.3) - ("rust-clap" ,rust-clap-2) + ("rust-nasm-rs" ,rust-nasm-rs-0.1) + ("rust-rustc-version" ,rust-rustc-version-0.2) ("rust-vergen" ,rust-vergen-3.1)) #:cargo-development-inputs - (("rust-rand-chacha" ,rust-rand-chacha-0.2) - ("rust-interpolate-name" - ,rust-interpolate-name-0.2) - ("rust-criterion" ,rust-criterion-0.3) - ("rust-pretty-assertions" - ,rust-pretty-assertions-0.6) + (("rust-criterion" ,rust-criterion-0.3) + ("rust-interpolate-name" ,rust-interpolate-name-0.2) + ("rust-pretty-assertions" ,rust-pretty-assertions-0.6) ("rust-rand" ,rust-rand-0.7) + ("rust-rand-chacha" ,rust-rand-chacha-0.2) ("rust-semver" ,rust-semver-0.9)) #:phases (modify-phases %standard-phases -- cgit v1.2.3 From 4fc95933941d457353734565a52ec6dd73930fdc Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 12 Jul 2020 15:00:08 +0300 Subject: gnu: rav1e: Update to 0.3.3. * gnu/packages/video.scm (rav1e): Update to 0.3.3. [arguments]: In cargo-inputs remove rust-better-panic-0.2, rust-err-derive-0.2. Replace rust-console-0.9 with 0.11, rust-fern-0.5 with 0.6, rust-image-0.22 with 0.23, rust-itertools-0.8 with 0.9. Add rust-thiserror-1.0, rust-rustc-version-0.2. In cargo-development-inputs add rust-assert-cmd-1. --- gnu/packages/video.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 413f83d79b..9d156d7012 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3982,7 +3982,7 @@ (define-public w-scan (define-public rav1e (package (name "rav1e") - (version "0.3.0") + (version "0.3.3") (source (origin (method url-fetch) @@ -3991,7 +3991,7 @@ (define-public rav1e (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1bsmj8kqzs5pf8dl98rsl6a67cljj1gkj3b5hmd8hn8wdy4ya173")))) + "053bh8hc6jj81ydq4gcak01b0ady59hvkl7d87im3y8nafg7xzb4")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -4000,18 +4000,16 @@ (define-public rav1e ("rust-arg-enum-proc-macro" ,rust-arg-enum-proc-macro-0.3) ("rust-arrayvec" ,rust-arrayvec-0.5) ("rust-backtrace" ,rust-backtrace-0.3) - ("rust-better-panic" ,rust-better-panic-0.2) ("rust-bitstream-io" ,rust-bitstream-io-0.8) ("rust-byteorder" ,rust-byteorder-1.3) ("rust-cfg-if" ,rust-cfg-if-0.1) ("rust-clap" ,rust-clap-2) - ("rust-console" ,rust-console-0.9) + ("rust-console" ,rust-console-0.11) ("rust-dav1d-sys" ,rust-dav1d-sys-0.3) - ("rust-err-derive" ,rust-err-derive-0.2) - ("rust-fern" ,rust-fern-0.5) - ("rust-image" ,rust-image-0.22) + ("rust-fern" ,rust-fern-0.6) + ("rust-image" ,rust-image-0.23) ("rust-interpolate-name" ,rust-interpolate-name-0.2) - ("rust-itertools" ,rust-itertools-0.8) + ("rust-itertools" ,rust-itertools-0.9) ("rust-ivf" ,rust-ivf-0.1) ("rust-libc" ,rust-libc-0.2) ("rust-log" ,rust-log-0.4) @@ -4027,6 +4025,7 @@ (define-public rav1e ("rust-serde" ,rust-serde-1.0) ("rust-signal-hook" ,rust-signal-hook-0.1) ("rust-simd-helpers" ,rust-simd-helpers-0.1) + ("rust-thiserror" ,rust-thiserror-1.0) ("rust-toml" ,rust-toml-0.5) ("rust-y4m" ,rust-y4m-0.5) ("rust-cc" ,rust-cc-1.0) @@ -4034,7 +4033,8 @@ (define-public rav1e ("rust-rustc-version" ,rust-rustc-version-0.2) ("rust-vergen" ,rust-vergen-3.1)) #:cargo-development-inputs - (("rust-criterion" ,rust-criterion-0.3) + (("rust-assert-cmd" ,rust-assert-cmd-1) + ("rust-criterion" ,rust-criterion-0.3) ("rust-interpolate-name" ,rust-interpolate-name-0.2) ("rust-pretty-assertions" ,rust-pretty-assertions-0.6) ("rust-rand" ,rust-rand-0.7) -- cgit v1.2.3 From 7f00617d25fb0eb7289cd994905a0c5495adc7f4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 12 Jul 2020 16:01:45 +0300 Subject: gnu: Replace rust-walkdir-2.2 with rust-walkdir-2.3. * gnu/packages/crates-io.scm (rust-andrew-0.2, rust-criterion-0.2, rust-globwalk-0.5, rust-grep-0.2, rust-handlebars-2.0, rust-ignore-0.4, rust-jpeg-decoder-0.1, rust-notify-4, rust-syn-0.15, rust-sysctl-0.4) [arguments]: Replace rust-walkdir-2.2 with 2.3. --- gnu/packages/crates-io.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0f24f8b9c3..1bf621b91f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -410,7 +410,7 @@ (define-public rust-andrew-0.2 (("rust-bitflags" ,rust-bitflags-1) ("rust-line-drawing" ,rust-line-drawing-0.7) ("rust-rusttype" ,rust-rusttype-0.7) - ("rust-walkdir" ,rust-walkdir-2.2) + ("rust-walkdir" ,rust-walkdir-2.3) ("rust-xdg" ,rust-xdg-2.2) ("rust-xml-rs" ,rust-xml-rs-0.8)) #:cargo-development-inputs @@ -4329,7 +4329,7 @@ (define-public rust-criterion-0.2 ("rust-serde-derive" ,rust-serde-derive-1.0) ("rust-serde-json" ,rust-serde-json-1.0) ("rust-tinytemplate" ,rust-tinytemplate-1.0) - ("rust-walkdir" ,rust-walkdir-2.2)) + ("rust-walkdir" ,rust-walkdir-2.3)) #:cargo-development-inputs (("rust-approx" ,rust-approx-0.3) ("rust-quickcheck" ,rust-quickcheck-0.8) @@ -9512,7 +9512,7 @@ (define-public rust-globwalk-0.5 (arguments `(#:cargo-inputs (("rust-ignore" ,rust-ignore-0.4) - ("rust-walkdir" ,rust-walkdir-2.2)) + ("rust-walkdir" ,rust-walkdir-2.3)) #:cargo-development-inputs (("rust-docmatic" ,rust-docmatic-0.1) ("rust-tempdir" ,rust-tempdir-0.3)))) @@ -9838,7 +9838,7 @@ (define-public rust-grep-0.2 ("rust-grep-searcher" ,rust-grep-searcher-0.1)) #:cargo-development-inputs (("rust-termcolor" ,rust-termcolor-1) - ("rust-walkdir" ,rust-walkdir-2.2)))) + ("rust-walkdir" ,rust-walkdir-2.3)))) (home-page "https://github.com/BurntSushi/ripgrep") (synopsis "Line oriented regex searching as a library") (description @@ -10164,7 +10164,7 @@ (define-public rust-handlebars-2.0 ("rust-quick-error" ,rust-quick-error-1.2) ("rust-serde" ,rust-serde-1.0) ("rust-serde-json" ,rust-serde-json-1.0) - ("rust-walkdir" ,rust-walkdir-2.2)) + ("rust-walkdir" ,rust-walkdir-2.3)) #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.2) ("rust-env-logger" ,rust-env-logger-0.6) @@ -10982,7 +10982,7 @@ (define-public rust-ignore-0.4 ("rust-regex" ,rust-regex-1) ("rust-same-file" ,rust-same-file-1.0) ("rust-thread-local" ,rust-thread-local-1.0) - ("rust-walkdir" ,rust-walkdir-2.2) + ("rust-walkdir" ,rust-walkdir-2.3) ("rust-winapi-util" ,rust-winapi-util-0.1)) #:cargo-development-inputs (("rust-crossbeam-channel" ,rust-crossbeam-channel-0.4)))) @@ -11769,7 +11769,7 @@ (define-public rust-jpeg-decoder-0.1 #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.3) ("rust-png" ,rust-png-0.14) - ("rust-walkdir" ,rust-walkdir-2.2)))) + ("rust-walkdir" ,rust-walkdir-2.3)))) (home-page "https://github.com/image-rs/jpeg-decoder") (synopsis "JPEG decoder") (description "JPEG decoder written in Rust.") @@ -14728,7 +14728,7 @@ (define-public rust-notify-4 ("rust-libc" ,rust-libc-0.2) ("rust-mio" ,rust-mio-0.6) ("rust-mio-extras" ,rust-mio-extras-2) - ("rust-walkdir" ,rust-walkdir-2.2) + ("rust-walkdir" ,rust-walkdir-2.3) ("rust-winapi" ,rust-winapi-0.3)) #:cargo-development-inputs (("rust-tempdir" ,rust-tempdir-0.3)))) @@ -24779,7 +24779,7 @@ (define-public rust-syn-0.15 ("rust-ref-cast" ,rust-ref-cast-0.2) ("rust-regex" ,rust-regex-1) ("rust-termcolor" ,rust-termcolor-1) - ("rust-walkdir" ,rust-walkdir-2.2)))) + ("rust-walkdir" ,rust-walkdir-2.3)))) (properties '()))) (define-public rust-syn-0.11 @@ -25110,7 +25110,7 @@ (define-public rust-sysctl-0.4 ("rust-byteorder" ,rust-byteorder-1.3) ("rust-failure" ,rust-failure-0.1) ("rust-libc" ,rust-libc-0.2) - ("rust-walkdir" ,rust-walkdir-2.2)))) + ("rust-walkdir" ,rust-walkdir-2.3)))) (home-page "https://github.com/johalun/sysctl-rs") (synopsis "Simplified interface to libc::sysctl") (description -- cgit v1.2.3 From e1485cd9ad9520b1e788f9f0c0e7cb2faee5b394 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 12 Jul 2020 16:02:18 +0300 Subject: gnu: Remove rust-walkdir-2.2. * gnu/packages/crates-io.scm (rust-walkdir-2.2): Remove variable. --- gnu/packages/crates-io.scm | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1bf621b91f..c251ccdc26 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -28220,35 +28220,9 @@ (define-public rust-walkdir-2.3 (description "Recursively walk a directory.") (license (list license:unlicense license:expat)))) -(define-public rust-walkdir-2.2 - (package - (name "rust-walkdir") - (version "2.2.9") - (source - (origin - (method url-fetch) - (uri (crate-uri "walkdir" version)) - (file-name (string-append name "-" version ".crate")) - (sha256 - (base32 - "07ppalpvxkf8cnqr64np422792y4z5bs9m8b4nrflh5rm17wjn4n")))) - (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-same-file" ,rust-same-file-1.0) - ("rust-winapi" ,rust-winapi-0.3) - ("rust-winapi-util" ,rust-winapi-util-0.1)) - #:cargo-development-inputs - (("rust-doc-comment" ,rust-doc-comment-0.3)))) - (home-page "https://github.com/BurntSushi/walkdir") - (synopsis "Recursively walk a directory") - (description "Recursively walk a directory.") - (license (list license:unlicense - license:expat)))) - (define-public rust-walkdir-1.0 (package - (inherit rust-walkdir-2.2) + (inherit rust-walkdir-2.3) (name "rust-walkdir") (version "1.0.7") (source -- cgit v1.2.3 From c02af11dbf21b4a41257ab010a15d97c0b434b0a Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Sun, 12 Jul 2020 15:02:55 +0200 Subject: gnu: Add pokerth. * gnu/packages/games.scm (pokerth): New variable. --- gnu/packages/games.scm | 79 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 77 insertions(+), 2 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 655b890e55..5a38e2066a 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -113,9 +113,11 @@ (define-module (gnu packages games) #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) + #:use-module (gnu packages gnupg) #:use-module (gnu packages gnuzilla) #:use-module (gnu packages gperf) #:use-module (gnu packages graphics) + #:use-module (gnu packages gsasl) #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) @@ -136,6 +138,7 @@ (define-module (gnu packages games) #:use-module (gnu packages lua) #:use-module (gnu packages man) #:use-module (gnu packages maths) + #:use-module (gnu packages messaging) #:use-module (gnu packages mp3) #:use-module (gnu packages music) #:use-module (gnu packages multiprecision) @@ -149,6 +152,7 @@ (define-module (gnu packages games) #:use-module (gnu packages perl-check) #:use-module (gnu packages perl-compression) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages protobuf) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) @@ -176,8 +180,6 @@ (define-module (gnu packages games) #:use-module (gnu packages xorg) #:use-module (gnu packages xiph) #:use-module (gnu packages xml) - #:use-module (gnu packages messaging) - #:use-module (gnu packages networking) #:use-module (guix build-system copy) #:use-module (guix build-system cmake) #:use-module (guix build-system glib-or-gtk) @@ -11593,3 +11595,76 @@ (define-public neverball earn extra balls. Also included is Neverputt, which is a 3D miniature golf game.") ;thanks to Debian for description (license license:gpl2+)))) + +(define-public pokerth + (package + (name "pokerth") + (version "1.1.2") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/pokerth/pokerth/" + version "/pokerth-" version ".tar.gz")) + (sha256 + (base32 "0yi9bj3k8yc1gkwmaf14zbbvvn13n54n1dli8k6j1pkph3p3vjq2")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Remove bundled websocketpp. + (delete-file-recursively "src/third_party/websocketpp") + (substitute* "pokerth_lib.pro" + (("src/third_party/websocketpp") + "")) + #t)))) + (build-system qt-build-system) + (inputs + `(("boost" ,boost) + ("curl" ,curl) + ("gsasl" ,gsasl) + ("libgcrypt" ,libgcrypt) + ("libircclient" ,libircclient) + ("protobuf" ,protobuf-2) + ("qtbase" ,qtbase) + ("sdl" ,(sdl-union (list sdl sdl-mixer))) + ("sqlite" ,sqlite) + ("tinyxml" ,tinyxml) + ("websocketpp" ,websocketpp) + ("zlib" ,zlib))) + (arguments + `(#:tests? #f ; No test suite + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* (find-files "." "\\.pro$") + (("/opt/gsasl") + (assoc-ref inputs "gsasl")) + (("\\$\\$\\{PREFIX\\}/include/libircclient") + (string-append (assoc-ref inputs "libircclient") + "/include/libircclient")) + (("LIB_DIRS =") + (string-append "LIB_DIRS = " + (assoc-ref inputs "boost") "/lib"))) + #t)) + (add-after 'unpack 'fix-build + (lambda _ + ;; Fixes for Boost versions >= 1.66. + (substitute* '("src/net/common/clientthread.cpp" + "src/net/serveraccepthelper.h") + (("boost::asio::socket_base::non_blocking_io command\\(true\\);") + "") + (("newSock->io_control\\(command\\);") + "newSock->non_blocking(true);") + (("acceptedSocket->io_control\\(command\\);") + "acceptedSocket->non_blocking(true);")) + #t)) + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (invoke "qmake" "pokerth.pro" "CONFIG+=client" + (string-append "PREFIX=" (assoc-ref outputs "out")))))))) + (home-page "https://www.pokerth.net") + (synopsis "Texas holdem poker game") + (description + "With PokerTH you can play the Texas holdem poker game, either against +computer opponents or against real players online.") + (license license:agpl3+))) -- cgit v1.2.3 From ba70a8db4025c71e5c41d63a170b2aedc28aca2a Mon Sep 17 00:00:00 2001 From: John Soo Date: Tue, 16 Jun 2020 21:04:45 -0700 Subject: gnu: Add rust-rustc-ap-rustc-span-654. * gnu/packages/crates-io.scm (rust-rustc-ap-rustc-span-654): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c251ccdc26..0d9a396413 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -21092,6 +21092,44 @@ (define-public rust-rustc-ap-rustc-macros-654 @url{https://www.github.com/rust-lang/rust}.") (license (list license:expat license:asl2.0)))) +(define-public rust-rustc-ap-rustc-span-654 + (package + (name "rust-rustc-ap-rustc-span") + (version "654.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rustc-ap-rustc_span" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0hj23syxxqqmk1y4kdvb0cb0xxi8wy429hhyd27bbmpya1h18j56")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-cfg-if" ,rust-cfg-if-0.1) + ("rust-log" ,rust-log-0.4) + ("rust-md-5" ,rust-md-5-0.8) + ("rust-rustc-ap-arena" ,rust-rustc-ap-arena-654) + ("rust-rustc-ap-rustc-data-structures" + ,rust-rustc-ap-rustc-data-structures-654) + ("rust-rustc-ap-rustc-index" ,rust-rustc-ap-rustc-index-654) + ("rust-rustc-ap-rustc-macros" ,rust-rustc-ap-rustc-macros-654) + ("rust-rustc-ap-serialize" ,rust-rustc-ap-serialize-654) + ("rust-scoped-tls" ,rust-scoped-tls-1.0) + ("rust-sha-1" ,rust-sha-1-0.8) + ("rust-unicode-width" ,rust-unicode-width-0.1)))) + (home-page "https://github.com/alexcrichton/rustc-auto-publish") + (synopsis + "Automatically published version of the source code spans used in rustc") + (description + "Use the spans used in the Rust compiler to represent source code with +this crate. It is automatically published using the compiler repository at +@url{https://www.github.com/rust-lang/rust}") + (license (list license:expat license:asl2.0)))) + (define-public rust-rustc-ap-serialize-654 (package (name "rust-rustc-ap-serialize") -- cgit v1.2.3 From 09c42dc72380105eea36c6e54b633d94c9cf9d84 Mon Sep 17 00:00:00 2001 From: John Soo Date: Tue, 16 Jun 2020 21:05:39 -0700 Subject: gnu: Add rust-rustc-ap-rustc-ast-654. * gnu/packages/crates-io.scm (rust-rustc-ap-rustc-ast-654): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0d9a396413..b180ea42da 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -20965,6 +20965,43 @@ (define-public rust-rustc-ap-graphviz-654 @url{https://www.github.com/rust-lang/rust}") (license (list license:expat license:asl2.0)))) +(define-public rust-rustc-ap-rustc-ast-654 + (package + (name "rust-rustc-ap-rustc-ast") + (version "654.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rustc-ap-rustc_ast" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0n4yhkd7x0c3nqyqz99lwjiix7mf1j5xbkn9fj90h4fxp3did7qq")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-log" ,rust-log-0.4) + ("rust-rustc-ap-rustc-data-structures" + ,rust-rustc-ap-rustc-data-structures-654) + ("rust-rustc-ap-rustc-index" ,rust-rustc-ap-rustc-index-654) + ("rust-rustc-ap-rustc-lexer" ,rust-rustc-ap-rustc-lexer-654) + ("rust-rustc-ap-rustc-macros" ,rust-rustc-ap-rustc-macros-654) + ("rust-rustc-ap-serialize" ,rust-rustc-ap-serialize-654) + ("rust-rustc-ap-rustc-span" ,rust-rustc-ap-rustc-span-654) + ("rust-scoped-tls" ,rust-scoped-tls-1.0) + ("rust-smallvec" ,rust-smallvec-1)))) + (home-page "https://github.com/alexcrichton/rustc-auto-publish") + (synopsis + "Automatically published version of the Rust ast used in rustc") + (description + "Use the Rust ast used in the Rust compiler with this crate. +It is automatically published using the compiler repository at +@url{https://www.github.com/rust-lang/rust}") + (license (list license:expat license:asl2.0)))) + (define-public rust-rustc-ap-rustc-data-structures-654 (package (name "rust-rustc-ap-rustc-data-structures") -- cgit v1.2.3 From 9d502dd76b33904be91ea3696c60ff34dc59518a Mon Sep 17 00:00:00 2001 From: John Soo Date: Tue, 16 Jun 2020 21:45:50 -0700 Subject: gnu: Add rust-rustc-ap-rustc-target-654. * gnu/packages/crates-io.scm (rust-rustc-ap-rustc-target-654): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b180ea42da..994e249c36 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -21167,6 +21167,40 @@ (define-public rust-rustc-ap-rustc-span-654 @url{https://www.github.com/rust-lang/rust}") (license (list license:expat license:asl2.0)))) +(define-public rust-rustc-ap-rustc-target-654 + (package + (name "rust-rustc-ap-rustc-target") + (version "654.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rustc-ap-rustc_target" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0i579l4jx4ky5wm0ah8zdy6dd6201rii6rv1wc4bi209ixwjikr8")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-log" ,rust-log-0.4) + ("rust-rustc-ap-rustc-data-structures" + ,rust-rustc-ap-rustc-data-structures-654) + ("rust-rustc-ap-rustc-index" ,rust-rustc-ap-rustc-index-654) + ("rust-rustc-ap-rustc-macros" ,rust-rustc-ap-rustc-macros-654) + ("rust-rustc-ap-serialize" ,rust-rustc-ap-serialize-654) + ("rust-rustc-ap-rustc-span" ,rust-rustc-ap-rustc-span-654)))) + (home-page "https://github.com/alexcrichton/rustc-auto-publish") + (synopsis + "Automatically published version of the compile targets used in rustc") + (description + "Use the compile targets as expressed in the Rust compiler with this +crate. It is automatically published using the compiler repository at +@url{https://www.github.com/rust-lang/rust}") + (license (list license:expat license:asl2.0)))) + (define-public rust-rustc-ap-serialize-654 (package (name "rust-rustc-ap-serialize") -- cgit v1.2.3 From a68430712fe623a61ba5eecfb8aa4547079a96c2 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Sun, 12 Jul 2020 00:42:06 +0200 Subject: gnu: Add thin-provisioning-tools. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/linux.scm (thin-provisioning-tools): New variable. Signed-off-by: Jakub Kądziołka --- gnu/packages/linux.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index bd7cbf183f..e47bc80f6e 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -46,6 +46,7 @@ ;;; Copyright © 2020 Brice Waegeneire ;;; Copyright © 2020 Morgan Smith ;;; Copyright © 2020 John Soo +;;; Copyright © 2020 Michael Rohleder ;;; ;;; This file is part of GNU Guix. ;;; @@ -73,6 +74,7 @@ (define-module (gnu packages linux) #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages bison) + #:use-module (gnu packages boost) #:use-module (gnu packages calendar) #:use-module (gnu packages check) #:use-module (gnu packages cpio) @@ -3403,6 +3405,37 @@ (define-public lvm2-static #t)))))) (synopsis "Logical volume management for Linux (statically linked)"))) +(define-public thin-provisioning-tools + (package + (name "thin-provisioning-tools") + (version "0.8.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jthornber/thin-provisioning-tools.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "01wl8c0cjbx1smbhj8dx6av5bnw5775m58gasc3vqwvsj0s9hq19")))) + (build-system gnu-build-system) + (arguments + ;; Doesn't build with --enable-testing due to a function name collision + ;; with glibc. Fixed upstream. TODO: Enable tests when 0.9.0 is released. + `(#:tests? #f)) + (native-inputs + `(("automake" ,automake) + ("autoreconf" ,autoconf))) + (inputs + `(("boost" ,boost) + ("expat" ,expat) + ("libaio" ,libaio))) + (synopsis "Tools for manipulating the metadata of device-mapper targets") + (description "A suite of tools for manipulating the metadata of the +dm-thin, dm-cache and dm-era device-mapper targets.") + (home-page "https://github.com/jthornber/thin-provisioning-tools") + (license license:gpl3+))) + (define-public wireless-tools (package (name "wireless-tools") -- cgit v1.2.3 From f2096c7aa92e8c8af5ec96b99cbabeb191164de1 Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Wed, 8 Jul 2020 20:48:57 +0100 Subject: gnu: dragonfly-reverb: Update to 3.0.0. * gnu/packages/music.scm (dragonfly-reverb): Update to 3.0.0. Signed-off-by: Efraim Flashner --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index fd24188bf8..4c1e16dcc5 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -5263,7 +5263,7 @@ (define-public zrythm (define-public dragonfly-reverb (package (name "dragonfly-reverb") - (version "2.0.0") + (version "3.0.0") (source (origin (method git-fetch) @@ -5275,7 +5275,7 @@ (define-public dragonfly-reverb (recursive? #t))) (file-name (git-file-name name version)) (sha256 - (base32 "1qrbv4kk5v6ynx424h1i54qj0w8v6vpw81b759jawxvzzprpgq72")))) + (base32 "1z2x33lzpd26dv1p29ca7vy8mjfzkfpin35iq46spwd9k3sqn1ja")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no check target -- cgit v1.2.3 From ad020ee2a8aa95f2578a5305b5d0b84cb15d3629 Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Wed, 8 Jul 2020 21:06:09 +0100 Subject: gnu: dragonfly-reverb: Use regex to install bin. * gnu/packages/music.scm (dragonfly-reverb)[arguments]: Use regex to install the binaries. Signed-off-by: Efraim Flashner --- gnu/packages/music.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 4c1e16dcc5..0e5ca65242 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -5295,8 +5295,15 @@ (define-public dragonfly-reverb (string-append lv2 "/" (basename file)))) (find-files "bin" "\\.lv2$" #:directories? #t)) ;; Install executables. - (install-file "bin/DragonflyRoomReverb" bin) - (install-file "bin/DragonflyHallReverb" bin) + (for-each + (lambda (file) + (install-file file bin)) + (find-files "bin" + (lambda (name stat) + (and + (equal? (dirname name) "bin") + (not (string-suffix? ".so" name)) + (not (string-suffix? ".lv2" name)))))) #t)))))) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From a35cd75216a941701de34c60ebb70e9175e9ec8c Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Wed, 8 Jul 2020 21:19:09 +0100 Subject: gnu: zita-resampler: Update to 1.6.2. * gnu/packages/audio.scm (zita-resampler): Update to 1.6.2. [source]: Adjust for upstream changes. [arguments]: Same. Signed-off-by: Efraim Flashner --- gnu/packages/audio.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 1fa11808e2..5e93eef9c2 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3203,7 +3203,7 @@ (define-public zita-convolver (define-public zita-resampler (package (name "zita-resampler") - (version "1.3.0") + (version "1.6.2") (source (origin (method url-fetch) (uri (string-append @@ -3213,26 +3213,28 @@ (define-public zita-resampler (snippet ;; Don't optimize for a specific processor architecture. '(begin - (substitute* '("apps/Makefile" "libs/Makefile") + (substitute* '("apps/Makefile" "source/Makefile") (("^CXXFLAGS \\+= -march=native") "")) #t)) (modules '((guix build utils))) (sha256 (base32 - "0r9ary5sc3y8vba5pad581ha7mgsrlyai83w7w4x2fmhfy64q0wq")))) + "1my5k2dh2dkvjp6xjnf9qy6i7s28z13kw1n9pwa4a2cpwbzawfr3")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no "check" target - #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:make-flags + (list (string-append "PREFIX=" (assoc-ref %outputs "out")) + (string-append "SUFFIX=")) #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-makefile-and-enter-directory (lambda _ - (substitute* "libs/Makefile" + (substitute* "source/Makefile" (("ldconfig") "true") (("^LIBDIR =.*") "LIBDIR = lib\n")) - (chdir "libs") + (chdir "source") #t)) (add-after 'install 'install-symlink -- cgit v1.2.3 From d0f0e2bd17edef8e240921cd5587a8b9d3bfc514 Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Wed, 8 Jul 2020 21:24:25 +0100 Subject: gnu: zita-alsa-pcmi: Update to 0.3.2. * gnu/packages/audio.scm (zita-alsa-pcmi): Update to 0.3.2. [arguments]: Adjust for upstream changes. Signed-off-by: Efraim Flashner --- gnu/packages/audio.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 5e93eef9c2..8e20387503 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3256,7 +3256,7 @@ (define-public zita-resampler (define-public zita-alsa-pcmi (package (name "zita-alsa-pcmi") - (version "0.2.0") + (version "0.3.2") (source (origin (method url-fetch) (uri (string-append @@ -3265,19 +3265,21 @@ (define-public zita-alsa-pcmi version ".tar.bz2")) (sha256 (base32 - "1rgv332g82rrrlm4vdam6p2pyrisxbi7b3izfaa0pcjglafsy7j9")))) + "12d7vdg74yh21w69qi0wg57iz4876j94qbiq09bvscih6xz9y78s")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no "check" target - #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:make-flags + (list (string-append "PREFIX=" (assoc-ref %outputs "out")) + (string-append "SUFFIX=")) #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-makefile-and-enter-directory (lambda _ - (substitute* "libs/Makefile" + (substitute* "source/Makefile" (("ldconfig") "true") (("^LIBDIR =.*") "LIBDIR = lib\n")) - (chdir "libs") + (chdir "source") #t)) (add-after 'install 'install-symlink (lambda _ -- cgit v1.2.3 From a8031e61925169d7e32f4715913305d3d03da4ca Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Wed, 8 Jul 2020 21:36:47 +0100 Subject: gnu: libaudec: Update to 0.2.2. * gnu/packages/audio.scm (libaudec): Update to 0.2.2. Signed-off-by: Efraim Flashner --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 8e20387503..b1308b1dce 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -4147,7 +4147,7 @@ (define-public ecasound (define-public libaudec (package (name "libaudec") - (version "0.2") + (version "0.2.2") (source (origin (method git-fetch) @@ -4157,7 +4157,7 @@ (define-public libaudec (file-name (git-file-name name version)) (sha256 (base32 - "0lfydvs92b0hr72z71ci3yi356rjzi162pgms8dphgg18bz8dazv")))) + "04mpmfmqc43asw0m3zxhb6jj4qms7x4jw7mx4xb1d3lh16xllniz")))) (build-system meson-build-system) (arguments `(#:configure-flags `("-Denable_tests=true -Denable_ffmpeg=true"))) -- cgit v1.2.3 From d9dbab0b901a311dd1278e87cbce33df64ee94d5 Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Thu, 9 Jul 2020 08:37:52 +0200 Subject: gnu: profanity: Update to 0.9.5. * gnu/packages/messaging.scm (profanity): Update to 0.9.5. [inputs] Add sqlite. Signed-off-by: Efraim Flashner --- gnu/packages/messaging.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 945257eca1..eb1856ada4 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1695,14 +1695,14 @@ (define-public libstrophe (define-public profanity (package (name "profanity") - (version "0.8.1") + (version "0.9.5") (source (origin (method url-fetch) (uri (string-append "https://profanity-im.github.io/profanity-" version ".tar.gz")) (sha256 (base32 - "15yrx2ir2bilxpjfaxpjb93yjpvpvcvh5r7wbsjx6kmmy7qg2zvb")))) + "00j9l9v62rz9hprgiy1vrz8v3v59ph18h8kskqxr31fgqvjv5xr3")))) (build-system gnu-build-system) (arguments '(#:configure-flags @@ -1721,7 +1721,8 @@ (define-public profanity ("libotr" ,libotr) ("ncurses" ,ncurses) ("openssl" ,openssl) - ("readline" ,readline))) + ("readline" ,readline) + ("sqlite" ,sqlite))) (native-inputs `(("autoconf" ,autoconf) ("autoconf-archive" ,autoconf-archive) -- cgit v1.2.3 From a8cae692b2dbfcb6bee18a3f141da2bdd1e1747b Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Thu, 9 Jul 2020 09:48:30 +0200 Subject: gnu: httpie: Update to 2.2.0. * gnu/packages/python-web.scm (httpie): Update to 2.2.0. Signed-off-by: Efraim Flashner --- gnu/packages/python-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index c929e254f7..c3016c8d95 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -372,14 +372,14 @@ (define-public python2-httplib2 (define-public httpie (package (name "httpie") - (version "2.0.0") + (version "2.2.0") (source (origin (method url-fetch) (uri (pypi-uri "httpie" version)) (sha256 (base32 - "02bw20cwv3a1lzrn919dk25dq4v81x6q786zlrqsqzhsdxszj14c")))) + "18058k0i3cc4ixvgzj882w693lf40283flvspbrvd876iq42ib1i")))) (build-system python-build-system) (arguments ;; The tests attempt to access external web servers, so we cannot run them. -- cgit v1.2.3 From 437af9e26cdddabb5c89c70cefa590e76a62b9dd Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Thu, 9 Jul 2020 11:07:58 +0200 Subject: gnu: fish: Update to 3.1.2. * gnu/packages/shells.scm (fish): Update to 3.1.2. [arguments] Set HOME to a writable folder. Remove a failing test file. Signed-off-by: Efraim Flashner --- gnu/packages/shells.scm | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 2551d62406..33c316aee3 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -99,7 +99,7 @@ (define-public dash (define-public fish (package (name "fish") - (version "3.1.0") + (version "3.1.2") (source (origin (method url-fetch) @@ -107,7 +107,7 @@ (define-public fish "releases/download/" version "/" "fish-" version ".tar.gz")) (sha256 - (base32 "0s2356mlx7fp9kgqgw91lm5ds2i9iq9hq071fbqmcp3875l1xnz5")))) + (base32 "1vblmb3x2k2cb0db5jdyflppnlqsm7i6jjaidyhmvaaw7ch2gffm")))) (build-system cmake-build-system) (inputs `(("fish-foreign-env" ,fish-foreign-env) @@ -121,10 +121,17 @@ (define-public fish (arguments '(#:phases (modify-phases %standard-phases + (add-after 'unpack 'set-env + (lambda _ + ;; some tests write to $HOME + (setenv "HOME" (getcwd)) + #t)) (add-after 'unpack 'patch-tests (lambda* (#:key inputs #:allow-other-keys) (let ((coreutils (assoc-ref inputs "coreutils")) (bash (assoc-ref inputs "bash"))) + ;; This test fails + (delete-file "tests/checks/pipeline-pgroup.fish") ;; These try to open a terminal (delete-file "tests/checks/interactive.fish") (delete-file "tests/checks/login-interactive.fish") @@ -143,8 +150,8 @@ (define-public fish "L\"/usr\", wds, vars, PATH_REQUIRE_DIR\\)\\);")) "")) (substitute* - (append (find-files "tests" ".*\\.(in|out|err)$") - (find-files "tests/checks" ".*\\.fish")) + (append (find-files "tests" ".*\\.(in|out|err)$") + (find-files "tests/checks" ".*\\.fish")) (("/bin/pwd" pwd) (string-append coreutils pwd)) (("/bin/echo" echo) (string-append coreutils echo)) (("/bin/sh" sh) (string-append bash sh)) @@ -169,9 +176,9 @@ (define-public fish ;; Embed absolute paths. (add-before 'install 'embed-absolute-paths (lambda _ - (substitute* "share/functions/__fish_print_help.fish" - (("nroff") (which "nroff"))) - #t)) + (substitute* "share/functions/__fish_print_help.fish" + (("nroff") (which "nroff"))) + #t)) ;; Enable completions, functions and configurations in user's and ;; system's guix profiles by adding them to __extra_* variables. (add-before 'install 'patch-fish-extra-paths -- cgit v1.2.3 From 5c33e79ada6fe65bb34e400ea877f01e09e3bdb2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 12 Jul 2020 21:53:02 +0300 Subject: gnu: fish: Remove bundled code. * gnu/packages/shells.scm (fish)[source]: Add snippet to remove bundled pcre2 source. --- gnu/packages/shells.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 33c316aee3..6e5db439fd 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2019, 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2020 Brice Waegeneire ;;; Copyright © 2020 Ryan Prior +;;; Copyright © 2020 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -107,7 +108,11 @@ (define-public fish "releases/download/" version "/" "fish-" version ".tar.gz")) (sha256 - (base32 "1vblmb3x2k2cb0db5jdyflppnlqsm7i6jjaidyhmvaaw7ch2gffm")))) + (base32 "1vblmb3x2k2cb0db5jdyflppnlqsm7i6jjaidyhmvaaw7ch2gffm")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "pcre2-10.32") #t)))) (build-system cmake-build-system) (inputs `(("fish-foreign-env" ,fish-foreign-env) -- cgit v1.2.3 From 8551bc64e4322080ef07b5009f4d46229df8d6f3 Mon Sep 17 00:00:00 2001 From: Jan Wielkiewicz Date: Sun, 12 Jul 2020 18:00:46 +0200 Subject: gnu: jami-client-gnome: Remove deprecated package. As this package has been deprecated for over a year. * gnu/packages/jami.scm (jami-client-gnome): Remove variable. Signed-off-by: Christopher Baines --- gnu/packages/jami.scm | 3 --- 1 file changed, 3 deletions(-) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index d5cb3b62f6..ef928cc421 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -590,6 +590,3 @@ (define-public jami This package provides the Jami client for the GNOME desktop.") (home-page "https://jami.net") (license license:gpl3+))) - -(define-public jami-client-gnome - (deprecated-package "jami-client-gnome" jami)) -- cgit v1.2.3 From bc6239ba078434cefe09194cba02ad1cfed87cc7 Mon Sep 17 00:00:00 2001 From: Jan Wielkiewicz Date: Sun, 12 Jul 2020 18:00:47 +0200 Subject: gnu: opendht: Add patch. The 2.1.4 release of opendht contains a bug, preventing it's use with recent releases of Jami. This minor patch [1] resolves this issue, and should be possible to remove with the next release. 1: https://github.com/savoirfairelinux/opendht/commit/e2b39dd3a0742853e00f9c3e8c46c911da20bed7 * gnu/packages/patches/opendht-fix-jami.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/networking.scm (opendht)[source]: Apply the patch. Signed-off-by: Christopher Baines --- gnu/local.mk | 1 + gnu/packages/networking.scm | 1 + gnu/packages/patches/opendht-fix-jami.patch | 33 +++++++++++++++++++++++++++++ 3 files changed, 35 insertions(+) create mode 100644 gnu/packages/patches/opendht-fix-jami.patch diff --git a/gnu/local.mk b/gnu/local.mk index 3046a840c9..57a1d0df84 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1344,6 +1344,7 @@ dist_patch_DATA = \ %D%/packages/patches/openbabel-fix-crash-on-nwchem-output.patch \ %D%/packages/patches/opencascade-oce-glibc-2.26.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 e6a9e69adf..44f81c94d1 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2918,6 +2918,7 @@ (define-public opendht (url "https://github.com/savoirfairelinux/opendht.git") (commit version))) (file-name (git-file-name name version)) + (patches (search-patches "opendht-fix-jami.patch")) (sha256 (base32 "1ax26ri1ifb6s8ppd28jmanka9yf8mw3np65q2h4djhhik0phhal")))) diff --git a/gnu/packages/patches/opendht-fix-jami.patch b/gnu/packages/patches/opendht-fix-jami.patch new file mode 100644 index 0000000000..9718a84a41 --- /dev/null +++ b/gnu/packages/patches/opendht-fix-jami.patch @@ -0,0 +1,33 @@ +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 1c15d30521fc6e8a03a7a244f66db5ea9a893012 Mon Sep 17 00:00:00 2001 From: Jan Wielkiewicz Date: Sun, 12 Jul 2020 18:00:48 +0200 Subject: gnu: jami: Update to 20200710.1.6bd18d2. * gnu/packages/jami.scm (%jami-version): Update to 20200710.1.6bd18d2. (jami-source)[origin]: Adjust the hash. (pjproject-jami)[arguments]: Add new patches. (libring)[inputs]: Add libarchive. Signed-off-by: Christopher Baines --- gnu/packages/jami.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index ef928cc421..c2f65ee66a 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -23,6 +23,7 @@ (define-module (gnu packages jami) #:use-module (gnu packages aidc) #:use-module (gnu packages audio) #: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) @@ -62,7 +63,7 @@ (define-module (gnu packages jami) #:use-module (guix utils) #:use-module (srfi srfi-1)) -(define %jami-version "20200401.1.6f090de") +(define %jami-version "20200710.1.6bd18d2") (define* (jami-source #:key without-daemon) (origin @@ -78,7 +79,7 @@ (define* (jami-source #:key without-daemon) #f)) (sha256 (base32 - "0lryx9n1jn0jsw7s10pbwivqv0d5m3jdzhdhdyg5n02v72mjvkmh")))) + "0lg61jv39x7kc9lq30by246xb6gcgp1rzj49ak7ff8nqpfzyfvva")))) ;; Savoir-Faire Linux modifies many libraries to add features ;; to Jami. This procedure makes applying patches to a given @@ -167,7 +168,10 @@ (define-public pjproject-jami "0006-ignore_ipv6_on_transport_check" "0007-pj_ice_sess" "0008-fix_ioqueue_ipv6_sendto" - "0009-add-config-site")) + "0009-add-config-site" + "0010-fix-pkgconfig" + "0011-fix-tcp-death-detection" + "0012-fix-turn-shutdown-crash")) #t))) ;; TODO: We could use substitute-keyword-arguments instead of ;; repeating the phases from pjproject, but somehow it does @@ -455,6 +459,7 @@ (define-public libring ("gsm" ,gsm) ("jack" ,jack-1) ("jsoncpp" ,jsoncpp) + ("libarchive" ,libarchive) ("libnatpmp" ,libnatpmp) ("libogg" ,libogg) ("libva" ,libva) -- cgit v1.2.3 From c54b9afb87de599953566ecca24ba71bd48fd69a Mon Sep 17 00:00:00 2001 From: Jan Wielkiewicz Date: Sun, 12 Jul 2020 18:00:49 +0200 Subject: gnu: pjproject-jami: Build without debugging assertions. This fixes a bug where Jami crashes while disconnecting from an audio call. * gnu/packages/jami.scm (pjproject-jami)[arguments]: Use -DNDEBUG flag. Signed-off-by: Christopher Baines --- gnu/packages/jami.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index c2f65ee66a..85a06026ed 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -142,8 +142,10 @@ (define-public pjproject-jami ;; against pjproject-jami: ;; relocation R_X86_64_32S against `.rodata' can not be used when ;; making a shared object; - "CFLAGS=-fPIC" - "CXXFLAGS=-fPIC") + ;; -DNDEBUG is needed to prevent assertion from happening and + ;; stopping the daemon. + "CFLAGS=-fPIC -DNDEBUG" + "CXXFLAGS=-fPIC -DNDEBUG") #:phases (modify-phases %standard-phases (add-after 'unpack 'make-git-checkout-writable -- cgit v1.2.3 From 060211853d3f18f9d582549fcfb803e9ec8d2837 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 12 Jul 2020 15:05:51 +0200 Subject: services: mumi: Run in a UTF-8 locale. * gnu/services/web.scm (mumi-shepherd-services)[environment]: New variable. Pass it as #:environment-variables to each 'make-forkexec-constructor' call. --- gnu/services/web.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gnu/services/web.scm b/gnu/services/web.scm index 63d2324b91..3c5b4d2586 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -37,6 +37,7 @@ (define-module (gnu services web) #:use-module (gnu system pam) #:use-module (gnu system shadow) #:use-module (gnu packages admin) + #:use-module (gnu packages base) #:use-module (gnu packages databases) #:use-module (gnu packages web) #:use-module (gnu packages patchutils) @@ -1720,6 +1721,11 @@ (define %mumi-accounts (shell (file-append shadow "/sbin/nologin"))))) (define (mumi-shepherd-services config) + (define environment + #~(list "LC_ALL=en_US.utf8" + (string-append "GUIX_LOCPATH=" #$glibc-utf8-locales + "/lib/locale"))) + (match config (($ mumi mailer? sender smtp) (list (shepherd-service @@ -1729,6 +1735,7 @@ (define (mumi-shepherd-services config) (start #~(make-forkexec-constructor `(#$(file-append mumi "/bin/mumi") "web" ,@(if #$mailer? '() '("--disable-mailer"))) + #:environment-variables #$environment #:user "mumi" #:group "mumi" #:log-file "/var/log/mumi.log")) (stop #~(make-kill-destructor))) @@ -1738,6 +1745,7 @@ (define (mumi-shepherd-services config) (requirement '(networking)) (start #~(make-forkexec-constructor '(#$(file-append mumi "/bin/mumi") "worker") + #:environment-variables #$environment #:user "mumi" #:group "mumi" #:log-file "/var/log/mumi.worker.log")) (stop #~(make-kill-destructor))) @@ -1753,6 +1761,7 @@ (define (mumi-shepherd-services config) ,@(if #$smtp (list (string-append "--smtp=" #$smtp)) '())) + #:environment-variables #$environment #:user "mumi" #:group "mumi" #:log-file "/var/log/mumi.mailer.log")) (stop #~(make-kill-destructor))))))) -- cgit v1.2.3 From 7bbe4655a8726a7250837c01c2678d7bcc6262e6 Mon Sep 17 00:00:00 2001 From: Ivan Kozlov Date: Sun, 12 Jul 2020 22:19:35 +0200 Subject: gnu: Add xssproxy. * gnu/packages/xdisorg.scm (xssproxy): New variable. --- gnu/packages/xdisorg.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index dafc63b5ca..6033b40380 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -37,6 +37,7 @@ ;;; Copyright © 2020 John Soo ;;; Copyright © 2020 Boris A. Dekshteyn ;;; Copyright © 2020 Alex McGrath +;;; Copyright © 2020 Ivan Kozlov ;;; ;;; This file is part of GNU Guix. ;;; @@ -1360,6 +1361,44 @@ (define-public xscreensaver "http://metadata.ftp-master.debian.org/changelogs/" "/main/x/xscreensaver/xscreensaver_5.36-1_copyright"))))) +(define-public xssproxy + (package + (name "xssproxy") + (version "1.0.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/timakro/xssproxy") + (commit (string-append "v" version)))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "0c83wmipnsdnbihc5niyczs7jrkss2s8n6iwwjdia7hkjzbd0hl7")))) + (build-system gnu-build-system) + (arguments `(#:make-flags `("bindir=/bin" + "man1dir=/share/man/man1" + ,(string-append "DESTDIR=" (assoc-ref %outputs "out")) + "CC=gcc") + #:phases (modify-phases %standard-phases + (delete 'configure) + (delete 'check)))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("glib" ,glib) + ("libx11" ,libx11) + ("libxext" ,libxext) + ("libxscrnsaver" ,libxscrnsaver) + ("dbus" ,dbus))) + (synopsis "Forward freedesktop.org Idle Inhibition Service calls to Xss") + (description "xssproxy implements the @code{org.freedesktop.ScreenSaver} +D-Bus interface described in the Idle Inhibition Service Draft by the +freedesktop.org developers. The inhibition of the screensaver is then +controlled using the XScreenSaverSuspend function from the Xss (X11 Screen +Saver extension) library.") + (home-page "https://github.com/timakro/xssproxy") + (license license:gpl3+))) + (define-public xsel (package (name "xsel") -- cgit v1.2.3 From c10526672e515f07c92dc447bbc592808f67238e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 12 Jul 2020 22:41:09 +0200 Subject: lint: source: Validate URLs of Git references. Until now the 'source' checker would look at URL for 'url-fetch' origins but not for 'git-fetch' origins. * guix/lint.scm (check-source): Add case for 'git-reference?'. * tests/lint.scm ("source, git-reference: 301 -> 200"): New test. --- guix/lint.scm | 47 ++++++++++++++++++++++++++--------------------- tests/lint.scm | 20 ++++++++++++++++++++ 2 files changed, 46 insertions(+), 21 deletions(-) diff --git a/guix/lint.scm b/guix/lint.scm index 445c06f8f4..a550caa237 100644 --- a/guix/lint.scm +++ b/guix/lint.scm @@ -793,27 +793,32 @@ (define (warnings-for-uris uris) (loop rest (cons warning warnings)))))))) (let ((origin (package-source package))) - (if (and (origin? origin) - (eqv? (origin-method origin) url-fetch)) - (let* ((uris (append-map (cut maybe-expand-mirrors <> %mirrors) - (map string->uri (origin-uris origin)))) - (warnings (warnings-for-uris uris))) - - ;; Just make sure that at least one of the URIs is valid. - (if (= (length uris) (length warnings)) - ;; When everything fails, report all of WARNINGS, otherwise don't - ;; report anything. - ;; - ;; XXX: Ideally we'd still allow warnings to be raised if *some* - ;; URIs are unreachable, but distinguish that from the error case - ;; where *all* the URIs are unreachable. - (cons* - (make-warning package - (G_ "all the source URIs are unreachable:") - #:field 'source) - warnings) - '())) - '()))) + (if (origin? origin) + (cond + ((eq? (origin-method origin) url-fetch) + (let* ((uris (append-map (cut maybe-expand-mirrors <> %mirrors) + (map string->uri (origin-uris origin)))) + (warnings (warnings-for-uris uris))) + + ;; Just make sure that at least one of the URIs is valid. + (if (= (length uris) (length warnings)) + ;; When everything fails, report all of WARNINGS, otherwise don't + ;; report anything. + ;; + ;; XXX: Ideally we'd still allow warnings to be raised if *some* + ;; URIs are unreachable, but distinguish that from the error case + ;; where *all* the URIs are unreachable. + (cons* + (make-warning package + (G_ "all the source URIs are unreachable:") + #:field 'source) + warnings) + '()))) + ((git-reference? (origin-uri origin)) + (warnings-for-uris + (list (string->uri (git-reference-url (origin-uri origin)))))) + (else + '()))))) (define (check-source-file-name package) "Emit a warning if PACKAGE's origin has no meaningful file name." diff --git a/tests/lint.scm b/tests/lint.scm index ac174f9f23..83becb655a 100644 --- a/tests/lint.scm +++ b/tests/lint.scm @@ -697,6 +697,26 @@ (define (warning-contains? str warnings) (and (? lint-warning?) second-warning)) (lint-warning-message second-warning))))))))) +(test-skip (if (http-server-can-listen?) 0 1)) +(test-equal "source, git-reference: 301 -> 200" + "permanent redirect from http://localhost:10000/foo/bar to http://localhost:9999/foo/bar" + (with-http-server `((200 ,%long-string)) + (let* ((initial-url (%local-url)) + (redirect (build-response #:code 301 + #:headers + `((location + . ,(string->uri initial-url)))))) + (parameterize ((%http-server-port (+ 1 (%http-server-port)))) + (with-http-server `((,redirect "")) + (let ((pkg (dummy-package + "x" + (source (origin + (method git-fetch) + (uri (git-reference (url (%local-url)) + (commit "v1.0.0"))) + (sha256 %null-sha256)))))) + (single-lint-warning-message (check-source pkg)))))))) + (test-skip (if (http-server-can-listen?) 0 1)) (test-equal "source: 301 -> 404" "URI http://localhost:10000/foo/bar not reachable: 404 (\"Such is life\")" -- cgit v1.2.3 From b0e7b6992f3f845e83cfbca4d700b51dba50b4d5 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 12 Jul 2020 22:53:28 +0200 Subject: gnu: Remove ".git" from "https://github/…/….git". MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Until now, 'lookup-origin' and thus 'lookup-origin-revision' in (guix swh) would sometimes return #f for these because the ".git" URLs are redirects to the non-".git" URLs. Consequently, 'guix lint -c archival' would keep saying "scheduled Software Heritage archival"; likewise, the fallback download code would fail. * gnu/packages/ada.scm, gnu/packages/admin.scm, gnu/packages/aidc.scm, gnu/packages/algebra.scm, gnu/packages/android.scm, gnu/packages/animation.scm, gnu/packages/arcan.scm, gnu/packages/assembly.scm, gnu/packages/audio.scm, gnu/packages/authentication.scm, gnu/packages/avr.scm, gnu/packages/axoloti.scm, gnu/packages/backup.scm, gnu/packages/bash.scm, gnu/packages/benchmark.scm, gnu/packages/bioconductor.scm, gnu/packages/bioinformatics.scm, gnu/packages/bittorrent.scm, gnu/packages/boost.scm, gnu/packages/build-tools.scm, gnu/packages/c.scm, gnu/packages/calendar.scm, gnu/packages/cdrom.scm, gnu/packages/check.scm, gnu/packages/chemistry.scm, gnu/packages/chez.scm, gnu/packages/clojure.scm, gnu/packages/code.scm, gnu/packages/compression.scm, gnu/packages/compton.scm, gnu/packages/coq.scm, gnu/packages/cpp.scm, gnu/packages/cran.scm, gnu/packages/crypto.scm, gnu/packages/curl.scm, gnu/packages/databases.scm, gnu/packages/datastructures.scm, gnu/packages/debug.scm, gnu/packages/disk.scm, gnu/packages/distributed.scm, gnu/packages/django.scm, gnu/packages/dlang.scm, gnu/packages/dns.scm, gnu/packages/docker.scm, gnu/packages/education.scm, gnu/packages/efi.scm, gnu/packages/elixir.scm, gnu/packages/emacs-xyz.scm, gnu/packages/embedded.scm, gnu/packages/emulators.scm, gnu/packages/engineering.scm, gnu/packages/erlang.scm, gnu/packages/fabric-management.scm, gnu/packages/file-systems.scm, gnu/packages/finance.scm, gnu/packages/firmware.scm, gnu/packages/flashing-tools.scm, gnu/packages/fonts.scm, gnu/packages/fontutils.scm, gnu/packages/fpga.scm, gnu/packages/game-development.scm, gnu/packages/games.scm, gnu/packages/genealogy.scm, gnu/packages/genimage.scm, gnu/packages/geo.scm, gnu/packages/gimp.scm, gnu/packages/gl.scm, gnu/packages/gnome-xyz.scm, gnu/packages/gnome.scm, gnu/packages/gnuzilla.scm, gnu/packages/golang.scm, gnu/packages/gpodder.scm, gnu/packages/graph.scm, gnu/packages/graphics.scm, gnu/packages/graphviz.scm, gnu/packages/groff.scm, gnu/packages/groovy.scm, gnu/packages/gtk.scm, gnu/packages/guile-xyz.scm, gnu/packages/guile.scm, gnu/packages/hardware.scm, gnu/packages/haskell-apps.scm, gnu/packages/haskell-xyz.scm, gnu/packages/hexedit.scm, gnu/packages/i2p.scm, gnu/packages/ibus.scm, gnu/packages/image-processing.scm, gnu/packages/image-viewers.scm, gnu/packages/image.scm, gnu/packages/ipfs.scm, gnu/packages/java-graphics.scm, gnu/packages/java-maths.scm, gnu/packages/java.scm, gnu/packages/javascript.scm, gnu/packages/jrnl.scm, gnu/packages/julia.scm, gnu/packages/jupyter.scm, gnu/packages/kodi.scm, gnu/packages/language.scm, gnu/packages/lego.scm, gnu/packages/less.scm, gnu/packages/libusb.scm, gnu/packages/linux.scm, gnu/packages/lirc.scm, gnu/packages/lisp-xyz.scm, gnu/packages/llvm.scm, gnu/packages/logging.scm, gnu/packages/lolcode.scm, gnu/packages/lua.scm, gnu/packages/lxde.scm, gnu/packages/lxqt.scm, gnu/packages/machine-learning.scm, gnu/packages/mail.scm, gnu/packages/markup.scm, gnu/packages/maths.scm, gnu/packages/maven.scm, gnu/packages/mes.scm, gnu/packages/messaging.scm, gnu/packages/monitoring.scm, gnu/packages/mpd.scm, gnu/packages/music.scm, gnu/packages/networking.scm, gnu/packages/node-xyz.scm, gnu/packages/ocaml.scm, gnu/packages/ocr.scm, gnu/packages/onc-rpc.scm, gnu/packages/opencl.scm, gnu/packages/opencog.scm, gnu/packages/pantheon.scm, gnu/packages/password-utils.scm, gnu/packages/patchutils.scm, gnu/packages/pdf.scm, gnu/packages/perl6.scm, gnu/packages/phabricator.scm, gnu/packages/popt.scm, gnu/packages/printers.scm, gnu/packages/prolog.scm, gnu/packages/protobuf.scm, gnu/packages/pulseaudio.scm, gnu/packages/python-crypto.scm, gnu/packages/python-web.scm, gnu/packages/python-xyz.scm, gnu/packages/qt.scm, gnu/packages/radio.scm, gnu/packages/rails.scm, gnu/packages/rdf.scm, gnu/packages/rednotebook.scm, gnu/packages/rpc.scm, gnu/packages/rsync.scm, gnu/packages/ruby.scm, gnu/packages/rust.scm, gnu/packages/scheme.scm, gnu/packages/screen.scm, gnu/packages/security-token.scm, gnu/packages/selinux.scm, gnu/packages/serialization.scm, gnu/packages/shells.scm, gnu/packages/shellutils.scm, gnu/packages/simh.scm, gnu/packages/sml.scm, gnu/packages/ssh.scm, gnu/packages/statistics.scm, gnu/packages/stenography.scm, gnu/packages/sync.scm, gnu/packages/syncthing.scm, gnu/packages/synergy.scm, gnu/packages/telephony.scm, gnu/packages/terminals.scm, gnu/packages/tex.scm, gnu/packages/texinfo.scm, gnu/packages/text-editors.scm, gnu/packages/textutils.scm, gnu/packages/time.scm, gnu/packages/tmux.scm, gnu/packages/tor.scm, gnu/packages/toys.scm, gnu/packages/version-control.scm, gnu/packages/video.scm, gnu/packages/vim.scm, gnu/packages/virtualization.scm, gnu/packages/vlang.scm, gnu/packages/vnc.scm, gnu/packages/vpn.scm, gnu/packages/web-browsers.scm, gnu/packages/web.scm, gnu/packages/wireservice.scm, gnu/packages/wm.scm, gnu/packages/wxwidgets.scm, gnu/packages/xdisorg.scm, gnu/packages/xml.scm, gnu/packages/xorg.scm, tests/lint.scm: Remove trailing ".git" from 'git-reference' URL. --- gnu/packages/ada.scm | 4 +- gnu/packages/admin.scm | 40 +- gnu/packages/aidc.scm | 4 +- gnu/packages/algebra.scm | 16 +- gnu/packages/android.scm | 4 +- gnu/packages/animation.scm | 2 +- gnu/packages/arcan.scm | 6 +- gnu/packages/assembly.scm | 6 +- gnu/packages/audio.scm | 48 +-- gnu/packages/authentication.scm | 2 +- gnu/packages/avr.scm | 2 +- gnu/packages/axoloti.scm | 6 +- gnu/packages/backup.scm | 6 +- gnu/packages/bash.scm | 4 +- gnu/packages/benchmark.scm | 4 +- gnu/packages/bioconductor.scm | 6 +- gnu/packages/bioinformatics.scm | 232 +++++----- gnu/packages/bittorrent.scm | 8 +- gnu/packages/boost.scm | 4 +- gnu/packages/build-tools.scm | 2 +- gnu/packages/c.scm | 6 +- gnu/packages/calendar.scm | 2 +- gnu/packages/cdrom.scm | 4 +- gnu/packages/check.scm | 6 +- gnu/packages/chemistry.scm | 4 +- gnu/packages/chez.scm | 14 +- gnu/packages/clojure.scm | 10 +- gnu/packages/code.scm | 12 +- gnu/packages/compression.scm | 18 +- gnu/packages/compton.scm | 4 +- gnu/packages/coq.scm | 8 +- gnu/packages/cpp.scm | 14 +- gnu/packages/cran.scm | 6 +- gnu/packages/crypto.scm | 4 +- gnu/packages/curl.scm | 2 +- gnu/packages/databases.scm | 10 +- gnu/packages/datastructures.scm | 6 +- gnu/packages/debug.scm | 4 +- gnu/packages/disk.scm | 12 +- gnu/packages/distributed.scm | 2 +- gnu/packages/django.scm | 6 +- gnu/packages/dlang.scm | 18 +- gnu/packages/dns.scm | 4 +- gnu/packages/docker.scm | 12 +- gnu/packages/education.scm | 2 +- gnu/packages/efi.scm | 2 +- gnu/packages/elixir.scm | 2 +- gnu/packages/emacs-xyz.scm | 856 ++++++++++++++++++------------------- gnu/packages/embedded.scm | 20 +- gnu/packages/emulators.scm | 44 +- gnu/packages/engineering.scm | 24 +- gnu/packages/erlang.scm | 2 +- gnu/packages/fabric-management.scm | 2 +- gnu/packages/file-systems.scm | 6 +- gnu/packages/finance.scm | 20 +- gnu/packages/firmware.scm | 4 +- gnu/packages/flashing-tools.scm | 12 +- gnu/packages/fonts.scm | 20 +- gnu/packages/fontutils.scm | 4 +- gnu/packages/fpga.scm | 6 +- gnu/packages/game-development.scm | 18 +- gnu/packages/games.scm | 84 ++-- gnu/packages/genealogy.scm | 2 +- gnu/packages/genimage.scm | 2 +- gnu/packages/geo.scm | 12 +- gnu/packages/gimp.scm | 4 +- gnu/packages/gl.scm | 6 +- gnu/packages/gnome-xyz.scm | 16 +- gnu/packages/gnome.scm | 18 +- gnu/packages/gnuzilla.scm | 2 +- gnu/packages/golang.scm | 120 +++--- gnu/packages/gpodder.scm | 2 +- gnu/packages/graph.scm | 8 +- gnu/packages/graphics.scm | 12 +- gnu/packages/graphviz.scm | 2 +- gnu/packages/groff.scm | 2 +- gnu/packages/groovy.scm | 2 +- gnu/packages/gtk.scm | 4 +- gnu/packages/guile-xyz.scm | 12 +- gnu/packages/guile.scm | 2 +- gnu/packages/hardware.scm | 4 +- gnu/packages/haskell-apps.scm | 4 +- gnu/packages/haskell-xyz.scm | 2 +- gnu/packages/hexedit.scm | 2 +- gnu/packages/i2p.scm | 2 +- gnu/packages/ibus.scm | 50 +-- gnu/packages/image-processing.scm | 8 +- gnu/packages/image-viewers.scm | 8 +- gnu/packages/image.scm | 22 +- gnu/packages/ipfs.scm | 6 +- gnu/packages/java-graphics.scm | 2 +- gnu/packages/java-maths.scm | 2 +- gnu/packages/java.scm | 20 +- gnu/packages/javascript.scm | 4 +- gnu/packages/jrnl.scm | 2 +- gnu/packages/julia.scm | 4 +- gnu/packages/jupyter.scm | 2 +- gnu/packages/kodi.scm | 10 +- gnu/packages/language.scm | 2 +- gnu/packages/lego.scm | 2 +- gnu/packages/less.scm | 2 +- gnu/packages/libusb.scm | 6 +- gnu/packages/linux.scm | 40 +- gnu/packages/lirc.scm | 2 +- gnu/packages/lisp-xyz.scm | 246 +++++------ gnu/packages/llvm.scm | 2 +- gnu/packages/logging.scm | 2 +- gnu/packages/lolcode.scm | 2 +- gnu/packages/lua.scm | 10 +- gnu/packages/lxde.scm | 2 +- gnu/packages/lxqt.scm | 2 +- gnu/packages/machine-learning.scm | 24 +- gnu/packages/mail.scm | 14 +- gnu/packages/markup.scm | 6 +- gnu/packages/maths.scm | 28 +- gnu/packages/maven.scm | 2 +- gnu/packages/mes.scm | 2 +- gnu/packages/messaging.scm | 22 +- gnu/packages/monitoring.scm | 4 +- gnu/packages/mpd.scm | 2 +- gnu/packages/music.scm | 94 ++-- gnu/packages/networking.scm | 26 +- gnu/packages/node-xyz.scm | 2 +- gnu/packages/ocaml.scm | 72 ++-- gnu/packages/ocr.scm | 2 +- gnu/packages/onc-rpc.scm | 2 +- gnu/packages/opencl.scm | 10 +- gnu/packages/opencog.scm | 12 +- gnu/packages/pantheon.scm | 6 +- gnu/packages/password-utils.scm | 6 +- gnu/packages/patchutils.scm | 2 +- gnu/packages/pdf.scm | 10 +- gnu/packages/perl6.scm | 22 +- gnu/packages/phabricator.scm | 4 +- gnu/packages/popt.scm | 2 +- gnu/packages/printers.scm | 4 +- gnu/packages/prolog.scm | 2 +- gnu/packages/protobuf.scm | 4 +- gnu/packages/pulseaudio.scm | 6 +- gnu/packages/python-crypto.scm | 2 +- gnu/packages/python-web.scm | 4 +- gnu/packages/python-xyz.scm | 60 +-- gnu/packages/qt.scm | 2 +- gnu/packages/radio.scm | 12 +- gnu/packages/rails.scm | 4 +- gnu/packages/rdf.scm | 2 +- gnu/packages/rednotebook.scm | 2 +- gnu/packages/rpc.scm | 6 +- gnu/packages/rsync.scm | 2 +- gnu/packages/ruby.scm | 56 +-- gnu/packages/rust.scm | 2 +- gnu/packages/scheme.scm | 4 +- gnu/packages/screen.scm | 2 +- gnu/packages/security-token.scm | 4 +- gnu/packages/selinux.scm | 4 +- gnu/packages/serialization.scm | 10 +- gnu/packages/shells.scm | 6 +- gnu/packages/shellutils.scm | 12 +- gnu/packages/simh.scm | 2 +- gnu/packages/sml.scm | 2 +- gnu/packages/ssh.scm | 6 +- gnu/packages/statistics.scm | 4 +- gnu/packages/stenography.scm | 2 +- gnu/packages/sync.scm | 4 +- gnu/packages/syncthing.scm | 24 +- gnu/packages/synergy.scm | 2 +- gnu/packages/telephony.scm | 8 +- gnu/packages/terminals.scm | 22 +- gnu/packages/tex.scm | 2 +- gnu/packages/texinfo.scm | 2 +- gnu/packages/text-editors.scm | 8 +- gnu/packages/textutils.scm | 8 +- gnu/packages/time.scm | 2 +- gnu/packages/tmux.scm | 10 +- gnu/packages/tor.scm | 2 +- gnu/packages/toys.scm | 2 +- gnu/packages/version-control.scm | 18 +- gnu/packages/video.scm | 44 +- gnu/packages/vim.scm | 4 +- gnu/packages/virtualization.scm | 2 +- gnu/packages/vlang.scm | 4 +- gnu/packages/vnc.scm | 4 +- gnu/packages/vpn.scm | 6 +- gnu/packages/web-browsers.scm | 2 +- gnu/packages/web.scm | 36 +- gnu/packages/wireservice.scm | 10 +- gnu/packages/wm.scm | 32 +- gnu/packages/wxwidgets.scm | 2 +- gnu/packages/xdisorg.scm | 36 +- gnu/packages/xml.scm | 16 +- gnu/packages/xorg.scm | 4 +- tests/lint.scm | 2 +- 192 files changed, 1673 insertions(+), 1673 deletions(-) diff --git a/gnu/packages/ada.scm b/gnu/packages/ada.scm index a8c2bdc9a9..e58b0d7754 100644 --- a/gnu/packages/ada.scm +++ b/gnu/packages/ada.scm @@ -38,7 +38,7 @@ (define-public python2-langkit (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/AdaCore/langkit.git") + (url "https://github.com/AdaCore/langkit") (commit commit))) (sha256 (base32 @@ -70,7 +70,7 @@ (define-public python2-libadalang (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/AdaCore/libadalang.git") + (url "https://github.com/AdaCore/libadalang") (commit commit))) (sha256 (base32 diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 6d8d6650ee..5a867d6c62 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -147,7 +147,7 @@ (define-public ktsuss (method git-fetch) (uri (git-reference - (url "https://github.com/nomius/ktsuss.git") + (url "https://github.com/nomius/ktsuss") (commit version))) (sha256 (base32 "0q9931f9hp47v1n8scli4bdg2rkjpf5jf8v7jj2gdn83aia1r2hz")) @@ -220,7 +220,7 @@ (define-public progress (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Xfennec/progress.git") + (url "https://github.com/Xfennec/progress") (commit (string-append "v" version)))) (sha256 (base32 "1cnb4ixlhshn139mj5sr42k5m6gjjbyqvkn1324c47niwrgp7dqm")) @@ -1488,7 +1488,7 @@ (define-public opendoas (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Duncaen/OpenDoas.git") + (url "https://github.com/Duncaen/OpenDoas") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -1916,7 +1916,7 @@ (define-public detox (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/dharple/detox.git") + (url "https://github.com/dharple/detox") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -2106,7 +2106,7 @@ (define-public fdupes (origin (method git-fetch) (uri (git-reference - (url "https://github.com/adrianlopezroche/fdupes.git") + (url "https://github.com/adrianlopezroche/fdupes") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -2358,7 +2358,7 @@ (define-public cpulimit (origin (method git-fetch) (uri (git-reference - (url "https://github.com/opsengine/cpulimit.git") + (url "https://github.com/opsengine/cpulimit") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -2397,7 +2397,7 @@ (define-public autojump (origin (method git-fetch) (uri (git-reference - (url "https://github.com/wting/autojump.git") + (url "https://github.com/wting/autojump") (commit (string-append "release-v" version)))) (file-name (git-file-name name version)) (sha256 @@ -2443,7 +2443,7 @@ (define-public fasd (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/clvv/fasd.git") + (url "https://github.com/clvv/fasd") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -2675,7 +2675,7 @@ (define-public dstat (origin (method git-fetch) (uri (git-reference - (url "https://github.com/dagwieers/dstat.git") + (url "https://github.com/dagwieers/dstat") (commit (string-append "v" version)))) (file-name (git-file-name "dstat" version)) (sha256 @@ -2727,7 +2727,7 @@ (define-public thefuck (origin (method git-fetch) (uri (git-reference - (url "https://github.com/nvbn/thefuck.git") + (url "https://github.com/nvbn/thefuck") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -2803,7 +2803,7 @@ (define-public cbatticon (origin (method git-fetch) (uri (git-reference - (url "https://github.com/valr/cbatticon.git") + (url "https://github.com/valr/cbatticon") (commit version))) (sha256 (base32 "0ivm2dzhsa9ir25ry418r2qg2llby9j7a6m3arbvq5c3kaj8m9jr")) @@ -2839,7 +2839,7 @@ (define-public interrobang (origin (method git-fetch) (uri (git-reference - (url "https://github.com/TrilbyWhite/interrobang.git") + (url "https://github.com/TrilbyWhite/interrobang") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -2915,7 +2915,7 @@ (define (sunxi-tools-source version) (origin (method git-fetch) (uri (git-reference - (url "https://github.com/linux-sunxi/sunxi-tools.git") + (url "https://github.com/linux-sunxi/sunxi-tools") (commit (string-append "v" version)))) (sha256 (base32 "04f3jqg8ww4jxsf9c6ddcdgy2xbhkyp0b3l5f1hvvbv94p81rjxd")) @@ -3020,7 +3020,7 @@ (define-public sedsed (origin (method git-fetch) (uri (git-reference - (url "https://github.com/aureliojargas/sedsed.git") + (url "https://github.com/aureliojargas/sedsed") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -3423,7 +3423,7 @@ (define-public masscan (origin (method git-fetch) (uri (git-reference - (url "https://github.com/robertdavidgraham/masscan.git") + (url "https://github.com/robertdavidgraham/masscan") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -3534,7 +3534,7 @@ (define-public spindle ;; We use git checkout to avoid github auto-generated tarballs (method git-fetch) (uri (git-reference - (url "https://github.com/hpc/Spindle.git") + (url "https://github.com/hpc/Spindle") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -3745,7 +3745,7 @@ (define-public solaar (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/pwr/Solaar.git") + (url "https://github.com/pwr/Solaar") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -3958,7 +3958,7 @@ (define-public jc (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/kellyjonbrazil/jc.git") + (url "https://github.com/kellyjonbrazil/jc") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -3982,7 +3982,7 @@ (define-public jtbl (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/kellyjonbrazil/jtbl.git") + (url "https://github.com/kellyjonbrazil/jtbl") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -4004,7 +4004,7 @@ (define-public hosts (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/xwmx/hosts.git") + (url "https://github.com/xwmx/hosts") (commit version))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/aidc.scm b/gnu/packages/aidc.scm index 5648f5a9ec..944ea048bf 100644 --- a/gnu/packages/aidc.scm +++ b/gnu/packages/aidc.scm @@ -91,7 +91,7 @@ (define-public libdmtx (origin (method git-fetch) (uri (git-reference - (url "https://github.com/dmtx/libdmtx.git") + (url "https://github.com/dmtx/libdmtx") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -163,7 +163,7 @@ (define-public qrcodegen-cpp (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/nayuki/QR-Code-generator.git") + (url "https://github.com/nayuki/QR-Code-generator") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (patches (search-patches "qrcodegen-cpp-make-install.patch")) diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index c9ff1b8948..f8544e6b90 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -155,7 +155,7 @@ (define-public fplll (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/fplll/fplll.git") + (url "https://github.com/fplll/fplll") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -205,7 +205,7 @@ (define-public python-fpylll ;; Github instead. (method git-fetch) (uri (git-reference - (url "https://github.com/fplll/fpylll.git") + (url "https://github.com/fplll/fpylll") (commit (string-append version "dev")))) (file-name (git-file-name name version)) (sha256 @@ -499,7 +499,7 @@ (define-public arb (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/fredrik-johansson/arb.git") + (url "https://github.com/fredrik-johansson/arb") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -544,7 +544,7 @@ (define-public python-flint (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/fredrik-johansson/python-flint.git") + (url "https://github.com/fredrik-johansson/python-flint") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -737,7 +737,7 @@ (define-public kiss-fft-for-extempore (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/extemporelang/kiss_fft.git") + (url "https://github.com/extemporelang/kiss_fft") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -843,7 +843,7 @@ (define-public java-la4j (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/vkostyukov/la4j.git") + (url "https://github.com/vkostyukov/la4j") (commit version))) (file-name (string-append name "-" version "-checkout")) (sha256 @@ -965,7 +965,7 @@ (define-public symengine (origin (method git-fetch) (uri (git-reference - (url "https://github.com/symengine/symengine.git") + (url "https://github.com/symengine/symengine") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -1084,7 +1084,7 @@ (define-public xtensor (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/QuantStack/xtensor.git") + (url "https://github.com/QuantStack/xtensor") (commit version))) (sha256 (base32 diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index 9ee7d28687..0fb4330d3e 100644 --- a/gnu/packages/android.scm +++ b/gnu/packages/android.scm @@ -65,7 +65,7 @@ (define-public android-make-stub (origin (method git-fetch) (uri (git-reference - (url "https://github.com/daym/android-make-stub.git") + (url "https://github.com/daym/android-make-stub") (commit (string-append "v" version)))) (file-name (string-append "android-make-stub-" version "-checkout")) @@ -99,7 +99,7 @@ (define-public android-googletest (origin (method git-fetch) (uri (git-reference - (url "https://github.com/google/googletest.git") + (url "https://github.com/google/googletest") (commit (string-append "release-" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm index 0357ac1190..e041592dbd 100644 --- a/gnu/packages/animation.scm +++ b/gnu/packages/animation.scm @@ -201,7 +201,7 @@ (define-public papagayo (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/LostMoho/Papagayo.git") + (url "https://github.com/LostMoho/Papagayo") (commit commit))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/arcan.scm b/gnu/packages/arcan.scm index e3f8b60aea..a84bf0d8dd 100644 --- a/gnu/packages/arcan.scm +++ b/gnu/packages/arcan.scm @@ -59,7 +59,7 @@ (define-public arcan (method git-fetch) (file-name (git-file-name name version)) (uri (git-reference - (url "https://github.com/letoram/arcan.git") + (url "https://github.com/letoram/arcan") (commit commit))) (sha256 (base32 "1pd0avlzc2rig1hd37zbhc7r2s6fjzdhshfg9l9cfzibl7caclyw")))) @@ -145,7 +145,7 @@ (define-public arcan (method git-fetch) (file-name "arcan-openal-0.5.4") (uri (git-reference - (url "https://github.com/letoram/openal.git") + (url "https://github.com/letoram/openal") (commit "1c7302c580964fee9ee9e1d89ff56d24f934bdef"))) (sha256 (base32 @@ -195,7 +195,7 @@ (define-public xarcan (method git-fetch) (file-name (git-file-name name version)) (uri (git-reference - (url "https://github.com/letoram/xarcan.git") + (url "https://github.com/letoram/xarcan") (commit commit))) (sha256 (base32 "0zng7cs6733mnf0p6g5wv02981f2sf567n56csax6cmzb8fpamym")))) diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm index 375747a990..50b64a7f65 100644 --- a/gnu/packages/assembly.scm +++ b/gnu/packages/assembly.scm @@ -263,7 +263,7 @@ (define-public rgbds (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/rednex/rgbds.git") + (url "https://github.com/rednex/rgbds") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -310,7 +310,7 @@ (define-public wla-dx (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/vhelin/wla-dx.git") + (url "https://github.com/vhelin/wla-dx") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -380,7 +380,7 @@ (define-public armips (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Kingcom/armips.git") + (url "https://github.com/Kingcom/armips") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index b1308b1dce..736b934d79 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -400,7 +400,7 @@ (define-public audacity (origin (method git-fetch) (uri (git-reference - (url "https://github.com/audacity/audacity.git") + (url "https://github.com/audacity/audacity") (commit (string-append "Audacity-" version)))) (file-name (git-file-name name version)) (sha256 @@ -718,7 +718,7 @@ (define-public caps-plugins-lv2 ;; Actually https://github.com/moddevices/caps-lv2.git, but it's ;; missing fixes for newer glibc, so using the origin of a pull ;; request regarding this issue: - (url "https://github.com/jujudusud/caps-lv2.git") + (url "https://github.com/jujudusud/caps-lv2") (commit "9c9478b7fbd8f9714f552ebe2a6866398b0babfb"))) (file-name (git-file-name name version)) (sha256 @@ -754,7 +754,7 @@ (define-public infamous-plugins (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ssj71/infamousPlugins.git") + (url "https://github.com/ssj71/infamousPlugins") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -793,7 +793,7 @@ (define-public swh-plugins (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/swh/ladspa.git") + (url "https://github.com/swh/ladspa") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -823,7 +823,7 @@ (define-public swh-plugins-lv2 (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/swh/lv2.git") + (url "https://github.com/swh/lv2") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -869,7 +869,7 @@ (define-public csound (origin (method git-fetch) (uri (git-reference - (url "https://github.com/csound/csound.git") + (url "https://github.com/csound/csound") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -1259,7 +1259,7 @@ (define-public fluidsynth (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/FluidSynth/fluidsynth.git") + (url "https://github.com/FluidSynth/fluidsynth") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -1339,7 +1339,7 @@ (define-public faust (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/grame-cncm/faust.git") + (url "https://github.com/grame-cncm/faust") (commit (string-append "v" (string-map (lambda (c) (if (char=? c #\.) #\- c)) @@ -2100,7 +2100,7 @@ (define-public lvtk (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/lvtk/lvtk.git") + (url "https://github.com/lvtk/lvtk") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -2302,7 +2302,7 @@ (define-public qjackrcd (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/orouits/qjackrcd.git") + (url "https://github.com/orouits/qjackrcd") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -2337,7 +2337,7 @@ (define-public supercollider (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/supercollider/supercollider.git") + (url "https://github.com/supercollider/supercollider") (commit (string-append "Version-" version)) ;; for nova-simd, nova-tt, hidapi, TLSF, oscpack (recursive? #t))) @@ -3084,7 +3084,7 @@ (define-public rsound (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Themaister/RSound.git") + (url "https://github.com/Themaister/RSound") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -3123,7 +3123,7 @@ (define-public xjackfreak (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/johnhldavis/xjackfreak.git") + (url "https://github.com/johnhldavis/xjackfreak") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -3308,7 +3308,7 @@ (define-public cuetools (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/svend/cuetools.git") + (url "https://github.com/svend/cuetools") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -3358,7 +3358,7 @@ (define-public dcadec (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/foo86/dcadec.git") + (url "https://github.com/foo86/dcadec") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -3436,7 +3436,7 @@ (define-public filteraudio (origin (method git-fetch) (uri (git-reference - (url "https://github.com/irungentoo/filter_audio.git") + (url "https://github.com/irungentoo/filter_audio") (commit commit))) (file-name (string-append name "-" version "-checkout")) (sha256 @@ -3545,7 +3545,7 @@ (define-public bluez-alsa ;; bootstrapped build system. (method git-fetch) (uri (git-reference - (url "https://github.com/Arkq/bluez-alsa.git") + (url "https://github.com/Arkq/bluez-alsa") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -3654,7 +3654,7 @@ (define-public noise-repellent (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/lucianodato/noise-repellent.git") + (url "https://github.com/lucianodato/noise-repellent") (commit version))) (file-name (string-append name "-" version "-checkout")) (sha256 @@ -3699,7 +3699,7 @@ (define-public cli-visualizer (origin (method git-fetch) (uri (git-reference - (url "https://github.com/dpayne/cli-visualizer.git") + (url "https://github.com/dpayne/cli-visualizer") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -3744,7 +3744,7 @@ (define-public cava (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/karlstav/cava.git") + (url "https://github.com/karlstav/cava") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -3897,7 +3897,7 @@ (define-public faudio (origin (method git-fetch) (uri (git-reference - (url "https://github.com/FNA-XNA/FAudio.git") + (url "https://github.com/FNA-XNA/FAudio") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -4040,7 +4040,7 @@ (define-public carla (method git-fetch) (uri (git-reference - (url "https://github.com/falkTX/Carla.git") + (url "https://github.com/falkTX/Carla") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -4291,7 +4291,7 @@ (define-public codec2 (origin (method git-fetch) (uri (git-reference - (url "https://github.com/drowe67/codec2.git") + (url "https://github.com/drowe67/codec2") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -4324,7 +4324,7 @@ (define-public ableton-link (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Ableton/link.git") + (url "https://github.com/Ableton/link") (commit (string-append "Link-" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/authentication.scm b/gnu/packages/authentication.scm index d995ef7e85..b3ff912c8f 100644 --- a/gnu/packages/authentication.scm +++ b/gnu/packages/authentication.scm @@ -101,7 +101,7 @@ (define-public yubico-pam (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Yubico/yubico-pam.git") + (url "https://github.com/Yubico/yubico-pam") (commit commit))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/avr.scm b/gnu/packages/avr.scm index f8884bb6cb..76af6fdef1 100644 --- a/gnu/packages/avr.scm +++ b/gnu/packages/avr.scm @@ -176,7 +176,7 @@ (define-public microscheme (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ryansuchocki/microscheme.git") + (url "https://github.com/ryansuchocki/microscheme") (commit (string-append "v" version)))) (sha256 (base32 "1r3ng4pw1s9yy1h5rafra1rq19d3vmb5pzbpcz1913wz22qdd976")) diff --git a/gnu/packages/axoloti.scm b/gnu/packages/axoloti.scm index 94d3d818c5..ba49a9d0f0 100644 --- a/gnu/packages/axoloti.scm +++ b/gnu/packages/axoloti.scm @@ -71,7 +71,7 @@ (define-public axoloti-runtime (origin (method git-fetch) (uri (git-reference - (url "https://github.com/axoloti/axoloti.git") + (url "https://github.com/axoloti/axoloti") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -367,7 +367,7 @@ (define-public axoloti-patcher-next (origin (method git-fetch) (uri (git-reference - (url "https://github.com/axoloti/axoloti.git") + (url "https://github.com/axoloti/axoloti") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -607,7 +607,7 @@ (define-public axoloti-patcher-next (origin (method git-fetch) (uri (git-reference - (url "https://github.com/JohannesTaelman/elfloader.git") + (url "https://github.com/JohannesTaelman/elfloader") (commit commit))) (file-name (git-file-name "elfloader" commit)) (sha256 diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index dacade5884..0d82a18aad 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -146,7 +146,7 @@ (define-public par2cmdline (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Parchive/par2cmdline.git") + (url "https://github.com/Parchive/par2cmdline") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -310,7 +310,7 @@ (define-public rdup (origin (method git-fetch) (uri (git-reference - (url "https://github.com/miekg/rdup.git") + (url "https://github.com/miekg/rdup") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -999,7 +999,7 @@ (define-public zbackup (origin (method git-fetch) (uri (git-reference - (url "https://github.com/zbackup/zbackup.git") + (url "https://github.com/zbackup/zbackup") (commit version))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index 1bc636a10b..47ca625d9a 100644 --- a/gnu/packages/bash.scm +++ b/gnu/packages/bash.scm @@ -330,7 +330,7 @@ (define-public bash-tap (origin (method git-fetch) (uri (git-reference - (url "https://github.com/illusori/bash-tap.git") + (url "https://github.com/illusori/bash-tap") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -373,7 +373,7 @@ (define-public bats (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/bats-core/bats-core.git") + (url "https://github.com/bats-core/bats-core") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm index 0ac1833487..9b06cc4d58 100644 --- a/gnu/packages/benchmark.scm +++ b/gnu/packages/benchmark.scm @@ -131,7 +131,7 @@ (define (intel-mpi-benchmarks mpi) (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/intel/mpi-benchmarks.git") + (url "https://github.com/intel/mpi-benchmarks") (commit (string-append "IMB-v" version)))) (file-name (git-file-name name version)) (sha256 @@ -217,7 +217,7 @@ (define-public benchmark (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/google/benchmark.git") + (url "https://github.com/google/benchmark") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 2fe8c3998d..3bf3c75e80 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -2934,7 +2934,7 @@ (define-public r-monocle3 (origin (method git-fetch) (uri (git-reference - (url "https://github.com/cole-trapnell-lab/monocle3.git") + (url "https://github.com/cole-trapnell-lab/monocle3") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -6509,7 +6509,7 @@ (define-public r-cicero-monocle3 (origin (method git-fetch) (uri (git-reference - (url "https://github.com/cole-trapnell-lab/cicero-release.git") + (url "https://github.com/cole-trapnell-lab/cicero-release") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -6530,7 +6530,7 @@ (define-public r-cistopic (origin (method git-fetch) (uri (git-reference - (url "https://github.com/aertslab/cisTopic.git") + (url "https://github.com/aertslab/cisTopic") (commit commit))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 7e97cdea7c..56837844b0 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -189,7 +189,7 @@ (define-public bamm (method git-fetch) ;; BamM is not available on pypi. (uri (git-reference - (url "https://github.com/Ecogenomics/BamM.git") + (url "https://github.com/Ecogenomics/BamM") (commit version) (recursive? #t))) (file-name (git-file-name name version)) @@ -283,7 +283,7 @@ (define-public bamtools (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/pezmaster31/bamtools.git") + (url "https://github.com/pezmaster31/bamtools") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -361,7 +361,7 @@ (define-public bedops (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/bedops/bedops.git") + (url "https://github.com/bedops/bedops") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -484,7 +484,7 @@ (define-public pbbam (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/PacificBiosciences/pbbam.git") + (url "https://github.com/PacificBiosciences/pbbam") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -540,7 +540,7 @@ (define-public blasr-libcpp (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/PacificBiosciences/blasr_libcpp.git") + (url "https://github.com/PacificBiosciences/blasr_libcpp") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -602,7 +602,7 @@ (define-public blasr (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/PacificBiosciences/blasr.git") + (url "https://github.com/PacificBiosciences/blasr") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -693,7 +693,7 @@ (define-public ribodiff (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ratschlab/RiboDiff.git") + (url "https://github.com/ratschlab/RiboDiff") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -737,7 +737,7 @@ (define-public bioawk (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/lh3/bioawk.git") + (url "https://github.com/lh3/bioawk") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -900,7 +900,7 @@ (define-public python-biom-format ;; Use GitHub as source because PyPI distribution does not contain ;; test data: https://github.com/biocore/biom-format/issues/693 (uri (git-reference - (url "https://github.com/biocore/biom-format.git") + (url "https://github.com/biocore/biom-format") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -1567,7 +1567,7 @@ (define-public bowtie (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/BenLangmead/bowtie2.git") + (url "https://github.com/BenLangmead/bowtie2") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -1783,7 +1783,7 @@ (define-public bwa-pssm (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/pkerpedjiev/bwa-pssm.git") + (url "https://github.com/pkerpedjiev/bwa-pssm") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -1813,7 +1813,7 @@ (define-public bwa-meth (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/brentp/bwa-meth.git") + (url "https://github.com/brentp/bwa-meth") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -1887,7 +1887,7 @@ (define-public python-pysam (method git-fetch) ;; Test data is missing on PyPi. (uri (git-reference - (url "https://github.com/pysam-developers/pysam.git") + (url "https://github.com/pysam-developers/pysam") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -2036,7 +2036,7 @@ (define-public tetoolkit (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/mhammell-laboratory/tetoolkit.git") + (url "https://github.com/mhammell-laboratory/tetoolkit") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -2153,7 +2153,7 @@ (define-public clipper (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/YeoLab/clipper.git") + (url "https://github.com/YeoLab/clipper") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -2412,7 +2412,7 @@ (define-public python-deeptools (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/deeptools/deepTools.git") + (url "https://github.com/deeptools/deepTools") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -2480,7 +2480,7 @@ (define-public libbigwig (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/dpryan79/libBigWig.git") + (url "https://github.com/dpryan79/libBigWig") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -2560,7 +2560,7 @@ (define-public python-dendropy (method git-fetch) ;; Source from GitHub so that tests are included. (uri (git-reference - (url "https://github.com/jeetsukumaran/DendroPy.git") + (url "https://github.com/jeetsukumaran/DendroPy") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -2618,7 +2618,7 @@ (define-public delly (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/dellytools/delly.git") + (url "https://github.com/dellytools/delly") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -2665,7 +2665,7 @@ (define-public diamond (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/bbuchfink/diamond.git") + (url "https://github.com/bbuchfink/diamond") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -2700,7 +2700,7 @@ (define-public discrover (origin (method git-fetch) (uri (git-reference - (url "https://github.com/maaskola/discrover.git") + (url "https://github.com/maaskola/discrover") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -2773,7 +2773,7 @@ (define-public eigensoft (origin (method git-fetch) (uri (git-reference - (url "https://github.com/DReichLab/EIG.git") + (url "https://github.com/DReichLab/EIG") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -3021,7 +3021,7 @@ (define-public express (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/adarob/eXpress.git") + (url "https://github.com/adarob/eXpress") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -3072,7 +3072,7 @@ (define-public express-beta-diversity (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/dparks1134/ExpressBetaDiversity.git") + (url "https://github.com/dparks1134/ExpressBetaDiversity") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -3199,7 +3199,7 @@ (define-public flexbar (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/seqan/flexbar.git") + (url "https://github.com/seqan/flexbar") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -3342,7 +3342,7 @@ (define-public fxtract (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ctSkennerton/fxtract.git") + (url "https://github.com/ctSkennerton/fxtract") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -3378,7 +3378,7 @@ (define-public fxtract ,(origin (method git-fetch) (uri (git-reference - (url "https://github.com/ctSkennerton/util.git") + (url "https://github.com/ctSkennerton/util") (commit util-commit))) (file-name (string-append "ctstennerton-util-" util-commit "-checkout")) @@ -3405,7 +3405,7 @@ (define-public gemma (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/xiangzhou/GEMMA.git") + (url "https://github.com/xiangzhou/GEMMA") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -3465,7 +3465,7 @@ (define-public grit (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/nboley/grit.git") + (url "https://github.com/nboley/grit") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -3690,7 +3690,7 @@ (define-public java-htsjdk (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/samtools/htsjdk.git") + (url "https://github.com/samtools/htsjdk") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -3740,7 +3740,7 @@ (define-public java-htsjdk-latest (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/samtools/htsjdk.git") + (url "https://github.com/samtools/htsjdk") (commit version))) (file-name (string-append name "-" version "-checkout")) (sha256 @@ -3784,7 +3784,7 @@ (define-public java-htsjdk-2.10.1 (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/samtools/htsjdk.git") + (url "https://github.com/samtools/htsjdk") (commit version))) (file-name (string-append name "-" version "-checkout")) (sha256 @@ -3812,7 +3812,7 @@ (define-public java-picard (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/broadinstitute/picard.git") + (url "https://github.com/broadinstitute/picard") (commit version))) (file-name (string-append "java-picard-" version "-checkout")) (sha256 @@ -3891,7 +3891,7 @@ (define-public java-picard-2.10.3 (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/broadinstitute/picard.git") + (url "https://github.com/broadinstitute/picard") (commit version))) (file-name (string-append "java-picard-" version "-checkout")) (sha256 @@ -3981,7 +3981,7 @@ (define-public java-picard-1.113 (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/broadinstitute/picard.git") + (url "https://github.com/broadinstitute/picard") (commit version))) (file-name (string-append "java-picard-" version "-checkout")) (sha256 @@ -4178,7 +4178,7 @@ (define-public fastp (origin (method git-fetch) (uri (git-reference - (url "https://github.com/OpenGene/fastp.git") + (url "https://github.com/OpenGene/fastp") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -4258,7 +4258,7 @@ (define-public idr (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/nboley/idr.git") + (url "https://github.com/nboley/idr") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -4349,7 +4349,7 @@ (define-public khmer (origin (method git-fetch) (uri (git-reference - (url "https://github.com/dib-lab/khmer.git") + (url "https://github.com/dib-lab/khmer") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -4457,7 +4457,7 @@ (define-public macs ;; The PyPi tarball does not contain tests. (method git-fetch) (uri (git-reference - (url "https://github.com/taoliu/MACS.git") + (url "https://github.com/taoliu/MACS") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -4580,7 +4580,7 @@ (define-public mash (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/marbl/mash.git") + (url "https://github.com/marbl/mash") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -4719,7 +4719,7 @@ (define-public minced (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ctSkennerton/minced.git") + (url "https://github.com/ctSkennerton/minced") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -4861,7 +4861,7 @@ (define-public newick-utils (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/tjunier/newick_utils.git") + (url "https://github.com/tjunier/newick_utils") (commit commit))) (file-name (string-append name "-" version "-checkout")) (sha256 @@ -4999,7 +4999,7 @@ (define-public pbtranscript-tofu (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/PacificBiosciences/cDNA_primer.git") + (url "https://github.com/PacificBiosciences/cDNA_primer") (commit commit))) (file-name (string-append name "-" version "-checkout")) (sha256 @@ -5220,7 +5220,7 @@ (define-public prodigal (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/hyattpd/Prodigal.git") + (url "https://github.com/hyattpd/Prodigal") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -5369,7 +5369,7 @@ (define-public raxml (origin (method git-fetch) (uri (git-reference - (url "https://github.com/stamatak/standard-RAxML.git") + (url "https://github.com/stamatak/standard-RAxML") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -5410,7 +5410,7 @@ (define-public rsem (origin (method git-fetch) (uri (git-reference - (url "https://github.com/deweylab/RSEM.git") + (url "https://github.com/deweylab/RSEM") (commit (string-append "v" version)))) (sha256 (base32 "1jlq11d1p8qp64w75yj8cnbbd1a93viq10pzsbwal7vdn8fg13j1")) @@ -5699,7 +5699,7 @@ (define-public mosaik ;; There are no release tarballs nor tags. (method git-fetch) (uri (git-reference - (url "https://github.com/wanpinglee/MOSAIK.git") + (url "https://github.com/wanpinglee/MOSAIK") (commit commit))) (file-name (string-append name "-" version)) (sha256 @@ -5745,7 +5745,7 @@ (define-public ngs-sdk (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ncbi/ngs.git") + (url "https://github.com/ncbi/ngs") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -5811,7 +5811,7 @@ (define-public ncbi-vdb (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ncbi/ncbi-vdb.git") + (url "https://github.com/ncbi/ncbi-vdb") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -5983,7 +5983,7 @@ (define-public plink-ng (origin (method git-fetch) (uri (git-reference - (url "https://github.com/chrchang/plink-ng.git") + (url "https://github.com/chrchang/plink-ng") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -6022,7 +6022,7 @@ (define-public smithlab-cpp (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/smithlabcode/smithlab_cpp.git") + (url "https://github.com/smithlabcode/smithlab_cpp") (commit commit))) (file-name (string-append name "-" version "-checkout")) (sha256 @@ -6171,7 +6171,7 @@ (define-public sra-tools (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ncbi/sra-tools.git") + (url "https://github.com/ncbi/sra-tools") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -6381,7 +6381,7 @@ (define-public seqtk (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/lh3/seqtk.git") + (url "https://github.com/lh3/seqtk") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -6417,7 +6417,7 @@ (define-public snap-aligner (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/amplab/snap.git") + (url "https://github.com/amplab/snap") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -6459,7 +6459,7 @@ (define-public sortmerna (origin (method git-fetch) (uri (git-reference - (url "https://github.com/biocore/sortmerna.git") + (url "https://github.com/biocore/sortmerna") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -6505,7 +6505,7 @@ (define-public star (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/alexdobin/STAR.git") + (url "https://github.com/alexdobin/STAR") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -6733,7 +6733,7 @@ (define-public taxtastic ;; The Pypi version does not include tests. (method git-fetch) (uri (git-reference - (url "https://github.com/fhcrc/taxtastic.git") + (url "https://github.com/fhcrc/taxtastic") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -6858,7 +6858,7 @@ (define-public r-scde (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/hms-dbmi/scde.git") + (url "https://github.com/hms-dbmi/scde") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -7304,7 +7304,7 @@ (define-public vsearch (origin (method git-fetch) (uri (git-reference - (url "https://github.com/torognes/vsearch.git") + (url "https://github.com/torognes/vsearch") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -8809,7 +8809,7 @@ (define-public r-chipkernels (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ManuSetty/ChIPKernels.git") + (url "https://github.com/ManuSetty/ChIPKernels") (commit commit))) (file-name (string-append name "-" version)) (sha256 @@ -8843,7 +8843,7 @@ (define-public r-seqgl (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ManuSetty/SeqGL.git") + (url "https://github.com/ManuSetty/SeqGL") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -9019,7 +9019,7 @@ (define-public bits (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/arq5x/bits.git") + (url "https://github.com/arq5x/bits") (commit commit))) (file-name (string-append name "-" version "-checkout")) (sha256 @@ -9065,7 +9065,7 @@ (define-public piranha (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/smithlabcode/piranha.git") + (url "https://github.com/smithlabcode/piranha") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -9104,7 +9104,7 @@ (define-public piranha (origin (method git-fetch) (uri (git-reference - (url "https://github.com/smithlabcode/smithlab_cpp.git") + (url "https://github.com/smithlabcode/smithlab_cpp") (commit commit))) (file-name (string-append "smithlab_cpp-" commit "-checkout")) (sha256 @@ -9157,7 +9157,7 @@ (define-public filevercmp (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ekg/filevercmp.git") + (url "https://github.com/ekg/filevercmp") (commit commit))) (file-name (git-file-name name commit)) (sha256 @@ -9234,7 +9234,7 @@ (define-public variant-tools (origin (method git-fetch) (uri (git-reference - (url "https://github.com/vatlab/varianttools.git") + (url "https://github.com/vatlab/varianttools") ;; There is no tag corresponding to version 3.1.2 (commit "813ae4a90d25b69abc8a40f4f70441fe09015249"))) (file-name (git-file-name name version)) @@ -11134,7 +11134,7 @@ (define-public r-dropbead (origin (method git-fetch) (uri (git-reference - (url "https://github.com/rajewsky-lab/dropbead.git") + (url "https://github.com/rajewsky-lab/dropbead") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -11164,7 +11164,7 @@ (define htslib-for-sambamba (origin (method git-fetch) (uri (git-reference - (url "https://github.com/lomereiter/htslib.git") + (url "https://github.com/lomereiter/htslib") (commit commit))) (file-name (string-append "htslib-" version "-checkout")) (sha256 @@ -11183,7 +11183,7 @@ (define-public sambamba (origin (method git-fetch) (uri (git-reference - (url "https://github.com/lomereiter/sambamba.git") + (url "https://github.com/lomereiter/sambamba") (commit (string-append "v" version)))) (file-name (string-append name "-" version "-checkout")) (sha256 @@ -11232,7 +11232,7 @@ (define-public sambamba (origin (method git-fetch) (uri (git-reference - (url "https://github.com/biod/BioD.git") + (url "https://github.com/biod/BioD") (commit commit))) (file-name (string-append "biod-" (string-take commit 9) @@ -11259,7 +11259,7 @@ (define-public ritornello (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/KlugerLab/Ritornello.git") + (url "https://github.com/KlugerLab/Ritornello") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -11305,7 +11305,7 @@ (define-public trim-galore (origin (method git-fetch) (uri (git-reference - (url "https://github.com/FelixKrueger/TrimGalore.git") + (url "https://github.com/FelixKrueger/TrimGalore") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -11520,7 +11520,7 @@ (define-public tadbit (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/3DGenomes/TADbit.git") + (url "https://github.com/3DGenomes/TADbit") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -11582,7 +11582,7 @@ (define-public kentutils (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ENCODE-DCC/kentUtils.git") + (url "https://github.com/ENCODE-DCC/kentUtils") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -11698,7 +11698,7 @@ (define-public f-seq (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/aboyle/F-seq.git") + (url "https://github.com/aboyle/F-seq") (commit commit))) (file-name (string-append name "-" version)) (sha256 @@ -11756,7 +11756,7 @@ (define-public bismark (origin (method git-fetch) (uri (git-reference - (url "https://github.com/FelixKrueger/Bismark.git") + (url "https://github.com/FelixKrueger/Bismark") (commit version))) (file-name (string-append name "-" version "-checkout")) (sha256 @@ -11908,7 +11908,7 @@ (define-public kallisto (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/pachterlab/kallisto.git") + (url "https://github.com/pachterlab/kallisto") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -11957,7 +11957,7 @@ (define-public libgff (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Kingsford-Group/libgff.git") + (url "https://github.com/Kingsford-Group/libgff") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -11980,7 +11980,7 @@ (define-public sailfish (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/kingsfordgroup/sailfish.git") + (url "https://github.com/kingsfordgroup/sailfish") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -12095,7 +12095,7 @@ (define-public sailfish ("rapmap" ,(origin (method git-fetch) (uri (git-reference - (url "https://github.com/COMBINE-lab/RapMap.git") + (url "https://github.com/COMBINE-lab/RapMap") (commit (string-append "sf-v" version)))) (file-name (string-append "rapmap-sf-v" version "-checkout")) (sha256 @@ -12130,7 +12130,7 @@ (define libstadenio-for-salmon (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/COMBINE-lab/staden-io_lib.git") + (url "https://github.com/COMBINE-lab/staden-io_lib") (commit (string-append "v" version)))) (file-name (string-append name "-" version "-checkout")) (sha256 @@ -12171,7 +12171,7 @@ (define-public salmon (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/COMBINE-lab/salmon.git") + (url "https://github.com/COMBINE-lab/salmon") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -12284,7 +12284,7 @@ (define-public salmon ("rapmap" ,(origin (method git-fetch) (uri (git-reference - (url "https://github.com/COMBINE-lab/RapMap.git") + (url "https://github.com/COMBINE-lab/RapMap") (commit (string-append "salmon-v" version)))) (file-name (string-append "rapmap-salmon-v" version "-checkout")) (sha256 @@ -12317,7 +12317,7 @@ (define-public python-loompy (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/linnarsson-lab/loompy.git") + (url "https://github.com/linnarsson-lab/loompy") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -12360,7 +12360,7 @@ (define-public java-forester (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/cmzmasek/forester.git") + (url "https://github.com/cmzmasek/forester") (commit commit))) (file-name (string-append name "-" version "-checkout")) (sha256 @@ -13200,7 +13200,7 @@ (define-public genrich (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/jsh58/Genrich.git") + (url "https://github.com/jsh58/Genrich") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -13235,7 +13235,7 @@ (define-public mantis (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/splatlab/mantis.git") + (url "https://github.com/splatlab/mantis") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -13302,7 +13302,7 @@ (define-public sjcount (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/pervouchine/sjcount-full.git") + (url "https://github.com/pervouchine/sjcount-full") (commit commit))) (file-name (string-append name "-" version "-checkout")) (sha256 @@ -13447,7 +13447,7 @@ (define-public r-circus (origin (method git-fetch) (uri (git-reference - (url "https://github.com/BIMSBbioinfo/ciRcus.git") + (url "https://github.com/BIMSBbioinfo/ciRcus") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -13493,7 +13493,7 @@ (define-public gffread (origin (method git-fetch) (uri (git-reference - (url "https://github.com/gpertea/gffread.git") + (url "https://github.com/gpertea/gffread") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -13527,7 +13527,7 @@ (define-public gffread (origin (method git-fetch) (uri (git-reference - (url "https://github.com/gpertea/gclib.git") + (url "https://github.com/gpertea/gclib") (commit commit))) (file-name (git-file-name "gclib" version)) (sha256 @@ -13554,7 +13554,7 @@ (define-public find-circ (origin (method git-fetch) (uri (git-reference - (url "https://github.com/marvin-jens/find_circ.git") + (url "https://github.com/marvin-jens/find_circ") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -13834,7 +13834,7 @@ (define-public python-pypairix (origin (method git-fetch) (uri (git-reference - (url "https://github.com/4dn-dcic/pairix.git") + (url "https://github.com/4dn-dcic/pairix") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -13933,7 +13933,7 @@ (define-public python-hicmatrix ;; Version 12 is not available on pypi. (method git-fetch) (uri (git-reference - (url "https://github.com/deeptools/HiCMatrix.git") + (url "https://github.com/deeptools/HiCMatrix") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -13973,7 +13973,7 @@ (define-public python-hicexplorer ;; The latest version is not available on Pypi. (method git-fetch) (uri (git-reference - (url "https://github.com/deeptools/HiCExplorer.git") + (url "https://github.com/deeptools/HiCExplorer") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -14122,7 +14122,7 @@ (define-public r-xbioc (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/renozao/xbioc.git") + (url "https://github.com/renozao/xbioc") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -14155,7 +14155,7 @@ (define-public r-cssam (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/shenorrLab/csSAM.git") + (url "https://github.com/shenorrLab/csSAM") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -14186,7 +14186,7 @@ (define-public r-bseqsc (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/shenorrLab/bseqsc.git") + (url "https://github.com/shenorrLab/bseqsc") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -14234,7 +14234,7 @@ (define-public porechop (origin (method git-fetch) (uri (git-reference - (url "https://github.com/rrwick/Porechop.git") + (url "https://github.com/rrwick/Porechop") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -14265,7 +14265,7 @@ (define-public poretools (origin (method git-fetch) (uri (git-reference - (url "https://github.com/arq5x/poretools.git") + (url "https://github.com/arq5x/poretools") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -14326,7 +14326,7 @@ (define-public jamm (origin (method git-fetch) (uri (git-reference - (url "https://github.com/mahmoudibrahim/JAMM.git") + (url "https://github.com/mahmoudibrahim/JAMM") (commit (string-append "JAMMv" version)))) (file-name (git-file-name name version)) (sha256 @@ -14526,7 +14526,7 @@ (define-public filtlong (origin (method git-fetch) (uri (git-reference - (url "https://github.com/rrwick/Filtlong.git") + (url "https://github.com/rrwick/Filtlong") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -14587,7 +14587,7 @@ (define-public nanopolish (origin (method git-fetch) (uri (git-reference - (url "https://github.com/jts/nanopolish.git") + (url "https://github.com/jts/nanopolish") (commit commit) (recursive? #t))) (file-name (git-file-name name version)) @@ -14661,7 +14661,7 @@ (define-public cnvkit (origin (method git-fetch) (uri (git-reference - (url "https://github.com/etal/cnvkit.git") + (url "https://github.com/etal/cnvkit") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -14697,7 +14697,7 @@ (define-public python-pyfit-sne (origin (method git-fetch) (uri (git-reference - (url "https://github.com/KlugerLab/pyFIt-SNE.git") + (url "https://github.com/KlugerLab/pyFIt-SNE") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -14960,7 +14960,7 @@ (define-public adapterremoval (origin (method git-fetch) (uri (git-reference - (url "https://github.com/MikkelSchubert/adapterremoval.git") + (url "https://github.com/MikkelSchubert/adapterremoval") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -14999,7 +14999,7 @@ (define-public pplacer (origin (method git-fetch) (uri (git-reference - (url "https://github.com/matsen/pplacer.git") + (url "https://github.com/matsen/pplacer") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -15221,7 +15221,7 @@ (define-public ataqv (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ParkerLab/ataqv.git") + (url "https://github.com/ParkerLab/ataqv") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -15262,7 +15262,7 @@ (define-public r-psiplot (origin (method git-fetch) (uri (git-reference - (url "https://github.com/kcha/psiplot.git") + (url "https://github.com/kcha/psiplot") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -15293,7 +15293,7 @@ (define-public python-ont-fast5-api (origin (method git-fetch) (uri (git-reference - (url "https://github.com/nanoporetech/ont_fast5_api.git") + (url "https://github.com/nanoporetech/ont_fast5_api") (commit (string-append "release_" version)))) (file-name (git-file-name name version)) (sha256 @@ -15324,7 +15324,7 @@ (define-public tbsp (origin (method git-fetch) (uri (git-reference - (url "https://github.com/phoenixding/tbsp.git") + (url "https://github.com/phoenixding/tbsp") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -15636,7 +15636,7 @@ (define-public freebayes (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ekg/freebayes.git") + (url "https://github.com/ekg/freebayes") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -15754,7 +15754,7 @@ (define-public samblaster (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/GregoryFaust/samblaster.git") + (url "https://github.com/GregoryFaust/samblaster") (commit (string-append "v." version)))) (file-name (git-file-name name version)) (sha256 @@ -15791,7 +15791,7 @@ (define-public r-velocyto (origin (method git-fetch) (uri (git-reference - (url "https://github.com/velocyto-team/velocyto.R.git") + (url "https://github.com/velocyto-team/velocyto.R") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -15832,7 +15832,7 @@ (define-public methyldackel (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/dpryan79/MethylDackel.git") + (url "https://github.com/dpryan79/MethylDackel") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -15880,7 +15880,7 @@ (define-public python-gffutils (origin (method git-fetch) (uri (git-reference - (url "https://github.com/daler/gffutils.git") + (url "https://github.com/daler/gffutils") (commit commit))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index 3314a6a823..edae9be461 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -192,7 +192,7 @@ (define-public tremc (origin (method git-fetch) (uri (git-reference - (url "https://github.com/tremc/tremc.git") + (url "https://github.com/tremc/tremc") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -223,7 +223,7 @@ (define-public transmission-remote-cli (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/fagga/transmission-remote-cli.git") + (url "https://github.com/fagga/transmission-remote-cli") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -347,7 +347,7 @@ (define-public mktorrent (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Rudde/mktorrent.git") + (url "https://github.com/Rudde/mktorrent") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -421,7 +421,7 @@ (define-public qbittorrent (origin (method git-fetch) (uri (git-reference - (url "https://github.com/qbittorrent/qBittorrent.git") + (url "https://github.com/qbittorrent/qBittorrent") (commit (string-append "release-" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index 9e7c40cd99..6a08b0d6c7 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -288,7 +288,7 @@ (define-public boost-sync (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/boostorg/sync.git") + (url "https://github.com/boostorg/sync") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -317,7 +317,7 @@ (define-public boost-signals2 (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/boostorg/signals2.git") + (url "https://github.com/boostorg/signals2") (commit (string-append "boost-" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index bb00cf431e..7213c1bd0b 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -59,7 +59,7 @@ (define-public bam ;; do not use auto-generated tarballs (method git-fetch) (uri (git-reference - (url "https://github.com/matricks/bam.git") + (url "https://github.com/matricks/bam") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index 8590b1384e..25bc78e6bf 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -351,7 +351,7 @@ (define-public libestr (origin (method git-fetch) (uri (git-reference - (url "https://github.com/rsyslog/libestr.git") + (url "https://github.com/rsyslog/libestr") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -384,7 +384,7 @@ (define-public libfastjson (origin (method git-fetch) (uri (git-reference - (url "https://github.com/rsyslog/libfastjson.git") + (url "https://github.com/rsyslog/libfastjson") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -411,7 +411,7 @@ (define-public liblogging (origin (method git-fetch) (uri (git-reference - (url "https://github.com/rsyslog/liblogging.git") + (url "https://github.com/rsyslog/liblogging") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm index 71b4827578..726687d488 100644 --- a/gnu/packages/calendar.scm +++ b/gnu/packages/calendar.scm @@ -63,7 +63,7 @@ (define-public date (origin (method git-fetch) (uri (git-reference - (url "https://github.com/HowardHinnant/date.git") + (url "https://github.com/HowardHinnant/date") (commit "9a0ee2542848ab8625984fc8cdbfb9b5414c0082"))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index ac8dd26af0..6dee19fb29 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -253,7 +253,7 @@ (define-public cdrdao (origin (method git-fetch) (uri (git-reference - (url "https://github.com/cdrdao/cdrdao.git") + (url "https://github.com/cdrdao/cdrdao") (commit (string-append "rel_" (string-replace-substring version "." "_"))))) (file-name (git-file-name name version)) @@ -555,7 +555,7 @@ (define-public libcue (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/lipnitsk/libcue.git") + (url "https://github.com/lipnitsk/libcue") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 3b946d7482..8dd4b364ef 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -470,7 +470,7 @@ (define-public go-gopkg.in-check.v1 (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/go-check/check.git") + (url "https://github.com/go-check/check") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -576,7 +576,7 @@ (define-public googletest (origin (method git-fetch) (uri (git-reference - (url "https://github.com/google/googletest.git") + (url "https://github.com/google/googletest") (commit (string-append "release-" version)))) (file-name (git-file-name name version)) (sha256 @@ -600,7 +600,7 @@ (define-public googletest-1.8 (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/google/googletest.git") + (url "https://github.com/google/googletest") (commit (string-append "release-" version)))) (file-name (git-file-name "googletest" version)) (sha256 diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm index 0540dfceb6..ddbf5ca098 100644 --- a/gnu/packages/chemistry.scm +++ b/gnu/packages/chemistry.scm @@ -57,7 +57,7 @@ (define-public avogadro (origin (method git-fetch) (uri (git-reference - (url "https://github.com/cryos/avogadro.git") + (url "https://github.com/cryos/avogadro") (commit version))) (sha256 (base32 "0258py3lkba85qhs5ynancinyym61vlp0zaq9yrfs3hhnhpzv9n2")) @@ -313,7 +313,7 @@ (define-public tng (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/gromacs/tng.git") + (url "https://github.com/gromacs/tng") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm index d08363a8dc..b80421d3f7 100644 --- a/gnu/packages/chez.scm +++ b/gnu/packages/chez.scm @@ -46,7 +46,7 @@ (define nanopass (origin (method git-fetch) (uri (git-reference - (url "https://github.com/nanopass/nanopass-framework-scheme.git") + (url "https://github.com/nanopass/nanopass-framework-scheme") (commit (string-append "v" version)))) (sha256 (base32 "0lrngdna6w7v9vlp1a873hgwrwsz2p0pgkccswa4smzvdyhgfsri")) (file-name (git-file-name "nanopass" version))))) @@ -56,7 +56,7 @@ (define stex (origin (method git-fetch) (uri (git-reference - (url "https://github.com/dybvig/stex.git") + (url "https://github.com/dybvig/stex") (commit (string-append "v" version)))) (sha256 (base32 "1jiawhhqnsj42hzmlbq5xby3iarhf8vhiqs0kg1a0zg5jsn6cf8n")) (file-name (git-file-name "stex" version))))) @@ -69,7 +69,7 @@ (define-public chez-scheme (origin (method git-fetch) (uri (git-reference - (url "https://github.com/cisco/ChezScheme.git") + (url "https://github.com/cisco/ChezScheme") (commit (string-append "v" version)))) (sha256 (base32 "1hagrqdp649n2g0wq2a9gfnz7mjcjakkw7ziplbj3db412bb7kx5")) @@ -230,7 +230,7 @@ (define-public chez-srfi (origin (method git-fetch) (uri (git-reference - (url "https://github.com/fedeinthemix/chez-srfi.git") + (url "https://github.com/fedeinthemix/chez-srfi") (commit (string-append "v" version)))) (sha256 (base32 "1vgn984mj2q4w6r2q66h7qklp2hrh85wwh4k9yisga5fi0ps7myf")) @@ -261,7 +261,7 @@ (define-public chez-web (origin (method git-fetch) (uri (git-reference - (url "https://github.com/arcfide/ChezWEB.git") + (url "https://github.com/arcfide/ChezWEB") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -326,7 +326,7 @@ (define-public chez-sockets (origin (method git-fetch) (uri (git-reference - (url "https://github.com/arcfide/chez-sockets.git") + (url "https://github.com/arcfide/chez-sockets") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -456,7 +456,7 @@ (define-public chez-irregex (origin (method git-fetch) (uri (git-reference - (url "https://github.com/fedeinthemix/chez-irregex.git") + (url "https://github.com/fedeinthemix/chez-irregex") (commit (string-append "v" version)))) (sha256 (base32 "0jh6piylw545j81llay9wfivgpv6lcnwd81gm4w17lkasslir50q")) diff --git a/gnu/packages/clojure.scm b/gnu/packages/clojure.scm index 9a1ceed66c..e66132ab40 100644 --- a/gnu/packages/clojure.scm +++ b/gnu/packages/clojure.scm @@ -151,7 +151,7 @@ (define-public clojure-algo-generic (origin (method git-fetch) (uri (git-reference - (url "https://github.com/clojure/algo.generic.git") + (url "https://github.com/clojure/algo.generic") (commit (string-append "algo.generic-" version)))) (file-name (git-file-name name version)) (sha256 @@ -176,7 +176,7 @@ (define-public clojure-algo-monads (origin (method git-fetch) (uri (git-reference - (url "https://github.com/clojure/algo.monads.git") + (url "https://github.com/clojure/algo.monads") (commit (string-append "algo.monads-" version)))) (file-name (git-file-name name version)) (sha256 @@ -205,7 +205,7 @@ (define-public clojure-core-match (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/clojure/core.match.git") + (url "https://github.com/clojure/core.match") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -232,7 +232,7 @@ (define-public clojure-instaparse (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Engelberg/instaparse.git") + (url "https://github.com/Engelberg/instaparse") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -283,7 +283,7 @@ (define-public clojure-tools-macro (origin (method git-fetch) (uri (git-reference - (url "https://github.com/clojure/tools.macro.git") + (url "https://github.com/clojure/tools.macro") (commit (string-append "tools.macro-" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index 7a1dfa5c8c..6229a04deb 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -238,7 +238,7 @@ (define-public cloc (origin (method git-fetch) (uri (git-reference - (url "https://github.com/AlDanial/cloc.git") + (url "https://github.com/AlDanial/cloc") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -422,7 +422,7 @@ (define-public withershins (origin (method git-fetch) (uri (git-reference - (url "https://github.com/cameronwhite/withershins.git") + (url "https://github.com/cameronwhite/withershins") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -482,7 +482,7 @@ (define-public lcov (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/linux-test-project/lcov.git") + (url "https://github.com/linux-test-project/lcov") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -574,7 +574,7 @@ (define-public rtags (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Andersbakken/rtags.git") + (url "https://github.com/Andersbakken/rtags") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (patches (search-patches "rtags-separate-rct.patch")) @@ -626,7 +626,7 @@ (define-public colormake (origin (method git-fetch) (uri (git-reference - (url "https://github.com/pagekite/Colormake.git") + (url "https://github.com/pagekite/Colormake") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -676,7 +676,7 @@ (define-public makefile2graph (origin (method git-fetch) (uri (git-reference - (url "https://github.com/lindenb/makefile2graph.git") + (url "https://github.com/lindenb/makefile2graph") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 730d6a53d8..fd5483b015 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -679,7 +679,7 @@ (define-public sfarklib (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/raboof/sfArkLib.git") + (url "https://github.com/raboof/sfArkLib") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -715,7 +715,7 @@ (define-public sfarkxtc ;; commit at this time. (method git-fetch) (uri (git-reference - (url "https://github.com/raboof/sfarkxtc.git") + (url "https://github.com/raboof/sfarkxtc") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -1004,7 +1004,7 @@ (define-public xdelta (origin (method git-fetch) (uri (git-reference - (url "https://github.com/jmacd/xdelta.git") + (url "https://github.com/jmacd/xdelta") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -1078,7 +1078,7 @@ (define-public snappy (origin (method git-fetch) (uri (git-reference - (url "https://github.com/google/snappy.git") + (url "https://github.com/google/snappy") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -1816,7 +1816,7 @@ (define-public google-brotli (origin (method git-fetch) (uri (git-reference - (url "https://github.com/google/brotli.git") + (url "https://github.com/google/brotli") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -1947,7 +1947,7 @@ (define-public quazip (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/stachenov/quazip.git") + (url "https://github.com/stachenov/quazip") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -2112,7 +2112,7 @@ (define-public xarchiver (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ib/xarchiver.git") + (url "https://github.com/ib/xarchiver") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -2142,7 +2142,7 @@ (define-public tarsplitter (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/AQUAOSOTech/tarsplitter.git") + (url "https://github.com/AQUAOSOTech/tarsplitter") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -2176,7 +2176,7 @@ (define-public c-blosc (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Blosc/c-blosc.git") + (url "https://github.com/Blosc/c-blosc") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/compton.scm b/gnu/packages/compton.scm index 9183348819..940fc83143 100644 --- a/gnu/packages/compton.scm +++ b/gnu/packages/compton.scm @@ -50,7 +50,7 @@ (define-public compton (origin (method git-fetch) (uri (git-reference - (url "https://github.com/chjj/compton.git") + (url "https://github.com/chjj/compton") (commit (string-append "v" upstream-version)))) (sha256 (base32 @@ -119,7 +119,7 @@ (define-public picom (origin (method git-fetch) (uri (git-reference - (url "https://github.com/yshui/picom.git") + (url "https://github.com/yshui/picom") (commit (string-append "v" version)))) (sha256 (base32 diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index 13243578b1..166e66c09e 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -51,7 +51,7 @@ (define-public coq (origin (method git-fetch) (uri (git-reference - (url "https://github.com/coq/coq.git") + (url "https://github.com/coq/coq") (commit (string-append "V" version)))) (file-name (git-file-name name version)) (sha256 @@ -329,7 +329,7 @@ (define-public coq-mathcomp (origin (method git-fetch) (uri (git-reference - (url "https://github.com/math-comp/math-comp.git") + (url "https://github.com/math-comp/math-comp") (commit (string-append "mathcomp-" version)))) (file-name (git-file-name name version)) (sha256 @@ -423,7 +423,7 @@ (define-public coq-bignums (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/coq/bignums.git") + (url "https://github.com/coq/bignums") (commit (string-append "V" version)))) (file-name (git-file-name name version)) (sha256 @@ -552,7 +552,7 @@ (define-public coq-equations (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/mattam82/Coq-Equations.git") + (url "https://github.com/mattam82/Coq-Equations") (commit (string-append "v" version "-8.10")))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 6b29dfc53f..cfbd11618e 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -122,7 +122,7 @@ (define-public dashel (origin (method git-fetch) (uri (git-reference - (url "https://github.com/aseba-community/dashel.git") + (url "https://github.com/aseba-community/dashel") (commit version))) (sha256 (base32 "0anks2l2i2qp0wlzqck1qgpq15a3l6dg8lw2h8s4nsj7f61lffwy")) @@ -147,7 +147,7 @@ (define-public xsimd (origin (method git-fetch) (uri (git-reference - (url "https://github.com/QuantStack/xsimd.git") + (url "https://github.com/QuantStack/xsimd") (commit version))) (sha256 (base32 "1ny2qin1j4h35mljivh8z52kwdyjxf4yxlzb8j52ji91v2ccc88j")) @@ -268,7 +268,7 @@ (define-public xtl (method git-fetch) (uri (git-reference - (url "https://github.com/QuantStack/xtl.git") + (url "https://github.com/QuantStack/xtl") (commit version))) (sha256 (base32 @@ -404,7 +404,7 @@ (define-public sobjectizer (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Stiffstream/sobjectizer.git") + (url "https://github.com/Stiffstream/sobjectizer") (commit (string-append "v." version)))) (sha256 (base32 "0jfai7sqxnnjkms38krm7mssj5l79nb3pllkbyj4j581a7l5j6l5")) @@ -435,7 +435,7 @@ (define-public tweeny (origin (method git-fetch) (uri (git-reference - (url "https://github.com/mobius3/tweeny.git") + (url "https://github.com/mobius3/tweeny") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -462,7 +462,7 @@ (define-public abseil-cpp (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/abseil/abseil-cpp.git") + (url "https://github.com/abseil/abseil-cpp") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -506,7 +506,7 @@ (define-public pegtl (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/taocpp/PEGTL.git") + (url "https://github.com/taocpp/PEGTL") (commit version))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 160e775adc..e565438bc4 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1063,7 +1063,7 @@ (define-public r-shiny (origin (method git-fetch) (uri (git-reference - (url "https://github.com/rstudio/shiny.git") + (url "https://github.com/rstudio/shiny") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -1437,7 +1437,7 @@ (define-public r-sankeyd3 (origin (method git-fetch) (uri (git-reference - (url "https://github.com/fbreitwieser/sankeyD3.git") + (url "https://github.com/fbreitwieser/sankeyD3") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -16234,7 +16234,7 @@ (define-public r-liger (origin (method git-fetch) (uri (git-reference - (url "https://github.com/MacoskoLab/liger.git") + (url "https://github.com/MacoskoLab/liger") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 01018933cb..5532f7e9f8 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -513,7 +513,7 @@ (define-public libscrypt (origin (method git-fetch) (uri (git-reference - (url "https://github.com/technion/libscrypt.git") + (url "https://github.com/technion/libscrypt") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -907,7 +907,7 @@ (define-public asignify (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/vstakhov/asignify.git") + (url "https://github.com/vstakhov/asignify") (commit commit))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index b0bdd6ded6..55b7e4393b 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -295,7 +295,7 @@ (define-public curlpp (origin (method git-fetch) (uri (git-reference - (url "https://github.com/jpbarrette/curlpp.git") + (url "https://github.com/jpbarrette/curlpp") (commit (string-append "v" version)))) (sha256 (base32 "1b0ylnnrhdax4kwjq64r1fk0i24n5ss6zfzf4hxwgslny01xiwrk")) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 9befa64a16..55fc4f8850 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -148,7 +148,7 @@ (define-public 4store (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/4store/4store.git") + (url "https://github.com/4store/4store") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -1433,7 +1433,7 @@ (define-public sqlcrush (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/coffeeandscripts/sqlcrush.git") + (url "https://github.com/coffeeandscripts/sqlcrush") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -2192,7 +2192,7 @@ (define-public lmdbxx (origin (method git-fetch) (uri (git-reference - (url "https://github.com/drycpp/lmdbxx.git") + (url "https://github.com/drycpp/lmdbxx") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -2421,7 +2421,7 @@ (define-public mdbtools (origin (method git-fetch) (uri (git-reference - (url "https://github.com/brianb/mdbtools.git") + (url "https://github.com/brianb/mdbtools") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -3157,7 +3157,7 @@ (define-public python-pypika (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/kayak/pypika.git") + (url "https://github.com/kayak/pypika") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/datastructures.scm b/gnu/packages/datastructures.scm index 864f1840f3..b996a537cf 100644 --- a/gnu/packages/datastructures.scm +++ b/gnu/packages/datastructures.scm @@ -86,7 +86,7 @@ (define-public sparsehash (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/sparsehash/sparsehash.git") + (url "https://github.com/sparsehash/sparsehash") (commit (string-append name "-" version)))) (file-name (git-file-name name version)) (sha256 @@ -161,7 +161,7 @@ (define-public uthash (origin (method git-fetch) (uri (git-reference - (url "https://github.com/troydhanson/uthash.git") + (url "https://github.com/troydhanson/uthash") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -263,7 +263,7 @@ (define-public libdivsufsort (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/y-256/libdivsufsort.git") + (url "https://github.com/y-256/libdivsufsort") (commit version))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm index cceebb00c8..f3e01de675 100644 --- a/gnu/packages/debug.scm +++ b/gnu/packages/debug.scm @@ -402,7 +402,7 @@ (define-public stress-make (origin (method git-fetch) (uri (git-reference - (url "https://github.com/lanl/stress-make.git") + (url "https://github.com/lanl/stress-make") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -606,7 +606,7 @@ (define-public mspdebug (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/dlbeer/mspdebug.git") + (url "https://github.com/dlbeer/mspdebug") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 7b94a95008..a5278d8c8c 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -96,7 +96,7 @@ (define-public udevil (method git-fetch) (uri (git-reference - (url "https://github.com/IgnorantGuru/udevil.git") + (url "https://github.com/IgnorantGuru/udevil") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -486,7 +486,7 @@ (define-public f3 (origin (method git-fetch) (uri (git-reference - (url "https://github.com/AltraMayor/f3.git") + (url "https://github.com/AltraMayor/f3") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -524,7 +524,7 @@ (define-public python-parted (origin (method git-fetch) (uri (git-reference - (url "https://github.com/dcantrell/pyparted.git") + (url "https://github.com/dcantrell/pyparted") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -565,7 +565,7 @@ (define-public duperemove (origin (method git-fetch) (uri (git-reference - (url "https://github.com/markfasheh/duperemove.git") + (url "https://github.com/markfasheh/duperemove") (commit (string-append "v" version)))) (sha256 (base32 "1scz76pvpljvrpfn176125xwaqwyy4pirlm11sc9spb2hyzknw2z")) @@ -695,7 +695,7 @@ (define-public ndctl (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/pmem/ndctl.git") + (url "https://github.com/pmem/ndctl") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -918,7 +918,7 @@ (define-public lf (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/gokcehan/lf.git") + (url "https://github.com/gokcehan/lf") (commit (string-append "r" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/distributed.scm b/gnu/packages/distributed.scm index d861484d22..0e5fe5ef69 100644 --- a/gnu/packages/distributed.scm +++ b/gnu/packages/distributed.scm @@ -48,7 +48,7 @@ (define-public boinc-client (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/boinc/boinc.git") + (url "https://github.com/boinc/boinc") (commit (string-append "client_release/" (version-major+minor version) "/" version)))) diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index 0cf414ad41..f723fcae50 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -132,7 +132,7 @@ (define-public python-django-extensions (method git-fetch) ;; Fetch from the git repository, so that the tests can be run. (uri (git-reference - (url "https://github.com/django-extensions/django-extensions.git") + (url "https://github.com/django-extensions/django-extensions") (commit version))) (file-name (string-append name "-" version)) (sha256 @@ -375,7 +375,7 @@ (define-public python-django-debug-toolbar (origin (method git-fetch) (uri (git-reference - (url "https://github.com/jazzband/django-debug-toolbar.git") + (url "https://github.com/jazzband/django-debug-toolbar") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -483,7 +483,7 @@ (define-public python-django-jinja (origin (method git-fetch) (uri (git-reference - (url "https://github.com/niwinz/django-jinja.git") + (url "https://github.com/niwinz/django-jinja") (commit version))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/dlang.scm b/gnu/packages/dlang.scm index 5db012c680..6cdb2efd14 100644 --- a/gnu/packages/dlang.scm +++ b/gnu/packages/dlang.scm @@ -88,7 +88,7 @@ (define-public ldc-bootstrap (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ldc-developers/ldc.git") + (url "https://github.com/ldc-developers/ldc") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -156,7 +156,7 @@ (define-public ldc-bootstrap ,(origin (method git-fetch) (uri (git-reference - (url "https://github.com/ldc-developers/phobos.git") + (url "https://github.com/ldc-developers/phobos") (commit (string-append "ldc-v" version)))) (file-name (git-file-name "phobos" version)) (sha256 @@ -166,7 +166,7 @@ (define-public ldc-bootstrap ,(origin (method git-fetch) (uri (git-reference - (url "https://github.com/ldc-developers/druntime.git") + (url "https://github.com/ldc-developers/druntime") (commit (string-append "ldc-v" version)))) (file-name (git-file-name "druntime" version)) (sha256 @@ -175,7 +175,7 @@ (define-public ldc-bootstrap ,(origin (method git-fetch) (uri (git-reference - (url "https://github.com/ldc-developers/dmd-testsuite.git") + (url "https://github.com/ldc-developers/dmd-testsuite") (commit (string-append "ldc-v" version)))) (file-name (git-file-name "dmd-testsuite" version)) (sha256 @@ -206,7 +206,7 @@ (define-public ldc (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ldc-developers/ldc.git") + (url "https://github.com/ldc-developers/ldc") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -273,7 +273,7 @@ (define-public ldc ,(origin (method git-fetch) (uri (git-reference - (url "https://github.com/ldc-developers/phobos.git") + (url "https://github.com/ldc-developers/phobos") (commit (string-append "ldc-v" older-version)))) (file-name (git-file-name "phobos" older-version)) (sha256 @@ -292,7 +292,7 @@ (define-public ldc ,(origin (method git-fetch) (uri (git-reference - (url "https://github.com/ldc-developers/druntime.git") + (url "https://github.com/ldc-developers/druntime") (commit (string-append "ldc-v" older-version)))) (file-name (git-file-name "druntime" older-version)) (sha256 @@ -301,7 +301,7 @@ (define-public ldc ,(origin (method git-fetch) (uri (git-reference - (url "https://github.com/ldc-developers/dmd-testsuite.git") + (url "https://github.com/ldc-developers/dmd-testsuite") (commit (string-append "ldc-v" older-version)))) (file-name (git-file-name "dmd-testsuite" older-version)) (sha256 @@ -315,7 +315,7 @@ (define-public dub (origin (method git-fetch) (uri (git-reference - (url "https://github.com/dlang/dub.git") + (url "https://github.com/dlang/dub") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index cb850745ca..1d893e46d7 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -762,7 +762,7 @@ (define-public ddclient (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ddclient/ddclient.git") + (url "https://github.com/ddclient/ddclient") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -929,7 +929,7 @@ (define-public public-suffix-list (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/publicsuffix/list.git") + (url "https://github.com/publicsuffix/list") (commit commit))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 8c6a14e662..a5589535c0 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -179,7 +179,7 @@ (define-public containerd (origin (method git-fetch) (uri (git-reference - (url "https://github.com/containerd/containerd.git") + (url "https://github.com/containerd/containerd") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -257,7 +257,7 @@ (define docker-libnetwork (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/docker/libnetwork.git") + (url "https://github.com/docker/libnetwork") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -311,7 +311,7 @@ (define-public docker (origin (method git-fetch) (uri (git-reference - (url "https://github.com/docker/engine.git") + (url "https://github.com/docker/engine") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -601,7 +601,7 @@ (define-public docker-cli (origin (method git-fetch) (uri (git-reference - (url "https://github.com/docker/cli.git") + (url "https://github.com/docker/cli") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -671,7 +671,7 @@ (define-public cqfd (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/savoirfairelinux/cqfd.git") + (url "https://github.com/savoirfairelinux/cqfd") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -709,7 +709,7 @@ (define-public tini (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/krallin/tini.git") + (url "https://github.com/krallin/tini") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 47d3145ad2..99e7b669b4 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -279,7 +279,7 @@ (define-public snap (origin (method git-fetch) (uri (git-reference - (url "https://github.com/jmoenig/Snap.git") + (url "https://github.com/jmoenig/Snap") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/efi.scm b/gnu/packages/efi.scm index bc27a7a504..12cadd6036 100644 --- a/gnu/packages/efi.scm +++ b/gnu/packages/efi.scm @@ -187,7 +187,7 @@ (define-public efilinux (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/mfleming/efilinux.git") + (url "https://github.com/mfleming/efilinux") (commit (string-append "efilinux-" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/elixir.scm b/gnu/packages/elixir.scm index b034400db8..8a2b6b302c 100644 --- a/gnu/packages/elixir.scm +++ b/gnu/packages/elixir.scm @@ -38,7 +38,7 @@ (define-public elixir (origin (method git-fetch) (uri (git-reference - (url "https://github.com/elixir-lang/elixir.git") + (url "https://github.com/elixir-lang/elixir") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f90f2c4e4f..9e053da7df 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -239,7 +239,7 @@ (define-public emacs-ac-geiser (source (origin (uri (git-reference - (url "https://github.com/xiaohanyu/ac-geiser.git") + (url "https://github.com/xiaohanyu/ac-geiser") (commit commit))) (method git-fetch) (sha256 @@ -383,7 +383,7 @@ (define-public emacs-with-editor (origin (method git-fetch) (uri (git-reference - (url "https://github.com/magit/with-editor.git") + (url "https://github.com/magit/with-editor") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -409,7 +409,7 @@ (define-public emacs-libgit (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/magit/libegit2.git") + (url "https://github.com/magit/libegit2") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -487,7 +487,7 @@ (define-public emacs-magit (origin (method git-fetch) (uri (git-reference - (url "https://github.com/magit/magit.git") + (url "https://github.com/magit/magit") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -598,7 +598,7 @@ (define-public emacs-magit-popup (origin (method git-fetch) (uri (git-reference - (url "https://github.com/magit/magit-popup.git") + (url "https://github.com/magit/magit-popup") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -632,7 +632,7 @@ (define-public emacs-magit-annex (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/magit/magit-annex.git") + (url "https://github.com/magit/magit-annex") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -655,7 +655,7 @@ (define-public emacs-minions (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/tarsius/minions.git") + (url "https://github.com/tarsius/minions") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -687,7 +687,7 @@ (define-public emacs-treepy (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/volrath/treepy.el.git") + (url "https://github.com/volrath/treepy.el") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -715,7 +715,7 @@ (define-public emacs-graphql #t)) (method git-fetch) (uri (git-reference - (url "https://github.com/vermiculus/graphql.el.git") + (url "https://github.com/vermiculus/graphql.el") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -778,7 +778,7 @@ (define-public emacs-typit (origin (method git-fetch) (uri (git-reference - (url "https://github.com/mrkkrp/typit.git") + (url "https://github.com/mrkkrp/typit") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -815,7 +815,7 @@ (define-public emacs-scribble-mode (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/emacs-pe/scribble-mode.git") + (url "https://github.com/emacs-pe/scribble-mode") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -1078,7 +1078,7 @@ (define-public emacs-flymake-shellcheck (origin (method git-fetch) (uri (git-reference - (url "https://github.com/federicotdn/flymake-shellcheck.git") + (url "https://github.com/federicotdn/flymake-shellcheck") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -1099,7 +1099,7 @@ (define-public emacs-a (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/plexus/a.el.git") + (url "https://github.com/plexus/a.el") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -1146,7 +1146,7 @@ (define-public emacs-anaphora (origin (method git-fetch) (uri (git-reference - (url "https://github.com/rolandwalker/anaphora.git") + (url "https://github.com/rolandwalker/anaphora") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -1252,7 +1252,7 @@ (define-public emacs-reformatter (origin (method git-fetch) (uri (git-reference - (url "https://github.com/purcell/reformatter.el.git") + (url "https://github.com/purcell/reformatter.el") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -1299,7 +1299,7 @@ (define-public emacs-bug-hunter (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Malabarba/elisp-bug-hunter.git") + (url "https://github.com/Malabarba/elisp-bug-hunter") (commit commit))) (file-name (git-file-name name commit)) (sha256 @@ -1461,7 +1461,7 @@ (define-public emacs-eww-lnum (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/m00natic/eww-lnum.git") + (url "https://github.com/m00natic/eww-lnum") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -1599,7 +1599,7 @@ (define-public emacs-ace-link (origin (method git-fetch) (uri (git-reference - (url "https://github.com/abo-abo/ace-link.git") + (url "https://github.com/abo-abo/ace-link") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -1627,7 +1627,7 @@ (define-public emacs-auto-sudoedit (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ncaq/auto-sudoedit.git") + (url "https://github.com/ncaq/auto-sudoedit") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -1721,7 +1721,7 @@ (define-public emacs-ctrlf (origin (method git-fetch) (uri (git-reference - (url "https://github.com/raxod502/ctrlf.git") + (url "https://github.com/raxod502/ctrlf") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -1805,7 +1805,7 @@ (define-public emacs-ag (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Wilfred/ag.el.git") + (url "https://github.com/Wilfred/ag.el") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -1916,7 +1916,7 @@ (define-public emacs-autothemer (origin (method git-fetch) (uri (git-reference - (url "https://github.com/sebastiansturm/autothemer.git") + (url "https://github.com/sebastiansturm/autothemer") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -1976,7 +1976,7 @@ (define-public emacs-bm (origin (method git-fetch) (uri (git-reference - (url "https://github.com/joodland/bm.git") + (url "https://github.com/joodland/bm") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -1996,7 +1996,7 @@ (define-public emacs-calfw (origin (method git-fetch) (uri (git-reference - (url "https://github.com/kiwanami/emacs-calfw.git") + (url "https://github.com/kiwanami/emacs-calfw") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -2072,7 +2072,7 @@ (define-public emacs-direnv (origin (method git-fetch) (uri (git-reference - (url "https://github.com/wbolster/emacs-direnv.git") + (url "https://github.com/wbolster/emacs-direnv") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -2124,7 +2124,7 @@ (define-public emacs-form-feed (origin (method git-fetch) (uri (git-reference - (url "https://github.com/wasamasa/form-feed.git") + (url "https://github.com/wasamasa/form-feed") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -2203,7 +2203,7 @@ (define-public emacs-go-mode (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/dominikh/go-mode.el.git") + (url "https://github.com/dominikh/go-mode.el") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -2231,7 +2231,7 @@ (define-public emacs-google-maps (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/jd/google-maps.el.git") + (url "https://github.com/jd/google-maps.el") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -2252,7 +2252,7 @@ (define-public emacs-graphviz-dot-mode (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ppareit/graphviz-dot-mode.git") + (url "https://github.com/ppareit/graphviz-dot-mode") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -2343,7 +2343,7 @@ (define-public emacs-mmt (origin (method git-fetch) (uri (git-reference - (url "https://github.com/mrkkrp/mmt.git") + (url "https://github.com/mrkkrp/mmt") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -2362,7 +2362,7 @@ (define-public emacs-tablist (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/politza/tablist.git") + (url "https://github.com/politza/tablist") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -2503,7 +2503,7 @@ (define-public emacs-dash (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/magnars/dash.el.git") + (url "https://github.com/magnars/dash.el") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -2618,7 +2618,7 @@ (define-public emacs-d-mode (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Emacs-D-Mode-Maintainers/Emacs-D-Mode.git") + (url "https://github.com/Emacs-D-Mode-Maintainers/Emacs-D-Mode") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -2644,7 +2644,7 @@ (define-public emacs-extempore-mode (origin (method git-fetch) (uri (git-reference - (url "https://github.com/extemporelang/extempore-emacs-mode.git") + (url "https://github.com/extemporelang/extempore-emacs-mode") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -2670,7 +2670,7 @@ (define-public emacs-kakoune (origin (method git-fetch) (uri (git-reference - (url "https://github.com/jmorag/kakoune.el.git") + (url "https://github.com/jmorag/kakoune.el") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -2715,7 +2715,7 @@ (define-public emacs-olivetti (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/rnkn/olivetti.git") + (url "https://github.com/rnkn/olivetti") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -2756,7 +2756,7 @@ (define-public emacs-s (origin (method git-fetch) (uri (git-reference - (url "https://github.com/magnars/s.el.git") + (url "https://github.com/magnars/s.el") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -2780,7 +2780,7 @@ (define-public emacs-symon (origin (method git-fetch) (uri (git-reference - (url "https://github.com/zk-phi/symon.git") + (url "https://github.com/zk-phi/symon") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -2829,7 +2829,7 @@ (define-public emacs-toml-mode (origin (method git-fetch) (uri (git-reference - (url "https://github.com/dryman/toml-mode.el.git") + (url "https://github.com/dryman/toml-mode.el") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -2873,7 +2873,7 @@ (define-public emacs-f (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/rejeep/f.el.git") + (url "https://github.com/rejeep/f.el") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -2919,7 +2919,7 @@ (define-public emacs-fringe-helper (origin (method git-fetch) (uri (git-reference - (url "https://github.com/nschum/fringe-helper.el.git") + (url "https://github.com/nschum/fringe-helper.el") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -2945,7 +2945,7 @@ (define-public emacs-git-gutter (origin (method git-fetch) (uri (git-reference - (url "https://github.com/syohex/emacs-git-gutter.git") + (url "https://github.com/syohex/emacs-git-gutter") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -2973,7 +2973,7 @@ (define-public emacs-git-gutter-fringe (origin (method git-fetch) (uri (git-reference - (url "https://github.com/syohex/git-gutter-fringe.git") + (url "https://github.com/syohex/git-gutter-fringe") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -2997,7 +2997,7 @@ (define-public emacs-git-link (origin (method git-fetch) (uri (git-reference - (url "https://github.com/sshaw/git-link.git") + (url "https://github.com/sshaw/git-link") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -3022,7 +3022,7 @@ (define-public emacs-apheleia (origin (method git-fetch) (uri (git-reference - (url "https://github.com/raxod502/apheleia.git") + (url "https://github.com/raxod502/apheleia") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -3099,7 +3099,7 @@ (define-public emacs-el-mock (origin (method git-fetch) (uri (git-reference - (url "https://github.com/rejeep/el-mock.el.git") + (url "https://github.com/rejeep/el-mock.el") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -3121,7 +3121,7 @@ (define-public emacs-espuds (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ecukes/espuds.git") + (url "https://github.com/ecukes/espuds") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -3148,7 +3148,7 @@ (define-public emacs-spark (origin (method git-fetch) (uri (git-reference - (url "https://github.com/alvinfrancis/spark.git") + (url "https://github.com/alvinfrancis/spark") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -3170,7 +3170,7 @@ (define-public emacs-es-mode (origin (method git-fetch) (uri (git-reference - (url "https://github.com/dakrone/es-mode.git") + (url "https://github.com/dakrone/es-mode") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -3200,7 +3200,7 @@ (define-public emacs-expand-region (origin (method git-fetch) (uri (git-reference - (url "https://github.com/magnars/expand-region.el.git") + (url "https://github.com/magnars/expand-region.el") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -3222,7 +3222,7 @@ (define-public emacs-fill-column-indicator (origin (method git-fetch) (uri (git-reference - (url "https://github.com/alpaker/Fill-Column-Indicator.git") + (url "https://github.com/alpaker/Fill-Column-Indicator") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -3243,7 +3243,7 @@ (define-public emacs-grep-a-lot (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ZungBang/emacs-grep-a-lot.git") + (url "https://github.com/ZungBang/emacs-grep-a-lot") (commit "9f9f645b9e308a0d887b66864ff97d0fca1ba4ad"))) (file-name (git-file-name name version)) (sha256 @@ -3262,7 +3262,7 @@ (define-public emacs-fd (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/yqrashawn/fd-dired.git") + (url "https://github.com/yqrashawn/fd-dired") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -3283,7 +3283,7 @@ (define-public emacs-rg (origin (method git-fetch) (uri (git-reference - (url "https://github.com/dajva/rg.el.git") + (url "https://github.com/dajva/rg.el") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -3320,7 +3320,7 @@ (define-public emacs-inf-ruby (origin (method git-fetch) (uri (git-reference - (url "https://github.com/nonsequitur/inf-ruby.git") + (url "https://github.com/nonsequitur/inf-ruby") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -3365,7 +3365,7 @@ (define-public emacs-erc-status-sidebar (origin (method git-fetch) (uri (git-reference - (url "https://github.com/drewbarbs/erc-status-sidebar.git") + (url "https://github.com/drewbarbs/erc-status-sidebar") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -3389,7 +3389,7 @@ (define-public emacs-shut-up (origin (method git-fetch) (uri (git-reference - (url "https://github.com/cask/shut-up.git") + (url "https://github.com/cask/shut-up") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -3409,7 +3409,7 @@ (define-public emacs-undercover (origin (method git-fetch) (uri (git-reference - (url "https://github.com/sviridov/undercover.el.git") + (url "https://github.com/sviridov/undercover.el") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -3433,7 +3433,7 @@ (define-public emacs-paren-face (origin (method git-fetch) (uri (git-reference - (url "https://github.com/tarsius/paren-face.git") + (url "https://github.com/tarsius/paren-face") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -3459,7 +3459,7 @@ (define-public emacs-page-break-lines (origin (method git-fetch) (uri (git-reference - (url "https://github.com/purcell/page-break-lines.git") + (url "https://github.com/purcell/page-break-lines") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -3480,7 +3480,7 @@ (define-public emacs-simple-httpd (origin (method git-fetch) (uri (git-reference - (url "https://github.com/skeeto/emacs-web-server.git") + (url "https://github.com/skeeto/emacs-web-server") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -3501,7 +3501,7 @@ (define-public emacs-skewer-mode (origin (method git-fetch) (uri (git-reference - (url "https://github.com/skeeto/skewer-mode.git") + (url "https://github.com/skeeto/skewer-mode") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -3528,7 +3528,7 @@ (define-public emacs-litable (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Fuco1/litable.git") + (url "https://github.com/Fuco1/litable") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -3584,7 +3584,7 @@ (define-public emacs-stripe-buffer (origin (method git-fetch) (uri (git-reference - (url "https://github.com/sabof/stripe-buffer.git") + (url "https://github.com/sabof/stripe-buffer") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -3630,7 +3630,7 @@ (define-public emacs-org-rich-yank (origin (method git-fetch) (uri (git-reference - (url "https://github.com/unhammer/org-rich-yank.git") + (url "https://github.com/unhammer/org-rich-yank") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -3654,7 +3654,7 @@ (define-public emacs-ob-erlang (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/xfwduke/ob-erlang.git") + (url "https://github.com/xfwduke/ob-erlang") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -3676,7 +3676,7 @@ (define-public emacs-ob-restclient (origin (method git-fetch) (uri (git-reference - (url "https://github.com/alf/ob-restclient.el.git") + (url "https://github.com/alf/ob-restclient.el") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -3699,7 +3699,7 @@ (define-public emacs-org-now (origin (method git-fetch) (uri (git-reference - (url "https://github.com/alphapapa/org-now.git") + (url "https://github.com/alphapapa/org-now") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -3724,7 +3724,7 @@ (define-public emacs-rich-minority (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Malabarba/rich-minority.git") + (url "https://github.com/Malabarba/rich-minority") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -3746,7 +3746,7 @@ (define-public emacs-robe (origin (method git-fetch) (uri (git-reference - (url "https://github.com/dgutov/robe.git") + (url "https://github.com/dgutov/robe") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -3775,7 +3775,7 @@ (define-public emacs-robot-mode (method git-fetch) (uri (git-reference ;; A better maintained fork of robot-mode. - (url "https://github.com/jvalkeejarvi/robot-mode.git") + (url "https://github.com/jvalkeejarvi/robot-mode") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -3800,7 +3800,7 @@ (define-public emacs-rspec (origin (method git-fetch) (uri (git-reference - (url "https://github.com/pezra/rspec-mode.git") + (url "https://github.com/pezra/rspec-mode") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -3829,7 +3829,7 @@ (define-public emacs-smart-mode-line (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Malabarba/smart-mode-line.git") + (url "https://github.com/Malabarba/smart-mode-line") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -3855,7 +3855,7 @@ (define-public emacs-sr-speedbar (origin (method git-fetch) (uri (git-reference - (url "https://github.com/emacsorphanage/sr-speedbar.git") + (url "https://github.com/emacsorphanage/sr-speedbar") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -3878,7 +3878,7 @@ (define-public emacs-shell-switcher (origin (method git-fetch) (uri (git-reference - (url "https://github.com/DamienCassou/shell-switcher.git") + (url "https://github.com/DamienCassou/shell-switcher") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -4276,7 +4276,7 @@ (define-public emacs-ob-ipython (method git-fetch) (uri (git-reference (commit "7147455230841744fb5b95dcbe03320313a77124") - (url "https://github.com/gregsexton/ob-ipython.git"))) + (url "https://github.com/gregsexton/ob-ipython"))) (file-name (git-file-name name version)) (sha256 (base32 @@ -4415,7 +4415,7 @@ (define-public emacs-company (origin (method git-fetch) (uri (git-reference - (url "https://github.com/company-mode/company-mode.git") + (url "https://github.com/company-mode/company-mode") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -4454,7 +4454,7 @@ (define-public emacs-company-posframe (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/tumashu/company-posframe.git") + (url "https://github.com/tumashu/company-posframe") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -4531,7 +4531,7 @@ (define-public emacs-company-irony (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Sarcasm/company-irony.git") + (url "https://github.com/Sarcasm/company-irony") (commit (string-append "v" version)))) (sha256 (base32 "1qgyam2vyjw90kpxns5cd6bq3qiqjhzpwrlvmi18vyb69qcgqd8a")) @@ -4553,7 +4553,7 @@ (define-public emacs-flycheck-irony (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Sarcasm/flycheck-irony.git") + (url "https://github.com/Sarcasm/flycheck-irony") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -4577,7 +4577,7 @@ (define-public emacs-irony-eldoc (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ikirill/irony-eldoc.git") + (url "https://github.com/ikirill/irony-eldoc") (commit "0df5831eaae264a25422b061eb2792aadde8b3f2"))) (file-name (git-file-name name version)) (sha256 @@ -4603,7 +4603,7 @@ (define-public emacs-company-quickhelp (origin (method git-fetch) (uri (git-reference - (url "https://github.com/expez/company-quickhelp.git") + (url "https://github.com/expez/company-quickhelp") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -4628,7 +4628,7 @@ (define-public emacs-math-symbol-lists (origin (method git-fetch) (uri (git-reference - (url "https://github.com/vspinu/math-symbol-lists.git") + (url "https://github.com/vspinu/math-symbol-lists") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -4687,7 +4687,7 @@ (define-public emacs-company-math (origin (method git-fetch) (uri (git-reference - (url "https://github.com/vspinu/company-math.git") + (url "https://github.com/vspinu/company-math") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -4734,7 +4734,7 @@ (define-public emacs-icomplete-vertical (origin (method git-fetch) (uri (git-reference - (url "https://github.com/oantolin/icomplete-vertical.git") + (url "https://github.com/oantolin/icomplete-vertical") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -4785,7 +4785,7 @@ (define-public emacs-nswbuff (origin (method git-fetch) (uri (git-reference - (url "https://github.com/joostkremers/nswbuff.git") + (url "https://github.com/joostkremers/nswbuff") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -4807,7 +4807,7 @@ (define-public emacs-phi-search (origin (method git-fetch) (uri (git-reference - (url "https://github.com/zk-phi/phi-search.git") + (url "https://github.com/zk-phi/phi-search") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -4829,7 +4829,7 @@ (define-public emacs-phi-search-mc (origin (method git-fetch) (uri (git-reference - (url "https://github.com/knu/phi-search-mc.el.git") + (url "https://github.com/knu/phi-search-mc.el") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -4854,7 +4854,7 @@ (define-public emacs-multiple-cursors (origin (method git-fetch) (uri (git-reference - (url "https://github.com/magnars/multiple-cursors.el.git") + (url "https://github.com/magnars/multiple-cursors.el") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -4877,7 +4877,7 @@ (define-public emacs-mc-extras (origin (method git-fetch) (uri (git-reference - (url "https://github.com/knu/mc-extras.el.git") + (url "https://github.com/knu/mc-extras.el") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -4924,7 +4924,7 @@ (define-public emacs-company-lsp (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/tigersoldier/company-lsp.git") + (url "https://github.com/tigersoldier/company-lsp") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -4983,7 +4983,7 @@ (define-public emacs-scheme-complete (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ashinn/scheme-complete.git") + (url "https://github.com/ashinn/scheme-complete") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -5012,7 +5012,7 @@ (define-public emacs-scel (origin (method git-fetch) (uri (git-reference - (url "https://github.com/supercollider/scel.git") + (url "https://github.com/supercollider/scel") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -5130,7 +5130,7 @@ (define-public emacs-constants (origin (method git-fetch) (uri (git-reference - (url "https://github.com/fedeinthemix/emacs-constants.git") + (url "https://github.com/fedeinthemix/emacs-constants") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -5150,7 +5150,7 @@ (define-public emacs-tagedit (origin (method git-fetch) (uri (git-reference - (url "https://github.com/magnars/tagedit.git") + (url "https://github.com/magnars/tagedit") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -5174,7 +5174,7 @@ (define-public emacs-slime (origin (method git-fetch) (uri (git-reference - (url "https://github.com/slime/slime.git") + (url "https://github.com/slime/slime") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -5239,7 +5239,7 @@ (define-public emacs-popup (origin (method git-fetch) (uri (git-reference - (url "https://github.com/auto-complete/popup-el.git") + (url "https://github.com/auto-complete/popup-el") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -5360,7 +5360,7 @@ (define-public emacs-god-mode (origin (method git-fetch) (uri (git-reference - (url "https://github.com/chrisdone/god-mode.git") + (url "https://github.com/chrisdone/god-mode") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -5384,7 +5384,7 @@ (define-public emacs-jinja2-mode (origin (method git-fetch) (uri (git-reference - (url "https://github.com/paradoxxxzero/jinja2-mode.git") + (url "https://github.com/paradoxxxzero/jinja2-mode") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -5483,7 +5483,7 @@ (define-public emacs-feature-mode (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/michaelklishin/cucumber.el.git") + (url "https://github.com/michaelklishin/cucumber.el") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -5507,7 +5507,7 @@ (define-public emacs-org-bullets (origin (method git-fetch) (uri (git-reference - (url "https://github.com/sabof/org-bullets.git") + (url "https://github.com/sabof/org-bullets") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -5528,7 +5528,7 @@ (define-public emacs-org-superstar (origin (method git-fetch) (uri (git-reference - (url "https://github.com/integral-dw/org-superstar-mode.git") + (url "https://github.com/integral-dw/org-superstar-mode") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -5572,7 +5572,7 @@ (define-public emacs-org-pomodoro (origin (method git-fetch) (uri (git-reference - (url "https://github.com/marcinkoziej/org-pomodoro.git") + (url "https://github.com/marcinkoziej/org-pomodoro") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -5623,7 +5623,7 @@ (define-public emacs-org-sidebar (origin (method git-fetch) (uri (git-reference - (url "https://github.com/alphapapa/org-sidebar.git") + (url "https://github.com/alphapapa/org-sidebar") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -5653,7 +5653,7 @@ (define-public emacs-org-trello (origin (method git-fetch) (uri (git-reference - (url "https://github.com/org-trello/org-trello.git") + (url "https://github.com/org-trello/org-trello") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -5684,7 +5684,7 @@ (define-public emacs-org-tanglesync (origin (method git-fetch) (uri (git-reference - (url "https://github.com/mtekman/org-tanglesync.el.git") + (url "https://github.com/mtekman/org-tanglesync.el") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -5732,7 +5732,7 @@ (define-public emacs-atom-one-dark-theme (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/jonathanchu/atom-one-dark-theme.git") + (url "https://github.com/jonathanchu/atom-one-dark-theme") (commit commit))) (sha256 (base32 @@ -5752,7 +5752,7 @@ (define-public emacs-zenburn-theme (origin (method git-fetch) (uri (git-reference - (url "https://github.com/bbatsov/zenburn-emacs.git") + (url "https://github.com/bbatsov/zenburn-emacs") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -5822,7 +5822,7 @@ (define-public emacs-poet-theme (origin (method git-fetch) (uri (git-reference - (url "https://github.com/kunalb/poet.git") + (url "https://github.com/kunalb/poet") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -5866,7 +5866,7 @@ (define-public emacs-gruvbox-theme (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/greduan/emacs-theme-gruvbox.git") + (url "https://github.com/greduan/emacs-theme-gruvbox") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -5895,7 +5895,7 @@ (define-public emacs-spacegray-theme (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/bruce/emacs-spacegray-theme.git") + (url "https://github.com/bruce/emacs-spacegray-theme") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -5974,7 +5974,7 @@ (define-public emacs-4clojure (origin (method git-fetch) (uri (git-reference - (url "https://github.com/emacsorphanage/4clojure.git") + (url "https://github.com/emacsorphanage/4clojure") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -5998,7 +5998,7 @@ (define-public emacs-base16-theme (origin (method git-fetch) (uri (git-reference - (url "https://github.com/belak/base16-emacs.git") + (url "https://github.com/belak/base16-emacs") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -6020,7 +6020,7 @@ (define-public emacs-solaire-mode (origin (method git-fetch) (uri (git-reference - (url "https://github.com/hlissner/emacs-solaire-mode.git") + (url "https://github.com/hlissner/emacs-solaire-mode") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -6043,7 +6043,7 @@ (define-public emacs-prescient (origin (method git-fetch) (uri (git-reference - (url "https://github.com/raxod502/prescient.el.git") + (url "https://github.com/raxod502/prescient.el") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -6068,7 +6068,7 @@ (define-public emacs-selectrum (origin (method git-fetch) (uri (git-reference - (url "https://github.com/raxod502/selectrum.git") + (url "https://github.com/raxod502/selectrum") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -6094,7 +6094,7 @@ (define-public emacs-smartparens (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Fuco1/smartparens.git") + (url "https://github.com/Fuco1/smartparens") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -6131,7 +6131,7 @@ (define-public emacs-highlight-symbol (origin (method git-fetch) (uri (git-reference - (url "https://github.com/nschum/highlight-symbol.el.git") + (url "https://github.com/nschum/highlight-symbol.el") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -6165,7 +6165,7 @@ (define-public emacs-symbol-overlay (origin (method git-fetch) (uri (git-reference - (url "https://github.com/wolray/symbol-overlay.git") + (url "https://github.com/wolray/symbol-overlay") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -6209,7 +6209,7 @@ (define-public emacs-perspective (origin (method git-fetch) (uri (git-reference - (url "https://github.com/nex3/perspective-el.git") + (url "https://github.com/nex3/perspective-el") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -6237,7 +6237,7 @@ (define-public emacs-persp-mode (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Bad-ptr/persp-mode.el.git") + (url "https://github.com/Bad-ptr/persp-mode.el") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -6389,7 +6389,7 @@ (define-public emacs-request (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/tkf/emacs-request.git") + (url "https://github.com/tkf/emacs-request") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -6576,7 +6576,7 @@ (define-public emacs-ivy-xref (origin (method git-fetch) (uri (git-reference - (url "https://github.com/alexmurray/ivy-xref.git") + (url "https://github.com/alexmurray/ivy-xref") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -6601,7 +6601,7 @@ (define-public emacs-ivy-pass (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ecraven/ivy-pass.git") + (url "https://github.com/ecraven/ivy-pass") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -6628,7 +6628,7 @@ (define-public emacs-ivy-yasnippet (origin (method git-fetch) (uri (git-reference - (url "https://github.com/mkcms/ivy-yasnippet.git") + (url "https://github.com/mkcms/ivy-yasnippet") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -6660,7 +6660,7 @@ (define-public emacs-ivy-rich (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Yevgnen/ivy-rich.git") + (url "https://github.com/Yevgnen/ivy-rich") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -6685,7 +6685,7 @@ (define-public emacs-avy (origin (method git-fetch) (uri (git-reference - (url "https://github.com/abo-abo/avy.git") + (url "https://github.com/abo-abo/avy") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -6717,7 +6717,7 @@ (define-public emacs-ace-window (origin (method git-fetch) (uri (git-reference - (url "https://github.com/abo-abo/ace-window.git") + (url "https://github.com/abo-abo/ace-window") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -6746,7 +6746,7 @@ (define-public emacs-iedit (origin (method git-fetch) (uri (git-reference - (url "https://github.com/victorhge/iedit.git") + (url "https://github.com/victorhge/iedit") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -6909,7 +6909,7 @@ (define-public emacs-clojure-mode (origin (method git-fetch) (uri (git-reference - (url "https://github.com/clojure-emacs/clojure-mode.git") + (url "https://github.com/clojure-emacs/clojure-mode") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -6938,7 +6938,7 @@ (define-public emacs-epl (origin (method git-fetch) (uri (git-reference - (url "https://github.com/cask/epl.git") + (url "https://github.com/cask/epl") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -7007,7 +7007,7 @@ (define-public emacs-pkg-info (origin (method git-fetch) (uri (git-reference - (url "https://github.com/lunaryorn/pkg-info.el.git") + (url "https://github.com/lunaryorn/pkg-info.el") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -7047,7 +7047,7 @@ (define-public emacs-sparql-mode (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ljos/sparql-mode.git") + (url "https://github.com/ljos/sparql-mode") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -7143,7 +7143,7 @@ (define-public emacs-julia-mode (origin (method git-fetch) (uri (git-reference - (url "https://github.com/JuliaEditorSupport/julia-emacs.git") + (url "https://github.com/JuliaEditorSupport/julia-emacs") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -7190,7 +7190,7 @@ (define-public emacs-js2-mode (origin (method git-fetch) (uri (git-reference - (url "https://github.com/mooz/js2-mode.git") + (url "https://github.com/mooz/js2-mode") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -7340,7 +7340,7 @@ (define-public emacs-markdown-mode (origin (method git-fetch) (uri (git-reference - (url "https://github.com/jrblevin/markdown-mode.git") + (url "https://github.com/jrblevin/markdown-mode") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -7363,7 +7363,7 @@ (define-public emacs-evil-markdown (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Somelauw/evil-markdown.git") + (url "https://github.com/Somelauw/evil-markdown") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -7435,7 +7435,7 @@ (define-public emacs-skeletor (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/chrisbarrett/skeletor.el.git") + (url "https://github.com/chrisbarrett/skeletor.el") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -7487,7 +7487,7 @@ (define-public emacs-elfeed (origin (method git-fetch) (uri (git-reference - (url "https://github.com/skeeto/elfeed.git") + (url "https://github.com/skeeto/elfeed") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -7512,7 +7512,7 @@ (define-public emacs-elfeed-org (origin (method git-fetch) (uri (git-reference - (url "https://github.com/remyhonig/elfeed-org.git") + (url "https://github.com/remyhonig/elfeed-org") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -7552,7 +7552,7 @@ (define-public emacs-el-x (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/sigma/el-x.git") + (url "https://github.com/sigma/el-x") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -7585,7 +7585,7 @@ (define-public emacs-mocker (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/sigma/mocker.el.git") + (url "https://github.com/sigma/mocker.el") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -7613,7 +7613,7 @@ (define-public emacs-find-file-in-project (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/technomancy/find-file-in-project.git") + (url "https://github.com/technomancy/find-file-in-project") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -7640,7 +7640,7 @@ (define-public emacs-pyvenv (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/jorgenschaefer/pyvenv.git") + (url "https://github.com/jorgenschaefer/pyvenv") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -7675,7 +7675,7 @@ (define-public emacs-highlight-indent-guides (origin (method git-fetch) (uri (git-reference - (url "https://github.com/DarthFennec/highlight-indent-guides.git") + (url "https://github.com/DarthFennec/highlight-indent-guides") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -7704,7 +7704,7 @@ (define-public emacs-highlight-indentation (origin (method git-fetch) (uri (git-reference - (url "https://github.com/antonj/Highlight-Indentation-for-Emacs.git") + (url "https://github.com/antonj/Highlight-Indentation-for-Emacs") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -7731,7 +7731,7 @@ (define-public emacs-elpy (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/jorgenschaefer/elpy.git") + (url "https://github.com/jorgenschaefer/elpy") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -7818,7 +7818,7 @@ (define-public emacs-rainbow-delimiters (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Fanael/rainbow-delimiters.git") + (url "https://github.com/Fanael/rainbow-delimiters") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -7893,7 +7893,7 @@ (define-public emacs-ryo-modal (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Kungsgeten/ryo-modal.git") + (url "https://github.com/Kungsgeten/ryo-modal") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -7937,7 +7937,7 @@ (define-public emacs-writeroom (origin (method git-fetch) (uri (git-reference - (url "https://github.com/joostkremers/writeroom-mode.git") + (url "https://github.com/joostkremers/writeroom-mode") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -8008,7 +8008,7 @@ (define-public emacs-yaml-mode (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/yoshiki/yaml-mode.git") + (url "https://github.com/yoshiki/yaml-mode") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -8081,7 +8081,7 @@ (define-public emacs-web-mode (origin (method git-fetch) (uri (git-reference - (url "https://github.com/fxbois/web-mode.git") + (url "https://github.com/fxbois/web-mode") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -8127,7 +8127,7 @@ (define-public emacs-helm (origin (method git-fetch) (uri (git-reference - (url "https://github.com/emacs-helm/helm.git") + (url "https://github.com/emacs-helm/helm") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -8158,7 +8158,7 @@ (define-public emacs-helm-org (origin (method git-fetch) (uri (git-reference - (url "https://github.com/emacs-helm/helm-org.git") + (url "https://github.com/emacs-helm/helm-org") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -8181,7 +8181,7 @@ (define-public emacs-helm-swoop (origin (method git-fetch) (uri (git-reference - (url "https://github.com/emacsorphanage/helm-swoop.git") + (url "https://github.com/emacsorphanage/helm-swoop") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -8204,7 +8204,7 @@ (define-public emacs-helm-ag (origin (method git-fetch) (uri (git-reference - (url "https://github.com/syohex/emacs-helm-ag.git") + (url "https://github.com/syohex/emacs-helm-ag") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -8232,7 +8232,7 @@ (define-public emacs-helm-projectile (origin (method git-fetch) (uri (git-reference - (url "https://github.com/bbatsov/helm-projectile.git") + (url "https://github.com/bbatsov/helm-projectile") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -8257,7 +8257,7 @@ (define-public emacs-taskrunner (origin (method git-fetch) (uri (git-reference - (url "https://github.com/emacs-taskrunner/emacs-taskrunner.git") + (url "https://github.com/emacs-taskrunner/emacs-taskrunner") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -8283,7 +8283,7 @@ (define-public emacs-ivy-taskrunner (origin (method git-fetch) (uri (git-reference - (url "https://github.com/emacs-taskrunner/ivy-taskrunner.git") + (url "https://github.com/emacs-taskrunner/ivy-taskrunner") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -8310,7 +8310,7 @@ (define-public emacs-helm-taskrunner (origin (method git-fetch) (uri (git-reference - (url "https://github.com/emacs-taskrunner/helm-taskrunner.git") + (url "https://github.com/emacs-taskrunner/helm-taskrunner") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -8337,7 +8337,7 @@ (define-public emacs-helm-make (origin (method git-fetch) (uri (git-reference - (url "https://github.com/abo-abo/helm-make.git") + (url "https://github.com/abo-abo/helm-make") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -8362,7 +8362,7 @@ (define-public emacs-cider (origin (method git-fetch) (uri (git-reference - (url "https://github.com/clojure-emacs/cider.git") + (url "https://github.com/clojure-emacs/cider") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -8407,7 +8407,7 @@ (define-public emacs-sly (origin (method git-fetch) (uri (git-reference - (url "https://github.com/joaotavora/sly.git") + (url "https://github.com/joaotavora/sly") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -8849,7 +8849,7 @@ (define-public emacs-evil-args (origin (method git-fetch) (uri (git-reference - (url "https://github.com/wcsmith/evil-args.git") + (url "https://github.com/wcsmith/evil-args") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -9142,7 +9142,7 @@ (define-public emacs-monky (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ananthakumaran/monky.git") + (url "https://github.com/ananthakumaran/monky") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -9169,7 +9169,7 @@ (define-public emacs-monroe (origin (method git-fetch) (uri (git-reference - (url "https://github.com/sanel/monroe.git") + (url "https://github.com/sanel/monroe") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -9332,7 +9332,7 @@ (define-public emacs-flx (origin (method git-fetch) (uri (git-reference - (url "https://github.com/lewang/flx.git") + (url "https://github.com/lewang/flx") (commit (string-append "v" version)))) (sha256 (base32 @@ -9453,7 +9453,7 @@ (define-public emacs-auto-complete (origin (method git-fetch) (uri (git-reference - (url "https://github.com/auto-complete/auto-complete.git") + (url "https://github.com/auto-complete/auto-complete") (commit (string-append "v" version)))) (sha256 (base32 @@ -9480,7 +9480,7 @@ (define-public emacs-nginx-mode (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ajc/nginx-mode.git") + (url "https://github.com/ajc/nginx-mode") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -9521,7 +9521,7 @@ (define-public emacs-cl-print (origin (method git-fetch) (uri (git-reference - (url "https://github.com/emacsmirror/cl-print.git") + (url "https://github.com/emacsmirror/cl-print") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -9544,7 +9544,7 @@ (define-public emacs-el-search (origin (method git-fetch) (uri (git-reference - (url "https://github.com/emacsmirror/el-search.git") + (url "https://github.com/emacsmirror/el-search") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -9567,7 +9567,7 @@ (define-public emacs-ht (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Wilfred/ht.el.git") + (url "https://github.com/Wilfred/ht.el") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -9594,7 +9594,7 @@ (define-public emacs-log4e (origin (method git-fetch) (uri (git-reference - (url "https://github.com/aki2o/log4e.git") + (url "https://github.com/aki2o/log4e") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -9624,7 +9624,7 @@ (define-public emacs-gntp (origin (method git-fetch) (uri (git-reference - (url "https://github.com/tekai/gntp.el.git") + (url "https://github.com/tekai/gntp.el") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -9647,7 +9647,7 @@ (define-public emacs-alert (origin (method git-fetch) (uri (git-reference - (url "https://github.com/jwiegley/alert.git") + (url "https://github.com/jwiegley/alert") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -9694,7 +9694,7 @@ (define-public emacs-mu4e-alert (origin (method git-fetch) (uri (git-reference - (url "https://github.com/iqbalansari/mu4e-alert.git") + (url "https://github.com/iqbalansari/mu4e-alert") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -9796,7 +9796,7 @@ (define-public emacs-yasnippet (origin (method git-fetch) (uri (git-reference - (url "https://github.com/joaotavora/yasnippet.git") + (url "https://github.com/joaotavora/yasnippet") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -10029,7 +10029,7 @@ (define-public emacs-memoize (origin (method git-fetch) (uri (git-reference - (url "https://github.com/skeeto/emacs-memoize.git") + (url "https://github.com/skeeto/emacs-memoize") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -10054,7 +10054,7 @@ (define-public emacs-linum-relative (origin (method git-fetch) (uri (git-reference - (url "https://github.com/coldnew/linum-relative.git") + (url "https://github.com/coldnew/linum-relative") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -10074,7 +10074,7 @@ (define-public emacs-idle-highlight (origin (method git-fetch) (uri (git-reference - (url "https://github.com/nonsequitur/idle-highlight-mode.git") + (url "https://github.com/nonsequitur/idle-highlight-mode") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -10096,7 +10096,7 @@ (define-public emacs-ox-twbs (origin (method git-fetch) (uri (git-reference - (url "https://github.com/marsmining/ox-twbs.git") + (url "https://github.com/marsmining/ox-twbs") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -10119,7 +10119,7 @@ (define-public emacs-highlight-sexp (origin (method git-fetch) (uri (git-reference - (url "https://github.com/daimrod/highlight-sexp.git") + (url "https://github.com/daimrod/highlight-sexp") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -10141,7 +10141,7 @@ (define-public emacs-highlight-stages (origin (method git-fetch) (uri (git-reference - (url "https://github.com/zk-phi/highlight-stages.git") + (url "https://github.com/zk-phi/highlight-stages") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -10292,7 +10292,7 @@ (define-public emacs-diminish (origin (method git-fetch) (uri (git-reference - (url "https://github.com/myrjola/diminish.el.git") + (url "https://github.com/myrjola/diminish.el") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -10446,7 +10446,7 @@ (define-public emacs-htmlize (origin (method git-fetch) (uri (git-reference - (url "https://github.com/hniksic/emacs-htmlize.git") + (url "https://github.com/hniksic/emacs-htmlize") (commit (string-append "release/" version)))) (file-name (git-file-name name version)) (sha256 @@ -10467,7 +10467,7 @@ (define-public emacs-xmlgen (origin (method git-fetch) (uri (git-reference - (url "https://github.com/philjackson/xmlgen.git") + (url "https://github.com/philjackson/xmlgen") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -10493,7 +10493,7 @@ (define-public emacs-cdlatex (origin (method git-fetch) (uri (git-reference - (url "https://github.com/cdominik/cdlatex.git") + (url "https://github.com/cdominik/cdlatex") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -10519,7 +10519,7 @@ (define-public emacs-cnfonts (origin (method git-fetch) (uri (git-reference - (url "https://github.com/tumashu/cnfonts.git") + (url "https://github.com/tumashu/cnfonts") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -10539,7 +10539,7 @@ (define-public emacs-php-mode (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ejmr/php-mode.git") + (url "https://github.com/ejmr/php-mode") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -10563,7 +10563,7 @@ (define-public emacs-pos-tip (origin (method git-fetch) (uri (git-reference - (url "https://github.com/pitkali/pos-tip.git") + (url "https://github.com/pitkali/pos-tip") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -10589,7 +10589,7 @@ (define-public emacs-pyim-basedict (origin (method git-fetch) (uri (git-reference - (url "https://github.com/tumashu/pyim-basedict.git") + (url "https://github.com/tumashu/pyim-basedict") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -10657,7 +10657,7 @@ (define-public emacs-el2org (origin (method git-fetch) (uri (git-reference - (url "https://github.com/tumashu/el2org.git") + (url "https://github.com/tumashu/el2org") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -10677,7 +10677,7 @@ (define-public emacs-mustache (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Wilfred/mustache.el.git") + (url "https://github.com/Wilfred/mustache.el") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -10704,7 +10704,7 @@ (define-public emacs-org2web (origin (method git-fetch) (uri (git-reference - (url "https://github.com/tumashu/org2web.git") + (url "https://github.com/tumashu/org2web") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -10956,7 +10956,7 @@ (define-public emacs-gnuplot (origin (method git-fetch) (uri (git-reference - (url "https://github.com/bruceravel/gnuplot-mode.git") + (url "https://github.com/bruceravel/gnuplot-mode") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -11061,7 +11061,7 @@ (define-public emacs-evil-commentary (origin (method git-fetch) (uri (git-reference - (url "https://github.com/linktohack/evil-commentary.git") + (url "https://github.com/linktohack/evil-commentary") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -11086,7 +11086,7 @@ (define-public emacs-ansi (origin (method git-fetch) (uri (git-reference - (url "https://github.com/rejeep/ansi.el.git") + (url "https://github.com/rejeep/ansi.el") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -11113,7 +11113,7 @@ (define-public emacs-commander (origin (method git-fetch) (uri (git-reference - (url "https://github.com/rejeep/commander.el.git") + (url "https://github.com/rejeep/commander.el") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -11162,7 +11162,7 @@ (define-public emacs-ert-runner (origin (method git-fetch) (uri (git-reference - (url "https://github.com/rejeep/ert-runner.el.git") + (url "https://github.com/rejeep/ert-runner.el") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -11211,7 +11211,7 @@ (define-public emacs-xtest (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/promethial/xtest.git") + (url "https://github.com/promethial/xtest") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -11233,7 +11233,7 @@ (define-public emacs-disable-mouse (origin (method git-fetch) (uri (git-reference - (url "https://github.com/purcell/disable-mouse.git") + (url "https://github.com/purcell/disable-mouse") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -11255,7 +11255,7 @@ (define-public emacs-json-reformat (origin (method git-fetch) (uri (git-reference - (url "https://github.com/gongo/json-reformat.git") + (url "https://github.com/gongo/json-reformat") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -11301,7 +11301,7 @@ (define-public emacs-json-snatcher (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Sterlingg/json-snatcher.git") + (url "https://github.com/Sterlingg/json-snatcher") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -11321,7 +11321,7 @@ (define-public emacs-json-mode (origin (method git-fetch) (uri (git-reference - (url "https://github.com/joshwnj/json-mode.git") + (url "https://github.com/joshwnj/json-mode") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -11368,7 +11368,7 @@ (define-public emacs-restclient (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/pashky/restclient.el.git") + (url "https://github.com/pashky/restclient.el") (commit commit))) (sha256 (base32 @@ -11420,7 +11420,7 @@ (define-public emacs-eimp (origin (method git-fetch) (uri (git-reference - (url "https://github.com/nicferrier/eimp.git") + (url "https://github.com/nicferrier/eimp") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -11457,7 +11457,7 @@ (define-public emacs-dired-hacks (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Fuco1/dired-hacks.git") + (url "https://github.com/Fuco1/dired-hacks") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -11523,7 +11523,7 @@ (define-public emacs-which-key (origin (method git-fetch) (uri (git-reference - (url "https://github.com/justbur/emacs-which-key.git") + (url "https://github.com/justbur/emacs-which-key") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -11577,7 +11577,7 @@ (define-public emacs-ws-butler (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/lewang/ws-butler.git") + (url "https://github.com/lewang/ws-butler") (commit "323b651dd70ee40a25accc940b8f80c3a3185205"))) (file-name (git-file-name name version)) (sha256 @@ -11628,7 +11628,7 @@ (define-public emacs-org-edit-latex (origin (method git-fetch) (uri (git-reference - (url "https://github.com/et2010/org-edit-latex.git") + (url "https://github.com/et2010/org-edit-latex") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -11654,7 +11654,7 @@ (define-public emacs-emamux (origin (method git-fetch) (uri (git-reference - (url "https://github.com/syohex/emacs-emamux.git") + (url "https://github.com/syohex/emacs-emamux") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -11748,7 +11748,7 @@ (define-public emacs-git-messenger (origin (method git-fetch) (uri (git-reference - (url "https://github.com/syohex/emacs-git-messenger.git") + (url "https://github.com/syohex/emacs-git-messenger") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -11776,7 +11776,7 @@ (define-public emacs-gitpatch (origin (method git-fetch) (uri (git-reference - (url "https://github.com/tumashu/gitpatch.git") + (url "https://github.com/tumashu/gitpatch") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -11824,7 +11824,7 @@ (define-public emacs-engine-mode (origin (method git-fetch) (uri (git-reference - (url "https://github.com/hrs/engine-mode.git") + (url "https://github.com/hrs/engine-mode") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -11845,7 +11845,7 @@ (define-public emacs-prop-menu (origin (method git-fetch) (uri (git-reference - (url "https://github.com/david-christiansen/prop-menu-el.git") + (url "https://github.com/david-christiansen/prop-menu-el") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -11880,7 +11880,7 @@ (define-public emacs-idris-mode (origin (method git-fetch) (uri (git-reference - (url "https://github.com/idris-hackers/idris-mode.git") + (url "https://github.com/idris-hackers/idris-mode") (commit commit))) (file-name (git-file-name name commit)) (sha256 @@ -11905,7 +11905,7 @@ (define-public emacs-browse-at-remote (origin (method git-fetch) (uri (git-reference - (url "https://github.com/rmuslimov/browse-at-remote.git") + (url "https://github.com/rmuslimov/browse-at-remote") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -11937,7 +11937,7 @@ (define-public emacs-tiny (origin (method git-fetch) (uri (git-reference - (url "https://github.com/abo-abo/tiny.git") + (url "https://github.com/abo-abo/tiny") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -12136,7 +12136,7 @@ (define-public emacs-circe (origin (method git-fetch) (uri (git-reference - (url "https://github.com/jorgenschaefer/circe.git") + (url "https://github.com/jorgenschaefer/circe") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -12192,7 +12192,7 @@ (define-public emacs-slack (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/yuya373/emacs-slack.git") + (url "https://github.com/yuya373/emacs-slack") (commit commit))) (file-name (git-file-name name commit)) (sha256 @@ -12227,7 +12227,7 @@ (define-public emacs-bash-completion (origin (method git-fetch) (uri (git-reference - (url "https://github.com/szermatt/emacs-bash-completion.git") + (url "https://github.com/szermatt/emacs-bash-completion") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -12300,7 +12300,7 @@ (define-public emacs-transmission (origin (method git-fetch) (uri (git-reference - (url "https://github.com/holomorph/transmission.git") + (url "https://github.com/holomorph/transmission") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -12329,7 +12329,7 @@ (define-public emacs-polymode (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/polymode/polymode.git") + (url "https://github.com/polymode/polymode") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -12383,7 +12383,7 @@ (define-public emacs-polymode-org (origin (method git-fetch) (uri (git-reference - (url "https://github.com/polymode/poly-org.git") + (url "https://github.com/polymode/poly-org") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -12410,7 +12410,7 @@ (define-public eless (origin (method git-fetch) (uri (git-reference - (url "https://github.com/kaushalmodi/eless.git") + (url "https://github.com/kaushalmodi/eless") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -12462,7 +12462,7 @@ (define-public emacs-evil-matchit (origin (method git-fetch) (uri (git-reference - (url "https://github.com/redguardtoo/evil-matchit.git") + (url "https://github.com/redguardtoo/evil-matchit") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -12485,7 +12485,7 @@ (define-public emacs-evil-smartparens (origin (method git-fetch) (uri (git-reference - (url "https://github.com/expez/evil-smartparens.git") + (url "https://github.com/expez/evil-smartparens") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -12509,7 +12509,7 @@ (define-public emacs-evil-quickscope (origin (method git-fetch) (uri (git-reference - (url "https://github.com/blorbx/evil-quickscope.git") + (url "https://github.com/blorbx/evil-quickscope") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -12538,7 +12538,7 @@ (define-public emacs-bongo (origin (method git-fetch) (uri (git-reference - (url "https://github.com/dbrock/bongo.git") + (url "https://github.com/dbrock/bongo") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -12586,7 +12586,7 @@ (define-public emacs-org-tree-slide (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/takaxp/org-tree-slide.git") + (url "https://github.com/takaxp/org-tree-slide") (commit commit))) (sha256 (base32 @@ -12610,7 +12610,7 @@ (define-public emacs-scratch-el (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ieure/scratch-el.git") + (url "https://github.com/ieure/scratch-el") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -12647,7 +12647,7 @@ (define-public emacs-kv (origin (method git-fetch) (uri (git-reference - (url "https://github.com/nicferrier/emacs-kv.git") + (url "https://github.com/nicferrier/emacs-kv") (commit "721148475bce38a70e0b678ba8aa923652e8900e"))) (file-name (git-file-name name version)) (sha256 @@ -12672,7 +12672,7 @@ (define-public emacs-esxml (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/tali713/esxml.git") + (url "https://github.com/tali713/esxml") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -12767,7 +12767,7 @@ (define-public epipe (origin (method git-fetch) (uri (git-reference - (url "https://github.com/cute-jumper/epipe.git") + (url "https://github.com/cute-jumper/epipe") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -12811,7 +12811,7 @@ (define-public emacs-hcl-mode (origin (method git-fetch) (uri (git-reference - (url "https://github.com/syohex/emacs-hcl-mode.git") + (url "https://github.com/syohex/emacs-hcl-mode") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -12833,7 +12833,7 @@ (define-public emacs-terraform-mode (origin (method git-fetch) (uri (git-reference - (url "https://github.com/syohex/emacs-terraform-mode.git") + (url "https://github.com/syohex/emacs-terraform-mode") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -12933,7 +12933,7 @@ (define-public emacs-deft (origin (method git-fetch) (uri (git-reference - (url "https://github.com/jrblevin/deft.git") + (url "https://github.com/jrblevin/deft") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -12955,7 +12955,7 @@ (define-public emacs-anzu (origin (method git-fetch) (uri (git-reference - (url "https://github.com/syohex/emacs-anzu.git") + (url "https://github.com/syohex/emacs-anzu") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -12999,7 +12999,7 @@ (define-public emacs-emmet-mode (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/smihica/emmet-mode.git") + (url "https://github.com/smihica/emmet-mode") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -13023,7 +13023,7 @@ (define-public emacs-ergoemacs-mode (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ergoemacs/ergoemacs-mode.git") + (url "https://github.com/ergoemacs/ergoemacs-mode") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -13085,7 +13085,7 @@ (define-public emacs-auth-source-pass (origin (method git-fetch) (uri (git-reference - (url "https://github.com/DamienCassou/auth-password-store.git") + (url "https://github.com/DamienCassou/auth-password-store") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -13111,7 +13111,7 @@ (define-public emacs-pass (origin (method git-fetch) (uri (git-reference - (url "https://github.com/NicolasPetton/pass.git") + (url "https://github.com/NicolasPetton/pass") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -13246,7 +13246,7 @@ (define-public emacs-finalize (origin (method git-fetch) (uri (git-reference - (url "https://github.com/skeeto/elisp-finalize.git") + (url "https://github.com/skeeto/elisp-finalize") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -13270,7 +13270,7 @@ (define-public emacs-emacsql (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/skeeto/emacsql.git") + (url "https://github.com/skeeto/emacsql") (commit (string-append version)))) (file-name (git-file-name name version)) (sha256 @@ -13352,7 +13352,7 @@ (define-public emacs-closql (origin (method git-fetch) (uri (git-reference - (url "https://github.com/emacscollective/closql.git") + (url "https://github.com/emacscollective/closql") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -13381,7 +13381,7 @@ (define-public emacs-epkg (origin (method git-fetch) (uri (git-reference - (url "https://github.com/emacscollective/epkg.git") + (url "https://github.com/emacscollective/epkg") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -13423,7 +13423,7 @@ (define-public emacs-elisp-slime-nav (origin (method git-fetch) (uri (git-reference - (url "https://github.com/purcell/elisp-slime-nav.git") + (url "https://github.com/purcell/elisp-slime-nav") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -13445,7 +13445,7 @@ (define-public emacs-dedicated (origin (method git-fetch) (uri (git-reference - (url "https://github.com/emacsorphanage/dedicated.git") + (url "https://github.com/emacsorphanage/dedicated") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -13472,7 +13472,7 @@ (define-public emacs-nnreddit (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/paul-issartel/nnreddit.git") + (url "https://github.com/paul-issartel/nnreddit") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -13493,7 +13493,7 @@ (define-public emacs-makey (origin (method git-fetch) (uri (git-reference - (url "https://github.com/mickeynp/makey.git") + (url "https://github.com/mickeynp/makey") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -13537,7 +13537,7 @@ (define-public emacs-outshine (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/alphapapa/outshine.git") + (url "https://github.com/alphapapa/outshine") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -13588,7 +13588,7 @@ (define-public emacs-org-recent-headings (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/alphapapa/org-recent-headings.git") + (url "https://github.com/alphapapa/org-recent-headings") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -13818,7 +13818,7 @@ (define-public emacs-parsebib (origin (method git-fetch) (uri (git-reference - (url "https://github.com/joostkremers/parsebib.git") + (url "https://github.com/joostkremers/parsebib") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -13838,7 +13838,7 @@ (define-public emacs-ebib (origin (method git-fetch) (uri (git-reference - (url "https://github.com/joostkremers/ebib.git") + (url "https://github.com/joostkremers/ebib") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -13868,7 +13868,7 @@ (define-public emacs-biblio (origin (method git-fetch) (uri (git-reference - (url "https://github.com/cpitclaudel/biblio.el.git") + (url "https://github.com/cpitclaudel/biblio.el") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -13899,7 +13899,7 @@ (define-public emacs-helm-bibtex (origin (method git-fetch) (uri (git-reference - (url "https://github.com/tmalsburg/helm-bibtex.git") + (url "https://github.com/tmalsburg/helm-bibtex") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -13945,7 +13945,7 @@ (define-public emacs-ewmctrl (origin (method git-fetch) (uri (git-reference - (url "https://github.com/flexibeast/ewmctrl.git") + (url "https://github.com/flexibeast/ewmctrl") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -14002,7 +14002,7 @@ (define-public emacs-helm-gtags (origin (method git-fetch) (uri (git-reference - (url "https://github.com/syohex/emacs-helm-gtags.git") + (url "https://github.com/syohex/emacs-helm-gtags") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -14024,7 +14024,7 @@ (define-public emacs-list-utils (origin (method git-fetch) (uri (git-reference - (url "https://github.com/rolandwalker/list-utils.git") + (url "https://github.com/rolandwalker/list-utils") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -14043,7 +14043,7 @@ (define-public emacs-move-text (origin (method git-fetch) (uri (git-reference - (url "https://github.com/emacsfodder/move-text.git") + (url "https://github.com/emacsfodder/move-text") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -14084,7 +14084,7 @@ (define-public emacs-rainbow-blocks (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/istib/rainbow-blocks.git") + (url "https://github.com/istib/rainbow-blocks") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -14107,7 +14107,7 @@ (define-public emacs-hierarchy (origin (method git-fetch) (uri (git-reference - (url "https://github.com/DamienCassou/hierarchy.git") + (url "https://github.com/DamienCassou/hierarchy") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -14135,7 +14135,7 @@ (define-public emacs-tree-mode (origin (method git-fetch) (uri (git-reference - (url "https://github.com/emacsorphanage/tree-mode.git") + (url "https://github.com/emacsorphanage/tree-mode") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -14155,7 +14155,7 @@ (define-public emacs-md4rd (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ahungry/md4rd.git") + (url "https://github.com/ahungry/md4rd") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -14184,7 +14184,7 @@ (define-public emacs-pulseaudio-control (origin (method git-fetch) (uri (git-reference - (url "https://github.com/flexibeast/pulseaudio-control.git") + (url "https://github.com/flexibeast/pulseaudio-control") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -14216,7 +14216,7 @@ (define-public emacs-datetime (origin (method git-fetch) (uri (git-reference - (url "https://github.com/doublep/datetime.git") + (url "https://github.com/doublep/datetime") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -14239,7 +14239,7 @@ (define-public emacs-org-mind-map (origin (method git-fetch) (uri (git-reference - (url "https://github.com/theodorewiles/org-mind-map.git") + (url "https://github.com/theodorewiles/org-mind-map") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -14262,7 +14262,7 @@ (define-public emacs-npm-mode (origin (method git-fetch) (uri (git-reference - (url "https://github.com/mojochao/npm-mode.git") + (url "https://github.com/mojochao/npm-mode") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -14303,7 +14303,7 @@ (define-public emacs-itail (origin (method git-fetch) (uri (git-reference - (url "https://github.com/re5et/itail.git") + (url "https://github.com/re5et/itail") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -14326,7 +14326,7 @@ (define-public emacs-loop (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Wilfred/loop.el.git") + (url "https://github.com/Wilfred/loop.el") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -14353,7 +14353,7 @@ (define-public emacs-elisp-refs (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Wilfred/elisp-refs.git") + (url "https://github.com/Wilfred/elisp-refs") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -14389,7 +14389,7 @@ (define-public emacs-crux (origin (method git-fetch) (uri (git-reference - (url "https://github.com/bbatsov/crux.git") + (url "https://github.com/bbatsov/crux") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -14410,7 +14410,7 @@ (define-public emacs-edit-server (origin (method git-fetch) (uri (git-reference - (url "https://github.com/stsquad/emacs_chrome.git") + (url "https://github.com/stsquad/emacs_chrome") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -14488,7 +14488,7 @@ (define-public emacs-esup (origin (method git-fetch) (uri (git-reference - (url "https://github.com/jschaf/esup.git") + (url "https://github.com/jschaf/esup") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -14512,7 +14512,7 @@ (define-public emacs-restart-emacs (origin (method git-fetch) (uri (git-reference - (url "https://github.com/iqbalansari/restart-emacs.git") + (url "https://github.com/iqbalansari/restart-emacs") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -14532,7 +14532,7 @@ (define-public emacs-sourcemap (origin (method git-fetch) (uri (git-reference - (url "https://github.com/syohex/emacs-sourcemap.git") + (url "https://github.com/syohex/emacs-sourcemap") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -14551,7 +14551,7 @@ (define-public emacs-macrostep (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/joddie/macrostep.git") + (url "https://github.com/joddie/macrostep") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -14601,7 +14601,7 @@ (define-public emacs-parent-mode (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Fanael/parent-mode.git") + (url "https://github.com/Fanael/parent-mode") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -14638,7 +14638,7 @@ (define-public emacs-isearch-prop (origin (method git-fetch) (uri (git-reference - (url "https://github.com/emacsmirror/isearch-prop.git") + (url "https://github.com/emacsmirror/isearch-prop") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -14664,7 +14664,7 @@ (define-public emacs-company-lua (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ptrv/company-lua.git") + (url "https://github.com/ptrv/company-lua") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -14692,7 +14692,7 @@ (define-public emacs-beginend (origin (method git-fetch) (uri (git-reference - (url "https://github.com/DamienCassou/beginend.git") + (url "https://github.com/DamienCassou/beginend") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -14719,7 +14719,7 @@ (define-public emacs-mbsync (origin (method git-fetch) (uri (git-reference - (url "https://github.com/dimitri/mbsync-el.git") + (url "https://github.com/dimitri/mbsync-el") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -14742,7 +14742,7 @@ (define-public emacs-ibuffer-projectile (origin (method git-fetch) (uri (git-reference - (url "https://github.com/purcell/ibuffer-projectile.git") + (url "https://github.com/purcell/ibuffer-projectile") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -14836,7 +14836,7 @@ (define-public emacs-hy-mode (origin (method git-fetch) (uri (git-reference - (url "https://github.com/hylang/hy-mode.git") + (url "https://github.com/hylang/hy-mode") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -14858,7 +14858,7 @@ (define-public emacs-web-beautify (origin (method git-fetch) (uri (git-reference - (url "https://github.com/yasuyk/web-beautify.git") + (url "https://github.com/yasuyk/web-beautify") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -14879,7 +14879,7 @@ (define-public emacs-helm-shell-history (origin (method git-fetch) (uri (git-reference - (url "https://github.com/yuutayamada/helm-shell-history.git") + (url "https://github.com/yuutayamada/helm-shell-history") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -14939,7 +14939,7 @@ (define-public emacs-org-ref (origin (method git-fetch) (uri (git-reference - (url "https://github.com/jkitchin/org-ref.git") + (url "https://github.com/jkitchin/org-ref") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -14987,7 +14987,7 @@ (define-public emacs-org-reveal (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/yjwen/org-reveal.git") + (url "https://github.com/yjwen/org-reveal") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -15033,7 +15033,7 @@ (define-public emacs-add-hooks (origin (method git-fetch) (uri (git-reference - (url "https://github.com/nickmccurdy/add-hooks.git") + (url "https://github.com/nickmccurdy/add-hooks") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -15053,7 +15053,7 @@ (define-public emacs-fancy-narrow (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Malabarba/fancy-narrow.git") + (url "https://github.com/Malabarba/fancy-narrow") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -15078,7 +15078,7 @@ (define-public emacs-know-your-http-well (origin (method git-fetch) (uri (git-reference - (url "https://github.com/for-GET/know-your-http-well.git") + (url "https://github.com/for-GET/know-your-http-well") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -15113,7 +15113,7 @@ (define-public emacs-navi-mode (origin (method git-fetch) (uri (git-reference - (url "https://github.com/alphapapa/navi.git") + (url "https://github.com/alphapapa/navi") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -15140,7 +15140,7 @@ (define-public emacs-download-region (origin (method git-fetch) (uri (git-reference - (url "https://github.com/zk-phi/download-region.git") + (url "https://github.com/zk-phi/download-region") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -15161,7 +15161,7 @@ (define-public emacs-helpful (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Wilfred/helpful.git") + (url "https://github.com/Wilfred/helpful") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -15210,7 +15210,7 @@ (define-public emacs-logview (origin (method git-fetch) (uri (git-reference - (url "https://github.com/doublep/logview.git") + (url "https://github.com/doublep/logview") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -15266,7 +15266,7 @@ (define-public emacs-benchmark-init (origin (method git-fetch) (uri (git-reference - (url "https://github.com/dholm/benchmark-init-el.git") + (url "https://github.com/dholm/benchmark-init-el") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -15288,7 +15288,7 @@ (define-public emacs-magit-gerrit (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/terranpro/magit-gerrit.git") + (url "https://github.com/terranpro/magit-gerrit") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -15313,7 +15313,7 @@ (define-public emacs-magit-org-todos-el (origin (method git-fetch) (uri (git-reference - (url "https://github.com/danielma/magit-org-todos.el.git") + (url "https://github.com/danielma/magit-org-todos.el") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -15363,7 +15363,7 @@ (define-public emacs-f3 (origin (method git-fetch) (uri (git-reference - (url "https://github.com/cosmicexplorer/f3.git") + (url "https://github.com/cosmicexplorer/f3") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -15385,7 +15385,7 @@ (define-public emacs-lice-el (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/buzztaiki/lice-el.git") + (url "https://github.com/buzztaiki/lice-el") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -15411,7 +15411,7 @@ (define-public emacs-academic-phrases (origin (method git-fetch) (uri (git-reference - (url "https://github.com/nashamri/academic-phrases.git") + (url "https://github.com/nashamri/academic-phrases") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -15445,7 +15445,7 @@ (define-public emacs-auto-yasnippet (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/abo-abo/auto-yasnippet.git") + (url "https://github.com/abo-abo/auto-yasnippet") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -15474,7 +15474,7 @@ (define-public emacs-highlight-numbers (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Fanael/highlight-numbers.git") + (url "https://github.com/Fanael/highlight-numbers") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -15594,7 +15594,7 @@ (define-public emacs-visual-regexp (origin (method git-fetch) (uri (git-reference - (url "https://github.com/benma/visual-regexp.el.git") + (url "https://github.com/benma/visual-regexp.el") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -15617,7 +15617,7 @@ (define-public emacs-faceup (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Lindydancer/faceup.git") + (url "https://github.com/Lindydancer/faceup") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -15675,7 +15675,7 @@ (define-public emacs-grep-context (origin (method git-fetch) (uri (git-reference - (url "https://github.com/mkcms/grep-context.git") + (url "https://github.com/mkcms/grep-context") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -15703,7 +15703,7 @@ (define-public emacs-helm-firefox (origin (method git-fetch) (uri (git-reference - (url "https://github.com/emacs-helm/helm-firefox.git") + (url "https://github.com/emacs-helm/helm-firefox") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -15725,7 +15725,7 @@ (define-public emacs-interactive-align (origin (method git-fetch) (uri (git-reference - (url "https://github.com/mkcms/interactive-align.git") + (url "https://github.com/mkcms/interactive-align") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -15767,7 +15767,7 @@ (define-public emacs-highlight-defined (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Fanael/highlight-defined.git") + (url "https://github.com/Fanael/highlight-defined") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -15788,7 +15788,7 @@ (define-public emacs-parinfer-mode (origin (method git-fetch) (uri (git-reference - (url "https://github.com/DogLooksGood/parinfer-mode.git") + (url "https://github.com/DogLooksGood/parinfer-mode") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -15812,7 +15812,7 @@ (define-public emacs-helm-eww (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/emacs-helm/helm-eww.git") + (url "https://github.com/emacs-helm/helm-eww") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -15836,7 +15836,7 @@ (define-public emacs-stumpwm-mode (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/stumpwm/stumpwm-contrib.git") + (url "https://github.com/stumpwm/stumpwm-contrib") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -15882,7 +15882,7 @@ (define-public emacs-ido-vertical-mode (origin (method git-fetch) (uri (git-reference - (url "https://github.com/creichert/ido-vertical-mode.el.git") + (url "https://github.com/creichert/ido-vertical-mode.el") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -15901,7 +15901,7 @@ (define-public emacs-wordgen (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Fanael/wordgen.el.git") + (url "https://github.com/Fanael/wordgen.el") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -15945,7 +15945,7 @@ (define-public emacs-highlight-escape-sequences (origin (method git-fetch) (uri (git-reference - (url "https://github.com/dgutov/highlight-escape-sequences.git") + (url "https://github.com/dgutov/highlight-escape-sequences") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -15965,7 +15965,7 @@ (define-public emacs-dashboard (origin (method git-fetch) (uri (git-reference - (url "https://github.com/rakanalh/emacs-dashboard.git") + (url "https://github.com/rakanalh/emacs-dashboard") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -15999,7 +15999,7 @@ (define-public emacs-slime-company (origin (method git-fetch) (uri (git-reference - (url "https://github.com/anwyn/slime-company.git") + (url "https://github.com/anwyn/slime-company") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -16046,7 +16046,7 @@ (define-public emacs-eros (origin (method git-fetch) (uri (git-reference - (url "https://github.com/xiongtx/eros.git") + (url "https://github.com/xiongtx/eros") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -16068,7 +16068,7 @@ (define-public emacs-stickyfunc-enhance (origin (method git-fetch) (uri (git-reference - (url "https://github.com/tuhdo/semantic-stickyfunc-enhance.git") + (url "https://github.com/tuhdo/semantic-stickyfunc-enhance") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -16092,7 +16092,7 @@ (define-public emacs-git-auto-commit-mode (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ryuslash/git-auto-commit-mode.git") + (url "https://github.com/ryuslash/git-auto-commit-mode") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -16138,7 +16138,7 @@ (define-public emacs-company-restclient (origin (method git-fetch) (uri (git-reference - (url "https://github.com/iquiw/company-restclient.git") + (url "https://github.com/iquiw/company-restclient") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -16203,7 +16203,7 @@ (define-public emacs-dumb-jump (origin (method git-fetch) (uri (git-reference - (url "https://github.com/jacktasia/dumb-jump.git") + (url "https://github.com/jacktasia/dumb-jump") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -16248,7 +16248,7 @@ (define-public emacs-dts-mode (origin (method git-fetch) (uri (git-reference - (url "https://github.com/bgamari/dts-mode.git") + (url "https://github.com/bgamari/dts-mode") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -16296,7 +16296,7 @@ (define-public emacs-isearch+ (origin (method git-fetch) (uri (git-reference - (url "https://github.com/emacsmirror/isearch-plus.git") + (url "https://github.com/emacsmirror/isearch-plus") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -16418,7 +16418,7 @@ (define-public emacs-org-caldav (origin (method git-fetch) (uri (git-reference - (url "https://github.com/dengste/org-caldav.git") + (url "https://github.com/dengste/org-caldav") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -16444,7 +16444,7 @@ (define-public emacs-zotxt (origin (method git-fetch) (uri (git-reference - (url "https://github.com/egh/zotxt-emacs.git") + (url "https://github.com/egh/zotxt-emacs") (commit "23a4a9f74a658222027d53a9a83cd4bcc583ca8b"))) (file-name (git-file-name name version)) (sha256 @@ -16546,7 +16546,7 @@ (define-public emacs-evil-mc (origin (method git-fetch) (uri (git-reference - (url "https://github.com/gabesoft/evil-mc.git") + (url "https://github.com/gabesoft/evil-mc") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -16880,7 +16880,7 @@ (define-public emacs-helm-exwm (origin (method git-fetch) (uri (git-reference - (url "https://github.com/emacs-helm/helm-exwm.git") + (url "https://github.com/emacs-helm/helm-exwm") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -16971,7 +16971,7 @@ (define-public emacs-helm-mu (origin (method git-fetch) (uri (git-reference - (url "https://github.com/emacs-helm/helm-mu.git") + (url "https://github.com/emacs-helm/helm-mu") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -17379,7 +17379,7 @@ (define-public emacs-org-brain (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Kungsgeten/org-brain.git") + (url "https://github.com/Kungsgeten/org-brain") (commit "3faf9303af3f2356e3444e69c22dc6c5774047d1"))) (file-name (git-file-name name version)) (sha256 @@ -17476,7 +17476,7 @@ (define-public emacs-adoc-mode (origin (method git-fetch) (uri (git-reference - (url "https://github.com/sensorflo/adoc-mode.git") + (url "https://github.com/sensorflo/adoc-mode") (commit (string-append "V" version)))) (file-name (git-file-name name version)) (sha256 @@ -17671,7 +17671,7 @@ (define-public emacs-dired-rsync (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/stsquad/dired-rsync.git") + (url "https://github.com/stsquad/dired-rsync") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -17988,7 +17988,7 @@ (define-public emacs-all-the-icons (origin (method git-fetch) (uri (git-reference - (url "https://github.com/domtronn/all-the-icons.el.git") + (url "https://github.com/domtronn/all-the-icons.el") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -18027,7 +18027,7 @@ (define-public emacs-wttrin (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/bcbcarl/emacs-wttrin.git") + (url "https://github.com/bcbcarl/emacs-wttrin") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -18052,7 +18052,7 @@ (define-public emacs-browse-kill-ring (origin (method git-fetch) (uri (git-reference - (url "https://github.com/browse-kill-ring/browse-kill-ring.git") + (url "https://github.com/browse-kill-ring/browse-kill-ring") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -18075,7 +18075,7 @@ (define-public emacs-powerline (origin (method git-fetch) (uri (git-reference - (url "https://github.com/milkypostman/powerline.git") + (url "https://github.com/milkypostman/powerline") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -18097,7 +18097,7 @@ (define-public emacs-spaceline (origin (method git-fetch) (uri (git-reference - (url "https://github.com/TheBB/spaceline.git") + (url "https://github.com/TheBB/spaceline") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -18267,7 +18267,7 @@ (define-public emacs-ov (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ShingoFukuyama/ov.el.git") + (url "https://github.com/ShingoFukuyama/ov.el") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -18288,7 +18288,7 @@ (define-public emacs-matrix-client (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/jgkamat/matrix-client-el.git") + (url "https://github.com/jgkamat/matrix-client-el") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -18335,7 +18335,7 @@ (define-public emacs-sesman (origin (method git-fetch) (uri (git-reference - (url "https://github.com/vspinu/sesman.git") + (url "https://github.com/vspinu/sesman") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -18369,7 +18369,7 @@ (define-public emacs-buttercup (origin (method git-fetch) (uri (git-reference - (url "https://github.com/jorgenschaefer/emacs-buttercup.git") + (url "https://github.com/jorgenschaefer/emacs-buttercup") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -18427,7 +18427,7 @@ (define-public emacs-frame-purpose (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/alphapapa/frame-purpose.el.git") + (url "https://github.com/alphapapa/frame-purpose.el") (commit version))) (sha256 (base32 @@ -18453,7 +18453,7 @@ (define-public emacs-arduino-mode (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/stardiviner/arduino-mode.git") + (url "https://github.com/stardiviner/arduino-mode") (commit commit))) (sha256 (base32 @@ -18489,7 +18489,7 @@ (define-public emacs-annalist (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/noctuid/annalist.el.git") + (url "https://github.com/noctuid/annalist.el") (commit commit))) (sha256 (base32 @@ -18526,7 +18526,7 @@ (define-public emacs-general (origin (method git-fetch) (uri (git-reference - (url "https://github.com/noctuid/general.el.git") + (url "https://github.com/noctuid/general.el") (commit commit))) (sha256 (base32 "0wn5rk3gkimdklip392mnjrmkymgrb7q9skifi03cbpjam1anzvv")) @@ -18773,7 +18773,7 @@ (define-public emacs-nix-mode (origin (method git-fetch) (uri (git-reference - (url "https://github.com/NixOS/nix-mode.git") + (url "https://github.com/NixOS/nix-mode") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -18846,7 +18846,7 @@ (define-public emacs-vterm (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/akermu/emacs-libvterm.git") + (url "https://github.com/akermu/emacs-libvterm") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -18911,7 +18911,7 @@ (define-public emacs-simple-mpc (origin (method git-fetch) (uri (git-reference - (url "https://github.com/jorenvo/simple-mpc.git") + (url "https://github.com/jorenvo/simple-mpc") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -18956,7 +18956,7 @@ (define-public emacs-cmake-font-lock (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Lindydancer/cmake-font-lock.git") + (url "https://github.com/Lindydancer/cmake-font-lock") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -19271,7 +19271,7 @@ (define-public emacs-dockerfile-mode (origin (method git-fetch) (uri (git-reference - (url "https://github.com/spotify/dockerfile-mode.git") + (url "https://github.com/spotify/dockerfile-mode") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -19295,7 +19295,7 @@ (define-public emacs-lsp-mode (origin (method git-fetch) (uri (git-reference - (url "https://github.com/emacs-lsp/lsp-mode.git") + (url "https://github.com/emacs-lsp/lsp-mode") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -19325,7 +19325,7 @@ (define-public emacs-pfuture (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Alexander-Miller/pfuture.git") + (url "https://github.com/Alexander-Miller/pfuture") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -19346,7 +19346,7 @@ (define-public emacs-treemacs (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Alexander-Miller/treemacs.git") + (url "https://github.com/Alexander-Miller/treemacs") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -19499,7 +19499,7 @@ (define-public emacs-lsp-java (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/emacs-lsp/lsp-java.git") + (url "https://github.com/emacs-lsp/lsp-java") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -19526,7 +19526,7 @@ (define-public emacs-lsp-ui (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/emacs-lsp/lsp-ui.git") + (url "https://github.com/emacs-lsp/lsp-ui") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -19554,7 +19554,7 @@ (define-public emacs-lsp-lua-emmy (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/phenix3443/lsp-lua-emmy.git") + (url "https://github.com/phenix3443/lsp-lua-emmy") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -19578,7 +19578,7 @@ (define-public emacs-lsp-ivy (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/emacs-lsp/lsp-ivy.git") + (url "https://github.com/emacs-lsp/lsp-ivy") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -19605,7 +19605,7 @@ (define-public emacs-helm-lsp (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/emacs-lsp/helm-lsp.git") + (url "https://github.com/emacs-lsp/helm-lsp") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -19725,7 +19725,7 @@ (define-public emacs-forge (origin (method git-fetch) (uri (git-reference - (url "https://github.com/magit/forge.git") + (url "https://github.com/magit/forge") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -19771,7 +19771,7 @@ (define-public emacs-matcha (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/jojojames/matcha.git") + (url "https://github.com/jojojames/matcha") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -20087,7 +20087,7 @@ (define-public emacs-vdiff (origin (method git-fetch) (uri (git-reference - (url "https://github.com/justbur/emacs-vdiff.git") + (url "https://github.com/justbur/emacs-vdiff") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -20465,7 +20465,7 @@ (define-public emacs-ivy-clipmenu (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/wpcarro/ivy-clipmenu.el.git") + (url "https://github.com/wpcarro/ivy-clipmenu.el") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -20515,7 +20515,7 @@ (define-public emacs-dash-docs (origin (method git-fetch) (uri (git-reference - (url "https://github.com/dash-docs-el/dash-docs.git") + (url "https://github.com/dash-docs-el/dash-docs") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -20562,7 +20562,7 @@ (define-public emacs-helm-dash (origin (method git-fetch) (uri (git-reference - (url "https://github.com/areina/helm-dash.git") + (url "https://github.com/areina/helm-dash") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -20588,7 +20588,7 @@ (define-public emacs-counsel-dash (origin (method git-fetch) (uri (git-reference - (url "https://github.com/dash-docs-el/counsel-dash.git") + (url "https://github.com/dash-docs-el/counsel-dash") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -20611,7 +20611,7 @@ (define-public emacs-calibredb (origin (method git-fetch) (uri (git-reference - (url "https://github.com/chenyanming/calibredb.el.git") + (url "https://github.com/chenyanming/calibredb.el") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -20771,7 +20771,7 @@ (define-public emacs-tramp-auto-auth (origin (method git-fetch) (uri (git-reference - (url "https://github.com/oitofelix/tramp-auto-auth.git") + (url "https://github.com/oitofelix/tramp-auto-auth") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -20967,7 +20967,7 @@ (define-public emacs-rotate-text (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/nschum/rotate-text.el.git") + (url "https://github.com/nschum/rotate-text.el") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -21016,7 +21016,7 @@ (define-public emacs-evil-cleverparens (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/luxbock/evil-cleverparens.git") + (url "https://github.com/luxbock/evil-cleverparens") (commit commit))) (sha256 (base32 "0lhnybpnk4n2yhlcnj9zxn0vi5hpjfaqfhvyfy7ckzz74g8v7iyw")) (file-name (git-file-name name version)))) @@ -21043,7 +21043,7 @@ (define-public emacs-evil-traces (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/mamapanda/evil-traces.git") + (url "https://github.com/mamapanda/evil-traces") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -21125,7 +21125,7 @@ (define-public emacs-xterm-color (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/atomontage/xterm-color.git") + (url "https://github.com/atomontage/xterm-color") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -21146,7 +21146,7 @@ (define-public emacs-org-noter (origin (method git-fetch) (uri (git-reference - (url "https://github.com/weirdNox/org-noter.git") + (url "https://github.com/weirdNox/org-noter") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -21172,7 +21172,7 @@ (define-public emacs-org-redmine (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/gongo/org-redmine.git") + (url "https://github.com/gongo/org-redmine") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -21195,7 +21195,7 @@ (define-public emacs-multi-term (origin (method git-fetch) (uri (git-reference - (url "https://github.com/manateelazycat/multi-term.git") + (url "https://github.com/manateelazycat/multi-term") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -21286,7 +21286,7 @@ (define-public emacs-gnus-alias (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/hexmode/gnus-alias.git") + (url "https://github.com/hexmode/gnus-alias") (commit "9447d3ccb4c0e75d0468899cccff7aa249657bac"))) (file-name (git-file-name name version)) (sha256 @@ -21316,7 +21316,7 @@ (define-public emacs-ox-epub (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ofosos/ox-epub.git") + (url "https://github.com/ofosos/ox-epub") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -21340,7 +21340,7 @@ (define-public emacs-ox-hugo (origin (method git-fetch) (uri (git-reference - (url "https://github.com/kaushalmodi/ox-hugo.git") + (url "https://github.com/kaushalmodi/ox-hugo") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -21362,7 +21362,7 @@ (define-public emacs-ox-pandoc (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/kawabata/ox-pandoc.git") + (url "https://github.com/kawabata/ox-pandoc") (commit "aa37dc7e94213d4ebedb85c384c1ba35007da18e"))) (file-name (git-file-name name version)) (sha256 @@ -21387,7 +21387,7 @@ (define-public emacs-wc-mode (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/bnbeckwith/wc-mode.git") + (url "https://github.com/bnbeckwith/wc-mode") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -21411,7 +21411,7 @@ (define-public emacs-mastodon (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/jdenen/mastodon.el.git") + (url "https://github.com/jdenen/mastodon.el") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -21463,7 +21463,7 @@ (define-public emacs-refactor (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Wilfred/emacs-refactor.git") + (url "https://github.com/Wilfred/emacs-refactor") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -21491,7 +21491,7 @@ (define-public emacs-flyspell-correct (origin (method git-fetch) (uri (git-reference - (url "https://github.com/d12frosted/flyspell-correct.git") + (url "https://github.com/d12frosted/flyspell-correct") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -21549,7 +21549,7 @@ (define-public emacs-org-jira (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ahungry/org-jira.git") + (url "https://github.com/ahungry/org-jira") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -21575,7 +21575,7 @@ (define-public emacs-systemd-mode (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/holomorph/systemd-mode.git") + (url "https://github.com/holomorph/systemd-mode") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -21601,7 +21601,7 @@ (define-public emacs-ssh-config-mode (method git-fetch) (uri (git-reference - (url "https://github.com/jhgorrell/ssh-config-mode-el.git") + (url "https://github.com/jhgorrell/ssh-config-mode-el") (commit commit))) (file-name (git-file-name name commit)) (sha256 @@ -21625,7 +21625,7 @@ (define-public emacs-ssh-agency (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/magit/ssh-agency.git") + (url "https://github.com/magit/ssh-agency") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -21656,7 +21656,7 @@ (define-public emacs-tao-theme (origin (method git-fetch) (uri (git-reference - (url "https://github.com/11111000000/tao-theme-emacs.git") + (url "https://github.com/11111000000/tao-theme-emacs") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -21685,7 +21685,7 @@ (define-public emacs-almost-mono-themes (origin (method git-fetch) (uri (git-reference - (url "https://github.com/cryon/almost-mono-themes.git") + (url "https://github.com/cryon/almost-mono-themes") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -21709,7 +21709,7 @@ (define-public emacs-quasi-monochrome (origin (method git-fetch) (uri (git-reference - (url "https://github.com/lbolla/emacs-quasi-monochrome.git") + (url "https://github.com/lbolla/emacs-quasi-monochrome") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -21733,7 +21733,7 @@ (define-public emacs-doom-themes (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/hlissner/emacs-doom-themes.git") + (url "https://github.com/hlissner/emacs-doom-themes") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -21844,7 +21844,7 @@ (define-public emacs-punpun-theme (origin (method git-fetch) (uri (git-reference - (url "https://github.com/wasamasa/punpun-theme.git") + (url "https://github.com/wasamasa/punpun-theme") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -21868,7 +21868,7 @@ (define-public emacs-spacemacs-theme (origin (method git-fetch) (uri (git-reference - (url "https://github.com/nashamri/spacemacs-theme.git") + (url "https://github.com/nashamri/spacemacs-theme") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -21891,7 +21891,7 @@ (define-public emacs-elixir-mode (origin (method git-fetch) (uri (git-reference - (url "https://github.com/elixir-editors/emacs-elixir.git") + (url "https://github.com/elixir-editors/emacs-elixir") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -21915,7 +21915,7 @@ (define-public emacs-dimmer (origin (method git-fetch) (uri (git-reference - (url "https://github.com/gonewest818/dimmer.el.git") + (url "https://github.com/gonewest818/dimmer.el") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -22124,7 +22124,7 @@ (define-public emacs-telega (origin (method git-fetch) (uri (git-reference - (url "https://github.com/zevlg/telega.el.git") + (url "https://github.com/zevlg/telega.el") (commit commit))) (sha256 (base32 @@ -22242,7 +22242,7 @@ (define-public emacs-doom-modeline (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/seagle0128/doom-modeline.git") + (url "https://github.com/seagle0128/doom-modeline") (commit (string-append "v" version)))) (sha256 (base32 @@ -22296,7 +22296,7 @@ (define-public emacs-org-present (origin (method git-fetch) (uri (git-reference - (url "https://github.com/rlister/org-present.git") + (url "https://github.com/rlister/org-present") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -22319,7 +22319,7 @@ (define-public emacs-fullframe (origin (method git-fetch) (uri (git-reference - (url "https://github.com/tomterl/fullframe.git") + (url "https://github.com/tomterl/fullframe") (commit version))) (sha256 (base32 @@ -22342,7 +22342,7 @@ (define-public emacs-eshell-toggle (origin (method git-fetch) (uri (git-reference - (url "https://github.com/4DA/eshell-toggle.git") + (url "https://github.com/4DA/eshell-toggle") (commit commit))) (sha256 (base32 @@ -22365,7 +22365,7 @@ (define-public emacs-repl-toggle (origin (method git-fetch) (uri (git-reference - (url "https://github.com/tomterl/repl-toggle.git") + (url "https://github.com/tomterl/repl-toggle") (commit version))) (sha256 (base32 @@ -22388,7 +22388,7 @@ (define-public emacs-rime (origin (method git-fetch) (uri (git-reference - (url "https://github.com/DogLooksGood/emacs-rime.git") + (url "https://github.com/DogLooksGood/emacs-rime") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -22437,7 +22437,7 @@ (define-public emacs-blackout (origin (method git-fetch) (uri (git-reference - (url "https://github.com/raxod502/blackout.git") + (url "https://github.com/raxod502/blackout") (commit commit))) (sha256 (base32 @@ -22460,7 +22460,7 @@ (define-public emacs-ivy-omni-org (origin (method git-fetch) (uri (git-reference - (url "https://github.com/akirak/ivy-omni-org.git") + (url "https://github.com/akirak/ivy-omni-org") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -22485,7 +22485,7 @@ (define-public emacs-ivy-posframe (origin (method git-fetch) (uri (git-reference - (url "https://github.com/tumashu/ivy-posframe.git") + (url "https://github.com/tumashu/ivy-posframe") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -22512,7 +22512,7 @@ (define-public emacs-shackle (origin (method git-fetch) (uri (git-reference - (url "https://github.com/wasamasa/shackle.git") + (url "https://github.com/wasamasa/shackle") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -22535,7 +22535,7 @@ (define-public emacs-helm-lacarte (origin (method git-fetch) (uri (git-reference - (url "https://github.com/emacs-helm/helm-lacarte.git") + (url "https://github.com/emacs-helm/helm-lacarte") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -22562,7 +22562,7 @@ (define-public emacs-esh-help (origin (method git-fetch) (uri (git-reference - (url "https://github.com/tom-tan/esh-help.git") + (url "https://github.com/tom-tan/esh-help") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -22587,7 +22587,7 @@ (define-public emacs-isearch-dabbrev (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Dewdrops/isearch-dabbrev.git") + (url "https://github.com/Dewdrops/isearch-dabbrev") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -22610,7 +22610,7 @@ (define-public emacs-helm-linux-disks (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Akirak/helm-linux-disks.git") + (url "https://github.com/Akirak/helm-linux-disks") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -22635,7 +22635,7 @@ (define-public emacs-psession (origin (method git-fetch) (uri (git-reference - (url "https://github.com/thierryvolpiatto/psession.git") + (url "https://github.com/thierryvolpiatto/psession") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -22658,7 +22658,7 @@ (define-public emacs-parseedn (origin (method git-fetch) (uri (git-reference - (url "https://github.com/clojure-emacs/parseedn.git") + (url "https://github.com/clojure-emacs/parseedn") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -22683,7 +22683,7 @@ (define-public emacs-parseclj (origin (method git-fetch) (uri (git-reference - (url "https://github.com/clojure-emacs/parseclj.git") + (url "https://github.com/clojure-emacs/parseclj") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -22706,7 +22706,7 @@ (define-public emacs-hide-mode-line (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/hlissner/emacs-hide-mode-line.git") + (url "https://github.com/hlissner/emacs-hide-mode-line") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -22890,7 +22890,7 @@ (define-public emacs-metal-mercury-mode (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ahungry/metal-mercury-mode.git") + (url "https://github.com/ahungry/metal-mercury-mode") (commit commit))) (sha256 (base32 @@ -22917,7 +22917,7 @@ (define-public emacs-boxquote (origin (method git-fetch) (uri (git-reference - (url "https://github.com/davep/boxquote.el.git") + (url "https://github.com/davep/boxquote.el") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -22939,7 +22939,7 @@ (define-public emacs-buffer-move (origin (method git-fetch) (uri (git-reference - (url "https://github.com/lukhas/buffer-move.git") + (url "https://github.com/lukhas/buffer-move") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -22987,7 +22987,7 @@ (define-public emacs-mwim (origin (method git-fetch) (uri (git-reference - (url "https://github.com/alezost/mwim.el.git") + (url "https://github.com/alezost/mwim.el") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -23031,7 +23031,7 @@ (define-public emacs-unkillable-scratch (origin (method git-fetch) (uri (git-reference - (url "https://github.com/EricCrosson/unkillable-scratch.git") + (url "https://github.com/EricCrosson/unkillable-scratch") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -23051,7 +23051,7 @@ (define-public emacs-switch-buffer-functions (origin (method git-fetch) (uri (git-reference - (url "https://github.com/10sr/switch-buffer-functions-el.git") + (url "https://github.com/10sr/switch-buffer-functions-el") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -23099,7 +23099,7 @@ (define-public emacs-dmenu (origin (method git-fetch) (uri (git-reference - (url "https://github.com/lujun9972/el-dmenu.git") + (url "https://github.com/lujun9972/el-dmenu") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -23120,7 +23120,7 @@ (define-public emacs-no-littering (origin (method git-fetch) (uri (git-reference - (url "https://github.com/emacscollective/no-littering.git") + (url "https://github.com/emacscollective/no-littering") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -23144,7 +23144,7 @@ (define-public emacs-meson-mode (origin (method git-fetch) (uri (git-reference - (url "https://github.com/wentasah/meson-mode.git") + (url "https://github.com/wentasah/meson-mode") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -23169,7 +23169,7 @@ (define-public emacs-message-x (origin (method git-fetch) (uri (git-reference - (url "https://github.com/emacsmirror/message-x.git") + (url "https://github.com/emacsmirror/message-x") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -23221,7 +23221,7 @@ (define-public emacs-gnus-harvest (origin (method git-fetch) (uri (git-reference - (url "https://github.com/jwiegley/gnus-harvest.git") + (url "https://github.com/jwiegley/gnus-harvest") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -23407,7 +23407,7 @@ (define-public emacs-org-journal (origin (method git-fetch) (uri (git-reference - (url "https://github.com/bastibe/org-journal.git") + (url "https://github.com/bastibe/org-journal") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -23562,7 +23562,7 @@ (define-public emacs-org-roam (origin (method git-fetch) (uri (git-reference - (url "https://github.com/jethrokuan/org-roam.git") + (url "https://github.com/jethrokuan/org-roam") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -23596,7 +23596,7 @@ (define-public emacs-uml-mode (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ianxm/emacs-uml.git") + (url "https://github.com/ianxm/emacs-uml") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -23691,7 +23691,7 @@ (define-public emacs-shell-pop (origin (method git-fetch) (uri (git-reference - (url "https://github.com/kyagi/shell-pop-el.git") + (url "https://github.com/kyagi/shell-pop-el") (commit commit))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index 9be1065de2..e3a9017ba5 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -596,7 +596,7 @@ (define propeller-binutils (source (origin (inherit (package-source xbinutils)) (method git-fetch) (uri (git-reference - (url "https://github.com/parallaxinc/propgcc.git") + (url "https://github.com/parallaxinc/propgcc") (commit commit))) (file-name (string-append name "-" commit "-checkout")) (sha256 @@ -632,7 +632,7 @@ (define-public propeller-gcc-6 (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/totalspectrum/gcc-propeller.git") + (url "https://github.com/totalspectrum/gcc-propeller") (commit commit))) (file-name (string-append name "-" commit "-checkout")) (sha256 @@ -667,7 +667,7 @@ (define-public propeller-gcc-4 (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/parallaxinc/propgcc.git") + (url "https://github.com/parallaxinc/propgcc") (commit commit))) (file-name (string-append name "-" commit "-checkout")) (sha256 @@ -709,7 +709,7 @@ (define-public proplib (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/parallaxinc/propgcc.git") + (url "https://github.com/parallaxinc/propgcc") (commit commit))) (file-name (string-append name "-" commit "-checkout")) (sha256 @@ -828,7 +828,7 @@ (define-public propeller-load (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/parallaxinc/propgcc.git") + (url "https://github.com/parallaxinc/propgcc") (commit commit))) (file-name (string-append name "-" commit "-checkout")) (sha256 @@ -913,7 +913,7 @@ (define-public spinsim (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/parallaxinc/spinsim.git") + (url "https://github.com/parallaxinc/spinsim") (commit commit))) (file-name (string-append name "-" commit "-checkout")) (sha256 @@ -969,7 +969,7 @@ (define-public binutils-vc4 (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/puppeh/binutils-vc4.git") + (url "https://github.com/puppeh/binutils-vc4") (commit commit))) (file-name (string-append name "-" version "-checkout")) (sha256 @@ -997,7 +997,7 @@ (define-public binutils-vc4 ,(origin (method git-fetch) (uri (git-reference - (url "https://github.com/puppeh/cgen.git") + (url "https://github.com/puppeh/cgen") (commit "d8e2a9eb70425f180fdd5bfd032884b0855f2032"))) (sha256 (base32 @@ -1021,7 +1021,7 @@ (define-public gcc-vc4 (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/puppeh/gcc-vc4.git") + (url "https://github.com/puppeh/gcc-vc4") (commit commit))) (file-name (string-append name "-" @@ -1045,7 +1045,7 @@ (define-public python-libmpsse (origin (method git-fetch) (uri (git-reference - (url "https://github.com/daym/libmpsse.git") + (url "https://github.com/daym/libmpsse") (commit (string-append "v" version)))) (file-name "libmpsse-checkout") (sha256 diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 35f236dbfe..3d1fb6c905 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -140,7 +140,7 @@ (define-public dolphin-emu (origin (method git-fetch) (uri (git-reference - (url "https://github.com/dolphin-emu/dolphin.git") + (url "https://github.com/dolphin-emu/dolphin") (commit commit))) (file-name (git-file-name name version)) (modules '((guix build utils))) @@ -289,7 +289,7 @@ (define-public emulation-station (source (origin (method git-fetch) ; no tarball available (uri (git-reference - (url "https://github.com/Aloshi/EmulationStation.git") + (url "https://github.com/Aloshi/EmulationStation") (commit commit))) ; no version tag (file-name (git-file-name name version)) (sha256 @@ -323,7 +323,7 @@ (define-public higan (origin (method git-fetch) (uri (git-reference - (url "https://github.com/higan-emu/higan.git") + (url "https://github.com/higan-emu/higan") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -484,7 +484,7 @@ (define-public mgba (origin (method git-fetch) (uri (git-reference - (url "https://github.com/mgba-emu/mgba.git") + (url "https://github.com/mgba-emu/mgba") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -540,7 +540,7 @@ (define-public sameboy (origin (method git-fetch) (uri (git-reference - (url "https://github.com/LIJI32/SameBoy.git") + (url "https://github.com/LIJI32/SameBoy") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -587,7 +587,7 @@ (define-public mupen64plus-core (origin (method git-fetch) (uri (git-reference - (url "https://github.com/mupen64plus/mupen64plus-core.git") + (url "https://github.com/mupen64plus/mupen64plus-core") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -636,7 +636,7 @@ (define-public mupen64plus-audio-sdl (origin (method git-fetch) (uri (git-reference - (url "https://github.com/mupen64plus/mupen64plus-audio-sdl.git") + (url "https://github.com/mupen64plus/mupen64plus-audio-sdl") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -682,7 +682,7 @@ (define-public mupen64plus-input-sdl (origin (method git-fetch) (uri (git-reference - (url "https://github.com/mupen64plus/mupen64plus-input-sdl.git") + (url "https://github.com/mupen64plus/mupen64plus-input-sdl") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -727,7 +727,7 @@ (define-public mupen64plus-rsp-hle (origin (method git-fetch) (uri (git-reference - (url "https://github.com/mupen64plus/mupen64plus-rsp-hle.git") + (url "https://github.com/mupen64plus/mupen64plus-rsp-hle") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -769,7 +769,7 @@ (define-public mupen64plus-rsp-z64 (origin (method git-fetch) (uri (git-reference - (url "https://github.com/mupen64plus/mupen64plus-rsp-z64.git") + (url "https://github.com/mupen64plus/mupen64plus-rsp-z64") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -811,7 +811,7 @@ (define-public mupen64plus-video-arachnoid (origin (method git-fetch) (uri (git-reference - (url "https://github.com/mupen64plus/mupen64plus-video-arachnoid.git") + (url "https://github.com/mupen64plus/mupen64plus-video-arachnoid") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -857,7 +857,7 @@ (define-public mupen64plus-video-glide64 (origin (method git-fetch) (uri (git-reference - (url "https://github.com/mupen64plus/mupen64plus-video-glide64.git") + (url "https://github.com/mupen64plus/mupen64plus-video-glide64") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -911,7 +911,7 @@ (define-public mupen64plus-video-glide64mk2 (origin (method git-fetch) (uri (git-reference - (url "https://github.com/mupen64plus/mupen64plus-video-glide64mk2.git") + (url "https://github.com/mupen64plus/mupen64plus-video-glide64mk2") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -961,7 +961,7 @@ (define-public mupen64plus-video-rice (origin (method git-fetch) (uri (git-reference - (url "https://github.com/mupen64plus/mupen64plus-video-rice.git") + (url "https://github.com/mupen64plus/mupen64plus-video-rice") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -1009,7 +1009,7 @@ (define-public mupen64plus-video-z64 (origin (method git-fetch) (uri (git-reference - (url "https://github.com/mupen64plus/mupen64plus-video-z64.git") + (url "https://github.com/mupen64plus/mupen64plus-video-z64") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -1064,7 +1064,7 @@ (define-public mupen64plus-ui-console (origin (method git-fetch) (uri (git-reference - (url "https://github.com/mupen64plus/mupen64plus-ui-console.git") + (url "https://github.com/mupen64plus/mupen64plus-ui-console") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -1129,7 +1129,7 @@ (define-public nestopia-ue (origin (method git-fetch) (uri (git-reference - (url "https://github.com/rdanbrook/nestopia.git") + (url "https://github.com/rdanbrook/nestopia") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -1180,7 +1180,7 @@ (define-public retroarch (origin (method git-fetch) (uri (git-reference - (url "https://github.com/libretro/RetroArch.git") + (url "https://github.com/libretro/RetroArch") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -1344,7 +1344,7 @@ (define-public mame (origin (method git-fetch) (uri (git-reference - (url "https://github.com/mamedev/mame.git") + (url "https://github.com/mamedev/mame") (commit (apply string-append "mame" (string-split version #\.))))) (file-name (git-file-name name version)) (sha256 @@ -1849,7 +1849,7 @@ (define-public ppsspp (origin (method git-fetch) (uri (git-reference - (url "https://github.com/hrydgard/ppsspp.git") + (url "https://github.com/hrydgard/ppsspp") (commit (string-append "v" version)))) (sha256 (base32 "02yx1w0ygclnmdl0imsvgj24lkzi55wvxkf47q617j0jgrqhy8yl")) @@ -1949,7 +1949,7 @@ (define-public ppsspp ,(origin (method git-fetch) (uri (git-reference - (url "https://github.com/hrydgard/ppsspp-lang.git") + (url "https://github.com/hrydgard/ppsspp-lang") (commit "d184ba2b607a03435be579406b816c90add334e6"))) (sha256 (base32 "0s003x6247nx09qd6a1jz1l2hsk5d6k1zmh8mg3m6hjjhvbvd9j9")))) @@ -1957,7 +1957,7 @@ (define-public ppsspp ,(origin (method git-fetch) (uri (git-reference - (url "https://github.com/hrydgard/pspautotests.git") + (url "https://github.com/hrydgard/pspautotests") (commit "328b839c7243e7f733f9eae88d059485e3d808e7"))) (sha256 (base32 "1gj1kr5ijxrqwvz7c41phskjr70ndp8iz0gr8c3xxsd8p9z5gdvm")))))) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index f2d32e663f..5262b296e8 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -606,7 +606,7 @@ (define-public fritzing (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/fritzing/fritzing-app.git") + (url "https://github.com/fritzing/fritzing-app") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -655,7 +655,7 @@ (define-public fritzing ,(origin (method git-fetch) (uri (git-reference - (url "https://github.com/fritzing/fritzing-parts.git") + (url "https://github.com/fritzing/fritzing-parts") (commit version))) (file-name (git-file-name "fritzing-parts" version)) (sha256 @@ -713,7 +713,7 @@ (define-public translate2geda (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/erichVK5/translate2geda.git") + (url "https://github.com/erichVK5/translate2geda") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -933,7 +933,7 @@ (define-public kicad-symbols (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/KiCad/kicad-symbols.git") + (url "https://github.com/KiCad/kicad-symbols") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -962,7 +962,7 @@ (define-public kicad-footprints (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/KiCad/kicad-footprints.git") + (url "https://github.com/KiCad/kicad-footprints") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -979,7 +979,7 @@ (define-public kicad-packages3d (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/KiCad/kicad-packages3d.git") + (url "https://github.com/KiCad/kicad-packages3d") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -996,7 +996,7 @@ (define-public kicad-templates (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/KiCad/kicad-templates.git") + (url "https://github.com/KiCad/kicad-templates") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -2109,7 +2109,7 @@ (define-public gpx (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/markwal/GPX.git") + (url "https://github.com/markwal/GPX") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -2230,7 +2230,7 @@ (define-public lib3mf (source (origin (method git-fetch) - (uri (git-reference (url "https://github.com/3MFConsortium/lib3mf.git") + (uri (git-reference (url "https://github.com/3MFConsortium/lib3mf") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -2335,7 +2335,7 @@ (define-public freecad (origin (method git-fetch) (uri (git-reference - (url "https://github.com/FreeCAD/FreeCAD.git") + (url "https://github.com/FreeCAD/FreeCAD") (commit version))) (modules '((guix build utils))) (snippet @@ -2478,7 +2478,7 @@ (define-public libarea (source (origin (method git-fetch) - (uri (git-reference (url "https://github.com/Heeks/libarea.git") + (uri (git-reference (url "https://github.com/Heeks/libarea") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -2519,7 +2519,7 @@ (define-public libspnav (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/FreeSpacenav/libspnav.git") + (url "https://github.com/FreeSpacenav/libspnav") (commit (string-append "libspnav-" version)))) (sha256 (base32 diff --git a/gnu/packages/erlang.scm b/gnu/packages/erlang.scm index 4b6c0cf105..93569f3560 100644 --- a/gnu/packages/erlang.scm +++ b/gnu/packages/erlang.scm @@ -47,7 +47,7 @@ (define-public erlang ;; pre-compiled files, so we use this snapshot of the source ;; repository. (uri (git-reference - (url "https://github.com/erlang/otp.git") + (url "https://github.com/erlang/otp") (commit (string-append "OTP-" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/fabric-management.scm b/gnu/packages/fabric-management.scm index c31ee6e217..0e8b388cd1 100644 --- a/gnu/packages/fabric-management.scm +++ b/gnu/packages/fabric-management.scm @@ -185,7 +185,7 @@ (define-public ucx (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/openucx/ucx.git") + (url "https://github.com/openucx/ucx") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index f986acc9d4..9236d34f9f 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -147,7 +147,7 @@ (define-public fsarchiver (method git-fetch) (uri (git-reference - (url "https://github.com/fdupoux/fsarchiver.git") + (url "https://github.com/fdupoux/fsarchiver") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -574,7 +574,7 @@ (define-public libnfs (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/sahlberg/libnfs.git") + (url "https://github.com/sahlberg/libnfs") (commit (string-append "libnfs-" version)))) (file-name (git-file-name name version)) (sha256 @@ -821,7 +821,7 @@ (define-public mergerfs-tools (origin (method git-fetch) (uri (git-reference - (url "https://github.com/trapexit/mergerfs-tools.git") + (url "https://github.com/trapexit/mergerfs-tools") (commit commit))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index edace82db5..dc825efc8e 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -206,7 +206,7 @@ (define-public ledger (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ledger/ledger.git") + (url "https://github.com/ledger/ledger") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -304,7 +304,7 @@ (define-public emacs-ledger-mode (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ledger/ledger-mode.git") + (url "https://github.com/ledger/ledger-mode") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -378,7 +378,7 @@ (define-public geierlein (origin (method git-fetch) (uri (git-reference - (url "https://github.com/stesie/geierlein.git") + (url "https://github.com/stesie/geierlein") (commit (string-append "V" version)))) (file-name (git-file-name name version)) (sha256 @@ -481,7 +481,7 @@ (define-public electron-cash (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Electron-Cash/Electron-Cash.git") + (url "https://github.com/Electron-Cash/Electron-Cash") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -553,7 +553,7 @@ (define-public monero (origin (method git-fetch) (uri (git-reference - (url "https://github.com/monero-project/monero.git") + (url "https://github.com/monero-project/monero") (commit (string-append "v" version)) (recursive? #t))) (file-name (git-file-name name version)) @@ -672,7 +672,7 @@ (define-public monero-gui (origin (method git-fetch) (uri (git-reference - (url "https://github.com/monero-project/monero-gui.git") + (url "https://github.com/monero-project/monero-gui") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -787,7 +787,7 @@ (define-public python-trezor-agent (origin (method git-fetch) (uri (git-reference - (url "https://github.com/romanz/trezor-agent.git") + (url "https://github.com/romanz/trezor-agent") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -1197,7 +1197,7 @@ (define-public trezord-udev-rules (origin (method git-fetch) (uri (git-reference - (url "https://github.com/trezor/trezor-common.git") + (url "https://github.com/trezor/trezor-common") (commit commit))) (sha256 (base32 @@ -1222,7 +1222,7 @@ (define-public trezord (origin (method git-fetch) (uri (git-reference - (url "https://github.com/trezor/trezord-go.git") + (url "https://github.com/trezor/trezord-go") (commit (string-append "v" version)))) (sha256 (base32 @@ -1405,7 +1405,7 @@ (define-public bitcoin-unlimited (origin (method git-fetch) (uri (git-reference - (url "https://github.com/BitcoinUnlimited/BitcoinUnlimited.git") + (url "https://github.com/BitcoinUnlimited/BitcoinUnlimited") (commit (string-append "BCHunlimited" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 91136ab174..15a6725c67 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -50,7 +50,7 @@ (define-public ath9k-htc-firmware (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/qca/open-ath9k-htc-firmware.git") + (url "https://github.com/qca/open-ath9k-htc-firmware") (commit version))) (sha256 (base32 @@ -197,7 +197,7 @@ (define* (make-opensbi-package platform name #:optional (arch "riscv64")) (origin (method git-fetch) (uri (git-reference - (url "https://github.com/riscv/opensbi.git") + (url "https://github.com/riscv/opensbi") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/flashing-tools.scm b/gnu/packages/flashing-tools.scm index 8e36da22ed..ed844430cd 100644 --- a/gnu/packages/flashing-tools.scm +++ b/gnu/packages/flashing-tools.scm @@ -98,7 +98,7 @@ (define-public 0xffff (origin (method git-fetch) (uri (git-reference - (url "https://github.com/pali/0xffff.git") + (url "https://github.com/pali/0xffff") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -216,7 +216,7 @@ (define-public teensy-loader-cli (origin (method git-fetch) (uri (git-reference - (url "https://github.com/PaulStoffregen/teensy_loader_cli.git") + (url "https://github.com/PaulStoffregen/teensy_loader_cli") (commit commit))) (sha256 (base32 "0sssim56pwsxp5cp5dlf6mi9h5fx2592m6j1g7abnm0s09b0lpdx")) (file-name (git-file-name name version)) @@ -266,7 +266,7 @@ (define-public rkflashtool (origin (method git-fetch) (uri (git-reference - (url "https://github.com/linux-rockchip/rkflashtool.git") + (url "https://github.com/linux-rockchip/rkflashtool") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -345,7 +345,7 @@ (define-public ifdtool (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/coreboot/coreboot.git") + (url "https://github.com/coreboot/coreboot") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -419,7 +419,7 @@ (define-public me-cleaner (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/corna/me_cleaner.git") + (url "https://github.com/corna/me_cleaner") (commit (string-append "v" version)))) (sha256 (base32 @@ -451,7 +451,7 @@ (define-public uefitool (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/LongSoft/UEFITool.git") + (url "https://github.com/LongSoft/UEFITool") (commit version))) (sha256 (base32 diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index e8ce8a2ab1..00048862c6 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -461,7 +461,7 @@ (define-public font-adobe-source-han-sans (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/adobe-fonts/source-han-sans.git") + (url "https://github.com/adobe-fonts/source-han-sans") (commit (string-append version "R")))) (file-name (git-file-name name version)) (sha256 @@ -847,7 +847,7 @@ (define-public font-fantasque-sans (origin (method git-fetch) (uri (git-reference - (url "https://github.com/belluzj/fantasque-sans.git") + (url "https://github.com/belluzj/fantasque-sans") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -930,7 +930,7 @@ (define-public font-adobe-source-code-pro (origin (method git-fetch) (uri (git-reference - (url "https://github.com/adobe-fonts/source-code-pro.git") + (url "https://github.com/adobe-fonts/source-code-pro") (commit (regexp-substitute/global ;; The upstream tag uses "/" between the roman and italic ;; versions, so substitute our "-" separator here. @@ -955,7 +955,7 @@ (define-public font-adobe-source-sans-pro (origin (method git-fetch) (uri (git-reference - (url "https://github.com/adobe-fonts/source-sans-pro.git") + (url "https://github.com/adobe-fonts/source-sans-pro") (commit (regexp-substitute/global ;; The upstream tag uses "/" between the roman and italic ;; versions, so substitute our "-" separator here. @@ -980,7 +980,7 @@ (define-public font-adobe-source-serif-pro (origin (method git-fetch) (uri (git-reference - (url "https://github.com/adobe-fonts/source-serif-pro.git") + (url "https://github.com/adobe-fonts/source-serif-pro") (commit (regexp-substitute/global ;; The upstream tag uses "/" between the roman and italic ;; versions, so substitute our "-" separator here. @@ -1023,7 +1023,7 @@ (define-public font-fira-sans (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/mozilla/Fira.git") + (url "https://github.com/mozilla/Fira") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -1068,7 +1068,7 @@ (define-public font-awesome (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/FortAwesome/Font-Awesome.git") + (url "https://github.com/FortAwesome/Font-Awesome") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -1105,7 +1105,7 @@ (define-public font-tamzen (origin (method git-fetch) (uri (git-reference - (url "https://github.com/sunaku/tamzen-font.git") + (url "https://github.com/sunaku/tamzen-font") (commit (string-append "Tamzen-" version)))) (file-name (git-file-name name version)) (sha256 @@ -1388,7 +1388,7 @@ (define-public font-google-material-design-icons (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/google/material-design-icons.git") + (url "https://github.com/google/material-design-icons") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -1658,7 +1658,7 @@ (define-public font-public-sans (origin (method git-fetch) (uri (git-reference - (url "https://github.com/uswds/public-sans.git") + (url "https://github.com/uswds/public-sans") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 3336a84001..46279301d6 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -177,7 +177,7 @@ (define-public ttf2eot (origin (method git-fetch) (uri (git-reference - (url "https://github.com/wget/ttf2eot.git") + (url "https://github.com/wget/ttf2eot") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -266,7 +266,7 @@ (define-public woff2 (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/google/woff2.git") + (url "https://github.com/google/woff2") (commit (string-append "v" version)))) (file-name (string-append name "-" version ".git")) (sha256 diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index fda5de60c7..b2717d2233 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -127,7 +127,7 @@ (define-public yosys (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/cliffordwolf/yosys.git") + (url "https://github.com/cliffordwolf/yosys") (commit (string-append "yosys-" version)) (recursive? #t))) ; for the ‘iverilog’ submodule (sha256 @@ -223,7 +223,7 @@ (define-public icestorm (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/cliffordwolf/icestorm.git") + (url "https://github.com/cliffordwolf/icestorm") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -304,7 +304,7 @@ (define-public arachne-pnr (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/YosysHQ/arachne-pnr.git") + (url "https://github.com/YosysHQ/arachne-pnr") (commit commit))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 871189933c..e45980e7a0 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -456,7 +456,7 @@ (define-public tiled (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/bjorn/tiled.git") + (url "https://github.com/bjorn/tiled") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -503,7 +503,7 @@ (define-public sfml ;; http://mirror0.sfml-dev.org/files/ because files there seem ;; to be changed in place. (uri (git-reference - (url "https://github.com/SFML/SFML.git") + (url "https://github.com/SFML/SFML") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -593,7 +593,7 @@ (define-public surgescript (origin (method git-fetch) (uri (git-reference - (url "https://github.com/alemart/surgescript.git") + (url "https://github.com/alemart/surgescript") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -1403,7 +1403,7 @@ (define-public ois (origin (method git-fetch) (uri (git-reference - (url "https://github.com/wgois/OIS.git") + (url "https://github.com/wgois/OIS") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -1933,7 +1933,7 @@ (define-public ioquake3 (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ioquake/ioq3.git") + (url "https://github.com/ioquake/ioq3") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -2051,7 +2051,7 @@ (define-public fna (origin (method git-fetch) (uri (git-reference - (url "https://github.com/FNA-XNA/FNA.git") + (url "https://github.com/FNA-XNA/FNA") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -2103,7 +2103,7 @@ (define-public libccd (origin (method git-fetch) (uri (git-reference - (url "https://github.com/danfis/libccd.git") + (url "https://github.com/danfis/libccd") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -2179,7 +2179,7 @@ (define-public chipmunk (origin (method git-fetch) (uri (git-reference - (url "https://github.com/slembcke/Chipmunk2D.git") + (url "https://github.com/slembcke/Chipmunk2D") (commit (string-append "Chipmunk-" version)))) (file-name (git-file-name name version)) (sha256 @@ -2206,7 +2206,7 @@ (define-public libtcod (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/libtcod/libtcod.git") + (url "https://github.com/libtcod/libtcod") (commit version))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 5a38e2066a..902c3d0cc1 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -345,7 +345,7 @@ (define-public alex4 (origin (method git-fetch) (uri (git-reference - (url "https://github.com/carstene1ns/alex4.git") + (url "https://github.com/carstene1ns/alex4") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -416,7 +416,7 @@ (define-public astromenace (origin (method git-fetch) (uri (git-reference - (url "https://github.com/viewizard/astromenace.git") + (url "https://github.com/viewizard/astromenace") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -476,7 +476,7 @@ (define-public bastet (origin (method git-fetch) (uri (git-reference - (url "https://github.com/fph/bastet.git") + (url "https://github.com/fph/bastet") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -655,7 +655,7 @@ (define-public cataclysm-dda (origin (method git-fetch) (uri (git-reference - (url "https://github.com/CleverRaven/Cataclysm-DDA.git") + (url "https://github.com/CleverRaven/Cataclysm-DDA") (commit version))) (sha256 (base32 "15l6w6lxays7qmsv0ci2ry53asb9an9dh7l7fc13256k085qcg68")) @@ -720,7 +720,7 @@ (define-public corsix-th (origin (method git-fetch) (uri (git-reference - (url "https://github.com/CorsixTH/CorsixTH.git") + (url "https://github.com/CorsixTH/CorsixTH") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -775,7 +775,7 @@ (define-public cowsay (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/tnalpgge/rank-amateur-cowsay.git") + (url "https://github.com/tnalpgge/rank-amateur-cowsay") (commit (string-append name "-" version)))) (file-name (git-file-name name version)) (sha256 @@ -818,7 +818,7 @@ (define-public lolcat (origin (method git-fetch) (uri (git-reference - (url "https://github.com/jaseg/lolcat.git") + (url "https://github.com/jaseg/lolcat") (commit commit))) (sha256 (base32 @@ -986,7 +986,7 @@ (define-public freedoom (origin (method git-fetch) (uri (git-reference - (url "https://github.com/freedoom/freedoom.git") + (url "https://github.com/freedoom/freedoom") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -1184,7 +1184,7 @@ (define-public julius (origin (method git-fetch) (uri (git-reference - (url "https://github.com/bvschaik/julius.git") + (url "https://github.com/bvschaik/julius") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -1291,7 +1291,7 @@ (define-public opensurge (origin (method git-fetch) (uri (git-reference - (url "https://github.com/alemart/opensurge.git") + (url "https://github.com/alemart/opensurge") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -1980,7 +1980,7 @@ (define-public seahorse-adventures (origin (method git-fetch) (uri (git-reference - (url "https://github.com/dulsi/seahorse-adventures.git") + (url "https://github.com/dulsi/seahorse-adventures") (commit (string-append "release-" version)))) (file-name (git-file-name name version)) (sha256 @@ -2092,7 +2092,7 @@ (define-public superstarfighter (origin (method git-fetch) (uri (git-reference - (url "https://github.com/notapixelstudio/superstarfighter.git") + (url "https://github.com/notapixelstudio/superstarfighter") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -2437,7 +2437,7 @@ (define-public abbaye (origin (method git-fetch) (uri (git-reference - (url "https://github.com/nevat/abbayedesmorts-gpl.git") + (url "https://github.com/nevat/abbayedesmorts-gpl") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -2668,7 +2668,7 @@ (define-public cmatrix (origin (method git-fetch) (uri (git-reference - (url "https://github.com/abishekvashok/cmatrix.git") + (url "https://github.com/abishekvashok/cmatrix") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -2985,7 +2985,7 @@ (define-public mars (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/thelaui/M.A.R.S..git") + (url "https://github.com/thelaui/M.A.R.S.") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -4065,7 +4065,7 @@ (define-public openrct2 (origin (method git-fetch) (uri (git-reference - (url "https://github.com/OpenRCT2/OpenRCT2.git") + (url "https://github.com/OpenRCT2/OpenRCT2") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -4273,7 +4273,7 @@ (define-public red-eclipse (origin (method git-fetch) (uri (git-reference - (url "https://github.com/redeclipse/base.git") + (url "https://github.com/redeclipse/base") (commit (string-append "v" release)) (recursive? #t))) ; for game data (file-name (git-file-name name version)) @@ -5087,7 +5087,7 @@ (define-public laby (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/sgimenez/laby.git") + (url "https://github.com/sgimenez/laby") (commit (string-append name "-" version)))) (file-name (git-file-name name version)) (sha256 @@ -5430,7 +5430,7 @@ (define-public no-more-secrets (origin (method git-fetch) (uri (git-reference - (url "https://github.com/bartobri/no-more-secrets.git") + (url "https://github.com/bartobri/no-more-secrets") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -5545,7 +5545,7 @@ (define-public freegish (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/freegish/freegish.git") + (url "https://github.com/freegish/freegish") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -5602,7 +5602,7 @@ (define-public cdogs-sdl (origin (method git-fetch) (uri (git-reference - (url "https://github.com/cxong/cdogs-sdl.git") + (url "https://github.com/cxong/cdogs-sdl") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -5739,7 +5739,7 @@ (define-public teeworlds (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/teeworlds/teeworlds.git") + (url "https://github.com/teeworlds/teeworlds") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -6581,7 +6581,7 @@ (define-public vkquake (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Novum/vkQuake.git") + (url "https://github.com/Novum/vkQuake") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -6716,7 +6716,7 @@ (define-public the-butterfly-effect (origin (method git-fetch) (uri (git-reference - (url "https://github.com/the-butterfly-effect/tbe.git") + (url "https://github.com/the-butterfly-effect/tbe") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -6768,7 +6768,7 @@ (define-public pioneer (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/pioneerspacesim/pioneer.git") + (url "https://github.com/pioneerspacesim/pioneer") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -6815,7 +6815,7 @@ (define-public badass (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/umayr/badass.git") + (url "https://github.com/umayr/badass") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -6840,7 +6840,7 @@ (define-public colobot (origin (method git-fetch) (uri (git-reference - (url "https://github.com/colobot/colobot.git") + (url "https://github.com/colobot/colobot") (commit (string-append "colobot-gold-" version)) (recursive? #t))) ;for "data/" subdir (file-name (git-file-name name version)) @@ -6915,7 +6915,7 @@ (define-public gzdoom (origin (method git-fetch) (uri (git-reference - (url "https://github.com/coelckers/gzdoom.git") + (url "https://github.com/coelckers/gzdoom") (commit (string-append "g" version)))) (file-name (git-file-name name version)) (sha256 @@ -7077,7 +7077,7 @@ (define-public crispy-doom (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/fabiangreffrath/crispy-doom.git") + (url "https://github.com/fabiangreffrath/crispy-doom") (commit (string-append "crispy-doom-" version)))) (file-name (git-file-name name version)) (sha256 @@ -7119,7 +7119,7 @@ (define-public rinutils (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/shlomif/rinutils.git") + (url "https://github.com/shlomif/rinutils") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -7642,7 +7642,7 @@ (define-public frozen-bubble (origin (method git-fetch) (uri (git-reference - (url "https://github.com/kthakore/frozen-bubble.git") + (url "https://github.com/kthakore/frozen-bubble") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -7871,7 +7871,7 @@ (define-public stepmania (origin (method git-fetch) (uri (git-reference - (url "https://github.com/stepmania/stepmania.git") + (url "https://github.com/stepmania/stepmania") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -8106,7 +8106,7 @@ (define-public slingshot (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ryanakca/slingshot.git") + (url "https://github.com/ryanakca/slingshot") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -8409,7 +8409,7 @@ (define-public flare-engine (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/flareteam/flare-engine.git") + (url "https://github.com/flareteam/flare-engine") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -8437,7 +8437,7 @@ (define-public flare-game (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/flareteam/flare-game.git") + (url "https://github.com/flareteam/flare-game") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -8563,7 +8563,7 @@ (define-public marble-marcher (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/HackerPoet/MarbleMarcher.git") + (url "https://github.com/HackerPoet/MarbleMarcher") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -9501,7 +9501,7 @@ (define-public leela-zero (origin (method git-fetch) (uri (git-reference - (url "https://github.com/leela-zero/leela-zero.git") + (url "https://github.com/leela-zero/leela-zero") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -9549,7 +9549,7 @@ (define-public q5go (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/bernds/q5Go.git") + (url "https://github.com/bernds/q5Go") (commit (string-append "q5go-" version)))) (file-name (git-file-name name version)) (sha256 @@ -11165,7 +11165,7 @@ (define-public xmoto (origin (method git-fetch) (uri (git-reference - (url "https://github.com/xmoto/xmoto.git") + (url "https://github.com/xmoto/xmoto") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -11257,7 +11257,7 @@ (define-public eboard (origin (method git-fetch) (uri (git-reference - (url "https://github.com/fbergo/eboard.git") + (url "https://github.com/fbergo/eboard") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -11359,7 +11359,7 @@ (define-public stockfish (origin (method git-fetch) (uri (git-reference - (url "https://github.com/official-stockfish/Stockfish.git") + (url "https://github.com/official-stockfish/Stockfish") (commit (string-append "sf_" version)))) (file-name (git-file-name name version)) (sha256 @@ -11491,7 +11491,7 @@ (define-public neverball (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Neverball/neverball.git") + (url "https://github.com/Neverball/neverball") (commit commit))) (sha256 (base32 diff --git a/gnu/packages/genealogy.scm b/gnu/packages/genealogy.scm index 79b24ed048..dde0fddc25 100644 --- a/gnu/packages/genealogy.scm +++ b/gnu/packages/genealogy.scm @@ -44,7 +44,7 @@ (define-public gramps (origin (method git-fetch) (uri (git-reference - (url "https://github.com/gramps-project/gramps.git") + (url "https://github.com/gramps-project/gramps") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/genimage.scm b/gnu/packages/genimage.scm index 27f55a398a..7ad710082c 100644 --- a/gnu/packages/genimage.scm +++ b/gnu/packages/genimage.scm @@ -45,7 +45,7 @@ (define-public genimage (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/pengutronix/genimage.git") + (url "https://github.com/pengutronix/genimage") (commit (string-append "v" version)))) (file-name (string-append name "-" version "-checkout")) (sha256 diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 0834add7d1..879132c43a 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -859,7 +859,7 @@ (define-public libosmium (origin (method git-fetch) (uri (git-reference - (url "https://github.com/osmcode/libosmium.git") + (url "https://github.com/osmcode/libosmium") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -892,7 +892,7 @@ (define-public osm2pgsql (origin (method git-fetch) (uri (git-reference - (url "https://github.com/openstreetmap/osm2pgsql.git") + (url "https://github.com/openstreetmap/osm2pgsql") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -941,7 +941,7 @@ (define-public tippecanoe (origin (method git-fetch) (uri (git-reference - (url "https://github.com/mapbox/tippecanoe.git") + (url "https://github.com/mapbox/tippecanoe") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -1032,7 +1032,7 @@ (define-public xygrib (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/opengribs/XyGrib.git") + (url "https://github.com/opengribs/XyGrib") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -1468,7 +1468,7 @@ (define-public qmapshack (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Maproom/qmapshack.git") + (url "https://github.com/Maproom/qmapshack") (commit (string-append "V_" version)))) (file-name (git-file-name name version)) (sha256 @@ -1620,7 +1620,7 @@ (define-public opencpn (origin (method git-fetch) (uri (git-reference - (url "https://github.com/OpenCPN/OpenCPN.git") + (url "https://github.com/OpenCPN/OpenCPN") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index c52dc7a4d1..c2fca073e3 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -311,7 +311,7 @@ (define-public mypaint-brushes (origin (method git-fetch) (uri (git-reference - (url "https://github.com/mypaint/mypaint-brushes.git") + (url "https://github.com/mypaint/mypaint-brushes") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -337,7 +337,7 @@ (define-public mypaint-brushes-1.3 (origin (method git-fetch) (uri (git-reference - (url "https://github.com/mypaint/mypaint-brushes.git") + (url "https://github.com/mypaint/mypaint-brushes") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index d7a6082189..fb33bd7f6d 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -193,7 +193,7 @@ (define-public s2tc (origin (method git-fetch) (uri (git-reference - (url "https://github.com/divVerent/s2tc.git") + (url "https://github.com/divVerent/s2tc") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -833,7 +833,7 @@ (define-public nanovg-for-extempore (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/extemporelang/nanovg.git") + (url "https://github.com/extemporelang/nanovg") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -893,7 +893,7 @@ (define-public virtualgl (origin (method git-fetch) (uri (git-reference - (url "https://github.com/VirtualGL/virtualgl.git") + (url "https://github.com/VirtualGL/virtualgl") (commit version))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index 53be103495..83e0fc785e 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -98,7 +98,7 @@ (define-public delft-icon-theme (origin (method git-fetch) (uri (git-reference - (url "https://github.com/madmaxms/iconpack-delft.git") + (url "https://github.com/madmaxms/iconpack-delft") (commit (string-append "v" version)))) (sha256 (base32 @@ -244,7 +244,7 @@ (define-public gnome-shell-extension-dash-to-dock (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/micheleg/dash-to-dock.git") + (url "https://github.com/micheleg/dash-to-dock") (commit (string-append "extensions.gnome.org-v" version)))) (sha256 @@ -423,7 +423,7 @@ (define-public gnome-shell-extension-dash-to-panel (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/home-sweet-gnome/dash-to-panel.git") + (url "https://github.com/home-sweet-gnome/dash-to-panel") (commit (string-append "v" version)))) (sha256 (base32 @@ -462,7 +462,7 @@ (define-public gnome-shell-extension-noannoyance (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/BjoernDaase/noannoyance.git") + (url "https://github.com/BjoernDaase/noannoyance") (commit "e37b5b3c31f577b4698bc6659bc9fec5ea9ac5d4"))) (sha256 (base32 @@ -485,7 +485,7 @@ (define-public gnome-shell-extension-paperwm (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/paperwm/PaperWM.git") + (url "https://github.com/paperwm/PaperWM") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -522,7 +522,7 @@ (define-public numix-gtk-theme (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/numixproject/numix-gtk-theme.git") + (url "https://github.com/numixproject/numix-gtk-theme") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -564,7 +564,7 @@ (define-public papirus-icon-theme (origin (method git-fetch) (uri (git-reference - (url "https://github.com/PapirusDevelopmentTeam/papirus-icon-theme.git") + (url "https://github.com/PapirusDevelopmentTeam/papirus-icon-theme") (commit tag))) (sha256 (base32 @@ -597,7 +597,7 @@ (define-public vala-language-server (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/benwaffle/vala-language-server.git") + (url "https://github.com/benwaffle/vala-language-server") (commit version))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 2f390c6955..78609b571b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5384,7 +5384,7 @@ (define-public gusb (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/hughsie/libgusb.git") + (url "https://github.com/hughsie/libgusb") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -8446,7 +8446,7 @@ (define-public arc-theme (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/NicoHood/arc-theme.git") + (url "https://github.com/NicoHood/arc-theme") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -8489,7 +8489,7 @@ (define-public faba-icon-theme (origin (method git-fetch) (uri (git-reference - (url "https://github.com/snwh/faba-icon-theme.git") + (url "https://github.com/snwh/faba-icon-theme") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -8522,7 +8522,7 @@ (define-public moka-icon-theme (origin (method git-fetch) (uri (git-reference - (url "https://github.com/snwh/moka-icon-theme.git") + (url "https://github.com/snwh/moka-icon-theme") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -8545,7 +8545,7 @@ (define-public arc-icon-theme (origin (method git-fetch) (uri (git-reference - (url "https://github.com/horst3180/arc-icon-theme.git") + (url "https://github.com/horst3180/arc-icon-theme") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -9416,7 +9416,7 @@ (define-public workrave (origin (method git-fetch) (uri (git-reference - (url "https://github.com/rcaelers/workrave.git") + (url "https://github.com/rcaelers/workrave") (commit (string-append "v" (string-map (match-lambda (#\. #\_) (chr chr)) version))))) @@ -10204,7 +10204,7 @@ (define-public libratbag (origin (method git-fetch) (uri (git-reference - (url "https://github.com/libratbag/libratbag.git") + (url "https://github.com/libratbag/libratbag") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -10271,7 +10271,7 @@ (define-public piper (origin (method git-fetch) (uri (git-reference - (url "https://github.com/libratbag/piper.git") + (url "https://github.com/libratbag/piper") (commit version))) (sha256 (base32 "00vrcsbsv2477l1ncpyzc61lhxgac84dsgr3sjs8qxw3nh1gaasv")) @@ -10338,7 +10338,7 @@ (define-public parlatype (origin (method git-fetch) (uri (git-reference - (url "https://github.com/gkarsay/parlatype.git") + (url "https://github.com/gkarsay/parlatype") (commit commit))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index fa430837f9..5da18a22b5 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1465,7 +1465,7 @@ (define-public firefox-decrypt (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Unode/firefox_decrypt.git") + (url "https://github.com/Unode/firefox_decrypt") (commit version))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 58d6b00fc4..2c31632db6 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -227,7 +227,7 @@ (define-public go-1.14 (origin (method git-fetch) (uri (git-reference - (url "https://github.com/golang/go.git") + (url "https://github.com/golang/go") (commit (string-append "go" version)))) (file-name (git-file-name name version)) (sha256 @@ -433,7 +433,7 @@ (define-public go-github-com-alsm-ioprogress (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/alsm/ioprogress.git") + (url "https://github.com/alsm/ioprogress") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -459,7 +459,7 @@ (define-public go-github-com-aki237-nscjar (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/aki237/nscjar.git") + (url "https://github.com/aki237/nscjar") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -509,7 +509,7 @@ (define-public go-gopkg.in-tomb.v2 (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/go-tomb/tomb.git") + (url "https://github.com/go-tomb/tomb") (commit commit))) (file-name (string-append name "-" version ".tar.gz")) (sha256 @@ -862,7 +862,7 @@ (define-public go-github-com-burntsushi-toml (origin (method git-fetch) (uri (git-reference - (url "https://github.com/BurntSushi/toml.git") + (url "https://github.com/BurntSushi/toml") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -887,7 +887,7 @@ (define-public go-github-com-getsentry-raven-go (origin (method git-fetch) (uri (git-reference - (url "https://github.com/getsentry/raven-go.git") + (url "https://github.com/getsentry/raven-go") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -916,7 +916,7 @@ (define-public go-github-com-hashicorp-go-version (origin (method git-fetch) (uri (git-reference - (url "https://github.com/hashicorp/go-version.git") + (url "https://github.com/hashicorp/go-version") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -946,7 +946,7 @@ (define-public go-github-com-jpillora-backoff (origin (method git-fetch) (uri (git-reference - (url "https://github.com/jpillora/backoff.git") + (url "https://github.com/jpillora/backoff") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -969,7 +969,7 @@ (define-public go-github-com-stretchr-objx (origin (method git-fetch) (uri (git-reference - (url "https://github.com/stretchr/objx.git") + (url "https://github.com/stretchr/objx") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -992,7 +992,7 @@ (define-public go-github-com-stretchr-testify (origin (method git-fetch) (uri (git-reference - (url "https://github.com/stretchr/testify.git") + (url "https://github.com/stretchr/testify") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -1031,7 +1031,7 @@ (define-public go-github-com-tevino-abool (origin (method git-fetch) (uri (git-reference - (url "https://github.com/tevino/abool.git") + (url "https://github.com/tevino/abool") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -1056,7 +1056,7 @@ (define-public go-github-com-blang-semver (origin (method git-fetch) (uri (git-reference - (url "https://github.com/blang/semver.git") + (url "https://github.com/blang/semver") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -1080,7 +1080,7 @@ (define-public go-github-com-emicklei-go-restful (origin (method git-fetch) (uri (git-reference - (url "https://github.com/emicklei/go-restful.git") + (url "https://github.com/emicklei/go-restful") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -1106,7 +1106,7 @@ (define-public go-github-com-google-cadvisor (origin (method git-fetch) (uri (git-reference - (url "https://github.com/google/cadvisor.git") + (url "https://github.com/google/cadvisor") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -1132,7 +1132,7 @@ (define-public go-github-com-google-gofuzz (origin (method git-fetch) (uri (git-reference - (url "https://github.com/google/gofuzz.git") + (url "https://github.com/google/gofuzz") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -1157,7 +1157,7 @@ (define-public go-github-com-gorilla-context (origin (method git-fetch) (uri (git-reference - (url "https://github.com/gorilla/context.git") + (url "https://github.com/gorilla/context") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -1181,7 +1181,7 @@ (define-public go-github-com-gorilla-mux (origin (method git-fetch) (uri (git-reference - (url "https://github.com/gorilla/mux.git") + (url "https://github.com/gorilla/mux") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -1207,7 +1207,7 @@ (define-public go-github-com-jonboulle-clockwork (origin (method git-fetch) (uri (git-reference - (url "https://github.com/jonboulle/clockwork.git") + (url "https://github.com/jonboulle/clockwork") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -1329,7 +1329,7 @@ (define-public go-github-com-spf13-pflag (origin (method git-fetch) (uri (git-reference - (url "https://github.com/spf13/pflag.git") + (url "https://github.com/spf13/pflag") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -1356,7 +1356,7 @@ (define-public go-github-com-spf13-viper (origin (method git-fetch) (uri (git-reference - (url "https://github.com/spf13/viper.git") + (url "https://github.com/spf13/viper") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -1493,7 +1493,7 @@ (define-public go-github-com-sirupsen-logrus (origin (method git-fetch) (uri (git-reference - (url "https://github.com/sirupsen/logrus.git") + (url "https://github.com/sirupsen/logrus") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -1522,7 +1522,7 @@ (define-public go-github-com-rifflock-lfshook (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/rifflock/lfshook.git") + (url "https://github.com/rifflock/lfshook") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -1655,7 +1655,7 @@ (define-public go-github-com-docker-go-connections (origin (method git-fetch) (uri (git-reference - (url "https://github.com/docker/go-connections.git") + (url "https://github.com/docker/go-connections") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -1682,7 +1682,7 @@ (define-public go-github-com-docker-machine (origin (method git-fetch) (uri (git-reference - (url "https://github.com/docker/machine.git") + (url "https://github.com/docker/machine") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -1709,7 +1709,7 @@ (define-public go-github-com-gorhill-cronexpr (origin (method git-fetch) (uri (git-reference - (url "https://github.com/gorhill/cronexpr.git") + (url "https://github.com/gorhill/cronexpr") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -2242,7 +2242,7 @@ (define-public go-github-com-libp2p-go-flow-metrics (origin (method git-fetch) (uri (git-reference - (url "https://github.com/libp2p/go-flow-metrics.git") + (url "https://github.com/libp2p/go-flow-metrics") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -2268,7 +2268,7 @@ (define-public go-github-com-davecgh-go-spew (origin (method git-fetch) (uri (git-reference - (url "https://github.com/davecgh/go-spew.git") + (url "https://github.com/davecgh/go-spew") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -2308,7 +2308,7 @@ (define-public go-github-com-btcsuite-btclog (origin (method git-fetch) (uri (git-reference - (url "https://github.com/btcsuite/btclog.git") + (url "https://github.com/btcsuite/btclog") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -2334,7 +2334,7 @@ (define-public go-github-com-btcsuite-btcd-btcec (origin (method git-fetch) (uri (git-reference - (url "https://github.com/btcsuite/btcd.git") + (url "https://github.com/btcsuite/btcd") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -2370,7 +2370,7 @@ (define-public go-github-com-minio-sha256-simd (origin (method git-fetch) (uri (git-reference - (url "https://github.com/minio/sha256-simd.git") + (url "https://github.com/minio/sha256-simd") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -2406,7 +2406,7 @@ (define-public go-github-com-libp2p-go-libp2p-crypto (origin (method git-fetch) (uri (git-reference - (url "https://github.com/libp2p/go-libp2p-crypto.git") + (url "https://github.com/libp2p/go-libp2p-crypto") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -2436,7 +2436,7 @@ (define-public go-github-com-mr-tron-base58 (origin (method git-fetch) (uri (git-reference - (url "https://github.com/mr-tron/base58.git") + (url "https://github.com/mr-tron/base58") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -2463,7 +2463,7 @@ (define-public go-github-com-gxed-hashland-keccakpg (origin (method git-fetch) (uri (git-reference - (url "https://github.com/gxed/hashland.git") + (url "https://github.com/gxed/hashland") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -2489,7 +2489,7 @@ (define-public go-github-com-minio-blake2b-simd (origin (method git-fetch) (uri (git-reference - (url "https://github.com/minio/blake2b-simd.git") + (url "https://github.com/minio/blake2b-simd") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -2519,7 +2519,7 @@ (define-public go-github-com-spaolacci-murmur3 (origin (method git-fetch) (uri (git-reference - (url "https://github.com/spaolacci/murmur3.git") + (url "https://github.com/spaolacci/murmur3") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -2545,7 +2545,7 @@ (define-public go-github-com-twmb-murmur3 (origin (method git-fetch) (uri (git-reference - (url "https://github.com/twmb/murmur3.git") + (url "https://github.com/twmb/murmur3") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -2573,7 +2573,7 @@ (define-public go-github-com-multiformats-go-multihash (origin (method git-fetch) (uri (git-reference - (url "https://github.com/multiformats/go-multihash.git") + (url "https://github.com/multiformats/go-multihash") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -2604,7 +2604,7 @@ (define-public go-github-com-libp2p-go-libp2p-peer (origin (method git-fetch) (uri (git-reference - (url "https://github.com/libp2p/go-libp2p-peer.git") + (url "https://github.com/libp2p/go-libp2p-peer") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -2639,7 +2639,7 @@ (define-public go-github-com-libp2p-go-libp2p-protocol (origin (method git-fetch) (uri (git-reference - (url "https://github.com/libp2p/go-libp2p-protocol.git") + (url "https://github.com/libp2p/go-libp2p-protocol") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -2664,7 +2664,7 @@ (define-public go-github-com-libp2p-go-libp2p-metrics (origin (method git-fetch) (uri (git-reference - (url "https://github.com/libp2p/go-libp2p-metrics.git") + (url "https://github.com/libp2p/go-libp2p-metrics") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -2703,7 +2703,7 @@ (define-public go-github-com-mitchellh-go-homedir (origin (method git-fetch) (uri (git-reference - (url "https://github.com/mitchellh/go-homedir.git") + (url "https://github.com/mitchellh/go-homedir") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -2764,7 +2764,7 @@ (define-public go-github-com-multiformats-go-multiaddr (origin (method git-fetch) (uri (git-reference - (url "https://github.com/multiformats/go-multiaddr.git") + (url "https://github.com/multiformats/go-multiaddr") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -2806,7 +2806,7 @@ (define-public go-github-com-multiformats-go-multiaddr-net (origin (method git-fetch) (uri (git-reference - (url "https://github.com/multiformats/go-multiaddr-net.git") + (url "https://github.com/multiformats/go-multiaddr-net") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -2844,7 +2844,7 @@ (define-public go-github-com-whyrusleeping-tar-utils (origin (method git-fetch) (uri (git-reference - (url "https://github.com/whyrusleeping/tar-utils.git") + (url "https://github.com/whyrusleeping/tar-utils") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -2869,7 +2869,7 @@ (define-public go-github-com-cheekybits-is (origin (method git-fetch) (uri (git-reference - (url "https://github.com/cheekybits/is.git") + (url "https://github.com/cheekybits/is") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -2901,7 +2901,7 @@ (define-public go-github-com-sabhiram-go-gitignore (origin (method git-fetch) (uri (git-reference - (url "https://github.com/sabhiram/go-gitignore.git") + (url "https://github.com/sabhiram/go-gitignore") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -2926,7 +2926,7 @@ (define-public go-github-com-urfave-cli (origin (method git-fetch) (uri (git-reference - (url "https://github.com/urfave/cli.git") + (url "https://github.com/urfave/cli") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -3055,7 +3055,7 @@ (define-public go-github-com-whyrusleeping-json-filter (origin (method git-fetch) (uri (git-reference - (url "https://github.com/whyrusleeping/json-filter.git") + (url "https://github.com/whyrusleeping/json-filter") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -3081,7 +3081,7 @@ (define-public go-github-com-whyrusleeping-progmeter (origin (method git-fetch) (uri (git-reference - (url "https://github.com/whyrusleeping/progmeter.git") + (url "https://github.com/whyrusleeping/progmeter") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -3106,7 +3106,7 @@ (define-public go-github-com-whyrusleeping-stump (origin (method git-fetch) (uri (git-reference - (url "https://github.com/whyrusleeping/stump.git") + (url "https://github.com/whyrusleeping/stump") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -3131,7 +3131,7 @@ (define-public go-github-com-kr-fs (origin (method git-fetch) (uri (git-reference - (url "https://github.com/kr/fs.git") + (url "https://github.com/kr/fs") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -3178,7 +3178,7 @@ (define-public go-github-com-kr-pretty (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/kr/pretty.git") + (url "https://github.com/kr/pretty") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -3201,7 +3201,7 @@ (define-public go-github-com-kr-text (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/kr/text.git") + (url "https://github.com/kr/text") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -3546,7 +3546,7 @@ (define-public go-github-com-pkg-errors (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/pkg/errors.git") + (url "https://github.com/pkg/errors") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -3768,7 +3768,7 @@ (define-public go-github-com-fatih-color (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/fatih/color.git") + (url "https://github.com/fatih/color") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -3790,7 +3790,7 @@ (define-public go-github-com-google-go-cmp-cmp (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/google/go-cmp.git") + (url "https://github.com/google/go-cmp") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -3838,7 +3838,7 @@ (define (go-gotest-tools-source version sha256-base32-hash) (origin (method git-fetch) (uri (git-reference - (url "https://github.com/gotestyourself/gotest.tools.git") + (url "https://github.com/gotestyourself/gotest.tools") (commit (string-append "v" version)))) (file-name (git-file-name "go-gotest-tools" version)) (sha256 @@ -3914,7 +3914,7 @@ (define-public gotestsum (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/gotestyourself/gotestsum.git") + (url "https://github.com/gotestyourself/gotestsum") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -3961,7 +3961,7 @@ (define-public go-github-com-golang-protobuf-proto (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/golang/protobuf.git") + (url "https://github.com/golang/protobuf") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -3986,7 +3986,7 @@ (define-public go-github-com-mattn-go-zglob (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/mattn/go-zglob.git") + (url "https://github.com/mattn/go-zglob") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/gpodder.scm b/gnu/packages/gpodder.scm index 6963da9dff..734599483b 100644 --- a/gnu/packages/gpodder.scm +++ b/gnu/packages/gpodder.scm @@ -43,7 +43,7 @@ (define-public gpodder (origin (method git-fetch) (uri (git-reference - (url "https://github.com/gpodder/gpodder.git") + (url "https://github.com/gpodder/gpodder") (commit version))) (sha256 (base32 diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm index 762ee30632..93460bb38e 100644 --- a/gnu/packages/graph.scm +++ b/gnu/packages/graph.scm @@ -216,7 +216,7 @@ (define-public r-rbiofabric (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/wjrl/RBioFabric.git") + (url "https://github.com/wjrl/RBioFabric") (commit commit))) (file-name (string-append name "-" version "-checkout")) (sha256 @@ -240,7 +240,7 @@ (define-public python-plotly (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/plotly/plotly.py.git") + (url "https://github.com/plotly/plotly.py") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -318,7 +318,7 @@ (define-public python-louvain (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/vtraag/louvain-igraph.git") + (url "https://github.com/vtraag/louvain-igraph") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -351,7 +351,7 @@ (define-public faiss (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/facebookresearch/faiss.git") + (url "https://github.com/facebookresearch/faiss") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index e8bff9b86a..5b18d14893 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -160,7 +160,7 @@ (define-public autotrace (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/autotrace/autotrace.git") + (url "https://github.com/autotrace/autotrace") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -301,7 +301,7 @@ (define-public assimp (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/assimp/assimp.git") + (url "https://github.com/assimp/assimp") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -511,7 +511,7 @@ (define-public ogre (origin (method git-fetch) (uri (git-reference - (url "https://github.com/OGRECave/ogre.git") + (url "https://github.com/OGRECave/ogre") (commit (string-append "v" version)) (recursive? #t))) ;for Dear ImGui submodule (file-name (git-file-name name version)) @@ -628,7 +628,7 @@ (define-public openimageio (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/OpenImageIO/oiio.git") + (url "https://github.com/OpenImageIO/oiio") (commit (string-append "Release-" version)))) (file-name (git-file-name name version)) (sha256 @@ -948,7 +948,7 @@ (define-public brdf-explorer (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/wdas/brdf.git") + (url "https://github.com/wdas/brdf") (commit commit))) (sha256 (base32 @@ -1217,7 +1217,7 @@ (define-public opencsg (origin (method git-fetch) (uri (git-reference - (url "https://github.com/floriankirsch/OpenCSG.git") + (url "https://github.com/floriankirsch/OpenCSG") (commit (string-append "opencsg-" (string-map dot-to-dash version) "-release")))) diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm index 815a35a974..0f2afb99de 100644 --- a/gnu/packages/graphviz.scm +++ b/gnu/packages/graphviz.scm @@ -211,7 +211,7 @@ (define-public python-pygraphviz (origin (method git-fetch) (uri (git-reference - (url "https://github.com/pygraphviz/pygraphviz.git") + (url "https://github.com/pygraphviz/pygraphviz") (commit (string-append "pygraphviz-" version)))) (file-name (string-append "pygraphviz-" version "-checkout")) (sha256 diff --git a/gnu/packages/groff.scm b/gnu/packages/groff.scm index 5fe353a901..ae896cf9fd 100644 --- a/gnu/packages/groff.scm +++ b/gnu/packages/groff.scm @@ -177,7 +177,7 @@ (define-public roffit (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/bagder/roffit.git") + (url "https://github.com/bagder/roffit") (commit commit))) (file-name (string-append "roffit-" commit "-checkout")) (sha256 diff --git a/gnu/packages/groovy.scm b/gnu/packages/groovy.scm index f5d0416f36..e21c4e3775 100644 --- a/gnu/packages/groovy.scm +++ b/gnu/packages/groovy.scm @@ -36,7 +36,7 @@ (define java-groovy-bootstrap (origin (method git-fetch) (uri (git-reference - (url "https://github.com/apache/groovy.git") + (url "https://github.com/apache/groovy") (commit (string-append "GROOVY_" (string-map (lambda (x) (if (eq? x #\.) #\_ x)) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 3cadccd25c..e3c097943f 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1741,7 +1741,7 @@ (define-public clipit (origin (method git-fetch) (uri (git-reference - (url "https://github.com/CristianHenzel/ClipIt.git") + (url "https://github.com/CristianHenzel/ClipIt") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -1856,7 +1856,7 @@ (define-public yad (origin (method git-fetch) (uri (git-reference - (url "https://github.com/v1cont/yad.git") + (url "https://github.com/v1cont/yad") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 160bf63a48..59266a045b 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -234,7 +234,7 @@ (define-public guildhall (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ijp/guildhall.git") + (url "https://github.com/ijp/guildhall") (commit commit))) (file-name (string-append name "-" version "-checkout")) (sha256 @@ -1350,7 +1350,7 @@ (define-public guile-dbd-postgresql (origin (method git-fetch) (uri (git-reference - (url "https://github.com/opencog/guile-dbi.git") + (url "https://github.com/opencog/guile-dbi") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -1850,7 +1850,7 @@ (define-public guile-miniadapton (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/fisherdj/miniAdapton.git") + (url "https://github.com/fisherdj/miniAdapton") (commit commit))) (file-name (string-append name "-" version "-checkout")) (sha256 @@ -2047,7 +2047,7 @@ (define-public guile-minikanren (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ijp/minikanren.git") + (url "https://github.com/ijp/minikanren") (commit "e844d85512f8c055d3f96143ee506007389a25e3"))) (file-name (string-append name "-" version "-checkout")) (sha256 @@ -3104,7 +3104,7 @@ (define-public guile-ffi-fftw (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/lloda/guile-ffi-fftw.git") + (url "https://github.com/lloda/guile-ffi-fftw") (commit commit))) (file-name (git-file-name "guile-ffi-fftw" version)) (sha256 @@ -3540,7 +3540,7 @@ (define-public guile-irc (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/rekado/guile-irc.git") + (url "https://github.com/rekado/guile-irc") (commit commit))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index a32bd33293..6430633694 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -596,7 +596,7 @@ (define-public guile-gdbm-ffi (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ijp/guile-gdbm.git") + (url "https://github.com/ijp/guile-gdbm") (commit "fa1d5b6231d0e4d096687b378c025f2148c5f246"))) (file-name (string-append name "-" version "-checkout")) (patches (search-patches diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index 6a2e2c695b..211a5a34ac 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -294,7 +294,7 @@ (define-public wavemon (origin (method git-fetch) (uri (git-reference - (url "https://github.com/uoaerg/wavemon.git") + (url "https://github.com/uoaerg/wavemon") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -338,7 +338,7 @@ (define-public rkdeveloptool (origin (method git-fetch) (uri (git-reference - (url "https://github.com/rockchip-linux/rkdeveloptool.git") + (url "https://github.com/rockchip-linux/rkdeveloptool") (commit commit))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index 5b6f0401e4..0197046453 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -149,7 +149,7 @@ (define-public corrode (origin (method git-fetch) (uri (git-reference - (url "https://github.com/jameysharp/corrode.git") + (url "https://github.com/jameysharp/corrode") (commit "b6699fb2fa552a07c6091276285a44133e5c9789"))) (file-name (git-file-name name version)) (sha256 @@ -624,7 +624,7 @@ (define-public kmonad (origin (method git-fetch) (uri (git-reference - (url "https://github.com/david-janssen/kmonad.git") + (url "https://github.com/david-janssen/kmonad") (commit version))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 0508916ead..2387dfb190 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -5129,7 +5129,7 @@ (define ghc-haddock-test (origin (method git-fetch) (uri (git-reference - (url "https://github.com/haskell/haddock.git") + (url "https://github.com/haskell/haddock") (commit (string-append "haddock-" version "-release")))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/hexedit.scm b/gnu/packages/hexedit.scm index e1a029167a..c2c6228548 100644 --- a/gnu/packages/hexedit.scm +++ b/gnu/packages/hexedit.scm @@ -38,7 +38,7 @@ (define-public hexedit (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/pixel/hexedit.git") + (url "https://github.com/pixel/hexedit") (commit version))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/i2p.scm b/gnu/packages/i2p.scm index 0061701304..537aeaf76c 100644 --- a/gnu/packages/i2p.scm +++ b/gnu/packages/i2p.scm @@ -35,7 +35,7 @@ (define-public i2pd (origin (method git-fetch) (uri (git-reference - (url "https://github.com/PurpleI2P/i2pd.git") + (url "https://github.com/PurpleI2P/i2pd") (commit version))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index b31d60f06c..b48f21b551 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -305,7 +305,7 @@ (define-public librime (origin (method git-fetch) (uri (git-reference - (url "https://github.com/rime/librime.git") + (url "https://github.com/rime/librime") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -356,7 +356,7 @@ (define-public rime-data (origin (method git-fetch) (uri (git-reference - (url "https://github.com/rime/plum.git") + (url "https://github.com/rime/plum") (commit "397d601dd22cfc857613973724724b8f44db9f9c"))) (file-name "plum-checkout") (sha256 @@ -403,7 +403,7 @@ (define-public rime-data ,(origin (method git-fetch) (uri (git-reference - (url "https://github.com/rime/rime-array.git") + (url "https://github.com/rime/rime-array") (commit "93cc99238f120606a076220ec4ddcad164f6396a"))) (file-name "rime-array-checkout") (sha256 @@ -413,7 +413,7 @@ (define-public rime-data ,(origin (method git-fetch) (uri (git-reference - (url "https://github.com/rime/rime-bopomofo.git") + (url "https://github.com/rime/rime-bopomofo") (commit "ed25098386f5efd3d70b08650f0d1b70c41c11a3"))) (file-name "rime-bopomofo-checkout") (sha256 @@ -423,7 +423,7 @@ (define-public rime-data ,(origin (method git-fetch) (uri (git-reference - (url "https://github.com/rime/rime-cangjie.git") + (url "https://github.com/rime/rime-cangjie") (commit "5fd8ce6f64039e505ca02655a621f2e830b97c19"))) (file-name "rime-cangjie-checkout") (sha256 @@ -433,7 +433,7 @@ (define-public rime-data ,(origin (method git-fetch) (uri (git-reference - (url "https://github.com/rime/rime-cantonese.git") + (url "https://github.com/rime/rime-cantonese") (commit "e06fe8e79d7d64db2f2b6339aabc004d8cbc1f67"))) (file-name "rime-cantonese-checkout") (sha256 @@ -443,7 +443,7 @@ (define-public rime-data ,(origin (method git-fetch) (uri (git-reference - (url "https://github.com/rime/rime-combo-pinyin.git") + (url "https://github.com/rime/rime-combo-pinyin") (commit "67b29cdc786928ea46b43a9c660dee3db8f1adff"))) (file-name "rime-combo-pinyin-checkout") (sha256 @@ -453,7 +453,7 @@ (define-public rime-data ,(origin (method git-fetch) (uri (git-reference - (url "https://github.com/rime/rime-double-pinyin.git") + (url "https://github.com/rime/rime-double-pinyin") (commit "69bf85d4dfe8bac139c36abbd68d530b8b6622ea"))) (file-name "rime-double-pinyin-checkout") (sha256 @@ -463,7 +463,7 @@ (define-public rime-data ,(origin (method git-fetch) (uri (git-reference - (url "https://github.com/rime/rime-emoji.git") + (url "https://github.com/rime/rime-emoji") (commit "c99d34e4a837349e4679a110bb4b94f71fe015ae"))) (file-name "rime-emoji-checkout") (sha256 @@ -473,7 +473,7 @@ (define-public rime-data ,(origin (method git-fetch) (uri (git-reference - (url "https://github.com/rime/rime-essay.git") + (url "https://github.com/rime/rime-essay") (commit "88055afa3752e4582fa887765d962a30e02bb1fa"))) (file-name "rime-essay-checkout") (sha256 @@ -483,7 +483,7 @@ (define-public rime-data ,(origin (method git-fetch) (uri (git-reference - (url "https://github.com/rime/rime-ipa.git") + (url "https://github.com/rime/rime-ipa") (commit "22b71710e029bcb412e9197192a638ab11bc2abf"))) (file-name "rime-ipa-checkout") (sha256 @@ -493,7 +493,7 @@ (define-public rime-data ,(origin (method git-fetch) (uri (git-reference - (url "https://github.com/rime/rime-jyutping.git") + (url "https://github.com/rime/rime-jyutping") (commit "6fe0d727b3178feabd0f01e6cd82599202764735"))) (file-name "rime-jyutping-checkout") (sha256 @@ -503,7 +503,7 @@ (define-public rime-data ,(origin (method git-fetch) (uri (git-reference - (url "https://github.com/rime/rime-luna-pinyin.git") + (url "https://github.com/rime/rime-luna-pinyin") (commit "f1268e192ca88b9526467ce04ac3e47c837891ad"))) (file-name "rime-luna-pinyin-checkout") (sha256 @@ -513,7 +513,7 @@ (define-public rime-data ,(origin (method git-fetch) (uri (git-reference - (url "https://github.com/rime/rime-middle-chinese.git") + (url "https://github.com/rime/rime-middle-chinese") (commit "ed6d44f8d0bedf6e0c1c3183a270f8f01a211a40"))) (file-name "rime-middle-chinese-checkout") (sha256 @@ -523,7 +523,7 @@ (define-public rime-data ,(origin (method git-fetch) (uri (git-reference - (url "https://github.com/rime/rime-pinyin-simp.git") + (url "https://github.com/rime/rime-pinyin-simp") (commit "b73df7fc0994912ce785462b3be569ae81258ac2"))) (file-name "rime-pinyin-simp-checkout") (sha256 @@ -533,7 +533,7 @@ (define-public rime-data ,(origin (method git-fetch) (uri (git-reference - (url "https://github.com/rime/rime-prelude.git") + (url "https://github.com/rime/rime-prelude") (commit "8a52b4f86a59f3eb602f9a4cf6a680a67c15df8c"))) (file-name "rime-prelude-checkout") (sha256 @@ -543,7 +543,7 @@ (define-public rime-data ,(origin (method git-fetch) (uri (git-reference - (url "https://github.com/rime/rime-quick.git") + (url "https://github.com/rime/rime-quick") (commit "3fe5911ba608cb2df1b6301b76ad1573bd482a76"))) (file-name "rime-quick-checkout") (sha256 @@ -553,7 +553,7 @@ (define-public rime-data ,(origin (method git-fetch) (uri (git-reference - (url "https://github.com/rime/rime-scj.git") + (url "https://github.com/rime/rime-scj") (commit "cab5a0858765eff0553dd685a2d61d5536e9149c"))) (file-name "rime-scj-checkout") (sha256 @@ -563,7 +563,7 @@ (define-public rime-data ,(origin (method git-fetch) (uri (git-reference - (url "https://github.com/rime/rime-soutzoe.git") + (url "https://github.com/rime/rime-soutzoe") (commit "beeaeca72d8e17dfd1e9af58680439e9012987dc"))) (file-name "rime-soutzoe-checkout") (sha256 @@ -573,7 +573,7 @@ (define-public rime-data ,(origin (method git-fetch) (uri (git-reference - (url "https://github.com/rime/rime-stenotype.git") + (url "https://github.com/rime/rime-stenotype") (commit "f3e9189d5ce33c55d3936cc58e39d0c88b3f0c88"))) (file-name "rime-stenotype-checkout") (sha256 @@ -583,7 +583,7 @@ (define-public rime-data ,(origin (method git-fetch) (uri (git-reference - (url "https://github.com/rime/rime-stroke.git") + (url "https://github.com/rime/rime-stroke") (commit "ea8576d1accd6fda339e96b415caadb56e2a07d1"))) (file-name "rime-stroke-checkout") (sha256 @@ -593,7 +593,7 @@ (define-public rime-data ,(origin (method git-fetch) (uri (git-reference - (url "https://github.com/rime/rime-terra-pinyin.git") + (url "https://github.com/rime/rime-terra-pinyin") (commit "492aaf914f9de37cc9d26b846dc693116de70ae8"))) (file-name "rime-terra-pinyin-checkout") (sha256 @@ -603,7 +603,7 @@ (define-public rime-data ,(origin (method git-fetch) (uri (git-reference - (url "https://github.com/rime/rime-wubi.git") + (url "https://github.com/rime/rime-wubi") (commit "dd052ee158a38cb791755318b1aef9b4a3ed0316"))) (file-name "rime-wubi-checkout") (sha256 @@ -613,7 +613,7 @@ (define-public rime-data ,(origin (method git-fetch) (uri (git-reference - (url "https://github.com/rime/rime-wugniu.git") + (url "https://github.com/rime/rime-wugniu") (commit "abd1ee98efbf170258fcf43875c21a4259e00b61"))) (file-name "rime-wugniu-checkout") (sha256 @@ -633,7 +633,7 @@ (define-public ibus-rime (origin (method git-fetch) (uri (git-reference - (url "https://github.com/rime/ibus-rime.git") + (url "https://github.com/rime/ibus-rime") (commit version))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index a11b1b89d3..ea6380167d 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -587,7 +587,7 @@ (define-public vxl (origin (method git-fetch) (uri (git-reference - (url "https://github.com/vxl/vxl.git") + (url "https://github.com/vxl/vxl") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -629,7 +629,7 @@ (define-public vxl-1 (origin (method git-fetch) (uri (git-reference - (url "https://github.com/vxl/vxl.git") + (url "https://github.com/vxl/vxl") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -850,7 +850,7 @@ (define-public itk-snap (origin (method git-fetch) (uri (git-reference - (url "https://github.com/pyushkevich/c3d.git") + (url "https://github.com/pyushkevich/c3d") (commit commit))) (file-name (git-file-name "c3d" version)) (sha256 @@ -865,7 +865,7 @@ (define-public itk-snap (origin (method git-fetch) (uri (git-reference - (url "https://github.com/pyushkevich/greedy.git") + (url "https://github.com/pyushkevich/greedy") (commit commit))) (file-name (git-file-name "greedy" version)) (sha256 diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 8303ba38f9..610a3d77bf 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -191,7 +191,7 @@ (define-public sxiv (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/muennich/sxiv.git") + (url "https://github.com/muennich/sxiv") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -237,7 +237,7 @@ (define-public viewnior (origin (method git-fetch) (uri (git-reference - (url "https://github.com/hellosiyan/Viewnior.git") + (url "https://github.com/hellosiyan/Viewnior") (commit (string-append name "-" version)))) (file-name (git-file-name name version)) (sha256 @@ -289,7 +289,7 @@ (define-public catimg (origin (method git-fetch) (uri (git-reference - (url "https://github.com/posva/catimg.git") + (url "https://github.com/posva/catimg") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -488,7 +488,7 @@ (define-public qview (origin (method git-fetch) (uri (git-reference - (url "https://github.com/jurplel/qView.git") + (url "https://github.com/jurplel/qView") (commit version))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 75b24ec0a0..3fdc6db8a1 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -309,7 +309,7 @@ (define-public libimagequant (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ImageOptim/libimagequant.git") + (url "https://github.com/ImageOptim/libimagequant") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -333,7 +333,7 @@ (define-public pngquant (origin (method git-fetch) (uri (git-reference - (url "https://github.com/kornelski/pngquant.git") + (url "https://github.com/kornelski/pngquant") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -589,7 +589,7 @@ (define-public leptonica (origin (method git-fetch) (uri (git-reference - (url "https://github.com/DanBloomberg/leptonica.git") + (url "https://github.com/DanBloomberg/leptonica") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -1357,7 +1357,7 @@ (define-public jasper (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/mdadams/jasper.git") + (url "https://github.com/mdadams/jasper") (commit (string-append "version-" version)))) (file-name (git-file-name name version)) (sha256 @@ -1380,7 +1380,7 @@ (define-public zimg (origin (method git-fetch) (uri (git-reference - (url "https://github.com/sekrit-twc/zimg.git") + (url "https://github.com/sekrit-twc/zimg") (commit (string-append "release-" version)))) (file-name (git-file-name name version)) (sha256 @@ -1408,7 +1408,7 @@ (define-public perceptualdiff (origin (method git-fetch) (uri (git-reference - (url "https://github.com/myint/perceptualdiff.git") + (url "https://github.com/myint/perceptualdiff") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -1482,7 +1482,7 @@ (define-public stb-image-for-extempore (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/extemporelang/stb.git") + (url "https://github.com/extemporelang/stb") (commit commit))) (sha256 (base32 @@ -1688,7 +1688,7 @@ (define-public gpick (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/thezbyg/gpick.git") + (url "https://github.com/thezbyg/gpick") (commit (string-append name "-" version)))) (file-name (git-file-name name version)) (sha256 @@ -1751,7 +1751,7 @@ (define-public flameshot (origin (method git-fetch) (uri (git-reference - (url "https://github.com/lupoDharkael/flameshot.git") + (url "https://github.com/lupoDharkael/flameshot") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -1864,7 +1864,7 @@ (define-public grim (origin (method git-fetch) (uri (git-reference - (url "https://github.com/emersion/grim.git") + (url "https://github.com/emersion/grim") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -1890,7 +1890,7 @@ (define-public slurp (origin (method git-fetch) (uri (git-reference - (url "https://github.com/emersion/slurp.git") + (url "https://github.com/emersion/slurp") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm index 15f174f8b6..ba3c71d964 100644 --- a/gnu/packages/ipfs.scm +++ b/gnu/packages/ipfs.scm @@ -37,7 +37,7 @@ (define-public go-github-com-ipfs-go-ipfs-cmdkit-files (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ipfs/go-ipfs-cmdkit.git") + (url "https://github.com/ipfs/go-ipfs-cmdkit") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -65,7 +65,7 @@ (define-public go-github-com-ipfs-go-ipfs-api (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ipfs/go-ipfs-api.git") + (url "https://github.com/ipfs/go-ipfs-api") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -110,7 +110,7 @@ (define-public gx (origin (method git-fetch) (uri (git-reference - (url "https://github.com/whyrusleeping/gx.git") + (url "https://github.com/whyrusleeping/gx") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/java-graphics.scm b/gnu/packages/java-graphics.scm index bc9972eb0a..f7a89021cd 100644 --- a/gnu/packages/java-graphics.scm +++ b/gnu/packages/java-graphics.scm @@ -96,7 +96,7 @@ (define-public java-marlin-renderer (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/bourgesl/marlin-renderer.git") + (url "https://github.com/bourgesl/marlin-renderer") (commit (string-append "v" (string-map (match-lambda (#\. #\_) (c c)) diff --git a/gnu/packages/java-maths.scm b/gnu/packages/java-maths.scm index 748ae67b58..97343e0a16 100644 --- a/gnu/packages/java-maths.scm +++ b/gnu/packages/java-maths.scm @@ -37,7 +37,7 @@ (define-public java-jblas (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/mikiobraun/jblas.git") + (url "https://github.com/mikiobraun/jblas") (commit (string-append "jblas-" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 170936a0ff..289bdd74d4 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2654,7 +2654,7 @@ (define-public javacc-4 (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/javacc/javacc.git") + (url "https://github.com/javacc/javacc") (commit "release_41"))) (file-name (string-append "javacc-" version "-checkout")) (sha256 @@ -2703,7 +2703,7 @@ (define-public javacc (origin (method git-fetch) (uri (git-reference - (url "https://github.com/javacc/javacc.git") + (url "https://github.com/javacc/javacc") (commit version))) (file-name (git-file-name "javacc" version)) (sha256 @@ -3329,7 +3329,7 @@ (define-public java-javaee-servletapi (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/javaee/servlet-spec.git") + (url "https://github.com/javaee/servlet-spec") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -4598,7 +4598,7 @@ (define-public java-cglib (origin (method git-fetch) (uri (git-reference - (url "https://github.com/cglib/cglib.git") + (url "https://github.com/cglib/cglib") (commit (string-append "RELEASE_" (string-map (lambda (c) (if (char=? c #\.) #\_ c)) @@ -8984,7 +8984,7 @@ (define-public java-cofoja (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/nhatminhle/cofoja.git") + (url "https://github.com/nhatminhle/cofoja") (commit (string-append "v" version)))) (file-name (string-append "java-cofoja-" version "-checkout")) (sha256 @@ -9386,7 +9386,7 @@ (define-public java-testng (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/cbeust/testng.git") + (url "https://github.com/cbeust/testng") (commit version))) (file-name (string-append name "-" version "-checkout")) (sha256 @@ -9464,7 +9464,7 @@ (define-public java-jnacl (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/neilalexander/jnacl.git") + (url "https://github.com/neilalexander/jnacl") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -10047,7 +10047,7 @@ (define-public java-jeromq (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/zeromq/jeromq.git") + (url "https://github.com/zeromq/jeromq") (commit (string-append "v" version)))) (file-name (string-append name "-" version "-checkout")) (sha256 @@ -10834,7 +10834,7 @@ (define-public java-xmlunit ,(origin (method git-fetch) (uri (git-reference - (url "https://github.com/xmlunit/test-resources.git") + (url "https://github.com/xmlunit/test-resources") (commit "a590d2ae865c3e0455691d76ba8eefccc2215aec"))) (file-name "java-xmlunit-test-resources") (sha256 @@ -11439,7 +11439,7 @@ (define-public java-eclipse-sisu-plexus (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/eclipse/sisu.plexus.git") + (url "https://github.com/eclipse/sisu.plexus") (commit (string-append "releases/" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm index 97c3a571a1..d5ff5bffee 100644 --- a/gnu/packages/javascript.scm +++ b/gnu/packages/javascript.scm @@ -188,7 +188,7 @@ (define-public js-json2 (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/douglascrockford/JSON-js.git") + (url "https://github.com/douglascrockford/JSON-js") (commit commit))) (file-name (string-append name "-" version "-checkout")) (sha256 @@ -303,7 +303,7 @@ (define-public js-requirejs (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/requirejs/requirejs.git") + (url "https://github.com/requirejs/requirejs") (commit version))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/jrnl.scm b/gnu/packages/jrnl.scm index 5b57cc7c9b..85d3863e05 100644 --- a/gnu/packages/jrnl.scm +++ b/gnu/packages/jrnl.scm @@ -38,7 +38,7 @@ (define-public jrnl (origin (method git-fetch) (uri (git-reference - (url "https://github.com/maebert/jrnl.git") + (url "https://github.com/maebert/jrnl") (commit version))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm index 8db5e66131..78488a4e99 100644 --- a/gnu/packages/julia.scm +++ b/gnu/packages/julia.scm @@ -61,7 +61,7 @@ (define libuv-julia (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/JuliaLang/libuv.git") + (url "https://github.com/JuliaLang/libuv") (commit commit))) (file-name (string-append name "-" version "-checkout")) (sha256 @@ -196,7 +196,7 @@ (define-public libwhich (origin (method git-fetch) (uri (git-reference - (url "https://github.com/vtjnash/libwhich.git") + (url "https://github.com/vtjnash/libwhich") ;; fixes linux-vdso.so related tests (commit "87cffe10080c98e7b5786c5166e420bf1ada1d41"))) (file-name (string-append name "-" version "-checkout")) diff --git a/gnu/packages/jupyter.scm b/gnu/packages/jupyter.scm index 3f16bc27f1..f826ebd171 100644 --- a/gnu/packages/jupyter.scm +++ b/gnu/packages/jupyter.scm @@ -145,7 +145,7 @@ (define-public xeus (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/QuantStack/xeus.git") + (url "https://github.com/QuantStack/xeus") (commit version))) (sha256 (base32 diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm index 742172a969..556dd6b4e5 100644 --- a/gnu/packages/kodi.scm +++ b/gnu/packages/kodi.scm @@ -90,7 +90,7 @@ (define-public crossguid (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/graeme-hill/crossguid.git") + (url "https://github.com/graeme-hill/crossguid") (commit commit))) (file-name (string-append name "-" version "-checkout")) (sha256 @@ -140,7 +140,7 @@ (define libdvdnav/kodi (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/xbmc/libdvdnav.git") + (url "https://github.com/xbmc/libdvdnav") (commit commit))) (file-name (string-append name "-" version "-checkout")) (sha256 @@ -175,7 +175,7 @@ (define libdvdread/kodi (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/xbmc/libdvdread.git") + (url "https://github.com/xbmc/libdvdread") (commit commit))) (file-name (string-append name "-" version "-checkout")) (sha256 @@ -210,7 +210,7 @@ (define libdvdcss/kodi (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/xbmc/libdvdcss.git") + (url "https://github.com/xbmc/libdvdcss") (commit commit))) (file-name (string-append name "-" version "-checkout")) (sha256 @@ -273,7 +273,7 @@ (define-public kodi (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/xbmc/xbmc.git") + (url "https://github.com/xbmc/xbmc") (commit (string-append version "-Leia")))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index c66718aa1e..366ea2c8e6 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -613,7 +613,7 @@ (define-public python2-tegaki-recognize ;; 'tegaki-recognize.in' are missing in the tarball. (method git-fetch) (uri (git-reference - (url "https://github.com/tegaki/tegaki.git") + (url "https://github.com/tegaki/tegaki") (commit commit))) (sha256 (base32 diff --git a/gnu/packages/lego.scm b/gnu/packages/lego.scm index 396b37ddd9..2067e45dd1 100644 --- a/gnu/packages/lego.scm +++ b/gnu/packages/lego.scm @@ -78,7 +78,7 @@ (define-public leocad (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/leozide/leocad.git") + (url "https://github.com/leozide/leocad") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/less.scm b/gnu/packages/less.scm index d449e0729e..f6ee355b68 100644 --- a/gnu/packages/less.scm +++ b/gnu/packages/less.scm @@ -63,7 +63,7 @@ (define-public lesspipe (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/wofr06/lesspipe.git") + (url "https://github.com/wofr06/lesspipe") (commit version))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm index ce958d86dc..7b13d98d95 100644 --- a/gnu/packages/libusb.scm +++ b/gnu/packages/libusb.scm @@ -128,7 +128,7 @@ (define-public libusb4java (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/usb4java/libusb4java.git") + (url "https://github.com/usb4java/libusb4java") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -356,7 +356,7 @@ (define-public libplist (origin (method git-fetch) (uri (git-reference - (url "https://github.com/libimobiledevice/libplist.git") + (url "https://github.com/libimobiledevice/libplist") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -596,7 +596,7 @@ (define-public hidapi (origin (method git-fetch) (uri (git-reference - (url "https://github.com/libusb/hidapi.git") + (url "https://github.com/libusb/hidapi") (commit (string-append "hidapi-" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e47bc80f6e..9fa7d0cd54 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1005,7 +1005,7 @@ (define-public acpi-call-linux-module (origin (method git-fetch) (uri (git-reference - (url "https://github.com/teleshoes/acpi_call.git") + (url "https://github.com/teleshoes/acpi_call") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -1048,7 +1048,7 @@ (define-public rtl8812au-aircrack-ng-linux-module (origin (method git-fetch) (uri (git-reference - (url "https://github.com/aircrack-ng/rtl8812au.git") + (url "https://github.com/aircrack-ng/rtl8812au") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -1094,7 +1094,7 @@ (define-public rtl8821ce-linux-module (origin (method git-fetch) (uri (git-reference - (url "https://github.com/tomaspinho/rtl8821ce.git") + (url "https://github.com/tomaspinho/rtl8821ce") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -1217,7 +1217,7 @@ (define-public v4l2loopback-linux-module (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/umlaeute/v4l2loopback.git") + (url "https://github.com/umlaeute/v4l2loopback") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -3038,7 +3038,7 @@ (define-public inotify-tools (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/rvoicilas/inotify-tools.git") + (url "https://github.com/rvoicilas/inotify-tools") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -3117,7 +3117,7 @@ (define-public earlyoom (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/rfjakob/earlyoom.git") + (url "https://github.com/rfjakob/earlyoom") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -3413,7 +3413,7 @@ (define-public thin-provisioning-tools (origin (method git-fetch) (uri (git-reference - (url "https://github.com/jthornber/thin-provisioning-tools.git") + (url "https://github.com/jthornber/thin-provisioning-tools") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -3652,7 +3652,7 @@ (define-public lm-sensors (origin (method git-fetch) (uri (git-reference - (url "https://github.com/groeck/lm-sensors.git") + (url "https://github.com/groeck/lm-sensors") (commit (string-append "V" (string-join (string-split version #\.) "-"))))) (file-name (git-file-name name version)) @@ -5056,7 +5056,7 @@ (define-public thinkfan (origin (method git-fetch) (uri (git-reference - (url "https://github.com/vmatare/thinkfan.git") + (url "https://github.com/vmatare/thinkfan") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -5114,7 +5114,7 @@ (define-public tpacpi-bat (origin (method git-fetch) (uri (git-reference - (url "https://github.com/teleshoes/tpacpi-bat.git") + (url "https://github.com/teleshoes/tpacpi-bat") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -5456,7 +5456,7 @@ (define-public haveged (origin (method git-fetch) (uri (git-reference - (url "https://github.com/jirka-h/haveged.git") + (url "https://github.com/jirka-h/haveged") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -5733,7 +5733,7 @@ (define-public radeontop (origin (method git-fetch) (uri (git-reference - (url "https://github.com/clbr/radeontop.git") + (url "https://github.com/clbr/radeontop") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -5887,7 +5887,7 @@ (define-public light (origin (method git-fetch) (uri (git-reference - (url "https://github.com/haikarainen/light.git") + (url "https://github.com/haikarainen/light") (commit (string-append "v" version)))) (sha256 (base32 "1a70zcf88ifsnwll486aicjnh48zisdf8f7vi34ihw61kdadsq9s")) @@ -5975,7 +5975,7 @@ (define-public tlp (origin (method git-fetch) (uri (git-reference - (url "https://github.com/linrunner/TLP.git") + (url "https://github.com/linrunner/TLP") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -6207,7 +6207,7 @@ (define-public proot (origin (method git-fetch) (uri (git-reference - (url "https://github.com/proot-me/PRoot.git") + (url "https://github.com/proot-me/PRoot") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -6650,7 +6650,7 @@ (define-public mbpfan (origin (method git-fetch) (uri (git-reference - (url "https://github.com/dgraziotin/mbpfan.git") + (url "https://github.com/dgraziotin/mbpfan") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -6685,7 +6685,7 @@ (define-public psm2 (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/intel/opa-psm2.git") + (url "https://github.com/intel/opa-psm2") (commit (string-append "PSM2_" version)))) (file-name (git-file-name name version)) (sha256 @@ -6803,7 +6803,7 @@ (define-public go-netlink (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/vishvananda/netlink.git") + (url "https://github.com/vishvananda/netlink") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -6875,7 +6875,7 @@ (define-public genext2fs (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/jeremie-koenig/genext2fs.git") + (url "https://github.com/jeremie-koenig/genext2fs") ;; 1.4.1-3 had a VCS tag but 1.4.1-4 doesn't. (commit "9ee43894634998b0b2b309d636f25c64314c9421"))) (file-name (git-file-name name version)) @@ -7028,7 +7028,7 @@ (define-public inputattach (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/linuxwacom/input-wacom.git") + (url "https://github.com/linuxwacom/input-wacom") (commit (string-append "input-wacom-" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/lirc.scm b/gnu/packages/lirc.scm index 510bc032f8..7b11f198e5 100644 --- a/gnu/packages/lirc.scm +++ b/gnu/packages/lirc.scm @@ -114,7 +114,7 @@ (define-public python-lirc (origin (method git-fetch) (uri (git-reference - (url "https://github.com/tompreston/python-lirc.git") + (url "https://github.com/tompreston/python-lirc") (commit commit))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 13c065c535..04c7c3e9ca 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -146,7 +146,7 @@ (define-public sbcl-fiveam (origin (method git-fetch) (uri (git-reference - (url "https://github.com/sionescu/fiveam.git") + (url "https://github.com/sionescu/fiveam") (commit (string-append "v" version)))) (file-name (git-file-name "fiveam" version)) (sha256 @@ -176,7 +176,7 @@ (define-public sbcl-bordeaux-threads (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/sionescu/bordeaux-threads.git") + (url "https://github.com/sionescu/bordeaux-threads") (commit (string-append "v" version)))) (sha256 (base32 "19i443fz3488v1pbbr9x24y8h8vlyhny9vj6c9jk5prm702awrp6")) @@ -209,7 +209,7 @@ (define-public sbcl-trivial-gray-streams (method git-fetch) (uri (git-reference - (url "https://github.com/trivial-gray-streams/trivial-gray-streams.git") + (url "https://github.com/trivial-gray-streams/trivial-gray-streams") (commit commit))) (sha256 (base32 "0b1pxlccmnagk9cbh4cy8s5k66g3x0gwib5shjwr24xvrji6lp94")) @@ -240,7 +240,7 @@ (define-public sbcl-fiasco (origin (method git-fetch) (uri (git-reference - (url "https://github.com/joaotavora/fiasco.git") + (url "https://github.com/joaotavora/fiasco") (commit commit))) (file-name (git-file-name "fiasco" version)) (sha256 @@ -274,7 +274,7 @@ (define-public sbcl-flexi-streams (origin (method git-fetch) (uri (git-reference - (url "https://github.com/edicl/flexi-streams.git") + (url "https://github.com/edicl/flexi-streams") (commit (string-append "v" version)))) (file-name (git-file-name "flexi-streams" version)) (sha256 @@ -311,7 +311,7 @@ (define-public sbcl-cl-ppcre (origin (method git-fetch) (uri (git-reference - (url "https://github.com/edicl/cl-ppcre.git") + (url "https://github.com/edicl/cl-ppcre") (commit (string-append "v" version)))) (file-name (git-file-name "cl-ppcre" version)) (sha256 @@ -338,7 +338,7 @@ (define sbcl-cl-unicode-base (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/edicl/cl-unicode.git") + (url "https://github.com/edicl/cl-unicode") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -382,7 +382,7 @@ (define-public sbcl-zpb-ttf (origin (method git-fetch) (uri (git-reference - (url "https://github.com/xach/zpb-ttf.git") + (url "https://github.com/xach/zpb-ttf") (commit (string-append "release-" version)))) (file-name (git-file-name name version)) (sha256 @@ -495,7 +495,7 @@ (define-public sbcl-spatial-trees (origin (method git-fetch) (uri (git-reference - (url "https://github.com/rpav/spatial-trees.git") + (url "https://github.com/rpav/spatial-trees") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -532,7 +532,7 @@ (define-public sbcl-flexichain (origin (method git-fetch) (uri (git-reference - (url "https://github.com/robert-strandh/Flexichain.git") + (url "https://github.com/robert-strandh/Flexichain") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -564,7 +564,7 @@ (define-public sbcl-cl-pdf (origin (method git-fetch) (uri (git-reference - (url "https://github.com/mbattyani/cl-pdf.git") + (url "https://github.com/mbattyani/cl-pdf") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -596,7 +596,7 @@ (define-public sbcl-clx (method git-fetch) (uri (git-reference - (url "https://github.com/sharplispers/clx.git") + (url "https://github.com/sharplispers/clx") (commit version))) (sha256 (base32 @@ -685,7 +685,7 @@ (define sbcl-slynk-boot0 (method git-fetch) (uri (git-reference - (url "https://github.com/joaotavora/sly.git") + (url "https://github.com/joaotavora/sly") (commit commit))) (sha256 (base32 "0wbpg9p9yg2hd62l15pvy50fk3hndq5zzyqlyyf04g368s895144")) @@ -1043,7 +1043,7 @@ (define-public sbcl-cl-uglify-js (origin (method git-fetch) (uri (git-reference - (url "https://github.com/mishoo/cl-uglify-js.git") + (url "https://github.com/mishoo/cl-uglify-js") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -1164,7 +1164,7 @@ (define-public sbcl-trivial-features (origin (method git-fetch) (uri (git-reference - (url "https://github.com/trivial-features/trivial-features.git") + (url "https://github.com/trivial-features/trivial-features") (commit commit))) (file-name (git-file-name "trivial-features" version)) (sha256 @@ -1250,7 +1250,7 @@ (define-public sbcl-babel (origin (method git-fetch) (uri (git-reference - (url "https://github.com/cl-babel/babel.git") + (url "https://github.com/cl-babel/babel") (commit commit))) (file-name (git-file-name "babel" version)) (sha256 @@ -1754,7 +1754,7 @@ (define-public sbcl-named-readtables (origin (method git-fetch) (uri (git-reference - (url "https://github.com/melisgl/named-readtables.git") + (url "https://github.com/melisgl/named-readtables") (commit commit))) (sha256 (base32 "01l4831m7k84qvhzyx0qgdl50isr4zmp40qf6dfq2iqcaj8y4h3n")) @@ -2520,7 +2520,7 @@ (define sbcl-cffi-bootstrap (origin (method git-fetch) (uri (git-reference - (url "https://github.com/cffi/cffi.git") + (url "https://github.com/cffi/cffi") (commit (string-append "v" version)))) (file-name (git-file-name "cffi-bootstrap" version)) (sha256 @@ -2805,7 +2805,7 @@ (define-public sbcl-trivial-garbage (origin (method git-fetch) (uri (git-reference - (url "https://github.com/trivial-garbage/trivial-garbage.git") + (url "https://github.com/trivial-garbage/trivial-garbage") (commit (string-append "v" version)))) (file-name (git-file-name "trivial-garbage" version)) (sha256 @@ -3521,7 +3521,7 @@ (define-public sbcl-trivial-backtrace (origin (method git-fetch) (uri (git-reference - (url "https://github.com/gwkkwg/trivial-backtrace.git") + (url "https://github.com/gwkkwg/trivial-backtrace") (commit commit))) (file-name (git-file-name "trivial-backtrace" version)) (sha256 @@ -3566,7 +3566,7 @@ (define-public sbcl-rfc2388 (origin (method git-fetch) (uri (git-reference - (url "https://github.com/jdz/rfc2388.git") + (url "https://github.com/jdz/rfc2388") (commit commit))) (file-name (git-file-name "rfc2388" version)) (sha256 @@ -3618,7 +3618,7 @@ (define-public sbcl-cl+ssl (origin (method git-fetch) (uri (git-reference - (url "https://github.com/cl-plus-ssl/cl-plus-ssl.git") + (url "https://github.com/cl-plus-ssl/cl-plus-ssl") (commit commit))) (file-name (git-file-name "cl+ssl" version)) (sha256 @@ -3727,7 +3727,7 @@ (define-public sbcl-chunga (origin (method git-fetch) (uri (git-reference - (url "https://github.com/edicl/chunga.git") + (url "https://github.com/edicl/chunga") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -3756,7 +3756,7 @@ (define-public sbcl-cl-who (origin (method git-fetch) (uri (git-reference - (url "https://github.com/edicl/cl-who.git") + (url "https://github.com/edicl/cl-who") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -3788,7 +3788,7 @@ (define-public sbcl-chipz (origin (method git-fetch) (uri (git-reference - (url "https://github.com/froydnj/chipz.git") + (url "https://github.com/froydnj/chipz") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -3820,7 +3820,7 @@ (define-public sbcl-drakma (origin (method git-fetch) (uri (git-reference - (url "https://github.com/edicl/drakma.git") + (url "https://github.com/edicl/drakma") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -3860,7 +3860,7 @@ (define-public sbcl-hunchentoot (origin (method git-fetch) (uri (git-reference - (url "https://github.com/edicl/hunchentoot.git") + (url "https://github.com/edicl/hunchentoot") (commit (string-append "v" version)))) (file-name (git-file-name "hunchentoot" version)) (sha256 @@ -3900,7 +3900,7 @@ (define-public sbcl-trivial-types (origin (method git-fetch) (uri (git-reference - (url "https://github.com/m2ym/trivial-types.git") + (url "https://github.com/m2ym/trivial-types") (commit "ee869f2b7504d8aa9a74403641a5b42b16f47d88"))) (file-name (git-file-name name version)) (sha256 @@ -3924,7 +3924,7 @@ (define-public sbcl-cl-syntax (origin (method git-fetch) (uri (git-reference - (url "https://github.com/m2ym/cl-syntax.git") + (url "https://github.com/m2ym/cl-syntax") (commit "03f0c329bbd55b8622c37161e6278366525e2ccc"))) (file-name (git-file-name "cl-syntax" version)) (sha256 @@ -3954,7 +3954,7 @@ (define-public sbcl-cl-annot (origin (method git-fetch) (uri (git-reference - (url "https://github.com/m2ym/cl-annot.git") + (url "https://github.com/m2ym/cl-annot") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -4087,7 +4087,7 @@ (define-public sbcl-quri (origin (method git-fetch) (uri (git-reference - (url "https://github.com/fukamachi/quri.git") + (url "https://github.com/fukamachi/quri") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -4123,7 +4123,7 @@ (define-public sbcl-myway (origin (method git-fetch) (uri (git-reference - (url "https://github.com/fukamachi/myway.git") + (url "https://github.com/fukamachi/myway") (commit commit))) (file-name (git-file-name "myway" version)) (sha256 @@ -4266,7 +4266,7 @@ (define-public sbcl-static-vectors (origin (method git-fetch) (uri (git-reference - (url "https://github.com/sionescu/static-vectors.git") + (url "https://github.com/sionescu/static-vectors") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -4300,7 +4300,7 @@ (define-public sbcl-marshal (origin (method git-fetch) (uri (git-reference - (url "https://github.com/wlbr/cl-marshal.git") + (url "https://github.com/wlbr/cl-marshal") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -4327,7 +4327,7 @@ (define-public sbcl-checkl (origin (method git-fetch) (uri (git-reference - (url "https://github.com/rpav/CheckL.git") + (url "https://github.com/rpav/CheckL") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -4365,7 +4365,7 @@ (define-public sbcl-fast-io (origin (method git-fetch) (uri (git-reference - (url "https://github.com/rpav/fast-io.git") + (url "https://github.com/rpav/fast-io") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -4404,7 +4404,7 @@ (define-public sbcl-jonathan (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Rudolph-Miller/jonathan.git") + (url "https://github.com/Rudolph-Miller/jonathan") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -4516,7 +4516,7 @@ (define-public sbcl-lack-request (origin (method git-fetch) (uri (git-reference - (url "https://github.com/fukamachi/lack.git") + (url "https://github.com/fukamachi/lack") (commit commit))) (file-name (git-file-name "lack-request" version)) (sha256 @@ -4557,7 +4557,7 @@ (define-public sbcl-local-time (origin (method git-fetch) (uri (git-reference - (url "https://github.com/dlowe-net/local-time.git") + (url "https://github.com/dlowe-net/local-time") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -4592,7 +4592,7 @@ (define-public sbcl-lack-response (origin (method git-fetch) (uri (git-reference - (url "https://github.com/fukamachi/lack.git") + (url "https://github.com/fukamachi/lack") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -4633,7 +4633,7 @@ (define-public sbcl-lack-component (origin (method git-fetch) (uri (git-reference - (url "https://github.com/fukamachi/lack.git") + (url "https://github.com/fukamachi/lack") (commit commit))) (file-name (git-file-name "lack-component" version)) (sha256 @@ -4669,7 +4669,7 @@ (define-public sbcl-lack-util (origin (method git-fetch) (uri (git-reference - (url "https://github.com/fukamachi/lack.git") + (url "https://github.com/fukamachi/lack") (commit commit))) (file-name (git-file-name "lack-util" version)) (sha256 @@ -4707,7 +4707,7 @@ (define-public sbcl-lack-middleware-backtrace (origin (method git-fetch) (uri (git-reference - (url "https://github.com/fukamachi/lack.git") + (url "https://github.com/fukamachi/lack") (commit commit))) (file-name (git-file-name "lack-middleware-backtrace" version)) (sha256 @@ -4743,7 +4743,7 @@ (define-public sbcl-trivial-mimes (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Shinmera/trivial-mimes.git") + (url "https://github.com/Shinmera/trivial-mimes") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -4790,7 +4790,7 @@ (define-public sbcl-lack-middleware-static (origin (method git-fetch) (uri (git-reference - (url "https://github.com/fukamachi/lack.git") + (url "https://github.com/fukamachi/lack") (commit commit))) (file-name (git-file-name "lack-middleware-static" version)) (sha256 @@ -4830,7 +4830,7 @@ (define-public sbcl-lack (origin (method git-fetch) (uri (git-reference - (url "https://github.com/fukamachi/lack.git") + (url "https://github.com/fukamachi/lack") (commit commit))) (file-name (git-file-name "lack" version)) (sha256 @@ -4867,7 +4867,7 @@ (define-public sbcl-ningle (origin (method git-fetch) (uri (git-reference - (url "https://github.com/fukamachi/ningle.git") + (url "https://github.com/fukamachi/ningle") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -4930,7 +4930,7 @@ (define-public sbcl-clack (origin (method git-fetch) (uri (git-reference - (url "https://github.com/fukamachi/clack.git") + (url "https://github.com/fukamachi/clack") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -5026,7 +5026,7 @@ (define-public sbcl-clunit (origin (method git-fetch) (uri (git-reference - (url "https://github.com/tgutu/clunit.git") + (url "https://github.com/tgutu/clunit") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -5059,7 +5059,7 @@ (define-public sbcl-py4cl (origin (method git-fetch) (uri (git-reference - (url "https://github.com/bendudson/py4cl.git") + (url "https://github.com/bendudson/py4cl") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -5158,7 +5158,7 @@ (define-public sbcl-cl-quickcheck (origin (method git-fetch) (uri (git-reference - (url "https://github.com/mcandre/cl-quickcheck.git") + (url "https://github.com/mcandre/cl-quickcheck") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -5189,7 +5189,7 @@ (define-public sbcl-burgled-batteries3 (origin (method git-fetch) (uri (git-reference - (url "https://github.com/snmsts/burgled-batteries3.git") + (url "https://github.com/snmsts/burgled-batteries3") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -5254,7 +5254,7 @@ (define-public sbcl-metabang-bind (origin (method git-fetch) (uri (git-reference - (url "https://github.com/gwkkwg/metabang-bind.git") + (url "https://github.com/gwkkwg/metabang-bind") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -6633,7 +6633,7 @@ (define-public sbcl-periods (origin (method git-fetch) (uri (git-reference - (url "https://github.com/jwiegley/periods.git") + (url "https://github.com/jwiegley/periods") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -6686,7 +6686,7 @@ (define-public sbcl-metatilities-base (origin (method git-fetch) (uri (git-reference - (url "https://github.com/gwkkwg/metatilities-base.git") + (url "https://github.com/gwkkwg/metatilities-base") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -6718,7 +6718,7 @@ (define-public sbcl-cl-containers (origin (method git-fetch) (uri (git-reference - (url "https://github.com/gwkkwg/cl-containers.git") + (url "https://github.com/gwkkwg/cl-containers") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -6807,7 +6807,7 @@ (define-public sbcl-fprog (origin (method git-fetch) (uri (git-reference - (url "https://github.com/jwiegley/cambl.git") + (url "https://github.com/jwiegley/cambl") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -6865,7 +6865,7 @@ (define-public sbcl-cl-ledger (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ledger/cl-ledger.git") + (url "https://github.com/ledger/cl-ledger") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -6910,7 +6910,7 @@ (define-public sbcl-bst (origin (method git-fetch) (uri (git-reference - (url "https://github.com/glv2/bst.git") + (url "https://github.com/glv2/bst") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -6941,7 +6941,7 @@ (define-public sbcl-cl-octet-streams (origin (method git-fetch) (uri (git-reference - (url "https://github.com/glv2/cl-octet-streams.git") + (url "https://github.com/glv2/cl-octet-streams") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -6976,7 +6976,7 @@ (define-public sbcl-lzlib (origin (method git-fetch) (uri (git-reference - (url "https://github.com/glv2/cl-lzlib.git") + (url "https://github.com/glv2/cl-lzlib") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -7021,7 +7021,7 @@ (define-public sbcl-chanl (origin (method git-fetch) (uri (git-reference - (url "https://github.com/zkat/chanl.git") + (url "https://github.com/zkat/chanl") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -7056,7 +7056,7 @@ (define-public sbcl-cl-store (origin (method git-fetch) (uri (git-reference - (url "https://github.com/skypher/cl-store.git") + (url "https://github.com/skypher/cl-store") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -7365,7 +7365,7 @@ (define-public sbcl-simple-parallel-tasks (origin (method git-fetch) (uri (git-reference - (url "https://github.com/glv2/simple-parallel-tasks.git") + (url "https://github.com/glv2/simple-parallel-tasks") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -7429,7 +7429,7 @@ (define-public sbcl-curry-compose-reader-macros (method git-fetch) (uri (git-reference - (url "https://github.com/eschulte/curry-compose-reader-macros.git") + (url "https://github.com/eschulte/curry-compose-reader-macros") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -7460,7 +7460,7 @@ (define-public sbcl-yason (origin (method git-fetch) (uri (git-reference - (url "https://github.com/phmarek/yason.git") + (url "https://github.com/phmarek/yason") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -7537,7 +7537,7 @@ (define-public sbcl-graph (method git-fetch) (uri (git-reference - (url "https://github.com/eschulte/graph.git") + (url "https://github.com/eschulte/graph") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -7640,7 +7640,7 @@ (define-public sbcl-documentation-utils (method git-fetch) (uri (git-reference - (url "https://github.com/Shinmera/documentation-utils.git") + (url "https://github.com/Shinmera/documentation-utils") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -7978,7 +7978,7 @@ (define-public sbcl-cl-interpol (origin (method git-fetch) (uri (git-reference - (url "https://github.com/edicl/cl-interpol.git") + (url "https://github.com/edicl/cl-interpol") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -8018,7 +8018,7 @@ (define sbcl-symbol-munger-boot0 (origin (method git-fetch) (uri (git-reference - (url "https://github.com/AccelerationNet/symbol-munger.git") + (url "https://github.com/AccelerationNet/symbol-munger") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -8057,7 +8057,7 @@ (define sbcl-lisp-unit2-boot0 (origin (method git-fetch) (uri (git-reference - (url "https://github.com/AccelerationNet/lisp-unit2.git") + (url "https://github.com/AccelerationNet/lisp-unit2") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -8090,7 +8090,7 @@ (define-public sbcl-symbol-munger (origin (method git-fetch) (uri (git-reference - (url "https://github.com/AccelerationNet/symbol-munger.git") + (url "https://github.com/AccelerationNet/symbol-munger") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -8146,7 +8146,7 @@ (define-public sbcl-cl-csv (origin (method git-fetch) (uri (git-reference - (url "https://github.com/AccelerationNet/cl-csv.git") + (url "https://github.com/AccelerationNet/cl-csv") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -8185,7 +8185,7 @@ (define-public sbcl-external-program (origin (method git-fetch) (uri (git-reference - (url "https://github.com/sellout/external-program.git") + (url "https://github.com/sellout/external-program") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -8221,7 +8221,7 @@ (define sbcl-cl-ana-boot0 (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ghollisjr/cl-ana.git") + (url "https://github.com/ghollisjr/cl-ana") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -9302,7 +9302,7 @@ (define-public sbcl-archive (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/sharplispers/archive.git") + (url "https://github.com/sharplispers/archive") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -9470,7 +9470,7 @@ (define-public sbcl-cl-coroutine (origin (method git-fetch) (uri (git-reference - (url "https://github.com/takagi/cl-coroutine.git") + (url "https://github.com/takagi/cl-coroutine") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -9517,7 +9517,7 @@ (define-public sbcl-vom (origin (method git-fetch) (uri (git-reference - (url "https://github.com/orthecreedence/vom.git") + (url "https://github.com/orthecreedence/vom") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -9548,7 +9548,7 @@ (define-public sbcl-cl-libuv (origin (method git-fetch) (uri (git-reference - (url "https://github.com/orthecreedence/cl-libuv.git") + (url "https://github.com/orthecreedence/cl-libuv") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -9598,7 +9598,7 @@ (define-public sbcl-cl-async-base (origin (method git-fetch) (uri (git-reference - (url "https://github.com/orthecreedence/cl-async.git") + (url "https://github.com/orthecreedence/cl-async") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -9726,7 +9726,7 @@ (define-public sbcl-blackbird (origin (method git-fetch) (uri (git-reference - (url "https://github.com/orthecreedence/blackbird.git") + (url "https://github.com/orthecreedence/blackbird") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -9761,7 +9761,7 @@ (define-public sbcl-cl-async-future (origin (method git-fetch) (uri (git-reference - (url "https://github.com/orthecreedence/cl-async-future.git") + (url "https://github.com/orthecreedence/cl-async-future") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -9796,7 +9796,7 @@ (define-public sbcl-green-threads (origin (method git-fetch) (uri (git-reference - (url "https://github.com/thezerobit/green-threads.git") + (url "https://github.com/thezerobit/green-threads") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -9844,7 +9844,7 @@ (define-public sbcl-cl-base32 (origin (method git-fetch) (uri (git-reference - (url "https://github.com/hargettp/cl-base32.git") + (url "https://github.com/hargettp/cl-base32") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -9875,7 +9875,7 @@ (define-public sbcl-cl-z85 (origin (method git-fetch) (uri (git-reference - (url "https://github.com/glv2/cl-z85.git") + (url "https://github.com/glv2/cl-z85") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -9906,7 +9906,7 @@ (define-public sbcl-ltk (origin (method git-fetch) (uri (git-reference - (url "https://github.com/herth/ltk.git") + (url "https://github.com/herth/ltk") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -9992,7 +9992,7 @@ (define-public sbcl-cl-lex (origin (method git-fetch) (uri (git-reference - (url "https://github.com/djr7C4/cl-lex.git") + (url "https://github.com/djr7C4/cl-lex") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -10094,7 +10094,7 @@ (define-public sbcl-cl-jpeg (origin (method git-fetch) (uri (git-reference - (url "https://github.com/sharplispers/cl-jpeg.git") + (url "https://github.com/sharplispers/cl-jpeg") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -10174,7 +10174,7 @@ (define-public sbcl-salza2 (origin (method git-fetch) (uri (git-reference - (url "https://github.com/xach/salza2.git") + (url "https://github.com/xach/salza2") (commit (string-append "release-" version)))) (file-name (git-file-name name version)) (sha256 @@ -10204,7 +10204,7 @@ (define-public sbcl-png-read (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Ramarren/png-read.git") + (url "https://github.com/Ramarren/png-read") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -10233,7 +10233,7 @@ (define-public sbcl-zpng (origin (method git-fetch) (uri (git-reference - (url "https://github.com/xach/zpng.git") + (url "https://github.com/xach/zpng") (commit (string-append "release-" version)))) (file-name (git-file-name name version)) (sha256 @@ -10260,7 +10260,7 @@ (define-public sbcl-cl-qrencode (origin (method git-fetch) (uri (git-reference - (url "https://github.com/jnjcc/cl-qrencode.git") + (url "https://github.com/jnjcc/cl-qrencode") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -10293,7 +10293,7 @@ (define-public sbcl-hdf5-cffi (origin (method git-fetch) (uri (git-reference - (url "https://github.com/hdfgroup/hdf5-cffi.git") + (url "https://github.com/hdfgroup/hdf5-cffi") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -10354,7 +10354,7 @@ (define-public sbcl-cl-randist (origin (method git-fetch) (uri (git-reference - (url "https://github.com/lvaruzza/cl-randist.git") + (url "https://github.com/lvaruzza/cl-randist") (commit "f088a54b540a7adefab7c04094a6103f9edda3d0"))) (file-name (git-file-name name version)) (sha256 @@ -10386,7 +10386,7 @@ (define-public sbcl-float-features (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Shinmera/float-features.git") + (url "https://github.com/Shinmera/float-features") (commit "d3ef60181635b0849aa28cfc238053b7ca4644b0"))) (file-name (git-file-name name version)) (sha256 @@ -10420,7 +10420,7 @@ (define-public sbcl-function-cache (origin (method git-fetch) (uri (git-reference - (url "https://github.com/AccelerationNet/function-cache.git") + (url "https://github.com/AccelerationNet/function-cache") (commit "6a5ada401e57da2c8abf046f582029926e61fce8"))) (file-name (git-file-name name version)) (sha256 @@ -10462,7 +10462,7 @@ (define-public sbcl-type-r (origin (method git-fetch) (uri (git-reference - (url "https://github.com/guicho271828/type-r.git") + (url "https://github.com/guicho271828/type-r") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -10499,7 +10499,7 @@ (define-public sbcl-trivialib-type-unify (origin (method git-fetch) (uri (git-reference - (url "https://github.com/guicho271828/trivialib.type-unify.git") + (url "https://github.com/guicho271828/trivialib.type-unify") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -10538,7 +10538,7 @@ (define-public sbcl-specialized-function (origin (method git-fetch) (uri (git-reference - (url "https://github.com/numcl/specialized-function.git") + (url "https://github.com/numcl/specialized-function") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -10580,7 +10580,7 @@ (define-public sbcl-constantfold (origin (method git-fetch) (uri (git-reference - (url "https://github.com/numcl/constantfold.git") + (url "https://github.com/numcl/constantfold") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -10618,7 +10618,7 @@ (define-public sbcl-gtype (origin (method git-fetch) (uri (git-reference - (url "https://github.com/numcl/gtype.git") + (url "https://github.com/numcl/gtype") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -10658,7 +10658,7 @@ (define-public sbcl-numcl (origin (method git-fetch) (uri (git-reference - (url "https://github.com/numcl/numcl.git") + (url "https://github.com/numcl/numcl") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -10705,7 +10705,7 @@ (define-public sbcl-pzmq (origin (method git-fetch) (uri (git-reference - (url "https://github.com/orivej/pzmq.git") + (url "https://github.com/orivej/pzmq") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -10752,7 +10752,7 @@ (define-public sbcl-clss (method git-fetch) (uri (git-reference - (url "https://github.com/Shinmera/clss.git") + (url "https://github.com/Shinmera/clss") (commit commit))) (sha256 (base32 "0la4dbcda78x29szanylccrsljqrn9d1mhh569sqkyp44ni5fv91")) @@ -10784,7 +10784,7 @@ (define-public sbcl-lquery (method git-fetch) (uri (git-reference - (url "https://github.com/Shinmera/lquery.git") + (url "https://github.com/Shinmera/lquery") (commit commit))) (sha256 (base32 "0520mcpxc2d6fdm8z61arpgd2z38kan7cf06qs373n5r64rakz6w")) @@ -10823,7 +10823,7 @@ (define-public sbcl-cl-mysql (origin (method git-fetch) (uri (git-reference - (url "https://github.com/hackinghat/cl-mysql.git") + (url "https://github.com/hackinghat/cl-mysql") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -10865,7 +10865,7 @@ (define-public sbcl-simple-date (origin (method git-fetch) (uri (git-reference - (url "https://github.com/marijnh/Postmodern.git") + (url "https://github.com/marijnh/Postmodern") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -10984,7 +10984,7 @@ (define-public sbcl-dbi (origin (method git-fetch) (uri (git-reference - (url "https://github.com/fukamachi/cl-dbi.git") + (url "https://github.com/fukamachi/cl-dbi") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -11505,7 +11505,7 @@ (define-public sbcl-clx-xembed (origin (method git-fetch) (uri (git-reference - (url "https://github.com/laynor/clx-xembed.git") + (url "https://github.com/laynor/clx-xembed") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -11568,7 +11568,7 @@ (define-public sbcl-prometheus (origin (method git-fetch) (uri (git-reference - (url "https://github.com/deadtrickster/prometheus.cl.git") + (url "https://github.com/deadtrickster/prometheus.cl") (commit "7352b92296996ff383503e19bdd3bcea30409a15"))) (file-name (git-file-name name version)) (sha256 @@ -11680,7 +11680,7 @@ (define-public sbcl-uuid (origin (method git-fetch) (uri (git-reference - (url "https://github.com/dardoria/uuid.git") + (url "https://github.com/dardoria/uuid") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -11712,7 +11712,7 @@ (define-public sbcl-dissect (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Shinmera/dissect.git") + (url "https://github.com/Shinmera/dissect") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -11746,7 +11746,7 @@ (define-public sbcl-rove (origin (method git-fetch) (uri (git-reference - (url "https://github.com/fukamachi/rove.git") + (url "https://github.com/fukamachi/rove") (commit "f3695db08203bf26f3b861dc22ac0f4257d3ec21"))) (file-name (git-file-name name version)) (sha256 @@ -11780,7 +11780,7 @@ (define-public sbcl-exponential-backoff (origin (method git-fetch) (uri (git-reference - (url "https://github.com/death/exponential-backoff.git") + (url "https://github.com/death/exponential-backoff") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -11810,7 +11810,7 @@ (define-public sbcl-sxql (origin (method git-fetch) (uri (git-reference - (url "https://github.com/fukamachi/sxql.git") + (url "https://github.com/fukamachi/sxql") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -11849,7 +11849,7 @@ (define-public sbcl-1am (origin (method git-fetch) (uri (git-reference - (url "https://github.com/lmj/1am.git") + (url "https://github.com/lmj/1am") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -11879,7 +11879,7 @@ (define-public sbcl-cl-ascii-table (origin (method git-fetch) (uri (git-reference - (url "https://github.com/telephil/cl-ascii-table.git") + (url "https://github.com/telephil/cl-ascii-table") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -11906,7 +11906,7 @@ (define-public sbcl-cl-rdkafka (origin (method git-fetch) (uri (git-reference - (url "https://github.com/SahilKang/cl-rdkafka.git") + (url "https://github.com/SahilKang/cl-rdkafka") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -12133,7 +12133,7 @@ (define-public sbcl-cl-libsvm-format (origin (method git-fetch) (uri (git-reference - (url "https://github.com/masatoi/cl-libsvm-format.git") + (url "https://github.com/masatoi/cl-libsvm-format") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -12168,7 +12168,7 @@ (define-public sbcl-cl-online-learning (origin (method git-fetch) (uri (git-reference - (url "https://github.com/masatoi/cl-online-learning.git") + (url "https://github.com/masatoi/cl-online-learning") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -12207,7 +12207,7 @@ (define-public sbcl-cl-random-forest (origin (method git-fetch) (uri (git-reference - (url "https://github.com/masatoi/cl-random-forest.git") + (url "https://github.com/masatoi/cl-random-forest") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -12249,7 +12249,7 @@ (define-public sbcl-bordeaux-fft (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ahefner/bordeaux-fft.git") + (url "https://github.com/ahefner/bordeaux-fft") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -12279,7 +12279,7 @@ (define-public sbcl-napa-fft3 (origin (method git-fetch) (uri (git-reference - (url "https://github.com/pkhuong/Napa-FFT3.git") + (url "https://github.com/pkhuong/Napa-FFT3") (commit commit))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index aee32b0722..b7bc21ea6e 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -865,7 +865,7 @@ (define-public libclc (origin (method git-fetch) (uri (git-reference - (url "https://github.com/llvm/llvm-project.git") + (url "https://github.com/llvm/llvm-project") (commit (string-append "llvmorg-" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm index c95eadd377..789f32920d 100644 --- a/gnu/packages/logging.scm +++ b/gnu/packages/logging.scm @@ -196,7 +196,7 @@ (define-public spdlog (origin (method git-fetch) (uri (git-reference - (url "https://github.com/gabime/spdlog.git") + (url "https://github.com/gabime/spdlog") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/lolcode.scm b/gnu/packages/lolcode.scm index 3f62c4d5a5..cdbff1f4b6 100644 --- a/gnu/packages/lolcode.scm +++ b/gnu/packages/lolcode.scm @@ -34,7 +34,7 @@ (define-public lci (origin (method git-fetch) (uri (git-reference - (url "https://github.com/justinmeza/lci.git") + (url "https://github.com/justinmeza/lci") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index 7babb281ec..5479b891bd 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -515,7 +515,7 @@ (define-public lua-penlight (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Tieske/Penlight.git") + (url "https://github.com/Tieske/Penlight") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -555,7 +555,7 @@ (define-public lua-ldoc (origin (method git-fetch) (uri (git-reference - (url "https://github.com/stevedonovan/LDoc.git") + (url "https://github.com/stevedonovan/LDoc") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -732,7 +732,7 @@ (define (make-lua-luv name lua) ;; not include the pkg-config files. (method git-fetch) (uri (git-reference - (url "https://github.com/luvit/luv.git") + (url "https://github.com/luvit/luv") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -765,7 +765,7 @@ (define (make-lua-luv name lua) ,(origin (method git-fetch) (uri (git-reference - (url "https://github.com/keplerproject/lua-compat-5.3.git") + (url "https://github.com/keplerproject/lua-compat-5.3") (commit "daebe77a2f498817713df37f0bb316db1d82222f"))) (file-name "lua-compat-5.3-checkout") (sha256 @@ -832,7 +832,7 @@ (define-public selene (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/jeremyong/Selene.git") + (url "https://github.com/jeremyong/Selene") ;; The release is quite old. (commit "ffe1ade2568d4cff5894552be8f43e63e379a4c9"))) (file-name "Selene") diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index cad5282e1a..29f1a49317 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -270,7 +270,7 @@ (define-public spacefm (method git-fetch) (uri (git-reference - (url "https://github.com/IgnorantGuru/spacefm.git") + (url "https://github.com/IgnorantGuru/spacefm") (commit version))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 46128d2997..d0da753e42 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -77,7 +77,7 @@ (define-public libdbusmenu-qt ;; Download from github rather than launchpad because launchpad trunk ;; tarball hash is not deterministic. (uri (git-reference - (url "https://github.com/unity8-team/libdbusmenu-qt.git") + (url "https://github.com/unity8-team/libdbusmenu-qt") (commit version))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index d6a1064683..18a4ac9ef2 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -93,7 +93,7 @@ (define-public fann (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/libfann/fann.git") + (url "https://github.com/libfann/fann") (commit commit))) (file-name (string-append name "-" version "-checkout")) (sha256 @@ -315,7 +315,7 @@ (define-public ocaml-mcl (origin (method git-fetch) (uri (git-reference - (url "https://github.com/fhcrc/mcl.git") + (url "https://github.com/fhcrc/mcl") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -584,7 +584,7 @@ (define-public rxcpp (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ReactiveX/RxCpp.git") + (url "https://github.com/ReactiveX/RxCpp") (commit (string-append "v" version)))) (sha256 (base32 "1rdpa3jlc181jd08nk437aar085h28i45s6nzrv65apb3xyyz0ij")) @@ -803,7 +803,7 @@ (define-public python-scikit-learn (origin (method git-fetch) (uri (git-reference - (url "https://github.com/scikit-learn/scikit-learn.git") + (url "https://github.com/scikit-learn/scikit-learn") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -860,7 +860,7 @@ (define-public python2-scikit-learn (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/scikit-learn/scikit-learn.git") + (url "https://github.com/scikit-learn/scikit-learn") (commit version))) (file-name (git-file-name "python-scikit-learn" version)) (sha256 @@ -1064,7 +1064,7 @@ (define-public kaldi (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/kaldi-asr/kaldi.git") + (url "https://github.com/kaldi-asr/kaldi") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -1175,7 +1175,7 @@ (define-public gst-kaldi-nnet2-online (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/alumae/gst-kaldi-nnet2-online.git") + (url "https://github.com/alumae/gst-kaldi-nnet2-online") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -1247,7 +1247,7 @@ (define-public kaldi-gstreamer-server (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/alumae/kaldi-gstreamer-server.git") + (url "https://github.com/alumae/kaldi-gstreamer-server") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -1351,7 +1351,7 @@ (define-public tensorflow (origin (method git-fetch) (uri (git-reference - (url "https://github.com/tensorflow/tensorflow.git") + (url "https://github.com/tensorflow/tensorflow") (commit (string-append "v" version)))) (file-name (string-append "tensorflow-" version "-checkout")) (sha256 @@ -1681,7 +1681,7 @@ (define-public tensorflow (origin (method git-fetch) (uri (git-reference - (url "https://github.com/google/double-conversion.git") + (url "https://github.com/google/double-conversion") (commit commit))) (file-name (git-file-name "double-conversion" @@ -1726,7 +1726,7 @@ (define-public tensorflow (origin (method git-fetch) (uri (git-reference - (url "https://github.com/google/highwayhash.git") + (url "https://github.com/google/highwayhash") (commit commit))) (file-name (string-append "highwayhash-0-" revision (string-take commit 7) @@ -1974,7 +1974,7 @@ (define-public gloo (origin (method git-fetch) (uri (git-reference - (url "https://github.com/facebookincubator/gloo.git") + (url "https://github.com/facebookincubator/gloo") (commit commit))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 646d437009..326173c180 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -473,7 +473,7 @@ (define-public neomutt (origin (method git-fetch) (uri (git-reference - (url "https://github.com/neomutt/neomutt.git") + (url "https://github.com/neomutt/neomutt") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -879,7 +879,7 @@ (define-public notifymuch (origin (method git-fetch) (uri (git-reference - (url "https://github.com/kspi/notifymuch.git") + (url "https://github.com/kspi/notifymuch") (commit commit))) (sha256 (base32 @@ -999,7 +999,7 @@ (define-public notmuch-addrlookup-c (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/aperezdc/notmuch-addrlookup-c.git") + (url "https://github.com/aperezdc/notmuch-addrlookup-c") (commit (string-append "v" version)))) (file-name (string-append name "-" version "-checkout")) (sha256 @@ -1838,7 +1838,7 @@ (define-public esmtp (origin (method git-fetch) (uri (git-reference - (url "https://github.com/andywingo/esmtp.git") + (url "https://github.com/andywingo/esmtp") (commit "01bf9fc"))) (sha256 (base32 @@ -2931,7 +2931,7 @@ (define-public imapfilter (origin (method git-fetch) (uri (git-reference - (url "https://github.com/lefcha/imapfilter.git") + (url "https://github.com/lefcha/imapfilter") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -2991,7 +2991,7 @@ (define-public tnef (origin (method git-fetch) (uri (git-reference - (url "https://github.com/verdammelt/tnef.git") + (url "https://github.com/verdammelt/tnef") (commit version))) (sha256 (base32 "104g48mcm00bgiyzas2vf86331w7bnw7h3bc11ib4lp7rz6zqfck")) @@ -3077,7 +3077,7 @@ (define-public ytnef (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Yeraze/ytnef.git") + (url "https://github.com/Yeraze/ytnef") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/markup.scm b/gnu/packages/markup.scm index 7ae73da8a5..56a920d873 100644 --- a/gnu/packages/markup.scm +++ b/gnu/packages/markup.scm @@ -43,7 +43,7 @@ (define-public hoedown (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/hoedown/hoedown.git") + (url "https://github.com/hoedown/hoedown") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -201,7 +201,7 @@ (define-public cmark (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/jgm/cmark.git") + (url "https://github.com/jgm/cmark") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -242,7 +242,7 @@ (define-public smu (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Gottox/smu.git") + (url "https://github.com/Gottox/smu") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index e5b336ac3b..b75fd25a23 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -263,7 +263,7 @@ (define-public python-cvxopt (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/cvxopt/cvxopt.git") + (url "https://github.com/cvxopt/cvxopt") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -840,7 +840,7 @@ (define-public gctp (origin (method git-fetch) (uri (git-reference - (url "https://github.com/OkoSanto/GCTP.git") + (url "https://github.com/OkoSanto/GCTP") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -1340,7 +1340,7 @@ (define-public hdf5-blosc (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Blosc/hdf5-blosc.git") + (url "https://github.com/Blosc/hdf5-blosc") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -1823,7 +1823,7 @@ (define-public opencascade-oce (origin (method git-fetch) (uri (git-reference - (url "https://github.com/tpaviot/oce.git") + (url "https://github.com/tpaviot/oce") (commit (string-append "OCE-" version)))) (file-name (git-file-name name version)) (patches (search-patches "opencascade-oce-glibc-2.26.patch")) @@ -2023,7 +2023,7 @@ (define-public maxflow (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/gerddie/maxflow.git") + (url "https://github.com/gerddie/maxflow") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -2418,7 +2418,7 @@ (define-public metamath (origin (method git-fetch) (uri (git-reference - (url "https://github.com/metamath/metamath-exe.git") + (url "https://github.com/metamath/metamath-exe") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -3218,7 +3218,7 @@ (define-public wxmaxima (origin (method git-fetch) (uri (git-reference - (url "https://github.com/wxMaxima-developers/wxmaxima.git") + (url "https://github.com/wxMaxima-developers/wxmaxima") (commit (string-append "Version-" version)))) (file-name (git-file-name name version)) (sha256 @@ -3326,7 +3326,7 @@ (define-public muparser (origin (method git-fetch) (uri (git-reference - (url "https://github.com/beltoforion/muparser.git") + (url "https://github.com/beltoforion/muparser") (commit (string-append "v" upstream-version)))) (file-name (git-file-name name version)) (sha256 @@ -3527,7 +3527,7 @@ (define-public openlibm (origin (method git-fetch) (uri (git-reference - (url "https://github.com/JuliaLang/openlibm.git") + (url "https://github.com/JuliaLang/openlibm") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -3566,7 +3566,7 @@ (define-public openspecfun (origin (method git-fetch) (uri (git-reference - (url "https://github.com/JuliaLang/openspecfun.git") + (url "https://github.com/JuliaLang/openspecfun") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -3604,7 +3604,7 @@ (define-public suitesparse (origin (method git-fetch) (uri (git-reference - (url "https://github.com/DrTimothyAldenDavis/SuiteSparse.git") + (url "https://github.com/DrTimothyAldenDavis/SuiteSparse") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -4140,7 +4140,7 @@ (define-public hypre (origin (method git-fetch) (uri (git-reference - (url "https://github.com/LLNL/hypre.git") + (url "https://github.com/LLNL/hypre") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -4596,7 +4596,7 @@ (define-public elemental (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/elemental/Elemental.git") + (url "https://github.com/elemental/Elemental") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -5569,7 +5569,7 @@ (define-public minisat (origin (method git-fetch) (uri (git-reference - (url "https://github.com/niklasso/minisat.git") + (url "https://github.com/niklasso/minisat") (commit commit))) (file-name (string-append name "-" version "-checkout")) (sha256 diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 66c6e3adfa..c4d2872cfe 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -85,7 +85,7 @@ (define-public maven-resolver-api (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/apache/maven-resolver.git") + (url "https://github.com/apache/maven-resolver") (commit (string-append "maven-resolver-" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 26704ecd58..9ffbe33ab7 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -296,7 +296,7 @@ (define-public m2-planet (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/oriansj/m2-planet.git") + (url "https://github.com/oriansj/m2-planet") (commit commit))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index eb1856ada4..3cdb4f2df3 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -235,7 +235,7 @@ (define-public bitlbee-discord (origin (method git-fetch) (uri (git-reference - (url "https://github.com/sm00th/bitlbee-discord.git") + (url "https://github.com/sm00th/bitlbee-discord") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -1005,7 +1005,7 @@ (define-public libtoxcore (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/irungentoo/toxcore.git") + (url "https://github.com/irungentoo/toxcore") (commit commit))) (file-name (string-append name "-" version "-checkout")) (sha256 @@ -1040,7 +1040,7 @@ (define-public c-toxcore (origin (method git-fetch) (uri (git-reference - (url "https://github.com/TokTok/c-toxcore.git") + (url "https://github.com/TokTok/c-toxcore") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -1071,7 +1071,7 @@ (define-public utox (origin (method git-fetch) (uri (git-reference - (url "https://github.com/uTox/uTox.git") + (url "https://github.com/uTox/uTox") (commit (string-append "v" version)) (recursive? #t))) ;; Needed for 'minini' git submodule. (file-name (string-append name "-" version "-checkout")) @@ -1195,7 +1195,7 @@ (define-public pybitmessage (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Bitmessage/PyBitmessage.git") + (url "https://github.com/Bitmessage/PyBitmessage") (commit version))) (file-name (string-append name "-" version "-checkout")) (sha256 @@ -1639,7 +1639,7 @@ (define-public libmesode (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/boothj5/libmesode.git") + (url "https://github.com/boothj5/libmesode") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -1670,7 +1670,7 @@ (define-public libstrophe (origin (method git-fetch) (uri (git-reference - (url "https://github.com/strophe/libstrophe.git") + (url "https://github.com/strophe/libstrophe") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -1778,7 +1778,7 @@ (define-public toxic (origin (method git-fetch) (uri (git-reference - (url "https://github.com/JFreegman/toxic.git") + (url "https://github.com/JFreegman/toxic") (commit (string-append "v" version)))) (sha256 (base32 "09l2j3lwvrq7bf3051vjsnml9w63790ly3iylgf26gkrmld6k31w")) @@ -1863,7 +1863,7 @@ (define-public mtxclient (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Nheko-Reborn/mtxclient.git") + (url "https://github.com/Nheko-Reborn/mtxclient") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -1913,7 +1913,7 @@ (define-public nheko (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Nheko-Reborn/nheko.git") + (url "https://github.com/Nheko-Reborn/nheko") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -2153,7 +2153,7 @@ (define-public tdlib (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/tdlib/td.git") + (url "https://github.com/tdlib/td") (commit commit))) (sha256 (base32 diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm index f6a1153548..429959531a 100644 --- a/gnu/packages/monitoring.scm +++ b/gnu/packages/monitoring.scm @@ -412,7 +412,7 @@ (define-public go-github-com-prometheus-node-exporter (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/prometheus/node_exporter.git") + (url "https://github.com/prometheus/node_exporter") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -434,7 +434,7 @@ (define-public fswatch (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/emcrisostomo/fswatch.git") + (url "https://github.com/emcrisostomo/fswatch") (commit version))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 653eec5b6a..3801eaeb6b 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -350,7 +350,7 @@ (define-public ashuffle (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/joshkunz/ashuffle.git") + (url "https://github.com/joshkunz/ashuffle") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 0e5ca65242..3089a22c7c 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -222,7 +222,7 @@ (define-public clementine (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/clementine-player/Clementine.git") + (url "https://github.com/clementine-player/Clementine") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -329,7 +329,7 @@ (define-public cmus (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/cmus/cmus.git") + (url "https://github.com/cmus/cmus") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -463,7 +463,7 @@ (define-public dumb (origin (method git-fetch) (uri (git-reference - (url "https://github.com/kode54/dumb.git") + (url "https://github.com/kode54/dumb") (commit version))) (sha256 (base32 "1cnq6rb14d4yllr0yi32p9jmcig8avs3f43bvdjrx4r1mpawspi6")) @@ -508,7 +508,7 @@ (define-public hydrogen (origin (method git-fetch) (uri (git-reference - (url "https://github.com/hydrogen-music/hydrogen.git") + (url "https://github.com/hydrogen-music/hydrogen") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -631,7 +631,7 @@ (define-public extempore (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/digego/extempore.git") + (url "https://github.com/digego/extempore") (commit (string-append "v" version)))) (sha256 (base32 @@ -1136,7 +1136,7 @@ (define-public bsequencer (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/sjaehn/BSEQuencer.git") + (url "https://github.com/sjaehn/BSEQuencer") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -1172,7 +1172,7 @@ (define-public bchoppr (origin (method git-fetch) (uri (git-reference - (url "https://github.com/sjaehn/BChoppr.git") + (url "https://github.com/sjaehn/BChoppr") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -1277,7 +1277,7 @@ (define-public powertabeditor (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/powertab/powertabeditor.git") + (url "https://github.com/powertab/powertabeditor") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -1315,7 +1315,7 @@ (define-public jalv-select (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/brummer10/jalv_select.git") + (url "https://github.com/brummer10/jalv_select") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -1860,7 +1860,7 @@ (define-public libpd (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/libpd/libpd.git") + (url "https://github.com/libpd/libpd") (commit version) (recursive? #t))) ; for the 'pure-data' submodule (file-name (string-append name "-" version "-checkout")) @@ -1941,7 +1941,7 @@ (define-public portmidi-for-extempore (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/extemporelang/portmidi.git") + (url "https://github.com/extemporelang/portmidi") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -2283,7 +2283,7 @@ (define-public jack-capture (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/kmatheussen/jack_capture.git") + (url "https://github.com/kmatheussen/jack_capture") (commit version))) (file-name (string-append name "-" version "-checkout")) (sha256 @@ -2474,7 +2474,7 @@ (define-public ams-lv2 (origin (method git-fetch) (uri (git-reference - (url "https://github.com/blablack/ams-lv2.git") + (url "https://github.com/blablack/ams-lv2") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -2515,7 +2515,7 @@ (define-public gxtuner (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/brummer10/gxtuner.git") + (url "https://github.com/brummer10/gxtuner") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -2603,7 +2603,7 @@ (define-public curseradio (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/chronitis/curseradio.git") + (url "https://github.com/chronitis/curseradio") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -2638,7 +2638,7 @@ (define-public pianobar (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/PromyLOPh/pianobar.git") + (url "https://github.com/PromyLOPh/pianobar") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -2860,7 +2860,7 @@ (define-public instantmusic (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/yask123/Instant-Music-Downloader.git") + (url "https://github.com/yask123/Instant-Music-Downloader") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -2978,7 +2978,7 @@ (define-public milkytracker (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/milkytracker/MilkyTracker.git") + (url "https://github.com/milkytracker/MilkyTracker") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -3023,7 +3023,7 @@ (define-public schismtracker (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/schismtracker/schismtracker.git") + (url "https://github.com/schismtracker/schismtracker") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -3211,7 +3211,7 @@ (define-public gx-guvnor-lv2 (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/brummer10/GxGuvnor.lv2.git") + (url "https://github.com/brummer10/GxGuvnor.lv2") (commit (string-append "v" version)))) (file-name (string-append name "-" version "-checkout")) (sha256 @@ -3335,7 +3335,7 @@ (define-public gx-suppa-tone-bender-lv2 (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/brummer10/GxSuppaToneBender.lv2.git") + (url "https://github.com/brummer10/GxSuppaToneBender.lv2") (commit (string-append "v" version)))) (file-name (string-append name "-" version "-checkout")) (sha256 @@ -3374,7 +3374,7 @@ (define-public gx-hyperion-lv2 (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/brummer10/GxHyperion.lv2.git") + (url "https://github.com/brummer10/GxHyperion.lv2") (commit (string-append "v" version)))) (file-name (string-append name "-" version "-checkout")) (sha256 @@ -3392,7 +3392,7 @@ (define-public gx-voodoo-fuzz-lv2 (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/brummer10/GxVoodoFuzz.lv2.git") + (url "https://github.com/brummer10/GxVoodoFuzz.lv2") (commit (string-append "v" version)))) (file-name (string-append name "-" version "-checkout")) (sha256 @@ -3412,7 +3412,7 @@ (define-public gx-super-fuzz-lv2 (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/brummer10/GxSuperFuzz.lv2.git") + (url "https://github.com/brummer10/GxSuperFuzz.lv2") (commit (string-append "v" version)))) (file-name (string-append name "-" version "-checkout")) (sha256 @@ -3432,7 +3432,7 @@ (define-public gx-vintage-fuzz-master-lv2 (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/brummer10/GxVintageFuzzMaster.lv2.git") + (url "https://github.com/brummer10/GxVintageFuzzMaster.lv2") (commit (string-append "v" version)))) (file-name (string-append name "-" version "-checkout")) (sha256 @@ -3493,7 +3493,7 @@ (define-public rkrlv2 (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ssj71/rkrlv2.git") + (url "https://github.com/ssj71/rkrlv2") (commit commit))) (sha256 (base32 @@ -3523,7 +3523,7 @@ (define-public mod-utilities (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/moddevices/mod-utilities.git") + (url "https://github.com/moddevices/mod-utilities") (commit commit))) (file-name (string-append name "-" version "-checkout")) (sha256 @@ -3807,7 +3807,7 @@ (define-public lmms (origin (method git-fetch) (uri (git-reference - (url "https://github.com/LMMS/lmms.git") + (url "https://github.com/LMMS/lmms") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -3859,7 +3859,7 @@ (define-public lmms ,(origin (method git-fetch) (uri (git-reference - (url "https://github.com/mjansson/rpmalloc.git") + (url "https://github.com/mjansson/rpmalloc") (commit "b5bdc18051bb74a22f0bde4bcc90b01cf590b496"))) (sha256 (base32 @@ -3896,7 +3896,7 @@ (define-public musescore (origin (method git-fetch) (uri (git-reference - (url "https://github.com/musescore/MuseScore.git") + (url "https://github.com/musescore/MuseScore") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -3969,7 +3969,7 @@ (define-public muse-sequencer (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/muse-sequencer/muse.git") + (url "https://github.com/muse-sequencer/muse") (commit (string-append "muse_" (string-map (lambda (c) (if (char=? c #\.) @@ -4153,7 +4153,7 @@ (define-public patchmatrix (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/OpenMusicKontrollers/patchmatrix.git") + (url "https://github.com/OpenMusicKontrollers/patchmatrix") (commit version))) (file-name (git-file-name "patchmatrix" version)) (sha256 @@ -4224,7 +4224,7 @@ (define-public sonivox-eas (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/pedrolcl/Linux-SonivoxEas.git") + (url "https://github.com/pedrolcl/Linux-SonivoxEas") (commit (string-append "v" version)))) (file-name (string-append name "-" version "-checkout")) (sha256 @@ -4437,7 +4437,7 @@ (define-public clyrics (origin (method git-fetch) (uri (git-reference - (url "https://github.com/trizen/clyrics.git") + (url "https://github.com/trizen/clyrics") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -4732,7 +4732,7 @@ (define-public playerctl (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/altdesktop/playerctl.git") + (url "https://github.com/altdesktop/playerctl") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -4800,7 +4800,7 @@ (define-public lsp-plugins (origin (method git-fetch) (uri (git-reference - (url "https://github.com/sadko4u/lsp-plugins.git") + (url "https://github.com/sadko4u/lsp-plugins") (commit (string-append "lsp-plugins-" version)))) (file-name (git-file-name name version)) (sha256 @@ -4871,7 +4871,7 @@ (define-public spectacle-analyzer (origin (method git-fetch) (uri (git-reference - (url "https://github.com/jpcima/spectacle.git") + (url "https://github.com/jpcima/spectacle") (commit (string-append "v" version)) ;; Bundles a specific commit of the DISTRHO plugin framework. (recursive? #t))) @@ -4968,7 +4968,7 @@ (define-public zam-plugins (method git-fetch) (uri (git-reference - (url "https://github.com/zamaudio/zam-plugins.git") + (url "https://github.com/zamaudio/zam-plugins") (commit version) ;; Recursive to fetch the DISTRHO plugin framework. This ;; framework is intended to be included in the sources @@ -5060,7 +5060,7 @@ (define-public dpf-plugins (method git-fetch) (uri (git-reference - (url "https://github.com/DISTRHO/DPF-Plugins.git") + (url "https://github.com/DISTRHO/DPF-Plugins") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -5107,7 +5107,7 @@ (define-public avldrums-lv2 (origin (method git-fetch) (uri (git-reference - (url "https://github.com/x42/avldrums.lv2.git") + (url "https://github.com/x42/avldrums.lv2") (commit (string-append "v" version)) ;; This plugin expects the robtk submodule's source files to be ;; there in order to build. @@ -5151,7 +5151,7 @@ (define-public helm (method git-fetch) (uri (git-reference - (url "https://github.com/mtytel/helm.git") + (url "https://github.com/mtytel/helm") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -5269,7 +5269,7 @@ (define-public dragonfly-reverb (method git-fetch) (uri (git-reference - (url "https://github.com/michaelwillis/dragonfly-reverb.git") + (url "https://github.com/michaelwillis/dragonfly-reverb") (commit version) ;; Bundles a specific commit of the DISTRHO plugin framework. (recursive? #t))) @@ -5355,7 +5355,7 @@ (define-public vl1-emulator (origin (method git-fetch) (uri (git-reference - (url "https://github.com/linuxmao-org/VL1-emulator.git") + (url "https://github.com/linuxmao-org/VL1-emulator") (commit (string-append "v" version)) ;; bundles a specific commit of the DISTRHO plugin framework (recursive? #t))) @@ -5395,7 +5395,7 @@ (define-public regrader (origin (method git-fetch) (uri (git-reference - (url "https://github.com/linuxmao-org/regrader.git") + (url "https://github.com/linuxmao-org/regrader") (commit (string-append "v" version)) ;; bundles a specific commit of the DISTRHO plugin framework (recursive? #t))) @@ -5447,7 +5447,7 @@ (define-public tap-lv2 (origin (method git-fetch) (uri (git-reference - (url "https://github.com/moddevices/tap-lv2.git") + (url "https://github.com/moddevices/tap-lv2") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -5487,7 +5487,7 @@ (define-public wolf-shaper (origin (method git-fetch) (uri (git-reference - (url "https://github.com/pdesaulniers/wolf-shaper.git") + (url "https://github.com/pdesaulniers/wolf-shaper") (commit (string-append "v" version)) ;; Bundles a specific commit of the DISTRHO plugin framework. (recursive? #t))) @@ -5569,7 +5569,7 @@ (define-public shiru-lv2 (origin (method git-fetch) (uri (git-reference - (url "https://github.com/linuxmao-org/shiru-plugins.git") + (url "https://github.com/linuxmao-org/shiru-plugins") (commit commit) ;; Bundles a specific commit of the DISTRHO plugin framework. (recursive? #t))) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 44f81c94d1..53599fe191 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -615,7 +615,7 @@ (define-public librdkafka (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/edenhill/librdkafka.git") + (url "https://github.com/edenhill/librdkafka") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -1064,7 +1064,7 @@ (define-public go-netns (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/vishvananda/netns.git") + (url "https://github.com/vishvananda/netns") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -1090,7 +1090,7 @@ (define-public go-sctp (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ishidawataru/sctp.git") + (url "https://github.com/ishidawataru/sctp") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -1221,7 +1221,7 @@ (define-public bwm-ng (origin (method git-fetch) (uri (git-reference - (url "https://github.com/vgropp/bwm-ng.git") + (url "https://github.com/vgropp/bwm-ng") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -1783,7 +1783,7 @@ (define-public sslh (origin (method git-fetch) (uri (git-reference - (url "https://github.com/yrutschle/sslh.git") + (url "https://github.com/yrutschle/sslh") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -2194,7 +2194,7 @@ (define-public thc-ipv6 (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/vanhauser-thc/thc-ipv6.git") + (url "https://github.com/vanhauser-thc/thc-ipv6") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -2505,7 +2505,7 @@ (define-public can-utils (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/linux-can/can-utils.git") + (url "https://github.com/linux-can/can-utils") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -2686,7 +2686,7 @@ (define-public ubridge (origin (method git-fetch) (uri (git-reference - (url "https://github.com/GNS3/ubridge.git") + (url "https://github.com/GNS3/ubridge") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -2725,7 +2725,7 @@ (define-public hcxtools (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ZerBea/hcxtools.git") + (url "https://github.com/ZerBea/hcxtools") (commit version))) (sha256 (base32 "0k2qlq9hz5zc21nyc6yrnfqzga7hydn5mm0x3rpl2fhkwl81lxcn")) @@ -2759,7 +2759,7 @@ (define-public hcxdumptool (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ZerBea/hcxdumptool.git") + (url "https://github.com/ZerBea/hcxdumptool") (commit version))) (sha256 (base32 "1b4d543y64ib92w9gcmiyjn5hz2vyjqmxk3f3yr1zk04fhw16gmf")) @@ -2873,7 +2873,7 @@ (define-public restinio (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Stiffstream/restinio.git") + (url "https://github.com/Stiffstream/restinio") (commit (string-append "v." version)))) (file-name (git-file-name name version)) (sha256 @@ -2915,7 +2915,7 @@ (define-public opendht (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/savoirfairelinux/opendht.git") + (url "https://github.com/savoirfairelinux/opendht") (commit version))) (file-name (git-file-name name version)) (patches (search-patches "opendht-fix-jami.patch")) @@ -3085,7 +3085,7 @@ (define-public pagekite (origin (method git-fetch) (uri (git-reference - (url "https://github.com/pagekite/PyPagekite.git") + (url "https://github.com/pagekite/PyPagekite") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 27cd5c18b7..b1d6d4ce59 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -253,7 +253,7 @@ (define-public node-semver (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/npm/node-semver.git") + (url "https://github.com/npm/node-semver") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 5792c1f465..1b40063ffb 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -238,7 +238,7 @@ (define-public ocamlbuild (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ocaml/ocamlbuild.git") + (url "https://github.com/ocaml/ocamlbuild") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -533,7 +533,7 @@ (define-public camlp5 (origin (method git-fetch) (uri (git-reference - (url "https://github.com/camlp5/camlp5.git") + (url "https://github.com/camlp5/camlp5") (commit (string-append "rel" (string-delete #\. version))))) (file-name (git-file-name name version)) (sha256 @@ -620,7 +620,7 @@ (define-public ocaml-num (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ocaml/num.git") + (url "https://github.com/ocaml/num") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -666,7 +666,7 @@ (define-public emacs-tuareg (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ocaml/tuareg.git") + (url "https://github.com/ocaml/tuareg") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -843,7 +843,7 @@ (define-public unison (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/bcpierce00/unison.git") + (url "https://github.com/bcpierce00/unison") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -1156,7 +1156,7 @@ (define-public ocaml-qcheck (origin (method git-fetch) (uri (git-reference - (url "https://github.com/c-cube/qcheck.git") + (url "https://github.com/c-cube/qcheck") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -1683,7 +1683,7 @@ (define-public ocaml4.07-ppx-tools (origin (method git-fetch) (uri (git-reference - (url "https://github.com/alainfrisch/ppx_tools.git") + (url "https://github.com/alainfrisch/ppx_tools") (commit version))) (file-name (git-file-name name version)) (sha256 (base32 @@ -1738,7 +1738,7 @@ (define-public ocaml-ssl (origin (method git-fetch) (uri (git-reference - (url "https://github.com/savonet/ocaml-ssl.git") + (url "https://github.com/savonet/ocaml-ssl") (commit version))) (file-name (git-file-name name version)) (sha256 (base32 @@ -2575,7 +2575,7 @@ (define-public ocaml-seq (origin (method git-fetch) (uri (git-reference - (url "https://github.com/c-cube/seq.git") + (url "https://github.com/c-cube/seq") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -2613,7 +2613,7 @@ (define-public ocaml-re (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ocaml/ocaml-re.git") + (url "https://github.com/ocaml/ocaml-re") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -2722,7 +2722,7 @@ (define-public ocaml4.07-ezjsonm (origin (method git-fetch) (uri (git-reference - (url "https://github.com/mirage/ezjsonm.git") + (url "https://github.com/mirage/ezjsonm") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -2755,7 +2755,7 @@ (define-public ocaml4.07-uri (origin (method git-fetch) (uri (git-reference - (url "https://github.com/mirage/ocaml-uri.git") + (url "https://github.com/mirage/ocaml-uri") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -2822,7 +2822,7 @@ (define-public ocaml4.07-piqilib (origin (method git-fetch) (uri (git-reference - (url "https://github.com/alavrik/piqi.git") + (url "https://github.com/alavrik/piqi") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -3120,7 +3120,7 @@ (define-public ocaml4.07-zed (origin (method git-fetch) (uri (git-reference - (url "https://github.com/diml/zed.git") + (url "https://github.com/diml/zed") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -3150,7 +3150,7 @@ (define-public ocaml4.07-lambda-term (origin (method git-fetch) (uri (git-reference - (url "https://github.com/diml/lambda-term.git") + (url "https://github.com/diml/lambda-term") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -3186,7 +3186,7 @@ (define-public ocaml4.07-utop (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ocaml-community/utop.git") + (url "https://github.com/ocaml-community/utop") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -3377,7 +3377,7 @@ (define-public dedukti (origin (method git-fetch) (uri (git-reference - (url "https://github.com/deducteam/dedukti.git") + (url "https://github.com/deducteam/dedukti") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -3522,7 +3522,7 @@ (define-public ocaml-bindlib (origin (method git-fetch) (uri (git-reference - (url "https://github.com/rlepigre/ocaml-bindlib.git") + (url "https://github.com/rlepigre/ocaml-bindlib") (commit (string-append "ocaml-bindlib_" version)))) (file-name (git-file-name name version)) (sha256 @@ -3730,7 +3730,7 @@ (define-public ocaml4.07-merlin (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ocaml/merlin.git") + (url "https://github.com/ocaml/merlin") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -4174,7 +4174,7 @@ (define-public ocaml4.07-ppx-compare (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/janestreet/ppx_compare.git") + (url "https://github.com/janestreet/ppx_compare") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -4299,7 +4299,7 @@ (define-public ocaml4.07-ppx-sexp-conv (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/janestreet/ppx_sexp_conv.git") + (url "https://github.com/janestreet/ppx_sexp_conv") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -4328,7 +4328,7 @@ (define-public ocaml4.07-ppx-variants-conv (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/janestreet/ppx_variants_conv.git") + (url "https://github.com/janestreet/ppx_variants_conv") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -4457,7 +4457,7 @@ (define-public ocaml4.07-ppx-hash (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/janestreet/ppx_hash.git") + (url "https://github.com/janestreet/ppx_hash") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -4488,7 +4488,7 @@ (define-public ocaml4.07-ppx-enumerate (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/janestreet/ppx_enumerate.git") + (url "https://github.com/janestreet/ppx_enumerate") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -4839,7 +4839,7 @@ (define-public ocaml4.07-ppx-expect (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/janestreet/ppx_expect.git") + (url "https://github.com/janestreet/ppx_expect") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -4914,7 +4914,7 @@ (define-public ocaml4.07-ppx-typerep-conv (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/janestreet/ppx_typerep_conv.git") + (url "https://github.com/janestreet/ppx_typerep_conv") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -4980,7 +4980,7 @@ (define-public ocaml4.07-ppx-bin-prot (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/janestreet/ppx_bin_prot.git") + (url "https://github.com/janestreet/ppx_bin_prot") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -5149,7 +5149,7 @@ (define-public ocaml4.07-spawn (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/janestreet/spawn.git") + (url "https://github.com/janestreet/spawn") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -5197,7 +5197,7 @@ (define-public ocaml4.07-core (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/janestreet/core.git") + (url "https://github.com/janestreet/core") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -5237,7 +5237,7 @@ (define-public ocaml4.07-core-kernel (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/janestreet/core_kernel.git") + (url "https://github.com/janestreet/core_kernel") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -5340,7 +5340,7 @@ (define-public ocaml-tyxml (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ocsigen/tyxml.git") + (url "https://github.com/ocsigen/tyxml") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -5375,7 +5375,7 @@ (define-public ocaml-bisect-ppx (origin (method git-fetch) (uri (git-reference - (url "https://github.com/aantron/bisect_ppx.git") + (url "https://github.com/aantron/bisect_ppx") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -5460,7 +5460,7 @@ (define-public ocaml4.07-fftw3 (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Chris00/fftw-ocaml.git") + (url "https://github.com/Chris00/fftw-ocaml") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -5496,7 +5496,7 @@ (define-public ocaml4.07-lacaml (origin (method git-fetch) (uri (git-reference - (url "https://github.com/mmottl/lacaml.git") + (url "https://github.com/mmottl/lacaml") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -5529,7 +5529,7 @@ (define-public ocaml-cairo2 (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Chris00/ocaml-cairo.git") + (url "https://github.com/Chris00/ocaml-cairo") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -5559,7 +5559,7 @@ (define-public lablgtk3 (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/garrigue/lablgtk.git") + (url "https://github.com/garrigue/lablgtk") (commit version))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/ocr.scm b/gnu/packages/ocr.scm index dc690f3cef..dc4930918a 100644 --- a/gnu/packages/ocr.scm +++ b/gnu/packages/ocr.scm @@ -93,7 +93,7 @@ (define-public zinnia (origin (method git-fetch) (uri (git-reference - (url "https://github.com/taku910/zinnia.git") + (url "https://github.com/taku910/zinnia") (commit commit))) (sha256 (base32 diff --git a/gnu/packages/onc-rpc.scm b/gnu/packages/onc-rpc.scm index cd31dfd910..8d0480622e 100644 --- a/gnu/packages/onc-rpc.scm +++ b/gnu/packages/onc-rpc.scm @@ -147,7 +147,7 @@ (define-public libnsl (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/thkukuk/libnsl.git") + (url "https://github.com/thkukuk/libnsl") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/opencl.scm b/gnu/packages/opencl.scm index f14d5df130..593b9044df 100644 --- a/gnu/packages/opencl.scm +++ b/gnu/packages/opencl.scm @@ -58,7 +58,7 @@ (define (make-opencl-headers major-version subversion) (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/KhronosGroup/OpenCL-Headers.git") + (url "https://github.com/KhronosGroup/OpenCL-Headers") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -109,7 +109,7 @@ (define-public opencl-clhpp (origin (method git-fetch) (uri (git-reference - (url "https://github.com/KhronosGroup/OpenCL-CLHPP.git") + (url "https://github.com/KhronosGroup/OpenCL-CLHPP") (commit (string-append "v" version)))) (sha256 (base32 "0h5kpg5cl8wzfnqmv6i26aig2apv06ffm9p3rh35938n9r8rladm")) @@ -181,7 +181,7 @@ (define-public clinfo (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Oblomov/clinfo.git") + (url "https://github.com/Oblomov/clinfo") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -223,7 +223,7 @@ (define-public beignet (origin (method git-fetch) (uri (git-reference - (url "https://github.com/intel/beignet.git") + (url "https://github.com/intel/beignet") (commit (string-append "Release_v" version)))) (file-name (git-file-name name version)) (sha256 @@ -303,7 +303,7 @@ (define-public pocl (origin (method git-fetch) (uri (git-reference - (url "https://github.com/pocl/pocl.git") + (url "https://github.com/pocl/pocl") (commit (string-append "v" version)))) (sha256 (base32 "1c4y69zks6hkq5fqh9waxgb8g4ka7y6h3vacmsm720kba0h57g8a")) diff --git a/gnu/packages/opencog.scm b/gnu/packages/opencog.scm index 18aba64aec..cca0b37ead 100644 --- a/gnu/packages/opencog.scm +++ b/gnu/packages/opencog.scm @@ -44,7 +44,7 @@ (define-public cogutil (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/opencog/cogutil.git") + (url "https://github.com/opencog/cogutil") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -76,7 +76,7 @@ (define-public atomspace (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/opencog/atomspace.git") + (url "https://github.com/opencog/atomspace") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -122,7 +122,7 @@ (define-public cogserver (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/opencog/cogserver.git") + (url "https://github.com/opencog/cogserver") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -164,7 +164,7 @@ (define-public attention (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/opencog/attention.git") + (url "https://github.com/opencog/attention") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -209,7 +209,7 @@ (define-public opencog (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/opencog/opencog.git") + (url "https://github.com/opencog/opencog") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -260,7 +260,7 @@ (define-public agi-bio (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/opencog/agi-bio.git") + (url "https://github.com/opencog/agi-bio") (commit commit))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/pantheon.scm b/gnu/packages/pantheon.scm index 036050d1bf..aa7074827e 100644 --- a/gnu/packages/pantheon.scm +++ b/gnu/packages/pantheon.scm @@ -41,7 +41,7 @@ (define-public granite (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/elementary/granite.git") + (url "https://github.com/elementary/granite") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -79,7 +79,7 @@ (define-public pantheon-calculator (origin (method git-fetch) (uri (git-reference - (url "https://github.com/elementary/calculator.git") + (url "https://github.com/elementary/calculator") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -120,7 +120,7 @@ (define-public sideload (origin (method git-fetch) (uri (git-reference - (url "https://github.com/elementary/sideload.git") + (url "https://github.com/elementary/sideload") (commit version))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index b7f9689862..0dffffd036 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -203,7 +203,7 @@ (define-public pwsafe (origin (method git-fetch) (uri (git-reference - (url "https://github.com/pwsafe/pwsafe.git") + (url "https://github.com/pwsafe/pwsafe") (commit version))) (sha256 (base32 "1ka7xsl63v0559fzf3pwc1iqr37gwr4vq5iaxa2hzar2g28hsxvh")) @@ -587,7 +587,7 @@ (define-public qtpass (origin (method git-fetch) (uri (git-reference - (url "https://github.com/IJHack/QtPass.git") + (url "https://github.com/IJHack/QtPass") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -711,7 +711,7 @@ (define-public browserpass-native (origin (method git-fetch) (uri (git-reference - (url "https://github.com/browserpass/browserpass-native.git") + (url "https://github.com/browserpass/browserpass-native") (commit version))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index 0d58c21eee..c26977be1f 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -325,7 +325,7 @@ (define-public patchwork (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/getpatchwork/patchwork.git") + (url "https://github.com/getpatchwork/patchwork") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 0ad1263812..5cf93ad724 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -312,7 +312,7 @@ (define-public libharu (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/libharu/libharu.git") + (url "https://github.com/libharu/libharu") (commit (string-append "RELEASE_" (string-join (string-split version #\.) "_"))))) @@ -827,7 +827,7 @@ (define-public xournalpp (origin (method git-fetch) (uri (git-reference - (url "https://github.com/xournalpp/xournalpp.git") + (url "https://github.com/xournalpp/xournalpp") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -1064,7 +1064,7 @@ (define-public pdf2svg (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/dawbarton/pdf2svg.git") + (url "https://github.com/dawbarton/pdf2svg") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -1161,7 +1161,7 @@ (define-public pdfarranger (origin (method git-fetch) (uri (git-reference - (url "https://github.com/jeromerobert/pdfarranger.git") + (url "https://github.com/jeromerobert/pdfarranger") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -1261,7 +1261,7 @@ (define-public pdfpc (origin (method git-fetch) (uri (git-reference - (url "https://github.com/pdfpc/pdfpc.git") + (url "https://github.com/pdfpc/pdfpc") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/perl6.scm b/gnu/packages/perl6.scm index 04e37a3b85..e02dd757e5 100644 --- a/gnu/packages/perl6.scm +++ b/gnu/packages/perl6.scm @@ -268,7 +268,7 @@ (define-public perl6-grammar-profiler-simple (origin (method git-fetch) (uri (git-reference - (url "https://github.com/perlpilot/Grammar-Profiler-Simple.git") + (url "https://github.com/perlpilot/Grammar-Profiler-Simple") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -315,7 +315,7 @@ (define-public perl6-json-class (origin (method git-fetch) (uri (git-reference - (url "https://github.com/jonathanstowe/JSON-Class.git") + (url "https://github.com/jonathanstowe/JSON-Class") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -347,7 +347,7 @@ (define-public perl6-json-fast (origin (method git-fetch) (uri (git-reference - (url "https://github.com/timo/json_fast.git") + (url "https://github.com/timo/json_fast") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -370,7 +370,7 @@ (define-public perl6-json-marshal (origin (method git-fetch) (uri (git-reference - (url "https://github.com/jonathanstowe/JSON-Marshal.git") + (url "https://github.com/jonathanstowe/JSON-Marshal") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -397,7 +397,7 @@ (define-public perl6-json-name (origin (method git-fetch) (uri (git-reference - (url "https://github.com/jonathanstowe/JSON-Name.git") + (url "https://github.com/jonathanstowe/JSON-Name") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -426,7 +426,7 @@ (define-public perl6-json-unmarshal (origin (method git-fetch) (uri (git-reference - (url "https://github.com/tadzik/JSON-Unmarshal.git") + (url "https://github.com/tadzik/JSON-Unmarshal") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -475,7 +475,7 @@ (define-public perl6-meta6 (origin (method git-fetch) (uri (git-reference - (url "https://github.com/jonathanstowe/META6.git") + (url "https://github.com/jonathanstowe/META6") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -612,7 +612,7 @@ (define-public perl6-tap-harness (origin (method git-fetch) (uri (git-reference - (url "https://github.com/perl6/tap-harness6.git") + (url "https://github.com/perl6/tap-harness6") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -642,7 +642,7 @@ (define-public perl6-terminal-ansicolor (origin (method git-fetch) (uri (git-reference - (url "https://github.com/tadzik/Terminal-ANSIColor.git") + (url "https://github.com/tadzik/Terminal-ANSIColor") ;; The commit where 0.5 was "tagged" (commit "edded4a7116ce11cbc9fb5a83669c7ba119d0212"))) (file-name (git-file-name name version)) @@ -715,7 +715,7 @@ (define-public perl6-uri (origin (method git-fetch) (uri (git-reference - (url "https://github.com/perl6-community-modules/uri.git") + (url "https://github.com/perl6-community-modules/uri") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -763,7 +763,7 @@ (define-public perl6-zef (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ugexe/zef.git") + (url "https://github.com/ugexe/zef") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/phabricator.scm b/gnu/packages/phabricator.scm index 6c94a13114..e4a4f79942 100644 --- a/gnu/packages/phabricator.scm +++ b/gnu/packages/phabricator.scm @@ -33,7 +33,7 @@ (define-public libphutil (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/phacility/libphutil.git") + (url "https://github.com/phacility/libphutil") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -72,7 +72,7 @@ (define-public arcanist (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/phacility/arcanist.git") + (url "https://github.com/phacility/arcanist") (commit commit))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/popt.scm b/gnu/packages/popt.scm index 95a9ea9211..df80f12077 100644 --- a/gnu/packages/popt.scm +++ b/gnu/packages/popt.scm @@ -107,7 +107,7 @@ (define-public gflags (origin (method git-fetch) (uri (git-reference - (url "https://github.com/gflags/gflags.git") + (url "https://github.com/gflags/gflags") (commit (string-append "v" version)))) (sha256 (base32 "147i3md3nxkjlrccqg4mq1kyzc7yrhvqv5902iibc7znkvzdvlp0")) diff --git a/gnu/packages/printers.scm b/gnu/packages/printers.scm index 7b2c2429dd..bbf98ee653 100644 --- a/gnu/packages/printers.scm +++ b/gnu/packages/printers.scm @@ -42,7 +42,7 @@ (define-public robocut (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Timmmm/robocut.git") + (url "https://github.com/Timmmm/robocut") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -81,7 +81,7 @@ (define-public brlaser (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/pdewacht/brlaser.git") + (url "https://github.com/pdewacht/brlaser") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/prolog.scm b/gnu/packages/prolog.scm index bf992f6bd6..3c96576ba9 100644 --- a/gnu/packages/prolog.scm +++ b/gnu/packages/prolog.scm @@ -90,7 +90,7 @@ (define-public swi-prolog (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/SWI-Prolog/swipl-devel.git") + (url "https://github.com/SWI-Prolog/swipl-devel") (recursive? #t) ; TODO: Determine if this can be split out. (commit (string-append "V" version)))) (file-name (git-file-name name version)) diff --git a/gnu/packages/protobuf.scm b/gnu/packages/protobuf.scm index 556bca6042..49abb21358 100644 --- a/gnu/packages/protobuf.scm +++ b/gnu/packages/protobuf.scm @@ -188,7 +188,7 @@ (define-public protozero (origin (method git-fetch) (uri (git-reference - (url "https://github.com/mapbox/protozero.git") + (url "https://github.com/mapbox/protozero") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -265,7 +265,7 @@ (define-public ruby-protobuf (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ruby-protobuf/protobuf.git") + (url "https://github.com/ruby-protobuf/protobuf") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index b4a8d981a2..58c7e5bd7d 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -354,7 +354,7 @@ (define-public pulseaudio-dlna (origin (method git-fetch) (uri (git-reference - (url "https://github.com/masmu/pulseaudio-dlna.git") + (url "https://github.com/masmu/pulseaudio-dlna") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -403,7 +403,7 @@ (define-public pamixer (origin (method git-fetch) (uri (git-reference - (url "https://github.com/cdemoulins/pamixer.git") + (url "https://github.com/cdemoulins/pamixer") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -438,7 +438,7 @@ (define-public pasystray (origin (method git-fetch) (uri (git-reference - (url "https://github.com/christophgysin/pasystray.git") + (url "https://github.com/christophgysin/pasystray") (commit (string-append name "-" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 5c9c251c01..aed7dfc943 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -719,7 +719,7 @@ (define-public python-asn1crypto (origin (method git-fetch) (uri (git-reference - (url "https://github.com/wbond/asn1crypto.git") + (url "https://github.com/wbond/asn1crypto") (commit version))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index c3016c8d95..6f78adb254 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2532,7 +2532,7 @@ (define-public python-flask-login (origin (method git-fetch) (uri (git-reference - (url "https://github.com/maxcountryman/flask-login.git") + (url "https://github.com/maxcountryman/flask-login") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -2764,7 +2764,7 @@ (define-public python-genshi (origin (method git-fetch) (uri (git-reference - (url "https://github.com/edgewall/genshi.git") + (url "https://github.com/edgewall/genshi") (commit version))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 074ea394e1..109a14b0ae 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1309,7 +1309,7 @@ (define-public python-cantools ;; not included with the PyPI archive. (method git-fetch) (uri (git-reference - (url "https://github.com/eerimoq/cantools.git") + (url "https://github.com/eerimoq/cantools") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -2049,7 +2049,7 @@ (define-public scons (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/SCons/scons.git") + (url "https://github.com/SCons/scons") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -2401,7 +2401,7 @@ (define-public python-cli-helpers ;; There's no source tarball on PyPI. (method git-fetch) (uri (git-reference - (url "https://github.com/dbcli/cli_helpers.git") + (url "https://github.com/dbcli/cli_helpers") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -3428,7 +3428,7 @@ (define-public python-deprecated (origin (method git-fetch) (uri (git-reference - (url "https://github.com/tantale/deprecated.git") + (url "https://github.com/tantale/deprecated") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -3464,7 +3464,7 @@ (define-public python-pygithub (origin (method git-fetch) (uri (git-reference - (url "https://github.com/PyGithub/PyGithub.git") + (url "https://github.com/PyGithub/PyGithub") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -3531,7 +3531,7 @@ (define-public python-robotframework (origin (method git-fetch) (uri (git-reference - (url "https://github.com/robotframework/robotframework.git") + (url "https://github.com/robotframework/robotframework") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -3580,7 +3580,7 @@ (define-public python-robotframework-lint (origin (method git-fetch) (uri (git-reference - (url "https://github.com/boakley/robotframework-lint.git") + (url "https://github.com/boakley/robotframework-lint") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -3611,7 +3611,7 @@ (define-public python-robotframework-sshlibrary (origin (method git-fetch) (uri (git-reference - (url "https://github.com/robotframework/SSHLibrary.git") + (url "https://github.com/robotframework/SSHLibrary") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -4016,7 +4016,7 @@ (define-public mallard-ducktype ;; git-reference because tests are not included in pypi source tarball ;; https://issues.guix.gnu.org/issue/36755#2 (uri (git-reference - (url "https://github.com/projectmallard/mallard-ducktype.git") + (url "https://github.com/projectmallard/mallard-ducktype") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -4422,7 +4422,7 @@ (define-public python-numpy-documentation ,(origin ; The build script expects scipy-sphinx-theme as a git submodule (method git-fetch) (uri (git-reference - (url "https://github.com/scipy/scipy-sphinx-theme.git") + (url "https://github.com/scipy/scipy-sphinx-theme") (commit "c466764e2231ba132c09826b5b138fffa1cfcec3"))) (sha256 (base32 @@ -4669,7 +4669,7 @@ (define-public python-colorspacious (origin (method git-fetch) (uri (git-reference - (url "https://github.com/njsmith/colorspacious.git") + (url "https://github.com/njsmith/colorspacious") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -5063,7 +5063,7 @@ (define-public python-socksipychain (origin (method git-fetch) (uri (git-reference - (url "https://github.com/pagekite/PySocksipyChain.git") + (url "https://github.com/pagekite/PySocksipyChain") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -5286,7 +5286,7 @@ (define-public python2-elib.intl ;; source from a (semi-arbitrary, i.e. latest as of now) git commit. (method git-fetch) (uri (git-reference - (url "https://github.com/dieterv/elib.intl.git") + (url "https://github.com/dieterv/elib.intl") (commit "d09997cfef"))) (file-name (string-append name "-" version "-checkout")) (sha256 @@ -5850,7 +5850,7 @@ (define-public python-gridmap (origin (method git-fetch) (uri (git-reference - (url "https://github.com/pygridtools/gridmap.git") + (url "https://github.com/pygridtools/gridmap") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -5881,7 +5881,7 @@ (define-public python-honcho (origin (method git-fetch) (uri (git-reference - (url "https://github.com/nickstenning/honcho.git") + (url "https://github.com/nickstenning/honcho") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -7468,7 +7468,7 @@ (define-public python-xlib (origin (method git-fetch) (uri (git-reference - (url "https://github.com/python-xlib/python-xlib.git") + (url "https://github.com/python-xlib/python-xlib") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -8801,7 +8801,7 @@ (define-public python-tlsh (origin (method git-fetch) (uri (git-reference - (url "https://github.com/trendmicro/tlsh.git") + (url "https://github.com/trendmicro/tlsh") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -12893,7 +12893,7 @@ (define-public python-schematics (origin (method git-fetch) (uri (git-reference - (url "https://github.com/schematics/schematics.git") + (url "https://github.com/schematics/schematics") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -15284,7 +15284,7 @@ (define-public python-flasgger (origin (method git-fetch) (uri (git-reference - (url "https://github.com/rochacbruno/flasgger.git") + (url "https://github.com/rochacbruno/flasgger") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -15817,7 +15817,7 @@ (define-public python-dukpy (origin (method git-fetch) (uri (git-reference - (url "https://github.com/kovidgoyal/dukpy.git") + (url "https://github.com/kovidgoyal/dukpy") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -16284,7 +16284,7 @@ (define-public python-send2trash (origin (method git-fetch) ;; Source tarball on PyPI doesn't include tests. (uri (git-reference - (url "https://github.com/hsoft/send2trash.git") + (url "https://github.com/hsoft/send2trash") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -16413,7 +16413,7 @@ (define-public python-funcy (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Suor/funcy.git") + (url "https://github.com/Suor/funcy") (commit version))) (sha256 (base32 "1s98vkjnq3zq71737hn8xa15kssvmy1sfzsll3vrlv53902418mw")) @@ -16532,7 +16532,7 @@ (define-public python-typed-ast (origin (method git-fetch) (uri (git-reference - (url "https://github.com/python/typed_ast.git") + (url "https://github.com/python/typed_ast") (commit version))) (sha256 (base32 "0l0hz809f7i356kmqkvfsaswiidb98j9hs9rrjnfawzqcbffzgyb")) @@ -16973,7 +16973,7 @@ (define-public python-glob2 (origin (method git-fetch) (uri (git-reference - (url "https://github.com/miracle2k/python-glob2.git") + (url "https://github.com/miracle2k/python-glob2") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -17163,7 +17163,7 @@ (define-public pybind11 (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/pybind/pybind11.git") + (url "https://github.com/pybind/pybind11") (commit (string-append "v" version)))) (sha256 (base32 @@ -18061,7 +18061,7 @@ (define-public python-retrying (origin (method git-fetch) (uri (git-reference - (url "https://github.com/rholder/retrying.git") + (url "https://github.com/rholder/retrying") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -18858,7 +18858,7 @@ (define-public python-iocapture (origin (method git-fetch) (uri (git-reference - (url "https://github.com/oinume/iocapture.git") + (url "https://github.com/oinume/iocapture") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -18898,7 +18898,7 @@ (define-public python-argh (origin (method git-fetch) (uri (git-reference - (url "https://github.com/neithere/argh.git") + (url "https://github.com/neithere/argh") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -19788,7 +19788,7 @@ (define-public python-json5 ;; sample.json5 is missing from PyPi source tarball (method git-fetch) (uri (git-reference - (url "https://github.com/dpranke/pyjson5.git") + (url "https://github.com/dpranke/pyjson5") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -19830,7 +19830,7 @@ (define-public python-unpaddedbase64 (origin (method git-fetch) (uri (git-reference - (url "https://github.com/matrix-org/python-unpaddedbase64.git") + (url "https://github.com/matrix-org/python-unpaddedbase64") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 4d95563403..7e9036c4b4 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -106,7 +106,7 @@ (define-public grantlee (origin (method git-fetch) (uri (git-reference - (url "https://github.com/steveire/grantlee.git") + (url "https://github.com/steveire/grantlee") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 890c6f63fd..812aa310c4 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -82,7 +82,7 @@ (define-public liquid-dsp (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/jgaeddert/liquid-dsp.git") + (url "https://github.com/jgaeddert/liquid-dsp") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -548,7 +548,7 @@ (define-public gqrx (origin (method git-fetch) (uri (git-reference - (url "https://github.com/csete/gqrx.git") + (url "https://github.com/csete/gqrx") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -712,7 +712,7 @@ (define-public hackrf (origin (method git-fetch) (uri (git-reference - (url "https://github.com/mossmann/hackrf.git") + (url "https://github.com/mossmann/hackrf") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -1025,7 +1025,7 @@ (define-public dump1090 (origin (method git-fetch) (uri (git-reference - (url "https://github.com/flightaware/dump1090.git") + (url "https://github.com/flightaware/dump1090") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -1067,7 +1067,7 @@ (define-public rtl-433 (origin (method git-fetch) (uri (git-reference - (url "https://github.com/merbanan/rtl_433.git") + (url "https://github.com/merbanan/rtl_433") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -1093,7 +1093,7 @@ (define-public multimon-ng (origin (method git-fetch) (uri (git-reference - (url "https://github.com/EliasOenal/multimon-ng.git") + (url "https://github.com/EliasOenal/multimon-ng") (commit version))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/rails.scm b/gnu/packages/rails.scm index 2fc7f0a113..42cc240f1c 100644 --- a/gnu/packages/rails.scm +++ b/gnu/packages/rails.scm @@ -290,7 +290,7 @@ (define-public ruby-rails-dom-testing (origin (method git-fetch) (uri (git-reference - (url "https://github.com/rails/rails-dom-testing.git") + (url "https://github.com/rails/rails-dom-testing") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -533,7 +533,7 @@ (define-public ruby-web-console ;; Download from GitHub as test files are not provided in the gem. (method git-fetch) (uri (git-reference - (url "https://github.com/rails/web-console.git") + (url "https://github.com/rails/web-console") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/rdf.scm b/gnu/packages/rdf.scm index 999c1e10f0..3471cb604a 100644 --- a/gnu/packages/rdf.scm +++ b/gnu/packages/rdf.scm @@ -160,7 +160,7 @@ (define-public lrdf (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/swh/LRDF.git") + (url "https://github.com/swh/LRDF") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/rednotebook.scm b/gnu/packages/rednotebook.scm index e5b1b2c7bf..c7ece525e9 100644 --- a/gnu/packages/rednotebook.scm +++ b/gnu/packages/rednotebook.scm @@ -35,7 +35,7 @@ (define-public rednotebook (origin (method git-fetch) (uri (git-reference - (url "https://github.com/jendrikseipp/rednotebook.git") + (url "https://github.com/jendrikseipp/rednotebook") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/rpc.scm b/gnu/packages/rpc.scm index de7d08ae4d..e26170942b 100644 --- a/gnu/packages/rpc.scm +++ b/gnu/packages/rpc.scm @@ -48,7 +48,7 @@ (define-public grpc (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/grpc/grpc.git") + (url "https://github.com/grpc/grpc") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -124,7 +124,7 @@ (define-public grpc-1.16.1 (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/grpc/grpc.git") + (url "https://github.com/grpc/grpc") (commit (string-append "v" version)))) (file-name (git-file-name "grpc" version)) (sha256 @@ -207,7 +207,7 @@ (define-public apache-thrift (origin (method git-fetch) (uri (git-reference - (url "https://github.com/apache/thrift.git") + (url "https://github.com/apache/thrift") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/rsync.scm b/gnu/packages/rsync.scm index 0d8217ee20..214095aa61 100644 --- a/gnu/packages/rsync.scm +++ b/gnu/packages/rsync.scm @@ -74,7 +74,7 @@ (define-public librsync (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/librsync/librsync.git") + (url "https://github.com/librsync/librsync") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 1ade88a624..8f48c3eba8 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -224,7 +224,7 @@ (define-public mruby (origin (method git-fetch) (uri (git-reference - (url "https://github.com/mruby/mruby.git") + (url "https://github.com/mruby/mruby") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -632,7 +632,7 @@ (define-public ruby-rspec-its (origin (method git-fetch) (uri (git-reference - (url "https://github.com/rspec/rspec-its.git") + (url "https://github.com/rspec/rspec-its") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -993,7 +993,7 @@ (define-public ruby-pandoc-ruby (origin (method git-fetch) ;the gem lacks many test files (uri (git-reference - (url "https://github.com/xwmx/pandoc-ruby.git") + (url "https://github.com/xwmx/pandoc-ruby") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -1102,7 +1102,7 @@ (define-public ruby-asciidoctor (origin (method git-fetch) ;the gem release lacks a Rakefile (uri (git-reference - (url "https://github.com/asciidoctor/asciidoctor.git") + (url "https://github.com/asciidoctor/asciidoctor") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -1206,7 +1206,7 @@ (define-public ruby-sporkmonger-rack-mount (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/sporkmonger/rack-mount.git") + (url "https://github.com/sporkmonger/rack-mount") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -1662,7 +1662,7 @@ (define-public ruby-execjs ;; fetch from github as the gem does not contain testing code (method git-fetch) (uri (git-reference - (url "https://github.com/rails/execjs.git") + (url "https://github.com/rails/execjs") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -2195,7 +2195,7 @@ (define-public ruby-fuubar ;; the tests. (method git-fetch) (uri (git-reference - (url "https://github.com/thekompanee/fuubar.git") + (url "https://github.com/thekompanee/fuubar") (commit (string-append "releases/v" version)))) (file-name (git-file-name name version)) (sha256 @@ -3108,7 +3108,7 @@ (define-public ruby-mysql2 (origin (method git-fetch) (uri (git-reference - (url "https://github.com/brianmario/mysql2.git") + (url "https://github.com/brianmario/mysql2") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -3533,7 +3533,7 @@ (define-public ruby-net-scp (origin (method git-fetch) (uri (git-reference - (url "https://github.com/net-ssh/net-scp.git") + (url "https://github.com/net-ssh/net-scp") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -3705,7 +3705,7 @@ (define-public ruby-minitest-pretty-diff (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/adammck/minitest-pretty_diff.git") + (url "https://github.com/adammck/minitest-pretty_diff") (commit commit))) (file-name (string-append name "-" version "-checkout")) (sha256 @@ -4215,7 +4215,7 @@ (define-public ruby-minitar (origin (method git-fetch) (uri (git-reference - (url "https://github.com/halostatue/minitar.git") + (url "https://github.com/halostatue/minitar") (commit commit))) (file-name (string-append name "-" version "-checkout")) (sha256 @@ -4790,7 +4790,7 @@ (define-public ruby-tilt (origin (method git-fetch) ;the distributed gem lacks tests (uri (git-reference - (url "https://github.com/rtomayko/tilt.git") + (url "https://github.com/rtomayko/tilt") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -5378,7 +5378,7 @@ (define-public ruby-listen ;; repository. (method git-fetch) (uri (git-reference - (url "https://github.com/guard/listen.git") + (url "https://github.com/guard/listen") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -5518,7 +5518,7 @@ (define-public ruby-nokogumbo ;; published gem and the tarball on Github is outdated. (method git-fetch) (uri (git-reference - (url "https://github.com/rubys/nokogumbo.git") + (url "https://github.com/rubys/nokogumbo") (commit (string-append "v" version)))) (file-name (string-append name "-" version "-checkout")) (sha256 @@ -5720,7 +5720,7 @@ (define-public ruby-byebug-11 (origin (method git-fetch) (uri (git-reference - (url "https://github.com/deivid-rodriguez/byebug.git") + (url "https://github.com/deivid-rodriguez/byebug") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -5836,7 +5836,7 @@ (define-public ruby-tdiff (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/postmodern/tdiff.git") + (url "https://github.com/postmodern/tdiff") (commit commit))) (file-name (string-append name "-" version "-checkout")) (sha256 @@ -5863,7 +5863,7 @@ (define-public ruby-nokogiri-diff (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/postmodern/nokogiri-diff.git") + (url "https://github.com/postmodern/nokogiri-diff") (commit commit))) (file-name (string-append name "-" version "-checkout")) (sha256 @@ -6409,7 +6409,7 @@ (define-public ruby-pry-byebug (origin (method git-fetch) (uri (git-reference - (url "https://github.com/deivid-rodriguez/pry-byebug.git") + (url "https://github.com/deivid-rodriguez/pry-byebug") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -6564,7 +6564,7 @@ (define-public ruby-cucumber-messages (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/cucumber/messages-ruby.git") + (url "https://github.com/cucumber/messages-ruby") (commit "12cd07eac87bce7843fd1bb0bf64bc4da09f097c"))) (file-name (git-file-name name version)) (sha256 @@ -6822,7 +6822,7 @@ (define-public ruby-cucumber (origin (method git-fetch) (uri (git-reference - (url "https://github.com/cucumber/cucumber-ruby.git") + (url "https://github.com/cucumber/cucumber-ruby") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -6937,7 +6937,7 @@ (define-public ruby-cucumber-core (origin (method git-fetch) (uri (git-reference - (url "https://github.com/cucumber/cucumber-ruby-core.git") + (url "https://github.com/cucumber/cucumber-ruby-core") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -6981,7 +6981,7 @@ (define-public ruby-cucumber-expressions (origin (method git-fetch) (uri (git-reference - (url "https://github.com/cucumber/cucumber-expressions-ruby.git") + (url "https://github.com/cucumber/cucumber-expressions-ruby") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -7039,7 +7039,7 @@ (define-public ruby-cucumber-tag-expressions (origin (method git-fetch) (uri (git-reference - (url "https://github.com/cucumber/tag-expressions-ruby.git") + (url "https://github.com/cucumber/tag-expressions-ruby") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -9155,7 +9155,7 @@ (define-public ruby-rdoc (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ruby/rdoc.git") + (url "https://github.com/ruby/rdoc") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -9270,7 +9270,7 @@ (define-public ruby-sass-spec (origin (method git-fetch) (uri (git-reference - (url "https://github.com/sass/sass-spec.git") + (url "https://github.com/sass/sass-spec") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -9457,7 +9457,7 @@ (define-public ruby-parallel (origin (method git-fetch) (uri (git-reference - (url "https://github.com/grosser/parallel.git") + (url "https://github.com/grosser/parallel") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -9870,7 +9870,7 @@ (define-public ruby-safe-yaml (origin (method git-fetch) (uri (git-reference - (url "https://github.com/dtao/safe_yaml.git") + (url "https://github.com/dtao/safe_yaml") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -10395,7 +10395,7 @@ (define-public ruby-backport ;; The gem does not include test code, so fetch from the Git repository. (method git-fetch) (uri (git-reference - (url "https://github.com/castwide/backport.git") + (url "https://github.com/castwide/backport") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 6fc0fd4f52..851a996e4b 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -122,7 +122,7 @@ (define-public mrustc (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/thepowersgang/mrustc.git") + (url "https://github.com/thepowersgang/mrustc") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index 4551e57d4a..a34d704867 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -890,7 +890,7 @@ (define-public stalin ;; (method git-fetch) (uri (git-reference - (url "https://github.com/barak/stalin.git") + (url "https://github.com/barak/stalin") (commit commit))) (file-name (string-append name "-" version "-checkout")) (sha256 @@ -962,7 +962,7 @@ (define-public femtolisp (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/JeffBezanson/femtolisp.git") + (url "https://github.com/JeffBezanson/femtolisp") (commit commit))) (file-name (string-append name "-" version "-checkout")) (sha256 diff --git a/gnu/packages/screen.scm b/gnu/packages/screen.scm index af519de0a3..0491731e20 100644 --- a/gnu/packages/screen.scm +++ b/gnu/packages/screen.scm @@ -159,7 +159,7 @@ (define-public reptyr (origin (method git-fetch) (uri (git-reference - (url "https://github.com/nelhage/reptyr.git") + (url "https://github.com/nelhage/reptyr") (commit (string-append "reptyr-" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index 8f9f2ed2a4..a2054ce3e7 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -485,7 +485,7 @@ (define-public libu2f-server (method git-fetch) (uri (git-reference - (url "https://github.com/Yubico/libu2f-server.git") + (url "https://github.com/Yubico/libu2f-server") (commit (string-append "libu2f-server-" version)))) (file-name (git-file-name name version)) (sha256 @@ -528,7 +528,7 @@ (define-public pam-u2f (method git-fetch) (uri (git-reference - (url "https://github.com/Yubico/pam-u2f.git") + (url "https://github.com/Yubico/pam-u2f") (commit (string-append "pam_u2f-" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/selinux.scm b/gnu/packages/selinux.scm index 1502d167c4..558a64a13b 100644 --- a/gnu/packages/selinux.scm +++ b/gnu/packages/selinux.scm @@ -52,7 +52,7 @@ (define-public libsepol (origin (method git-fetch) (uri (git-reference - (url "https://github.com/SELinuxProject/selinux.git") + (url "https://github.com/SELinuxProject/selinux") (commit release))) (file-name (string-append "selinux-" release "-checkout")) (sha256 @@ -327,7 +327,7 @@ (define-public python-setools (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/TresysTechnology/setools.git") + (url "https://github.com/TresysTechnology/setools") (commit version))) (file-name (string-append name "-" version "-checkout")) (sha256 diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index be81715116..fc0102caf0 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -60,7 +60,7 @@ (define-public cereal (origin (method git-fetch) (uri (git-reference - (url "https://github.com/USCiLab/cereal.git") + (url "https://github.com/USCiLab/cereal") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -145,7 +145,7 @@ (define-public libmpack (origin (method git-fetch) (uri (git-reference - (url "https://github.com/tarruda/libmpack.git") + (url "https://github.com/tarruda/libmpack") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -175,7 +175,7 @@ (define-public lua-libmpack (origin (method git-fetch) (uri (git-reference - (url "https://github.com/libmpack/libmpack-lua.git") + (url "https://github.com/libmpack/libmpack-lua") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -267,7 +267,7 @@ (define-public yaml-cpp (origin (method git-fetch) (uri (git-reference - (url "https://github.com/jbeder/yaml-cpp.git") + (url "https://github.com/jbeder/yaml-cpp") (commit (string-append "yaml-cpp-" version)))) (file-name (git-file-name name version)) (sha256 @@ -321,7 +321,7 @@ (define-public jsoncpp-for-tensorflow (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/open-source-parsers/jsoncpp.git") + (url "https://github.com/open-source-parsers/jsoncpp") (commit version))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 6e5db439fd..1ebdfce768 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -253,7 +253,7 @@ (define-public fish-foreign-env (origin (method git-fetch) (uri (git-reference - (url "https://github.com/oh-my-fish/plugin-foreign-env.git") + (url "https://github.com/oh-my-fish/plugin-foreign-env") (commit "dddd9213272a0ab848d474d0cbde12ad034e65bc"))) (file-name (git-file-name name version)) (sha256 @@ -300,7 +300,7 @@ (define-public rc (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/rakitzis/rc.git") + (url "https://github.com/rakitzis/rc") (commit (string-append "v" version)))) (sha256 (base32 @@ -744,7 +744,7 @@ (define-public loksh (origin (method git-fetch) (uri (git-reference - (url "https://github.com/dimkr/loksh.git") + (url "https://github.com/dimkr/loksh") (commit version))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm index 29e288a402..b1db32a3dc 100644 --- a/gnu/packages/shellutils.scm +++ b/gnu/packages/shellutils.scm @@ -50,7 +50,7 @@ (define-public zsh-autosuggestions (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/zsh-users/zsh-autosuggestions.git") + (url "https://github.com/zsh-users/zsh-autosuggestions") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -96,7 +96,7 @@ (define-public sh-z (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/rupa/z.git") + (url "https://github.com/rupa/z") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -194,7 +194,7 @@ (define-public direnv (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/direnv/direnv.git") + (url "https://github.com/direnv/direnv") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -248,7 +248,7 @@ (define-public fzy (origin (method git-fetch) (uri (git-reference - (url "https://github.com/jhawthorn/fzy.git") + (url "https://github.com/jhawthorn/fzy") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -282,7 +282,7 @@ (define-public hstr (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/dvorka/hstr.git") + (url "https://github.com/dvorka/hstr") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -325,7 +325,7 @@ (define-public shell-functools (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/sharkdp/shell-functools.git") + (url "https://github.com/sharkdp/shell-functools") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/simh.scm b/gnu/packages/simh.scm index bbca246bc1..b911b30b00 100644 --- a/gnu/packages/simh.scm +++ b/gnu/packages/simh.scm @@ -33,7 +33,7 @@ (define-public simh (origin (method git-fetch) (uri (git-reference - (url "https://github.com/simh/simh.git") + (url "https://github.com/simh/simh") (commit (string-append "v" version)))) (sha256 (base32 "1jiq6shj6a9xvzacvmyhxxd6xdyica8q4006qqjh5mh96rxrp15c")) diff --git a/gnu/packages/sml.scm b/gnu/packages/sml.scm index d441dcf638..216272517b 100644 --- a/gnu/packages/sml.scm +++ b/gnu/packages/sml.scm @@ -37,7 +37,7 @@ (define-public polyml (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/polyml/polyml.git") + (url "https://github.com/polyml/polyml") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index aaa552bfd6..9ae3d94194 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -78,7 +78,7 @@ (define-public hss (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/six-ddc/hss.git") + (url "https://github.com/six-ddc/hss") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -495,7 +495,7 @@ (define-public et (origin (method git-fetch) (uri (git-reference - (url "https://github.com/MisterTea/EternalTCP.git") + (url "https://github.com/MisterTea/EternalTCP") (commit (string-append "et-v" version)))) (file-name (git-file-name name version)) (sha256 @@ -828,7 +828,7 @@ (define-public endlessh (origin (method git-fetch) (uri (git-reference - (url "https://github.com/skeeto/endlessh.git") + (url "https://github.com/skeeto/endlessh") (commit version))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 8633d1117b..7cbb6bf51e 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5630,7 +5630,7 @@ (define-public r-catterplots (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Gibbsdavidl/CatterPlots.git") + (url "https://github.com/Gibbsdavidl/CatterPlots") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -5653,7 +5653,7 @@ (define-public r-colorout (origin (method git-fetch) (uri (git-reference - (url "https://github.com/jalvesaq/colorout.git") + (url "https://github.com/jalvesaq/colorout") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/stenography.scm b/gnu/packages/stenography.scm index f0193da25f..c462deacfa 100644 --- a/gnu/packages/stenography.scm +++ b/gnu/packages/stenography.scm @@ -36,7 +36,7 @@ (define-public plover (origin (method git-fetch) (uri (git-reference - (url "https://github.com/openstenoproject/plover.git") + (url "https://github.com/openstenoproject/plover") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index 372cea81c1..9f1c5e349f 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -64,7 +64,7 @@ (define-public megacmd (origin (method git-fetch) (uri (git-reference - (url "https://github.com/meganz/MEGAcmd.git") + (url "https://github.com/meganz/MEGAcmd") (commit (string-append version "_Linux")) (recursive? #t))) (sha256 @@ -266,7 +266,7 @@ (define-public lsyncd (origin (method git-fetch) (uri (git-reference - (url "https://github.com/axkibe/lsyncd.git") + (url "https://github.com/axkibe/lsyncd") (commit (string-append "release-" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index dfc222057e..e6a8ab4d31 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -663,7 +663,7 @@ (define-public go-github-com-chmduquesne-rollinghash (origin (method git-fetch) (uri (git-reference - (url "https://github.com/chmduquesne/rollinghash.git") + (url "https://github.com/chmduquesne/rollinghash") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -687,7 +687,7 @@ (define-public go-github-com-petermattis-goid (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/petermattis/goid.git") + (url "https://github.com/petermattis/goid") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -711,7 +711,7 @@ (define-public go-github-com-kballard-go-shellquote (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/kballard/go-shellquote.git") + (url "https://github.com/kballard/go-shellquote") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -761,7 +761,7 @@ (define-public go-github-com-beorn7-perks-quantile (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/beorn7/perks.git") + (url "https://github.com/beorn7/perks") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -787,7 +787,7 @@ (define-public go-github-com-prometheus-client-model (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/prometheus/client_model.git") + (url "https://github.com/prometheus/client_model") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -820,7 +820,7 @@ (define-public go-github-com-matttproud-golang-protobuf-extensions-pbutil (method git-fetch) (uri (git-reference - (url "https://github.com/matttproud/golang_protobuf_extensions.git") + (url "https://github.com/matttproud/golang_protobuf_extensions") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -847,7 +847,7 @@ (define-public go-github-com-prometheus-common (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/prometheus/common.git") + (url "https://github.com/prometheus/common") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -890,7 +890,7 @@ (define-public go-github-com-prometheus-procfs (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/prometheus/procfs.git") + (url "https://github.com/prometheus/procfs") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -915,7 +915,7 @@ (define-public go-github-com-prometheus-client-golang (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/prometheus/client_golang.git") + (url "https://github.com/prometheus/client_golang") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -1002,7 +1002,7 @@ (define-public go-github-com-flynn-archive-go-shlex (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/flynn-archive/go-shlex.git") + (url "https://github.com/flynn-archive/go-shlex") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -1025,7 +1025,7 @@ (define-public go-github-com-audriusbutkevicius-pfilter (origin (method git-fetch) (uri (git-reference - (url "https://github.com/AudriusButkevicius/pfilter.git") + (url "https://github.com/AudriusButkevicius/pfilter") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -1050,7 +1050,7 @@ (define-public go-github-com-ccding-go-stun (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ccding/go-stun.git") + (url "https://github.com/ccding/go-stun") (commit commit))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/synergy.scm b/gnu/packages/synergy.scm index 4db15527d7..1f8f8f351e 100644 --- a/gnu/packages/synergy.scm +++ b/gnu/packages/synergy.scm @@ -42,7 +42,7 @@ (define-public synergy (origin (method git-fetch) (uri (git-reference - (url "https://github.com/symless/synergy-core.git") + (url "https://github.com/symless/synergy-core") (commit (string-append "v" version "-stable")))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 542d36a841..4c5e4d5d78 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -102,7 +102,7 @@ (define-public libilbc (method git-fetch) (uri (git-reference - (url "https://github.com/TimothyGu/libilbc.git") + (url "https://github.com/TimothyGu/libilbc") (commit (string-append "v" version)))) (file-name @@ -297,7 +297,7 @@ (define-public zrtpcpp (method git-fetch) (uri (git-reference - (url "https://github.com/wernerd/ZRTPCPP.git") + (url "https://github.com/wernerd/ZRTPCPP") (commit (string-append "V" version)))) (file-name @@ -727,7 +727,7 @@ (define-public pjproject (origin (method git-fetch) (uri (git-reference - (url "https://github.com/pjsip/pjproject.git") + (url "https://github.com/pjsip/pjproject") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -813,7 +813,7 @@ (define-public libtgvoip (origin (method git-fetch) (uri (git-reference - (url "https://github.com/grishka/libtgvoip.git") + (url "https://github.com/grishka/libtgvoip") (commit version))) (file-name (git-file-name name version)) ;; Fix compilation on i686-linux architecture. diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 81ce223385..2ece7e7fde 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -94,7 +94,7 @@ (define-public tilda (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/lanoxx/tilda.git") + (url "https://github.com/lanoxx/tilda") (commit (string-append "tilda-" version)))) (file-name (git-file-name name version)) (sha256 @@ -365,7 +365,7 @@ (define-public picocom (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/npat-efault/picocom.git") + (url "https://github.com/npat-efault/picocom") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -407,7 +407,7 @@ (define-public beep ;; unmaintained for some time, and vulnerable to at least two CVEs: ;; https://github.com/johnath/beep/issues/11#issuecomment-454056858 ;; Use this maintained fork instead. - (url "https://github.com/spkr-beep/beep.git") + (url "https://github.com/spkr-beep/beep") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -438,7 +438,7 @@ (define-public unibilium (origin (method git-fetch) (uri (git-reference - (url "https://github.com/mauke/unibilium.git") + (url "https://github.com/mauke/unibilium") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -708,7 +708,7 @@ (define-public go-github.com-nsf-termbox-go (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/nsf/termbox-go.git") + (url "https://github.com/nsf/termbox-go") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -766,7 +766,7 @@ (define-public go-github.com-howeyc-gopass (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/howeyc/gopass.git") + (url "https://github.com/howeyc/gopass") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -902,7 +902,7 @@ (define-public tmate (origin (method git-fetch) (uri (git-reference - (url "https://github.com/tmate-io/tmate.git") + (url "https://github.com/tmate-io/tmate") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -934,7 +934,7 @@ (define-public kitty (origin (method git-fetch) (uri (git-reference - (url "https://github.com/kovidgoyal/kitty.git") + (url "https://github.com/kovidgoyal/kitty") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -1041,7 +1041,7 @@ (define-public eternalterminal (origin (method git-fetch) (uri (git-reference - (url "https://github.com/MisterTea/EternalTerminal.git") + (url "https://github.com/MisterTea/EternalTerminal") (commit (string-append "et-v" version)))) (file-name (git-file-name name version)) (sha256 @@ -1081,7 +1081,7 @@ (define-public wterm (origin (method git-fetch) (uri (git-reference - (url "https://github.com/majestrate/wterm.git") + (url "https://github.com/majestrate/wterm") (commit "0ae42717c08a85a6509214e881422c7fbe7ecc45"))) (sha256 (base32 @@ -1137,7 +1137,7 @@ (define-public alacritty (origin (method git-fetch) (uri (git-reference - (url "https://github.com/jwilm/alacritty.git") + (url "https://github.com/jwilm/alacritty") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 7b10433269..c4f9f6cfb7 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -3094,7 +3094,7 @@ (define-public texlive-luatex-luaotfload (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/lualatex/luaotfload.git") + (url "https://github.com/lualatex/luaotfload") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm index 70e050371d..dea26a6395 100644 --- a/gnu/packages/texinfo.scm +++ b/gnu/packages/texinfo.scm @@ -253,7 +253,7 @@ (define-public pinfo (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/baszoetekouw/pinfo.git") + (url "https://github.com/baszoetekouw/pinfo") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 924dc68c03..c3ee8cfdd0 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -502,7 +502,7 @@ (define-public ghostwriter (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/wereturtle/ghostwriter.git") + (url "https://github.com/wereturtle/ghostwriter") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -559,7 +559,7 @@ (define-public manuskript (origin (method git-fetch) (uri (git-reference - (url "https://github.com/olivierkes/manuskript.git") + (url "https://github.com/olivierkes/manuskript") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -661,7 +661,7 @@ (define-public editorconfig-core-c (origin (method git-fetch) (uri (git-reference - (url "https://github.com/editorconfig/editorconfig-core-c.git") + (url "https://github.com/editorconfig/editorconfig-core-c") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -903,7 +903,7 @@ (define-public ne (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/vigna/ne.git") + (url "https://github.com/vigna/ne") (commit version))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 090ac1d91c..3c765aa887 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -259,7 +259,7 @@ (define-public cityhash (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/google/cityhash.git") + (url "https://github.com/google/cityhash") (commit commit))) (file-name (string-append name "-" version ".tar.gz")) (sha256 @@ -710,7 +710,7 @@ (define-public dotconf (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/williamh/dotconf.git") + (url "https://github.com/williamh/dotconf") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -878,7 +878,7 @@ (define-public python-editdistance (origin (method git-fetch) (uri (git-reference - (url "https://github.com/aflc/editdistance.git") + (url "https://github.com/aflc/editdistance") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -1087,7 +1087,7 @@ (define-public nkf (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/nurse/nkf.git") + (url "https://github.com/nurse/nkf") (commit commit))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm index 6eefb6c525..0249334a2e 100644 --- a/gnu/packages/time.scm +++ b/gnu/packages/time.scm @@ -247,7 +247,7 @@ (define-public python-ciso8601 (method git-fetch) ;; The PyPi distribution doesn't include the tests. (uri (git-reference - (url "https://github.com/closeio/ciso8601.git") + (url "https://github.com/closeio/ciso8601") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/tmux.scm b/gnu/packages/tmux.scm index c028a885d2..c81b526999 100644 --- a/gnu/packages/tmux.scm +++ b/gnu/packages/tmux.scm @@ -74,7 +74,7 @@ (define-public tmux-themepack (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/jimeh/tmux-themepack.git") + (url "https://github.com/jimeh/tmux-themepack") (commit commit))) (sha256 (base32 @@ -104,7 +104,7 @@ (define-public tmuxifier (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/jimeh/tmuxifier.git") + (url "https://github.com/jimeh/tmuxifier") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -151,7 +151,7 @@ (define-public python-libtmux (method git-fetch) ;; PyPI source tarball does not include tests. (uri (git-reference - (url "https://github.com/tmux-python/libtmux.git") + (url "https://github.com/tmux-python/libtmux") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -196,7 +196,7 @@ (define-public python-daemux (origin (method git-fetch) (uri (git-reference - (url "https://github.com/edouardklein/daemux.git") + (url "https://github.com/edouardklein/daemux") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -231,7 +231,7 @@ (define-public tmux-xpanes (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/greymd/tmux-xpanes.git") + (url "https://github.com/greymd/tmux-xpanes") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index 24d10cc417..c852c54a5b 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -218,7 +218,7 @@ (define-public onionshare (origin (method git-fetch) (uri (git-reference - (url "https://github.com/micahflee/onionshare.git") + (url "https://github.com/micahflee/onionshare") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/toys.scm b/gnu/packages/toys.scm index f643e06974..459c0c4953 100644 --- a/gnu/packages/toys.scm +++ b/gnu/packages/toys.scm @@ -42,7 +42,7 @@ (define-public sl (origin (method git-fetch) (uri (git-reference - (url "https://github.com/mtoyoda/sl.git") + (url "https://github.com/mtoyoda/sl") (commit version))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 5151e63ee1..d2a24c7571 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -723,7 +723,7 @@ (define-public git-crypt (origin (method git-fetch) (uri (git-reference - (url "https://github.com/AGWA/git-crypt.git") + (url "https://github.com/AGWA/git-crypt") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -971,7 +971,7 @@ (define-public python-ghp-import (origin (method git-fetch) (uri (git-reference - (url "https://github.com/davisp/ghp-import.git") + (url "https://github.com/davisp/ghp-import") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -1102,7 +1102,7 @@ (define-public shflags (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/kward/shflags.git") + (url "https://github.com/kward/shflags") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -1185,7 +1185,7 @@ (define-public stgit (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ctmarinas/stgit.git") + (url "https://github.com/ctmarinas/stgit") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -1237,7 +1237,7 @@ (define-public vcsh (origin (method git-fetch) (uri (git-reference - (url "https://github.com/RichiH/vcsh.git") + (url "https://github.com/RichiH/vcsh") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -1312,7 +1312,7 @@ (define-public gitolite (origin (method git-fetch) (uri (git-reference - (url "https://github.com/sitaramc/gitolite.git") + (url "https://github.com/sitaramc/gitolite") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -2058,7 +2058,7 @@ (define-public findnewest (origin (method git-fetch) (uri (git-reference - (url "https://github.com/0-wiz-0/findnewest.git") + (url "https://github.com/0-wiz-0/findnewest") (commit (string-append "findnewest-" version)))) (file-name (git-file-name name version)) (sha256 @@ -2130,7 +2130,7 @@ (define-public git-annex-remote-rclone (origin (method git-fetch) (uri (git-reference - (url "https://github.com/DanielDent/git-annex-remote-rclone.git") + (url "https://github.com/DanielDent/git-annex-remote-rclone") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -2399,7 +2399,7 @@ (define-public git-imerge (origin (method git-fetch) (uri (git-reference - (url "https://github.com/mhagger/git-imerge.git") + (url "https://github.com/mhagger/git-imerge") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 9d156d7012..e188b37f14 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1170,7 +1170,7 @@ (define-public ffmpeg-for-stepmania (origin (method git-fetch) (uri (git-reference - (url "https://github.com/stepmania/ffmpeg.git") + (url "https://github.com/stepmania/ffmpeg") (commit "eda6effcabcf9c238e4635eb058d72371336e09b"))) (sha256 (base32 "1by8rmbva8mfrivdbbkr2gx4kga89zqygkd4cfjl76nr8mdcdamb")) @@ -1196,7 +1196,7 @@ (define-public ffmpegthumbnailer (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/dirkvdb/ffmpegthumbnailer.git") + (url "https://github.com/dirkvdb/ffmpegthumbnailer") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -1469,7 +1469,7 @@ (define-public mpv (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/mpv-player/mpv.git") + (url "https://github.com/mpv-player/mpv") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -1798,7 +1798,7 @@ (define-public you-get (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/soimort/you-get.git") + (url "https://github.com/soimort/you-get") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -1837,7 +1837,7 @@ (define-public youtube-viewer (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/trizen/youtube-viewer.git") + (url "https://github.com/trizen/youtube-viewer") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -2221,7 +2221,7 @@ (define-public vapoursynth (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/vapoursynth/vapoursynth.git") + (url "https://github.com/vapoursynth/vapoursynth") (commit (string-append "R" version)))) (file-name (git-file-name name version)) (sha256 @@ -2326,7 +2326,7 @@ (define-public twitchy (origin (method git-fetch) (uri (git-reference - (url "https://github.com/BasioMeusPuga/twitchy.git") + (url "https://github.com/BasioMeusPuga/twitchy") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -2369,7 +2369,7 @@ (define-public mlt (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/mltframework/mlt.git") + (url "https://github.com/mltframework/mlt") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -2462,7 +2462,7 @@ (define-public obs (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/obsproject/obs-studio.git") + (url "https://github.com/obsproject/obs-studio") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -2631,7 +2631,7 @@ (define-public simplescreenrecorder (origin (method git-fetch) (uri (git-reference - (url "https://github.com/MaartenBaert/ssr.git") + (url "https://github.com/MaartenBaert/ssr") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -2771,7 +2771,7 @@ (define-public mps-youtube (origin (method git-fetch) (uri (git-reference - (url "https://github.com/mps-youtube/mps-youtube.git") + (url "https://github.com/mps-youtube/mps-youtube") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -3226,7 +3226,7 @@ (define-public ffms2 (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/FFMS/ffms2.git") + (url "https://github.com/FFMS/ffms2") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -3328,7 +3328,7 @@ (define-public gst-transcoder (origin (method git-fetch) (uri (git-reference - (url "https://github.com/pitivi/gst-transcoder.git") + (url "https://github.com/pitivi/gst-transcoder") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -3442,7 +3442,7 @@ (define-public motion (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Motion-Project/motion.git") + (url "https://github.com/Motion-Project/motion") (commit (string-append "release-" version)))) (sha256 (base32 @@ -3489,7 +3489,7 @@ (define-public subdl (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/alexanderwink/subdl.git") + (url "https://github.com/alexanderwink/subdl") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -3523,7 +3523,7 @@ (define-public l-smash (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/l-smash/l-smash.git") + (url "https://github.com/l-smash/l-smash") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -3587,7 +3587,7 @@ (define-public vidstab (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/georgmartius/vid.stab.git") + (url "https://github.com/georgmartius/vid.stab") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -3763,7 +3763,7 @@ (define-public wlstream (origin (method git-fetch) (uri (git-reference - (url "https://github.com/atomnuker/wlstream.git") + (url "https://github.com/atomnuker/wlstream") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -3860,7 +3860,7 @@ (define-public theorafile (origin (method git-fetch) (uri (git-reference - (url "https://github.com/FNA-XNA/Theorafile.git") + (url "https://github.com/FNA-XNA/Theorafile") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -3921,7 +3921,7 @@ (define-public svt-av1 (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/OpenVisualCloud/SVT-AV1.git") + (url "https://github.com/OpenVisualCloud/SVT-AV1") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -4065,7 +4065,7 @@ (define-public peek (origin (method git-fetch) (uri (git-reference - (url "https://github.com/phw/peek.git") + (url "https://github.com/phw/peek") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -4099,7 +4099,7 @@ (define-public wf-recorder (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ammen99/wf-recorder.git") + (url "https://github.com/ammen99/wf-recorder") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index df6359351f..ab3492fe25 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -458,7 +458,7 @@ (define-public vim-fugitive (origin (method git-fetch) (uri (git-reference - (url "https://github.com/tpope/vim-fugitive.git") + (url "https://github.com/tpope/vim-fugitive") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -574,7 +574,7 @@ (define-public editorconfig-vim (origin (method git-fetch) (uri (git-reference - (url "https://github.com/editorconfig/editorconfig-vim.git") + (url "https://github.com/editorconfig/editorconfig-vim") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 64cd815bb8..051b81e2bd 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -878,7 +878,7 @@ (define-public qmpbackup (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/abbbi/qmpbackup.git") + (url "https://github.com/abbbi/qmpbackup") (commit version))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/vlang.scm b/gnu/packages/vlang.scm index d73dd566c5..6722258aa1 100644 --- a/gnu/packages/vlang.scm +++ b/gnu/packages/vlang.scm @@ -33,7 +33,7 @@ (define-public v (origin (method git-fetch) (uri (git-reference - (url "https://github.com/vlang/v.git") + (url "https://github.com/vlang/v") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -103,7 +103,7 @@ (define-public v (origin (method git-fetch) (uri (git-reference - (url "https://github.com/vlang/vc.git") + (url "https://github.com/vlang/vc") (commit vc-version))) (file-name (git-file-name "vc" vc-version)) (sha256 diff --git a/gnu/packages/vnc.scm b/gnu/packages/vnc.scm index dcfbe89829..a084b30f59 100644 --- a/gnu/packages/vnc.scm +++ b/gnu/packages/vnc.scm @@ -51,7 +51,7 @@ (define-public tigervnc-client (method git-fetch) (uri (git-reference - (url "https://github.com/TigerVNC/tigervnc.git") + (url "https://github.com/TigerVNC/tigervnc") (commit commit))) (sha256 (base32 @@ -238,7 +238,7 @@ (define-public libvnc (origin (method git-fetch) (uri (git-reference - (url "https://github.com/LibVNC/libvncserver.git") + (url "https://github.com/LibVNC/libvncserver") (commit (string-append "LibVNCServer-" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index ed9be6c16d..65cf5bd355 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -227,7 +227,7 @@ (define-public ocproxy (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/cernekee/ocproxy.git") + (url "https://github.com/cernekee/ocproxy") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -327,7 +327,7 @@ (define-public protonvpn-cli ;; Thus, fetch code from Git. (method git-fetch) (uri (git-reference - (url "https://github.com/ProtonVPN/linux-cli.git") + (url "https://github.com/ProtonVPN/linux-cli") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -462,7 +462,7 @@ (define-public badvpn (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ambrop72/badvpn.git") + (url "https://github.com/ambrop72/badvpn") (commit version))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index a38959feac..dd113bc0d4 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -219,7 +219,7 @@ (define-public luakit (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/luakit/luakit.git") + (url "https://github.com/luakit/luakit") (commit version))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 1a7ea54601..c7f4337e2a 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -198,7 +198,7 @@ (define-public mod-wsgi (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/GrahamDumpleton/mod_wsgi.git") + (url "https://github.com/GrahamDumpleton/mod_wsgi") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -423,7 +423,7 @@ (define-public nginx-accept-language-module (origin (method git-fetch) (uri (git-reference - (url "https://github.com/giom/nginx_accept_language_module.git") + (url "https://github.com/giom/nginx_accept_language_module") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -647,7 +647,7 @@ (define-public fcgiwrap (origin (method git-fetch) (uri (git-reference - (url "https://github.com/gnosek/fcgiwrap.git") + (url "https://github.com/gnosek/fcgiwrap") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -844,7 +844,7 @@ (define-public json-parser ;; do not use auto-generated tarballs (method git-fetch) (uri (git-reference - (url "https://github.com/udp/json-parser.git") + (url "https://github.com/udp/json-parser") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -874,7 +874,7 @@ (define-public qjson (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/flavio/qjson.git") + (url "https://github.com/flavio/qjson") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -914,7 +914,7 @@ (define-public qoauth (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ayoy/qoauth.git") + (url "https://github.com/ayoy/qoauth") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -1045,7 +1045,7 @@ (define-public rapidjson (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Tencent/rapidjson.git") + (url "https://github.com/Tencent/rapidjson") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -1086,7 +1086,7 @@ (define-public libyajl (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/lloyd/yajl.git") + (url "https://github.com/lloyd/yajl") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -1117,7 +1117,7 @@ (define-public libwebsockets ;; things from Git. (method git-fetch) (uri (git-reference - (url "https://github.com/warmcat/libwebsockets.git") + (url "https://github.com/warmcat/libwebsockets") (commit (string-append "v" version "-chrome37-firefox30")))) (sha256 @@ -1196,7 +1196,7 @@ (define-public websocketpp (origin (method git-fetch) (uri (git-reference - (url "https://github.com/zaphoyd/websocketpp.git") + (url "https://github.com/zaphoyd/websocketpp") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -1230,7 +1230,7 @@ (define-public wslay (origin (method git-fetch) (uri (git-reference - (url "https://github.com/tatsuhiro-t/wslay.git") + (url "https://github.com/tatsuhiro-t/wslay") (commit (string-append "release-" version)))) (file-name (git-file-name name version)) (sha256 @@ -1406,7 +1406,7 @@ (define-public websockify (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/novnc/websockify.git") + (url "https://github.com/novnc/websockify") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -1667,7 +1667,7 @@ (define-public libsass (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/sass/libsass.git") + (url "https://github.com/sass/libsass") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -1701,7 +1701,7 @@ (define-public sassc (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/sass/sassc.git") + (url "https://github.com/sass/sassc") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -1758,7 +1758,7 @@ (define-public sassc/libsass-3.5 (origin (method git-fetch) (uri (git-reference - (url "https://github.com/sass/libsass.git") + (url "https://github.com/sass/libsass") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -5021,7 +5021,7 @@ (define-public libcyaml (origin (method git-fetch) (uri (git-reference - (url "https://github.com/tlsa/libcyaml.git") + (url "https://github.com/tlsa/libcyaml") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -5747,7 +5747,7 @@ (define-public xinetd (origin (method git-fetch) (uri (git-reference - (url "https://github.com/openSUSE/xinetd.git") + (url "https://github.com/openSUSE/xinetd") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -7311,7 +7311,7 @@ (define-public hpcguix-web (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/UMCUGenetics/hpcguix-web.git") + (url "https://github.com/UMCUGenetics/hpcguix-web") (commit commit))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/wireservice.scm b/gnu/packages/wireservice.scm index 0d772b54d1..e3bfe8d478 100644 --- a/gnu/packages/wireservice.scm +++ b/gnu/packages/wireservice.scm @@ -67,7 +67,7 @@ (define-public python-leather (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/wireservice/leather.git") + (url "https://github.com/wireservice/leather") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -93,7 +93,7 @@ (define-public python-agate (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/wireservice/agate.git") + (url "https://github.com/wireservice/agate") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -126,7 +126,7 @@ (define-public python-agate-sql (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/wireservice/agate-sql.git") + (url "https://github.com/wireservice/agate-sql") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -152,7 +152,7 @@ (define-public python-agate-dbf (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/wireservice/agate-dbf.git") + (url "https://github.com/wireservice/agate-dbf") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -177,7 +177,7 @@ (define-public python-agate-excel (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/wireservice/agate-excel.git") + (url "https://github.com/wireservice/agate-excel") (commit version))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 8b54376f37..2849873329 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -121,7 +121,7 @@ (define-public bspwm (origin (method git-fetch) (uri (git-reference - (url "https://github.com/baskerville/bspwm.git") + (url "https://github.com/baskerville/bspwm") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -403,7 +403,7 @@ (define-public i3blocks (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/vivien/i3blocks.git") + (url "https://github.com/vivien/i3blocks") (commit version))) (sha256 (base32 @@ -458,7 +458,7 @@ (define-public python-i3-py ;; for years. (method git-fetch) (uri (git-reference - (url "https://github.com/ziberna/i3-py.git") + (url "https://github.com/ziberna/i3-py") (commit "27f88a616e9ecc340e7d041d3d00782f8a1964c1"))) (sha256 (base32 @@ -503,7 +503,7 @@ (define-public quickswitch-i3 ;; instead of the release. (method git-fetch) (uri (git-reference - (url "https://github.com/proxypoke/quickswitch-for-i3.git") + (url "https://github.com/proxypoke/quickswitch-for-i3") (commit commit))) (sha256 (base32 @@ -541,7 +541,7 @@ (define-public i3lock-color (origin (method git-fetch) (uri (git-reference - (url "https://github.com/PandorasFox/i3lock-color.git") + (url "https://github.com/PandorasFox/i3lock-color") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -584,7 +584,7 @@ (define-public i3lock-fancy (origin (method git-fetch) (uri (git-reference - (url "https://github.com/meskarune/i3lock-fancy.git") + (url "https://github.com/meskarune/i3lock-fancy") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -1109,7 +1109,7 @@ (define-public spectrwm (origin (method git-fetch) (uri (git-reference - (url "https://github.com/conformal/spectrwm.git") + (url "https://github.com/conformal/spectrwm") (commit (string-append "SPECTRWM_" (string-join (string-split version #\.) "_"))))) @@ -1317,7 +1317,7 @@ (define-public wlroots (origin (method git-fetch) (uri (git-reference - (url "https://github.com/swaywm/wlroots.git") + (url "https://github.com/swaywm/wlroots") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -1362,7 +1362,7 @@ (define-public sway (origin (method git-fetch) (uri (git-reference - (url "https://github.com/swaywm/sway.git") + (url "https://github.com/swaywm/sway") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -1414,7 +1414,7 @@ (define-public swayidle (origin (method git-fetch) (uri (git-reference - (url "https://github.com/swaywm/swayidle.git") + (url "https://github.com/swaywm/swayidle") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -1440,7 +1440,7 @@ (define-public swaylock (origin (method git-fetch) (uri (git-reference - (url "https://github.com/swaywm/swaylock.git") + (url "https://github.com/swaywm/swaylock") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -1468,7 +1468,7 @@ (define-public swaybg (origin (method git-fetch) (uri (git-reference - (url "https://github.com/swaywm/swaybg.git") + (url "https://github.com/swaywm/swaybg") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -1493,7 +1493,7 @@ (define-public waybar (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Alexays/Waybar.git") + (url "https://github.com/Alexays/Waybar") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -1531,7 +1531,7 @@ (define-public mako (origin (method git-fetch) (uri (git-reference - (url "https://github.com/emersion/mako.git") + (url "https://github.com/emersion/mako") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -1559,7 +1559,7 @@ (define-public stumpwm (origin (method git-fetch) (uri (git-reference - (url "https://github.com/stumpwm/stumpwm.git") + (url "https://github.com/stumpwm/stumpwm") (commit version))) (file-name (git-file-name "stumpwm" version)) (sha256 @@ -1669,7 +1669,7 @@ (define stumpwm-contrib (origin (method git-fetch) (uri (git-reference - (url "https://github.com/stumpwm/stumpwm-contrib.git") + (url "https://github.com/stumpwm/stumpwm-contrib") (commit commit))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm index 2cdff17404..7141b2f4b8 100644 --- a/gnu/packages/wxwidgets.scm +++ b/gnu/packages/wxwidgets.scm @@ -162,7 +162,7 @@ (define-public wxwidgets-3.1 (origin (method git-fetch) (uri (git-reference - (url "https://github.com/wxWidgets/wxWidgets.git") + (url "https://github.com/wxWidgets/wxWidgets") (commit (string-append "v" version)))) (file-name (git-file-name "wxwidgets" version)) (sha256 diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 6033b40380..2308580f5c 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -221,7 +221,7 @@ (define-public bemenu (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Cloudef/bemenu.git") + (url "https://github.com/Cloudef/bemenu") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -265,7 +265,7 @@ (define-public copyq (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/hluk/CopyQ.git") + (url "https://github.com/hluk/CopyQ") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -296,7 +296,7 @@ (define-public xclip (origin (method git-fetch) (uri (git-reference - (url "https://github.com/astrand/xclip.git") + (url "https://github.com/astrand/xclip") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -633,7 +633,7 @@ (define-public scrot (method git-fetch) (uri (git-reference - (url "https://github.com/resurrecting-open-source-projects/scrot.git") + (url "https://github.com/resurrecting-open-source-projects/scrot") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -665,7 +665,7 @@ (define-public slop (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/naelstrof/slop.git") + (url "https://github.com/naelstrof/slop") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -698,7 +698,7 @@ (define-public maim (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/naelstrof/maim.git") + (url "https://github.com/naelstrof/maim") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -1051,7 +1051,7 @@ (define-public xcape (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/alols/xcape.git") + (url "https://github.com/alols/xcape") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -1244,7 +1244,7 @@ (define-public redshift-wayland (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/minus7/redshift.git") + (url "https://github.com/minus7/redshift") (commit commit))) (file-name (string-append name "-" version)) (sha256 @@ -1552,7 +1552,7 @@ (define-public dzen (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/robm/dzen.git") + (url "https://github.com/robm/dzen") (commit commit))) (file-name (string-append name "-" version)) (sha256 @@ -1722,7 +1722,7 @@ (define-public nxbelld (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/dusxmt/nxbelld.git") + (url "https://github.com/dusxmt/nxbelld") (commit version))) (sha256 (base32 @@ -1918,7 +1918,7 @@ (define-public xrandr-invert-colors (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/zoltanp/xrandr-invert-colors.git") + (url "https://github.com/zoltanp/xrandr-invert-colors") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -2053,7 +2053,7 @@ (define-public wl-clipboard (origin (method git-fetch) (uri (git-reference - (url "https://github.com/bugaevc/wl-clipboard.git") + (url "https://github.com/bugaevc/wl-clipboard") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -2103,7 +2103,7 @@ (define-public jgmenu (origin (method git-fetch) (uri (git-reference - (url "https://github.com/johanmalm/jgmenu.git") + (url "https://github.com/johanmalm/jgmenu") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -2222,7 +2222,7 @@ (define-public xsettingsd (origin (method git-fetch) (uri (git-reference - (url "https://github.com/derat/xsettingsd.git") + (url "https://github.com/derat/xsettingsd") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -2288,7 +2288,7 @@ (define-public clipnotify (origin (method git-fetch) (uri (git-reference - (url "https://github.com/cdown/clipnotify.git") + (url "https://github.com/cdown/clipnotify") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -2339,7 +2339,7 @@ (define-public clipmenu (origin (method git-fetch) (uri (git-reference - (url "https://github.com/cdown/clipmenu.git") + (url "https://github.com/cdown/clipmenu") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -2418,7 +2418,7 @@ (define-public kbdd (origin (method git-fetch) (uri (git-reference - (url "https://github.com/qnikst/kbdd.git") + (url "https://github.com/qnikst/kbdd") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -2454,7 +2454,7 @@ (define-public j4-dmenu-desktop (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/enkore/j4-dmenu-desktop.git") + (url "https://github.com/enkore/j4-dmenu-desktop") (commit (string-append "r" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 90181a1773..c3a9a1cfeb 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -1108,7 +1108,7 @@ (define-public tinyxml2 (origin (method git-fetch) (uri (git-reference - (url "https://github.com/leethomason/tinyxml2.git") + (url "https://github.com/leethomason/tinyxml2") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -1216,7 +1216,7 @@ (define-public xlsx2csv (origin (method git-fetch) (uri (git-reference - (url "https://github.com/dilshod/xlsx2csv.git") + (url "https://github.com/dilshod/xlsx2csv") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -1628,7 +1628,7 @@ (define-public java-xom (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/elharo/xom.git") + (url "https://github.com/elharo/xom") (commit (string-append "XOM_" version)))) (file-name (git-file-name name version)) (sha256 @@ -1767,7 +1767,7 @@ (define-public java-dom4j (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/dom4j/dom4j.git") + (url "https://github.com/dom4j/dom4j") (commit (string-append "version-" version)))) (file-name (git-file-name name version)) (sha256 @@ -1840,7 +1840,7 @@ (define-public java-kxml2 (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/stefanhaustein/kxml2.git") + (url "https://github.com/stefanhaustein/kxml2") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -1914,7 +1914,7 @@ (define-public java-jettison (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/codehaus/jettison.git") + (url "https://github.com/codehaus/jettison") (commit (string-append "jettison-" version)))) (file-name (git-file-name name version)) (sha256 @@ -1946,7 +1946,7 @@ (define-public java-jdom2 (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/hunterhacker/jdom.git") + (url "https://github.com/hunterhacker/jdom") (commit (string-append "JDOM-" version)))) (file-name (git-file-name name version)) (sha256 @@ -1974,7 +1974,7 @@ (define-public java-xstream (origin (method git-fetch) (uri (git-reference - (url "https://github.com/x-stream/xstream.git") + (url "https://github.com/x-stream/xstream") (commit (string-append "XSTREAM_" (string-map (lambda (x) (if (eq? x #\.) #\_ x)) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 9b663aa158..eef2eb13ba 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3540,7 +3540,7 @@ (define-public v86d (origin (method git-fetch) (uri (git-reference - (url "https://github.com/mjanusz/v86d.git") + (url "https://github.com/mjanusz/v86d") (commit (string-append name "-" version)))) (file-name (git-file-name name version)) (sha256 @@ -6698,7 +6698,7 @@ (define-public xcur2png (origin (method git-fetch) (uri (git-reference - (url "https://github.com/eworm-de/xcur2png.git") + (url "https://github.com/eworm-de/xcur2png") (commit version))) (file-name (git-file-name name version)) (sha256 diff --git a/tests/lint.scm b/tests/lint.scm index 83becb655a..2f5e5623c1 100644 --- a/tests/lint.scm +++ b/tests/lint.scm @@ -611,7 +611,7 @@ (define (warning-contains? str warnings) (origin (method git-fetch) (uri (git-reference - (url "https://github.com/archive/example.git") + (url "https://github.com/archive/example") (commit "0"))) (sha256 %null-sha256)))))) (check-source-unstable-tarball pkg))) -- cgit v1.2.3 From a143e92446859bd1edc7a7aea85b2089c82c77da Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 12 Jul 2020 23:13:25 +0200 Subject: services: web: Do not export record type descriptors. * gnu/services/web.scm (, ) (, , ) (, ) (, ) (, ) () () (, ) (, ) (, ) (): Do not export. --- gnu/services/web.scm | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/gnu/services/web.scm b/gnu/services/web.scm index 3c5b4d2586..3b9f9e40be 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -59,20 +59,17 @@ (define-module (gnu services web) #:use-module (srfi srfi-9) #:use-module (ice-9 match) #:use-module (ice-9 format) - #:export ( - httpd-configuration + #:export (httpd-configuration httpd-configuration? httpd-configuration-package httpd-configuration-pid-file httpd-configuration-config - httpd-virtualhost httpd-virtualhost? httpd-virtualhost-addresses-and-ports httpd-virtualhost-contents - httpd-config-file httpd-config-file? httpd-config-file-modules @@ -84,14 +81,12 @@ (define-module (gnu services web) httpd-config-file-user httpd-config-file-group - httpd-module httpd-module? %default-httpd-modules httpd-service-type - nginx-configuration nginx-configuration? nginx-configuartion-nginx @@ -106,7 +101,6 @@ (define-module (gnu services web) nginx-configuration-extra-content nginx-configuration-file - nginx-server-configuration nginx-server-configuration? nginx-server-configuration-listen @@ -119,19 +113,16 @@ (define-module (gnu services web) nginx-server-configuration-server-tokens? nginx-server-configuration-raw-content - nginx-upstream-configuration nginx-upstream-configuration? nginx-upstream-configuration-name nginx-upstream-configuration-servers - nginx-location-configuration nginx-location-configuration? nginx-location-configuration-uri nginx-location-configuration-body - nginx-named-location-configuration nginx-named-location-configuration? nginx-named-location-configuration-name @@ -144,7 +135,6 @@ (define-module (gnu services web) fcgiwrap-configuration? fcgiwrap-service-type - php-fpm-configuration make-php-fpm-configuration php-fpm-configuration? @@ -162,7 +152,6 @@ (define-module (gnu services web) php-fpm-configuration-workers-log-file php-fpm-configuration-file - php-fpm-dynamic-process-manager-configuration make-php-fpm-dynamic-process-manager-configuration php-fpm-dynamic-process-manager-configuration? @@ -171,13 +160,11 @@ (define-module (gnu services web) php-fpm-dynamic-process-manager-configuration-min-spare-servers php-fpm-dynamic-process-manager-configuration-max-spare-servers - php-fpm-static-process-manager-configuration make-php-fpm-static-process-manager-configuration php-fpm-static-process-manager-configuration? php-fpm-static-process-manager-configuration-max-children - php-fpm-on-demand-process-manager-configuration make-php-fpm-on-demand-process-manager-configuration php-fpm-on-demand-process-manager-configuration? @@ -193,7 +180,6 @@ (define-module (gnu services web) hpcguix-web-configuration? hpcguix-web-service-type - tailon-configuration-file tailon-configuration-file? tailon-configuration-file-files @@ -207,7 +193,6 @@ (define-module (gnu services web) tailon-configuration-file-http-auth tailon-configuration-file-users - tailon-configuration tailon-configuration? tailon-configuration-config-file @@ -215,7 +200,6 @@ (define-module (gnu services web) tailon-service-type - varnish-configuration varnish-configuration? varnish-configuration-package @@ -229,7 +213,6 @@ (define-module (gnu services web) varnish-service-type - patchwork-database-configuration patchwork-database-configuration? patchwork-database-configuration-engine @@ -239,7 +222,6 @@ (define-module (gnu services web) patchwork-database-configuration-host patchwork-database-configuration-port - patchwork-settings-module patchwork-settings-module? patchwork-settings-module-database-configuration @@ -254,7 +236,6 @@ (define-module (gnu services web) patchwork-settings-module-force-https-links? patchwork-settings-module-extra-settings - patchwork-configuration patchwork-configuration? patchwork-configuration-patchwork @@ -264,7 +245,6 @@ (define-module (gnu services web) patchwork-virtualhost patchwork-service-type - mumi-configuration mumi-configuration? mumi-configuration-mumi -- cgit v1.2.3 From ada42a4292652c417697e2adf264ea3d97498a26 Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Fri, 10 Jul 2020 15:39:54 +0200 Subject: gnu: gnunet: Update to 0.13.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnunet.scm (gnunet): Update to 0.13.0. [native-inputs] Add curl. [arguments] Disable one failing test. Signed-off-by: Ludovic Courtès --- gnu/packages/gnunet.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index f2ab3a1c27..8ff719a542 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -32,6 +32,7 @@ (define-module (gnu packages gnunet) #:use-module (gnu packages aidc) #:use-module (gnu packages autotools) #:use-module (gnu packages compression) + #:use-module (gnu packages crypto) #:use-module (gnu packages curl) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) @@ -250,7 +251,7 @@ (define-public gnurl (define-public gnunet (package (name "gnunet") - (version "0.12.2") + (version "0.13.0") (source (origin (method url-fetch) @@ -258,7 +259,7 @@ (define-public gnunet ".tar.gz")) (sha256 (base32 - "1mwcy7fj1rpd39w7j7k3jdwlil5s889b2qlhfdggqmhigl28na5c")))) + "0g2zp8rj4yzz9xj4b5k9bdflmmpqxdgxvkr1vk5cq0jlz3vqmxx3")))) (build-system gnu-build-system) (inputs `(("bluez" ,bluez) @@ -274,6 +275,7 @@ (define-public gnunet ("libltdl" ,libltdl) ("libmicrohttpd" ,libmicrohttpd) ("libogg" ,libogg) + ("libsodium" ,libsodium) ("libunistring" ,libunistring) ("miniupnpc" ,miniupnpc) ("opus" ,opus) @@ -282,7 +284,8 @@ (define-public gnunet ("zbar" ,zbar) ("zlib" ,zlib))) (native-inputs - `(("pkg-config" ,pkg-config) + `(("curl" ,curl) + ("pkg-config" ,pkg-config) ("python" ,python) ("xxd" ,xxd) ("which" ,(@ (gnu packages base) which)))) @@ -311,8 +314,9 @@ (define-public gnunet (("test_transport_blacklisting_multiple_plugins\\$\\(EXEEXT\\) \\\\\n") "")) (substitute* "src/testbed/Makefile" (("test_testbed_api_2peers_1controller\\$\\(EXEEXT\\) \\\\\n") "") - (("test_testbed_api_test\\$\\(EXEEXT\\) \\\\\n") "") (("test_testbed_api_statistics\\$\\(EXEEXT\\) \\\\\n") "") + (("test_testbed_api_test\\$\\(EXEEXT\\) \\\\\n") "") + (("test_testbed_api_test_timeout\\$\\(EXEEXT\\) \\\\\n") "") (("test_testbed_api_topology\\$\\(EXEEXT\\) \\\\\n") "") (("test_testbed_api_topology_clique\\$\\(EXEEXT\\) \\\\\n") "")) (substitute* "src/topology/Makefile" -- cgit v1.2.3 From bea2134fe16ef4ee9a2274f5cfbd8482c6a41bf3 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 13 Jul 2020 01:02:29 +0200 Subject: gnu: gnunet: Update to 0.13.1. * gnu/packages/gnunet.scm (gnunet): Update to 0.13.1. --- gnu/packages/gnunet.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index 8ff719a542..72f4d1c12c 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -251,7 +251,7 @@ (define-public gnurl (define-public gnunet (package (name "gnunet") - (version "0.13.0") + (version "0.13.1") (source (origin (method url-fetch) @@ -259,7 +259,7 @@ (define-public gnunet ".tar.gz")) (sha256 (base32 - "0g2zp8rj4yzz9xj4b5k9bdflmmpqxdgxvkr1vk5cq0jlz3vqmxx3")))) + "15jnca5zxng7r6m3qzq9lr73xxq0v6mvcp0lny3zrlkz5s2nmmq3")))) (build-system gnu-build-system) (inputs `(("bluez" ,bluez) -- cgit v1.2.3 From 5cd9cd644ca493b230cb229e7c46641e94a4e2fa Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 13 Jul 2020 04:20:50 +0200 Subject: gnu: tests: Fix unbound variable. Record type descriptors were made private in a143e92446859bd1edc7a7aea85b2089c82c77da, but a usage of them was forgotten in the tests files. * gnu/tests/web.scm (patchwork-initial-database-setup-service): Use accessors to access field values instead of unexported type descriptor. --- gnu/tests/web.scm | 73 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 37 insertions(+), 36 deletions(-) diff --git a/gnu/tests/web.scm b/gnu/tests/web.scm index 1c984dd6f4..7513eab2e4 100644 --- a/gnu/tests/web.scm +++ b/gnu/tests/web.scm @@ -521,42 +521,43 @@ (define %test-tailon ;;; Patchwork ;;; -(define patchwork-initial-database-setup-service - (match-lambda - (($ - engine name user password host port) - - (define start-gexp - #~(lambda () - (let ((pid (primitive-fork)) - (postgres (getpwnam "postgres"))) - (if (eq? pid 0) - (dynamic-wind - (const #t) - (lambda () - (setgid (passwd:gid postgres)) - (setuid (passwd:uid postgres)) - (primitive-exit - (if (and - (zero? - (system* #$(file-append postgresql "/bin/createuser") - #$user)) - (zero? - (system* #$(file-append postgresql "/bin/createdb") - "-O" #$user #$name))) - 0 - 1))) - (lambda () - (primitive-exit 1))) - (zero? (cdr (waitpid pid))))))) - - (shepherd-service - (requirement '(postgres)) - (provision '(patchwork-postgresql-user-and-database)) - (start start-gexp) - (stop #~(const #f)) - (respawn? #f) - (documentation "Setup patchwork database."))))) +(define (patchwork-initial-database-setup-service configuration) + (define start-gexp + #~(lambda () + (let ((pid (primitive-fork)) + (postgres (getpwnam "postgres"))) + (if (eq? pid 0) + (dynamic-wind + (const #t) + (lambda () + (setgid (passwd:gid postgres)) + (setuid (passwd:uid postgres)) + (primitive-exit + (if (and + (zero? + (system* #$(file-append postgresql "/bin/createuser") + #$(patchwork-database-configuration-user + configuration))) + (zero? + (system* #$(file-append postgresql "/bin/createdb") + "-O" + #$(patchwork-database-configuration-user + configuration) + #$(patchwork-database-configuration-name + configuration)))) + 0 + 1))) + (lambda () + (primitive-exit 1))) + (zero? (cdr (waitpid pid))))))) + + (shepherd-service + (requirement '(postgres)) + (provision '(patchwork-postgresql-user-and-database)) + (start start-gexp) + (stop #~(const #f)) + (respawn? #f) + (documentation "Setup patchwork database."))) (define (patchwork-os patchwork) (simple-operating-system -- cgit v1.2.3 From 000498784f4aae34742b28e72175cebce4cff01e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 13 Jul 2020 09:02:56 +0300 Subject: gnu: libreoffice: Update to 6.4.5.2. * gnu/packages/libreoffice.scm (libreoffice): Update to 6.4.5.2. [source]: Remove patch. * gnu/packages/patches/libreoffice-poppler-compat.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/libreoffice.scm | 5 ++--- gnu/packages/patches/libreoffice-poppler-compat.patch | 19 ------------------- 3 files changed, 2 insertions(+), 23 deletions(-) delete mode 100644 gnu/packages/patches/libreoffice-poppler-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index 57a1d0df84..8494c5e305 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1211,7 +1211,6 @@ dist_patch_DATA = \ %D%/packages/patches/libmygpo-qt-fix-qt-5.11.patch \ %D%/packages/patches/libmygpo-qt-missing-qt5-modules.patch \ %D%/packages/patches/libqalculate-3.8.0-libcurl-ssl-fix.patch \ - %D%/packages/patches/libreoffice-poppler-compat.patch \ %D%/packages/patches/libsndfile-armhf-type-checks.patch \ %D%/packages/patches/libsndfile-CVE-2017-8361-8363-8365.patch \ %D%/packages/patches/libsndfile-CVE-2017-8362.patch \ diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index a98ae152f6..ebe4fd7246 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -1049,7 +1049,7 @@ (define-public libqxp (define-public libreoffice (package (name "libreoffice") - (version "6.4.4.2") + (version "6.4.5.2") (source (origin (method url-fetch) @@ -1057,10 +1057,9 @@ (define-public libreoffice (string-append "https://download.documentfoundation.org/libreoffice/src/" (version-prefix version 3) "/libreoffice-" version ".tar.xz")) - (patches (search-patches "libreoffice-poppler-compat.patch")) (sha256 (base32 - "0y6026h374787yy2f3as1q7clxmgywsfdrj62kw3577wvybqaf2l")))) + "1v4ili9j8d0xfj3q69niski1v65icg8xi09ip2bsk343rawwck3a")))) (build-system glib-or-gtk-build-system) (native-inputs `(("bison" ,bison) diff --git a/gnu/packages/patches/libreoffice-poppler-compat.patch b/gnu/packages/patches/libreoffice-poppler-compat.patch deleted file mode 100644 index 8dc0b60a12..0000000000 --- a/gnu/packages/patches/libreoffice-poppler-compat.patch +++ /dev/null @@ -1,19 +0,0 @@ -Fix type mismatch with Poppler 0.86. - -Taken from Arch Linux: -https://git.archlinux.org/svntogit/packages.git/tree/trunk/libreoffice-poppler-0.86.patch?h=packages/libreoffice-fresh - -diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx ---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -@@ -563,7 +563,9 @@ void PDFOutDev::processLink(Link* link, Catalog*) - if (!(pAction && pAction->getKind() == actionURI)) - return; - --#if POPPLER_CHECK_VERSION(0, 72, 0) -+#if POPPLER_CHECK_VERSION(0, 86, 0) -+ const char* pURI = static_cast(pAction)->getURI().c_str(); -+#elif POPPLER_CHECK_VERSION(0, 72, 0) - const char* pURI = static_cast(pAction)->getURI()->c_str(); - #else - const char* pURI = static_cast(pAction)->getURI()->getCString(); -- cgit v1.2.3 From 13b1bbde9669fe4efd19c03bd191ed23d1d14b69 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 13 Jul 2020 12:07:28 +0200 Subject: gnu: Add rust-rle-decode-fast-1. * gnu/packages/crates-io.scm (rust-rle-decode-fast-1): New variable. --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 994e249c36..411dc859b3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -20603,6 +20603,32 @@ (define-public rust-ring-0.13 ;; build dependencies ("rust-cc" ,rust-cc-1.0)))))) +(define-public rust-rle-decode-fast-1 + (package + (name "rust-rle-decode-fast") + (version "1.0.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "rle-decode-fast" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1b4h7qs4mssc5dnlhs3f91ya8pb40bv72zzshl18gify2jllzgna")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-criterion" ,rust-criterion-0.2)))) + (home-page "https://github.com/WanzenBug/rle-decode-helper") + (synopsis "Implement decoding for Run Length Encoded data in Rust") + (description + "This crate provides a fast way to implement any kind of decoding +for Run Length Encoded data in Rust. + +Writing a fast decoder that is also safe can be quite challenging, so +this crate is here to save you the hassle of maintaining and testing +your own implementation.") + (license (list license:expat license:asl2.0)))) + (define-public rust-rls-span-0.5 (package (name "rust-rls-span") -- cgit v1.2.3 From 83683001aff340e872a96247cbf8c783bdf85d6d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 13 Jul 2020 12:30:17 +0200 Subject: gnu: Add rust-zeroize-derive-1. * gnu/packages/crates-io.scm (rust-zeroize-derive-1): New variable. --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 411dc859b3..4221ba4599 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -30015,6 +30015,30 @@ (define-public rust-zbase32-0.1 (description "This package provides an implementation of zbase32.") (license license:lgpl3+))) +(define-public rust-zeroize-derive-1 + (package + (name "rust-zeroize-derive") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "zeroize-derive" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "18lc9xq9dwvmv81y3bqnw20974nbrs7d20rljb1inz7wd7n1w9fy")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1.0) + ("rust-quote" ,rust-quote-1.0) + ("rust-syn" ,rust-syn-1.0) + ("rust-synstructure" ,rust-synstructure-0.12)))) + (home-page "https://github.com/iqlusioninc/crates/") + (synopsis "Custom derive support for zeroize") + (description "This crate provides custom derive support for Zeroize.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-zip-0.5 (package (name "rust-zip") -- cgit v1.2.3 From 1cc3a0451e3e96aa2ca67742c40d158b6137872f Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 13 Jul 2020 12:30:53 +0200 Subject: gnu: Add rust-zeroize-1. * gnu/packages/crates-io.scm (rust-zeroize-1): New variable. --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4221ba4599..3c59bb1503 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -30015,6 +30015,32 @@ (define-public rust-zbase32-0.1 (description "This package provides an implementation of zbase32.") (license license:lgpl3+))) +(define-public rust-zeroize-1 + (package + (name "rust-zeroize") + (version "1.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "zeroize" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1f5547q8l8bpi16yy6lix2gl9rf1qz45lj06bq7wjk525gnw5fiw")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ;2 doc tests fail + #:cargo-inputs + (("rust-zeroize-derive" ,rust-zeroize-derive-1)))) + (home-page "https://github.com/iqlusioninc/crates/") + (synopsis "Securely clear secrets from memory") + (description + "Zeroize securely clears secrets from memory with a simple trait built on +stable Rust primitives, which guarantee memory is zeroed using an operation +will not be ``optimized away'' by the compiler. It uses a portable pure Rust +implementation that works everywhere, even WASM!") + (license (list license:asl2.0 license:expat)))) + (define-public rust-zeroize-derive-1 (package (name "rust-zeroize-derive") -- cgit v1.2.3 From c5384ea3137243f77d901a51c45c5f489fa452f1 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Sat, 27 Jun 2020 15:06:14 +0200 Subject: gnu: Add python-pyopengl. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-pyopengl): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 46 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 109a14b0ae..f832793169 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15512,6 +15512,52 @@ (define-public python2-pyopengl-accelerate (description "This is the Cython-coded accelerator module for PyOpenGL."))) +(define-public python-pyopengl + (package + (name "python-pyopengl") + (version "3.1.5") + (source + (origin + (method url-fetch) + (uri (pypi-uri "PyOpenGL" version)) + (sha256 + (base32 + "091lp9bpqi8yf1nmyg19xmvw611lrzq2q94cl1k5gnlh0c6vl1s1")))) + (build-system python-build-system) + (inputs + `(("mesa" ,mesa) + ("freeglut" ,freeglut) + ("glu" ,glu))) + (arguments + `(#:tests? #f ; Tests fail: AttributeError: 'GLXPlatform' object has no + ;attribute 'OSMesa' + #:phases + (modify-phases %standard-phases + (add-before 'build 'fix-paths + (lambda* (#:key inputs outputs #:allow-other-keys) + (substitute* '("OpenGL/platform/ctypesloader.py") + (("filenames_to_try = \\[\\]") "filenames_to_try = [name]")) + (substitute* '("OpenGL/platform/glx.py" "tests/check_glut_load.py") + (("'GL'") + (string-append "'" (assoc-ref inputs "mesa") "/lib/libGL.so'")) + (("'GLU'") + (string-append "'" (assoc-ref inputs "glu") "/lib/libGLU.so'")) + (("'glut',") + (string-append "'" (assoc-ref inputs "freeglut") "/lib/libglut.so',")) + (("'GLESv1_CM'") + (string-append "'" (assoc-ref inputs "mesa") "/lib/libGLESv1_CM.so'")) + (("'GLESv2'") + (string-append "'" (assoc-ref inputs "mesa") "/lib/libGLESv2.so'"))) + ;; Not providing libgle. It seems to be very old. + #t))))) + (home-page "http://pyopengl.sourceforge.net") + (synopsis "Standard OpenGL bindings for Python") + (description + "PyOpenGL is the most common cross platform Python binding to OpenGL and +related APIs. The binding is created using the standard @code{ctypes} +library.") + (license license:bsd-3))) + (define-public python-rencode (package (name "python-rencode") -- cgit v1.2.3 From 13910d401285293ad6b6562bab43ec00de4f54b0 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Sat, 27 Jun 2020 15:07:01 +0200 Subject: gnu: Add python-pyopengl-accelerate. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (gnu/packages/python-xyz.scm): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f832793169..d49443e689 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15558,6 +15558,31 @@ (define-public python-pyopengl library.") (license license:bsd-3))) +(define-public python-pyopengl-accelerate + (package + (inherit python-pyopengl) + (name "python-pyopengl-accelerate") + (version "3.1.5") + (source + (origin + (method url-fetch) + (uri (pypi-uri "PyOpenGL-accelerate" version)) + (sha256 + (base32 + "01iggy5jwxv7lxnj51zbmlbhag9wcb7dvrbwgi97i90n0a5m3r8j")))) + (inputs + `(("mesa" ,mesa) + ("python-numpy" ,python-numpy))) ; for cython module + ; numpy_formathandler, thus not propagated + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'fix-paths)))) + (synopsis "Acceleration code for PyOpenGL") + (description + "This is the Cython-coded accelerator module for PyOpenGL."))) + (define-public python-rencode (package (name "python-rencode") -- cgit v1.2.3 From 339184f1d04ff30036a4c472e281e8d08988786e Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Sat, 27 Jun 2020 15:08:02 +0200 Subject: gnu: Add xf86-video-dummy. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xorg.scm (xf86-video-dummy): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/xorg.scm | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index eef2eb13ba..95cd49cf25 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2827,10 +2827,26 @@ (define-public xf86-video-cirrus X server.") (license license:x11))) - -;; non-free license -;; (define-public xf86-video-dummy - +(define-public xf86-video-dummy + (package + (name "xf86-video-dummy") + (version "0.3.8") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://xorg/individual/driver/" + "xf86-video-dummy-" version ".tar.bz2")) + (sha256 + (base32 "1fcm9vwgv8wnffbvkzddk4yxrh3kc0np6w65wj8k88q7jf3bn4ip")))) + (build-system gnu-build-system) + (inputs `(("xorg-server" ,xorg-server))) + (native-inputs `(("pkg-config" ,pkg-config))) + (home-page "https://www.x.org/wiki/") + (synopsis "Dummy video driver for X server") + (description + "Virtual/offscreen frame buffer driver for the Xorg X server.") + ;; per https://lists.freedesktop.org/archives/xorg/2020-June/060316.html + (license license:x11))) (define-public xf86-video-fbdev (package -- cgit v1.2.3 From dab195957bdd75eba49ee3d08adc5ff805d4f497 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Sat, 27 Jun 2020 15:11:05 +0200 Subject: gnu: xpra: Upgrade to 4.0.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xorg.scm (xpra)[version]: Upgrade. [source]: Add patch. [inputs]: Adjust to use Python 3 dependencies. [arguments]: Use Python 3, add phases to patch hardcoded binary paths. * gnu/local.mk (dist_patch_DATA): Add patch. * gnu/packages/patches/xpra-4.0.1-systemd-run.patch: New file. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 1 + gnu/packages/patches/xpra-4.0.1-systemd-run.patch | 34 +++++ gnu/packages/xorg.scm | 153 +++++++++++++--------- 3 files changed, 123 insertions(+), 65 deletions(-) create mode 100644 gnu/packages/patches/xpra-4.0.1-systemd-run.patch diff --git a/gnu/local.mk b/gnu/local.mk index 8494c5e305..ddd024677a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1637,6 +1637,7 @@ dist_patch_DATA = \ %D%/packages/patches/xplanet-1.3.1-libdisplay_DisplayOutput.cpp.patch \ %D%/packages/patches/xplanet-1.3.1-libimage_gif.c.patch \ %D%/packages/patches/xplanet-1.3.1-xpUtil-Add2017LeapSecond.cpp.patch \ + %D%/packages/patches/xpra-4.0.1-systemd-run.patch \ %D%/packages/patches/xsane-fix-memory-leak.patch \ %D%/packages/patches/xsane-fix-pdf-floats.patch \ %D%/packages/patches/xsane-fix-snprintf-buffer-length.patch \ diff --git a/gnu/packages/patches/xpra-4.0.1-systemd-run.patch b/gnu/packages/patches/xpra-4.0.1-systemd-run.patch new file mode 100644 index 0000000000..1ea11830a5 --- /dev/null +++ b/gnu/packages/patches/xpra-4.0.1-systemd-run.patch @@ -0,0 +1,34 @@ +Disable systemd-run if the command is not found. + +diff -Naur xpra-4.0.1/xpra/scripts/main.py xpra-4.0.1.patched/xpra/scripts/main.py +--- xpra-4.0.1/xpra/scripts/main.py 2020-05-17 18:12:15.000000000 +0200 ++++ xpra-4.0.1.patched/xpra/scripts/main.py 2020-06-01 12:12:18.500257507 +0200 +@@ -312,16 +312,18 @@ + if not is_systemd_pid1(): + return False + #test it: +- cmd = ["systemd-run", "--quiet", "--user", "--scope", "--", "true"] +- proc = Popen(cmd, stdin=None, stdout=None, stderr=None, shell=False) +- r = pollwait(proc, timeout=1) +- if r is None: +- try: +- proc.terminate() +- except Exception: +- pass +- return r==0 +- ++ try: ++ cmd = ["systemd-run", "--quiet", "--user", "--scope", "--", "true"] ++ proc = Popen(cmd, stdin=None, stdout=None, stderr=None, shell=False) ++ r = pollwait(proc, timeout=1) ++ if r is None: ++ try: ++ proc.terminate() ++ except Exception: ++ pass ++ return r==0 ++ except FileNotFoundError: ++ return False + + def run_mode(script_file, error_cb, options, args, mode, defaults): + #configure default logging handler: diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 95cd49cf25..19873073d0 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6276,7 +6276,7 @@ (define-public xcompmgr (define-public xpra (package (name "xpra") - (version "2.5.3") + (version "4.0.2") (source (origin (method url-fetch) @@ -6284,85 +6284,108 @@ (define-public xpra version ".tar.xz")) (sha256 (base32 - "1ys35lj28903alccks9p055psy1fsk1nxi8ncchvw8bfxkkkvbys")))) + "1cs39jzi59hkl421xmhi549ndmdfzkg0ap45f4nlsn9zr9zwmp3x")) + (patches (search-patches "xpra-4.0.1-systemd-run.patch")))) (build-system python-build-system) - (inputs `(("ffmpeg" ,ffmpeg) - ("flac" ,flac) - ("gtk+-2" ,gtk+-2) ;; no full GTK3 support yet + ;; see also http://xpra.org/trac/wiki/Dependencies + (inputs `( + ;; Essential dependencies. ("libjpeg" ,libjpeg-turbo) - ("libpng" ,libpng) - ("libvpx" ,libvpx) - ("libx264" ,libx264) - ("libxcomposite" ,libxcomposite) - ("libxdamage" ,libxdamage) - ("libxi" ,libxi) - ("libxkbfile" ,libxkbfile) + ("libwebp" ,libwebp) + ("ffmpeg" ,ffmpeg) + ("libx11" ,libx11) ("libxrandr" ,libxrandr) ("libxtst" ,libxtst) - ("lzo" ,lzo) - ("python2-cryptography" ,python2-cryptography) - ("python2-dbus" ,python2-dbus) - ("python2-lz4" ,python2-lz4) - ("python2-lzo" ,python2-lzo) - ("python2-netifaces" ,python2-netifaces) - ("python2-numpy" ,python2-numpy) - ("python2-pillow" ,python2-pillow) - ("python2-pycairo" ,python2-pycairo) - ("python2-pycrypto" ,python2-pycrypto) - ("python2-pygobject" ,python2-pygobject) - ("python2-pyopengl" ,python2-pyopengl) - ("python2-pyopengl-accelerate" ,python2-pyopengl-accelerate) - ("python2-pygtk" ,python2-pygtk) - ("python2-rencode" ,python2-rencode) - ("xorg-server" ,xorg-server))) + ("libxfixes" ,libxfixes) + ("libxkbfile" ,libxkbfile) + ("libxcomposite" ,libxcomposite) + ("libxdamage" ,libxdamage) + ("libxext" ,libxext) + ("gtk+" ,gtk+) + ("python-pycairo" ,python-pycairo) + ("python-pygobject" ,python-pygobject) + ("xauth" ,xauth) + ("xorg-server" ,xorg-server) + ("xf86-video-dummy" ,xf86-video-dummy) + ("xf86-input-mouse" ,xf86-input-mouse) + ("xf86-input-keyboard" ,xf86-input-keyboard) + ("python-pillow" ,python-pillow) + ;; Optional dependencies. + ("python-rencode" ,python-rencode) ; For speed. + ("python-numpy", python-numpy) + ("python-pyopengl" ,python-pyopengl) ; Drawing acceleration. + ("python-pyopengl-accelerate" ,python-pyopengl-accelerate) ; Same. + ("python-paramiko" ,python-paramiko) ; Tunneling over SSH. + ("python-dbus" ,python-dbus) ; For desktop notifications. + ("dbus" ,dbus) ; For dbus-launch command. + ("python-lz4" ,python-lz4) ; Faster compression than zlib. + ("python-netifaces" ,python-netifaces))) (native-inputs `(("pkg-config" ,pkg-config) - ("python2-cython" ,python2-cython))) + ("python-cython" ,python-cython))) (arguments - `(#:python ,python-2 ;; no full Python 3 support yet - #:configure-flags '("--with-tests" - "--with-bundle_tests" - "--without-Xdummy" ;; We use Xvfb instead. - "--without-Xdummy_wrapper" - "--without-strict") + `(#:configure-flags '("--without-Xdummy" + "--without-Xdummy_wrapper" + "--with-opengl" + "--without-debug" + "--without-strict") ; Ignore compiler warnings. #:modules ((guix build python-build-system) (guix build utils)) - + #:tests? #f ; Do not run test-cases. This would rebuild all modules and + ; they seem to require python2. #:phases (modify-phases %standard-phases + ;; built by 'install phase (delete 'build) - (delete 'check) ;; There's no test suite at the moment. - - ;; Remove BUILD_CPU, BUILD_DATE, BUILD_TIME from build info to - ;; prevent deterministic issues. Also correct some directories and - ;; use the xvfb binary instead of xorg-server (which doesn't seem to - ;; work). - (add-before 'install 'remove-timestamps&set-file-names + (add-before 'install 'fix-paths (lambda* (#:key inputs outputs #:allow-other-keys) - (substitute* "add_build_info.py" - ((".*\"BUILD_CPU\", get_cpuinfo.*") "")) - (substitute* "add_build_info.py" - ((".*\"BUILD_DATE\", datetime.*") "")) - (substitute* "add_build_info.py" - ((".*\"BUILD_TIME\", datetime.*") "")) - (substitute* "setup.py" - (("/etc/init.d/") - (string-append (assoc-ref outputs "out") - "/etc/init.d/"))) - (substitute* "setup.py" - (("/usr/lib/") - (string-append (assoc-ref outputs "out") "/lib/"))) - ;; Use Xvfb with '-nolisten local' to disable abstract X11 sockets. - (substitute* "./xpra/scripts/config.py" - ((":.*join.*xvfb.*") - (string-append ": \"" (assoc-ref inputs "xorg-server") - "/bin/Xvfb +extension Composite" - " -screen 0 5760x2560x24+32 -dpi 96 -nolisten" - " tcp -nolisten local -noreset -auth" - " $XAUTHORITY\",\n"))) + ;; Fix binary paths. + (substitute* '("xpra/scripts/config.py" "xpra/x11/vfb_util.py") + (("\"Xvfb\"") + (string-append "\"" (assoc-ref inputs "xorg-server") "/bin/Xvfb\"")) + (("\"Xorg\"") + (string-append "\"" (assoc-ref inputs "xorg-server") "/bin/Xorg\"")) + (("\"xauth\"") + (string-append "\"" (assoc-ref inputs "xauth") "/bin/xauth\""))) + ;; Fix directory of config files. + (substitute* '("xpra/scripts/config.py" "xpra/platform/xposix/paths.py") + (("\"/etc/xpra/?\"") + (string-append "\"" (assoc-ref outputs "out") "/etc/xpra/\""))) + ;; XXX: Stolen from (gnu packages linux) + (define (append-to-file name body) + (let ((file (open-file name "a"))) + (display body file) + (close-port file))) + ;; Add Xorg module paths. + (append-to-file + "etc/xpra/xorg.conf" + (string-append "\nSection \"Files\"\nModulePath \"" + (assoc-ref inputs "xf86-video-dummy") "/lib/xorg/modules," + (assoc-ref inputs "xf86-input-mouse") "/lib/xorg/modules," + (assoc-ref inputs "xf86-input-keyboard") "/lib/xorg/modules," + (assoc-ref inputs "xorg-server") "/lib/xorg/modules\"\n" + "EndSection\n\n")) + (substitute* '("xpra/scripts/config.py" + "etc/xpra/conf.d/60_server.conf.in" + "unittests/unit/server/mixins/notification_test.py") + ;; The trailing -- is intentional, so we only replace it inside + ;; a command line. + (("dbus-launch --") + (string-append (assoc-ref inputs "dbus") "/bin/dbus-launch --"))) + ;; /run/user does not exist on guix system (substitute* "./xpra/scripts/config.py" (("socket-dir.*: \"\",") "socket-dir\" : \"~/.xpra\",")) - #t))))) + #t)) + ;; GTK3 will not be found, if GI can’t find its typelibs. + (add-after + 'install 'wrap-program + (lambda* (#:key outputs #:allow-other-keys) + (let ((prog (string-append (assoc-ref outputs "out") + "/bin/xpra"))) + ;; XXX: only export typelibs in inputs + (wrap-program prog + `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))) + #t)))))) (home-page "https://www.xpra.org/") (synopsis "Remote access to individual applications or full desktops") (description "Xpra is a persistent remote display server and client for -- cgit v1.2.3 From 2cb678cd04f6a77626b0a7d9ff9cba9ba00bb9ab Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Sat, 27 Jun 2020 15:14:25 +0200 Subject: gnu: python2-pyopengl-accelerate: Remove. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python2-pyopengl-accelerate): Remove variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d49443e689..b5b19c0ec3 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15496,22 +15496,6 @@ (define-public python2-pyopengl library.") (license license:bsd-3))) -(define-public python2-pyopengl-accelerate - (package - (inherit python2-pyopengl) - (name "python2-pyopengl-accelerate") - (version "3.1.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "PyOpenGL-accelerate" version)) - (sha256 - (base32 - "0464c1ifzk0k92lyndikmvzjgnx1y25r7bkkc8pnxm4kp1q4czwj")))) - (synopsis "Acceleration code for PyOpenGL") - (description - "This is the Cython-coded accelerator module for PyOpenGL."))) - (define-public python-pyopengl (package (name "python-pyopengl") -- cgit v1.2.3 From 7c55224ac685eee33082075a207d577640dad359 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Sat, 27 Jun 2020 15:15:03 +0200 Subject: gnu: python2-pyopengl: Remove. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python2-pyopengl): Remove variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b5b19c0ec3..6fe2ca0a2e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15474,28 +15474,6 @@ (define-public python-regex (define-public python2-regex (package-with-python2 python-regex)) -(define-public python2-pyopengl - (package - (name "python2-pyopengl") - (version "3.1.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "PyOpenGL" version)) - (sha256 - (base32 - "1byxjj6a8rwzhxhjqlc588zdad2qwxdd7vlam2653ylll31waiwv")))) - (arguments - `(#:python ,python-2)) - (build-system python-build-system) - (home-page "http://pyopengl.sourceforge.net") - (synopsis "Standard OpenGL bindings for Python") - (description - "PyOpenGL is the most common cross platform Python binding to OpenGL and -related APIs. The binding is created using the standard @code{ctypes} -library.") - (license license:bsd-3))) - (define-public python-pyopengl (package (name "python-pyopengl") -- cgit v1.2.3 From f28c09f2fc24f282d91c0c77c7a7722da0b82c44 Mon Sep 17 00:00:00 2001 From: Peter Lo Date: Sat, 27 Jun 2020 19:07:43 +0800 Subject: gnu: Add r-rismed. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/cran.scm (r-rismed): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/cran.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index e565438bc4..1ff7941baf 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -21,6 +21,7 @@ ;;; Copyright © 2020 Danjela Lura ;;; Copyright © 2020 Naga Malleswari ;;; Copyright © 2020 Eric Brown +;;; Copyright © 2020 Peter Lo ;;; ;;; This file is part of GNU Guix. ;;; @@ -22372,3 +22373,26 @@ (define-public r-shapforxgboost and force plot. It relies on the @code{XGBoost} package to produce SHAP values.") (license license:expat))) + +(define-public r-rismed + (package + (name "r-rismed") + (version "2.1.7") + (source + (origin + (method url-fetch) + (uri (cran-uri "RISmed" version)) + (sha256 + (base32 + "08dmkkxsmwp9b4h2g1bbx03cijn793fsnzkmbima8x9d42vxnm1l")))) + (properties `((upstream-name . "RISmed"))) + (build-system r-build-system) + (home-page "https://cran.r-project.org/web/packages/RISmed") + (synopsis "Download content from NCBI databases") + (description + "This package provides a set of tools to extract bibliographic +content from the National Center for Biotechnology Information (NCBI) +databases, including PubMed. The name RISmed is a portmanteau of +RIS (for Research Information Systems, a common tag format for +bibliographic data) and PubMed.") + (license license:gpl2+))) -- cgit v1.2.3 From 565bf214ad0258c66eef22c48e13c902a77ac439 Mon Sep 17 00:00:00 2001 From: Peter Lo Date: Sat, 27 Jun 2020 19:48:20 +0800 Subject: gnu: Add r-semver. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/cran.scm (r-semver): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/cran.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 1ff7941baf..60a99d1664 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -22396,3 +22396,29 @@ (define-public r-rismed RIS (for Research Information Systems, a common tag format for bibliographic data) and PubMed.") (license license:gpl2+))) + +(define-public r-semver + (package + (name "r-semver") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "semver" version)) + (sha256 + (base32 + "10wpkyms2cix3bsin2q0qhkbl445pwwpa5gm2s4jjw1989namkxy")))) + (properties `((upstream-name . "semver"))) + (build-system r-build-system) + (propagated-inputs + `(("r-assertthat" ,r-assertthat) + ("r-rcpp" ,r-rcpp))) + (native-inputs `(("r-knitr" ,r-knitr))) + (home-page "https://github.com/johndharrison/semver") + (synopsis "Parser for Semantic Versioning 2.0.0") + (description + "This package provides tools and functions for parsing, rendering and +operating on semantic version strings. Semantic versioning is a simple set of +rules and requirements that dictate how version numbers are assigned and +incremented as outlined at @url{http://semver.org}.") + (license license:expat))) -- cgit v1.2.3 From 85d9f9bae696ba3e773f408d76a4028d0fb0d4b4 Mon Sep 17 00:00:00 2001 From: Peter Lo Date: Sat, 27 Jun 2020 19:48:21 +0800 Subject: gnu: Add r-binman. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/cran.scm (r-binman): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/cran.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 60a99d1664..6e196635e0 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -22422,3 +22422,34 @@ (define-public r-semver rules and requirements that dictate how version numbers are assigned and incremented as outlined at @url{http://semver.org}.") (license license:expat))) + +(define-public r-binman + (package + (name "r-binman") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "binman" version)) + (sha256 + (base32 + "0hm0h285p4v9lhrqjy8s22f1s1vmfpfla5iaycpj8vw3qb3632az")))) + (properties `((upstream-name . "binman"))) + (build-system r-build-system) + (propagated-inputs + `(("r-assertthat" ,r-assertthat) + ("r-httr" ,r-httr) + ("r-jsonlite" ,r-jsonlite) + ("r-rappdirs" ,r-rappdirs) + ("r-semver" ,r-semver) + ("r-xml2" ,r-xml2) + ("r-yaml" ,r-yaml))) + (native-inputs `(("r-knitr" ,r-knitr))) + (home-page "https://github.com/ropensci/binman") + (synopsis "Binary download manager") + (description + "This package provides tools and functions for managing the download of +binary files. Binary repositories are defined in the YAML format. Defining +new pre-download, download and post-download templates allow additional +repositories to be added.") + (license license:expat))) -- cgit v1.2.3 From 719034c1a3af03bbb5b9a6af15f9a53dd104a37d Mon Sep 17 00:00:00 2001 From: Peter Lo Date: Sat, 27 Jun 2020 19:48:22 +0800 Subject: gnu: Add r-wdman. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/cran.scm (r-wdman): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/cran.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 6e196635e0..bbc95866ab 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -22453,3 +22453,36 @@ (define-public r-binman new pre-download, download and post-download templates allow additional repositories to be added.") (license license:expat))) + +(define-public r-wdman + (package + (name "r-wdman") + (version "0.2.5") + (source + (origin + (method url-fetch) + (uri (cran-uri "wdman" version)) + (sha256 + (base32 + "1yf41lsrr9dbf5n4f5hv9mlmzl736fhnp9gxkm2g9apws6gsig02")))) + (properties `((upstream-name . "wdman"))) + (build-system r-build-system) + (propagated-inputs + `(("r-assertthat" ,r-assertthat) + ("r-binman" ,r-binman) + ("r-processx" ,r-processx) + ("r-semver" ,r-semver) + ("r-yaml" ,r-yaml))) + (native-inputs `(("r-knitr" ,r-knitr))) + (home-page "https://docs.ropensci.org/wdman/") + (synopsis "Webdriver/Selenium binary manager") + (description + "There are a number of binary files associated with the +Webdriver/Selenium project (see @url{http://www.seleniumhq.org/download/}, +@url{https://sites.google.com/a/chromium.org/chromedriver/}, +@url{https://github.com/mozilla/geckodriver}, +@url{http://phantomjs.org/download.html}, and +@url{https://github.com/SeleniumHQ/selenium/wiki/InternetExplorerDriver} for +more information). This package provides functions to download these binaries +and to manage processes involving them.") + (license license:expat))) -- cgit v1.2.3 From 170bffff550d4121e78c5c32d2c50177fa2e4c7d Mon Sep 17 00:00:00 2001 From: Peter Lo Date: Sat, 27 Jun 2020 19:48:23 +0800 Subject: gnu: Add r-rselenium. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/cran.scm (r-rselenium): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/cran.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index bbc95866ab..1ffb3f0a35 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -22486,3 +22486,38 @@ (define-public r-wdman more information). This package provides functions to download these binaries and to manage processes involving them.") (license license:expat))) + +(define-public r-rselenium + (package + (name "r-rselenium") + (version "1.7.7") + (source + (origin + (method url-fetch) + (uri (cran-uri "RSelenium" version)) + (sha256 + (base32 + "1xn5fdbzmq7b1f5fc9ls23g177bmnd8bn4p4d8aafr6z3jwkmfir")))) + (properties `((upstream-name . "RSelenium"))) + (build-system r-build-system) + (propagated-inputs + `(("r-binman" ,r-binman) + ("r-catools" ,r-catools) + ("r-httr" ,r-httr) + ("r-openssl" ,r-openssl) + ("r-wdman" ,r-wdman) + ("r-xml" ,r-xml))) + (native-inputs `(("r-knitr" ,r-knitr))) + (home-page "https://docs.ropensci.org/RSelenium/") + (synopsis "R bindings for Selenium WebDriver") + (description + "This package provides a set of R bindings for the Selenium 2.0 +WebDriver (see @url{https://selenium.dev/documentation/en/} for more +information) using the @code{JsonWireProtocol} (see +@url{https://github.com/SeleniumHQ/selenium/wiki/JsonWireProtocol} for more +information). Selenium 2.0 WebDriver allows driving a web browser natively as +a user would either locally or on a remote machine using the Selenium server +it marks a leap forward in terms of web browser automation. Selenium +automates web browsers (commonly referred to as browsers). Using RSelenium +you can automate browsers locally or remotely.") + (license license:agpl3+))) -- cgit v1.2.3 From 399d89b5c8cf60f0ef4f4f5e1699c5d92a51f015 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 13 Jul 2020 15:51:46 +0300 Subject: gnu: micropython: Update to 1.12. * gnu/packages/python.scm (micropython): Update to 1.12. [arguments]: Add phase to compile mpy-cross before compiling micropython. --- gnu/packages/python.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index e2b254bf6f..45d7288817 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -14,7 +14,7 @@ ;;; Copyright © 2015, 2016, 2017 Leo Famulari ;;; Copyright © 2015, 2017 Ben Woodcroft ;;; Copyright © 2015, 2016 Erik Edrosa -;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2015, 2017 Kyle Meyer ;;; Copyright © 2015, 2016 Chris Marusich ;;; Copyright © 2016 Danny Milosavljevic @@ -589,7 +589,7 @@ (define-public python-minimal-wrapper (wrap-python3 python-minimal)) (define-public micropython (package (name "micropython") - (version "1.11") + (version "1.12") (source (origin (method url-fetch) @@ -598,7 +598,7 @@ (define-public micropython "/micropython-" version ".tar.gz")) (sha256 (base32 - "0px3xhw16rl0l7qifq7jw1gq92wzlnhd17dmszv9m2c3wbzs9p9f")) + "1fl1dm2aay23hyqbarnv69qj7z2wljcvkwmvfwfac8yadcv05zcq")) (modules '((guix build utils))) (snippet '(begin @@ -612,7 +612,11 @@ (define-public micropython (arguments `(#:phases (modify-phases %standard-phases - (add-before 'build 'prepare-build + (add-before 'build 'build-mpy-cross + (lambda* (#:key make-flags #:allow-other-keys) + (with-directory-excursion "mpy-cross" + (apply invoke "make" make-flags)))) + (add-after 'build-mpy-cross 'prepare-build (lambda _ (chdir "ports/unix") ;; see: https://github.com/micropython/micropython/pull/4246 -- cgit v1.2.3 From efb10f175fa6323024aa471c58ea1da445085298 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 13 Jul 2020 16:43:58 +0200 Subject: packages: Ensure bags are insensitive to '%current-system'. Fixes . Reported by Jan Nieuwenhuizen . This is a followup to f52fbf7094c9c346d38ad469cc8d92d18387786e. * guix/packages.scm (bag-transitive-inputs, bag-transitive-build-inputs) (bag-transitive-host-inputs, bag-transitive-target-inputs): Parameterize %CURRENT-SYSTEM in addition to %CURRENT-TARGET-SYSTEM. * tests/packages.scm ("package->bag, sensitivity to %current-system"): New test. --- guix/packages.scm | 12 ++++++++---- tests/packages.scm | 14 ++++++++++++++ 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/guix/packages.scm b/guix/packages.scm index 68ef718872..95d7c2cc0d 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -923,22 +923,26 @@ (define (bag-direct-inputs bag) (define (bag-transitive-inputs bag) "Same as 'package-transitive-inputs', but applied to a bag." - (parameterize ((%current-target-system #f)) + (parameterize ((%current-target-system #f) + (%current-system (bag-system bag))) (transitive-inputs (bag-direct-inputs bag)))) (define (bag-transitive-build-inputs bag) "Same as 'package-transitive-native-inputs', but applied to a bag." - (parameterize ((%current-target-system #f)) + (parameterize ((%current-target-system #f) + (%current-system (bag-system bag))) (transitive-inputs (bag-build-inputs bag)))) (define (bag-transitive-host-inputs bag) "Same as 'package-transitive-target-inputs', but applied to a bag." - (parameterize ((%current-target-system (bag-target bag))) + (parameterize ((%current-target-system (bag-target bag)) + (%current-system (bag-system bag))) (transitive-inputs (bag-host-inputs bag)))) (define (bag-transitive-target-inputs bag) "Return the \"target inputs\" of BAG, recursively." - (parameterize ((%current-target-system (bag-target bag))) + (parameterize ((%current-target-system (bag-target bag)) + (%current-system (bag-system bag))) (transitive-inputs (bag-target-inputs bag)))) (define* (package-closure packages #:key (system (%current-system))) diff --git a/tests/packages.scm b/tests/packages.scm index 26377b269b..6aa36170d2 100644 --- a/tests/packages.scm +++ b/tests/packages.scm @@ -1110,6 +1110,20 @@ (define read-at (("dep" package) (eq? package dep))))) +(test-assert "package->bag, sensitivity to %current-system" + (let* ((dep (dummy-package "dep" + (propagated-inputs (if (string=? (%current-system) + "i586-gnu") + `(("libxml2" ,libxml2)) + '())))) + (pkg (dummy-package "foo" + (native-inputs `(("dep" ,dep))))) + (bag (package->bag pkg (%current-system) "i586-gnu"))) + (equal? (parameterize ((%current-system "x86_64-linux")) + (bag-transitive-inputs bag)) + (parameterize ((%current-system "i586-gnu")) + (bag-transitive-inputs bag))))) + (test-assert "package->bag, sensitivity to %current-target-system" (let* ((dep (dummy-package "dep" (propagated-inputs (if (%current-target-system) -- cgit v1.2.3 From b418a0b07bf26cddf7b43ada5c8977f43cfadca0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 13 Jul 2020 19:29:53 +0200 Subject: gnu: claws-mail: Update to 3.17.6. * gnu/packages/mail.scm (claws-mail): Update to 3.17.6. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 326173c180..b4af56d59e 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1186,7 +1186,7 @@ (define-public compface (define-public claws-mail (package (name "claws-mail") - (version "3.17.5") + (version "3.17.6") (source (origin (method url-fetch) (uri (string-append @@ -1194,7 +1194,7 @@ (define-public claws-mail ".tar.xz")) (sha256 (base32 - "1gjrmdmhc7zzilrlss9yl86ybv9sra8v0qi7mkwv7d9azidx5kns")))) + "1s05qw0r0gqwvvkxvrrwbjkbi61dvilixiwrpgcq21qc9csc9r0m")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("bogofilter" ,bogofilter) -- cgit v1.2.3 From 62cf0cfda33edec96283cf236bddbe7181de9052 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 13 Jul 2020 19:48:54 +0200 Subject: gnu: fping: Update to 4.3. * gnu/packages/networking.scm (fping): Update to 4.3. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 53599fe191..4171cdc5af 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -985,14 +985,14 @@ (define-public wireshark (define-public fping (package (name "fping") - (version "4.2") + (version "4.3") (source (origin (method url-fetch) (uri (string-append "https://fping.org/dist/fping-" version ".tar.gz")) (sha256 - (base32 "0jmnf4vmr43aiwk3h2b5qdsb95gxar8gz1yli8fswnm9nrs9ccvx")))) + (base32 "0b9ppwibc0dx2ns95m0z1b28939af1c8yvgjbhnr9f7p8bl0l14j")))) (build-system gnu-build-system) (home-page "https://fping.org/") (synopsis "Send ICMP ECHO_REQUEST packets to network hosts") -- cgit v1.2.3 From 0ea04bad3b1205e3b50462e3f10219e6460fef21 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 13 Jul 2020 19:51:37 +0200 Subject: gnu: urlscan: Update to 0.9.5. * gnu/packages/mail.scm (urlscan): Update to 0.9.5. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index b4af56d59e..84725b14a4 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2961,13 +2961,13 @@ (define-public imapfilter (define-public urlscan (package (name "urlscan") - (version "0.9.4") + (version "0.9.5") (source (origin (method url-fetch) (uri (pypi-uri "urlscan" version)) (sha256 - (base32 "1q0vxv9haap01vz1cbkzss62cgwb9365lv5vnkg2gbpx4g5y7a9l")))) + (base32 "07vcwirap0p4dkqrqblfn1q017slgd8m6qyijvbi3gxnr09pbyx2")))) (build-system python-build-system) (propagated-inputs `(("python-urwid" ,python-urwid))) -- cgit v1.2.3 From acfb487e47c3a755df107d9fc7b4e444107f916d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 13 Jul 2020 19:59:33 +0200 Subject: gnu: sslh: Update to 1.21. * gnu/packages/networking.scm (sslh): Update to 1.21. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 4171cdc5af..d4c8905974 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1778,7 +1778,7 @@ (define-public enet (define-public sslh (package (name "sslh") - (version "1.20") + (version "1.21") (source (origin (method git-fetch) @@ -1787,7 +1787,7 @@ (define-public sslh (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "18zhkqlwfh6f5dg1a41a4p7p9g94dgb9nwls1ksy9r5yz174i2fx")))) + (base32 "1hqnqzxaabqrvjh24p30yr9f71s2q6ddvlqmycf9b71qq5nj4xrf")))) (build-system gnu-build-system) (native-inputs `(;; Test dependencies. -- cgit v1.2.3 From 9c77cbba3d5bf688f75bd14010d656b45cc794c8 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 13 Jul 2020 15:48:40 -0400 Subject: gnu: tremc: Update to 0.9.2. * gnu/packages/bittorrent.scm (tremc): Update to 0.9.2. --- gnu/packages/bittorrent.scm | 62 ++++++++++++++++++++++----------------------- 1 file changed, 30 insertions(+), 32 deletions(-) diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index edae9be461..be10a34a6c 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 Taylan Ulrich Bayirli/Kammer ;;; Copyright © 2014, 2015, 2016 Ludovic Courtès -;;; Copyright © 2016, 2017, 2018, 2019 Leo Famulari +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Leo Famulari ;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2016 Tomáš Čech ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice @@ -183,38 +183,36 @@ (define-public rtorrent (license l:gpl2+))) (define-public tremc - (let ((commit "4d50dab7376601daca13f7be6eabc0eaa057c1b0") - (revision "0")) - (package - (name "tremc") - (version (git-version "0.9.1" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/tremc/tremc") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0qpi65n8rv7l9mg8qyqx70z83inkl8v5r5nks65c99lhscdki0w7")))) - (build-system gnu-build-system) - (arguments - `(#:tests? #f ; no test suite - #:make-flags - (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) - #:phases - (modify-phases %standard-phases - ;; The software is just a Python script that must be copied into place. - (delete 'configure) - (delete 'build)))) - (inputs - `(("python" ,python))) - (synopsis "Console client for the Transmission BitTorrent daemon") - (description "Tremc is a console client, with a curses interface, for the + (package + (name "tremc") + (version "0.9.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tremc/tremc") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1fqspp2ckafplahgba54xmx0sjidx1pdzyjaqjhz0ivh98dkx2n5")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no test suite + #:make-flags + (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + ;; The software is just a Python script that must be copied into place. + (delete 'configure) + (delete 'build)))) + (inputs + `(("python" ,python))) + (synopsis "Console client for the Transmission BitTorrent daemon") + (description "Tremc is a console client, with a curses interface, for the Transmission BitTorrent daemon.") - (home-page "https://github.com/tremc/tremc") - (license l:gpl3+)))) + (home-page "https://github.com/tremc/tremc") + (license l:gpl3+))) (define-public transmission-remote-cli (package -- cgit v1.2.3 From c9d939268262beef44395e37bd95b1144afa6d88 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 13 Jul 2020 23:34:41 +0200 Subject: gnu: emacs-hyperbole: Update to 7.1.2. * gnu/packages/emacs-xyz.scm (emacs-hyperbole): Update to 7.1.2. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 9e053da7df..5897435927 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -259,14 +259,14 @@ (define-public emacs-ac-geiser (define-public emacs-hyperbole (package (name "emacs-hyperbole") - (version "7.0.6") + (version "7.1.2") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "hyperbole-" version ".tar")) (sha256 - (base32 "08gi4v76s53nfmn3s0qcxc3zii0pspjfd6ry7jq1kgm3z34x8hab")) + (base32 "1bspmqnbniwr9385wh823dsr5fgch5qnlkf45s4vi0nvg8jdccp1")) (patches (search-patches "emacs-hyperbole-toggle-messaging.patch")))) (build-system emacs-build-system) -- cgit v1.2.3 From 455933c60554ce8a60d58c9e2713d74456d235ce Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 13 Jul 2020 23:36:35 +0200 Subject: gnu: emacs-delight: Update to 1.7. * gnu/packages/emacs-xyz.scm (emacs-delight): Update to 1.7. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 5897435927..bcbc0a5e68 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -23003,14 +23003,14 @@ (define-public emacs-mwim (define-public emacs-delight (package (name "emacs-delight") - (version "1.5") + (version "1.7") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "delight-" version ".el")) (sha256 - (base32 "0kzlvzwmn6zj0874086q2xw0pclyi7wlkq48zh2lkd2796xm8vw7")))) + (base32 "0pihsghrf9xnd1kqlq48qmjcmp5ra95wwwgrb3l8m1wagmmc0bi1")))) (build-system emacs-build-system) (home-page "https://elpa.gnu.org/packages/delight.html") (synopsis "Dimmer switch for your mode-line lighter text") -- cgit v1.2.3 From 7d212938ff93bc5e8a7c5184229f31118d41ae67 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 13 Jul 2020 19:49:34 +0200 Subject: gnu: fping: Edit description. * gnu/packages/networking.scm (fping)[description]: Fix a typo & mark it up. --- gnu/packages/networking.scm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index d4c8905974..d5f86fb09b 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -997,13 +997,14 @@ (define-public fping (home-page "https://fping.org/") (synopsis "Send ICMP ECHO_REQUEST packets to network hosts") (description - "fping is a ping like program which uses the Internet Control Message -Protocol (ICMP) echo request to determine if a target host is responding. -fping differs from ping in that you can specify any number of targets on the -command line, or specify a file containing the lists of targets to ping. -Instead of sending to one target until it times out or replies, fping will -send out a ping packet and move on to the next target in a round-robin -fashion.") + "fping is a ping-like program which uses @acronym{ICMP, Internet Control +Message Protocol} echo requests to determine if a target host is responding. + +@command{fping} differs from @command{ping} in that you can specify any number +of targets on the command line, or specify a file containing the lists of +targets to ping. Instead of sending to one target until it times out or +replies, fping will send out a ping packet and move on to the next target in a +round-robin fashion.") (license license:expat))) (define-public gandi.cli -- cgit v1.2.3 From 0ac65c8bed7e8f65ece3ae8f5fa2e7c0e4b027d6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 13 Jul 2020 19:52:55 +0200 Subject: gnu: urlscan: Edit description. * gnu/packages/mail.scm (urlscan)[description]: Replace inappropriate @code{}. --- gnu/packages/mail.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 84725b14a4..8b802ddea5 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2975,12 +2975,12 @@ (define-public urlscan (synopsis "View/select the URLs in an email message or file") (description "Urlscan is a small program that is designed to integrate with the -@code{mutt} mailreader to allow you to easily launch a Web browser for URLs +Mutt mail reader to allow you to easily launch a Web browser for URLs contained in email messages. It parses an email message or file and scans it for URLs and email addresses. It then displays the URLs and their context within the message, and allows you to choose one or more URLs to send to your -Web browser. Alternatively, it send a list of all URLs to stdout. It is a -replacement for the @code{urlview} program.") +Web browser. Alternatively, it send a list of all URLs to standard output. +It is a replacement for the @command{urlview} program.") (license gpl2))) (define-public tnef -- cgit v1.2.3 From 338f5428d6ca1a76a80e8378650d8b8b5e0600d4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 14 Jul 2020 02:00:25 +0200 Subject: gnu: singularity: Refer to egrep. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/linux.scm (singularity)[arguments]: Rename ‘patch-reference-to-squashfs-tools’ to ‘patch-references’ and add egrep. Reported by slimjim on #guix. --- gnu/packages/linux.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 9fa7d0cd54..80f546e056 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3937,12 +3937,18 @@ (define-public singularity `(#:configure-flags '("--localstatedir=/var") #:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-reference-to-squashfs-tools + (add-after 'unpack 'patch-references (lambda _ (substitute* "libexec/cli/build.exec" (("if ! singularity_which mksquashfs") "if 0") (("if ! mksquashfs") (string-append "if ! " (which "mksquashfs")))) + (substitute* (list "libexec/cli/help.exec" + "libexec/bootstrap-scripts/functions" + "libexec/bootstrap-scripts/post.sh" + "libexec/functions") + (("egrep ") + (string-append (which "egrep") " "))) #t)) (add-after 'install 'set-PATH (lambda* (#:key inputs outputs #:allow-other-keys) -- cgit v1.2.3 From 927ecd4ebe234b46d6386a61e1b9a11bd4d3243c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 14 Jul 2020 03:06:05 +0200 Subject: gnu: mbedtls-apache: Update to 2.23.0 [security fixes]. * gnu/packages/tls.scm (mbedtls-apache): Update to 2.23.0. [source]: Use GIT-FETCH and GIT-FILE-NAME. [arguments]: Make source files writable. Enable threading. --- gnu/packages/tls.scm | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 37f62c95bf..1003ae81a8 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -891,22 +891,39 @@ (define-public acme-client (define-public mbedtls-apache (package (name "mbedtls-apache") - (version "2.16.6") + ;; XXX Check whether ‘-Wformat-signedness’ below still breaks when updating. + (version "2.23.0") (source (origin - (method url-fetch) - ;; XXX: The download links on the website are script redirection links - ;; which effectively lead to the format listed in the uri here. - (uri (string-append "https://tls.mbed.org/download/mbedtls-" - version "-apache.tgz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/ARMmbed/mbedtls") + (commit (string-append "mbedtls-" version)))) (sha256 - (base32 - "0w0p51vx0cc6fyqfdn59669q6n4187vi64fw5ha302hrlqimwib6")))) + (base32 "13fa9h2i989cbf8n8c0j019mshv6wg213va18my1s787lhcq2d62")) + (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments `(#:configure-flags (list "-DUSE_SHARED_MBEDTLS_LIBRARY=ON" - "-DUSE_STATIC_MBEDTLS_LIBRARY=OFF"))) + "-DUSE_STATIC_MBEDTLS_LIBRARY=OFF") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'make-source-writable + (lambda _ + (for-each make-file-writable (find-files ".")) + #t)) + (add-before 'configure 'enable-features + ;; Some packages like Hiawatha depend on ’less embedded’ features. + (lambda _ + (substitute* "include/mbedtls/config.h" + (("//(#define MBEDTLS_THREADING_(C|PTHREAD))" + _ match) + match)) + ;; XXX The above enables code that breaks with -Werror… + (substitute* "CMakeLists.txt" + ((" -Wformat-signedness") "")) + #t))))) (native-inputs `(("perl" ,perl) ("python" ,python))) -- cgit v1.2.3 From 765684613f705bf1aef57c1761836de4051f4889 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 14 Jul 2020 03:07:44 +0200 Subject: gnu: hiawatha: Update to 10.11. * gnu/packages/web.scm (hiawatha): Update to 10.11. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index c7f4337e2a..c0a3134a89 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5822,7 +5822,7 @@ (define-public tidy-html (define-public hiawatha (package (name "hiawatha") - (version "10.10") + (version "10.11") (source (origin (method url-fetch) @@ -5835,7 +5835,7 @@ (define-public hiawatha (list "extra/nghttp2.tgz" "mbedtls")) #t)) (sha256 - (base32 "1nd46cx1qp5lh2kwnn2mlwk9zm8jm7pgf90xs9vpwr7saxbnzr5m")))) + (base32 "09wpgilbv13zal71v9lbsqr8c3fignygadykpd1p1pb8blb5vn3r")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; no tests included -- cgit v1.2.3 From dbfd8044254f794c7ee56ae275522674e180bc9c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 14 Jul 2020 03:13:26 +0200 Subject: gnu: usb-modeswitch: Update to 2.6.1. * gnu/packages/usb-modeswitch.scm (usb-modeswitch): Update to 2.6.1. --- gnu/packages/usb-modeswitch.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/usb-modeswitch.scm b/gnu/packages/usb-modeswitch.scm index 6de810d23d..990b364be8 100644 --- a/gnu/packages/usb-modeswitch.scm +++ b/gnu/packages/usb-modeswitch.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright 2019, 2020 Florian Pelz +;;; Copyright 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -76,7 +77,7 @@ (define-public usb-modeswitch-data (define-public usb-modeswitch (package (name "usb-modeswitch") - (version "2.6.0") + (version "2.6.1") (source (origin (method url-fetch) (uri (string-append @@ -84,7 +85,7 @@ (define-public usb-modeswitch "usb-modeswitch-" version ".tar.bz2")) (sha256 (base32 - "18wbbxc5cfsmikba0msdvd5qlaga27b32nhrzicyd9mdddp265f2")))) + "0d7s8p92r36danjd15y1zaznf6rbk17kxyg9367nabz56vhxk5ai")))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("libusb" ,libusb) ("jimtcl" ,jimtcl) -- cgit v1.2.3 From 9cb208d86b0fae4b5c2b9ef4fa38a43594434c78 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 14 Jul 2020 03:24:35 +0200 Subject: gnu: usb-modeswitch: Use CC-FOR-TARGET. * gnu/packages/usb-modeswitch.scm (usb-modeswitch)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/usb-modeswitch.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/usb-modeswitch.scm b/gnu/packages/usb-modeswitch.scm index 990b364be8..2ca4da5e3c 100644 --- a/gnu/packages/usb-modeswitch.scm +++ b/gnu/packages/usb-modeswitch.scm @@ -23,6 +23,7 @@ (define-module (gnu packages usb-modeswitch) #:use-module (guix download) #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) + #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages base) #:use-module (gnu packages compression) @@ -94,7 +95,8 @@ (define-public usb-modeswitch (build-system gnu-build-system) (arguments `(#:tests? #f ; does not support `make check` - #:make-flags (list "CC=gcc") + #:make-flags + (list ,(string-append "CC=" (cc-for-target))) #:phases (modify-phases %standard-phases (delete 'configure) ; no configure script -- cgit v1.2.3 From 5cdb25c6866014b2c7a7bca64c07712f328486f5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 14 Jul 2020 03:50:47 +0200 Subject: gnu: mbedtls-apache-for-hiawatha: Fix. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There's already a custom embedtls-apache variant for Hiawatha. Fix it instead of enabling threading for embedtls-apache. * gnu/packages/tls.scm (embedtls-for-hiawatha): Fix usage of SUBSTITUTE-KEYWORD-ARGUMENTS. Disable -Wformat-signedness. (embedtls-for-hiawatha): Remove ‘enable-features’ phase. --- gnu/packages/tls.scm | 38 +++++++++++++++----------------------- 1 file changed, 15 insertions(+), 23 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 1003ae81a8..408a9e1e67 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -891,7 +891,8 @@ (define-public acme-client (define-public mbedtls-apache (package (name "mbedtls-apache") - ;; XXX Check whether ‘-Wformat-signedness’ below still breaks when updating. + ;; XXX Check whether ‘-Wformat-signedness’ still breaks mbedtls-for-hiawatha + ;; when updating. (version "2.23.0") (source (origin @@ -912,17 +913,6 @@ (define-public mbedtls-apache (add-after 'unpack 'make-source-writable (lambda _ (for-each make-file-writable (find-files ".")) - #t)) - (add-before 'configure 'enable-features - ;; Some packages like Hiawatha depend on ’less embedded’ features. - (lambda _ - (substitute* "include/mbedtls/config.h" - (("//(#define MBEDTLS_THREADING_(C|PTHREAD))" - _ match) - match)) - ;; XXX The above enables code that breaks with -Werror… - (substitute* "CMakeLists.txt" - ((" -Wformat-signedness") "")) #t))))) (native-inputs `(("perl" ,perl) @@ -942,17 +932,19 @@ (define-public mbedtls-for-hiawatha (package (inherit mbedtls-apache) (arguments - (substitute-keyword-arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'configure 'configure-extra-features - (lambda _ - (for-each (lambda (feature) - (invoke "scripts/config.pl" "set" feature)) - (list "MBEDTLS_THREADING_C" - "MBEDTLS_THREADING_PTHREAD")) - #t))) - ,@(package-arguments mbedtls-apache))))))) + (substitute-keyword-arguments (package-arguments mbedtls-apache) + ((#:phases phases) + `(modify-phases ,phases + (add-before 'configure 'configure-extra-features + (lambda _ + (for-each (lambda (feature) + (invoke "scripts/config.pl" "set" feature)) + (list "MBEDTLS_THREADING_C" + "MBEDTLS_THREADING_PTHREAD")) + ;; XXX The above enables code that breaks with -Werror… + (substitute* "CMakeLists.txt" + ((" -Wformat-signedness") "")) + #t))))))))) (define-public dehydrated (package -- cgit v1.2.3 From 1f5cc686b70858245b5a20f3ee13e85565cd5ced Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 14 Jul 2020 03:52:42 +0200 Subject: gnu: mutt: Update to 1.14.6. * gnu/packages/mail.scm (mutt): Update to 1.14.6. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 8b802ddea5..930e7a42cc 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -421,7 +421,7 @@ (define-public fetchmail (define-public mutt (package (name "mutt") - (version "1.14.5") + (version "1.14.6") (source (origin (method url-fetch) (uri (list @@ -431,7 +431,7 @@ (define-public mutt version ".tar.gz"))) (sha256 (base32 - "0p1xiqzmkqlzy5yi4l0dh0lacdq300zdj48zk0fir8j1pp512sri")) + "0i0q6vwhnb1grimsrpmz8maw255rh9k0laijzxkry6xqa80jm5s7")) (patches (search-patches "mutt-store-references.patch")))) (build-system gnu-build-system) (inputs -- cgit v1.2.3 From 8612b073c68aa796b91ec0d999e158426529fd24 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 14 Jul 2020 03:56:56 +0200 Subject: gnu: libzip: Update to 1.7.2. * gnu/packages/compression.scm (libzip): Update to 1.7.2. --- gnu/packages/compression.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index fd5483b015..8c6b9f3b69 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1612,14 +1612,14 @@ (define-public zziplib (define-public libzip (package (name "libzip") - (version "1.7.1") + (version "1.7.2") (source (origin (method url-fetch) (uri (string-append "https://libzip.org/download/libzip-" version ".tar.xz")) (sha256 (base32 - "1b4pl3dhva80lg9pmsg82cw40pnn0n35z823irsam7x72wdxq850")))) + "0kpz85yqgn0yrrc9bfq95ssbvvs6q525xwq6mvkfv5hjvijvc4vj")))) (native-inputs `(("perl" ,perl))) (inputs -- cgit v1.2.3 From c319c895734761a7010d1e3667d860fa49f6f563 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 14 Jul 2020 10:55:07 +0300 Subject: gnu: font-gnu-freefont: Update to 13.0.03. * gnu/packages/fonts.scm (font-gnu-unifont): Update to 13.0.03. --- gnu/packages/fonts.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 00048862c6..38b342f770 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -710,7 +710,7 @@ (define-public font-anonymous-pro-minus (define-public font-gnu-unifont (package (name "font-gnu-unifont") - (version "13.0.02") + (version "13.0.03") (source (origin (method url-fetch) @@ -720,7 +720,7 @@ (define-public font-gnu-unifont (string-append "mirror://gnu/unifont/unifont-" version "/unifont-" version ".tar.gz"))) (sha256 - (base32 "1fg908qadh14kfbpzqfj3vgzlxgx68sdlwhl2prz7arq5r45dami")))) + (base32 "04l2sbg6il78qsj3jxqfbz5k1xzihvw8vdlckgkp4zfr0nh2q7h7")))) (build-system gnu-build-system) (outputs '("out" ; TrueType version "pcf" ; PCF (bitmap) version -- cgit v1.2.3 From 82990835cd040e330b9a6c29637f32d305ca1f61 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 14 Jul 2020 10:58:39 +0200 Subject: gnu: emacs-paren-face: Update to 1.0.6. * gnu/packages/emacs-xyz.scm (emacs-paren-face): Update to 1.0.6. [synopsis, description]: Fix typo. --- gnu/packages/emacs-xyz.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index bcbc0a5e68..18cdb86661 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3428,7 +3428,7 @@ (define-public emacs-undercover (define-public emacs-paren-face (package (name "emacs-paren-face") - (version "1.0.5") + (version "1.0.6") (source (origin (method git-fetch) @@ -3437,17 +3437,16 @@ (define-public emacs-paren-face (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 - "04vkg8fhdn8x02dydxbwpizh2yn3sbmn9432v770vbbq6b62k2lx")))) + (base32 "17bdcxah216z928387yx6z9lmp4jsi461n8fwiqaibn2qy5fagas")))) (build-system emacs-build-system) (home-page "https://github.com/tarsius/paren-face") - (synopsis "Face for parentheses in lisp modes") + (synopsis "Face for parentheses in Lisp modes") (description "This library defines a face named @code{parenthesis} used just for parentheses. The intended purpose of this face is to make parentheses less visible in Lisp code by dimming them. Lispers probably don't need to be constantly made aware of the existence of the parentheses. Dimming them might -be even more useful for people new to lisp who have not yet learned to +be even more useful for people new to Lisp who have not yet learned to subconsciously blend out the parentheses.") (license license:gpl3+))) -- cgit v1.2.3 From 3c27256c9b5bffe367d53d4b2db6ccf5d293a384 Mon Sep 17 00:00:00 2001 From: Morgan Smith Date: Sat, 11 Jul 2020 08:40:50 -0400 Subject: gnu: Add emacs-org-drill. * gnu/packages/emacs-xyz.scm (emacs-org-drill): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 18cdb86661..0ed8827594 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -5519,6 +5519,31 @@ (define-public emacs-org-bullets @code{org-mode} to be rendered as UTF-8 characters.") (license license:gpl3+))) +(define-public emacs-org-drill + (package + (name "emacs-org-drill") + (version "2.7.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/phillord/org-drill") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "13y302lyscdqrba1sfx60yf5ji2xi7fbsvjsjbw7hiz63kg6rccy")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-org" ,emacs-org) + ("emacs-persist" ,emacs-persist))) + (home-page "https://gitlab.com/phillord/org-drill") + (synopsis "Flash card memorization system using Org mode") + (description + "This package uses spaced repetition algorithms to conduct interactive +drill sessions to aid in memorization. In these sessions you are shown flash +cards created in Org mode.") + (license license:gpl3+))) + (define-public emacs-org-superstar (package (name "emacs-org-superstar") -- cgit v1.2.3 From edda093807767338e0fd339edeb43f6015c4217c Mon Sep 17 00:00:00 2001 From: Morgan Smith Date: Fri, 10 Jul 2020 22:08:59 -0400 Subject: gnu: Add emacs-literate-calc-mode. * gnu/packages/emacs-xyz.scm (emacs-literate-calc-mode): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0ed8827594..f8e7ec9f4f 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3541,6 +3541,34 @@ (define-public emacs-litable (description "This package provides dynamic evaluation in Emacs.") (license license:gpl3+)))) +(define-public emacs-literate-calc-mode + (let ((commit "e855bd718fa7d0d70b8f43264e10664369dd3a37") + (revision "0")) + (package + (name "emacs-literate-calc-mode") + (version (git-version "0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sulami/literate-calc-mode.el") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0mk4cig8g8ibz97mvyan79fkypyanh7r0h7h20ibafq09nb0mw01")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-s" ,emacs-s))) + (home-page "https://github.com/sulami/literate-calc-mode.el") + (synopsis "Literate programming for Emacs Calc") + (description + "This library provides literate programming for Calc. There is both +a major and a minor mode. The major mode does some basic syntax highlighting, +while the minor mode only evaluates all Calc statements while typing. In +particular, the minor mode works quite well with Org or Markdown modes, or +other markup language major modes.") + (license license:gpl3+)))) + (define-public emacs-string-inflection (package (name "emacs-string-inflection") -- cgit v1.2.3 From 9e43129bf8373843c249100444b905e4f0c0948b Mon Sep 17 00:00:00 2001 From: Morgan Smith Date: Fri, 10 Jul 2020 21:34:23 -0400 Subject: gnu: Add emacs-flycheck-ledger. * gnu/packages/emacs-xyz.scm (emacs-flycheck-ledger): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f8e7ec9f4f..c941323a4e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -181,6 +181,7 @@ (define-module (gnu packages emacs-xyz) #:use-module (gnu packages wordnet) #:use-module (gnu packages photo) #:use-module (gnu packages uml) + #:use-module (gnu packages finance) #:use-module (guix utils) #:use-module (srfi srfi-1) #:use-module (ice-9 match)) @@ -4103,6 +4104,41 @@ (define-public emacs-flycheck-guile compile}.") (license license:gpl3+))) +(define-public emacs-flycheck-ledger + (package + (name "emacs-flycheck-ledger") + (version "0.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/purcell/flycheck-ledger.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1djrj3is0dzrl2703bw7bclf33dp4xqmy144q7xj5pvpb9v3kf50")))) + (inputs `(("ledger" ,ledger))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((ledger (assoc-ref inputs "ledger"))) + ;; Specify the absolute executable location of ledger. + (substitute* "flycheck-ledger.el" + (("\"ledger\"") (string-append "\"" ledger "\"")))) + #t))))) + (propagated-inputs + `(("emacs-flycheck" ,emacs-flycheck))) + (build-system emacs-build-system) + (home-page "https://github.com/purcell/flycheck-ledger") + (synopsis "Ledger support for Flycheck") + (description + "This Flycheck checker uses the output of @code{ledger balance} on the +current file to find errors such as unbalanced transactions and syntax +errors.") + (license license:gpl3+))) + (define-public emacs-flycheck-rust (package (name "emacs-flycheck-rust") -- cgit v1.2.3 From 8615bcbe20b5172e5075d525748e4f70d2f7e6f9 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 14 Jul 2020 11:58:13 +0200 Subject: gnu: Add emacs-counsel-notmuch. * gnu/packages/emacs-xyz.scm (emacs-counsel-notmuch): New variable. --- gnu/packages/emacs-xyz.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index c941323a4e..537638bd36 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7041,6 +7041,46 @@ (define-public emacs-epl @code{package.el} into a sane API.") (license license:gpl3+))) +(define-public emacs-counsel-notmuch + ;; Upstream provides no release. Extract version for main file. + (let ((commit "a4a1562935e4180c42524c51609d1283e9be0688") + (revision "0")) + (package + (name "emacs-counsel-notmuch") + (version (git-version "1.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fuxialexander/counsel-notmuch.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "01k1321d961kc2i660a5595bqk0d85f16snsxngsn5si6y83kqr7")))) + (build-system emacs-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'locate-notmuch + (lambda* (#:key inputs #:allow-other-keys) + (make-file-writable "counsel-notmuch.el") + (emacs-substitute-variables "counsel-notmuch.el" + ("counsel-notmuch-path" + (string-append (assoc-ref inputs "notmuch") + "/bin/notmuch"))) + #t))))) + (inputs + `(("emacs-counsel" ,emacs-counsel) + ("notmuch" ,notmuch) + ("emacs-s" ,emacs-s))) + (home-page "https://github.com/fuxialexander/counsel-notmuch") + (synopsis "Search emails in Notmuch asynchronously with Ivy") + (description + "This package can be used to search emails in Notmuch +asynchronously, with Counsel and Ivy. Simply call +@code{counsel-notmuch} and input your Notmuch query.") + (license license:gpl3+)))) + (define-public emacs-counsel-projectile (package (name "emacs-counsel-projectile") -- cgit v1.2.3 From c4659802207d53516fb68aef94f9c133344b4172 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 14 Jul 2020 04:06:18 +0200 Subject: gnu: ppsspp: Name git checkouts. * gnu/packages/emulators.scm (ppsspp)[inputs]: Use GIT-FILE-NAME for in-line git origins. --- gnu/packages/emulators.scm | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 3d1fb6c905..b459e76d4b 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1946,21 +1946,25 @@ (define-public ppsspp ;; TODO: unbundle armips. ("armips-source" ,(package-source armips)) ("lang" - ,(origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/hrydgard/ppsspp-lang") - (commit "d184ba2b607a03435be579406b816c90add334e6"))) - (sha256 - (base32 "0s003x6247nx09qd6a1jz1l2hsk5d6k1zmh8mg3m6hjjhvbvd9j9")))) + ,(let ((commit "d184ba2b607a03435be579406b816c90add334e6")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hrydgard/ppsspp-lang") + (commit commit))) + (sha256 + (base32 "0s003x6247nx09qd6a1jz1l2hsk5d6k1zmh8mg3m6hjjhvbvd9j9")) + (file-name (git-file-name "ppsspp-lang" commit))))) ("tests" - ,(origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/hrydgard/pspautotests") - (commit "328b839c7243e7f733f9eae88d059485e3d808e7"))) - (sha256 - (base32 "1gj1kr5ijxrqwvz7c41phskjr70ndp8iz0gr8c3xxsd8p9z5gdvm")))))) + ,(let ((commit "328b839c7243e7f733f9eae88d059485e3d808e7")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hrydgard/pspautotests") + (commit commit))) + (sha256 + (base32 "1gj1kr5ijxrqwvz7c41phskjr70ndp8iz0gr8c3xxsd8p9z5gdvm")) + (file-name (git-file-name "pspautotests" commit))))))) (arguments `(#:out-of-source? #f #:configure-flags (list "-DUSE_DISCORD=OFF" -- cgit v1.2.3 From d6f303d4e5e80c4e46f131f5bac1f6be5cda433e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 10 Jul 2020 13:25:26 +0200 Subject: etc: Enable mount unit only if it exists. * etc/guix-install.sh (sys_enable_guix_daemon): Enable gnu-store.mount only if it was actually installed. Reported by peanutbutterandc on #guix. --- etc/guix-install.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index bf15aede21..54bd813efd 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -350,6 +350,8 @@ sys_enable_guix_daemon() cp "${ROOT_HOME}/.config/guix/current/lib/systemd/system/gnu-store.mount" \ /etc/systemd/system/; chmod 664 /etc/systemd/system/gnu-store.mount; + systemctl daemon-reload && + systemctl enable gnu-store.mount; fi cp "${ROOT_HOME}/.config/guix/current/lib/systemd/system/guix-daemon.service" \ @@ -367,8 +369,8 @@ sys_enable_guix_daemon() fi; systemctl daemon-reload && - systemctl start gnu-store.mount guix-daemon && - systemctl enable gnu-store.mount guix-daemon; } && + systemctl enable guix-daemon && + systemctl start guix-daemon; } && _msg "${PAS}enabled Guix daemon via systemd" ;; sysv-init) -- cgit v1.2.3 From 8a3d041698af5e55197073e2edf33515c1dc4b28 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 14 Jul 2020 14:49:59 +0200 Subject: gnu: flightgear: Update to 2018.3.5. * gnu/packages/games.scm (flightgear): (simgear): Update to 2018.3.5. --- gnu/packages/games.scm | 52 +++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 902c3d0cc1..5de6dbf4ac 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -8621,15 +8621,15 @@ (define-public marble-marcher (define simgear (package (name "simgear") - (version "2018.3.2") - (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/flightgear/release-" - (version-major+minor version) "/" - "simgear-" version ".tar.bz2")) - (sha256 - (base32 - "1941ay8rngz4vwsx37bbpxr48hpcvcbj3xw1hy264lq4qnl99c68")))) + (version "2018.3.5") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/flightgear/release-" + (version-major+minor version) "/" + "simgear-" version ".tar.bz2")) + (sha256 + (base32 "1vkqm66r1205k3hdjmx5wmx5kvmsb0dgfzrs8n5gqnxj8szs42dl")))) (build-system cmake-build-system) (arguments `(#:phases @@ -8639,7 +8639,7 @@ (define simgear ;; Skip tests that require internet access. (invoke "ctest" "-E" "(http|dns)")))))) (inputs - `(("boost" ,boost-for-mysql) ; fails with 1.69 + `(("boost" ,boost-for-mysql) ; fails with 1.69 ("curl" ,curl) ("expat" ,expat) ("mesa" ,mesa) @@ -8658,21 +8658,21 @@ (define-public flightgear (package (name "flightgear") (version (package-version simgear)) - (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/flightgear/release-" - (version-major+minor version) "/" - "flightgear-" version ".tar.bz2")) - (sha256 - (base32 - "0lzy524cjzs8vldcjcc750bgg5c4mq9fkymxxxzqf68ilc4d1jss")) - (modules '((guix build utils))) - (snippet - '(begin - ;; There are some bundled libraries. - (for-each delete-file-recursively - '("3rdparty/sqlite3/")) - #t)))) + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/flightgear/release-" + (version-major+minor version) "/" + "flightgear-" version ".tar.bz2")) + (sha256 + (base32 "0ya3vb539kwi1qrifqhsj5j3k4w6s06hrllp2vdzxf6id7cgf0hc")) + (modules '((guix build utils))) + (snippet + '(begin + ;; There are some bundled libraries. + (for-each delete-file-recursively + '("3rdparty/sqlite3/")) + #t)))) (build-system cmake-build-system) (arguments `(#:configure-flags @@ -8738,7 +8738,7 @@ (define-public flightgear "FlightGear-" version "-data.tar.bz2")) (sha256 (base32 - "0h4npa7gqpf5fw6pv2bpw0wbwr7fa2vhia21cjbigfgd75x82zi7")))))) + "04fv9za5zlyxlyfh6jx78y42l3jazvzl9dq2y6rzxqlcc9g5swhk")))))) (home-page "https://home.flightgear.org/") (synopsis "Flight simulator") (description "The goal of the FlightGear project is to create a -- cgit v1.2.3 From 7c86ef098d2dbc61cf0b827be1800f575ab00a5e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 14 Jul 2020 15:01:43 +0200 Subject: gnu: rust-xdg-2.2: Fix typo and indentation. * gnu/packages/crates-io.scm (rust-xdg-2.2): Fix indentation. [description]: Add missing final dot. --- gnu/packages/crates-io.scm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3c59bb1503..806e111f6f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -29853,19 +29853,18 @@ (define-public rust-xdg-2.2 (name "rust-xdg") (version "2.2.0") (source - (origin - (method url-fetch) - (uri (crate-uri "xdg" version)) - (file-name (string-append name "-" version ".crate")) - (sha256 - (base32 - "0mws8a0fr3cqk5nh7aq9lmkmhzghvasqy4mhw6nnza06l4d6i2fh")))) + (origin + (method url-fetch) + (uri (crate-uri "xdg" version)) + (file-name (string-append name "-" version ".crate")) + (sha256 + (base32 "0mws8a0fr3cqk5nh7aq9lmkmhzghvasqy4mhw6nnza06l4d6i2fh")))) (build-system cargo-build-system) (home-page "https://github.com/whitequark/rust-xdg") (synopsis "Store and retrieve files according to XDG specification") (description "This package provides a library for storing and retrieving files according -to XDG Base Directory specification") +to XDG Base Directory specification.") (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 01655843e25542f400da4acfe6e9fdc4e0903102 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 13 Jul 2020 23:42:12 +0200 Subject: gnu: python-docker-py: Remove unused input. * gnu/packages/docker.scm (python-docker-py)[inputs]: Remove PYTHON-IPADDRESS. --- gnu/packages/docker.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index a5589535c0..4beba12c11 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -66,7 +66,6 @@ (define-public python-docker-py (arguments '(#:tests? #f)) (inputs `(("python-requests" ,python-requests-2.20) - ("python-ipaddress" ,python-ipaddress) ("python-six" ,python-six) ("python-urllib3" ,python-urllib3-1.24) ("python-websocket-client" ,python-websocket-client))) -- cgit v1.2.3 From 34fa5c053211d3629196fb6b0bdcf4748f23079e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 13 Jul 2020 23:42:48 +0200 Subject: gnu: silkaj: Remove unused input. * gnu/packages/finance.scm (silkaj)[inputs]: Remove PYTHON-IPADDRESS. --- gnu/packages/finance.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index dc825efc8e..d403bc2510 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -1131,7 +1131,6 @@ (define-public silkaj (inputs `(("click" ,python-click) ("duniterpy" ,python-duniterpy) - ("ipaddress" ,python-ipaddress) ("pynacl" ,python-pynacl) ("tabulate" ,python-tabulate) ("texttable" ,python-texttable))) -- cgit v1.2.3 From 3ad866c8e445e82c12a64a1f7aebf7ac7dafd8b4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 13 Jul 2020 23:43:11 +0200 Subject: gnu: python-txtorcon: Remove unused input. * gnu/packages/python-crypto.scm (python-txtorcon)[propagated-inputs]: Remove PYTHON-IPADDRESS. --- gnu/packages/python-crypto.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index aed7dfc943..ff67ddddf1 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -1197,7 +1197,6 @@ (define-public python-txtorcon `(("python-automat" ,python-automat) ("python-idna" ,python-idna) ("python-incremental" ,python-incremental) - ("python-ipaddress" ,python-ipaddress) ("python-service-identity" ,python-service-identity) ("python-twisted" ,python-twisted) ("python-zope-interface" ,python-zope-interface))) -- cgit v1.2.3 From d89266edf7fde92107f1137ac5d7ab6a0ba15627 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 13 Jul 2020 23:43:51 +0200 Subject: gnu: virt-manager: Remove unused input. * gnu/packages/virtualization.scm (virt-manager)[inputs]: Remove PYTHON-IPADDRESS. --- gnu/packages/virtualization.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 051b81e2bd..f4df76fec9 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -730,7 +730,6 @@ (define-public virt-manager ("vte" ,vte) ("python-libvirt" ,python-libvirt) ("python-requests" ,python-requests) - ("python-ipaddress" ,python-ipaddress) ("python-pycairo" ,python-pycairo) ("python-pygobject" ,python-pygobject) ("python-libxml2" ,python-libxml2) -- cgit v1.2.3 From 007af2fb15176bc8d547163a2468e81924d62e75 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 14 Jul 2020 21:21:23 +0200 Subject: gnu: python-bottle: Update to 0.12.18. * gnu/packages/python-web.scm (python-bottle): Update to 0.12.18. --- gnu/packages/python-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 6f78adb254..34b00c6e65 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2945,14 +2945,14 @@ (define-public python2-werkzeug (define-public python-bottle (package (name "python-bottle") - (version "0.12.13") + (version "0.12.18") (source (origin (method url-fetch) (uri (pypi-uri "bottle" version)) (sha256 (base32 - "0m9k2a7yxvggc4kw8fsvj381vgsvfcdshg5nzy6vwrxiw2p53drr")))) + "17pn43kzr7m6czjbm4nda7kzs4ap9mmb30qfbhifyzas2i5vf688")))) (build-system python-build-system) (home-page "http://bottlepy.org/") (synopsis "WSGI framework for small web-applications.") -- cgit v1.2.3 From 3b4bb631c3c28dd9d5390d93ca0be2629e544037 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 14 Jul 2020 21:21:48 +0200 Subject: gnu: python-pycurl: Update to 7.43.0.5. * gnu/packages/python-web.scm (python-pycurl): Update to 7.43.0.5. --- gnu/packages/python-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 34b00c6e65..a7e5e7081f 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -608,14 +608,14 @@ (define-public python2-html5-parser (define-public python-pycurl (package (name "python-pycurl") - (version "7.43.0.2") + (version "7.43.0.5") (source (origin (method url-fetch) (uri (string-append "https://dl.bintray.com/pycurl/pycurl/pycurl-" version ".tar.gz")) (sha256 - (base32 "1915kb04k1j4y6k1dx1sgnbddxrl9r1n4q928if2lkrdm73xy30g")))) + (base32 "1cwlb76vddqp2mxqvjbhf367caddzy82rhangddjjhjqaj8x4zgc")))) (build-system python-build-system) (arguments ;; The tests attempt to access external web servers, so we cannot run -- cgit v1.2.3 From ec6ee7d72ea80d12c6cbd468a0d214c1694bd103 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 14 Jul 2020 21:22:11 +0200 Subject: gnu: python-bitarray: Update to 1.4.0. * gnu/packages/python-xyz.scm (python-bitarray): Update to 1.4.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 6fe2ca0a2e..d16f41d278 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -652,13 +652,13 @@ (define-public python2-backport-ssl-match-hostname (define-public python-bitarray (package (name "python-bitarray") - (version "1.2.1") + (version "1.4.0") (source (origin (method url-fetch) (uri (pypi-uri "bitarray" version)) (sha256 (base32 - "1kxrlxfj9nrx512sfwifwl9z4v6ky3qschl0zmk3s3dvc3s7bmif")))) + "177fj6wbw5jln54wpp6plcqy2329wjkwqwvgz7022rrg3xfrq49g")))) (build-system python-build-system) (home-page "https://github.com/ilanschnell/bitarray") (synopsis "Efficient arrays of booleans") -- cgit v1.2.3 From 784dadc0f70f5c015100b9cf400948e97aafe5ac Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 14 Jul 2020 21:22:36 +0200 Subject: gnu: python-paramiko: Update to 2.7.1. * gnu/packages/python-crypto.scm (python-paramiko): Update to 2.7.1. --- gnu/packages/python-crypto.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index ff67ddddf1..da7b8edeba 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -205,14 +205,14 @@ (define-public python-pyblake2 (define-public python-paramiko (package (name "python-paramiko") - (version "2.4.2") + (version "2.7.1") (source (origin (method url-fetch) (uri (pypi-uri "paramiko" version)) (sha256 (base32 - "1jqgj2gl1pz7bi2aab1r2xq0ml0gskmm9p235cg9y32nydymm5x8")))) + "17wx8lkhqxmddfdq7z7x45xqq2w3gwa974hpq1n3y0dqbn4r414j")))) (build-system python-build-system) (arguments `(;; FIXME: Tests require many unpackaged libraries, see dev-requirements.txt. -- cgit v1.2.3 From 2008b8b7afea917d3ebc42679c447a4c8e8e9733 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 14 Jul 2020 21:23:10 +0200 Subject: gnu: python-simplejson: Update to 3.17.0. * gnu/packages/python-xyz.scm (python-simplejson): Update to 3.17.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d16f41d278..121be26676 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1700,14 +1700,14 @@ (define-public python2-mechanize (define-public python-simplejson (package (name "python-simplejson") - (version "3.14.0") + (version "3.17.0") (source (origin (method url-fetch) (uri (pypi-uri "simplejson" version)) (sha256 (base32 - "1lkv3xlf7ryzi69zqfdbkvpxdfy1rg1rq2yzcnxgf4km5m6difqy")))) + "108yf3252fy4ndqab7h46raksxfhcn113bzy2yd8369vidrjnjrb")))) (build-system python-build-system) (home-page "http://simplejson.readthedocs.org/en/latest/") (synopsis -- cgit v1.2.3 From f5e3f02fdd668c24717b63f0289394cfd704f726 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 14 Jul 2020 21:24:39 +0200 Subject: gnu: python-pynacl: Update to 1.4.0. * gnu/packages/python-crypto.scm (python-pynacl): Update to 1.4.0. [source](snippet): Adjust to fix spurious build requirement. [arguments]: Add #:modules. Replace check phase with custom pytest invocation. --- gnu/packages/python-crypto.scm | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index da7b8edeba..97f5903840 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -739,26 +739,44 @@ (define-public python2-asn1crypto (define-public python-pynacl (package (name "python-pynacl") - (version "1.3.0") + (version "1.4.0") (source (origin (method url-fetch) (uri (pypi-uri "PyNaCl" version)) (modules '((guix build utils))) - ;; Remove bundled libsodium. - (snippet '(begin (delete-file-recursively "src/libsodium") - #t)) + (snippet + '(begin + ;; Remove spurious dependency on python-wheel, can be removed + ;; for 1.5. + (substitute* "setup.py" + (("\"wheel\"") "")) + ;; Remove bundled libsodium. + (delete-file-recursively "src/libsodium") + #t)) (sha256 (base32 - "0330wyvggm19xhmwmz9rrr97lzbv3siwfy50gmax3vvgs7nh0q8c")))) + "01b56hxrbif3hx8l6rwz5kljrgvlbj7shmmd2rjh0hn7974a5sal")))) (build-system python-build-system) (arguments - `(#:phases - (modify-phases %standard-phases + `(#:modules (,@%python-build-system-modules + (guix build utils) + (ice-9 ftw) + (srfi srfi-26)) + #:phases + (modify-phases (@ (guix build python-build-system) %standard-phases) (add-before 'build 'use-system-sodium (lambda _ (setenv "SODIUM_INSTALL" "system") - #t))))) + #t)) + (replace 'check + (lambda _ + (let ((build-directory + (car (scandir "build" (cut string-prefix? "lib" <>))))) + (setenv "PYTHONPATH" + (string-append "./build/" build-directory ":" + (getenv "PYTHONPATH"))) + (invoke "pytest" "-vv"))))))) (native-inputs `(("python-hypothesis" ,python-hypothesis) ("python-pytest" ,python-pytest))) -- cgit v1.2.3 From 0a72157271e0860ca779444403737b1bd45f6e03 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 14 Jul 2020 22:01:35 +0200 Subject: gnu: Remove python2-pywavelets. This package no longer supports Python 2 since the update in 501d89d707a64335731f54e0e28dbf252b31afc7 and has no dependents. * gnu/packages/python-xyz.scm (python2-pywavelets): Remove variable. --- gnu/packages/python-xyz.scm | 3 --- 1 file changed, 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 121be26676..15d9e097c5 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5599,9 +5599,6 @@ (define-public python-pywavelets localized only in frequency instead of in time and frequency.") (license license:expat))) -(define-public python2-pywavelets - (package-with-python2 python-pywavelets)) - (define-public python-pywinrm (package (name "python-pywinrm") -- cgit v1.2.3 From b91a73a6a4a419ffd53c41916d8acf3232b10eea Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 14 Jul 2020 15:50:38 +0200 Subject: services: Add 'system-provenance' procedure. * gnu/services.scm (sexp->channel, system-provenance): New procedures. * guix/scripts/system.scm (sexp->channel): Remove. (display-system-generation): Use 'system-provenance' instead of parsing the "provenance" file right here. --- gnu/services.scm | 32 ++++++++++++++++++++++++++++++++ guix/scripts/system.scm | 49 ++++++++++++++----------------------------------- 2 files changed, 46 insertions(+), 35 deletions(-) diff --git a/gnu/services.scm b/gnu/services.scm index f6dc56d940..6509a9014e 100644 --- a/gnu/services.scm +++ b/gnu/services.scm @@ -89,6 +89,7 @@ (define-module (gnu services) system-service-type provenance-service-type + system-provenance boot-service-type cleanup-service-type activation-service-type @@ -423,6 +424,19 @@ (define (channel->sexp channel) (branch ,(channel-branch channel)) (commit ,(channel-commit channel)))) +(define (sexp->channel sexp) + "Return the channel corresponding to SEXP, an sexp as found in the +\"provenance\" file produced by 'provenance-service-type'." + (match sexp + (('channel ('name name) + ('url url) + ('branch branch) + ('commit commit) + rest ...) + ;; XXX: In the future REST may include a channel introduction. + (channel (name name) (url url) + (branch branch) (commit commit))))) + (define (provenance-file channels config-file) "Return a 'provenance' file describing CHANNELS, a list of channels, and CONFIG-FILE, which can be either #f or a containing the OS @@ -474,6 +488,24 @@ (define provenance-service-type itself: the channels used when building the system, and its configuration file, when available."))) +(define (system-provenance system) + "Given SYSTEM, the file name of a system generation, return two values: the +list of channels SYSTEM is built from, and its configuration file. If that +information is missing, return the empty list (for channels) and possibly +#false (for the configuration file)." + (catch 'system-error + (lambda () + (match (call-with-input-file (string-append system "/provenance") + read) + (('provenance ('version 0) + ('channels channels ...) + ('configuration-file config-file)) + (values (map sexp->channel channels) + config-file)) + (_ + (values '() #f)))) + (lambda _ + (values '() #f)))) ;;; ;;; Cleanup. diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index 61eeec622b..f2b4367094 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -446,19 +446,6 @@ (define (shepherd-service-node-type services) ;;; Generations. ;;; -(define (sexp->channel sexp) - "Return the channel corresponding to SEXP, an sexp as found in the -\"provenance\" file produced by 'provenance-service-type'." - (match sexp - (('channel ('name name) - ('url url) - ('branch branch) - ('commit commit) - rest ...) - ;; XXX: In the future REST may include a channel introduction. - (channel (name name) (url url) - (branch branch) (commit commit))))) - (define* (display-system-generation number #:optional (profile %system-profile)) "Display a summary of system generation NUMBER in a human-readable format." @@ -482,13 +469,10 @@ (define (display-channel channel) (uuid->string root) root)) (kernel (boot-parameters-kernel params)) - (multiboot-modules (boot-parameters-multiboot-modules params)) - (provenance (catch 'system-error - (lambda () - (call-with-input-file - (string-append generation "/provenance") - read)) - (const #f)))) + (multiboot-modules (boot-parameters-multiboot-modules params))) + (define-values (channels config-file) + (system-provenance generation)) + (display-generation profile number) (format #t (G_ " file name: ~a~%") generation) (format #t (G_ " canonical file name: ~a~%") (readlink* generation)) @@ -518,21 +502,16 @@ (define (display-channel channel) (format #t (G_ " multiboot: ~a~%") (string-join modules "\n ")))) - (match provenance - (#f #t) - (('provenance ('version 0) - ('channels channels ...) - ('configuration-file config-file)) - (unless (null? channels) - ;; TRANSLATORS: Here "channel" is the same terminology as used in - ;; "guix describe" and "guix pull --channels". - (format #t (G_ " channels:~%")) - (for-each display-channel (map sexp->channel channels))) - (when config-file - (format #t (G_ " configuration file: ~a~%") - (if (supports-hyperlinks?) - (file-hyperlink config-file) - config-file)))))))) + (unless (null? channels) + ;; TRANSLATORS: Here "channel" is the same terminology as used in + ;; "guix describe" and "guix pull --channels". + (format #t (G_ " channels:~%")) + (for-each display-channel channels)) + (when config-file + (format #t (G_ " configuration file: ~a~%") + (if (supports-hyperlinks?) + (file-hyperlink config-file) + config-file)))))) (define* (list-generations pattern #:optional (profile %system-profile)) "Display in a human-readable format all the system generations matching -- cgit v1.2.3 From 8003a5adaf6f11c8e24bdbe0d99a306f1ae2c507 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 15 Jul 2020 00:26:28 +0200 Subject: news: Add ‘fr’ translation. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * etc/news.scm: Add ‘fr’ translation. --- etc/news.scm | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/etc/news.scm b/etc/news.scm index e239fae840..1ef238ca2d 100644 --- a/etc/news.scm +++ b/etc/news.scm @@ -15,7 +15,8 @@ (entry (commit "a98712785e0b042a290420fd74e5a4a5da4fc68f") (title (en "New @command{guix git authenticate} command") - (de "Neuer Befehl @command{guix git authenticate}")) + (de "Neuer Befehl @command{guix git authenticate}") + (fr "Nouvelle commande @command{guix git authenticate}")) (body (en "The new @command{guix git authenticate} command authenticates a Git repository by verifying commit signatures and ensuring they all come from @@ -43,7 +44,21 @@ Führen Sie @command{info \"(guix) Invoking guix git authenticate\"} aus, um mehr Informationen zu erhalten, und lesen Sie @uref{https://guix.gnu.org/blog/2020/securing-updates/} für die Details dieser -Mechanismen."))) +Mechanismen.") + (fr "La nouvelle commande @command{guix git authenticate} authentifie +un dépôt Git en vérifiant les signatures sur les changements (@i{commits}) et +en s'assurant qu'elles sont autorisées, exactement comme @command{guix pull} +le fait désormais. + +Cette commande est avant tout utile aux personnes développant un canal. Elle +leur permet de s'assurer, avant de pousser des changements, que le canal ne +contient que des changements signés par des clefs autorisées. Mais cette +commande peut aussi s'avérer utile dès que tu veux utiliser Git et permettre +aux autres d'authentifier le code récupéré depuis ton dépôt. + +Lance @command{info \"(guix.fr) Invoking guix git authenticate\"} pour plus +d'informations. Voir @uref{https://guix.gnu.org/blog/2020/securing-updates/} +pour en savoir plus sur ces mécanismes."))) (entry (commit "43badf261f4688c8a7a7a9004a4bff8acb205835") (title (en "@command{guix pull} authenticates channels") -- cgit v1.2.3 From a168c3e4f8d580f70e1c26bcdfc5b8378b2fa42d Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 15 Jul 2020 01:11:00 +0200 Subject: ui: 'with-error-handling' does not unwind the stack. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since a07d5e558b5403dad0a59776b950b6b02169c249, we've been getting useless backtraces upon unhandled errors, like this: Backtrace: 1 (primitive-load "/home/…/bin/guix") In guix/ui.scm: 1953:12 0 (run-guix-command _ . _) guix/ui.scm:1953:12: In procedure run-guix-command: In procedure struct-vtable: Wrong type argument in position 1 (expecting struct): #f This change finally gives us real backtraces back. * guix/ui.scm (guard*): New macro. (call-with-error-handling): Use it instead of 'guard'. --- guix/ui.scm | 291 +++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 158 insertions(+), 133 deletions(-) diff --git a/guix/ui.scm b/guix/ui.scm index 88a046a177..27bcade9dd 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -652,6 +652,23 @@ (define (top-most-entry entry) or remove one of them from the profile.") name1 name2))))) +(cond-expand + (guile-3 + ;; On Guile 3.0, in 'call-with-error-handling' we need to re-raise. To + ;; preserve useful backtraces in case of unhandled errors, we want that to + ;; happen before the stack has been unwound, hence 'guard*'. + (define-syntax-rule (guard* (var clauses ...) exp ...) + "This variant of SRFI-34 'guard' does not unwind the stack before +evaluating the tests and bodies of CLAUSES." + (with-exception-handler + (lambda (var) + (cond clauses ... (else (raise var)))) + (lambda () exp ...) + #:unwind? #f))) + (else + (define-syntax-rule (guard* (var clauses ...) exp ...) + (guard (var clauses ...) exp ...)))) + (define (call-with-error-handling thunk) "Call THUNK within a user-friendly error handler." (define (port-filename* port) @@ -660,143 +677,147 @@ (define (port-filename* port) (and (not (port-closed? port)) (port-filename port))) - (guard (c ((package-input-error? c) - (let* ((package (package-error-package c)) - (input (package-error-invalid-input c)) - (location (package-location package)) - (file (location-file location)) - (line (location-line location)) - (column (location-column location))) - (leave (G_ "~a:~a:~a: package `~a' has an invalid input: ~s~%") - file line column - (package-full-name package) input))) - ((package-cross-build-system-error? c) - (let* ((package (package-error-package c)) - (loc (package-location package)) - (system (package-build-system package))) - (leave (G_ "~a: ~a: build system `~a' does not support cross builds~%") - (location->string loc) - (package-full-name package) - (build-system-name system)))) - ((gexp-input-error? c) - (let ((input (package-error-invalid-input c))) - (leave (G_ "~s: invalid G-expression input~%") - (gexp-error-invalid-input c)))) - ((profile-not-found-error? c) - (leave (G_ "profile '~a' does not exist~%") - (profile-error-profile c))) - ((missing-generation-error? c) - (leave (G_ "generation ~a of profile '~a' does not exist~%") - (missing-generation-error-generation c) - (profile-error-profile c))) - ((unmatched-pattern-error? c) - (let ((pattern (unmatched-pattern-error-pattern c))) - (leave (G_ "package '~a~@[@~a~]~@[:~a~]' not found in profile~%") - (manifest-pattern-name pattern) - (manifest-pattern-version pattern) - (match (manifest-pattern-output pattern) - ("out" #f) - (output output))))) - ((profile-collision-error? c) - (let ((entry (profile-collision-error-entry c)) - (conflict (profile-collision-error-conflict c))) - (define (report-parent-entries entry) - (let ((parent (force (manifest-entry-parent entry)))) - (when (manifest-entry? parent) - (report-error (G_ " ... propagated from ~a@~a~%") - (manifest-entry-name parent) - (manifest-entry-version parent)) - (report-parent-entries parent)))) - - (define (manifest-entry-output* entry) - (match (manifest-entry-output entry) - ("out" "") - (output (string-append ":" output)))) - - (report-error (G_ "profile contains conflicting entries for ~a~a~%") - (manifest-entry-name entry) - (manifest-entry-output* entry)) - (report-error (G_ " first entry: ~a@~a~a ~a~%") - (manifest-entry-name entry) - (manifest-entry-version entry) - (manifest-entry-output* entry) - (manifest-entry-item entry)) - (report-parent-entries entry) - (report-error (G_ " second entry: ~a@~a~a ~a~%") - (manifest-entry-name conflict) - (manifest-entry-version conflict) - (manifest-entry-output* conflict) - (manifest-entry-item conflict)) - (report-parent-entries conflict) - (display-collision-resolution-hint c) - (exit 1))) - ((nar-error? c) - (let ((file (nar-error-file c)) - (port (nar-error-port c))) - (if file - (leave (G_ "corrupt input while restoring '~a' from ~s~%") - file (or (port-filename* port) port)) - (leave (G_ "corrupt input while restoring archive from ~s~%") - (or (port-filename* port) port))))) - ((store-connection-error? c) - (leave (G_ "failed to connect to `~a': ~a~%") - (store-connection-error-file c) - (strerror (store-connection-error-code c)))) - ((store-protocol-error? c) - ;; FIXME: Server-provided error messages aren't i18n'd. - (leave (G_ "~a~%") - (store-protocol-error-message c))) - ((derivation-missing-output-error? c) - (leave (G_ "reference to invalid output '~a' of derivation '~a'~%") - (derivation-missing-output c) - (derivation-file-name (derivation-error-derivation c)))) - ((file-search-error? c) - (leave (G_ "file '~a' could not be found in these \ + (guard* (c ((package-input-error? c) + (let* ((package (package-error-package c)) + (input (package-error-invalid-input c)) + (location (package-location package)) + (file (location-file location)) + (line (location-line location)) + (column (location-column location))) + (leave (G_ "~a:~a:~a: package `~a' has an invalid input: ~s~%") + file line column + (package-full-name package) input))) + ((package-cross-build-system-error? c) + (let* ((package (package-error-package c)) + (loc (package-location package)) + (system (package-build-system package))) + (leave (G_ "~a: ~a: build system `~a' does not support cross builds~%") + (location->string loc) + (package-full-name package) + (build-system-name system)))) + ((gexp-input-error? c) + (let ((input (package-error-invalid-input c))) + (leave (G_ "~s: invalid G-expression input~%") + (gexp-error-invalid-input c)))) + ((profile-not-found-error? c) + (leave (G_ "profile '~a' does not exist~%") + (profile-error-profile c))) + ((missing-generation-error? c) + (leave (G_ "generation ~a of profile '~a' does not exist~%") + (missing-generation-error-generation c) + (profile-error-profile c))) + ((unmatched-pattern-error? c) + (let ((pattern (unmatched-pattern-error-pattern c))) + (leave (G_ "package '~a~@[@~a~]~@[:~a~]' not found in profile~%") + (manifest-pattern-name pattern) + (manifest-pattern-version pattern) + (match (manifest-pattern-output pattern) + ("out" #f) + (output output))))) + ((profile-collision-error? c) + (let ((entry (profile-collision-error-entry c)) + (conflict (profile-collision-error-conflict c))) + (define (report-parent-entries entry) + (let ((parent (force (manifest-entry-parent entry)))) + (when (manifest-entry? parent) + (report-error (G_ " ... propagated from ~a@~a~%") + (manifest-entry-name parent) + (manifest-entry-version parent)) + (report-parent-entries parent)))) + + (define (manifest-entry-output* entry) + (match (manifest-entry-output entry) + ("out" "") + (output (string-append ":" output)))) + + (report-error (G_ "profile contains conflicting entries for ~a~a~%") + (manifest-entry-name entry) + (manifest-entry-output* entry)) + (report-error (G_ " first entry: ~a@~a~a ~a~%") + (manifest-entry-name entry) + (manifest-entry-version entry) + (manifest-entry-output* entry) + (manifest-entry-item entry)) + (report-parent-entries entry) + (report-error (G_ " second entry: ~a@~a~a ~a~%") + (manifest-entry-name conflict) + (manifest-entry-version conflict) + (manifest-entry-output* conflict) + (manifest-entry-item conflict)) + (report-parent-entries conflict) + (display-collision-resolution-hint c) + (exit 1))) + ((nar-error? c) + (let ((file (nar-error-file c)) + (port (nar-error-port c))) + (if file + (leave (G_ "corrupt input while restoring '~a' from ~s~%") + file (or (port-filename* port) port)) + (leave (G_ "corrupt input while restoring archive from ~s~%") + (or (port-filename* port) port))))) + ((store-connection-error? c) + (leave (G_ "failed to connect to `~a': ~a~%") + (store-connection-error-file c) + (strerror (store-connection-error-code c)))) + ((store-protocol-error? c) + ;; FIXME: Server-provided error messages aren't i18n'd. + (leave (G_ "~a~%") + (store-protocol-error-message c))) + ((derivation-missing-output-error? c) + (leave (G_ "reference to invalid output '~a' of derivation '~a'~%") + (derivation-missing-output c) + (derivation-file-name (derivation-error-derivation c)))) + ((file-search-error? c) + (leave (G_ "file '~a' could not be found in these \ directories:~{ ~a~}~%") - (file-search-error-file-name c) - (file-search-error-search-path c))) - ((invoke-error? c) - (leave (G_ "program exited\ + (file-search-error-file-name c) + (file-search-error-search-path c))) + ((invoke-error? c) + (leave (G_ "program exited\ ~@[ with non-zero exit status ~a~]\ ~@[ terminated by signal ~a~]\ ~@[ stopped by signal ~a~]: ~s~%") - (invoke-error-exit-status c) - (invoke-error-term-signal c) - (invoke-error-stop-signal c) - (cons (invoke-error-program c) - (invoke-error-arguments c)))) - ((and (error-location? c) (message-condition? c)) - (report-error (error-location c) (G_ "~a~%") - (gettext (condition-message c) %gettext-domain)) - (when (fix-hint? c) - (display-hint (condition-fix-hint c))) - (exit 1)) - ((and (message-condition? c) (fix-hint? c)) - (report-error (G_ "~a~%") - (gettext (condition-message c) %gettext-domain)) - (display-hint (condition-fix-hint c)) - (exit 1)) - - ;; On Guile 3.0.0, exceptions such as 'unbound-variable' are - ;; compound and include a '&message'. However, that message only - ;; contains the format string. Thus, special-case it here to - ;; avoid displaying a bare format string. - ((cond-expand - (guile-3 - ((exception-predicate &exception-with-kind-and-args) c)) - (else #f)) - (raise c)) - - ((message-condition? c) - ;; Normally '&message' error conditions have an i18n'd message. - (leave (G_ "~a~%") - (gettext (condition-message c) %gettext-domain)))) - ;; Catch EPIPE and the likes. - (catch 'system-error - thunk - (lambda (key proc format-string format-args . rest) - (leave (G_ "~a: ~a~%") proc - (apply format #f format-string format-args)))))) + (invoke-error-exit-status c) + (invoke-error-term-signal c) + (invoke-error-stop-signal c) + (cons (invoke-error-program c) + (invoke-error-arguments c)))) + ((and (error-location? c) (message-condition? c)) + (report-error (error-location c) (G_ "~a~%") + (gettext (condition-message c) %gettext-domain)) + (when (fix-hint? c) + (display-hint (condition-fix-hint c))) + (exit 1)) + ((and (message-condition? c) (fix-hint? c)) + (report-error (G_ "~a~%") + (gettext (condition-message c) %gettext-domain)) + (display-hint (condition-fix-hint c)) + (exit 1)) + + ;; On Guile 3.0.0, exceptions such as 'unbound-variable' are + ;; compound and include a '&message'. However, that message only + ;; contains the format string. Thus, special-case it here to + ;; avoid displaying a bare format string. + ;; + ;; Furthermore, use of 'guard*' ensures that the stack has not + ;; been unwound when we re-raise, since that would otherwise show + ;; useless backtraces. + ((cond-expand + (guile-3 + ((exception-predicate &exception-with-kind-and-args) c)) + (else #f)) + (raise c)) + + ((message-condition? c) + ;; Normally '&message' error conditions have an i18n'd message. + (leave (G_ "~a~%") + (gettext (condition-message c) %gettext-domain)))) + ;; Catch EPIPE and the likes. + (catch 'system-error + thunk + (lambda (key proc format-string format-args . rest) + (leave (G_ "~a: ~a~%") proc + (apply format #f format-string format-args)))))) (define-syntax-rule (leave-on-EPIPE exp ...) "Run EXP... in a context where EPIPE errors are caught and lead to 'exit' @@ -1993,4 +2014,8 @@ (define (guix-main arg0 . args) (initialize-guix) (apply run-guix args)) +;;; Local Variables: +;;; eval: (put 'guard* 'scheme-indent-function 2) +;;; End: + ;;; ui.scm ends here -- cgit v1.2.3 From 9e12da319b779d1c7f3d46ad2fd4025d4ffc228f Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 15 Jul 2020 01:31:23 +0200 Subject: system: Add 'location' field to . This allows error messages to include source location info. * gnu/system.scm ()[location]: New field. --- gnu/system.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/system.scm b/gnu/system.scm index f915057f36..e7f85e4358 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -118,6 +118,7 @@ (define-module (gnu system) operating-system-sudoers-file operating-system-swap-devices operating-system-kernel-loadable-modules + operating-system-location operating-system-derivation operating-system-profile @@ -255,7 +256,12 @@ (define-record-type* operating-system (default %setuid-programs)) ; list of string-valued gexps (sudoers-file operating-system-sudoers-file ; file-like - (default %sudoers-specification))) + (default %sudoers-specification)) + + (location operating-system-location ; + (default (and=> (current-source-location) + source-properties->location)) + (innate))) (define (operating-system-kernel-arguments os root-device) "Return all the kernel arguments, including the ones not specified -- cgit v1.2.3 From d7e9e0bbc9aadec3e1830767a8771bfbe9c43155 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 15 Jul 2020 01:32:25 +0200 Subject: system: 'operating-system-root-file-system' raises upon missing root. * gnu/system.scm (operating-system-root-file-system): Raise when 'find' returns #f. --- gnu/system.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gnu/system.scm b/gnu/system.scm index e7f85e4358..de5f25a35d 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -1032,9 +1032,13 @@ (define* (operating-system-profile os) (define (operating-system-root-file-system os) "Return the root file system of OS." - (find (lambda (fs) - (string=? "/" (file-system-mount-point fs))) - (operating-system-file-systems os))) + (or (find (lambda (fs) + (string=? "/" (file-system-mount-point fs))) + (operating-system-file-systems os)) + (raise (condition + (&message (message "missing root file system")) + (&error-location + (location (operating-system-location os))))))) (define (operating-system-initrd-file os) "Return a gexp denoting the initrd file of OS." -- cgit v1.2.3 From 6422615fc93e057269803dcbc2049a6ea17ec437 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 15 Jul 2020 13:45:42 +0200 Subject: gnu: opensmtpd-extras: Don't use NAME in source URI. * gnu/packages/mail.scm (opensmtpd-extras)[source]: Hard-code NAME. --- gnu/packages/mail.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 930e7a42cc..ff9a136ff1 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2413,7 +2413,7 @@ (define-public opensmtpd-extras (source (origin (method url-fetch) (uri (string-append "https://www.opensmtpd.org/archives/" - name "-" version ".tar.gz")) + "opensmtpd-extras-" version ".tar.gz")) (sha256 (base32 "1kld4hxgz792s0cb2gl7m2n618ikzqkj88w5dhaxdrxg4x2c4vdm")))) -- cgit v1.2.3 From 4fdf4b6cfaa154e91e80b76f04db009d97aee894 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 15 Jul 2020 14:04:20 +0200 Subject: gnu: opensmtpd-extras: Update to 6.7.1. * gnu/packages/mail.scm (opensmtpd-extras): Update to 6.7.1. [native-inputs]: Remove bison, groff, automake, and autoconf. [inputs]: Remove libasr, perl, lua, and linux-pam. Add mysql. [arguments]: Remove obsolete or ineffective options. [license]: Update. --- gnu/packages/mail.scm | 87 +++++++++++++++++++++++---------------------------- 1 file changed, 39 insertions(+), 48 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index ff9a136ff1..079c70ee80 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2409,71 +2409,62 @@ (define-public opensmtpd (define-public opensmtpd-extras (package (name "opensmtpd-extras") - (version "5.7.1") + (version "6.7.1") (source (origin (method url-fetch) (uri (string-append "https://www.opensmtpd.org/archives/" "opensmtpd-extras-" version ".tar.gz")) (sha256 (base32 - "1kld4hxgz792s0cb2gl7m2n618ikzqkj88w5dhaxdrxg4x2c4vdm")))) + "1b1mx71bvmv92lbm08wr2p60g3qhikvv3n15zsr6dcwbk9aqahzq")))) (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) (inputs `(("libressl" ,libressl) ("libevent" ,libevent) - ("libasr" ,libasr) - ("python-2" ,python-2) + ("mysql" ,mysql) ("opensmtpd" ,opensmtpd) - ("perl" ,perl) - ("lua" ,lua) ("postgresql" ,postgresql) - ("sqlite" ,sqlite) - ("linux-pam" ,linux-pam))) - (native-inputs - `(("bison" ,bison) - ("pkg-config" ,pkg-config) - ("groff" ,groff) - ("automake" ,automake) - ("autoconf" ,autoconf))) + ("python" ,python-2) + ("sqlite" ,sqlite))) (arguments - `(;; We have to configure it like this because the default checks for for example - ;; python in /usr/local/bin, /usr/bin and fails otherwise. - #:configure-flags (list - "--with-filter-clamav" "--with-filter-dkim-signer" - "--with-filter-dnsbl" "--with-filter-lua" - "--with-filter-monkey" "--with-filter-pause" - "--with-filter-perl" "--with-filter-python" - "--with-filter-regex" "--with-filter-spamassassin" - "--with-filter-stub" "--with-filter-trace" - "--with-filter-void" - - "--with-queue-null" "--with-queue-python" - "--with-queue-ram" "--with-queue-stub" - - "--with-scheduler-python" "--with-scheduler-ram" - "--with-scheduler-stub" - - "--with-table-ldap" ; "--with-table-mysql" - "--with-table-passwd" "--with-table-postgres" - "--with-table-python" "--with-table-socketmap" - "--with-table-sqlite" "--with-table-stub" - ;;"--with-table-redis" ; TODO: package hiredis - - "--with-user=smtpd" "--with-privsep-user=smtpd" - "--localstatedir=/var" "--sysconfdir=/etc" - "--with-lua-type=lua" ; can use lua or luajit - - (string-append "--with-python=" - (assoc-ref %build-inputs "python-2")) - (string-append "--with-lua=" - (assoc-ref %build-inputs "lua"))))) - (license (list bsd-2 bsd-3 bsd-4 - public-domain isc license:openssl)) + `(#:configure-flags + (list "--sysconfdir=/etc" + "--localstatedir=/var" + + "--with-queue-null" + "--with-queue-python" + "--with-queue-ram" + "--with-queue-stub" + + "--with-table-ldap" + "--with-table-mysql" + "--with-table-postgres" + ;; "--with-table-redis" ; TODO: package hiredis + "--with-table-socketmap" + "--with-table-passwd" + "--with-table-python" + "--with-table-sqlite" + "--with-table-stub" + + "--with-scheduler-ram" + "--with-scheduler-stub" + "--with-scheduler-python" + + "--with-user-smtpd=smtpd" + + ;; We have to configure it like this because the default checks for + ;; for example Python in /usr/{,local/}bin and fails otherwise. + (string-append "--with-python=" + (assoc-ref %build-inputs "python"))))) + (home-page "https://www.opensmtpd.org") (synopsis "Extra tables, filters, and various other addons for OpenSMTPD") (description "This package provides extra tables, filters, and various other addons for OpenSMTPD to extend its functionality.") - (home-page "https://www.opensmtpd.org"))) + (license (list bsd-2 bsd-3 ; openbsd-compat + isc)))) ; everything else (define-public python-mailmanclient (package -- cgit v1.2.3 From 7e3b537c7601c760219edc0351d443324c079d81 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 15 Jul 2020 14:13:17 +0200 Subject: gnu: Consistently use license: prefix in (gnu packages mail). * gnu/packages/mail.scm: Don't #:select arbitrary variables from (guix licenses). (anubis, mailutils, nullmailer, fetchmail, mutt, neomutt, gmime) (bogofilter, offlineimap, emacs-mew, mu, alot, notifymuch, notmuch) (python-notmuch, muchsync, getmail, libetpan, compface, claws-mail) (msmtp, exim, dovecot, dovecot-trees, dovecot-libsodium-plugin, isync) (perl-email-abstract, perl-email-address, perl-email-address-xs) (perl-email-date-format, perl-email-messageid, perl-email-mime) (perl-email-mime-contenttype, perl-email-mime-encodings) (perl-email-sender, perl-email-simple, libesmtp, esmtp, fdm, procmail) (khard, perl-mail-spf, perl-mail-authenticationresults, perl-mail-dkim) (dkimproxy, mb2md, mpop, mhonarc, sendmail, opensmtpd, opensmtpd-extras) (python-mailmanclient, python2-django-mailman3, postorius, swaks, alpine) (balsa, afew, pan, urlscan, tnef, mumi, ytnef, public-inbox, sylpheed) [licenses]: Use a license: prefix instead. --- gnu/packages/mail.scm | 155 +++++++++++++++++++++++++------------------------- 1 file changed, 76 insertions(+), 79 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 079c70ee80..8b7a2bc00a 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -128,13 +128,7 @@ (define-module (gnu packages mail) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xorg) #:use-module (gnu packages xml) - #:use-module ((guix licenses) - #:select (fdl1.1+ - agpl3+ - gpl2 gpl2+ gpl3 gpl3+ lgpl2.1 lgpl2.1+ lgpl3+ - non-copyleft (expat . license:expat) bsd-3 - public-domain bsd-4 isc (openssl . license:openssl) - bsd-2 x11-style agpl3 asl2.0 perl-license)) + #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) @@ -183,7 +177,7 @@ (define-public anubis to the message before passing it on for delivery by the MTA. Anubis may, for example, modify the message headers or body, or encrypt or sign the message.") (home-page "https://www.gnu.org/software/anubis/manual/") - (license gpl3+))) + (license license:gpl3+))) (define-public mailutils (package @@ -289,7 +283,7 @@ (define-public mailutils software.") (license ;; Libraries are under LGPLv3+, and programs under GPLv3+. - (list gpl3+ lgpl3+)))) + (list license:gpl3+ license:lgpl3+)))) (define-public guile2.2-mailutils (package @@ -380,8 +374,8 @@ (define-public nullmailer It requires little ongoing administration. The included @command{sendmail} emulator front-end should allow most (if not all) sendmail-compatible programs to run without any changes.") - (license (list lgpl2.1+ ; lib/cli++/ (but some files lack headers) - gpl2+)))) ; everything else + (license (list license:lgpl2.1+ ; lib/cli++/ (but some files lack headers) + license:gpl2+)))) ; everything else (define-public fetchmail (package @@ -416,7 +410,7 @@ (define-public fetchmail so it can then be read by normal mail user agents such as mutt, elm or BSD Mail. It allows all your system MTA's filtering, forwarding, and aliasing facilities to work just as they would on normal mail.") - (license gpl2+))) ; most files are actually public domain or x11 + (license license:gpl2+))) ; most files are actually public domain or x11 (define-public mutt (package @@ -463,7 +457,7 @@ (define-public mutt (description "Mutt is a small but very powerful text-based mail client for Unix operating systems.") - (license gpl2+))) + (license license:gpl2+))) (define-public neomutt (package @@ -557,7 +551,7 @@ (define-public neomutt (description "NeoMutt is a command-line mail reader which is based on mutt. It adds a large amount of new and improved features to mutt.") - (license gpl2+))) + (license license:gpl2+))) (define-public gmime (package @@ -602,7 +596,7 @@ (define-public gmime "GMime provides a core library and set of utilities which may be used for the creation and parsing of messages using the Multipurpose Internet Mail Extension (MIME).") - (license (list lgpl2.1+ gpl2+ gpl3+)))) + (license (list license:lgpl2.1+ license:gpl2+ license:gpl3+)))) ;; Some packages are not ready for GMime 3 yet. (define-public gmime-2.6 @@ -648,7 +642,7 @@ (define-public bogofilter (non-spam) by a statistical analysis of the message's header and content (body). The program is able to learn from the user's classifications and corrections. It is based on a Bayesian filter.") - (license gpl3+))) + (license license:gpl3+))) (define-public offlineimap (package @@ -694,7 +688,7 @@ (define-public offlineimap "OfflineImap synchronizes emails between two repositories, so that you can read the same mailbox from multiple computers. It supports IMAP as REMOTE repository and Maildir/IMAP as LOCAL repository.") - (license gpl2+))) + (license license:gpl2+))) (define-public emacs-mew (package @@ -745,7 +739,7 @@ (define-public emacs-mew (description "Mew (Messaging in the Emacs World) is a user interface for text messages, multimedia messages (MIME), news articles and security functionality including PGP, S/MIME, SSH, and SSL.") - (license bsd-3))) + (license license:bsd-3))) (define-public mu (package @@ -829,7 +823,7 @@ (define-public mu Maildir-format. Mu's purpose in life is to help you to quickly find the messages you need; in addition, it allows you to view messages, extract attachments, create new maildirs, and so on.") - (license gpl3+))) + (license license:gpl3+))) (define-public alot (package @@ -866,7 +860,7 @@ (define-public alot (description "Alot is an experimental terminal mail user agent (@dfn{MUA}) based on @code{notmuch} mail. It is written in Python using the @code{urwid} toolkit.") - (license gpl3+))) + (license license:gpl3+))) (define-public notifymuch (let @@ -914,7 +908,7 @@ (define-public notifymuch within a configurable period (defaults to 48 hours). To use notifymuch, run @command{notifymuch} after new mail is indexed, this can be automated by invoking @command{notifymuch} from the post-new hook.") - (license gpl3)))) + (license license:gpl3)))) (define-public notmuch (package @@ -990,7 +984,7 @@ (define-public notmuch (description "Notmuch is a command-line based program for indexing, searching, read- ing, and tagging large collections of email messages.") - (license gpl3+))) + (license license:gpl3+))) (define-public notmuch-addrlookup-c (package @@ -1061,7 +1055,7 @@ (define-public python-notmuch (description "This package provides Python bindings to use the Notmuch mail indexing and search library.") - (license gpl3+))) + (license license:gpl3+))) (define-public python2-notmuch (package-with-python2 python-notmuch)) @@ -1096,7 +1090,7 @@ (define-public muchsync replicas. A version-vector-based algorithm allows it to exchange only the minimum information necessary to bring replicas up to date regardless of which pairs have previously synchronized.") - (license gpl2+))) + (license license:gpl2+))) (define-public getmail (package @@ -1122,7 +1116,7 @@ (define-public getmail useful features.") ;; License is specified in file '__init__.py'. - (license gpl2))) + (license license:gpl2))) (define-public libetpan (package @@ -1160,7 +1154,7 @@ (define-public libetpan framework for different kinds of mail access: IMAP, SMTP, POP and NNTP. It provides an API for C language. It's the low-level API used by MailCore and MailCore 2.") - (license bsd-3))) + (license license:bsd-3))) (define-public compface (package @@ -1181,7 +1175,7 @@ (define-public compface (description "This package takes your 48x48x1 portrait image and compresses it.") (home-page "https://legacy.cs.indiana.edu/ftp/faces/") - (license (x11-style "file://README")))) + (license (license:x11-style "file://README")))) (define-public claws-mail (package @@ -1243,7 +1237,7 @@ (define-public claws-mail are accessible with the keyboard. Plus, Claws-Mail is extensible via addons which can add many functionalities to the base client.") (home-page "https://www.claws-mail.org/") - (license gpl3+))) ; most files are actually public domain or x11 + (license license:gpl3+))) ; most files are actually public domain or x11 (define-public msmtp (package @@ -1293,7 +1287,7 @@ (define-public msmtp "msmtp is an SMTP client. In the default mode, it transmits a mail to an SMTP server (for example at a free mail provider) which takes care of further delivery.") - (license gpl3+))) + (license license:gpl3+))) (define-public exim (package @@ -1399,7 +1393,7 @@ (define-public exim similar to Smail 3, but its facilities are more general. There is a great deal of flexibility in the way mail can be routed, and there are extensive facilities for checking incoming mail.") - (license gpl2+))) + (license license:gpl2+))) (define-public dovecot (package @@ -1461,7 +1455,8 @@ (define-public dovecot ;; Most source files are covered by either lgpl2.1 or expat. The SHA code ;; is covered by a variant of BSD-3, and UnicodeData.txt is covered by the ;; Unicode, Inc. License Agreement for Data Files and Software. - (license (list lgpl2.1 license:expat (non-copyleft "file://COPYING"))))) + (license (list license:lgpl2.1 license:expat + (license:non-copyleft "file://COPYING"))))) (define-public dovecot-trees (package @@ -1511,7 +1506,7 @@ (define-public dovecot-trees using libsodium sealed boxes. @item New mail is encrypted as it arrives using the Curve25519 public key. @end enumerate\n") - (license agpl3))) + (license license:agpl3))) (define-public dovecot-libsodium-plugin (let ((commit "044de73c01c35385df0105f6b387bec5d5317ce7") @@ -1548,7 +1543,7 @@ (define-public dovecot-libsodium-plugin (description "@code{dovecot-libsodium-plugin} provides a libsodium password hashing scheme (such as scrypt) plug-in for @code{Dovecot}.") - (license gpl3+)))) + (license license:gpl3+)))) (define-public isync (package @@ -1574,7 +1569,7 @@ (define-public isync (description "isync/mbsync is a command-line tool for two-way synchronization of mailboxes. Currently Maildir and IMAP are supported types.") - (license gpl2+))) + (license license:gpl2+))) (define-public perl-email-abstract (package @@ -1597,7 +1592,7 @@ (define-public perl-email-abstract (synopsis "Interface to mail representations") (description "Email::Abstract provides module writers with the ability to write simple, representation-independent mail handling code.") - (license perl-license))) + (license license:perl-license))) (define-public perl-email-address (package @@ -1616,7 +1611,7 @@ (define-public perl-email-address (description "Email::Address implements a regex-based RFC 2822 parser that locates email addresses in strings and returns a list of Email::Address objects found. Alternatively you may construct objects manually.") - (license perl-license))) + (license license:perl-license))) (define-public perl-email-address-xs (package @@ -1638,7 +1633,7 @@ (define-public perl-email-address-xs addresses and groups. Unlike Email::Address, this module does not use regular expressions for parsing but instead is implemented in XS and uses shared code from Dovecot IMAP server.") - (license perl-license))) + (license license:perl-license))) (define-public perl-email-date-format (package @@ -1657,7 +1652,7 @@ (define-public perl-email-date-format (synopsis "Produce RFC 2822 date strings") (description "Email::Date::Format provides a means for generating an RFC 2822 compliant datetime string.") - (license perl-license))) + (license license:perl-license))) (define-public perl-email-messageid (package @@ -1676,7 +1671,7 @@ (define-public perl-email-messageid (synopsis "Generate world unique message-ids") (description "Email::MessageID generates recommended message-ids to identify a message uniquely.") - (license perl-license))) + (license license:perl-license))) (define-public perl-email-mime (package @@ -1705,7 +1700,7 @@ (define-public perl-email-mime handle MIME encoded messages. It takes a message as a string, splits it up into its constituent parts, and allows you access to various parts of the message. Headers are decoded from MIME encoding.") - (license perl-license))) + (license license:perl-license))) (define-public perl-email-mime-contenttype (package @@ -1726,7 +1721,7 @@ (define-public perl-email-mime-contenttype (synopsis "Parse MIME Content-Type headers") (description "Email::MIME::ContentType parses a MIME Content-Type header.") - (license perl-license))) + (license license:perl-license))) (define-public perl-email-mime-encodings (package @@ -1746,7 +1741,7 @@ (define-public perl-email-mime-encodings (home-page "https://metacpan.org/release/Email-MIME-Encodings") (synopsis "Unified interface to MIME encoding and decoding") (description "This module wraps MIME::Base64 and MIME::QuotedPrint.") - (license perl-license))) + (license license:perl-license))) (define-public perl-email-sender (package @@ -1777,7 +1772,7 @@ (define-public perl-email-sender (synopsis "Perl library for sending email") (description "Email::Sender replaces the old and sometimes problematic Email::Send library.") - (license perl-license))) + (license license:perl-license))) (define-public perl-email-simple (package @@ -1798,7 +1793,7 @@ (define-public perl-email-simple (synopsis "Parsing of RFC 2822 messages") (description "Email::Simple provides simple parsing of RFC 2822 message format and headers.") - (license perl-license))) + (license license:perl-license))) (define-public libesmtp (package @@ -1828,7 +1823,7 @@ (define-public libesmtp It may be used as part of a Mail User Agent (MUA) or other program that must be able to post electronic mail where mail functionality may not be that program's primary purpose.") - (license (list lgpl2.1+ gpl2+)))) + (license (list license:lgpl2.1+ license:gpl2+)))) (define-public esmtp (package @@ -1865,7 +1860,7 @@ (define-public esmtp page for more on configuration. This package also provides minimal compatibility shims for the @command{sendmail}, @command{mailq}, and @command{newaliases} commands.") - (license gpl2+))) + (license license:gpl2+))) (define-public fdm (package @@ -1891,7 +1886,8 @@ (define-public fdm ;; Why point to a source file? Well, all the individual files have a ;; copy of this license in their headers, but there's no seprate file ;; with that information. - (non-copyleft "https://github.com/nicm/fdm/blob/master/command.c")))) + (license:non-copyleft + "https://github.com/nicm/fdm/blob/master/command.c")))) (define-public procmail @@ -1939,10 +1935,10 @@ (define-public procmail can be sorted into separate files/directories and arbitrary commands can be executed on mail arrival. Procmail is considered stable, but is no longer maintained.") - (license gpl2+))) ;; procmail allows to choose the - ;; nonfree Artistic License 1.0 - ;; as alternative to the GPL2+. - ;; This option is not listed here. + (license license:gpl2+))) ;; procmail allows to choose the + ;; nonfree Artistic License 1.0 + ;; as alternative to the GPL2+. + ;; This option is not listed here. (define-public khard (package @@ -1979,7 +1975,7 @@ (define-public khard synchronizing with a remote address book, @command{vdirsyncer} is recommended. Khard can also be used from within the email client @command{mutt}.") (home-page "https://github.com/scheibler/khard") - (license gpl3+))) + (license license:gpl3+))) (define-public perl-mail-spf (package @@ -2018,7 +2014,7 @@ (define-public perl-mail-spf (synopsis "Perl implementation of Sender Policy Framework") (description "Mail::SPF is the Sender Policy Framework implemented in Perl.") - (license bsd-3))) + (license license:bsd-3))) (define-public perl-mail-authenticationresults (package @@ -2041,7 +2037,7 @@ (define-public perl-mail-authenticationresults that indicates the message authentication status as per RFC7601. This module is not fully compliant with the RFC but it tries to implement most styles of Authentication-Results header seen in the wild.") - (license perl-license))) + (license license:perl-license))) (define-public perl-mail-dkim (package @@ -2073,7 +2069,7 @@ (define-public perl-mail-dkim both of which sign and verify emails using digital signatures and DNS records. Mail-DKIM can be used by any Perl program that wants to provide support for DKIM and/or DomainKeys.") - (license gpl3+))) + (license license:gpl3+))) (define-public dkimproxy (package @@ -2148,7 +2144,7 @@ (define-public dkimproxy It was designed for Postfix, but can be used to add DKIM support to nearly any existing mail server. With Postfix, the proxies can operate as either @code{Before-Queue} or @code{After-Queue} content filters.") - (license gpl2+))) + (license license:gpl2+))) (define-public mb2md (package @@ -2193,7 +2189,7 @@ (define-public mb2md (description "Mb2md is a Perl script that takes one or more mbox format files and converts them to maildir format directories.") - (license public-domain))) + (license license:public-domain))) (define-public mpop (package @@ -2220,7 +2216,7 @@ (define-public mpop to mbox files, maildir folders or an @acronym{MDA, Mail Delivery Agent}, TLS/SSL, several authentication methods, @acronym{IDN, Internationalized Domain Names} and SOCKS proxies.") - (license gpl3+))) + (license license:gpl3+))) (define-public mhonarc (package @@ -2242,7 +2238,7 @@ (define-public mhonarc provides HTML mail archiving with index, mail thread linking, etc; plus other capabilities including support for MIME and powerful user customization features.") - (license gpl2+))) + (license license:gpl2+))) (define-public sendmail @@ -2324,8 +2320,8 @@ (define-public sendmail "Sendmail is a mail transfer agent (MTA) originally developed by Eric Allman. It is highly configurable and supports many delivery methods and many transfer protocols.") - (license (non-copyleft "file://LICENSE" - "See LICENSE in the distribution.")))) + (license (license:non-copyleft "file://LICENSE" + "See LICENSE in the distribution.")))) (define-public opensmtpd (package @@ -2403,8 +2399,9 @@ (define-public opensmtpd provide enough features to satisfy typical usage at the risk of unsuitability to esoteric or niche requirements.") (home-page "https://www.opensmtpd.org") - (license (list bsd-2 bsd-3 bsd-4 (non-copyleft "file://COPYING") - public-domain isc license:openssl)))) + (license (list license:bsd-2 license:bsd-3 license:bsd-4 + (license:non-copyleft "file://COPYING") + license:public-domain license:isc license:openssl)))) (define-public opensmtpd-extras (package @@ -2463,8 +2460,8 @@ (define-public opensmtpd-extras (description "This package provides extra tables, filters, and various other addons for OpenSMTPD to extend its functionality.") - (license (list bsd-2 bsd-3 ; openbsd-compat - isc)))) ; everything else + (license (list license:bsd-2 license:bsd-3 ; openbsd-compat + license:isc)))) ; everything else (define-public python-mailmanclient (package @@ -2488,7 +2485,7 @@ (define-public python-mailmanclient (description "The mailmanclient library provides official Python bindings for the GNU Mailman 3 REST API.") - (license lgpl3+))) + (license license:lgpl3+))) (define-public python2-mailmanclient (package-with-python2 python-mailmanclient)) @@ -2589,7 +2586,7 @@ (define-public python2-django-mailman3 (description "Libraries and templates for Django-based interfaces interacting with Mailman.") - (license gpl3+))) + (license license:gpl3+))) (define-public postorius (package @@ -2619,7 +2616,7 @@ (define-public postorius (description "Postorius is a Django app which provides a web user interface to access GNU Mailman.") - (license (list gpl3+ lgpl3+)))) + (license (list license:gpl3+ license:lgpl3+)))) (define-public blists (package @@ -2703,7 +2700,7 @@ (define-public swaks Options can be specified in environment variables, configuration files, and the command line allowing maximum configurability and ease of use for operators and scripters.") - (license gpl2+))) + (license license:gpl2+))) (define-public alpine (package @@ -2784,7 +2781,7 @@ (define-public alpine @item pico, the standalone text editor, GNU nano's predecessor @item pilot, the standalone file system navigator @end enumerate\n") - (license asl2.0))) + (license license:asl2.0))) (define-public balsa (package @@ -2840,7 +2837,7 @@ (define-public balsa the GNOME desktop. It supports both POP3 and IMAP servers as well as the mbox, maildir and mh local mailbox formats. Balsa also supports SMTP and/or the use of a local MTA such as Sendmail.") - (license gpl3+))) + (license license:gpl3+))) (define-public afew (package @@ -2865,7 +2862,7 @@ (define-public afew provides automatic tagging each time new mail is registered with notmuch. It can add tags based on email headers or Maildir folders and can handle spam and killed threads.") - (license isc))) + (license license:isc))) (define-public pan (package @@ -2912,7 +2909,7 @@ (define-public pan and binaries. It supports offline reading, scoring and killfiles, yEnc, NZB, PGP handling, multiple servers, and secure connections.") ;; License of the docs: fdl-1.1; Others: gpl2. - (license (list fdl1.1+ gpl2)))) + (license (list license:fdl1.1+ license:gpl2)))) (define-public imapfilter (package @@ -2972,7 +2969,7 @@ (define-public urlscan within the message, and allows you to choose one or more URLs to send to your Web browser. Alternatively, it send a list of all URLs to standard output. It is a replacement for the @command{urlview} program.") - (license gpl2))) + (license license:gpl2))) (define-public tnef (package @@ -2997,7 +2994,7 @@ (define-public tnef (description "TNEF is a tar-like program that unpacks MIME attachments of type @code{application/ms-tnef}.") - (license gpl2+))) + (license license:gpl2+))) (define-public mumi (let ((commit "5a578328199bab51a147fbadbce12c8d06959ed6") @@ -3059,7 +3056,7 @@ (define-public mumi (home-page "https://git.elephly.net/software/mumi.git") (synopsis "Debbugs web interface") (description "Mumi is a Debbugs web interface.") - (license agpl3+)))) + (license license:agpl3+)))) (define-public ytnef (package @@ -3083,7 +3080,7 @@ (define-public ytnef (synopsis "TNEF stream reader for winmail.dat files") (description "This package provides a TNEF stream reader library and related tools to process winmail.dat files.") - (license gpl2+))) + (license license:gpl2+))) (define-public public-inbox (let ((commit "05a06f3262a2ddbf46adb85169e13ce9127e4524") @@ -3169,7 +3166,7 @@ (define-public public-inbox "public-inbox implements the sharing of an email inbox via git to complement or replace traditional mailing lists. Readers may read via NNTP, Atom feeds or HTML archives.") - (license agpl3+)))) + (license license:agpl3+)))) (define-public sylpheed (package @@ -3201,4 +3198,4 @@ (define-public sylpheed "Sylpheed is a simple, lightweight but featureful, and easy-to-use e-mail client. Sylpheed provides intuitive user-interface. Sylpheed is also designed for keyboard-oriented operation.") - (license gpl2+))) + (license license:gpl2+))) -- cgit v1.2.3 From ba1e4ce2560d51c8ba935e5b5667ba3a0133c694 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 15 Jul 2020 19:13:43 +0200 Subject: gnu: rust: Add SSL native search paths. * gnu/packages/rust.scm (rust-1.19)[native-search-paths]: Add entries for SSL_CERT_DIR and SSL_CERT_FILE. Reported by Kimapr[m] in #guix. --- gnu/packages/rust.scm | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 851a996e4b..dc373ef2bb 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2017 Ben Woodcroft ;;; Copyright © 2017, 2018 Nikolai Merinov ;;; Copyright © 2017, 2019 Efraim Flashner -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Danny Milosavljevic ;;; Copyright © 2019 Ivan Petkov ;;; Copyright © 2020 Jakub Kądziołka @@ -447,7 +447,18 @@ (define rust-1.19 (files '("include/c++" "include"))) (search-path-specification (variable "LIBRARY_PATH") - (files '("lib" "lib64"))))) + (files '("lib" "lib64"))) + + ;; For cargo. + (search-path-specification + (variable "SSL_CERT_DIR") + (separator #f) + (files '("etc/ssl/certs"))) + (search-path-specification + (variable "SSL_CERT_FILE") + (file-type 'regular) + (separator #f) + (files '("etc/ssl/certs/ca-certificates.crt"))))) (synopsis "Compiler for the Rust progamming language") (description "Rust is a systems programming language that provides memory -- cgit v1.2.3 From 7af2b55d7b8f600ebe87790c151724315dc83383 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 14 Jul 2020 20:56:24 +0200 Subject: gnu: protobuf: Update to 3.12.3. * gnu/packages/protobuf.scm (protobuf): Update to 3.12.3. --- gnu/packages/protobuf.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/protobuf.scm b/gnu/packages/protobuf.scm index 49abb21358..7c14ddbdfa 100644 --- a/gnu/packages/protobuf.scm +++ b/gnu/packages/protobuf.scm @@ -78,7 +78,7 @@ (define-public fstrm (define-public protobuf (package (name "protobuf") - (version "3.11.3") + (version "3.12.3") (source (origin (method url-fetch) (uri (string-append "https://github.com/google/protobuf/releases/" @@ -86,7 +86,7 @@ (define-public protobuf version ".tar.gz")) (sha256 (base32 - "0l8a1sgzhwwx5j5hv9n9zx8vkdwwn5gvd9dcpkkz4h0j17k1zywz")))) + "0s29dj8l9j6jk04im3ivcji1x9jm42fwjmwcmli0smz0m337xyaf")))) (build-system gnu-build-system) (inputs `(("zlib" ,zlib))) (outputs (list "out" -- cgit v1.2.3 From b514478cb9205ef04194dbe4235765abd0930da9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 14 Jul 2020 15:43:31 +0200 Subject: gnu: gparted: Use the Glib-or-GTK build system. Fixes . * gnu/packages/disk.scm (gparted)[build-system]: Use glib-or-gtk-build-system. --- gnu/packages/disk.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index a5278d8c8c..6d812f560c 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -78,6 +78,7 @@ (define-module (gnu packages disk) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (guix build-system gnu) + #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system go) #:use-module (guix build-system python) #:use-module (guix build-system trivial) @@ -432,7 +433,7 @@ (define-public gparted version "/gparted-" version ".tar.gz")) (sha256 (base32 "092rgwjh1825fal6v3yafq2wr0i61hh0a2n0j4296zn0zdx7pzp2")))) - (build-system gnu-build-system) + (build-system glib-or-gtk-build-system) (arguments ;; Tests require access to paths outside the build container, such ;; as '/dev/disk/by-id' -- cgit v1.2.3 From dec0217f6e21a2f48328aaff5448dcf2f4fea7d9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Jul 2020 20:08:10 +0200 Subject: gnu: python-shiboken-2, python-pyside-2: Update to 5.14.2.3. * gnu/packages/patches/qtbase-absolute-runpath.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/qt.scm (qtbase/next): New variable. * gnu/packages/qt.scm (python-shiboken-2): Update to 5.14.2.3. [source](uri): Adjust for tarball rename. [inputs]: Use the default CLANG-TOOLCHAIN. (python-pyside-2)[inputs]: Likewise. (python-pyside-2-tools)[inputs]: Change from QTBASE to QTBASE/NEXT. --- gnu/local.mk | 1 + gnu/packages/patches/qtbase-absolute-runpath.patch | 17 +++++++++++++++ gnu/packages/qt.scm | 24 ++++++++++++++++------ 3 files changed, 36 insertions(+), 6 deletions(-) create mode 100644 gnu/packages/patches/qtbase-absolute-runpath.patch diff --git a/gnu/local.mk b/gnu/local.mk index ddd024677a..9b42160de3 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1473,6 +1473,7 @@ dist_patch_DATA = \ %D%/packages/patches/qemu-glibc-2.27.patch \ %D%/packages/patches/qrcodegen-cpp-make-install.patch \ %D%/packages/patches/qt4-ldflags.patch \ + %D%/packages/patches/qtbase-absolute-runpath.patch \ %D%/packages/patches/qtbase-moc-ignore-gcc-macro.patch \ %D%/packages/patches/qtbase-use-TZDIR.patch \ %D%/packages/patches/qtscript-disable-tests.patch \ diff --git a/gnu/packages/patches/qtbase-absolute-runpath.patch b/gnu/packages/patches/qtbase-absolute-runpath.patch new file mode 100644 index 0000000000..cec4ddc0a3 --- /dev/null +++ b/gnu/packages/patches/qtbase-absolute-runpath.patch @@ -0,0 +1,17 @@ +Do not use $ORIGIN in RUNPATH so that executables can be copied elsewhere and +still be expected to work (needed for python-pyside-2-tools). + +diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf +--- a/mkspecs/common/linux.conf ++++ b/mkspecs/common/linux.conf +@@ -10,8 +10,8 @@ QMAKE_CFLAGS_THREAD += -D_REENTRANT + QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_THREAD + QMAKE_LFLAGS_GCSECTIONS = -Wl,--gc-sections + +-QMAKE_LFLAGS_REL_RPATH = -Wl,-z,origin +-QMAKE_REL_RPATH_BASE = $ORIGIN ++QMAKE_LFLAGS_REL_RPATH = ++QMAKE_REL_RPATH_BASE = + + QMAKE_INCDIR = + QMAKE_LIBDIR = diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 7e9036c4b4..0cb36427a0 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -596,6 +596,18 @@ (define-public qtbase ;; qt used to refer to the monolithic Qt 5.x package (define-deprecated qt qtbase) +;; This variable is required by 'python-pyside-2-tools', which copies some +;; qtbase executables that fail to run because RUNPATH refers to the +;; wrong $ORIGIN. TODO: Merge with qtbase in the next rebuild cycle. +(define qtbase/next + (package + (inherit qtbase) + (source + (origin + (inherit (package-source qtbase)) + (patches (append (origin-patches (package-source qtbase)) + (search-patches "qtbase-absolute-runpath.patch"))))))) + (define-public qtsvg (package (inherit qtbase) (name "qtsvg") @@ -2566,19 +2578,19 @@ (define-public qtcolorwidgets (define-public python-shiboken-2 (package (name "python-shiboken-2") - (version "5.12.6") + (version "5.14.2.3") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases" "/QtForPython/pyside2/PySide2-" version - "-src/pyside-setup-everywhere-src-" + "-src/pyside-setup-opensource-src-" version ".tar.xz")) (sha256 (base32 - "1n45l6xxyxs6cfp2l4rp8qs1c2fyfwyrdxa4qcpwfsqsi51rydsk")))) + "08lhqm0n3fjqpblcx9rshsp8g3bvf7yzbai5q99bly2wa04y6b83")))) (build-system cmake-build-system) (inputs - `(("clang-toolchain" ,clang-toolchain-6) + `(("clang-toolchain" ,clang-toolchain) ("libxml2" ,libxml2) ("libxslt" ,libxslt) ("python-wrapper" ,python-wrapper) @@ -2631,7 +2643,7 @@ (define-public python-pyside-2 (inputs `(("libxml2" ,libxml2) ("libxslt" ,libxslt) - ("clang-toolchain" ,clang-toolchain-6) + ("clang-toolchain" ,clang-toolchain) ("qtbase" ,qtbase) ("qtdatavis3d" ,qtdatavis3d) ("qtlocation" ,qtlocation) @@ -2699,7 +2711,7 @@ (define-public python-pyside-2-tools (inputs `(("python-pyside-2" ,python-pyside-2) ("python-shiboken-2" ,python-shiboken-2) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase/next))) (native-inputs `(("python" ,python-wrapper))) (arguments -- cgit v1.2.3 From 15076369062852c266bc697fc54b2ba157aceed0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Jul 2020 20:29:26 +0200 Subject: gnu: python-tinycss2: Fix test failure. Fixes . Reported by Michael Rohleder . * gnu/packages/patches/python-tinycss2-flake8-compat.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/python-web.scm (python-tinycss2)[source](patches): New field. --- gnu/local.mk | 1 + .../patches/python-tinycss2-flake8-compat.patch | 36 ++++++++++++++++++++++ gnu/packages/python-web.scm | 1 + 3 files changed, 38 insertions(+) create mode 100644 gnu/packages/patches/python-tinycss2-flake8-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index 9b42160de3..2f59279977 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1466,6 +1466,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-shouldbe-0.1.2-cpy3.8.patch \ %D%/packages/patches/python-slugify-depend-on-unidecode.patch \ %D%/packages/patches/python2-subprocess32-disable-input-test.patch \ + %D%/packages/patches/python-tinycss2-flake8-compat.patch \ %D%/packages/patches/python-unittest2-python3-compat.patch \ %D%/packages/patches/python-unittest2-remove-argparse.patch \ %D%/packages/patches/python-waitress-fix-tests.patch \ diff --git a/gnu/packages/patches/python-tinycss2-flake8-compat.patch b/gnu/packages/patches/python-tinycss2-flake8-compat.patch new file mode 100644 index 0000000000..a66eb42fa1 --- /dev/null +++ b/gnu/packages/patches/python-tinycss2-flake8-compat.patch @@ -0,0 +1,36 @@ +Fix test failure that occurs with recent versions of Flake8. + +Taken from upstream: +https://github.com/Kozea/tinycss2/commit/6556604fb98c2153412384d6f0f705db2da1aa60 + +diff --git a/tinycss2/css-parsing-tests/make_color3_hsl.py b/tinycss2/css-parsing-tests/make_color3_hsl.py +index d1fd3a6..56fda0c 100644 +--- a/tinycss2/css-parsing-tests/make_color3_hsl.py ++++ b/tinycss2/css-parsing-tests/make_color3_hsl.py +@@ -8,16 +8,17 @@ def trim(s): + print('[') + print(',\n'.join( + '"hsl%s(%s, %s%%, %s%%%s)", [%s, %s, %s, %s]' % ( +- ('a' if a is not None else '', h, +- trim(str(s / 10.)), trim(str(l / 10.)), +- ', %s' % a if a is not None else '') + ++ ('a' if alpha is not None else '', hue, ++ trim(str(saturation / 10.)), trim(str(light / 10.)), ++ ', %s' % alpha if alpha is not None else '') + + tuple(trim(str(round(v, 10))) +- for v in colorsys.hls_to_rgb(h / 360., l / 1000., s / 1000.)) + +- (a if a is not None else 1,) ++ for v in colorsys.hls_to_rgb( ++ hue / 360., light / 1000., saturation / 1000.)) + ++ (alpha if alpha is not None else 1,) + ) +- for a in [None, 1, .2, 0] +- for l in range(0, 1001, 125) +- for s in range(0, 1001, 125) +- for h in range(0, 360, 30) ++ for alpha in [None, 1, .2, 0] ++ for light in range(0, 1001, 125) ++ for saturation in range(0, 1001, 125) ++ for hue in range(0, 360, 30) + )) + print(']') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index a7e5e7081f..1d7cfd852d 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -3411,6 +3411,7 @@ (define-public python-tinycss2 (origin (method url-fetch) (uri (pypi-uri "tinycss2" version)) + (patches (search-patches "python-tinycss2-flake8-compat.patch")) (sha256 (base32 "1kw84y09lggji4krkc58jyhsfj31w8npwhznr7lf19d0zbix09v4")))) (build-system python-build-system) -- cgit v1.2.3 From 209bfe60ee779413348d0bf25cbe1fdd70e9ff4b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 15 Jul 2020 21:10:53 +0200 Subject: gnu: bind: Update to 9.16.5. * gnu/packages/dns.scm (isc-bind): Update to 9.16.5. --- gnu/packages/dns.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 1d893e46d7..a36ac0184f 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -119,7 +119,7 @@ (define-public dnsmasq (define-public isc-bind (package (name "bind") - (version "9.16.4") + (version "9.16.5") (source (origin (method url-fetch) (uri (string-append @@ -127,7 +127,7 @@ (define-public isc-bind "/bind-" version ".tar.xz")) (sha256 (base32 - "02ip1xvmnqla3p5k2rmfrksrw4q9iqbrhyg3mamvrj5a7n6hh8km")))) + "0xf07mmd0vi91jd15z8d3hhjva8v27l4ip4l8yzah4gg3zjv6y33")))) (build-system gnu-build-system) (outputs `("out" "utils")) (inputs -- cgit v1.2.3 From be6835765bed5a806ec881e84f7b412872886fd7 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sat, 11 Jul 2020 12:09:44 +0300 Subject: gnu: zabbix-agentd: Update to 5.0.1. * gnu/packages/monitoring.scm (zabbix-agentd): Update to 5.0.1. (arguments)[#:phases]: Update front-end path. --- gnu/packages/monitoring.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm index 429959531a..d07bc0bd60 100644 --- a/gnu/packages/monitoring.scm +++ b/gnu/packages/monitoring.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2017, 2018, 2019, 2020 Ricardo Wurmus ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Gábor Boskovits -;;; Copyright © 2018, 2019 Oleg Pykhalov +;;; Copyright © 2018, 2019, 2020 Oleg Pykhalov ;;; Copyright © 2020 Alex ter Weele ;;; Copyright © 2020 Lars-Dominik Braun ;;; @@ -158,16 +158,16 @@ (define-public nagios (define-public zabbix-agentd (package (name "zabbix-agentd") - (version "4.4.6") + (version "5.0.1") (source (origin (method url-fetch) (uri (string-append - "mirror://sourceforge/zabbix/ZABBIX%20Latest%20Stable/" version - "/zabbix-" version ".tar.gz")) + "https://cdn.zabbix.com/zabbix/sources/stable/" + (version-major+minor version) "/zabbix-" version ".tar.gz")) (sha256 (base32 - "03mf4sklnw1x0ixp41vnibkz0794yi9jhws7ixld8jj2czk2ifr2")))) + "1djkm3261plr36khvh49fbjpb67wxi5v08a5waxzqkrmy9f9x890")))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -201,7 +201,7 @@ (define-public zabbix-server (front-end-conf (string-append php "/conf")) (etc (string-append php "/etc"))) (mkdir-p php) - (copy-recursively "frontends/php" php) + (copy-recursively "ui" php) ;; Make front-end write config to ‘/etc/zabbix’ directory. (rename-file front-end-conf (string-append front-end-conf "-example")) -- cgit v1.2.3 From 37fea3c30a79d2c401dd64b446a0fbfe4a14b966 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sat, 11 Jul 2020 14:01:44 +0300 Subject: tests: zabbix: Fix typo in comment. * gnu/tests/monitoring.scm (run-zabbix-server-test)[test]: Fix typo in comment. --- gnu/tests/monitoring.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/tests/monitoring.scm b/gnu/tests/monitoring.scm index 732fbc54d7..d20b8ac59e 100644 --- a/gnu/tests/monitoring.scm +++ b/gnu/tests/monitoring.scm @@ -280,7 +280,7 @@ (define marionette '(file-exists? "/var/run/nginx/pid") marionette)) - ;; Make sure we can access pages that correspond to our repository. + ;; Make sure we can access pages that correspond to our Zabbix instance. (letrec-syntax ((test-url (syntax-rules () ((_ path code) -- cgit v1.2.3 From 7233b19fde688d79d19ed1614a804c1d80f55260 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 10 Jun 2020 21:28:53 -0400 Subject: gnu: Transmission: Update to 3.0.0. * gnu/packages/bittorrent.scm (transmission): Update to 3.0.0. [source]: Remove obsolete patch. * gnu/packages/patches/transmission-CVE-2018-10756.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/bittorrent.scm | 14 ++--- .../patches/transmission-CVE-2018-10756.patch | 71 ---------------------- 3 files changed, 6 insertions(+), 80 deletions(-) delete mode 100644 gnu/packages/patches/transmission-CVE-2018-10756.patch diff --git a/gnu/local.mk b/gnu/local.mk index 2f59279977..7ed634a7a8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1568,7 +1568,6 @@ dist_patch_DATA = \ %D%/packages/patches/tipp10-fix-compiling.patch \ %D%/packages/patches/tipp10-remove-license-code.patch \ %D%/packages/patches/tk-find-library.patch \ - %D%/packages/patches/transmission-CVE-2018-10756.patch \ %D%/packages/patches/ttf2eot-cstddef.patch \ %D%/packages/patches/ttfautohint-source-date-epoch.patch \ %D%/packages/patches/tomb-fix-errors-on-open.patch \ diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index be10a34a6c..b124e17d76 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -65,16 +65,15 @@ (define-module (gnu packages bittorrent) (define-public transmission (package (name "transmission") - (version "2.94") + (version "3.00") (source (origin (method url-fetch) - (uri (string-append - "https://github.com/transmission/transmission-releases/raw/" - "master/transmission-" version ".tar.xz")) - (patches (search-patches "transmission-CVE-2018-10756.patch")) + (uri (string-append "https://github.com/transmission/transmission" + "/releases/download/" version "/transmission-" + version ".tar.xz")) (sha256 (base32 - "0zbbj7rlm6m7vb64x68a64cwmijhsrwx9l63hbwqs7zr9742qi1m")))) + "1wjmn96zrvmk8j1yz2ysmqd7a2x6ilvnwwapcvfzgxs2wwpnai4i")))) (build-system glib-or-gtk-build-system) (outputs '("out" ; library and command-line interface "gui")) ; graphical user interface @@ -90,8 +89,7 @@ (define-public transmission (gui (assoc-ref outputs "gui"))) (mkdir-p (string-append gui "/bin")) (rename-file (string-append out "/bin/transmission-gtk") - (string-append gui - "/bin/transmission-gtk")) + (string-append gui "/bin/transmission-gtk")) ;; Move the '.desktop' and icon files as well. (mkdir (string-append gui "/share")) diff --git a/gnu/packages/patches/transmission-CVE-2018-10756.patch b/gnu/packages/patches/transmission-CVE-2018-10756.patch deleted file mode 100644 index f9bdcf60aa..0000000000 --- a/gnu/packages/patches/transmission-CVE-2018-10756.patch +++ /dev/null @@ -1,71 +0,0 @@ -Fix CVE-2018-10756: - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-10756 - -Patch copied from Fedora: - -https://src.fedoraproject.org/rpms/transmission/blob/master/f/2123adf8e5e1c2b48791f9d22fc8c747e974180e.patch - ---- a/libtransmission/variant.c 2018-05-01 12:21:08.000000000 -0500 -+++ b/libtransmission/variant.c 2020-05-18 10:21:27.554214128 -0500 -@@ -820,7 +820,7 @@ - struct SaveNode - { - const tr_variant * v; -- tr_variant sorted; -+ tr_variant* sorted; - size_t childIndex; - bool isVisited; - }; -@@ -849,26 +849,33 @@ - - qsort (tmp, n, sizeof (struct KeyIndex), compareKeyIndex); - -- tr_variantInitDict (&node->sorted, n); -+ node->sorted = tr_new(tr_variant, 1); -+ tr_variantInitDict (node->sorted, n); - for (i=0; isorted.val.l.vals[i] = *tmp[i].val; -+ node->sorted->val.l.vals[i] = *tmp[i].val; - node->sorted.val.l.count = n; - - tr_free (tmp); - -- node->v = &node->sorted; -+ v = node->sorted; - } - else - { -- node->v = v; -+ node->sorted = NULL; - } -+ -+ node->v = v; - } - - static void - nodeDestruct (struct SaveNode * node) - { -- if (node->v == &node->sorted) -- tr_free (node->sorted.val.l.vals); -+ //TR_ASSERT(node != NULL); -+ if (node->sorted != NULL) -+ { -+ tr_free(node->sorted->val.l.vals); -+ tr_free(node->sorted); -+ } - } - - /** ---- a/libtransmission/variant.c 2020-05-18 10:21:49.000000000 -0500 -+++ b/libtransmission/variant.c 2020-05-18 10:24:34.673648865 -0500 -@@ -853,7 +853,7 @@ - tr_variantInitDict (node->sorted, n); - for (i=0; isorted->val.l.vals[i] = *tmp[i].val; -- node->sorted.val.l.count = n; -+ node->sorted->val.l.count = n; - - tr_free (tmp); - - -- cgit v1.2.3 From 03f9a8c35be387f37badcd2c830ac7414ac17225 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 15 Jul 2020 23:19:57 +0200 Subject: Revert "gnu: rust: Add SSL native search paths." This reverts commit ba1e4ce2560d51c8ba935e5b5667ba3a0133c694. --- gnu/packages/rust.scm | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index dc373ef2bb..851a996e4b 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2017 Ben Woodcroft ;;; Copyright © 2017, 2018 Nikolai Merinov ;;; Copyright © 2017, 2019 Efraim Flashner -;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Danny Milosavljevic ;;; Copyright © 2019 Ivan Petkov ;;; Copyright © 2020 Jakub Kądziołka @@ -447,18 +447,7 @@ (define rust-1.19 (files '("include/c++" "include"))) (search-path-specification (variable "LIBRARY_PATH") - (files '("lib" "lib64"))) - - ;; For cargo. - (search-path-specification - (variable "SSL_CERT_DIR") - (separator #f) - (files '("etc/ssl/certs"))) - (search-path-specification - (variable "SSL_CERT_FILE") - (file-type 'regular) - (separator #f) - (files '("etc/ssl/certs/ca-certificates.crt"))))) + (files '("lib" "lib64"))))) (synopsis "Compiler for the Rust progamming language") (description "Rust is a systems programming language that provides memory -- cgit v1.2.3 From f5340e004590d3775157b335efa8a1525605a55c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 10 Jul 2020 17:48:06 +0200 Subject: gnu: Add tao. * gnu/packages/patches/tao-add-missing-headers.patch, gnu/packages/patches/tao-fix-parser-types.patch: New files. * gnu/local.mk (dist_patch_DATA): Add them. * gnu/packages/audio.scm (tao): New variable. --- gnu/local.mk | 2 + gnu/packages/audio.scm | 71 ++++++++++++++ gnu/packages/patches/tao-add-missing-headers.patch | 102 +++++++++++++++++++++ gnu/packages/patches/tao-fix-parser-types.patch | 26 ++++++ 4 files changed, 201 insertions(+) create mode 100644 gnu/packages/patches/tao-add-missing-headers.patch create mode 100644 gnu/packages/patches/tao-fix-parser-types.patch diff --git a/gnu/local.mk b/gnu/local.mk index 7ed634a7a8..f7c6036ee7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1548,6 +1548,8 @@ dist_patch_DATA = \ %D%/packages/patches/t1lib-CVE-2011-0764.patch \ %D%/packages/patches/t1lib-CVE-2011-1552+.patch \ %D%/packages/patches/t4k-common-libpng16.patch \ + %D%/packages/patches/tao-add-missing-headers.patch \ + %D%/packages/patches/tao-fix-parser-types.patch \ %D%/packages/patches/tar-remove-wholesparse-check.patch \ %D%/packages/patches/tar-skip-unreliable-tests.patch \ %D%/packages/patches/tcc-boot-0.9.27.patch \ diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 736b934d79..e3085b8a7f 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -70,6 +70,7 @@ (define-module (gnu packages audio) #:use-module (gnu packages fontutils) #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) + #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gnunet) ; libmicrohttpd @@ -861,6 +862,76 @@ (define-public swh-plugins-lv2 emulation (valve, tape), bit fiddling (decimator, pointer-cast), etc.") (license license:gpl3+))) +(define-public tao + (package + (name "tao") + (version "1.0-beta-10May2006") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/taopm/Tao/" + "tao-" version "/" + "tao-" version ".tar.gz")) + (sha256 + (base32 + "156py3g6mmglldfd0j76bn7n242hdwf49diaprjpj7crp8vgf2pz")) + (patches + (search-patches "tao-add-missing-headers.patch" + "tao-fix-parser-types.patch")) + (modules '((guix build utils))) + (snippet + '(begin + (substitute* "configure" + (("SHELL=/bin/sh") "")) + #t)))) + (build-system gnu-build-system) + (arguments + '(#:configure-flags '("TAO_RELEASE=-beta") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-references + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "user-scripts/tao.in" + (("taoparse") + (string-append (assoc-ref outputs "out") "/bin/taoparse")) + (("grep") (which "grep")) + (("sed -f \\$distdir/user-scripts/") + (string-append (which "sed") " -f $distdir/")) + (("distdir=.*") + (string-append "distdir=" + (assoc-ref outputs "out") "/share/tao"))) + #t)) + (add-after 'install 'install-extra-files + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (share (string-append out "/share/tao/")) + (inc (string-append out "/include/tao/"))) + (mkdir-p share) + (mkdir-p inc) + (install-file "user-scripts/error.parse" share) + (copy-recursively "examples" (string-append share "examples")) + (for-each (lambda (file) (install-file file inc)) + (find-files "include" "\\.h")) + #t)))))) + (inputs + `(("audiofile" ,audiofile) + ("libxi" ,libxi) + ("libxmu" ,libxmu) + ("mesa" ,mesa) + ("glut" ,freeglut) + ("flex" ,flex) + ("bison" ,bison) + ("sed" ,sed) + ("grep" ,grep))) + (home-page "http://taopm.sourceforge.net/") + (synopsis "Sound Synthesis with Physical Models") + (description "Tao is a software package for sound synthesis using physical +models. It provides a virtual acoustic material constructed from masses and +springs which can be used as the basis for building quite complex virtual +musical instruments. Tao comes with a synthesis language for creating and +playing instruments and a C++ API for those who would like to use it as an +object library.") + (license license:gpl2+))) + (define-public csound (package (name "csound") diff --git a/gnu/packages/patches/tao-add-missing-headers.patch b/gnu/packages/patches/tao-add-missing-headers.patch new file mode 100644 index 0000000000..f117281993 --- /dev/null +++ b/gnu/packages/patches/tao-add-missing-headers.patch @@ -0,0 +1,102 @@ +Taken from Debian: +https://salsa.debian.org/multimedia-team/taopm/-/raw/master/debian/patches/01-add-missing-headers.diff + +Description: Adding missing headers +Author: Tiago Bortoletto Vaz +Last-Update: 2013-04-17 +--- a/libtao/Tao.cc ++++ b/libtao/Tao.cc +@@ -18,6 +18,7 @@ + + #include "Tao.h" + #include ++#include + + extern Tao tao; + float &Time = tao.synthesisEngine.time; +--- a/libtao/TaoDevice.cc ++++ b/libtao/TaoDevice.cc +@@ -20,6 +20,7 @@ + #include "Tao.h" + #include "TaoAccessPoint.h" + #include "TaoInstrument.h" ++#include + + TaoDevice::TaoDevice() + { +--- a/libtao/TaoInstrument.cc ++++ b/libtao/TaoInstrument.cc +@@ -23,6 +23,7 @@ + //#include + #include + #include ++#include + + float TaoInstrument::defaultMass=3.5; // Set to optimum value for + // frequency response of +--- a/libtao/TaoOutput.cc ++++ b/libtao/TaoOutput.cc +@@ -24,6 +24,7 @@ + #include + #include "TaoOutput.h" + #include "Tao.h" ++#include + + extern Tao tao; + +--- a/libtao/TaoPitch.cc ++++ b/libtao/TaoPitch.cc +@@ -30,6 +30,7 @@ + #include "TaoPitch.h" + #include + #include ++#include + + // This class allows pitches and frequencies to be specified in a number of + // different formats including the following: +--- a/taoparse/taoparser.yy ++++ b/taoparse/taoparser.yy +@@ -19,7 +19,8 @@ + + #include + #include +-#include ++#include ++#include + #include "taoparserdefs.h" + + int yyerror(char *s); +--- a/libtao/TaoGraphicsEngine.cc ++++ b/libtao/TaoGraphicsEngine.cc +@@ -27,7 +27,8 @@ + #include "TaoInstrument.h" + #include "TaoAccessPoint.h" + #include "TaoDevice.h" +-#include ++#include ++#include + + extern Tao tao; + extern void taoMasterTick(); +--- a/tao2aiff/tao2aiff.cc ++++ b/tao2aiff/tao2aiff.cc +@@ -25,6 +25,8 @@ + #include + #include "audiofile.h" + #include "tao2aiff.h" ++#include ++#include + + + main(int argc, char **argv) +--- a/tao2wav/tao2wav.cc ++++ b/tao2wav/tao2wav.cc +@@ -25,6 +25,8 @@ + #include + #include "audiofile.h" + #include "tao2wav.h" ++#include ++#include + + main(int argc, char **argv) + { diff --git a/gnu/packages/patches/tao-fix-parser-types.patch b/gnu/packages/patches/tao-fix-parser-types.patch new file mode 100644 index 0000000000..5dcf3fc2ea --- /dev/null +++ b/gnu/packages/patches/tao-fix-parser-types.patch @@ -0,0 +1,26 @@ +Taken from Debian: +https://salsa.debian.org/multimedia-team/taopm/-/raw/master/debian/patches/02-fix-parser-yyerror.diff + +Description: Use a constant char, dummy comment. +Author: Tiago Bortoletto Vaz +Last-Update: 2013-04-17 +--- a/taoparse/taoparser.yy ++++ b/taoparse/taoparser.yy +@@ -23,7 +23,7 @@ + #include + #include "taoparserdefs.h" + +-int yyerror(char *s); ++int yyerror(const char *s); + + //#ifdef LINUX + int yylex(void); +@@ -2924,7 +2924,7 @@ + } + + +-int yyerror (char *s) ++int yyerror (const char *s) + { + parse_error(what_I_expected_here); + std::cout << "PARSE_FAILED"; -- cgit v1.2.3 From 2d9c897dd03cad836982c2f6187b4c58977e85de Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 10 Jul 2020 17:49:16 +0200 Subject: gnu: r-variancepartition: Update to 1.18.2. * gnu/packages/bioconductor.scm (r-variancepartition): Update to 1.18.2. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 3bf3c75e80..e35a1dfe78 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -7048,14 +7048,14 @@ (define-public r-wavetiling (define-public r-variancepartition (package (name "r-variancepartition") - (version "1.18.0") + (version "1.18.2") (source (origin (method url-fetch) (uri (bioconductor-uri "variancePartition" version)) (sha256 (base32 - "1rn655qq7dshbk1dd41n7y2hfz8498jxd2j4rk7p8hrikd3s32dm")))) + "19bhkb8vd44m3nkznw075fx3y2p3a1bsazbhcfiqw9n4190k9bgv")))) (properties `((upstream-name . "variancePartition"))) (build-system r-build-system) -- cgit v1.2.3 From 15597255e65d009550f39f84bcb4364ff8c0dca4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 10 Jul 2020 17:49:19 +0200 Subject: gnu: r-rhdf5: Update to 2.32.2. * gnu/packages/bioinformatics.scm (r-rhdf5): Update to 2.32.2. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 56837844b0..ad4fadd6a0 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8893,13 +8893,13 @@ (define-public r-tximport (define-public r-rhdf5 (package (name "r-rhdf5") - (version "2.32.1") + (version "2.32.2") (source (origin (method url-fetch) (uri (bioconductor-uri "rhdf5" version)) (sha256 (base32 - "102zam2j43jwgaz9ch6y2jjbc3qf56ngmggikf99s8l3w9ggbskm")))) + "1v6ygi0avh3gmaj2ld2nr7vww4ipw39b5kqci9w27i3ja985lb8j")))) (build-system r-build-system) (propagated-inputs `(("r-rhdf5lib" ,r-rhdf5lib))) -- cgit v1.2.3 From b80f141f86293edd54314d47345fb2c8c74b77bc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 10 Jul 2020 17:49:22 +0200 Subject: gnu: r-delayedmatrixstats: Update to 1.10.1. * gnu/packages/bioinformatics.scm (r-delayedmatrixstats): Update to 1.10.1. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index ad4fadd6a0..2ba58f61b2 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -11063,14 +11063,14 @@ (define-public r-scran (define-public r-delayedmatrixstats (package (name "r-delayedmatrixstats") - (version "1.10.0") + (version "1.10.1") (source (origin (method url-fetch) (uri (bioconductor-uri "DelayedMatrixStats" version)) (sha256 (base32 - "0i6gw8058gw9yajya3w9qq6l3p634fq9sv8dh8ifigxz0k9b98r6")))) + "046sam0rz42ph0m7jz7v3bck7d3h2mp45gzywh5dvc1qkjq6fdxx")))) (properties `((upstream-name . "DelayedMatrixStats"))) (build-system r-build-system) -- cgit v1.2.3 From 1b5c263bfc77a9a2249e2fd5d200c5a1e1802c80 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 10 Jul 2020 17:49:29 +0200 Subject: gnu: r-rcpp: Update to 1.0.5. * gnu/packages/cran.scm (r-rcpp): Update to 1.0.5. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 1ffb3f0a35..d388f9ed34 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2005,13 +2005,13 @@ (define-public r-pkgload (define-public r-rcpp (package (name "r-rcpp") - (version "1.0.4.6") + (version "1.0.5") (source (origin (method url-fetch) (uri (cran-uri "Rcpp" version)) (sha256 - (base32 "00mk23zmrqn1c4mk9d6csjcbnl12wd7yicjk2ikmw5dyvdfngbs5")))) + (base32 "012wbj446k1wz6bp6bpf6h77ypvcsw69xvnax6qf6vyc7dj2qimq")))) (build-system r-build-system) (home-page "http://www.rcpp.org") (synopsis "Seamless R and C++ integration") -- cgit v1.2.3 From 1fdd9ebf7707949adaa5fba047154ddb68f4cc04 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 10 Jul 2020 17:49:32 +0200 Subject: gnu: r-getoptlong: Update to 1.0.2. * gnu/packages/cran.scm (r-getoptlong): Update to 1.0.2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index d388f9ed34..efa979c7b6 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2261,14 +2261,14 @@ (define-public r-dendextend (define-public r-getoptlong (package (name "r-getoptlong") - (version "1.0.0") + (version "1.0.2") (source (origin (method url-fetch) (uri (cran-uri "GetoptLong" version)) (sha256 (base32 - "1fswgy5j4xaipqs7nk7nzrl66vrchhxrk0w7hcsbyij3sxgn3z9j")))) + "1p89v2qzqfxyrmqzkv245716n9i4bllnq77a6gw811mgdhxbd51l")))) (properties `((upstream-name . "GetoptLong"))) (build-system r-build-system) (inputs -- cgit v1.2.3 From fbd4582a91369ebe434596645325f07b026170c0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 10 Jul 2020 17:49:39 +0200 Subject: gnu: r-cubature: Update to 2.0.4.1. * gnu/packages/cran.scm (r-cubature): Update to 2.0.4.1. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index efa979c7b6..d5f35b04b1 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4948,17 +4948,19 @@ (define-public r-urca (define-public r-cubature (package (name "r-cubature") - (version "2.0.4") + (version "2.0.4.1") (source (origin (method url-fetch) (uri (cran-uri "cubature" version)) (sha256 (base32 - "0jpyq8j7x06dpiz29w48av879ygldzgls9z810192hsymkmfaz6r")))) + "006la36gxdikvmdnq4ny7ik7r30id4z3b3fqsl57dpqwkpsbsgrq")))) (build-system r-build-system) (propagated-inputs `(("r-rcpp" ,r-rcpp))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/bnaras/cubature") (synopsis "Adaptive multivariate integration over hypercubes") (description -- cgit v1.2.3 From e1bfb22e6c9600a794a5d5011253cddecbf7ac99 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 10 Jul 2020 17:49:43 +0200 Subject: gnu: r-doby: Update to 4.6.7. * gnu/packages/cran.scm (r-doby): Update to 4.6.7. [propagated-inputs]: Add r-dplyr and r-ggplot2. --- gnu/packages/cran.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index d5f35b04b1..9e51c0264d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7278,19 +7278,21 @@ (define-public r-deriv (define-public r-doby (package (name "r-doby") - (version "4.6.6") + (version "4.6.7") (source (origin (method url-fetch) (uri (cran-uri "doBy" version)) (sha256 (base32 - "0wz1vmsf1545r1m42q88s675ncwvm8figjn7kzbngjn9aqck9qbq")))) + "16vg1aa272sfzyqxfb63fyis9hv6g5m3nmxxa6mk1gy0irqnl3jk")))) (properties `((upstream-name . "doBy"))) (build-system r-build-system) (propagated-inputs `(("r-broom" ,r-broom) ("r-deriv" ,r-deriv) + ("r-dplyr" ,r-dplyr) + ("r-ggplot2" ,r-ggplot2) ("r-magrittr" ,r-magrittr) ("r-mass" ,r-mass) ("r-matrix" ,r-matrix) -- cgit v1.2.3 From 215475907a01e1b59adc0572d2cfdc699fb9ee4a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 10 Jul 2020 17:49:50 +0200 Subject: gnu: r-future: Update to 1.18.0. * gnu/packages/cran.scm (r-future): Update to 1.18.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 9e51c0264d..dd9c2a0e85 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -12189,14 +12189,14 @@ (define-public r-globals (define-public r-future (package (name "r-future") - (version "1.17.0") + (version "1.18.0") (source (origin (method url-fetch) (uri (cran-uri "future" version)) (sha256 (base32 - "0d4y7gwcgqx2z0y6h5bh4lrz0m7b0inii5cjcq0kk8za762bi8rg")))) + "01fp8kgjf0k6c83q1w3dy9z90g72cc9d0004d1qw6n1j65nwxg4f")))) (build-system r-build-system) (propagated-inputs `(("r-digest" ,r-digest) -- cgit v1.2.3 From ed8c14589c8474c0adfc5962fe574be0b1076595 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 10 Jul 2020 17:49:53 +0200 Subject: gnu: r-nonnest2: Update to 0.5-5. * gnu/packages/cran.scm (r-nonnest2): Update to 0.5-5. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index dd9c2a0e85..3dfa1666f2 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -12882,14 +12882,14 @@ (define-public r-lavaan (define-public r-nonnest2 (package (name "r-nonnest2") - (version "0.5-4") + (version "0.5-5") (source (origin (method url-fetch) (uri (cran-uri "nonnest2" version)) (sha256 (base32 - "07nr54hxdnc4k022nd4a2g9w9l9ym2ikfr978rrnqc71wx750i0z")))) + "1ddaqwx8i3ygwvxf11mc8xhgk4nkvnail99nr5szq8i168752zq2")))) (build-system r-build-system) (propagated-inputs `(("r-compquadform" ,r-compquadform) -- cgit v1.2.3 From e9d906748df7156d7a179608dbb7534834f5501e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 10 Jul 2020 17:49:57 +0200 Subject: gnu: r-quanteda: Update to 2.1.0. * gnu/packages/cran.scm (r-quanteda): Update to 2.1.0. [propagated-inputs]: Add r-digest. --- gnu/packages/cran.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 3dfa1666f2..6c76c5e5c3 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20175,18 +20175,19 @@ (define-public r-snowballc (define-public r-quanteda (package (name "r-quanteda") - (version "2.0.1") + (version "2.1.0") (source (origin (method url-fetch) (uri (cran-uri "quanteda" version)) (sha256 (base32 - "0pym6vdzqbkyj87m3pla229092xvvx4j830x67qflxzzdmc9dzhz")))) + "0qxvm75g6r0d1clj8b19gjqwkfrqypapf4zysb8nyfbmn33h8xc7")))) (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) -- cgit v1.2.3 From 8aff0a206c0ae21696963fd63ec1308f2ea7c9ea Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 10 Jul 2020 17:50:03 +0200 Subject: gnu: r-iheatmapr: Update to 0.5.0. * gnu/packages/cran.scm (r-iheatmapr): Update to 0.5.0. [propagated-inputs]: Remove r-plyr and r-s4vectors. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 6c76c5e5c3..d81f954d49 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20933,14 +20933,14 @@ (define-public r-irtoys (define-public r-iheatmapr (package (name "r-iheatmapr") - (version "0.4.12") + (version "0.5.0") (source (origin (method url-fetch) (uri (cran-uri "iheatmapr" version)) (sha256 (base32 - "0s479j9l35xiss599vablxgvg6i2j9zq9sxphsq4vdk3bafg84bw")))) + "0s2lc088rq2siy2wzmg1y6nss68rs33mf7w2izqqmg6kbx6d7y9h")))) (properties `((upstream-name . "iheatmapr"))) (build-system r-build-system) (propagated-inputs @@ -20950,10 +20950,10 @@ (define-public r-iheatmapr ("r-jsonlite" ,r-jsonlite) ("r-knitr" ,r-knitr) ("r-magrittr" ,r-magrittr) - ("r-plyr" ,r-plyr) ("r-rcolorbrewer" ,r-rcolorbrewer) - ("r-s4vectors" ,r-s4vectors) ("r-scales" ,r-scales))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://docs.ropensci.org/iheatmapr") (synopsis "Interactive, Complex Heatmaps") (description -- cgit v1.2.3 From 3cafe807b2ba3e18615416bc36f22bbe41f7f589 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 10 Jul 2020 17:50:07 +0200 Subject: gnu: r-rstantools: Update to 2.1.1. * gnu/packages/cran.scm (r-rstantools): Update to 2.1.1. [propagated-inputs]: Add r-rcppparallel. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index d81f954d49..e549651d75 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -21142,20 +21142,23 @@ (define-public r-shinystan (define-public r-rstantools (package (name "r-rstantools") - (version "2.0.0") + (version "2.1.1") (source (origin (method url-fetch) (uri (cran-uri "rstantools" version)) (sha256 (base32 - "1il0pn4ksbdkska5fmhvgaicvwnnc6cs08g6ags9fj1xkjiqmrsa")))) + "0b9x8rzj3dr4m7yjx476nn42z22xd1xnw85m9frfwxy5ivg1any9")))) (properties `((upstream-name . "rstantools"))) (build-system r-build-system) (inputs `(("pandoc" ,ghc-pandoc))) (propagated-inputs `(("r-desc" ,r-desc) - ("r-rcpp" ,r-rcpp))) + ("r-rcpp" ,r-rcpp) + ("r-rcppparallel" ,r-rcppparallel))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://mc-stan.org/rstantools/") (synopsis "Tools for developing R packages interfacing with Stan") (description -- cgit v1.2.3 From 67462c7be9a39cfea581681ea49be81cbe04f51b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 10 Jul 2020 17:50:12 +0200 Subject: gnu: r-loo: Update to 2.3.0. * gnu/packages/cran.scm (r-loo): Update to 2.3.0. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index e549651d75..e01a92c35f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -21172,14 +21172,14 @@ (define-public r-rstantools (define-public r-loo (package (name "r-loo") - (version "2.2.0") + (version "2.3.0") (source (origin (method url-fetch) (uri (cran-uri "loo" version)) (sha256 (base32 - "1hq1zcj76x55z9kic6cwf7mfq9pzqfbr341jbc9wp7x8ac4zcva6")))) + "1lgkmb9938x5cfm0rff3lp4wrj2rvsv61dw1iz1jfd4xr38w87wx")))) (properties `((upstream-name . "loo"))) (build-system r-build-system) (inputs @@ -21188,6 +21188,8 @@ (define-public r-loo (propagated-inputs `(("r-checkmate" ,r-checkmate) ("r-matrixstats" ,r-matrixstats))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://mc-stan.org/loo/") (synopsis "Leave-One-Out cross-validation and WAIC for Bayesian models") (description -- cgit v1.2.3 From 0091d815ad843750158cb200b28483b678a62bcc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 10 Jul 2020 17:50:17 +0200 Subject: gnu: r-rstan: Update to 2.21.1. * gnu/packages/cran.scm (r-rstan): Update to 2.21.1. [propagated-inputs]: Add r-rcppparallel and r-v8. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index e01a92c35f..d8c9fa0f1e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -21207,14 +21207,14 @@ (define-public r-loo (define-public r-rstan (package (name "r-rstan") - (version "2.19.3") + (version "2.21.1") (source (origin (method url-fetch) (uri (cran-uri "rstan" version)) (sha256 (base32 - "128ndwjrhf8b1qvvqz4bl13qlm8718z9qs5ryc6gsdr3vk65s0np")))) + "0fxxh2jmrgfp98195qkqli1r9ni457vnjdvqm5l91j6aagkbk8zz")))) (properties `((upstream-name . "rstan"))) (build-system r-build-system) (arguments @@ -21230,7 +21230,8 @@ (define-public r-rstan #t))))) (native-inputs `(("tzdata" ,tzdata-for-tests) - ("pandoc" ,ghc-pandoc))) + ("pandoc" ,ghc-pandoc) + ("r-knitr" ,r-knitr))) (propagated-inputs `(("r-bh" ,r-bh) ("r-ggplot2" ,r-ggplot2) @@ -21240,7 +21241,9 @@ (define-public r-rstan ("r-pkgbuild" ,r-pkgbuild) ("r-rcpp" ,r-rcpp) ("r-rcppeigen" ,r-rcppeigen) - ("r-stanheaders" ,r-stanheaders))) + ("r-rcppparallel" ,r-rcppparallel) + ("r-stanheaders" ,r-stanheaders) + ("r-v8" ,r-v8))) (home-page "https://discourse.mc-stan.org/") (synopsis "R interface to Stan") (description -- cgit v1.2.3 From 59b88ab39eb5cd6bb75115215b0b9f1742791955 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 10 Jul 2020 17:50:21 +0200 Subject: gnu: r-svglite: Update to 1.2.3.2. * gnu/packages/statistics.scm (r-svglite): Update to 1.2.3.2. [native-inputs]: Add r-knitr. --- gnu/packages/statistics.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 7cbb6bf51e..c2d9eeee92 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1187,19 +1187,21 @@ (define-public r-gdtools (define-public r-svglite (package (name "r-svglite") - (version "1.2.3") + (version "1.2.3.2") (source (origin (method url-fetch) (uri (cran-uri "svglite" version)) (sha256 (base32 - "1zivykbi1pxdxhrkc1if1ihdn5p27j0nai2q0abca1dwry3wg2yl")))) + "00n8bg4iligl0h24v42cka417w26zmcxrr4r6k8wdal1riwhgmi5")))) (build-system r-build-system) (propagated-inputs `(("r-bh" ,r-bh) ("r-gdtools" ,r-gdtools) ("r-rcpp" ,r-rcpp))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/hadley/svglite") (synopsis "SVG graphics device") (description -- cgit v1.2.3 From f7b05fb97848b34ff6fdbc3804760bdc05730d88 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 10 Jul 2020 17:50:24 +0200 Subject: gnu: r-tibble: Update to 3.0.2. * gnu/packages/statistics.scm (r-tibble): Update to 3.0.2. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index c2d9eeee92..2f0095fb8c 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1637,14 +1637,14 @@ (define-public r-rlang (define-public r-tibble (package (name "r-tibble") - (version "3.0.1") + (version "3.0.2") (source (origin (method url-fetch) (uri (cran-uri "tibble" version)) (sha256 (base32 - "17m7xvn423snq9dmr0bhx42j5rbc53w1viizxx4bvq37nz7m4i8m")))) + "14mpbdmd4jcdxawxnk9rp5pg95hxndhv4xg6sb21idpdicv02iqs")))) (build-system r-build-system) (propagated-inputs `(("r-cli" ,r-cli) -- cgit v1.2.3 From f12fd7691265f4cc869724bc7ec21eeecbeeaf2e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 10 Jul 2020 17:50:27 +0200 Subject: gnu: r-xml: Update to 3.99-0.4. * gnu/packages/statistics.scm (r-xml): Update to 3.99-0.4. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 2f0095fb8c..53b8cc4fbd 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2876,13 +2876,13 @@ (define-public r-rcurl (define-public r-xml (package (name "r-xml") - (version "3.99-0.3") + (version "3.99-0.4") (source (origin (method url-fetch) (uri (cran-uri "XML" version)) (sha256 (base32 - "0lzpqwajs5xaqdna50vl24qkp9xvh00zypjjzy6kgdzk11isgdw1")))) + "1bw6wr17gp0vdnxc5hip47n15nhxwacin3a5992sc7yfb55kaxm5")))) (properties `((upstream-name . "XML"))) (build-system r-build-system) -- cgit v1.2.3 From 79f7cd99daa2204741f5074325c9c4baee124c4e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 10 Jul 2020 17:50:31 +0200 Subject: gnu: r-gplots: Update to 3.0.4. * gnu/packages/statistics.scm (r-gplots): Update to 3.0.4. [native-inputs]: Add r-knitr. --- gnu/packages/statistics.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 53b8cc4fbd..5547e5ed42 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4217,20 +4217,22 @@ (define-public r-gdata (define-public r-gplots (package (name "r-gplots") - (version "3.0.3") + (version "3.0.4") (source (origin (method url-fetch) (uri (cran-uri "gplots" version)) (sha256 (base32 - "0hs6mk48i9yd43rg9wfjc2nxsjjwrnpifxqvxkv8ah18kvpd6xnp")))) + "15ip3v4xiqzbanf8bc5fj90cbwdgixr72aj5jrp34jfdzdx0gxwg")))) (build-system r-build-system) (propagated-inputs `(("r-catools" ,r-catools) ("r-gdata" ,r-gdata) ("r-gtools" ,r-gtools) ("r-kernsmooth" ,r-kernsmooth))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://cran.r-project.org/web/packages/gplots") (synopsis "Various R programming tools for plotting data") (description -- cgit v1.2.3 From 021ad446fc15beec23b96ffc82cd30a2aafd4684 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 10 Jul 2020 17:50:34 +0200 Subject: gnu: r-cairo: Update to 1.5-12.2. * gnu/packages/statistics.scm (r-cairo): Update to 1.5-12.2. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 5547e5ed42..8c419d25b1 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5449,14 +5449,14 @@ (define-public r-tsne (define-public r-cairo (package (name "r-cairo") - (version "1.5-12") + (version "1.5-12.2") (source (origin (method url-fetch) (uri (cran-uri "Cairo" version)) (sha256 (base32 - "02v29am4fac3fyq6y1w6r89zwbqqkxjsxrafcwb5s124ikxyl22f")))) + "14hgz5wmnhlbqkd1g662n1agmjnlj3pq69gfng1vb0ivr02l2lnx")))) (properties `((upstream-name . "Cairo"))) (build-system r-build-system) (inputs -- cgit v1.2.3 From ba663a331b2d94d434e2bb0fe7542a101daae3ba Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 13 Jul 2020 16:12:29 +0200 Subject: gnu: Add r-conquer. * gnu/packages/cran.scm (r-conquer): New variable. --- gnu/packages/cran.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index d8c9fa0f1e..ff6be76f89 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -22534,3 +22534,30 @@ (define-public r-rselenium automates web browsers (commonly referred to as browsers). Using RSelenium you can automate browsers locally or remotely.") (license license:agpl3+))) + +(define-public r-conquer + (package + (name "r-conquer") + (version "1.0.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "conquer" version)) + (sha256 + (base32 + "1c7id7wgspma5bdcirrhw7f9fp709zxpj31klivasdbvd4jgi4vb")))) + (properties `((upstream-name . "conquer"))) + (build-system r-build-system) + (propagated-inputs + `(("r-matrix" ,r-matrix) + ("r-matrixstats" ,r-matrixstats) + ("r-rcpp" ,r-rcpp) + ("r-rcpparmadillo" ,r-rcpparmadillo))) + (home-page "https://github.com/XiaoouPan/conquer") + (synopsis "Convolution-type smoothed quantile regression") + (description + "This package provides fast and accurate convolution-type smoothed +quantile regression, implemented using Barzilai-Borwein gradient descent with +a Huber regression warm start. Confidence intervals for regression +coefficients are constructed using multiplier bootstrap.") + (license license:gpl3))) -- cgit v1.2.3 From 1a7d1c54d4bcc369863160fba806bd941670d049 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 13 Jul 2020 21:03:03 +0200 Subject: gnu: r-rsubread: Update to 2.2.4. * gnu/packages/bioconductor.scm (r-rsubread): Update to 2.2.4. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index e35a1dfe78..b9d15161a2 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5781,14 +5781,14 @@ (define-public r-annotatr (define-public r-rsubread (package (name "r-rsubread") - (version "2.2.3") + (version "2.2.4") (source (origin (method url-fetch) (uri (bioconductor-uri "Rsubread" version)) (sha256 (base32 - "0406fl5zz8pc8yighkaw13ib3y8p45jsarl5sncgn4myfpl2p3z5")))) + "0yznfqgp5cbz68n3rrfvm752267da16kl538zdrb1g1aw9zdfqc6")))) (properties `((upstream-name . "Rsubread"))) (build-system r-build-system) (inputs `(("zlib" ,zlib))) -- cgit v1.2.3 From a9a912805a4bc24f64369922fea393c717ee36aa Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 13 Jul 2020 21:03:11 +0200 Subject: gnu: r-activepathways: Update to 1.0.2. * gnu/packages/bioconductor.scm (r-activepathways): Update to 1.0.2. [propagated-inputs]: Remove r-metap. --- gnu/packages/bioconductor.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index b9d15161a2..3ab94cb431 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -7187,21 +7187,20 @@ (define-public r-activedriverwgs (define-public r-activepathways (package (name "r-activepathways") - (version "1.0.1") + (version "1.0.2") (source (origin (method url-fetch) (uri (cran-uri "ActivePathways" version)) (sha256 (base32 - "1xb0d1svmzw404pv8ja6wr4773k7x2lxkrzrayilvzqbfzj1wx20")))) + "1hxy760x141ykrpqdbfldq4ggj1svj3lsrpwi4rb2x7r4lna937l")))) (properties `((upstream-name . "ActivePathways"))) (build-system r-build-system) (propagated-inputs `(("r-data-table" ,r-data-table) - ("r-ggplot2" ,r-ggplot2) - ("r-metap" ,r-metap))) + ("r-ggplot2" ,r-ggplot2))) (native-inputs `(("r-knitr" ,r-knitr))) (home-page "https://cran.r-project.org/web/packages/ActivePathways/") -- cgit v1.2.3 From 02f3a622e25f48a1fc6dcbb8e099082e5cfd7d60 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 13 Jul 2020 21:03:14 +0200 Subject: gnu: r-summarizedexperiment: Update to 1.18.2. * gnu/packages/bioinformatics.scm (r-summarizedexperiment): Update to 1.18.2. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 2ba58f61b2..ea59457ec3 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8092,13 +8092,13 @@ (define-public r-delayedarray (define-public r-summarizedexperiment (package (name "r-summarizedexperiment") - (version "1.18.1") + (version "1.18.2") (source (origin (method url-fetch) (uri (bioconductor-uri "SummarizedExperiment" version)) (sha256 (base32 - "07rc79k5dp0dnf4dvsxif995aa9cgfkf13yf84qnwl64k9pf3c2c")))) + "1raw5ycigr6gjgzn3kx3jls5hzww10fhnwd8c17c20hmhirf13rw")))) (properties `((upstream-name . "SummarizedExperiment"))) (build-system r-build-system) -- cgit v1.2.3 From 16e16586d205245b9a1a6a431cb511b58d640e9d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 13 Jul 2020 21:03:17 +0200 Subject: gnu: r-genomicfeatures: Update to 1.40.1. * gnu/packages/bioinformatics.scm (r-genomicfeatures): Update to 1.40.1. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index ea59457ec3..65f32e75e1 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8205,13 +8205,13 @@ (define-public r-rtracklayer (define-public r-genomicfeatures (package (name "r-genomicfeatures") - (version "1.40.0") + (version "1.40.1") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomicFeatures" version)) (sha256 (base32 - "09ffsflk2yhhj9ivm028y3qdkvv8idgxpm4il3y9rym7shc8b3f8")))) + "0zm7q957g952qyfqmvf27sldsnq6sqd0wlgnqzvmxayg9pxh0l0z")))) (properties `((upstream-name . "GenomicFeatures"))) (build-system r-build-system) -- cgit v1.2.3 From 82eafe32a2e54b488ef224a59d548e10e882075b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 13 Jul 2020 21:03:20 +0200 Subject: gnu: r-qtl2: Update to 0.22-11. * gnu/packages/bioinformatics.scm (r-qtl2): Update to 0.22-11. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 65f32e75e1..4b9598666f 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8532,12 +8532,12 @@ (define-public r-qtl (define-public r-qtl2 (package (name "r-qtl2") - (version "0.22-8") + (version "0.22-11") (source (origin (method url-fetch) (uri (cran-uri "qtl2" version)) (sha256 - (base32 "07w74s7lyyrfa1l6q6v8sxnfaqwxb4w1x4wawcngf0hr1rwx9lda")))) + (base32 "0dfdzjylqzc92dcszawc8cyinxccjm3p36v9vcq9ma818pqcanmr")))) (build-system r-build-system) (propagated-inputs `(("r-data-table" ,r-data-table) -- cgit v1.2.3 From b7f051db14fb485fcfa4917924eef186fb1b8c07 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 13 Jul 2020 21:03:23 +0200 Subject: gnu: r-rhdf5lib: Update to 1.10.1. * gnu/packages/bioinformatics.scm (r-rhdf5lib): Update to 1.10.1. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 4b9598666f..b09b93cdc3 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10840,14 +10840,14 @@ (define-public r-hdf5array (define-public r-rhdf5lib (package (name "r-rhdf5lib") - (version "1.10.0") + (version "1.10.1") (source (origin (method url-fetch) (uri (bioconductor-uri "Rhdf5lib" version)) (sha256 (base32 - "09ylwyk6a8sdrmi1mx7vpycpykqlqylmwa973g6jrcmk0h0qfa4w")) + "0f45sqrvzj6x4mckalyp8366hm8v0rrmzklx3xd4gs6l2wallcn9")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From df952ca338e4eb4eae60d6a12f057b86ee505ca6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 13 Jul 2020 21:03:30 +0200 Subject: gnu: r-broom: Update to 0.7.0. * gnu/packages/cran.scm (r-broom): Update to 0.7.0. [propagated-inputs]: Remove r-nlme and r-reshape2; add r-ellipsis, r-glue, and r-rlang. --- gnu/packages/cran.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index ff6be76f89..b54c1599c8 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3411,22 +3411,23 @@ (define-public r-generics (define-public r-broom (package (name "r-broom") - (version "0.5.6") + (version "0.7.0") (source (origin (method url-fetch) (uri (cran-uri "broom" version)) (sha256 (base32 - "0da3jsb02xckrk6alznicn6l5lnyvdhc64qklyarnd77miqgc1hb")))) + "0bq8w1ckrladzck2g0mgiyjdrzi06kbqalk5q3pfvj1607fdv3d5")))) (build-system r-build-system) (propagated-inputs `(("r-backports" ,r-backports) ("r-dplyr" ,r-dplyr) + ("r-ellipsis" ,r-ellipsis) ("r-generics" ,r-generics) - ("r-nlme" ,r-nlme) + ("r-glue" ,r-glue) ("r-purrr" ,r-purrr) - ("r-reshape2" ,r-reshape2) + ("r-rlang" ,r-rlang) ("r-stringr" ,r-stringr) ("r-tibble" ,r-tibble) ("r-tidyr" ,r-tidyr))) -- cgit v1.2.3 From 4d639b61cfbb08d1536298b40773e57215e7038c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 13 Jul 2020 21:03:34 +0200 Subject: gnu: r-mice: Update to 3.10.0. * gnu/packages/cran.scm (r-mice): Update to 3.10.0. [propagated-inputs]: Add r-generics. --- gnu/packages/cran.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index b54c1599c8..381aa84844 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3710,18 +3710,19 @@ (define-public r-mitml (define-public r-mice (package (name "r-mice") - (version "3.9.0") + (version "3.10.0") (source (origin (method url-fetch) (uri (cran-uri "mice" version)) (sha256 (base32 - "1wycbc2iqp68gfzvqx1gsn5n1k1h4bg79dy8m5msqf226hy83ncn")))) + "0w81shmd2crpdlh66pnm27v4n06aayganq6kkalirln4c0ci2nyi")))) (build-system r-build-system) (propagated-inputs `(("r-broom" ,r-broom) ("r-dplyr" ,r-dplyr) + ("r-generics" ,r-generics) ("r-lattice" ,r-lattice) ("r-rcpp" ,r-rcpp) ("r-tidyr" ,r-tidyr))) -- cgit v1.2.3 From 2762d722c5e694872ff7255dba8b87c1ceb6f1bf Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 13 Jul 2020 21:03:39 +0200 Subject: gnu: r-pillar: Update to 1.4.6. * gnu/packages/cran.scm (r-pillar): Update to 1.4.6. [propagated-inputs]: Add r-ellipsis and r-lifecycle. --- gnu/packages/cran.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 381aa84844..4525843156 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4461,19 +4461,21 @@ (define-public r-vctrs (define-public r-pillar (package (name "r-pillar") - (version "1.4.4") + (version "1.4.6") (source (origin (method url-fetch) (uri (cran-uri "pillar" version)) (sha256 (base32 - "0viymfp1rkr7ig3m1b016r75hk8qbr9cqsjc6c20ks9pm5svmsp1")))) + "01ck8ziqzjc9ibbj3g88siz1iw263dgl8jx6ryw2v50rjrr3y7fj")))) (build-system r-build-system) (propagated-inputs `(("r-cli" ,r-cli) ("r-crayon" ,r-crayon) + ("r-ellipsis" ,r-ellipsis) ("r-fansi" ,r-fansi) + ("r-lifecycle" ,r-lifecycle) ("r-rlang" ,r-rlang) ("r-utf8" ,r-utf8) ("r-vctrs" ,r-vctrs))) -- cgit v1.2.3 From 88804120c3981c9d9a7bdb1087872fd1e0b9ab17 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 13 Jul 2020 21:03:42 +0200 Subject: gnu: r-gamlss-dist: Update to 5.1-7. * gnu/packages/cran.scm (r-gamlss-dist): Update to 5.1-7. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 4525843156..1b6cc670e8 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -12609,13 +12609,13 @@ (define-public r-drimpute (define-public r-gamlss-dist (package (name "r-gamlss-dist") - (version "5.1-6") + (version "5.1-7") (source (origin (method url-fetch) (uri (cran-uri "gamlss.dist" version)) (sha256 - (base32 "1p904x0b07z4amaqdn2xhs7qzbq8lisr6lqc844s3pkxzmny7w1z")))) + (base32 "0nzgq3rnziy0i2zxn88hqy3pakpyin2m2csk9j3zg39si66c6wcq")))) (properties `((upstream-name . "gamlss.dist"))) (build-system r-build-system) (propagated-inputs `(("r-mass" ,r-mass))) -- cgit v1.2.3 From 22df7543b1b96e78fa0861ae231d5e616b99812b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 13 Jul 2020 21:03:46 +0200 Subject: gnu: r-gamlss: Update to 5.1-7. * gnu/packages/cran.scm (r-gamlss): Update to 5.1-7. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 1b6cc670e8..68212ae182 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -17852,14 +17852,14 @@ (define-public r-gamlss-data (define-public r-gamlss (package (name "r-gamlss") - (version "5.1-6") + (version "5.1-7") (source (origin (method url-fetch) (uri (cran-uri "gamlss" version)) (sha256 (base32 - "16b7ick1khvldbvfmmpw9cjs1vznnrisvifq7717fxzd8c9s5jdr")))) + "0ywqwsp4k6jgnicp1gdsglji61l5cnackl52700v8kmkk83bq4c8")))) (properties `((upstream-name . "gamlss"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 2d2b5d60f8d90df738bc7d1c75dd9e7562156aba Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 13 Jul 2020 21:03:49 +0200 Subject: gnu: r-brms: Update to 2.13.3. * gnu/packages/cran.scm (r-brms): Update to 2.13.3. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 68212ae182..d87b5d5b06 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -22093,14 +22093,14 @@ (define-public r-rserve (define-public r-brms (package (name "r-brms") - (version "2.13.0") + (version "2.13.3") (source (origin (method url-fetch) (uri (cran-uri "brms" version)) (sha256 (base32 - "0vdncdawxawi16f326qrgy9jjjipmqdjxh741y9p7xdzd4fwaxx3")))) + "13gnc517yssvi2mnih5bln06hcbn4y80gd9h3szacs6n3mwpig5f")))) (properties `((upstream-name . "brms"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 9fcf3d92a0f0e88e8ab9fb52b1dbdd45e83a8ce1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 13 Jul 2020 21:03:52 +0200 Subject: gnu: r-rlang: Update to 0.4.7. * gnu/packages/statistics.scm (r-rlang): Update to 0.4.7. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 8c419d25b1..44efa8891f 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1619,13 +1619,13 @@ (define-public r-r6 (define-public r-rlang (package (name "r-rlang") - (version "0.4.6") + (version "0.4.7") (source (origin (method url-fetch) (uri (cran-uri "rlang" version)) (sha256 (base32 - "1jik4lywg4688dfi5fh8jbnmsxvq3382ii0nsw5armjzfq3v309s")))) + "0f4rhnhyhgrv874l0yzm80ij6vcqdykfd7bzmnqs0wbgyhkxk8vq")))) (build-system r-build-system) (home-page "http://rlang.tidyverse.org") (synopsis "Functions for base types, core R and Tidyverse features") -- cgit v1.2.3 From c85c85d67cd2d2c516e180ff334e865c3d64c437 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 13 Jul 2020 21:03:55 +0200 Subject: gnu: r-tibble: Update to 3.0.3. * gnu/packages/statistics.scm (r-tibble): Update to 3.0.3. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 44efa8891f..041be4d3d4 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1637,14 +1637,14 @@ (define-public r-rlang (define-public r-tibble (package (name "r-tibble") - (version "3.0.2") + (version "3.0.3") (source (origin (method url-fetch) (uri (cran-uri "tibble" version)) (sha256 (base32 - "14mpbdmd4jcdxawxnk9rp5pg95hxndhv4xg6sb21idpdicv02iqs")))) + "0f4yi87w6509lnaz1lhk9s8nm3bzx21ij3273s0zx7vpbp0qlxxz")))) (build-system r-build-system) (propagated-inputs `(("r-cli" ,r-cli) -- cgit v1.2.3 From c4dfd2bf6230dbbbd15c1dcc65ed625ed9151317 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 13 Jul 2020 21:03:58 +0200 Subject: gnu: r-r-rsp: Update to 0.44.0. * gnu/packages/statistics.scm (r-r-rsp): Update to 0.44.0. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 041be4d3d4..928b4fd354 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3551,13 +3551,13 @@ (define-public r-r-cache (define-public r-r-rsp (package (name "r-r-rsp") - (version "0.43.2") + (version "0.44.0") (source (origin (method url-fetch) (uri (cran-uri "R.rsp" version)) (sha256 (base32 - "128zqyvbq9hm9gy86jzhj609lkfw57vr24mdxgh46ncmx66ag4gj")))) + "0n9sxrffahgxcc8h9vgxg5i446g14cibixpf82nkpm5bvidhfsc9")))) (properties `((upstream-name . "R.rsp"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From d57ce2024b0bdec0f8d05258c32c7bc7275a17a6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 13 Jul 2020 21:04:02 +0200 Subject: gnu: r-quantreg: Update to 5.61. * gnu/packages/statistics.scm (r-quantreg): Update to 5.61. [propagated-inputs]: Add r-conquer. --- gnu/packages/statistics.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 928b4fd354..904727df2b 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5094,18 +5094,19 @@ (define-public r-matrixmodels (define-public r-quantreg (package (name "r-quantreg") - (version "5.55") + (version "5.61") (source (origin (method url-fetch) (uri (cran-uri "quantreg" version)) (sha256 - (base32 "1zjc8p95kb0ypxa6nxp0lkdq8armkjmmhf8484m25n5f14a59qfb")))) + (base32 "0kby1crnzkdg5sczwqapfpkr58apyzrrx85khigcqggmhhwl44wk")))) (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran))) (propagated-inputs - `(("r-matrix" ,r-matrix) + `(("r-conquer" ,r-conquer) + ("r-matrix" ,r-matrix) ("r-matrixmodels" ,r-matrixmodels) ("r-sparsem" ,r-sparsem))) (home-page "https://www.r-project.org") -- cgit v1.2.3 From 2020a0567b469aee0e975583aa39f4b51a976120 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Thu, 16 Jul 2020 16:47:07 +0200 Subject: gnu: Add cl-tga. * gnu/packages/lisp-xyz.scm (sbcl-tga, cl-tga, ecl-tga): New variables. --- gnu/packages/lisp-xyz.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 04c7c3e9ca..f0e4189b13 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -12295,3 +12295,33 @@ (define-public sbcl-napa-fft3 (define-public cl-napa-fft3 (sbcl-package->cl-source-package sbcl-napa-fft3)) + +(define-public sbcl-cl-tga + (let ((commit "4dc2f7b8a259b9360862306640a07a23d4afaacc") + (revision "0")) + (package + (name "sbcl-cl-tga") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fisxoj/cl-tga") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "03k3npmn0xd3fd2m7vwxph82av2xrfb150imqrinlzqmzvz1v1br")))) + (build-system asdf-build-system/sbcl) + (home-page "https://github.com/fisxoj/cl-tga") + (synopsis "TGA file loader for Common Lisp") + (description + "Cl-tga was written to facilitate loading @emph{.tga} files into OpenGL +programs. It's a very simple library, and, at the moment, only supports +non-RLE encoded forms of the files.") + (license license:expat)))) + +(define-public cl-tga + (sbcl-package->cl-source-package sbcl-cl-tga)) + +(define-public ecl-cl-tga + (sbcl-package->ecl-package sbcl-cl-tga)) -- cgit v1.2.3 From 31c67a8525bc94d1fdf787c6c17991e16895b794 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Thu, 16 Jul 2020 16:58:42 +0200 Subject: gnu: Add cl-com.gigamonkeys.binary-data. * gnu/packages/lisp-xyz.scm (sbcl-com.gigamonkeys.binary-data, cl-com.gigamonkeys.binary-data, ecl-com.gigamonkeys.binary-data): New variables. --- gnu/packages/lisp-xyz.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index f0e4189b13..64d5794557 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -12325,3 +12325,34 @@ (define-public cl-tga (define-public ecl-cl-tga (sbcl-package->ecl-package sbcl-cl-tga)) + +(define-public sbcl-com.gigamonkeys.binary-data + (let ((commit "22e908976d7f3e2318b7168909f911b4a00963ee") + (revision "0")) + (package + (name "sbcl-com.gigamonkeys.binary-data") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gigamonkey/monkeylib-binary-data") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "072v417vmcnvmyh8ddq9vmwwrizm7zwz9dpzi14qy9nsw8q649zw")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("alexandria" ,sbcl-alexandria))) + (home-page "https://github.com/gigamonkey/monkeylib-binary-data") + (synopsis "Common Lisp library for reading and writing binary data") + (description + "This a Common Lisp library for reading and writing binary data. It is +based on code from chapter 24 of the book @emph{Practical Common Lisp}.") + (license license:bsd-3)))) + +(define-public cl-com.gigamonkeys.binary-data + (sbcl-package->cl-source-package sbcl-com.gigamonkeys.binary-data)) + +(define-public ecl-com.gigamonkeys.binary-data + (sbcl-package->ecl-package sbcl-com.gigamonkeys.binary-data)) -- cgit v1.2.3 From 556daf642a855622f383f8bc71c7b7c77c831edc Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Thu, 16 Jul 2020 17:08:27 +0200 Subject: gnu: Add cl-deflate. * gnu/packages/lisp-xyz.scm (sbcl-deflate, cl-deflate, ecl-deflate): New variables. --- gnu/packages/lisp-xyz.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 64d5794557..5d5e99251b 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -12356,3 +12356,31 @@ (define-public cl-com.gigamonkeys.binary-data (define-public ecl-com.gigamonkeys.binary-data (sbcl-package->ecl-package sbcl-com.gigamonkeys.binary-data)) + +(define-public sbcl-deflate + (package + (name "sbcl-deflate") + (version "1.0.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pmai/Deflate") + (commit (string-append "release-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1jpdjnxh6cw2d8hk70r2sxn92is52s9b855irvwkdd777fdciids")))) + (build-system asdf-build-system/sbcl) + (home-page "https://github.com/pmai/Deflate") + (synopsis "Native deflate decompression for Common Lisp") + (description + "This library is an implementation of Deflate (RFC 1951) decompression, +with optional support for ZLIB-style (RFC 1950) and gzip-style (RFC 1952) +wrappers of deflate streams. It currently does not handle compression.") + (license license:expat))) + +(define-public cl-deflate + (sbcl-package->cl-source-package sbcl-deflate)) + +(define-public ecl-deflate + (sbcl-package->ecl-package sbcl-deflate)) -- cgit v1.2.3 From 7387c090b0c17cd4cc70b382517b2c52f1fd5472 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Thu, 16 Jul 2020 17:20:13 +0200 Subject: gnu: Add cl-skippy. * gnu/packages/lisp-xyz.scm (sbcl-skippy, cl-skippy, ecl-skippy): New variables. --- gnu/packages/lisp-xyz.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 5d5e99251b..6003a28eea 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -12384,3 +12384,31 @@ (define-public cl-deflate (define-public ecl-deflate (sbcl-package->ecl-package sbcl-deflate)) + +(define-public sbcl-skippy + (let ((commit "e456210202ca702c792292c5060a264d45e47090") + (revision "0")) + (package + (name "sbcl-skippy") + (version (git-version "1.3.12" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/xach/skippy") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1sxbn5nh24qpx9w64x8mhp259cxcl1x8p126wk3b91ijjsj7l5vj")))) + (build-system asdf-build-system/sbcl) + (home-page "https://xach.com/lisp/skippy/") + (synopsis "Common Lisp library for GIF images") + (description + "Skippy is a Common Lisp library to read and write GIF image files.") + (license license:bsd-2)))) + +(define-public cl-skippy + (sbcl-package->cl-source-package sbcl-skippy)) + +(define-public ecl-skippy + (sbcl-package->ecl-package sbcl-skippy)) -- cgit v1.2.3 From ec2c73b8ed22a2c13b0b511e49f776691765268e Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Thu, 16 Jul 2020 17:48:57 +0200 Subject: gnu: Add cl-freetype2. * gnu/packages/lisp-xyz.scm (sbcl-freetype2, cl-freetype2, ecl-freetype2): New variables. --- gnu/packages/lisp-xyz.scm | 54 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 6003a28eea..23cc633146 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -54,6 +54,7 @@ (define-module (gnu packages lisp-xyz) #:use-module (gnu packages compression) #:use-module (gnu packages databases) #:use-module (gnu packages enchant) + #:use-module (gnu packages fontutils) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages imagemagick) @@ -12412,3 +12413,56 @@ (define-public cl-skippy (define-public ecl-skippy (sbcl-package->ecl-package sbcl-skippy)) + +(define-public sbcl-cl-freetype2 + (let ((commit "96058da730b4812df916c1f4ee18c99b3b15a3de") + (revision "0")) + (package + (name "sbcl-cl-freetype2") + (version (git-version "1.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rpav/cl-freetype2") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0f8darhairgxnb5bzqcny7nh7ss3471bdzix5rzcyiwdbr5kymjl")))) + (build-system asdf-build-system/sbcl) + (native-inputs + `(("fiveam" ,sbcl-fiveam))) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("cffi" ,sbcl-cffi) + ("cffi-grovel" ,sbcl-cffi-grovel) + ("freetype" ,freetype) + ("trivial-garbage" ,sbcl-trivial-garbage))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/ffi/ft2-lib.lisp" + (("\"libfreetype\"") + (string-append "\"" (assoc-ref inputs "freetype") + "/lib/libfreetype\""))) + (substitute* "src/ffi/grovel/grovel-freetype2.lisp" + (("-I/usr/include/freetype") + (string-append "-I" (assoc-ref inputs "freetype") + "/include/freetype"))) + #t))))) + (home-page "https://github.com/rpav/cl-freetype2") + (synopsis "Common Lisp bindings for Freetype 2") + (description + "This is a general Freetype 2 wrapper for Common Lisp using CFFI. It's +geared toward both using Freetype directly by providing a simplified API, as +well as providing access to the underlying C structures and functions for use +with other libraries which may also use Freetype.") + (license license:bsd-3)))) + +(define-public cl-freetype2 + (sbcl-package->cl-source-package sbcl-cl-freetype2)) + +(define-public ecl-cl-freetype2 + (sbcl-package->ecl-package sbcl-cl-freetype2)) -- cgit v1.2.3 From fc748ff067130d9b67db910e02a60d352b994648 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Thu, 16 Jul 2020 17:58:21 +0200 Subject: gnu: Add cl-opticl-core. * gnu/packages/lisp-xyz.scm (sbcl-opticl-core, cl-opticl-core, ecl-opticl-core): New variables. --- gnu/packages/lisp-xyz.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 23cc633146..6a975d8146 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -12466,3 +12466,34 @@ (define-public cl-freetype2 (define-public ecl-cl-freetype2 (sbcl-package->ecl-package sbcl-cl-freetype2)) + +(define-public sbcl-opticl-core + (let ((commit "b7cd13d26df6b824b216fbc360dc27bfadf04999") + (revision "0")) + (package + (name "sbcl-opticl-core") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/slyrus/opticl-core") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0458bllabcdjghfrqx6aki49c9qmvfmkk8jl75cfpi7q0i12kh95")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("alexandria" ,sbcl-alexandria))) + (home-page "https://github.com/slyrus/opticl-core") + (synopsis "Core classes and pixel access macros for Opticl") + (description + "This Common Lisp library contains the core classes and pixel access +macros for the Opticl image processing library.") + (license license:bsd-2)))) + +(define-public cl-opticl-core + (sbcl-package->cl-source-package sbcl-opticl-core)) + +(define-public ecl-opticl-core + (sbcl-package->ecl-package sbcl-opticl-core)) -- cgit v1.2.3 From 1c1b0532d19bd514cd2a5c7f09371808f10f3092 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Thu, 16 Jul 2020 18:12:39 +0200 Subject: gnu: Add cl-retrospectiff. * gnu/packages/lisp-xyz.scm (sbcl-retrospectiff, cl-retrospectiff, ecl-retrospectiff): New variables. --- gnu/packages/lisp-xyz.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 6a975d8146..e4d110381d 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -12497,3 +12497,41 @@ (define-public cl-opticl-core (define-public ecl-opticl-core (sbcl-package->ecl-package sbcl-opticl-core)) + +(define-public sbcl-retrospectiff + (let ((commit "c2a69d77d5010f8cdd9045b3e36a08a73da5d321") + (revision "0")) + (package + (name "sbcl-retrospectiff") + (version (git-version "0.2" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/slyrus/retrospectiff") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0qsn9hpd8j2kp43dk05j8dczz9zppdff5rrclbp45n3ksk9inw8i")))) + (build-system asdf-build-system/sbcl) + (native-inputs + `(("fiveam" ,sbcl-fiveam))) + (inputs + `(("cl-jpeg" ,sbcl-cl-jpeg) + ("com.gigamonkeys.binary-data" ,sbcl-com.gigamonkeys.binary-data) + ("deflate" ,sbcl-deflate) + ("flexi-streams" ,sbcl-flexi-streams) + ("ieee-floats" ,sbcl-ieee-floats) + ("opticl-core" ,sbcl-opticl-core))) + (home-page "https://github.com/slyrus/retrospectiff") + (synopsis "Common Lisp library for TIFF images") + (description + "Retrospectiff is a common lisp library for reading and writing images +in the TIFF (Tagged Image File Format) format.") + (license license:bsd-2)))) + +(define-public cl-retrospectif + (sbcl-package->cl-source-package sbcl-retrospectiff)) + +(define-public ecl-retrospectiff + (sbcl-package->ecl-package sbcl-retrospectiff)) -- cgit v1.2.3 From 0f44f63ca216c8c50ac77f9e4ea600bebc2f45a3 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Thu, 16 Jul 2020 18:45:42 +0200 Subject: gnu: Add cl-mmap. * gnu/packages/lisp-xyz.scm (sbcl-mmap, cl-mmap, ecl-mmap): New variables. --- gnu/packages/lisp-xyz.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index e4d110381d..91088d8b58 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -12535,3 +12535,43 @@ (define-public cl-retrospectif (define-public ecl-retrospectiff (sbcl-package->ecl-package sbcl-retrospectiff)) + +(define-public sbcl-mmap + (let ((commit "ba2e98c67e25f0fb8ff838238561120a23903ce7") + (revision "0")) + (package + (name "sbcl-mmap") + (version (git-version "1.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Shinmera/mmap") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0qd0xp20i1pcfn12kkapv9pirb6hd4ns7kz4zf1mmjwykpsln96q")))) + (build-system asdf-build-system/sbcl) + (native-inputs + `(("alexandria" ,sbcl-alexandria) + ("cffi" ,sbcl-cffi) + ("parachute" ,sbcl-parachute) + ("trivial-features" ,sbcl-trivial-features))) + (inputs + `(("cffi" ,sbcl-cffi) + ("documentation-utils" ,sbcl-documentation-utils))) + (home-page "https://shinmera.github.io/mmap/") + (synopsis "File memory mapping for Common Lisp") + (description + "This is a utility library providing access to the @emph{mmap} family of +functions in a portable way. It allows you to directly map a file into the +address space of your process without having to manually read it into memory +sequentially. Typically this is much more efficient for files that are larger +than a few Kb.") + (license license:zlib)))) + +(define-public cl-mmap + (sbcl-package->cl-source-package sbcl-mmap)) + +(define-public ecl-mmap + (sbcl-package->ecl-package sbcl-mmap)) -- cgit v1.2.3 From 242bd807938abb586a5e6997743ff31ef813c027 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Thu, 16 Jul 2020 19:02:09 +0200 Subject: gnu: Add cl-3bz. * gnu/packages/lisp-xyz.scm (sbcl-3bz, cl-3bz, ecl-3bz): New variables. --- gnu/packages/lisp-xyz.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 91088d8b58..a09e203729 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -12575,3 +12575,44 @@ (define-public cl-mmap (define-public ecl-mmap (sbcl-package->ecl-package sbcl-mmap)) + +(define-public sbcl-3bz + (let ((commit "d6119083b5e0b0a6dd3abc2877936c51f3f3deed") + (revision "0")) + (package + (name "sbcl-3bz") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/3b/3bz") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0fyxzyf2b6sc0w8d9g4nlva861565z6f3xszj0lw29x526dd9rhj")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("babel" ,sbcl-babel) + ("cffi" ,sbcl-cffi) + ("mmap" ,sbcl-mmap) + ("nibbles" ,sbcl-nibbles) + ("trivial-features" ,sbcl-trivial-features))) + (arguments + ;; FIXME: Without the following line, the build fails (see issue 41437). + `(#:asd-system-name "3bz")) + (home-page "https://github.com/3b/3bz") + (synopsis "Deflate decompression for Common Lisp") + (description + "3bz is an implementation of Deflate decompression (RFC 1951) optionally +with zlib (RFC 1950) or gzip (RFC 1952) wrappers, with support for reading from +foreign pointers (for use with mmap and similar, etc), and from CL octet +vectors and streams.") + (license license:expat)))) + +(define-public cl-3bz + (sbcl-package->cl-source-package sbcl-3bz)) + +(define-public ecl-3bz + (sbcl-package->ecl-package sbcl-3bz)) -- cgit v1.2.3 From 5dff9687c989bc56aede6b2f1243c035572291b0 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Thu, 16 Jul 2020 19:13:17 +0200 Subject: gnu: Add cl-zpb-exif. * gnu/packages/lisp-xyz.scm (sbcl-zpb-exif, cl-zpb-exif, ecl-zpb-exif): New variables. --- gnu/packages/lisp-xyz.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index a09e203729..f5dc86eb28 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -12616,3 +12616,30 @@ (define-public cl-3bz (define-public ecl-3bz (sbcl-package->ecl-package sbcl-3bz)) + +(define-public sbcl-zpb-exif + (package + (name "sbcl-zpb-exif") + (version "1.2.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/xach/zpb-exif") + (commit (string-append "release-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "15s227jhby55cisz14xafb0p1ws2jmrg2rrbbd00lrb97im84hy6")))) + (build-system asdf-build-system/sbcl) + (home-page "https://xach.com/lisp/zpb-exif/") + (synopsis "EXIF information extractor for Common Lisp") + (description + "This is a Common Lisp library to extract EXIF information from image +files.") + (license license:bsd-2))) + +(define-public cl-zpb-exif + (sbcl-package->cl-source-package sbcl-zpb-exif)) + +(define-public ecl-zpb-exif + (sbcl-package->ecl-package sbcl-zpb-exif)) -- cgit v1.2.3 From b0e7bc35c4941108a002b6f91ead13017f8a5f6f Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Thu, 16 Jul 2020 19:43:41 +0200 Subject: gnu: Add cl-pngload. * gnu/packages/lisp-xyz.scm (sbcl-pngload, cl-pngload, ecl-pngload): New variables. --- gnu/packages/lisp-xyz.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index f5dc86eb28..0ad8ab6bf4 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -12643,3 +12643,43 @@ (define-public cl-zpb-exif (define-public ecl-zpb-exif (sbcl-package->ecl-package sbcl-zpb-exif)) + +(define-public sbcl-pngload + (package + (name "sbcl-pngload") + (version "2.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/bufferswap/pngload") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1ix8dd0fxlf8xm0bszh1s7sx83hn0vqq8b8c9gkrd5m310w8mpvh")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("3bz" ,sbcl-3bz) + ("alexandria" ,sbcl-alexandria) + ("cffi" ,sbcl-cffi) + ("mmap" ,sbcl-mmap) + ("parse-float" ,sbcl-parse-float) + ("static-vectors" ,sbcl-static-vectors) + ("swap-bytes" ,sbcl-swap-bytes) + ("zpb-exif" ,sbcl-zpb-exif))) + (arguments + ;; Test suite disabled because of a dependency cycle. + ;; pngload tests depend on opticl which depends on pngload. + '(#:tests? #f)) + (home-page "https://github.com/bufferswap/pngload") + (synopsis "PNG image decoder for Common Lisp") + (description + "This is a Common Lisp library to load images in the PNG image format, +both from files on disk, or streams in memory.") + (license license:expat))) + +(define-public cl-pngload + (sbcl-package->cl-source-package sbcl-pngload)) + +(define-public ecl-pngload + (sbcl-package->ecl-package sbcl-pngload)) -- cgit v1.2.3 From b736e9ba2c7e6ca090da308436879231d8252601 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Thu, 16 Jul 2020 19:47:43 +0200 Subject: gnu: Add cl-opticl. * gnu/packages/lisp-xyz.scm (sbcl-opticl, cl-opticl): New variables. --- gnu/packages/lisp-xyz.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 0ad8ab6bf4..391b1796e4 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -12683,3 +12683,40 @@ (define-public cl-pngload (define-public ecl-pngload (sbcl-package->ecl-package sbcl-pngload)) + +(define-public sbcl-opticl + (let ((commit "e8684416eca2e78e82a7b436d436ef2ea24c019d") + (revision "0")) + (package + (name "sbcl-opticl") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/slyrus/opticl") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "03rirnnhhisjbimlmpi725h1d3x0cfv00r57988am873dyzawmm1")))) + (build-system asdf-build-system/sbcl) + (native-inputs + `(("fiveam" ,sbcl-fiveam))) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("cl-jpeg" ,sbcl-cl-jpeg) + ("cl-tga" ,sbcl-cl-tga) + ("png-read" ,sbcl-png-read) + ("pngload" ,sbcl-pngload) + ("retrospectiff" ,sbcl-retrospectiff) + ("skippy" ,sbcl-skippy) + ("zpng" ,sbcl-zpng))) + (home-page "https://github.com/slyrus/opticl") + (synopsis "Image processing library for Common Lisp") + (description + "Opticl is a Common Lisp library for representing, processing, loading, +and saving 2-dimensional pixel-based images.") + (license license:bsd-2)))) + +(define-public cl-opticl + (sbcl-package->cl-source-package sbcl-opticl)) -- cgit v1.2.3 From 2c735995868b77eed6ae52379a474b605d19f1a3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 16 Jul 2020 17:06:01 +0200 Subject: gnu: lv2: Use HTTPS. * gnu/packages/audio.scm (lv2)[source, home-page]: Use HTTPS. --- gnu/packages/audio.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index e3085b8a7f..573731e1a7 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2094,21 +2094,21 @@ (define-public lv2 (version "1.18.0") (source (origin (method url-fetch) - (uri (string-append "http://lv2plug.in/spec/lv2-" + (uri (string-append "https://lv2plug.in/spec/lv2-" version ".tar.bz2")) (sha256 (base32 "0gs7401xz23q9vajqr31aa2db8dvssgyh5zrvr4ipa6wig7yb8wh")))) (build-system waf-build-system) (arguments - `(#:tests? #f ; no check target + `(#:tests? #f ; no check target #:configure-flags '("--no-plugins"))) (inputs ;; Leaving off cairo and gtk+-2.0 which are needed for example plugins `(("libsndfile" ,libsndfile))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://lv2plug.in/") + (home-page "https://lv2plug.in/") (synopsis "LV2 audio plugin specification") (description "LV2 is an open specification for audio plugins and host applications. -- cgit v1.2.3 From c4ccf2db6290aa4a20743ab98428c087d41d7441 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 16 Jul 2020 17:13:55 +0200 Subject: gnu: lirc: Use HTTPS home page. Also add a missing copyright line for an obvious nckx phase. * gnu/packages/lirc.scm (lirc)[home-page]: Use HTTPS. --- gnu/packages/lirc.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/lirc.scm b/gnu/packages/lirc.scm index 7b11f198e5..2b0cea16ab 100644 --- a/gnu/packages/lirc.scm +++ b/gnu/packages/lirc.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015, 2016, 2017 Alex Kost ;;; Copyright © 2016 Danny Milosavljevic +;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; Copyright © 2019 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. @@ -92,7 +93,7 @@ (define-public lirc ("linux-headers" ,linux-libre-headers) ("alsa-lib" ,alsa-lib) ("python" ,python))) - (home-page "http://www.lirc.org/") + (home-page "https://www.lirc.org/") (synopsis "Linux Infrared Remote Control") (description "LIRC allows computers to send and receive IR signals of many commonly -- cgit v1.2.3 From 3720a6f847d5c4bcbbb14953dd19462cad894b8e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 16 Jul 2020 17:57:31 +0200 Subject: gnu: lsof: Use HTTPS home page. * gnu/packages/lsof.scm (lsof)[home-page]: Use HTTPS. --- gnu/packages/lsof.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/lsof.scm b/gnu/packages/lsof.scm index e29f3b4569..34ad0f03d5 100644 --- a/gnu/packages/lsof.scm +++ b/gnu/packages/lsof.scm @@ -47,7 +47,7 @@ (define-public lsof ;; Add mirrors because the canonical FTP server at purdue.edu ;; bails out when it cannot do a reverse DNS lookup, as noted - ;; at . + ;; at . "ftp://ftp.fu-berlin.de/pub/unix/tools/lsof/" (string-append "http://www.mirrorservice.org/sites/" "lsof.itap.purdue.edu/pub/tools/unix/lsof") @@ -121,4 +121,4 @@ (define-public lsof (license (license:fsf-free "file://00FAQ" "License inspired by zlib, see point 1.9 of 00FAQ in the distribution.")) - (home-page "http://people.freebsd.org/~abe/"))) + (home-page "https://people.freebsd.org/~abe/"))) -- cgit v1.2.3 From 70e1199c0d4091c6c32fe78a222ef65c97cee5d8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 16 Jul 2020 17:58:45 +0200 Subject: gnu: bombadillo: Use HTTPS home page. * gnu/packages/web-browsers.scm (bombadillo)[home-page]: Use HTTPS. --- gnu/packages/web-browsers.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index dd113bc0d4..6508419418 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -621,7 +621,7 @@ (define-public bombadillo (install-file "bombadillo.1" mandir) (install-file "bombadillo-icon.png" pixdir) #t))))))) - (home-page "http://bombadillo.colorfield.space") + (home-page "https://bombadillo.colorfield.space") (synopsis "Terminal browser for the gopher, gemini, and finger protocols") (description "Bombadillo is a non-web browser for the terminal with vim-like key bindings, a document pager, configurable settings, and robust -- cgit v1.2.3 From 228d29010679b3090cf359fd3d21d7f5bc33b008 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 16 Jul 2020 18:12:34 +0200 Subject: gnu: Update Haskell Wiki URIs. * gnu/packages/haskell-web.scm (ghc-hxt-regex-xmlschema)[home-page]: Use HTTPS and follow permanent redirection. * gnu/packages/haskell-xyz.scm (ghc-alsa-core, ghc-base-unicode-symbols) (ghc-colour, ghc-data-accessor, ghc-data-accessor-transformers) (ghc-gluraw, ghc-glut, ghc-gnuplot, ghc-haddock-test, ghc-opengl) (ghc-openglraw, ghc-storablevector)[home-page]: Likewise. --- gnu/packages/haskell-web.scm | 2 +- gnu/packages/haskell-xyz.scm | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 0c79ece194..85c9aa9755 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -1447,7 +1447,7 @@ (define-public ghc-hxt-regex-xmlschema (inputs `(("ghc-hxt-charproperties" ,ghc-hxt-charproperties) ("ghc-hunit" ,ghc-hunit))) - (home-page "http://www.haskell.org/haskellwiki/Regular_expressions_for_XML_Schema") + (home-page "https://wiki.haskell.org/Regular_expressions_for_XML_Schema") (synopsis "Regular expression library for W3C XML Schema regular expressions") (description "This library supports full W3C XML Schema regular expressions inclusive diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 2387dfb190..234f75dbfc 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -333,7 +333,7 @@ (define-public ghc-alsa-core ("alsa-lib" ,alsa-lib))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.haskell.org/haskellwiki/ALSA") + (home-page "https://wiki.haskell.org/ALSA") (synopsis "Binding to the ALSA Library API (Exceptions)") (description "This package provides access to ALSA infrastructure, that is needed by both alsa-seq and alsa-pcm.") @@ -937,7 +937,7 @@ (define-public ghc-base-unicode-symbols (base32 "1ia6li7qjg1zkak4gf6mnbshw45mq9bfjr0jch58ds0lscmvwyzf")))) (build-system haskell-build-system) - (home-page "http://www.haskell.org/haskellwiki/Unicode-symbols") + (home-page "https://wiki.haskell.org/Unicode-symbols") (synopsis "Unicode alternatives for common functions and operators") (description "This package defines new symbols for a number of functions, operators and types in the base package. All symbols are documented with @@ -2113,7 +2113,7 @@ (define-public ghc-colour ;; ghc-test-framework -> ghc-ansi-terminal -> ghc-colour. `(#:tests? #f)) (build-system haskell-build-system) - (home-page "https://www.haskell.org/haskellwiki/Colour") + (home-page "https://wiki.haskell.org/Colour") (synopsis "Model for human colour perception") (description "This package provides a data type for colours and transparency. @@ -2644,7 +2644,7 @@ (define-public ghc-data-accessor (sha256 (base32 "1fq4gygxbz0bd0mzgvc1sl3m4gjnsv8nbgpnmdpa29zj5lb9agxc")))) (build-system haskell-build-system) - (home-page "https://www.haskell.org/haskellwiki/Record_access") + (home-page "https://wiki.haskell.org/Record_access") (synopsis "Haskell utilities for accessing and manipulating fields of records") (description "This package provides Haskell modules for accessing and @@ -2665,7 +2665,7 @@ (define-public ghc-data-accessor-transformers (base32 "0yp030vafbpddl27m606aibbbr5ar5j5bsv4bksscz3cq4yq5j10")))) (build-system haskell-build-system) (inputs `(("ghc-data-accessor" ,ghc-data-accessor))) - (home-page "https://www.haskell.org/haskellwiki/Record_access") + (home-page "https://wiki.haskell.org/Record_access") (synopsis "Use Accessor to access state in transformers State monad") (description "This package provides Haskell modules to allow use of Accessor to access state in transformers State monad.") @@ -4762,7 +4762,7 @@ (define-public ghc-gluraw (build-system haskell-build-system) (inputs `(("ghc-openglraw" ,ghc-openglraw))) - (home-page "https://www.haskell.org/haskellwiki/Opengl") + (home-page "https://wiki.haskell.org/Opengl") (synopsis "Raw Haskell bindings GLU") (description "GLURaw is a raw Haskell binding for the GLU 1.3 OpenGL utility library. It is basically a 1:1 mapping of GLU's C API, intended as a @@ -4789,7 +4789,7 @@ (define-public ghc-glut ("ghc-opengl" ,ghc-opengl) ("ghc-openglraw" ,ghc-openglraw) ("freeglut" ,freeglut))) - (home-page "https://www.haskell.org/haskellwiki/Opengl") + (home-page "https://wiki.haskell.org/Opengl") (synopsis "Haskell bindings for the OpenGL Utility Toolkit") (description "This library provides Haskell bindings for the OpenGL Utility Toolkit, a window system-independent toolkit for writing OpenGL @@ -4825,7 +4825,7 @@ (define-public ghc-gnuplot (substitute* "os/generic/Graphics/Gnuplot/Private/OS.hs" (("(gnuplotName = ).*$" all cmd) (string-append cmd "\"" gnuplot "/bin/gnuplot\""))))))))) - (home-page "https://www.haskell.org/haskellwiki/Gnuplot") + (home-page "https://wiki.haskell.org/Gnuplot") (synopsis "2D and 3D plots using gnuplot") (description "This package provides a Haskell module for creating 2D and 3D plots using gnuplot.") @@ -5145,7 +5145,7 @@ (define ghc-haddock-test (inputs `(("ghc-syb" ,ghc-syb) ("ghc-xml" ,ghc-xml))) - (home-page "http://www.haskell.org/haddock/") + (home-page "https://www.haskell.org/haddock/") (synopsis "Test utilities for Haddock") (description "This package provides test utilities for Haddock.") (license license:bsd-3) @@ -8441,7 +8441,7 @@ (define-public ghc-opengl ("ghc-gluraw" ,ghc-gluraw) ("ghc-statevar" ,ghc-statevar) ("ghc-openglraw" ,ghc-openglraw))) - (home-page "https://www.haskell.org/haskellwiki/Opengl") + (home-page "https://wiki.haskell.org/Opengl") (synopsis "Haskell bindings for the OpenGL graphics system") (description "This package provides Haskell bindings for the OpenGL graphics system (GL, version 4.5) and its accompanying utility library (GLU, @@ -8467,7 +8467,7 @@ (define-public ghc-openglraw `(("ghc-half" ,ghc-half) ("ghc-fixed" ,ghc-fixed) ("glu" ,glu))) - (home-page "https://www.haskell.org/haskellwiki/Opengl") + (home-page "https://wiki.haskell.org/Opengl") (synopsis "Raw Haskell bindings for the OpenGL graphics system") (description "OpenGLRaw is a raw Haskell binding for the OpenGL 4.5 graphics system and lots of OpenGL extensions. It is basically a 1:1 mapping @@ -11966,7 +11966,7 @@ (define-public ghc-storablevector ("ghc-unsafe" ,ghc-unsafe) ("ghc-quickcheck" ,ghc-quickcheck) ("ghc-syb" ,ghc-syb))) - (home-page "https://www.haskell.org/haskellwiki/Storable_Vector") + (home-page "https://wiki.haskell.org/Storable_Vector") (synopsis "Fast, packed, strict storable arrays with a list interface") (description "This library provides fast, packed, strict storable arrays with a list interface, a chunky lazy list interface with variable -- cgit v1.2.3 From 702a10125724c2af7eadfab3a9edf71c3d32936b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 16 Jul 2020 18:20:30 +0200 Subject: gnu: Use HTTPS for github.com (and subdomains) home pages. * gnu/packages/bioconductor.scm (r-qvalue)[home-page]: Use HTTPS and follow permanent redirection. * gnu/packages/check.scm (python-codecov, python-nosexcover) [home-page]: Likewise. * gnu/packages/cran.scm (r-ffbase, r-ggrepel, r-valr) [home-page]: Likewise. * gnu/packages/crates-io.scm (rust-block-0.1, rust-dispatch-0.1) (rust-objc-0.2, rust-objc-exception-0.1) (rust-objc-foundation-0.1, rust-objc-id-0.1, rust-objc-test-utils-0.0) (rust-onig-5.0, rust-onig-sys-69.2, rust-vergen-3.1) [home-page]: Likewise. * gnu/packages/finance.scm (ledger-agent, keepkey-agent) [home-page]: Likewise. * gnu/packages/haskell-check.scm (ghc-tasty-expected-failure) [home-page]: Likewise. * gnu/packages/haskell-web.scm (ghc-bsb-http-chunked, ghc-warp) (ghc-warp-tls)[home-page]: Likewise. * gnu/packages/haskell-xyz.scm (ghc-configurator, ghc-hasktags) (ghc-linear, ghc-newtype-generics, ghc-retry, ghc-xdg-basedir) (ghc-pretty-show)[home-page]: Likewise. * gnu/packages/java.scm (java-javax-inject)[home-page]: Likewise. * gnu/packages/libffi.scm (ruby-ffi)[home-page]: Likewise. * gnu/packages/linux.scm (procenv)[home-page]: Likewise. * gnu/packages/python-web.scm (python-aiodns, python-flask-htpasswd) (python-pycares)[home-page]: Likewise. * gnu/packages/python-xyz.scm (python-progressbar33, python-whatever) (python-funcy)[home-page]: Likewise. * gnu/packages/ruby.scm (ruby-rubyzip, ruby-spinach, ruby-gherkin-ruby) (ruby-code-statistics, ruby-colorize, ruby-wwtd)[home-page]: Likewise. --- gnu/packages/bioconductor.scm | 2 +- gnu/packages/check.scm | 4 ++-- gnu/packages/cran.scm | 6 +++--- gnu/packages/crates-io.scm | 20 ++++++++++---------- gnu/packages/finance.scm | 4 ++-- gnu/packages/haskell-check.scm | 2 +- gnu/packages/haskell-web.scm | 6 +++--- gnu/packages/haskell-xyz.scm | 14 +++++++------- gnu/packages/java.scm | 2 +- gnu/packages/libffi.scm | 2 +- gnu/packages/linux.scm | 2 +- gnu/packages/python-web.scm | 6 +++--- gnu/packages/python-xyz.scm | 6 +++--- gnu/packages/ruby.scm | 12 ++++++------ 14 files changed, 44 insertions(+), 44 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 3ab94cb431..b191c8b4ae 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1587,7 +1587,7 @@ (define-public r-qvalue ("r-reshape2" ,r-reshape2))) (native-inputs `(("r-knitr" ,r-knitr))) - (home-page "http://github.com/jdstorey/qvalue") + (home-page "https://github.com/StoreyLab/qvalue") (synopsis "Q-value estimation for false discovery rate control") (description "This package takes a list of p-values resulting from the simultaneous diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 8dd4b364ef..661ed65e53 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1600,7 +1600,7 @@ (define-public python-codecov (propagated-inputs `(("python-coverage" ,python-coverage) ("python-requests" ,python-requests))) - (home-page "http://github.com/codecov/codecov-python") + (home-page "https://github.com/codecov/codecov-python") (synopsis "Upload code coverage reports to @code{codecov.io}") (description "Codecov collects code coverage reports from code written in Python, Java, @@ -2163,7 +2163,7 @@ (define-public python-nosexcover (propagated-inputs `(("python-coverage" ,python-coverage) ("python-nose" ,python-nose))) - (home-page "http://github.com/cmheisel/nose-xcover") + (home-page "https://github.com/cmheisel/nose-xcover") (synopsis "Extends nose.plugins.cover to add Cobertura-style XML reports") (description "Nose-xcover is a companion to the built-in @code{nose.plugins.cover}. This plugin will write out an XML coverage report diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index d87b5d5b06..e6fd3f27c3 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2347,7 +2347,7 @@ (define-public r-ffbase `(("r-bit" ,r-bit) ("r-fastmatch" ,r-fastmatch) ("r-ff" ,r-ff))) - (home-page "http://github.com/edwindj/ffbase") + (home-page "https://github.com/edwindj/ffbase") (synopsis "Basic statistical functions for package 'ff'") (description "This package extends the out of memory vectors of @code{ff} with @@ -3530,7 +3530,7 @@ (define-public r-ggrepel ("r-scales" ,r-scales))) (native-inputs `(("r-knitr" ,r-knitr))) ; for vignettes - (home-page "http://github.com/slowkow/ggrepel") + (home-page "https://github.com/slowkow/ggrepel") (synopsis "Repulsive text and label geometries for ggplot2") (description "This package provides text and label geometries for ggplot2 that help to @@ -13205,7 +13205,7 @@ (define-public r-valr ("r-tibble" ,r-tibble))) (native-inputs `(("r-knitr" ,r-knitr))) - (home-page "http://github.com/rnabioco/valr") + (home-page "https://github.com/rnabioco/valr") (synopsis "Genome interval arithmetic in R") (description "This package enables you to read and manipulate genome intervals and diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 806e111f6f..9df41311a1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1995,7 +1995,7 @@ (define-public rust-block-0.1 `(#:skip-build? #t #:cargo-development-inputs (("rust-objc-test-utils" ,rust-objc-test-utils-0.0)))) - (home-page "http://github.com/SSheldon/rust-block") + (home-page "https://github.com/SSheldon/rust-block") (synopsis "Rust interface for Apple's C language extension of blocks") (description "This package provides a rust interface for Apple's C language extension of blocks.") @@ -5724,7 +5724,7 @@ (define-public rust-dispatch-0.1 "019nzy993hxaiazcdnayx3csv2iki34i535asw11ki96hakkrs84")))) (build-system cargo-build-system) (arguments '(#:tests? #f)) ; Tests only run on Mac. - (home-page "http://github.com/SSheldon/rust-dispatch") + (home-page "https://github.com/SSheldon/rust-dispatch") (synopsis "Rust wrapper for Apple's Grand Central Dispatch") (description "This package provides a Rust wrapper for Apple's Grand Central Dispatch.") @@ -15258,7 +15258,7 @@ (define-public rust-objc-0.2 #:cargo-inputs (("rust-malloc-buf" ,rust-malloc-buf-0.0) ("rust-objc-exception" ,rust-objc-exception-0.1)))) - (home-page "http://github.com/SSheldon/rust-objc") + (home-page "https://github.com/SSheldon/rust-objc") (synopsis "Objective-C Runtime bindings and wrapper for Rust") (description "This package provides an Objective-C Runtime bindings and wrapper for Rust.") @@ -15282,7 +15282,7 @@ (define-public rust-objc-exception-0.1 `(#:skip-build? #t #:cargo-inputs (("rust-cc" ,rust-cc-1.0)))) - (home-page "http://github.com/SSheldon/rust-objc-exception") + (home-page "https://github.com/SSheldon/rust-objc-exception") (synopsis "Rust interface for Objective-C's throw and try/catch statements") (description "This package provides a Rust interface for Objective-C's throw and @@ -15309,7 +15309,7 @@ (define-public rust-objc-foundation-0.1 (("rust-block" ,rust-block-0.1) ("rust-objc" ,rust-objc-0.2) ("rust-objc-id" ,rust-objc-id-0.1)))) - (home-page "http://github.com/SSheldon/rust-objc-foundation") + (home-page "https://github.com/SSheldon/rust-objc-foundation") (synopsis "Rust wrapper for Objective-C's Foundation framework") (description "This package provides a rust wrapper for Objective-C's Foundation framework.") @@ -15332,7 +15332,7 @@ (define-public rust-objc-id-0.1 (arguments `(#:tests? #f ; Tests require gcc-objc. #:cargo-inputs (("rust-objc" ,rust-objc-0.2)))) - (home-page "http://github.com/SSheldon/rust-objc-id") + (home-page "https://github.com/SSheldon/rust-objc-id") (synopsis "Rust smart pointers for Objective-C reference counting") (description "This package provides Rust smart pointers for Objective-C reference counting.") @@ -15356,7 +15356,7 @@ (define-public rust-objc-test-utils-0.0 `(#:skip-build? #t #:cargo-inputs (("rust-gcc" ,rust-gcc-0.3)))) - (home-page "http://github.com/SSheldon/rust-objc") + (home-page "https://github.com/SSheldon/rust-objc") (synopsis "Utilities for testing Objective-C interop") (description "This package provides utilities for testing Objective-C interop.") @@ -15478,7 +15478,7 @@ (define-public rust-onig-5.0 ("rust-bitflags" ,rust-bitflags-1) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-onig-sys" ,rust-onig-sys-69.2)))) - (home-page "http://github.com/iwillspeak/rust-onig") + (home-page "https://github.com/rust-onig/rust-onig") (synopsis "Rust bindings for the Oniguruma regular expression library") (description @@ -15507,7 +15507,7 @@ (define-public rust-onig-sys-69.2 (("rust-pkg-config" ,rust-pkg-config-0.3) ("rust-bindgen" ,rust-bindgen-0.50) ("rust-cc" ,rust-cc-1.0)))) - (home-page "http://github.com/iwillspeak/rust-onig") + (home-page "https://github.com/rust-onig/rust-onig") (synopsis "Rust bindings to the oniguruma library.") (description @@ -28139,7 +28139,7 @@ (define-public rust-vergen-3.1 (("rust-chrono" ,rust-chrono-0.4) ("rust-chrono" ,rust-chrono-0.4) ("rust-bitflags" ,rust-bitflags-1)))) - (home-page "http://github.com/rustyhorde/vergen") + (home-page "https://github.com/rustyhorde/vergen") (synopsis "Generate version related functions") (description "Generate version related functions.") diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index d403bc2510..1cd9014e45 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -965,7 +965,7 @@ (define-public ledger-agent (inputs `(("python-ledgerblue" ,python-ledgerblue) ("python-trezor-agent" ,python-trezor-agent))) - (home-page "http://github.com/romanz/trezor-agent") + (home-page "https://github.com/romanz/trezor-agent") (synopsis "Ledger as hardware SSH/GPG agent") (description "This package allows using Ledger as hardware SSH/GPG agent. @@ -1024,7 +1024,7 @@ (define-public keepkey-agent (inputs `(("python-keepkey" ,python-keepkey) ("python-trezor-agent" ,python-trezor-agent))) - (home-page "http://github.com/romanz/trezor-agent") + (home-page "https://github.com/romanz/trezor-agent") (synopsis "KeepKey as hardware SSH/GPG agent") (description "This package allows using KeepKey as a hardware SSH/GPG agent.") diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index bb7f57b49d..c2cffbad9e 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -392,7 +392,7 @@ (define-public ghc-tasty-expected-failure (inputs `(("ghc-tagged" ,ghc-tagged) ("ghc-tasty" ,ghc-tasty))) - (home-page "http://github.com/nomeata/tasty-expected-failure") + (home-page "https://github.com/nomeata/tasty-expected-failure") (synopsis "Mark tasty tests as failure expected") (description "With the function @code{Test.Tasty.ExpectedFailure.expectFail} in the diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 85c9aa9755..812af1fbc2 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -568,7 +568,7 @@ (define-public ghc-bsb-http-chunked ("ghc-tasty-hedgehog" ,ghc-tasty-hedgehog) ("ghc-tasty-hunit" ,ghc-tasty-hunit) ("ghc-doctest" ,ghc-doctest))) - (home-page "http://github.com/sjakobi/bsb-http-chunked") + (home-page "https://github.com/sjakobi/bsb-http-chunked") (synopsis "Chunked HTTP transfer encoding for bytestring builders") (description "This Haskell library contains functions for encoding bytestring builders for chunked Hypertext Transfer Protocol (HTTP) 1.1 @@ -616,7 +616,7 @@ (define-public ghc-warp ("ghc-hunit" ,ghc-hunit) ("ghc-http-client" ,ghc-http-client) ("hspec-discover" ,hspec-discover))) - (home-page "http://github.com/yesodweb/wai") + (home-page "https://github.com/yesodweb/wai") (synopsis "HTTP server library for Haskell's WAI") (description "Warp is a server library for HTTP/1.x and HTTP/2 based WAI (Web Application Interface in Haskell).") @@ -671,7 +671,7 @@ (define-public ghc-warp-tls ("ghc-tls-session-manager" ,ghc-tls-session-manager) ("ghc-wai" ,ghc-wai) ("ghc-warp" ,ghc-warp))) - (home-page "http://github.com/yesodweb/wai") + (home-page "https://github.com/yesodweb/wai") (synopsis "SSL/TLS support for Warp") (description "This package provides SSL/TLS support for Warp, a WAI handler, via the native Haskell TLS implementation.") diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 234f75dbfc..a5ceef1f54 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -2472,7 +2472,7 @@ (define-public ghc-configurator `(("ghc-hunit" ,ghc-hunit) ("ghc-test-framework" ,ghc-test-framework) ("ghc-test-framework-hunit" ,ghc-test-framework-hunit))) - (home-page "http://github.com/bos/configurator") + (home-page "https://github.com/bos/configurator") (synopsis "Configuration management") (description "This package provides a configuration management library for programs @@ -5492,7 +5492,7 @@ (define-public ghc-hasktags ("ghc-utf8-string" ,ghc-utf8-string) ("ghc-microlens-platform" ,ghc-microlens-platform) ("ghc-hunit" ,ghc-hunit))) - (home-page "http://github.com/MarcWeber/hasktags") + (home-page "https://github.com/MarcWeber/hasktags") (synopsis "Make @code{Ctags} and @code{Etags} files for Haskell programs") (description "This package provides a means of generating tag files for Emacs and @@ -6991,7 +6991,7 @@ (define-public ghc-linear ("ghc-test-framework" ,ghc-test-framework) ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) ("ghc-hunit" ,ghc-hunit))) - (home-page "http://github.com/ekmett/linear/") + (home-page "https://github.com/ekmett/linear/") (synopsis "Linear algebra library for Haskell") (description "This package provides types and combinators for linear algebra on free @@ -8258,7 +8258,7 @@ (define-public ghc-newtype-generics (native-inputs `(("ghc-hspec" ,ghc-hspec) ("hspec-discover" ,hspec-discover))) - (home-page "http://github.com/sjakobi/newtype-generics") + (home-page "https://github.com/sjakobi/newtype-generics") (synopsis "Typeclass and set of functions for working with newtypes") (description "The @code{Newtype} typeclass represents the packing and unpacking of a newtype, and allows you to operate under that newtype with @@ -9622,7 +9622,7 @@ (define-public ghc-pretty-show (inputs `(("ghc-haskell-lexer" ,ghc-haskell-lexer) ("ghc-happy" ,ghc-happy))) - (home-page "http://wiki.github.com/yav/pretty-show") + (home-page "https://wiki.github.com/yav/pretty-show") (synopsis "Tools for working with derived `Show` instances") (description "This package provides a library and an executable for working with @@ -10565,7 +10565,7 @@ (define-public ghc-retry ("ghc-tasty-hunit" ,ghc-tasty-hunit) ("ghc-tasty-hedgehog" ,ghc-tasty-hedgehog) ("ghc-hedgehog" ,ghc-hedgehog))) - (home-page "http://github.com/Soostone/retry") + (home-page "https://github.com/Soostone/retry") (synopsis "Retry combinators for monadic actions that may fail") (description "This package exposes combinators that can wrap arbitrary monadic actions. They run the action and potentially retry @@ -14351,7 +14351,7 @@ (define-public ghc-xdg-basedir (base32 "0azlzaxp2dn4l1nr7shsxah2magk1szf6fx0mv75az00qsjw6qg4")))) (build-system haskell-build-system) - (home-page "http://github.com/willdonnelly/xdg-basedir") + (home-page "https://github.com/willdonnelly/xdg-basedir") (synopsis "XDG Base Directory library for Haskell") (description "This package provides a library implementing the XDG Base Directory spec.") (license license:bsd-3))) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 289bdd74d4..92df503b09 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -9079,7 +9079,7 @@ (define-public java-javax-inject `(#:jar-name "java-javax-inject.jar" #:jdk ,icedtea-8 #:tests? #f)); no tests - (home-page "http://github.com/javax-inject/javax-inject") + (home-page "https://github.com/javax-inject/javax-inject") (synopsis "JSR-330: Dependency Injection for Java") (description "This package specifies a means for obtaining objects in such a way as to maximize reusability, testability and maintainability compared to diff --git a/gnu/packages/libffi.scm b/gnu/packages/libffi.scm index 36f6e5ece6..ec8703ffdb 100644 --- a/gnu/packages/libffi.scm +++ b/gnu/packages/libffi.scm @@ -248,5 +248,5 @@ (define-public ruby-ffi dynamic libraries, binding functions within them, and calling those functions from Ruby code. Moreover, a Ruby-FFI extension works without changes on Ruby and JRuby.") - (home-page "http://wiki.github.com/ffi/ffi") + (home-page "https://wiki.github.com/ffi/ffi") (license bsd-3))) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 80f546e056..1b71bc1e0c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -6430,7 +6430,7 @@ (define-public procenv itself and its environment as possible. It can be used as a test tool, to understand the type of environment a process runs in, and for comparing system environments.") - (home-page "http://github.com/jamesodhunt/procenv/") + (home-page "https://github.com/jamesodhunt/procenv/") (license license:gpl3+))) (define-public libfabric diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 1d7cfd852d..0624cc967a 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -187,7 +187,7 @@ (define-public python-aiodns `(("python-pycares" ,python-pycares))) (arguments `(#:tests? #f)) ;tests require internet access - (home-page "http://github.com/saghul/aiodns") + (home-page "https://github.com/saghul/aiodns") (synopsis "Simple DNS resolver for asyncio") (description "@code{aiodns} provides a simple way for doing asynchronous DNS resolutions with a synchronous looking interface by @@ -2368,7 +2368,7 @@ (define-public python-flask-htpasswd ("python-itsdangerous" ,python-itsdangerous) ("python-passlib" ,python-passlib) ("python-tox" ,python-tox))) - (home-page "http://github.com/carsongee/flask-htpasswd") + (home-page "https://github.com/carsongee/flask-htpasswd") (synopsis "Basic authentication via htpasswd files in Flask applications") (description "This package provides Basic authentication via @file{htpasswd} files and access_token authentication in Flask @@ -3106,7 +3106,7 @@ (define-public python-pycares (build-system python-build-system) (arguments `(#:tests? #f)) ;tests require internet access - (home-page "http://github.com/saghul/pycares") + (home-page "https://github.com/saghul/pycares") (synopsis "Python interface for @code{c-ares}") (description "@code{pycares} is a Python module which provides an interface to @code{c-ares}, a C library that performs DNS requests and diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 15d9e097c5..e1e3870d06 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10163,7 +10163,7 @@ (define-public python-progressbar33 (base32 "1zvf6zs5hzrc03p9nfs4p16vhilqikycvv1yk0pxn8s07fdhvzji")))) (build-system python-build-system) - (home-page "http://github.com/germangh/python-progressbar") + (home-page "https://github.com/germangh/python-progressbar") (synopsis "Text progress bar library for Python") (description "This package provides a text progress bar library for Python. This @@ -16426,7 +16426,7 @@ (define-public python-whatever (invoke "py.test")))))) (native-inputs `(("python-pytest" ,python-pytest))) - (home-page "http://github.com/Suor/whatever") + (home-page "https://github.com/Suor/whatever") (synopsis "Make anonymous functions by partial application of operators") (description "@code{whatever} provides an easy way to make anonymous functions by partial application of operators.") @@ -16458,7 +16458,7 @@ (define-public python-funcy (native-inputs `(("python-pytest" ,python-pytest) ("python-whatever" ,python-whatever))) - (home-page "http://github.com/Suor/funcy") + (home-page "https://github.com/Suor/funcy") (synopsis "Functional tools") (description "@code{funcy} is a library that provides functional tools. Examples are: diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 8f48c3eba8..d3d27f70b2 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2458,7 +2458,7 @@ (define-public ruby-rubyzip (synopsis "Ruby module is for reading and writing zip files") (description "The rubyzip module provides ways to read from and create zip files.") - (home-page "http://github.com/rubyzip/rubyzip") + (home-page "https://github.com/rubyzip/rubyzip") (license license:bsd-2))) (define-public ruby-simplecov-html @@ -4758,7 +4758,7 @@ (define-public ruby-spinach (package (name "ruby-spinach") (version "0.11.0") - (home-page "http://github.com/codegram/spinach") + (home-page "https://github.com/codegram/spinach") (source (origin (method url-fetch) (uri (rubygems-uri "spinach" version)) @@ -6630,7 +6630,7 @@ (define-public ruby-gherkin-ruby (package (name "ruby-gherkin-ruby") (version "0.3.2") - (home-page "http://github.com/codegram/gherkin-ruby") + (home-page "https://github.com/codegram/gherkin-ruby") (source (origin (method url-fetch) (uri (rubygems-uri "gherkin-ruby" version)) @@ -8855,7 +8855,7 @@ (define-public ruby-code-statistics (description "This gem is a port of the rails 'rake stats' method so it can be made more robust and work for non rails projects.") - (home-page "http://github.com/danmayer/code_statistics") + (home-page "https://github.com/danmayer/code_statistics") (license license:expat))) (define-public ruby-rubypants @@ -9057,7 +9057,7 @@ (define-public ruby-colorize "This package extends the @code{String} class and adds a @code{ColorizedString} with methods to set text color, background color, and text effects.") - (home-page "http://github.com/fazibear/colorize") + (home-page "https://github.com/fazibear/colorize") (license license:gpl2+))) (define-public ruby-colorator @@ -10602,7 +10602,7 @@ (define-public ruby-wwtd (package (name "ruby-wwtd") (version "1.4.1") - (home-page "http://github.com/grosser/wwtd") + (home-page "https://github.com/grosser/wwtd") (source (origin (method git-fetch) (uri (git-reference -- cgit v1.2.3 From 1467ca6829b2695eb536b8025420b32e298831a5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 16 Jul 2020 18:24:09 +0200 Subject: gnu: Use HTTPS for www.yesodweb.com. * gnu/packages/haskell-web.scm (ghc-css-text, ghc-yesod-persistent) [home-page]: Use HTTPS. --- gnu/packages/haskell-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 812af1fbc2..c53dc064b1 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -807,7 +807,7 @@ (define-public ghc-css-text `(("ghc-attoparsec" ,ghc-attoparsec) ("ghc-hspec" ,ghc-hspec) ("ghc-quickcheck" ,ghc-quickcheck))) - (home-page "http://www.yesodweb.com/") + (home-page "https://www.yesodweb.com/") (synopsis "CSS parser and renderer") (description "This package provides a CSS parser and renderer for Haskell.") @@ -1288,7 +1288,7 @@ (define-public ghc-yesod-persistent ("ghc-wai-extra" ,ghc-wai-extra) ("ghc-yesod-core" ,ghc-yesod-core) ("ghc-persistent-sqlite" ,ghc-persistent-sqlite))) - (home-page "http://www.yesodweb.com/") + (home-page "https://www.yesodweb.com/") (synopsis "Helpers for using Persistent from Yesod") (description "This Haskell package provides helpers for using Persistent from Yesod.") -- cgit v1.2.3 From d48b5c8af7ea3ac0ec80dab3d0036f185913d1e3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 16 Jul 2020 18:30:58 +0200 Subject: gnu: ghc-pandoc-types: Use HTTPS home page. * gnu/packages/haskell-xyz.scm (ghc-pandoc-types)[home-page]: Use HTTPS. --- gnu/packages/haskell-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index a5ceef1f54..5f43e93108 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -8883,7 +8883,7 @@ (define-public ghc-pandoc-types ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2) ("ghc-hunit" ,ghc-hunit))) - (home-page "http://johnmacfarlane.net/pandoc") + (home-page "https://johnmacfarlane.net/pandoc") (synopsis "Types for representing a structured document") (description "This module defines the @code{Pandoc} data structure, which is used by -- cgit v1.2.3 From 00a34333bb47ee8e8bceb05b7ca4e6e7fadc9b14 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 16 Jul 2020 18:36:38 +0200 Subject: gnu: Use HTTPS for igraph.org. * gnu/packages/graph.scm (igraph, r-igraph)[home-page]: Use HTTPS. --- gnu/packages/graph.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm index 93460bb38e..65dc23588f 100644 --- a/gnu/packages/graph.scm +++ b/gnu/packages/graph.scm @@ -78,7 +78,7 @@ (define-public igraph ("lapack" ,lapack) ("openblas" ,openblas) ("zlib" ,zlib))) - (home-page "http://igraph.org") + (home-page "https://igraph.org") (synopsis "Network analysis and visualization") (description "This package provides a library for the analysis of networks and graphs. @@ -145,7 +145,7 @@ (define-public r-igraph `(("r-magrittr" ,r-magrittr) ("r-matrix" ,r-matrix) ("r-pkgconfig" ,r-pkgconfig))) - (home-page "http://igraph.org") + (home-page "https://igraph.org") (synopsis "Network analysis and visualization") (description "This package provides routines for simple graphs and network analysis. -- cgit v1.2.3 From 2ae03bf6319bc2f8b9c6b8c247f4b620e809d9b1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 16 Jul 2020 18:47:31 +0200 Subject: gnu: jack@0.125.0: Update URIs. gnu/packages/audio.scm (jack-1)[source]: Use a working mirror. [home-page]: Use HTTPS. --- gnu/packages/audio.scm | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 573731e1a7..22fd7d993f 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1690,15 +1690,16 @@ (define-public jack-1 (package (name "jack") (version "0.125.0") - (source (origin - (method url-fetch) - (uri (string-append - "http://jackaudio.org/downloads/jack-audio-connection-kit-" - version - ".tar.gz")) - (sha256 - (base32 - "0i6l25dmfk2ji2lrakqq9icnwjxklgcjzzk65dmsff91z2zva5rm")))) + (source + (origin + (method url-fetch) + ;; jackaudio.org/downloads/jack-audio-connection-kit-0.125.0.tar.gz + ;; no longer exists (404). Use an unofficial mirror. + (uri (string-append "https://crux.ster.zone/downloads/" + "jack-audio-connection-kit/" + "jack-audio-connection-kit-" version ".tar.gz")) + (sha256 + (base32 "0i6l25dmfk2ji2lrakqq9icnwjxklgcjzzk65dmsff91z2zva5rm")))) (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases @@ -1718,7 +1719,7 @@ (define-public jack-1 ("bdb" ,bdb))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://jackaudio.org/") + (home-page "https://jackaudio.org/") (synopsis "JACK audio connection kit") (description "JACK is a low-latency audio server. It can connect a number of -- cgit v1.2.3 From c980589260bfed62cdc00ebe59799edc85d5af5c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 16 Jul 2020 18:52:23 +0200 Subject: gnu: Use HTTPS for biojava.org home pages. * gnu/packages/bioinformatics.scm (java-biojava-core) (java-biojava-phylo, java-biojava-alignment, java-biojava-phylo-4.0) (java-biojava-alignment-4.0)[home-page]: Use HTTPS. --- gnu/packages/bioinformatics.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index b09b93cdc3..4255df07d3 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -12566,7 +12566,7 @@ (define-public java-biojava-core (native-inputs `(("java-junit" ,java-junit) ("java-hamcrest-core" ,java-hamcrest-core))) - (home-page "http://biojava.org") + (home-page "https://biojava.org") (synopsis "Core libraries of Java framework for processing biological data") (description "BioJava is a project dedicated to providing a Java framework for processing biological data. It provides analytical and statistical @@ -12609,7 +12609,7 @@ (define-public java-biojava-phylo (native-inputs `(("java-junit" ,java-junit) ("java-hamcrest-core" ,java-hamcrest-core))) - (home-page "http://biojava.org") + (home-page "https://biojava.org") (synopsis "Biojava interface to the forester phylogenomics library") (description "The phylo module provides a biojava interface layer to the forester phylogenomics library for constructing phylogenetic trees."))) @@ -12646,7 +12646,7 @@ (define-public java-biojava-alignment (native-inputs `(("java-junit" ,java-junit) ("java-hamcrest-core" ,java-hamcrest-core))) - (home-page "http://biojava.org") + (home-page "https://biojava.org") (synopsis "Biojava API for genetic sequence alignment") (description "The alignment module of BioJava provides an API that contains @@ -12703,7 +12703,7 @@ (define-public java-biojava-phylo-4.0 (native-inputs `(("java-junit" ,java-junit) ("java-hamcrest-core" ,java-hamcrest-core))) - (home-page "http://biojava.org") + (home-page "https://biojava.org") (synopsis "Biojava interface to the forester phylogenomics library") (description "The phylo module provides a biojava interface layer to the forester phylogenomics library for constructing phylogenetic trees."))) @@ -12740,7 +12740,7 @@ (define-public java-biojava-alignment-4.0 (native-inputs `(("java-junit" ,java-junit) ("java-hamcrest-core" ,java-hamcrest-core))) - (home-page "http://biojava.org") + (home-page "https://biojava.org") (synopsis "Biojava API for genetic sequence alignment") (description "The alignment module of BioJava provides an API that contains -- cgit v1.2.3 From fe39c701952733cf19650898feaa78ad4337a599 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 16 Jul 2020 18:56:27 +0200 Subject: gnu: Use HTTPS for mdc-berlin.de home pages. * gnu/packages/bioinformatics.scm (r-genomation, r-genomationdata, pigx-rnaseq) (pigx-chipseq, pigx-bsseq, pigx-scrnaseq, pigx)[home-page]: Use HTTPS. --- gnu/packages/bioinformatics.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 4255df07d3..8a6be59d2a 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8415,7 +8415,7 @@ (define-public r-genomation ("r-seqpattern" ,r-seqpattern))) (native-inputs `(("r-knitr" ,r-knitr))) - (home-page "http://bioinformatics.mdc-berlin.de/genomation/") + (home-page "https://bioinformatics.mdc-berlin.de/genomation/") (synopsis "Summary, annotation and visualization of genomic data") (description "This package provides a package for summary and annotation of genomic @@ -8448,7 +8448,7 @@ (define-public r-genomationdata (arguments `(#:substitutable? #f)) (native-inputs `(("r-knitr" ,r-knitr))) - (home-page "http://bioinformatics.mdc-berlin.de/genomation/") + (home-page "https://bioinformatics.mdc-berlin.de/genomation/") (synopsis "Experimental data for use with the genomation package") (description "This package contains experimental genetic data for use with the @@ -12952,7 +12952,7 @@ (define-public pigx-rnaseq ("ghc-pandoc-citeproc" ,ghc-pandoc-citeproc) ("python-wrapper" ,python-wrapper) ("python-pyyaml" ,python-pyyaml))) - (home-page "http://bioinformatics.mdc-berlin.de/pigx/") + (home-page "https://bioinformatics.mdc-berlin.de/pigx/") (synopsis "Analysis pipeline for RNA sequencing experiments") (description "PiGX RNAseq is an analysis pipeline for preprocessing and reporting for RNA sequencing experiments. It is easy to use and produces high @@ -13021,7 +13021,7 @@ (define-public pigx-chipseq ("kentutils" ,kentutils))) (native-inputs `(("python-pytest" ,python-pytest))) - (home-page "http://bioinformatics.mdc-berlin.de/pigx/") + (home-page "https://bioinformatics.mdc-berlin.de/pigx/") (synopsis "Analysis pipeline for ChIP sequencing experiments") (description "PiGX ChIPseq is an analysis pipeline for preprocessing, peak calling and reporting for ChIP sequencing experiments. It is easy to use and @@ -13083,7 +13083,7 @@ (define-public pigx-bsseq ("trim-galore" ,trim-galore) ("cutadapt" ,cutadapt) ("samtools" ,samtools))) - (home-page "http://bioinformatics.mdc-berlin.de/pigx/") + (home-page "https://bioinformatics.mdc-berlin.de/pigx/") (synopsis "Bisulfite sequencing pipeline from fastq to methylation reports") (description "PiGx BSseq is a data processing pipeline for raw fastq read data of bisulfite experiments; it produces reports on aggregate methylation @@ -13147,7 +13147,7 @@ (define-public pigx-scrnaseq ("r-singlecellexperiment" ,r-singlecellexperiment) ("r-stringr" ,r-stringr) ("r-yaml" ,r-yaml))) - (home-page "http://bioinformatics.mdc-berlin.de/pigx/") + (home-page "https://bioinformatics.mdc-berlin.de/pigx/") (synopsis "Analysis pipeline for single-cell RNA sequencing experiments") (description "PiGX scRNAseq is an analysis pipeline for preprocessing and quality control for single cell RNA sequencing experiments. The inputs are @@ -13176,7 +13176,7 @@ (define-public pigx ("pigx-chipseq" ,pigx-chipseq) ("pigx-rnaseq" ,pigx-rnaseq) ("pigx-scrnaseq" ,pigx-scrnaseq))) - (home-page "http://bioinformatics.mdc-berlin.de/pigx/") + (home-page "https://bioinformatics.mdc-berlin.de/pigx/") (synopsis "Analysis pipelines for genomics") (description "PiGx is a collection of genomics pipelines. It includes the following pipelines: -- cgit v1.2.3 From 69cfb72b38d82383b9c1b2f24261833a4e8a8615 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 16 Jul 2020 19:05:39 +0200 Subject: gnu: libyaml: Use HTTPS. * gnu/packages/web.scm (libyaml)[source, home-page]: Use HTTPS. --- gnu/packages/web.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index c0a3134a89..47162c49de 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1492,14 +1492,12 @@ (define-public libyaml (source (origin (method url-fetch) - (uri (string-append - "http://pyyaml.org/download/libyaml/yaml-" - version ".tar.gz")) + (uri (string-append "https://pyyaml.org/download/libyaml/yaml-" + version ".tar.gz")) (sha256 - (base32 - "0mq5wf17ifcwwxq3kbimhi53jn3fg23vcynqpzxjcz3vfjlfs2nq")))) + (base32 "0mq5wf17ifcwwxq3kbimhi53jn3fg23vcynqpzxjcz3vfjlfs2nq")))) (build-system gnu-build-system) - (home-page "http://pyyaml.org/wiki/LibYAML") + (home-page "https://pyyaml.org/wiki/LibYAML") (synopsis "YAML 1.1 parser and emitter written in C") (description "LibYAML is a YAML 1.1 parser and emitter written in C.") -- cgit v1.2.3 From c4944d6c81b7b803deba79661eea76ec4179bf69 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 16 Jul 2020 18:57:24 +0200 Subject: gnu: java-xmlunit: Use HTTPS home page. * gnu/packages/java.scm (java-xmlunit)[home-page]: Use HTTPS. --- gnu/packages/java.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 92df503b09..5970de1f45 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -10840,7 +10840,7 @@ (define-public java-xmlunit (sha256 (base32 "0r0glj37pg5l868yjz78gckr91cs8fysxxbp9p328dssssi91agr")))))) - (home-page "http://www.xmlunit.org/") + (home-page "https://www.xmlunit.org/") (synopsis "XML output testing") (description "XMLUnit provides you with the tools to verify the XML you emit is the one you want to create. It provides helpers to validate against -- cgit v1.2.3 From 7fc2ba2a2cfb6568a2067e62c966fe35a7ed9bde Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 16 Jul 2020 19:01:03 +0200 Subject: gnu: kyotocabinet: Use HTTPS. * gnu/packages/databases.scm (kyotocabinet)[source, home-page]: Use HTTPS. --- gnu/packages/databases.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 55fc4f8850..0e6ad4e291 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1976,8 +1976,8 @@ (define-public kyotocabinet (version "1.2.77") (source (origin (method url-fetch) - (uri (string-append "http://fallabs.com/kyotocabinet/pkg/" - name "-" version ".tar.gz")) + (uri (string-append "https://fallabs.com/kyotocabinet/pkg/" + "kyotocabinet-" version ".tar.gz")) (sha256 (base32 "1rlx4307adbzd842b4npq6cwlw8h010ingxaz3qz1ijc70lr72an")))) @@ -1989,7 +1989,7 @@ (define-public kyotocabinet (string-append "LDFLAGS=-Wl,-rpath=" (assoc-ref %outputs "out") "/lib")))) (inputs `(("zlib" ,zlib))) - (home-page "http://fallabs.com/kyotocabinet/") + (home-page "https://fallabs.com/kyotocabinet/") (synopsis "Kyoto Cabinet is a modern implementation of the DBM database") (description -- cgit v1.2.3 From 4089d7920fc5f27fefdde6b0fec17f3224e62377 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 15 Jul 2020 21:22:01 +0200 Subject: guix-install.sh: Suggest running gpg as root. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The original example regularly prevented new users from installing Guix at all. * etc/guix-install.scm (chk_gpg_keyring): Suggest ‘sudo -i gpg’. --- etc/guix-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 54bd813efd..efcc3d81d8 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -111,7 +111,7 @@ chk_gpg_keyring() # systems where gpg has never been used, causing errors and confusion. gpg --dry-run --list-keys ${OPENPGP_SIGNING_KEY_ID} >/dev/null 2>&1 || ( _err "${ERR}Missing OpenPGP public key. Fetch it with this command:" - echo " wget https://sv.gnu.org/people/viewgpg.php?user_id=15145 -qO - | gpg --import -" + echo " wget https://sv.gnu.org/people/viewgpg.php?user_id=15145 -qO - | sudo -i gpg --import -" exit 1 ) } -- cgit v1.2.3 From 2ffd1314cd80d9d8fb38b78a34ef10bbf666838f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 15 Jul 2020 21:24:15 +0200 Subject: guix-install.sh: Make sure /etc/profile is sourced. New users regularly report missing newly-installed programmes and icons. * etc/guix-install.scm (main): Tell users to log out & back in. --- etc/guix-install.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index efcc3d81d8..72dc3839e8 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -418,6 +418,7 @@ sys_authorize_build_farms() sys_create_init_profile() { # Create /etc/profile.d/guix.sh for better desktop integration + # This will not take effect until the next shell or desktop session! [ -d "/etc/profile.d" ] || mkdir /etc/profile.d # Just in case cat <<"EOF" > /etc/profile.d/guix.sh # _GUIX_PROFILE: `guix pull` profile @@ -507,6 +508,9 @@ main() _msg "${PAS}Guix has successfully been installed!" _msg "${INF}Run 'info guix' to read the manual." + + # Required to source /etc/profile in desktop environments. + _msg "${INF}Please log out and back in to complete the installation." } main "$@" -- cgit v1.2.3 From 7089a45aa1195844683b9c1ed0ba56f919eb922f Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 16 Jul 2020 15:35:03 -0400 Subject: gnu: linux-libre@4.19: Update to 4.19.133. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.133. (linux-libre-4.19-pristine-source): Update hash. (linux-libre-4.19-source): Remove %linux-libre-fix-atheros-9271-patch. --- gnu/packages/linux.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 1b71bc1e0c..7750627a9f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -391,10 +391,10 @@ (define-public linux-libre-5.4-pristine-source (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.132") +(define-public linux-libre-4.19-version "4.19.133") (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "0i3xka0n26iqslvc8xzxlcig3gjwfprzgdwd1q3wrr1cjsafxmyp"))) + (hash (base32 "1i6vfzg8xds4lvvzkxaak74727iq35hx4vxr14w65bq9gpzfacxr"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) @@ -473,8 +473,7 @@ (define-public linux-libre-5.4-source (define-public linux-libre-4.19-source (source-with-patches linux-libre-4.19-pristine-source (list %boot-logo-patch - %linux-libre-arm-export-__sync_icache_dcache-patch - %linux-libre-fix-atheros-9271-patch))) + %linux-libre-arm-export-__sync_icache_dcache-patch))) (define-public linux-libre-4.14-source (source-with-patches linux-libre-4.14-pristine-source -- cgit v1.2.3 From d269422ec1e96cd2d40bd0c797440c56a3313bc4 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 16 Jul 2020 15:35:59 -0400 Subject: gnu: linux-libre@5.7: Update to 5.7.9. * gnu/packages/linux.scm (linux-libre-5.7-version): Update to 5.7.9. (linux-libre-5.7-pristine-source): Update hash. (linux-libre-5.7-source): Remove %linux-libre-fix-atheros-9271-patch. --- gnu/packages/linux.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 7750627a9f..1eb5ca6870 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -375,10 +375,10 @@ (define (%upstream-linux-source version hash) (sha256 hash))) -(define-public linux-libre-5.7-version "5.7.8") +(define-public linux-libre-5.7-version "5.7.9") (define-public linux-libre-5.7-pristine-source (let ((version linux-libre-5.7-version) - (hash (base32 "1ijdhjik5hlaj8w32qf5x4gigf2aa6xkg68hckm5h1s0isw7gddg"))) + (hash (base32 "1y231c3lf94lgnnn8bzi2yfx40h4xsli2hq0kaxdd744lxk30zd8"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.7))) @@ -457,8 +457,7 @@ (define (source-with-patches source patches) (define-public linux-libre-5.7-source (source-with-patches linux-libre-5.7-pristine-source (list %boot-logo-patch - %linux-libre-arm-export-__sync_icache_dcache-patch - %linux-libre-fix-atheros-9271-patch))) + %linux-libre-arm-export-__sync_icache_dcache-patch))) (define-public linux-libre-5.4-source (source-with-patches linux-libre-5.4-pristine-source -- cgit v1.2.3 From 851cc11cd1c28178110ea7db5d528b342e9bc5be Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 16 Jul 2020 15:37:05 -0400 Subject: gnu: linux-libre: Update to 5.4.52. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.52. (linux-libre-5.4-pristine-source): Update hash. (linux-libre-5.4-source): Remove %linux-libre-fix-atheros-9271-patch. --- gnu/packages/linux.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 1eb5ca6870..eab48bd349 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -383,10 +383,10 @@ (define-public linux-libre-5.7-pristine-source (%upstream-linux-source version hash) deblob-scripts-5.7))) -(define-public linux-libre-5.4-version "5.4.51") +(define-public linux-libre-5.4-version "5.4.52") (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "1786l83nwzjazr2rl5fwxpw9dzlggi33nnj9grmp4dnn9j5ym2wy"))) + (hash (base32 "0fjxx8xpp0v0wwfw6zd5nc21i2r82wzcsy2yyl7w5c90259zlzh3"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) @@ -463,7 +463,6 @@ (define-public linux-libre-5.4-source (source-with-patches linux-libre-5.4-pristine-source (list %boot-logo-patch %linux-libre-arm-export-__sync_icache_dcache-patch - %linux-libre-fix-atheros-9271-patch ;; Pinebook Pro patch from linux-next, ;; can be dropped for linux-libre 5.7 (search-patch -- cgit v1.2.3 From 72a91d74cec01bfcfcef2b62c5b327fab82950b6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 3 Jul 2020 00:28:57 +0200 Subject: gnu: Add ganeti. * gnu/packages/virtualization.scm (system->qemu-target, ganeti): New variables. * gnu/packages/patches/ganeti-deterministic-manual.patch, gnu/packages/patches/ganeti-disable-version-symlinks.patch, gnu/packages/patches/ganeti-drbd-compat.patch, gnu/packages/patches/ganeti-haskell-pythondir.patch, gnu/packages/patches/ganeti-os-disk-size.patch, gnu/packages/patches/ganeti-preserve-PYTHONPATH.patch, gnu/packages/patches/ganeti-shepherd-master-failover.patch, gnu/packages/patches/ganeti-shepherd-support.patch: New files. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. --- gnu/local.mk | 8 + .../patches/ganeti-deterministic-manual.patch | 16 + .../patches/ganeti-disable-version-symlinks.patch | 136 +++++++ gnu/packages/patches/ganeti-drbd-compat.patch | 166 +++++++++ .../patches/ganeti-haskell-pythondir.patch | 66 ++++ gnu/packages/patches/ganeti-os-disk-size.patch | 17 + .../patches/ganeti-preserve-PYTHONPATH.patch | 21 ++ .../patches/ganeti-shepherd-master-failover.patch | 18 + gnu/packages/patches/ganeti-shepherd-support.patch | 87 +++++ gnu/packages/virtualization.scm | 395 +++++++++++++++++++++ 10 files changed, 930 insertions(+) create mode 100644 gnu/packages/patches/ganeti-deterministic-manual.patch create mode 100644 gnu/packages/patches/ganeti-disable-version-symlinks.patch create mode 100644 gnu/packages/patches/ganeti-drbd-compat.patch create mode 100644 gnu/packages/patches/ganeti-haskell-pythondir.patch create mode 100644 gnu/packages/patches/ganeti-os-disk-size.patch create mode 100644 gnu/packages/patches/ganeti-preserve-PYTHONPATH.patch create mode 100644 gnu/packages/patches/ganeti-shepherd-master-failover.patch create mode 100644 gnu/packages/patches/ganeti-shepherd-support.patch diff --git a/gnu/local.mk b/gnu/local.mk index f7c6036ee7..c36fa1ea5e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -947,6 +947,14 @@ dist_patch_DATA = \ %D%/packages/patches/fontconfig-hurd-path-max.patch \ %D%/packages/patches/freeimage-unbundle.patch \ %D%/packages/patches/fuse-overlapping-headers.patch \ + %D%/packages/patches/ganeti-deterministic-manual.patch \ + %D%/packages/patches/ganeti-disable-version-symlinks.patch \ + %D%/packages/patches/ganeti-drbd-compat.patch \ + %D%/packages/patches/ganeti-haskell-pythondir.patch \ + %D%/packages/patches/ganeti-os-disk-size.patch \ + %D%/packages/patches/ganeti-preserve-PYTHONPATH.patch \ + %D%/packages/patches/ganeti-shepherd-master-failover.patch \ + %D%/packages/patches/ganeti-shepherd-support.patch \ %D%/packages/patches/gash-utils-ls-test.patch \ %D%/packages/patches/gawk-shell.patch \ %D%/packages/patches/gcc-arm-bug-71399.patch \ diff --git a/gnu/packages/patches/ganeti-deterministic-manual.patch b/gnu/packages/patches/ganeti-deterministic-manual.patch new file mode 100644 index 0000000000..2d90aa740e --- /dev/null +++ b/gnu/packages/patches/ganeti-deterministic-manual.patch @@ -0,0 +1,16 @@ +Sort the ecode list in the gnt-cluster manual for deterministic results. + +Submitted upstream: . + +diff --git a/lib/build/sphinx_ext.py b/lib/build/sphinx_ext.py +--- a/lib/build/sphinx_ext.py ++++ b/lib/build/sphinx_ext.py +@@ -108,7 +108,7 @@ CV_ECODES_DOC = "ecodes" + # pylint: disable=W0621 + CV_ECODES_DOC_LIST = [(name, doc) for (_, name, doc) in constants.CV_ALL_ECODES] + DOCUMENTED_CONSTANTS = { +- CV_ECODES_DOC: CV_ECODES_DOC_LIST, ++ CV_ECODES_DOC: sorted(CV_ECODES_DOC_LIST, key=lambda tup: tup[0]), + } + + diff --git a/gnu/packages/patches/ganeti-disable-version-symlinks.patch b/gnu/packages/patches/ganeti-disable-version-symlinks.patch new file mode 100644 index 0000000000..a5f347cfc6 --- /dev/null +++ b/gnu/packages/patches/ganeti-disable-version-symlinks.patch @@ -0,0 +1,136 @@ +This patch adds a new "--disable-version-links" configuration option +that allows installing to the standard GNU installation directories +instead of having to add symlinks in /etc/ganeti/{lib,share} that +points to the right $ganeti/{lib,share}/$version. Mainly to reduce +service complexity, and because Guix users can install as many versions +of Ganeti they can muster without resorting to such hacks. + +diff --git a/Makefile.am b/Makefile.am +--- a/Makefile.am ++++ b/Makefile.am +@@ -66,11 +66,16 @@ SHELL_ENV_INIT = autotools/shell-env-init + # so, if some currently architecture-independent executable is replaced by an + # architecture-dependent one (and hence has to go under $(versiondir)), add a link + # under $(versionedsharedir) but do not change the external links. ++# ++# As of Ganeti 3.0, it is possible to disable this behavior by passing ++# --disable-version-links, in which case the standard GNU installation ++# directories are used. + if USE_VERSION_FULL + DIRVERSION=$(VERSION_FULL) + else + DIRVERSION=$(VERSION_MAJOR).$(VERSION_MINOR) + endif ++if USE_VERSION_LINKS + versiondir = $(libdir)/ganeti/$(DIRVERSION) + defaultversiondir = $(libdir)/ganeti/default + versionedsharedir = $(prefix)/share/ganeti/$(DIRVERSION) +@@ -90,6 +95,18 @@ gntpythondir = $(versionedsharedir) + pkgpython_bindir = $(versionedsharedir) + gnt_python_sbindir = $(versionedsharedir) + tools_pythondir = $(versionedsharedir) ++else ++myexeclibdir = $(pkglibdir) ++pkgpython_rpc_stubdir = $(pkgpythondir)/rpc/stub ++gntpythondir = $(sbindir) ++pkgpython_bindir = $(pkglibdir) ++gnt_python_sbindir = $(sbindir) ++tools_pythondir = $(pkglibdir) ++versionedsharedir = $(pkglibdir) ++# This is a hack but works because the only user does $(versiondir)$(datadir). ++versiondir = ++endif !USE_VERSION_LINKS ++ + + clientdir = $(pkgpythondir)/client + cmdlibdir = $(pkgpythondir)/cmdlib +@@ -2356,6 +2373,7 @@ src/AutoConf.hs: Makefile src/AutoConf.hs.in $(PRINT_PY_CONSTANTS) \ + -DVERSION_SUFFIX="$(VERSION_SUFFIX)" \ + -DVERSION_FULL="$(VERSION_FULL)" \ + -DDIRVERSION="$(DIRVERSION)" \ ++ -DUSE_VERSION_LINKS="$(USE_VERSION_LINKS)" \ + -DLOCALSTATEDIR="$(localstatedir)" \ + -DSYSCONFDIR="$(sysconfdir)" \ + -DSSH_CONFIG_DIR="$(SSH_CONFIG_DIR)" \ +@@ -2857,6 +2875,7 @@ install-exec-local: + @mkdir_p@ "$(DESTDIR)${localstatedir}/lib/ganeti" \ + "$(DESTDIR)${localstatedir}/log/ganeti" \ + "$(DESTDIR)${localstatedir}/run/ganeti" ++if USE_VERSION_LINKS + for dir in $(SYMLINK_TARGET_DIRS); do \ + @mkdir_p@ $(DESTDIR)$$dir; \ + done +@@ -2892,7 +2911,8 @@ install-exec-local: + if INSTALL_SYMLINKS + $(LN_S) -f $(versionedsharedir) $(DESTDIR)$(sysconfdir)/ganeti/share + $(LN_S) -f $(versiondir) $(DESTDIR)$(sysconfdir)/ganeti/lib +-endif ++endif INSTALL_SYMLINKS ++endif USE_VERSION_LINKS + + .PHONY: apidoc + if WANT_HSAPIDOC +diff --git a/configure.ac b/configure.ac +--- a/configure.ac ++++ b/configure.ac +@@ -29,6 +29,23 @@ AC_SUBST([BINDIR], $bindir) + AC_SUBST([SBINDIR], $sbindir) + AC_SUBST([MANDIR], $mandir) + ++# --enable-version-links ++AC_ARG_ENABLE([version-links], ++ [AS_HELP_STRING([--enable-version-links], ++ m4_normalize([install ganeti to version-specific ++ subdirectories to allow installing multiple versions ++ in parallel (default: enabled)]))], ++ [[if test "$enableval" != no; then ++ USE_VERSION_LINKS=True ++ else ++ USE_VERSION_LINKS=False ++ fi ++ ]], ++ [USE_VERSION_LINKS=True ++ ]) ++AC_SUBST(USE_VERSION_LINKS, $USE_VERSION_LINKS) ++AM_CONDITIONAL([USE_VERSION_LINKS], [test "$USE_VERSION_LINKS" = True]) ++ + # --enable-versionfull + AC_ARG_ENABLE([versionfull], + [AS_HELP_STRING([--enable-versionfull], +diff --git a/lib/bootstrap.py b/lib/bootstrap.py +--- a/lib/bootstrap.py ++++ b/lib/bootstrap.py +@@ -944,7 +944,7 @@ def SetupNodeDaemon(opts, cluster_name, node, ssh_port): + debug=opts.debug, verbose=opts.verbose, + use_cluster_key=True, ask_key=opts.ssh_key_check, + strict_host_check=opts.ssh_key_check, +- ensure_version=True) ++ ensure_version=constants.USE_VERSION_LINKS) + + _WaitForSshDaemon(node, ssh_port) + _WaitForNodeDaemon(node) +diff --git a/src/AutoConf.hs.in b/src/AutoConf.hs.in +--- a/src/AutoConf.hs.in ++++ b/src/AutoConf.hs.in +@@ -64,6 +64,9 @@ versionFull = "VERSION_FULL" + dirVersion :: String + dirVersion = "DIRVERSION" + ++useVersionLinks :: Bool ++useVersionLinks = USE_VERSION_LINKS ++ + localstatedir :: String + localstatedir = "LOCALSTATEDIR" + +diff --git a/src/Ganeti/Constants.hs b/src/Ganeti/Constants.hs +--- a/src/Ganeti/Constants.hs ++++ b/src/Ganeti/Constants.hs +@@ -164,5 +164,8 @@ versionRevision = AutoConf.versionRevision + dirVersion :: String + dirVersion = AutoConf.dirVersion + ++useVersionLinks :: Bool ++useVersionLinks = AutoConf.useVersionLinks ++ + osApiV10 :: Int + osApiV10 = 10 diff --git a/gnu/packages/patches/ganeti-drbd-compat.patch b/gnu/packages/patches/ganeti-drbd-compat.patch new file mode 100644 index 0000000000..32f46bc7ed --- /dev/null +++ b/gnu/packages/patches/ganeti-drbd-compat.patch @@ -0,0 +1,166 @@ +This patch adds support for newer versions of DRBD. + +Submitted upstream: . + +diff --git a/lib/storage/drbd.py b/lib/storage/drbd.py +--- a/lib/storage/drbd.py ++++ b/lib/storage/drbd.py +@@ -315,6 +315,13 @@ class DRBD8Dev(base.BlockDev): + """ + return self._show_info_cls.GetDevInfo(self._GetShowData(minor)) + ++ @staticmethod ++ def _NeedsLocalSyncerParams(): ++ # For DRBD >= 8.4, syncer init must be done after local, not in net. ++ info = DRBD8.GetProcInfo() ++ version = info.GetVersion() ++ return version["k_minor"] >= 4 ++ + def _MatchesLocal(self, info): + """Test if our local config matches with an existing device. + +@@ -397,6 +404,20 @@ class DRBD8Dev(base.BlockDev): + base.ThrowError("drbd%d: can't attach local disk: %s", + minor, result.output) + ++ def _WaitForMinorSyncParams(): ++ """Call _SetMinorSyncParams and raise RetryAgain on errors. ++ """ ++ if self._SetMinorSyncParams(minor, self.params): ++ raise utils.RetryAgain() ++ ++ if self._NeedsLocalSyncerParams(): ++ # Retry because disk config for DRBD resource may be still uninitialized. ++ try: ++ utils.Retry(_WaitForMinorSyncParams, 1.0, 5.0) ++ except utils.RetryTimeout as e: ++ base.ThrowError("drbd%d: can't set the synchronization parameters: %s" % ++ (minor, utils.CommaJoin(e.args[0]))) ++ + def _AssembleNet(self, minor, net_info, dual_pri=False, hmac=None, + secret=None): + """Configure the network part of the device. +@@ -432,21 +453,24 @@ class DRBD8Dev(base.BlockDev): + # sync speed only after setting up both sides can race with DRBD + # connecting, hence we set it here before telling DRBD anything + # about its peer. +- sync_errors = self._SetMinorSyncParams(minor, self.params) +- if sync_errors: +- base.ThrowError("drbd%d: can't set the synchronization parameters: %s" % +- (minor, utils.CommaJoin(sync_errors))) ++ ++ if not self._NeedsLocalSyncerParams(): ++ sync_errors = self._SetMinorSyncParams(minor, self.params) ++ if sync_errors: ++ base.ThrowError("drbd%d: can't set the synchronization parameters: %s" % ++ (minor, utils.CommaJoin(sync_errors))) + + family = self._GetNetFamily(minor, lhost, rhost) + +- cmd = self._cmd_gen.GenNetInitCmd(minor, family, lhost, lport, ++ cmds = self._cmd_gen.GenNetInitCmds(minor, family, lhost, lport, + rhost, rport, protocol, + dual_pri, hmac, secret, self.params) + +- result = utils.RunCmd(cmd) +- if result.failed: +- base.ThrowError("drbd%d: can't setup network: %s - %s", +- minor, result.fail_reason, result.output) ++ for cmd in cmds: ++ result = utils.RunCmd(cmd) ++ if result.failed: ++ base.ThrowError("drbd%d: can't setup network: %s - %s", ++ minor, result.fail_reason, result.output) + + def _CheckNetworkConfig(): + info = self._GetShowInfo(minor) +@@ -463,19 +487,20 @@ class DRBD8Dev(base.BlockDev): + base.ThrowError("drbd%d: timeout while configuring network", minor) + + # Once the assembly is over, try to set the synchronization parameters +- try: +- # The minor may not have been set yet, requiring us to set it at least +- # temporarily +- old_minor = self.minor +- self._SetFromMinor(minor) +- sync_errors = self.SetSyncParams(self.params) +- if sync_errors: +- base.ThrowError("drbd%d: can't set the synchronization parameters: %s" % +- (self.minor, utils.CommaJoin(sync_errors))) +- finally: +- # Undo the change, regardless of whether it will have to be done again +- # soon +- self._SetFromMinor(old_minor) ++ if not self._NeedsLocalSyncerParams(): ++ try: ++ # The minor may not have been set yet, requiring us to set it at least ++ # temporarily ++ old_minor = self.minor ++ self._SetFromMinor(minor) ++ sync_errors = self.SetSyncParams(self.params) ++ if sync_errors: ++ base.ThrowError("drbd%d: can't set the synchronization parameters: %s" % ++ (self.minor, utils.CommaJoin(sync_errors))) ++ finally: ++ # Undo the change, regardless of whether it will have to be done again ++ # soon ++ self._SetFromMinor(old_minor) + + @staticmethod + def _GetNetFamily(minor, lhost, rhost): +diff --git a/lib/storage/drbd_cmdgen.py b/lib/storage/drbd_cmdgen.py +--- a/lib/storage/drbd_cmdgen.py ++++ b/lib/storage/drbd_cmdgen.py +@@ -56,7 +56,7 @@ class BaseDRBDCmdGenerator(object): + def GenLocalInitCmds(self, minor, data_dev, meta_dev, size_mb, params): + raise NotImplementedError + +- def GenNetInitCmd(self, minor, family, lhost, lport, rhost, rport, protocol, ++ def GenNetInitCmds(self, minor, family, lhost, lport, rhost, rport, protocol, + dual_pri, hmac, secret, params): + raise NotImplementedError + +@@ -138,7 +138,7 @@ class DRBD83CmdGenerator(BaseDRBDCmdGenerator): + + return [args] + +- def GenNetInitCmd(self, minor, family, lhost, lport, rhost, rport, protocol, ++ def GenNetInitCmds(self, minor, family, lhost, lport, rhost, rport, protocol, + dual_pri, hmac, secret, params): + args = ["drbdsetup", self._DevPath(minor), "net", + "%s:%s:%s" % (family, lhost, lport), +@@ -155,7 +155,7 @@ class DRBD83CmdGenerator(BaseDRBDCmdGenerator): + if params[constants.LDP_NET_CUSTOM]: + args.extend(shlex.split(params[constants.LDP_NET_CUSTOM])) + +- return args ++ return [args] + + def GenSyncParamsCmd(self, minor, params): + args = ["drbdsetup", self._DevPath(minor), "syncer"] +@@ -345,8 +345,14 @@ class DRBD84CmdGenerator(BaseDRBDCmdGenerator): + + return cmds + +- def GenNetInitCmd(self, minor, family, lhost, lport, rhost, rport, protocol, ++ def GenNetInitCmds(self, minor, family, lhost, lport, rhost, rport, protocol, + dual_pri, hmac, secret, params): ++ cmds = [] ++ ++ cmds.append(["drbdsetup", "new-resource", self._GetResource(minor)]) ++ cmds.append(["drbdsetup", "new-minor", self._GetResource(minor), ++ str(minor), "0"]) ++ + args = ["drbdsetup", "connect", self._GetResource(minor), + "%s:%s:%s" % (family, lhost, lport), + "%s:%s:%s" % (family, rhost, rport), +@@ -362,7 +368,8 @@ class DRBD84CmdGenerator(BaseDRBDCmdGenerator): + if params[constants.LDP_NET_CUSTOM]: + args.extend(shlex.split(params[constants.LDP_NET_CUSTOM])) + +- return args ++ cmds.append(args) ++ return cmds + + def GenSyncParamsCmd(self, minor, params): + args = ["drbdsetup", "disk-options", minor] diff --git a/gnu/packages/patches/ganeti-haskell-pythondir.patch b/gnu/packages/patches/ganeti-haskell-pythondir.patch new file mode 100644 index 0000000000..fa77771839 --- /dev/null +++ b/gnu/packages/patches/ganeti-haskell-pythondir.patch @@ -0,0 +1,66 @@ +This patch allows the Haskell daemons to locate Python libraries +installed to a non-standard pythondir. It is necessary because Guix +does not use versionedsharedir (see related patch that disables it). + +diff --git a/Makefile.am b/Makefile.am +--- a/Makefile.am ++++ b/Makefile.am +@@ -83,6 +83,7 @@ myexeclibdir = $(pkglibdir) + bindir = $(versiondir)/$(BINDIR) + sbindir = $(versiondir)$(SBINDIR) + mandir = $(versionedsharedir)/root$(MANDIR) ++pythondir = $(versionedsharedir) + pkgpythondir = $(versionedsharedir)/ganeti + pkgpython_rpc_stubdir = $(versionedsharedir)/ganeti/rpc/stub + gntpythondir = $(versionedsharedir) +@@ -2386,6 +2387,7 @@ src/AutoConf.hs: Makefile src/AutoConf.hs.in $(PRINT_PY_CONSTANTS) \ + -DPKGLIBDIR="$(libdir)/ganeti" \ + -DSHAREDIR="$(prefix)/share/ganeti" \ + -DVERSIONEDSHAREDIR="$(versionedsharedir)" \ ++ -DPYTHONDIR="$(pythondir)" \ + -DDRBD_BARRIERS="$(DRBD_BARRIERS)" \ + -DDRBD_NO_META_FLUSH="$(DRBD_NO_META_FLUSH)" \ + -DSYSLOG_USAGE="$(SYSLOG_USAGE)" \ +diff --git a/src/AutoConf.hs.in b/src/AutoConf.hs.in +--- a/src/AutoConf.hs.in ++++ b/src/AutoConf.hs.in +@@ -157,6 +157,9 @@ sharedir = "SHAREDIR" + versionedsharedir :: String + versionedsharedir = "VERSIONEDSHAREDIR" + ++pythondir :: String ++pythondir = "PYTHONDIR" ++ + drbdBarriers :: String + drbdBarriers = "DRBD_BARRIERS" + +diff --git a/src/Ganeti/Path.hs b/src/Ganeti/Path.hs +--- a/src/Ganeti/Path.hs ++++ b/src/Ganeti/Path.hs +@@ -188,5 +188,5 @@ getInstReasonFilename instName = instanceReasonDir `pjoin` instName + + -- | The path to the Python executable for starting jobs. + jqueueExecutorPy :: IO FilePath +-jqueueExecutorPy = return $ versionedsharedir +- "ganeti" "jqueue" "exec.py" ++jqueueExecutorPy = return $ pythondir ++ "ganeti" "jqueue" "exec.py" +diff --git a/src/Ganeti/Query/Exec.hs b/src/Ganeti/Query/Exec.hs +--- a/src/Ganeti/Query/Exec.hs ++++ b/src/Ganeti/Query/Exec.hs +@@ -99,12 +99,12 @@ spawnJobProcess jid = withErrorLogAt CRITICAL (show jid) $ + do + use_debug <- isDebugMode + env_ <- (M.toList . M.insert "GNT_DEBUG" (if use_debug then "1" else "0") +- . M.insert "PYTHONPATH" AC.versionedsharedir ++ . M.insert "PYTHONPATH" AC.pythondir + . M.fromList) + `liftM` getEnvironment + execPy <- P.jqueueExecutorPy + logDebug $ "Executing " ++ AC.pythonPath ++ " " ++ execPy +- ++ " with PYTHONPATH=" ++ AC.versionedsharedir ++ ++ " with PYTHONPATH=" ++ AC.pythondir + + (master, child) <- pipeClient connectConfig + let (rh, wh) = clientToHandle child + diff --git a/gnu/packages/patches/ganeti-os-disk-size.patch b/gnu/packages/patches/ganeti-os-disk-size.patch new file mode 100644 index 0000000000..16b1d7615c --- /dev/null +++ b/gnu/packages/patches/ganeti-os-disk-size.patch @@ -0,0 +1,17 @@ +This exposes information about disk sizes to OS install scripts. instance-guix +uses this if available to determine the size of the VM image. + +Submitted upstream: +https://github.com/ganeti/ganeti/pull/1503 + +diff --git a/lib/backend.py b/lib/backend.py +--- a/lib/backend.py ++++ b/lib/backend.py +@@ -4305,6 +4305,7 @@ def OSEnvironment(instance, inst_os, debug=0): + uri = _CalculateDeviceURI(instance, disk, real_disk) + result["DISK_%d_ACCESS" % idx] = disk.mode + result["DISK_%d_UUID" % idx] = disk.uuid ++ result["DISK_%d_SIZE" % idx] = str(disk.size) + if real_disk.dev_path: + result["DISK_%d_PATH" % idx] = real_disk.dev_path + if uri: diff --git a/gnu/packages/patches/ganeti-preserve-PYTHONPATH.patch b/gnu/packages/patches/ganeti-preserve-PYTHONPATH.patch new file mode 100644 index 0000000000..1358e30633 --- /dev/null +++ b/gnu/packages/patches/ganeti-preserve-PYTHONPATH.patch @@ -0,0 +1,21 @@ +Do not override PYTHONPATH when calling Python code from the Haskell +daemons. This is necessary because the Python library dependencies are +only available through PYTHONPATH. + +diff --git a/src/Ganeti/Query/Exec.hs b/src/Ganeti/Query/Exec.hs +--- a/src/Ganeti/Query/Exec.hs ++++ b/src/Ganeti/Query/Exec.hs +@@ -99,12 +99,10 @@ spawnJobProcess jid = withErrorLogAt CRITICAL (show jid) $ + do + use_debug <- isDebugMode + env_ <- (M.toList . M.insert "GNT_DEBUG" (if use_debug then "1" else "0") +- . M.insert "PYTHONPATH" AC.pythondir + . M.fromList) + `liftM` getEnvironment + execPy <- P.jqueueExecutorPy + logDebug $ "Executing " ++ AC.pythonPath ++ " " ++ execPy +- ++ " with PYTHONPATH=" ++ AC.pythondir + + (master, child) <- pipeClient connectConfig + let (rh, wh) = clientToHandle child + diff --git a/gnu/packages/patches/ganeti-shepherd-master-failover.patch b/gnu/packages/patches/ganeti-shepherd-master-failover.patch new file mode 100644 index 0000000000..36a7918998 --- /dev/null +++ b/gnu/packages/patches/ganeti-shepherd-master-failover.patch @@ -0,0 +1,18 @@ +By default, master-failover will call "herd start ganeti-wconfd" with +extra arguments such as --force-node. That does not work with the +Shepherd, so the Guix service has a "force-start" action for this purpose. + +diff --git a/lib/bootstrap.py b/lib/bootstrap.py +--- a/lib/bootstrap.py ++++ b/lib/bootstrap.py +@@ -1011,9 +1011,7 @@ def MasterFailover(no_voting=False): + + try: + # Forcefully start WConfd so that we can access the configuration +- result = utils.RunCmd([pathutils.DAEMON_UTIL, +- "start", constants.WCONFD, "--force-node", +- "--no-voting", "--yes-do-it"]) ++ result = utils.RunCmd(["herd", "force-start", constants.WCONFD]) + if result.failed: + raise errors.OpPrereqError("Could not start the configuration daemon," + " command %s had exitcode %s and error %s" % diff --git a/gnu/packages/patches/ganeti-shepherd-support.patch b/gnu/packages/patches/ganeti-shepherd-support.patch new file mode 100644 index 0000000000..f750604344 --- /dev/null +++ b/gnu/packages/patches/ganeti-shepherd-support.patch @@ -0,0 +1,87 @@ +Ganeti uses an internal tool to start/stop daemons during init and +upgrade. This patch makes the tool use native Shepherd facilities. + +diff --git a/daemons/daemon-util.in b/daemons/daemon-util.in +--- a/daemons/daemon-util.in ++++ b/daemons/daemon-util.in +@@ -184,6 +184,21 @@ use_systemctl() { + return 1 + } + ++# Checks if we should use the Shepherd to start/stop daemons ++use_shepherd() { ++ # Is Shepherd running as PID 1? ++ ps --no-headers -p 1 -o cmd | grep -q shepherd || return 1 ++ ++ type -p herd >/dev/null || return 1 ++ ++ # Does Shepherd know about Ganeti at all? ++ if herd status | grep -q ganeti; then ++ return 0 ++ fi ++ ++ return 1 ++} ++ + # Prints path to PID file for a daemon. + daemon_pidfile() { + if [[ "$#" -lt 1 ]]; then +@@ -261,6 +276,13 @@ check() { + else + return 1 + fi ++ elif use_shepherd; then ++ activestate="$(herd status ${name})" ++ if echo $activestate | grep -q Running ; then ++ return 0 ++ else ++ return 1 ++ fi + elif type -p start-stop-daemon >/dev/null; then + start-stop-daemon --stop --signal 0 --quiet \ + --pidfile $pidfile --name "$name" +@@ -291,6 +313,20 @@ start() { + return $? + fi + ++ if use_shepherd; then ++ if herd status "$name" | grep -q "disabled"; then ++ # The Shepherd will disable a service that has stopped, even if it exits ++ # gracefully. Thus, we must re-enable it in case of a master failover. ++ herd enable "${name}" ++ fi ++ # Note: unlike systemd, which happily starts a service and returns success ++ # even if the daemon immediately exits, the Shepherd actually waits for it ++ # to come up. Thus, ignore the exit status from 'herd start' in case of ++ # master daemons running on the wrong node, or ganeti-kvmd disabled, etc. ++ herd start "${name}" ++ return 0 ++ fi ++ + # Read $_ARGS and $EXTRA__ARGS + eval local args="\"\$${ucname}_ARGS \$EXTRA_${ucname}_ARGS\"" + +@@ -336,6 +372,13 @@ stop() { + + if use_systemctl; then + systemctl stop "${name}.service" ++ elif use_shepherd; then ++ if herd status | grep -q "$name"; then ++ herd stop "$name" ++ else ++ # Do not raise an error if the service has not been enabled. ++ return 0 ++ fi + elif type -p start-stop-daemon >/dev/null; then + start-stop-daemon --stop --quiet --oknodo --retry 30 \ + --pidfile $pidfile --name "$name" +@@ -352,6 +395,9 @@ check_and_start() { + if use_systemctl; then + echo "${name} supervised by systemd but not running, will not restart." + return 1 ++ elif use_shepherd; then ++ echo "${name} supervised by shepherd but not running, will not restart." ++ return 1 + fi + + start $name diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index f4df76fec9..d4ef9cc3fd 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -38,6 +38,7 @@ (define-module (gnu packages virtualization) #:use-module (gnu packages attr) #:use-module (gnu packages autotools) #:use-module (gnu packages backup) + #:use-module (gnu packages base) #:use-module (gnu packages bison) #:use-module (gnu packages check) #:use-module (gnu packages cmake) @@ -60,11 +61,19 @@ (define-module (gnu packages virtualization) #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) #:use-module (gnu packages golang) + #:use-module (gnu packages graphviz) #:use-module (gnu packages gtk) + #:use-module (gnu packages haskell) + #:use-module (gnu packages haskell-apps) + #:use-module (gnu packages haskell-check) + #:use-module (gnu packages haskell-crypto) + #:use-module (gnu packages haskell-web) + #:use-module (gnu packages haskell-xyz) #:use-module (gnu packages image) #:use-module (gnu packages libbsd) #:use-module (gnu packages libusb) #:use-module (gnu packages linux) + #:use-module (gnu packages m4) #:use-module (gnu packages ncurses) #:use-module (gnu packages nettle) #:use-module (gnu packages networking) @@ -75,6 +84,7 @@ (define-module (gnu packages virtualization) #:use-module (gnu packages polkit) #:use-module (gnu packages protobuf) #:use-module (gnu packages python) + #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages pulseaudio) @@ -82,6 +92,7 @@ (define-module (gnu packages virtualization) #:use-module (gnu packages sdl) #:use-module (gnu packages sphinx) #:use-module (gnu packages spice) + #:use-module (gnu packages ssh) #:use-module (gnu packages texinfo) #:use-module (gnu packages textutils) #:use-module (gnu packages tls) @@ -349,6 +360,390 @@ (define-public qemu-minimal "usbredir" "libdrm" "libepoxy" "pulseaudio" "vde2" "libcacard"))))) +(define (system->qemu-target system) + (cond + ((string-prefix? "i686" system) + "qemu-system-i386") + ((string-prefix? "arm" system) + "qemu-system-arm") + (else + (string-append "qemu-system-" (match (string-split system #\-) + ((arch kernel) arch) + (_ system)))))) + +(define-public ganeti + (package + (name "ganeti") + ;; Note: we use a pre-release for Python 3 compatibility as well as many + ;; other fixes. + (version "3.0.0beta1-24-g024cc9fa2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ganeti/ganeti") + (commit (string-append "v" version)))) + (sha256 + (base32 "1ll34qd2mifni3bhg7cnir3xfnkafig8ch33qndqwrsby0y5ssia")) + (file-name (git-file-name name version)) + (patches (search-patches "ganeti-shepherd-support.patch" + "ganeti-shepherd-master-failover.patch" + "ganeti-deterministic-manual.patch" + "ganeti-drbd-compat.patch" + "ganeti-os-disk-size.patch" + "ganeti-haskell-pythondir.patch" + "ganeti-disable-version-symlinks.patch" + "ganeti-preserve-PYTHONPATH.patch")))) + (build-system gnu-build-system) + (arguments + `(#:imported-modules (,@%gnu-build-system-modules + (guix build haskell-build-system) + (guix build python-build-system)) + #:modules (,@%gnu-build-system-modules + ((guix build haskell-build-system) #:prefix haskell:) + ((guix build python-build-system) #:select (python-version)) + (ice-9 rdelim)) + + ;; The default test target includes a lot of checks that are only really + ;; relevant for developers such as NEWS file checking, line lengths, etc. + ;; We are only interested in the "py-tests" and "hs-tests" targets: this + ;; is the closest we've got even though it includes a little more. + #:test-target "check-TESTS" + + #:configure-flags + (list "--localstatedir=/var" + "--sharedstatedir=/var" + "--sysconfdir=/etc" + "--enable-haskell-tests" + + ;; By default, the build system installs everything to versioned + ;; directories such as $libdir/3.0 and relies on a $libdir/default + ;; symlink pointed from /etc/ganeti/{lib,share} to actually function. + ;; This is done to accommodate installing multiple versions in + ;; parallel, but is of little use to us as Guix users can just + ;; roll back and forth. Thus, disable it for simplicity. + "--disable-version-links" + + ;; Ganeti can optionally take control over SSH host keys and + ;; distribute them to nodes as they are added, and also rotate keys + ;; with 'gnt-cluster renew-crypto --new-ssh-keys'. Thus it needs to + ;; know how to restart the SSH daemon. + "--with-sshd-restart-command='herd restart ssh-daemon'" + + ;; Look for OS definitions in this directory by default. It can + ;; be changed in the cluster configuration. + "--with-os-search-path=/run/current-system/profile/share/ganeti/os" + + ;; The default QEMU executable to use. We don't use the package + ;; here because this entry is stored in the cluster configuration. + (string-append "--with-kvm-path=/run/current-system/profile/bin/" + ,(system->qemu-target (%current-system)))) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'create-vcs-version + (lambda _ + ;; If we are building from a git checkout, we need to create a + ;; 'vcs-version' file manually because the build system does + ;; not have access to the git repository information. + (unless (file-exists? "vcs-version") + (call-with-output-file "vcs-version" + (lambda (port) + (format port "v~a~%" ,version)))) + #t)) + (add-after 'unpack 'patch-absolute-file-names + (lambda _ + (substitute* '("lib/utils/process.py" + "lib/utils/text.py" + "src/Ganeti/Constants.hs" + "src/Ganeti/HTools/CLI.hs" + "test/py/ganeti.config_unittest.py" + "test/py/ganeti.hooks_unittest.py" + "test/py/ganeti.utils.process_unittest.py" + "test/py/ganeti.utils.text_unittest.py" + "test/py/ganeti.utils.wrapper_unittest.py") + (("/bin/sh") (which "sh")) + (("/bin/bash") (which "bash")) + (("/usr/bin/env") (which "env")) + (("/bin/true") (which "true"))) + + ;; This script is called by the node daemon at startup to perform + ;; sanity checks on the cluster IP addresses, and it is also used + ;; in a master-failover scenario. Add absolute references to + ;; avoid propagating these executables. + (substitute* "tools/master-ip-setup" + (("arping") (which "arping")) + (("ndisc6") (which "ndisc6")) + (("fping") (which "fping")) + (("grep") (which "grep")) + (("ip addr") (string-append (which "ip") " addr"))) + #t)) + (add-after 'unpack 'override-builtin-PATH + (lambda _ + ;; Ganeti runs OS install scripts and similar with a built-in + ;; hard coded PATH. Patch so it works on Guix System. + (substitute* "src/Ganeti/Constants.hs" + (("/sbin:/bin:/usr/sbin:/usr/bin") + "/run/setuid-programs:/run/current-system/profile/sbin:\ +/run/current-system/profile/bin")) + #t)) + (add-after 'bootstrap 'patch-sphinx-version-detection + (lambda _ + ;; The build system runs 'sphinx-build --version' to verify that + ;; the Sphinx is recent enough, but does not expect the + ;; .sphinx-build-real executable name created by the Sphinx wrapper. + (substitute* "configure" + (("\\$SPHINX --version 2>&1") + "$SPHINX --version 2>&1 | sed 's/.sphinx-build-real/sphinx-build/g'")) + #t)) + + ;; The build system invokes Cabal and GHC, which do not work with + ;; GHC_PACKAGE_PATH: . + ;; Tweak the build system to do roughly what haskell-build-system does. + (add-before 'configure 'configure-haskell + (assoc-ref haskell:%standard-phases 'setup-compiler)) + (add-after 'configure 'do-not-use-GHC_PACKAGE_PATH + (lambda _ + (unsetenv "GHC_PACKAGE_PATH") + (substitute* "Makefile" + (("\\$\\(CABAL\\)") + "$(CABAL) --package-db=../package.conf.d") + (("\\$\\(GHC\\)") + "$(GHC) -package-db=../package.conf.d")) + #t)) + + (add-after 'configure 'fix-installation-directories + (lambda _ + (substitute* "Makefile" + ;; Do not attempt to create /var during install. + (("\\$\\(DESTDIR\\)\\$\\{localstatedir\\}") + "$(DESTDIR)${prefix}${localstatedir}") + ;; Similarly, do not attempt to install the sample ifup scripts + ;; to /etc/ganeti. + (("\\$\\(DESTDIR\\)\\$\\(ifupdir\\)") + "$(DESTDIR)${prefix}$(ifupdir)")) + #t)) + (add-before 'build 'adjust-tests + (lambda _ + ;; Disable tests that can not run. Do it early to prevent + ;; touching the Makefile later and triggering a needless rebuild. + (substitute* "Makefile" + ;; These tests expect the presence of a 'root' user (via + ;; ganeti/runtime.py), which fails in the build environment. + (("test/py/ganeti\\.asyncnotifier_unittest\\.py") "") + (("test/py/ganeti\\.backend_unittest\\.py") "") + (("test/py/ganeti\\.daemon_unittest\\.py") "") + (("test/py/ganeti\\.tools\\.ensure_dirs_unittest\\.py") "") + (("test/py/ganeti\\.utils\\.io_unittest-runasroot\\.py") "") + ;; Disable the bash_completion test, as it requires the full + ;; bash instead of bash-minimal. + (("test/py/bash_completion\\.bash") + "") + ;; This test requires networking. + (("test/py/import-export_unittest\\.bash") + "")) + + ;; Many of the Makefile targets reset PYTHONPATH before running + ;; the Python interpreter, which does not work very well for us. + (substitute* "Makefile" + (("PYTHONPATH=") + (string-append "PYTHONPATH=" (getenv "PYTHONPATH") ":"))) + #t)) + (add-after 'build 'build-bash-completions + (lambda _ + (let ((orig-pythonpath (getenv "PYTHONPATH"))) + (setenv "PYTHONPATH" (string-append ".:" orig-pythonpath)) + (invoke "./autotools/build-bash-completion") + (setenv "PYTHONPATH" orig-pythonpath) + #t))) + (add-before 'check 'pre-check + (lambda* (#:key inputs #:allow-other-keys) + ;; Set TZDIR so that time zones are found. + (setenv "TZDIR" (string-append (assoc-ref inputs "tzdata") + "/share/zoneinfo")) + + ;; This test checks whether PYTHONPATH is untouched, and extends + ;; it to include test directories if so. Add an else branch for + ;; our modified PYTHONPATH, in order to prevent a confusing test + ;; failure where expired certificates are not cleaned because + ;; check-cert-expired is silently crashing. + (substitute* "test/py/ganeti-cleaner_unittest.bash" + (("then export PYTHONPATH=(.*)" all testpath) + (string-append all "else export PYTHONPATH=" + (getenv "PYTHONPATH") ":" testpath "\n"))) + + (substitute* "test/py/ganeti.utils.process_unittest.py" + ;; This test attempts to run an executable with + ;; RunCmd(..., reset_env=True), which fails because the default + ;; PATH from Constants.hs does not exist in the build container. + ((".*def testResetEnv.*" all) + (string-append " @unittest.skipIf(True, " + "\"cannot reset env in the build container\")\n" + all)) + + ;; XXX: Somehow this test fails in the build container, but + ;; works in 'guix environment -C', even without /bin/sh? + ((".*def testPidFile.*" all) + (string-append " @unittest.skipIf(True, " + "\"testPidFile fails in the build container\")\n" + all))) + + ;; XXX: Why are these links not added automatically. + (with-directory-excursion "test/hs" + (for-each (lambda (file) + (symlink "../../src/htools" file)) + '("hspace" "hscan" "hinfo" "hbal" "hroller" + "hcheck" "hail" "hsqueeze"))) + #t)) + (add-after 'install 'install-bash-completions + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (compdir (string-append out "/etc/bash_completion.d"))) + (mkdir-p compdir) + (copy-file "doc/examples/bash_completion" + (string-append compdir "/ganeti")) + ;; The one file contains completions for many different + ;; executables. Create symlinks for found completions. + (with-directory-excursion compdir + (for-each + (lambda (prog) (symlink "ganeti" prog)) + (call-with-input-file "ganeti" + (lambda (port) + (let loop ((line (read-line port)) + (progs '())) + (if (eof-object? line) + progs + (if (string-prefix? "complete" line) + (loop (read-line port) + ;; Extract "prog" from lines of the form: + ;; "complete -F _prog -o filenames prog". + ;; Note that 'burnin' is listed with the + ;; absolute file name, which is why we + ;; run everything through 'basename'. + (cons (basename (car (reverse (string-split + line #\ )))) + progs)) + (loop (read-line port) progs)))))))) + #t))) + ;; Wrap all executables with PYTHONPATH. We can't borrow the phase + ;; from python-build-system because we also need to wrap the scripts + ;; in $out/lib/ganeti such as "node-daemon-setup". + (add-after 'install 'wrap + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (sbin (string-append out "/sbin")) + (lib (string-append out "/lib")) + (python (assoc-ref inputs "python")) + (major+minor (python-version python)) + (PYTHONPATH (string-append lib "/python" major+minor + "/site-packages:" + (getenv "PYTHONPATH")))) + (define (shell-script? file) + (call-with-ascii-input-file file + (lambda (port) + (let ((shebang (false-if-exception (read-line port)))) + (and shebang + (string-prefix? "#!" shebang) + (or (string-contains shebang "/bin/bash") + (string-contains shebang "/bin/sh"))))))) + + (define (wrap? file) + ;; Do not wrap shell scripts because some are meant to be + ;; sourced, which breaks if they are wrapped. We do wrap + ;; the Haskell executables because some call out to Python + ;; directly. + (and (executable-file? file) + (not (symbolic-link? file)) + (not (shell-script? file)))) + + (for-each (lambda (file) + (wrap-program file + `("PYTHONPATH" ":" prefix (,PYTHONPATH)))) + (filter wrap? + (append (find-files (string-append lib "/ganeti")) + (find-files sbin)))) + #t)))))) + (native-inputs + `(("haskell" ,ghc) + ("cabal" ,cabal-install) + ("m4" ,m4) + + ;; These inputs are necessary to bootstrap the package, because we + ;; have patched the build system. + ("autoconf" ,autoconf) + ("automake" ,automake) + + ;; For the documentation. + ("python-docutils" ,python-docutils) + ("sphinx" ,python-sphinx) + ("pandoc" ,ghc-pandoc) + ("dot" ,graphviz) + + ;; Test dependencies. + ("fakeroot" ,fakeroot) + ("ghc-temporary" ,ghc-temporary) + ("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) + ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2) + ("python-mock" ,python-mock) + ("python-pyyaml" ,python-pyyaml) + ("openssh" ,openssh) + ("procps" ,procps) + ("shelltestrunner" ,shelltestrunner) + ("tzdata" ,tzdata-for-tests))) + (inputs + `(("arping" ,iputils) ;must be the iputils version + ("curl" ,curl) + ("fping" ,fping) + ("iproute2" ,iproute) + ("ndisc6" ,ndisc6) + ("socat" ,socat) + ("qemu" ,qemu-minimal) ;for qemu-img + ("ghc-attoparsec" ,ghc-attoparsec) + ("ghc-base64-bytestring" ,ghc-base64-bytestring) + ("ghc-cryptonite" ,ghc-cryptonite) + ("ghc-curl" ,ghc-curl) + ("ghc-hinotify" ,ghc-hinotify) + ("ghc-hslogger" ,ghc-hslogger) + ("ghc-json" ,ghc-json) + ("ghc-lens" ,ghc-lens) + ("ghc-lifted-base" ,ghc-lifted-base) + ("ghc-network" ,ghc-network) + ("ghc-old-time" ,ghc-old-time) + ("ghc-psqueue" ,ghc-psqueue) + ("ghc-regex-pcre" ,ghc-regex-pcre) + ("ghc-utf8-string" ,ghc-utf8-string) + ("ghc-zlib" ,ghc-zlib) + + ;; For the optional metadata daemon. + ("ghc-snap-core" ,ghc-snap-core) + ("ghc-snap-server" ,ghc-snap-server) + + ("python" ,python) + ("python-pyopenssl" ,python-pyopenssl) + ("python-simplejson" ,python-simplejson) + ("python-pyparsing" ,python-pyparsing) + ("python-pyinotify" ,python-pyinotify) + ("python-pycurl" ,python-pycurl) + ("python-bitarray" ,python-bitarray) + ("python-paramiko" ,python-paramiko) + ("python-psutil" ,python-psutil))) + (home-page "http://www.ganeti.org/") + (synopsis "Cluster-based virtual machine management system") + (description + "Ganeti is a virtual machine management tool built on top of existing +virtualization technologies such as Xen or KVM. Ganeti controls: + +@itemize @bullet +@item Disk creation management; +@item Operating system installation for instances (in co-operation with +OS-specific install scripts); and +@item Startup, shutdown, and failover between physical systems. +@end itemize + +Ganeti is designed to facilitate cluster management of virtual servers and +to provide fast and simple recovery after physical failures, using +commodity hardware.") + (license license:bsd-2))) + (define-public libosinfo (package (name "libosinfo") -- cgit v1.2.3 From ecd5db37ff34be163c6dbc86b1cf4b45eacf850e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 17 Jun 2020 20:17:40 +0200 Subject: gnu: Add ganeti-instance-guix. * gnu/packages/virtualization.scm (ganeti-instance-guix): New public variable. --- gnu/packages/virtualization.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index d4ef9cc3fd..5b01f3ddb1 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -744,6 +744,33 @@ (define (wrap? file) commodity hardware.") (license license:bsd-2))) +(define-public ganeti-instance-guix + (package + (name "ganeti-instance-guix") + (version "0.6") + (home-page "https://github.com/mbakke/ganeti-instance-guix") + (source (origin + (method git-fetch) + (uri (git-reference (url home-page) (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0aa08irpcpns6mhjgsplc5f0p8ab1qcr9ah1gj5z66kxgqyflzrp")))) + (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--sysconfdir=/etc" "--localstatedir=/var"))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake))) + (inputs + `(("util-linux" ,util-linux) + ("qemu-img" ,qemu-minimal))) + (synopsis "Guix OS integration for Ganeti") + (description + "This package provides a guest OS definition for Ganeti that uses +Guix to build virtual machines.") + (license license:gpl3+))) + (define-public libosinfo (package (name "libosinfo") -- cgit v1.2.3 From 7b572c5f19d735be5373f245dc1705d22cfa3eb9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 17 Jun 2020 20:23:06 +0200 Subject: gnu: Add ganeti-instance-debootstrap. * gnu/packages/virtualization.scm (ganeti-instance-debootstrap): New public variable. --- gnu/packages/virtualization.scm | 95 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 5b01f3ddb1..8b120992f9 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -46,6 +46,7 @@ (define-module (gnu packages virtualization) #:use-module (gnu packages cross-base) #:use-module (gnu packages curl) #:use-module (gnu packages cyrus-sasl) + #:use-module (gnu packages debian) #:use-module (gnu packages disk) #:use-module (gnu packages dns) #:use-module (gnu packages docbook) @@ -771,6 +772,100 @@ (define-public ganeti-instance-guix Guix to build virtual machines.") (license license:gpl3+))) +(define-public ganeti-instance-debootstrap + (package + (name "ganeti-instance-debootstrap") + ;; We need two commits on top of the latest release for compatibility + ;; with newer sfdisk, as well as gnt-network integration. + (version "0.16-2-ge145396") + (home-page "https://github.com/ganeti/instance-debootstrap") + (source (origin + (method git-fetch) + (uri (git-reference (url home-page) (commit version))) + (sha256 + (base32 + "0f2isw9d8lawzj21rrq1q9xhq8xfa65rqbhqmrn59z201x9q1336")))) + (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--sysconfdir=/etc" "--localstatedir=/var") + #:phases (modify-phases %standard-phases + (add-after 'unpack 'add-absolute-references + (lambda _ + (substitute* "common.sh.in" + (("/sbin/blkid") (which "blkid")) + (("kpartx -") + (string-append (which "kpartx") " -"))) + (substitute* "import" + (("restore -r") + (string-append (which "restore") " -r"))) + (substitute* "export" + (("dump -0") + (string-append (which "dump") " -0"))) + (substitute* "create" + (("debootstrap") (which "debootstrap")) + (("`which run-parts`") (which "run-parts")) + ;; Here we actually need to hard code /bin/passwd + ;; because it's called via chroot, which fails if + ;; "/bin" is not in PATH. + (("passwd") "/bin/passwd")) + #t)) + (add-after 'unpack 'set-dpkg-arch + (lambda* (#:key system #:allow-other-keys) + ;; The create script passes --arch to debootstrap, + ;; and defaults to `dpkg --print-architecture` when + ;; ARCH is not set in variant.conf. Hard code the + ;; build-time architecture to avoid the dpkg dependency. + (let ((dpkg-arch + (cond ((string-prefix? "x86_64" system) + "amd64") + ((string-prefix? "i686" system) + "i386") + ((string-prefix? "aarch64" system) + "arm64") + (else (car (string-split system #\-)))))) + (substitute* "create" + (("`dpkg --print-architecture`") + dpkg-arch)) + #t))) + (add-after 'configure 'adjust-Makefile + (lambda _ + ;; Do not attempt to create /etc/ganeti/instance-debootstrap + ;; and /etc/default/ganeti-instance-debootstrap during install. + ;; They are created by the Ganeti service. + (substitute* "Makefile" + (("\\$\\(variantsdir\\)") + "$(prefix)/etc/ganeti/instance-debootstrap/variants") + (("\\$\\(defaultsdir\\)") + "$(prefix)/etc/default/ganeti-instance-debootstrap")) + #t)) + (add-after 'install 'make-variants.list-symlink + (lambda* (#:key outputs #:allow-other-keys) + ;; The Ganeti OS API mandates a variants.list file that + ;; describes all supported "variants" of this OS. + ;; Guix generates this file, so make the original file + ;; a symlink to it. + (with-directory-excursion (string-append + (assoc-ref outputs "out") + "/share/ganeti/os/debootstrap") + (delete-file "variants.list") + (symlink "/etc/ganeti/instance-debootstrap/variants/variants.list" + "variants.list")) + #t))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake))) + (inputs + `(("debianutils" ,debianutils) + ("debootstrap" ,debootstrap) + ("dump" ,dump) + ("kpartx" ,multipath-tools) + ("util-linux" ,util-linux))) + (synopsis "Debian OS integration for Ganeti") + (description + "This package provides a guest OS definition for Ganeti. It installs +Debian or a derivative using @command{debootstrap}.") + (license license:gpl2+))) + (define-public libosinfo (package (name "libosinfo") -- cgit v1.2.3 From 9a622827559b223cc6b48733a82c74ce14a29bab Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 4 Jul 2020 00:30:19 +0200 Subject: services: Add ganeti. * gnu/services/ganeti.scm, gnu/tests/ganeti.scm: New files. * doc/guix.texi (Virtualization Services): Document the Ganeti services. --- doc/guix.texi | 646 +++++++++++++++++++++++++++ gnu/local.mk | 2 + gnu/services/ganeti.scm | 1109 +++++++++++++++++++++++++++++++++++++++++++++++ gnu/tests/ganeti.scm | 265 +++++++++++ 4 files changed, 2022 insertions(+) create mode 100644 gnu/services/ganeti.scm create mode 100644 gnu/tests/ganeti.scm diff --git a/doc/guix.texi b/doc/guix.texi index 17338ed764..a6ee679b11 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -24975,6 +24975,652 @@ the @code{--snapshot} flag using something along these lines: (options '("--hda")))) @end lisp +@subsubheading Ganeti + +@cindex ganeti + +@quotation Note +This service is considered experimental. Configuration options may be changed +in a backwards-incompatible manner, and not all features have been thorougly +tested. Users of this service are encouraged to share their experience at +@email{guix-devel@@gnu.org}. +@end quotation + +Ganeti is a virtual machine management system. It is designed to keep virtual +machines running on a cluster of servers even in the event of hardware failures, +and to make maintenance and recovery tasks easy. It consists of multiple +services which are described later in this section. In addition to the Ganeti +service, you will need the OpenSSH service (@pxref{Networking Services, +@code{openssh-service-type}}), and update the @file{/etc/hosts} file +(@pxref{operating-system Reference, @code{hosts-file}}) with the cluster name +and address (or use a DNS server). + +All nodes participating in a Ganeti cluster should have the same Ganeti and +@file{/etc/hosts} configuration. Here is an example configuration for a Ganeti +cluster node that supports multiple storage backends, and installs the +@code{debootstrap} and @code{guix} @dfn{OS providers}: + +@lisp +(use-package-modules virtualization) +(use-service-modules base ganeti networking ssh) +(operating-system + ;; @dots{} + (host-name "node1") + (hosts-file (plain-file "hosts" (format #f " +127.0.0.1 localhost +::1 localhost + +192.168.1.200 ganeti.example.com +192.168.1.201 node1.example.com node1 +192.168.1.202 node2.example.com node2 +"))) + + ;; Install QEMU so we can use KVM-based instances, and LVM, DRBD and Ceph + ;; in order to use the "plain", "drbd" and "rbd" storage backends. + (packages (append (map specification->package + '("qemu" "lvm2" "drbd-utils" "ceph" + ;; Add the debootstrap and guix OS providers. + "ganeti-instance-guix" "ganeti-instance-debootstrap")) + %base-packages)) + (services + (append (list (static-networking-service "eth0" "192.168.1.201" + #:netmask "255.255.255.0" + #:gateway "192.168.1.254" + #:name-servers '("192.168.1.252" + "192.168.1.253")) + + ;; Ganeti uses SSH to communicate between nodes. + (service openssh-service-type + (openssh-configuration + (permit-root-login 'without-password))) + + (service ganeti-service-type + (ganeti-configuration + ;; This list specifies allowed file system paths + ;; for storing virtual machine images. + (file-storage-paths '("/srv/ganeti/file-storage")) + ;; This variable configures a single "variant" for + ;; both Debootstrap and Guix that works with KVM. + (os %default-ganeti-os)))) + %base-services))) +@end lisp + +Users are advised to read the +@url{http://docs.ganeti.org/ganeti/master/html/admin.html,Ganeti +administrators guide} to learn about the various cluster options and +day-to-day operations. There is also a +@url{https://guix.gnu.org/blog/2020/ganeti-on-guix/,blog post} +describing how to configure a small cluster. + +@defvr {Scheme Variable} ganeti-service-type +This is a service type that includes all the various services that Ganeti +nodes should run. + +Its value is a @code{ganeti-configuration} object that defines the package +to use for CLI operations, as well as configuration for the various daemons. +@end defvr + +@deftp {Data Type} ganeti-configuration +The @code{ganeti} service takes the following configuration options: + +@table @asis +@item @code{ganeti} (default: @code{ganeti}) +The @code{ganeti} package to use. It will be installed to the system profile +and make @command{gnt-cluster}, @command{gnt-instance}, etc available. Note +that the value specified here does not affect the other services as each refer +to a specific @code{ganeti} package (see below). + +@item @code{noded-configuration} (default: @code{(ganeti-noded-configuration)}) +@itemx @code{confd-configuration} (default: @code{(ganeti-confd-configuration)}) +@itemx @code{wconfd-configuration} (default: @code{(ganeti-wconfd-configuration)}) +@itemx @code{luxid-configuration} (default: @code{(ganeti-luxid-configuration)}) +@itemx @code{rapi-configuration} (default: @code{(ganeti-rapi-configuration)}) +@itemx @code{kvmd-configuration} (default: @code{(ganeti-kvmd-configuration)}) +@itemx @code{mond-configuration} (default: @code{(ganeti-mond-configuration)}) +@itemx @code{metad-configuration} (default: @code{(ganeti-metad-configuration)}) +@itemx @code{watcher-configuration} (default: @code{(ganeti-watcher-configuration)}) +@itemx @code{cleaner-configuration} (default: @code{(ganeti-cleaner-configuration)}) + +These options control the various daemons and cron jobs that are distributed +with Ganeti. The possible values for these are described in detail below. +To override a setting, you must use the configuration type for that service: + +@lisp +(service ganeti-service-type + (ganeti-configuration + (rapi-configuration + (ganeti-rapi-configuration + (interface "eth1")))) + (watcher-configuration + (ganeti-watcher-configuration + (rapi-ip "10.0.0.1")))) +@end lisp + +@item @code{file-storage-paths} (default: @code{'()}) +List of allowed directories for file storage backend. + +@item @code{os} (default: @code{%default-ganeti-os}) +List of @code{} records. +@end table + +In essence @code{ganeti-service-type} is shorthand for declaring each service +individually: + +@lisp +(service ganeti-noded-service-type) +(service ganeti-confd-service-type) +(service ganeti-wconfd-service-type) +(service ganeti-luxid-service-type) +(service ganeti-kvmd-service-type) +(service ganeti-mond-service-type) +(service ganeti-metad-service-type) +(service ganeti-watcher-service-type) +(service ganeti-cleaner-service-type) +@end lisp + +Plus a service extension for @code{etc-service-type} that configures the file +storage backend and OS variants. + +@end deftp + +@deftp {Data Type} ganeti-os +This data type is suitable for passing to the @code{os} configuration of +Ganeti. It takes the following parameters: + +@table @asis +@item @code{name} +The name for this OS provider. It is only used to specify where the +configuration ends up. Setting it to ``debootstrap'' will create +@file{/etc/ganeti/instance-debootstrap}. + +@item @code{extension} +The file extension for variants of this OS type. For example +@file{.conf} or @file{.scm}. + +@item @code{variants} (default: @code{'()}) +List of @code{ganeti-os-variant} objects for this OS. + +@end table +@end deftp + +@deftp {Data Type} ganeti-os-variant +This is the data type for a Ganeti OS variant. It takes the following +parameters: + +@table @asis +@item @code{name} +The name of this variant. + +@item @code{configuration} +A configuration file for this variant. +@end table +@end deftp + +@defvr {Scheme Variable} %default-debootstrap-hooks +This variable contains hooks to configure networking and the GRUB bootloader. +@end defvr + +@defvr {Scheme Variable} %default-debootstrap-extra-pkgs +This variable contains a list of packages suitable for a fully-virtualized guest. +@end defvr + +@deftp {Data Type} debootstrap-configuration + +This data type creates configuration files suitable for the debootstrap OS provider. + +@table @asis +@item @code{hooks} (default: @code{%default-debootstrap-hooks}) +When not @code{#f}, this must be a G-expression that specifies a directory with +scripts that will run when the OS is installed. It can also be a list of +@code{(name . file-like)} pairs. For example: + +@lisp + +`((99-hello-world . ,(plain-file "#!/bin/sh\necho Hello, World"))) + +@end lisp + +That will create a directory with one executable named @code{99-hello-world} +and run it every time this variant is installed. If set to @code{#f}, hooks +in @file{/etc/ganeti/instance-debootstrap/hooks} will be used, if any. +@item @code{proxy} (default: @code{#f}) +HTTP proxy to use, if any. +@item @code{mirror} (default: @code{#f}) +The Debian mirror. Typically something like @code{http://ftp.no.debian.org/debian}. +The default varies depending on the distribution. +@item @code{arch} (default: @code{#f}) +The dpkg architecture. Set to @code{armhf} to debootstrap an ARMv7 instance +on an AArch64 host. Default is to use the current system architecture. +@item @code{suite} (default: @code{"stable"}) +When set, this must be a Debian distribution ``suite'' such as @code{buster} +or @code{focal}. If set to @code{#f}, the default for the OS provider is used. +@item @code{extra-pkgs} (default: @code{%default-debootstrap-extra-pkgs}) +List of extra packages that will get installed by dpkg in addition +to the minimal system. +@item @code{components} (default: @code{#f}) +When set, must be a list of Debian repository ``components''. For example +@code{'("main" "contrib")}. +@item @code{generate-cache?} (default: @code{#t}) +Whether to automatically cache the generated debootstrap archive. +@item @code{clean-cache} (default: @code{14}) +Discard the cache after this amount of days. Use @code{#f} to never +clear the cache. +@item @code{partition-style} (default: @code{'msdos}) +The type of partition to create. When set, it must be one of +@code{'msdos}, @code{'none} or a string. +@item @code{partition-alignment} (default: @code{2048}) +Alignment of the partition in sectors. +@end table +@end deftp + +@deffn {Scheme Procedure} debootstrap-variant +This is a helper procedure that creates a @code{ganeti-os-variant} record. It +takes two parameters: a name and a @code{debootstrap-configuration} object. +@end deffn + +@deffn {Scheme Procedure} debootstrap-os +This is a helper procedure that creates a @code{ganeti-os} record. It takes +a list of variants created with @code{debootstrap-variant}. +@end deffn + +@deffn {Scheme Procedure} guix-variant +This is a helper procedure that creates a @code{ganeti-os-variant} record for +use with the Guix OS provider. It takes a name and a G-expression that returns +a ``file-like'' (@pxref{G-Expressions, file-like objects}) object containing a +Guix System configuration. +@end deffn + +@deffn {Scheme Procedure} guix-os +This is a helper procedure that creates a @code{ganeti-os} record. It +takes a list of variants produced by @code{guix-variant}. +@end deffn + +@defvr {Scheme Variable} %default-debootstrap-variants +This is a convenience variable to make the debootstrap provider work +``out of the box'' without users having to declare variants manually. It +contains a single debootstrap variant with the default configuration: + +@lisp +(list (debootstrap-variant + "default" + (debootstrap-configuration)))) +@end lisp +@end defvr + +@defvr {Scheme Variable} %default-guix-variants +This is a convenience variable to make the Guix OS provider work without +additional configuration. It creates a virtual machine that has an SSH +server, a serial console, and authorizes the Ganeti hosts SSH keys. + +@lisp +(list (guix-variant + "default" + (file-append ganeti-instance-guix + "/share/doc/ganeti-instance-guix/examples/dynamic.scm")))) +@end lisp +@end defvr + +Users can implement support for OS providers unbeknownst to Guix by extending +the @code{ganeti-os} and @code{ganeti-os-variant} records appropriately. +For example: + +@lisp +(ganeti-os + (name "custom") + (extension ".conf") + (variants + (list (ganeti-os-variant + (name "foo") + (configuration (plain-file "bar" "this is fine")))))) +@end lisp + +That creates @file{/etc/ganeti/instance-custom/variants/foo.conf} which points +to a file in the store with contents @code{this is fine}. It also creates +@file{/etc/ganeti/instance-custom/variants/variants.list} with contents @code{foo}. + +Obviously this may not work for all OS providers out there. If you find the +interface limiting, please reach out to @email{guix-devel@@gnu.org}. + +The rest of this section documents the various services that are included by +@code{ganeti-service-type}. + +@defvr {Scheme Variable} ganeti-noded-service-type +@command{ganeti-noded} is the daemon responsible for node-specific functions +within the Ganeti system. The value of this service must be a +@code{ganeti-noded-configuration} object. +@end defvr + +@deftp {Data Type} ganeti-noded-configuration +This is the configuration for the @code{ganeti-noded} service. + +@table @asis +@item @code{ganeti} (default: @code{ganeti}) +The @code{ganeti} package to use for this service. + +@item @code{port} (default: @code{1811}) +The TCP port on which the node daemon listens for network requests. + +@item @code{address} (default: @code{"0.0.0.0"}) +The network address that the daemon will bind to. The default address means +bind to all available addresses. + +@item @code{interface} (default: @code{#f}) +When this is set, it must be a specific network interface (e.g.@: @code{eth0}) +that the daemon will bind to. + +@item @code{max-clients} (default: @code{20}) +This sets a limit on the maximum number of simultaneous client connections +that the daemon will handle. Connections above this count are accepted, but +no responses will be sent until enough connections have closed. + +@item @code{ssl?} (default: @code{#t}) +Whether to use SSL/TLS to encrypt network communications. The certificate +is automatically provisioned by the cluster and can be rotated with +@command{gnt-cluster renew-crypto}. + +@item @code{ssl-key} (default: @file{"/var/lib/ganeti/server.pem"}) +This can be used to provide a specific encryption key for TLS communications. + +@item @code{ssl-cert} (default: @file{"/var/lib/ganeti/server.pem"}) +This can be used to provide a specific certificate for TLS communications. + +@item @code{debug?} (default: @code{#f}) +When true, the daemon performs additional logging for debugging purposes. +Note that this will leak encryption details to the log files, use with caution. + +@end table +@end deftp + +@defvr {Scheme Variable} ganeti-confd-service-type +@command{ganeti-confd} answers queries related to the configuration of a +Ganeti cluster. The purpose of this daemon is to have a highly available +and fast way to query cluster configuration values. It is automatically +active on all @dfn{master candidates}. The value of this service must be a +@code{ganeti-confd-configuration} object. + +@end defvr + +@deftp {Data Type} ganeti-confd-configuration +This is the configuration for the @code{ganeti-confd} service. + +@table @asis +@item @code{ganeti} (default: @code{ganeti}) +The @code{ganeti} package to use for this service. + +@item @code{port} (default: @code{1814}) +The UDP port on which to listen for network requests. + +@item @code{address} (default: @code{"0.0.0.0"}) +Network address that the daemon will bind to. + +@item @code{debug?} (default: @code{#f}) +When true, the daemon performs additional logging for debugging purposes. + +@end table +@end deftp + +@defvr {Scheme Variable} ganeti-wconfd-service-type +@command{ganeti-wconfd} is the daemon that has authoritative knowledge +about the cluster configuration and is the only entity that can accept +changes to it. All jobs that need to modify the configuration will do so +by sending appropriate requests to this daemon. It only runs on the +@dfn{master node} and will automatically disable itself on other nodes. + +The value of this service must be a +@code{ganeti-wconfd-configuration} object. +@end defvr + +@deftp {Data Type} ganeti-wconfd-configuration +This is the configuration for the @code{ganeti-wconfd} service. + +@table @asis +@item @code{ganeti} (default: @code{ganeti}) +The @code{ganeti} package to use for this service. + +@item @code{no-voting?} (default: @code{#f}) +The daemon will refuse to start if the majority of cluster nodes does not +agree that it is running on the master node. Set to @code{#t} to start +even if a quorum can not be reached (dangerous, use with caution). + +@item @code{debug?} (default: @code{#f}) +When true, the daemon performs additional logging for debugging purposes. + +@end table +@end deftp + +@defvr {Scheme Variable} ganeti-luxid-service-type +@command{ganeti-luxid} is a daemon used to answer queries related to the +configuration and the current live state of a Ganeti cluster. Additionally, +it is the authorative daemon for the Ganeti job queue. Jobs can be +submitted via this daemon and it schedules and starts them. + +It takes a @code{ganeti-luxid-configuration} object. +@end defvr + +@deftp {Data Type} ganeti-luxid-configuration +This is the configuration for the @code{ganeti-wconfd} service. + +@table @asis +@item @code{ganeti} (default: @code{ganeti}) +The @code{ganeti} package to use for this service. + +@item @code{no-voting?} (default: @code{#f}) +The daemon will refuse to start if it cannot verify that the majority of +cluster nodes believes that it is running on the master node. Set to +@code{#t} to ignore such checks and start anyway (this can be dangerous). + +@item @code{debug?} (default: @code{#f}) +When true, the daemon performs additional logging for debugging purposes. + +@end table +@end deftp + +@defvr {Scheme Variable} ganeti-rapi-service-type +@command{ganeti-rapi} provides a remote API for Ganeti clusters. It runs on +the master node and can be used to perform cluster actions programmatically +via a JSON-based RPC protocol. + +Most query operations are allowed without authentication (unless +@var{require-authentication?} is set), whereas write operations require +explicit authorization via the @file{/var/lib/ganeti/rapi/users} file. See +the @url{http://docs.ganeti.org/ganeti/master/html/rapi.html, Ganeti Remote +API documentation} for more information. + +The value of this service must be a @code{ganeti-rapi-configuration} object. +@end defvr + +@deftp {Data Type} ganeti-rapi-configuration +This is the configuration for the @code{ganeti-rapi} service. + +@table @asis +@item @code{ganeti} (default: @code{ganeti}) +The @code{ganeti} package to use for this service. + +@item @code{require-authentication?} (default: @code{#f}) +Whether to require authentication even for read-only operations. + +@item @code{port} (default: @code{5080}) +The TCP port on which to listen to API requests. + +@item @code{address} (default: @code{"0.0.0.0"}) +The network address that the service will bind to. By default it listens +on all configured addresses. + +@item @code{interface} (default: @code{#f}) +When set, it must specify a specific network interface such as @code{eth0} +that the daemon will bind to. + +@item @code{max-clients} (default: @code{20}) +The maximum number of simultaneous client requests to handle. Further +connections are allowed, but no responses are sent until enough connections +have closed. + +@item @code{ssl?} (default: @code{#f}) +Whether to use SSL/TLS encryption on the RAPI port. + +@item @code{ssl-key} (default: @file{"/var/lib/ganeti/server.pem"}) +This can be used to provide a specific encryption key for TLS communications. + +@item @code{ssl-cert} (default: @file{"/var/lib/ganeti/server.pem"}) +This can be used to provide a specific certificate for TLS communications. + +@item @code{debug?} (default: @code{#f}) +When true, the daemon performs additional logging for debugging purposes. +Note that this will leak encryption details to the log files, use with caution. + +@end table +@end deftp + +@defvr {Scheme Variable} ganeti-kvmd-service-type +@command{ganeti-kvmd} is responsible for determining whether a given KVM +instance was shut down by an administrator or a user. Normally Ganeti will +restart an instance that was not stopped through Ganeti itself. If the +cluster option @code{user_shutdown} is true, this daemon monitors the +@code{QMP} socket provided by QEMU and listens for shutdown events, and +marks the instance as @dfn{USER_down} instead of @dfn{ERROR_down} when +it shuts down gracefully by itself. + +It takes a @code{ganeti-kvmd-configuration} object. +@end defvr + +@deftp {Data Type} ganeti-kvmd-configuration + +@table @asis +@item @code{ganeti} (default: @code{ganeti}) +The @code{ganeti} package to use for this service. + +@item @code{debug?} (default: @code{#f}) +When true, the daemon performs additional logging for debugging purposes. + +@end table +@end deftp + +@defvr {Scheme Variable} ganeti-mond-service-type +@command{ganeti-mond} is an optional daemon that provides Ganeti monitoring +functionality. It is responsible for running data collectors and publish the +collected information through a HTTP interface. + +It takes a @code{ganeti-mond-configuration} object. +@end defvr + +@deftp {Data Type} ganeti-mond-configuration + +@table @asis +@item @code{ganeti} (default: @code{ganeti}) +The @code{ganeti} package to use for this service. + +@item @code{port} (default: @code{1815}) +The port on which the daemon will listen. + +@item @code{address} (default: @code{"0.0.0.0"}) +The network address that the daemon will bind to. By default it binds to all +available interfaces. + +@item @code{debug?} (default: @code{#f}) +When true, the daemon performs additional logging for debugging purposes. + +@end table +@end deftp + +@defvr {Scheme Variable} ganeti-metad-service-type +@command{ganeti-metad} is an optional daemon that can be used to provide +information about the cluster to instances or OS install scripts. It is +not included in @code{ganeti-service-type} because using it requires +additional configuration and support in OS providers. + +It takes a @code{ganeti-metad-configuration} object. +@end defvr + +@deftp {Data Type} ganeti-metad-configuration + +@table @asis +@item @code{ganeti} (default: @code{ganeti}) +The @code{ganeti} package to use for this service. + +@item @code{port} (default: @code{80}) +The port on which the daemon will listen. + +@item @code{address} (default: @code{#f}) +If set, the daemon will bind to this address only. If left unset, the behavior +depends on the cluster configuration. + +@item @code{debug?} (default: @code{#f}) +When true, the daemon performs additional logging for debugging purposes. + +@end table +@end deftp + +@defvr {Scheme Variable} ganeti-watcher-service-type +@command{ganeti-watcher} is a script designed to run periodically and ensure +the health of a cluster. It will automatically restart instances that have +stopped without Ganetis consent, and repairs DRBD links in case a node has +rebooted. It also archives old cluster jobs and restarts Ganeti daemons +that are not running. If the cluster parameter @code{ensure_node_health} +is set, the watcher will also shutdown instances and DRBD devices if the +node it is running on is declared offline by known master candidates. + +It can be paused on all nodes with @command{gnt-cluster watcher pause}. + +The service takes a @code{ganeti-watcher-configuration} object. +@end defvr + +@deftp {Data Type} ganeti-watcher-configuration + +@table @asis +@item @code{ganeti} (default: @code{ganeti}) +The @code{ganeti} package to use for this service. + +@item @code{schedule} (default: @code{'(next-second-from (next-minute (range 0 60 5)))}) +How often to run the script. The default is every five minutes. + +@item @code{rapi-ip} (default: @code{#f}) +This option needs to be specified only if the RAPI daemon is configured to use +a particular interface or address. By default the cluster address is used. + +@item @code{job-age} (default: @code{(* 6 3600)}) +Archive cluster jobs older than this age, specified in seconds. The default +is 6 hours. This keeps @command{gnt-job list} manageable. + +@item @code{verify-disks?} (default: @code{#t}) +If this is @code{#f}, the watcher will not try to repair broken DRBD links +automatically. Administrators will need to use @command{gnt-cluster verify-disks} +manually instead. + +@item @code{debug?} (default: @code{#f}) +When @code{#t}, the script performs additional logging for debugging purposes. + +@end table +@end deftp + +@defvr {Scheme Variable} ganeti-cleaner-service-type +@command{ganeti-cleaner} is a script designed to run periodically and remove +old files from the cluster. This service type controls two @dfn{cron jobs}: +one intended for the master node that permanently purges old cluster jobs, +and one intended for every node that removes expired X509 certificates, keys, +and outdated @command{ganeti-watcher} information. Like all Ganeti services, +it is safe to include even on non-master nodes as it will disable itself as +necessary. + +It takes a @code{ganeti-cleaner-configuration} object. +@end defvr + +@deftp {Data Type} ganeti-cleaner-configuration + +@table @asis +@item @code{ganeti} (default: @code{ganeti}) +The @code{ganeti} package to use for the @command{gnt-cleaner} command. + +@item @code{master-schedule} (default: @code{"45 1 * * *"}) +How often to run the master cleaning job. The default is once per day, at +01:45:00. + +@item @code{node-schedule} (default: @code{"45 2 * * *"}) +How often to run the node cleaning job. The default is once per day, at +02:45:00. + +@end table +@end deftp + @node Version Control Services @subsection Version Control Services diff --git a/gnu/local.mk b/gnu/local.mk index c36fa1ea5e..7f4ff1f695 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -586,6 +586,7 @@ GNU_SYSTEM_MODULES = \ %D%/services/docker.scm \ %D%/services/authentication.scm \ %D%/services/games.scm \ + %D%/services/ganeti.scm \ %D%/services/getmail.scm \ %D%/services/guix.scm \ %D%/services/hurd.scm \ @@ -662,6 +663,7 @@ GNU_SYSTEM_MODULES = \ %D%/tests/desktop.scm \ %D%/tests/dict.scm \ %D%/tests/docker.scm \ + %D%/tests/ganeti.scm \ %D%/tests/guix.scm \ %D%/tests/monitoring.scm \ %D%/tests/nfs.scm \ diff --git a/gnu/services/ganeti.scm b/gnu/services/ganeti.scm new file mode 100644 index 0000000000..80a61818f7 --- /dev/null +++ b/gnu/services/ganeti.scm @@ -0,0 +1,1109 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2020 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 services ganeti) + #:use-module (gnu packages virtualization) + #:use-module (gnu services) + #:use-module (gnu services mcron) + #:use-module (gnu services shepherd) + #:use-module (guix gexp) + #:use-module (guix records) + + #:use-module (srfi srfi-1) + #:use-module (ice-9 match) + + #:export (ganeti-noded-configuration + ganeti-noded-configuration? + ganeti-noded-configuration-ganeti + ganeti-noded-configuration-port + ganeti-noded-configuration-address + ganeti-noded-configuration-interface + ganeti-noded-configuration-max-clients + ganeti-noded-configuration-ssl? + ganeti-noded-configuration-ssl-key + ganeti-noded-configuration-ssl-cert + ganeti-noded-configuration-debug? + ganeti-noded-service-type + + ganeti-confd-configuration + ganeti-confd-configuration? + ganeti-confd-configuration-ganeti + ganeti-confd-configuration-port + ganeti-confd-configuration-address + ganeti-confd-configuration-debug + ganeti-confd-service-type + + ganeti-wconfd-configuration + ganeti-wconfd-configuration? + ganeti-wconfd-configuration-ganeti + ganeti-wconfd-configuration-no-voting? + ganeti-wconfd-configuration-debug? + ganeti-wconfd-service-type + + ganeti-luxid-configuration + ganeti-luxid-configuration? + ganeti-luxid-configuration-ganeti + ganeti-luxid-configuration-no-voting? + ganeti-luxid-configuration-debug? + ganeti-luxid-service-type + + ganeti-rapi-configuration + ganeti-rapi-configuration? + ganeti-rapi-configuration-ganeti + ganeti-rapi-configuration-require-authentication? + ganeti-rapi-configuration-port + ganeti-rapi-configuration-address + ganeti-rapi-configuration-interface + ganeti-rapi-configuration-max-clients + ganeti-rapi-configuration-ssl? + ganeti-rapi-configuration-ssl-key + ganeti-rapi-configuration-ssl-cert + ganeti-rapi-configuration-debug? + ganeti-rapi-service-type + + ganeti-kvmd-configuration + ganeti-kvmd-configuration? + ganeti-kvmd-configuration-ganeti + ganeti-kvmd-configuration-debug? + ganeti-kvmd-service-type + + ganeti-mond-configuration + ganeti-mond-configuration? + ganeti-mond-configuration-ganeti + ganeti-mond-configuration-port + ganeti-mond-configuration-address + ganeti-mond-configuration-debug? + ganeti-mond-service-type + + ganeti-metad-configuration + ganeti-metad-configuration? + ganeti-metad-configuration-ganeti + ganeti-metad-configuration-port + ganeti-metad-configuration-address + ganeti-metad-configuration-debug? + ganeti-metad-service-type + + ganeti-watcher-configuration + ganeti-watcher-configuration? + ganeti-watcher-configuration-ganeti + ganeti-watcher-configuration-schedule + ganeti-watcher-configuration-rapi-ip + ganeti-watcher-configuration-job-age + ganeti-watcher-configuration-verify-disks? + ganeti-watcher-configuration-debug? + ganeti-watcher-service-type + + ganeti-cleaner-configuration + ganeti-cleaner-configuration? + ganeti-cleaner-configuration-ganeti + ganeti-cleaner-configuration-master-schedule + ganeti-cleaner-configuration-node-schedule + ganeti-cleaner-service-type + + ganeti-os + ganeti-os? + ganeti-os-name + ganeti-os-extension + ganeti-os-variants + + ganeti-os-variant + ganeti-os-variant? + ganeti-os-variant-name + ganeti-os-variant-configuration + + %debootstrap-interfaces-hook + %debootstrap-grub-hook + %default-debootstrap-hooks + %default-debootstrap-extra-pkgs + debootstrap-configuration + debootstrap-configuration? + debootstrap-configuration-hooks + debootstrap-configuration-proxy + debootstrap-configuration-mirror + debootstrap-configuration-arch + debootstrap-configuration-suite + debootstrap-configuration-extra-pkgs + debootstrap-configuration-components + debootstrap-configuration-generate-cache? + debootstrap-configuration-clean-cache + debootstrap-configuration-partition-style + debootstrap-configuration-partition-alignment + + debootstrap-variant + debootstrap-os + %default-debootstrap-variants + + guix-variant + guix-os + %default-guix-variants + + %default-ganeti-os + + ganeti-configuration + ganeti-configuration? + ganeti-configuration-noded-configuration + ganeti-configuration-confd-configuration + ganeti-configuration-wconfd-configuration + ganeti-configuration-luxid-configuration + ganeti-configuration-rapi-configuration + ganeti-configuration-kvmd-configuration + ganeti-configuration-mond-configuration + ganeti-configuration-metad-configuration + ganeti-configuration-watcher-configuration + ganeti-configuration-cleaner-configuration + ganeti-configuration-file-storage-paths + ganeti-configuration-os + ganeti-service-type)) + +;;; +;;; Service definitions for running a Ganeti cluster. +;;; +;;; Planned improvements: run daemons (except ganeti-noded) under unprivileged +;;; user accounts and/or containers. The account names must match the ones +;;; given to Ganetis configure script. metad needs "setcap" or root in order +;;; to bind on port 80. + +;; Set PATH so the various daemons are able to find the 'ip' executable, LVM, +;; Ceph, Gluster, etc, without having to add absolute references to everything. +(define %default-ganeti-environment-variables + (list (string-append "PATH=" + (string-join '("/run/setuid-programs" + "/run/current-system/profile/sbin" + "/run/current-system/profile/bin") + ":")))) + +(define-record-type* + ganeti-noded-configuration make-ganeti-noded-configuration + ganeti-noded-configuration? + (ganeti ganeti-noded-configuration-ganeti ; + (default ganeti)) + (port ganeti-noded-configuration-port ;integer + (default 1811)) + (address ganeti-noded-configuration-address ;string + (default "0.0.0.0")) + (interface ganeti-noded-configuration-interface ;string | #f + (default #f)) + (max-clients ganeti-noded-configuration-max-clients ;integer + (default 20)) + (ssl? ganeti-noded-configuration-ssl? ;Boolean + (default #t)) + (ssl-key ganeti-noded-configuration-ssl-key ;string + (default "/var/lib/ganeti/server.pem")) + (ssl-cert ganeti-noded-configuration-ssl-cert ;string + (default "/var/lib/ganeti/server.pem")) + (debug? ganeti-noded-configuration-debug? ;Boolean + (default #f))) + +(define ganeti-noded-service + (match-lambda + (($ ganeti port address interface max-clients + ssl? ssl-key ssl-cert debug?) + (list (shepherd-service + (documentation "Run the Ganeti node daemon.") + (provision '(ganeti-noded)) + (requirement '(user-processes networking)) + + ;; If the daemon stops, it is probably for a good reason; + ;; otherwise ganeti-watcher will restart it for us anyway. + (respawn? #f) + + (start #~(make-forkexec-constructor + (list #$(file-append ganeti "/sbin/ganeti-noded") + #$(string-append "--port=" (number->string port)) + #$(string-append "--bind=" address) + #$@(if interface + #~((string-append "--interface=" #$interface)) + #~()) + #$(string-append "--max-clients=" + (number->string max-clients)) + #$@(if ssl? + #~((string-append "--ssl-key=" #$ssl-key) + (string-append "--ssl-cert=" #$ssl-cert)) + #~("--no-ssl")) + #$@(if debug? + #~("--debug") + #~())) + #:environment-variables + '#$%default-ganeti-environment-variables + #:pid-file "/var/run/ganeti/ganeti-noded.pid")) + (stop #~(make-kill-destructor))))))) + +(define ganeti-noded-service-type + (service-type (name 'ganeti-noded) + (extensions + (list (service-extension shepherd-root-service-type + ganeti-noded-service))) + (default-value (ganeti-noded-configuration)) + (description + "@command{ganeti-noded} is the daemon which is responsible +for the node functions in the Ganeti system."))) + +(define-record-type* + ganeti-confd-configuration make-ganeti-confd-configuration + ganeti-confd-configuration? + (ganeti ganeti-confd-configuration-ganeti ; + (default ganeti)) + (port ganeti-confd-configuration-port ;integer + (default 1814)) + (address ganeti-confd-configuration-address ;string + (default "0.0.0.0")) + (debug? ganeti-confd-configuration-debug? ;Boolean + (default #f))) + +(define ganeti-confd-service + (match-lambda + (($ ganeti port address debug?) + (list (shepherd-service + (documentation "Run the Ganeti confd daemon.") + (provision '(ganeti-confd)) + (requirement '(user-processes networking)) + (respawn? #f) + (start #~(make-forkexec-constructor + (list #$(file-append ganeti "/sbin/ganeti-confd") + #$(string-append "--port=" (number->string port)) + #$(string-append "--bind=" address) + #$@(if debug? + #~("--debug") + #~())) + #:environment-variables + '#$%default-ganeti-environment-variables + #:pid-file "/var/run/ganeti/ganeti-confd.pid")) + (stop #~(make-kill-destructor))))))) + +(define ganeti-confd-service-type + (service-type (name 'ganeti-confd) + (extensions + (list (service-extension shepherd-root-service-type + ganeti-confd-service))) + (default-value (ganeti-confd-configuration)) + (description + "@command{ganeti-confd} is a daemon used to answer queries +related to the configuration of a Ganeti cluster."))) + +(define-record-type* + ganeti-wconfd-configuration make-ganeti-wconfd-configuration + ganeti-wconfd-configuration? + (ganeti ganeti-wconfd-configuration-ganeti ; + (default ganeti)) + (no-voting? ganeti-wconfd-configuration-no-voting? ;Boolean + (default #f)) + (debug? ganeti-wconfd-configuration-debug? ;Boolean + (default #f))) + +;; If this file exists, the wconfd daemon will be forcefully started even on +;; non-master nodes. It is used to accommodate a master-failover scenario. +(define %wconfd-force-node-hint + "/var/lib/ganeti/guix_wconfd_force_node_hint") + +(define (wconfd-wrapper ganeti args) + ;; Wrapper for the wconfd daemon that looks for the force-node hint. + (program-file + "wconfd-wrapper" + #~(begin + (let ((wconfd #$(file-append ganeti "/sbin/ganeti-wconfd")) + (force-node? (file-exists? #$%wconfd-force-node-hint))) + (if force-node? + (execl wconfd wconfd "--force-node" "--no-voting" "--yes-do-it" #$@args) + (execl wconfd wconfd #$@args)))))) + +(define shepherd-wconfd-force-start-action + ;; Shepherd action to create the force-node hint and start wconfd. + (shepherd-action + (name 'force-start) + (documentation + "Forcefully start wconfd even on non-master nodes (dangerous!).") + (procedure #~(lambda _ + (format #t "Forcefully starting the wconfd daemon...~%") + (action 'ganeti-wconfd 'enable) + (dynamic-wind + (lambda () + (false-if-exception + (call-with-output-file #$%wconfd-force-node-hint + (lambda (port) + (const #t))))) + (lambda () + (action 'ganeti-wconfd 'restart)) + (lambda () + (delete-file #$%wconfd-force-node-hint))) + #t)))) + +(define ganeti-wconfd-service + (match-lambda + (($ ganeti no-voting? debug?) + (list (shepherd-service + (documentation "Run the Ganeti wconfd daemon.") + (provision '(ganeti-wconfd)) + (requirement '(user-processes)) + + ;; Shepherd action to support a master-failover scenario. It is + ;; automatically invoked during 'gnt-cluster master-failover' (see + ;; related Ganeti patch) and not intended for interactive use. + (actions (list shepherd-wconfd-force-start-action)) + + ;; wconfd will disable itself when not running on the master + ;; node. Don't attempt to restart it. + (respawn? #f) + + (start + #~(make-forkexec-constructor + (list #$(wconfd-wrapper ganeti + (append + (if no-voting? + '("--no-voting" "--yes-do-it") + '()) + (if debug? + '("--debug") + '())))) + #:environment-variables + '#$%default-ganeti-environment-variables + #:pid-file "/var/run/ganeti/ganeti-wconfd.pid")) + (stop #~(make-kill-destructor))))))) + +(define ganeti-wconfd-service-type + (service-type (name 'ganeti-wconfd) + (extensions + (list (service-extension shepherd-root-service-type + ganeti-wconfd-service))) + (default-value (ganeti-wconfd-configuration)) + (description + "@command{ganeti-wconfd} is the daemon that has authoritative +knowledge about the configuration and is the only entity that can accept changes +to it. All jobs that need to modify the configuration will do so by sending +appropriate requests to this daemon."))) + +(define-record-type* + ganeti-luxid-configuration make-ganeti-luxid-configuration + ganeti-luxid-configuration? + (ganeti ganeti-luxid-configuration-ganeti ; + (default ganeti)) + (no-voting? ganeti-luxid-configuration-no-voting? ;Boolean + (default #f)) + (debug? ganeti-luxid-configuration-debug? ;Boolean + (default #f))) + +(define ganeti-luxid-service + (match-lambda + (($ ganeti no-voting? debug?) + (list (shepherd-service + (documentation "Run the Ganeti LUXI daemon.") + (provision '(ganeti-luxid)) + (requirement '(user-processes)) + + ;; This service will automatically disable itself when not + ;; running on the master node. Don't attempt to restart it. + (respawn? #f) + + (start #~(make-forkexec-constructor + (list #$(file-append ganeti "/sbin/ganeti-luxid") + #$@(if no-voting? + #~("--no-voting" "--yes-do-it") + #~()) + #$@(if debug? + #~("--debug") + #~())) + #:environment-variables + '#$%default-ganeti-environment-variables + #:pid-file "/var/run/ganeti/ganeti-luxid.pid")) + (stop #~(make-kill-destructor))))))) + +(define ganeti-luxid-service-type + (service-type (name 'ganeti-luxid) + (extensions + (list (service-extension shepherd-root-service-type + ganeti-luxid-service))) + (default-value (ganeti-luxid-configuration)) + (description + "@command{ganeti-luxid} is a daemon used to answer queries +related to the configuration and the current live state of a Ganeti cluster. +Additionally, it is the autorative daemon for the Ganeti job queue. Jobs can +be submitted via this daemon and it schedules and starts them."))) + +(define-record-type* + ganeti-rapi-configuration make-ganeti-rapi-configuration + ganeti-rapi-configuration? + (ganeti ganeti-rapi-configuration-ganeti ; + (default ganeti)) + (require-authentication? + ganeti-rapi-configuration-require-authentication? ;Boolean + (default #f)) + (port ganeti-rapi-configuration-port ;integer + (default 5080)) + (address ganeti-rapi-configuration-address ;string + (default "0.0.0.0")) + (interface ganeti-rapi-configuration-interface ;string | #f + (default #f)) + (max-clients ganeti-rapi-configuration-max-clients ;integer + (default 20)) + (ssl? ganeti-rapi-configuration-ssl? ;Boolean + (default #f)) + (ssl-key ganeti-rapi-configuration-ssl-key ;string + (default "/var/lib/ganeti/server.pem")) + (ssl-cert ganeti-rapi-configuration-ssl-cert ;string + (default "/var/lib/ganeti/server.pem")) + (debug? ganeti-rapi-configuration-debug? ;Boolean + (default #f))) + +(define ganeti-rapi-service + (match-lambda + (($ ganeti require-authentication? port address + interface max-clients ssl? ssl-key ssl-cert + debug?) + (list (shepherd-service + (documentation "Run the Ganeti RAPI daemon.") + (provision '(ganeti-rapi)) + (requirement '(user-processes networking)) + + ;; This service will automatically disable itself when not + ;; running on the master node. Don't attempt to restart it. + (respawn? #f) + + (start #~(make-forkexec-constructor + (list #$(file-append ganeti "/sbin/ganeti-rapi") + #$@(if require-authentication? + #~("--require-authentication") + #~()) + #$(string-append "--port=" (number->string port)) + #$(string-append "--bind=" address) + #$@(if interface + #~((string-append "--interface=" #$interface)) + #~()) + #$(string-append "--max-clients=" + (number->string max-clients)) + #$@(if ssl? + #~((string-append "--ssl-key=" #$ssl-key) + (string-append "--ssl-cert=" #$ssl-cert)) + #~("--no-ssl")) + #$@(if debug? + #~("--debug") + #~())) + #:environment-variables + '#$%default-ganeti-environment-variables + #:pid-file "/var/run/ganeti/ganeti-rapi.pid")) + (stop #~(make-kill-destructor))))))) + +(define ganeti-rapi-service-type + (service-type (name 'ganeti-rapi) + (extensions + (list (service-extension shepherd-root-service-type + ganeti-rapi-service))) + (default-value (ganeti-rapi-configuration)) + (description + "@command{ganeti-rapi} is the daemon providing a remote API +for Ganeti clusters."))) + +(define-record-type* + ganeti-kvmd-configuration make-ganeti-kvmd-configuration + ganeti-kvmd-configuration? + (ganeti ganeti-kvmd-configuration-ganeti ; + (default ganeti)) + (debug? ganeti-kvmd-configuration-debug? ;Boolean + (default #f))) + +(define ganeti-kvmd-service + (match-lambda + (($ ganeti debug?) + (list (shepherd-service + (documentation "Run the Ganeti KVM daemon.") + (provision '(ganeti-kvmd)) + (requirement '(user-processes)) + + ;; This service will automatically disable itself when not + ;; needed. Don't attempt to restart it. + (respawn? #f) + + (start #~(make-forkexec-constructor + (list #$(file-append ganeti "/sbin/ganeti-kvmd") + #$@(if debug? + #~("--debug") + #~())) + #:environment-variables + '#$%default-ganeti-environment-variables + #:pid-file "/var/run/ganeti/ganeti-kvmd.pid")) + (stop #~(make-kill-destructor))))))) + +(define ganeti-kvmd-service-type + (service-type (name 'ganeti-kvmd) + (extensions + (list (service-extension shepherd-root-service-type + ganeti-kvmd-service))) + (default-value (ganeti-kvmd-configuration)) + (description + "@command{ganeti-kvmd} is responsible for determining whether +a given KVM instance was shutdown by an administrator or a user. + +The KVM daemon monitors, using @code{inotify}, KVM instances through their QMP +sockets, which are provided by KVM. Using the QMP sockets, the KVM daemon +listens for particular shutdown, powerdown, and stop events which will determine +if a given instance was shutdown by the user or Ganeti, and this result is +communicated to Ganeti via a special file in the filesystem."))) + +(define-record-type* + ganeti-mond-configuration make-ganeti-mond-configuration + ganeti-mond-configuration? + (ganeti ganeti-mond-configuration-ganeti ; + (default ganeti)) + (port ganeti-mond-configuration-port ;integer + (default 1815)) + (address ganeti-mond-configuration-address ;string + (default "0.0.0.0")) + (debug? ganeti-mond-configuration-debug? ;Boolean + (default #f))) + +(define ganeti-mond-service + (match-lambda + (($ ganeti port address debug?) + (list (shepherd-service + (documentation "Run the Ganeti monitoring daemon.") + (provision '(ganeti-mond)) + (requirement '(user-processes networking)) + (respawn? #f) + (start #~(make-forkexec-constructor + (list #$(file-append ganeti "/sbin/ganeti-mond") + #$(string-append "--port=" (number->string port)) + #$(string-append "--bind=" address) + #$@(if debug? + #~("--debug") + #~())) + #:pid-file "/var/run/ganeti/ganeti-mond.pid")) + (stop #~(make-kill-destructor))))))) + +(define ganeti-mond-service-type + (service-type (name 'ganeti-mond) + (extensions + (list (service-extension shepherd-root-service-type + ganeti-mond-service))) + (default-value (ganeti-mond-configuration)) + (description + "@command{ganeti-mond} is a daemon providing monitoring +functionality. It is responsible for running the data collectors and to +provide the collected information through a HTTP interface."))) + +(define-record-type* + ganeti-metad-configuration make-ganeti-metad-configuration + ganeti-metad-configuration? + (ganeti ganeti-metad-configuration-ganeti ; + (default ganeti)) + (port ganeti-metad-configuration-port ;integer + (default 80)) + (address ganeti-metad-configuration-address ;string | #f + (default #f)) + (debug? ganeti-metad-configuration-debug? ;Boolean + (default #f))) + +(define ganeti-metad-service + (match-lambda + (($ ganeti port address debug?) + (list (shepherd-service + (documentation "Run the Ganeti metadata daemon.") + (provision '(ganeti-metad)) + (requirement '(user-processes networking)) + (respawn? #f) + (start #~(make-forkexec-constructor + (list #$(file-append ganeti "/sbin/ganeti-metad") + #$(string-append "--port=" (number->string port)) + #$@(if address + #~((string-append "--bind=" #$address)) + #~()) + #$@(if debug? + #~("--debug") + #~())) + #:pid-file "/var/run/ganeti/ganeti-metad.pid")) + (stop #~(make-kill-destructor))))))) + +(define ganeti-metad-service-type + (service-type (name 'ganeti-metad) + (extensions + (list (service-extension shepherd-root-service-type + ganeti-metad-service))) + (default-value (ganeti-metad-configuration)) + (description + "@command{ganeti-metad} is a daemon that can be used to pass +information to OS install scripts or instances."))) + +(define-record-type* + ganeti-watcher-configuration make-ganeti-watcher-configuration + ganeti-watcher-configuration? + (ganeti ganeti-watcher-configuration-ganeti ; + (default ganeti)) + (schedule ganeti-watcher-configuration-schedule ;list | string + (default '(next-second-from + ;; Run every five minutes. + (next-minute (range 0 60 5))))) + (rapi-ip ganeti-watcher-configuration-rapi-ip ;#f | string + (default #f)) + (job-age ganeti-watcher-configuration-job-age ;integer + (default (* 6 3600))) + (verify-disks? ganeti-watcher-configuration-verify-disks? ;Boolean + (default #t)) + (debug? ganeti-watcher-configuration-debug? ;Boolean + (default #f))) + +(define ganeti-watcher-command + (match-lambda + (($ ganeti _ rapi-ip job-age verify-disks? + debug?) + #~(lambda () + (system* #$(file-append ganeti "/sbin/ganeti-watcher") + #$@(if rapi-ip + #~(string-append "--rapi-ip=" #$rapi-ip) + #~()) + #$(string-append "--job-age=" (number->string job-age)) + #$@(if verify-disks? + #~() + #~("--no-verify-disks")) + #$@(if debug? + #~("--debug") + #~())))))) + +(define (ganeti-watcher-jobs config) + (match config + (($ _ schedule) + (list + #~(job #$@(match schedule + ((? string?) + #~(#$schedule)) + ((? list?) + #~('#$schedule))) + #$(ganeti-watcher-command config)))))) + +(define ganeti-watcher-service-type + (service-type (name 'ganeti-watcher) + (extensions + (list (service-extension mcron-service-type + ganeti-watcher-jobs))) + (default-value (ganeti-watcher-configuration)) + (description + "@command{ganeti-watcher} is a periodically run script that +performs a number of maintenance actions on the cluster. It will automatically +restart instances that are marked as ERROR_down, i.e., instances that should be +running, but are not; and it will also try to repair DRBD links in case a +secondary node has rebooted. In addition it is responsible for archiving old +cluster jobs, and it will restart any down Ganeti daemons that are appropriate +for the current node. If the cluster parameter @code{maintain_node_health} is +enabled, the watcher will also shutdown instances and DRBD devices if the node +is declared offline by known master candidates."))) + +(define-record-type* + ganeti-cleaner-configuration make-ganeti-cleaner-configuration + ganeti-cleaner-configuration? + (ganeti ganeti-cleaner-configuration-ganeti ; + (default ganeti)) + (master-schedule ganeti-cleaner-configuration-master-schedule ;list | string + ;; Run the master cleaner at 01:45 every day. + (default "45 1 * * *")) + (node-schedule ganeti-cleaner-configuration-node-schedule ;list | string + ;; Run the node cleaner at 02:45 every day. + (default "45 2 * * *"))) + +(define ganeti-cleaner-jobs + (match-lambda + (($ ganeti master-schedule node-schedule) + (list + #~(job #$@(match master-schedule + ((? string?) + #~(#$master-schedule)) + ((? list?) + #~('#$master-schedule))) + (lambda () + (system* #$(file-append ganeti "/sbin/ganeti-cleaner") + "master"))) + #~(job #$@(match node-schedule + ((? string?) + #~(#$node-schedule)) + ((? list?) + #~('#$node-schedule))) + (lambda () + (system* #$(file-append ganeti "/sbin/ganeti-cleaner") + "node"))))))) + +(define ganeti-cleaner-service-type + (service-type (name 'ganeti-cleaner) + (extensions + (list (service-extension mcron-service-type + ganeti-cleaner-jobs))) + (default-value (ganeti-cleaner-configuration)) + (description + "@command{ganeti-cleaner} is a script that removes old files +from the cluster. When called with @code{node} as argument it removes expired +X509 certificates and keys from @file{/var/run/ganeti/crypto}, as well as +outdated @command{ganeti-watcher} information. + +When called with @code{master} as argument, it instead removes files older +than 21 days from @file{/var/lib/ganeti/queue/archive}."))) + +(define-record-type* + ganeti-configuration make-ganeti-configuration + ganeti-configuration? + (ganeti ganeti-configuration-ganeti + (default ganeti)) + (noded-configuration ganeti-configuration-noded-configuration + (default (ganeti-noded-configuration))) + (confd-configuration ganeti-configuration-confd-configuration + (default (ganeti-confd-configuration))) + (wconfd-configuration ganeti-configuration-wconfd-configuration + (default (ganeti-wconfd-configuration))) + (luxid-configuration ganeti-configuration-luxid-configuration + (default (ganeti-luxid-configuration))) + (rapi-configuration ganeti-configuration-rapi-configuration + (default (ganeti-rapi-configuration))) + (kvmd-configuration ganeti-configuration-kvmd-configuration + (default (ganeti-kvmd-configuration))) + (mond-configuration ganeti-configuration-mond-configuration + (default (ganeti-mond-configuration))) + (metad-configuration ganeti-configuration-metad-configuration + (default (ganeti-metad-configuration))) + (watcher-configuration ganeti-configuration-watcher-configuration + (default (ganeti-watcher-configuration))) + (cleaner-configuration ganeti-configuration-cleaner-configuration + (default (ganeti-cleaner-configuration))) + (file-storage-paths ganeti-configuration-file-storage-paths ;list of strings | gexp + (default '())) + (os ganeti-configuration-os ;list of + (default '()))) + +(define (ganeti-activation config) + (with-imported-modules '((guix build utils)) + #~(begin + (use-modules (guix build utils)) + (for-each mkdir-p + '("/var/log/ganeti" + "/var/log/ganeti/kvm" + "/var/log/ganeti/os" + "/var/lib/ganeti/rapi" + "/var/lib/ganeti/queue" + "/var/lib/ganeti/queue/archive" + "/var/run/ganeti/bdev-cache" + "/var/run/ganeti/crypto" + "/var/run/ganeti/socket" + "/var/run/ganeti/instance-disks" + "/var/run/ganeti/instance-reason" + "/var/run/ganeti/livelocks"))))) + +(define ganeti-shepherd-services + (match-lambda + (($ _ noded confd wconfd luxid rapi kvmd mond metad) + (append (ganeti-noded-service noded) + (ganeti-confd-service confd) + (ganeti-wconfd-service wconfd) + (ganeti-luxid-service luxid) + (ganeti-rapi-service rapi) + (ganeti-kvmd-service kvmd) + (ganeti-mond-service mond) + (ganeti-metad-service metad))))) + +(define ganeti-mcron-jobs + (match-lambda + (($ _ _ _ _ _ _ _ _ _ watcher cleaner) + (append (ganeti-watcher-jobs watcher) + (ganeti-cleaner-jobs cleaner))))) + +(define-record-type* + ganeti-os make-ganeti-os ganeti-os? + (name ganeti-os-name) ;string + (extension ganeti-os-extension) ;string + (variants ganeti-os-variants ;list of + (default '()))) + +(define-record-type* + ganeti-os-variant make-ganeti-os-variant ganeti-os-variant? + (name ganeti-os-variant-name) ;string + (configuration ganeti-os-variant-configuration)) ; + +(define %debootstrap-interfaces-hook + (file-append ganeti-instance-debootstrap + "/share/doc/ganeti-instance-debootstrap/examples/interfaces")) + +;; The GRUB hook shipped with instance-debootstrap does not work with GRUB2. +;; For convenience, provide one that work with modern Debians here. +;; Note: it would be neat to reuse Guix' bootloader infrastructure instead. +(define %debootstrap-grub-hook + (plain-file "grub" + "#!/usr/bin/env bash +CLEANUP=( ) +cleanup() { + if [ ${#CLEANUP[*]} -gt 0 ]; then + LAST_ELEMENT=$((${#CLEANUP[*]}-1)) + REVERSE_INDEXES=$(seq ${LAST_ELEMENT} -1 0) + for i in $REVERSE_INDEXES; do + ${CLEANUP[$i]} + done + fi +} + +trap cleanup EXIT + +mount -t proc proc $TARGET/proc +CLEANUP+=(\"umount $TARGET/proc\") +mount -t sysfs sysfs $TARGET/sys +CLEANUP+=(\"umount $TARGET/sys\") +mount -o bind /dev $TARGET/dev +CLEANUP+=(\"umount $TARGET/dev\") + +echo ' +GRUB_TIMEOUT_STYLE=menu +GRUB_CMDLINE_LINUX_DEFAULT=\"console=ttyS0,115200 net.ifnames=0\" +GRUB_TERMINAL=\"serial\" +GRUB_SERIAL_COMMAND=\"serial --unit=0 --speed=115200\" +' >> $TARGET/etc/default/grub + +# This PATH is propagated into the chroot and necessary to make grub-install +# and related commands visible. +export PATH=\"/usr/sbin:/usr/bin:/sbin:/bin:$PATH\" + +chroot \"$TARGET\" grub-install $BLOCKDEV +chroot \"$TARGET\" update-grub + +cleanup +trap - EXIT +")) + +(define %default-debootstrap-hooks + `((10-interfaces . ,%debootstrap-interfaces-hook) + (90-grub . ,%debootstrap-grub-hook))) + +(define %default-debootstrap-extra-pkgs + ;; Packages suitable for a fully virtualized KVM guest. + '("acpi-support-base" "udev" "linux-image-amd64" "openssh-server" + "locales-all" "grub-pc")) + +(define-record-type* + debootstrap-configuration make-debootstrap-configuration + debootstrap-configuration? + (hooks debootstrap-configuration-hooks ;#f | gexp | '((name . gexp)) + (default %default-debootstrap-hooks)) + (proxy debootstrap-configuration-proxy (default #f)) ;#f | string + (mirror debootstrap-configuration-mirror ;#f | string + (default #f)) + (arch debootstrap-configuration-arch (default #f)) ;#f | string + (suite debootstrap-configuration-suite ;#f | string + (default "stable")) + (extra-pkgs debootstrap-configuration-extra-pkgs ;list of strings + (default %default-debootstrap-extra-pkgs)) + (components debootstrap-configuration-components ;list of strings + (default '())) + (generate-cache? debootstrap-configuration-generate-cache? ;Boolean + (default #t)) + (clean-cache debootstrap-configuration-clean-cache ;#f | integer + (default 14)) + (partition-style debootstrap-configuration-partition-style ;#f | symbol | string + (default 'msdos)) + (partition-alignment debootstrap-configuration-partition-alignment ;#f | integer + (default 2048))) + +(define (hooks->directory hooks) + (match hooks + ((? file-like?) + hooks) + ((? list?) + (let ((names (map car hooks)) + (files (map cdr hooks))) + (with-imported-modules '((guix build utils)) + (computed-file "hooks-union" + #~(begin + (use-modules (guix build utils) + (ice-9 match)) + (mkdir-p #$output) + (with-directory-excursion #$output + (for-each (match-lambda + ((name hook) + (let ((file-name (string-append + #$output "/" + (symbol->string name)))) + ;; Copy to the destination to ensure + ;; the file is executable. + (copy-file hook file-name) + (chmod file-name #o555)))) + '#$(zip names files)))))))) + (_ #f))) + +(define-gexp-compiler (debootstrap-configuration-compiler + (file ) system target) + (match file + (($ hooks proxy mirror arch suite extra-pkgs + components generate-cache? clean-cache + partition-style partition-alignment) + (let ((customize-dir (hooks->directory hooks))) + (gexp->derivation + "debootstrap-variant" + #~(call-with-output-file (ungexp output "out") + (lambda (port) + (display + (string-append + (ungexp-splicing + `(,@(if proxy + `("PROXY=" ,proxy "\n") + '()) + ,@(if mirror + `("MIRROR=" ,mirror "\n") + '()) + ,@(if arch + `("ARCH=" ,arch "\n") + '()) + ,@(if suite + `("SUITE=" ,suite "\n") + '()) + ,@(if (not (null? extra-pkgs)) + `("EXTRA_PKGS=" ,(string-join extra-pkgs ",") "\n") + '()) + ,@(if (not (null? components)) + `("COMPONENTS=" ,(string-join components ",") "\n") + '()) + ,@(if customize-dir + `("CUSTOMIZE_DIR=" ,customize-dir "\n") + '()) + ,@(if generate-cache? + '("GENERATE_CACHE=yes\n") + '("GENERATE_CACHE=no\n")) + ,@(if clean-cache + `("CLEAN_CACHE=" ,(number->string clean-cache) "\n") + '()) + ,@(if partition-style + (if (symbol? partition-style) + `("PARTITION_STYLE=" + ,(symbol->string partition-style) "\n") + `("PARTITION_STYLE=" ,partition-style "\n")) + '()) + ,@(if partition-alignment + `("PARTITION_ALIGNMENT=" + ,(number->string partition-alignment) "\n") + '())))) + port))) + #:local-build? #t))))) + +(define (ganeti-os->directory os) + "Return the derivation to build the configuration directory to be installed +in /etc/ganeti/instance-$os for OS." + (let* ((name (ganeti-os-name os)) + (extension (ganeti-os-extension os)) + (variants (ganeti-os-variants os)) + (names (map ganeti-os-variant-name variants)) + (configs (map ganeti-os-variant-configuration variants))) + (with-imported-modules '((guix build utils)) + (define builder + #~(begin + (use-modules (guix build utils) + (ice-9 format) + (ice-9 match) + (srfi srfi-1)) + (mkdir-p #$output) + (unless (null? '#$names) + (let ((variants-dir (string-append #$output "/variants"))) + (mkdir-p variants-dir) + (call-with-output-file (string-append variants-dir "/variants.list") + (lambda (port) + (format port "~a~%" + (string-join '#$names "\n")))) + (for-each (match-lambda + ((name file) + (symlink file + (string-append variants-dir "/" name + #$extension)))) + + '#$(zip names configs)))))) + + (computed-file (string-append name "-os") builder)))) + +(define (ganeti-directory file-storage-file os) + (let ((dirs (map ganeti-os->directory os)) + (names (map ganeti-os-name os))) + (define builder + #~(begin + (use-modules (ice-9 match)) + (mkdir #$output) + (when #$file-storage-file + (symlink #$file-storage-file + (string-append #$output "/file-storage-paths"))) + (for-each (match-lambda + ((name dest) + (symlink dest + (string-append #$output "/instance-" name)))) + '#$(zip names dirs)))) + (computed-file "etc-ganeti" builder))) + +(define (file-storage-file paths) + (match paths + ((? null?) #f) + ((? list?) (plain-file + "file-storage-paths" + (string-join paths "\n"))) + (_ paths))) + +(define (ganeti-etc-service config) + (list `("ganeti" ,(ganeti-directory + (file-storage-file + (ganeti-configuration-file-storage-paths config)) + (ganeti-configuration-os config))))) + +(define (debootstrap-os variants) + (ganeti-os + (name "debootstrap") + (extension ".conf") + (variants variants))) + +(define (debootstrap-variant name configuration) + (ganeti-os-variant + (name name) + (configuration configuration))) + +(define %default-debootstrap-variants + (list (debootstrap-variant + "default" + (debootstrap-configuration)))) + +(define (guix-os variants) + (ganeti-os + (name "guix") + (extension ".scm") + (variants variants))) + +(define (guix-variant name configuration) + (ganeti-os-variant + (name name) + (configuration configuration))) + +(define %default-guix-variants + (list (guix-variant + "default" + (file-append ganeti-instance-guix + "/share/doc/ganeti-instance-guix/examples/dynamic.scm")))) + +;; The OS configurations usually come with a default OS. To make them work +;; out of the box, follow suit. +(define %default-ganeti-os + (list (debootstrap-os %default-debootstrap-variants) + (guix-os %default-guix-variants))) + +(define ganeti-service-type + (service-type (name 'ganeti) + (extensions + (list (service-extension activation-service-type + ganeti-activation) + (service-extension shepherd-root-service-type + ganeti-shepherd-services) + (service-extension etc-service-type + ganeti-etc-service) + (service-extension profile-service-type + (compose list ganeti-configuration-ganeti)) + (service-extension mcron-service-type + ganeti-mcron-jobs))) + (default-value (ganeti-configuration (os %default-ganeti-os))) + (description + "Ganeti is a family of services that are designed to run +on a fleet of machines and facilitate deployment and maintenance of virtual +servers (@dfn{instances}). It can migrate instances between nodes, automatically +restart failed instances, evacuate nodes, and much more."))) diff --git a/gnu/tests/ganeti.scm b/gnu/tests/ganeti.scm new file mode 100644 index 0000000000..0615edcde4 --- /dev/null +++ b/gnu/tests/ganeti.scm @@ -0,0 +1,265 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2020 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 ganeti) + #:use-module (gnu) + #:use-module (gnu tests) + #:use-module (gnu system vm) + #:use-module (gnu services) + #:use-module (gnu services ganeti) + #:use-module (gnu services networking) + #:use-module (gnu services ssh) + #:use-module (gnu packages virtualization) + #:use-module (guix gexp) + #:use-module (ice-9 format) + #:export (%test-ganeti-kvm %test-ganeti-lxc)) + +(define %ganeti-os + (operating-system + (host-name "gnt1") + (timezone "Etc/UTC") + (locale "en_US.UTF-8") + + (bootloader (bootloader-configuration + (bootloader grub-bootloader) + (target "/dev/vda"))) + (file-systems (cons (file-system + (device (file-system-label "my-root")) + (mount-point "/") + (type "ext4")) + %base-file-systems)) + (firmware '()) + + ;; The hosts file must contain a nonlocal IP for host-name. + ;; In addition, the cluster name must resolve to an IP address that + ;; is not currently provisioned. + (hosts-file (plain-file "hosts" (format #f " +127.0.0.1 localhost +::1 localhost +10.0.2.2 gnt1.example.com gnt1 +192.168.254.254 ganeti.example.com +"))) + + (packages (append (list ganeti-instance-debootstrap ganeti-instance-guix) + %base-packages)) + (services + (append (list (static-networking-service "eth0" "10.0.2.2" + #:netmask "255.255.255.0" + #:gateway "10.0.2.1" + #:name-servers '("10.0.2.1")) + + (service openssh-service-type + (openssh-configuration + (permit-root-login 'without-password))) + + (service ganeti-service-type + (ganeti-configuration + (file-storage-paths '("/srv/ganeti/file-storage")) + (os %default-ganeti-os)))) + %base-services)))) + +(define* (run-ganeti-test hypervisor #:key + (master-netdev "eth0") + (hvparams '()) + (extra-packages '()) + (rapi-port 5080) + (noded-port 1811)) + "Run tests in %GANETI-OS." + (define os + (marionette-operating-system + (operating-system + (inherit %ganeti-os) + (packages (append extra-packages + (operating-system-packages %ganeti-os)))) + #:imported-modules '((gnu services herd) + (guix combinators)))) + + (define %forwarded-rapi-port 5080) + (define %forwarded-noded-port 1811) + + (define vm + (virtual-machine + (operating-system os) + ;; Some of the daemons are fairly memory-hungry. + (memory-size 512) + ;; Forward HTTP ports so we can access them from the "outside". + (port-forwardings `((,%forwarded-rapi-port . ,rapi-port) + (,%forwarded-noded-port . ,noded-port))))) + + (define test + (with-imported-modules '((gnu build marionette)) + #~(begin + (use-modules (srfi srfi-11) (srfi srfi-64) + (web uri) (web client) (web response) + (gnu build marionette)) + + (define marionette + (make-marionette (list #$vm))) + + (mkdir #$output) + (chdir #$output) + + (test-begin "ganeti") + + ;; Ganeti uses the Shepherd to start/stop daemons, so make sure + ;; it is ready before we begin. It takes a while because all + ;; Ganeti daemons fail to start initially. + (test-assert "shepherd is ready" + (wait-for-unix-socket "/var/run/shepherd/socket" marionette)) + + (test-eq "gnt-cluster init" + 0 + (marionette-eval + '(begin + (setenv + "PATH" + ;; Init needs to run 'ssh-keygen', 'ip', etc. + "/run/current-system/profile/sbin:/run/current-system/profile/bin") + (system* #$(file-append ganeti "/sbin/gnt-cluster") "init" + (string-append "--master-netdev=" #$master-netdev) + ;; TODO: Enable more disk backends. + "--enabled-disk-templates=file" + (string-append "--enabled-hypervisors=" + #$hypervisor) + (string-append "--hypervisor-parameters=" + #$hypervisor ":" + (string-join '#$hvparams "\n")) + ;; Set the default NIC mode to 'routed' to avoid having to + ;; configure a full bridge to placate 'gnt-cluster verify'. + "--nic-parameters=mode=routed,link=eth0" + "ganeti.example.com")) + marionette)) + + ;; Disable the watcher while doing daemon tests to prevent interference. + (test-eq "watcher pause" + 0 + (marionette-eval + '(begin + (system* #$(file-append ganeti "/sbin/gnt-cluster") + "watcher" "pause" "1h")) + marionette)) + + (test-assert "force-start wconfd" + ;; Check that the 'force-start' Shepherd action works, used in a + ;; master-failover scenario. + (marionette-eval + '(begin + (setenv "PATH" "/run/current-system/profile/bin") + (invoke "herd" "stop" "ganeti-wconfd") + (invoke "herd" "disable" "ganeti-wconfd") + (invoke "herd" "force-start" "ganeti-wconfd")) + marionette)) + + ;; Verify that the cluster is healthy. + (test-eq "gnt-cluster verify 1" + 0 + (marionette-eval + '(begin + (system* #$(file-append ganeti "/sbin/gnt-cluster") "verify")) + marionette)) + + ;; Try stopping and starting daemons with daemon-util like + ;; 'gnt-node add', 'gnt-cluster init', etc. + (test-eq "daemon-util stop-all" + 0 + (marionette-eval + '(begin + (system* #$(file-append ganeti "/lib/ganeti/daemon-util") + "stop-all")) + marionette)) + + (test-eq "daemon-util start-all" + 0 + (marionette-eval + '(begin + (system* #$(file-append ganeti "/lib/ganeti/daemon-util") + "start-all")) + marionette)) + + ;; Check that the cluster is still healthy after the daemon restarts. + (test-eq "gnt-cluster verify 2" + 0 + (marionette-eval + '(begin + (system* #$(file-append ganeti "/sbin/gnt-cluster") "verify")) + marionette)) + + (test-eq "watcher continue" + 0 + (marionette-eval + '(begin + (system* #$(file-append ganeti "/sbin/gnt-cluster") + "watcher" "continue")) + marionette)) + + ;; Try accessing the RAPI. This causes an expected failure: + ;; https://github.com/ganeti/ganeti/issues/1502 + ;; Run it anyway for easy testing of potential fixes. + (test-equal "http-get RAPI version" + '(200 "2") + (let-values + (((response text) + (http-get #$(simple-format + #f "http://localhost:~A/version" + %forwarded-rapi-port) + #:decode-body? #t))) + (list (response-code response) text))) + + (test-equal "gnt-os list" + "debootstrap+default\nguix+default\n" + (marionette-eval + '(begin + (use-modules (ice-9 popen)) + (let* ((port (open-pipe* + OPEN_READ + #$(file-append ganeti "/sbin/gnt-os") + "list" "--no-headers")) + (output (get-string-all port))) + (close-pipe port) + output)) + marionette)) + + (test-eq "gnt-cluster destroy" + 0 + (marionette-eval + '(begin + (system* #$(file-append ganeti "/sbin/gnt-cluster") + "destroy" "--yes-do-it")) + marionette)) + + (test-end) + (exit (= (test-runner-fail-count (test-runner-current)) 1))))) + + (gexp->derivation (string-append "ganeti-" hypervisor "-test") test)) + +(define %test-ganeti-kvm + (system-test + (name "ganeti-kvm") + (description "Provision a Ganeti cluster using the KVM hypervisor.") + (value (run-ganeti-test "kvm" + ;; Set kernel_path to an empty string to prevent + ;; 'gnt-cluster verify' from testing for its presence. + #:hvparams '("kernel_path=") + #:extra-packages (list qemu))))) + +(define %test-ganeti-lxc + (system-test + (name "ganeti-lxc") + (description "Provision a Ganeti cluster using LXC as the hypervisor.") + (value (run-ganeti-test "lxc" + #:extra-packages (list lxc))))) -- cgit v1.2.3 From 074814fe575ebf36049a26351cc7853967ceb0ae Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Thu, 16 Jul 2020 23:54:58 +0200 Subject: gnu: keepassxc: Set QT_PLUGIN_PATH. * gnu/packages/password-utils.scm (keepassxc): Wrap program to set QT_PLUGIN_PATH for svg icons to show properly. --- gnu/packages/password-utils.scm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 0dffffd036..ee4d088501 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -133,7 +133,19 @@ (define-public keepassxc (build-system cmake-build-system) (arguments '(#:configure-flags '("-DWITH_XC_ALL=YES" - "-DWITH_XC_UPDATECHECK=NO"))) + "-DWITH_XC_UPDATECHECK=NO") + #:phases + (modify-phases %standard-phases + (add-after 'install 'wrap-bin + (lambda* (#:key outputs inputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (wrap-program (string-append out "/bin/keepassxc") + `("QT_PLUGIN_PATH" ":" prefix + ,(map (lambda (label) + (string-append (assoc-ref inputs label) + "/lib/qt5/plugins")) + '("qtbase" "qtsvg"))))) + #t))))) (native-inputs `(("asciidoctor" ,ruby-asciidoctor) ("qttools" ,qttools))) -- cgit v1.2.3 From 0482ea07f9d8ee53108ef6507d15fa7a70ac1a71 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 17 Jul 2020 01:04:24 +0200 Subject: doc: Small fixups for the Ganeti documentation. * doc/guix.texi (Virtualization Services): Fix various inaccuracies and add markup the procedure parameters. --- doc/guix.texi | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index a6ee679b11..40c8f06bf0 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -24982,7 +24982,7 @@ the @code{--snapshot} flag using something along these lines: @quotation Note This service is considered experimental. Configuration options may be changed in a backwards-incompatible manner, and not all features have been thorougly -tested. Users of this service are encouraged to share their experience at +tested. Users of this service are encouraged to share their experience at @email{guix-devel@@gnu.org}. @end quotation @@ -25050,7 +25050,7 @@ Users are advised to read the administrators guide} to learn about the various cluster options and day-to-day operations. There is also a @url{https://guix.gnu.org/blog/2020/ganeti-on-guix/,blog post} -describing how to configure a small cluster. +describing how to configure and initialize a small cluster. @defvr {Scheme Variable} ganeti-service-type This is a service type that includes all the various services that Ganeti @@ -25058,6 +25058,8 @@ nodes should run. Its value is a @code{ganeti-configuration} object that defines the package to use for CLI operations, as well as configuration for the various daemons. +Allowed file storage paths and available guest operating systems are also +configured through this data type. @end defvr @deftp {Data Type} ganeti-configuration @@ -25124,8 +25126,8 @@ storage backend and OS variants. @end deftp @deftp {Data Type} ganeti-os -This data type is suitable for passing to the @code{os} configuration of -Ganeti. It takes the following parameters: +This data type is suitable for passing to the @code{os} parameter of +@code{ganeti-configuration}. It takes the following parameters: @table @asis @item @code{name} @@ -25175,16 +25177,14 @@ scripts that will run when the OS is installed. It can also be a list of @code{(name . file-like)} pairs. For example: @lisp - `((99-hello-world . ,(plain-file "#!/bin/sh\necho Hello, World"))) - @end lisp That will create a directory with one executable named @code{99-hello-world} and run it every time this variant is installed. If set to @code{#f}, hooks in @file{/etc/ganeti/instance-debootstrap/hooks} will be used, if any. @item @code{proxy} (default: @code{#f}) -HTTP proxy to use, if any. +Optional HTTP proxy to use. @item @code{mirror} (default: @code{#f}) The Debian mirror. Typically something like @code{http://ftp.no.debian.org/debian}. The default varies depending on the distribution. @@ -25213,24 +25213,24 @@ Alignment of the partition in sectors. @end table @end deftp -@deffn {Scheme Procedure} debootstrap-variant +@deffn {Scheme Procedure} debootstrap-variant @var{name} @var{configuration} This is a helper procedure that creates a @code{ganeti-os-variant} record. It takes two parameters: a name and a @code{debootstrap-configuration} object. @end deffn -@deffn {Scheme Procedure} debootstrap-os +@deffn {Scheme Procedure} debootstrap-os @var{variants}@dots{} This is a helper procedure that creates a @code{ganeti-os} record. It takes a list of variants created with @code{debootstrap-variant}. @end deffn -@deffn {Scheme Procedure} guix-variant +@deffn {Scheme Procedure} guix-variant @var{name} @var{configuration} This is a helper procedure that creates a @code{ganeti-os-variant} record for use with the Guix OS provider. It takes a name and a G-expression that returns a ``file-like'' (@pxref{G-Expressions, file-like objects}) object containing a Guix System configuration. @end deffn -@deffn {Scheme Procedure} guix-os +@deffn {Scheme Procedure} guix-os @var{variants}@dots{} This is a helper procedure that creates a @code{ganeti-os} record. It takes a list of variants produced by @code{guix-variant}. @end deffn @@ -25243,7 +25243,7 @@ contains a single debootstrap variant with the default configuration: @lisp (list (debootstrap-variant "default" - (debootstrap-configuration)))) + (debootstrap-configuration))) @end lisp @end defvr @@ -25256,7 +25256,7 @@ server, a serial console, and authorizes the Ganeti hosts SSH keys. (list (guix-variant "default" (file-append ganeti-instance-guix - "/share/doc/ganeti-instance-guix/examples/dynamic.scm")))) + "/share/doc/ganeti-instance-guix/examples/dynamic.scm"))) @end lisp @end defvr @@ -25524,9 +25524,7 @@ When true, the daemon performs additional logging for debugging purposes. @defvr {Scheme Variable} ganeti-metad-service-type @command{ganeti-metad} is an optional daemon that can be used to provide -information about the cluster to instances or OS install scripts. It is -not included in @code{ganeti-service-type} because using it requires -additional configuration and support in OS providers. +information about the cluster to instances or OS install scripts. It takes a @code{ganeti-metad-configuration} object. @end defvr -- cgit v1.2.3 From ba7a63da4822d53298d64a31e3dd55bc60bad62a Mon Sep 17 00:00:00 2001 From: Diego Nicola Barbato Date: Fri, 17 Jul 2020 01:18:00 +0200 Subject: gnu: emacs-exwm: Fix fullscreen states. * gnu/packages/patches/emacs-exwm-fix-fullscreen-states.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/emacs-xyz.scm (emacs-exwm)[source]: Use it. Signed-off-by: Nicolas Goaziou --- gnu/local.mk | 1 + gnu/packages/emacs-xyz.scm | 7 +++- .../patches/emacs-exwm-fix-fullscreen-states.patch | 39 ++++++++++++++++++++++ 3 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/emacs-exwm-fix-fullscreen-states.patch diff --git a/gnu/local.mk b/gnu/local.mk index 7f4ff1f695..a50048e749 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -907,6 +907,7 @@ dist_patch_DATA = \ %D%/packages/patches/elm-compiler-fix-map-key.patch \ %D%/packages/patches/emacs27-exec-path.patch \ %D%/packages/patches/emacs-exec-path.patch \ + %D%/packages/patches/emacs-exwm-fix-fullscreen-states.patch \ %D%/packages/patches/emacs-fix-scheme-indent-function.patch \ %D%/packages/patches/emacs-json-reformat-fix-tests.patch \ %D%/packages/patches/emacs-highlight-stages-add-gexp.patch \ diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 537638bd36..c3f9d768f9 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -10900,7 +10900,12 @@ (define-public emacs-exwm (uri (string-append "https://elpa.gnu.org/packages/" "exwm-" version ".tar")) (sha256 - (base32 "0lj1a3cmbpf4h6x8k6x8cdm1qb51ca6filydnvi5zcda8zpl060s")))) + (base32 "0lj1a3cmbpf4h6x8k6x8cdm1qb51ca6filydnvi5zcda8zpl060s")) + (patches + ;; Patch fixing fullscreen view. Applied upstream as + ;; edb930005b0ba83051ca8a59b493e9a3c8ef580a. It can be removed in + ;; next release. + (search-patches "emacs-exwm-fix-fullscreen-states.patch")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-xelb" ,emacs-xelb))) diff --git a/gnu/packages/patches/emacs-exwm-fix-fullscreen-states.patch b/gnu/packages/patches/emacs-exwm-fix-fullscreen-states.patch new file mode 100644 index 0000000000..6d31021f67 --- /dev/null +++ b/gnu/packages/patches/emacs-exwm-fix-fullscreen-states.patch @@ -0,0 +1,39 @@ +From edb930005b0ba83051ca8a59b493e9a3c8ef580a Mon Sep 17 00:00:00 2001 +From: Chris Feng +Date: Sun, 14 Jun 2020 00:00:00 +0000 +Subject: [PATCH] Fix fullscreen states + +* exwm-layout.el (exwm-layout-set-fullscreen, +exwm-layout-unset-fullscreen): Use `exwm--id' for interactive use. +(exwm-layout-unset-fullscreen): Mandatorily clear fullscreen states. +--- + exwm-layout.el | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/exwm-layout.el b/exwm-layout.el +index 170c2be..79d0c95 100644 +--- a/exwm-layout.el ++++ b/exwm-layout.el +@@ -205,7 +205,7 @@ + :border-width 0 + :stack-mode xcb:StackMode:Above)) + (cl-pushnew xcb:Atom:_NET_WM_STATE_FULLSCREEN exwm--ewmh-state) +- (exwm-layout--set-ewmh-state id) ++ (exwm-layout--set-ewmh-state exwm--id) + (xcb:flush exwm--connection) + (set-window-dedicated-p (get-buffer-window) t) + (exwm-input--release-keyboard exwm--id))) +@@ -233,7 +233,9 @@ + (let ((window (get-buffer-window nil t))) + (when window + (exwm-layout--show exwm--id window)))) +- (exwm-layout--set-ewmh-state id) ++ (setq exwm--ewmh-state ++ (delq xcb:Atom:_NET_WM_STATE_FULLSCREEN exwm--ewmh-state)) ++ (exwm-layout--set-ewmh-state exwm--id) + (xcb:flush exwm--connection) + (set-window-dedicated-p (get-buffer-window) nil) + (when (eq 'line-mode exwm--selected-input-mode) +-- +2.26.2 + -- cgit v1.2.3 From 0fc715f9712424b0147c6bd261ce10c25fe73082 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Wed, 15 Jul 2020 19:13:47 +0200 Subject: gnu: hedgewars: Install desktop icon. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/games.scm (hedgewars)[arguments]: Add ‘install-icon’ phase. Signed-off-by: Nicolas Goaziou --- gnu/packages/games.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 5de6dbf4ac..e60c455cb6 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -8813,7 +8813,15 @@ (define-public hedgewars #:phases (modify-phases %standard-phases (replace 'check - (lambda _ (invoke "ctest")))))) + (lambda _ (invoke "ctest"))) + (add-after 'install 'install-icon + (lambda _ + ;; Install icon for the desktop file. + (let* ((out (assoc-ref %outputs "out")) + (icons (string-append out "/share/icons/hicolor/512x512/apps"))) + (with-directory-excursion (string-append "../hedgewars-src-" ,version) + (install-file "misc/hedgewars.png" icons))) + #t))))) (inputs `(("ffmpeg" ,ffmpeg) ("freeglut" ,freeglut) -- cgit v1.2.3 From 52edd7eddbfdf47fef4391d3bde9098d579179e6 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Wed, 15 Jul 2020 20:25:35 +0200 Subject: gnu: godot: Update to 3.2.2. * gnu/packages/game-development.scm (godot): Update to 3.2.2. Signed-off-by: Nicolas Goaziou --- gnu/packages/game-development.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index e45980e7a0..b0a25ae7b4 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1535,7 +1535,7 @@ (define-public openmw (define-public godot (package (name "godot") - (version "3.2.1") + (version "3.2.2") (source (origin (method git-fetch) (uri (git-reference @@ -1544,7 +1544,7 @@ (define-public godot (file-name (git-file-name name version)) (sha256 (base32 - "1kndls0rklha7kz9l4i2ivjxab4jpk3b2j7dcgcg2qc3s81yd0r6")) + "1libz83mbyrkbbsmmi8z2rydv3ls0w9r4vb5v6diqqwn7ka8z804")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) -- cgit v1.2.3 From 4226c1f709336b93fc852d2736cfd36b419e513b Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Wed, 15 Jul 2020 04:53:48 +0200 Subject: gnu: emacs-projectile: Update to 2.2.0. * gnu/packages/emacs-xyz.scm (emacs-projectile): Update to 2.2.0. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index c3f9d768f9..de8120532e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7531,7 +7531,7 @@ (define-public emacs-edit-indirect (define-public emacs-projectile (package (name "emacs-projectile") - (version "2.1.0") + (version "2.2.0") (source (origin (method url-fetch) (uri (string-append "https://raw.githubusercontent.com/bbatsov" @@ -7539,7 +7539,7 @@ (define-public emacs-projectile (file-name (string-append "projectile-" version ".el")) (sha256 (base32 - "1jj9wk91clyph3zmxkd7y7d6gdqmjd1vndhyq5fxp7i7dy013571")))) + "1d983siysg98bjbb2r99qbrpvpf6dn85si8gyak4z05m67s8sn6v")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-dash" ,emacs-dash) -- cgit v1.2.3 From 9ba8cb43b928f2133dbea871f0e7d9aaf3afe785 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Wed, 15 Jul 2020 17:43:18 +0200 Subject: gnu: emacs-helm-projectile: Update to 1.0.0. * gnu/packages/emacs-xyz.scm (emacs-helm-projectile): Update to 1.0.0. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 47 +++++++++++++++++++++------------------------- 1 file changed, 21 insertions(+), 26 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index de8120532e..55afda50df 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -8347,33 +8347,28 @@ (define-public emacs-helm-ag as well as features for editing search results.") (license license:gpl3+))) -;; There hasn't been a tag or release since 2016, so we take the latest -;; commit. (define-public emacs-helm-projectile - (let ((commit "5328b74dddcee8d1913803ca8167868831a07463") - (version "0.14.0") - (revision "1")) - (package - (name "emacs-helm-projectile") - (version (git-version version revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/bbatsov/helm-projectile") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0a811cblrvc8llpv771b8dppgxs6bwjyvjy3qn2xns4nigvn93s0")))) - (build-system emacs-build-system) - (propagated-inputs - `(("emacs-helm" ,emacs-helm) - ("emacs-projectile" ,emacs-projectile))) - (home-page "https://github.com/bbatsov/helm-projectile") - (synopsis "Helm integration for Projectile") - (description - "This Emacs library provides a Helm interface for Projectile.") - (license license:gpl3+)))) + (package + (name "emacs-helm-projectile") + (version "1.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/bbatsov/helm-projectile") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "05gpg90gg03yalmv9fw1y9k21i2l617iipvs0p9n80aln8nrzs8g")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-helm" ,emacs-helm) + ("emacs-projectile" ,emacs-projectile))) + (home-page "https://github.com/bbatsov/helm-projectile") + (synopsis "Helm integration for Projectile") + (description + "This Emacs library provides a Helm interface for Projectile.") + (license license:gpl3+))) (define-public emacs-taskrunner (let ((commit "3afd4a546d42339543d3d4e51b175fc3e82b3358") -- cgit v1.2.3 From f49eb9f997ce0eca391da00b3fc56ac474e23fe4 Mon Sep 17 00:00:00 2001 From: Diego Nicola Barbato Date: Wed, 15 Jul 2020 17:15:49 +0200 Subject: gnu: freeorion: Build with boost-with-python2. * gnu/packages/games.scm (freeorion)[inputs]: Replace boost with boost-with-python2. Signed-off-by: Nicolas Goaziou --- gnu/packages/games.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index e60c455cb6..8c14911cb8 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -9472,7 +9472,7 @@ (define-public freeorion (string-append "\"" roboto-dir "Roboto-" type ".ttf\");"))) #t)))))) (inputs - `(("boost" ,boost) + `(("boost" ,boost-with-python2) ("boost_signals" ,boost-signals2) ("font-dejavu" ,font-dejavu) ("font-roboto" ,font-google-roboto) -- cgit v1.2.3 From 33c154d6a5cd4f586b833ebd5d34f4f44339b0ba Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 17 Jul 2020 02:51:25 +0200 Subject: gnu: corkscrew: Use git source. * gnu/packages/ssh.scm (corkscrew)[source]: Use GIT-FETCH and GIT-FILE-NAME. [arguments]: Adapt to changed README file name. [home-page]: Switch to a working URI. --- gnu/packages/ssh.scm | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 9ae3d94194..a612b9dd15 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -401,26 +401,25 @@ (define-public corkscrew (version "2.0") (source (origin - (method url-fetch) - ;; The agroman.net domain name expired on 2017-03-23, and the original - ;; "http://www.agroman.net/corkscrew/corkscrew-2.0.tar.gz" now returns - ;; bogus HTML. Perhaps it will yet return. Until then, use a mirror. - (uri (string-append "https://downloads.openwrt.org/sources/" - "corkscrew-" version ".tar.gz")) - (sha256 (base32 - "1gmhas4va6gd70i2x2mpxpwpgww6413mji29mg282jms3jscn3qd")))) + (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 + ;; 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 + ;; is not able to detect them. (flags `(,(string-append "--prefix=" out) ,(string-append "--build=" build) ,(string-append "--host=" (or target build))))) @@ -430,9 +429,9 @@ (define-public corkscrew (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (doc (string-append out "/share/doc/" ,name "-" ,version))) - (install-file "README" doc) + (install-file "README.markdown" doc) #t)))))) - (home-page "http://www.agroman.net/corkscrew") + (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. -- cgit v1.2.3 From f1841ccf46625164268251d3c474f8722ccc74ee Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 17 Jul 2020 00:58:23 +0200 Subject: gnu: ghc-missingh: Update home page. * gnu/packages/haskell-xyz.scm (ghc-missingh)[home-page]: Update. --- gnu/packages/haskell-xyz.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 5f43e93108..ce1259ed4b 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -7625,7 +7625,8 @@ (define-public ghc-missingh `(("ghc-errorcall-eq-instance" ,ghc-errorcall-eq-instance) ("ghc-quickcheck" ,ghc-quickcheck) ("ghc-hunit" ,ghc-hunit))) - (home-page "https://software.complete.org/missingh") + ;; ‘Official’ redirects to a 404. + (home-page "https://github.com/haskell-hvr/missingh") (synopsis "Large utility library") (description "MissingH is a library of all sorts of utility functions for Haskell -- cgit v1.2.3 From f5d88758be48b4e10991a35fc855e03801bea56e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 17 Jul 2020 01:01:50 +0200 Subject: gnu: ghc-uniplate: Use a working home page. * gnu/packages/haskell-xyz.scm (ghc-uniplate)[home-page]: Update. --- gnu/packages/haskell-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index ce1259ed4b..54c77653cc 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -13457,7 +13457,7 @@ (define-public ghc-uniplate `(("ghc-syb" ,ghc-syb) ("ghc-hashable" ,ghc-hashable) ("ghc-unordered-containers" ,ghc-unordered-containers))) - (home-page "http://community.haskell.org/~ndm/uniplate/") + (home-page "https://github.com/ndmitchell/uniplate") (synopsis "Simple, concise and fast generic operations") (description "Uniplate is a library for writing simple and concise generic operations. Uniplate has similar goals to the original Scrap Your Boilerplate -- cgit v1.2.3 From 7bb7bb5c9d6c26c80a934f6895bb4deb05947c53 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 17 Jul 2020 00:06:20 +0200 Subject: gnu: lbzip2: Update to 2.5-0.b6dc48a. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/compression.scm (lbzip2): Update to 2.5-0.b6dc48a. [source]: Use GIT-FETCH and GIT-FILE-NAME. Remove snippet. [arguments]: Add ‘unpack-gnulib’ and custom bootstrap phase. [native-inputs]: Add autoconf, automake, gnulib, and perl. [home-page]: Use source repository. --- gnu/packages/compression.scm | 81 ++++++++++++++++++++++++++++---------------- 1 file changed, 52 insertions(+), 29 deletions(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 8c6b9f3b69..e45b86b5c7 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -380,40 +380,63 @@ (define-public bzip2 (home-page "https://web.archive.org/web/20180801004107/http://www.bzip.org/"))) (define-public lbzip2 - (package - (name "lbzip2") - (version "2.5") - (source (origin - (method url-fetch) - (uri (string-append "http://archive.lbzip2.org/lbzip2-" - version ".tar.gz")) - (sha256 - (base32 - "1sahaqc5bw4i0iyri05syfza4ncf5cml89an033fspn97klmxis6")) - (modules '((guix build utils))) - (snippet - '(begin - (substitute* (find-files "lib" "\\.c$") - (("#if defined _IO_ftrylockfile") - "#if defined _IO_EOF_SEEN")) - (substitute* "lib/stdio-impl.h" - (("^/\\* BSD stdio derived implementations") - (string-append "#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN\n" - "# define _IO_IN_BACKUP 0x100\n" - "#endif\n\n" - "/* BSD stdio derived implementations"))) - #t)))) - (build-system gnu-build-system) - (synopsis "Parallel bzip2 compression utility") - (description - "lbzip2 is a multi-threaded compression utility with support for the + ;; The last 2.5 release is 4 years behind the newest commit (from 2018) and + ;; may create files that can't even be decompressed by newer bzip2 versions. + (let ((commit "b6dc48a7b9bfe6b340ed1f6d72133608ad57144b") + (revision "0")) + (package + (name "lbzip2") + (version (git-version "2.5" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/kjn/lbzip2") + (commit commit))) + (sha256 + (base32 "140xp00dmjsr6c3dwb4dwf0pzlgf159igri321inbinsjiclkngy")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'unpack-gnulib + (lambda* (#:key inputs #:allow-other-keys) + (let ((gnulib (assoc-ref inputs "gnulib"))) + (copy-recursively gnulib "lib") + (setenv "PATH" (string-append "lib:" (getenv "PATH"))) + #t))) + (delete 'bootstrap) ; gnulib still has unpatched shebangs + (add-after 'patch-source-shebangs 'bootstrap + (lambda _ + (invoke "sh" "build-aux/autogen.sh") + #t))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("gnulib" + ,(let ((commit "2d431ac35c4943a3655c07ba91870d2323321b43")) + (origin + (method git-fetch) + (uri (git-reference + (url "git://git.savannah.gnu.org/gnulib.git") + (commit commit))) + (sha256 + (base32 "1f0xr4w89bqvhzsfcflcagdixidrk41k00k7kpr91w9lazfis4kf")) + (file-name (git-file-name "gnulib" commit))))) + ("perl" ,perl))) + (synopsis "Parallel bzip2 compression utility") + (description + "lbzip2 is a multi-threaded compression utility with support for the bzip2 compressed file format. lbzip2 can process standard bz2 files in parallel. It uses POSIX threading model (pthreads), which allows it to take full advantage of symmetric multiprocessing (SMP) systems. It has been proven to scale linearly, even to over one hundred processor cores. lbzip2 is fully compatible with bzip2 – both at file format and command line level.") - (home-page "http://www.lbzip2.org/") - (license license:gpl3+))) + ;; lbzip2.org now looks fishy. There is no source code to be found. + ;; Reported upstream: . + (home-page "https://github.com/kjn/lbzip2") + (license license:gpl3+)))) (define-public pbzip2 (package -- cgit v1.2.3 From 5654eef7e9d32e3a1981417d5db7de7b4f9f5391 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 17 Jul 2020 00:35:32 +0200 Subject: gnu: Update the LXQt home page. * gnu/packages/lxqt.scm (lxqt-build-tools, liblxqt, libsysstat) (lxqt-about, lxqt-admin, lxqt-config, lxqt-globalkeys) (lxqt-notificationd, lxqt-openssh-askpass, lxqt-panel, lxqt-policykit) (lxqt-powermanagement, lxqt-qtplugin, lxqt-runner, lxqt-session) (lxqt-sudo, lxqt-themes, libfm-qt, pcmanfm-qt, compton-conf, lximage-qt) (obconf-qt, pavucontrol-qt, qps, qtermwidget, qterminal, screengrab) (lxqt-archiver, lxqt)[home-page]: Update to a working domain. --- gnu/packages/lxqt.scm | 58 +++++++++++++++++++++++++-------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index d0da753e42..f445a7eb30 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -154,7 +154,7 @@ (define-public lxqt-build-tools (description "Lxqt-build-tools is providing several tools needed to build LXQt itself as well as other components maintained by the LXQt project.") - (home-page "https://lxqt.org") + (home-page "https://lxqt.github.io") (license license:lgpl2.1+))) (define-public libqtxdg @@ -235,7 +235,7 @@ (define-public liblxqt (native-inputs `(("lxqt-build-tools" ,lxqt-build-tools) ("qttools" ,qttools))) - (home-page "https://lxqt.org/") + (home-page "https://lxqt.github.io") (synopsis "Core utility library for all LXQt components") (description "liblxqt provides the basic libraries shared by the components of the LXQt desktop environment.") @@ -258,7 +258,7 @@ (define-public libsysstat `(("qtbase" ,qtbase))) (native-inputs `(("lxqt-build-tools" ,lxqt-build-tools))) - (home-page "https://lxqt.org/") + (home-page "https://lxqt.github.io") (synopsis "Library used to query system info and statistics") (description "libsysstat is a library to query system information like CPU and memory usage or network traffic.") @@ -304,7 +304,7 @@ (define-public lxqt-about (string-append (assoc-ref outputs "out") "/share/lxqt/translations"))) #t))))) - (home-page "https://lxqt.org") + (home-page "https://lxqt.github.io") (synopsis "Provides information about LXQt and the system") (description "lxqt-about is a dialogue window providing information about LXQt and the system it's running on.") @@ -350,7 +350,7 @@ (define-public lxqt-admin (string-append (assoc-ref outputs "out") "/share/lxqt/translations"))) #t))))) - (home-page "https://lxqt.org") + (home-page "https://lxqt.github.io") (synopsis "LXQt system administration tool") (description "lxqt-admin is providing two GUI tools to adjust settings of the operating system LXQt is running on.") @@ -419,7 +419,7 @@ (define-public lxqt-config (string-append (assoc-ref outputs "out") "/share/lxqt/translations"))) #t))))) - (home-page "https://lxqt.org") + (home-page "https://lxqt.github.io") (synopsis "Tools to configure LXQt and the underlying operating system") (description "lxqt-config is providing several tools involved in the configuration of both LXQt and the underlying operating system.") @@ -467,7 +467,7 @@ (define-public lxqt-globalkeys (string-append (assoc-ref outputs "out") "/share/lxqt/translations"))) #t))))) - (home-page "https://lxqt.org/") + (home-page "https://lxqt.github.io") (synopsis "Daemon used to register global keyboard shortcuts") (description "lxqt-globalkeys is providing tools to set global keyboard shortcuts in LXQt sessions, that is shortcuts which apply to the LXQt session @@ -514,7 +514,7 @@ (define-public lxqt-notificationd (string-append (assoc-ref outputs "out") "/share/lxqt/translations"))) #t))))) - (home-page "https://lxqt.org/") + (home-page "https://lxqt.github.io") (synopsis "The LXQt notification daemon") (description "lxqt-notificationd is LXQt's implementation of a daemon according to the Desktop Notifications Specification.") @@ -553,7 +553,7 @@ (define-public lxqt-openssh-askpass (string-append (assoc-ref outputs "out") "/share/lxqt/translations"))) #t))))) - (home-page "https://lxqt.org/") + (home-page "https://lxqt.github.io") (synopsis "GUI to query passwords on behalf of SSH agents") (description "lxqt-openssh-askpass is a GUI to query credentials on behalf of other programs.") @@ -619,7 +619,7 @@ (define-public lxqt-panel (string-append (assoc-ref outputs "out") "/share/lxqt/translations"))) #t))))) - (home-page "https://lxqt.org/") + (home-page "https://lxqt.github.io") (synopsis "The LXQt desktop panel") (description "lxqt-panel represents the taskbar of LXQt.") (license license:lgpl2.1+))) @@ -667,7 +667,7 @@ (define-public lxqt-policykit (string-append (assoc-ref outputs "out") "/share/lxqt/translations"))) #t))))) - (home-page "https://lxqt.org/") + (home-page "https://lxqt.github.io") (synopsis "The LXQt PolicyKit agent") (description "lxqt-policykit is the polkit authentication agent of LXQt.") @@ -715,7 +715,7 @@ (define-public lxqt-powermanagement (string-append (assoc-ref outputs "out") "/share/lxqt/translations"))) #t))))) - (home-page "https://lxqt.org/") + (home-page "https://lxqt.github.io") (synopsis "Power management module for LXQt") (description "lxqt-powermanagement is providing tools to monitor power management events and optionally trigger actions like e. g. shut down a system @@ -754,7 +754,7 @@ (define-public lxqt-qtplugin (("DESTINATION \"\\$\\{QT_PLUGINS_DIR\\}") "DESTINATION \"lib/qt5/plugins")) #t))))) - (home-page "https://lxqt.org/") + (home-page "https://lxqt.github.io") (synopsis "LXQt Qt platform integration plugin") (description "lxqt-qtplugin is providing a library libqtlxqt to integrate Qt with LXQt.") @@ -803,7 +803,7 @@ (define-public lxqt-runner (string-append (assoc-ref outputs "out") "/share/lxqt/translations"))) #t))))) - (home-page "https://lxqt.org/") + (home-page "https://lxqt.github.io") (synopsis "Tool used to launch programs quickly by typing their names") (description "lxqt-runner provides a GUI that comes up on the desktop and allows for launching applications or shutting down the system.") @@ -863,7 +863,7 @@ (define-public lxqt-session (string-append (assoc-ref outputs "out") "/share/lxqt/translations"))) #t))))) - (home-page "https://lxqt.org/") + (home-page "https://lxqt.github.io") (synopsis "Session manager for LXQt") (description "lxqt-session provides the standard session manager for the LXQt desktop environment.") @@ -904,7 +904,7 @@ (define-public lxqt-sudo (string-append (assoc-ref outputs "out") "/share/lxqt/translations"))) #t))))) - (home-page "https://lxqt.org/") + (home-page "https://lxqt.github.io") (synopsis "GUI frontend for sudo/su") (description "lxqt-sudo is a graphical front-end of commands sudo and su respectively. As such it enables regular users to launch applications with @@ -938,7 +938,7 @@ (define-public lxqt-themes (("DESTINATION \"\\$\\{LXQT_SHARE_DIR\\}") "DESTINATION \"share/lxqt")) #t))))) - (home-page "https://lxqt.org/") + (home-page "https://lxqt.github.io") (synopsis "Themes, graphics and icons for LXQt") (description "This package comprises a number of graphic files and themes for LXQt.") @@ -976,7 +976,7 @@ (define-public libfm-qt `(("pkg-config" ,pkg-config) ("lxqt-build-tools" ,lxqt-build-tools) ("qttools" ,qttools))) - (home-page "https://lxqt.org/") + (home-page "https://lxqt.github.io") (synopsis "Qt binding for libfm") (description "libfm-qt is the Qt port of libfm, a library providing components to build desktop file managers which belongs to LXDE.") @@ -1012,7 +1012,7 @@ (define-public pcmanfm-qt (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}") "DESTINATION \"etc/xdg")) #t))))) - (home-page "https://lxqt.org/") + (home-page "https://lxqt.github.io") (synopsis "File manager and desktop icon manager") (description "PCManFM-Qt is the Qt port of PCManFM, the file manager of LXDE.") @@ -1050,7 +1050,7 @@ (define-public compton-conf (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}") "DESTINATION \"etc/xdg")) #t))))) - (home-page "https://lxqt.org/") + (home-page "https://lxqt.github.io") (synopsis "GUI configuration tool for compton X composite manager") (description "@code{compton-conf} is a configuration tool for X composite manager Compton.") @@ -1080,7 +1080,7 @@ (define-public lximage-qt ("qttools" ,qttools))) (arguments '(#:tests? #f)) ; no tests - (home-page "https://lxqt.org/") + (home-page "https://lxqt.github.io") (synopsis "The image viewer and screenshot tool for lxqt") (description "LXImage-Qt is the Qt port of LXImage, a simple and fast image viewer.") @@ -1115,7 +1115,7 @@ (define-public obconf-qt ("qttools" ,qttools))) (arguments '(#:tests? #f)) ; no tests - (home-page "https://lxqt.org/") + (home-page "https://lxqt.github.io") (synopsis "Openbox configuration tool") (description "ObConf-Qt is a Qt port of ObConf, a configuration editor for window manager OpenBox.") @@ -1145,7 +1145,7 @@ (define-public pavucontrol-qt ("qttools" ,qttools))) (arguments '(#:tests? #f)) ; no tests - (home-page "https://lxqt.org/") + (home-page "https://lxqt.github.io") (synopsis "Pulseaudio mixer in Qt") (description "@code{pavucontrol-qt} is the Qt port of volume control @code{pavucontrol} of sound server @code{PulseAudio}.") @@ -1175,7 +1175,7 @@ (define-public qps ("qttools" ,qttools))) (arguments '(#:tests? #f)) ; no tests - (home-page "https://lxqt.org/") + (home-page "https://lxqt.github.io") (synopsis "Qt-based visual process status monitor") (description "@code{qps} is a monitor that displays the status of the processes currently in existence, much like code{top} or code{ps}.") @@ -1201,7 +1201,7 @@ (define-public qtermwidget ("qttools" ,qttools))) (arguments '(#:tests? #f)) ; no tests - (home-page "https://lxqt.org/") + (home-page "https://lxqt.github.io") (synopsis "The terminal widget for QTerminal") (description "QTermWidget is a terminal emulator widget for Qt 5.") (license license:gpl2+))) @@ -1227,7 +1227,7 @@ (define-public qterminal ("qttools" ,qttools))) (arguments '(#:tests? #f)) ; no tests - (home-page "https://lxqt.org/") + (home-page "https://lxqt.github.io") (synopsis "Lightweight Qt-based terminal emulator") (description "QTerminal is a lightweight Qt terminal emulator based on QTermWidget.") @@ -1256,7 +1256,7 @@ (define-public screengrab ("qttools" ,qttools))) (arguments '(#:tests? #f)) ; no tests - (home-page "https://lxqt.org/") + (home-page "https://lxqt.github.io") (synopsis "Crossplatform tool for fast making screenshots") (description "ScreenGrab is a program for fast creating screenshots, and easily publishing them on internet image hosting services.") @@ -1287,7 +1287,7 @@ (define-public lxqt-archiver ("qttools" ,qttools))) (arguments '(#:tests? #f)) - (home-page "https://lxqt.org/") + (home-page "https://lxqt.github.io") (synopsis "Simple & lightweight desktop-agnostic Qt file archiver") (description "This package provides a Qt graphical interface to archiving programs @@ -1394,5 +1394,5 @@ (define-public lxqt ("qterminal" ,qterminal))) (synopsis "The Lightweight Qt Desktop Environment") (description "LXQt is a lightweight Qt desktop environment.") - (home-page "https://lxqt.org/") + (home-page "https://lxqt.github.io") (license license:gpl2+))) -- cgit v1.2.3 From 3d3bc413b4288fbf45a61fb2136387878375ebef Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 5 Apr 2020 19:54:29 +0200 Subject: guix: java-utils: Add Maven-related phases. * guix/build/maven/java.scm: New file. * guix/build/maven/plugin.scm: New file. * guix/build/maven/pom.scm: New file. * Makefile.am (MODULES): Add them. * guix/build-system/ant.scm (%ant-build-system-modules): Add them to the build side. * guix/build/java-utils.scm (generate-plugin.xml, install-pom-file) (install-from-pom): New procedures. --- Makefile.am | 3 + guix/build-system/ant.scm | 3 + guix/build/java-utils.scm | 159 +++++++++++++- guix/build/maven/java.scm | 147 +++++++++++++ guix/build/maven/plugin.scm | 498 ++++++++++++++++++++++++++++++++++++++++++++ guix/build/maven/pom.scm | 422 +++++++++++++++++++++++++++++++++++++ 6 files changed, 1231 insertions(+), 1 deletion(-) create mode 100644 guix/build/maven/java.scm create mode 100644 guix/build/maven/plugin.scm create mode 100644 guix/build/maven/pom.scm diff --git a/Makefile.am b/Makefile.am index 20d43cd130..c067e37c5f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -212,6 +212,9 @@ MODULES = \ guix/build/emacs-utils.scm \ guix/build/java-utils.scm \ guix/build/lisp-utils.scm \ + guix/build/maven/java.scm \ + guix/build/maven/plugin.scm \ + guix/build/maven/pom.scm \ guix/build/graft.scm \ guix/build/bournish.scm \ guix/build/qt-utils.scm \ diff --git a/guix/build-system/ant.scm b/guix/build-system/ant.scm index b5626bd42d..1809d1f3d2 100644 --- a/guix/build-system/ant.scm +++ b/guix/build-system/ant.scm @@ -39,6 +39,9 @@ (define-module (guix build-system ant) (define %ant-build-system-modules ;; Build-side modules imported by default. `((guix build ant-build-system) + (guix build maven java) + (guix build maven plugin) + (guix build maven pom) (guix build java-utils) (guix build syscalls) ,@%gnu-build-system-modules)) diff --git a/guix/build/java-utils.scm b/guix/build/java-utils.scm index 8200638bee..a868e4d52c 100644 --- a/guix/build/java-utils.scm +++ b/guix/build/java-utils.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2016 Hartmut Goebel ;;; Copyright © 2016 Ricardo Wurmus ;;; Copyright © 2018 Alex Vong +;;; Copyright © 2020 Julien Lepiller ;;; ;;; This file is part of GNU Guix. ;;; @@ -20,9 +21,17 @@ (define-module (guix build java-utils) #:use-module (guix build utils) + #:use-module (guix build syscalls) + #:use-module (guix build maven pom) + #:use-module (guix build maven plugin) + #:use-module (ice-9 match) + #:use-module (sxml simple) #:export (ant-build-javadoc + generate-plugin.xml install-jars - install-javadoc)) + install-javadoc + install-pom-file + install-from-pom)) (define* (ant-build-javadoc #:key (target "javadoc") (make-flags '()) #:allow-other-keys) @@ -49,3 +58,151 @@ (define* (install-javadoc apidoc-directory) (mkdir-p docs) (copy-recursively apidoc-directory docs) #t))) + +(define* (install-pom-file pom-file) + "Install a @file{.pom} file to a maven repository structure in @file{lib/m2} +that respects the file's artifact ID and group ID. This requires the parent +pom, if any, to be present in the inputs so some of this information can be +fetched." + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (java-inputs (append (map cdr inputs) (map cdr outputs))) + (pom-content (get-pom pom-file)) + (version (pom-version pom-content java-inputs)) + (artifact (pom-artifactid pom-content)) + (group (group->dir (pom-groupid pom-content java-inputs))) + (repository (string-append out "/lib/m2/" group "/" artifact "/" + version "/")) + (pom-name (string-append repository artifact "-" version ".pom"))) + (mkdir-p (dirname pom-name)) + (copy-file pom-file pom-name)) + #t)) + +(define (install-jar-file-with-pom jar pom-file inputs) + "Unpack the jar archive, add the pom file, and repack it. This is necessary +to ensure that maven can find dependencies." + (format #t "adding ~a to ~a\n" pom-file jar) + (let* ((dir (mkdtemp! "jar-contents.XXXXXX")) + (manifest (string-append dir "/META-INF/MANIFEST.MF")) + (pom (get-pom pom-file)) + (artifact (pom-artifactid pom)) + (group (pom-groupid pom inputs)) + (version (pom-version pom inputs)) + (pom-dir (string-append "META-INF/maven/" group "/" artifact))) + (mkdir-p (string-append dir "/" pom-dir)) + (copy-file pom-file (string-append dir "/" pom-dir "/pom.xml")) + (with-directory-excursion dir + (with-output-to-file (string-append pom-dir "/pom.properties") + (lambda _ + (format #t "version=~a~%" version) + (format #t "groupId=~a~%" group) + (format #t "artifactId=~a~%" artifact))) + (invoke "jar" "uf" jar (string-append pom-dir "/pom.xml") + (string-append pom-dir "/pom.properties"))) + #t)) + +(define* (install-from-pom pom-file) + "Install a jar archive and its @var{pom-file} to a maven repository structure +in @file{lib/m2}. This requires the parent pom file, if any, to be present in +the inputs of the package being built. This phase looks either for a properly +named jar file (@file{artifactID-version.jar}) or the single jar in the build +directory. If there are more than one jar, and none is named appropriately, +the phase fails." + (lambda* (#:key inputs outputs jar-name #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (java-inputs (append (map cdr inputs) (map cdr outputs))) + (pom-content (get-pom pom-file)) + (version (pom-version pom-content java-inputs)) + (artifact (pom-artifactid pom-content)) + (group (group->dir (pom-groupid pom-content java-inputs))) + (repository (string-append out "/lib/m2/" group "/" artifact "/" + version "/")) + ;; We try to find the file that was built. If it was built from our + ;; generated ant.xml file, it is name jar-name, otherwise it should + ;; have the expected name for maven. + (jars (find-files "." (or jar-name (string-append artifact "-" + version ".jar")))) + ;; Otherwise, we try to find any jar file. + (jars (if (null? jars) + (find-files "." ".*.jar") + jars)) + (jar-name (string-append repository artifact "-" version ".jar")) + (pom-name (string-append repository artifact "-" version ".pom"))) + ;; Ensure we can override the file + (chmod pom-file #o644) + (fix-pom-dependencies pom-file java-inputs) + (mkdir-p (dirname jar-name)) + (copy-file pom-file pom-name) + ;; If there are too many jar files, we don't know which one to install, so + ;; fail. + (if (= (length jars) 1) + (begin + (copy-file (car jars) jar-name) + (install-jar-file-with-pom jar-name pom-file java-inputs)) + (throw 'no-jars jars))) + #t)) + +(define (sxml-indent sxml) + "Adds some indentation to @var{sxml}, an sxml value, to make reviewing easier +after the value is written to an xml file." + (define (sxml-indent-aux sxml lvl) + (match sxml + ((? string? str) str) + ((tag ('@ attr ...) content ...) + (cond + ((null? content) sxml) + ((string? (car content)) sxml) + (else + `(,tag (@ ,@attr) ,(sxml-indent-content content (+ lvl 1)))))) + ((tag content ...) + (cond + ((null? content) sxml) + ((string? (car content)) sxml) + (else `(,tag ,(sxml-indent-content content (+ lvl 1)))))) + (_ sxml))) + (define (sxml-indent-content sxml lvl) + (map + (lambda (sxml) + (list "\n" (string-join (make-list (* 2 lvl) " ") "") + (sxml-indent-aux sxml lvl))) + sxml)) + (sxml-indent-aux sxml 0)) + +(define* (generate-plugin.xml pom-file goal-prefix directory source-groups + #:key + (plugin.xml "build/classes/META-INF/maven/plugin.xml")) + "Generates the @file{plugin.xml} file that is required by Maven so it can +recognize the package as a plugin, and find the entry points in the plugin." + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((pom-content (get-pom pom-file)) + (java-inputs (append (map cdr inputs) (map cdr outputs))) + (name (pom-name pom-content)) + (description (pom-description pom-content)) + (dependencies (pom-dependencies pom-content)) + (version (pom-version pom-content java-inputs)) + (artifact (pom-artifactid pom-content)) + (groupid (pom-groupid pom-content java-inputs)) + (mojos + `(mojos + ,@(with-directory-excursion directory + (map + (lambda (group) + (apply generate-mojo-from-files maven-convert-type group)) + source-groups))))) + (mkdir-p (dirname plugin.xml)) + (with-output-to-file plugin.xml + (lambda _ + (sxml->xml + (sxml-indent + `(plugin + (name ,name) + (description ,description) + (groupId ,groupid) + (artifactId ,artifact) + (version ,version) + (goalPrefix ,goal-prefix) + (isolatedRealm "false") + (inheritedByDefault "true") + ,mojos + (dependencies + ,@dependencies))))))))) diff --git a/guix/build/maven/java.scm b/guix/build/maven/java.scm new file mode 100644 index 0000000000..daa4c88045 --- /dev/null +++ b/guix/build/maven/java.scm @@ -0,0 +1,147 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2019, 2020 Julien Lepiller +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (guix build maven java) + #:use-module (ice-9 peg) + #:use-module (ice-9 textual-ports) + #:export (parse-java-file)) + +(define-peg-pattern java-file body (and (* WS) (* (and top-level-statement + (* WS))))) +(define-peg-pattern WS none (or " " "\n" "\t" "\r")) +(define-peg-pattern top-level-statement body (or package import-pat class-pat comment inline-comment)) +(define-peg-pattern package all (and (ignore "package") (* WS) package-name + (* WS) (ignore ";"))) +(define-peg-pattern import-pat all (and (ignore "import") (* WS) + (? (and (ignore "static") (* WS))) + package-name + (* WS) (ignore ";"))) +(define-peg-pattern comment all (and (? (and annotation-pat (* WS))) (ignore "/*") + comment-part)) +(define-peg-pattern comment-part body (or (ignore (and (* "*") "/")) + (and (* "*") (+ comment-chr) comment-part))) +(define-peg-pattern comment-chr body (or "\t" "\n" (range #\ #\)) (range #\+ #\xffff))) +(define-peg-pattern inline-comment none (and (ignore "//") (* inline-comment-chr) + (ignore "\n"))) +(define-peg-pattern inline-comment-chr body (range #\ #\xffff)) +(define-peg-pattern package-name body (* (or (range #\a #\z) (range #\A #\Z) + (range #\0 #\9) "_" "."))) +(define-peg-pattern class-pat all (and (? (and annotation-pat (* WS))) + (* (ignore (or inline-comment comment))) + (? (and (ignore "private") (* WS))) + (? (and (ignore "public") (* WS))) + (? (and (ignore "static") (* WS))) + (? (and (ignore "final") (* WS))) + (? (and (ignore "abstract") (* WS))) + (ignore "class") + (* WS) package-name (* WS) + (? extends) + (? implements) + (ignore "{") class-body (ignore "}"))) +(define-peg-pattern extends all (? (and (ignore "extends") (* WS) + package-name (* WS)))) +(define-peg-pattern implements all (? (and (ignore "implements") (* WS) + package-name (* WS)))) +(define-peg-pattern annotation-pat all (and (ignore "@") package-name + (? (and + (* WS) + (ignore "(") (* WS) + annotation-attr (* WS) + (* (and (ignore ",") (* WS) + annotation-attr (* WS))) + (ignore ")"))))) +(define-peg-pattern annotation-attr all (or (and attr-name (* WS) (ignore "=") + (* WS) attr-value (* WS)) + attr-value)) +(define-peg-pattern attr-name all (* (or (range #\a #\z) (range #\A #\Z) (range #\0 #\9) + "_"))) +(define-peg-pattern attr-value all (or "true" "false" + (+ (or (range #\0 #\9) (range #\a #\z) + (range #\A #\Z) "." "_")) + array-pat + string-pat)) +(define-peg-pattern array-pat body + (and (ignore "{") (* WS) value + (* (and (* WS) "," (* WS) value)) + (* WS) (ignore "}"))) +(define-peg-pattern string-pat body (and (ignore "\"") (* string-chr) (ignore "\""))) +(define-peg-pattern string-chr body (or " " "!" (and (ignore "\\") "\"") + (and (ignore "\\") "\\") (range #\# #\xffff))) + +(define-peg-pattern class-body all (and (* WS) (* (and class-statement (* WS))))) +(define-peg-pattern class-statement body (or inline-comment comment param-pat + method-pat class-pat)) +(define-peg-pattern param-pat all (and (* (and annotation-pat (* WS) + (? (ignore inline-comment)) + (* WS))) + (? (and (ignore (or "private" "public" + "protected")) + (* WS))) + (? (and (ignore "static") (* WS))) + (? (and (ignore "volatile") (* WS))) + (? (and (ignore "final") (* WS))) + type-name (* WS) param-name + (? (and (* WS) (ignore "=") (* WS) value)) + (ignore ";"))) +(define-peg-pattern value none (or string-pat (+ valuechr))) +(define-peg-pattern valuechr none (or comment inline-comment "\n" + "\t" "\r" + (range #\ #\:) (range #\< #\xffff))) +(define-peg-pattern param-name all (* (or (range #\a #\z) (range #\A #\Z) (range #\0 #\9) + "_"))) +(define-peg-pattern type-name all type-pat) +(define-peg-pattern type-pat body + (or "?" + (and (* (or (range #\a #\z) (range #\A #\Z) (range #\0 #\9) "_")) + (? "...") + (? "[]") + (? type-param)))) +(define-peg-pattern type-param body (and "<" (? type-pat) + (* (and (* WS) "," (* WS) type-pat)) + (* WS) ">")) +(define-peg-pattern method-pat all (and (* (and annotation-pat (* WS))) + (? (and (ignore (or "private" "public" "protected")) + (* WS))) + (? (and (ignore type-param) (* WS))) + (? (and (ignore (or "abstract" "final")) + (* WS))) + (? (and (ignore "static") (* WS))) + type-name (* WS) param-name (* WS) + (ignore "(") + param-list (ignore ")") (* WS) + (? (and (ignore "throws") (* WS) package-name (* WS) + (* (and (ignore ",") (* WS) package-name + (* WS))))) + (or (ignore ";") + (and (ignore "{") (* WS) + (? (and method-statements (* WS))) + (ignore "}"))))) +(define-peg-pattern param-list all (and (* WS) (* (and (? annotation-pat) (* WS) + type-name (* WS) + param-name (* WS) + (? (ignore ",")) (* WS))))) +(define-peg-pattern method-statements none (and (or (+ method-chr) + (and "{" method-statements "}") + string-pat) + (? method-statements))) +(define-peg-pattern method-chr none (or "\t" "\n" "\r" " " "!" (range #\# #\z) "|" + (range #\~ #\xffff))) + + +(define (parse-java-file file) + (peg:tree (match-pattern java-file (call-with-input-file file get-string-all)))) diff --git a/guix/build/maven/plugin.scm b/guix/build/maven/plugin.scm new file mode 100644 index 0000000000..13148ab53c --- /dev/null +++ b/guix/build/maven/plugin.scm @@ -0,0 +1,498 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2019, 2020 Julien Lepiller +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (guix build maven plugin) + #:use-module (guix build maven java) + #:use-module (ice-9 textual-ports) + #:use-module (ice-9 match) + #:use-module (srfi srfi-9) + #:export (generate-mojo-from-files + default-convert-type + maven-convert-type)) + +(define-record-type mojo + (make-mojo package name goal description requires-dependency-collection + requires-dependency-resolution requires-direct-invocation? + requires-project? requires-reports? aggregator? requires-online? + inherited-by-default? instantiation-strategy execution-strategy + since thread-safe? phase parameters components) + mojo? + (package mojo-package) + (name mojo-name) + (goal mojo-goal) + (description mojo-description) + (requires-dependency-collection mojo-requires-dependency-collection) + (requires-dependency-resolution mojo-requires-dependency-resolution) + (requires-direct-invocation? mojo-requires-direct-invocation?) + (requires-project? mojo-requires-project?) + (requires-reports? mojo-requires-reports?) + (aggregator? mojo-aggregator?) + (requires-online? mojo-requires-online?) + (inherited-by-default? mojo-inherited-by-default?) + (instantiation-strategy mojo-instantiation-strategy) + (execution-strategy mojo-execution-strategy) + (since mojo-since) + (thread-safe? mojo-thread-safe?) + (phase mojo-phase) + (parameters mojo-parameters) + (components mojo-components)) + +(define* (update-mojo mojo + #:key + (package (mojo-package mojo)) + (name (mojo-name mojo)) + (goal (mojo-goal mojo)) + (description (mojo-description mojo)) + (requires-dependency-collection (mojo-requires-dependency-collection mojo)) + (requires-dependency-resolution (mojo-requires-dependency-resolution mojo)) + (requires-direct-invocation? (mojo-requires-direct-invocation? mojo)) + (requires-project? (mojo-requires-project? mojo)) + (requires-reports? (mojo-requires-reports? mojo)) + (aggregator? (mojo-aggregator? mojo)) + (requires-online? (mojo-requires-online? mojo)) + (inherited-by-default? (mojo-inherited-by-default? mojo)) + (instantiation-strategy (mojo-instantiation-strategy mojo)) + (execution-strategy (mojo-execution-strategy mojo)) + (since (mojo-since mojo)) + (thread-safe? (mojo-thread-safe? mojo)) + (phase (mojo-phase mojo)) + (parameters (mojo-parameters mojo)) + (components (mojo-components mojo))) + (make-mojo package name goal description requires-dependency-collection + requires-dependency-resolution requires-direct-invocation? + requires-project? requires-reports? aggregator? requires-online? + inherited-by-default? instantiation-strategy execution-strategy + since thread-safe? phase parameters components)) + +(define-record-type mojo-parameter + (make-mojo-parameter name type since required editable property description + configuration) + mojo-parameter? + (name mojo-parameter-name) + (type mojo-parameter-type) + (since mojo-parameter-since) + (required mojo-parameter-required) + (editable mojo-parameter-editable) + (property mojo-parameter-property) + (description mojo-parameter-description) + (configuration mojo-parameter-configuration)) + +(define* (update-mojo-parameter mojo-parameter + #:key (name (mojo-parameter-name mojo-parameter)) + (type (mojo-parameter-type mojo-parameter)) + (since (mojo-parameter-since mojo-parameter)) + (required (mojo-parameter-required mojo-parameter)) + (editable (mojo-parameter-editable mojo-parameter)) + (property (mojo-parameter-property mojo-parameter)) + (description (mojo-parameter-description mojo-parameter)) + (configuration (mojo-parameter-configuration mojo-parameter))) + (make-mojo-parameter name type since required editable property description + configuration)) + +(define-record-type + (make-mojo-component field role hint) + mojo-component? + (field mojo-component-field) + (role mojo-component-role) + (hint mojo-component-hint)) + +(define* (update-mojo-component mojo-component + #:key (field (mojo-component-field mojo-component)) + (role (mojo-component-role mojo-component)) + (hint (mojo-component-hint mojo-component))) + (make-mojo-component field role hint)) + +(define (generate-mojo-parameter mojo-parameter) + `(parameter (name ,(mojo-parameter-name mojo-parameter)) + (type ,(mojo-parameter-type mojo-parameter)) + ,@(if (mojo-parameter-since mojo-parameter) + `(since (mojo-parameter-since mojo-parameter)) + '()) + (required ,(if (mojo-parameter-required mojo-parameter) "true" "false")) + (editable ,(if (mojo-parameter-editable mojo-parameter) "true" "false")) + (description ,(mojo-parameter-description mojo-parameter)))) + +(define (generate-mojo-configuration mojo-parameter) + (let ((config (mojo-parameter-configuration mojo-parameter))) + (if (or config (mojo-parameter-property mojo-parameter)) + `(,(string->symbol (mojo-parameter-name mojo-parameter)) + (@ ,@(cons (list 'implementation (mojo-parameter-type mojo-parameter)) + (or config '()))) + ,@(if (mojo-parameter-property mojo-parameter) + (list (string-append "${" (mojo-parameter-property mojo-parameter) + "}")) + '())) + #f))) + +(define (generate-mojo-component mojo-component) + (let ((role (mojo-component-role mojo-component)) + (field (mojo-component-field mojo-component)) + (hint (mojo-component-hint mojo-component))) + `(requirement + (role ,role) + ,@(if hint + `((role-hint ,hint)) + '()) + (field-name ,field)))) + +(define (generate-mojo mojo) + `(mojo + (goal ,(mojo-goal mojo)) + (description ,(mojo-description mojo)) + ,@(let ((val (mojo-requires-dependency-collection mojo))) + (if val + `((requiresDependencyCollection ,val)) + '())) + ,@(let ((val (mojo-requires-dependency-resolution mojo))) + (if val + `((requiresDependencyResolution ,val)) + '())) + ,@(let ((val (mojo-requires-direct-invocation? mojo))) + (if val + `((requiresDirectInvocation ,val)) + '())) + ,@(let ((val (mojo-requires-project? mojo))) + (if val + `((requiresProject ,val)) + '())) + ,@(let ((val (mojo-requires-reports? mojo))) + (if val + `((requiresReports ,val)) + '())) + ,@(let ((val (mojo-aggregator? mojo))) + (if val + `((aggregator ,val)) + '())) + ,@(let ((val (mojo-requires-online? mojo))) + (if val + `((requiresOnline ,val)) + '())) + ,@(let ((val (mojo-inherited-by-default? mojo))) + (if val + `((inheritedByDefault ,val)) + '())) + ,@(let ((phase (mojo-phase mojo))) + (if phase + `((phase ,phase)) + '())) + (implementation ,(string-append (mojo-package mojo) "." (mojo-name mojo))) + (language "java") + (instantiationStrategy ,(mojo-instantiation-strategy mojo)) + (executionStrategy ,(mojo-execution-strategy mojo)) + ,@(let ((since (mojo-since mojo))) + (if since + `((since ,since)) + '())) + ,@(let ((val (mojo-thread-safe? mojo))) + (if val + `((threadSafe ,val)) + '())) + (parameters + ,(map generate-mojo-parameter (mojo-parameters mojo))) + (configuration + ,@(filter (lambda (a) a) (map generate-mojo-configuration (mojo-parameters mojo)))) + (requirements + ,@(map generate-mojo-component (mojo-components mojo))))) + + +(define (default-convert-type type) + (cond + ((equal? type "String") "java.lang.String") + ((equal? type "String[]") "java.lang.String[]") + ((equal? type "File") "java.io.File") + ((equal? type "File[]") "java.io.File[]") + ((equal? type "List") "java.util.List") + ((equal? type "Boolean") "java.lang.Boolean") + ((equal? type "Properties") "java.util.Properties") + ((and (> (string-length type) 5) + (equal? (substring type 0 4) "Map<")) + "java.util.Map") + ((and (> (string-length type) 6) + (equal? (substring type 0 5) "List<")) + "java.util.List") + ((and (> (string-length type) 15) + (equal? (substring type 0 14) "LinkedHashSet<")) + "java.util.LinkedHashSet") + (else type))) + +(define (maven-convert-type type) + (cond + ((equal? type "MavenProject") + "org.apache.maven.project.MavenProject") + (else (default-convert-type type)))) + +(define (update-mojo-from-file mojo file convert-type) + (define parse-tree (parse-java-file file)) + + (define (update-mojo-from-attrs mojo attrs) + (let loop ((mojo mojo) (attrs attrs)) + (match attrs + ('() mojo) + ((attr attrs ...) + (match attr + (('annotation-attr ('attr-name name) ('attr-value value)) + (cond + ((equal? name "name") + (loop (update-mojo mojo #:goal value) attrs)) + ((equal? name "defaultPhase") + (let* ((phase (car (reverse (string-split value #\.)))) + (phase (string-downcase phase)) + (phase (string-join (string-split phase #\_) "-"))) + (loop (update-mojo mojo #:phase phase) attrs))) + ((equal? name "requiresProject") + (loop (update-mojo mojo #:requires-project? value) attrs)) + ((equal? name "threadSafe") + (loop (update-mojo mojo #:thread-safe? value) attrs)) + ((equal? name "aggregator") + (loop (update-mojo mojo #:aggregator? value) attrs)) + ((equal? name "requiresDependencyCollection") + (loop + (update-mojo mojo #:requires-dependency-collection + (match value + ("ResolutionScope.COMPILE" "compile") + ("ResolutionScope.COMPILE_PLUS_RUNTIME" + "compile+runtime") + ("ResolutionScope.RUNTIME" "runtime") + ("ResolutionScope.RUNTIME_PLUS_SYSTEM" + "runtime+system") + ("ResolutionScope.TEST" "test") + ("ResolutionScope.PROVIDED" "provided") + ("ResolutionScope.SYSTEM" "system") + ("ResolutionScope.IMPORT" "import"))) + attrs)) + ((equal? name "requiresDependencyResolution") + (loop + (update-mojo mojo #:requires-dependency-resolution + (match value + ("ResolutionScope.COMPILE" "compile") + ("ResolutionScope.COMPILE_PLUS_RUNTIME" + "compile+runtime") + ("ResolutionScope.RUNTIME" "runtime") + ("ResolutionScope.RUNTIME_PLUS_SYSTEM" + "runtime+system") + ("ResolutionScope.TEST" "test") + ("ResolutionScope.PROVIDED" "provided") + ("ResolutionScope.SYSTEM" "system") + ("ResolutionScope.IMPORT" "import"))) + attrs)) + (else + (throw 'not-found-attr name)))) + ((attrs ...) (loop mojo attrs)) + (_ (loop mojo attrs))))))) + + (define (string->attr name) + (define (string-split-upper s) + (let ((i (string-index s char-set:upper-case))) + (if (and i (> i 0)) + (cons (substring s 0 i) (string-split-upper (substring s i))) + (list s)))) + (string->symbol + (string-join (map string-downcase (string-split-upper name)) "-"))) + + (define (update-mojo-parameter-from-attrs mojo-parameter attrs) + (match attrs + ('() mojo-parameter) + (('annotation-attr ('attr-name name) 'attr-value) + mojo-parameter) + ;(update-mojo-parameter-from-attrs mojo-parameter + ; `(annotation-attr (attr-name ,name) (attr-value "")))) + (('annotation-attr ('attr-name name) ('attr-value value)) + (cond + ((equal? name "editable") + (update-mojo-parameter mojo-parameter #:editable value)) + ((equal? name "required") + (update-mojo-parameter mojo-parameter #:required value)) + ((equal? name "property") + (update-mojo-parameter mojo-parameter #:property value)) + (else + (update-mojo-parameter mojo-parameter + #:configuration + (cons + (list (string->attr name) value) + (or + (mojo-parameter-configuration mojo-parameter) + '())))))) + ((attr attrs ...) + (update-mojo-parameter-from-attrs + (update-mojo-parameter-from-attrs mojo-parameter attr) + attrs)))) + + (define (update-mojo-component-from-attrs mojo-component inverse-import attrs) + (match attrs + ('() mojo-component) + ((attr attrs ...) + (match attr + (('annotation-attr ('attr-name name) ('attr-value value)) + (cond + ((equal? name "role") + (update-mojo-component-from-attrs + (update-mojo-component mojo-component + #:role (select-import inverse-import value convert-type)) + inverse-import + attrs)) + ((equal? name "hint") + (update-mojo-component-from-attrs + (update-mojo-component mojo-component #:hint value) + inverse-import + attrs)) + (else (throw 'not-found-attr name)))) + ((attrss ...) + (update-mojo-component-from-attrs + mojo-component inverse-import (append attrss attrs))))))) + + (define (add-mojo-parameter parameters name type last-comment attrs inverse-import) + (let loop ((parameters parameters)) + (match parameters + ('() (list (update-mojo-parameter-from-attrs + (make-mojo-parameter + ;; name convert since required editable property comment config + name (select-import inverse-import type convert-type) + #f #f #t #f last-comment #f) + attrs))) + ((parameter parameters ...) + (if (equal? (mojo-parameter-name parameter) name) + (cons (update-mojo-parameter-from-attrs + (make-mojo-parameter + name (select-import inverse-import type convert-type) + #f #f #t #f last-comment #f) + attrs) parameters) + (cons parameter (loop parameters))))))) + + (define (update-mojo-from-class-content mojo inverse-import content) + (let loop ((content content) + (mojo mojo) + (last-comment #f)) + (match content + ('() mojo) + ((('comment ('annotation-pat _ ...) last-comment) content ...) + (loop content mojo last-comment)) + ((('comment last-comment) content ...) + (loop content mojo last-comment)) + ((('param-pat ('annotation-pat annot-name attrs ...) ('type-name type) + ('param-name name)) content ...) + (cond + ((equal? annot-name "Parameter") + (loop content + (update-mojo mojo + #:parameters + (add-mojo-parameter + (mojo-parameters mojo) name type last-comment + attrs inverse-import)) + #f)) + ((equal? annot-name "Component") + (loop content + (update-mojo mojo + #:components + (cons (update-mojo-component-from-attrs + (make-mojo-component + name + (select-import inverse-import type + convert-type) + #f) + inverse-import + attrs) + (mojo-components mojo))) + #f)) + (else (throw 'not-found-annot annot-name)))) + ((('class-pat _ ...) content ...) + (loop content mojo #f)) + ((('param-pat _ ...) content ...) + (loop content mojo #f)) + ((('method-pat _ ...) content ...) + (loop content mojo #f))))) + + (define (update-inverse-import inverse-import package) + (let ((package-name (car (reverse (string-split package #\.))))) + (cons (cons package-name package) inverse-import))) + + (define (select-import inverse-import package convert-type) + (let* ((package (car (string-split package #\<))) + (package (string-split package #\.)) + (rest (reverse (cdr package))) + (rest (cond + ((null? rest) '()) + ((equal? (car rest) "class") (cdr rest)) + (else rest))) + (base (or (assoc-ref inverse-import (car package)) (car package)))) + (convert-type (string-join (cons base rest) ".")))) + + (let loop ((content parse-tree) + (mojo mojo) + (inverse-import '()) + (last-comment #f)) + (if (null? content) + mojo + (match content + ((tls content ...) + (match tls + (('package package) + (loop content (update-mojo mojo #:package package) inverse-import + last-comment)) + (('import-pat package) + (loop content mojo (update-inverse-import inverse-import package) + last-comment)) + (('comment last-comment) + (loop content mojo inverse-import last-comment)) + (('class-pat class-tls ...) + (let loop2 ((class-tls class-tls) (mojo mojo)) + (match class-tls + ('() (loop content mojo inverse-import #f)) + (((? string? name) class-tls ...) + (loop2 class-tls (update-mojo mojo #:name name))) + ((('annotation-pat annot-name (attrs ...)) class-tls ...) + (loop2 + class-tls + (update-mojo-from-attrs mojo attrs))) + ((('class-body class-content ...) class-tls ...) + (loop2 + class-tls + (update-mojo-from-class-content + mojo inverse-import class-content))) + ((_ class-tls ...) + (loop2 class-tls mojo))))) + (_ + (loop content mojo inverse-import last-comment)))))))) + +(define (generate-mojo-from-files convert-type . files) + (let ((mojo (make-mojo #f #f #f #f #f #f #f #f #f #f #f #f "per-lookup" + "once-per-session" #f #f #f '() '()))) + (let loop ((files files) (mojo mojo)) + (if (null? files) + (generate-mojo mojo) + (loop + (cdr files) + (update-mojo-from-file + (update-mojo mojo + #:package #f + #:name #f + #:goal #f + #:description #f + #:requires-dependency-resolution #f + #:requires-direct-invocation? #f + #:requires-project? #f + #:requires-reports? #f + #:aggregator? #f + #:requires-online? #f + #:inherited-by-default? #f + #:instantiation-strategy "per-lookup" + #:execution-strategy "once-per-session" + #:since #f + #:thread-safe? #f + #:phase #f) + (car files) + convert-type)))))) diff --git a/guix/build/maven/pom.scm b/guix/build/maven/pom.scm new file mode 100644 index 0000000000..aa60af2afa --- /dev/null +++ b/guix/build/maven/pom.scm @@ -0,0 +1,422 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2019, 2020 Julien Lepiller +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (guix build maven pom) + #:use-module (sxml simple) + #:use-module (system foreign) + #:use-module (ice-9 match) + #:use-module (srfi srfi-1) + #:export (get-pom + pom-ref + pom-description + pom-name + pom-version + pom-artifactid + pom-groupid + pom-dependencies + group->dir + fix-pom-dependencies)) + +(define (get-pom file) + "Return the content of a @file{.pom} file." + (let ((pom-content (call-with-input-file file xml->sxml))) + (match pom-content + (('*TOP* _ (_ ('@ _ ...) content ...)) + content) + (('*TOP* (_ ('@ _ ...) content ...)) + content) + (('*TOP* _ (_ content ...)) + content) + (('*TOP* (_ content ...)) + content)))) + +(define (pom-ref content attr) + "Gets a value associated to @var{attr} in @var{content}, an sxml value that +represents a @file{.pom} file content, or parts of it." + (or + (assoc-ref + content + (string->symbol + (string-append "http://maven.apache.org/POM/4.0.0:" attr))) + (assoc-ref content (string->symbol attr)))) + +(define (get-parent content) + (pom-ref content "parent")) + +(define* (find-parent content inputs #:optional local-packages) + "Find the parent pom for the pom file whith @var{content} in a package's +@var{inputs}. When the parent pom cannot be found in @var{inputs}, but +@var{local-packages} is defined, the parent pom is looked up in it. + +@var{local-packages} is an association list of groupID to an association list +of artifactID to version number. + +The result is an sxml document that describes the content of the parent pom, or +of an hypothetical parent pom if it was generated from @var{local-packages}. +If no result is found, the result is @code{#f}." + (let ((parent (pom-ref content "parent"))) + (if parent + (let* ((groupid (car (pom-ref parent "groupId"))) + (artifactid (car (pom-ref parent "artifactId"))) + (version (car (pom-ref parent "version"))) + (pom-file (string-append "lib/m2/" (group->dir groupid) + "/" artifactid "/" version "/" + artifactid "-" version ".pom")) + (java-inputs (filter + (lambda (input) + (file-exists? (string-append input "/" pom-file))) + inputs)) + (java-inputs (map (lambda (input) (string-append input "/" pom-file)) + java-inputs))) + (if (null? java-inputs) + (let ((version (assoc-ref (assoc-ref local-packages groupid) artifactid))) + (if version + `((groupId ,groupid) + (artifactId ,artifactid) + (version ,version)) + #f)) + (get-pom (car java-inputs)))) + #f))) + +(define* (pom-groupid content inputs #:optional local-packages) + "Find the groupID of a pom file, potentially looking at its parent pom file. +See @code{find-parent} for the meaning of the arguments." + (if content + (let ((res (or (pom-ref content "groupId") + (pom-groupid (find-parent content inputs local-packages) + inputs)))) + (cond + ((string? res) res) + ((null? res) #f) + ((list? res) (car res)) + (else #f))) + #f)) + +(define (pom-artifactid content) + "Find the artifactID of a pom file, from its sxml @var{content}." + (let ((res (pom-ref content "artifactId"))) + (if (and res (>= (length res) 1)) + (car res) + #f))) + +(define* (pom-version content inputs #:optional local-packages) + "Find the version of a pom file, potentially looking at its parent pom file. +See @code{find-parent} for the meaning of the arguments." + (if content + (let ((res (or (pom-ref content "version") + (pom-version (find-parent content inputs local-packages) + inputs)))) + (cond + ((string? res) res) + ((null? res) #f) + ((list? res) (car res)) + (else #f))) + #f)) + +(define (pom-name content) + "Return the name of the package as contained in the sxml @var{content} of the +pom file." + (let ((res (pom-ref content "name"))) + (if (and res (>= (length res) 1)) + (car res) + #f))) + +(define (pom-description content) + "Return the description of the package as contained in the sxml @var{content} +of the pom file." + (let ((res (pom-ref content "description"))) + (if (and res (>= (length res) 1)) + (car res) + #f))) + +(define (pom-dependencies content) + "Return the list of dependencies listed in the sxml @var{content} of the pom +file." + (filter + (lambda (a) a) + (map + (match-lambda + ((? string? _) #f) + (('http://maven.apache.org/POM/4.0.0:dependency content ...) + (let loop ((content content) (groupid #f) (artifactid #f) (version #f) (scope #f)) + (match content + ('() + `(dependency + (groupId ,groupid) + (artifactId ,artifactid) + (version ,version) + ,@(if scope `((scope ,scope)) '()))) + (((? string? _) content ...) + (loop content groupid artifactid version scope)) + ((('http://maven.apache.org/POM/4.0.0:scope scope) content ...) + (loop content groupid artifactid version scope)) + ((('http://maven.apache.org/POM/4.0.0:groupId groupid) content ...) + (loop content groupid artifactid version scope)) + ((('http://maven.apache.org/POM/4.0.0:artifactId artifactid) content ...) + (loop content groupid artifactid version scope)) + ((('http://maven.apache.org/POM/4.0.0:version version) content ...) + (loop content groupid artifactid version scope)) + ((_ content ...) + (loop content groupid artifactid version scope)))))) + (pom-ref content "dependencies")))) + +(define version-compare + (let ((strverscmp + (let ((sym (or (dynamic-func "strverscmp" (dynamic-link)) + (error "could not find `strverscmp' (from GNU libc)")))) + (pointer->procedure int sym (list '* '*))))) + (lambda (a b) + "Return '> when A denotes a newer version than B, +'< when A denotes a older version than B, +or '= when they denote equal versions." + (let ((result (strverscmp (string->pointer a) (string->pointer b)))) + (cond ((positive? result) '>) + ((negative? result) '<) + (else '=)))))) + +(define (version>? a b) + "Return #t when A denotes a version strictly newer than B." + (eq? '> (version-compare a b))) + +(define (fix-maven-xml sxml) + "When writing an xml file from an sxml representation, it is not possible to +use namespaces in tag names. This procedure takes an @var{sxml} representation +of a pom file and removes the namespace uses. It also adds the required bits +to re-declare the namespaces in the top-level element." + (define (fix-xml sxml) + (match sxml + ((tag ('@ opts ...) rest ...) + (if (> (string-length (symbol->string tag)) + (string-length "http://maven.apache.org/POM/4.0.0:")) + (let* ((tag (symbol->string tag)) + (tag (substring tag (string-length + "http://maven.apache.org/POM/4.0.0:"))) + (tag (string->symbol tag))) + `(,tag (@ ,@opts) ,@(map fix-xml rest))) + `(,tag (@ ,@opts) ,@(map fix-xml rest)))) + ((tag (rest ...)) + (if (> (string-length (symbol->string tag)) + (string-length "http://maven.apache.org/POM/4.0.0:")) + (let* ((tag (symbol->string tag)) + (tag (substring tag (string-length + "http://maven.apache.org/POM/4.0.0:"))) + (tag (string->symbol tag))) + `(,tag ,@(map fix-xml rest))) + `(,tag ,@(map fix-xml rest)))) + ((tag rest ...) + (if (> (string-length (symbol->string tag)) + (string-length "http://maven.apache.org/POM/4.0.0:")) + (let* ((tag (symbol->string tag)) + (tag (substring tag (string-length + "http://maven.apache.org/POM/4.0.0:"))) + (tag (string->symbol tag))) + `(,tag ,@(map fix-xml rest))) + `(,tag ,@(map fix-xml rest)))) + (_ sxml))) + + `((*TOP* (*PI* xml "version=\"1.0\" encoding=\"UTF-8\"") + (project (@ (xmlns "http://maven.apache.org/POM/4.0.0") + (xmlns:xsi "http://www.w3.org/2001/XMLSchema-instance") + (xmlns:schemaLocation "http://maven.apache.org/POM/4.0.0 + http://maven.apache.org/xsd/maven-4.0.0.xsd")) + ,(map fix-xml sxml))))) + +(define (group->dir group) + "Convert a group ID to a directory path." + (string-join (string-split group #\.) "/")) + +(define* (fix-pom-dependencies pom-file inputs + #:key with-plugins? with-build-dependencies? + (excludes '()) (local-packages '())) + "Open @var{pom-file}, and override its content, rewritting its dependencies +to set their version to the latest version available in the @var{inputs}. + +@var{#:with-plugins?} controls whether plugins are also overiden. +@var{#:with-build-dependencies?} controls whether build dependencies (whose +scope is not empty) are also overiden. By default build dependencies and +plugins are not overiden. + +@var{#:excludes} is an association list of groupID to a list of artifactIDs. +When a pair (groupID, artifactID) is present in the list, its entry is +removed instead of being overiden. If the entry is ignored because of the +previous arguments, the entry is not removed. + +@var{#:local-packages} is an association list that contains additional version +information for packages that are not in @var{inputs}. If the package is +not found in @var{inputs}, information from this list is used instead to determine +the latest version of the package. This is an association list of group IDs +to another association list of artifact IDs to a version number. + +Returns nothing, but overides the @var{pom-file} as a side-effect." + (define pom (get-pom pom-file)) + + (define (ls dir) + (let ((dir (opendir dir))) + (let loop ((res '())) + (let ((entry (readdir dir))) + (if (eof-object? entry) + res + (loop (cons entry res))))))) + + (define fix-pom + (match-lambda + ('() '()) + ((tag rest ...) + (match tag + (('http://maven.apache.org/POM/4.0.0:dependencies deps ...) + `((http://maven.apache.org/POM/4.0.0:dependencies ,(fix-deps deps)) + ,@(fix-pom rest))) + (('http://maven.apache.org/POM/4.0.0:dependencyManagement deps ...) + `((http://maven.apache.org/POM/4.0.0:dependencyManagement + ,(fix-dep-management deps)) + ,@(fix-pom rest))) + (('http://maven.apache.org/POM/4.0.0:build build ...) + (if with-plugins? + `((http://maven.apache.org/POM/4.0.0:build ,(fix-build build)) + ,@(fix-pom rest)) + (cons tag (fix-pom rest)))) + (tag (cons tag (fix-pom rest))))))) + + (define fix-dep-management + (match-lambda + ('() '()) + ((tag rest ...) + (match tag + (('http://maven.apache.org/POM/4.0.0:dependencies deps ...) + `((http://maven.apache.org/POM/4.0.0:dependencies ,(fix-deps deps #t)) + ,@(fix-dep-management rest))) + (tag (cons tag (fix-dep-management rest))))))) + + (define* (fix-deps deps #:optional optional?) + (match deps + ('() '()) + ((tag rest ...) + (match tag + (('http://maven.apache.org/POM/4.0.0:dependency dep ...) + `((http://maven.apache.org/POM/4.0.0:dependency ,(fix-dep dep optional?)) + ,@(fix-deps rest optional?))) + (tag (cons tag (fix-deps rest optional?))))))) + + (define fix-build + (match-lambda + ('() '()) + ((tag rest ...) + (match tag + (('http://maven.apache.org/POM/4.0.0:pluginManagement management ...) + `((http://maven.apache.org/POM/4.0.0:pluginManagement + ,(fix-management management)) + ,@(fix-build rest))) + (('http://maven.apache.org/POM/4.0.0:plugins plugins ...) + `((http://maven.apache.org/POM/4.0.0:plugins + ,(fix-plugins plugins)) + ,@(fix-build rest))) + (tag (cons tag (fix-build rest))))))) + + (define fix-management + (match-lambda + ('() '()) + ((tag rest ...) + (match tag + (('http://maven.apache.org/POM/4.0.0:plugins plugins ...) + `((http://maven.apache.org/POM/4.0.0:plugins + ,(fix-plugins plugins #t)) + ,@(fix-management rest))) + (tag (cons tag (fix-management rest))))))) + + (define* (fix-plugins plugins #:optional optional?) + (match plugins + ('() '()) + ((tag rest ...) + (match tag + (('http://maven.apache.org/POM/4.0.0:plugin plugin ...) + (let ((group (or (pom-groupid plugin inputs) "org.apache.maven.plugins")) + (artifact (pom-artifactid plugin))) + (if (member artifact (or (assoc-ref excludes group) '())) + (fix-plugins rest optional?) + `((http://maven.apache.org/POM/4.0.0:plugin + ,(fix-plugin plugin optional?)) + ,@(fix-plugins rest optional?))))) + (tag (cons tag (fix-plugins rest optional?))))))) + + (define* (fix-plugin plugin #:optional optional?) + (let* ((artifact (pom-artifactid plugin)) + (group (or (pom-groupid plugin inputs) "org.apache.maven.plugins")) + (version (or (assoc-ref (assoc-ref local-packages group) artifact) + (find-version inputs group artifact optional?) + (pom-version plugin inputs)))) + (if (pom-version plugin inputs) + (map + (lambda (tag) + (match tag + (('http://maven.apache.org/POM/4.0.0:version _) + `(http://maven.apache.org/POM/4.0.0:version ,version)) + (('version _) + `(http://maven.apache.org/POM/4.0.0:version ,version)) + (tag tag))) + plugin) + (cons `(http://maven.apache.org/POM/4.0.0:version ,version) plugin)))) + + (define* (fix-dep dep #:optional optional?) + (let* ((artifact (pom-artifactid dep)) + (group (or (pom-groupid dep inputs) (pom-groupid pom inputs))) + (scope (pom-ref dep "scope")) + (is-optional? (equal? (pom-ref dep "optional") '("true")))) + (format (current-error-port) "maven: ~a:~a :: ~a (optional: ~a)~%" + group artifact scope optional?) + (if (or (and (not (equal? scope '("test"))) (not is-optional?)) + with-build-dependencies?) + (let ((version (or (assoc-ref (assoc-ref local-packages group) artifact) + (find-version inputs group artifact optional?) + (pom-version dep inputs)))) + (if (pom-version dep inputs) + (map + (lambda (tag) + (match tag + (('http://maven.apache.org/POM/4.0.0:version _) + `(http://maven.apache.org/POM/4.0.0:version ,version)) + (('version _) + `(http://maven.apache.org/POM/4.0.0:version ,version)) + (_ tag))) + dep) + (cons `(http://maven.apache.org/POM/4.0.0:version ,version) dep))) + dep))) + + (define* (find-version inputs group artifact #:optional optional?) + (let* ((directory (string-append "lib/m2/" (group->dir group) + "/" artifact)) + (java-inputs (filter + (lambda (input) + (file-exists? (string-append input "/" directory))) + inputs)) + (java-inputs (map (lambda (input) (string-append input "/" directory)) + java-inputs)) + (versions (append-map ls java-inputs)) + (versions (sort versions version>?))) + (if (null? versions) + (if optional? + #f + (begin + (format (current-error-port) "maven: ~a:~a is missing from inputs~%" + group artifact) + (throw 'no-such-input group artifact))) + (car versions)))) + + (let ((tmpfile (string-append pom-file ".tmp"))) + (with-output-to-file pom-file + (lambda _ + (sxml->xml (fix-maven-xml (fix-pom pom))))))) -- cgit v1.2.3 From 30b7704a57001aabe3335c9feed8b35fe87ddbb8 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 5 Apr 2020 21:17:43 +0200 Subject: gnu: java-asm: Remove dependency on bnd libraries. * gnu/packages/java.scm (java-asm): Remove dependency on java-aqute-bndlib and java-aqute-libg. (java-slf4j-api-bootstrap, java-aqute-bndlib-bootstrap) (java-aqute-libg-bootstrap): Remove unused variables. --- gnu/packages/java.scm | 53 ++++++++------------------------------------------- 1 file changed, 8 insertions(+), 45 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 5970de1f45..5f80b1342c 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2016 Leo Famulari ;;; Copyright © 2016, 2017 Roel Janssen ;;; Copyright © 2017, 2019 Carlo Zancanaro -;;; Copyright © 2017, 2018, 2019 Julien Lepiller +;;; Copyright © 2017-2020 Julien Lepiller ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2016, 2017, 2018 Alex Vong ;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice @@ -4535,9 +4535,6 @@ (define-public java-asm (base32 "115l5pqblirdkmzi32dxx7gbcm4jy0s14y5wircr6h8jdr9aix00")))) (build-system ant-build-system) - (propagated-inputs - `(("java-aqute-bndlib" ,java-aqute-bndlib) - ("java-aqute-libg" ,java-aqute-libg))) (arguments `(#:build-target "compile" ;; The tests require an old version of Janino, which no longer compiles @@ -4554,6 +4551,12 @@ (define-public java-asm "-Dbiz.aQute.bnd.path=dummy-path") #:phases (modify-phases %standard-phases + (add-before 'build 'remove-bnd-dependency + (lambda _ + ;; This file is the only one to require bnd, and is not needed + ;; because we don't build a bundle. + (delete-file "src/org/objectweb/asm/tools/ModuleInfoBndPlugin.java") + #t)) (add-before 'install 'build-jars (lambda* (#:key make-flags #:allow-other-keys) ;; We cannot use the "jar" target because it depends on a couple @@ -4582,13 +4585,7 @@ (define java-asm-bootstrap (arguments (substitute-keyword-arguments (package-arguments java-asm) ((#:tests? _) #f))) - (native-inputs `()) - (propagated-inputs - `(("java-aqute-bndlib" ,java-aqute-bndlib-bootstrap) - ("java-aqute-libg" ,java-aqute-libg-bootstrap) - ,@(delete `("java-aqute-bndlib" ,java-aqute-bndlib) - (delete `("java-aqute-libg" ,java-aqute-libg) - (package-inputs java-asm))))))) + (native-inputs `()))) (define-public java-cglib (package @@ -7017,15 +7014,6 @@ (define-public java-slf4j-api time.") (license license:expat))) -(define java-slf4j-api-bootstrap - (package - (inherit java-slf4j-api) - (name "java-slf4j-api-bootstrap") - (inputs `()) - (arguments - (substitute-keyword-arguments (package-arguments java-slf4j-api) - ((#:tests? _ #f) #f))))) - (define-public java-slf4j-simple (package (name "java-slf4j-simple") @@ -8309,20 +8297,6 @@ (define-public java-aqute-libg `(("hamcrest" ,java-hamcrest-core) ("java-junit" ,java-junit))))) -(define java-aqute-libg-bootstrap - (package - (inherit java-aqute-libg) - (name "java-aqute-libg-bootstrap") - (arguments - ;; Disable tests, at this stage of bootstrap we have no test frameworks. - (substitute-keyword-arguments (package-arguments java-aqute-libg) - ((#:tests? _ #f) #f))) - (inputs - `(("slf4j-bootstrap" ,java-slf4j-api-bootstrap) - ,@(delete `("slf4j" ,java-slf4j-api) - (package-inputs java-aqute-libg)))) - (native-inputs '()))) - (define-public java-aqute-bndlib (package (inherit java-aqute-bnd-annotation) @@ -8346,17 +8320,6 @@ (define-public java-aqute-bndlib ("promise" ,java-osgi-util-promise) ("osgi" ,java-osgi-core))))) -(define java-aqute-bndlib-bootstrap - (package - (inherit java-aqute-bndlib) - (name "java-aqute-bndlib-bootstrap") - (inputs - `(("slf4j-bootstrap" ,java-slf4j-api-bootstrap) - ("java-aqute-libg-bootstrap" ,java-aqute-libg-bootstrap) - ,@(delete `("slf4j" ,java-slf4j-api) - (delete `("java-aqute-libg" ,java-aqute-libg) - (package-inputs java-aqute-bndlib))))))) - (define-public java-ops4j-pax-tinybundles (package (name "java-ops4j-pax-tinybundles") -- cgit v1.2.3 From 031516d69a4cd8d4d5c4ed6989b1f5b39eb607c1 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 5 Apr 2020 21:21:23 +0200 Subject: gnu: Add java-hamcrest-library. * gnu/packages/java.scm (java-hamcrest-library): New variable. --- gnu/packages/java.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 5f80b1342c..a3781a2da5 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -3702,6 +3702,16 @@ (define-public java-hamcrest-core testing frameworks, mocking libraries and UI validation rules.") (license license:bsd-2))) +(define-public java-hamcrest-library + (package + (inherit java-hamcrest-core) + (name "java-hamcrest-library") + (arguments + (substitute-keyword-arguments (package-arguments java-hamcrest-core) + ((#:build-target _) "library"))) + (propagated-inputs + `(("java-hamcrest-core" ,java-hamcrest-core))))) + (define-public java-junit (package (name "java-junit") -- cgit v1.2.3 From 29428e10b832e99af70eafdb381a45bd701b3397 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 5 Apr 2020 21:30:26 +0200 Subject: gnu: java-junit: Enable tests. * gnu/packages/java.scm (java-junit)[arguments]: Enable tests. --- gnu/packages/java.scm | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index a3781a2da5..c74afa726b 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -3733,10 +3733,21 @@ (define-public java-junit #t)))) (build-system ant-build-system) (arguments - `(#:tests? #f ; no tests - #:jar-name "junit.jar")) - (inputs + `(#:jar-name "junit.jar" + #:source-dir "src/main/java" + #:test-dir "src/test" + #:test-exclude (list "**/SimpleTest.java" "**/StackTracesTest.java" + "**/RuleChainTest.java" "**/TestWatchmanTest.java") + #:phases + (modify-phases %standard-phases + (add-before 'check 'copy-test-resources + (lambda _ + (copy-recursively "src/test/resources" "build/test-classes") + #t))))) + (propagated-inputs `(("java-hamcrest-core" ,java-hamcrest-core))) + (native-inputs + `(("java-hamcrest-library" ,java-hamcrest-library))) (home-page "https://junit.org/junit4/") (synopsis "Test framework for Java") (description -- cgit v1.2.3 From e0ee843f77b495cc2d8f4a402358b4628a687bfa Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 5 Apr 2020 21:31:30 +0200 Subject: gnu: java-jarjar: unbundle maven-plugin-api. * gnu/packages/java.scm (java-jarjar): Unbundle maven-plugin-api. --- gnu/packages/java.scm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index c74afa726b..70d8b619df 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -3544,10 +3544,10 @@ (define-public java-jarjar (snippet '(begin ;; Delete bundled thirds-party jar archives. - ;; TODO: unbundle maven-plugin-api. - (delete-file "lib/asm-4.0.jar") - (delete-file "lib/asm-commons-4.0.jar") - (delete-file "lib/junit-4.8.1.jar") + (delete-file-recursively "lib") + (delete-file "src/test/enumtest.jar") + ;; the CLASSPATH needs this directory, create an empty one + (mkdir-p "lib") #t)))) (build-system ant-build-system) (arguments @@ -3576,6 +3576,13 @@ (define-public java-jarjar ""))) #t)) + (add-before 'build 'remove-maven-dependency + (lambda _ + ;; We do not need to build jarjar as a maven plugin just yet, so + ;; remove this file. Maven requires jarjar (but not that plugin), + ;; so removing it improves the bootstrap. + (delete-file "src/main/com/tonicsystems/jarjar/JarJarMojo.java") + #t)) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let ((target (string-append (assoc-ref outputs "out") -- cgit v1.2.3 From fff4fcc4e22f11788dfaf103141ff6cffbf788dc Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 16 May 2020 17:04:35 +0200 Subject: gnu: java-junit: Install from pom file. * gnu/packages/java.scm (java-junit)[arguments]: Replace install phase. (java-hamcrest-core)[arguments]: Replace install phase. (java-hamcrest-library)[arguments]: Replace install phase. (java-cisd-jhdf5, java-commons-math3, java-commons-collections4) (java-commons-io, java-commons-exec-1.1, java-commons-exec) (java-commons-lang3, java-commons-codec, java-native-access) (java-native-access-platform, java-hamcrest-all): Change junit and hamcrest jar location accordingly. (java-hamcrest-all): Use old install phase of java-hamcrest-core. * gnu/packages/maths.scm (java-hdf): Change junit and hamcrest jar location accordingly. --- gnu/packages/java.scm | 149 +++++++++++++++++++++++++++++++------------------ gnu/packages/maths.scm | 13 +++-- 2 files changed, 105 insertions(+), 57 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 70d8b619df..9d32a51645 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -3202,11 +3202,10 @@ (define-public java-cisd-jhdf5 (string-append (assoc-ref inputs "java-testng") "/share/java/java-testng.jar")) (("\\$\\{lib\\}/junit4/junit.jar") - (string-append (assoc-ref inputs "java-junit") - "/share/java/junit.jar")) + (car (find-files (assoc-ref inputs "java-junit") "jar$"))) (("\\$\\{lib\\}/jmock/hamcrest/hamcrest-core.jar") - (string-append (assoc-ref inputs "java-hamcrest-core") - "/share/java/hamcrest-core.jar"))) + (car (find-files (assoc-ref inputs "java-hamcrest-core") + "jar$")))) ;; Remove dependency on ch.rinn.restrictions (with-directory-excursion "source/java/ch/systemsx/cisd/hdf5/" (substitute* '("BitSetConversionUtils.java" @@ -3625,6 +3624,7 @@ (define-public java-hamcrest-core (arguments `(#:tests? #f ; Tests require junit #:modules ((guix build ant-build-system) + (guix build java-utils) (guix build utils) (srfi srfi-1)) #:make-flags (list (string-append "-Dversion=" ,version)) @@ -3678,28 +3678,18 @@ (define-public java-hamcrest-core (lambda _ (mkdir-p "lib/integration") #t)) + (add-before 'build 'create-pom + (lambda _ + (substitute* "pom/hamcrest-core.pom" + (("@VERSION@") ,version)) + #t)) (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((target (string-append (assoc-ref outputs "out") - "/share/java/")) - (version-suffix ,(string-append "-" version ".jar")) - (install-without-version-suffix - (lambda (jar) - (copy-file jar - (string-append target - (basename jar version-suffix) - ".jar"))))) - (mkdir-p target) - (for-each - install-without-version-suffix - (find-files "build" - (lambda (name _) - (and (string-suffix? ".jar" name) - (not (string-suffix? "-sources.jar" name))))))) - #t))))) + (install-from-pom "pom/hamcrest-core.pom"))))) (native-inputs `(("java-qdox-1.12" ,java-qdox-1.12) ("java-jarjar" ,java-jarjar))) + (propagated-inputs + `(("java-hamcrest-parent-pom" ,java-hamcrest-parent-pom))) (home-page "http://hamcrest.org/") (synopsis "Library of matchers for building test expressions") (description @@ -3709,15 +3699,44 @@ (define-public java-hamcrest-core testing frameworks, mocking libraries and UI validation rules.") (license license:bsd-2))) +(define java-hamcrest-parent-pom + (package + (inherit java-hamcrest-core) + (name "java-hamcrest-parent-pom") + (propagated-inputs '()) + (native-inputs '()) + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda _ + (substitute* "pom/hamcrest-parent.pom" + (("@VERSION@") ,(package-version java-hamcrest-core))) + #t)) + (replace 'install + (install-pom-file "pom/hamcrest-parent.pom"))))))) + (define-public java-hamcrest-library (package (inherit java-hamcrest-core) (name "java-hamcrest-library") (arguments (substitute-keyword-arguments (package-arguments java-hamcrest-core) - ((#:build-target _) "library"))) + ((#:build-target _) "library") + ((#:phases phases) + `(modify-phases ,phases + (replace 'create-pom + (lambda _ + (substitute* "pom/hamcrest-library.pom" + (("@VERSION@") ,(package-version java-hamcrest-core))) + #t)) + (replace 'install + (install-from-pom "pom/hamcrest-library.pom")))))) (propagated-inputs - `(("java-hamcrest-core" ,java-hamcrest-core))))) + `(("java-hamcrest-core" ,java-hamcrest-core) + ("java-hamcrest-parent-pom" ,java-hamcrest-parent-pom))))) (define-public java-junit (package @@ -3750,7 +3769,9 @@ (define-public java-junit (add-before 'check 'copy-test-resources (lambda _ (copy-recursively "src/test/resources" "build/test-classes") - #t))))) + #t)) + (replace 'install + (install-from-pom "pom.xml"))))) (propagated-inputs `(("java-hamcrest-core" ,java-hamcrest-core))) (native-inputs @@ -4874,8 +4895,29 @@ (define-public java-hamcrest-all (find-files (assoc-ref inputs "java-easymock") "\\.jar$"))) ";")) (("build/hamcrest-core-\\$\\{version\\}\\.jar") - (string-append (assoc-ref inputs "java-hamcrest-core") - "/share/java/hamcrest-core.jar"))) + (car (find-files (assoc-ref inputs "java-hamcrest-core") + "jar$")))) + #t)) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((target (string-append (assoc-ref outputs "out") + "/share/java/")) + (version-suffix + ,(string-append + "-" (package-version java-hamcrest-core) ".jar")) + (install-without-version-suffix + (lambda (jar) + (copy-file jar + (string-append target + (basename jar version-suffix) + ".jar"))))) + (mkdir-p target) + (for-each + install-without-version-suffix + (find-files "build" + (lambda (name _) + (and (string-suffix? ".jar" name) + (not (string-suffix? "-sources.jar" name))))))) #t))))))) (inputs `(("java-junit" ,java-junit) @@ -4935,9 +4977,10 @@ (define-public java-commons-math3 #:make-flags (let ((hamcrest (assoc-ref %build-inputs "java-hamcrest-core")) (junit (assoc-ref %build-inputs "java-junit"))) - (list (string-append "-Djunit.jar=" junit "/share/java/junit.jar") - (string-append "-Dhamcrest.jar=" hamcrest - "/share/java/hamcrest-core.jar"))) + (list (string-append "-Djunit.jar=" + (car (find-files junit "jar$"))) + (string-append "-Dhamcrest.jar=" + (car (find-files hamcrest ".*.jar$"))))) #:phases (modify-phases %standard-phases ;; We want to build the jar in the build phase and run the tests @@ -5024,9 +5067,10 @@ (define-public java-commons-collections4 (let ((hamcrest (assoc-ref %build-inputs "java-hamcrest-core")) (junit (assoc-ref %build-inputs "java-junit")) (easymock (assoc-ref %build-inputs "java-easymock"))) - (list (string-append "-Djunit.jar=" junit "/share/java/junit.jar") - (string-append "-Dhamcrest.jar=" hamcrest - "/share/java/hamcrest-core.jar") + (list (string-append "-Djunit.jar=" + (car (find-files junit "jar$"))) + (string-append "-Dhamcrest.jar=" + (car (find-files hamcrest "jar$"))) (string-append "-Deasymock.jar=" easymock "/share/java/easymock.jar"))) #:phases @@ -5161,8 +5205,8 @@ (define-public java-commons-io `(#:test-target "test" #:make-flags (list (string-append "-Djunit.jar=" - (assoc-ref %build-inputs "java-junit") - "/share/java/junit.jar")) + (car (find-files (assoc-ref %build-inputs "java-junit") + "jar$")))) #:phases (modify-phases %standard-phases (add-after 'build 'build-javadoc ant-build-javadoc) @@ -5194,8 +5238,8 @@ (define-public java-commons-exec-1.1 `(#:test-target "test" #:make-flags (list (string-append "-Dmaven.junit.jar=" - (assoc-ref %build-inputs "java-junit") - "/share/java/junit.jar")) + (car (find-files (assoc-ref %build-inputs "java-junit") + "jar$")))) #:phases (modify-phases %standard-phases (add-before 'build 'delete-network-tests @@ -5230,8 +5274,8 @@ (define-public java-commons-exec `(#:test-target "test" #:make-flags (list (string-append "-Dmaven.junit.jar=" - (assoc-ref %build-inputs "java-junit") - "/share/java/junit.jar") + (car (find-files (assoc-ref %build-inputs "java-junit") + "jar$"))) "-Dmaven.compiler.source=1.7" "-Dmaven.compiler.target=1.7") #:phases @@ -5332,9 +5376,10 @@ (define-public java-commons-lang3 (junit (assoc-ref %build-inputs "java-junit")) (easymock (assoc-ref %build-inputs "java-easymock")) (io (assoc-ref %build-inputs "java-commons-io"))) - (list (string-append "-Djunit.jar=" junit "/share/java/junit.jar") - (string-append "-Dhamcrest.jar=" hamcrest - "/share/java/hamcrest-all.jar") + (list (string-append "-Djunit.jar=" + (car (find-files junit "jar$"))) + (string-append "-Dhamcrest.jar=" + (car (find-files hamcrest ".*.jar$"))) (string-append "-Dcommons-io.jar=" io "/share/java/commons-io-" ,(package-version java-commons-io) @@ -6901,9 +6946,8 @@ (define-public java-commons-codec #:make-flags (let ((hamcrest (assoc-ref %build-inputs "java-hamcrest-core")) (junit (assoc-ref %build-inputs "java-junit"))) - (list (string-append "-Djunit.jar=" junit "/share/java/junit.jar") - (string-append "-Dhamcrest.jar=" hamcrest - "/share/java/hamcrest-core.jar") + (list (string-append "-Djunit.jar=" (car (find-files junit "jar$"))) + (string-append "-Dhamcrest.jar=" (car (find-files hamcrest "jar$"))) ;; Do not append version to jar. "-Dfinal.name=commons-codec")) #:phases @@ -11090,11 +11134,10 @@ (define-public java-native-access ;; so don't fail if we can't find a native library for another architecture. (("zipfileset") "zipfileset erroronmissingarchive=\"false\"")) ;; Copy test dependencies - (copy-file (string-append (assoc-ref inputs "java-junit") - "/share/java/junit.jar") + (copy-file (car (find-files (assoc-ref inputs "java-junit") "jar$")) "lib/junit.jar") - (copy-file (string-append (assoc-ref inputs "java-hamcrest-core") - "/share/java/hamcrest-core.jar") + (copy-file (car (find-files (assoc-ref inputs "java-hamcrest-core") + "jar$")) "lib/hamcrest-core.jar") ;; FIXME: once reflections.jar is built, copy it to lib/test. #t)) @@ -11143,11 +11186,11 @@ (define-public java-native-access-platform (string-append (assoc-ref inputs "java-native-access") "/share/java/jna.jar")) (("../../lib/hamcrest-core-.*.jar") - (string-append (assoc-ref inputs "java-hamcrest-core") - "/share/java/hamcrest-core.jar")) + (car (find-files (assoc-ref inputs "java-hamcrest-core") + "jar$"))) (("../../lib/junit.jar") - (string-append (assoc-ref inputs "java-junit") - "/share/java/junit.jar"))) + (car (find-files (assoc-ref inputs "java-junit") + "jar$")))) #t)) (replace 'install (install-jars "dist"))))) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index b75fd25a23..ee4d30cfbe 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1187,10 +1187,15 @@ (define-public hdf-java (jhdf (string-append lib "/jhdf.jar")) (jhdf5 (string-append lib "/jhdf5.jar")) (testjars - (map (lambda (i) - (string-append (assoc-ref inputs i) - "/share/java/" i ".jar")) - '("junit" "hamcrest-core" "slf4j-api" "slf4j-simple"))) + (append + (map (lambda (i) + (string-append (assoc-ref inputs i) + "/share/java/" i ".jar")) + '("slf4j-api" "slf4j-simple")) + (list + (car (find-files (assoc-ref inputs "junit") "jar$")) + (car (find-files (assoc-ref inputs "hamcrest-core") + "jar$"))))) (class-path (string-join `("." ,build-dir ,jhdf ,jhdf5 ,@testjars) ":"))) -- cgit v1.2.3 From bef4d92050928cee6eafd2bde580b27bf16056da Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 14:26:32 +0200 Subject: gnu: Add apache-parent-pom-13. * gnu/packages/maven-parent-pom.scm: New file. * gnu/local.mk: Add maven-parent-pom.scm. --- gnu/local.mk | 1 + gnu/packages/maven-parent-pom.scm | 55 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 gnu/packages/maven-parent-pom.scm diff --git a/gnu/local.mk b/gnu/local.mk index a50048e749..67756186b5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -359,6 +359,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/maths.scm \ %D%/packages/matrix.scm \ %D%/packages/maven.scm \ + %D%/packages/maven-parent-pom.scm \ %D%/packages/mc.scm \ %D%/packages/mcrypt.scm \ %D%/packages/medical.scm \ diff --git a/gnu/packages/maven-parent-pom.scm b/gnu/packages/maven-parent-pom.scm new file mode 100644 index 0000000000..b1bc44696b --- /dev/null +++ b/gnu/packages/maven-parent-pom.scm @@ -0,0 +1,55 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2020 Julien Lepiller +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages maven-parent-pom) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix git-download) + #:use-module (guix utils) + #:use-module (guix build-system ant) + #:use-module (gnu packages java)) + +(define (make-apache-parent-pom version hash) + (hidden-package + (package + (name "apache-parent-pom") + (version version) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/apache/maven-apache-parent") + (commit (string-append "apache-" version)))) + (file-name (git-file-name name version)) + (sha256 (base32 hash)))) + (build-system ant-build-system) + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (replace 'install + (install-pom-file "pom.xml"))))) + (home-page "https://apache.org/") + (synopsis "Apache parent pom") + (description "This package contains the Apache parent POM.") + (license license:asl2.0)))) + +(define-public apache-parent-pom-13 + (make-apache-parent-pom + "13" "1cfxaz1jy8fbn06sb648qpiq23swpbj3kb5ya7f9g9jmya5fy09z")) -- cgit v1.2.3 From 10f8dedf39d6a2e40070691a8a27846eada4f790 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 15:58:57 +0200 Subject: gnu: Add apache-parent-pom-6. * gnu/packages/maven.scm (apache-parent-pom-6): New variable. --- gnu/packages/maven-parent-pom.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/maven-parent-pom.scm b/gnu/packages/maven-parent-pom.scm index b1bc44696b..d6b11e755a 100644 --- a/gnu/packages/maven-parent-pom.scm +++ b/gnu/packages/maven-parent-pom.scm @@ -50,6 +50,10 @@ (define (make-apache-parent-pom version hash) (description "This package contains the Apache parent POM.") (license license:asl2.0)))) +(define-public apache-parent-pom-6 + (make-apache-parent-pom + "6" "1bq0ma2ya2cnp2icd4l20sv6y7zxqr9sa35wzv1s49nqsrm38kw3")) + (define-public apache-parent-pom-13 (make-apache-parent-pom "13" "1cfxaz1jy8fbn06sb648qpiq23swpbj3kb5ya7f9g9jmya5fy09z")) -- cgit v1.2.3 From 67d54abe35b5571c838193aa802576472a03ffbf Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 19:34:53 +0200 Subject: gnu: Add apache-parent-pom-11. * gnu/packages/maven-parent-pom.scm (apache-parent-pom-11): New variable. --- gnu/packages/maven-parent-pom.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/maven-parent-pom.scm b/gnu/packages/maven-parent-pom.scm index d6b11e755a..24bf7dc7a1 100644 --- a/gnu/packages/maven-parent-pom.scm +++ b/gnu/packages/maven-parent-pom.scm @@ -54,6 +54,10 @@ (define-public apache-parent-pom-6 (make-apache-parent-pom "6" "1bq0ma2ya2cnp2icd4l20sv6y7zxqr9sa35wzv1s49nqsrm38kw3")) +(define-public apache-parent-pom-11 + (make-apache-parent-pom + "11" "0m1a4db8s6y8f4vvm9bx7zx7lixcvaah064560nbja7na3xz6lls")) + (define-public apache-parent-pom-13 (make-apache-parent-pom "13" "1cfxaz1jy8fbn06sb648qpiq23swpbj3kb5ya7f9g9jmya5fy09z")) -- cgit v1.2.3 From 3eebbff671fbf1990ef1d65ab67d7af2f85ae037 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 14:27:37 +0200 Subject: gnu: Add apache-parent-pom-16. * gnu/packages/maven-parent-pom.scm (apache-parent-pom-16): New variable. --- gnu/packages/maven-parent-pom.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/maven-parent-pom.scm b/gnu/packages/maven-parent-pom.scm index 24bf7dc7a1..a5193e65ce 100644 --- a/gnu/packages/maven-parent-pom.scm +++ b/gnu/packages/maven-parent-pom.scm @@ -61,3 +61,7 @@ (define-public apache-parent-pom-11 (define-public apache-parent-pom-13 (make-apache-parent-pom "13" "1cfxaz1jy8fbn06sb648qpiq23swpbj3kb5ya7f9g9jmya5fy09z")) + +(define-public apache-parent-pom-16 + (make-apache-parent-pom + "16" "1y5b0dlc72ijcqfffdbh0k75qwaddy5qw725v9pzhrzqkpaa51xb")) -- cgit v1.2.3 From d83b144a6dd1b7d256a22738713143dad79a60f0 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 16:34:57 +0200 Subject: gnu: Add apache-parent-pom-17. * gnu/packages/maven.scm (apache-parent-pom-17): New variable. --- gnu/packages/maven-parent-pom.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/maven-parent-pom.scm b/gnu/packages/maven-parent-pom.scm index a5193e65ce..cb7b9d75bb 100644 --- a/gnu/packages/maven-parent-pom.scm +++ b/gnu/packages/maven-parent-pom.scm @@ -65,3 +65,7 @@ (define-public apache-parent-pom-13 (define-public apache-parent-pom-16 (make-apache-parent-pom "16" "1y5b0dlc72ijcqfffdbh0k75qwaddy5qw725v9pzhrzqkpaa51xb")) + +(define-public apache-parent-pom-17 + (make-apache-parent-pom + "17" "06hj5d6rdkmwl24k2rvzj8plq8x1ncsbjck4w3awz1hp9gngg4y5")) -- cgit v1.2.3 From 474c61c579c0d62da779ca392e3c39ecb79e1eb4 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 14:28:02 +0200 Subject: gnu: Add apache-parent-pom-18. * gnu/packages/maven-parent-pom.scm (apache-parent-pom-18): New variable. --- gnu/packages/maven-parent-pom.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/maven-parent-pom.scm b/gnu/packages/maven-parent-pom.scm index cb7b9d75bb..46f2c62aee 100644 --- a/gnu/packages/maven-parent-pom.scm +++ b/gnu/packages/maven-parent-pom.scm @@ -69,3 +69,7 @@ (define-public apache-parent-pom-16 (define-public apache-parent-pom-17 (make-apache-parent-pom "17" "06hj5d6rdkmwl24k2rvzj8plq8x1ncsbjck4w3awz1hp9gngg4y5")) + +(define-public apache-parent-pom-18 + (make-apache-parent-pom + "18" "1il97vpdmv5k2gnyinj45q00f7f4w9hcb588digwfid5bskddnyy")) -- cgit v1.2.3 From 97de6e0c8015144eb0cac38d85789124295e3abf Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 20:25:06 +0200 Subject: gnu: Add apache-parent-pom-19. * gnu/packages/maven-parent-pom.scm (apache-parent-pom-19): New variable. --- gnu/packages/maven-parent-pom.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/maven-parent-pom.scm b/gnu/packages/maven-parent-pom.scm index 46f2c62aee..64637244ea 100644 --- a/gnu/packages/maven-parent-pom.scm +++ b/gnu/packages/maven-parent-pom.scm @@ -73,3 +73,7 @@ (define-public apache-parent-pom-17 (define-public apache-parent-pom-18 (make-apache-parent-pom "18" "1il97vpdmv5k2gnyinj45q00f7f4w9hcb588digwfid5bskddnyy")) + +(define-public apache-parent-pom-19 + (make-apache-parent-pom + "19" "02drnwv2qqk1dmxbmmrk0bi1iil5cal9l47w53ascpbjg6242mp1")) -- cgit v1.2.3 From a2f64c345e827d419bf21831bfef474bf41ea4a9 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 14:28:34 +0200 Subject: gnu: Add apache-parent-pom-21. * gnu/packages/maven-parent-pom.scm (apache-parent-pom-21): New variable. --- gnu/packages/maven-parent-pom.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/maven-parent-pom.scm b/gnu/packages/maven-parent-pom.scm index 64637244ea..073ac36944 100644 --- a/gnu/packages/maven-parent-pom.scm +++ b/gnu/packages/maven-parent-pom.scm @@ -77,3 +77,7 @@ (define-public apache-parent-pom-18 (define-public apache-parent-pom-19 (make-apache-parent-pom "19" "02drnwv2qqk1dmxbmmrk0bi1iil5cal9l47w53ascpbjg6242mp1")) + +(define-public apache-parent-pom-21 + (make-apache-parent-pom + "21" "0clcbrq1b2b8sbvlqddyw2dg5niq25dhdma9sk4b0i30hqaipx96")) -- cgit v1.2.3 From 506165869207f2356fb46df5889b33f8e873a7f9 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 14:28:59 +0200 Subject: gnu: Add apache-commons-parent-pom-39. * gnu/packages/maven-parent-pom.scm (apache-commons-parent-pom-39): New variable. --- gnu/packages/maven-parent-pom.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/maven-parent-pom.scm b/gnu/packages/maven-parent-pom.scm index 073ac36944..d40209d221 100644 --- a/gnu/packages/maven-parent-pom.scm +++ b/gnu/packages/maven-parent-pom.scm @@ -81,3 +81,38 @@ (define-public apache-parent-pom-19 (define-public apache-parent-pom-21 (make-apache-parent-pom "21" "0clcbrq1b2b8sbvlqddyw2dg5niq25dhdma9sk4b0i30hqaipx96")) + +(define (make-apache-commons-parent-pom version hash parent) + (hidden-package + (package + (name "apache-commons-parent-pom") + (version version) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/apache/commons-parent") + (commit (string-append "commons-parent-" version)))) + (file-name (git-file-name name version)) + (sha256 (base32 hash)))) + (build-system ant-build-system) + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (replace 'install + (install-pom-file "pom.xml"))))) + (propagated-inputs + (if parent + `(("parent" ,parent)) + '())) + (home-page "https://maven.apache.org/") + (synopsis "Apache Commons parent pom") + (description "This package contains the Apache Commons parent POM.") + (license license:asl2.0)))) + +(define-public apache-commons-parent-pom-39 + (make-apache-commons-parent-pom + "39" "0mjx48a55ik1h4hsxhifkli1flvkp6d05ab14p4al0fc6rhdxi46" + apache-parent-pom-16)) -- cgit v1.2.3 From bd31f1df4703b8c8bc76f2f401803427528be975 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 14:29:26 +0200 Subject: gnu: Add apache-commons-parent-pom-41. * gnu/packages/maven-parent-pom.scm (apache-commons-parent-pom-41): New variable. --- gnu/packages/maven-parent-pom.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/packages/maven-parent-pom.scm b/gnu/packages/maven-parent-pom.scm index d40209d221..e12da21f0b 100644 --- a/gnu/packages/maven-parent-pom.scm +++ b/gnu/packages/maven-parent-pom.scm @@ -116,3 +116,8 @@ (define-public apache-commons-parent-pom-39 (make-apache-commons-parent-pom "39" "0mjx48a55ik1h4hsxhifkli1flvkp6d05ab14p4al0fc6rhdxi46" apache-parent-pom-16)) + +(define-public apache-commons-parent-pom-41 + (make-apache-commons-parent-pom + "41" "1k184amdqdx62bb2k0m9v93zzx768qcyam5dvdgksqc1aaqhadlb" + apache-parent-pom-18)) -- cgit v1.2.3 From 568ea5315bac0b033e99bae7f20cdb14e99a8fa4 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 14:29:55 +0200 Subject: gnu: Add apache-commons-parent-pom-48. * gnu/packages/maven-parent-pom.scm (apache-commons-parent-pom-48): New variable. --- gnu/packages/maven-parent-pom.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/packages/maven-parent-pom.scm b/gnu/packages/maven-parent-pom.scm index e12da21f0b..1e55f13ad7 100644 --- a/gnu/packages/maven-parent-pom.scm +++ b/gnu/packages/maven-parent-pom.scm @@ -121,3 +121,8 @@ (define-public apache-commons-parent-pom-41 (make-apache-commons-parent-pom "41" "1k184amdqdx62bb2k0m9v93zzx768qcyam5dvdgksqc1aaqhadlb" apache-parent-pom-18)) + +(define-public apache-commons-parent-pom-48 + (make-apache-commons-parent-pom + "48" "0dk8qp7swbh4y1q7q34y14yhigzl5yz0ixa8jhhhq91yc2q570iq" + apache-parent-pom-21)) -- cgit v1.2.3 From 40448a023600b7b5e876d0a1d2a25878e61de579 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 14:30:20 +0200 Subject: gnu: Add apache-commons-parent-pom-50. * gnu/packages/maven-parent-pom.scm (apache-commons-parent-pom-50): New variable. --- gnu/packages/maven-parent-pom.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/packages/maven-parent-pom.scm b/gnu/packages/maven-parent-pom.scm index 1e55f13ad7..e4bfca36fd 100644 --- a/gnu/packages/maven-parent-pom.scm +++ b/gnu/packages/maven-parent-pom.scm @@ -126,3 +126,8 @@ (define-public apache-commons-parent-pom-48 (make-apache-commons-parent-pom "48" "0dk8qp7swbh4y1q7q34y14yhigzl5yz0ixa8jhhhq91yc2q570iq" apache-parent-pom-21)) + +(define-public apache-commons-parent-pom-50 + (make-apache-commons-parent-pom + "50" "0ki8px35dan51ashblpw6rdl27c2fq62slazhslhq3lr4fwlpvxs" + apache-parent-pom-21)) -- cgit v1.2.3 From 16466a5d7f13e0824d115388f39f3b9296402ed3 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 14:32:34 +0200 Subject: gnu: Add java-weld-parent-pom. * gnu/packages/maven-parent-pom.scm (java-weld-parent-pom): New variable. --- gnu/packages/maven-parent-pom.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/maven-parent-pom.scm b/gnu/packages/maven-parent-pom.scm index e4bfca36fd..f2c2b20be1 100644 --- a/gnu/packages/maven-parent-pom.scm +++ b/gnu/packages/maven-parent-pom.scm @@ -131,3 +131,30 @@ (define-public apache-commons-parent-pom-50 (make-apache-commons-parent-pom "50" "0ki8px35dan51ashblpw6rdl27c2fq62slazhslhq3lr4fwlpvxs" apache-parent-pom-21)) + +(define-public java-weld-parent-pom + (hidden-package + (package + (name "java-weld-parent-pom") + (version "36") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/weld/parent") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0rbvizcsma456mw9fvp4dj9cljh97nswvhi04xhczi38j5bgal0m")))) + (build-system ant-build-system) + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'build) + (replace 'install + (install-pom-file "pom.xml"))))) + (home-page "https://github.com/weld/parent") + (synopsis "Pom parent file for weld projects") + (description "This package contains the parent Maven Pom for weld projects.") + (license license:asl2.0)))) -- cgit v1.2.3 From ad9df5110c6725295c2734e89ce7ee2f62c277d8 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 14:33:04 +0200 Subject: gnu: add java-sonatype-forge-parent-pom-4. * gnu/packages/maven-parent-pom.scm (java-sonatype-forge-parent-pom-4): New variable. --- gnu/packages/maven-parent-pom.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/maven-parent-pom.scm b/gnu/packages/maven-parent-pom.scm index f2c2b20be1..6964b19253 100644 --- a/gnu/packages/maven-parent-pom.scm +++ b/gnu/packages/maven-parent-pom.scm @@ -158,3 +158,34 @@ (define-public java-weld-parent-pom (synopsis "Pom parent file for weld projects") (description "This package contains the parent Maven Pom for weld projects.") (license license:asl2.0)))) + +(define (make-java-sonatype-forge-parent-pom version hash) + (hidden-package + (package + (name "java-sonatype-forge-parent-pom") + (version version) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sonatype/oss-parents") + (commit (string-append "forge-parent-" version)))) + (file-name (git-file-name name version)) + (sha256 (base32 hash)))) + (build-system ant-build-system) + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'build) + (delete 'configure) + (replace 'install + (install-pom-file "pom.xml"))))) + (home-page "https://github.com/sonatype/oss-parents") + (synopsis "Sonatype forge parent pom") + (description "This package contains a single pom.xml file that is used by +other projects as their parent pom.") + (license license:asl2.0)))) + +(define-public java-sonatype-forge-parent-pom-4 + (make-java-sonatype-forge-parent-pom + "4" "1gip239ar20qzy6yf37r6ks54bl7gqi1v49p65manrz84cmad0dh")) -- cgit v1.2.3 From a1694cf323607eafbe1380a3eff6dcc0c7a9dbf3 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 14:33:34 +0200 Subject: gnu: Add java-sonatype-forge-parent-pom-5. * gnu/packages/maven-parent-pom.scm (java-sonatype-forge-parent-pom-5): New variable. --- gnu/packages/maven-parent-pom.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/maven-parent-pom.scm b/gnu/packages/maven-parent-pom.scm index 6964b19253..9fde8a8213 100644 --- a/gnu/packages/maven-parent-pom.scm +++ b/gnu/packages/maven-parent-pom.scm @@ -189,3 +189,7 @@ (define (make-java-sonatype-forge-parent-pom version hash) (define-public java-sonatype-forge-parent-pom-4 (make-java-sonatype-forge-parent-pom "4" "1gip239ar20qzy6yf37r6ks54bl7gqi1v49p65manrz84cmad0dh")) + +(define-public java-sonatype-forge-parent-pom-5 + (make-java-sonatype-forge-parent-pom + "5" "0pr60wyjmaml4flmcij6l94b72ryx5gsiiasiwvcvrz9b2fkb3cd")) -- cgit v1.2.3 From 95e686955bcd4360ee8f5c70f19873586dad5225 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 15:21:55 +0200 Subject: gnu: Add java-sonatype-forge-parent-pom-6. * gnu/packages/maven-parent-pom.scm (java-sonatype-forge-parent-pom-6): New variable. --- gnu/packages/maven-parent-pom.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/maven-parent-pom.scm b/gnu/packages/maven-parent-pom.scm index 9fde8a8213..70973f90b5 100644 --- a/gnu/packages/maven-parent-pom.scm +++ b/gnu/packages/maven-parent-pom.scm @@ -193,3 +193,7 @@ (define-public java-sonatype-forge-parent-pom-4 (define-public java-sonatype-forge-parent-pom-5 (make-java-sonatype-forge-parent-pom "5" "0pr60wyjmaml4flmcij6l94b72ryx5gsiiasiwvcvrz9b2fkb3cd")) + +(define-public java-sonatype-forge-parent-pom-6 + (make-java-sonatype-forge-parent-pom + "6" "0sa5wn5kc6y74m9g3azkm5i9d7kvyvgdw7wjlp7bjgy9s5qkbhgz")) -- cgit v1.2.3 From 94f2bac18e1436bd7cd0c3572dbf43de019534e1 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 14:33:57 +0200 Subject: gnu: Add java-sonatype-forge-parent-pom-10. * gnu/packages/maven-parent-pom.scm (java-sonatype-forge-parent-pom-10): New variable. --- gnu/packages/maven-parent-pom.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/maven-parent-pom.scm b/gnu/packages/maven-parent-pom.scm index 70973f90b5..e64b531cd8 100644 --- a/gnu/packages/maven-parent-pom.scm +++ b/gnu/packages/maven-parent-pom.scm @@ -197,3 +197,7 @@ (define-public java-sonatype-forge-parent-pom-5 (define-public java-sonatype-forge-parent-pom-6 (make-java-sonatype-forge-parent-pom "6" "0sa5wn5kc6y74m9g3azkm5i9d7kvyvgdw7wjlp7bjgy9s5qkbhgz")) + +(define-public java-sonatype-forge-parent-pom-10 + (make-java-sonatype-forge-parent-pom + "10" "1n89wb00q4s9nwpqq6q1h4nzakw1l1rppjygxkl3iid7m5fnj60n")) -- cgit v1.2.3 From a98ff9b8abcf922e3999905f1513338577e571ab Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 14:34:24 +0200 Subject: gnu: Add java-sonatype-spice-parent-pom-15. * gnu/packages/maven-parent-pom.scm (java-sonatype-spice-parent-pom-15): New variable. --- gnu/packages/maven-parent-pom.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/maven-parent-pom.scm b/gnu/packages/maven-parent-pom.scm index e64b531cd8..96cf897ebf 100644 --- a/gnu/packages/maven-parent-pom.scm +++ b/gnu/packages/maven-parent-pom.scm @@ -201,3 +201,35 @@ (define-public java-sonatype-forge-parent-pom-6 (define-public java-sonatype-forge-parent-pom-10 (make-java-sonatype-forge-parent-pom "10" "1n89wb00q4s9nwpqq6q1h4nzakw1l1rppjygxkl3iid7m5fnj60n")) + +(define-public java-sonatype-spice-parent-pom-15 + (hidden-package + (package + (name "java-sonatype-spice-parent-pom") + (version "15") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sonatype/oss-parents") + ;; The only commit where spice-parent is version 15 + (commit "a4d1169c66fb21b214cb3eff2f056ec3e3695ca7"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0h62h6m31srmqnd1bhyspz6hdhkkv48knkj0ximq3pzdixgzyxgy")))) + (build-system ant-build-system) + (propagated-inputs + `(("java-sonatype-forge-parent-pom-5" ,java-sonatype-forge-parent-pom-5))) + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'build) + (delete 'configure) + (replace 'install + (install-pom-file "pom.xml"))))) + (home-page "https://github.com/sonatype/oss-parents") + (synopsis "Sonatype spice parent pom") + (description "This package contains a single pom.xml file that is used by +other projects as their parent pom.") + (license license:asl2.0)))) -- cgit v1.2.3 From 03e792108cee10fa6f838b8b9ccf25d0ec83efba Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 14:34:52 +0200 Subject: gnu: Add java-sonatype-spice-parent-pom-17. * gnu/packages/maven-parent-pom.scm (java-sonatype-spice-parent-pom-17): New variable. --- gnu/packages/maven-parent-pom.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/maven-parent-pom.scm b/gnu/packages/maven-parent-pom.scm index 96cf897ebf..4f9daa2475 100644 --- a/gnu/packages/maven-parent-pom.scm +++ b/gnu/packages/maven-parent-pom.scm @@ -233,3 +233,28 @@ (define-public java-sonatype-spice-parent-pom-15 (description "This package contains a single pom.xml file that is used by other projects as their parent pom.") (license license:asl2.0)))) + +(define-public java-sonatype-spice-parent-pom-17 + (hidden-package + (package + (inherit java-sonatype-spice-parent-pom-15) + (version "17") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sonatype/oss-parents") + (commit "spice-parent-17"))) + (file-name (git-file-name "java-sonatype-spice-parent-pom" version)) + (sha256 + (base32 + "1d4jh1scgnjwhv8f0r052vrksg0kman09hslfvfvpfidl8rwiigq")))) + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'build) + (delete 'configure) + (replace 'install + (install-pom-file "spice-parent/pom.xml"))))) + (propagated-inputs + `(("java-sonatype-forge-parent-pom-10" ,java-sonatype-forge-parent-pom-10)))))) -- cgit v1.2.3 From bdec75a25e9d155c8304ed3ff4ac523437ee1853 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 14:35:21 +0200 Subject: gnu: Add java-sonatype-spice-parent-pom-12. * gnu/packages/maven-parent-pom.scm (java-sonatype-spice-parent-pom-12): New variable. --- gnu/packages/maven-parent-pom.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gnu/packages/maven-parent-pom.scm b/gnu/packages/maven-parent-pom.scm index 4f9daa2475..5e7fa11be4 100644 --- a/gnu/packages/maven-parent-pom.scm +++ b/gnu/packages/maven-parent-pom.scm @@ -258,3 +258,21 @@ (define-public java-sonatype-spice-parent-pom-17 (install-pom-file "spice-parent/pom.xml"))))) (propagated-inputs `(("java-sonatype-forge-parent-pom-10" ,java-sonatype-forge-parent-pom-10)))))) + +(define-public java-sonatype-spice-parent-pom-12 + (hidden-package + (package + (inherit java-sonatype-spice-parent-pom-15) + (version "12") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sonatype/oss-parents") + ;; The only commit where spice-parent is version 12 + (commit "95088ae2891f673828351d7d9150240859b4a29a"))) + (file-name (git-file-name "java-sonatype-spice-parent-pom" version)) + (sha256 + (base32 + "0pq5yf6swn43rxdfksnqsky1402zza2xq1aypwma9jkck2yl0vma")))) + (propagated-inputs + `(("java-sonatype-forge-parent-pom-4" ,java-sonatype-forge-parent-pom-4)))))) -- cgit v1.2.3 From 0dd0bb78a897120e9d472b9de62e1a3e7bd2892d Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 14:47:28 +0200 Subject: gnu: Add java-sonatype-oss-parent-pom-7. * gnu/packages/maven-parent-pom.scm (java-sonatype-oss-parent-pom-7): New variable. --- gnu/packages/maven-parent-pom.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/maven-parent-pom.scm b/gnu/packages/maven-parent-pom.scm index 5e7fa11be4..bcdb4bc64f 100644 --- a/gnu/packages/maven-parent-pom.scm +++ b/gnu/packages/maven-parent-pom.scm @@ -276,3 +276,32 @@ (define-public java-sonatype-spice-parent-pom-12 "0pq5yf6swn43rxdfksnqsky1402zza2xq1aypwma9jkck2yl0vma")))) (propagated-inputs `(("java-sonatype-forge-parent-pom-4" ,java-sonatype-forge-parent-pom-4)))))) + +(define-public java-sonatype-oss-parent-pom-7 + (hidden-package + (package + (name "java-sonatype-oss-parent-pom") + (version "7") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sonatype/oss-parents") + (commit (string-append "oss-parent-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0lkvkmm51vrrrp79ksq3i2v693279rbn06yxck70ivhjrbq77927")))) + (build-system ant-build-system) + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'build) + (delete 'configure) + (replace 'install + (install-pom-file "pom.xml"))))) + (home-page "https://github.com/sonatype/oss-parents") + (synopsis "Sonatype oss parent pom") + (description "This package contains a single pom.xml file that is used by +other projects as their parent pom.") + (license license:asl2.0)))) -- cgit v1.2.3 From 744979f926aac05ab48a3252e9bb362cdf936256 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 14:47:56 +0200 Subject: gnu: Add java-sonatype-oss-parent-pom-9. * gnu/packages/maven-parent-pom.scm (java-sonatype-oss-parent-pom-9): New variable. --- gnu/packages/maven-parent-pom.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/maven-parent-pom.scm b/gnu/packages/maven-parent-pom.scm index bcdb4bc64f..6e5a5b03e7 100644 --- a/gnu/packages/maven-parent-pom.scm +++ b/gnu/packages/maven-parent-pom.scm @@ -19,6 +19,7 @@ (define-module (gnu packages maven-parent-pom) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) + #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix utils) #:use-module (guix build-system ant) @@ -305,3 +306,26 @@ (define-public java-sonatype-oss-parent-pom-7 (description "This package contains a single pom.xml file that is used by other projects as their parent pom.") (license license:asl2.0)))) + +(define-public java-sonatype-oss-parent-pom-9 + (hidden-package + (package + (inherit java-sonatype-oss-parent-pom-7) + (version "9") + (source (origin + (method url-fetch) + (uri (string-append "https://repo1.maven.org/maven2/org/sonatype/" + "oss/oss-parent/" version "/oss-parent-" + version ".pom")) + (sha256 + (base32 + "0yl2hbwz2kn1hll1i00ddzn8f89bfdcjwdifz0pj2j15k1gjch7v")))) + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'unpack) + (delete 'configure) + (delete 'build) + (replace 'install + (install-pom-file (assoc-ref %build-inputs "source"))))))))) -- cgit v1.2.3 From 6969a575e4439de46c52ac4c4512804c6e288d69 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 14:30:49 +0200 Subject: gnu: Add plexus-parent-pom-3.1. * gnu/packages/maven-parent-pom.scm (plexus-parent-pom-3.1): New variable. --- gnu/packages/maven-parent-pom.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/maven-parent-pom.scm b/gnu/packages/maven-parent-pom.scm index 6e5a5b03e7..6dbff83b8a 100644 --- a/gnu/packages/maven-parent-pom.scm +++ b/gnu/packages/maven-parent-pom.scm @@ -329,3 +329,38 @@ (define-public java-sonatype-oss-parent-pom-9 (delete 'build) (replace 'install (install-pom-file (assoc-ref %build-inputs "source"))))))))) + +(define* (make-plexus-parent-pom version hash #:optional parent) + (hidden-package + (package + (name "plexus-parent-pom") + (version version) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/codehaus-plexus/plexus-pom") + (commit (string-append "plexus-" version)))) + (file-name (git-file-name name version)) + (sha256 (base32 hash)))) + (build-system ant-build-system) + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (replace 'install + (install-pom-file "pom.xml"))))) + (propagated-inputs + (if parent + `(("parent" ,parent)) + '())) + (home-page "https://codehaus-plexus.github.io/plexus-pom") + (synopsis "Plexus parent pom") + (description "This package contains the Plexus parent POM.") + (license license:asl2.0)))) + +(define-public plexus-parent-pom-3.1 + (make-plexus-parent-pom + "3.1" "0r1wa6zrpzynn4028w7880abkk2xk25mipav5f0a4d1abqzy5m53" + java-sonatype-spice-parent-pom-17)) -- cgit v1.2.3 From 1350f558efca9d73ccf458d973ca26ebd81a6ffb Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 14:31:14 +0200 Subject: gnu: Add plexus-parent-pom-4.0. * gnu/packages/maven-parent-pom.scm (plexus-parent-pom-4.0): New variable. --- gnu/packages/maven-parent-pom.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/packages/maven-parent-pom.scm b/gnu/packages/maven-parent-pom.scm index 6dbff83b8a..0323353a59 100644 --- a/gnu/packages/maven-parent-pom.scm +++ b/gnu/packages/maven-parent-pom.scm @@ -364,3 +364,8 @@ (define-public plexus-parent-pom-3.1 (make-plexus-parent-pom "3.1" "0r1wa6zrpzynn4028w7880abkk2xk25mipav5f0a4d1abqzy5m53" java-sonatype-spice-parent-pom-17)) + +(define-public plexus-parent-pom-4.0 + (make-plexus-parent-pom + "4.0" "15xbvc3cqhdkli8sj2l4hqkvk6icikbj182fbm86ixkamjh5lyfk" + java-sonatype-forge-parent-pom-10)) -- cgit v1.2.3 From c460bb176b16997fd13fb6650faa6f1d55aa8def Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 14:31:37 +0200 Subject: gnu: add plexus-parent-pom-5.1. * gnu/packages/maven-parent-pom.scm (plexus-parent-pom-5.1): New variable. --- gnu/packages/maven-parent-pom.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/maven-parent-pom.scm b/gnu/packages/maven-parent-pom.scm index 0323353a59..38b4e8ccb1 100644 --- a/gnu/packages/maven-parent-pom.scm +++ b/gnu/packages/maven-parent-pom.scm @@ -369,3 +369,7 @@ (define-public plexus-parent-pom-4.0 (make-plexus-parent-pom "4.0" "15xbvc3cqhdkli8sj2l4hqkvk6icikbj182fbm86ixkamjh5lyfk" java-sonatype-forge-parent-pom-10)) + +(define-public plexus-parent-pom-5.1 + (make-plexus-parent-pom + "5.1" "1mb87adzyv8lilzd6sw40j5000vhib2p0lgf9zzgggpkh79ddm8v")) -- cgit v1.2.3 From 8c375b779d5d20dfc1603d2351f7c9cb9191549d Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 14:32:08 +0200 Subject: gnu: Add plexus-parent-pom-6.1. * gnu/packages/maven-parent-pom.scm (plexus-parent-pom-6.1): New variable. --- gnu/packages/maven-parent-pom.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/maven-parent-pom.scm b/gnu/packages/maven-parent-pom.scm index 38b4e8ccb1..de3ada3868 100644 --- a/gnu/packages/maven-parent-pom.scm +++ b/gnu/packages/maven-parent-pom.scm @@ -373,3 +373,7 @@ (define-public plexus-parent-pom-4.0 (define-public plexus-parent-pom-5.1 (make-plexus-parent-pom "5.1" "1mb87adzyv8lilzd6sw40j5000vhib2p0lgf9zzgggpkh79ddm8v")) + +(define-public plexus-parent-pom-6.1 + (make-plexus-parent-pom + "6.1" "1pisca0fxpgbhf4xdgw5mn86622pg3mc5b8760kf9mk2awazshlj")) -- cgit v1.2.3 From c68f832b2d8a242919bae0536491388bd199b57a Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 14:54:08 +0200 Subject: gnu: Add maven-parent-pom-33. * gnu/packager/maven-parent-pom.scm (maven-parent-pom-33): New variable. --- gnu/packages/maven-parent-pom.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/gnu/packages/maven-parent-pom.scm b/gnu/packages/maven-parent-pom.scm index de3ada3868..a104b32425 100644 --- a/gnu/packages/maven-parent-pom.scm +++ b/gnu/packages/maven-parent-pom.scm @@ -377,3 +377,41 @@ (define-public plexus-parent-pom-5.1 (define-public plexus-parent-pom-6.1 (make-plexus-parent-pom "6.1" "1pisca0fxpgbhf4xdgw5mn86622pg3mc5b8760kf9mk2awazshlj")) + +(define (make-maven-parent-pom version hash parent) + (hidden-package + (package + (name "maven-parent-pom") + (version version) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/apache/maven-parent") + (commit (string-append "maven-parent-" version)))) + (file-name (git-file-name name version)) + (sha256 (base32 hash)))) + (build-system ant-build-system) + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (add-after 'install 'install-plugins + (install-pom-file "maven-plugins/pom.xml")) + (add-after 'install 'install-shared + (install-pom-file "maven-shared-components/pom.xml")) + (replace 'install + (install-pom-file "pom.xml"))))) + (propagated-inputs + `(("parent" ,parent))) + (home-page "https://maven.apache.org/") + (synopsis "Maven parent pom") + (description "Apache Maven is a software project management and comprehension +tool. This package contains the Maven parent POM.") + (license license:asl2.0)))) + +(define-public maven-parent-pom-33 + (make-maven-parent-pom + "33" "1b0z2gsvpccgcssys9jbdfwlwq8b5imdwr508f87ssdbfs29lh65" + apache-parent-pom-21)) -- cgit v1.2.3 From 0e1cca3031866099b30e4cc700b9ff7be5533780 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 14:54:40 +0200 Subject: gnu: Add maven-parent-pom-30. * gnu/packages/maven-parent-pom.scm (maven-parent-pom-30): New variable. --- gnu/packages/maven-parent-pom.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/packages/maven-parent-pom.scm b/gnu/packages/maven-parent-pom.scm index a104b32425..45c4619e44 100644 --- a/gnu/packages/maven-parent-pom.scm +++ b/gnu/packages/maven-parent-pom.scm @@ -415,3 +415,8 @@ (define-public maven-parent-pom-33 (make-maven-parent-pom "33" "1b0z2gsvpccgcssys9jbdfwlwq8b5imdwr508f87ssdbfs29lh65" apache-parent-pom-21)) + +(define-public maven-parent-pom-30 + (make-maven-parent-pom + "30" "1w463na38v2054wn1cwbfqy095z13fhil4jmn08dsa4drdvdsjdw" + apache-parent-pom-18)) -- cgit v1.2.3 From 9ef1ce016606968dd0d5be64001b8357c2a3aebf Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 16:32:59 +0200 Subject: gnu: Add maven-parent-pom-27. * gnu/packages/maven.scm (maven-parent-pom-27): New variable. --- gnu/packages/maven-parent-pom.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/gnu/packages/maven-parent-pom.scm b/gnu/packages/maven-parent-pom.scm index 45c4619e44..2d92ec5dc5 100644 --- a/gnu/packages/maven-parent-pom.scm +++ b/gnu/packages/maven-parent-pom.scm @@ -420,3 +420,16 @@ (define-public maven-parent-pom-30 (make-maven-parent-pom "30" "1w463na38v2054wn1cwbfqy095z13fhil4jmn08dsa4drdvdsjdw" apache-parent-pom-18)) + +(define-public maven-parent-pom-27 + (let ((base (make-maven-parent-pom + "27" "1s31hi4n99kj7x1cy5dvzwldbjqzk6c3dn20hk61hwhgmkcbf14x" + apache-parent-pom-17))) + (package + (inherit base) + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:phases phases) + `(modify-phases ,phases + (delete 'install-plugins) + (delete 'install-shared)))))))) -- cgit v1.2.3 From cfcb2599108e61f6562070ee1620b2b8e51307c8 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 15:57:22 +0200 Subject: gnu: Add maven-parent-pom-15. * gnu/packages/maven.scm (maven-parent-pom-15): New variable. --- gnu/packages/maven-parent-pom.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/gnu/packages/maven-parent-pom.scm b/gnu/packages/maven-parent-pom.scm index 2d92ec5dc5..c40d75a4ea 100644 --- a/gnu/packages/maven-parent-pom.scm +++ b/gnu/packages/maven-parent-pom.scm @@ -433,3 +433,16 @@ (define-public maven-parent-pom-27 `(modify-phases ,phases (delete 'install-plugins) (delete 'install-shared)))))))) + +(define-public maven-parent-pom-15 + (let ((base (make-maven-parent-pom + "15" "154nbc3w9is1dpzlfi1xk03mfksxndnniyzq8mcw2wdbargb5504" + apache-parent-pom-6))) + (package + (inherit base) + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:phases phases) + `(modify-phases ,phases + (delete 'install-plugins) + (delete 'install-shared)))))))) -- cgit v1.2.3 From 8226c928c01dadffc7e0baf28856ef7551a1efaa Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 19:29:36 +0200 Subject: gnu: Add maven-parent-pom-22. * gnu/packages/maven-parent-pom.scm (maven-parent-pom-22): New variable. --- gnu/packages/maven-parent-pom.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/maven-parent-pom.scm b/gnu/packages/maven-parent-pom.scm index c40d75a4ea..ef59fcf89e 100644 --- a/gnu/packages/maven-parent-pom.scm +++ b/gnu/packages/maven-parent-pom.scm @@ -446,3 +446,22 @@ (define-public maven-parent-pom-15 `(modify-phases ,phases (delete 'install-plugins) (delete 'install-shared)))))))) + +(define-public maven-parent-pom-22 + (let ((base (make-maven-parent-pom + "22" "1kgqbyx7ckashy47n9rgyg4asyrvp933hdiknvnad7msq5d4c2jg" + apache-parent-pom-11))) + (package + (inherit base) + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:phases phases) + `(modify-phases ,phases + (delete 'install-plugins) + (delete 'install-shared) + (add-before 'install 'fix-versions + (lambda _ + (substitute* "pom.xml" + (("1.5.5") + ,(package-version java-plexus-component-annotations))) + #t))))))))) -- cgit v1.2.3 From 7b28106e913f435ef52f57c6b39e5982d8dd478b Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 20:23:55 +0200 Subject: gnu: add maven-parent-pom-31. * gnu/packages/maven-parent-pom.scm (maven-parent-pom-31): New variable. --- gnu/packages/maven-parent-pom.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/packages/maven-parent-pom.scm b/gnu/packages/maven-parent-pom.scm index ef59fcf89e..23b60c7926 100644 --- a/gnu/packages/maven-parent-pom.scm +++ b/gnu/packages/maven-parent-pom.scm @@ -416,6 +416,11 @@ (define-public maven-parent-pom-33 "33" "1b0z2gsvpccgcssys9jbdfwlwq8b5imdwr508f87ssdbfs29lh65" apache-parent-pom-21)) +(define-public maven-parent-pom-31 + (make-maven-parent-pom + "31" "0skxv669v9ffwbmrmybnn9awkf1g3ylk88bz0hv6g11zpj1a8454" + apache-parent-pom-19)) + (define-public maven-parent-pom-30 (make-maven-parent-pom "30" "1w463na38v2054wn1cwbfqy095z13fhil4jmn08dsa4drdvdsjdw" -- cgit v1.2.3 From 40b20507d159db3f4b483ac9907cc4f9afbe6ac7 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 19:31:32 +0200 Subject: gnu: Add maven-plugins-pom-23. * gnu/packages/maven-parent-pom.scm (maven-plugins-pom-23): New variable. --- gnu/packages/maven-parent-pom.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/maven-parent-pom.scm b/gnu/packages/maven-parent-pom.scm index 23b60c7926..6937521252 100644 --- a/gnu/packages/maven-parent-pom.scm +++ b/gnu/packages/maven-parent-pom.scm @@ -470,3 +470,33 @@ (define-public maven-parent-pom-22 (("1.5.5") ,(package-version java-plexus-component-annotations))) #t))))))))) + +(define-public maven-plugins-pom-23 + (hidden-package + (package + (name "maven-plugins-pom") + (version "23") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/apache/maven-plugins") + (commit (string-append "maven-plugins-" version)))) + (file-name (git-file-name "maven-plugins-pom" version)) + (sha256 + (base32 + "1j50il0c9kirr1cvf6vfr86wxp65lwqm9i4bz304ix12vv6ncxjq")))) + (build-system ant-build-system) + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (replace 'install + (install-pom-file "pom.xml"))))) + (propagated-inputs + `(("maven-parent-pom" ,maven-parent-pom-22))) + (home-page "https://github.com/apache/maven-plugins") + (synopsis "Maven parent pom for maven plugins projects") + (description "This package contains the parent pom for maven plugins.") + (license license:asl2.0)))) -- cgit v1.2.3 From b5710bbc4ae7c5487a40f78eb4a2b38c1dc3c3b4 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 16:29:47 +0200 Subject: gnu: Add maven-components-parent-pom-22. * gnu/packages/maven-parent-pom.scm (maven-components-parent-pom-22): New variable. --- gnu/packages/maven-parent-pom.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/maven-parent-pom.scm b/gnu/packages/maven-parent-pom.scm index 6937521252..e376c11fdf 100644 --- a/gnu/packages/maven-parent-pom.scm +++ b/gnu/packages/maven-parent-pom.scm @@ -500,3 +500,34 @@ (define-public maven-plugins-pom-23 (synopsis "Maven parent pom for maven plugins projects") (description "This package contains the parent pom for maven plugins.") (license license:asl2.0)))) + +(define-public maven-components-parent-pom-22 + (hidden-package + (package + (name "maven-components-parent-pom") + (version "22") + (source (origin + (method url-fetch) + (uri (string-append "https://repo1.maven.org/maven2/org/apache/" + "maven/shared/maven-shared-components/22/" + "maven-shared-components-22.pom")) + (sha256 + (base32 + "11skhrjgrrs6z5rw1w39ap1pzhrc99g0czip10kz7wsavg746ibm")))) + (build-system ant-build-system) + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'unpack) + (delete 'build) + (delete 'configure) + (replace 'install + (install-pom-file (assoc-ref %build-inputs "source")))))) + (propagated-inputs + `(("maven-parent-pom-27" ,maven-parent-pom-27))) + (home-page "https://apache.org/maven") + (synopsis "Parent pom file for the maven components") + (description "This package contains the parent pom files for maven shared +components.") + (license license:lgpl2.1+)))) -- cgit v1.2.3 From c2cef73132bdf3337ea1e4f572aaec5c64dad409 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 16:31:15 +0200 Subject: gnu: Add maven-components-parent-pom-21. * gnu/packages/maven-parent-pom.scm (maven-components-parent-pom-21): New variable. --- gnu/packages/maven-parent-pom.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gnu/packages/maven-parent-pom.scm b/gnu/packages/maven-parent-pom.scm index e376c11fdf..84af3a1c53 100644 --- a/gnu/packages/maven-parent-pom.scm +++ b/gnu/packages/maven-parent-pom.scm @@ -531,3 +531,15 @@ (define-public maven-components-parent-pom-22 (description "This package contains the parent pom files for maven shared components.") (license license:lgpl2.1+)))) + +(define-public maven-components-parent-pom-21 + (package + (inherit maven-components-parent-pom-22) + (source (origin + (method url-fetch) + (uri (string-append "https://repo1.maven.org/maven2/org/apache/" + "maven/shared/maven-shared-components/21/" + "maven-shared-components-21.pom")) + (sha256 + (base32 + "0cqa072fz55j5xyvixqv8vbd7jsbhb1cd14bzjvm0hbv2wpd9npf")))))) -- cgit v1.2.3 From b916b6382ee32a2ed8cd83378a42cb76c0dd2014 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 16 May 2020 22:06:20 +0200 Subject: gnu: java-commons-lang3: Update to 3.9. * gnu/packages/java.scm (java-commons-lang3): Update to 3.9. --- gnu/packages/java.scm | 36 +++++++++--------------------------- 1 file changed, 9 insertions(+), 27 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 9d32a51645..3af375758c 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -66,6 +66,7 @@ (define-module (gnu packages java) #:use-module (gnu packages libffi) #:use-module (gnu packages linux) ;alsa #:use-module (gnu packages maths) + #:use-module (gnu packages maven-parent-pom) #:use-module (gnu packages nss) #:use-module (gnu packages onc-rpc) #:use-module (gnu packages web) @@ -5359,43 +5360,24 @@ (define-public java-commons-lang (define-public java-commons-lang3 (package (name "java-commons-lang3") - (version "3.4") + (version "3.9") (source (origin (method url-fetch) (uri (string-append "mirror://apache/commons/lang/source/" "commons-lang3-" version "-src.tar.gz")) (sha256 - (base32 "0xpshb9spjhplq5a7mr0y1bgfw8190ik4xj8f569xidfcki1d6kg")))) + (base32 "0s4ffbvsyl16c90l45ximsg4dwd8hmz7wsza3p308fw43h6mwhb6")))) (build-system ant-build-system) - (outputs '("out" "doc")) (arguments - `(#:test-target "test" - #:make-flags - (let ((hamcrest (assoc-ref %build-inputs "java-hamcrest-all")) - (junit (assoc-ref %build-inputs "java-junit")) - (easymock (assoc-ref %build-inputs "java-easymock")) - (io (assoc-ref %build-inputs "java-commons-io"))) - (list (string-append "-Djunit.jar=" - (car (find-files junit "jar$"))) - (string-append "-Dhamcrest.jar=" - (car (find-files hamcrest ".*.jar$"))) - (string-append "-Dcommons-io.jar=" io - "/share/java/commons-io-" - ,(package-version java-commons-io) - "-SNAPSHOT.jar") - (string-append "-Deasymock.jar=" easymock - "/share/java/easymock.jar"))) + `(#:jar-name "commons-lang3.jar" + #:source-dir "src/main/java" + #:tests? #f; require junit5 #:phases (modify-phases %standard-phases - (add-after 'build 'build-javadoc ant-build-javadoc) - (replace 'install (install-jars "target")) - (add-after 'install 'install-doc (install-javadoc "target/apidocs"))))) - (native-inputs - `(("java-junit" ,java-junit) - ("java-commons-io" ,java-commons-io) - ("java-hamcrest-all" ,java-hamcrest-all) - ("java-easymock" ,java-easymock))) + (replace 'install (install-from-pom "pom.xml"))))) + (propagated-inputs + `(("apache-commons-parent-pom" ,apache-commons-parent-pom-48))) (home-page "https://commons.apache.org/lang/") (synopsis "Extension of the java.lang package") (description "The Commons Lang components contains a set of Java classes -- cgit v1.2.3 From ba03666d298e05ba9d549cf4e83b7e383f648894 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 16 May 2020 22:15:53 +0200 Subject: gnu: java-commons-codec: Update to 1.14. * gnu/packages/java.scm (java-commons-codec): Update to 1.14. --- gnu/packages/java.scm | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 3af375758c..1ad659ccd9 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -6913,33 +6913,38 @@ (define-public java-commons-cli (define-public java-commons-codec (package (name "java-commons-codec") - (version "1.10") + (version "1.14") (source (origin (method url-fetch) (uri (string-append "mirror://apache/commons/codec/source/" "commons-codec-" version "-src.tar.gz")) (sha256 (base32 - "1w9qg30y4s0x8gnmr2fgj4lyplfn788jqxbcz27lf5kbr6n8xr65")))) + "11xr0agckkhm91pb5akf2mbk84yd54gyr178wj57gsm97fi7nkh9")))) (build-system ant-build-system) - (outputs '("out" "doc")) (arguments - `(#:test-target "test" - #:make-flags - (let ((hamcrest (assoc-ref %build-inputs "java-hamcrest-core")) - (junit (assoc-ref %build-inputs "java-junit"))) - (list (string-append "-Djunit.jar=" (car (find-files junit "jar$"))) - (string-append "-Dhamcrest.jar=" (car (find-files hamcrest "jar$"))) - ;; Do not append version to jar. - "-Dfinal.name=commons-codec")) + `(#:jar-name "java-commons-codec.jar" + #:source-dir "src/main/java" + #:test-dir "src/test" + #:test-exclude (list "**/*AbstractTest.java") #:phases (modify-phases %standard-phases - (add-after 'build 'build-javadoc ant-build-javadoc) - (replace 'install (install-jars "dist")) - (add-after 'install 'install-doc (install-javadoc "dist/docs/api"))))) + (add-before 'build 'copy-resources + (lambda _ + (copy-recursively "src/main/resources" + "build/classes") + #t)) + (add-before 'check 'copy-test-resources + (lambda _ + (copy-recursively "src/test/resources" + "build/test-classes") + #t)) + (replace 'install (install-from-pom "pom.xml"))))) (native-inputs - `(("java-junit" ,java-junit) - ("java-hamcrest-core" ,java-hamcrest-core))) + `(("java-commons-lang3" ,java-commons-lang3) + ("java-junit" ,java-junit))) + (propagated-inputs + `(("apache-commons-parent-pom" ,apache-commons-parent-pom-50))) (home-page "https://commons.apache.org/codec/") (synopsis "Common encoders and decoders such as Base64, Hex, Phonetic and URLs") (description "The codec package contains simple encoder and decoders for -- cgit v1.2.3 From b3971a5c47180450f8c1079ff0f33735bcba9b97 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 16 May 2020 23:02:32 +0200 Subject: gnu: java-plexus-utils: Update to 3.2.1. * gnu/packages/java.scm (java-plexus-utils): Update to 3.2.1. --- gnu/packages/java.scm | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 1ad659ccd9..c8de5c333a 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -3819,7 +3819,8 @@ (define-public java-junitparams (define-public java-plexus-utils (package (name "java-plexus-utils") - (version "3.2.0") + ;; sisu-build-api needs this version, later versions don't work + (version "3.2.1") (source (origin (method git-fetch) (uri (git-reference @@ -3828,7 +3829,7 @@ (define-public java-plexus-utils (file-name (git-file-name name version)) (sha256 (base32 - "1mlx7xrq7lgqjqcpg7y4hi1ghavf28vvk3har82037dqx61n0f15")))) + "1w169glixyk94jbczj8jzg897lsab46jihiaa3dhw0p06g35va8b")))) (build-system ant-build-system) ;; FIXME: The default build.xml does not include a target to install ;; javadoc files. @@ -3858,11 +3859,21 @@ (define-public java-plexus-utils ;; FIXME: The command line tests fail, maybe because they use ;; absolute paths. - (delete-file "cli/CommandlineTest.java")) - #t))))) + (delete-file "cli/CommandlineTest.java") + + ;; These tests require openjdk jmh, which is not packaged yet + (for-each delete-file (find-files "." "PerfTest.java$"))) + #t)) + (add-before 'build 'copy-resources + (lambda _ + (copy-recursively "src/main/resources" "build/classes") + #t)) + (replace 'install (install-from-pom "pom.xml"))))) (native-inputs `(("java-hamcrest-core" ,java-hamcrest-core) ("java-junit" ,java-junit))) + (propagated-inputs + `(("plexus-parent-pom" ,plexus-parent-pom-5.1))) (home-page "https://codehaus-plexus.github.io/plexus-utils/") (synopsis "Common utilities for the Plexus framework") (description "This package provides various Java utility classes for the -- cgit v1.2.3 From 2ddf13aed27d09368563787581b9d0f0408d6007 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 16 May 2020 23:36:43 +0200 Subject: gnu: Add java-plexus-utils-3.3.0. * gnu/packages/java.scm (java-plexus-utils-3.3.0): New variable. --- gnu/packages/java.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index c8de5c333a..ac98f357b4 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -3881,6 +3881,20 @@ (define-public java-plexus-utils more.") (license license:asl2.0))) +(define-public java-plexus-utils-3.3.0 + (package + (inherit java-plexus-utils) + (version "3.3.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/codehaus-plexus/plexus-utils") + (commit (string-append "plexus-utils-" version)))) + (file-name (git-file-name "java-plexus-utils" version)) + (sha256 + (base32 + "0d0fq21rzjy0j55kcp8w9k1rbq9rwr0r7cc8239p9jbz54vihp0g")))))) + (define-public java-plexus-interpolation (package (name "java-plexus-interpolation") -- cgit v1.2.3 From 79265a459868b9d70d527e2f412bf7f3d3c797c8 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 16 May 2020 23:55:05 +0200 Subject: gnu: java-plexus-io: Update to 3.2.0. * gnu/packages/java.scm (java-plexus-io): Update to 3.2.0. (java-commons-io)[arguments]: Install from pom file. --- gnu/packages/java.scm | 50 ++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 38 insertions(+), 12 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index ac98f357b4..ab28b25f1e 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -3997,7 +3997,7 @@ (define java-plexus-container-default-bootstrap (define-public java-plexus-io (package (name "java-plexus-io") - (version "3.0.0") + (version "3.2.0") (source (origin (method git-fetch) (uri (git-reference @@ -4006,25 +4006,28 @@ (define-public java-plexus-io (file-name (git-file-name name version)) (sha256 (base32 - "1h4q9l2j9sfbscvxpnyy2hazi0r83h3am86y4r959wrl1b24xxwd")))) + "1r3wqfpbxq8vp4p914i8p88r0994rmcjw02hz14n11cfb6gsyvlr")))) (build-system ant-build-system) (arguments `(#:jar-name "plexus-io.jar" #:source-dir "src/main/java" #:test-dir "src/test" - #:jdk ,icedtea-8 #:phases (modify-phases %standard-phases (add-before 'build 'copy-resources (lambda _ - (mkdir-p "build/classes/META-INF/plexus") - (copy-file "src/main/resources/META-INF/plexus/components.xml" - "build/classes/META-INF/plexus/components.xml") - #t))))) + (mkdir-p "build/classes") + (copy-recursively "src/main/resources" "build/classes") + (mkdir-p "build/test-classes") + (copy-recursively "src/test/resources" "build/test-classes") + #t)) + (replace 'install (install-from-pom "pom.xml"))))) + (propagated-inputs + `(("java-plexus-utils" ,java-plexus-utils-3.3.0) + ("java-commons-io" ,java-commons-io) + ("plexus-parent-pom" ,plexus-parent-pom-5.1))) (inputs - `(("utils" ,java-plexus-utils) - ("commons-io" ,java-commons-io) - ("java-jsr305" ,java-jsr305))) + `(("java-jsr305" ,java-jsr305))) (native-inputs `(("junit" ,java-junit) ("hamcrest" ,java-hamcrest-core) @@ -5236,11 +5239,13 @@ (define-public java-commons-io #:phases (modify-phases %standard-phases (add-after 'build 'build-javadoc ant-build-javadoc) - (replace 'install (install-jars "target")) + (replace 'install (install-from-pom "pom.xml")) (add-after 'install 'install-doc (install-javadoc "target/apidocs"))))) (native-inputs `(("java-junit" ,java-junit) ("java-hamcrest-core" ,java-hamcrest-core))) + (propagated-inputs + `(("apache-commons-parent-pom" ,apache-commons-parent-pom-39))) (home-page "https://commons.apache.org/io/") (synopsis "Common useful IO related classes") (description "Commons-IO contains utility classes, stream implementations, @@ -5671,7 +5676,28 @@ (define-public java-jsr305 (build-system ant-build-system) (arguments `(#:tests? #f ; no tests included - #:jar-name "jsr305.jar")) + #:jar-name "jsr305.jar" + #:modules ((guix build ant-build-system) + (guix build java-utils) + (guix build maven pom) + (guix build utils) + (sxml simple)) + #:phases + (modify-phases %standard-phases + (add-before 'install 'create-pom + (lambda _ + (with-output-to-file "pom.xml" + (lambda _ + (sxml->xml + `((project + (modelVersion "4.0.0") + (name "jsr305") + (groupId "com.google.code.findbugs") + (artifactId "jsr305") + (version ,,version)))))) + #t)) + (replace 'install + (install-from-pom "pom.xml"))))) (home-page "http://findbugs.sourceforge.net/") (synopsis "Annotations for the static analyzer called findbugs") (description "This package provides annotations for the findbugs package. -- cgit v1.2.3 From ae9130964209d8051adf56bcce22173c54516488 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 17 May 2020 00:17:03 +0200 Subject: gnu: java-plexus-classworlds: Update to 2.6.0. * gnu/packages/java.scm (java-plexus-classworlds): Update to 2.6.0. --- gnu/packages/java.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index ab28b25f1e..9d11e13ae2 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -3929,7 +3929,7 @@ (define-public java-plexus-interpolation (define-public java-plexus-classworlds (package (name "java-plexus-classworlds") - (version "2.5.2") + (version "2.6.0") (source (origin (method git-fetch) (uri (git-reference @@ -3938,12 +3938,17 @@ (define-public java-plexus-classworlds (file-name (git-file-name name version)) (sha256 (base32 - "1iv8x55fbni2hg4l7pdpbwfq75xmvq1f25g6nxma8rcdpihsh13r")))) + "034k2hgvj1saalwbnzrbg4n0zgzwcpz1lhlb8q4kgglsp9pmm03s")))) (build-system ant-build-system) (arguments `(#:jar-name "plexus-classworlds.jar" #:source-dir "src/main" - #:tests? #f));; FIXME: we need to generate some resources as in pom.xml + #:tests? #f;; FIXME: we need to generate some resources as in pom.xml + #:phases + (modify-phases %standard-phases + (replace 'install (install-from-pom "pom.xml"))))) + (propagated-inputs + `(("plexus-parent-pom-5.1" ,plexus-parent-pom-5.1))) (native-inputs `(("java-junit" ,java-junit))) (home-page "https://codehaus-plexus.github.io/plexus-classworlds/") -- cgit v1.2.3 From 02ed96dccf4764dc707bcfcb523b24cf31ed2a79 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 17 May 2020 00:12:49 +0200 Subject: gnu: java-plexus-archiver: Update to 4.2.2. * gnu/packages/java.scm (java-plexus-archiver): Update to 4.2.2. (java-plexus-container-default, java-commons-compress) (java-geronimo-xbean-reflect): Install from pom file. (java-guava): Install from pom [source]: Use git source instead of generated source jar. * gnu/packages/java-compression.scm (java-xz, java-iq80-snappy): Install from pom. --- gnu/packages/java-compression.scm | 27 +++--- gnu/packages/java.scm | 181 ++++++++++++++++++++++++++++++-------- 2 files changed, 162 insertions(+), 46 deletions(-) diff --git a/gnu/packages/java-compression.scm b/gnu/packages/java-compression.scm index b1d3ae7060..3abc0ea071 100644 --- a/gnu/packages/java-compression.scm +++ b/gnu/packages/java-compression.scm @@ -207,7 +207,6 @@ (define-public java-iq80-snappy `(#:jar-name "iq80-snappy.jar" #:source-dir "src/main/java" #:test-dir "src/test" - #:jdk ,icedtea-8 #:phases (modify-phases %standard-phases (replace 'check @@ -228,7 +227,8 @@ (define (test class) ;; We don't have hadoop (delete-file "src/main/java/org/iq80/snappy/HadoopSnappyCodec.java") (delete-file "src/test/java/org/iq80/snappy/TestHadoopSnappyCodec.java") - #t))))) + #t)) + (replace 'install (install-from-pom "pom.xml"))))) (home-page "https://github.com/dain/snappy") (native-inputs `(("guava" ,java-guava) @@ -303,14 +303,21 @@ (define-public java-xz ;; the package is not contained in a subdirectory (chdir "..") #t)) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - ;; Do we want to install *Demo.jar? - (install-file "build/jar/xz.jar" - (string-append - (assoc-ref outputs "out") - "/share/java/xz.jar")) - #t))))) + (add-before 'install 'generate-pom + (lambda _ + (copy-file "maven/pom_template.xml" "pom.xml") + (substitute* "pom.xml" + (("@VERSION@") ,version) + (("@TITLE@") "XZ data compression") + (("@HOMEPAGE@") "http://tukaani.org/xz/java.html")) + #t)) + (add-before 'install 'rename-jar + (lambda _ + (rename-file "build/jar/xz.jar" + (string-append "build/jar/xz-" ,version ".jar")) + #t)) + (replace 'install + (install-from-pom "pom.xml"))))) (native-inputs `(("unzip" ,unzip))) (home-page "https://tukaani.org") diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 9d11e13ae2..e5e7586f92 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -3976,22 +3976,31 @@ (define java-plexus-container-default-bootstrap `(#:jar-name "container-default.jar" #:source-dir "plexus-container-default/src/main/java" #:test-dir "plexus-container-default/src/test" - #:jdk ,icedtea-8 #:tests? #f; requires plexus-archiver, which depends on this package #:phases (modify-phases %standard-phases + (add-before 'build 'fix-google-collections + (lambda _ + ;; Google collections are now replaced with guava + (substitute* "plexus-container-default/pom.xml" + (("google-collections") "guava") + (("com.google.collections") "com.google.guava")) + #t)) (add-before 'build 'copy-resources (lambda _ (copy-recursively "plexus-container-default/src/main/resources/" "build/classes") - #t))))) - (inputs - `(("worldclass" ,java-plexus-classworlds) - ("xbean" ,java-geronimo-xbean-reflect) - ("utils" ,java-plexus-utils) - ("junit" ,java-junit) - ("guava" ,java-guava))) + #t)) + (replace 'install + (install-from-pom "plexus-container-default/pom.xml"))))) + (propagated-inputs + `(("java-plexus-worldclass" ,java-plexus-classworlds) + ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect) + ("java-plexus-utils" ,java-plexus-utils) + ("java-junit" ,java-junit) + ("java-guava" ,java-guava) + ("java-plexus-containers-parent-pom" ,java-plexus-containers-parent-pom))) (home-page "https://github.com/codehaus-plexus/plexus-containers") (synopsis "Inversion-of-control container") (description "Plexus-default-container is Plexus' inversion-of-control @@ -3999,6 +4008,21 @@ (define java-plexus-container-default-bootstrap implementation.") (license license:asl2.0))) +(define java-plexus-containers-parent-pom + (package + (inherit java-plexus-container-default-bootstrap) + (name "java-plexus-containers-parent-pom") + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (replace 'install + (install-pom-file "pom.xml"))))) + (propagated-inputs + `(("plexus-parent-pom" ,plexus-parent-pom-4.0))))) + (define-public java-plexus-io (package (name "java-plexus-io") @@ -4050,19 +4074,18 @@ (define-public java-plexus-io (define-public java-plexus-archiver (package (name "java-plexus-archiver") - (version "4.1.0") + (version "4.2.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/codehaus-plexus/plexus-archiver" "/archive/plexus-archiver-" version ".tar.gz")) (sha256 (base32 - "0ry6i92gli0mvdmfih2vgs0lkf9yvx18h2ajxim66yg6yipnp0hg")))) + "144n971r3lfrx3l12nf2scm80x4xdvgbkk4bjpa4vcvvdrll6qys")))) (build-system ant-build-system) (arguments `(#:jar-name "plexus-archiver.jar" #:source-dir "src/main/java" - #:jdk ,icedtea-8 #:test-dir "src/test" #:test-exclude (list "**/Abstract*.java" "**/Base*.java") #:phases @@ -4080,19 +4103,22 @@ (define-public java-plexus-archiver #t)) (add-before 'build 'copy-resources (lambda _ - (mkdir-p "build/classes/META-INF/plexus") - (copy-file "src/main/resources/META-INF/plexus/components.xml" - "build/classes/META-INF/plexus/components.xml") - #t))))) + (mkdir-p "build/classes") + (copy-recursively "src/main/resources" "build/classes") + (mkdir-p "build/test-classes") + (copy-recursively "src/test/resources" "build/test-classes") + #t)) + (replace 'install (install-from-pom "pom.xml"))))) + (propagated-inputs + `(("java-plexus-utils" ,java-plexus-utils-3.3.0) + ("java-plexus-io" ,java-plexus-io) + ("java-iq80-snappy" ,java-iq80-snappy) + ("java-commons-compress" ,java-commons-compress) + ("plexus-parent-pom" ,plexus-parent-pom-6.1))) (inputs - `(("utils" ,java-plexus-utils) - ("commons-io" ,java-commons-io) - ("snappy" ,java-iq80-snappy) - ("io" ,java-plexus-io) - ("compress" ,java-commons-compress) - ("container-default" ,java-plexus-container-default-bootstrap) - ("snappy" ,java-snappy) - ("java-jsr305" ,java-jsr305))) + `(("java-jsr305" ,java-jsr305) + ("java-plexus-container-default" + ,java-plexus-container-default-bootstrap))) (native-inputs `(("java-hamcrest-core" ,java-hamcrest-core) ("junit" ,java-junit) @@ -5715,22 +5741,23 @@ (define-public java-guava ;; This is the last release of Guava that can be built with Java 7. (version "20.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/google/guava/" - "releases/download/v" version - "/guava-" version "-sources.jar")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/google/guava/") + (commit (string-append "v" version)))) (sha256 (base32 - "1gawrs5gi6j5hcfxdgpnfli75vb9pfi4sn09pnc8xacr669yajwr")))) + "00h5cawdjic1vind3yivzh1f58flvm1yfmhsyqwyvmbvj1vakysp")))) (build-system ant-build-system) (arguments `(#:tests? #f ; no tests included #:jar-name "guava.jar" + #:source-dir "guava/src" #:phases (modify-phases %standard-phases (add-after 'unpack 'trim-sources (lambda _ - (with-directory-excursion "src/com/google/common" + (with-directory-excursion "guava/src/com/google/common" ;; Remove annotations to avoid extra dependencies: ;; * "j2objc" annotations are used when converting Java to ;; Objective C; @@ -5749,9 +5776,12 @@ (define-public java-guava (("@ForOverride") "") (("@J2ObjCIncompatible") "") (("@IgnoreJRERequirement") ""))) - #t))))) + #t)) + (replace 'install (install-from-pom "guava/pom.xml"))))) (inputs `(("java-jsr305" ,java-jsr305))) + (propagated-inputs + `(("java-guava-parent-pom" ,java-guava-parent-pom))) (home-page "https://github.com/google/guava") (synopsis "Google core libraries for Java") (description "Guava is a set of core libraries that includes new @@ -5761,6 +5791,21 @@ (define-public java-guava more!") (license license:asl2.0))) +(define java-guava-parent-pom + (package + (inherit java-guava) + (name "java-guava-parent-pom") + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (replace 'install + (install-pom-file "pom.xml"))))) + (propagated-inputs + `(("java-sonatype-oss-parent-pom" ,java-sonatype-oss-parent-pom-7))))) + ;; The java-commons-logging package provides adapters to many different ;; logging frameworks. To avoid an excessive dependency graph we try to build ;; it with only a minimal set of adapters. @@ -6084,12 +6129,14 @@ (define-public java-commons-compress ;; package at this point. ;; https://github.com/powermock/powermock (delete-file "archivers/sevenz/SevenZNativeHeapTest.java")) - #t))))) - (inputs + #t)) + (replace 'install (install-from-pom "pom.xml"))))) + (propagated-inputs + `(("java-xz" ,java-xz) + ("apache-commons-parent-pom" ,apache-commons-parent-pom-41))) + (native-inputs `(("java-junit" ,java-junit) - ("java-hamcrest-core" ,java-hamcrest-core) - ("java-mockito" ,java-mockito-1) - ("java-xz" ,java-xz))) + ("java-mockito" ,java-mockito-1))) (home-page "https://commons.apache.org/proper/commons-compress/") (synopsis "Java library for working with compressed files") (description "The Apache Commons Compress library defines an API for @@ -10274,13 +10321,16 @@ (define-public java-geronimo-xbean-reflect ;; org.apache.xbean.asm6 is actually repackaged java-asm (substitute* (string-append dir "XbeanAsmParameterNameLoader.java") (("org.apache.xbean.asm5") "org.objectweb.asm")) - #t)))))) + #t))) + (replace 'install (install-from-pom "xbean-reflect/pom.xml"))))) (inputs `(("asm" ,java-asm) ("log4j" ,java-log4j-api) ("log4j-1.2" ,java-log4j-1.2-api) ("log4j-core" ,java-log4j-core) ("logging" ,java-commons-logging-minimal))) + (propagated-inputs + `(("java-geronimo-parent-pom" ,java-geronimo-parent-pom))) (native-inputs `(("junit" ,java-junit))) (home-page "https://geronimo.apache.org/maven/xbean/3.6/xbean-reflect/") @@ -10289,6 +10339,65 @@ (define-public java-geronimo-xbean-reflect and graphs of objects for dependency injection frameworks") (license license:asl2.0))) +(define java-geronimo-genesis-2.1 + (package + (name "java-geronimo-genesis") + (version "2.1") + (source (origin + (method svn-fetch) + (uri (svn-reference + (url (string-append "https://svn.apache.org/repos/asf/" + "geronimo/genesis/tags/genesis-" + version)) + (revision 1807396))) + (file-name (string-append name "-" version "-source")) + (sha256 + (base32 + "119yn795jvnjf52si84q192s8wag1k013iabg78b7wnadssnnh31")))) + (build-system ant-build-system) + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (replace 'install + (install-pom-file "pom.xml")) + (add-after 'install 'install-enforcer-rules + (install-pom-file "genesis-enforcer-rules/pom.xml")) + (add-after 'install 'install-flava + (install-pom-file "genesis-default-flava/pom.xml")) + (add-after 'install 'install-packaging + (install-pom-file "genesis-packaging/pom.xml")) + (add-after 'install-flava 'install-flava-java4 + (install-pom-file "genesis-default-flava/genesis-java1.4-flava/pom.xml")) + (add-after 'install-flava 'install-flava-java5 + (install-pom-file "genesis-default-flava/genesis-java5-flava/pom.xml")) + (add-after 'install-flava 'install-flava-java6 + (install-pom-file "genesis-default-flava/genesis-java6-flava/pom.xml"))))) + (propagated-inputs + `(("apache-parent-pom" ,apache-parent-pom-13))) + (home-page "https://geronimo.apache.org") + (synopsis "Collection of maven POM files for the Geronimo project") + (description "Apache Geronimo is a server runtime. This package contains +only pom files used by other components in the Geronimo project.") + (license license:asl2.0))) + +(define java-geronimo-parent-pom + (package + (inherit java-geronimo-xbean-reflect) + (name "java-geronimo-parent-pom") + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (replace 'install + (install-pom-file "pom.xml"))))) + (propagated-inputs + `(("java-geronimo-genesis" ,java-geronimo-genesis-2.1))))) + (define-public java-geronimo-xbean-bundleutils (package (inherit java-geronimo-xbean-reflect) -- cgit v1.2.3 From aabaac7d85971a4e6b8826f6412b7cd40d42bbcc Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 17 May 2020 18:01:32 +0200 Subject: gnu: Add javacc-3. * gnu/packages/java.scm (javacc-3): New variable. --- gnu/packages/java.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index e5e7586f92..f3c8abe99b 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2696,6 +2696,35 @@ (define-public javacc-4 debugging, etc.") (license license:bsd-3))) +;; javacc-3, as javacc-4 is not properly bootstrapped: is contains a javacc.jar +;; in the bootstrap/ directory. +(define-public javacc-3 + (package + (inherit javacc-4) + (version "3.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/javacc/javacc.git") + (commit "release_32"))) + (file-name (string-append "javacc-" version "-checkout")) + (sha256 + (base32 + "1pyf1xyh8gk83nxqn2v2mdws32l68ydznha41cxa4l2kkbq1v1g3")))) + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (add-before 'build 'set-java-version + (lambda _ + (for-each + (lambda (file) + (substitute* file + (("debug=") "source=\"1.4\" debug="))) + (find-files "." "build.xml")) + #t)) + (replace 'install (install-jars "bin/lib"))))))) + (define-public javacc (package (inherit javacc-4) -- cgit v1.2.3 From b8d977b1545a957523eb00cbd475c8a1944f8ac4 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 17 May 2020 17:57:41 +0200 Subject: gnu: java-bsh: Unbundle third-party libraries. * gnu/packages/java.scm (java-bsh)[source]: Remove bundled jar files. --- gnu/packages/java.scm | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index f3c8abe99b..884c10a0a4 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -9422,19 +9422,38 @@ (define-public java-bsh (file-name (git-file-name name version)) (sha256 (base32 - "0kz3f0xjack6c9syssi4qjw1rbd3q5963sk5pmr143hiibxa9csw")))) + "0kz3f0xjack6c9syssi4qjw1rbd3q5963sk5pmr143hiibxa9csw")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Delete bundled third-party jar archives. + (for-each delete-file (find-files "." ".*.jar$")) + (for-each (lambda (file) (chmod file #o644)) + (find-files "." ".")) + #t)))) (build-system ant-build-system) (arguments `(#:build-target "jarall" #:test-target "junit-tests-all" #:phases (modify-phases %standard-phases + (add-before 'install 'fix-pom + (lambda _ + (substitute* "pom.xml" + (("org.apache-extras.beanshell") "org.beanshell")) + #t)) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let ((share (string-append (assoc-ref outputs "out") "/share/java"))) (mkdir-p share) (copy-file "dist/bsh-2.0b6.jar" (string-append share "/bsh-2.0b6.jar")) #t)))))) + (inputs + `(("java-classpathx-servletapi" ,java-classpathx-servletapi) + ("java-commons-bsf" ,java-commons-bsf))) + (native-inputs + `(("java-junit" ,java-junit) + ("javacc" ,javacc-3))) (home-page "http://beanshell.org/") (synopsis "Lightweight Scripting for Java") (description "BeanShell is a small, free, embeddable Java source -- cgit v1.2.3 From 6671d6a14e182c25a6d90a390a3593a57b3565d3 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 17 May 2020 23:23:48 +0200 Subject: gnu: java-plexus-interpolation: Update to 1.26. * gnu/packages/java.scm (java-plexus-interpolation): Update to 1.26. --- gnu/packages/java.scm | 150 +++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 124 insertions(+), 26 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 884c10a0a4..57fd3a2505 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -3927,7 +3927,7 @@ (define-public java-plexus-utils-3.3.0 (define-public java-plexus-interpolation (package (name "java-plexus-interpolation") - (version "1.23") + (version "1.26") (source (origin (method git-fetch) (uri (git-reference @@ -3936,11 +3936,16 @@ (define-public java-plexus-interpolation (file-name (git-file-name name version)) (sha256 (base32 - "005hxxg1adv71a96lz4vp65bk3v1pi76j4c45z29xzizclib16vl")))) + "1rahjmhywf6d5m32qzlc9izawyvcd71abfm9k03f13rs2xmfxzlh")))) (build-system ant-build-system) (arguments `(#:jar-name "plexus-interpolation.jar" - #:source-dir "src/main")) + #:source-dir "src/main" + #:phases + (modify-phases %standard-phases + (replace 'install (install-from-pom "pom.xml"))))) + (propagated-inputs + `(("plexus-parent-pom-5.1" ,plexus-parent-pom-5.1))) (native-inputs `(("java-junit" ,java-junit) ("java-hamcrest-core" ,java-hamcrest-core))) @@ -9209,7 +9214,28 @@ (define-public java-aopalliance `(#:jar-name "java-aopalliance.jar" #:jdk ,icedtea-8 #:tests? #f; no tests - #:source-dir "aopalliance/src/main")) + #:source-dir "aopalliance/src/main" + #:modules ((guix build ant-build-system) + (guix build utils) + (guix build maven pom) + (guix build java-utils) + (sxml simple)) + #:phases + (modify-phases %standard-phases + (add-before 'install 'create-pom + (lambda _ + (with-output-to-file "pom.xml" + (lambda _ + (sxml->xml + `((project + (modelVersion "4.0.0") + (name "aopalliance") + (groupId "aopalliance") + (artifactId "aopalliance") + (version "1.0")))))) + #t)) + (replace 'install + (install-from-pom "pom.xml"))))) (home-page "http://aopalliance.sourceforge.net") (synopsis "Aspect-Oriented Programming") (description "The AOP Alliance project is a joint project between several @@ -9220,19 +9246,24 @@ (define-public java-aopalliance (define-public java-javax-inject (package (name "java-javax-inject") - (version "tck-1") + (version "1") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/javax-inject/javax-inject/" - "archive/javax.inject-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/javax-inject/javax-inject") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1ydrlvh2r7vr1g7lhjwy3w2dggpj9h6pix1lakkkgdywb365n6g0")))) + "1rspl0nkvk1jif6nccikw93xic6ljj2b6kpy2mffwi2mnvc13j7x")))) (build-system ant-build-system) (arguments `(#:jar-name "java-javax-inject.jar" - #:jdk ,icedtea-8 - #:tests? #f)); no tests + #:tests? #f; no tests + #:phases + (modify-phases %standard-phases + (replace 'install + (install-from-pom "pom.xml"))))) (home-page "https://github.com/javax-inject/javax-inject") (synopsis "JSR-330: Dependency Injection for Java") (description "This package specifies a means for obtaining objects in such @@ -9269,20 +9300,23 @@ (define-public java-guice (arguments `(#:jar-name "java-guice.jar" #:jdk ,icedtea-8 - #:tests? #f ; FIXME: tests are not in a java sub directory + #:tests? #f; FIXME: tests are not in a java sub directory #:source-dir "core/src" #:phases (modify-phases %standard-phases (add-after 'unpack 'make-files-writable (lambda _ (for-each make-file-writable (find-files ".")) - #t))))) - (inputs - `(("guava" ,java-guava) + #t)) + (replace 'install + (install-from-pom "core/pom.xml"))))) + (propagated-inputs + `(("java-aopalliance" ,java-aopalliance) + ("java-asm" ,java-asm) ("java-cglib" ,java-cglib) - ("java-aopalliance" ,java-aopalliance) + ("java-guava" ,java-guava) ("java-javax-inject" ,java-javax-inject) - ("java-asm" ,java-asm))) + ("java-guice-parent-pom" ,java-guice-parent-pom))) (home-page "https://github.com/google/guice") (synopsis "Lightweight dependency injection framework") (description "Guice is a lightweight dependency injection framework for @@ -9309,6 +9343,51 @@ (define-public java-guice-servlet ("servlet" ,java-classpathx-servletapi) ,@(package-inputs java-guice))))) +(define java-guice-parent-pom + (package + (inherit java-guice) + (name "java-guice-parent-pom") + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (add-after 'install 'install-extensions + (install-pom-file "extensions/pom.xml")) + (replace 'install + (install-pom-file "pom.xml"))))) + (propagated-inputs + `(("java-google-parent-pom" ,java-google-parent-pom-5))))) + +(define java-google-parent-pom-5 + (package + (name "java-google-parent-pom") + (version "5") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/google/google-maven-parents") + (commit (string-append "google-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0zb7hx24p8k8rfdvix2vsbfqn73jhrycdndvhf8j5gbii9wbqibv")))) + (build-system ant-build-system) + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (replace 'install + (install-pom-file "pom.xml"))))) + (home-page "https://github.com/google/google-maven-parents") + (synopsis "Google parent pom") + (description "This package contains the Maven parent POM for other Google +Java projects.") + (license license:asl2.0))) + (define-public java-assertj (package (name "java-assertj") @@ -10484,7 +10563,7 @@ (define-public java-geronimo-xbean-bundleutils ("java-osgi-framework" ,java-osgi-framework) ("java-eclipse-osgi" ,java-eclipse-osgi) ("java-osgi-service-packageadmin" ,java-osgi-service-packageadmin))))) - + (define-public java-geronimo-xbean-asm-util (package (inherit java-geronimo-xbean-reflect) @@ -10496,7 +10575,7 @@ (define-public java-geronimo-xbean-asm-util (inputs `(("java-asm" ,java-asm))) (native-inputs '()))) - + (define-public java-geronimo-xbean-finder (package (inherit java-geronimo-xbean-reflect) @@ -11627,25 +11706,30 @@ (define-public java-apache-ivy (define-public java-eclipse-sisu-inject (package (name "java-eclipse-sisu-inject") - (version "0.3.3") + (version "0.3.4") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/eclipse/sisu.inject/") - (commit "releases/0.3.3"))) + (commit (string-append "releases/" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "0gibc9x0bw0f4ls086fx73610fcspz9g2as7kcpcfhvl5znysvg7")))) + "16044sizdb0rjbhlfbmcnpds5y7by7dyn9b0c11606aikqi8k3x6")))) (build-system ant-build-system) (arguments `(#:jar-name "eclipse-sisu-inject.jar" #:source-dir "org.eclipse.sisu.inject/src" - #:jdk ,icedtea-8 - #:tests? #f)); no tests - (inputs + #:tests? #f; no tests + #:phases + (modify-phases %standard-phases + (replace 'install + (install-from-pom "org.eclipse.sisu.inject/pom.xml"))))) + (propagated-inputs `(("java-guice" ,java-guice) - ("java-guice-servlet" ,java-guice-servlet) + ("java-sisu-inject-parent-pom" ,java-sisu-inject-parent-pom))) + (inputs + `(("java-guice-servlet" ,java-guice-servlet) ("java-javax-inject" ,java-javax-inject) ("java-javaee-servletapi" ,java-javaee-servletapi) ("java-junit" ,java-junit) @@ -11666,6 +11750,20 @@ (define-public java-eclipse-sisu-inject OSGi Service Registry is a goal of this project.") (license license:epl1.0))) +(define java-sisu-inject-parent-pom + (package + (inherit java-eclipse-sisu-inject) + (name "java-sisu-inject-parent-pom") + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (replace 'install + (install-pom-file "pom.xml"))))) + (propagated-inputs '()))) + (define-public java-eclipse-sisu-plexus (package (name "java-eclipse-sisu-plexus") -- cgit v1.2.3 From ff0496d05422e756b79a1276bfe02b6ccba658e7 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 26 Jun 2020 23:46:51 +0200 Subject: gnu: maven-wagon-provider-api: Update to 3.3.4. * gnu/packages/maven.scm (maven-wagon-provider-api): Update to 3.3.4. (maven-wagon-provider-test): Add missing dependency. --- gnu/packages/maven.scm | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index c4d2872cfe..683aabf2de 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -30,6 +30,7 @@ (define-module (gnu packages maven) #:use-module (gnu packages base) #:use-module (gnu packages compression) #:use-module (gnu packages java) + #:use-module (gnu packages maven-parent-pom) #:use-module (gnu packages web) #:use-module (gnu packages xml)) @@ -401,19 +402,26 @@ (define-public maven-plugin-annotations (define-public maven-wagon-provider-api (package (name "maven-wagon-provider-api") - (version "3.1.0") + (version "3.3.4") (source (origin (method url-fetch) (uri (string-append "mirror://apache/maven/wagon/" "wagon-" version "-source-release.zip")) - (sha256 (base32 "0r07j6xdzdnrvqnv8ida7dx1m05pznh5qgmcfcfpyvg9nxbj3l1n")))) + (sha256 + (base32 + "1iq9bilgfklzbxwwhzi3f19mkbaaf9dh9f83h3yz5gbmvypask9a")))) (build-system ant-build-system) (arguments `(#:jar-name "maven-wagon-provider-api.jar" #:source-dir "wagon-provider-api/src/main/java" - #:test-dir "wagon-provider-api/src/test")) - (inputs - `(("java-plexus-utils" ,java-plexus-utils))) + #:test-dir "wagon-provider-api/src/test" + #:phases + (modify-phases %standard-phases + (replace 'install + (install-from-pom "wagon-provider-api/pom.xml"))))) + (propagated-inputs + `(("java-plexus-utils" ,java-plexus-utils) + ("maven-wagon-parent-pom" ,maven-wagon-parent-pom))) (native-inputs `(("unzip" ,unzip) ("java-junit" ,java-junit) @@ -424,6 +432,22 @@ (define-public maven-wagon-provider-api artifact and repository handling code.") (license license:asl2.0))) +(define maven-wagon-parent-pom + (package + (inherit maven-wagon-provider-api) + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (replace 'install + (install-pom-file "pom.xml"))))) + (propagated-inputs + `(("maven-parent-pom-33" ,maven-parent-pom-33))) + (native-inputs + `(("unzip" ,unzip))))) + (define-public maven-wagon-provider-test (package (inherit maven-wagon-provider-api) @@ -436,6 +460,7 @@ (define-public maven-wagon-provider-test (inputs `(("java-plexus-utils" ,java-plexus-utils) ("java-plexus-container-default" ,java-plexus-container-default) + ("java-eclipse-jetty-http-9.2" ,java-eclipse-jetty-http-9.2) ("java-eclipse-jetty-util-9.2" ,java-eclipse-jetty-util-9.2) ("java-eclipse-jetty-security-9.2" ,java-eclipse-jetty-security-9.2) ("java-eclipse-jetty-server-9.2" ,java-eclipse-jetty-server-9.2) -- cgit v1.2.3 From 968bb6827577fdb70216d03fbe9db79f1f0aa09f Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 00:06:22 +0200 Subject: gnu: java-httpcomponents-httpclient: Update to 4.5.12. * gnu/packages/java.scm (java-httpcomponents-httpclient): Update to 4.5.12. --- gnu/packages/java.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 57fd3a2505..912f7d808e 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -6028,7 +6028,7 @@ (define-public java-httpcomponents-httpcore-ab (define-public java-httpcomponents-httpclient (package (name "java-httpcomponents-httpclient") - (version "4.5.3") + (version "4.5.12") (source (origin (method url-fetch) (uri (string-append "mirror://apache/httpcomponents/httpclient/" @@ -6036,7 +6036,7 @@ (define-public java-httpcomponents-httpclient version "-src.tar.gz")) (sha256 (base32 - "1428399s7qy3cim5wc6f3ks4gl9nf9vkjpfmnlap3jflif7g2pj1")))) + "1va99m2zc2liv0v9vn72p5ja8yz4s5wq7zpahaai5nr966kvxzkb")))) (build-system ant-build-system) (arguments `(#:jar-name "httpcomponents-httpclient.jar" -- cgit v1.2.3 From 51087d51df20b89cf081aaa895efadbb73e6550b Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 26 Jun 2020 23:22:04 +0200 Subject: gnu: maven: Install from pom file. * gnu/packages/java.scm (java-plexus-container-default-bootstrap) (java-plexus-component-annotations, java-plexus-cipher, java-asm) (java-jsr250, java-commons-cli, java-slf4j-api, java-slf4j-simple) (java-bsh, java-jboss-el-api-spec, java-jboss-interceptors-api-spec) (java-cdi-api, java-eclipse-sisu-plexus): Install from pom file. * gnu/packages/maven.scm (maven-resolver-api, maven-resolver-spi) (maven-resolver-util, maven-resolver-connector-basic, maven-resolver-impl) (java-plexus-utils, maven-artifact, maven-model, maven-builder-support) (maven-settings, maven-settings-builder, maven-model-builder) (maven-repository-metadata, maven-resolver-provider, maven-plugin-api) (maven-core, maven-embedder, maven-compat): Install from pom file. --- gnu/packages/java-compression.scm | 5 +- gnu/packages/java.scm | 263 +++++++++++++++++++++++++++------ gnu/packages/maven.scm | 295 +++++++++++++++++++++++++++----------- 3 files changed, 436 insertions(+), 127 deletions(-) diff --git a/gnu/packages/java-compression.scm b/gnu/packages/java-compression.scm index 3abc0ea071..112f04af53 100644 --- a/gnu/packages/java-compression.scm +++ b/gnu/packages/java-compression.scm @@ -231,10 +231,9 @@ (define (test class) (replace 'install (install-from-pom "pom.xml"))))) (home-page "https://github.com/dain/snappy") (native-inputs - `(("guava" ,java-guava) + `(("java-guava" ,java-guava) ("java-snappy" ,java-snappy) - ("hamcrest" ,java-hamcrest-core) - ("testng" ,java-testng))) + ("java-testng" ,java-testng))) (synopsis "Java port of the Snappy (de)compressor") (description "Iq80-snappy is a port of the Snappy compressor and decompressor rewritten diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 912f7d808e..dfb84fc410 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -3591,11 +3591,11 @@ (define-public java-jarjar (("") (string-append "")) + "/lib/m2\" includes=\"**/*.jar\"/>")) (("") "") (("lib/asm-commons-4.0.jar") - (string-append (assoc-ref inputs "java-asm-bootstrap") - "/share/java/asm-6.0.jar")) + (car (find-files (assoc-ref inputs "java-asm-bootstrap") + "asm-6.0.jar"))) (("") (string-append "" @@ -4181,9 +4181,15 @@ (define-public java-plexus-container-default ;; Failures "**/ComponentRealmCompositionTest.java" "**/PlexusContainerTest.java") - #:jdk ,icedtea-8 #:phases (modify-phases %standard-phases + (add-before 'build 'fix-google-collections + (lambda _ + ;; Google collections are now replaced with guava + (substitute* "plexus-container-default/pom.xml" + (("google-collections") "guava") + (("com.google.collections") "com.google.guava")) + #t)) (add-before 'build 'copy-resources (lambda _ (copy-recursively @@ -4198,7 +4204,9 @@ (define-public java-plexus-container-default dir "/plexus/component/composition/" "ComponentRealmCompositionTest.java") (("src/test") "plexus-container-default/src/test")) - #t)))))) + #t))) + (replace 'install + (install-from-pom "plexus-container-default/pom.xml"))))) (inputs `(("worldclass" ,java-plexus-classworlds) ("xbean" ,java-geronimo-xbean-reflect) @@ -4216,7 +4224,13 @@ (define-public java-plexus-component-annotations (arguments `(#:jar-name "plexus-component-annotations.jar" #:source-dir "plexus-component-annotations/src/main/java" - #:tests? #f)); no tests + #:tests? #f; no tests + #:phases + (modify-phases %standard-phases + (replace 'install + (install-from-pom "plexus-component-annotations/pom.xml"))))) + (propagated-inputs + `(("java-plexus-containers-parent-pom" ,java-plexus-containers-parent-pom))) (inputs '()) (native-inputs '()) (synopsis "Plexus descriptors generator") @@ -4240,7 +4254,6 @@ (define-public java-plexus-cipher (arguments `(#:jar-name "plexus-cipher.jar" #:source-dir "src/main/java" - #:jdk ,icedtea-8 #:tests? #f; FIXME: requires sisu-inject-bean #:phases (modify-phases %standard-phases @@ -4251,10 +4264,21 @@ (define-public java-plexus-cipher (with-output-to-file "build/classes/META-INF/sisu/javax.inject.Named" (lambda _ (display "org.sonatype.plexus.components.cipher.DefaultPlexusCipher\n"))) - #t))))) + #t)) + (add-before 'install 'fix-test-dependency + (lambda _ + ;; sisu-inject-bean is only used for tests, but its scope is "provided". + (substitute* "pom.xml" + (("provided") "test")) + #t)) + (replace 'install (install-from-pom "pom.xml"))))) (inputs `(("java-cdi-api" ,java-cdi-api) ("java-javax-inject" ,java-javax-inject))) + (propagated-inputs + `(("java-sonatype-spice-parent-pom" ,java-sonatype-spice-parent-pom-15))) + (native-inputs + `(("java-junit" ,java-junit))) (home-page "https://github.com/sonatype/plexus-cipher") (synopsis "Encryption/decryption Component") (description "Plexus-cipher contains a component to deal with encryption @@ -4330,7 +4354,6 @@ (define-public java-plexus-sec-dispatcher (arguments `(#:jar-name "plexus-sec-dispatcher.jar" #:source-dir "src/main/java" - #:jdk ,icedtea-8 #:phases (modify-phases %standard-phases (add-before 'build 'generate-models @@ -4378,9 +4401,12 @@ (define (modello-single-mode file version mode) (add-before 'check 'fix-paths (lambda _ (copy-recursively "src/test/resources" "target") - #t))))) - (inputs - `(("java-plexus-cipher" ,java-plexus-cipher))) + #t)) + (replace 'install (install-from-pom "pom.xml"))))) + (propagated-inputs + `(("java-plexus-utils" ,java-plexus-utils) + ("java-plexus-cipher" ,java-plexus-cipher) + ("java-sonatype-spice-parent-pom" ,java-sonatype-spice-parent-pom-12))) (native-inputs `(("java-modello-core" ,java-modello-core) ;; for modello: @@ -4708,10 +4734,19 @@ (define-public java-asm (invoke "jar" "-cf" (string-append "dist/asm-" ,version ".jar") "-C" "output/build/tmp" "."))) + (add-before 'install 'fix-pom + (lambda _ + (substitute* (find-files "archive" "\\.pom$") + (("@product.artifact@") ,version)) + #t)) + (add-before 'install 'install-parent + (install-pom-file "archive/asm-parent.pom")) (replace 'install - (install-jars "dist"))))) + (install-from-pom "archive/asm.pom"))))) (native-inputs `(("java-junit" ,java-junit))) + (propagated-inputs + `(("java-org-ow2-parent-pom" ,java-org-ow2-parent-pom-1.3))) (home-page "https://asm.ow2.io/") (synopsis "Very small and fast Java bytecode manipulation framework") (description "ASM is an all purpose Java bytecode manipulation and @@ -4721,6 +4756,32 @@ (define-public java-asm complex transformations and code analysis tools.") (license license:bsd-3))) +(define java-org-ow2-parent-pom-1.3 + (package + (name "java-org-ow2-parent-pom") + (version "1.3") + (source (origin + (method url-fetch) + (uri "https://repo1.maven.org/maven2/org/ow2/ow2/1.3/ow2-1.3.pom") + (sha256 + (base32 + "1yr8hfx8gffpppa4ii6cvrsq029a6x8hzy7nsavxhs60s9kmq8ai")))) + (build-system ant-build-system) + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'unpack) + (delete 'build) + (delete 'configure) + (replace 'install + (install-pom-file (assoc-ref %build-inputs "source")))))) + (home-page "https://ow2.org") + (synopsis "Ow2.org parent pom") + (description "This package contains the parent pom for projects from ow2.org, +including java-asm.") + (license license:lgpl2.1+))) + (define java-asm-bootstrap (package (inherit java-asm) @@ -5715,7 +5776,28 @@ (define-public java-jsr250 (arguments `(#:tests? #f ; no tests included #:jdk ,icedtea-8 - #:jar-name "jsr250.jar")) + #:jar-name "jsr250.jar" + #:modules ((guix build ant-build-system) + (guix build utils) + (guix build maven pom) + (guix build java-utils) + (sxml simple)) + #:phases + (modify-phases %standard-phases + (add-before 'install 'create-pom + (lambda _ + (with-output-to-file "pom.xml" + (lambda _ + (sxml->xml + `((project + (modelVersion "4.0.0") + (name "jsr250") + (groupId "javax.annotation") + (artifactId "jsr250-api") + (version ,,version)))))) + #t)) + (replace 'install + (install-from-pom "pom.xml"))))) (home-page "https://jcp.org/en/jsr/detail?id=250") (synopsis "Security-related annotations") (description "This package provides annotations for security. It provides @@ -7024,7 +7106,11 @@ (define-public java-commons-cli (build-system ant-build-system) ;; TODO: javadoc (arguments - `(#:jar-name "commons-cli.jar")) + `(#:jar-name "commons-cli.jar" + #:phases + (modify-phases %standard-phases + (replace 'install + (install-from-pom "pom.xml"))))) (native-inputs `(("java-junit" ,java-junit) ("java-hamcrest-core" ,java-hamcrest-core))) @@ -7197,8 +7283,12 @@ (define-public java-slf4j-api (string-append "" ""))) - #t))))) - (inputs + #t)) + (replace 'install + (install-from-pom "slf4j-api/pom.xml"))))) + (propagated-inputs + `(("java-slf4j-parent" ,java-slf4j-parent))) + (native-inputs `(("java-junit" ,java-junit) ("java-hamcrest-core" ,java-hamcrest-core))) (home-page "https://www.slf4j.org/") @@ -7210,6 +7300,21 @@ (define-public java-slf4j-api time.") (license license:expat))) +(define java-slf4j-parent + (package + (inherit java-slf4j-api) + (name "java-slf4j-parent") + (native-inputs `()) + (propagated-inputs '()) + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'build) + (delete 'configure) + (replace 'install + (install-pom-file "pom.xml"))))))) + (define-public java-slf4j-simple (package (name "java-slf4j-simple") @@ -7231,11 +7336,14 @@ (define-public java-slf4j-simple ;; ... and build test helper classes here: (apply invoke `("javac" "-d" "." - ,@(find-files "slf4j-api/src/test" ".*\\.java")))))))) - (inputs + ,@(find-files "slf4j-api/src/test" ".*\\.java"))))) + (replace 'install + (install-from-pom "slf4j-simple/pom.xml"))))) + (propagated-inputs + `(("java-slf4j-api" ,java-slf4j-api))) + (native-inputs `(("java-junit" ,java-junit) - ("java-hamcrest-core" ,java-hamcrest-core) - ("java-slf4j-api" ,java-slf4j-api))) + ("java-hamcrest-core" ,java-hamcrest-core))) (home-page "https://www.slf4j.org/") (synopsis "Simple implementation of simple logging facade for Java") (description "SLF4J binding for the Simple implementation, which outputs @@ -9522,11 +9630,7 @@ (define-public java-bsh (("org.apache-extras.beanshell") "org.beanshell")) #t)) (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((share (string-append (assoc-ref outputs "out") "/share/java"))) - (mkdir-p share) - (copy-file "dist/bsh-2.0b6.jar" (string-append share "/bsh-2.0b6.jar")) - #t)))))) + (install-from-pom "pom.xml"))))) (inputs `(("java-classpathx-servletapi" ,java-classpathx-servletapi) ("java-commons-bsf" ,java-commons-bsf))) @@ -10775,7 +10879,31 @@ (define-public java-jboss-el-api-spec (build-system ant-build-system) (arguments `(#:jar-name "java-jboss-el-api_spec.jar" - #:jdk ,icedtea-8)) + #:modules ((guix build ant-build-system) + (guix build utils) + (guix build maven pom) + (guix build java-utils) + (sxml simple)) + #:phases + (modify-phases %standard-phases + ;; the origin of javax.el:javax.el-api is unknown, so we use this package + ;; instead, which implements the same thing. We override the pom file + ;; to "rename" the package so it can be found by maven. + (add-before 'install 'override-pom + (lambda _ + (delete-file "pom.xml") + (with-output-to-file "pom.xml" + (lambda _ + (sxml->xml + `(project + (modelVersion "4.0.0") + (name "el-api") + (groupId "javax.el") + (artifactId "javax.el-api") + (version "3.0"))))) + #t)) + (replace 'install + (install-from-pom "pom.xml"))))) (inputs `(("java-junit" ,java-junit))) (home-page "https://github.com/jboss/jboss-el-api_spec") @@ -10804,7 +10932,33 @@ (define-public java-jboss-interceptors-api-spec `(#:jar-name "java-jboss-interceptors-api_spec.jar" #:jdk ,icedtea-8 #:source-dir "." - #:tests? #f)); no tests + #:tests? #f; no tests + #:modules ((guix build ant-build-system) + (guix build utils) + (guix build maven pom) + (guix build java-utils) + (sxml simple)) + #:phases + (modify-phases %standard-phases + ;; the origin of javax.interceptor:javax.interceptor-api is unknown, + ;; so we use this package instead, which implements the same thing. + ;; We override the pom file to "rename" the package so it can be found + ;; by maven. + (add-before 'install 'override-pom + (lambda _ + (delete-file "pom.xml") + (with-output-to-file "pom.xml" + (lambda _ + (sxml->xml + `(project + (modelVersion "4.0.0") + (name "interceptor-api") + (groupId "javax.interceptor") + (artifactId "javax.interceptor-api") + (version "3.0"))))) + #t)) + (replace 'install + (install-from-pom "pom.xml"))))) (home-page "https://github.com/jboss/jboss-interceptors-api_spec") (synopsis "Interceptors 1.2 API classes from JSR 318") (description "Java-jboss-interceptors-api-spec implements the Interceptors @@ -10831,11 +10985,16 @@ (define-public java-cdi-api #:jar-name "java-cdi-api.jar" #:test-dir "api/src/test" #:jdk ,icedtea-8 - #:tests? #f)); Tests fail because we don't have a CDI provider yet - (inputs + #:tests? #f; Tests fail because we don't have a CDI provider yet + #:phases + (modify-phases %standard-phases + (replace 'install + (install-from-pom "api/pom.xml"))))) + (propagated-inputs `(("java-javax-inject" ,java-javax-inject) ("java-jboss-el-api-spec" ,java-jboss-el-api-spec) - ("java-jboss-interceptors-api-spec" ,java-jboss-interceptors-api-spec))) + ("java-jboss-interceptors-api-spec" ,java-jboss-interceptors-api-spec) + ("java-weld-parent-pom" ,java-weld-parent-pom))) (native-inputs `(("java-testng" ,java-testng) ("java-hamcrest-core" ,java-hamcrest-core))) @@ -11825,22 +11984,27 @@ (define-public java-eclipse-sisu-plexus (substitute* "java/org/eclipse/sisu/plexus/DefaultPlexusContainerTest.java" (("resources/component-jar") "org.eclipse.sisu.plexus.tests/resources/component-jar"))) - #t))))) - (inputs + #t)) + (replace 'install + (install-from-pom "org.eclipse.sisu.plexus/pom.xml"))))) + (propagated-inputs `(("java-plexus-classworlds" ,java-plexus-classworlds) - ("java-plexus-util" ,java-plexus-utils) + ("java-plexus-utils" ,java-plexus-utils) ("java-plexus-component-annotations" ,java-plexus-component-annotations) - ("java-osgi-framework" ,java-osgi-framework) + ("java-cdi-api" ,java-cdi-api) ("java-eclipse-sisu-inject" ,java-eclipse-sisu-inject) - ("java-guice" ,java-guice) - ("java-javax-inject" ,java-javax-inject) + ("java-sisu-plexus-parent-pom" ,java-sisu-plexus-parent-pom))) + (inputs + `(("java-osgi-framework" ,java-osgi-framework) ("java-slf4j-api" ,java-slf4j-api) - ("java-junit" ,java-junit))) - (native-inputs - `(("java-guava" ,java-guava) + ("java-javax-inject" ,java-javax-inject) + ("java-guice" ,java-guice) + ("java-guava" ,java-guava) ("java-aopalliance" ,java-aopalliance) - ("java-cglib" ,java-cglib) - ("java-asm" ,java-asm))) + ("java-asm" ,java-asm) + ("java-cglib" ,java-cglib))) + (native-inputs + `(("java-junit" ,java-junit))) (home-page "https://www.eclipse.org/sisu/") (synopsis "Plexus support for the sisu container") (description "Sisu is a modular JSR330-based container that supports @@ -11848,6 +12012,21 @@ (define-public java-eclipse-sisu-plexus adds Plexus support to the Sisu-Inject container.") (license license:epl1.0))) +(define java-sisu-plexus-parent-pom + (package + (inherit java-eclipse-sisu-plexus) + (name "java-sisu-plexus-parent-pom") + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (replace 'install + (install-pom-file "pom.xml"))))) + (propagated-inputs + `(("java-sonatype-oss-parent-pom-9" ,java-sonatype-oss-parent-pom-9))))) + (define-public java-commons-compiler (package (name "java-commons-compiler") diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 683aabf2de..dfd7102e1e 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -96,7 +96,11 @@ (define-public maven-resolver-api (arguments `(#:jar-name "maven-resolver-api.jar" #:source-dir "maven-resolver-api/src/main/java" - #:test-dir "maven-resolver-api/src/test")) + #:test-dir "maven-resolver-api/src/test" + #:phases + (modify-phases %standard-phases + (replace 'install + (install-from-pom "maven-resolver-api/pom.xml"))))) (native-inputs `(("java-asm" ,java-asm) ("java-cglib" ,java-cglib) @@ -104,11 +108,32 @@ (define-public maven-resolver-api ("java-junit" ,java-junit) ("java-mockito-1" ,java-mockito-1) ("java-objenesis" ,java-objenesis))) + (propagated-inputs + `(("maven-resolver-parent-pom" ,maven-resolver-parent-pom))) (home-page "https://github.com/apache/maven-resolver") (synopsis "Maven repository system API") (description "This package contains the API for the maven repository system.") (license license:asl2.0))) +(define maven-resolver-parent-pom + (package + (inherit maven-resolver-api) + (name "maven-resolver-parent-pom") + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (add-before 'install 'fix-pom + (lambda _ + (substitute* "pom.xml" + (("no_aop") "")) + #t)) + (replace 'install + (install-pom-file "pom.xml"))))) + (propagated-inputs '()))) + (define-public maven-resolver-spi (package (inherit maven-resolver-api) @@ -117,8 +142,11 @@ (define-public maven-resolver-spi `(#:jar-name "maven-resolver-spi.jar" #:source-dir "maven-resolver-spi/src/main/java" #:test-dir "maven-resolver-spi/src/test" - #:jdk ,icedtea-8)) - (inputs + #:phases + (modify-phases %standard-phases + (replace 'install + (install-from-pom "maven-resolver-spi/pom.xml"))))) + (propagated-inputs `(("maven-resolver-api" ,maven-resolver-api))) (synopsis "Maven repository system SPI") (description "This package contains the service provider interface (SPI) @@ -148,8 +176,11 @@ (define-public maven-resolver-util `(#:jar-name "maven-resolver-util.jar" #:source-dir "maven-resolver-util/src/main/java" #:test-dir "maven-resolver-util/src/test" - #:jdk ,icedtea-8)) - (inputs + #:phases + (modify-phases %standard-phases + (replace 'install + (install-from-pom "maven-resolver-util/pom.xml"))))) + (propagated-inputs `(("maven-resolver-api" ,maven-resolver-api))) (native-inputs `(("java-junit" ,java-junit) @@ -176,16 +207,17 @@ (define-public maven-resolver-connector-basic (with-output-to-file "build/classes/META-INF/sisu/javax.inject.Named" (lambda _ (display "org.eclipse.aether.connector.basic.BasicRepositoryConnectorFactory\n"))) - #t))))) - (inputs + #t)) + (replace 'install + (install-from-pom "maven-resolver-connector-basic/pom.xml"))))) + (propagated-inputs `(("maven-resolver-api" ,maven-resolver-api) ("maven-resolver-spi" ,maven-resolver-spi) ("maven-resolver-util" ,maven-resolver-util) - ("java-javax-inject" ,java-javax-inject) ("java-slf4j-api" ,java-slf4j-api))) (native-inputs - `(("java-junit" ,java-junit) - ("java-hamcrest-core" ,java-hamcrest-core) + `(("java-javax-inject" ,java-javax-inject) + ("java-junit" ,java-junit) ("maven-resolver-test-util" ,maven-resolver-test-util))) (synopsis "Maven repository connector implementation") (description "This package contains a repository connector implementation @@ -199,7 +231,6 @@ (define-public maven-resolver-impl `(#:jar-name "maven-resolver-impl.jar" #:source-dir "maven-resolver-impl/src/main/java" #:test-dir "maven-resolver-impl/src/test" - #:jdk ,icedtea-8 #:phases (modify-phases %standard-phases (add-before 'build 'generate-sisu @@ -233,22 +264,20 @@ (define-public maven-resolver-impl "org.eclipse.aether.internal.impl.Maven2RepositoryLayoutFactory\n" "org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory\n" "org.eclipse.aether.internal.impl.slf4j.Slf4jLoggerFactory")))) - #t))))) - (inputs + #t)) + (replace 'install + (install-from-pom "maven-resolver-impl/pom.xml"))))) + (propagated-inputs `(("maven-resolver-api" ,maven-resolver-api) ("maven-resolver-spi" ,maven-resolver-spi) ("maven-resolver-util" ,maven-resolver-util) ("java-eclipse-sisu-inject" ,java-eclipse-sisu-inject) ("java-javax-inject" ,java-javax-inject) ("java-guice" ,java-guice) - ("java-guava" ,java-guava) - ("java-cglib" ,java-cglib) - ("java-asm" ,java-asm) - ("jajva-aopalliance" ,java-aopalliance) - ("java-slf4j-api" ,java-slf4j-api))) + ("java-slf4j-api" ,java-slf4j-api) + ("maven-resolver-parent-pom" ,maven-resolver-parent-pom))) (native-inputs `(("java-junit" ,java-junit) - ("java-hamcrest-core" ,java-hamcrest-core) ("maven-resolver-test-util" ,maven-resolver-test-util))))) (define-public maven-resolver-transport-wagon @@ -357,12 +386,15 @@ (define-public maven-shared-utils (lambda _ (delete-file "src/test/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractorTest.java") - #t))))) - (inputs + #t)) + (replace 'install + (install-from-pom "pom.xml"))))) + (propagated-inputs `(("java-jansi" ,java-jansi) ("java-commons-io" ,java-commons-io) ("java-jsr305" ,java-jsr305) - ("java-plexus-container-default" ,java-plexus-container-default))) + ("java-plexus-container-default" ,java-plexus-container-default) + ("maven-parent-pom-30" ,maven-parent-pom-30))) (native-inputs `(("unzip" ,unzip) ("java-junit" ,java-junit) @@ -405,7 +437,7 @@ (define-public maven-wagon-provider-api (version "3.3.4") (source (origin (method url-fetch) - (uri (string-append "mirror://apache/maven/wagon/" + (uri (string-append "https://archive.apache.org/dist/maven/wagon/" "wagon-" version "-source-release.zip")) (sha256 (base32 @@ -710,9 +742,9 @@ (define-public maven-wagon-http manage artifacts and deployment. This package contains a Wagon provider that gets and puts artifacts through HTTP(S) using Apache HttpClient-4.x."))) -(define-public maven-artifact +(define maven-pom (package - (name "maven-artifact") + (name "maven-pom") (version "3.6.1") (source (origin (method url-fetch) @@ -729,24 +761,101 @@ (define-public maven-artifact (search-patches "maven-generate-component-xml.patch" "maven-generate-javax-inject-named.patch")))) (build-system ant-build-system) + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (add-before 'install 'fix-dependencies + (lambda _ + (substitute* "pom.xml" + (("classWorldsVersion>.*") + (string-append + "classWorldsVersion>" + ,(package-version java-plexus-classworlds) + "\n")) + (("commonsCliVersion>.*") + (string-append + "commonsCliVersion>" + ,(package-version java-commons-cli) + "\n")) + (("commonsLangVersion>.*") + (string-append + "commonsLangVersion>" + ,(package-version java-commons-lang3) + "\n")) + (("plexusUtilsVersion>.*") + (string-append + "plexusUtilsVersion>" + ,(package-version java-plexus-utils) + "\n")) + (("plexusInterpolationVersion>.*") + (string-append + "plexusInterpolationVersion>" + ,(package-version java-plexus-interpolation) + "\n")) + (("guiceVersion>.*") + (string-append + "guiceVersion>" + ,(package-version java-guice) + "\n")) + (("sisuInjectVersion>.*") + (string-append + "sisuInjectVersion>" + ,(package-version java-eclipse-sisu-inject) + "\n")) + (("securityDispatcherVersion>.*") + (string-append + "securityDispatcherVersion>" + ,(package-version java-plexus-sec-dispatcher) + "\n")) + (("cipherVersion>.*") + (string-append + "cipherVersion>" + ,(package-version java-plexus-cipher) + "\n")) + (("slf4jVersion>.*") + (string-append + "slf4jVersion>" + ,(package-version java-slf4j-api) + "\n")) + (("no_aop") "")) + #t)) + (replace 'install + (install-pom-file "pom.xml"))))) + (propagated-inputs + `(("maven-parent-pom-33" ,maven-parent-pom-33))) + (home-page "https://maven.apache.org/") + (synopsis "Build system") + (description "Apache Maven is a software project management and comprehension +tool. This package contains the Maven pom file, used by all maven components.") + (license license:asl2.0))) + +(define-public maven-artifact + (package + (inherit maven-pom) + (name "maven-artifact") (arguments `(#:jar-name "maven-artifact.jar" #:source-dir "maven-artifact/src/main/java" #:test-dir "maven-artifact/src/test" - #:main-class "org.apache.maven.artifact.versioning.ComparableVersion")) - (inputs + #:main-class "org.apache.maven.artifact.versioning.ComparableVersion" + #:phases + (modify-phases %standard-phases + (replace 'install + (install-from-pom "maven-artifact/pom.xml"))))) + (propagated-inputs `(("java-plexus-utils" ,java-plexus-utils) - ("java-commons-lang3" ,java-commons-lang3))) + ("java-commons-lang3" ,java-commons-lang3) + ("maven-pom" ,maven-pom))) (native-inputs `(("java-junit" ,java-junit))) - (home-page "https://maven.apache.org/") - (synopsis "Build system") (description "Apache Maven is a software project management and comprehension tool. This package contains the Maven Artifact classes, providing the @code{Artifact} interface, with its @code{DefaultArtifact} implementation. The jar file is executable and provides a little tool to display how Maven parses -and compares versions:") - (license license:asl2.0))) +and compares versions:"))) (define-public maven-model (package @@ -756,7 +865,6 @@ (define-public maven-model `(#:jar-name "maven-model.jar" #:source-dir "maven-model/src/main/java" #:test-dir "maven-model/src/test" - #:jdk ,icedtea-8 #:phases (modify-phases %standard-phases (add-before 'build 'generate-models @@ -770,10 +878,12 @@ (define (modello-single-mode file version mode) (modello-single-mode file "4.0.0" "xpp3-reader") (modello-single-mode file "4.0.0" "xpp3-writer") (modello-single-mode file "4.0.0" "xpp3-extended-reader")) - #t))))) - (inputs + #t)) + (replace 'install (install-from-pom "maven-model/pom.xml"))))) + (propagated-inputs `(("java-commons-lang3" ,java-commons-lang3) - ("java-plexus-utils" ,java-plexus-utils))) + ("java-plexus-utils" ,java-plexus-utils) + ("maven-pom" ,maven-pom))) (native-inputs `(("java-modello-core" ,java-modello-core) ;; for modello: @@ -816,13 +926,12 @@ (define-public maven-builder-support '("org/apache/maven/building/FileSourceTest.java" "org/apache/maven/building/UrlSourceTest.java") (("target/test-classes") "maven-builder-support/src/test/resources"))) - #t))))) - (inputs - `(("java-plexus-utils" ,java-plexus-utils) - ("java-commons-lang3" ,java-commons-lang3))) + #t)) + (replace 'install (install-from-pom "maven-builder-support/pom.xml"))))) + (propagated-inputs + `(("maven-pom" ,maven-pom))) (native-inputs - `(("java-junit" ,java-junit) - ("java-hamcrest-core" ,java-hamcrest-core))) + `(("java-junit" ,java-junit))) (description "Apache Maven is a software project management and comprehension tool. This package contains a support library for descriptor builders (model, setting, toolchains)"))) @@ -834,7 +943,6 @@ (define-public maven-settings (arguments `(#:jar-name "maven-settings.jar" #:source-dir "maven-settings/src/main/java" - #:jdk ,icedtea-8 #:tests? #f; no tests #:phases (modify-phases %standard-phases @@ -848,8 +956,11 @@ (define (modello-single-mode file version mode) (modello-single-mode file "1.1.0" "java") (modello-single-mode file "1.1.0" "xpp3-reader") (modello-single-mode file "1.1.0" "xpp3-writer")) - #t))))) - (inputs '()) + #t)) + (replace 'install (install-from-pom "maven-settings/pom.xml"))))) + (propagated-inputs + `(("java-plexus-utils" ,java-plexus-utils) + ("maven-pom" ,maven-pom))) (native-inputs `(("java-modello-core" ,java-modello-core) ;; for modello: @@ -891,17 +1002,18 @@ (define-public maven-settings-builder (chmod "components.sh" #o755) (invoke "./components.sh" "maven-settings-builder/src/main/java" "build/classes/META-INF/plexus/components.xml") - #t))))) - (inputs + #t)) + (replace 'install (install-from-pom "maven-settings-builder/pom.xml"))))) + (propagated-inputs `(("java-plexus-utils" ,java-plexus-utils) - ("java-plexus-component-annotations" ,java-plexus-component-annotations) ("java-plexus-interpolation" ,java-plexus-interpolation) ("java-plexus-sec-dispatcher" ,java-plexus-sec-dispatcher) ("maven-builder-support" ,maven-builder-support) ("maven-settings" ,maven-settings) - ("java-commons-lang3" ,java-commons-lang3))) + ("maven-pom" ,maven-pom))) (native-inputs - `(("java-junit" ,java-junit))) + `(("java-junit" ,java-junit) + ("java-plexus-component-annotations" ,java-plexus-component-annotations))) (description "Apache Maven is a software project management and comprehension tool. This package contains the effective model builder, with profile activation, inheritance, interpolation, @dots{}"))) @@ -933,19 +1045,19 @@ (define-public maven-model-builder (lambda _ (substitute* (find-files "maven-model-builder/src/test/java" ".*.java") (("src/test") "maven-model-builder/src/test")) - #t))))) - (inputs - `(("model" ,maven-model) - ("artifact" ,maven-artifact) - ("support" ,maven-builder-support) - ("annotations" ,java-plexus-component-annotations) - ("utils" ,java-plexus-utils) - ("interpolation" ,java-plexus-interpolation) - ("lang3" ,java-commons-lang3) - ("guava" ,java-guava))) + #t)) + (replace 'install + (install-from-pom "maven-model-builder/pom.xml"))))) + (propagated-inputs + `(("java-plexus-interpolation" ,java-plexus-interpolation) + ("java-plexus-utils" ,java-plexus-utils) + ("maven-artifact" ,maven-artifact) + ("maven-builder-support" ,maven-builder-support) + ("maven-model" ,maven-model) + ("maven-pom" ,maven-pom))) (native-inputs `(("java-junit" ,java-junit) - ("java-hamcrest-core" ,java-hamcrest-core) + ("java-guava" ,java-guava) ("java-eclipse-sisu-plexus" ,java-eclipse-sisu-plexus) ("java-plexus-component-annotations" ,java-plexus-component-annotations) ("guice" ,java-guice) @@ -982,8 +1094,12 @@ (define (modello-single-mode file version mode) (modello-single-mode file "1.1.0" "java") (modello-single-mode file "1.1.0" "xpp3-reader") (modello-single-mode file "1.1.0" "xpp3-writer")) - #t))))) - (inputs '()) + #t)) + (replace 'install + (install-from-pom "maven-repository-metadata/pom.xml"))))) + (propagated-inputs + `(("java-plexus-utils" ,java-plexus-utils) + ("maven-pom" ,maven-pom))) (native-inputs `(("modello" ,java-modello-core) ;; for modello: @@ -1025,22 +1141,21 @@ (define-public maven-resolver-provider (chmod "./sisu.sh" #o755) (invoke "./sisu.sh" "maven-resolver-provider/src/main/java" "build/classes/META-INF/sisu/javax.inject.Named") - #t))))) - (inputs - `(("maven-resolver-spi" ,maven-resolver-spi) + #t)) + (replace 'install + (install-from-pom "maven-resolver-provider/pom.xml"))))) + (propagated-inputs + `(("maven-model" ,maven-model) + ("maven-model-builder" ,maven-model-builder) + ("maven-resolver-spi" ,maven-resolver-spi) ("maven-resolver-api" ,maven-resolver-api) ("maven-resolver-impl" ,maven-resolver-impl) ("maven-resolver-util" ,maven-resolver-util) - ("maven-model" ,maven-model) - ("maven-model-builder" ,maven-model-builder) ("maven-builder-support" ,maven-builder-support) ("maven-repository-metadata" ,maven-repository-metadata) ("java-plexus-utils" ,java-plexus-utils) ("java-plexus-component-annotations" ,java-plexus-component-annotations) - ("java-commons-lang3" ,java-commons-lang3) ("java-guice" ,java-guice) - ("java-guava" ,java-guava) - ("java-eclipse-sisu-inject" ,java-eclipse-sisu-inject) ("java-javax-inject" ,java-javax-inject))))) (define-public maven-plugin-api @@ -1064,8 +1179,10 @@ (define (modello-single-mode file version mode) (modello-single-mode file "1.0.0" "java") (modello-single-mode file "1.0.0" "xpp3-reader") (modello-single-mode file "1.0.0" "xpp3-writer")) - #t))))) - (inputs + #t)) + (replace 'install + (install-from-pom "maven-plugin-api/pom.xml"))))) + (propagated-inputs `(("maven-artifact" ,maven-artifact) ("maven-model" ,maven-model) ("java-eclipse-sisu-plexus" ,java-eclipse-sisu-plexus) @@ -1147,8 +1264,15 @@ (define (modello-single-mode file version mode) (modello-single-mode file "1.1.0" "java") (modello-single-mode file "1.1.0" "xpp3-reader") (modello-single-mode file "1.1.0" "xpp3-writer")) - #t))))) - (inputs + #t)) + (add-before 'install 'fix-pom + (lambda _ + (substitute* "pom.xml" + (("no_aop") "")) + #t)) + (replace 'install + (install-from-pom "pom.xml"))))) + (propagated-inputs `(("maven-artifact" ,maven-artifact) ("maven-resolver-provider" ,maven-resolver-provider) ("maven-builder-support" ,maven-builder-support) @@ -1306,8 +1430,10 @@ (define (modello-single-mode file version mode) (substitute* "build.xml" (("srcdir=\"maven-embedder/src/test\"") "srcdir=\"maven-embedder/src/test/java\"")) - #t))))) - (inputs + #t)) + (replace 'install + (install-from-pom "maven-embedder/pom.xml"))))) + (propagated-inputs `(("maven-core" ,maven-core) ("maven-artifact" ,maven-artifact) ("maven-plugin-api" ,maven-plugin-api) @@ -1334,7 +1460,8 @@ (define (modello-single-mode file version mode) ("java-guice" ,java-guice) ("java-javax-inject" ,java-javax-inject) ("java-slf4j-api" ,java-slf4j-api) - ("java-slf4j-simple" ,java-slf4j-simple))) + ("java-slf4j-simple" ,java-slf4j-simple) + ("java-jsr250" ,java-jsr250))) (native-inputs `(("java-modello-core" ,java-modello-core) ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect) @@ -1503,8 +1630,10 @@ (define (modello-single-mode file version mode) (add-after 'generate-metadata 'rebuild (lambda _ (invoke "ant" "jar") - #t))))) - (inputs + #t)) + (replace 'install + (install-from-pom "pom.xml"))))) + (propagated-inputs `(("maven-artifact" ,maven-artifact) ("maven-repository-metadata" ,maven-repository-metadata) ("maven-builder-support" ,maven-builder-support) @@ -1584,8 +1713,10 @@ (define-public maven ;; Reference every jar so plexus-classworlds can find them. (for-each (lambda (dependency) - (format #t "load ~a/share/java/*.jar~%" - (assoc-ref inputs dependency))) + (for-each + (lambda (file) + (format #t "load ~a~%" file)) + (find-files (assoc-ref inputs dependency) ".*.jar$"))) '("maven-artifact" "maven-embedder" "maven-core" "maven-compat" "maven-builder-support" "maven-model" "maven-model-builder" "maven-settings" "maven-settings-builder" "maven-plugin-api" -- cgit v1.2.3 From 159e6d9fe33b8a76ae650d3b6b1f3d708eb6baaa Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 26 Jun 2020 22:24:10 +0200 Subject: gnu: maven-shared-utils: Fix /bin/sh invocation. * gnu/packages/maven.scm (maven-shared-utils): Fix /bin/sh invocation. --- gnu/packages/maven.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index dfd7102e1e..00c644c432 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -379,9 +379,13 @@ (define-public maven-shared-utils (arguments `(#:jar-name "maven-shared-utils.jar" #:source-dir "src/main/java" - #:jdk ,icedtea-8 #:phases (modify-phases %standard-phases + (add-before 'build 'fix-/bin/sh-invocation + (lambda _ + (substitute* (find-files "src" ".*.java$") + (("/bin/sh") (which "sh"))) + #t)) (add-before 'check 'remove-cyclic-dep (lambda _ (delete-file -- cgit v1.2.3 From 29534ff7f30e434e9d4177f8fcbec40a154d72e5 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 17:05:07 +0200 Subject: gnu: java-modello-core: Propagate inputs. * gnu/packages/java.scm (java-modello-core): Propagate inputs. (java-modello-plugins-java, java-modello-plugins-xml, java-modello-xpp3): Remove java-modello-core's inputs and propagate. --- gnu/packages/java.scm | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index dfb84fc410..4db1a3b199 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -4554,7 +4554,7 @@ (define-public java-modello-core "modello/core/io/ModelReaderTest.java") (("src/test") "modello-core/src/test"))) #t))))) - (inputs + (propagated-inputs `(("java-plexus-utils" ,java-plexus-utils) ("java-plexus-container-default" ,java-plexus-container-default) ("java-sisu-build-api" ,java-sisu-build-api))) @@ -4603,8 +4603,7 @@ (define-public java-modello-plugins-java "build/classes") #t))))) (inputs - `(("java-modello-core" ,java-modello-core) - ,@(package-inputs java-modello-core))) + `(("java-modello-core" ,java-modello-core))) (synopsis "Modello Java Plugin") (description "Modello Java Plugin generates Java objects for the model."))) @@ -4633,10 +4632,9 @@ (define-public java-modello-plugins-xml "java/org/codehaus/modello/plugins/xml/XmlModelloPluginTest.java" (("src/test") "modello-plugins/modello-plugin-xml/src/test"))) #t))))) - (inputs + (propagated-inputs `(("java-modello-core" ,java-modello-core) - ("java-modello-plugins-java" ,java-modello-plugins-java) - ,@(package-inputs java-modello-core))) + ("java-modello-plugins-java" ,java-modello-plugins-java))) (synopsis "Modello XML Plugin") (description "Modello XML Plugin contains shared code for every plugins working on XML representation of the model."))) @@ -4679,11 +4677,10 @@ (define-public java-modello-plugins-xpp3 (copy-recursively "modello-plugins/modello-plugin-xpp3/src/main/resources" "build/classes") #t))))) - (inputs + (propagated-inputs `(("java-modello-core" ,java-modello-core) ("java-modello-plugins-java" ,java-modello-plugins-java) - ("java-modello-plugins-xml" ,java-modello-plugins-xml) - ,@(package-inputs java-modello-core))) + ("java-modello-plugins-xml" ,java-modello-plugins-xml))) (native-inputs `(("java-xmlunit" ,java-xmlunit) ("java-modello-test" ,java-modello-test) -- cgit v1.2.3 From 6a25a3b1ba837b41e0ba877d1c947c43e91b6ded Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 04:07:17 +0200 Subject: gnu: Add java-plexus-digest. * gnu/packages/java.scm (java-plexus-digest): New variable. --- gnu/packages/java.scm | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 4db1a3b199..3e778b6da9 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -4336,6 +4336,69 @@ (define-public java-plexus-compiler-javac (description "This package contains the Javac Compiler support for Plexus Compiler component."))) +(define plexus-components-pom-1.1.20 + (package + (name "plexus-components-pom-1.1.20") + (version "1.1.20") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/codehaus-plexus/plexus-components") + (commit (string-append "plexus-components-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1q254k95m9icyfsvaw8c226midg8v6v436wvivhv7im825mnp5yb")))) + (build-system ant-build-system) + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (replace 'install + (install-pom-file "pom.xml"))))) + (propagated-inputs + `(("plexus-parent-pom" ,plexus-parent-pom-3.1))) + (home-page "https://github.com/codehaus-plexus/plexus-components") + (synopsis "Maven parent pom for plexus packages") + (description "This package contains the parent pom for plexus component +packages.") + (license license:asl2.0))) + +(define-public java-plexus-digest + (package + (name "java-plexus-digest") + (version "1.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/codehaus-plexus/plexus-digest") + (commit "2a52ad1bda8297fa0e287163d2fa37245ec6a430"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "19w5wxsliz8r42niry68qa665kvjsb8081dazg9vgd3pca72w07x")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "plexus-digest.jar" + #:source-dir "src/main/java" + #:tests? #f + #:phases + (modify-phases %standard-phases + (replace 'install + (install-from-pom "pom.xml"))))) + (propagated-inputs + `(("java-plexus-utils" ,java-plexus-utils) + ("plexus-components-pom-1.1.20" ,plexus-components-pom-1.1.20))) + (native-inputs + `(("java-junit" ,java-junit))) + (home-page "https://github.com/codehaus-plexus/plexus-digest") + (synopsis "Hash function utilities for Java") + (description "This package is a plexus component that contains hash +function utilities.") + (license license:asl2.0))) + (define-public java-plexus-sec-dispatcher (package (name "java-plexus-sec-dispatcher") -- cgit v1.2.3 From a18f0a7fd1a073c6a755370c377fe13a24815d51 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 14:02:44 +0200 Subject: gnu: Add java-sonatype-aether-api. * gnu/packages/maven.scm (java-sonatype-aether-api): New variable. --- gnu/packages/maven.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 00c644c432..757b522d60 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -364,6 +364,40 @@ (define-public maven-resolver-transport-wagon (description "This package contains a transport implementation based on Maven Wagon, for use in Maven."))) +;; aether is the parent project that was forked into maven-resolver. It used +;; to be used with older versions of Maven, and is still required for some +;; plugins and their dependencies. This version is required for the plugins, +;; even though there are newer versions of this project. +(define-public java-sonatype-aether-api + (package + (name "java-sonatype-aether-api") + (version "1.7") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sonatype/sonatype-aether") + (commit (string-append "aether-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1wn9fv91n40bvlwbzy0dmh0xqibxl2mpzpnbibhqss3c0zlr1ccq")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "aether-api.jar" + #:source-dir "aether-api/src/main/java" + #:test-dir "aether-api/src/test" + #:phases + (modify-phases %standard-phases + (add-before 'install 'install-parent (install-pom-file "pom.xml")) + (replace 'install (install-from-pom "aether-api/pom.xml"))))) + (propagated-inputs + `(("java-sonatype-forge-parent-pom" ,java-sonatype-forge-parent-pom-6))) + (native-inputs `(("java-junit" ,java-junit))) + (home-page "https://github.com/sonatype/sonatype-aether") + (synopsis "Maven repository system API") + (description "This package contains the API for the maven repository system.") + (license license:asl2.0))) + (define-public maven-shared-utils (package (name "maven-shared-utils") -- cgit v1.2.3 From c68e3dc139436fa8a260459a53ce88c3509239cc Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 15:24:15 +0200 Subject: gnu: Add java-sonatype-aether-spi. * gnu/packages/maven.scm (java-sonatype-aether-spi): New variable. --- gnu/packages/maven.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 757b522d60..ef5b5002c5 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -398,6 +398,23 @@ (define-public java-sonatype-aether-api (description "This package contains the API for the maven repository system.") (license license:asl2.0))) +(define-public java-sonatype-aether-spi + (package + (inherit java-sonatype-aether-api) + (name "java-sonatype-aether-spi") + (arguments + `(#:jar-name "aether-spi.jar" + #:source-dir "aether-spi/src/main/java" + #:tests? #f; no tests + #:phases + (modify-phases %standard-phases + (replace 'install (install-from-pom "aether-spi/pom.xml"))))) + (propagated-inputs + `(("java-sonatype-aether-api" ,java-sonatype-aether-api))) + (synopsis "Maven repository system SPI") + (description "This package contains the service provider interface (SPI) +for repository system implementations and repository connectors."))) + (define-public maven-shared-utils (package (name "maven-shared-utils") -- cgit v1.2.3 From a1ed79363fb8f3187330c0a5343faa0891b3d704 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 15:31:28 +0200 Subject: gnu: Add java-sonatype-aether-test-util. * gnu/packages/maven.scm (java-sonatype-aether-test-util): New variable. --- gnu/packages/maven.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index ef5b5002c5..5a8e7303e3 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -415,6 +415,21 @@ (define-public java-sonatype-aether-spi (description "This package contains the service provider interface (SPI) for repository system implementations and repository connectors."))) +(define-public java-sonatype-aether-test-util + (package + (inherit java-sonatype-aether-api) + (name "java-sonatype-aether-test-util") + (arguments + `(#:jar-name "java-sonatype-aether-test-util.jar" + #:source-dir "aether-test-util/src/main/java" + #:test-dir "aether-test-util/src/test")) + (inputs + `(("java-sonatype-aether-api" ,java-sonatype-aether-api) + ("java-sonatype-aether-spi" ,java-sonatype-aether-spi))) + (synopsis "Utility classes for testing the maven repository system") + (description "This package contains a collection of utility classes to +ease testing of the repository system."))) + (define-public maven-shared-utils (package (name "maven-shared-utils") -- cgit v1.2.3 From 8815719c96156023e1f4d10868b11c0b6b36d4f9 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 15:36:31 +0200 Subject: gnu: Add java-sonatype-aether-util. * gnu/packages/maven.scm (java-sonatype-aether-util): New variable. --- gnu/packages/maven.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 5a8e7303e3..153671c387 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -430,6 +430,26 @@ (define-public java-sonatype-aether-test-util (description "This package contains a collection of utility classes to ease testing of the repository system."))) +(define-public java-sonatype-aether-util + (package + (inherit java-sonatype-aether-api) + (name "java-sonatype-aether-util") + (arguments + `(#:jar-name "aether-util.jar" + #:source-dir "aether-util/src/main/java" + #:test-dir "aether-util/src/test" + #:phases + (modify-phases %standard-phases + (replace 'install (install-from-pom "aether-util/pom.xml"))))) + (propagated-inputs + `(("java-sonatype-aether-api" ,java-sonatype-aether-api))) + (native-inputs + `(("java-junit" ,java-junit) + ("java-sonatype-aether-test-util" ,java-sonatype-aether-test-util))) + (synopsis "Utility classes for the maven repository system") + (description "This package contains a collection of utility classes to +ease usage of the repository system."))) + (define-public maven-shared-utils (package (name "maven-shared-utils") -- cgit v1.2.3 From 540f36284353b7a3e23e4fa395c36dd2c26b478d Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 15:36:52 +0200 Subject: gnu: Add java-sonatype-aether-impl. * gnu/packages/maven.scm (java-sonatype-aether-impl): New variable. (java-plexus-component-metadata): Propagate inputs. --- gnu/packages/maven.scm | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 153671c387..2baf6e9881 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -54,7 +54,7 @@ (define-public java-plexus-component-metadata (copy-recursively "src/main/resources" "build/classes/") #t))))) - (inputs + (propagated-inputs `(("java-plexus-container-default" ,java-plexus-container-default) ("java-plexu-component-annotations" ,java-plexus-component-annotations) ("java-plexus-utils" ,java-plexus-utils) @@ -450,6 +450,48 @@ (define-public java-sonatype-aether-util (description "This package contains a collection of utility classes to ease usage of the repository system."))) +(define-public java-sonatype-aether-impl + (package + (inherit java-sonatype-aether-api) + (name "java-sonatype-aether-impl") + (arguments + `(#:jar-name "aether-impl.jar" + #:source-dir "aether-impl/src/main/java" + #:test-dir "aether-impl/src/test" + #:phases + (modify-phases %standard-phases + (add-before 'install 'fix-pom + (lambda _ + (substitute* "aether-impl/pom.xml" + (("org.sonatype.sisu") "org.codehaus.plexus") + (("sisu-inject-plexus") "plexus-container-default")) + #t)) + (add-after 'build 'generate-metadata + (lambda _ + (invoke "java" "-cp" (string-append (getenv "CLASSPATH") ":build/classes") + "org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli" + "--source" "src/main/java" + "--output" "build/classes/META-INF/plexus/components.xml" + "--classes" "build/classes" + "--descriptors" "build/classes/META-INF") + #t)) + (add-after 'generate-metadata 'rebuild + (lambda _ + (invoke "ant" "jar") + #t)) + (replace 'install (install-from-pom "aether-impl/pom.xml"))))) + (propagated-inputs + `(("java-sonatype-aether-api" ,java-sonatype-aether-api) + ("java-sonatype-aether-spi" ,java-sonatype-aether-spi) + ("java-sonatype-aether-util" ,java-sonatype-aether-util) + ("java-plexus-component-annotations" ,java-plexus-component-annotations) + ("java-plexus-container-default" ,java-plexus-container-default) + ("java-slf4j-api" ,java-slf4j-api))) + (native-inputs + `(("java-junit" ,java-junit) + ("java-plexus-component-metadata" ,java-plexus-component-metadata) + ("java-sonatype-aether-test-util" ,java-sonatype-aether-test-util))))) + (define-public maven-shared-utils (package (name "maven-shared-utils") -- cgit v1.2.3 From 9a7d55ee2519da7e7616b3aa907b4231d8123565 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 15:44:56 +0200 Subject: gnu: Add java-eclipse-aether-api. * gnu/packages/maven.scm (java-eclipse-aether-api): New variable. --- gnu/packages/maven.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 2baf6e9881..ae5efc640e 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -492,6 +492,35 @@ (define-public java-sonatype-aether-impl ("java-plexus-component-metadata" ,java-plexus-component-metadata) ("java-sonatype-aether-test-util" ,java-sonatype-aether-test-util))))) +;; Again, this old version is required by some maven plugins +(define-public java-eclipse-aether-api + (package + (name "java-eclipse-aether-api") + (version "1.0.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/eclipse/aether-core") + (commit "aether-1.0.2.v20150114"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "14d336nn0kh5ddf23j37va3hd8gaai19llrpxhf4bcc7g7sgdqxs")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "aether-api.jar" + #:source-dir "aether-api/src/main/java" + #:test-dir "aether-api/src/test" + #:phases + (modify-phases %standard-phases + (add-before 'install 'install-parent (install-pom-file "pom.xml")) + (replace 'install (install-from-pom "aether-api/pom.xml"))))) + (native-inputs `(("java-junit" ,java-junit))) + (home-page "https://github.com/sonatype/sonatype-aether") + (synopsis "Maven repository system API") + (description "This package contains the API for the maven repository system.") + (license license:asl2.0))) + (define-public maven-shared-utils (package (name "maven-shared-utils") -- cgit v1.2.3 From 5d1a24dd894d46e5647723977a9701a74b3c060d Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 15:46:55 +0200 Subject: gnu: Add java-eclipse-aether-spi. * gnu/packages/maven.scm (java-eclipse-aether-spi): New variable. --- gnu/packages/maven.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index ae5efc640e..bfbe21c948 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -521,6 +521,23 @@ (define-public java-eclipse-aether-api (description "This package contains the API for the maven repository system.") (license license:asl2.0))) +(define-public java-eclipse-aether-spi + (package + (inherit java-eclipse-aether-api) + (name "java-eclipse-aether-spi") + (arguments + `(#:jar-name "aether-spi.jar" + #:source-dir "aether-spi/src/main/java" + #:test-dir "aether-spi/src/test" + #:phases + (modify-phases %standard-phases + (replace 'install (install-from-pom "aether-spi/pom.xml"))))) + (propagated-inputs + `(("java-eclipse-aether-api" ,java-eclipse-aether-api))) + (synopsis "Maven repository system SPI") + (description "This package contains the service provider interface (SPI) +for repository system implementations and repository connectors."))) + (define-public maven-shared-utils (package (name "maven-shared-utils") -- cgit v1.2.3 From 7a85b602ca7102a6141c55c0936fe41757f57a41 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 15:49:25 +0200 Subject: gnu: Add java-eclipse-aether-test-util. * gnu/packages/maven.scm (java-eclipse-aether-test-util): New variable. --- gnu/packages/maven.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index bfbe21c948..5e6d7aeaed 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -538,6 +538,24 @@ (define-public java-eclipse-aether-spi (description "This package contains the service provider interface (SPI) for repository system implementations and repository connectors."))) +(define-public java-eclipse-aether-test-util + (package + (inherit java-eclipse-aether-api) + (name "java-eclipse-aether-test-util") + (arguments + `(#:jar-name "aether-test-util.jar" + #:source-dir "aether-test-util/src/main/java" + #:test-dir "aether-test-util/src/test" + #:phases + (modify-phases %standard-phases + (replace 'install (install-from-pom "aether-util/pom.xml"))))) + (propagated-inputs + `(("java-eclipse-aether-api" ,java-eclipse-aether-api) + ("java-eclipse-aether-spi" ,java-eclipse-aether-spi))) + (synopsis "Utility classes for testing the maven repository system") + (description "This package contains a collection of utility classes to +ease testing of the repository system."))) + (define-public maven-shared-utils (package (name "maven-shared-utils") -- cgit v1.2.3 From 47b4ed504d945ee87936939cf68e6e5690083e3b Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 15:50:08 +0200 Subject: gnu: Add java-eclipse-aether-util. * gnu/packages/maven.scm (java-eclipse-aether-util): New variable. --- gnu/packages/maven.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 5e6d7aeaed..82e9db2de6 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -556,6 +556,26 @@ (define-public java-eclipse-aether-test-util (description "This package contains a collection of utility classes to ease testing of the repository system."))) +(define-public java-eclipse-aether-util + (package + (inherit java-eclipse-aether-api) + (name "java-eclipse-aether-util") + (arguments + `(#:jar-name "aether-util.jar" + #:source-dir "aether-util/src/main/java" + #:test-dir "aether-util/src/test" + #:phases + (modify-phases %standard-phases + (replace 'install (install-from-pom "aether-util/pom.xml"))))) + (propagated-inputs + `(("java-eclipse-aether-api" ,java-eclipse-aether-api))) + (native-inputs + `(("java-eclipse-aether-test-util" ,java-eclipse-aether-test-util) + ("java-junit" ,java-junit))) + (synopsis "Utility classes for the maven repository system") + (description "This package contains a collection of utility classes to +ease usage of the repository system."))) + (define-public maven-shared-utils (package (name "maven-shared-utils") -- cgit v1.2.3 From b277bd37ba89697f036a39709678f7a72339e527 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 15:51:48 +0200 Subject: gnu: Add java-eclipse-aether-impl. * gnu/packages/maven.scm (java-eclipse-aether-impl): New variable. --- gnu/packages/maven.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 82e9db2de6..08bb152a83 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -576,6 +576,29 @@ (define-public java-eclipse-aether-util (description "This package contains a collection of utility classes to ease usage of the repository system."))) +(define-public java-eclipse-aether-impl + (package + (inherit java-eclipse-aether-api) + (name "java-eclipse-aether-impl") + (arguments + `(#:jar-name "aether-impl.jar" + #:source-dir "aether-impl/src/main/java" + #:test-dir "aether-impl/src/test" + #:phases + (modify-phases %standard-phases + (replace 'install (install-from-pom "aether-impl/pom.xml"))))) + (propagated-inputs + `(("java-eclipse-aether-api" ,java-eclipse-aether-api) + ("java-eclipse-aether-spi" ,java-eclipse-aether-spi) + ("java-eclipse-aether-util" ,java-eclipse-aether-util) + ("java-javax-inject" ,java-javax-inject) + ("java-eclipse-sisu-inject" ,java-eclipse-sisu-inject) + ("java-guice" ,java-guice) + ("java-slf4j-api" ,java-slf4j-api))) + (native-inputs + `(("java-eclipse-aether-test-util" ,java-eclipse-aether-test-util) + ("java-junit" ,java-junit))))) + (define-public maven-shared-utils (package (name "maven-shared-utils") -- cgit v1.2.3 From 756e976e56e7eefee5a829823a70df493dfd8773 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 15:55:05 +0200 Subject: gnu: maven-3.0-artifact: New variable. * gnu/packages/maven.scm (maven-3.0-artifact): New variable. --- gnu/packages/maven.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 08bb152a83..eb2a0b34d9 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -2058,3 +2058,43 @@ (define-public maven publication are all controlled from the @file{pom.xml} declarative file. Maven can be extended by plugins to utilise a number of other development tools for reporting or the build process."))) + +;; Many plugins require maven 3.0 as a dependency. +(define maven-3.0-pom + (package + (inherit maven-pom) + (version "3.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/apache/maven") + (commit (string-append "maven-" version)))) + (file-name (git-file-name "maven" version)) + (sha256 + (base32 + "06jdwxx9w24shhv3kca80rlrikynn7kdqcrwg59lv2b7adpllwnh")) + (modules '((guix build utils))) + (snippet + '(begin + (for-each delete-file (find-files "." "\\.jar$")) + (for-each (lambda (file) (chmod file #o644)) + (find-files "." ".")) + #t)) + (patches + (search-patches "maven-generate-component-xml.patch" + "maven-generate-javax-inject-named.patch")))) + (propagated-inputs + `(("maven-parent-pom-15" ,maven-parent-pom-15))))) + +(define-public maven-3.0-artifact + (package + (inherit maven-artifact) + (version (package-version maven-3.0-pom)) + (source (package-source maven-3.0-pom)) + (propagated-inputs + (map + (lambda (input) + (if (equal? (car input) "maven-pom") + `("maven-pom" ,maven-3.0-pom) + input)) + (package-propagated-inputs maven-artifact))))) -- cgit v1.2.3 From b909d584445fc41096b76a570fa9a0b6e1875177 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 16:08:22 +0200 Subject: gnu: Add maven-3.0-model. * gnu/packages/maven.scm (maven-3.0-model): New variable. --- gnu/packages/maven.scm | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index eb2a0b34d9..3a3e7cf8e0 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -2098,3 +2098,55 @@ (define-public maven-3.0-artifact `("maven-pom" ,maven-3.0-pom) input)) (package-propagated-inputs maven-artifact))))) + +(define-public maven-3.0-model + (package + (inherit maven-model) + (version (package-version maven-3.0-pom)) + (source (package-source maven-3.0-pom)) + (propagated-inputs + (map + (lambda (input) + (if (equal? (car input) "maven-pom") + `("maven-pom" ,maven-3.0-pom) + input)) + (package-propagated-inputs maven-artifact))) + (arguments + `(#:jar-name "maven-model.jar" + #:source-dir "maven-model/src/main/java" + #:test-dir "maven-model/src/test" + #:modules + ((guix build ant-build-system) + (guix build java-utils) + (guix build syscalls) + (guix build utils)) + #:phases + (modify-phases %standard-phases + (add-after 'configure 'use-newer-model + (lambda* (#:key inputs #:allow-other-keys) + ;; The model has almost not changed, but the newer version is + ;; needed to prevent an error in the newer modello we have + (let ((source (assoc-ref inputs "maven-source")) + (dir (mkdtemp! "maven-source-XXXXXXXX"))) + (with-directory-excursion dir + (invoke "tar" "xf" source) + (copy-file (car (find-files "." "maven.mdo")) + "../maven-model/src/main/mdo/maven.mdo"))) + #t)) + (add-before 'build 'generate-models + (lambda* (#:key inputs #:allow-other-keys) + (define (modello-single-mode file version mode) + (invoke "java" "org.codehaus.modello.ModelloCli" + file mode "maven-model/src/main/java" version + "false" "true" "UTF-8")) + (let ((file "maven-model/src/main/mdo/maven.mdo")) + (modello-single-mode file "4.0.0" "java") + (modello-single-mode file "4.0.0" "xpp3-reader") + (modello-single-mode file "4.0.0" "xpp3-writer") + (modello-single-mode file "4.0.0" "xpp3-extended-reader")) + #t)) + (replace 'install + (install-from-pom "maven-model/pom.xml"))))) + (inputs + `(("maven-source" ,(package-source maven-pom)) + ,@(package-inputs maven-model))))) -- cgit v1.2.3 From ba58d208d477463291e90685faee78e0465bd33a Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 16:09:13 +0200 Subject: gnu: Add maven-3.0-settings. * gnu/packages/maven.scm (maven-3.0-settings): New variable. --- gnu/packages/maven.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 3a3e7cf8e0..4c46521a70 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -2150,3 +2150,16 @@ (define (modello-single-mode file version mode) (inputs `(("maven-source" ,(package-source maven-pom)) ,@(package-inputs maven-model))))) + +(define-public maven-3.0-settings + (package + (inherit maven-settings) + (version (package-version maven-3.0-pom)) + (source (package-source maven-3.0-pom)) + (propagated-inputs + (map + (lambda (input) + (if (equal? (car input) "maven-pom") + `("maven-pom" ,maven-3.0-pom) + input)) + (package-propagated-inputs maven-settings))))) -- cgit v1.2.3 From b1cfac7a46a4f1760a723c475d371953e4148850 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 16:11:04 +0200 Subject: gnu: Add maven-3.0-settings-builder. * gnu/packages/maven.scm (maven-3.0-settings-builder): New variable. --- gnu/packages/maven.scm | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 4c46521a70..ff35827b0e 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -32,7 +32,8 @@ (define-module (gnu packages maven) #:use-module (gnu packages java) #:use-module (gnu packages maven-parent-pom) #:use-module (gnu packages web) - #:use-module (gnu packages xml)) + #:use-module (gnu packages xml) + #:use-module (ice-9 match)) (define-public java-plexus-component-metadata (package @@ -2163,3 +2164,21 @@ (define-public maven-3.0-settings `("maven-pom" ,maven-3.0-pom) input)) (package-propagated-inputs maven-settings))))) + +(define-public maven-3.0-settings-builder + (package + (inherit maven-settings-builder) + (version (package-version maven-3.0-pom)) + (source (package-source maven-3.0-pom)) + (propagated-inputs + `(("java-plexus-component-annotations" ,java-plexus-component-annotations) + ,@(filter + (lambda (a) a) + (map + (lambda (input) + (match (car input) + ("maven-pom" `("maven-pom" ,maven-3.0-pom)) + ("maven-settings" `("maven-settings" ,maven-3.0-settings)) + ("maven-builder-support" #f) + (_ input))) + (package-propagated-inputs maven-settings-builder))))))) -- cgit v1.2.3 From 279ec0c005fc85b5d3eac8974d8b2f730474aa55 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 16:12:14 +0200 Subject: gnu: Add maven-3.0-model-builder. * gnu/packages/maven.scm (maven-3.0-model-builder): New variable. --- gnu/packages/maven.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index ff35827b0e..42ae8a98d9 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -2182,3 +2182,22 @@ (define-public maven-3.0-settings-builder ("maven-builder-support" #f) (_ input))) (package-propagated-inputs maven-settings-builder))))))) + +(define-public maven-3.0-model-builder + (package + (inherit maven-model-builder) + (version (package-version maven-3.0-pom)) + (source (package-source maven-3.0-pom)) + (propagated-inputs + `(("java-plexus-component-annotations" ,java-plexus-component-annotations) + ,@(filter + (lambda (a) a) + (map + (lambda (input) + (match (car input) + ("maven-pom" `("maven-pom" ,maven-3.0-pom)) + ("maven-model" `("maven-model" ,maven-3.0-model)) + ("maven-artifact" `("maven-artifact" ,maven-3.0-artifact)) + ("maven-builder-support" #f) + (_ input))) + (package-propagated-inputs maven-model-builder))))))) -- cgit v1.2.3 From 457efe296e87805879e2ccbef34b71f169c1e2ea Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 16:16:42 +0200 Subject: gnu: Add maven-3.0-plugin-api. * gnu/packages/maven.scm (maven-3.0-plugin-api): New variable. --- gnu/packages/maven.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 42ae8a98d9..95a5779472 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -2201,3 +2201,31 @@ (define-public maven-3.0-model-builder ("maven-builder-support" #f) (_ input))) (package-propagated-inputs maven-model-builder))))))) + +(define-public maven-3.0-plugin-api + (package + (inherit maven-plugin-api) + (version (package-version maven-3.0-pom)) + (source (package-source maven-3.0-pom)) + (arguments + (substitute-keyword-arguments (package-arguments maven-plugin-api) + ((#:phases phases) + `(modify-phases ,phases + (add-before 'install 'fix-pom + (lambda _ + (substitute* "maven-plugin-api/pom.xml" + (("org.sonatype.sisu") "org.codehaus.plexus") + (("sisu-inject-plexus") "plexus-container-default")) + #t)))))) + (propagated-inputs + (map + (lambda (input) + (match (car input) + ("maven-pom" `("maven-pom" ,maven-3.0-pom)) + ("maven-artifact" `("maven-artifact" ,maven-3.0-artifact)) + ("maven-model" `("maven-model" ,maven-3.0-model)) + (_ input))) + (package-propagated-inputs maven-model-builder))) + (native-inputs + `(("java-plexus-container-default" ,java-plexus-container-default) + ,@(package-native-inputs maven-plugin-api))))) -- cgit v1.2.3 From 721a00c06a17158ae48d9518527230595e7668a7 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 16:17:59 +0200 Subject: gnu: Add maven-3.0-repository-metadata. * gnu/packages/maven.scm (maven-3.0-repository-metadata): New variable. --- gnu/packages/maven.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 95a5779472..2c18e179eb 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -2229,3 +2229,16 @@ (define-public maven-3.0-plugin-api (native-inputs `(("java-plexus-container-default" ,java-plexus-container-default) ,@(package-native-inputs maven-plugin-api))))) + +(define-public maven-3.0-repository-metadata + (package + (inherit maven-repository-metadata) + (version (package-version maven-3.0-pom)) + (source (package-source maven-3.0-pom)) + (propagated-inputs + (map + (lambda (input) + (if (equal? (car input) "maven-pom") + `("maven-pom" ,maven-3.0-pom) + input)) + (package-propagated-inputs maven-repository-metadata))))) -- cgit v1.2.3 From 65f0946a6ccae37341bcf0704f69ee780dcc2337 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 16:19:01 +0200 Subject: gnu: Add maven-3.0-aether-provider. * gnu/packages/maven.scm (maven-3.0-aether-provider): New variable. --- gnu/packages/maven.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 2c18e179eb..409da674a5 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -2242,3 +2242,41 @@ (define-public maven-3.0-repository-metadata `("maven-pom" ,maven-3.0-pom) input)) (package-propagated-inputs maven-repository-metadata))))) + +(define-public maven-3.0-aether-provider + (package + (inherit maven-3.0-pom) + (name "maven-aether-provider") + (arguments + `(#:jar-name "maven-aether-provider.jar" + #:source-dir "maven-aether-provider/src/main/java" + #:tests? #f; no tests in 3.0 + #:phases + (modify-phases %standard-phases + (add-after 'build 'generate-metadata + (lambda _ + (invoke "java" "-cp" (string-append (getenv "CLASSPATH") ":build/classes") + "org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli" + "--source" "src/main/java" + "--output" "build/classes/META-INF/plexus/components.xml" + "--classes" "build/classes" + "--descriptors" "build/classes/META-INF") + #t)) + (add-after 'generate-metadata 'rebuild + (lambda _ + (invoke "ant" "jar") + #t)) + (replace 'install + (install-from-pom "maven-aether-provider/pom.xml"))))) + (propagated-inputs + `(("maven-model" ,maven-3.0-model) + ("maven-model-builder" ,maven-3.0-model-builder) + ("maven-repository-metadata" ,maven-3.0-repository-metadata) + ("java-sonatype-aether-api" ,java-sonatype-aether-api) + ("java-sonatype-aether-spi" ,java-sonatype-aether-spi) + ("java-sonatype-aether-impl" ,java-sonatype-aether-impl) + ("java-plexus-component-annotation" ,java-plexus-component-annotations) + ("java-plexus-utils" ,java-plexus-utils) + ("maven-pom" ,maven-3.0-pom))) + (native-inputs + `(("java-plexus-component-metadata" ,java-plexus-component-metadata))))) -- cgit v1.2.3 From 6f852f3b67701f509bd272b6e0e291f9e67db713 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 16:20:34 +0200 Subject: gnu: Add maven-3.0-core. * gnu/packages/maven.scm (maven-3.0-core): New variable. --- gnu/packages/maven.scm | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 409da674a5..68e87fcf22 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -2280,3 +2280,100 @@ (define-public maven-3.0-aether-provider ("maven-pom" ,maven-3.0-pom))) (native-inputs `(("java-plexus-component-metadata" ,java-plexus-component-metadata))))) + +(define-public maven-3.0-core + (package + (inherit maven-core) + (version (package-version maven-3.0-pom)) + (source (package-source maven-3.0-pom)) + (arguments + `(#:jar-name "maven-core.jar" + #:source-dir "src/main/java" + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-before 'configure 'chdir + (lambda _ + ;; Required for generating components.xml in maven-core + (chdir "maven-core") + #t)) + (add-before 'build 'generate-models + (lambda* (#:key inputs #:allow-other-keys) + (define (modello-single-mode file version mode) + (invoke "java" "org.codehaus.modello.ModelloCli" + file mode "src/main/java" version + "false" "true" "UTF-8")) + (let ((file "src/main/mdo/toolchains.mdo")) + (modello-single-mode file "1.0.0" "java") + (modello-single-mode file "1.0.0" "xpp3-reader") + (modello-single-mode file "1.0.0" "xpp3-writer")) + #t)) + (add-before 'build 'copy-resources + (lambda _ + (mkdir-p "build/classes/") + (copy-recursively "src/main/resources" "build/classes") + #t)) + (add-after 'build 'generate-metadata + (lambda _ + (define (components file) + (let ((sxml (with-input-from-file file + (lambda _ (xml->sxml (current-input-port) + #:trim-whitespace? #t))))) + ;; Select the list of s inside the + ;; and . + ((@ (ice-9 match) match) sxml + (('*TOP* + ('*PI* foo ...) + ('component-set + ('components x ...))) x)))) + (use-modules (sxml simple)) + (delete-file "build/classes/META-INF/plexus/components.xml") + (invoke "java" "-cp" (string-append (getenv "CLASSPATH") ":build/classes") + "org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli" + "--source" "build/classes/META-INF/plexus" + "--output" "build/classes/META-INF/plexus/components.t.xml" + "--classes" "build/classes" + "--descriptors" "build/classes") + ;; Now we merge all other components from hand-written xml + (let ((generated-xml (components "build/classes/META-INF/plexus/components.t.xml")) + (components-xml (components "src/main/resources/META-INF/plexus/components.xml")) + (artifact-handlers-xml (components "src/main/resources/META-INF/plexus/artifact-handlers.xml"))) + (with-output-to-file "build/classes/META-INF/plexus/components.xml" + (lambda _ + (display "\n") + (sxml->xml + `(component-set + (components + ,@(append generated-xml components-xml + artifact-handlers-xml))))))) + #t)) + (add-after 'generate-metadata 'rebuild + (lambda _ + (invoke "ant" "jar") + #t)) + (add-before 'install 'fix-pom + (lambda _ + (substitute* "pom.xml" + (("org.sonatype.sisu") "org.codehaus.plexus") + (("sisu-inject-plexus") "plexus-container-default")) + #t)) + (replace 'install + (install-from-pom "pom.xml"))))) + (propagated-inputs + `(("maven-model" ,maven-3.0-model) + ("maven-settings" ,maven-3.0-settings) + ("maven-settings-builder" ,maven-3.0-settings-builder) + ("maven-repository-metadata" ,maven-3.0-repository-metadata) + ("maven-artifact" ,maven-3.0-artifact) + ("maven-model-builder" ,maven-3.0-model-builder) + ("maven-aether-provider" ,maven-3.0-aether-provider) + ("java-sonatype-aether-impl" ,java-sonatype-aether-impl) + ("java-sonatype-aether-api" ,java-sonatype-aether-api) + ("java-sonatype-aether-util" ,java-sonatype-aether-util) + ("java-plexus-interpolation" ,java-plexus-interpolation) + ("java-plexus-utils" ,java-plexus-utils) + ("java-plexus-classworlds" ,java-plexus-classworlds) + ("java-plexus-component-annotations" ,java-plexus-component-annotations) + ("java-plexus-container-default" ,java-plexus-container-default) + ("java-plexus-sec-dispatcher" ,java-plexus-sec-dispatcher) + ("maven-pom" ,maven-3.0-pom))))) -- cgit v1.2.3 From 1203b94f7ec4b9d18564895065d584b33c3c9070 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 16:26:53 +0200 Subject: gnu: Add maven-3.0-compat. * gnu/packages/maven.scm (maven-3.0-compat): New variable. --- gnu/packages/maven.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 68e87fcf22..3a18df9c24 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -2377,3 +2377,40 @@ (define (components file) ("java-plexus-container-default" ,java-plexus-container-default) ("java-plexus-sec-dispatcher" ,java-plexus-sec-dispatcher) ("maven-pom" ,maven-3.0-pom))))) + +(define-public maven-3.0-compat + (package + (inherit maven-compat) + (version (package-version maven-3.0-pom)) + (source (package-source maven-3.0-pom)) + (arguments + `(#:tests? #f ;require an old version of java-easymock + ,@(substitute-keyword-arguments (package-arguments maven-compat) + ((#:phases phases) + `(modify-phases ,phases + (add-before 'install 'fix-pom + (lambda _ + (substitute* "pom.xml" + (("org.sonatype.sisu") "org.codehaus.plexus") + (("sisu-inject-plexus") "plexus-container-default")) + #t)) + (delete 'build-tests)))))) + (propagated-inputs + `(("maven-model" ,maven-3.0-model) + ("maven-model-builder" ,maven-3.0-model-builder) + ("maven-settings" ,maven-3.0-settings) + ("maven-settings-builder" ,maven-3.0-settings-builder) + ("maven-artifact" ,maven-3.0-artifact) + ("maven-core" ,maven-3.0-core) + ("maven-aether-provider" ,maven-3.0-aether-provider) + ("maven-repository-metadata" ,maven-3.0-repository-metadata) + ("java-sonatype-aether-api" ,java-sonatype-aether-api) + ("java-sonatype-aether-util" ,java-sonatype-aether-util) + ("java-sonatype-aether-impl" ,java-sonatype-aether-impl) + ("java-plexus-utils" ,java-plexus-utils) + ("java-plexus-interpolation" ,java-plexus-interpolation) + ("java-eclipse-sisu-plexus" ,java-eclipse-sisu-plexus) + ("java-plexus-component-annotations" ,java-plexus-component-annotations) + ("java-plexus-container-default" ,java-plexus-container-default) + ("maven-wagon-provider-api" ,maven-wagon-provider-api) + ("maven-pom" ,maven-3.0-pom))))) -- cgit v1.2.3 From 708e0e1dbd01ae1b950cc3c225001cef7fb2ce78 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 16:36:46 +0200 Subject: gnu: Add maven-shared-utils-3.0. * gnu/packages/maven.scm (maven-shared-utils-3.0): New variable. --- gnu/packages/maven.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 3a18df9c24..800145b982 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -2414,3 +2414,19 @@ (define-public maven-3.0-compat ("java-plexus-container-default" ,java-plexus-container-default) ("maven-wagon-provider-api" ,maven-wagon-provider-api) ("maven-pom" ,maven-3.0-pom))))) + +(define-public maven-shared-utils-3.0 + (package + (inherit maven-shared-utils) + (version "3.0.0") + (source (origin + (method url-fetch) + (uri (string-append "https://archive.apache.org/dist/maven/shared/" + "maven-shared-utils-" version "-source-release.zip")) + (sha256 + (base32 + "0qm8y85kip2hyhnhlkqgj0rhmf83z07s7l7gzsfl5dzl3kvp8nal")))) + (propagated-inputs + `(("maven-core" ,maven-3.0-core) + ("maven-components-parent-pom" ,maven-components-parent-pom-21) + ,@(package-propagated-inputs maven-shared-utils))))) -- cgit v1.2.3 From ebaaad1dffffa164904d113c2264e09770c31887 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 16:42:25 +0200 Subject: gnu: add maven-shared-io. * gnu/packages/maven.scm (maven-shared-io): New variable. --- gnu/packages/maven.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 800145b982..57fcde1e04 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -2430,3 +2430,47 @@ (define-public maven-shared-utils-3.0 `(("maven-core" ,maven-3.0-core) ("maven-components-parent-pom" ,maven-components-parent-pom-21) ,@(package-propagated-inputs maven-shared-utils))))) + +(define-public maven-shared-io + (package + (name "maven-shared-io") + (version "3.0.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://apache/maven/shared/" + "maven-shared-io-" version + "-source-release.zip")) + (sha256 + (base32 + "0hsyll8gg581802xhs4achdz8fpmfz7y02abx9s4mb8bc6yfh229")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "maven-shared-io.jar" + #:source-dir "src/main/java" + #:test-dir "src/test" + #:phases + (modify-phases %standard-phases + (add-before 'build 'copy-resources + (lambda _ + (copy-recursively "src/main/resources" "build/classes/") + (copy-recursively "src/test/resources" "build/test-classes/") + #t)) + (replace 'install + (install-from-pom "pom.xml"))))) + (propagated-inputs + `(("maven-artifact" ,maven-3.0-artifact) + ("maven-compat" ,maven-3.0-compat) + ("maven-plugin-api" ,maven-3.0-plugin-api) + ("maven-shared-utils" ,maven-shared-utils) + ("maven-wagon-provider-api" ,maven-wagon-provider-api) + ("java-plexus-utils" ,java-plexus-utils) + ("maven-components-parent-pom" ,maven-components-parent-pom-22))) + (native-inputs + `(("unzip" ,unzip) + ("java-junit" ,java-junit) + ("java-easymock" ,java-easymock))) + (home-page "https://maven.apache.org/shared/maven-dependency-tree") + (synopsis "Tree-based API for resolution of Maven project dependencies") + (description "This package provides a tree-based API for resolution of +Maven project dependencies.") + (license license:asl2.0))) -- cgit v1.2.3 From 9f547318e92799cfc1063fc2ffc91196aab871e4 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 17:04:29 +0200 Subject: gnu: Add maven-file-management. * gnu/packages/maven.scm (maven-file-management): New variable. --- gnu/packages/maven.scm | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 57fcde1e04..4e55c51713 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -2474,3 +2474,57 @@ (define-public maven-shared-io (description "This package provides a tree-based API for resolution of Maven project dependencies.") (license license:asl2.0))) + +(define-public maven-file-management + (package + (name "maven-file-management") + (version "3.0.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://apache/maven/shared/" + "file-management-" version + "-source-release.zip")) + (sha256 + (base32 + "0wisz6sm67axrwvx8a75mb9s03h7kzkzfw8j3aaa4sx4k9ph58da")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "maven-file-management.jar" + #:source-dir "src/main/java" + #:phases + (modify-phases %standard-phases + (add-before 'build 'copy-resources + (lambda _ + (copy-recursively "src/main/resources" "build/classes/") + #t)) + (add-before 'build 'generate-models + (lambda* (#:key inputs #:allow-other-keys) + (define (modello-single-mode file version mode) + (invoke "java" + "org.codehaus.modello.ModelloCli" + file mode "src/main/java" version + "false" "true")) + (let ((file "src/main/mdo/fileset.mdo")) + (modello-single-mode file "1.1.0" "java") + (modello-single-mode file "1.1.0" "xpp3-reader") + (modello-single-mode file "1.1.0" "xpp3-writer")) + #t)) + (replace 'install + (install-from-pom "pom.xml"))))) + (propagated-inputs + `(("maven-plugin-api" ,maven-3.0-plugin-api) + ("maven-shared-io" ,maven-shared-io) + ("maven-shared-utils" ,maven-shared-utils) + ("java-plexus-utils" ,java-plexus-utils) + ("maven-components-parent-pom" ,maven-components-parent-pom-22))) + (native-inputs + `(("java-modello-core" ,java-modello-core) + ;; modello plugins: + ("java-modellop-plugins-java" ,java-modello-plugins-java) + ("java-modellop-plugins-xpp3" ,java-modello-plugins-xpp3) + ("unzip" ,unzip))) + (home-page "https://maven.apache.org/shared/maven-dependency-tree") + (synopsis "Tree-based API for resolution of Maven project dependencies") + (description "This package provides a tree-based API for resolution of +Maven project dependencies.") + (license license:asl2.0))) -- cgit v1.2.3 From 84ca4dbe7fb3cb998189a1667f06066fb53c11b7 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 17:20:45 +0200 Subject: gnu: Add maven-archiver. * gnu/packages/maven.scm (maven-archiver): New variable. --- gnu/packages/maven.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 4e55c51713..6291293b46 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -2528,3 +2528,43 @@ (define (modello-single-mode file version mode) (description "This package provides a tree-based API for resolution of Maven project dependencies.") (license license:asl2.0))) + +(define-public maven-archiver + (package + (name "maven-archiver") + (version "3.5.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://apache/maven/shared/" + "maven-archiver-" version + "-source-release.zip")) + (sha256 + (base32 + "1204xkqj259brpk3yscprml0lbfbyn1vn5nrgqjk44z5vx127lbw")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "maven-archiver.jar" + #:source-dir "src/main/java" + #:phases + (modify-phases %standard-phases + (replace 'install + (install-from-pom "pom.xml"))))) + (propagated-inputs + `(("java-commons-io" ,java-commons-io) + ("maven-artifact" ,maven-3.0-artifact) + ("maven-core" ,maven-3.0-core) + ("maven-model" ,maven-3.0-model) + ("maven-shared-utils" ,maven-shared-utils) + ("java-plexus-archiver" ,java-plexus-archiver) + ("java-plexus-interpolation" ,java-plexus-interpolation) + ("java-plexus-utils" ,java-plexus-utils) + ("maen-parent-pom" ,maven-parent-pom-33))) + (native-inputs + `(("java-junit" ,java-junit) + ("java-assertj" ,java-assertj) + ("unzip" ,unzip))) + (home-page "https://maven.apache.org/shared/maven-dependency-tree") + (synopsis "Tree-based API for resolution of Maven project dependencies") + (description "This package provides a tree-based API for resolution of +Maven project dependencies.") + (license license:asl2.0))) -- cgit v1.2.3 From 24bdd1504eba3f10b144c53738bdbde5f678b9b9 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 17:22:08 +0200 Subject: gnu: Add maven-dependency-tree. * gnu/packages/maven.scm (maven-dependency-tree): New variable. --- gnu/packages/maven.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 6291293b46..e59e7aea8b 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -2568,3 +2568,41 @@ (define-public maven-archiver (description "This package provides a tree-based API for resolution of Maven project dependencies.") (license license:asl2.0))) + +(define-public maven-dependency-tree + (package + (name "maven-dependency-tree") + (version "3.0.1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://apache/maven/shared/" + "maven-dependency-tree-" version + "-source-release.zip")) + (sha256 + (base32 + "0mxfslxvcmjs13jl30zhcg672j970dzn6ihh79w9ajh6sfqmlds2")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "maven-dependency-tree.jar" + #:source-dir "src/main/java" + #:phases + (modify-phases %standard-phases + (replace 'install + (install-from-pom "pom.xml"))))) + (propagated-inputs + `(("maven-core" ,maven-3.0-core) + ("java-plexus-component-annotations" ,java-plexus-component-annotations) + ("maven-parent-pom" ,maven-parent-pom-30))) + (inputs + `(("java-sonatype-aether-api" ,java-sonatype-aether-api) + ("java-sonatype-aether-util" ,java-sonatype-aether-util) + ("java-eclipse-aether-api" ,java-eclipse-aether-api) + ("java-eclipse-aether-util" ,java-eclipse-aether-util))) + (native-inputs + `(("unzip" ,unzip) + ("java-junit" ,java-junit))) + (home-page "https://maven.apache.org/shared/maven-dependency-tree") + (synopsis "Tree-based API for resolution of Maven project dependencies") + (description "This package provides a tree-based API for resolution of +Maven project dependencies.") + (license license:asl2.0))) -- cgit v1.2.3 From ee1bed9d64fe923c2733d368e353dc9a6789b600 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 17:23:24 +0200 Subject: gnu: Add maven-common-artifact-filters. * gnu/packages/maven.scm (maven-common-artifact-filters): New variable. --- gnu/packages/maven.scm | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index e59e7aea8b..bca499d87d 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -2606,3 +2606,52 @@ (define-public maven-dependency-tree (description "This package provides a tree-based API for resolution of Maven project dependencies.") (license license:asl2.0))) + +(define-public maven-common-artifact-filters + (package + (name "maven-common-artifact-filters") + (version "3.1.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://apache/maven/shared/" + "maven-common-artifact-filters-" version + "-source-release.zip")) + (sha256 + (base32 + "1cl1qk4r0gp62bjzfm7lml9raz1my2kd4yf0ci0lnfsn0h5qivnb")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "maven-common-artifact-filters.jar" + #:source-dir "src/main/java" + #:tests? #f; require maven-plugin-testing-harness, which requires maven 3.2. + #:phases + (modify-phases %standard-phases + (add-before 'build 'remove-sisu + (lambda _ + ;; Replace sisu with an existing dependency, to prevent a failure + ;; when rewritting dependency versions + (substitute* "pom.xml" + (("sisu-inject-plexus") "maven-plugin-api") + (("org.sonatype.sisu") "org.apache.maven")) + #t)) + (replace 'install + (install-from-pom "pom.xml"))))) + (propagated-inputs + `(("maven-artifact" ,maven-3.0-artifact) + ("maven-model" ,maven-3.0-model) + ("maven-core" ,maven-3.0-core) + ("maven-plugin-api" ,maven-3.0-plugin-api) + ("maven-shared-utils" ,maven-shared-utils) + ("maven-parent-pom" ,maven-parent-pom-33) + ("java-sonatype-aether-api" ,java-sonatype-aether-api) + ("java-sonatype-aether-util" ,java-sonatype-aether-util))) + (inputs + `(("maven-resolver-api" ,maven-resolver-api) + ("maven-resolver-util" ,maven-resolver-util))) + (native-inputs + `(("unzip" ,unzip))) + (home-page "https://maven.apache.org/shared/maven-dependency-tree") + (synopsis "Tree-based API for resolution of Maven project dependencies") + (description "This package provides a tree-based API for resolution of +Maven project dependencies.") + (license license:asl2.0))) -- cgit v1.2.3 From c3951015d79ce7410fbd66d889acc88be9192d32 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 17:25:52 +0200 Subject: gnu: Add maven-enforcer-api. * gnu/packages/maven.scm (maven-enforcer-api): New variable. * gnu/packages/patches/maven-enforcer-api-fix-old-dependencies.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/maven.scm | 50 ++++++ .../maven-enforcer-api-fix-old-dependencies.patch | 177 +++++++++++++++++++++ 3 files changed, 228 insertions(+) create mode 100644 gnu/packages/patches/maven-enforcer-api-fix-old-dependencies.patch diff --git a/gnu/local.mk b/gnu/local.mk index 67756186b5..b174cdeaf5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1279,6 +1279,7 @@ dist_patch_DATA = \ %D%/packages/patches/mars-install.patch \ %D%/packages/patches/mars-sfml-2.3.patch \ %D%/packages/patches/maxima-defsystem-mkdir.patch \ + %D%/packages/patches/maven-enforcer-api-fix-old-dependencies.patch \ %D%/packages/patches/maven-generate-component-xml.patch \ %D%/packages/patches/maven-generate-javax-inject-named.patch \ %D%/packages/patches/mcrypt-CVE-2012-4409.patch \ diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index bca499d87d..fb0cb9eac4 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -2655,3 +2655,53 @@ (define-public maven-common-artifact-filters (description "This package provides a tree-based API for resolution of Maven project dependencies.") (license license:asl2.0))) + +(define-public maven-enforcer-api + (package + (name "maven-enforcer-api") + (version "3.0.0-M3") + (source (origin + (method url-fetch) + (uri (string-append "mirror://apache/maven/enforcer/" + "enforcer-" version "-source-release.zip")) + (sha256 + (base32 + "014cwj0dqa69nnlzcin8pk9wsjmmg71vsbcpb16cibcjpm6h9wjg")) + (patches + (search-patches "maven-enforcer-api-fix-old-dependencies.patch")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "maven-enforcer-api.jar" + #:source-dir "enforcer-api/src/main/java" + #:tests? #f; no tests + #:phases + (modify-phases %standard-phases + (replace 'install + (install-from-pom "enforcer-api/pom.xml"))))) + (propagated-inputs + `(("maven-plugin-api" ,maven-plugin-api) + ("java-plexus-container-default" ,java-plexus-container-default) + ("java-jsr305" ,java-jsr305) + ("maven-enforcer-parent-pom" ,maven-enforcer-parent-pom))) + (native-inputs + `(("unzip" ,unzip))) + (home-page "https://maven.apache.org/shared/maven-dependency-tree") + (synopsis "Tree-based API for resolution of Maven project dependencies") + (description "This package provides a tree-based API for resolution of +Maven project dependencies.") + (license license:asl2.0))) + +(define maven-enforcer-parent-pom + (package + (inherit maven-enforcer-api) + (name "maven-enforcer-parent-pom") + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (replace 'install + (install-pom-file "pom.xml"))))) + (propagated-inputs + `(("maven-parent-pom" ,maven-parent-pom-30))))) diff --git a/gnu/packages/patches/maven-enforcer-api-fix-old-dependencies.patch b/gnu/packages/patches/maven-enforcer-api-fix-old-dependencies.patch new file mode 100644 index 0000000000..98a0c8a395 --- /dev/null +++ b/gnu/packages/patches/maven-enforcer-api-fix-old-dependencies.patch @@ -0,0 +1,177 @@ +From eccc46eaf7903a8e837813795498b12c078faaea Mon Sep 17 00:00:00 2001 +From: Julien Lepiller +Date: Wed, 11 Mar 2020 21:53:32 +0100 +Subject: [PATCH] Fix old dependencies + +--- + .../enforcer/AbstractBanDependencies.java | 2 +- + .../enforcer/BanTransitiveDependencies.java | 2 +- + .../enforcer/DependencyConvergence.java | 17 ++++++++--------- + .../enforcer/RequireUpperBoundDeps.java | 19 +++++++++---------- + .../enforcer/utils/DependencyVersionMap.java | 6 +++--- + 5 files changed, 22 insertions(+), 24 deletions(-) + +diff --git a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractBanDependencies.java b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractBanDependencies.java +index 2888a61..2b944b7 100644 +--- a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractBanDependencies.java ++++ b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractBanDependencies.java +@@ -119,7 +119,7 @@ public abstract class AbstractBanDependencies + Set dependencies = null; + try + { +- DependencyNode node = graphBuilder.buildDependencyGraph( project, null ); ++ DependencyNode node = graphBuilder.buildDependencyGraph( project.getProjectBuildingRequest(), null ); + if ( searchTransitive ) + { + dependencies = ArtifactUtils.getAllDescendants( node ); +diff --git a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BanTransitiveDependencies.java b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BanTransitiveDependencies.java +index 6e1dcd4..1b964ba 100644 +--- a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BanTransitiveDependencies.java ++++ b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BanTransitiveDependencies.java +@@ -158,7 +158,7 @@ public class BanTransitiveDependencies + try + { + MavenProject project = (MavenProject) helper.evaluate( "${project}" ); +- rootNode = createDependencyGraphBuilder().buildDependencyGraph( project, null ); ++ rootNode = createDependencyGraphBuilder().buildDependencyGraph( project.getProjectBuildingRequest(), null ); + } + catch ( Exception e ) + { +diff --git a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java +index 684f984..ca7ad3a 100644 +--- a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java ++++ b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java +@@ -35,9 +35,9 @@ import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper; + import org.apache.maven.plugin.logging.Log; + import org.apache.maven.plugins.enforcer.utils.DependencyVersionMap; + import org.apache.maven.project.MavenProject; +-import org.apache.maven.shared.dependency.tree.DependencyNode; +-import org.apache.maven.shared.dependency.tree.DependencyTreeBuilder; +-import org.apache.maven.shared.dependency.tree.DependencyTreeBuilderException; ++import org.apache.maven.shared.dependency.graph.DependencyNode; ++import org.apache.maven.shared.dependency.graph.DependencyGraphBuilder; ++import org.apache.maven.shared.dependency.graph.DependencyGraphBuilderException; + import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException; + import org.codehaus.plexus.component.repository.exception.ComponentLookupException; + +@@ -60,7 +60,7 @@ public class DependencyConvergence + // CHECKSTYLE_OFF: LineLength + /** + * Uses the {@link EnforcerRuleHelper} to populate the values of the +- * {@link DependencyTreeBuilder#buildDependencyTree(MavenProject, ArtifactRepository, ArtifactFactory, ArtifactMetadataSource, ArtifactFilter, ArtifactCollector)} ++ * {@link DependencyGraphBuilder#buildDependencyTree(MavenProject, ArtifactRepository, ArtifactFactory, ArtifactMetadataSource, ArtifactFilter, ArtifactCollector)} + * factory method.
+ * This method simply exists to hide all the ugly lookup that the {@link EnforcerRuleHelper} has to do. + * +@@ -75,16 +75,15 @@ public class DependencyConvergence + try + { + MavenProject project = (MavenProject) helper.evaluate( "${project}" ); +- DependencyTreeBuilder dependencyTreeBuilder = +- (DependencyTreeBuilder) helper.getComponent( DependencyTreeBuilder.class ); ++ DependencyGraphBuilder dependencyTreeBuilder = ++ (DependencyGraphBuilder) helper.getComponent( DependencyGraphBuilder.class ); + ArtifactRepository repository = (ArtifactRepository) helper.evaluate( "${localRepository}" ); + ArtifactFactory factory = (ArtifactFactory) helper.getComponent( ArtifactFactory.class ); + ArtifactMetadataSource metadataSource = + (ArtifactMetadataSource) helper.getComponent( ArtifactMetadataSource.class ); + ArtifactCollector collector = (ArtifactCollector) helper.getComponent( ArtifactCollector.class ); + ArtifactFilter filter = null; // we need to evaluate all scopes +- DependencyNode node = dependencyTreeBuilder.buildDependencyTree( project, repository, factory, +- metadataSource, filter, collector ); ++ DependencyNode node = dependencyTreeBuilder.buildDependencyGraph( project.getProjectBuildingRequest(), filter); + return node; + } + catch ( ExpressionEvaluationException e ) +@@ -95,7 +94,7 @@ public class DependencyConvergence + { + throw new EnforcerRuleException( "Unable to lookup a component " + e.getLocalizedMessage(), e ); + } +- catch ( DependencyTreeBuilderException e ) ++ catch ( DependencyGraphBuilderException e ) + { + throw new EnforcerRuleException( "Could not build dependency tree " + e.getLocalizedMessage(), e ); + } +diff --git a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireUpperBoundDeps.java b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireUpperBoundDeps.java +index 458554a..2de9870 100644 +--- a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireUpperBoundDeps.java ++++ b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireUpperBoundDeps.java +@@ -38,10 +38,10 @@ import org.apache.maven.enforcer.rule.api.EnforcerRuleException; + import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper; + import org.apache.maven.plugin.logging.Log; + import org.apache.maven.project.MavenProject; +-import org.apache.maven.shared.dependency.tree.DependencyNode; +-import org.apache.maven.shared.dependency.tree.DependencyTreeBuilder; +-import org.apache.maven.shared.dependency.tree.DependencyTreeBuilderException; +-import org.apache.maven.shared.dependency.tree.traversal.DependencyNodeVisitor; ++import org.apache.maven.shared.dependency.graph.DependencyNode; ++import org.apache.maven.shared.dependency.graph.DependencyGraphBuilder; ++import org.apache.maven.shared.dependency.graph.DependencyGraphBuilderException; ++import org.apache.maven.shared.dependency.graph.traversal.DependencyNodeVisitor; + import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException; + import org.codehaus.plexus.component.repository.exception.ComponentLookupException; + +@@ -91,7 +91,7 @@ public class RequireUpperBoundDeps + // CHECKSTYLE_OFF: LineLength + /** + * Uses the {@link EnforcerRuleHelper} to populate the values of the +- * {@link DependencyTreeBuilder#buildDependencyTree(MavenProject, ArtifactRepository, ArtifactFactory, ArtifactMetadataSource, ArtifactFilter, ArtifactCollector)} ++ * {@link DependencyGraphBuilder#buildDependencyTree(MavenProject, ArtifactRepository, ArtifactFactory, ArtifactMetadataSource, ArtifactFilter, ArtifactCollector)} + * factory method.
+ * This method simply exists to hide all the ugly lookup that the {@link EnforcerRuleHelper} has to do. + * +@@ -106,8 +106,8 @@ public class RequireUpperBoundDeps + try + { + MavenProject project = (MavenProject) helper.evaluate( "${project}" ); +- DependencyTreeBuilder dependencyTreeBuilder = +- (DependencyTreeBuilder) helper.getComponent( DependencyTreeBuilder.class ); ++ DependencyGraphBuilder dependencyTreeBuilder = ++ (DependencyGraphBuilder) helper.getComponent( DependencyGraphBuilder.class ); + ArtifactRepository repository = (ArtifactRepository) helper.evaluate( "${localRepository}" ); + ArtifactFactory factory = (ArtifactFactory) helper.getComponent( ArtifactFactory.class ); + ArtifactMetadataSource metadataSource = +@@ -115,8 +115,7 @@ public class RequireUpperBoundDeps + ArtifactCollector collector = (ArtifactCollector) helper.getComponent( ArtifactCollector.class ); + ArtifactFilter filter = null; // we need to evaluate all scopes + DependencyNode node = +- dependencyTreeBuilder.buildDependencyTree( project, repository, factory, metadataSource, filter, +- collector ); ++ dependencyTreeBuilder.buildDependencyGraph( project.getProjectBuildingRequest(), filter); + return node; + } + catch ( ExpressionEvaluationException e ) +@@ -127,7 +126,7 @@ public class RequireUpperBoundDeps + { + throw new EnforcerRuleException( "Unable to lookup a component " + e.getLocalizedMessage(), e ); + } +- catch ( DependencyTreeBuilderException e ) ++ catch ( DependencyGraphBuilderException e ) + { + throw new EnforcerRuleException( "Could not build dependency tree " + e.getLocalizedMessage(), e ); + } +diff --git a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/DependencyVersionMap.java b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/DependencyVersionMap.java +index b6213fa..2c2a645 100644 +--- a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/DependencyVersionMap.java ++++ b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/DependencyVersionMap.java +@@ -26,8 +26,8 @@ import java.util.Map; + + import org.apache.maven.artifact.Artifact; + import org.apache.maven.plugin.logging.Log; +-import org.apache.maven.shared.dependency.tree.DependencyNode; +-import org.apache.maven.shared.dependency.tree.traversal.DependencyNodeVisitor; ++import org.apache.maven.shared.dependency.graph.DependencyNode; ++import org.apache.maven.shared.dependency.graph.traversal.DependencyNodeVisitor; + + /** + * @author Brian Fox +@@ -132,4 +132,4 @@ public class DependencyVersionMap + } + return output; + } +-} +\ No newline at end of file ++} +-- +2.24.1 + -- cgit v1.2.3 From 94261e7ce2c640a074e25a0c976bb5ac546ff429 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 17:34:58 +0200 Subject: gnu: Add maven-enforcer-rules. * gnu/packages-maven.scm (maven-enforcer-rules): New variable. --- gnu/packages/maven.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index fb0cb9eac4..0eb5db3c13 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -2705,3 +2705,30 @@ (define maven-enforcer-parent-pom (install-pom-file "pom.xml"))))) (propagated-inputs `(("maven-parent-pom" ,maven-parent-pom-30))))) + +(define-public maven-enforcer-rules + (package + (inherit maven-enforcer-api) + (name "maven-enforcer-rules") + (arguments + `(#:tests? #f; requires maven-plugin-testing-harness + #:jar-name "maven-enforcer-rules.jar" + #:source-dir "enforcer-rules/src/main/java" + #:test-dir "enforcer-rules/src/test" + #:phases + (modify-phases %standard-phases + (replace 'install + (install-from-pom "enforcer-rules/pom.xml"))))) + (propagated-inputs + `(("maven-artifact" ,maven-artifact) + ("maven-plugin-api" ,maven-plugin-api) + ("maven-core" ,maven-core) + ("maven-common-artifact-filters" ,maven-common-artifact-filters) + ("java-commons-codec" ,java-commons-codec) + ("java-commons-lang3" ,java-commons-lang3) + ("maven-enforcer-api" ,maven-enforcer-api) + ("maven-resolver-util" ,maven-resolver-util) + ("java-bsh" ,java-bsh) + ("maven-dependency-tree" ,maven-dependency-tree) + ("maven-compat" ,maven-3.0-compat) + ("maven-enforcer-parent-pom" ,maven-enforcer-parent-pom))))) -- cgit v1.2.3 From e244157bee5d1eee9a51a65ad07a23c772a7e817 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 18:50:13 +0200 Subject: gnu: Add maven-enforcer-plugin. * gnu/packages/maven.scm (maven-enforcer-plugin): New variable. --- gnu/packages/maven.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 0eb5db3c13..560c94ebcd 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -2732,3 +2732,32 @@ (define-public maven-enforcer-rules ("maven-dependency-tree" ,maven-dependency-tree) ("maven-compat" ,maven-3.0-compat) ("maven-enforcer-parent-pom" ,maven-enforcer-parent-pom))))) + +(define-public maven-enforcer-plugin + (package + (inherit maven-enforcer-api) + (name "maven-enforcer-plugin") + (arguments + `(#:tests? #f + #:jar-name "maven-enforcer-plugin.jar" + #:source-dir "maven-enforcer-plugin/src/main/java" + #:phases + (modify-phases %standard-phases + (add-before 'build 'generate-plugin.xml + (generate-plugin.xml "maven-enforcer-plugin/pom.xml" + "enforcer" + "maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/" + (list + (list "DisplayInfoMojo.java") + (list "EnforceMojo.java")))) + (replace 'install + (install-from-pom "maven-enforcer-plugin/pom.xml"))))) + (propagated-inputs + `(("maven-artifact" ,maven-artifact) + ("maven-plugin-api" ,maven-plugin-api) + ("maven-core" ,maven-core) + ("java-plexus-utils" ,java-plexus-utils) + ("maven-enforcer-api" ,maven-enforcer-api) + ("maven-enforcer-rules" ,maven-enforcer-rules) + ("maven-plugin-annotations" ,maven-plugin-annotations) + ("maven-enforcer-parent-pom" ,maven-enforcer-parent-pom))))) -- cgit v1.2.3 From ea806229c7f66bdb389e52e81dddfba72be31abe Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 19:22:15 +0200 Subject: gnu: Add maven-artifact-transfer. * gnu/packages/maven.scm (maven-artifact-transfer): New variable. --- gnu/packages/maven.scm | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 560c94ebcd..9940558ead 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -2761,3 +2761,59 @@ (define-public maven-enforcer-plugin ("maven-enforcer-rules" ,maven-enforcer-rules) ("maven-plugin-annotations" ,maven-plugin-annotations) ("maven-enforcer-parent-pom" ,maven-enforcer-parent-pom))))) + +(define-public maven-artifact-transfer + (package + (name "maven-artifact-transfer") + (version "0.12.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://apache/maven/shared/" + "maven-artifact-transfer-" version + "-source-release.zip")) + (sha256 + (base32 + "0mkdjr3wnvaxqaq68sy7h4mqlq3xgwwp5s2anj5vbxfy4bsc1ivj")))) + (build-system ant-build-system) + (arguments + `(#:tests? #f; require mockito 2 + #:jar-name "maven-artifact-transfer.jar" + #:source-dir "src/main/java" + #:phases + (modify-phases %standard-phases + (add-after 'build 'generate-metadata + (lambda _ + (invoke "java" "-cp" (string-append (getenv "CLASSPATH") ":build/classes") + "org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli" + "--source" "src/main/java" + "--output" "build/classes/META-INF/plexus/components.xml" + "--classes" "build/classes" + "--descriptors" "build/classes/META-INF") + #t)) + (add-after 'generate-metadata 'rebuild + (lambda _ + (invoke "ant" "jar") + #t)) + (replace 'install + (install-from-pom "pom.xml"))))) + (propagated-inputs + `(("java-commons-codec" ,java-commons-codec) + ("maven-artifact" ,maven-3.0-artifact) + ("maven-core" ,maven-3.0-core) + ("maven-common-artifact-filters" ,maven-common-artifact-filters) + ("java-plexus-component-annotations" ,java-plexus-component-annotations) + ("java-plexus-utils" ,java-plexus-utils) + ("java-slf4j-api" ,java-slf4j-api) + ("java-plexus-classworlds" ,java-plexus-classworlds) + ("java-sonatype-aether-api" ,java-sonatype-aether-api) + ("java-eclipse-aether-api" ,java-eclipse-aether-api) + ("java-eclipse-aether-util" ,java-eclipse-aether-util) + ("java-eclipse-aether-impl" ,java-eclipse-aether-impl))) + (native-inputs + `(("unzip" ,unzip) + ("java-plexus-component-metadata" ,java-plexus-component-metadata))) + (home-page "https://maven.apache.org/shared/maven-artifact-transfer") + (synopsis "API to install, deploy and resolve artifacts in Maven") + (description "This package contains an API to install, deploy and resolve +artifacts in Maven 3.") + (license license:asl2.0))) -- cgit v1.2.3 From f738576086fbe474477c06fd6be8ac73f3148336 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 23:04:47 +0200 Subject: gnu: maven-plugin-annotations: Install from pom file. * gnu/packages/maven.scm (maven-plugin-annotations): Install from pom file. --- gnu/packages/maven.scm | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 9940558ead..126e077208 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -661,9 +661,14 @@ (define-public maven-plugin-annotations (arguments `(#:jar-name "maven-plugin-annotations.jar" #:source-dir "maven-plugin-annotations/src/main/java" - #:tests? #f)) - (inputs - `(("maven-artifact" ,maven-artifact))) + #:tests? #f + #:phases + (modify-phases %standard-phases + (replace 'install + (install-from-pom "maven-plugin-annotations/pom.xml"))))) + (propagated-inputs + `(("maven-artifact" ,maven-artifact) + ("maven-plugin-tools-parent-pom" ,maven-plugin-tools-parent-pom))) (native-inputs `(("unzip" ,unzip))) (home-page "https://maven.apache.org/plugin-tools/maven-plugin-annotations/") @@ -671,6 +676,20 @@ (define-public maven-plugin-annotations (description "This package contains Java 5 annotations for use in Mojos.") (license license:asl2.0))) +(define maven-plugin-tools-parent-pom + (package + (inherit maven-plugin-annotations) + (name "maven-plugin-tools-parent-pom") + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (replace 'install + (install-pom-file "pom.xml"))))) + (propagated-inputs '()))) + (define-public maven-wagon-provider-api (package (name "maven-wagon-provider-api") -- cgit v1.2.3 From ebe6e6f5d273277c59cbdea145c839d17aec6fe4 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 19:25:27 +0200 Subject: gnu: Add maven-install-plugin. --- gnu/packages/maven.scm | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 126e077208..de74cbc8dd 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -2836,3 +2836,63 @@ (define-public maven-artifact-transfer (description "This package contains an API to install, deploy and resolve artifacts in Maven 3.") (license license:asl2.0))) + +(define-public maven-install-plugin + (package + (name "maven-install-plugin") + (version "3.0.0-M1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://apache/maven/plugins/" + "maven-install-plugin-" version + "-source-release.zip")) + (sha256 + (base32 + "1l9iydxririrair0i5sk2iypn9wspzbb666lc0ddg20yyr8w39dm")))) + (build-system ant-build-system) + (arguments + `(#:tests? #f; require maven-plugin-testing-harness + #:jar-name "maven-install-plugin.jar" + #:source-dir "src/main/java" + #:phases + (modify-phases %standard-phases + (add-before 'build 'fix-pom + (lambda _ + (substitute* "pom.xml" + (("maven-project") "maven-core") + (("maven-artifact-manager") "maven-artifact") + (("2.0.6") "3.0")) + #t)) + (add-before 'build 'generate-plugin.xml + (generate-plugin.xml "pom.xml" + "install" + "src/main/java/org/apache/maven/plugins/install" + (list + (list "AbstractInstallMojo.java" "InstallFileMojo.java") + (list "AbstractInstallMojo.java" "InstallMojo.java")))) + (replace 'install + (install-from-pom "pom.xml"))))) + (propagated-inputs + `(("maven-artifact" ,maven-artifact) + ("maven-plugin-api" ,maven-plugin-api) + ("maven-compat" ,maven-compat) + ("maven-artifact-transfer" ,maven-artifact-transfer) + ("maven-plugins-pom-23" ,maven-plugins-pom-23) + ("java-plexus-digest" ,java-plexus-digest))) + (inputs + `(("maven-plugin-annotations" ,maven-plugin-annotations) + ("java-slf4j-api" ,java-slf4j-api))) + (native-inputs + `(("unzip" ,unzip))) + (home-page "https://maven.apache.org/plugin/maven-install-plugin") + (synopsis "Maven's install plugin") + (description "The Install Plugin is used during the install phase to add +artifact(s) to the local repository. The Install Plugin uses the information +in the POM (groupId, artifactId, version) to determine the proper location for +the artifact within the local repository. + +The local repository is the local cache where all artifacts needed for the +build are stored. By default, it is located within the user's home directory +(@file{~/.m2/repository}) but the location can be configured in +@file{~/.m2/settings.xml} using the @code{} element.") + (license license:asl2.0))) -- cgit v1.2.3 From f0e3e6caa3582a1994244ad0ec1f3b2efaf68703 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 20:19:06 +0200 Subject: gnu: Add maven-filtering. * gnu/packages/maven.scm (maven-filtering): New variable. * gnu/packages/java.scm (java-sisu-build-api): Install from pom file. --- gnu/packages/java.scm | 4 ++- gnu/packages/maven.scm | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 3e778b6da9..dd7bb8cde9 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -4571,7 +4571,9 @@ (define-public java-sisu-build-api \n \n \n"))) - #t))))) + #t)) + (replace 'install + (install-from-pom "pom.xml"))))) (inputs `(("java-plexus-utils" ,java-plexus-utils) ("java-plexus-container-default" ,java-plexus-container-default))) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index de74cbc8dd..03206ea545 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -2896,3 +2896,77 @@ (define-public maven-install-plugin (@file{~/.m2/repository}) but the location can be configured in @file{~/.m2/settings.xml} using the @code{} element.") (license license:asl2.0))) + +(define-public maven-filtering + (package + (name "maven-filtering") + (version "3.1.1") + (source (origin + (method url-fetch) + (uri (string-append "https://archive.apache.org/dist/maven/" + "shared/maven-filtering-" version + "-source-release.zip")) + (sha256 + (base32 + "09wrdhchnszd2l6h4z30ra0bv1a19qyjgac9z8zf1pn0m4nw05yz")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "maven-filtering.jar" + #:source-dir "src/main/java" + #:test-dir "src/test" + ;; this test comes from sisu-build-api, not this package + #:test-exclude (list "**/IncrementalResourceFilteringTest.java" + "**/Abstract*.java") + #:phases + (modify-phases %standard-phases + (add-after 'build 'generate-metadata + (lambda _ + (invoke "java" "-cp" (string-append (getenv "CLASSPATH") ":build/classes") + "org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli" + "--source" "src/main/java" + "--output" "build/classes/META-INF/plexus/components.xml" + "--classes" "build/classes" + "--descriptors" "build/classes/META-INF") + #t)) + (add-after 'generate-metadata 'rebuild + (lambda _ + (invoke "ant" "jar") + #t)) + (add-before 'check 'decompress-tests + (lambda* (#:key inputs #:allow-other-keys) + (let* ((build-api-source (assoc-ref inputs "java-sisu-build-api-origin")) + (classes (string-append build-api-source "/src/test/java"))) + (copy-recursively classes "src/test/")) + #t)) + (add-before 'check 'fix-directory + (lambda _ + (substitute* (find-files "src/test" ".*.java$") + (("target/test-classes/") "build/test-classes/")))) + (add-before 'check 'copy-test-resources + (lambda _ + (copy-recursively "src/test/resources" "build/test-classes/") + #t)) + (replace 'install + (install-from-pom "pom.xml"))))) + (propagated-inputs + `(("maven-core" ,maven-3.0-core) + ("maven-shared-utils" ,maven-shared-utils) + ("java-plexus-utils" ,java-plexus-utils) + ("java-plexus-interpolation" ,java-plexus-interpolation) + ("java-sisu-build-api" ,java-sisu-build-api) + ("maven-parent-pom" ,maven-parent-pom-30))) + (inputs + `(("java-jsr305" ,java-jsr305))) + (native-inputs + `(("unzip" ,unzip) + ("java-assertj" ,java-assertj) + ("java-junit" ,java-junit) + ("java-mockito" ,java-mockito-1) + ("java-objenesis" ,java-objenesis) + ("java-plexus-component-metadata" ,java-plexus-component-metadata) + ("java-sisu-build-api-origin" ,(package-source java-sisu-build-api)))) + (home-page "https://maven.apache.org/shared/maven-filtering") + (synopsis "Shared component for all plugins that needs to filter resources") + (description "This component provides an API to filter resources in Maven +projects.") + (license license:asl2.0))) -- cgit v1.2.3 From 5bebb1e81f97001b2346ea309c969c972f109a94 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 20:22:14 +0200 Subject: gnu: Add maven-resources-plugin. * gnu/packages/maven.scm (maven-resources-plugin): New variable. --- gnu/packages/maven.scm | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 03206ea545..78f9751862 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -2970,3 +2970,56 @@ (define-public maven-filtering (description "This component provides an API to filter resources in Maven projects.") (license license:asl2.0))) + +(define-public maven-resources-plugin + (package + (name "maven-resources-plugin") + (version "3.1.0") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/apache/" + "maven-resources-plugin/archive/" + "maven-resources-plugin-" version ".tar.gz")) + (sha256 + (base32 + "1f5gnjg2xmqfxml6k0ydyd1sxxwzgnb24qn6avcc4mijwd8a84pl")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "maven-resources-plugin.jar" + #:source-dir "src/main/java" + #:test-dir "src/test" + #:tests? #f; test depends on maven-plugin-test-harness + #:phases + (modify-phases %standard-phases + (add-before 'build 'generate-plugin.xml + (generate-plugin.xml "pom.xml" "resources" + "src/main/java/org/apache/maven/plugins/resources" + (list + (list "ResourcesMojo.java" "CopyResourcesMojo.java") + (list "ResourcesMojo.java") + (list "ResourcesMojo.java" "TestResourcesMojo.java")))) + (replace 'install + (install-from-pom "pom.xml"))))) + (propagated-inputs + `(("maven-plugin-api" ,maven-plugin-api) + ("maven-core" ,maven-core) + ("java-plexus-utils" ,java-plexus-utils) + ("maven-filtering" ,maven-filtering) + ("java-plexus-interpolation" ,java-plexus-interpolation) + ("maven-parent-pom" ,maven-parent-pom-31))) + (inputs + `(("maven-plugin-annotations" ,maven-plugin-annotations) + ("java-commons-io" ,java-commons-io))) + (native-inputs + `(("java-plexus-component-metadata" ,java-plexus-component-metadata))) + (home-page "https://maven.apache.org/plugins/maven-resources-plugin") + (synopsis "Maven plugin to collect and install resources") + (description "The Resources Plugin handles the copying of project resources +to the output directory. There are two different kinds of resources: main +resources and test resources. The difference is that the main resources are +the resources associated to the main source code while the test resources are +associated to the test source code. + +Thus, this allows the separation of resources for the main source code and its +unit tests.") + (license license:asl2.0))) -- cgit v1.2.3 From 0ab9eba78e37ee83f5e1e40a5c40495c5330a3d8 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 20:32:40 +0200 Subject: gnu: Add java-qdox-2-M9. * gnu/packages/java.scm (java-qdox-2-M9): New variable. (java-qdox): Install from pom file. --- gnu/packages/java.scm | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index dd7bb8cde9..49cfb0a8a5 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -3548,7 +3548,28 @@ (define-public java-qdox (build-system ant-build-system) (arguments `(#:jar-name "qdox.jar" - #:tests? #f)); no tests + #:tests? #f; no tests + #:modules + ((guix build ant-build-system) + (guix build java-utils) + (guix build utils) + (sxml simple)) + #:phases + (modify-phases %standard-phases + (add-before 'install 'create-pom + (lambda _ + (with-output-to-file "pom.xml" + (lambda _ + (sxml->xml + `((project + (modelVersion "4.0.0") + (name "QDox") + (groupId "com.thoughtworks.qdox") + (artifactId "qdox") + (version ,,version)))))) + #t)) + (replace 'install + (install-from-pom "pom.xml"))))) (home-page "https://github.com/codehaus/qdox") (synopsis "Parse definitions from Java source files") (description "QDox is a high speed, small footprint parser for extracting @@ -3557,6 +3578,23 @@ (define-public java-qdox documentation tools.") (license license:asl2.0))) +(define-public java-qdox-2-M9 + (package + (inherit java-qdox) + (version "2.0-M9"); required by plexus-java + (source (origin + (method url-fetch) + ;; 2.0-M4, -M5 at https://github.com/paul-hammant/qdox + ;; Older releases at https://github.com/codehaus/qdox/ + ;; Note: The release at maven is pre-generated. The release at + ;; github requires jflex. + (uri (string-append "https://repo1.maven.org/maven2/" + "com/thoughtworks/qdox/qdox/" version + "/qdox-" version "-sources.jar")) + (sha256 + (base32 + "1s2jnmx2dkwnaha12lcj26aynywgwa8sslc47z82wx8xai13y4fg")))))) + (define-public java-jarjar (package (name "java-jarjar") -- cgit v1.2.3 From 015e8774b7b75399bb5eaacd48a1c4e5c08821c3 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 22:28:56 +0200 Subject: gnu: java-plexus-component-metadata: Move to java.scm. * gnu/packages/maven.scm (maven-core-bootstrap): Make public and hidden. (java-plexus-component-metadata): Move to ... * gnu/packages/java.scm: ... here. --- gnu/packages/java.scm | 46 ++++++++++ gnu/packages/maven.scm | 244 ++++++++++++++++++++----------------------------- 2 files changed, 146 insertions(+), 144 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 49cfb0a8a5..4e62993e03 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -66,6 +66,7 @@ (define-module (gnu packages java) #:use-module (gnu packages libffi) #:use-module (gnu packages linux) ;alsa #:use-module (gnu packages maths) + #:use-module (gnu packages maven) #:use-module (gnu packages maven-parent-pom) #:use-module (gnu packages nss) #:use-module (gnu packages onc-rpc) @@ -4275,6 +4276,51 @@ (define-public java-plexus-component-annotations (description "This package is a Maven plugin to generate Plexus descriptors from source tags and class annotations."))) +(define-public java-plexus-component-metadata + (package + (inherit java-plexus-container-default) + (name "java-plexus-component-metadata") + (arguments + `(#:jar-name "plexus-component-metadata.jar" + #:source-dir "src/main/java" + #:test-dir "src/test" + #:jdk ,icedtea-8 + #:phases + (modify-phases %standard-phases + (add-before 'configure 'chdir + (lambda _ + (chdir "plexus-component-metadata") + #t)) + (add-before 'build 'copy-resources + (lambda _ + (copy-recursively "src/main/resources" + "build/classes/") + #t))))) + (propagated-inputs + `(("java-plexus-container-default" ,java-plexus-container-default) + ("java-plexu-component-annotations" ,java-plexus-component-annotations) + ("java-plexus-utils" ,java-plexus-utils) + ("java-plexus-cli" ,java-plexus-cli) + ("java-plexus-classworlds" ,java-plexus-classworlds) + ("maven-plugin-api" ,maven-plugin-api) + ("maven-plugin-annotations" ,maven-plugin-annotations) + ("maven-core-bootstrap" ,maven-core-bootstrap) + ("maven-model" ,maven-model) + ("java-commons-cli" ,java-commons-cli) + ("java-qdox" ,java-qdox) + ("java-jdom2" ,java-jdom2) + ("java-asm" ,java-asm))) + (native-inputs + `(("java-junit" ,java-junit) + ("java-guava" ,java-guava) + ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect))) + (synopsis "Inversion-of-control container for Maven") + (description "The Plexus project provides a full software stack for creating +and executing software projects. Based on the Plexus container, the +applications can utilise component-oriented programming to build modular, +reusable components that can easily be assembled and reused. This package +provides the Maven plugin generating the component metadata."))) + (define-public java-plexus-cipher (package (name "java-plexus-cipher") diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 78f9751862..dced82977d 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -35,51 +35,6 @@ (define-module (gnu packages maven) #:use-module (gnu packages xml) #:use-module (ice-9 match)) -(define-public java-plexus-component-metadata - (package - (inherit java-plexus-container-default) - (name "java-plexus-component-metadata") - (arguments - `(#:jar-name "plexus-component-metadata.jar" - #:source-dir "src/main/java" - #:test-dir "src/test" - #:jdk ,icedtea-8 - #:phases - (modify-phases %standard-phases - (add-before 'configure 'chdir - (lambda _ - (chdir "plexus-component-metadata") - #t)) - (add-before 'build 'copy-resources - (lambda _ - (copy-recursively "src/main/resources" - "build/classes/") - #t))))) - (propagated-inputs - `(("java-plexus-container-default" ,java-plexus-container-default) - ("java-plexu-component-annotations" ,java-plexus-component-annotations) - ("java-plexus-utils" ,java-plexus-utils) - ("java-plexus-cli" ,java-plexus-cli) - ("java-plexus-classworlds" ,java-plexus-classworlds) - ("maven-plugin-api" ,maven-plugin-api) - ("maven-plugin-annotations" ,maven-plugin-annotations) - ("maven-core-bootstrap" ,maven-core-bootstrap) - ("maven-model" ,maven-model) - ("java-commons-cli" ,java-commons-cli) - ("java-qdox" ,java-qdox) - ("java-jdom2" ,java-jdom2) - ("java-asm" ,java-asm))) - (native-inputs - `(("java-junit" ,java-junit) - ("java-guava" ,java-guava) - ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect))) - (synopsis "Inversion-of-control container for Maven") - (description "The Plexus project provides a full software stack for creating -and executing software projects. Based on the Plexus container, the -applications can utilise component-oriented programming to build modular, -reusable components that can easily be assembled and reused. This package -provides the Maven plugin generating the component metadata."))) - (define-public maven-resolver-api (package (name "maven-resolver-api") @@ -1472,106 +1427,107 @@ (define (modello-single-mode file version mode) A plugin is described in a @file{META-INF/maven/plugin.xml} plugin descriptor, generally generated from plugin sources using maven-plugin-plugin."))) -(define maven-core-bootstrap - (package - (inherit maven-artifact) - (name "maven-core") - (arguments - `(#:jar-name "maven-core.jar" - #:source-dir "src/main/java" - #:jdk ,icedtea-8 - ;; Tests need maven-compat, which requires maven-core - #:tests? #f - #:phases - (modify-phases %standard-phases - (add-before 'configure 'chdir - (lambda _ - ;; Required for generating components.xml in maven-core - (chdir "maven-core") - #t)) - (add-before 'build 'copy-resources - (lambda _ - (mkdir-p "build/classes/") - (copy-recursively "src/main/resources" "build/classes") - #t)) - (add-after 'copy-resources 'fill-properties - (lambda _ - ;; This file controls the output of some mvn subcommands, such as - ;; mvn -version. - (substitute* "build/classes/org/apache/maven/messages/build.properties" - (("\\$\\{buildNumber\\}") "guix_build") - (("\\$\\{timestamp\\}") "0") - (("\\$\\{project.version\\}") ,(package-version maven-artifact)) - (("\\$\\{distributionId\\}") "apache-maven") - (("\\$\\{distributionShortName\\}") "Maven") - (("\\$\\{distributionName\\}") "Apache Maven")) - #t)) - (add-before 'build 'generate-sisu-named - (lambda _ - (mkdir-p "build/classes/META-INF/sisu") - (chmod "../sisu.sh" #o755) - (invoke "../sisu.sh" "src/main/java" - "build/classes/META-INF/sisu/javax.inject.Named") - #t)) - (add-before 'build 'generate-models - (lambda* (#:key inputs #:allow-other-keys) - (define (modello-single-mode file version mode) - (invoke "java" "org.codehaus.modello.ModelloCli" - file mode "src/main/java" version - "false" "true")) - (let ((file "src/main/mdo/toolchains.mdo")) - (modello-single-mode file "1.1.0" "java") - (modello-single-mode file "1.1.0" "xpp3-reader") - (modello-single-mode file "1.1.0" "xpp3-writer")) - #t)) - (add-before 'install 'fix-pom - (lambda _ - (substitute* "pom.xml" - (("no_aop") "")) - #t)) - (replace 'install - (install-from-pom "pom.xml"))))) - (propagated-inputs - `(("maven-artifact" ,maven-artifact) - ("maven-resolver-provider" ,maven-resolver-provider) - ("maven-builder-support" ,maven-builder-support) - ("maven-model" ,maven-model) - ("maven-model-builder" ,maven-model-builder) - ("maven-settings" ,maven-settings) - ("maven-settings-builder" ,maven-settings-builder) - ("maven-plugin-api" ,maven-plugin-api) - ("maven-repository-metadata" ,maven-repository-metadata) - ("maven-shared-utils" ,maven-shared-utils) - ("java-plexus-component-annotations" ,java-plexus-component-annotations) - ("java-plexus-utils" ,java-plexus-utils) - ("java-commons-lang3" ,java-commons-lang3) - ("java-guava" ,java-guava) - ("java-guice" ,java-guice) - ("maven-resolver-api" ,maven-resolver-api) - ("maven-resolver-spi" ,maven-resolver-spi) - ("maven-resolver-util" ,maven-resolver-util) - ("maven-resolver-impl" ,maven-resolver-impl) - ("java-eclipse-sisu-inject" ,java-eclipse-sisu-inject) - ("java-eclipse-sisu-plexus" ,java-eclipse-sisu-plexus) - ("java-javax-inject" ,java-javax-inject) - ("java-plexus-classworld" ,java-plexus-classworlds))) - (native-inputs - `(("java-modello-core" ,java-modello-core) - ("java-cglib" ,java-cglib) - ("java-asm" ,java-asm) - ("java-plexus-classworlds" ,java-plexus-classworlds) - ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect) - ("java-sisu-build-api" ,java-sisu-build-api) - ("java-modello-plugins-java" ,java-modello-plugins-java) - ("java-modello-plugins-xml" ,java-modello-plugins-xml) - ("java-modello-plugins-xpp3" ,java-modello-plugins-xpp3) - ;; tests - ("java-junit" ,java-junit) - ("java-mockito-1" ,java-mockito-1) - ("java-commons-jxpath" ,java-commons-jxpath))) - (description "Apache Maven is a software project management and comprehension +(define-public maven-core-bootstrap + (hidden-package + (package + (inherit maven-artifact) + (name "maven-core") + (arguments + `(#:jar-name "maven-core.jar" + #:source-dir "src/main/java" + #:jdk ,icedtea-8 + ;; Tests need maven-compat, which requires maven-core + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-before 'configure 'chdir + (lambda _ + ;; Required for generating components.xml in maven-core + (chdir "maven-core") + #t)) + (add-before 'build 'copy-resources + (lambda _ + (mkdir-p "build/classes/") + (copy-recursively "src/main/resources" "build/classes") + #t)) + (add-after 'copy-resources 'fill-properties + (lambda _ + ;; This file controls the output of some mvn subcommands, such as + ;; mvn -version. + (substitute* "build/classes/org/apache/maven/messages/build.properties" + (("\\$\\{buildNumber\\}") "guix_build") + (("\\$\\{timestamp\\}") "0") + (("\\$\\{project.version\\}") ,(package-version maven-artifact)) + (("\\$\\{distributionId\\}") "apache-maven") + (("\\$\\{distributionShortName\\}") "Maven") + (("\\$\\{distributionName\\}") "Apache Maven")) + #t)) + (add-before 'build 'generate-sisu-named + (lambda _ + (mkdir-p "build/classes/META-INF/sisu") + (chmod "../sisu.sh" #o755) + (invoke "../sisu.sh" "src/main/java" + "build/classes/META-INF/sisu/javax.inject.Named") + #t)) + (add-before 'build 'generate-models + (lambda* (#:key inputs #:allow-other-keys) + (define (modello-single-mode file version mode) + (invoke "java" "org.codehaus.modello.ModelloCli" + file mode "src/main/java" version + "false" "true")) + (let ((file "src/main/mdo/toolchains.mdo")) + (modello-single-mode file "1.1.0" "java") + (modello-single-mode file "1.1.0" "xpp3-reader") + (modello-single-mode file "1.1.0" "xpp3-writer")) + #t)) + (add-before 'install 'fix-pom + (lambda _ + (substitute* "pom.xml" + (("no_aop") "")) + #t)) + (replace 'install + (install-from-pom "pom.xml"))))) + (propagated-inputs + `(("maven-artifact" ,maven-artifact) + ("maven-resolver-provider" ,maven-resolver-provider) + ("maven-builder-support" ,maven-builder-support) + ("maven-model" ,maven-model) + ("maven-model-builder" ,maven-model-builder) + ("maven-settings" ,maven-settings) + ("maven-settings-builder" ,maven-settings-builder) + ("maven-plugin-api" ,maven-plugin-api) + ("maven-repository-metadata" ,maven-repository-metadata) + ("maven-shared-utils" ,maven-shared-utils) + ("java-plexus-component-annotations" ,java-plexus-component-annotations) + ("java-plexus-utils" ,java-plexus-utils) + ("java-commons-lang3" ,java-commons-lang3) + ("java-guava" ,java-guava) + ("java-guice" ,java-guice) + ("maven-resolver-api" ,maven-resolver-api) + ("maven-resolver-spi" ,maven-resolver-spi) + ("maven-resolver-util" ,maven-resolver-util) + ("maven-resolver-impl" ,maven-resolver-impl) + ("java-eclipse-sisu-inject" ,java-eclipse-sisu-inject) + ("java-eclipse-sisu-plexus" ,java-eclipse-sisu-plexus) + ("java-javax-inject" ,java-javax-inject) + ("java-plexus-classworld" ,java-plexus-classworlds))) + (native-inputs + `(("java-modello-core" ,java-modello-core) + ("java-cglib" ,java-cglib) + ("java-asm" ,java-asm) + ("java-plexus-classworlds" ,java-plexus-classworlds) + ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect) + ("java-sisu-build-api" ,java-sisu-build-api) + ("java-modello-plugins-java" ,java-modello-plugins-java) + ("java-modello-plugins-xml" ,java-modello-plugins-xml) + ("java-modello-plugins-xpp3" ,java-modello-plugins-xpp3) + ;; tests + ("java-junit" ,java-junit) + ("java-mockito-1" ,java-mockito-1) + ("java-commons-jxpath" ,java-commons-jxpath))) + (description "Apache Maven is a software project management and comprehension tool. This package contains the maven core classes managing the whole build -process."))) +process.")))) (define-public maven-core (package -- cgit v1.2.3 From 8630a0809966a86213c132fbedad5268047757d0 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 20:35:38 +0200 Subject: gnu: add java-plexus-java. * gnu/packages/java.scm (java-plexus-java): New variable. --- gnu/packages/java.scm | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 4e62993e03..2eceff19ae 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -4369,6 +4369,62 @@ (define-public java-plexus-cipher and decryption.") (license license:asl2.0))) +(define-public java-plexus-java + (package + (name "java-plexus-java") + (version "0.9.10") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/codehaus-plexus/plexus-languages") + (commit (string-append "plexus-languages-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0vmvgq5hfxs90yyxgssfpwq78l7vwx1ljwpkk594mrdr8sm668b5")) + (modules '((guix build utils))) + (snippet + `(begin + (for-each delete-file (find-files "." ".*.jar$")) + #t)))) + (build-system ant-build-system) + (arguments + `(#:jar-name "plexus-java.java" + #:source-dir "plexus-java/src/main/java" + #:test-dir "plexus-java/src/test" + #:tests? #f; require mockito 2 + #:phases + (modify-phases %standard-phases + (add-after 'build 'generate-metadata + (lambda _ + (invoke "java" "-cp" (string-append (getenv "CLASSPATH") ":build/classes") + "org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli" + "--source" "plexus-java/src/main/java" + "--output" "build/classes/META-INF/plexus/components.xml" + "--classes" "build/classes" + "--descriptors" "build/classes/META-INF") + (invoke "ant" "jar") + #t)) + (add-before 'install 'install-parent + (install-pom-file "pom.xml")) + (replace 'install + (install-from-pom "plexus-java/pom.xml"))))) + (propagated-inputs + `(("java-asm" ,java-asm) + ("java-qdox" ,java-qdox-2-M9) + ("java-javax-inject" ,java-javax-inject) + ("plexus-parent-pom" ,plexus-parent-pom-4.0))) + (inputs + `(("java-plexus-component-annotations" ,java-plexus-component-annotations))) + (native-inputs + `(("java-plexus-component-metadata" ,java-plexus-component-metadata) + ("java-junit" ,java-junit))) + (home-page "https://codehaus-plexus.github.io/plexus-languages/plexus-java") + (synopsis "Shared language features for Java") + (description "This package contains shared language features of the Java +language, for the plexus project.") + (license license:asl2.0))) + (define-public java-plexus-compiler-api (package (name "java-plexus-compiler-api") -- cgit v1.2.3 From 90a1d04cc12e58af8c4b933490dd3587771f0e0e Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 20:46:19 +0200 Subject: gnu: Add java-plexus-compiler-manager. * gnu/packages/java.scm (java-plexus-compiler-manager): New variable. (java-plexus-compiler-api, java-plexus-compiler-javac): Install from pom file. (java-plexus-compiler-javac): Install plexus components file. --- gnu/packages/java.scm | 128 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 121 insertions(+), 7 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 2eceff19ae..bc650968e0 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -4442,10 +4442,14 @@ (define-public java-plexus-compiler-api (arguments `(#:jar-name "plexus-compiler-api.jar" #:source-dir "plexus-compiler-api/src/main/java" - #:jdk ,icedtea-8 - #:test-dir "plexus-compiler-api/src/test")) - (inputs + #:test-dir "plexus-compiler-api/src/test" + #:phases + (modify-phases %standard-phases + (replace 'install + (install-from-pom "plexus-compiler-api/pom.xml"))))) + (propagated-inputs `(("java-plexus-container-default" ,java-plexus-container-default) + ("java-plexus-compiler-pom" ,java-plexus-compiler-pom) ("java-plexus-util" ,java-plexus-utils))) (native-inputs `(("java-junit" ,java-junit))) @@ -4456,6 +4460,91 @@ (define-public java-plexus-compiler-api (license (list license:asl2.0 license:expat)))) +(define java-plexus-compiler-pom + (package + (inherit java-plexus-compiler-api) + (name "java-plexus-compiler-pom") + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (replace 'install + (install-pom-file "pom.xml")) + (add-after 'install 'install-compilers + (install-pom-file "plexus-compilers/pom.xml"))))) + (propagated-inputs + `(("plexus-components-parent-pom-4.0" ,plexus-components-parent-pom-4.0))))) + +(define plexus-components-parent-pom-4.0 + (package + (name "plexus-components-parent-pom") + (version "4.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/codehaus-plexus/plexus-components") + (commit (string-append "plexus-components-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "041bm8yv0m2i17mqg8zljib4ykpha7ijls2qfdwvkma4d39lhysi")))) + (build-system ant-build-system) + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (replace 'install + (install-pom-file "pom.xml"))))) + (propagated-inputs + `(("plexus-parent-pom-4.0" ,plexus-parent-pom-4.0))) + (home-page "https://codehaus-plexus.github.io/plexus-components") + (synopsis "Plexus parent pom") + (description "This package contains the Plexus components parent POM.") + (license license:asl2.0))) + +(define-public java-plexus-compiler-manager + (package + (inherit java-plexus-compiler-api) + (name "java-plexus-compiler-manager") + (arguments + `(#:jar-name "compiler-compiler-manager.java" + #:source-dir "plexus-compiler-manager/src/main/java" + #:test-dir "plexus-compiler-manager/src/test" + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'build 'generate-metadata + (lambda _ + (invoke "java" "-cp" (string-append (getenv "CLASSPATH") ":build/classes") + "org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli" + "--source" "plexus-compiler-manager/src/main/java" + "--output" "build/classes/META-INF/plexus/components.xml" + "--classes" "build/classes" + "--descriptors" "build/classes/META-INF") + (invoke "ant" "jar") + #t)) + (add-after 'generate-metadata 'rebuild + (lambda _ + (invoke "ant" "jar") + #t)) + (replace 'install + (install-from-pom "plexus-compiler-manager/pom.xml"))))) + (propagated-inputs + `(("java-plexus-compiler-api" ,java-plexus-compiler-api) + ("java-plexus-compiler-pom" ,java-plexus-compiler-pom) + ("java-plexus-container-default" ,java-plexus-container-default))) + (native-inputs + `(("unzip" ,unzip) + ("java-plexus-component-metadata" ,java-plexus-component-metadata))) + (synopsis "Compiler management for Plexus Compiler component") + (description "Plexus Compiler is a Plexus component to use different +compilers through a uniform API. This component chooses the compiler +implementation to use in a project."))) + (define-public java-plexus-compiler-javac (package (inherit java-plexus-compiler-api) @@ -4465,13 +4554,38 @@ (define-public java-plexus-compiler-javac #:source-dir "plexus-compilers/plexus-compiler-javac/src/main/java" #:jdk ,icedtea-8 #:tests? #f; depends on compiler-test -> maven-core -> ... -> this package. - #:test-dir "plexus-compilers/plexus-compiler-javac/src/test")) - (inputs + #:test-dir "plexus-compilers/plexus-compiler-javac/src/test" + #:modules ((guix build ant-build-system) + (guix build utils) + (guix build java-utils) + (sxml simple)) + #:phases + (modify-phases %standard-phases + ;; We cannot use java-plexus-component-metadata to generate the metadata + ;; because it ultimately depends on this package. + ;; Create it manually instead + (add-before 'build 'create-metadata + (lambda _ + (let* ((dir "build/classes/META-INF/plexus") + (file (string-append dir "/components.xml"))) + (mkdir-p dir) + (with-output-to-file file + (lambda _ + (sxml->xml + `(component-set + (components + (component + (role "org.codehaus.plexus.compiler.Compiler") + (role-hint "javac") + (implementation "org.codehaus.plexus.compiler.javac.JavacCompiler") + (isolated-realm "false")))))))) + #t)) + (replace 'install + (install-from-pom "plexus-compilers/plexus-compiler-javac/pom.xml"))))) + (propagated-inputs `(("java-plexus-compiler-api" ,java-plexus-compiler-api) ("java-plexus-utils" ,java-plexus-utils) ("java-plexus-container-default" ,java-plexus-container-default))) - (native-inputs - `(("java-junit" ,java-junit))) (synopsis "Javac Compiler support for Plexus Compiler component") (description "This package contains the Javac Compiler support for Plexus Compiler component."))) -- cgit v1.2.3 From c45e7ee688cb48d7742b5093745a9cf811d110bf Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 20:58:23 +0200 Subject: gnu: Add maven-shared-incremental. * gnu/packages/maven.scm (maven-shared-incremental): New variable. --- gnu/packages/maven.scm | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index dced82977d..f00e29e0e2 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -2979,3 +2979,58 @@ (define-public maven-resources-plugin Thus, this allows the separation of resources for the main source code and its unit tests.") (license license:asl2.0))) + +(define-public maven-shared-incremental + (package + (name "maven-shared-incremental") + (version "1.1") + (source (origin + (method url-fetch) + (uri (string-append "https://archive.apache.org/dist/maven/shared/" + "maven-shared-incremental-" version + "-source-release.zip")) + (sha256 + (base32 + "03n4nfswyg9ahkz2zx4skcr3ghs01zh95g9js51hc75mfqx9b976")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "shared-incremental.java" + #:source-dir "src/main/java" + #:test-dir "src/test" + #:phases + (modify-phases %standard-phases + (add-before 'build 'change-parent + (lambda _ + (substitute* "pom.xml" + (("19") "30")) + #t)) + (add-before 'build 'fix-pom + (lambda _ + (substitute* "pom.xml" + (("plexus-component-api") "plexus-component-annotations")) + #t)) + (add-after 'build 'generate-metadata + (lambda _ + (invoke "java" "-cp" (string-append (getenv "CLASSPATH") ":build/classes") + "org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli" + "--source" "src/main/java" + "--output" "build/classes/META-INF/plexus/components.xml" + "--classes" "build/classes" + "--descriptors" "build/classes/META-INF") + #t)) + (replace 'install + (install-from-pom "pom.xml"))))) + (propagated-inputs + `(("maven-plugin-api" ,maven-plugin-api) + ("maven-core" ,maven-core) + ("maven-shared-utils" ,maven-shared-utils) + ("java-plexus-component-annotations" ,java-plexus-component-annotations) + ("maven-parent-pom" ,maven-parent-pom-30))) + (native-inputs + `(("unzip" ,unzip) + ("java-plexus-component-metadata" ,java-plexus-component-metadata))) + (home-page "https://maven.apache.org/shared/maven-shared-incremental") + (synopsis "Maven Incremental Build support utilities") + (description "This package contains various utility classes and plexus +components for supporting incremental build functionality in maven plugins.") + (license license:asl2.0))) -- cgit v1.2.3 From dd607254efe1e73fefd1f7593af5f52f6e803c9e Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 23:08:25 +0200 Subject: gnu: Add maven-compiler-plugin. * gnu/packages/maven.scm (maven-compiler-plugin): New variable. --- gnu/packages/maven.scm | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index f00e29e0e2..cd2213b31f 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -3034,3 +3034,71 @@ (define-public maven-shared-incremental (description "This package contains various utility classes and plexus components for supporting incremental build functionality in maven plugins.") (license license:asl2.0))) + +(define-public maven-compiler-plugin + (package + (name "maven-compiler-plugin") + (version "3.8.1") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/apache/" + "maven-compiler-plugin/archive/" + "maven-compiler-plugin-" version ".tar.gz")) + (sha256 + (base32 + "018d9qwc4cd6k7a8kvhvxjmzbzd2ifdf7m36wqjfq42010js1mv1")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "maven-compiler-plugin.jar" + #:source-dir "src/main/java" + #:test-dir "src/test" + #:tests? #f; test depends on maven-plugin-test-harness + #:phases + (modify-phases %standard-phases + (add-before 'build 'generate-plugin.xml + (generate-plugin.xml "pom.xml" + "compiler" + "src/main/java/org/apache/maven/plugin/compiler" + (list + (list "AbstractCompilerMojo.java" "CompilerMojo.java") + (list "AbstractCompilerMojo.java" "TestCompilerMojo.java")))) + (add-after 'generate-plugin.xml 'fix-plugin.xml + (lambda _ + (substitute* "build/classes/META-INF/maven/plugin.xml" + ;; These are defined in AbstractCompilerMojo.java, but not + ;; parsed correctly in the previous phase + (("DEFAULT_TARGET") "1.6") + (("DEFAULT_SOURCE") "1.6")) + #t)) + (replace 'install + (install-from-pom "pom.xml"))))) + (propagated-inputs + `(("maven-plugin-api" ,maven-plugin-api) + ("maven-artifact" ,maven-artifact) + ("maven-core" ,maven-core) + ("maven-shared-utils" ,maven-shared-utils) + ("maven-shared-incremental" ,maven-shared-incremental) + ("java-plexus-java" ,java-plexus-java) + ("java-plexus-compiler-api" ,java-plexus-compiler-api) + ("java-plexus-compiler-manager" ,java-plexus-compiler-manager) + ("java-plexus-compiler-javac" ,java-plexus-compiler-javac) + ("maven-parent-pom" ,maven-parent-pom-33))) + (inputs + `(("maven-plugin-annotations" ,maven-plugin-annotations) + ("java-commons-io" ,java-commons-io))) + (home-page "https://maven.apache.org/plugins/maven-compiler-plugin") + (synopsis "Compiler plugin for Maven") + (description "The Compiler Plugin is used to compile the sources of your +project. Since 3.0, the default compiler is @code{javax.tools.JavaCompiler} +(if you are using java 1.6) and is used to compile Java sources. If you want +to force the plugin using javac, you must configure the plugin option +@code{forceJavacCompilerUse}. + +Also note that at present the default source setting is 1.6 and the default +target setting is 1.6, independently of the JDK you run Maven with. You are +highly encouraged to change these defaults by setting source and target as +described in Setting the -source and -target of the Java Compiler. + +Other compilers than javac can be used and work has already started on +AspectJ, .NET, and C#.") + (license license:asl2.0))) -- cgit v1.2.3 From 2a08d8ffd0f4ee2e930e700a4348eb453711f0ee Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 23:15:24 +0200 Subject: gnu: Add java-surefire-logger-api. * gnu/packages/maven.scm (java-surefire-logger-api): New variable. --- gnu/packages/maven.scm | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index cd2213b31f..e98968f74f 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -3102,3 +3102,74 @@ (define-public maven-compiler-plugin Other compilers than javac can be used and work has already started on AspectJ, .NET, and C#.") (license license:asl2.0))) + +(define-public java-surefire-logger-api + (package + (name "java-surefire-logger-api") + (version "3.0.0-M4") + (source (origin + (method url-fetch) + (uri (string-append "mirror://apache/maven/surefire/" + "surefire-" version "-source-release.zip")) + (sha256 + (base32 + "1s6d4pzk3bjm9l38mj9sfgbgmk145rppdj1dmqwc4d5105mr9q9w")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "java-surefire-logger-api.jar" + #:source-dir "surefire-logger-api/src/main/java" + #:tests? #f; require mockito 2 + #:phases + (modify-phases %standard-phases + (replace 'install + (install-from-pom "surefire-logger-api/pom.xml"))))) + (propagated-inputs + `(("java-surefire-parent-pom" ,java-surefire-parent-pom))) + (native-inputs + `(("unzip" ,unzip))) + (home-page "https://maven.apache.org/surefire/surefire-logger-api") + (synopsis "Interfaces and Utilities related only to internal SureFire Logger API") + (description "This package contains interfaces and utilities that are +internal to the SureFire Logger API. It is designed to have no dependency.") + (license license:asl2.0))) + +(define-public java-surefire-parent-pom + (package + (inherit java-surefire-logger-api) + (name "java-surefire-parent-pom") + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (add-before 'install 'fix-pom-dependency-versions + (lambda _ + (substitute* "pom.xml" + (("1.11") ,(package-version java-commons-compress)) + (("1.13") ,(package-version java-commons-codec))) + (substitute* "pom.xml" + (("commonsLang3Version>.*") + (string-append + "commonsLang3Version>" + ,(package-version java-commons-lang3) + "\n")) + (("commonsCompress>.*") + (string-append + "commonsCompress>" + ,(package-version java-commons-compress) + "\n")) + (("commonsIoVersion>.*") + (string-append + "commonsIoVersion>" + ,(package-version java-commons-io) + "\n")) + (("0.11.0") ,(package-version maven-artifact-transfer)) + (("1.0.3") ,(package-version java-plexus-java))) + #t)) + (add-after 'install 'install-providers + (install-pom-file "surefire-providers/pom.xml")) + (replace 'install + (install-pom-file "pom.xml"))))) + (propagated-inputs + `(("maven-parent-pom" ,maven-parent-pom-33))))) -- cgit v1.2.3 From ef61b4a1be93edad37fdac2c89aa7c7d99ecb630 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 23:21:47 +0200 Subject: gnu: Add maven-shared-utils-3.1. * gnu/packages/maven.scm (maven-shared-utils-3.1): New variable. --- gnu/packages/maven.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index e98968f74f..1aa4eecb63 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -2406,6 +2406,18 @@ (define-public maven-shared-utils-3.0 ("maven-components-parent-pom" ,maven-components-parent-pom-21) ,@(package-propagated-inputs maven-shared-utils))))) +(define-public maven-shared-utils-3.1 + (package + (inherit maven-shared-utils) + (version "3.1.0") + (source (origin + (method url-fetch) + (uri (string-append "https://archive.apache.org/dist/maven/shared/" + "maven-shared-utils-" version "-source-release.zip")) + (sha256 + (base32 + "0vfaas4g09ch0agrd1dcxcmhdd3w971ssvfr9mx9gi2lp5nv8w66")))))) + (define-public maven-shared-io (package (name "maven-shared-io") -- cgit v1.2.3 From ac8179a05ca76bbbf620d201f4e7428a92746f96 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 23:19:32 +0200 Subject: gnu: Add java-surefire-api. * gnu/packages/maven.scm (java-surefire-api): New variable. --- gnu/packages/maven.scm | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 1aa4eecb63..f2668cd1a2 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -3185,3 +3185,69 @@ (define-public java-surefire-parent-pom (install-pom-file "pom.xml"))))) (propagated-inputs `(("maven-parent-pom" ,maven-parent-pom-33))))) + +(define-public java-surefire-api + (package + (inherit java-surefire-logger-api) + (name "java-surefire-api") + (arguments + `(#:tests? #f + #:jar-name "java-surefire-api.jar" + #:source-dir "surefire-api/src/main/java" + #:phases + (modify-phases %standard-phases + (add-before 'build 'copy-resources + (lambda _ + (mkdir-p "build/classes") + (copy-recursively "surefire-api/src/main/resources" "build/classes") + #t)) + (add-before 'build 'prepare-shade + (lambda* (#:key inputs #:allow-other-keys) + (mkdir-p "build/classes") + (with-directory-excursion "build/classes" + (for-each + (lambda (input) + (for-each + (lambda (jar-file) + (invoke "jar" "xf" jar-file) + (delete-file-recursively "META-INF")) + (find-files (assoc-ref inputs input) ".*.jar$"))) + '("maven-shared-utils" "java-commons-codec"))) + #t)) + (add-after 'build 'shade + (lambda* (#:key inputs #:allow-other-keys) + (let ((jarjar + (car (find-files (assoc-ref inputs "java-jarjar") ".*.jar$"))) + (injar "java-surefire-api.jar") + (outjar "java-surefire-api-shaded.jar")) + (with-directory-excursion "build/jar" + (with-output-to-file "rules" + (lambda _ + (format #t (string-append + "rule " + "org.apache.maven.shared.utils.** " + "org.apache.maven.surefire.shade.api." + "org.apache.maven.shared.utils.@1~%")) + (format #t (string-append + "rule " + "org.apache.commons.codec.** " + "org.apache.maven.surefire.shade.api." + "org.apache.commons.codec.@1~%")))) + (invoke "java" "-jar" jarjar "process" "rules" injar outjar) + (delete-file injar) + (rename-file outjar injar))) + #t)) + (replace 'install + (install-from-pom "surefire-api/pom.xml"))))) + (propagated-inputs + `(("java-surefire-logger-api" ,java-surefire-logger-api) + ("java-commons-codec" ,java-commons-codec) + ("java-surefire-parent-pom" ,java-surefire-parent-pom) + ("maven-shared-utils" ,maven-shared-utils-3.1))) + (inputs + `(("java-jsr305" ,java-jsr305))) + (native-inputs + `(("unzip" ,unzip) + ("java-jarjar" ,java-jarjar))) + (synopsis "Maven SureFire API") + (description "This package contains the API to use Maven SureFire."))) -- cgit v1.2.3 From bf2769c23f25b7e708e2ac17f1e90c4506a2a5e7 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 23:26:31 +0200 Subject: gnu: Add java-surefire-booter. * gnu/packages/maven.scm (java-surefire-booter): New variable. --- gnu/packages/maven.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index f2668cd1a2..4aa7f25d05 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -3251,3 +3251,31 @@ (define-public java-surefire-api ("java-jarjar" ,java-jarjar))) (synopsis "Maven SureFire API") (description "This package contains the API to use Maven SureFire."))) + +(define-public java-surefire-booter + (package + (inherit java-surefire-logger-api) + (name "java-surefire-booter") + (arguments + `(#:tests? #f; require mockito 2 + #:jar-name "java-surefire-booter.jar" + #:source-dir "surefire-booter/src/main/java" + #:phases + (modify-phases %standard-phases + (add-before 'build 'fix-/bin/sh + (lambda _ + (substitute* "surefire-booter/src/main/java/org/apache/maven/surefire/booter/PpidChecker.java" + (("/bin/sh") (which "sh"))) + #t)) + (replace 'install + (install-from-pom "surefire-booter/pom.xml"))))) + (propagated-inputs + `(("java-surefire-api" ,java-surefire-api) + ("java-commons-lang3" ,java-commons-lang3) + ("java-commons-io" ,java-commons-io) + ("java-surefire-parent-pom" ,java-surefire-parent-pom))) + (inputs + `(("java-jsr305" ,java-jsr305))) + (synopsis "API and Facilities used by forked tests running in JVM sub-process") + (description "SureFire runs tests inside a forked JVM subprocess. This +package contains an API and facilities used inside that forked JVM."))) -- cgit v1.2.3 From 15725d9a78b0f18f9768e1eb76922df8c2be11a2 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 23:28:46 +0200 Subject: gnu: Add java-surefire-extensions-api. * gnu/packages/maven.scm (java-surefire-extensions-api): New variable. --- gnu/packages/maven.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 4aa7f25d05..38fb2a171e 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -3279,3 +3279,24 @@ (define-public java-surefire-booter (synopsis "API and Facilities used by forked tests running in JVM sub-process") (description "SureFire runs tests inside a forked JVM subprocess. This package contains an API and facilities used inside that forked JVM."))) + +(define-public java-surefire-extensions-api + (package + (inherit java-surefire-logger-api) + (name "java-surefire-extensions-api") + (arguments + `(#:tests? #f; requires mockito 2 + #:jar-name "java-surefire-extensions-api.jar" + #:source-dir "surefire-extensions-api/src/main/java" + #:phases + (modify-phases %standard-phases + (replace 'install + (install-from-pom "surefire-extensions-api/pom.xml"))))) + (propagated-inputs + `(("java-surefire-api" ,java-surefire-api) + ("java-surefire-parent-pom" ,java-surefire-parent-pom))) + (inputs + `(("java-plexus-component-annotations" ,java-plexus-component-annotations))) + (synopsis "Extension API for Maven SureFire") + (description "Surefire is a test framework project. This is the aggregator +POM in Apache Maven Surefire project."))) -- cgit v1.2.3 From fd090644b3e6e94c34b86216839e75743fbf49b8 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 23:31:45 +0200 Subject: gnu: Add java-surefire-common-java5. * gnu/packages/maven.scm (java-surefire-common-java5): New variable. --- gnu/packages/maven.scm | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 38fb2a171e..0aa5e550e8 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -3300,3 +3300,60 @@ (define-public java-surefire-extensions-api (synopsis "Extension API for Maven SureFire") (description "Surefire is a test framework project. This is the aggregator POM in Apache Maven Surefire project."))) + +(define-public java-surefire-common-java5 + (package + (inherit java-surefire-logger-api) + (name "java-surefire-common-java5") + (arguments + `(#:jar-name "java-surefire-common-java5.jar" + #:source-dir "surefire-providers/common-java5/src/main/java" + #:test-dir "surefire-providers/common-java5/src/test" + #:test-exclude (list + ;; Abstract class + "**/PojoStackTraceWriterTest.java" + ;; Fails + "**/SmartStackTraceParserTest.java") + #:phases + (modify-phases %standard-phases + (add-before 'build 'prepare-shade + (lambda* (#:key inputs #:allow-other-keys) + (mkdir-p "build/classes") + (with-directory-excursion "build/classes" + (for-each + (lambda (jar-file) + (invoke "jar" "xf" jar-file) + (delete-file-recursively "META-INF")) + (find-files (assoc-ref inputs "maven-shared-utils") ".*.jar$"))) + #t)) + (add-after 'build 'shade + (lambda* (#:key inputs #:allow-other-keys) + (let ((jarjar + (car (find-files (assoc-ref inputs "java-jarjar") ".*.jar$"))) + (injar "java-surefire-common-java5.jar") + (outjar "java-surefire-common-java5-shaded.jar")) + (with-directory-excursion "build/jar" + (with-output-to-file "rules" + (lambda _ + (format #t (string-append + "rule " + "org.apache.maven.shared.utils.** " + "org.apache.maven.surefire.shade.common." + "org.apache.maven.shared.utils.@1~%")))) + (invoke "java" "-jar" jarjar "process" "rules" injar outjar) + (delete-file injar) + (rename-file outjar injar))) + #t)) + (replace 'install + (install-from-pom "surefire-providers/common-java5/pom.xml"))))) + (propagated-inputs + `(("maven-shared-utils" ,maven-shared-utils-3.1) + ("java-surefire-api" ,java-surefire-api) + ("java-surefire-parent-pom" ,java-surefire-parent-pom))) + (native-inputs + `(("unzip" ,unzip) + ("java-jarjar" ,java-jarjar) + ("java-junit" ,java-junit) + ("java-fest-assert" ,java-fest-assert))) + (synopsis "Common java5 facilities for Maven SureFire") + (description "This package contains shared Java 5 code for all providers."))) -- cgit v1.2.3 From 72ce48788d08c272362534125810c4c76ad0553a Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 23:38:38 +0200 Subject: gnu: Add java-surefire-common-junit3. * gnu/packages/maven.scm (java-surefire-common-junit3): New variable. --- gnu/packages/maven.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 0aa5e550e8..40e21c5f25 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -3357,3 +3357,26 @@ (define-public java-surefire-common-java5 ("java-fest-assert" ,java-fest-assert))) (synopsis "Common java5 facilities for Maven SureFire") (description "This package contains shared Java 5 code for all providers."))) + +(define-public java-surefire-common-junit3 + (package + (inherit java-surefire-logger-api) + (name "java-surefire-common-junit3") + (arguments + `(#:jar-name "java-surefire-common-junit3.jar" + #:source-dir "surefire-providers/common-junit3/src/main/java" + #:test-dir "surefire-providers/common-junit3/src/test" + #:phases + (modify-phases %standard-phases + (replace 'install + (install-from-pom "surefire-providers/common-junit3/pom.xml"))))) + (propagated-inputs + `(("java-junit" ,java-junit) + ("java-surefire-api" ,java-surefire-api) + ("java-surefire-parent-pom" ,java-surefire-parent-pom))) + (native-inputs + `(("unzip" ,unzip) + ("java-junit" ,java-junit) + ("java-fest-assert" ,java-fest-assert))) + (synopsis "Shared JUnit3 provider code for Maven SureFire") + (description "This package contains shared code for all JUnit providers."))) -- cgit v1.2.3 From 586db0f9c52adc64ffce89098bf5cdb07580574c Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 23:41:34 +0200 Subject: gnu: Add java-surefire-common-junit4. * gnu/packages/maven.scm (java-surefire-common-junit4): New variable. --- gnu/packages/maven.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 40e21c5f25..87a3385b09 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -3380,3 +3380,26 @@ (define-public java-surefire-common-junit3 ("java-fest-assert" ,java-fest-assert))) (synopsis "Shared JUnit3 provider code for Maven SureFire") (description "This package contains shared code for all JUnit providers."))) + +(define-public java-surefire-common-junit4 + (package + (inherit java-surefire-logger-api) + (name "java-surefire-common-junit4") + (arguments + `(#:jar-name "java-surefire-common-junit4.jar" + #:source-dir "surefire-providers/common-junit4/src/main/java" + #:tests? #f; tests require junit 4.0 + #:phases + (modify-phases %standard-phases + (replace 'install + (install-from-pom "surefire-providers/common-junit4/pom.xml"))))) + (propagated-inputs + `(("java-junit" ,java-junit) + ("java-surefire-api" ,java-surefire-api) + ("java-surefire-common-java5" ,java-surefire-common-java5) + ("java-surefire-common-junit3" ,java-surefire-common-junit3) + ("maven-shared-utils" ,maven-shared-utils-3.1) + ("java-surefire-parent-pom" ,java-surefire-parent-pom))) + (synopsis "Shared JUnit4 provider code for Maven SureFire") + (description "This package contains shared code for all JUnit providers, +starting from JUnit 4."))) -- cgit v1.2.3 From e1ee5a75f3017315bb82f38b068bd4c003464b64 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 23:45:57 +0200 Subject: gnu: Add java-surefire-junit4. * gnu/packages/maven.scm (java-surefire-junit4): New variable. --- gnu/packages/maven.scm | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 87a3385b09..cbeda43b72 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -3403,3 +3403,95 @@ (define-public java-surefire-common-junit4 (synopsis "Shared JUnit4 provider code for Maven SureFire") (description "This package contains shared code for all JUnit providers, starting from JUnit 4."))) + +(define-public java-surefire-junit4 + (package + (inherit java-surefire-logger-api) + (name "java-surefire-junit4") + (arguments + `(;#:tests? #f + #:jar-name "java-surefire-junit4.jar" + #:source-dir "surefire-providers/surefire-junit4/src/main/java" + #:test-dir "surefire-providers/surefire-junit4/src/test" + #:modules ((guix build ant-build-system) + (guix build utils) + (guix build java-utils) + (sxml simple)) + #:phases + (modify-phases %standard-phases + (add-before 'install 'regenerate-own-pom + (lambda _ + ;; Surefire struggles resolving artifacts because of this pom + ;; file, resulting in a NullPointerException when collecting + ;; Artifacts (and a "Failure detected." message from + ;; DefaultArtifactResolver). Replace the pom file with a much + ;; simpler one. Everything is shaded anyway (as used to be the + ;; case in 2.22), so there will not be missing dependencies. + (with-output-to-file "surefire-providers/surefire-junit4/pom.xml" + (lambda _ + (sxml->xml + `((project + (modelVersion "4.0.0") + (name "Surefire JUnit4") + (groupId "org.apache.maven.surefire") + (artifactId "surefire-junit4") + (version ,,(package-version java-surefire-common-java5))))))) + #t)) + (add-before 'build 'copy-resources + (lambda _ + (mkdir-p "build/classes") + (copy-recursively "surefire-providers/surefire-junit4/src/main/resources" + "build/classes") + #t)) + (add-before 'build 'prepare-shade + (lambda* (#:key inputs #:allow-other-keys) + (mkdir-p "build/classes") + (with-directory-excursion "build/classes" + (for-each + (lambda (input) + (for-each + (lambda (jar-file) + (invoke "jar" "xf" jar-file) + (delete-file-recursively "META-INF")) + (find-files (assoc-ref inputs input) ".*.jar$"))) + '("maven-shared-utils" "java-surefire-common-java5" + "java-surefire-common-junit3" "java-surefire-common-junit4" + "java-surefire-api"))) + #t)) + (add-after 'build 'shade + (lambda* (#:key inputs #:allow-other-keys) + (let ((jarjar + (car (find-files (assoc-ref inputs "java-jarjar") ".*.jar$"))) + (injar "java-surefire-junit4.jar") + (outjar "java-surefire-junit4-shaded.jar")) + (with-directory-excursion "build/jar" + (with-output-to-file "rules" + (lambda _ + (format #t (string-append + "rule " + "org.apache.maven.shared.utils.** " + "org.apache.maven.surefire.shade." + "org.apache.maven.shared.utils.@1~%")))) + (invoke "java" "-jar" jarjar "process" "rules" injar outjar) + (delete-file injar) + (rename-file outjar injar))) + #t)) + (replace 'install + (install-from-pom "surefire-providers/surefire-junit4/pom.xml"))))) + (propagated-inputs + `(("java-junit" ,java-junit) + ("java-surefire-parent-pom" ,java-surefire-parent-pom))) + (inputs + `(("java-surefire-common-junit4" ,java-surefire-common-junit4) + ("java-surefire-common-junit3" ,java-surefire-common-junit3) + ("java-surefire-common-java5" ,java-surefire-common-java5) + ("java-surefire-api" ,java-surefire-api))) + (native-inputs + `(("java-jarjar" ,java-jarjar) + ("unzip" ,unzip) + ("java-junit" ,java-junit) + ("java-hamcrest-all" ,java-hamcrest-all) + ("java-fest-assert" ,java-fest-assert))) + (synopsis "SureFire JUnit 4.0+ runner") + (description "This package contains the runner for tests run on a forked +JVM, using JUnit 4.0 or later."))) -- cgit v1.2.3 From b777e194376ec5ace990789e92251f89983da3e6 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Jun 2020 23:58:07 +0200 Subject: gnu: Add maven-surefire-common. * gnu/packages/maven.scm (maven-surefire-common): New variable. * gnu/packages/java.scm (java-hawtjni, java-jansi-native, java-jansi): Install from pom file. --- gnu/packages/java.scm | 39 +++++++++++++++++++--- gnu/packages/maven.scm | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 122 insertions(+), 5 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index bc650968e0..f7d8c8c696 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -11079,7 +11079,11 @@ (define-public java-hawtjni (with-directory-excursion "hawtjni-generator/src/main/resources/" (install-file "libhawtjni.so" lib) (install-file "hawtjni.h" inc))) - #t))))) + #t)) + (add-before 'install 'install-parent + (install-pom-file "pom.xml")) + (replace 'install + (install-from-pom "hawtjni-runtime/pom.xml"))))) (inputs `(("java-commons-cli" ,java-commons-cli) ("java-asm" ,java-asm) @@ -11138,8 +11142,16 @@ (define-public java-jansi-native (lambda* (#:key outputs #:allow-other-keys) (install-file "src/main/native-package/src/jansi.h" (string-append (assoc-ref outputs "out") "/include")) - #t))))) - (inputs + #t)) + (add-before 'install 'fix-pom + (lambda _ + ;; pom contains variables to complete name, but we don't support that + (substitute* "pom.xml" + (("\\$\\{platform\\}") "native")) + #t)) + (replace 'install + (install-from-pom "pom.xml"))))) + (propagated-inputs `(("java-hawtjni" ,java-hawtjni))) (home-page "https://fusesource.github.io/jansi/") (synopsis "Native library for jansi") @@ -11168,8 +11180,25 @@ (define-public java-jansi (modify-phases %standard-phases (add-after 'check 'clear-term (lambda _ - (invoke "echo" "-e" "\\e[0m")))))) - (inputs + (invoke "echo" "-e" "\\e[0m"))) + (add-before 'install 'install-parent + (install-pom-file "pom.xml")) + (add-before 'install 'fix-pom + (lambda _ + ;; pom adds jansi native versions for different platforms, but we + ;; only need one, so use native instead + (substitute* "jansi/pom.xml" + (("windows32") "native") + (("windows64") "native") + (("osx") "native") + (("linux32") "native") + (("linux64") "native") + (("freebsd32") "native") + (("freebsd64") "native")) + #t)) + (replace 'install + (install-from-pom "jansi/pom.xml"))))) + (propagated-inputs `(("java-jansi-native" ,java-jansi-native))) (native-inputs `(("java-junit" ,java-junit) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index cbeda43b72..bfb5a51807 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -3495,3 +3495,91 @@ (define-public java-surefire-junit4 (synopsis "SureFire JUnit 4.0+ runner") (description "This package contains the runner for tests run on a forked JVM, using JUnit 4.0 or later."))) + +(define-public maven-surefire-common + (package + (inherit java-surefire-logger-api) + (name "maven-surefire-common") + (arguments + `(#:tests? #f; require mockito 2 + #:jar-name "maven-surefire-common.jar" + #:source-dir "maven-surefire-common/src/main/java" + #:phases + (modify-phases %standard-phases + (add-before 'build 'prepare-shade + (lambda* (#:key inputs #:allow-other-keys) + (mkdir-p "build/classes") + (with-directory-excursion "build/classes" + (for-each + (lambda (input) + (for-each + (lambda (jar-file) + (invoke "jar" "xf" jar-file) + (delete-file-recursively "META-INF")) + (find-files (assoc-ref inputs input) ".*.jar$"))) + '("maven-shared-utils" "java-commons-io" "java-commons-lang3" + "java-commons-compress" "maven-common-artifact-filters"))) + #t)) + (add-after 'build 'shade + (lambda* (#:key inputs #:allow-other-keys) + (let ((jarjar + (car (find-files (assoc-ref inputs "java-jarjar") ".*.jar$"))) + (injar "maven-surefire-common.jar") + (outjar "maven-surefire-common-shaded.jar")) + (with-directory-excursion "build/jar" + (with-output-to-file "rules" + (lambda _ + (format #t (string-append + "rule " + "org.apache.maven.shared.utils.** " + "org.apache.maven.surefire.shade.common." + "org.apache.maven.shared.utils.@1~%")) + (format #t (string-append + "rule " + "org.apache.commons.io.** " + "org.apache.maven.surefire.shade.common." + "org.apache.commons.io.@1~%")) + (format #t (string-append + "rule " + "org.apache.commons.lang3.** " + "org.apache.maven.surefire.shade.common." + "org.apache.commons.lang3.@1~%")) + (format #t (string-append + "rule " + "org.apache.commons.compress.** " + "org.apache.maven.surefire.shade.common." + "org.apache.commons.compress.@1~%")))) + (invoke "java" "-jar" jarjar "process" "rules" injar outjar) + (delete-file injar) + (rename-file outjar injar))) + #t)) + (add-before 'install 'fix-pom + (lambda _ + (substitute* "maven-surefire-common/pom.xml" + (("maven-toolchain") "maven-core")) + #t)) + (replace 'install + (install-from-pom "maven-surefire-common/pom.xml"))))) + (propagated-inputs + `(("java-surefire-api" ,java-surefire-api) + ("java-surefire-extensions-api" ,java-surefire-extensions-api) + ("java-surefire-booter" ,java-surefire-booter) + ("maven-core" ,maven-core) + ("maven-plugin-annotations" ,maven-plugin-annotations) + ("maven-common-artifact-filters" ,maven-common-artifact-filters) + ("maven-artifact-transfer" ,maven-artifact-transfer) + ("java-plexus-java" ,java-plexus-java) + ("java-jansi" ,java-jansi) + ("java-commons-io" ,java-commons-io) + ("java-commons-lang3" ,java-commons-lang3) + ("java-commons-compress" ,java-commons-compress) + ("maven-shared-utils" ,maven-shared-utils-3.1) + ("java-surefire-parent-pom" ,java-surefire-parent-pom))) + (inputs + `(("java-jsr305" ,java-jsr305))) + (native-inputs + `(("unzip" ,unzip) + ("java-jarjar" ,java-jarjar))) + (synopsis "API used in Surefire and Failsafe MOJO") + (description "This package contains an API used in SureFire and Failsafe +MOJO."))) -- cgit v1.2.3 From 7c02294bc2a535dfe5d1573683234e00d4594ce1 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 28 Jun 2020 00:01:32 +0200 Subject: gnu: Add maven-surefire-plugin. * gnu/packages/maven.scm (maven-surefire-plugin): New variable. --- gnu/packages/maven.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index bfb5a51807..5c95a50648 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -3583,3 +3583,34 @@ (define-public maven-surefire-common (synopsis "API used in Surefire and Failsafe MOJO") (description "This package contains an API used in SureFire and Failsafe MOJO."))) + +(define-public maven-surefire-plugin + (package + (inherit java-surefire-logger-api) + (name "maven-surefire-plugin") + (arguments + `(#:jar-name "maven-surefire-plugin.jar" + #:source-dir "maven-surefire-plugin/src/main/java" + #:tests? #f; test depends on maven-plugin-test-harness + #:phases + (modify-phases %standard-phases + (add-before 'build 'generate-plugin.xml + (generate-plugin.xml "maven-surefire-plugin/pom.xml" + "surefire" + "." + (list + (list + "maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java" + "maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java")))) + (replace 'install + (install-from-pom "maven-surefire-plugin/pom.xml"))))) + (propagated-inputs + `(("maven-surefire-common" ,maven-surefire-common) + ("maven-core" ,maven-core))) + (native-inputs + `(("maven-plugin-annotations" ,maven-plugin-annotations) + ("unzip" ,unzip))) + (synopsis "SureFire Maven plugin that runs tests.") + (description "The Surefire Plugin is used during the test phase of the +build lifecycle to execute the unit tests of an application. It generates +reports in two different file formats, plain text and xml."))) -- cgit v1.2.3 From 562408a8c00fe12376f242ba52a231a79ab997f8 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 28 Jun 2020 00:04:14 +0200 Subject: gnu: Add maven-jar-plugin. * gnu/packages/maven.scm (maven-jar-plugin): New variable. --- gnu/packages/maven.scm | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 5c95a50648..e0cc98d408 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -3614,3 +3614,48 @@ (define-public maven-surefire-plugin (description "The Surefire Plugin is used during the test phase of the build lifecycle to execute the unit tests of an application. It generates reports in two different file formats, plain text and xml."))) + +(define-public maven-jar-plugin + (package + (name "maven-jar-plugin") + (version "3.2.0") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/apache/" + "maven-jar-plugin/archive/" + "maven-jar-plugin-" version ".tar.gz")) + (sha256 + (base32 + "032042n3kfb4g5jf6khzxywn22xfy3jpx57lkq88xsv0lwx9np96")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "maven-jar-plugin.jar" + #:source-dir "src/main/java" + #:tests? #f; test depends on maven-plugin-test-harness + #:phases + (modify-phases %standard-phases + (add-before 'build 'generate-plugin.xml + (generate-plugin.xml "pom.xml" + "jar" + "src/main/java/org/apache/maven/plugins/jar" + (list + (list "AbstractJarMojo.java" "JarMojo.java") + (list "AbstractJarMojo.java" "TestJarMojo.java")))) + (replace 'install + (install-from-pom "pom.xml"))))) + (propagated-inputs + `(("maven-archiver" ,maven-archiver) + ("maven-artifact" ,maven-3.0-artifact) + ("maven-core" ,maven-3.0-core) + ("maven-plugin-api" ,maven-3.0-plugin-api) + ("maven-file-management" ,maven-file-management) + ("maven-shared-utils" ,maven-shared-utils) + ("java-plexus-archiver" ,java-plexus-archiver) + ("java-plexus-utils" ,java-plexus-utils))) + (inputs + `(("maven-plugin-annotations" ,maven-plugin-annotations))) + (home-page "https://maven.apache.org/plugins/maven-jar-plugin") + (synopsis "Jar builder plugin for Maven") + (description "This plugin provides the capability to build jars. If you +would like to sign jars please use the Maven Jarsigner Plugin instead.") + (license license:asl2.0))) -- cgit v1.2.3 From 55b90c90532cd50617fb3dd56173f96de1cbe0b3 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 28 Jun 2020 00:07:50 +0200 Subject: guix: Add maven-build-system. * guix/build-system/maven.scm: New file. * guix/build/maven-build-system.scm: New file. * Makefile.am (MODULES): Add them. * doc/guix.texi (Build Systems): Document the maven build system. --- Makefile.am | 2 + doc/guix.texi | 42 ++++++++ guix/build-system/maven.scm | 214 ++++++++++++++++++++++++++++++++++++++ guix/build/maven-build-system.scm | 163 +++++++++++++++++++++++++++++ 4 files changed, 421 insertions(+) create mode 100644 guix/build-system/maven.scm create mode 100644 guix/build/maven-build-system.scm diff --git a/Makefile.am b/Makefile.am index c067e37c5f..31784adfff 100644 --- a/Makefile.am +++ b/Makefile.am @@ -132,6 +132,7 @@ MODULES = \ guix/build-system/haskell.scm \ guix/build-system/julia.scm \ guix/build-system/linux-module.scm \ + guix/build-system/maven.scm \ guix/build-system/node.scm \ guix/build-system/perl.scm \ guix/build-system/python.scm \ @@ -181,6 +182,7 @@ MODULES = \ guix/build/gnu-build-system.scm \ guix/build/gnu-dist.scm \ guix/build/guile-build-system.scm \ + guix/build/maven-build-system.scm \ guix/build/node-build-system.scm \ guix/build/perl-build-system.scm \ guix/build/python-build-system.scm \ diff --git a/doc/guix.texi b/doc/guix.texi index 40c8f06bf0..2041d10447 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -6811,6 +6811,48 @@ uuid, the package version, and a list of dependencies specified by their name and their uuid. @end defvr +@defvr {Scheme Variable} maven-build-system +This variable is exported by @code{(guix build-system maven)}. It implements +a build procedure for @uref{https://maven.apache.org, Maven} packages. Maven +is a dependency and lifecycle management tool for Java. A user of Maven +specifies dependencies and plugins in a @file{pom.xml} file that Maven reads. +When Maven does not have one of the dependencies or plugins in its repository, +it will download them and use them to build the package. + +The maven build system ensures that maven will not try to download any +dependency by running in offline mode. Maven will fail if a dependency is +missing. Before running Maven, the @file{pom.xml} (and subprojects) are +modified to specify the version of dependencies and plugins that match the +versions available in the guix build environment. Dependencies and plugins +must be installed in the fake maven repository at @file{lib/m2}, and are +symlinked into a proper repository before maven is run. Maven is instructed +to use that repository for the build and installs built artifacts there. +Changed files are copied to the @file{lib/m2} directory of the package output. + +You can specify a @file{pom.xml} file with the @code{#:pom-file} argument, +or let the build system use the default @file{pom.xml} file in the sources. + +In case you need to specify a dependency's version manually, you can use the +@code{#:local-packages} argument. It takes an association list where the key +is the groupId of the package and its value is an association list where the +key is the artifactId of the package and its value is the version you want to +override in the @file{pom.xml}. + +Some packages use dependencies or plugins that are not useful at runtime nor +at build time in Guix. You can alter the @file{pom.xml} file to remove them +using the @code{#:exclude} argument. Its value is an association list where +the key is the groupId of the plugin or dependency you want to remove, and +the value is a list of artifactId you want to remove. + +You can override the default @code{jdk} and @code{maven} packages with the +corresponding argument, @code{#:jdk} and @code{#:maven}. + +The @code{#:maven-plugins} argument is a list of maven plugins used during +the build, with the same format as the @code{inputs} fields of the package +declaration. Its default value is @code{%default-maven-plugins} which is +also exported. +@end defvr + @defvr {Scheme Variable} minify-build-system This variable is exported by @code{(guix build-system minify)}. It implements a minification procedure for simple JavaScript packages. diff --git a/guix/build-system/maven.scm b/guix/build-system/maven.scm new file mode 100644 index 0000000000..88ae1ce7bc --- /dev/null +++ b/guix/build-system/maven.scm @@ -0,0 +1,214 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2020 Julien Lepiller +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (guix build-system maven) + #:use-module (guix store) + #:use-module (guix utils) + #:use-module (guix derivations) + #:use-module (guix search-paths) + #:use-module (guix build-system) + #:use-module (guix build-system gnu) + #:use-module (guix packages) + #:use-module (ice-9 match) + #:use-module (srfi srfi-1) + #:export (%maven-build-system-modules + default-maven + %default-maven-plugins + %default-exclude + lower + maven-build + maven-build-system)) + +;; Commentary: +;; +;; Standard build procedure for Maven packages. This is implemented as an +;; extension of `gnu-build-system'. +;; +;; Code: + +(define %maven-build-system-modules + ;; Build-side modules imported by default. + `((guix build maven-build-system) + (guix build maven pom) + ,@%gnu-build-system-modules)) + +(define (default-maven) + "Return the default maven package." + + ;; Do not use `@' to avoid introducing circular dependencies. + (let ((module (resolve-interface '(gnu packages maven)))) + (module-ref module 'maven))) + +(define (default-maven-compiler-plugin) + "Return the default maven compiler plugin package." + ;; Do not use `@' to avoid introducing circular dependencies. + (let ((module (resolve-interface '(gnu packages maven)))) + (module-ref module 'maven-compiler-plugin))) + +(define (default-maven-jar-plugin) + "Return the default maven jar plugin package." + ;; Do not use `@' to avoid introducing circular dependencies. + (let ((module (resolve-interface '(gnu packages maven)))) + (module-ref module 'maven-jar-plugin))) + +(define (default-maven-resources-plugin) + "Return the default maven resources plugin package." + ;; Do not use `@' to avoid introducing circular dependencies. + (let ((module (resolve-interface '(gnu packages maven)))) + (module-ref module 'maven-resources-plugin))) + +(define (default-maven-surefire-plugin) + "Return the default maven surefire plugin package." + ;; Do not use `@' to avoid introducing circular dependencies. + (let ((module (resolve-interface '(gnu packages maven)))) + (module-ref module 'maven-surefire-plugin))) + +(define (default-java-surefire-junit4) + "Return the default surefire junit4 provider package." + ;; Do not use `@' to avoid introducing circular dependencies. + (let ((module (resolve-interface '(gnu packages maven)))) + (module-ref module 'java-surefire-junit4))) + +(define (default-maven-install-plugin) + "Return the default maven install plugin package." + ;; Do not use `@' to avoid introducing circular dependencies. + (let ((module (resolve-interface '(gnu packages maven)))) + (module-ref module 'maven-install-plugin))) + +(define (default-jdk) + "Return the default JDK package." + ;; Lazily resolve the binding to avoid a circular dependency. + (let ((jdk-mod (resolve-interface '(gnu packages java)))) + (module-ref jdk-mod 'icedtea))) + +(define %default-maven-plugins + `(("maven-compiler-plugin" ,(default-maven-compiler-plugin)) + ("maven-jar-plugin" ,(default-maven-jar-plugin)) + ("maven-resources-plugin" ,(default-maven-resources-plugin)) + ("maven-surefire-plugin" ,(default-maven-surefire-plugin)) + ("java-surefire-junit4" ,(default-java-surefire-junit4)) + ("maven-install-plugin" ,(default-maven-install-plugin)))) + +(define %default-exclude + `(("org.apache.maven.plugins" . + ("maven-release-plugin" "maven-site-plugin")))) + +(define* (lower name + #:key source inputs native-inputs outputs system target + (maven (default-maven)) + (jdk (default-jdk)) + (maven-plugins %default-maven-plugins) + (local-packages '()) + (exclude %default-exclude) + #:allow-other-keys + #:rest arguments) + "Return a bag for NAME." + (define private-keywords + '(#:source #:target #:jdk #:maven #:maven-plugins #:inputs #:native-inputs)) + + (and (not target) ;XXX: no cross-compilation + (bag + (name name) + (system system) + (host-inputs `(,@(if source + `(("source" ,source)) + '()) + ,@inputs + + ;; Keep the standard inputs of 'gnu-build-system'. + ,@(standard-packages))) + (build-inputs `(("maven" ,maven) + ("jdk" ,jdk "jdk") + ,@maven-plugins + ,@native-inputs)) + (outputs outputs) + (build maven-build) + (arguments (strip-keyword-arguments private-keywords arguments))))) + +(define* (maven-build store name inputs + #:key (guile #f) + (outputs '("out")) + (search-paths '()) + (out-of-source? #t) + (validate-runpath? #t) + (patch-shebangs? #t) + (strip-binaries? #t) + (exclude %default-exclude) + (local-packages '()) + (tests? #t) + (strip-flags ''("--strip-debug")) + (strip-directories ''("lib" "lib64" "libexec" + "bin" "sbin")) + (phases '(@ (guix build maven-build-system) + %standard-phases)) + (system (%current-system)) + (imported-modules %maven-build-system-modules) + (modules '((guix build maven-build-system) + (guix build maven pom) + (guix build utils)))) + "Build SOURCE using PATCHELF, and with INPUTS. This assumes that SOURCE +provides its own binaries." + (define builder + `(begin + (use-modules ,@modules) + (maven-build #:source ,(match (assoc-ref inputs "source") + (((? derivation? source)) + (derivation->output-path source)) + ((source) + source) + (source + source)) + #:system ,system + #:outputs %outputs + #:inputs %build-inputs + #:search-paths ',(map search-path-specification->sexp + search-paths) + #:phases ,phases + #:exclude (quote ,exclude) + #:local-packages (quote ,local-packages) + #:tests? ,tests? + #:out-of-source? ,out-of-source? + #:validate-runpath? ,validate-runpath? + #:patch-shebangs? ,patch-shebangs? + #:strip-binaries? ,strip-binaries? + #:strip-flags ,strip-flags + #:strip-directories ,strip-directories))) + + (define guile-for-build + (match guile + ((? package?) + (package-derivation store guile system #:graft? #f)) + (#f ; the default + (let* ((distro (resolve-interface '(gnu packages commencement))) + (guile (module-ref distro 'guile-final))) + (package-derivation store guile system #:graft? #f))))) + + (build-expression->derivation store name builder + #:system system + #:inputs inputs + #:modules imported-modules + #:outputs outputs + #:guile-for-build guile-for-build)) + +(define maven-build-system + (build-system + (name 'maven) + (description "The standard Maven build system") + (lower lower))) + +;;; maven.scm ends here diff --git a/guix/build/maven-build-system.scm b/guix/build/maven-build-system.scm new file mode 100644 index 0000000000..914298d584 --- /dev/null +++ b/guix/build/maven-build-system.scm @@ -0,0 +1,163 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2020 Julien Lepiller +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (guix build maven-build-system) + #:use-module ((guix build gnu-build-system) #:prefix gnu:) + #:use-module (guix build utils) + #:use-module (guix build maven pom) + #:use-module (ice-9 match) + #:export (%standard-phases + maven-build)) + +;; Commentary: +;; +;; Builder-side code of the standard maven build procedure. +;; +;; Code: + +(define* (set-home #:key outputs inputs #:allow-other-keys) + (let ((home (string-append (getcwd) "/build-home"))) + (setenv "HOME" home)) + (setenv "JAVA_HOME" (assoc-ref inputs "jdk")) + #t) + +(define* (configure #:key inputs #:allow-other-keys) + (let* ((m2-files (map + (lambda (input) + (match input + ((name . dir) + (let ((m2-dir (string-append dir "/lib/m2"))) + (if (file-exists? m2-dir) m2-dir #f))))) + inputs)) + (m2-files (filter (lambda (a) a) m2-files))) + (for-each + (lambda (m2-dir) + (for-each + (lambda (file) + (let ((dir (string-append (getenv "HOME") "/.m2/repository/" + (dirname file)))) + (mkdir-p dir) + (symlink (string-append m2-dir "/" file) + (string-append dir "/" (basename file))))) + (with-directory-excursion m2-dir + (find-files "." ".*.(jar|pom)$")))) + m2-files)) + (invoke "mvn" "-v") + #t) + +(define (add-local-package local-packages group artifact version) + (define (alist-set lst key val) + (match lst + ('() (list (cons key val))) + (((k . v) lst ...) + (if (equal? k key) + (cons (cons key val) lst) + (cons (cons k v) (alist-set lst key val)))))) + (alist-set local-packages group + (alist-set (or (assoc-ref local-packages group) '()) artifact + version))) + +(define (fix-pom pom-file inputs local-packages excludes) + (chmod pom-file #o644) + (format #t "fixing ~a~%" pom-file) + (fix-pom-dependencies pom-file (map cdr inputs) + #:with-plugins? #t #:with-build-dependencies? #t + #:local-packages local-packages + #:excludes excludes) + (let* ((pom (get-pom pom-file)) + (java-inputs (map cdr inputs)) + (artifact (pom-artifactid pom)) + (group (pom-groupid pom java-inputs local-packages)) + (version (pom-version pom java-inputs local-packages))) + (let loop ((modules (pom-ref pom "modules")) + (local-packages + (add-local-package local-packages group artifact version))) + (pk 'local-packages local-packages) + (match modules + (#f local-packages) + ('() local-packages) + (((? string? _) modules ...) + (loop modules local-packages)) + (((_ module) modules ...) + (loop + modules + (fix-pom (string-append (dirname pom-file) "/" module "/pom.xml") + inputs local-packages excludes))))))) + +(define* (fix-pom-files #:key inputs local-packages exclude #:allow-other-keys) + (fix-pom "pom.xml" inputs local-packages exclude)) + +(define* (build #:key outputs #:allow-other-keys) + "Build the given package." + (invoke "mvn" "package" + ;; offline mode: don't download dependencies + "-o" + ;, set directory where dependencies are installed + (string-append "-Duser.home=" (getenv "HOME"))) + #t) + +(define* (check #:key tests? #:allow-other-keys) + "Check the given package." + (when tests? + (invoke "mvn" "test" + (string-append "-Duser.home=" (getenv "HOME")) + "-e")) + #t) + +(define* (install #:key outputs #:allow-other-keys) + "Install the given package." + (let* ((out (assoc-ref outputs "out")) + (java (string-append out "/lib/m2"))) + (invoke "mvn" "install" "-o" "-e" + "-DskipTests" + (string-append "-Duser.home=" (getenv "HOME"))) + ;; Go through the repository to find files that can be installed + (with-directory-excursion (string-append (getenv "HOME") "/.m2/repository") + (let ((installable + (filter (lambda (file) + (not (eq? 'symlink (stat:type (lstat file))))) + (find-files "." ".")))) + (mkdir-p java) + (for-each + (lambda (file) + (mkdir-p (string-append java "/" (dirname file))) + (copy-file file (string-append java "/" file))) + installable))) + ;; Remove some files that are not required and introduce timestamps + (for-each delete-file (find-files out "maven-metadata-local.xml")) + (for-each delete-file (find-files out "_remote.repositories"))) + #t) + +(define %standard-phases + ;; Everything is as with the GNU Build System except for the `configure' + ;; , `build', `check' and `install' phases. + (modify-phases gnu:%standard-phases + (delete 'bootstrap) + (add-before 'configure 'set-home set-home) + (replace 'configure configure) + (add-after 'configure 'fix-pom-files fix-pom-files) + (replace 'build build) + (replace 'check check) + (replace 'install install))) + +(define* (maven-build #:key inputs (phases %standard-phases) + #:allow-other-keys #:rest args) + "Build the given package, applying all of PHASES in order." + (apply gnu:gnu-build #:inputs inputs #:phases phases args)) + +;;; maven-build-system.scm ends here -- cgit v1.2.3 From 22b3a95f6eb375c9ca89af9eeee8ec9903abd557 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Fri, 17 Jul 2020 09:43:11 +0100 Subject: build-system/maven: Make default-maven-plugins a procedure. This allows compiling the module without the (gnu packages maven) module being available. * guix/build-system/maven.scm (%default-maven-plugins): Rename to default-maven-plugins, and convert to a procedure. * doc/guix.texi (maven-build-system): Update. --- doc/guix.texi | 2 +- guix/build-system/maven.scm | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 2041d10447..2c5c017eea 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -6849,7 +6849,7 @@ corresponding argument, @code{#:jdk} and @code{#:maven}. The @code{#:maven-plugins} argument is a list of maven plugins used during the build, with the same format as the @code{inputs} fields of the package -declaration. Its default value is @code{%default-maven-plugins} which is +declaration. Its default value is @code{(default-maven-plugins)} which is also exported. @end defvr diff --git a/guix/build-system/maven.scm b/guix/build-system/maven.scm index 88ae1ce7bc..2dceefccc1 100644 --- a/guix/build-system/maven.scm +++ b/guix/build-system/maven.scm @@ -28,7 +28,7 @@ (define-module (guix build-system maven) #:use-module (srfi srfi-1) #:export (%maven-build-system-modules default-maven - %default-maven-plugins + default-maven-plugins %default-exclude lower maven-build @@ -96,7 +96,7 @@ (define (default-jdk) (let ((jdk-mod (resolve-interface '(gnu packages java)))) (module-ref jdk-mod 'icedtea))) -(define %default-maven-plugins +(define (default-maven-plugins) `(("maven-compiler-plugin" ,(default-maven-compiler-plugin)) ("maven-jar-plugin" ,(default-maven-jar-plugin)) ("maven-resources-plugin" ,(default-maven-resources-plugin)) @@ -112,7 +112,7 @@ (define* (lower name #:key source inputs native-inputs outputs system target (maven (default-maven)) (jdk (default-jdk)) - (maven-plugins %default-maven-plugins) + (maven-plugins (default-maven-plugins)) (local-packages '()) (exclude %default-exclude) #:allow-other-keys -- cgit v1.2.3 From 0e1428ac5dc3a7f1aa68988dd88885009e9706a6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 17 Jul 2020 12:32:52 +0300 Subject: gnu: quassel: Fix calling inxi script. * gnu/packages/irc.scm (quassel)[source]: Only remove bundled inxi script. [arguments]: Adjust 'patch-inxi-reference phase to symlink packaged inxi to where quassel expects it to be. --- gnu/packages/irc.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index 81e4205acf..5abd54b49a 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -80,12 +80,10 @@ (define-public quassel "0mg8jydc70vlylppzich26q4s40kr78r3ysfyjwisfvlg2byxvs8")) (patches (search-patches "quassel-qt-514-compat.patch")) (modules '((guix build utils))) - ;; We don't want to install the bundled scripts. + ;; We don't want to install the bundled inxi script. (snippet '(begin - (delete-file-recursively "data/scripts") - (substitute* "data/CMakeLists.txt" - (("NOT WIN32") "WIN32")) + (delete-file "data/scripts/inxi") #t)))) (build-system cmake-build-system) (arguments @@ -103,8 +101,7 @@ (define-public quassel (add-after 'unpack 'patch-inxi-reference (lambda* (#:key inputs #:allow-other-keys) (let ((inxi (string-append (assoc-ref inputs "inxi") "/bin/inxi"))) - (substitute* "src/common/aliasmanager.cpp" - ((" inxi ") (string-append " " inxi " "))) + (symlink inxi "data/scripts/inxi") #t)))) #:tests? #f)) ; no test target (native-inputs -- cgit v1.2.3 From 1ee584057dfd0453f7d8273cd7fa8d139b5c5dd2 Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Thu, 16 Jul 2020 22:40:45 +0200 Subject: gnu: gdal: Add postgresql dependency. * gnu/packages/geo.scm (gdal)[inputs]: Add postgresql. [native-inputs]: New field. Introduces pkg-config. --- gnu/packages/geo.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 879132c43a..d5ccc3cb07 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -666,9 +666,12 @@ (define-public gdal ("libwebp" ,libwebp) ("netcdf" ,netcdf) ("pcre" ,pcre) + ("postgresql" ,postgresql) ; libpq ("proj" ,proj) ("sqlite" ,sqlite) ("zlib" ,zlib))) + (native-inputs + `(("pkg-config" ,pkg-config))) (home-page "https://gdal.org/") (synopsis "Raster and vector geospatial data format library") (description "GDAL is a translator library for raster and vector geospatial -- cgit v1.2.3 From b45be61267c11eb6978a0f758a34ff7781233b43 Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Thu, 16 Jul 2020 23:03:45 +0200 Subject: gnu: gdal: Update to 3.1.2. * gnu/packages/geo.scm (gdal): Update to 3.1.2. --- gnu/packages/geo.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index d5ccc3cb07..79b6c04a70 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -602,7 +602,7 @@ (define-public spatialite-gui (define-public gdal (package (name "gdal") - (version "3.0.4") + (version "3.1.2") (source (origin (method url-fetch) (uri (string-append @@ -610,7 +610,7 @@ (define-public gdal version ".tar.gz")) (sha256 (base32 - "10symyajj1b7j98f889lqxxbmhcyvlhq9gg0l42h69bv22wx45gw")) + "1p6nmlsr8wbyq350pa6c22vrp98dcsa7yjnqsbhdbp74yj53nw9r")) (modules '((guix build utils))) (snippet `(begin -- cgit v1.2.3 From 7953f8b72482fe4c51c38df43d776ad7c74424f4 Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Fri, 17 Jul 2020 09:18:17 +0200 Subject: gnu: libosmium: Update to 2.15.6. * gnu/packages/geo.scm (libosmium): Update to 2.15.6. --- gnu/packages/geo.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 79b6c04a70..45b622111d 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -857,7 +857,7 @@ (define-public imposm3 (define-public libosmium (package (name "libosmium") - (version "2.15.4") + (version "2.15.6") (source (origin (method git-fetch) @@ -866,7 +866,7 @@ (define-public libosmium (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0mlcvqrhp40bzj5r5j9nfc5vbis8hmzcq9xi8jylkciyydaynhz4")))) + (base32 "0rqy18bbakp41f44y5id9ixh0ar2dby46z17p4115z8k1vv9znq2")))) (build-system cmake-build-system) (propagated-inputs `(("boost" ,boost) -- cgit v1.2.3 From 12988adf189c2aba05427b4dc23f4d85c84298ed Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Fri, 17 Jul 2020 09:22:06 +0200 Subject: gnu: osm2pgsql: Update to 1.2.2. * gnu/packages/geo.scm (osm2pgsql): Update to 1.2.2. --- gnu/packages/geo.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 45b622111d..0dd269adcf 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -890,7 +890,7 @@ (define-public libosmium (define-public osm2pgsql (package (name "osm2pgsql") - (version "1.2.1") + (version "1.2.2") (source (origin (method git-fetch) @@ -899,7 +899,7 @@ (define-public osm2pgsql (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1ysan01lpqzjxlq3y2kdminfjs5d9zksicpf9vvzpdk3fzq51fc9")) + (base32 "1j35aa8qinhavliqi5pdm0viyi7lm5xyk402rliaxxs1r2hbsafn")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 2be973c35e9a6f364c31aa916e50b1043824c848 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 17 Jul 2020 14:58:11 +0300 Subject: gnu: java-guava: Use a source file-name. * gnu/packages/java.scm (java-guava)[source]: Add a file-name field. --- gnu/packages/java.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index f7d8c8c696..d42b537ae2 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -6177,6 +6177,7 @@ (define-public java-guava (uri (git-reference (url "https://github.com/google/guava/") (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 "00h5cawdjic1vind3yivzh1f58flvm1yfmhsyqwyvmbvj1vakysp")))) -- cgit v1.2.3 From 7d49e1897c79cc6b397a1bdf0eeda5077d9edfb1 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 17 Jul 2020 14:59:16 +0300 Subject: gnu: ganeti-instance-debootstrap: Use a source file-name. * gnu/packages/virtualization.scm (ganeti-instance-debootstrap)[source]: Add a file-name field. --- gnu/packages/virtualization.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 8b120992f9..7352e37786 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -782,6 +782,7 @@ (define-public ganeti-instance-debootstrap (source (origin (method git-fetch) (uri (git-reference (url home-page) (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 "0f2isw9d8lawzj21rrq1q9xhq8xfa65rqbhqmrn59z201x9q1336")))) -- cgit v1.2.3 From 17666c090b6329bf0be3bb068382d9cd4aafab01 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Wed, 15 Jul 2020 22:02:24 +0200 Subject: gnu: Add Rust 1.45. * gnu/packages/rust.scm (rust-1.45): New variable. * gnu/packages/patches/rust-1.45-linker-locale.patch: New file. * gnu/local.mk (dist_patch_DATA): Add the patch to the list. --- gnu/local.mk | 1 + gnu/packages/patches/rust-1.45-linker-locale.patch | 14 ++++++++ gnu/packages/rust.scm | 37 +++++++++++++++++++++- 3 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/rust-1.45-linker-locale.patch diff --git a/gnu/local.mk b/gnu/local.mk index b174cdeaf5..b3811a473f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1518,6 +1518,7 @@ dist_patch_DATA = \ %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 \ %D%/packages/patches/rust-bootstrap-stage0-test.patch \ %D%/packages/patches/rust-coresimd-doctest.patch \ %D%/packages/patches/rust-nettle-disable-vendor.patch \ diff --git a/gnu/packages/patches/rust-1.45-linker-locale.patch b/gnu/packages/patches/rust-1.45-linker-locale.patch new file mode 100644 index 0000000000..40220e8e77 --- /dev/null +++ b/gnu/packages/patches/rust-1.45-linker-locale.patch @@ -0,0 +1,14 @@ +Patch will be included upstream in 1.47: https://github.com/rust-lang/rust/pull/74416 +diff --git a/src/librustc_codegen_ssa/back/linker.rs b/src/librustc_codegen_ssa/back/linker.rs +index e64aafa599f..12575ac4358 100644 +--- a/src/librustc_codegen_ssa/back/linker.rs ++++ b/src/librustc_codegen_ssa/back/linker.rs +@@ -28,7 +28,7 @@ use rustc_target::spec::{LinkOutputKind, LinkerFlavor, LldFlavor}; + pub fn disable_localization(linker: &mut Command) { + // No harm in setting both env vars simultaneously. + // Unix-style linkers. +- linker.env("LC_ALL", "C"); ++ linker.env("LC_ALL", "en_US.UTF-8"); + // MSVC's `link.exe`. + linker.env("VSLANG", "1033"); + } diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 851a996e4b..b0ad992138 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -1280,7 +1280,42 @@ (define-public rust-1.44 (rust-bootstrapped-package rust-1.43 "1.44.1" "0ww4z2v3gxgn3zddqzwqya1gln04p91ykbrflnpdbmcd575n8bky")) -;; NOTE: An update to LLVM 10 is coming in 1.45, make sure not to miss it. +(define-public rust-1.45 + (let ((base-rust + (rust-bootstrapped-package rust-1.44 "1.45.0" + "0z6dh0yd3fcm3qh960wi4s6fa6pxz9mh77psycsqfkkx5kqra15s"))) + (package + (inherit base-rust) + (source + (origin + (inherit (package-source base-rust)) + (patches (search-patches "rust-1.45-linker-locale.patch")))) + (inputs + (alist-replace "llvm" (list llvm-10) + (package-inputs base-rust))) + (arguments + (substitute-keyword-arguments (package-arguments base-rust) + ((#:phases phases) + `(modify-phases ,phases + ;; These tests make sure that the parser behaves properly when + ;; a source file starts with a shebang. Unfortunately, + ;; the patch-shebangs phase changes the meaning of these edge-cases. + ;; We skip the test since it's drastically unlikely Guix's packaging + ;; will introduce a bug here. + (add-after 'patch-tests 'skip-shebang-tests + (lambda _ + (with-directory-excursion "src/test/ui/parser/shebang" + (delete-file "shebang-doc-comment.rs") + (delete-file "sneaky-attrib.rs") + #t))) + ;; This test case synchronizes itself by starting a localhost TCP + ;; server. This doesn't work as networking is not available. + (add-after 'patch-tests 'skip-networking-test + (lambda _ + (substitute* "src/tools/cargo/tests/testsuite/freshness.rs" + (("fn linking_interrupted" all) + (string-append "#[ignore] " all))) + #t))))))))) ;; TODO(staging): Bump this variable to the latest packaged rust. (define-public rust rust-1.39) -- cgit v1.2.3 From e28a824f0899a3291bdbe35f68f123171c959dd4 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Fri, 17 Jul 2020 15:22:57 +0200 Subject: gnu: rust: Use search-patches instead of map search-patch * gnu/packages/rust.scm: Replace instances of map search-patch with search-patches. --- gnu/packages/rust.scm | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index b0ad992138..a807978917 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -227,7 +227,7 @@ (define rust-1.19 (sha256 (base32 "0l8c14qsf42rmkqy92ahij4vf356dbyspxcips1aswpvad81y8qm")) (modules '((guix build utils))) (snippet '(begin (delete-file-recursively "src/llvm") #t)) - (patches (map search-patch '("rust-1.19-mrustc.patch"))))) + (patches (search-patches "rust-1.19-mrustc.patch")))) (outputs '("out" "cargo")) (properties '((timeout . 72000) ;20 hours (max-silent-time . 18000))) ;5 hours (for armel) @@ -718,8 +718,8 @@ (define-public rust-1.25 (delete-file-recursively "src/llvm") (delete-file-recursively "src/llvm-emscripten") #t)) - (patches (map search-patch - '("rust-1.25-accept-more-detailed-gdb-lines.patch"))))) + (patches (search-patches + "rust-1.25-accept-more-detailed-gdb-lines.patch")))) (arguments (substitute-keyword-arguments (package-arguments base-rust) ((#:phases phases) @@ -753,9 +753,9 @@ (define-public rust-1.26 (source (origin (inherit (package-source base-rust)) - (patches (map search-patch - '("rust-coresimd-doctest.patch" - "rust-1.25-accept-more-detailed-gdb-lines.patch"))))) + (patches (search-patches + "rust-coresimd-doctest.patch" + "rust-1.25-accept-more-detailed-gdb-lines.patch")))) (arguments (substitute-keyword-arguments (package-arguments base-rust) ((#:phases phases) @@ -823,10 +823,10 @@ (define-public rust-1.27 (source (origin (inherit (package-source base-rust)) - (patches (map search-patch '("rust-coresimd-doctest.patch" - "rust-bootstrap-stage0-test.patch" - "rust-1.25-accept-more-detailed-gdb-lines.patch" - "rust-reproducible-builds.patch"))))) + (patches (search-patches "rust-coresimd-doctest.patch" + "rust-bootstrap-stage0-test.patch" + "rust-1.25-accept-more-detailed-gdb-lines.patch" + "rust-reproducible-builds.patch")))) (native-inputs ;; FIXME: Rust 1.27 and some later versions require GDB 8.2 specifically. ;; See . @@ -859,10 +859,10 @@ (define-public rust-1.28 (source (origin (inherit (package-source base-rust)) - (patches (map search-patch '("rust-coresimd-doctest.patch" - "rust-bootstrap-stage0-test.patch" - "rust-1.25-accept-more-detailed-gdb-lines.patch" - "rust-reproducible-builds.patch"))))) + (patches (search-patches "rust-coresimd-doctest.patch" + "rust-bootstrap-stage0-test.patch" + "rust-1.25-accept-more-detailed-gdb-lines.patch" + "rust-reproducible-builds.patch")))) (inputs ;; Use LLVM 6.0 (alist-replace "llvm" (list llvm-6) @@ -895,8 +895,8 @@ (define-public rust-1.29 (source (origin (inherit (package-source base-rust)) - (patches (map search-patch '("rust-1.25-accept-more-detailed-gdb-lines.patch" - "rust-reproducible-builds.patch")))))))) + (patches (search-patches "rust-1.25-accept-more-detailed-gdb-lines.patch" + "rust-reproducible-builds.patch"))))))) (define-public rust-1.30 (let ((base-rust @@ -1010,7 +1010,7 @@ (define-public rust-1.32 (delete-file-recursively "src/tools/lldb") (delete-file-recursively "vendor/jemalloc-sys/jemalloc") #t)) - (patches (map search-patch '("rust-reproducible-builds.patch"))) + (patches (search-patches "rust-reproducible-builds.patch")) ;; the vendor directory has moved to the root of ;; the tarball, so we have to strip an extra prefix (patch-flags '("-p2")))) -- cgit v1.2.3 From d6b05ba3534b030f8de976e340c19ac8a4118ff4 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Fri, 17 Jul 2020 15:23:53 +0200 Subject: gitignore: Don't ignore daemon source code. Remove files that are included in the repository from .gitignore. This improves the behavior of some code-searching tools. --- .gitignore | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.gitignore b/.gitignore index f420d4228e..f630444a0f 100644 --- a/.gitignore +++ b/.gitignore @@ -89,17 +89,8 @@ /m4/nls.m4 /m4/po.m4 /m4/progtest.m4 -/nix-setuid-helper -/nix/AUTHORS -/nix/COPYING /nix/config.h /nix/config.h.in -/nix/nix-daemon/nix-daemon.cc -/nix/nix-setuid-helper/nix-setuid-helper.cc -/nix/scripts/authenticate -/nix/scripts/list-runtime-roots -/nix/scripts/offload -/nix/scripts/substitute /po/doc/*.mo /po/guix/*.gmo /po/guix/*.insert-header -- cgit v1.2.3 From d0a6906d36ec9000b97215ee7f0442584a3323a1 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 17 Jul 2020 10:11:54 +0200 Subject: gnu: Add sbcl-clim-lisp. * gnu/packages/lisp-xyz.scm (sbcl-clim-lisp): New variable. --- gnu/packages/lisp-xyz.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 391b1796e4..5fedf08eb6 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -12720,3 +12720,31 @@ (define-public sbcl-opticl (define-public cl-opticl (sbcl-package->cl-source-package sbcl-opticl)) + +(define-public sbcl-clim-lisp + (let ((commit "27b4d7a667c9b3faa74cabcb57706b888314fff7") + (revision "0")) + (package + (name "sbcl-clim-lisp") + (version (git-version "0.9.7" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mcclim/mcclim") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0jijfgkwas6xnpp5wiii6slcx9pgsalngacb8zm29x6pamx2193h")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("closer-mop" ,sbcl-closer-mop) + ("log4cl" ,sbcl-log4cl) + ("trivial-gray-streams" ,sbcl-trivial-gray-streams))) + (home-page "https://common-lisp.net/project/mcclim/") + (synopsis "Common Lisp GUI toolkit") + (description + "McCLIM is an implementation of the @emph{Common Lisp Interface Manager +specification}, a toolkit for writing GUIs in Common Lisp.") + (license license:lgpl2.1+)))) -- cgit v1.2.3 From 9e7db6c8e4cb4d80aac5ff28742b523d6755f33b Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 17 Jul 2020 10:18:48 +0200 Subject: gnu: Add sbcl-clim-basic. * gnu/packages/lisp-xyz.scm (sbcl-clim-basic): New variable. --- gnu/packages/lisp-xyz.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 5fedf08eb6..31a8bf60c0 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -12748,3 +12748,19 @@ (define-public sbcl-clim-lisp "McCLIM is an implementation of the @emph{Common Lisp Interface Manager specification}, a toolkit for writing GUIs in Common Lisp.") (license license:lgpl2.1+)))) + +(define-public sbcl-clim-basic + (package + (inherit sbcl-clim-lisp) + (name "sbcl-clim-basic") + (inputs + `(("alexandria" ,sbcl-alexandria) + ("babel" ,sbcl-babel) + ("bordeaux-threads" ,sbcl-bordeaux-threads) + ("clim-lisp" ,sbcl-clim-lisp) + ("flexichain" ,sbcl-flexichain) + ("spatial-trees" ,sbcl-spatial-trees) + ("trivial-features" ,sbcl-trivial-features) + ("trivial-garbage" ,sbcl-trivial-garbage))) + (arguments + '(#:asd-file "Core/clim-basic/clim-basic.asd")))) -- cgit v1.2.3 From 5a691dc0e9189b6d60cf1fe5a5a90e8036faae3c Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 17 Jul 2020 10:22:24 +0200 Subject: gnu: Add sbcl-clim-core. * gnu/packages/lisp-xyz.scm (sbcl-clim-core): New variable. --- gnu/packages/lisp-xyz.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 31a8bf60c0..0116343fc2 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -12764,3 +12764,12 @@ (define-public sbcl-clim-basic ("trivial-garbage" ,sbcl-trivial-garbage))) (arguments '(#:asd-file "Core/clim-basic/clim-basic.asd")))) + +(define-public sbcl-clim-core + (package + (inherit sbcl-clim-lisp) + (name "sbcl-clim-core") + (inputs + `(("clim-basic" ,sbcl-clim-basic))) + (arguments + '(#:asd-file "Core/clim-core/clim-core.asd")))) -- cgit v1.2.3 From 699650ed9765b8b8c2008352f09e6723fd2c035d Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 17 Jul 2020 10:24:51 +0200 Subject: gnu: Add sbcl-esa-mcclim. * gnu/packages/lisp-xyz.scm (sbcl-esa-mcclim): New variable. --- gnu/packages/lisp-xyz.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 0116343fc2..f810e06247 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -12773,3 +12773,13 @@ (define-public sbcl-clim-core `(("clim-basic" ,sbcl-clim-basic))) (arguments '(#:asd-file "Core/clim-core/clim-core.asd")))) + +(define-public sbcl-esa-mcclim + (package + (inherit sbcl-clim-lisp) + (name "sbcl-esa-mcclim") + (inputs + `(("alexandria" ,sbcl-alexandria) + ("clim-core" ,sbcl-clim-core))) + (arguments + '(#:asd-file "Libraries/ESA/esa-mcclim.asd")))) -- cgit v1.2.3 From 7cdfd92e8d32e17544313957762064e9fc6f0aad Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 17 Jul 2020 10:27:01 +0200 Subject: gnu: Add sbcl-mcclim-fonts. * gnu/packages/lisp-xyz.scm (sbcl-mcclim-fonts): New variable. --- gnu/packages/lisp-xyz.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index f810e06247..2e63e70b47 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -12783,3 +12783,12 @@ (define-public sbcl-esa-mcclim ("clim-core" ,sbcl-clim-core))) (arguments '(#:asd-file "Libraries/ESA/esa-mcclim.asd")))) + +(define-public sbcl-mcclim-fonts + (package + (inherit sbcl-clim-lisp) + (name "sbcl-mcclim-fonts") + (inputs + `(("clim-basic" ,sbcl-clim-basic))) + (arguments + '(#:asd-file "Extensions/fonts/mcclim-fonts.asd")))) -- cgit v1.2.3 From 49abb68760f4abd881db279e76c45eeeb6b2f243 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 17 Jul 2020 10:31:05 +0200 Subject: gnu: Add sbcl-automaton. * gnu/packages/lisp-xyz.scm (sbcl-automaton): New variable. --- gnu/packages/lisp-xyz.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 2e63e70b47..6559fb520c 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -12792,3 +12792,12 @@ (define-public sbcl-mcclim-fonts `(("clim-basic" ,sbcl-clim-basic))) (arguments '(#:asd-file "Extensions/fonts/mcclim-fonts.asd")))) + +(define-public sbcl-automaton + (package + (inherit sbcl-clim-lisp) + (name "sbcl-automaton") + (inputs + `()) + (arguments + '(#:asd-file "Libraries/Drei/cl-automaton/automaton.asd")))) -- cgit v1.2.3 From 720c83870973749f567c511216f2a60e2c54f497 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 17 Jul 2020 10:33:02 +0200 Subject: gnu: Add sbcl-persistent. * gnu/packages/lisp-xyz.scm (sbcl-persistent): New variable. --- gnu/packages/lisp-xyz.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 6559fb520c..7a3755df8f 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -12801,3 +12801,12 @@ (define-public sbcl-automaton `()) (arguments '(#:asd-file "Libraries/Drei/cl-automaton/automaton.asd")))) + +(define-public sbcl-persistent + (package + (inherit sbcl-clim-lisp) + (name "sbcl-persistent") + (inputs + `()) + (arguments + '(#:asd-file "Libraries/Drei/Persistent/persistent.asd")))) -- cgit v1.2.3 From b2f63ae60515fb0ff02d01c238c359cfdc771552 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 17 Jul 2020 10:38:12 +0200 Subject: gnu: Add sbcl-drei-mcclim. * gnu/packages/lisp-xyz.scm (sbcl-drei-mcclim): New variable. --- gnu/packages/lisp-xyz.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 7a3755df8f..1476bf10d4 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -12810,3 +12810,20 @@ (define-public sbcl-persistent `()) (arguments '(#:asd-file "Libraries/Drei/Persistent/persistent.asd")))) + +(define-public sbcl-drei-mcclim + (package + (inherit sbcl-clim-lisp) + (name "sbcl-drei-mcclim") + (native-inputs + `(("fiveam" ,sbcl-fiveam))) + (inputs + `(("automaton" ,sbcl-automaton) + ("clim-core" ,sbcl-clim-core) + ("esa-mcclim" ,sbcl-esa-mcclim) + ("flexichain" ,sbcl-flexichain) + ("mcclim-fonts" ,sbcl-mcclim-fonts) + ("persistent" ,sbcl-persistent) + ("swank" ,cl-slime-swank))) + (arguments + '(#:asd-file "Libraries/Drei/drei-mcclim.asd")))) -- cgit v1.2.3 From 0ee4e6ef36d1c9a56b0939bb3dc7e219a27aa7bd Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 17 Jul 2020 10:44:38 +0200 Subject: gnu: Add sbcl-clim. * gnu/packages/lisp-xyz.scm (sbcl-clim): New variable. --- gnu/packages/lisp-xyz.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 1476bf10d4..a3bc522c67 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -12827,3 +12827,14 @@ (define-public sbcl-drei-mcclim ("swank" ,cl-slime-swank))) (arguments '(#:asd-file "Libraries/Drei/drei-mcclim.asd")))) + +(define-public sbcl-clim + (package + (inherit sbcl-clim-lisp) + (name "sbcl-clim") + (inputs + `(("clim-core" ,sbcl-clim-core) + ("drei-mcclim" ,sbcl-drei-mcclim) + ("swank" ,cl-slime-swank))) ; For drei-mcclim + (arguments + '(#:asd-file "Core/clim/clim.asd")))) -- cgit v1.2.3 From 875aadaeeba621f4301e331a305598b7bb0c9ee1 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 17 Jul 2020 10:48:39 +0200 Subject: gnu: Add sbcl-mcclim-backend-common. * gnu/packages/lisp-xyz.scm (sbcl-mcclim-backend-common): New variable. --- gnu/packages/lisp-xyz.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index a3bc522c67..44193c1a8b 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -12838,3 +12838,15 @@ (define-public sbcl-clim ("swank" ,cl-slime-swank))) ; For drei-mcclim (arguments '(#:asd-file "Core/clim/clim.asd")))) + +(define-public sbcl-mcclim-backend-common + (package + (inherit sbcl-clim-lisp) + (name "sbcl-mcclim-backend-common") + (native-inputs + `(("fiveam" ,sbcl-fiveam))) + (inputs + `(("clim" ,sbcl-clim) + ("swank" ,cl-slime-swank))) ; For drei-mcclim + (arguments + '(#:asd-file "Backends/common/mcclim-backend-common.asd")))) -- cgit v1.2.3 From 9721909b9f8f5e75c6d4e429e4ffe4621bcfd5d0 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 17 Jul 2020 10:54:49 +0200 Subject: gnu: Add sbcl-mcclim-clx. * gnu/packages/lisp-xyz.scm (sbcl-mcclim-clx): New variable. --- gnu/packages/lisp-xyz.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 44193c1a8b..a8a29a4d12 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -12850,3 +12850,17 @@ (define-public sbcl-mcclim-backend-common ("swank" ,cl-slime-swank))) ; For drei-mcclim (arguments '(#:asd-file "Backends/common/mcclim-backend-common.asd")))) + +(define-public sbcl-mcclim-clx + (package + (inherit sbcl-clim-lisp) + (name "sbcl-mcclim-clx") + (inputs + `(("alexandria" ,sbcl-alexandria) + ("cl-unicode" ,sbcl-cl-unicode) + ("clx" ,sbcl-clx) + ("mcclim-backend-common" ,sbcl-mcclim-backend-common) + ("mcclim-fonts" ,sbcl-mcclim-fonts) + ("swank" ,cl-slime-swank))) ; For drei-mcclim + (arguments + '(#:asd-file "Backends/CLX/mcclim-clx.asd")))) -- cgit v1.2.3 From c085e707122f49c840dce6e6e12e8515abcb85ed Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 17 Jul 2020 11:07:17 +0200 Subject: gnu: Add sbcl-mcclim-fonts-truetype. * gnu/packages/lisp-xyz.scm (sbcl-mcclim-fonts-truetype): New variable. --- gnu/packages/lisp-xyz.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index a8a29a4d12..d6aebfecb5 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -12864,3 +12864,21 @@ (define-public sbcl-mcclim-clx ("swank" ,cl-slime-swank))) ; For drei-mcclim (arguments '(#:asd-file "Backends/CLX/mcclim-clx.asd")))) + +(define-public sbcl-mcclim-fonts-truetype + (package + (inherit sbcl-clim-lisp) + (name "sbcl-mcclim-fonts-truetype") + (inputs + `(("alexandria" ,sbcl-alexandria) + ("cl-aa" ,sbcl-cl-aa) + ("cl-paths-ttf" ,sbcl-cl-paths-ttf) + ("cl-vectors" ,sbcl-cl-vectors) + ("clim-basic" ,sbcl-clim-basic) + ("zpb-ttf" ,sbcl-zpb-ttf))) + (arguments + '(#:asd-file "./Extensions/fonts/mcclim-fonts.asd" + #:asd-system-name "mcclim-fonts/truetype" + ;; Tests want access to user's fonts, which are not available in + ;; build container. + #:tests? #f)))) -- cgit v1.2.3 From fc77c14182aa01d4861914538bfa947868ce3566 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 17 Jul 2020 11:19:35 +0200 Subject: gnu: Add sbcl-mcclim-fonts-clx-truetype. * gnu/packages/lisp-xyz.scm (sbcl-mcclim-fonts-clx-truetype): New variable. --- gnu/packages/lisp-xyz.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index d6aebfecb5..9859c8e2ae 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -12882,3 +12882,23 @@ (define-public sbcl-mcclim-fonts-truetype ;; Tests want access to user's fonts, which are not available in ;; build container. #:tests? #f)))) + +(define-public sbcl-mcclim-fonts-clx-truetype + (package + (inherit sbcl-clim-lisp) + (name "sbcl-mcclim-fonts-clx-truetype") + (inputs + `(("mcclim-clx" ,sbcl-mcclim-clx) + ("mcclim-fonts-truetype" ,sbcl-mcclim-fonts-truetype) + ("swank" ,cl-slime-swank))) ; For drei-mcclim + (arguments + '(#:asd-file "./Extensions/fonts/mcclim-fonts.asd" + #:asd-system-name "mcclim-fonts/clx-truetype" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-asd-system-names + (lambda _ + (substitute* "Extensions/fonts/mcclim-fonts.asd" + ((":depends-on \\(#:mcclim-fonts/truetype") + ":depends-on (#:mcclim-fonts-truetype")) + #t))))))) -- cgit v1.2.3 From 46fa001dea6b39b705b31996485734fc193973e8 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 17 Jul 2020 11:26:28 +0200 Subject: gnu: Add sbcl-mcclim-clx-truetype. * gnu/packages/lisp-xyz.scm (sbcl-mcclim-clx-truetype): New variable. --- gnu/packages/lisp-xyz.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 9859c8e2ae..7ba414f9a8 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -12902,3 +12902,23 @@ (define-public sbcl-mcclim-fonts-clx-truetype ((":depends-on \\(#:mcclim-fonts/truetype") ":depends-on (#:mcclim-fonts-truetype")) #t))))))) + +(define-public sbcl-mcclim-clx-truetype + (package + (inherit sbcl-clim-lisp) + (name "sbcl-mcclim-clx-truetype") + (inputs + `(("mcclim-clx" ,sbcl-mcclim-clx) + ("mcclim-fonts-clx-truetype" ,sbcl-mcclim-fonts-clx-truetype) + ("swank" ,cl-slime-swank))) ; For drei-mcclim + (arguments + '(#:asd-file "Backends/CLX/mcclim-clx.asd" + #:asd-system-name "mcclim-clx/truetype" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-asd-system-names + (lambda _ + (substitute* "Backends/CLX/mcclim-clx.asd" + (("mcclim-fonts/clx-truetype") + "mcclim-fonts-clx-truetype")) + #t))))))) -- cgit v1.2.3 From db0940180544c3ef5d83b216f1e0287f71189426 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 17 Jul 2020 11:44:27 +0200 Subject: gnu: Add sbcl-mcclim-fontconfig. * gnu/packages/lisp-xyz.scm (sbcl-mcclim-fontconfig): New variable. --- gnu/packages/lisp-xyz.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 7ba414f9a8..0adeff41c1 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -12922,3 +12922,34 @@ (define-public sbcl-mcclim-clx-truetype (("mcclim-fonts/clx-truetype") "mcclim-fonts-clx-truetype")) #t))))))) + +(define-public sbcl-mcclim-fontconfig + (package + (inherit sbcl-clim-lisp) + (name "sbcl-mcclim-fontconfig") + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("cffi" ,sbcl-cffi) + ("cffi-grovel" ,sbcl-cffi-grovel) + ("fontconfig" ,fontconfig))) + (arguments + '(#:asd-file "Extensions/fontconfig/mcclim-fontconfig.asd" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "Extensions/fontconfig/src/functions.lisp" + (("libfontconfig\\.so") + (string-append (assoc-ref inputs "fontconfig") + "/lib/libfontconfig.so"))) + #t)) + (add-after 'unpack 'fix-build + (lambda _ + ;; The cffi-grovel system does not get loaded automatically, + ;; so we load it explicitly. + (substitute* "Extensions/fontconfig/mcclim-fontconfig.asd" + (("\\(asdf:defsystem #:mcclim-fontconfig" all) + (string-append "(asdf:load-system :cffi-grovel)\n" all))) + #t))))))) -- cgit v1.2.3 From 892f1ef0545a13ff4fff2883a4521f157790aa6f Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 17 Jul 2020 11:51:46 +0200 Subject: gnu: Add sbcl-mcclim-harfbuzz. * gnu/packages/lisp-xyz.scm (sbcl-mcclim-harfbuzz): New variable. --- gnu/packages/lisp-xyz.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 0adeff41c1..5898953ae2 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -12953,3 +12953,36 @@ (define-public sbcl-mcclim-fontconfig (("\\(asdf:defsystem #:mcclim-fontconfig" all) (string-append "(asdf:load-system :cffi-grovel)\n" all))) #t))))))) + +(define-public sbcl-mcclim-harfbuzz + (package + (inherit sbcl-clim-lisp) + (name "sbcl-mcclim-harfbuzz") + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("cffi" ,sbcl-cffi) + ("cffi-grovel" ,sbcl-cffi-grovel) + ("freetype" ,freetype) + ("harfbuzz" ,harfbuzz) + ("trivial-garbage" ,sbcl-trivial-garbage))) + (arguments + '(#:asd-file "Extensions/harfbuzz/mcclim-harfbuzz.asd" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "Extensions/harfbuzz/src/functions.lisp" + (("libharfbuzz\\.so") + (string-append (assoc-ref inputs "harfbuzz") + "/lib/libharfbuzz.so"))) + #t)) + (add-after 'unpack 'fix-build + (lambda _ + ;; The cffi-grovel system does not get loaded automatically, + ;; so we load it explicitly. + (substitute* "Extensions/harfbuzz/mcclim-harfbuzz.asd" + (("\\(asdf:defsystem #:mcclim-harfbuzz" all) + (string-append "(asdf:load-system :cffi-grovel)\n" all))) + #t))))))) -- cgit v1.2.3 From fab0adc752523eea70f3a206e123035b492395af Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 17 Jul 2020 11:58:08 +0200 Subject: gnu: Add sbcl-mcclim-fonts-clx-freetype. * gnu/packages/lisp-xyz.scm (sbcl-mcclim-fonts-clx-freetype): New variable. --- gnu/packages/lisp-xyz.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 5898953ae2..9876ffd143 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -12986,3 +12986,18 @@ (define-public sbcl-mcclim-harfbuzz (("\\(asdf:defsystem #:mcclim-harfbuzz" all) (string-append "(asdf:load-system :cffi-grovel)\n" all))) #t))))))) + +(define-public sbcl-mcclim-fonts-clx-freetype + (package + (inherit sbcl-clim-lisp) + (name "sbcl-mcclim-fonts-clx-freetype") + (inputs + `(("cl-freetype2" ,sbcl-cl-freetype2) + ("mcclim-clx" ,sbcl-mcclim-clx) + ("mcclim-fontconfig" ,sbcl-mcclim-fontconfig) + ("mcclim-fonts" ,sbcl-mcclim-fonts) + ("mcclim-harfbuzz" ,sbcl-mcclim-harfbuzz) + ("swank" ,cl-slime-swank))) ; For drei-mcclim + (arguments + '(#:asd-file "Extensions/fonts/mcclim-fonts.asd" + #:asd-system-name "mcclim-fonts/clx-freetype")))) -- cgit v1.2.3 From 942a8247467adf6aabbbb5c43bd9a55c991e72c6 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 17 Jul 2020 12:02:24 +0200 Subject: gnu: Add sbcl-mcclim-clx-freetype. * gnu/packages/lisp-xyz.scm (sbcl-mcclim-clx-freetype): New variable. --- gnu/packages/lisp-xyz.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 9876ffd143..9ff37ac6a1 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -13001,3 +13001,23 @@ (define-public sbcl-mcclim-fonts-clx-freetype (arguments '(#:asd-file "Extensions/fonts/mcclim-fonts.asd" #:asd-system-name "mcclim-fonts/clx-freetype")))) + +(define-public sbcl-mcclim-clx-freetype + (package + (inherit sbcl-clim-lisp) + (name "sbcl-mcclim-clx-freetype") + (inputs + `(("mcclim-clx" ,sbcl-mcclim-clx) + ("mcclim-fonts-clx-freetype" ,sbcl-mcclim-fonts-clx-freetype) + ("swank" ,cl-slime-swank))) ; For drei-mcclim + (arguments + '(#:asd-file "Backends/CLX/mcclim-clx.asd" + #:asd-system-name "mcclim-clx/freetype" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-asd-system-names + (lambda _ + (substitute* "Backends/CLX/mcclim-clx.asd" + (("mcclim-fonts/clx-freetype") + "mcclim-fonts-clx-freetype")) + #t))))))) -- cgit v1.2.3 From 6b40a9afb75c7683eb07dd522e981e194d76424d Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 17 Jul 2020 13:45:43 +0200 Subject: gnu: Add sbcl-mcclim-render. * gnu/packages/lisp-xyz.scm (sbcl-mcclim-render): New variable. --- gnu/packages/lisp-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 9ff37ac6a1..3aca2cfcdb 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -13021,3 +13021,25 @@ (define-public sbcl-mcclim-clx-freetype (("mcclim-fonts/clx-freetype") "mcclim-fonts-clx-freetype")) #t))))))) + +(define-public sbcl-mcclim-render + (package + (inherit sbcl-clim-lisp) + (name "sbcl-mcclim-render") + (inputs + `(("alexandria" ,sbcl-alexandria) + ("cl-vectors" ,sbcl-cl-vectors) + ("clim-basic" ,sbcl-clim-basic) + ("mcclim-backend-common" ,sbcl-mcclim-backend-common) + ("mcclim-fonts-truetype" ,sbcl-mcclim-fonts-truetype) + ("swank" ,cl-slime-swank))) ; For drei-mcclim + (arguments + '(#:asd-file "Extensions/render/mcclim-render.asd" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-asd-system-names + (lambda _ + (substitute* "Extensions/render/mcclim-render.asd" + (("mcclim-fonts/truetype") + "mcclim-fonts-truetype")) + #t))))))) -- cgit v1.2.3 From 1f1d0bacef2e372c3de9e9ab9f00c4937e4ef3f8 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 17 Jul 2020 13:49:28 +0200 Subject: gnu: Add sbcl-mcclim-clx-fb. * gnu/packages/lisp-xyz.scm (sbcl-mcclim-clx-fb): New variable. --- gnu/packages/lisp-xyz.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 3aca2cfcdb..b6f915a448 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -13043,3 +13043,15 @@ (define-public sbcl-mcclim-render (("mcclim-fonts/truetype") "mcclim-fonts-truetype")) #t))))))) + +(define-public sbcl-mcclim-clx-fb + (package + (inherit sbcl-clim-lisp) + (name "sbcl-mcclim-clx-fb") + (inputs + `(("mcclim-backend-common" ,sbcl-mcclim-backend-common) + ("mcclim-clx" ,sbcl-mcclim-clx) + ("mcclim-render" ,sbcl-mcclim-render) + ("swank" ,cl-slime-swank))) ; For drei-mcclim + (arguments + '(#:asd-file "Backends/CLX-fb/mcclim-clx-fb.asd")))) -- cgit v1.2.3 From 6be78cd9fe980725554499ba13ba5c4a22a57ba6 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 17 Jul 2020 13:52:13 +0200 Subject: gnu: Add sbcl-mcclim-null. * gnu/packages/lisp-xyz.scm (sbcl-mcclim-null): New variable. --- gnu/packages/lisp-xyz.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index b6f915a448..93b703e4a6 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -13055,3 +13055,13 @@ (define-public sbcl-mcclim-clx-fb ("swank" ,cl-slime-swank))) ; For drei-mcclim (arguments '(#:asd-file "Backends/CLX-fb/mcclim-clx-fb.asd")))) + +(define-public sbcl-mcclim-null + (package + (inherit sbcl-clim-lisp) + (name "sbcl-mcclim-null") + (inputs + `(("clim" ,sbcl-clim) + ("swank" ,cl-slime-swank))) ; For drei-mcclim + (arguments + '(#:asd-file "Backends/Null/mcclim-null.asd")))) -- cgit v1.2.3 From 48f2694dd5f85b97e7ad6c40d2ba74f3f7bf02ca Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 17 Jul 2020 13:55:44 +0200 Subject: gnu: Add sbcl-clim-postscript-font. * gnu/packages/lisp-xyz.scm (sbcl-clim-postscript-font): New variable. --- gnu/packages/lisp-xyz.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 93b703e4a6..908ef42627 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -13065,3 +13065,14 @@ (define-public sbcl-mcclim-null ("swank" ,cl-slime-swank))) ; For drei-mcclim (arguments '(#:asd-file "Backends/Null/mcclim-null.asd")))) + +(define-public sbcl-clim-postscript-font + (package + (inherit sbcl-clim-lisp) + (name "sbcl-clim-postscript-font") + (inputs + `(("clim-basic" ,sbcl-clim-basic) + ("mcclim-backend-common" ,sbcl-mcclim-backend-common) + ("swank" ,cl-slime-swank))) ; For drei-mcclim + (arguments + '(#:asd-file "Backends/PostScript/clim-postscript-font.asd")))) -- cgit v1.2.3 From b1ca56bf3bd3ce72443056db5c78b46153fe6bc2 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 17 Jul 2020 14:03:04 +0200 Subject: gnu: Add sbcl-clim-postscript. * gnu/packages/lisp-xyz.scm (sbcl-clim-postscript): New variable. --- gnu/packages/lisp-xyz.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 908ef42627..58bfff2726 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -13076,3 +13076,20 @@ (define-public sbcl-clim-postscript-font ("swank" ,cl-slime-swank))) ; For drei-mcclim (arguments '(#:asd-file "Backends/PostScript/clim-postscript-font.asd")))) + +(define-public sbcl-clim-postscript + (package + (inherit sbcl-clim-lisp) + (name "sbcl-clim-postscript") + (native-inputs + `(("fiveam" ,sbcl-fiveam))) + (inputs + `(("clim-basic" ,sbcl-clim-basic) + ("clim-postscript-font" ,sbcl-clim-postscript-font) + ("swank" ,cl-slime-swank))) ; For drei-mcclim + (arguments + '(#:asd-file "Backends/PostScript/clim-postscript.asd" + ;; Test suite disabled because of a dependency cycle. + ;; The tests depend on mcclim/test-util, which depends on mcclim, + ;; wich depends on mcclim/extensions, which depends on clim-postscript. + #:tests? #f)))) -- cgit v1.2.3 From 1a1b584b0e46b52445312295688adfa3a9a8129d Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 17 Jul 2020 14:07:10 +0200 Subject: gnu: Add sbcl-clim-pdf. * gnu/packages/lisp-xyz.scm (sbcl-clim-pdf): New variable. --- gnu/packages/lisp-xyz.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 58bfff2726..84260e971a 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -13093,3 +13093,22 @@ (define-public sbcl-clim-postscript ;; The tests depend on mcclim/test-util, which depends on mcclim, ;; wich depends on mcclim/extensions, which depends on clim-postscript. #:tests? #f)))) + +(define-public sbcl-clim-pdf + (package + (inherit sbcl-clim-lisp) + (name "sbcl-clim-pdf") + (native-inputs + `(("fiveam" ,sbcl-fiveam))) + (inputs + `(("cl-pdf" ,sbcl-cl-pdf) + ("clim-basic" ,sbcl-clim-basic) + ("clim-postscript-font" ,sbcl-clim-postscript-font) + ("flexi-streams" ,sbcl-flexi-streams) + ("swank" ,cl-slime-swank))) ; For drei-mcclim + (arguments + '(#:asd-file "Backends/PDF/clim-pdf.asd" + ;; Test suite disabled because of a dependency cycle. + ;; The tests depend on mcclim/test-util, which depends on mcclim, + ;; wich depends on mcclim/extensions, which depends on clim-pdf. + #:tests? #f)))) -- cgit v1.2.3 From efa88f9020fc37c3009af9c6776f5c3ae5401e2c Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 17 Jul 2020 14:19:09 +0200 Subject: gnu: Add sbcl-mcclim-looks. * gnu/packages/lisp-xyz.scm (sbcl-mcclim-looks): New variable. --- gnu/packages/lisp-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 84260e971a..413fb70ecd 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -13112,3 +13112,29 @@ (define-public sbcl-clim-pdf ;; The tests depend on mcclim/test-util, which depends on mcclim, ;; wich depends on mcclim/extensions, which depends on clim-pdf. #:tests? #f)))) + +(define-public sbcl-mcclim-looks + (package + (inherit sbcl-clim-lisp) + (name "sbcl-mcclim-looks") + (inputs + `(("clim" ,sbcl-clim) + ("mcclim-clx" ,sbcl-mcclim-clx) + ("mcclim-clx-fb" ,sbcl-mcclim-clx-fb) + ("mcclim-clx-freetype" ,sbcl-mcclim-clx-freetype) + ("mcclim-clx-truetype" ,sbcl-mcclim-clx-truetype) + ("mcclim-null" ,sbcl-mcclim-null) + ("swank" ,cl-slime-swank))) ; For drei-mcclim + (arguments + '(#:asd-file "mcclim.asd" + #:asd-system-name "mcclim/looks" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-asd-system-names + (lambda _ + (substitute* "mcclim.asd" + (("mcclim-clx/truetype") + "mcclim-clx-truetype") + (("mcclim-clx/freetype") + "mcclim-clx-freetype")) + #t))))))) -- cgit v1.2.3 From 9757de5dc61b8115d80cf6ace71d1e3fafdf66a9 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 17 Jul 2020 14:21:07 +0200 Subject: gnu: Add sbcl-mcclim-franz. * gnu/packages/lisp-xyz.scm (sbcl-mcclim-franz): New variable. --- gnu/packages/lisp-xyz.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 413fb70ecd..dd41abca32 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -13138,3 +13138,13 @@ (define-public sbcl-mcclim-looks (("mcclim-clx/freetype") "mcclim-clx-freetype")) #t))))))) + +(define-public sbcl-mcclim-franz + (package + (inherit sbcl-clim-lisp) + (name "sbcl-mcclim-franz") + (inputs + `(("clim" ,sbcl-clim) + ("swank" ,cl-slime-swank))) ; For drei-mcclim + (arguments + '(#:asd-file "Extensions/Franz/mcclim-franz.asd")))) -- cgit v1.2.3 From 000ee6e5b637ab0f233556414cd4c15bc2b78ab0 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 17 Jul 2020 14:24:38 +0200 Subject: gnu: Add sbcl-mcclim-bezier-core. * gnu/packages/lisp-xyz.scm (sbcl-mcclim-bezier-core): New variable. --- gnu/packages/lisp-xyz.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index dd41abca32..904bd6f159 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -13148,3 +13148,18 @@ (define-public sbcl-mcclim-franz ("swank" ,cl-slime-swank))) ; For drei-mcclim (arguments '(#:asd-file "Extensions/Franz/mcclim-franz.asd")))) + +(define-public sbcl-mcclim-bezier-core + (package + (inherit sbcl-clim-lisp) + (name "sbcl-mcclim-bezier-core") + (inputs + `(("clim" ,sbcl-clim) + ("clim-pdf" ,sbcl-clim-pdf) + ("clim-postscript" ,sbcl-clim-postscript) + ("mcclim-null" ,sbcl-mcclim-null) + ("mcclim-render" ,sbcl-mcclim-render) + ("swank" ,cl-slime-swank))) ; For drei-mcclim + (arguments + '(#:asd-file "Extensions/bezier/mcclim-bezier.asd" + #:asd-system-name "mcclim-bezier/core")))) -- cgit v1.2.3 From d92e264935fe53733d4d77566dc8e71d408a0cbd Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 17 Jul 2020 14:31:08 +0200 Subject: gnu: Add sbcl-mcclim-bezier-clx. * gnu/packages/lisp-xyz.scm (sbcl-mcclim-bezier-clx): New variable. --- gnu/packages/lisp-xyz.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 904bd6f159..9294b39a7a 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -13163,3 +13163,24 @@ (define-public sbcl-mcclim-bezier-core (arguments '(#:asd-file "Extensions/bezier/mcclim-bezier.asd" #:asd-system-name "mcclim-bezier/core")))) + +(define-public sbcl-mcclim-bezier-clx + (package + (inherit sbcl-clim-lisp) + (name "sbcl-mcclim-bezier-clx") + (inputs + `(("clim" ,sbcl-clim) + ("mcclim-bezier/core" ,sbcl-mcclim-bezier-core) + ("mcclim-clx" ,sbcl-mcclim-clx) + ("swank" ,cl-slime-swank))) ; For drei-mcclim + (arguments + '(#:asd-file "Extensions/bezier/mcclim-bezier.asd" + #:asd-system-name "mcclim-bezier/clx" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-asd-system-names + (lambda _ + (substitute* "Extensions/bezier/mcclim-bezier.asd" + (("mcclim-bezier/core\\)") + "mcclim-bezier-core)")) + #t))))))) -- cgit v1.2.3 From c93bd9f8b90fcda9d61b572cd7fb0fbf6c351118 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 17 Jul 2020 14:34:51 +0200 Subject: gnu: Add sbcl-mcclim-bezier. * gnu/packages/lisp-xyz.scm (sbcl-mcclim-bezier): New variable. --- gnu/packages/lisp-xyz.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 9294b39a7a..c679f7d19a 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -13184,3 +13184,24 @@ (define-public sbcl-mcclim-bezier-clx (("mcclim-bezier/core\\)") "mcclim-bezier-core)")) #t))))))) + +(define-public sbcl-mcclim-bezier + (package + (inherit sbcl-clim-lisp) + (name "sbcl-mcclim-bezier") + (inputs + `(("mcclim-bezier/clx" ,sbcl-mcclim-bezier-clx) + ("mcclim-bezier/core" ,sbcl-mcclim-bezier-core) + ("swank" ,cl-slime-swank))) ; For drei-mcclim + (arguments + '(#:asd-file "Extensions/bezier/mcclim-bezier.asd" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-asd-system-names + (lambda _ + (substitute* "Extensions/bezier/mcclim-bezier.asd" + (("\\(#:mcclim-bezier/core") + "(#:mcclim-bezier-core") + (("#:mcclim-bezier/clx\\)\\)") + "#:mcclim-bezier-clx))")) + #t))))))) -- cgit v1.2.3 From 92da537c41ae860316eb4bd737ca92092f579c42 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 17 Jul 2020 14:36:56 +0200 Subject: gnu: Add sbcl-mcclim-bitmaps. * gnu/packages/lisp-xyz.scm (sbcl-mcclim-bitmaps): New variable. --- gnu/packages/lisp-xyz.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index c679f7d19a..34c30423b2 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -13205,3 +13205,13 @@ (define-public sbcl-mcclim-bezier (("#:mcclim-bezier/clx\\)\\)") "#:mcclim-bezier-clx))")) #t))))))) + +(define-public sbcl-mcclim-bitmaps + (package + (inherit sbcl-clim-lisp) + (name "sbcl-mcclim-bitmaps") + (inputs + `(("clim-basic" ,sbcl-clim-basic) + ("opticl" ,sbcl-opticl))) + (arguments + '(#:asd-file "Extensions/bitmap-formats/mcclim-bitmaps.asd")))) -- cgit v1.2.3 From 5d2abf9f274af5eacd371633086f0cea7d4b4cd8 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 17 Jul 2020 14:38:51 +0200 Subject: gnu: Add sbcl-conditional-commands. * gnu/packages/lisp-xyz.scm (sbcl-conditional-commands): New variable. --- gnu/packages/lisp-xyz.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 34c30423b2..70f978d8b4 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -13215,3 +13215,12 @@ (define-public sbcl-mcclim-bitmaps ("opticl" ,sbcl-opticl))) (arguments '(#:asd-file "Extensions/bitmap-formats/mcclim-bitmaps.asd")))) + +(define-public sbcl-conditional-commands + (package + (inherit sbcl-clim-lisp) + (name "sbcl-conditional-commands") + (inputs + `(("clim-basic" ,sbcl-clim-basic))) + (arguments + '(#:asd-file "Extensions/conditional-commands/conditional-commands.asd")))) -- cgit v1.2.3 From e88754626f1bbc6c156f18db05465ad7504e7edb Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 17 Jul 2020 14:41:42 +0200 Subject: gnu: Add sbcl-mcclim-layouts-tab. * gnu/packages/lisp-xyz.scm (sbcl-mcclim-layouts-tab): New variable. --- gnu/packages/lisp-xyz.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 70f978d8b4..6ea2446f09 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -13224,3 +13224,14 @@ (define-public sbcl-conditional-commands `(("clim-basic" ,sbcl-clim-basic))) (arguments '(#:asd-file "Extensions/conditional-commands/conditional-commands.asd")))) + +(define-public sbcl-mcclim-layouts-tab + (package + (inherit sbcl-clim-lisp) + (name "sbcl-mcclim-layouts-tab") + (inputs + `(("clim" ,sbcl-clim) + ("swank" ,cl-slime-swank))) ; For drei-mcclim + (arguments + '(#:asd-file "Extensions/layouts/mcclim-layouts.asd" + #:asd-system-name "mcclim-layouts/tab")))) -- cgit v1.2.3 From 8e0e7f3566e6869dee1a216bf256bb6bca9f6e96 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 17 Jul 2020 14:47:11 +0200 Subject: gnu: Add sbcl-mcclim-extensions. * gnu/packages/lisp-xyz.scm (sbcl-mcclim-extensions): New variable. --- gnu/packages/lisp-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 6ea2446f09..f3afaf030e 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -13235,3 +13235,28 @@ (define-public sbcl-mcclim-layouts-tab (arguments '(#:asd-file "Extensions/layouts/mcclim-layouts.asd" #:asd-system-name "mcclim-layouts/tab")))) + +(define-public sbcl-mcclim-extensions + (package + (inherit sbcl-clim-lisp) + (name "sbcl-mcclim-extensions") + (inputs + `(("clim-pdf" ,sbcl-clim-pdf) + ("clim-postscript" ,sbcl-clim-postscript) + ("conditional-commands" ,sbcl-conditional-commands) + ("mcclim-bezier" ,sbcl-mcclim-bezier) + ("mcclim-bitmaps" ,sbcl-mcclim-bitmaps) + ("mcclim-franz" ,sbcl-mcclim-franz) + ("mcclim-layouts-tab" ,sbcl-mcclim-layouts-tab) + ("swank" ,cl-slime-swank))) ; For drei-mcclim + (arguments + '(#:asd-file "mcclim.asd" + #:asd-system-name "mcclim/extensions" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-asd-system-names + (lambda _ + (substitute* "mcclim.asd" + (("mcclim-layouts/tab") + "mcclim-layouts-tab")) + #t))))))) -- cgit v1.2.3 From 8afd2d10eeb8b33f4a03720495f70a664e5ca39f Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 17 Jul 2020 14:53:43 +0200 Subject: gnu: Add sbcl-mcclim. * gnu/packages/lisp-xyz.scm (sbcl-mcclim): New variable. --- gnu/packages/lisp-xyz.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index f3afaf030e..615793c4f4 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -13260,3 +13260,26 @@ (define-public sbcl-mcclim-extensions (("mcclim-layouts/tab") "mcclim-layouts-tab")) #t))))))) + +(define-public sbcl-mcclim + (package + (inherit sbcl-clim-lisp) + (name "sbcl-mcclim") + (native-inputs + `(("fiveam" ,sbcl-fiveam))) + (inputs + `(("mcclim-looks" ,sbcl-mcclim-looks) + ("mcclim-extensions" ,sbcl-mcclim-extensions) + ("swank" ,cl-slime-swank))) ; For drei-mcclim + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-asd-system-names + (lambda _ + (substitute* "mcclim.asd" + ((":depends-on \\(\"mcclim/looks\" \"mcclim/extensions\"\\)") + ":depends-on (\"mcclim-looks\" \"mcclim-extensions\")")) + #t))) + ;; Test suite disabled because of a dependency cycle. + ;; The tests depend on mcclim/test-util, which depends on mcclim. + #:tests? #f)))) -- cgit v1.2.3 From 0f935e95493a45fc74d8e2322f98115962cc20b1 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 17 Jul 2020 15:20:12 +0200 Subject: gnu: Add cl-mcclim. * gnu/packages/lisp-xyz.scm (cl-mcclim): New variable. --- gnu/packages/lisp-xyz.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 615793c4f4..4eefa94258 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -13283,3 +13283,38 @@ (define-public sbcl-mcclim ;; Test suite disabled because of a dependency cycle. ;; The tests depend on mcclim/test-util, which depends on mcclim. #:tests? #f)))) + +(define-public cl-mcclim + (let ((base (sbcl-package->cl-source-package sbcl-clim-lisp))) + (package + (inherit base) + (name "cl-mcclim") + (native-inputs + `(("fiveam" ,cl-fiveam) + ("pkg-config" ,pkg-config))) + (inputs + `(("alexandria" ,cl-alexandria) + ("babel" ,cl-babel) + ("bordeaux-threads" ,cl-bordeaux-threads) + ("cffi" ,cl-cffi) + ("cl-aa" ,cl-aa) + ("cl-freetype2" ,cl-freetype2) + ("cl-paths-ttf" ,cl-paths-ttf) + ("cl-pdf" ,cl-pdf) + ("cl-unicode" ,cl-unicode) + ("cl-vectors" ,cl-vectors) + ("closer-mop" ,cl-closer-mop) + ("clx" ,cl-clx) + ("flexi-streams" ,cl-flexi-streams) + ("flexichain" ,cl-flexichain) + ("fontconfig" ,fontconfig) + ("freetype" ,freetype) + ("harfbuzz" ,harfbuzz) + ("log4cl" ,cl-log4cl) + ("opticl" ,cl-opticl) + ("spatial-trees" ,cl-spatial-trees) + ("trivial-features" ,cl-trivial-features) + ("trivial-garbage" ,cl-trivial-garbage) + ("trivial-gray-streams" ,cl-trivial-gray-streams) + ("swank" ,cl-slime-swank) + ("zpb-ttf" ,cl-zpb-ttf)))))) -- cgit v1.2.3 From c9ea5dfdbe1c4758cfbd7b4b665219d4b8a4bad6 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Fri, 17 Jul 2020 22:13:58 +0200 Subject: tests: docker-system: Use guile-3.0. This helps find the (json) module in the virtual machine. * gnu/tests/docker.scm (build-tarball&run-docker-test, run-docker-system-test): Replace guile-2.2 with guile-3.0. --- gnu/tests/docker.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/tests/docker.scm b/gnu/tests/docker.scm index 5ab33e1104..ea6c9a33fe 100644 --- a/gnu/tests/docker.scm +++ b/gnu/tests/docker.scm @@ -157,7 +157,7 @@ (define (build-tarball&run-docker-test) (version "0") (source #f) (build-system trivial-build-system) - (arguments `(#:guile ,guile-2.2 + (arguments `(#:guile ,guile-3.0 #:builder (let ((out (assoc-ref %outputs "out"))) (mkdir out) @@ -171,7 +171,7 @@ (define (build-tarball&run-docker-test) (home-page #f) (license license:public-domain))) (profile (profile-derivation (packages->manifest - (list guile-2.2 guile-json-3 + (list guile-3.0 guile-json-3 guest-script-package)) #:hooks '() #:locales? #f)) @@ -254,7 +254,7 @@ (define (docker-cli command . args) (define (wait-for-container-file container file) ;; Wait for FILE to show up in CONTAINER. (docker-cli "exec" container - #$(file-append guile-2.2 "/bin/guile") + #$(file-append guile-3.0 "/bin/guile") "-c" (object->string `(let loop ((n 15)) -- cgit v1.2.3 From 607a136a25359b395869c19e3fb78176cb789f6b Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Fri, 17 Jul 2020 21:12:01 +0000 Subject: gnu: diffoscope: Update to 151. * gnu/packages/diffoscope (diffoscope): Update to 151. --- gnu/packages/diffoscope.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index 6c649e1a0e..9480f1f226 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -72,7 +72,7 @@ (define-module (gnu packages diffoscope) (define-public diffoscope (package (name "diffoscope") - (version "150") + (version "151") (source (origin (method git-fetch) (uri (git-reference @@ -81,7 +81,7 @@ (define-public diffoscope (file-name (git-file-name name version)) (sha256 (base32 - "0a3hycbbbpadwcck8zc9q3xsjclb36h2nkn95ff39q37966mm5rz")))) + "1lv44ngqij9dp3xk9jj95w7an7h03iac6b2ifpq33j5fffswa1sm")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 4b3d54e73e5c0fee5fac1542a216576c1a8d958b Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Tue, 14 Jul 2020 23:34:43 -0400 Subject: gnu: windowmaker: Update to 0.95.9. * gnu/packages/gnustep.scm (windowmaker): Update to 0.95.9. [source]: Update URI. [home-page]: Use HTTPS URL. --- gnu/packages/gnustep.scm | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/gnu/packages/gnustep.scm b/gnu/packages/gnustep.scm index 7a8a39eee3..0dcd0bee0d 100644 --- a/gnu/packages/gnustep.scm +++ b/gnu/packages/gnustep.scm @@ -67,16 +67,16 @@ (define-public gnustep-make (define-public windowmaker (package (name "windowmaker") - (version "0.95.8") + (version "0.95.9") (synopsis "NeXTSTEP-like window manager") (source (origin (method url-fetch) (uri (string-append - "http://windowmaker.org/pub/source/release/WindowMaker-" - version ".tar.gz")) + "https://github.com/window-maker/wmaker/releases/download/" + "wmaker-" version "/WindowMaker-" version ".tar.gz")) (sha256 (base32 - "12p8kljqgx5hnic0zvs5mxwp7kg21sb6qjagb2qw8ydvf5amrgwx")))) + "055pqvlkhipyjn7m6bb3fs4zz9rd1ynzl0mmwbhp05ihc3zmh8zj")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) @@ -113,26 +113,26 @@ (define-public windowmaker (call-with-output-file (string-append xsessions "/windowmaker.desktop") (lambda (port) - (format port "~ + (format port "~ [Desktop Entry]~@ Name=Window Maker~@ Comment=~a~@ Exec=~a/bin/wmaker~@ Type=Application~%" - (string-map (match-lambda - (#\newline #\space) - (chr chr)) - ,synopsis) out)))) + (string-map (match-lambda + (#\newline #\space) + (chr chr)) + ,synopsis) out)))) #t)) (add-after 'install-xsession 'wrap - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin"))) - ;; In turn, 'wmaker.inst' wants to invoke 'wmmenugen' - ;; etc., so make sure everything is in $PATH. - (wrap-program (string-append bin "/wmaker.inst") - `("PATH" ":" prefix (,bin))) - #t)))))) + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + ;; In turn, 'wmaker.inst' wants to invoke 'wmmenugen' + ;; etc., so make sure everything is in $PATH. + (wrap-program (string-append bin "/wmaker.inst") + `("PATH" ":" prefix (,bin))) + #t)))))) (inputs `(("libxmu" ,libxmu) ("libxft" ,libxft) @@ -145,7 +145,7 @@ (define-public windowmaker ("libtiff" ,libtiff))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://windowmaker.org/") + (home-page "https://windowmaker.org/") (description "Window Maker is an X11 window manager originally designed to provide integration support for the GNUstep Desktop Environment. In every way -- cgit v1.2.3 From 056db754bfda432c6a44bbd94340141c55d9c154 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 16 Jul 2020 18:32:49 -0400 Subject: gnu: ltris: Update to 1.2. * gnu/packages/games.scm (ltris): Update to 1.2. [source]: Use a "mirror://sourceforge" URL. --- gnu/packages/games.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 8c14911cb8..4df27576d4 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -1554,14 +1554,14 @@ (define-public gnushogi (define-public ltris (package (name "ltris") - (version "1.0.20") + (version "1.2") (source (origin (method url-fetch) - (uri (string-append "http://prdownloads.sourceforge.net/lgames/" + (uri (string-append "mirror://sourceforge/lgames/ltris/" "ltris-" version ".tar.gz")) (sha256 - (base32 "16zbqsc4amx9g3yjv6054nh4ia09dgfp8k6q4qxpjicl3dw3z0in")))) + (base32 "15b18p7id55xiz2jkf56w2f1g6yw1rcb98bpa188i6skqrgnrg57")))) (build-system gnu-build-system) (arguments '(;; The code in LTris uses traditional GNU semantics for inline functions -- cgit v1.2.3 From a2e65534416b9777d4c8bfd25570e6696eee83c8 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 17 Jul 2020 20:51:53 -0400 Subject: gnu: starfighter: Update to 2.3. * gnu/packages/games.scm (starfighter): Update to 2.3. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 4df27576d4..36e379dd99 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4759,7 +4759,7 @@ (define-public widelands (define-public starfighter (package (name "starfighter") - (version "2.2.1") + (version "2.3") (source (origin (method url-fetch) (uri (string-append @@ -4768,7 +4768,7 @@ (define-public starfighter version "-src.tar.gz")) (sha256 (base32 - "0bmrid26z7il42lczfs3j3cv671az9fxi2wkf0s22smmzkhcnnrz")))) + "156ivi8cqqv9gxi8kj393av1s2sj7bblabm1b3kibla1s8l090n9")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 9622928d1e26f8bfa2a38cfee34de7c3bdf7c28e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 13 Jul 2020 08:54:38 -0400 Subject: gnu: ruby-prawn: Add a %prawn-project-licenses variable. * gnu/packages/ruby.scm (%prawn-project-licenses): New variable. --- gnu/packages/ruby.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index d3d27f70b2..43e271415b 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -79,6 +79,13 @@ (define-module (gnu packages ruby) #:use-module (guix build-system ruby) #:use-module ((srfi srfi-1) #:select (alist-delete))) +(define %prawn-project-licenses + ;; This set of licenses applies to most (all?) components of the Prawn + ;; project (it is triple licensed). + (list license:ruby + license:gpl2+ + license:gpl3+)) + (define-public ruby (package (name "ruby") -- cgit v1.2.3 From ed2f26f879d5a3646ce0e08a88a2451eeef31979 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 12 Jul 2020 14:51:38 -0400 Subject: gnu: ruby-pdf-inspector: Enable tests. * gnu/packages/ruby.scm (ruby-pdf-inspector)[origin]: Use the git-fetch method. [phases]: Add the 'drop-signing-key-requirement phase and replace the 'check phase to enable tests. [license]: Set to %prawn-project-licenses. --- gnu/packages/ruby.scm | 55 +++++++++++++++++++++++++++++++++++---------------- 1 file changed, 38 insertions(+), 17 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 43e271415b..1b506b730f 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -9590,25 +9590,46 @@ (define-public ruby-pdf-reader (license license:gpl3+))) (define-public ruby-pdf-inspector - (package - (name "ruby-pdf-inspector") - (version "1.3.0") - (source (origin - (method url-fetch) - (uri (rubygems-uri "pdf-inspector" version)) - (sha256 - (base32 - "1g853az4xzgqxr5xiwhb76g4sqmjg4s79mm35mp676zjsrwpa47w")))) - (build-system ruby-build-system) - (propagated-inputs - `(("ruby-pdf-reader" ,ruby-pdf-reader))) - (arguments `(#:tests? #f)); No rakefile - (home-page "https://github.com/prawnpdf/pdf-inspector") - (synopsis "Analysis classes for inspecting PDF output") - (description "This library provides a number of PDF::Reader based tools for + (let ((revision "1") + (commit "00ee4c92ff917118785ebec188e81effc968abeb")) + (package + (name "ruby-pdf-inspector") + (version (git-version "1.3.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/prawnpdf/pdf-inspector.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0h9w81ddd0gvkh5n2cvny9ddb5qiac1si0dhinkk0xxh5382qs0m")))) + (build-system ruby-build-system) + (arguments + `(#:test-target "spec" + #:phases (modify-phases %standard-phases + (add-before 'build 'drop-signing-key-requirement + (lambda _ + (substitute* "pdf-inspector.gemspec" + (("spec.signing_key =.*") + "spec.signing_key = nil")) + #t)) + (replace 'check + (lambda _ + (substitute* "pdf-inspector.gemspec" + ((".*rubocop.*") "") + ((".*yard.*") "")) + (invoke "rspec")))))) + (native-inputs + `(("ruby-rspec" ,ruby-rspec))) + (propagated-inputs + `(("ruby-pdf-reader" ,ruby-pdf-reader))) + (home-page "https://github.com/prawnpdf/pdf-inspector") + (synopsis "Analysis classes for inspecting PDF output") + (description "This library provides a number of PDF::Reader based tools for use in testing PDF output. Presently, the primary purpose of this tool is to support the tests found in Prawn, a pure Ruby PDF generation library.") - (license license:gpl3+))) + (license %prawn-project-licenses)))) (define-public ruby-pdf-core (package -- cgit v1.2.3 From b377dd95b8fb3d77deff6101baae4c6e9a6be9ce Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 12 Jul 2020 14:59:19 -0400 Subject: gnu: ruby-pdf-reader: Update to 2.4.0. * gnu/packages/ruby.scm (ruby-pdf-reader): Update to 2.4.0. --- gnu/packages/ruby.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 1b506b730f..5be2e6e192 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -9562,13 +9562,13 @@ (define-public ruby-morecane (define-public ruby-pdf-reader (package (name "ruby-pdf-reader") - (version "2.1.0") + (version "2.4.0") (source (origin (method url-fetch) (uri (rubygems-uri "pdf-reader" version)) (sha256 (base32 - "1b3ig4wpcgdbqa7yw0ahwbmikkkywn2a22bfmrknl5ls7g066x45")))) + "1g3gr2m46275hjv6fv4jwq3qlvdbnhf1jxir9vzgxhv45ncnhffy")))) (build-system ruby-build-system) (arguments `(#:test-target "spec")) (native-inputs -- cgit v1.2.3 From 34796d7a6cf777f4f78708d06a1ba661d27f029a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 12 Jul 2020 21:46:11 -0400 Subject: gnu: ruby-pdf-reader: Actually run tests. * gnu/packages/ruby.scm (ruby-pdf-reader)[source]: Use git-fetch. [phases]{do-not-use-bundler}: Add phase. [native-inputs]{bundler}: Delete input. --- gnu/packages/ruby.scm | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 5be2e6e192..f87caa1545 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -9564,16 +9564,24 @@ (define-public ruby-pdf-reader (name "ruby-pdf-reader") (version "2.4.0") (source (origin - (method url-fetch) - (uri (rubygems-uri "pdf-reader" version)) + (method git-fetch) ;no test in distributed gem archive + (uri (git-reference + (url "https://github.com/yob/pdf-reader.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1g3gr2m46275hjv6fv4jwq3qlvdbnhf1jxir9vzgxhv45ncnhffy")))) + "1yh8yrlssf5ppnkvk4m78vmh5r5vqwdcd0gm3lqipw162llz0rai")))) (build-system ruby-build-system) - (arguments `(#:test-target "spec")) + (arguments `(#:test-target "spec" + #:phases (modify-phases %standard-phases + (add-after 'unpack 'do-not-use-bundler + (lambda _ + (substitute* "spec/spec_helper.rb" + ((".*[Bb]undler.*") "")) + #t))))) (native-inputs - `(("bundler" ,bundler) - ("ruby-rspec" ,ruby-rspec) + `(("ruby-rspec" ,ruby-rspec) ("ruby-cane" ,ruby-cane) ("ruby-morecane" ,ruby-morecane))) (propagated-inputs -- cgit v1.2.3 From 4179ed930d717c2ab6e4936364f355d2a7de9010 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 12 Jul 2020 22:31:24 -0400 Subject: gnu: ruby-ttfunk: Update to 1.6.2.1. * gnu/packages/ruby.scm (ruby-ttfunk): Update to 1.6.2.1. [license]: Set to %prawn-project-licenses. --- gnu/packages/ruby.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index f87caa1545..547f50db65 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -8514,7 +8514,7 @@ (define-public ruby-ascii85 (define-public ruby-ttfunk (package (name "ruby-ttfunk") - (version "1.5.1") + (version "1.6.2.1") (source (origin (method git-fetch) @@ -8525,7 +8525,7 @@ (define-public ruby-ttfunk (file-name (git-file-name name version)) (sha256 (base32 - "0dx9891zcli0sjrslmsvrwalv86hbjbqlmbrcasnjr069v05h9v9")))) + "0rsf4j6s97wbcnjbvmmh6xrc7imw4g9lrlcvn945wh400lc8r53z")))) (build-system ruby-build-system) (arguments `(#:test-target "spec" @@ -8557,7 +8557,7 @@ (define-public ruby-ttfunk (home-page "https://github.com/prawnpdf/ttfunk") ;; From the README: "Matz's terms for Ruby, GPLv2, or GPLv3. See LICENSE ;; for details." - (license (list license:gpl2 license:gpl3 license:ruby)))) + (license %prawn-project-licenses))) (define-public ruby-puma (package -- cgit v1.2.3 From e6c7a601b8ae43b155af2118fda199f4cc4d66ab Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 13 Jul 2020 08:49:48 -0400 Subject: gnu: ruby-prawn: Update to commit d980247be8a00e7c59cd4e5785e3aa98f9856db1. * gnu/packages/ruby.scm (ruby-prawn): Update to commit d980247be8a00e7c59cd4e5785e3aa98f9856db1. [arguments]: Drop the #:tests? arguments, enabling tests. [phases]: Remove the 'fix-dependencies phase. Add the 'drop-signing-key-requirement and replace the 'check phase. [native-inputs]: Remove bundler. Add ruby-prawn-manual-builder. [home-page]: Use HTTPS. [license]: Set to %prawn-project-licenses. --- gnu/packages/ruby.scm | 79 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 46 insertions(+), 33 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 547f50db65..c813abf72f 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -9660,39 +9660,52 @@ (define-public ruby-pdf-core (license license:gpl3+))) (define-public ruby-prawn - (package - (name "ruby-prawn") - (version "2.2.2") - (source (origin - (method url-fetch) - (uri (rubygems-uri "prawn" version)) - (sha256 - (base32 - "1qdjf1v6sfl44g3rqxlg8k4jrzkwaxgvh2l4xws97a8f3xv4na4m")))) - (build-system ruby-build-system) - (arguments - ; No tests - `(#:tests? #f - #:phases - (modify-phases %standard-phases - (add-before 'build 'fix-dependencies - (lambda _ - (substitute* "prawn.gemspec" - (("~> 0.7.0") "~> 0.7")) - #t))))) - (propagated-inputs - `(("ruby-pdf-core" ,ruby-pdf-core) - ("ruby-ttfunk" ,ruby-ttfunk))) - (native-inputs - `(("bundler" ,bundler) - ("ruby-pdf-inspector" ,ruby-pdf-inspector) - ("ruby-rspec" ,ruby-rspec) - ("ruby-simplecov" ,ruby-simplecov) - ("ruby-yard" ,ruby-yard))) - (home-page "http://prawnpdf.org/api-docs/2.0/") - (synopsis "PDF generation for Ruby") - (description "Prawn is a pure Ruby PDF generation library.") - (license license:gpl3+))) + ;; There hasn't been a new release since 2017/03/17. + (let ((revision "1") + (commit "d980247be8a00e7c59cd4e5785e3aa98f9856db1")) + (package + (name "ruby-prawn") + (version (git-version "2.2.2" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/prawnpdf/prawn.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0mcmvf22h8il93yq48v9f31qpy27pvjxgv9172p0f4x9lqy0imwr")))) + (build-system ruby-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'build 'drop-signing-key-requirement + (lambda _ + (substitute* "prawn.gemspec" + (("spec.signing_key =.*") + "spec.signing_key = nil")) + #t)) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; The Prawn manual test fails (see: + ;; https://github.com/prawnpdf/prawn/issues/1163), so exclude + ;; it. + (invoke "rspec" "--exclude-pattern" "prawn_manual_spec.rb")) + #t))))) + (propagated-inputs + `(("ruby-pdf-core" ,ruby-pdf-core) + ("ruby-ttfunk" ,ruby-ttfunk))) + (native-inputs + `(("ruby-pdf-inspector" ,ruby-pdf-inspector) + ("ruby-prawn-manual-builder" ,ruby-prawn-manual-builder) + ("ruby-rspec" ,ruby-rspec) + ("ruby-simplecov" ,ruby-simplecov) + ("ruby-yard" ,ruby-yard))) + (home-page "https://prawnpdf.org/api-docs/2.0/") + (synopsis "PDF generation for Ruby") + (description "Prawn is a pure Ruby PDF generation library.") + (license %prawn-project-licenses)))) (define-public ruby-prawn-table (package -- cgit v1.2.3 From cc10ca338849f633c24ec9a79dc694cdbc564d4b Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 13 Jul 2020 09:00:50 -0400 Subject: gnu: ruby-prawn-manual-builder: Use %prawn-project-licenses. * gnu/packages/ruby.scm (ruby-prawn-manual-builder)[license]: Set to %prawn-project-licenses. --- gnu/packages/ruby.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index c813abf72f..e388aee63e 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -4555,10 +4555,7 @@ (define-public ruby-prawn-manual-builder "This package provides a tool for writing manuals for Prawn and Prawn accessories") (home-page "https://github.com/prawnpdf/prawn-manual_builder") - (license (list - ;; GPLv2 or GPLv3 or custom license described in LICENSE file - license:gpl2 - license:gpl3)))) + (license %prawn-project-licenses))) (define-public ruby-progress_bar (package -- cgit v1.2.3 From 15b188c33dafc8ce6af142a740390e9507339526 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 13 Jul 2020 09:17:04 -0400 Subject: gnu: Add ruby-prawn-icon. * gnu/packages/ruby.scm (ruby-prawn-icon): New variable. --- gnu/packages/ruby.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index e388aee63e..6a0ddd6719 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1155,6 +1155,42 @@ (define-public ruby-asciidoctor (home-page "https://asciidoctor.org") (license license:expat))) +(define-public ruby-prawn-icon + (package + (name "ruby-prawn-icon") + (version "2.5.0") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "prawn-icon" version)) + (sha256 + (base32 + "1ivkdf8rdf92hhy97vbmc2a4w97vcvqd58jcj4z9hz3hfsb1526w")))) + (build-system ruby-build-system) + (arguments + `(#:test-target "spec" + #:phases (modify-phases %standard-phases + (add-after 'unpack 'remove-unnecessary-dependencies + (lambda _ + (substitute* '("Rakefile" "spec/spec_helper.rb") + ((".*[Bb]undler.*") "") + (("^require 'rubocop.*") "") + (("^RuboCop.*") "")) + #t))))) + (native-inputs + `(("ruby-pdf-inspector" ,ruby-pdf-inspector) + ("ruby-pdf-reader" ,ruby-pdf-reader) + ("ruby-rspec" ,ruby-rspec) + ("ruby-simplecov" ,ruby-simplecov))) + (propagated-inputs + `(("ruby-prawn" ,ruby-prawn))) + (synopsis "Icon fonts for use with the Prawn PDF toolkit") + (description "@code{Prawn::Icon} provides various icon fonts including +FontAwesome, PaymentFont and Foundation Icons for use with the Prawn PDF +toolkit.") + (home-page "https://github.com/jessedoyle/prawn-icon/") + (license %prawn-project-licenses))) + (define-public ruby-ast (package (name "ruby-ast") -- cgit v1.2.3 From 2d877f6ef3f59e152ae37d72ce150a442baeb7eb Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 13 Jul 2020 09:35:52 -0400 Subject: gnu: Add ruby-css-parser. * gnu/packages/ruby.scm (ruby-css-parser): New variable. --- gnu/packages/ruby.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 6a0ddd6719..c362500e8b 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1191,6 +1191,27 @@ (define-public ruby-prawn-icon (home-page "https://github.com/jessedoyle/prawn-icon/") (license %prawn-project-licenses))) +(define-public ruby-css-parser + (package + (name "ruby-css-parser") + (version "1.7.1") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "css_parser" version)) + (sha256 + (base32 + "04c4dl8cm5rjr50k9qa6yl9r05fk9zcb1zxh0y0cdahxlsgcydfw")))) + (build-system ruby-build-system) + (arguments `(#:tests? #f)) ;gem doesn't ship with test suite + (propagated-inputs + `(("ruby-addressable" ,ruby-addressable))) + (synopsis "Ruby Cascading Style Sheets (CSS) parser") + (description "This package allows loading, parsing and cascading Cascading +Style Sheets (CSS) rule sets in Ruby.") + (home-page "https://github.com/premailer/css_parser") + (license license:expat))) + (define-public ruby-ast (package (name "ruby-ast") -- cgit v1.2.3 From 95692655a1a954835128990f8dedeff4a256bf7a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 13 Jul 2020 10:49:23 -0400 Subject: gnu: Add ruby-prawn-svg. * gnu/packages/ruby.scm (ruby-prawn-svg): New variable. --- gnu/packages/ruby.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index c362500e8b..0a2b6f43a1 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1212,6 +1212,42 @@ (define-public ruby-css-parser (home-page "https://github.com/premailer/css_parser") (license license:expat))) +(define-public ruby-prawn-svg + (package + (name "ruby-prawn-svg") + (version "0.30.0") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "prawn-svg" version)) + (sha256 + (base32 + "0df3l49cy3xpwi0b73hmi2ykbjg9kjwrvhk0k3z7qhh5ghmmrn77")))) + (build-system ruby-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'do-not-use-bundler + (lambda _ + (substitute* "spec/spec_helper.rb" + ((".*[Bb]undler.*") "")) + #t)) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "rspec" "-Ilib" "-rprawn-svg")) + #t))))) + (native-inputs + `(("ruby-rspec" ,ruby-rspec))) + (propagated-inputs + `(("ruby-css-parser" ,ruby-css-parser) + ("ruby-prawn" ,ruby-prawn))) + (synopsis "SVG renderer for the Prawn PDF library") + (description "This library allows rendering Scalable Vector Graphics (SVG) +graphics directly into a Portable Document Format (PDF) document using the +Prawn module.") + (home-page "https://github.com/mogest/prawn-svg") + (license license:expat))) + (define-public ruby-ast (package (name "ruby-ast") -- cgit v1.2.3 From ce52f2b11cb1033e74efe9bb2178fa6667dffff3 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 13 Jul 2020 11:22:10 -0400 Subject: gnu: Add ruby-prawn-templates. * gnu/packages/ruby.scm (ruby-prawn-templates): New variable. --- gnu/packages/ruby.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 0a2b6f43a1..9a5b488029 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1248,6 +1248,48 @@ (define-public ruby-prawn-svg (home-page "https://github.com/mogest/prawn-svg") (license license:expat))) +(define-public ruby-prawn-templates + (package + (name "ruby-prawn-templates") + (version "0.1.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/prawnpdf/prawn-templates.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0wll54wxxwixpwazfn4ffbqvqbfrl01cfsv8y11vnlzy7isx5xvl")))) + (build-system ruby-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'do-not-use-bundler + (lambda _ + (substitute* "spec/spec_helper.rb" + ((".*[Bb]undler.*") "")) + #t)) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "rspec")) + #t))))) + (native-inputs + `(("ruby-pdf-inspector" ,ruby-pdf-inspector) + ("ruby-rspec" ,ruby-rspec))) + (propagated-inputs + `(("ruby-pdf-reader" ,ruby-pdf-reader) + ("ruby-prawn" ,ruby-prawn))) + (synopsis "Prawn extension to include or combine PDF documents") + (description "This @strong{unmaintained} package provides a Prawn +extension that allows including other Portable Document Format (PDF) documents +as background or combining several PDF documents into one. This functionality +used to be part of Prawn itself, but was extracted from Prawn 0.15.0 because +of its many longstanding issues.") + (home-page "https://github.com/prawnpdf/prawn-templates") + (license %prawn-project-licenses))) + (define-public ruby-ast (package (name "ruby-ast") -- cgit v1.2.3 From f949b60e69601fa9965f517ef2de0b7546331844 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 13 Jul 2020 12:00:24 -0400 Subject: gnu: Add ruby-polyglot. * gnu/packages/ruby.scm (ruby-polyglot): New variable. --- gnu/packages/ruby.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 9a5b488029..15a26ef91e 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1290,6 +1290,26 @@ (define-public ruby-prawn-templates (home-page "https://github.com/prawnpdf/prawn-templates") (license %prawn-project-licenses))) +(define-public ruby-polyglot + (package + (name "ruby-polyglot") + (version "0.3.5") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "polyglot" version)) + (sha256 + (base32 + "1bqnxwyip623d8pr29rg6m8r0hdg08fpr2yb74f46rn1wgsnxmjr")))) + (build-system ruby-build-system) + (arguments `(#:tests? #f)) ;no test suite + (synopsis "Augment @code{require} to load non-Ruby file types") + (description "The Polyglot library allows a Ruby module to register a +loader for the file type associated with a filename extension, and it augments +@code{require} to find and load matching files.") + (home-page "https://github.com/cjheath/polyglot") + (license license:expat))) + (define-public ruby-ast (package (name "ruby-ast") -- cgit v1.2.3 From 1f183ca0b2eca997dff46a9cf94c302a972eb98c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 13 Jul 2020 12:00:30 -0400 Subject: gnu: Add ruby-treetop. * gnu/packages/ruby.scm (ruby-treetop): New variable. --- gnu/packages/ruby.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 15a26ef91e..2105b97d26 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1310,6 +1310,45 @@ (define-public ruby-polyglot (home-page "https://github.com/cjheath/polyglot") (license license:expat))) +(define-public ruby-treetop + (package + (name "ruby-treetop") + (version "1.6.10") + (source + (origin + (method git-fetch) ;no test suite in distributed gem + (uri (git-reference + (url "https://github.com/cjheath/treetop.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1dmk94z6ivhrz5hsq68vl5vgydhkz89n394rha1ymddw3rymbfcv")))) + (build-system ruby-build-system) + (arguments + `(#:test-target "spec" + #:phases + (modify-phases %standard-phases + (replace 'replace-git-ls-files + (lambda _ + ;; TODO: Remove after the fix of using 'cut' to better mimic the + ;; git ls-files output is merged in ruby-build-system. + (substitute* "treetop.gemspec" + (("`git ls-files -z`") + "`find . -type f -print0 |sort -z|cut -zc3-`")) + #t))))) + (native-inputs + `(("ruby-activesupport" ,ruby-activesupport) + ("ruby-rr" ,ruby-rr) + ("ruby-rspec" ,ruby-rspec))) + (propagated-inputs + `(("ruby-polyglot" ,ruby-polyglot))) + (synopsis "Ruby-based parsing DSL based on parsing expression grammars") + (description "This package provides a Ruby-based Parsing Expression +Grammar (PEG) parser generator Domain Specific Language (DSL).") + (home-page "https://github.com/cjheath/treetop") + (license license:expat))) + (define-public ruby-ast (package (name "ruby-ast") -- cgit v1.2.3 From 818b402cc55ff02ed3563c4f2f9dbaf2ecde79f1 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 13 Jul 2020 23:17:16 -0400 Subject: gnu: Add ruby-sorcerer. * gnu/packages/ruby.scm (ruby-sorcerer): New variable. --- gnu/packages/ruby.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 2105b97d26..0b40a6fa5f 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -631,6 +631,26 @@ (define-public ruby-rspec-expectations-2 (propagated-inputs `(("ruby-diff-lcs" ,ruby-diff-lcs))))) +(define-public ruby-sorcerer + (package + (name "ruby-sorcerer") + (version "2.0.1") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "sorcerer" version)) + (sha256 + (base32 + "0d32ha9pp9slpmsm027pkdpbr9vc5jn2m8rl6hwwx6a87m8cr58h")))) + (build-system ruby-build-system) + (synopsis "Ripper-style abstract syntax tree to Ruby source generator") + (description "Sorcerer generates Ruby code from a Ripper-like abstract +syntax tree (i.e. S-Expressions). Sorcerer is targeted mainly at small +snippets of Ruby code, expressable in a single line. Longer examples may be +re-sourced, but they will be rendered in a single line format.") + (home-page "https://github.com/rspec-given/sorcerer") + (license license:expat))) + (define-public ruby-rspec-its (package (name "ruby-rspec-its") -- cgit v1.2.3 From 906b9a141abbac5d5da2b12c3dc4777f44ed033c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 13 Jul 2020 23:28:19 -0400 Subject: gnu: Add ruby-given-core. * gnu/packages/ruby.scm (ruby-given-core): New variable. --- gnu/packages/ruby.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 0b40a6fa5f..d48bb054cf 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -651,6 +651,28 @@ (define-public ruby-sorcerer (home-page "https://github.com/rspec-given/sorcerer") (license license:expat))) +(define-public ruby-given-core + (package + (name "ruby-given-core") + (version "3.8.0") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "given_core" version)) + (sha256 + (base32 + "1lzyqllbbv6as3qgwz2007mvy7wy247bgkch9adnmh1zfa73bkrg")))) + (build-system ruby-build-system) + (arguments '(#:tests? #f)) ;no test suite for the core package + (propagated-inputs + `(("ruby-sorcerer" ,ruby-sorcerer))) + (synopsis "Core abstractions used by rspec-given and minitest-given") + (description "Given_core is the basic functionality behind rspec-given and +minitest-given, extensions that allow the use of Given/When/Then terminology +when defining specifications.") + (home-page "https://github.com/rspec-given/rspec-given") + (license license:expat))) + (define-public ruby-rspec-its (package (name "ruby-rspec-its") -- cgit v1.2.3 From 9c1715581fa4e7f0d851cd51288c554d08d06cc4 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 14 Jul 2020 00:17:09 -0400 Subject: gnu: Add ruby-rspec-given. * gnu/packages/ruby.scm (ruby-rspec-given): New variable. --- gnu/packages/ruby.scm | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index d48bb054cf..8acb589c46 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -673,6 +673,55 @@ (define-public ruby-given-core (home-page "https://github.com/rspec-given/rspec-given") (license license:expat))) +(define-public ruby-rspec-given + (package + (name "ruby-rspec-given") + (version "3.8.0") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "rspec-given" version)) + (sha256 + (base32 + "1783bazja10kbha8hk15khvybsq88siyax02cpkk688604h54nji")))) + (build-system ruby-build-system) + (arguments + `(#:test-target "rs" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-rakefile + (lambda _ + (substitute* '("Rakefile" "rakelib/gemspec.rake") + (("require '\\./lib/given/.*") "") + (("Given::VERSION") (format #f "~s" ,version)) + ;; Fix the error: "cannot load such file -- example_helper" + (("sh \"rspec") + "sh \"rspec -Ilib:examples")) + #t)) + (add-after 'extract-gemspec 'delete-failing-tests + ;; See: https://github.com/jimweirich/rspec-given/issues/57. + (lambda _ + (substitute* ".gemspec" + (("\"spec/lib/given/natural_assertion_spec.rb\".freeze, ") + "") + (("\"examples/integration/failing_messages_spec.rb\".freeze, ") + "")) + (delete-file "spec/lib/given/natural_assertion_spec.rb") + (delete-file "examples/integration/failing_messages_spec.rb") + #t))))) + (native-inputs + `(("ruby-rspec" ,ruby-rspec) + ("ruby-minitest" ,ruby-minitest))) + (propagated-inputs + `(("ruby-given-core" ,ruby-given-core) + ("ruby-rspec" ,ruby-rspec))) + (synopsis "Given/When/Then for RSpec and Minitest") + (description "Given is an RSpec extension that allows the use of +Given/When/Then terminology when defining specifications, in a way similar to +the Cucumber Gherkin language.") + (home-page "https://github.com/rspec-given/rspec-given") + (license license:expat))) + (define-public ruby-rspec-its (package (name "ruby-rspec-its") -- cgit v1.2.3 From fe9993b19c93359e336fc9c8ca9e99634abd59a9 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 14 Jul 2020 22:29:02 -0400 Subject: gnu: ruby-coveralls: Strip exact versions from gemspec file. * gnu/packages/ruby.scm (ruby-coveralls)[phases]: New 'strip-version-requirements phase. --- gnu/packages/ruby.scm | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 8acb589c46..4b5b577c06 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -7186,8 +7186,20 @@ (define-public ruby-coveralls "1mv4fn5lfxhy7bc2f1lpnc5yp9mvv97az77j4r7jgrxcqwn8fqxc")))) (build-system ruby-build-system) ;; The test suite depends on ruby-vcr, which cannot be included in Guix - ;; because of its nonfree, Hippocratic derived license. - (arguments '(#:tests? #f)) + ;; because of its nonfree, Hippocratic-derived license. + (arguments + `(#:tests? #f + #:phases (modify-phases %standard-phases + (add-after 'extract-gemspec 'strip-version-requirements + ;; Keeping strict version requirements can cause problems + ;; to users of the library, such as: Gem::ConflictError: + ;; Unable to activate coveralls-0.8.23, because + ;; simplecov-0.17.1 conflicts with simplecov (~> 0.16.1). + (lambda _ + (substitute* "coveralls-ruby.gemspec" + (("(.*add_.*dependency\\([^,]+), .*" _ stripped) + (string-append stripped ")\n"))) + #t))))) (propagated-inputs `(("ruby-json" ,ruby-json) ("ruby-term-ansicolor" ,ruby-term-ansicolor) -- cgit v1.2.3 From 9fc61da93bd37626dd451a02fadd7bbaacfbc88a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 14 Jul 2020 22:34:27 -0400 Subject: gnu: ruby-parser: Update to 2.7.1.4. * gnu/packages/ruby.scm (ruby-parser): Update to 2.7.1.4. --- gnu/packages/ruby.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 4b5b577c06..f280988dbd 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -4741,14 +4741,14 @@ (define-public ruby-parallel-tests (define-public ruby-parser (package (name "ruby-parser") - (version "2.6.0.0") + (version "2.7.1.4") (source (origin (method url-fetch) (uri (rubygems-uri "parser" version)) (sha256 (base32 - "1hhz2k5417vr2k1llwqgjdnmyrhlpqicy0y2arr6r1gp04fg9wlm")))) + "1030znhvhkfn39svwbj6qn4xb6hgl94gnvg57k4d3r76f9bryqmn")))) (build-system ruby-build-system) (native-inputs `(("bundler" ,bundler) -- cgit v1.2.3 From 308104f8e9c45bc4a5b44634f7059624910a14a5 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 14 Jul 2020 22:34:47 -0400 Subject: gnu: ruby-ast: Update to 2.4.1. * gnu/packages/ruby.scm (ruby-ast): Update to 2.4.1. [origin]: Use git-fetch. --- gnu/packages/ruby.scm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index f280988dbd..7a8132a0b6 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1443,14 +1443,17 @@ (define-public ruby-treetop (define-public ruby-ast (package (name "ruby-ast") - (version "2.4.0") + (version "2.4.1") (source (origin - (method url-fetch) - (uri (rubygems-uri "ast" version)) + (method git-fetch) ;no test included in gem from v2.4.1 + (uri (git-reference + (url "https://github.com/whitequark/ast") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "184ssy3w93nkajlz2c70ifm79jp3j737294kbc5fjw69v1w0n9x7")))) + "0k8vya256chimy473g818gim06m5rjgh6mz5sc5g8xz3csh3rysi")))) (build-system ruby-build-system) (arguments '(#:phases -- cgit v1.2.3 From 5c4c28f8f588d65a5b0162aeb81a8b4731e38fe6 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 14 Jul 2020 22:36:25 -0400 Subject: gnu: Add ruby-rubocop-ast. * gnu/packages/ruby.scm (ruby-rubocop-ast): New variable. --- gnu/packages/ruby.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 7a8132a0b6..9099d2f8e6 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -6429,6 +6429,50 @@ (define-public ruby-rest-client (home-page "https://github.com/rest-client/rest-client") (license license:expat))) +(define-public ruby-rubocop-ast + (package + (name "ruby-rubocop-ast") + (version "0.1.0") + (source + (origin + (method git-fetch) ;no test suite in distributed gem + (uri (git-reference + (url "https://github.com/rubocop-hq/rubocop-ast.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0nz25z5b76xkgb9sh370hni3l946j07fr05cdwkdj9x7ibgsb6nj")))) + (build-system ruby-build-system) + (arguments + `(#:test-target "spec" + #:phases (modify-phases %standard-phases + (add-after 'unpack 'disable-bundler + (lambda _ + (substitute* "Rakefile" + (("Bundler\\.setup.*") "nil\n")) + #t)) + (replace 'replace-git-ls-files + (lambda _ + (substitute* "rubocop-ast.gemspec" + (("`git ls-files(.*)`" _ files) + (format #f "`find ~a -type f| sort`" files))) + #t))))) + (native-inputs + `(("ruby-bump" ,ruby-bump) + ("ruby-rspec" ,ruby-rspec))) + (propagated-inputs + `(("ruby-parser" ,ruby-parser))) + (synopsis "RuboCop's AST extensions and NodePattern functionality") + (description "Rubocop::AST extends @code{ruby-parser} with classes used +by RuboCop to deal with Ruby's Abstract Syntax Tree (AST), in particular: +@itemize +@item @code{RuboCop::AST::Node} +@item @code{RuboCop::AST::NodePattern} +@end itemize") + (home-page "https://rubocop.org/") + (license license:expat))) + (define-public ruby-rubocop (package (name "ruby-rubocop") -- cgit v1.2.3 From e098bdae3acdb024f0d73ac4245402811c644dac Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 14 Jul 2020 22:36:33 -0400 Subject: gnu: Add ruby-rexml. * gnu/packages/ruby.scm (ruby-rexml): New variable. --- gnu/packages/ruby.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 9099d2f8e6..ad1692f4b9 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -6473,6 +6473,28 @@ (define-public ruby-rubocop-ast (home-page "https://rubocop.org/") (license license:expat))) +(define-public ruby-rexml + (package + (name "ruby-rexml") + (version "3.2.4") + (source + (origin + (method git-fetch) ;no tests in distributed gem + (uri (git-reference + (url "https://github.com/ruby/rexml.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0rhjjbkaq2f2cs8hyr2i4yjqpcyl8m0wmr2cypa401m3fvz4221i")))) + (build-system ruby-build-system) + (synopsis "XML toolkit for Ruby") + (description "Inspired by Electric XML library for Java, REXML aims to be +easy-to-use API, small and fast. It supports both tree and stream document +parsing.") + (home-page "https://github.com/ruby/rexml") + (license license:bsd-2))) + (define-public ruby-rubocop (package (name "ruby-rubocop") -- cgit v1.2.3 From 93ec41c648ced0c3606923366a3658d335148b11 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 15 Jul 2020 01:08:57 -0400 Subject: gnu: Add ruby-character-set. * gnu/packages/ruby.scm (ruby-character-set): New variable. --- gnu/packages/ruby.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index ad1692f4b9..3c3da2a625 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -6495,6 +6495,35 @@ (define-public ruby-rexml (home-page "https://github.com/ruby/rexml") (license license:bsd-2))) +(define-public ruby-character-set + (package + (name "ruby-character-set") + (version "1.4.0") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "character_set" version)) + (sha256 + (base32 + "0affq9n77vwy897ri2zhmfinfagf37hcwwimrccy1bcxan9mj3h3")))) + (build-system ruby-build-system) + (arguments '(#:tests? #f)) ;avoid a cycle with ruby-regexp-parser + (synopsis "Ruby library to manipulate Unicode") + (description "CharacterSet is a C-extended Ruby library to work with sets +of Unicode code points. It can read and write these sets in various formats +and implements the @code{stdlib} @code{Set} interface for them. It also +offers an alternate paradigm of @code{String} processing which grants much +better performance than @code{Regexp} and @code{String} methods from the +@code{stdlib} where applicable. Many parts can be used independently, e.g.: +@itemize +@item @code{CharacterSet::Character} +@item @code{CharacterSet::Parser} +@item @code{CharacterSet::Writer} +@item @code{RangeCompressor} +@end itemize") + (home-page "https://github.com/jaynetics/character_set") + (license license:expat))) + (define-public ruby-rubocop (package (name "ruby-rubocop") -- cgit v1.2.3 From ac75f1df1d41249260c1599d8d62871189382bb0 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 15 Jul 2020 01:09:06 -0400 Subject: gnu: Add ruby-range-compressor. * gnu/packages/ruby.scm (ruby-range-compressor): New variable. --- gnu/packages/ruby.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 3c3da2a625..cf500c8efe 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -6524,6 +6524,39 @@ (define-public ruby-character-set (home-page "https://github.com/jaynetics/character_set") (license license:expat))) +(define-public ruby-range-compressor + (package + (name "ruby-range-compressor") + (version "1.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janosch-x/range_compressor.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0y8slri2msyyg2szgwgriqd6qw9hkxycssdrcl5lk2dbcq5zvn54")))) + (build-system ruby-build-system) + (arguments + `(#:test-target "spec" + #:phases (modify-phases %standard-phases + (add-after 'extract-gemspec 'strip-version-requirements + (lambda _ + (substitute* "range_compressor.gemspec" + (("(.*add_.*dependency '[_A-Za-z0-9-]+').*" _ stripped) + (string-append stripped "\n"))) + #t))))) + (native-inputs + `(("ruby-rspec" ,ruby-rspec))) + (synopsis "Simple arrays of objects to arrays of ranges compressor") + (description "RangeCompresses is a tiny library that allows compressing +arrays of objects into arrays of ranges. For example, it can turn the +following: @code{[1, 2, 3, 4, 6, 8, 9, 10]} into @code{[1..4, 6..6, 8..10]}.") + (home-page "https://github.com/janosch-x/range_compressor") + (license license:expat))) + (define-public ruby-rubocop (package (name "ruby-rubocop") -- cgit v1.2.3 From 8aba0333b25006e4e09f7cb2b817eea12c4d77a8 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 15 Jul 2020 01:09:18 -0400 Subject: gnu: Add ruby-regexp-property-values. * gnu/packages/ruby.scm (ruby-regexp-property-values): New variable. --- gnu/packages/ruby.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index cf500c8efe..d0c6ccb9c1 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -6557,6 +6557,37 @@ (define-public ruby-range-compressor (home-page "https://github.com/janosch-x/range_compressor") (license license:expat))) +(define-public ruby-regexp-property-values + (package + (name "ruby-regexp-property-values") + (version "1.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference ;no test suite in distributed gem + (url "https://github.com/jaynetics/regexp_property_values.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0l3fjmscg1wxn7kc6bl022cc6k5d91pwb7daq1b5w36kvsx52w1j")))) + (build-system ruby-build-system) + (arguments + '(#:test-target "default")) + (native-inputs + `(("ruby-character-set" ,ruby-character-set) + ("ruby-rake-compiler" ,ruby-rake-compiler) + ("ruby-range-compressor" ,ruby-range-compressor) + ("ruby-rspec" ,ruby-rspec))) + (synopsis "Inspect Ruby's regex engine property values") + (description "This small library lets you see which property values are +supported by the regular expression engine of the Ruby version you are running +and can directly read out their code point ranges. In other words, it +determines all supported values for @code{\\p{value}} expressions and what +they match.") + (home-page "https://github.com/jaynetics/regexp_property_values") + (license license:expat))) + (define-public ruby-rubocop (package (name "ruby-rubocop") -- cgit v1.2.3 From b6f2a8d164420213c9db223cf818626c8ae1a5ef Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 14 Jul 2020 22:36:43 -0400 Subject: gnu: Add ruby-regexp-parser. * gnu/packages/ruby.scm (ruby-regexp-parser): New variable. --- gnu/packages/ruby.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index d0c6ccb9c1..f80bba9b5f 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -6588,6 +6588,47 @@ (define-public ruby-regexp-property-values (home-page "https://github.com/jaynetics/regexp_property_values") (license license:expat))) +(define-public ruby-regexp-parser + (package + (name "ruby-regexp-parser") + (version "1.7.1") + (source + (origin + (method git-fetch) ;bin/test missing from gem + (uri (git-reference + (url "https://github.com/ammar/regexp_parser.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0dk9d4vpw31cc06s29fqyr1kq0kipym1mydifkcrnppvpl3pd53r")))) + (build-system ruby-build-system) + (arguments + '(#:test-target "default" + #:phases (modify-phases %standard-phases + (add-before 'build 'compile-scanner.rb + (lambda _ + (invoke "rake" "build") + ;; XXX: This is needed otherwise the install + ;; phase fails to delete the installed cached + ;; gem file. + (delete-file-recursively "pkg") + #t))))) + (native-inputs + `(("ragel" ,ragel) + ("ruby-regexp-property-values" ,ruby-regexp-property-values) + ("ruby-rspec" ,ruby-rspec))) + (synopsis "A regular expression parser library for Ruby ") + (description "A Ruby gem for tokenizing, parsing, and transforming regular +expressions. It comprises the following components: +@itemize +@item A scanner/tokenizer based on Ragel, +@item A lexer that produces a stream of token objects, +@item A parser that produces a tree of Expression objects. +@end itemize") + (home-page "https://github.com/ammar/regexp_parser") + (license license:expat))) + (define-public ruby-rubocop (package (name "ruby-rubocop") -- cgit v1.2.3 From 12ed6da4fe4dc014c230ebbc857cfc698347ea2f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 14 Jul 2020 22:36:53 -0400 Subject: gnu: Add ruby-test-queue. * gnu/packages/ruby.scm (ruby-test-queue): New variable. --- gnu/packages/ruby.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index f80bba9b5f..0fae903592 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -6629,6 +6629,38 @@ (define-public ruby-regexp-parser (home-page "https://github.com/ammar/regexp_parser") (license license:expat))) +(define-public ruby-test-queue + (package + (name "ruby-test-queue") + (version "0.4.2") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "test-queue" version)) + (sha256 + (base32 + "0hvm3n1qrqxqilhqk4rjivw3gcrd08zz1i6am9qzg1ppjxv6f36f")))) + (build-system ruby-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "rspec")) + #t))))) + (native-inputs + `(("ruby-rspec" ,ruby-rspec))) + (synopsis "Minitest/RSpec parallel test runner for CI environments") + (description "The test-queue module is a parallel test runner, +built using a centralized queue to ensure optimal distribution of +tests between workers. It is specifically optimized for Continuous +Integration (CI) environments: build statistics from each run are +stored locally and used to sort the queue at the beginning of the next +run.") + (home-page "https://github.com/tmm1/test-queue") + (license license:expat))) + (define-public ruby-rubocop (package (name "ruby-rubocop") -- cgit v1.2.3 From c164c402a1899ffd2b2caba541b51e05855e94b8 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 14 Jul 2020 22:37:13 -0400 Subject: gnu: ruby-rubocop: Update to 0.88.0. * gnu/packages/patches/ruby-rubocop-break-dependency-cycle.patch: New file. * gnu/local.mk (dist_patch_DATA): Register patch. * gnu/packages/ruby.scm (ruby-rubocop): Update to 0.88.0. [origin]: Use git-fetch. Apply the newly added patch. [arguments]: Set #:test-target to "default". Remove #:tests?, enabling tests. [phases]{remove-problematic-tests, disable-bundler, set-home, make-adoc-files-writable}: New phases. Replace the 'replace-git-ls-files phase. [native-inputs]: Add ruby-bump, ruby-pry, ruby-rspec, ruby-test-queue, ruby-webmock-2 and ruby-yard. [propagated-inputs]: Remove ruby-powerpack and ruby-jaro-winkler. Add ruby-regexp-parser, ruby-rexml and ruby-rubocop-ast. --- gnu/local.mk | 1 + .../ruby-rubocop-break-dependency-cycle.patch | 101 +++++++++++++++++++++ gnu/packages/ruby.scm | 68 ++++++++++++-- 3 files changed, 160 insertions(+), 10 deletions(-) create mode 100644 gnu/packages/patches/ruby-rubocop-break-dependency-cycle.patch diff --git a/gnu/local.mk b/gnu/local.mk index b3811a473f..e8915990bc 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1513,6 +1513,7 @@ dist_patch_DATA = \ %D%/packages/patches/racket-store-checksum-override.patch \ %D%/packages/patches/retroarch-disable-online-updater.patch \ %D%/packages/patches/ruby-rack-ignore-failing-test.patch \ + %D%/packages/patches/ruby-rubocop-break-dependency-cycle.patch\ %D%/packages/patches/ruby-sanitize-system-libxml.patch \ %D%/packages/patches/ruby-tzinfo-data-ignore-broken-test.patch\ %D%/packages/patches/runc-CVE-2019-5736.patch \ diff --git a/gnu/packages/patches/ruby-rubocop-break-dependency-cycle.patch b/gnu/packages/patches/ruby-rubocop-break-dependency-cycle.patch new file mode 100644 index 0000000000..035a98fa33 --- /dev/null +++ b/gnu/packages/patches/ruby-rubocop-break-dependency-cycle.patch @@ -0,0 +1,101 @@ +From ff3f00b7f33332ebf1c3c05abc4a781684775b3c Mon Sep 17 00:00:00 2001 +From: Maxim Cournoyer +Date: Tue, 14 Jul 2020 11:50:12 -0400 +Subject: [PATCH] config: Drop rubocop-performance, rubocop-rspec requirements. + +This patch removes Rubocop extensions from Rubocop's closure to break +a dependency cycle with itself. + +* .rubocop.yml: Remove rubocop-performance and rubocop-rspec and their +corresponding directives. +* .rubocop_todo.yml: Likewise. +--- + .rubocop.yml | 15 --------------- + .rubocop_todo.yml | 44 -------------------------------------------- + 2 files changed, 59 deletions(-) + +diff --git a/.rubocop.yml b/.rubocop.yml +index 4f05d5be2..f12ef7c06 100644 +--- a/.rubocop.yml ++++ b/.rubocop.yml +@@ -3,8 +3,6 @@ + inherit_from: .rubocop_todo.yml + require: + - rubocop/cop/internal_affairs +- - rubocop-performance +- - rubocop-rspec + + AllCops: + NewCops: enable +@@ -106,16 +104,3 @@ Metrics/ClassLength: + Metrics/ModuleLength: + Exclude: + - 'spec/**/*.rb' +- +-RSpec/FilePath: +- Exclude: +- - spec/rubocop/formatter/junit_formatter_spec.rb +- +-RSpec/PredicateMatcher: +- EnforcedStyle: explicit +- +-RSpec/MessageSpies: +- EnforcedStyle: receive +- +-RSpec/NestedGroups: +- Max: 7 +diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml +index 3f72042d1..fa637cd42 100644 +--- a/.rubocop_todo.yml ++++ b/.rubocop_todo.yml +@@ -24,47 +24,3 @@ Metrics/MethodLength: + # Configuration parameters: CountComments. + Metrics/ModuleLength: + Max: 132 +- +-# Offense count: 10 +-RSpec/AnyInstance: +- Exclude: +- - 'spec/rubocop/cli_spec.rb' +- - 'spec/rubocop/cop/lint/duplicate_methods_spec.rb' +- - 'spec/rubocop/cop/team_spec.rb' +- - 'spec/rubocop/target_finder_spec.rb' +- +-# Offense count: 981 +-# Configuration parameters: Prefixes. +-# Prefixes: when, with, without +-RSpec/ContextWording: +- Enabled: false +- +-# Offense count: 3810 +-# Configuration parameters: Max. +-RSpec/ExampleLength: +- Enabled: false +- +-# Offense count: 38 +-RSpec/ExpectOutput: +- Exclude: +- - 'spec/rubocop/cli/cli_auto_gen_config_spec.rb' +- - 'spec/rubocop/cli/cli_options_spec.rb' +- - 'spec/rubocop/config_spec.rb' +- - 'spec/rubocop/cop/cop_spec.rb' +- - 'spec/rubocop/formatter/disabled_config_formatter_spec.rb' +- - 'spec/rubocop/formatter/formatter_set_spec.rb' +- - 'spec/rubocop/options_spec.rb' +- - 'spec/rubocop/rake_task_spec.rb' +- - 'spec/rubocop/result_cache_spec.rb' +- - 'spec/rubocop/target_finder_spec.rb' +- +-# Offense count: 434 +-RSpec/MultipleExpectations: +- Max: 25 +- +-# Offense count: 5 +-RSpec/SubjectStub: +- Exclude: +- - 'spec/rubocop/config_spec.rb' +- - 'spec/rubocop/formatter/json_formatter_spec.rb' +- - 'spec/rubocop/formatter/progress_formatter_spec.rb' +-- +2.27.0 + diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 0fae903592..8b87449d7d 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -6664,25 +6664,73 @@ (define-public ruby-test-queue (define-public ruby-rubocop (package (name "ruby-rubocop") - (version "0.77.0") + (version "0.88.0") (source (origin - (method url-fetch) - (uri (rubygems-uri "rubocop" version)) + (method git-fetch) ;no tests in distributed gem + (uri (git-reference + (url "https://github.com/rubocop-hq/rubocop.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0m88b1bgbhmmbdnz2xv6n0il0j4q5qm9jbc0vf1zsaxmxqp06nx9")))) + "1d06893jp8pd85fvgp5d16vqcf31bafi430v4f4y746ihyvhzz5r")) + (patches (search-patches "ruby-rubocop-break-dependency-cycle.patch")))) (build-system ruby-build-system) (arguments - '(;; No included tests - #:tests? #f)) + '(#:test-target "default" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'remove-problematic-tests + ;; These tests depend on Rubocop extensions, which cannot be + ;; included as they cause a dependency cycle with Rubocop itself. + (lambda _ + (delete-file "spec/rubocop/config_loader_spec.rb") + (substitute* "Gemfile" + ((".*'rubocop-performance'.*") "") + ((".*'rubocop-rspec'.*") "")) + ;; Prevent "Unnecessary disabling of RSpec/* (unknown cop)" + ;; errors. + (substitute* (find-files "spec/rubocop/cop/" "_spec\\.rb$") + (("# (rubocop:(enable|disable) RSpec.*)" _ what) + (string-append "# Disabled: " what))) + #t)) + (add-after 'unpack 'disable-bundler + (lambda _ + (substitute* "Rakefile" + (("Bundler\\.setup.*") "nil\n")) + #t)) + (replace 'replace-git-ls-files + (lambda _ + (substitute* "rubocop.gemspec" + (("`git ls-files(.*)`" _ files) + (format #f "`find ~a -type f| sort`" files))) + #t)) + (add-before 'check 'set-home + (lambda _ + (setenv "HOME" (getcwd)) + #t)) + (add-before 'check 'make-adoc-files-writable + (lambda _ + (let ((adoc-files (find-files "docs/modules/ROOT/pages" + "\\.adoc$"))) + (for-each make-file-writable adoc-files)) + #t))))) + (native-inputs + `(("ruby-bump" ,ruby-bump) + ("ruby-pry" ,ruby-pry) + ("ruby-rspec" ,ruby-rspec) + ("ruby-test-queue" ,ruby-test-queue) + ("ruby-webmock" ,ruby-webmock-2) + ("ruby-yard" ,ruby-yard))) (propagated-inputs - `(("ruby-parser" ,ruby-parser) - ("ruby-powerpack" ,ruby-powerpack) + `(("ruby-parallel" ,ruby-parallel) + ("ruby-parser" ,ruby-parser) ("ruby-rainbow" ,ruby-rainbow) + ("ruby-regexp-parser" ,ruby-regexp-parser) + ("ruby-rexml" ,ruby-rexml) + ("ruby-rubocop-ast" ,ruby-rubocop-ast) ("ruby-progressbar" ,ruby-progressbar) - ("ruby-parallel" ,ruby-parallel) - ("ruby-jaro-winkler" ,ruby-jaro-winkler) ("ruby-unicode-display-width" ,ruby-unicode-display-width))) (synopsis "Ruby code style checking tool") (description -- cgit v1.2.3 From 668617923b63375e9dc093909d67a3a11df5732a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 14 Jul 2020 00:17:41 -0400 Subject: gnu: Add ruby-rubocop-performance. * gnu/packages/ruby.scm (ruby-rubocop-performance): New variable. --- gnu/packages/ruby.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 8b87449d7d..5666e0c1e9 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1440,6 +1440,28 @@ (define-public ruby-treetop (home-page "https://github.com/cjheath/treetop") (license license:expat))) +(define-public ruby-rubocop-performance + (package + (name "ruby-rubocop-performance") + (version "1.7.1") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "rubocop-performance" version)) + (sha256 + (base32 + "04r8d4x62ygv17spvz9yyfxbmbf8qxwhijs0xycfvzr0q4pyg9sw")))) + (build-system ruby-build-system) + (arguments + `(#:tests? #f)) ;no test suite in the distributed gem + (propagated-inputs + `(("ruby-rubocop" ,ruby-rubocop))) + (synopsis "Performance optimizations checkers for Ruby code") + (description "This package provides a collection of RuboCop cops to check +for performance optimizations in Ruby code.") + (home-page "https://docs.rubocop.org/rubocop-performance/") + (license license:expat))) + (define-public ruby-ast (package (name "ruby-ast") -- cgit v1.2.3 From c7ab342a366a9372d9c6a670a460edaeb8c550a5 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 14 Jul 2020 01:18:11 -0400 Subject: gnu: Add ruby-gimme. * gnu/packages/ruby.scm (ruby-gimme): New variable. --- gnu/packages/ruby.scm | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 5666e0c1e9..ce41b41b4e 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1462,6 +1462,69 @@ (define-public ruby-rubocop-performance (home-page "https://docs.rubocop.org/rubocop-performance/") (license license:expat))) +(define-public ruby-gimme + (let ((revision "1") + (commit "4e71f0236f1271871916dd403261d26533db34c0")) + (package + (name "ruby-gimme") + (version (git-version "0.5.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/searls/gimme.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0hrd32ygvf3i7h47ak8f623cz8ns9q7g60nnnvvlnywbggjaz3h6")))) + (build-system ruby-build-system) + (native-inputs + `(("ruby-coveralls" ,ruby-coveralls) + ("ruby-cucumber" ,ruby-cucumber) + ("ruby-pry" ,ruby-pry) + ("ruby-simplecov" ,ruby-simplecov) + ("ruby-rspec-given" ,ruby-rspec-given))) + (arguments + `(;; The cucumber task fails with error: "index 3 out of matches + ;; (IndexError)", apparently due to our newer Cucumber version. + ;; TODO: Try the "default" task with a future release. + #:test-target "spec" + #:phases + (modify-phases %standard-phases + (add-after 'extract-gemspec 'prepare-for-tests + (lambda _ + ;; Delete failing tests (possibly due to our newer rspec + ;; version). + (delete-file "spec/gimme/gives_class_methods_spec.rb") + (delete-file "spec/gimme/rspec_adapter_spec.rb") + (delete-file "spec/gimme/verifies_class_methods_spec.rb") + ;; Fix duplicate version requirements and de-register files. + (delete-file "Gemfile") + (delete-file "Gemfile.lock") + (substitute* "gimme.gemspec" + ((".*\"Gemfile\".*") "") + ((".*\"Gemfile\\.lock\",.*") "") + ((".*(rspec|cucumber).*\">= 0\".*") "") + (("\"spec/gimme/gives_class_methods_spec.rb\",") "") + (("\"spec/gimme/rspec_adapter_spec.rb\",") "") + (("\"spec/gimme/verifies_class_methods_spec.rb\",") "") + ;; All of these gems relate to development, and are + ;; unnecessary when running the tests. + ((".*(add|gem).*guard-.*") "") + ((".*(add|gem).*jeweler.*") "") + ((".*(add|gem).*pry.*") "") + ((".*(add|gem).*growl.*") "") + ((".*(add|gem).*rb-fsevent.*") "")) + #t))))) + (synopsis "Lightweight test double library for Ruby") + (description "Gimme is a very lightweight test double library for Ruby, +based on Mockito (a mocking framework for Java). It is an opinionated (but +not noisy) means to facilitate test-driving by enabling the authors to specify +only what they care about.") + (home-page "https://github.com/searls/gimme") + (license license:expat)))) + (define-public ruby-ast (package (name "ruby-ast") -- cgit v1.2.3 From 97295c2aa4b7c2e9f5952b6e181812d8e34b769f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 14 Jul 2020 22:25:41 -0400 Subject: gnu: Add ruby-standard. * gnu/packages/ruby.scm (ruby-standard): New variable. --- gnu/packages/ruby.scm | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index ce41b41b4e..e38f9afd22 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1525,6 +1525,58 @@ (define-public ruby-gimme (home-page "https://github.com/searls/gimme") (license license:expat)))) +(define-public ruby-standard + (package + (name "ruby-standard") + (version "0.4.7") + (source + (origin + (method git-fetch) ;no test suite in distributed gem + (uri (git-reference + (url "https://github.com/testdouble/standard.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0ylx0lm2pbbgr5h7fban592w96bl3wxmvfcpcdfrhkxnpg5kiwgv")))) + (build-system ruby-build-system) + (arguments + ;; TODO: the tests are currently broken due to using a newer Rubocop. + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'relax-version-requiremens + (lambda _ + (delete-file "Gemfile") + (delete-file "Gemfile.lock") + #t)) + (replace 'replace-git-ls-files + (lambda _ + ;; TODO: Remove after the fix of using 'cut' to better mimic the + ;; git ls-files output is merged in ruby-build-system. + (substitute* "standard.gemspec" + (("`git ls-files -z`") + "`find . -type f -not -regex '.*\\.gem$' -print0 \ +|sort -z|cut -zc3-`")) + #t))))) + (native-inputs + `(("ruby-gimme" ,ruby-gimme) + ("ruby-pry" ,ruby-pry) + ("ruby-simplecov" ,ruby-simplecov))) + (propagated-inputs + `(("ruby-rubocop" ,ruby-rubocop) + ("ruby-rubocop-performance" ,ruby-rubocop-performance))) + (synopsis "Ruby Style Guide, with linter & automatic code fixer") + (description "Standard is a port of StandardJS. Like StandardJS, it aims +to save time in the following ways: +@itemize +@item No configuration. +@item Automatically format code. +@item Catch style issues and programmer errors early. +@end itemize") + (home-page "https://github.com/testdouble/standard") + (license license:expat))) + (define-public ruby-ast (package (name "ruby-ast") -- cgit v1.2.3 From db9f951b837a95558e98564fdeed1cc2fd37d39b Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 14 Jul 2020 22:26:17 -0400 Subject: gnu: Add ruby-chunky-png. * gnu/packages/ruby.scm (ruby-chunky-png): New variable. --- gnu/packages/ruby.scm | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index e38f9afd22..530e5a14f7 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1577,6 +1577,74 @@ (define-public ruby-standard (home-page "https://github.com/testdouble/standard") (license license:expat))) +(define-public ruby-chunky-png + ;; There hasn't been a release since 2018/11/21 and there are test failures + ;; in that release, so use the latest commit. + (let ((revision "1") + (commit "143b9cd1412e49edd4f8b661c7cd9b22941f43c0")) + (package + (name "ruby-chunky-png") + (version (git-version "1.3.11" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/wvanbergen/chunky_png.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0wbcgfzymbpmmxsb04arc49a2icki6f2fc6d6sqgg8369mc67g9z")))) + (build-system ruby-build-system) + (arguments + `(#:test-target "spec" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'disable-bundler + (lambda _ + (substitute* (find-files "." "\\.rb$") + (("require.*bundler/setup.*") "")) + #t)) + (replace 'replace-git-ls-files + (lambda _ + ;; TODO: Remove after the fix of using 'cut' to better mimic the + ;; git ls-files output is merged in ruby-build-system. + (substitute* "chunky_png.gemspec" + (("`git ls-files`") + "`find . -type f -not -regex '.*\\.gem$' |sort |cut -c3-`")) + #t))))) + (native-inputs + `(("bundler" ,bundler) + ("ruby-rspec" ,ruby-rspec) + ("ruby-standard" ,ruby-standard) + ("ruby-yard" ,ruby-yard))) + (synopsis "Ruby library to handle PNG images") + (description "ChunkyPNG is a pure Ruby library that can read and write +Portable Network Graphics (PNG) images without depending on an external image +library. It tries to be memory efficient and reasonably fast. It has +features such as: +@itemize +@item +Decoding support for any image that the PNG standard allows. This includes all +standard color modes, all bit depths, all transparency, and interlacing and +filtering options. +@item +Encoding support for images of all color modes (true color, grayscale, and +indexed) and transparency for all these color modes. The best color mode is +chosen automatically, based on the amount of used colors. +@item Read/write access to the image's pixels. +@item Read/write access to all image metadata that is stored in chunks. +@item +Memory efficiency: @code{fixnum} are used, i.e. 4 or 8 bytes of memory per +pixel, depending on the hardware). +@item +Performance: ChunkyPNG is reasonably fast for Ruby standards, by only using +integer math and a highly optimized saving routine. +@item Interoperability with RMagick. +@end itemize") + (home-page "https://github.com/wvanbergen/chunky_png/wiki") + (license license:expat)))) + (define-public ruby-ast (package (name "ruby-ast") -- cgit v1.2.3 From f421785bd7bf44da6080b1d5df9311a5486c49a7 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 14 Jul 2020 22:26:27 -0400 Subject: gnu: Add ruby-text-hyphen. * gnu/packages/ruby.scm (ruby-text-hyphen): New variable. --- gnu/packages/ruby.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 530e5a14f7..21b1abade4 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1645,6 +1645,31 @@ (define-public ruby-chunky-png (home-page "https://github.com/wvanbergen/chunky_png/wiki") (license license:expat)))) +(define-public ruby-text-hyphen + (package + (name "ruby-text-hyphen") + (version "1.4.1") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "text-hyphen" version)) + (sha256 + (base32 + "1gj4awvs9ryf960m0iawg43jyjmfwcqgfwrbcfp890a57b9ag7q1")))) + (build-system ruby-build-system) + (native-inputs + `(("ruby-hoe" ,ruby-hoe))) + (synopsis "Ruby library to hyphenate words in various languages") + (description "Text::Hyphen is a Ruby library to hyphenate words in various +languages using Ruby-fied versions of TeX hyphenation patterns. It will +properly hyphenate various words according to the rules of the language the +word is written in. The algorithm is based on that of the TeX typesetting +system by Donald E. Knuth.") + (home-page "https://github.com/halostatue/text-hyphen") + ;; The whole is licensed under the Expat license, but parts use various + ;; versions of the LaTeX Project Public License. + (license license:expat))) + (define-public ruby-ast (package (name "ruby-ast") -- cgit v1.2.3 From 7d94616d2ad713cad7fc4878e767f4a9018baf4c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 14 Jul 2020 22:43:49 -0400 Subject: gnu: Add ruby-open-uri-cached. * gnu/packages/ruby.scm (ruby-open-uri-cached): New variable. --- gnu/packages/ruby.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 21b1abade4..49ed262187 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1670,6 +1670,27 @@ (define-public ruby-text-hyphen ;; versions of the LaTeX Project Public License. (license license:expat))) +(define-public ruby-open-uri-cached + (package + (name "ruby-open-uri-cached") + (version "0.0.5") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "open-uri-cached" version)) + (sha256 + (base32 + "13xy2vhrgz9mdxhklw5fszhamsdxh8ysf3l40g92hqm4hm288wap")))) + (build-system ruby-build-system) + (arguments + `(#:tests? #f)) ;no test suite + (synopsis "OpenURI with transparent disk caching") + (description "OpenURI with transparent disk caching, which is +useful to avoid making excessive queries, for example when scraping +web pages.") + (home-page "https://github.com/tigris/open-uri-cached") + (license license:expat))) + (define-public ruby-ast (package (name "ruby-ast") -- cgit v1.2.3 From 22d6b5345284c5995814368b612c7dbec22e6979 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 14 Jul 2020 22:54:56 -0400 Subject: gnu: ruby-rouge: Update to 3.21.0. * gnu/packages/ruby.scm (ruby-rouge): Update to 3.21.0. --- gnu/packages/ruby.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 49ed262187..69f7e7683e 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -10662,13 +10662,13 @@ (define-public ruby-em-websocket (define-public ruby-rouge (package (name "ruby-rouge") - (version "3.13.0") + (version "3.21.0") (source (origin (method url-fetch) (uri (rubygems-uri "rouge" version)) (sha256 (base32 - "1y90nx9ph9adnrpcsvs2adca2l3dyz8am2d2kzxkwd3a086ji7aw")))) + "1agrrmj88k9jkk36ra1ml2c1jffpp595pkxmcla74ac9ia09vn3s")))) (build-system ruby-build-system) (arguments `(#:tests? #f)); No rakefile (home-page "http://rouge.jneen.net/") -- cgit v1.2.3 From 9c5a7d0012944809128eca76938e8eb573abc979 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 14 Jul 2020 22:45:21 -0400 Subject: gnu: Add ruby-asciidoctor-pdf. * gnu/packages/ruby.scm (ruby-asciidoctor-pdf): New variable. --- gnu/packages/ruby.scm | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 69f7e7683e..e03edfc747 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1691,6 +1691,111 @@ (define-public ruby-open-uri-cached (home-page "https://github.com/tigris/open-uri-cached") (license license:expat))) +(define-public ruby-asciidoctor-pdf + ;; Use the latest commit, as the last tag doesn't build with the + ;; latest Ruby dependencies in Guix. + (let ((revision "1") + (commit "d257440df895d1595a3825ef58b32e4b290ba1c3")) + (package + (name "ruby-asciidoctor-pdf") + (version (git-version "1.5.3" revision commit)) + (source + (origin + (method git-fetch) ;no test suite in the distributed gem + (uri (git-reference + (url "https://github.com/asciidoctor/asciidoctor-pdf.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1563d11ghzsrsg4inwfwj6b9hb5sk5b429f49fwq5qg3sq76kgjj")))) + (build-system ruby-build-system) + (arguments + `(#:test-target "spec" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'remove-failing-tests + ;; Two tests module fail for unknown reasons, *only* when + ;; ran in the build container (see: + ;; https://github.com/asciidoctor/asciidoctor-pdf/issues/1725#issuecomment-658777965). + (lambda _ + (delete-file "spec/audio_spec.rb") + (delete-file "spec/video_spec.rb") + #t)) + (add-after 'extract-gemspec 'strip-version-requirements + (lambda _ + (substitute* "asciidoctor-pdf.gemspec" + (("(.*add_.*dependency '[_A-Za-z0-9-]+').*" _ stripped) + (string-append stripped "\n"))) + #t)) + (replace 'replace-git-ls-files + ;; TODO: Remove after the fix of using 'cut' to better mimic the + ;; git ls-files output is merged in ruby-build-system. + (lambda _ + (substitute* "asciidoctor-pdf.gemspec" + (("`git ls-files -z`") + "`find . -type f -not -regex '.*\\.gem$' -print0 \ +|sort -z|cut -zc3-`")) + #t)) + ;; The tests rely on the Gem being installed, so move the check phase + ;; after the install phase. + (delete 'check) + (add-after 'install 'check + (lambda* (#:key outputs tests? #:allow-other-keys) + (let ((new-gem (string-append (assoc-ref outputs "out") + "/lib/ruby/vendor_ruby"))) + (setenv "GEM_PATH" + (string-append (getenv "GEM_PATH") ":" new-gem)) + (when tests? + (invoke "rspec" "-t" "~visual" "-t" "~cli" "-t" "~network")) + #t)))))) + (native-inputs + `(("ruby-chunky-png" ,ruby-chunky-png) + ("ruby-coderay" ,ruby-coderay) + ("ruby-pdf-inspector" ,ruby-pdf-inspector) + ("ruby-rouge" ,ruby-rouge) + ("ruby-rspec" ,ruby-rspec))) + (propagated-inputs + `(("ruby-asciidoctor" ,ruby-asciidoctor) + ("ruby-concurrent-ruby" ,ruby-concurrent) + ("ruby-open-uri-cached" ,ruby-open-uri-cached) + ("ruby-prawn" ,ruby-prawn) + ("ruby-prawn-icon" ,ruby-prawn-icon) + ("ruby-prawn-svg" ,ruby-prawn-svg) + ("ruby-prawn-table" ,ruby-prawn-table) + ("ruby-prawn-templates" ,ruby-prawn-templates) + ("ruby-safe-yaml" ,ruby-safe-yaml) + ("ruby-text-hyphen" ,ruby-text-hyphen) + ("ruby-thread-safe" ,ruby-thread-safe) + ("ruby-treetop" ,ruby-treetop) + ("ruby-ttfunk" ,ruby-ttfunk))) + (synopsis"AsciiDoc to Portable Document Format (PDF)} converter") + (description "Asciidoctor PDF is an extension for Asciidoctor that +converts AsciiDoc documents to Portable Document Format (PDF) using the Prawn +PDF library. It has features such as: +@itemize +@item Direct AsciiDoc to PDF conversion +@item Configuration-driven theme (style and layout) +@item Scalable Vector Graphics (SVG) support +@item PDF document outline (i.e., bookmarks) +@item Table of contents page(s) +@item Document metadata (title, authors, subject, keywords, etc.) +@item Internal cross reference links +@item Syntax highlighting with Rouge, Pygments, or CodeRay +@item Page numbering +@item Customizable running content (header and footer) +@item +“Keep together” blocks (i.e., page breaks avoided in certain block content) +@item Orphaned section titles avoided +@item Autofit verbatim blocks (as permitted by base_font_size_min setting) +@item Table border settings honored +@item Font-based icons +@item Custom TrueType (TTF) fonts +@item Double-sided printing mode (margins alternate on recto and verso pages) +@end itemize") + (home-page "https://asciidoctor.org/docs/asciidoctor-pdf") + (license license:expat)))) + (define-public ruby-ast (package (name "ruby-ast") -- cgit v1.2.3 From 479c032495b8c872dc4fb5348702a6d4fa07ca8c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 17 Jul 2020 17:23:38 -0400 Subject: gnu: ruby-yard: Make the package reproducible. * gnu/packages/ruby.scm (ruby-yard)[phases]: Add a 'do-not-set-date-in-gemspec phase. --- gnu/packages/ruby.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index e03edfc747..99ef4fbd6b 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -8098,7 +8098,15 @@ (define-public ruby-yard (arguments ;; Note: Tests are willfully disabled to alleviate dependency cycle ;; problems. - `(#:tests? #f)) + `(#:tests? #f + #:phases (modify-phases %standard-phases + (add-after 'unpack 'do-not-set-date-in-gemspec + ;; Fix a reproducibility issue (see: + ;; https://github.com/lsegal/yard/issues/1343). + (lambda _ + (substitute* "yard.gemspec" + ((".*s\\.date.*") "")) + #t))))) (synopsis "Documentation generation tool for Ruby") (description "YARD is a documentation generation tool for the Ruby programming language. It enables the user to generate consistent, usable -- cgit v1.2.3 From b998b19e5189b67239c4058ecc31dd054083fe75 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Sat, 18 Jul 2020 11:28:11 +0200 Subject: gnu: rust-dirs-sys-0.3: Update to 0.3.5. * gnu/packages/crates-io.scm (rust-dirs-sys-0.3): Update to 0.3.5. (rust-dirs-2.0, rust-dirs-sys-0.3): Don't skip build. --- gnu/packages/crates-io.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9df41311a1..8a1e462f85 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5624,8 +5624,7 @@ (define-public rust-dirs-2.0 (base32 "1qymhyq7w7wlf1dirq6gsnabdyzg6yi2yyxkx6c4ldlkbjdaibhk")))) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-0.1) ("rust-dirs-sys" ,rust-dirs-sys-0.3)))) (build-system cargo-build-system) @@ -5662,7 +5661,7 @@ (define-public rust-dirs-1.0 (define-public rust-dirs-sys-0.3 (package (name "rust-dirs-sys") - (version "0.3.4") + (version "0.3.5") (source (origin (method url-fetch) @@ -5671,11 +5670,10 @@ (define-public rust-dirs-sys-0.3 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0yyykdcmbc476z1v9m4z5jb8y91dw6kgzpkiqi2ig07xx0yv585g")))) + "0ym5843xack45b1yjahrh3q2f72shnwf1dd2jncf9qsxf3sxg4wf")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-0.1) ("rust-libc" ,rust-libc-0.2) ("rust-redox-users" ,rust-redox-users-0.3) -- cgit v1.2.3 From 7bbe61f8fffb0f21e9a75c7fb8e134d7dbaa9ced Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 18 Jul 2020 13:24:12 +0200 Subject: gnu: java-hamcrest-library: Fix race condition. * gnu/packages/java.scm (java-hamcrest-library)[arguments]: Fix build.xml in the same way it is fixed in java-hamcrest-all to prevent a race condition. --- gnu/packages/java.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index d42b537ae2..424c24b75f 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -3796,6 +3796,13 @@ (define-public java-hamcrest-library ((#:build-target _) "library") ((#:phases phases) `(modify-phases ,phases + (add-after 'unpack 'patch-classpath-for-integration + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "build.xml" + (("build/hamcrest-core-\\$\\{version\\}\\.jar") + (car (find-files (assoc-ref inputs "java-hamcrest-core") + "jar$")))) + #t)) (replace 'create-pom (lambda _ (substitute* "pom/hamcrest-library.pom" -- cgit v1.2.3 From ba1d9680d61d3b06d9b81a81863448f494d654a7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jul 2020 21:10:27 +0200 Subject: .guix-authorizations: Add brettgilio (back) to the committers. * .guix-authorizations: Add fingerprint for brettgilio. --- .guix-authorizations | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.guix-authorizations b/.guix-authorizations index a5a081857a..7b3f2dfd1f 100644 --- a/.guix-authorizations +++ b/.guix-authorizations @@ -33,6 +33,8 @@ (name "biscuolo")) ("7988 3B9F 7D6A 4DBF 3719 0367 2506 A96C CF63 0B21" (name "boskovits")) + ("E82A C026 95D6 FF02 43CA 1E5C F6C5 2DD1 BA27 CB87" + (name "brettgilio")) (;; primary: "8929 BBC5 73CD 9206 3DDD 979D 3D36 CAA0 116F 0F99" "1C9B F005 1A1A 6A44 5257 599A A949 03A1 66A1 8FAE" (name "bricewge")) -- cgit v1.2.3 From 1825729f8b2d803c3817ffc5fe191acc0394f004 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 18 Jul 2020 22:46:29 +0300 Subject: gnu: simplescreenrecorder: Update to 0.4.2. * gnu/packages/video.scm (simplescreenrecorder): Update to 0.4.2. [inputs]: Add libxinerama. --- gnu/packages/video.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index e188b37f14..52c51b9851 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2626,7 +2626,7 @@ (define-public recordmydesktop (define-public simplescreenrecorder (package (name "simplescreenrecorder") - (version "0.3.11") + (version "0.4.2") (source (origin (method git-fetch) @@ -2636,7 +2636,7 @@ (define-public simplescreenrecorder (file-name (git-file-name name version)) (sha256 (base32 - "0n702dnv4qshgn3b90ixvplfafjhgz6040yir5vy8khjdpciysq4")))) + "1dzp5yzqlha65crzklx2qlan6ssw1diwzfpc4svd7gnr858q2292")))) (build-system cmake-build-system) ;; Although libx11, libxfixes, libxext are listed as build dependencies in ;; README.md, the program builds and functions properly without them. @@ -2647,6 +2647,7 @@ (define-public simplescreenrecorder ("glu" ,glu) ("jack" ,jack-1) ("libxi" ,libxi) + ("libxinerama" ,libxinerama) ("pulseaudio" ,pulseaudio) ("qtbase" ,qtbase) ("qtx11extras" ,qtx11extras))) -- cgit v1.2.3 From 7e6df0e99305c800a24b9217776f8b75dad3bab9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jul 2020 02:11:01 +0200 Subject: gnu: libzip: Update to 1.7.3. * gnu/packages/compression.scm (libzip): Update to 1.7.3. --- gnu/packages/compression.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index e45b86b5c7..72e2d1343c 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1635,14 +1635,14 @@ (define-public zziplib (define-public libzip (package (name "libzip") - (version "1.7.2") + (version "1.7.3") (source (origin (method url-fetch) (uri (string-append "https://libzip.org/download/libzip-" version ".tar.xz")) (sha256 (base32 - "0kpz85yqgn0yrrc9bfq95ssbvvs6q525xwq6mvkfv5hjvijvc4vj")))) + "0ck1dk7zn5qzpgxklg0r26nfsf04xb6c46gsig060hkvvgzp6156")))) (native-inputs `(("perl" ,perl))) (inputs -- cgit v1.2.3 From 8e8088050877661f572958cb5d809de739f19f43 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jul 2020 02:17:33 +0200 Subject: gnu: r-loo: Update to 2.3.1. * gnu/packages/cran.scm (r-loo): Update to 2.3.1. --- gnu/packages/cran.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index e6fd3f27c3..5ede11a4e3 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -21176,14 +21176,13 @@ (define-public r-rstantools (define-public r-loo (package (name "r-loo") - (version "2.3.0") + (version "2.3.1") (source (origin (method url-fetch) (uri (cran-uri "loo" version)) (sha256 - (base32 - "1lgkmb9938x5cfm0rff3lp4wrj2rvsv61dw1iz1jfd4xr38w87wx")))) + (base32 "12z0k8lhz0rxygs5lc7076nw6qhk0pda8nxf65hkinfrf4dy53fr")))) (properties `((upstream-name . "loo"))) (build-system r-build-system) (inputs -- cgit v1.2.3 From e93253b7a5d1f37d6afb78cdee0649f2040d4fdf Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jul 2020 02:18:37 +0200 Subject: gnu: nnn: Update to 3.3. * gnu/packages/admin.scm (nnn): Update to 3.3. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 5a867d6c62..806d2fb08e 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3344,14 +3344,14 @@ (define-public pfetch (define-public nnn (package (name "nnn") - (version "3.2") + (version "3.3") (source (origin (method url-fetch) (uri (string-append "https://github.com/jarun/nnn/releases/download/v" version "/nnn-v" version ".tar.gz")) (sha256 - (base32 "1zflz7yj5wzdnl0728g8qrld2z6dqn7sblbmkjvyqlv1fwjd1fsf")))) + (base32 "1jiaygylwrlz6rlls1q69xw10j6ypr96yshsbzisg0adk37lbchn")))) (build-system gnu-build-system) (inputs `(("ncurses" ,ncurses) -- cgit v1.2.3 From 6052fd73ae60760407ea2c57007ad11b60e60f4e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jul 2020 02:18:53 +0200 Subject: gnu: 7kaa: Update to 2.15.4p1. * gnu/packages/games.scm (7kaa): Update to 2.15.4p1. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 36e379dd99..e037ff649c 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -11459,7 +11459,7 @@ (define-public burgerspace (define-public 7kaa (package (name "7kaa") - (version "2.15.4") + (version "2.15.4p1") (source (origin (method url-fetch) @@ -11467,7 +11467,7 @@ (define-public 7kaa "releases/download/v" version "/" "7kaa-" version ".tar.xz")) (sha256 - (base32 "0n0bn6xshv3cwk8j0lkl65a1vqd1xkkzlhvwxm32va80nc16d5ds")))) + (base32 "1y7v0jhp3apb619p7asikqr1dnwb2yxbh40wbx1ppmr5f03mq9ph")))) (build-system gnu-build-system) (native-inputs `(("gettext" ,gettext-minimal) -- cgit v1.2.3 From 7ffec020aec9ccbc531d24e65acd93e9f3962f9f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jul 2020 02:19:05 +0200 Subject: gnu: clamav: Update to 0.102.4. * gnu/packages/antivirus.scm (clamav): Update to 0.102.4. --- gnu/packages/antivirus.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/antivirus.scm b/gnu/packages/antivirus.scm index 367ebe70dd..c7bf911ae7 100644 --- a/gnu/packages/antivirus.scm +++ b/gnu/packages/antivirus.scm @@ -44,14 +44,14 @@ (define-module (gnu packages antivirus) (define-public clamav (package (name "clamav") - (version "0.102.3") + (version "0.102.4") (source (origin (method url-fetch) (uri (string-append "https://www.clamav.net/downloads/production/" "clamav-" version ".tar.gz")) (sha256 (base32 - "14q6vi178ih60yz4ja33b6181va1dcj8fyscnmxfx2crav250c7d")) + "06rrzyrhnr0rswryijpbbzywr6387rv8qjq8sb8cl3h2d1m45ggf")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 754cfbdcc084727cc926e670c25b294b38c8f7aa Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Thu, 2 Jul 2020 23:25:18 -0500 Subject: gnu: Add GNOME MultiWriter. * gnu/packages/gnome.scm (gnome-multi-writer): New variable. --- gnu/packages/gnome.scm | 43 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 78609b571b..116f6d660f 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2013, 2015 Andreas Enge ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2014 Ian Denhardt -;;; Copyright © 2014, 2016 Eric Bavier +;;; Copyright © 2014, 2016, 2020 Eric Bavier ;;; Copyright © 2014, 2015 Federico Beffa ;;; Copyright © 2015, 2016 Sou Bunnbu ;;; Copyright © 2015 Mathieu Lirzin @@ -3964,6 +3964,47 @@ (define-public gnome-mines floating in an ocean using only your brain and a little bit of luck.") (license license:gpl2+))) +(define-public gnome-multi-writer + (package + (name "gnome-multi-writer") + (version "3.35.90") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/gnome-multi-writer/" + (version-major+minor version) "/" + "gnome-multi-writer-" version ".tar.xz")) + (sha256 + (base32 + "07vgzjjdrxcp7h73z13h9agafxb4vmqx5i81bcfyw0ilw9kkdzmp")))) + (build-system meson-build-system) + (arguments + '(#:glib-or-gtk? #t + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'skip-post-install + (lambda _ + (substitute* "meson.build" + (("meson.add_install_script" &) (string-append "# " &))) + #t))))) + (native-inputs + `(("glib:bin" ,glib "bin") + ("pkg-config" ,pkg-config))) + (inputs + `(("gtk+" ,gtk+) + ("glib" ,glib) ; for gio + ("gusb" ,gusb) + ("udisks" ,udisks) + ("libgudev" ,libgudev) + ("libcanberra" ,libcanberra) + ("polkit" ,polkit))) + (home-page "https://wiki.gnome.org/Apps/MultiWriter") + (synopsis "Write to multiple USB devices at once") + (description + "MultiWriter can be used to write an ISO file to multiple USB devices at +once.") + (license license:gpl2+))) + (define-public gnome-sudoku (package (name "gnome-sudoku") -- cgit v1.2.3 From d3eef4276076ad0e54f8c9b438b9cd90311f1a8e Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Sat, 18 Jul 2020 22:19:06 -0500 Subject: gnu: tdlib: Update to 1.6.6. * gnu/packages/messaging.scm (tdlib): Update to 1.6.6. --- gnu/packages/messaging.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 3cdb4f2df3..adf648a0a6 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -2144,9 +2144,9 @@ (define-public telegram-purple (license license:gpl2+))) (define-public tdlib - (let ((commit "278c7acdec83c5ac17d8e1ed0bb2cacbcea62460") + (let ((commit "f45d80fe16f99d112d545b7cd74ce46342fe3437") (revision "0") - (version "1.6.0")) + (version "1.6.6")) (package (name "tdlib") (version (git-version version revision commit)) @@ -2157,7 +2157,7 @@ (define-public tdlib (commit commit))) (sha256 (base32 - "0zlzpl6fgszg18kwycyyyrnkm255dvc6fkq0b0y32m5wvwwl36cv")) + "1q8zw26mqhpdzvqbgc7fmn8rzwm5amb8m7s6impin4342wj7h6nr")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments -- cgit v1.2.3 From 282ca4a135919b324d447a5e1f643fce4cc17da5 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Sat, 18 Jul 2020 22:19:48 -0500 Subject: gnu: emacs-telega: Update to 0.6.27. * gnu/packages/emacs-xyz.scm (emacs-telega): Update to 0.6.27. [arguments]: Move 'telega-paths-patch after check phase to work around substituting store paths for ffmpeg and ffplay. --- gnu/packages/emacs-xyz.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 55afda50df..3145faf3b4 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -22242,9 +22242,9 @@ (define-public emacs-telega ;; This package has versions newer than indicated on MELPA. ;; Get the current version from `telega-version` in telega.el. ;; or by running M-x telega-version. - (let ((commit "ae09592498ce380e57fbb76725fd4c89ae248864") + (let ((commit "5fd725ef8e0b4cf2eb908b1f48638a9d5df49b93") (revision "0") - (version "0.6.0")) + (version "0.6.27")) (package (name "emacs-telega") (version (git-version version revision commit)) @@ -22256,7 +22256,7 @@ (define-public emacs-telega (commit commit))) (sha256 (base32 - "0mv6i80958d9crzspzik5xh5g8326115bvg2frgv0dp9p6rm86m3")) + "1852xkd8pq1g6c74nm8kbgiglsig7cyizp2igr4mydln2pak0ccx")) (patches (search-patches "emacs-telega-test-env.patch")) (file-name (git-file-name name version)))) (build-system gnu-build-system) @@ -22284,7 +22284,7 @@ (define-public emacs-telega (("python3 run_tests.py") "")) #t)) - (add-after 'unpack 'telega-paths-patch + (add-after 'check 'telega-paths-patch (lambda* (#:key inputs #:allow-other-keys) ;; Hard-code paths to `ffplay` and `ffmpeg`. (let ((ffplay-bin (string-append (assoc-ref inputs "ffmpeg") @@ -22345,6 +22345,8 @@ (define-public emacs-telega (propagated-inputs `(("emacs-visual-fill-column" ,emacs-visual-fill-column) ("emacs-company" ,emacs-company) + ("emacs-rainbow-identifiers" + ,emacs-rainbow-identifiers) ("libwebp" ,libwebp))) ; sticker support. (native-inputs `(("tdlib" ,tdlib) -- cgit v1.2.3 From d37eb6bb20069464e3a82d15a350084b457c12f6 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Sat, 18 Jul 2020 23:38:10 -0500 Subject: gnu: swi-prolog: Update to 8.3.4. * gnu/packages/prolog.scm (swi-prolog): Update to 8.3.4. [arguments]: Several test phases now pass that were broken previously, so 'delete-failing-tests-(pre/post) have been removed in favor of a single 'delete-failing-tests phase after unpack. The comment was revised to reflect this change. --- gnu/packages/prolog.scm | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/gnu/packages/prolog.scm b/gnu/packages/prolog.scm index 3c96576ba9..18c51a7c94 100644 --- a/gnu/packages/prolog.scm +++ b/gnu/packages/prolog.scm @@ -86,7 +86,7 @@ (define-public gprolog (define-public swi-prolog (package (name "swi-prolog") - (version "8.1.21") + (version "8.3.4") (source (origin (method git-fetch) (uri (git-reference @@ -96,7 +96,7 @@ (define-public swi-prolog (file-name (git-file-name name version)) (sha256 (base32 - "1axdiz37dllw0ih58ffm0m95dfxqfzwahl48hpzq90rz4swcr1lq")))) + "1r8ypnm8vd2si5wsc9f9i612967l9pdd57bdq4n29mjnl18wznfr")))) (build-system cmake-build-system) (arguments `(#:parallel-build? #t @@ -106,11 +106,9 @@ (define-public swi-prolog "-DSWIPL_INSTALL_IN_LIB=OFF") ; FIXME: Breaks RUNPATH validation. #:phases (modify-phases %standard-phases - ;; XXX: Delete a variety of tests which fail either attempting to - ;; establish a network connection, or attempts to write to the - ;; immutable store. Phases marked *-pre are disabled /before/ building. - ;; Phases marked *-post are disabled /after/ building. - (add-after 'unpack 'delete-failing-tests-pre + ;; XXX: Delete the test phase that attempts to write to the + ;; immutable store. + (add-after 'unpack 'delete-failing-tests (lambda _ (substitute* "src/CMakeLists.txt" ((" save") "")) @@ -119,16 +117,6 @@ (define-public swi-prolog (with-directory-excursion "src/Tests" (for-each delete-file-recursively '("save"))) - #t)) - (add-before 'check 'delete-failing-tests-post - (lambda _ - (with-directory-excursion "packages" - (for-each delete-file-recursively - '("http" - "pengines" - "RDF" - "semweb" - "ssl"))) #t))))) (native-inputs `(("zlib" ,zlib) -- cgit v1.2.3 From 667903d1433ae86df09cc090daac67faa62afd32 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Sat, 18 Jul 2020 23:51:32 -0500 Subject: gnu: straw-viewer: Update to 0.0.6. * gnu/packages/video.scm (straw-viewer): Update to 0.0.6. --- gnu/packages/video.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 52c51b9851..4120174484 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -43,6 +43,7 @@ ;;; Copyright © 2020 Alex McGrath ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020 Vinicius Monego +;;; Copyright © 2020 Brett Gilio ;;; ;;; This file is part of GNU Guix. ;;; @@ -528,7 +529,7 @@ (define-public mkvtoolnix (define-public straw-viewer (package (name "straw-viewer") - (version "0.0.2") + (version "0.0.6") (source (origin (method git-fetch) @@ -537,7 +538,8 @@ (define-public straw-viewer (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "067j8wdfy29bi5ahky10xzzs8cr3mn95wl4kyqqjvjzri77a25j3")))) + (base32 + "0a9g10r56jdm2jx2yg9i8j8nczq74x78c29bhannr7ybnm2r6w2a")))) (build-system perl-build-system) (native-inputs `(("perl-module-build" ,perl-module-build) -- cgit v1.2.3 From 4deab59f5aed983dd6466603be8b6bb122c83e04 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Sun, 19 Jul 2020 02:29:31 -0500 Subject: gnu: lean: Update to 3.17.1. * gnu/packages/lean.scm (lean): Update to 3.17.1. --- gnu/packages/lean.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/lean.scm b/gnu/packages/lean.scm index 235113d475..79d2ef4436 100644 --- a/gnu/packages/lean.scm +++ b/gnu/packages/lean.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Amin Bandali +;;; Copyright © 2020 Brett Gilio ;;; ;;; This file is part of GNU Guix. ;;; @@ -26,7 +27,7 @@ (define-module (gnu packages lean) (define-public lean (package (name "lean") - (version "3.5.0") + (version "3.17.1") (home-page "https://github.com/leanprover-community/lean") (source (origin (method git-fetch) @@ -35,7 +36,7 @@ (define-public lean (file-name (git-file-name name version)) (sha256 (base32 - "1fdblq8ckrv6wqxfl4ybcs3ybfq7y096c9f5j4j75ymb14r401lr")))) + "15yfryg98x9lvy00v1w5kg4hp921mpvlxx1ic3m08k1ls6p1gkj4")))) (build-system cmake-build-system) (inputs `(("gmp" ,gmp))) -- cgit v1.2.3 From a5e5e51f33172b7d8208e59b90d7b03872c54afd Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Sun, 19 Jul 2020 02:54:48 -0500 Subject: gnu: python-language-server: Update to 0.34.1. * gnu/packages/python-xyz.scm (python-language-server): Update to 0.34.1. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e1e3870d06..53a7108a4e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3840,14 +3840,14 @@ (define-public python-pydocstyle (define-public python-language-server (package (name "python-language-server") - (version "0.32.0") + (version "0.34.1") (source (origin (method url-fetch) (uri (pypi-uri "python-language-server" version)) (sha256 (base32 - "0j5swacmjps9sas1gfwg0xi84rmjhfhz20cwg3k4058d20rs20ip")))) + "0gfjjlj7yg2nf8wkbrshwaljkwlqja4n7s1x949f495anmkg8vxr")))) (build-system python-build-system) (propagated-inputs `(("python-pluggy" ,python-pluggy) -- cgit v1.2.3 From 3f17586269d2984bc592a9bd225fb89f4d9742d8 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Sun, 19 Jul 2020 02:55:29 -0500 Subject: gnu: python-language-server: Remove comment in inputs. * gnu/packages/python-xyz.scm (python-language-server)[inputs]: Remove comment introduced in dcff9bda97d088a717d6f7c01bdf7c0e68d62b9b about using special versions of packages. --- gnu/packages/python-xyz.scm | 2 -- 1 file changed, 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 53a7108a4e..110d303818 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3852,8 +3852,6 @@ (define-public python-language-server (propagated-inputs `(("python-pluggy" ,python-pluggy) ("python-jsonrpc-server" ,python-jsonrpc-server) - ;; Note: Remove the special versions of Jedi and Parso when updating - ;; this package. ("python-jedi" ,python-jedi) ("python-yapf" ,python-yapf) ("python-pyflakes" ,python-pyflakes) -- cgit v1.2.3 From 2c7802d2e0a81b70fb7c3bd8d1def65c0bd27771 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 19 Jul 2020 11:15:10 +0300 Subject: gnu: python-humanfriendly: Don't propagate python-monotonic. python-monotonic targets python-2 and early versions of python-3. * gnu/packages/python-xyz.scm (python-humanfriendly)[propagated-inputs]: Remove python-monotonic. [properties]: New field. (python2-humanfriendly): Adjust accordingly. --- gnu/packages/python-xyz.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 110d303818..cdc09bcc1b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1136,8 +1136,6 @@ (define-public python-humanfriendly (arguments `(;; XXX: Tests depend on coloredlogs, which in turn depends on humanfriendly. #:tests? #f)) - (propagated-inputs - `(("python-monotonic" ,python-monotonic))) (home-page "https://humanfriendly.readthedocs.io") (synopsis "Human-friendly input and output in Python") (description @@ -1146,10 +1144,16 @@ (define-public python-humanfriendly numbers, file sizes, and timespans, timers for long-running operations, menus to allow the user to choose from a list of options, and terminal interaction helpers.") + (properties `((python2-variant . ,(delay python2-humanfriendly)))) (license license:expat))) (define-public python2-humanfriendly - (package-with-python2 python-humanfriendly)) + (let ((base (package-with-python2 + (strip-python2-variant python-humanfriendly)))) + (package (inherit base) + (propagated-inputs + `(("python2-monotonic" ,python2-monotonic) + ,@(package-propagated-inputs base)))))) (define-public python-textparser (package -- cgit v1.2.3 From fd7b950858be1f57da2bbab89b105721095e73b8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 19 Jul 2020 11:20:49 +0300 Subject: gnu: python-humanfriendly: Update to 8.2. * gnu/packages/python-xyz.scm (python-humanfriendly): Upgrade to 8.2. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index cdc09bcc1b..80a4862f90 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1124,14 +1124,14 @@ (define-public python2-uniseg (define-public python-humanfriendly (package (name "python-humanfriendly") - (version "4.4.1") + (version "8.2") (source (origin (method url-fetch) (uri (pypi-uri "humanfriendly" version)) (sha256 (base32 - "0pisgizjql86785jchfjv217g0lsgk114g2lja5j4y3lsc3b9szi")))) + "04ixg8b7p6xc8x8lffhi7wfl77xhszakhd0s6j0cf6a84j8yqlmz")))) (build-system python-build-system) (arguments `(;; XXX: Tests depend on coloredlogs, which in turn depends on humanfriendly. -- cgit v1.2.3 From 1c5901ae4e962b1726de909f3e402804a1e5984a Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Sun, 19 Jul 2020 11:33:52 +0200 Subject: gnu: sbcl-mcclim-fonts-truetype: Fix build. * gnu/packages/lisp-xyz.scm (sbcl-mcclim-fonts-truetype)[inputs]: Add font-dejavu. [arguments]: Add 'fix-paths' phase and don't disable test phase. --- gnu/packages/lisp-xyz.scm | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 4eefa94258..985ab05af7 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -54,6 +54,7 @@ (define-module (gnu packages lisp-xyz) #:use-module (gnu packages compression) #:use-module (gnu packages databases) #:use-module (gnu packages enchant) + #:use-module (gnu packages fonts) #:use-module (gnu packages fontutils) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) @@ -12875,13 +12876,22 @@ (define-public sbcl-mcclim-fonts-truetype ("cl-paths-ttf" ,sbcl-cl-paths-ttf) ("cl-vectors" ,sbcl-cl-vectors) ("clim-basic" ,sbcl-clim-basic) + ("font-dejavu" ,font-dejavu) ("zpb-ttf" ,sbcl-zpb-ttf))) (arguments - '(#:asd-file "./Extensions/fonts/mcclim-fonts.asd" + '(#:asd-file "Extensions/fonts/mcclim-fonts.asd" #:asd-system-name "mcclim-fonts/truetype" - ;; Tests want access to user's fonts, which are not available in - ;; build container. - #:tests? #f)))) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + ;; mcclim-truetype uses DejaVu as default font and + ;; sets the path at build time. + (substitute* "Extensions/fonts/fontconfig.lisp" + (("/usr/share/fonts/truetype/dejavu/") + (string-append (assoc-ref inputs "font-dejavu") + "/share/fonts/truetype/"))) + #t))))))) (define-public sbcl-mcclim-fonts-clx-truetype (package -- cgit v1.2.3 From ddedd2727029d0dcabf3f7a0b763f94ace5d5622 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 17 Jul 2020 23:51:48 +0200 Subject: gnu: python-psutil: Update to 5.7.2. * gnu/packages/python-xyz.scm (python-psutil): Update to 5.7.2. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 80a4862f90..55a9bb3945 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -420,13 +420,13 @@ (define-public python-pymediainfo (define-public python-psutil (package (name "python-psutil") - (version "5.7.0") + (version "5.7.2") (source (origin (method url-fetch) (uri (pypi-uri "psutil" version)) (sha256 - (base32 "03jykdi3dgf1cdal9bv4fq9zjvzj9l9bs99gi5ar81sdl5nc2pk8")))) + (base32 "1svv985vmqsls35kmvp3vhh26nsgz229324s9k29awf6qgqhm6ch")))) (build-system python-build-system) (arguments ;; FIXME: some tests do not return and time out. Some tests fail because -- cgit v1.2.3 From c91c132fc42c6e67140b393b963d7ced009f093e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Jul 2020 08:59:48 +0200 Subject: gnu: ungoogled-chromium: Update to 84.0.4147.89-0.df199c0. * gnu/packages/patches/ungoogled-chromium-system-jsoncpp.patch, gnu/packages/patches/ungoogled-chromium-system-zlib.patch: Delete files. * gnu/packages/patches/ungoogled-chromium-system-nspr.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/chromium.scm (%preserved-third-party-files): Adjust for 84. (%ungoogled-revision): Set to df199c04ff367da59ce52a23a3f3b305dd3b00c3. (%debian-revision): Set to debian/83.0.4103.116-3. (%gentoo-revision): Set to f3f649046d31ebdbc8c4a302b2384504eff78027. (chromium-gcc-patchset, %chromium-gcc-patches): New variables. (%gentoo-patches): Remove GCC patches, which have been moved to the above repo. Add ffmpeg compatibility patch. (%debian-patches): Add zlib and jsoncpp patch; remove nspr patch. (%ungoogled-origin): Update hash. (ungoogled-chromium-snippet): Add the new GCC patches. Remove obsolete local patches, add new. (xcb-proto/python2): New variable. (ungoogled-chromium): Update to 84.0.4147.89-0..df199c0. [arguments]: Add "is_unsafe_developer_build", "max_jobs_per_link", "exclude_unwind_tables", "xcbproto_path", "perfetto_use_system_protobuf" to #:configure-flags. Remove "linux_use_bundled_binutils". Adjust vulkan header substitutions. [native-inputs]: Remove YASM. [inputs]: Change from FFMPEG-4.2 to FFMPEG. Add PROTOBUF and XCB-PROTO/PYTHON2. --- gnu/local.mk | 3 +- gnu/packages/chromium.scm | 130 +++++++++++---------- .../ungoogled-chromium-system-jsoncpp.patch | 65 ----------- .../patches/ungoogled-chromium-system-nspr.patch | 120 +++++++++++++++++++ .../patches/ungoogled-chromium-system-zlib.patch | 47 -------- 5 files changed, 187 insertions(+), 178 deletions(-) delete mode 100644 gnu/packages/patches/ungoogled-chromium-system-jsoncpp.patch create mode 100644 gnu/packages/patches/ungoogled-chromium-system-nspr.patch delete mode 100644 gnu/packages/patches/ungoogled-chromium-system-zlib.patch diff --git a/gnu/local.mk b/gnu/local.mk index e8915990bc..0eac01d72d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1594,8 +1594,7 @@ dist_patch_DATA = \ %D%/packages/patches/u-boot-riscv64-fix-extlinux.patch \ %D%/packages/patches/ucx-tcp-iface-ioctl.patch \ %D%/packages/patches/udiskie-no-appindicator.patch \ - %D%/packages/patches/ungoogled-chromium-system-jsoncpp.patch \ - %D%/packages/patches/ungoogled-chromium-system-zlib.patch \ + %D%/packages/patches/ungoogled-chromium-system-nspr.patch \ %D%/packages/patches/unzip-CVE-2014-8139.patch \ %D%/packages/patches/unzip-CVE-2014-8140.patch \ %D%/packages/patches/unzip-CVE-2014-8141.patch \ diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index d9ba53d832..7ce9b65abf 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -55,6 +55,7 @@ (define-module (gnu packages chromium) #:use-module (gnu packages nss) #:use-module (gnu packages pciutils) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages protobuf) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) #:use-module (gnu packages python-web) @@ -137,6 +138,8 @@ (define %preserved-third-party-files "third_party/dawn" ;ASL2.0 "third_party/depot_tools/owners.py" ;BSD-3 "third_party/devtools-frontend" ;BSD-3 + "third_party/devtools-frontend/src/front_end/third_party/acorn" ;Expat + "third_party/devtools-frontend/src/front_end/third_party/codemirror" ;Expat "third_party/devtools-frontend/src/front_end/third_party/fabricjs" ;Expat "third_party/devtools-frontend/src/front_end/third_party/lighthouse" ;ASL2.0 "third_party/devtools-frontend/src/front_end/third_party/wasmparser" ;ASL2.0 @@ -159,6 +162,7 @@ (define %preserved-third-party-files "third_party/jstemplate" ;ASL2.0 "third_party/khronos" ;Expat, SGI "third_party/leveldatabase" ;BSD-3 + "third_party/libavif" ;BSD-2 "third_party/libXNVCtrl" ;Expat "third_party/libaddressinput" ;ASL2.0 "third_party/libaom" ;BSD-2 or "Alliance for Open Media Patent License 1.0" @@ -174,6 +178,7 @@ (define %preserved-third-party-files "third_party/libwebm" ;BSD-3 "third_party/libxml/chromium" ;BSD-3 "third_party/libyuv" ;BSD-3 + "third_party/lottie" ;Expat "third_party/lss" ;BSD-3 "third_party/mako" ;Expat "third_party/markupsafe" ;BSD-3 @@ -186,6 +191,7 @@ (define %preserved-third-party-files "third_party/one_euro_filter" ;BSD-3 "third_party/openscreen" ;BSD-3 "third_party/openscreen/src/third_party/tinycbor" ;Expat + "third_party/openscreen/src/third_party/mozilla" ;MPL1.1/GPL2+/LGPL2.1+, BSD-3 "third_party/ots" ;BSD-3 "third_party/pdfium" ;BSD-3 "third_party/pdfium/third_party/agg23" ;Expat @@ -223,12 +229,13 @@ (define %preserved-third-party-files "third_party/swiftshader/third_party/SPIRV-Headers" ;X11-style "third_party/usb_ids" ;BSD-3 "third_party/usrsctp" ;BSD-2 + "third_party/vulkan_memory_allocator" ;Expat "third_party/wayland/wayland_scanner_wrapper.py" ;BSD-3 "third_party/wayland-protocols" ;Expat "third_party/web-animations-js" ;ASL2.0 "third_party/webdriver" ;ASL2.0 "third_party/webrtc" ;BSD-3 - "third_party/webrtc/common_audio/third_party/fft4g" ;Non-copyleft + "third_party/webrtc/common_audio/third_party/ooura" ;Non-copyleft "third_party/webrtc/common_audio/third_party/spl_sqrt_floor" ;Public domain "third_party/webrtc/modules/third_party/fft" ;Non-copyleft "third_party/webrtc/modules/third_party/g711" ;Public domain @@ -239,7 +246,6 @@ (define %preserved-third-party-files "third_party/widevine/cdm/widevine_cdm_common.h" ;BSD-3 "third_party/woff2" ;ASL2.0 "third_party/xdg-utils" ;Expat - "third_party/yasm/run_yasm.py" ;BSD-2 or BSD-3 "third_party/zlib/google" ;BSD-3 "url/third_party/mozilla" ;BSD-3, MPL1.1/GPL2+/LGPL2.1+ "v8/src/third_party/siphash" ;Public domain @@ -254,10 +260,6 @@ (define %blacklisted-files ;; run the Blink performance tests, just remove everything to save ~24MiB. '("third_party/blink/perf_tests")) -(define %ungoogled-revision "f08ce8b3f1300ef0750b5d6bf967b9cbbfd9a56d") -(define %debian-revision "debian/81.0.4044.92-1") -(define %gentoo-revision "55ef09d6709f4e4cbe23418e4ade0f219fa2fa1f") - (define (gentoo-patch name revision hash) (origin (method url-fetch) @@ -266,39 +268,15 @@ (define (gentoo-patch name revision hash) (file-name (string-append "ungoogled-" name)) (sha256 (base32 hash)))) -(define %gentoo-patches - (list (gentoo-patch "chromium-fix-char_traits.patch" %gentoo-revision - "1zr9wj2rj5phwdiffykd8w3srmzn0xxgmznz762qp7rs7amnp8ns") - (gentoo-patch "chromium-blink-style_format.patch" %gentoo-revision - "098akk5l01m0n3zz08ycz1kp3xmjnbng6d399z1fnb2zigbf0b0z") - (gentoo-patch "chromium-78-protobuf-export.patch" %gentoo-revision - "1wbw29daqwyrnij4991v84955ydqfvvjpz4s2p40agnzmgdzwnsx") - (gentoo-patch "chromium-79-gcc-alignas.patch" %gentoo-revision - "1a6l4i9cicy8dpxxjamyw8cl2nmqfv3x9gbffrsr8571my6fh17s") - (gentoo-patch "chromium-80-gcc-quiche.patch" %gentoo-revision - "0rdlsymw6h8i6yhysiq4la53pwivzv1i9lh0gprh5cl367r1haww") - (gentoo-patch "chromium-82-gcc-noexcept.patch" %gentoo-revision - "0pljnysjvbv2ck0s159qssjhv1pfr32i0nb66smmfmfix2yaizqc") - (gentoo-patch "chromium-82-gcc-incomplete-type.patch" %gentoo-revision - "04751dnpmiasifhq29a1kyxlnq6f2fmd2qbkv7hxdlsxbzg3lhsv") - (gentoo-patch "chromium-82-gcc-template.patch" %gentoo-revision - "1ilmx9wmzyrwmfvr2mwc7m5z6lnbhjkms5k40i8yavqah6kcdbw2") - (gentoo-patch "chromium-82-gcc-iterator.patch" %gentoo-revision - "1xljai9cj99pf4q3l8hz90i8mhdbd8v6h1vj8y37v6j8p78n3zvj") - (gentoo-patch "chromium-83-gcc-template.patch" %gentoo-revision - "1bb1anqdrimza7d0gg4fmxij00563jd9k1azy8sz1ybd8gvrphqi") - (gentoo-patch "chromium-83-gcc-include.patch" %gentoo-revision - "0rs9jj71ridplndi967m0z47vqd8ryykg36gjx8iyf3580vr2hlw") - (gentoo-patch "chromium-83-gcc-permissive.patch" %gentoo-revision - "04mrmrg3pbwl3gph2n1dkbv4miz80xww1gysd39six028nxacjpg") - (gentoo-patch "chromium-83-gcc-iterator.patch" %gentoo-revision - "0q66399va607kjnk8n9xlcr740q7c522p2z7abyd2hgq2bxgglnv") - (gentoo-patch "chromium-83-gcc-serviceworker.patch" %gentoo-revision - "0klvcqqzldfhvqr3plja64qamgff1m2z1zcn325bj32gmpypqjx9") - (gentoo-patch "chromium-83-gcc-10.patch" %gentoo-revision - "0vfvh1jypqcb274bggacg165mw2q5gmn237cvrrwcjqalz0ahnry") - (gentoo-patch "chromium-83-icu67.patch" %gentoo-revision - "05spmjhg5f56mkq3f96vm4s2d9h6vqdxz5g8ibd9pf8ddnh4blnx"))) +;; This repository contains libstdc++ compatibility patches for Chromium. +(define (chromium-gcc-patchset commit hash) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/stha09/chromium-patches") + (commit commit))) + (file-name (git-file-name "chromium-gcc-patches" commit)) + (sha256 (base32 hash)))) (define (debian-patch name revision hash) (origin @@ -310,9 +288,25 @@ (define (debian-patch name revision hash) (string-append "ungoogled-chromium-" category "-" name)))) (sha256 (base32 hash)))) +(define %ungoogled-revision "df199c04ff367da59ce52a23a3f3b305dd3b00c3") +(define %debian-revision "debian/83.0.4103.116-3") +(define %gentoo-revision "f3f649046d31ebdbc8c4a302b2384504eff78027") + +(define %gentoo-patches + ;; This patch is necessary for compatibility with FFmpeg 4.3. + (list (gentoo-patch "chromium-84-mediaalloc.patch" %gentoo-revision + "0snxdc4nb8ykzncz62vpsl8hgxpy24m17mycx67i2gckmrpslzzv"))) + +(define %chromium-gcc-patches + (chromium-gcc-patchset + "chromium-84-patchset-3" + "0l05gx3pn703n47anjwsl5sjcqw8kaxmivf7llax97kj3k6d127v")) + (define %debian-patches - (list (debian-patch "system/nspr.patch" %debian-revision - "1x6ydc8pfks2c1dlwf0c58par6znjknvs9815576ycx27jl633dy") + (list (debian-patch "system/zlib.patch" %debian-revision + "0bp2vh1cgmwjrn1zkpphkd3bs662s23xwdhy3abm9cfjvwrj117n") + (debian-patch "system/jsoncpp.patch" %debian-revision + "0d95brl4a5y5w142yd0rvf59z513h7chsz0vnm034d6lqf22ahwf") (debian-patch "system/openjpeg.patch" %debian-revision "0zd6v5njx1pc7i0y6mslxvpx5j4cq01mmyx55qcqx8qzkm0gm48j"))) @@ -325,7 +319,7 @@ (define %ungoogled-origin (string-take %ungoogled-revision 7))) (sha256 (base32 - "0kc40p8f7cls696gh6ign37l8j4x1pyyz32jkkli9cmrpbsjsadl")))) + "1bqvcq3dj6615198j7cz3ylyyic5zpis06capvl6ybl1na3ainb0")))) ;; This is a source 'snippet' that does the following: ;; *) Applies various patches for unbundling purposes and libstdc++ compatibility. @@ -350,12 +344,10 @@ (define ungoogled-chromium-snippet patch "--no-backup-if-mismatch")) (append '#+%gentoo-patches '#+%debian-patches + (find-files #$%chromium-gcc-patches "\\.patch$") '#+(list (local-file (search-patch - "ungoogled-chromium-system-jsoncpp.patch")) - (local-file - (search-patch - "ungoogled-chromium-system-zlib.patch"))))) + "ungoogled-chromium-system-nspr.patch"))))) (with-directory-excursion #+%ungoogled-origin (format #t "Ungooglifying...~%") @@ -386,8 +378,7 @@ (define ungoogled-chromium-snippet "--system-libraries" "ffmpeg" "flac" "fontconfig" "freetype" "harfbuzz-ng" "icu" "libdrm" "libevent" "libjpeg" "libpng" "libvpx" "libwebp" "libxml" - "libxslt" "openh264" "opus" "re2" "snappy" "yasm" - "zlib") + "libxslt" "openh264" "opus" "re2" "snappy" "zlib") #t)))) (define opus+custom @@ -402,10 +393,20 @@ (define opus+custom `(cons "--enable-custom-modes" ,flags)))))) +;; Chromium still has Python2-only code, so we need this special Python 2 +;; variant of xcb-proto. +(define xcb-proto/python2 + (package/inherit + xcb-proto + (name "python2-xcb-proto") + (native-inputs + `(("pkg-config" ,pkg-config) + ("python" ,python-2))))) + (define-public ungoogled-chromium (package (name "ungoogled-chromium") - (version (string-append "83.0.4103.116-0." + (version (string-append "84.0.4147.89-0." (string-take %ungoogled-revision 7))) (synopsis "Graphical web browser") (source (origin @@ -415,7 +416,7 @@ (define-public ungoogled-chromium (car (string-split version #\-)) ".tar.xz")) (sha256 (base32 - "1hravbi1lazmab2mih465alfzji1kzy38zya1visbwz9zs6pw35v")) + "0yf6j0459qzr677zsa2apmfz0x0ndlscvwj1a5v40nqjijchv5qp")) (modules '((guix build utils))) (snippet (force ungoogled-chromium-snippet)))) (build-system gnu-build-system) @@ -435,10 +436,13 @@ (define-public ungoogled-chromium ;; directory for an exhaustive list of supported flags. ;; (Note: The 'configure' phase will do that for you.) (list "is_debug=false" + "is_unsafe_developer_build=false" "use_gold=false" "use_lld=false" + (string-append "max_jobs_per_link=" + (number->string (parallel-job-count))) + "exclude_unwind_tables=true" "clang_use_chrome_plugins=false" - "linux_use_bundled_binutils=false" "use_custom_libcxx=false" "use_sysroot=false" "enable_precompiled_headers=false" @@ -467,6 +471,9 @@ (define-public ungoogled-chromium "custom_toolchain=\"//build/toolchain/linux/unbundle:default\"" "host_toolchain=\"//build/toolchain/linux/unbundle:default\"" + (string-append "xcbproto_path=\"" + (assoc-ref %build-inputs "xcb-proto") "/share/xcb\"") + ;; Prefer system libraries. "use_system_freetype=true" "use_system_harfbuzz=true" @@ -481,6 +488,7 @@ (define-public ungoogled-chromium "use_pulseaudio=true" "link_pulseaudio=true" "icu_use_data_file=false" + "perfetto_use_system_protobuf=true" ;; VA-API acceleration is currently only supported on x86_64-linux. ,@(if (string-prefix? "x86_64" (or (%current-target-system) @@ -568,13 +576,10 @@ (define-public ungoogled-chromium (substitute* "third_party/webrtc/rtc_base/strings/json.h" (("#include \"third_party/jsoncpp/") "#include \"json/")) - (substitute* "gpu/config/gpu_util.cc" - (("third_party/vulkan/include/") - "")) - (substitute* '("components/viz/common/gpu/vulkan_context_provider.h" - "components/viz/common/resources/resource_format_utils.h") - (("third_party/vulkan/include/") "")) + "components/viz/common/resources/resource_format_utils.h" + "gpu/config/gpu_util.cc") + (("third_party/vulkan_headers/include/") "")) (substitute* "third_party/skia/include/gpu/vk/GrVkVulkan.h" (("include/third_party/vulkan/") "")) @@ -743,7 +748,6 @@ (define-public ungoogled-chromium ("node" ,node) ("pkg-config" ,pkg-config) ("which" ,which) - ("yasm" ,yasm) ;; This file contains defaults for new user profiles. ("master-preferences" ,(local-file "aux-files/chromium/master-preferences.json")) @@ -760,11 +764,7 @@ (define-public ungoogled-chromium ("dbus-glib" ,dbus-glib) ("expat" ,expat) ("flac" ,flac) - - ;; FIXME: Change to ffmpeg 4.3 when supported, see - ;; . - ("ffmpeg" ,ffmpeg-4.2) - + ("ffmpeg" ,ffmpeg) ("fontconfig" ,fontconfig) ("freetype" ,freetype) ("gdk-pixbuf" ,gdk-pixbuf) @@ -805,13 +805,15 @@ (define-public ungoogled-chromium ("opus" ,opus+custom) ("pango" ,pango) ("pciutils" ,pciutils) + ("protobuf" ,protobuf) ("pulseaudio" ,pulseaudio) ("re2" ,re2) ("snappy" ,snappy) ("speech-dispatcher" ,speech-dispatcher) ("udev" ,eudev) ("valgrind" ,valgrind) - ("vulkan-headers" ,vulkan-headers))) + ("vulkan-headers" ,vulkan-headers) + ("xcb-proto" ,xcb-proto/python2))) ;; Building Chromium takes ... a very long time. On a single core, a busy ;; mid-end x86 system may need more than 24 hours to complete the build. diff --git a/gnu/packages/patches/ungoogled-chromium-system-jsoncpp.patch b/gnu/packages/patches/ungoogled-chromium-system-jsoncpp.patch deleted file mode 100644 index 294e1ea33b..0000000000 --- a/gnu/packages/patches/ungoogled-chromium-system-jsoncpp.patch +++ /dev/null @@ -1,65 +0,0 @@ -Build with the system jsoncpp instead of the bundled one. - -Adapted from Debian: -https://salsa.debian.org/chromium-team/chromium/-/blob/master/debian/patches/system/jsoncpp.patch - -diff --git a/third_party/jsoncpp/BUILD.gn b/third_party/jsoncpp/BUILD.gn ---- a/third_party/jsoncpp/BUILD.gn -+++ b/third_party/jsoncpp/BUILD.gn -@@ -3,52 +3,14 @@ - # found in the LICENSE file. - - import("//testing/libfuzzer/fuzzer_test.gni") -+import("//build/config/linux/pkg_config.gni") - --config("jsoncpp_config") { -- include_dirs = [ -- "source/include", -- "generated", -- ] -- -- # TODO(crbug.com/983223): Update JsonCpp BUILD.gn to remove deprecated -- # declaration flag. -- # This temporary flag allowing clients to update to the new version, and then -- # update to the new StreamWriter and CharReader classes. -- if (!is_win || is_clang) { -- cflags_cc = [ "-Wno-deprecated-declarations" ] -- } -+pkg_config("jsoncpp_config") { -+ packages = [ "jsoncpp" ] - } - --source_set("jsoncpp") { -- sources = [ -- "generated/version.h", -- "source/include/json/assertions.h", -- "source/include/json/autolink.h", -- "source/include/json/config.h", -- "source/include/json/features.h", -- "source/include/json/forwards.h", -- "source/include/json/json.h", -- "source/include/json/reader.h", -- "source/include/json/value.h", -- "source/include/json/writer.h", -- "source/src/lib_json/json_reader.cpp", -- "source/src/lib_json/json_tool.h", -- "source/src/lib_json/json_value.cpp", -- "source/src/lib_json/json_writer.cpp", -- ] -- -+group("jsoncpp") { - public_configs = [ ":jsoncpp_config" ] -- -- defines = [ -- "JSON_USE_EXCEPTION=0", -- "JSON_USE_NULLREF=0", -- ] -- -- include_dirs = [ "source/src/lib_json" ] -- -- if (!is_win || is_clang) { -- cflags_cc = [ "-Wno-implicit-fallthrough" ] -- } - } - - if (build_with_chromium) { diff --git a/gnu/packages/patches/ungoogled-chromium-system-nspr.patch b/gnu/packages/patches/ungoogled-chromium-system-nspr.patch new file mode 100644 index 0000000000..6fbc0a56a7 --- /dev/null +++ b/gnu/packages/patches/ungoogled-chromium-system-nspr.patch @@ -0,0 +1,120 @@ +Build with the system nspr library. + +Originally based on a Debian patch: +https://salsa.debian.org/chromium-team/chromium/-/blob/master/debian/patches/system/nspr.patch + +--- a/base/time/pr_time_unittest.cc ++++ b/base/time/pr_time_unittest.cc +@@ -7,7 +7,7 @@ + + #include "base/compiler_specific.h" + #include "base/stl_util.h" +-#include "base/third_party/nspr/prtime.h" ++#include + #include "base/time/time.h" + #include "build/build_config.h" + #include "testing/gtest/include/gtest/gtest.h" +--- a/base/time/time.cc ++++ b/base/time/time.cc +@@ -14,7 +14,7 @@ + #include "base/macros.h" + #include "base/no_destructor.h" + #include "base/strings/stringprintf.h" +-#include "base/third_party/nspr/prtime.h" ++#include + #include "base/time/time_override.h" + #include "build/build_config.h" + +--- a/base/BUILD.gn ++++ b/base/BUILD.gn +@@ -107,6 +107,9 @@ config("base_flags") { + "-Wglobal-constructors", + ] + } ++ ldflags = [ ++ "-lnspr4", ++ ] + } + + config("base_implementation") { +@@ -712,8 +715,6 @@ jumbo_component("base") { + "third_party/cityhash_v103/src/city_v103.h", + "third_party/icu/icu_utf.cc", + "third_party/icu/icu_utf.h", +- "third_party/nspr/prtime.cc", +- "third_party/nspr/prtime.h", + "third_party/superfasthash/superfasthash.c", + "thread_annotations.h", + "threading/hang_watcher.cc", +--- a/tools/gn/build/gen.py ++++ b/tools/gn/build/gen.py +@@ -339,6 +339,9 @@ def WriteGNNinja(path, platform, host, o + if not options.no_static_libstdcpp: + ldflags.append('-static-libstdc++') + ++ # Additional system libraries that are used. ++ libs.append('-lnspr4') ++ + # This is needed by libc++. + if not platform.is_mingw(): + libs.append('-ldl') +--- a/third_party/blink/renderer/platform/BUILD.gn ++++ b/third_party/blink/renderer/platform/BUILD.gn +@@ -103,6 +103,9 @@ + "//build/win:default_exe_manifest", + "//third_party/icu", + ] ++ ldflags = [ ++ "-lnspr4" ++ ] + } + + # This isn't strictly necessary since we can just add the deps to "platform", +--- a/third_party/crashpad/crashpad/handler/BUILD.gn ++++ b/third_party/crashpad/crashpad/handler/BUILD.gn +@@ -140,6 +140,9 @@ + "../third_party/mini_chromium:base", + "../tools:tool_support", + ] ++ ldflags = [ ++ "-lnspr4" ++ ] + + if (crashpad_is_win) { + if (crashpad_is_in_chromium || crashpad_is_in_dart) { +--- a/chrome/common/search/BUILD.gn ++++ b/chrome/common/search/BUILD.gn +@@ -20,6 +20,9 @@ + "//chrome/common/themes:autogenerated_theme_util", + "//skia", + ] ++ ldflags = [ ++ "-lnspr4" ++ ] + } + + compiled_action("generate_chrome_colors_info") { +--- a/components/url_formatter/spoof_checks/top_domains/BUILD.gn ++++ b/components/url_formatter/spoof_checks/top_domains/BUILD.gn +@@ -31,6 +31,9 @@ + "//net/tools/huffman_trie:huffman_trie_generator_sources", + "//url:url", + ] ++ ldflags = [ ++ "-lnspr4", ++ ] + if (is_ios) { + libs = [ "UIKit.framework" ] + } +--- a/components/schema_org/BUILD.gn ++++ b/components/schema_org/BUILD.gn +@@ -33,6 +33,9 @@ + "//base", + "//url", + ] ++ ldflags = [ ++ "-lnspr4", ++ ] + } + + compiled_action("schema_org_name_data") { diff --git a/gnu/packages/patches/ungoogled-chromium-system-zlib.patch b/gnu/packages/patches/ungoogled-chromium-system-zlib.patch deleted file mode 100644 index b6e3c0f075..0000000000 --- a/gnu/packages/patches/ungoogled-chromium-system-zlib.patch +++ /dev/null @@ -1,47 +0,0 @@ -Use zlib instead of the bundled lzma_sdk. - -Adapted from Debian: -https://salsa.debian.org/chromium-team/chromium/-/blob/master/debian/patches/system/zlib.patch - -diff --git a/courgette/BUILD.gn b/courgette/BUILD.gn ---- a/courgette/BUILD.gn -+++ b/courgette/BUILD.gn -@@ -58,7 +58,6 @@ static_library("courgette_lib") { - - deps = [ - "//base", -- "//third_party/lzma_sdk", - ] - - public_deps = [ -@@ -79,7 +78,6 @@ source_set("courgette_common") { - ] - deps = [ - "//base", -- "//third_party/lzma_sdk", - ] - } - -diff --git a/courgette/crc.cc b/courgette/crc.cc ---- a/courgette/crc.cc -+++ b/courgette/crc.cc -@@ -7,6 +7,8 @@ - #include - #include - -+#define COURGETTE_USE_CRC_LIB -+ - #ifdef COURGETTE_USE_CRC_LIB - # include "zlib.h" - #else -diff --git a/third_party/perfetto/gn/BUILD.gn b/third_party/perfetto/gn/BUILD.gn ---- a/third_party/perfetto/gn/BUILD.gn -+++ b/third_party/perfetto/gn/BUILD.gn -@@ -304,7 +304,6 @@ if (enable_perfetto_zlib) { - public_configs = [ "//buildtools:zlib_config" ] - public_deps = [ "//buildtools:zlib" ] - } else { -- public_configs = [ "//third_party/zlib:zlib_config" ] - public_deps = [ "//third_party/zlib" ] - } - } -- cgit v1.2.3 From 41daf1286575f3a1998493c893f6d5a9c5b62de8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Jul 2020 09:59:57 +0200 Subject: services: ganeti: Use TLS on the remote API by default. * gnu/services/ganeti.scm (): Set SSL? to #t. * gnu/tests/ganeti.scm (%ganeti-os): Set SSL? to #f. * doc/guix.texi (Virtualization Services): Adjust accordingly. --- doc/guix.texi | 2 +- gnu/services/ganeti.scm | 2 +- gnu/tests/ganeti.scm | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 2c5c017eea..df37349c4a 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -25497,7 +25497,7 @@ The maximum number of simultaneous client requests to handle. Further connections are allowed, but no responses are sent until enough connections have closed. -@item @code{ssl?} (default: @code{#f}) +@item @code{ssl?} (default: @code{#t}) Whether to use SSL/TLS encryption on the RAPI port. @item @code{ssl-key} (default: @file{"/var/lib/ganeti/server.pem"}) diff --git a/gnu/services/ganeti.scm b/gnu/services/ganeti.scm index 80a61818f7..f7d1aeb8da 100644 --- a/gnu/services/ganeti.scm +++ b/gnu/services/ganeti.scm @@ -450,7 +450,7 @@ (define-record-type* (max-clients ganeti-rapi-configuration-max-clients ;integer (default 20)) (ssl? ganeti-rapi-configuration-ssl? ;Boolean - (default #f)) + (default #t)) (ssl-key ganeti-rapi-configuration-ssl-key ;string (default "/var/lib/ganeti/server.pem")) (ssl-cert ganeti-rapi-configuration-ssl-cert ;string diff --git a/gnu/tests/ganeti.scm b/gnu/tests/ganeti.scm index 0615edcde4..ff853a7149 100644 --- a/gnu/tests/ganeti.scm +++ b/gnu/tests/ganeti.scm @@ -70,6 +70,11 @@ (define %ganeti-os (service ganeti-service-type (ganeti-configuration (file-storage-paths '("/srv/ganeti/file-storage")) + (rapi-configuration + (ganeti-rapi-configuration + ;; Disable TLS so we can test the RAPI without + ;; pulling in GnuTLS. + (ssl? #f))) (os %default-ganeti-os)))) %base-services)))) -- cgit v1.2.3 From eccdd80e080ae4ea22fdc32d09b0cf12efe702cc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Jul 2020 10:03:51 +0200 Subject: doc: Fix Ganeti blog post URL. * doc/guix.texi (Virtualization Services): Adjust Ganeti blog post URL. --- doc/guix.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index df37349c4a..26ef937604 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -25091,7 +25091,7 @@ Users are advised to read the @url{http://docs.ganeti.org/ganeti/master/html/admin.html,Ganeti administrators guide} to learn about the various cluster options and day-to-day operations. There is also a -@url{https://guix.gnu.org/blog/2020/ganeti-on-guix/,blog post} +@url{https://guix.gnu.org/blog/2020/running-a-ganeti-cluster-on-guix/,blog post} describing how to configure and initialize a small cluster. @defvr {Scheme Variable} ganeti-service-type -- cgit v1.2.3 From 54cab3059d03d477ed55f6933be3dab6357f7457 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jul 2020 14:10:57 +0200 Subject: gnu: s-tui: Update to 1.0.2. * gnu/packages/admin.scm (s-tui): Update to 1.0.2. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 806d2fb08e..cdc030bc3a 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1865,13 +1865,13 @@ (define-public acpica (define-public s-tui (package (name "s-tui") - (version "1.0.1") + (version "1.0.2") (source (origin (method url-fetch) (uri (pypi-uri "s-tui" version)) (sha256 - (base32 "1gqrb2xxii43j7kszy7kvv4f6hr8ac4p0m9q8i1xs5fhsqcx186i")))) + (base32 "0xkfdaz5np21311ffdvhks58155qby8j8scbcixhvjd913pj66qx")))) (build-system python-build-system) (inputs `(("python-psutil" ,python-psutil) -- cgit v1.2.3 From cd6aa38e7fc3e7d9fa1b79db041e8bf7cda39322 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jul 2020 14:12:25 +0200 Subject: gnu: perl-gd: Update to 2.72 [fixes CVE-2019-6977]. * gnu/packages/gd.scm (perl-gd): Update to 2.72. --- gnu/packages/gd.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gd.scm b/gnu/packages/gd.scm index c6a2e0117d..0d632de52c 100644 --- a/gnu/packages/gd.scm +++ b/gnu/packages/gd.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2016, 2017 Leo Famulari ;;; Copyright © 2017 Efraim Flashner ;;; Copyright © 2017 Marius Bakke -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -94,14 +94,14 @@ (define-public gd (define-public perl-gd (package (name "perl-gd") - (version "2.71") + (version "2.72") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/R/RU/RURBAN/" "GD-" version ".tar.gz")) (sha256 - (base32 "1ivskdb4nwy7ky37369hwkfxp11fkp6ri5k7qlf2dmra7f3y86s5")))) + (base32 "014ik1rng6cnjfgdarkyy5m6wl4pdzc2b445m27krfn3zh9hgl31")))) (build-system perl-build-system) (inputs `(("fontconfig" ,fontconfig) -- cgit v1.2.3 From 56f12a65a0829bd6d8e8f6c4d04102e5273bd09e Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Sun, 19 Jul 2020 15:46:13 +0200 Subject: gnu: r-rhdf5lib: Fix libsz substitution. This is a follow-up to commit b7f051db14fb485fcfa4917924eef186fb1b8c07 - in the new version, some of the format strings being replaced gained quotes. This commit fixes build of dependents of r-rhdf5lib, such as r-hdf5array. * gnu/packages/bioinformatics (r-rhdf5lib): Remove all instances of libsz.a. --- gnu/packages/bioinformatics.scm | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 8a6be59d2a..681919df3d 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10867,14 +10867,7 @@ (define-public r-rhdf5lib (for-each delete-file '("configure" "configure.ac")) ;; Do not make other packages link with the proprietary libsz. (substitute* "R/zzz.R" - (("'\"%s/libhdf5.a\" \"%s/libsz.a\" -lz'") - "'\"%s/libhdf5.a\" \"%s/libhdf5.a\" -lz'") - (("'\"%s/libhdf5_cpp.a\" \"%s/libhdf5.a\" \"%s/libsz.a\" -lz'") - "'\"%s/libhdf5_cpp.a\" \"%s/libhdf5.a\" \"%s/libhdf5.a\" -lz'") - (("'%s/libhdf5_hl.a %s/libhdf5.a %s/libsz.a -lz'") - "'%s/libhdf5_hl.a %s/libhdf5.a %s/libhdf5.a -lz'") - (("'%s/libhdf5_hl_cpp.a %s/libhdf5_hl.a %s/libhdf5_cpp.a %s/libhdf5.a %s/libsz.a -lz'") - "'%s/libhdf5_hl_cpp.a %s/libhdf5_hl.a %s/libhdf5_cpp.a %s/libhdf5.a %s/libhdf5.a -lz'")) + ((" \"%s/libsz.a\"") "")) (with-directory-excursion "src" (invoke "tar" "xvf" (assoc-ref inputs "hdf5-source")) (rename-file (string-append "hdf5-" ,(package-version hdf5-1.10)) -- cgit v1.2.3 From 4dfbebdb6460d5a42345562f4d3ecc2baaeb2b4d Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Sun, 19 Jul 2020 10:36:44 -0500 Subject: gnu: stress-make: Fix build with make 4.3. * gnu/packages/debug.scm (stress-make): Update to latest upstream commit. [arguments]: Adjust source file name for substitute*. --- gnu/packages/debug.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm index f3e01de675..2a3e6edc31 100644 --- a/gnu/packages/debug.scm +++ b/gnu/packages/debug.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014, 2015, 2016, 2017, 2019 Eric Bavier +;;; Copyright © 2014, 2015, 2016, 2017, 2019, 2020 Eric Bavier ;;; Copyright © 2016, 2017, 2018, 2020 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2019 Rutger Helling @@ -393,8 +393,8 @@ (define-public qemu-for-american-fuzzy-lop (supported-systems (delete "mips64el-linux" %supported-systems)))))) (define-public stress-make - (let ((commit "9e92dff8f0157f012aaf31de5b8b8112ad720100") - (revision "1")) ;No official source distribution + (let ((commit "97815bed8060de33952475b3498767c91f59ffd9") + (revision "2")) ;No official source distribution (package (name "stress-make") (version (git-version "1.0" revision commit)) @@ -407,7 +407,7 @@ (define-public stress-make (file-name (git-file-name name version)) (sha256 (base32 - "1z1yiwnqyzv3v6152fnjbfh2lr8q8fi5xxfdclnr8l8sd4c1rasp")))) + "0k55cy7x0hlc6rgpascl6ibhcfxaash3p9r9r8kwvbm3zag1rmac")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) @@ -431,7 +431,7 @@ (define-public stress-make (add-after 'unpack-make 'set-default-shell (lambda _ ;; Taken mostly directly from (@ (gnu packages base) gnu-make) - (substitute* (string-append ,make-dir "/job.c") + (substitute* (string-append ,make-dir "/src/job.c") (("default_shell = .*$") (format #f "default_shell = \"~a\";\n" (which "sh")))))) -- cgit v1.2.3 From dc9e8f2ed3cc568969e351f8bad84a6b36dacac6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 19 Jul 2020 16:18:11 +0300 Subject: gnu: python-fasteners: Update to 0.15. * gnu/packages/python-xyz.scm (python-fasteners): Update to 0.15. [propagated-inputs]: Move python-testtools ... [native-inputs]: ... to here. --- gnu/packages/python-xyz.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 55a9bb3945..c6afe0b03d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17240,19 +17240,20 @@ (define-public pybind11 (define-public python-fasteners (package (name "python-fasteners") - (version "0.14.1") + (version "0.15") (source (origin (method url-fetch) (uri (pypi-uri "fasteners" version)) (sha256 (base32 - "063y20kx01ihbz2mziapmjxi2cd0dq48jzg587xdsdp07xvpcz22")))) + "1vzmz1xh38b84dv0f4hlp7arwmx8wjlih6lf964bpy8dnyk6s5rs")))) (build-system python-build-system) (propagated-inputs `(("python-monotonic" ,python-monotonic) - ("python-six" ,python-six) - ("python-testtools" ,python-testtools))) + ("python-six" ,python-six))) + (native-inputs + `(("python-testtools" ,python-testtools))) (home-page "https://github.com/harlowja/fasteners") (synopsis "Python package that provides useful locks") (description -- cgit v1.2.3 From 163686d82e9afeaae45235eb61ae5ee77d4b16b7 Mon Sep 17 00:00:00 2001 From: guy fleury iteriteka Date: Thu, 16 Jul 2020 16:33:02 +0200 Subject: gnu: Add gdc-10. * gnu/packages/gcc.scm (gdc-10): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/gcc.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 9e881092c9..9ff5e3d7c0 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -692,6 +692,11 @@ (define-public gfortran (custom-gcc gcc "gfortran" '("fortran") %generic-search-paths))) +(define-public gdc-10 + (hidden-package + (custom-gcc gcc-10 "gdc" '("d") + %generic-search-paths))) + (define-public libgccjit (package (inherit gcc-9) -- cgit v1.2.3 From 7b2ab96a6efcd30ce12371cac101f1f965ff20b8 Mon Sep 17 00:00:00 2001 From: guy fleury iteriteka Date: Thu, 16 Jul 2020 16:35:14 +0200 Subject: gnu: Add gdc-toolchain. * gnu/packages/commencement.scm(gdc-toolchain): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/commencement.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index d0393ebe25..aa30e3fa18 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2018, 2019, 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2019, 2020 Marius Bakke ;;; Copyright © 2020 Timothy Sample +;;; Copyright © 2020 Guy Fleury Iteriteka ;;; ;;; This file is part of GNU Guix. ;;; @@ -3901,6 +3902,14 @@ (define-public gcc-toolchain-9 (define-public gcc-toolchain-10 (make-gcc-toolchain gcc-10)) +(define-public gdc-toolchain-10 + (package (inherit (make-gcc-toolchain gdc-10)) + (synopsis "Complete GCC tool chain for D lang development") + (description "This package provides a complete GCC tool chain for +D lang development to be installed in user profiles. This includes +gdc, as well as libc (headers and binaries, plus debugging symbols +in the @code{debug} output), and binutils."))) + ;; Provide the Fortran toolchain package only for the version of gfortran that ;; is used by Guix internally to build Fortran libraries, because combining ;; code compiled with different versions can cause problems. -- cgit v1.2.3 From c15a2cd906d93ad9f55090c1e30d7d9845fcddf2 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Sun, 19 Jul 2020 15:09:57 -0500 Subject: gnu: libtorrent-rasterbar: Update to 1.2.7. * gnu/packages/bittorrent.scm (libtorrent-rasterbar): Update to 1.2.7. [source]: Modify the URL. --- gnu/packages/bittorrent.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index b124e17d76..9cf8e2eb40 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2018 Fis Trivial ;;; Copyright © 2018 Nam Nguyen ;;; Copyright © 2018 Ricardo Wurmus -;;; Copyright © 2019 Brett Gilio +;;; Copyright © 2019, 2020 Brett Gilio ;;; ;;; This file is part of GNU Guix. ;;; @@ -375,17 +375,17 @@ (define-public mktorrent (define-public libtorrent-rasterbar (package (name "libtorrent-rasterbar") - (version "1.1.14") + (version "1.2.7") (source (origin (method url-fetch) (uri (string-append - "https://github.com/arvidn/libtorrent/releases/download/libtorrent-" + "https://github.com/arvidn/libtorrent/releases/download/libtorrent_" (string-join (string-split version #\.) "_") "/libtorrent-rasterbar-" version ".tar.gz")) (sha256 (base32 - "0sn3ingmk1lk9p56f9ifgdwhjg0qizcfgv15wyc9s71nm5fya7sc")))) + "001g35janbxi20c7jzsf3ii9mkagz4kdsp7f3sz5r0n0cng0c05w")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From d0ff7e1c94d84cc1030463eb11e44f0098a25694 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jul 2020 15:04:37 +0200 Subject: gnu: mtd-utils: Update to 2.1.2. * gnu/packages/linux.scm (mtd-utils): Update to 2.1.2. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index eab48bd349..2940a90f0f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5672,7 +5672,7 @@ (define-public mcelog (define-public mtd-utils (package (name "mtd-utils") - (version "2.1.1") + (version "2.1.2") (source (origin (method url-fetch) (uri (string-append @@ -5680,7 +5680,7 @@ (define-public mtd-utils "mtd-utils-" version ".tar.bz2")) (sha256 (base32 - "1lijl89l7hljx8xx70vrz9srd3h41v5gh4b0lvqnlv831yvyh5cd")))) + "1mp9fqgnz5r69s8ly98ry6k2blqnaqpllwi8m930dm0n8zrwbm4a")))) (arguments '(#:configure-flags '("--enable-unit-tests"))) (native-inputs -- cgit v1.2.3 From 4437eb1d94ce988338f2678b3d7f959ae4150d07 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jul 2020 16:37:41 +0200 Subject: gnu: mc: Update to 4.8.25. * gnu/packages/mc.scm (mc): Update to 4.8.25. --- gnu/packages/mc.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mc.scm b/gnu/packages/mc.scm index 56e563a132..06841d822c 100644 --- a/gnu/packages/mc.scm +++ b/gnu/packages/mc.scm @@ -37,14 +37,14 @@ (define-module (gnu packages mc) (define-public mc (package (name "mc") - (version "4.8.24") + (version "4.8.25") (source (origin (method url-fetch) (uri (string-append "https://ftp.midnight-commander.org/mc-" version ".tar.xz")) (sha256 - (base32 "0ikd2yql44p7nagmb08dmjqdwadclnvgr7ri9pmzc2s5f301r7w5")))) + (base32 "12jlnabnc91xsm35g99g2wnh96jmznvrhffd18rj7fqfy8brdhgz")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("perl" ,perl))) -- cgit v1.2.3 From b3763b5330683eca8a3dadecbec59960898c0c74 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jul 2020 16:43:25 +0200 Subject: gnu: zabbix-agentd, zabbix-server: Update to 5.0.2 [fixes CVE-2020-15803]. * gnu/packages/monitoring.scm (zabbix-agentd): Update to 5.0.2. --- gnu/packages/monitoring.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm index d07bc0bd60..aae39f19f9 100644 --- a/gnu/packages/monitoring.scm +++ b/gnu/packages/monitoring.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2016 Ludovic Courtès ;;; Copyright © 2018 Sou Bunnbu ;;; Copyright © 2017, 2018, 2019, 2020 Ricardo Wurmus -;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Gábor Boskovits ;;; Copyright © 2018, 2019, 2020 Oleg Pykhalov ;;; Copyright © 2020 Alex ter Weele @@ -158,7 +158,7 @@ (define-public nagios (define-public zabbix-agentd (package (name "zabbix-agentd") - (version "5.0.1") + (version "5.0.2") (source (origin (method url-fetch) @@ -166,8 +166,7 @@ (define-public zabbix-agentd "https://cdn.zabbix.com/zabbix/sources/stable/" (version-major+minor version) "/zabbix-" version ".tar.gz")) (sha256 - (base32 - "1djkm3261plr36khvh49fbjpb67wxi5v08a5waxzqkrmy9f9x890")))) + (base32 "1cnns7ixqi7ank3cbvcs7d8rb5zh9qiqbmgivazr83jnz81qg46w")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 626bc647c06fff82d3d23ce1363f5b42977b49d8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jul 2020 18:44:10 +0200 Subject: gnu: python-pendulum: Update to 2.1.1. * gnu/packages/time.scm (python-pendulum): Update to 2.1.1. --- gnu/packages/time.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm index 0249334a2e..e396412e47 100644 --- a/gnu/packages/time.scm +++ b/gnu/packages/time.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2016 Hartmut Goebel ;;; Copyright © 2016 Danny Milosavljevic ;;; Copyright © 2016, 2020 Marius Bakke -;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2016, 2017, 2018, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2017 Ben Woodcroft ;;; Copyright © 2017 Nikita ;;; Copyright © 2017 Julien Lepiller @@ -140,14 +140,13 @@ (define-public python2-pytz (define-public python-pendulum (package (name "python-pendulum") - (version "2.1.0") + (version "2.1.1") (source (origin (method url-fetch) (uri (pypi-uri "pendulum" version)) (sha256 - (base32 - "1zhzk0ai8is8zclw4v73dllf0hx0l5nmm4sbwrh6cl8h5qsang09")))) + (base32 "1w4an6ki3l1pc36m2f2xiglaw5czmj9b4imbigln9z6mlnkkjxyr")))) (build-system python-build-system) ;; XXX: The PyPI distribution lacks tests, and the upstream repository ;; lacks a setup.py! -- cgit v1.2.3 From 7915e3e198c689e3a372229a7e983fbdfc5f30ca Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jul 2020 21:04:35 +0200 Subject: gnu: qutebrowser: Update to 1.13.1. * gnu/packages/web-browsers.scm (qutebrowser): Update to 1.13.1. --- gnu/packages/web-browsers.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 6508419418..65ab7732bc 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -344,7 +344,7 @@ (define-public lynx (define-public qutebrowser (package (name "qutebrowser") - (version "1.13.0") + (version "1.13.1") (source (origin (method url-fetch) @@ -352,7 +352,7 @@ (define-public qutebrowser "qutebrowser/releases/download/v" version "/" "qutebrowser-" version ".tar.gz")) (sha256 - (base32 "1xq0a0mcssc1ss4fvhhwr75dhlh3nr9w46i2gmqczzh5cynk1sfk")))) + (base32 "1n72dvrv4dch4i07lsis76p7g16a039fwx8rk7w8q9f60wgqb5i8")))) (build-system python-build-system) (native-inputs `(("python-attrs" ,python-attrs))) ; for tests -- cgit v1.2.3 From b036e370b458738b0eb182776e9e9c1f6e1584a4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 20 Jul 2020 01:47:24 +0200 Subject: gnu: xev: Update to 1.2.4. * gnu/packages/xorg.scm (xev): Update to 1.2.4. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 19873073d0..af9f396caa 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2405,7 +2405,7 @@ (define-public xdriinfo (define-public xev (package (name "xev") - (version "1.2.3") + (version "1.2.4") (source (origin (method url-fetch) @@ -2415,7 +2415,7 @@ (define-public xev ".tar.bz2")) (sha256 (base32 - "02ddsdx138g7szhwklpbzi0cxr34871iay3k28kdcihrz8f4zg36")))) + "1ql592pdhddhkipkrsxn929y9l2nn02a5fh2z3dx47kmzs5y006p")))) (build-system gnu-build-system) (inputs `(("libxrender" ,libxrender) -- cgit v1.2.3 From 454b3748661b2ad47665e176e93d25f0ff9fbecb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 20 Jul 2020 01:47:39 +0200 Subject: gnu: console-setup: Update to 1.196. * gnu/packages/xorg.scm (console-setup): Update to 1.196. [source]: Use git tag. --- gnu/packages/xorg.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index af9f396caa..66d78ca322 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6654,15 +6654,15 @@ (define-public bdfresize (define-public console-setup (package (name "console-setup") - (version "1.195") + (version "1.196") (source (origin (method git-fetch) (uri (git-reference (url "https://salsa.debian.org/installer-team/console-setup.git") - (commit "38512eb9a97f57ead1f87f6aee6df455f721c645"))) ; no tag + (commit version))) (sha256 - (base32 "0d0xagigs5k3appzz5lzxdjncvnkgz4amz6ks7imiq8kkjixvmfy")) + (base32 "0c79rycgpna8910as6blw3z3sajzzakz4qlvr6js2yr8zq2d0ylg")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 8bbc8accda7285acc346a14ea984862dc0f814c1 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Sun, 19 Jul 2020 20:24:00 -0500 Subject: gnu: lean: Disable test cases for i686 and armhf. * gnu/packages/lean.scm (lean)[arguments]: Individual test cases are currently failing for 32-bit architectures. Disable them temporarily pending further investigation as to resolution. --- gnu/packages/lean.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/lean.scm b/gnu/packages/lean.scm index 79d2ef4436..0cc67da874 100644 --- a/gnu/packages/lean.scm +++ b/gnu/packages/lean.scm @@ -42,6 +42,13 @@ (define-public lean `(("gmp" ,gmp))) (arguments `(#:build-type "Release" ; default upstream build type + ;; XXX: Test phases currently fail on 32-bit sytems. + ;; Tests for those architectures have been temporarily + ;; disabled, pending further investigation. + #:tests? ,(let ((arch (or (%current-target-system) + (%current-system)))) + (not (or (string-prefix? "i686" arch) + (string-prefix? "armhf" arch)))) #:phases (modify-phases %standard-phases (add-after 'patch-source-shebangs 'patch-tests-shebangs -- cgit v1.2.3 From 271bc79f9f3522da3b21ed900af3f9a77b349e72 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 19 Jul 2020 21:58:29 -0400 Subject: gnu: libmpdclient: Update to 2.19. * gnu/packages/mpd.scm (libmpdclient): Update to 2.19. --- gnu/packages/mpd.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 3801eaeb6b..835c075f79 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -60,7 +60,7 @@ (define-module (gnu packages mpd) (define-public libmpdclient (package (name "libmpdclient") - (version "2.18") + (version "2.19") (source (origin (method url-fetch) (uri @@ -69,7 +69,7 @@ (define-public libmpdclient "/libmpdclient-" version ".tar.xz")) (sha256 (base32 - "1yl123xr25gcd3vlsfmn6p7gbrq029pgnxa8m6n6j0byaqgixc2c")))) + "12d1fzlkcnjw4ayk2wp11vhglfcvr5k02arzdbkhiavq496av2hm")))) (build-system meson-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 00b6558811d0c520a561b2c4fec67bdf74e2ffa5 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 19 Jul 2020 21:58:51 -0400 Subject: gnu: MPD: Update to 0.21.25. * gnu/packages/mpd.scm (mpd): Update to 0.21.25. --- gnu/packages/mpd.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 835c075f79..8c82f30d85 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -92,7 +92,7 @@ (define-public libmpdclient (define-public mpd (package (name "mpd") - (version "0.21.24") + (version "0.21.25") (source (origin (method url-fetch) (uri @@ -101,7 +101,7 @@ (define-public mpd "/mpd-" version ".tar.xz")) (sha256 (base32 - "1mjclv7nf42smzry6cswciicsypv0mfsfl8nsykb6wp6h9z2lqw4")))) + "00f2cm3sg0vi9gxb1yk35lyyh3fbabwim3mfnsz2syrjpw0sv810")))) (build-system meson-build-system) (arguments `(#:configure-flags '("-Ddocumentation=true"))) ;the default is 'false'... -- cgit v1.2.3 From cd0c4268d74e58fcfe9c729183d90665f4abbb09 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Sun, 19 Jul 2020 23:54:32 -0500 Subject: gnu: emacs-telega: Update to 0.6.27-1. * gnu/packages/emacs-xyz.scm (emacs-telega): Update to 0.6.27-1. [source]: Take a new commit that includes the latest .el files from the contrib subdirectory. [arguments]: Add a substitute method for the 'telega-install-contrib phase to know where telega-contrib is located, and use it appropriately. [arguments]: Manually invoke bytecompilation as a separate step for the contrib directory. [arguments]: Add 'telega-install-contrib phase to place the contrib directory files in a more guix-suitable place. --- gnu/packages/emacs-xyz.scm | 35 +++++++++++++++++++++++++++++------ 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 3145faf3b4..10619efef0 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -22242,8 +22242,8 @@ (define-public emacs-telega ;; This package has versions newer than indicated on MELPA. ;; Get the current version from `telega-version` in telega.el. ;; or by running M-x telega-version. - (let ((commit "5fd725ef8e0b4cf2eb908b1f48638a9d5df49b93") - (revision "0") + (let ((commit "5c39c3a81e48222911db75ae30e5a8f8fa34efb5") + (revision "1") (version "0.6.27")) (package (name "emacs-telega") @@ -22256,7 +22256,7 @@ (define-public emacs-telega (commit commit))) (sha256 (base32 - "1852xkd8pq1g6c74nm8kbgiglsig7cyizp2igr4mydln2pak0ccx")) + "0wyycgsb1ja73phs9a2dgi50m2p6sdvx3xdwclfyijx4hzwlv233")) (patches (search-patches "emacs-telega-test-env.patch")) (file-name (git-file-name name version)))) (build-system gnu-build-system) @@ -22307,6 +22307,13 @@ (define-public emacs-telega "(concat \"telega-data/\" filename) (locate-dominating-file telega--lib-directory \"telega-data\")")) + ;; Modify telega.el to reflect unique dir name in + ;; `telega-install-contrib' phase. + (substitute* "telega.el" + (("\\(push \\(expand-file-name \"contrib\" telega--lib-directory\\) load-path\\)") + "(push (expand-file-name \"telega-contrib\" + (locate-dominating-file telega--lib-directory + \"telega-contrib\")) load-path)")) #t)) ;; The server test suite has a hardcoded path. ;; Reset this behavior to use the proper path. @@ -22325,7 +22332,16 @@ (define-public emacs-telega ;; Build emacs-side using `emacs-build-system' (add-after 'compress-documentation 'emacs-add-source-to-load-path (assoc-ref emacs:%standard-phases 'add-source-to-load-path)) - (add-after 'emacs-add-source-to-load-path 'emacs-install + ;; Manually invoke bytecompilation for the contrib + ;; subdirectory. + (add-after 'emacs-add-source-to-load-path 'emacs-bytecomp-contrib + (lambda _ + (substitute* "Makefile" + (("byte-recompile-directory \".\"") + "byte-recompile-directory \"contrib\"")) + (invoke "make" "compile") + #t)) + (add-after 'emacs-bytecomp-contrib 'emacs-install (assoc-ref emacs:%standard-phases 'install)) ;; This step installs subdir /etc, which contains images, sounds and ;; various other data, next to the site-lisp dir. @@ -22336,9 +22352,16 @@ (define-public emacs-telega (string-append (assoc-ref outputs "out") "/share/emacs/telega-data/")) #t)) - (add-after 'telega-install-data 'emacs-build + (add-after 'emacs-install 'telega-install-contrib + (lambda* (#:key outputs #:allow-other-keys) + (copy-recursively + "contrib" + (string-append (assoc-ref outputs "out") + "/share/emacs/telega-contrib")) + #t)) + (add-after 'telega-install-contrib 'emacs-build (assoc-ref emacs:%standard-phases 'build)) - (add-after 'emacs-build 'emacs-make-autoloads + (add-after 'telega-install-contrib 'emacs-make-autoloads (assoc-ref emacs:%standard-phases 'make-autoloads))))) (inputs `(("ffmpeg" ,ffmpeg))) ; mp4/gif support. -- cgit v1.2.3 From 883e91b4a8aefd04c49ec1a0220289281c18c8bf Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Wed, 15 Jul 2020 13:56:59 +0200 Subject: gnu: gnunet: Enable more tests. * gnu/packages/gnunet.scm (gnunet)[arguments]: Enable cadet tests. Signed-off-by: Efraim Flashner --- gnu/packages/gnunet.scm | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index 72f4d1c12c..979dadbe2e 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -296,17 +296,6 @@ (define-public gnunet (add-after 'configure 'remove-failing-tests ;; These tests fail in Guix's building environment. (lambda _ - (substitute* "src/cadet/Makefile" - (("test_cadet_2_reopen\\$\\(EXEEXT\\) \\\\\n") "test_cadet_2_reopen$(EXEEXT)") - (("test_cadet_5_forward\\$\\(EXEEXT\\) \\\\\n") "") - (("test_cadet_5_signal\\$\\(EXEEXT\\) \\\\\n") "") - (("test_cadet_5_keepalive\\$\\(EXEEXT\\) \\\\\n") "") - (("test_cadet_5_speed\\$\\(EXEEXT\\) \\\\\n") "") - (("test_cadet_5_speed_ack\\$\\(EXEEXT\\) \\\\\n") "") - (("test_cadet_5_speed_reliable\\$\\(EXEEXT\\) \\\\\n") "") - (("test_cadet_5_speed_reliable_backwards\\$\\(EXEEXT\\) \\\\\n") "") - (("test_cadet_5_speed_backwards\\$\\(EXEEXT\\) \\\\\n") "") - (("test_cadet_5_reopen\\$\\(EXEEXT\\)") "")) (substitute* "src/transport/Makefile" (("\\$\\(am__EXEEXT_15\\)") "") ; test_transport_api_https (("test_transport_api_manipulation_cfg\\$\\(EXEEXT\\) \\\\\n") "") -- cgit v1.2.3 From d33bc2c82e14dbcbbc8a74140f94a79b717ad0e6 Mon Sep 17 00:00:00 2001 From: Alexandru-Sergiu Marton Date: Sat, 18 Jul 2020 13:09:44 +0300 Subject: gnu: Add rust-directories-3. * gnu/packages/crates-io.scm (rust-directories-3): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 8a1e462f85..092af7257a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5610,6 +5610,36 @@ (define-public rust-digest-0.8 (("rust-blobby" ,rust-blobby-0.1) ("rust-generic-array" ,rust-generic-array-0.13)))))) +(define-public rust-directories-3 + (package + (name "rust-directories") + (version "3.0.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "directories" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "03ysv4m6mhsc3w1xnvncd5sxf7v2dz917awq6ksx0n0bsqwxdzpq")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-dirs-sys" ,rust-dirs-sys-0.3)) + #:cargo-development-inputs + (("rust-bencher" ,rust-bencher-0.1)))) + (home-page "https://github.com/dirs-dev/directories-rs") + (synopsis "Library for standard locations of data directories") + (description + "This package provides a tiny mid-level library that provides +platform-specific standard locations of directories for config, +cache and other data on Linux, Windows and macOS by leveraging the +mechanisms defined by the XDG base/user directory specifications +on Linux, the Known Folder API on Windows, and the Standard +Directory guidelines on macOS.") + (license (list license:expat license:asl2.0)))) + (define-public rust-dirs-2.0 (package (name "rust-dirs") -- cgit v1.2.3 From 500ee354ae2dd57e1af78c69984133824f1f16ee Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Sun, 19 Jul 2020 10:49:29 +0200 Subject: gnu: widelands: Update to 21. * gnu/packages/games.scm (widelands): Update to 21. [arguments]: Remove unneeded 'install-desktop-file-and-icons phase. Signed-off-by: Efraim Flashner --- gnu/packages/games.scm | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index e037ff649c..f4d75eedd4 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -51,6 +51,7 @@ ;;; Copyright © 2020 Vitaliy Shatrov ;;; Copyright © 2020 Jack Hill ;;; Copyright © 2020 Vincent Legoll +;;; Copyright © 2020 Michael Rohleder ;;; ;;; This file is part of GNU Guix. ;;; @@ -4651,15 +4652,15 @@ (define-public warzone2100 (define-public widelands (package (name "widelands") - (version "20") + (version "21") (source (origin (method url-fetch) (uri (string-append "https://launchpad.net/widelands/" "build" version "/build" version "/+download/" - "widelands-build" version ".tar.bz2")) + "widelands-build" version "-source.tar.gz")) (sha256 - (base32 "1cmwfwk7j6yi2pwmm4rm57s23sdzasqf53nx6567sdagqyc4sn9q")) + (base32 "0mz3jily0w1zxxqbnkqrp6hl88xhrwzbil9crq7gpcwidx60w7k0")) (modules '((guix build utils))) (snippet '(begin @@ -4683,25 +4684,6 @@ (define-public widelands "-DCMAKE_BUILD_TYPE=Release")) #:phases (modify-phases %standard-phases - (add-after 'unpack 'install-desktop-file-and-icons - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((share (string-append (assoc-ref outputs "out") "/share")) - (applications (string-append share "/applications")) - (icons (string-append share "/icons/hicolor"))) - ;; Move desktop entry. - (mkdir-p applications) - (copy-file "debian/org.widelands.widelands.desktop" - (string-append applications "/widelands.desktop")) - ;; Install icons. - (for-each (lambda (size) - (let* ((dim (string-append size "x" size)) - (apps (string-append icons "/" dim "/apps"))) - (mkdir-p apps) - (copy-file (string-append "data/images/logos" - "/wl-ico-" size ".png") - (string-append apps "/widelands.png")))) - '("16" "32" "48" "64" "128")) - #t))) (add-after 'unpack 'unbundle-fonts ;; Unbundle fonts already packaged in Guix. XXX: missing fonts are ;; amiri, Culmus, mmrCensus, Nakula, and Sinhala. -- cgit v1.2.3 From 3448c7eda3f120af690c5dc6252a1358779be522 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 20 Jul 2020 12:43:37 +0200 Subject: gnu: java-cisd-base: Update location of commons-io jar. * gnu/packages/java.scm (java-cisd-base)[arguments]: Update location of commons-io jar. --- gnu/packages/java.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 424c24b75f..68cdb62a7e 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2933,9 +2933,11 @@ (define-public java-cisd-base ,(package-version java-commons-lang) ".jar")) (("\\$\\{lib\\}/commons-io/commons-io.jar") (string-append (assoc-ref inputs "java-commons-io") - "/share/java/commons-io-" + "/lib/m2/commons-io/commons-io/" ,(package-version java-commons-io) - "-SNAPSHOT.jar")) + "/commons-io-" + ,(package-version java-commons-io) + ".jar")) ;; Remove dependency on svn ((" Date: Mon, 20 Jul 2020 12:44:26 +0200 Subject: gnu: java-cisd-jhdf5: Update location of commons-io jar. * gnu/packages/java.scm (java-cisd-jhdf5)[arguments]: Update location of commons-io jar. --- gnu/packages/java.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 68cdb62a7e..8df45e0904 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -3228,9 +3228,11 @@ (define-public java-cisd-jhdf5 ,(package-version java-commons-lang) ".jar")) (("\\$\\{lib\\}/commons-io/commons-io.jar") (string-append (assoc-ref inputs "java-commons-io") - "/share/java/commons-io-" + "/lib/m2/commons-io/commons-io/" + ,(package-version java-commons-io) + "/commons-io-" ,(package-version java-commons-io) - "-SNAPSHOT.jar")) + ".jar")) (("\\$\\{lib\\}/testng/testng-jdk15.jar") (string-append (assoc-ref inputs "java-testng") "/share/java/java-testng.jar")) -- cgit v1.2.3 From d6fedf6bf73c5875b6f3d75f1a3349e7ccef43c5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 20 Jul 2020 15:34:23 +0300 Subject: gnu: python-pytest-vcr: Fix integration with pytest-5. * gnu/packages/python-check.scm (python-pytest-vcr): Update to 1.0.2-1.4d6c7b3. --- gnu/packages/python-check.scm | 61 +++++++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index 200bce6ced..09eb253f06 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -126,35 +126,38 @@ (define-public python-vcrpy (license license:expat))) (define-public python-pytest-vcr - (package - (name "python-pytest-vcr") - (version "1.0.2") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ktosiek/pytest-vcr") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1i6fin91mklvbi8jzfiswvwf1m91f43smpj36a17xrzk4gisfs6i")))) - (build-system python-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key inputs outputs #:allow-other-keys) - (add-installed-pythonpath inputs outputs) - (invoke "pytest" "tests/")))))) - (propagated-inputs - `(("python-pytest" ,python-pytest) - ("python-vcrpy" ,python-vcrpy))) - (home-page "https://github.com/ktosiek/pytest-vcr") - (synopsis "Plugin for managing VCR.py cassettes") - (description - "Plugin for managing VCR.py cassettes.") - (license license:expat))) + ;; This commit fixes integration with pytest-5 + (let ((commit "4d6c7b3e379a6a7cba0b8f9d20b704dc976e9f05") + (revision "1")) + (package + (name "python-pytest-vcr") + (version (git-version "1.0.2" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ktosiek/pytest-vcr") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1yk988zi0la6zpcm3fff0mxf942di2jiymrfqas19nyngj5ygaqs")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs outputs #:allow-other-keys) + (add-installed-pythonpath inputs outputs) + (invoke "pytest" "tests/")))))) + (propagated-inputs + `(("python-pytest" ,python-pytest) + ("python-vcrpy" ,python-vcrpy))) + (home-page "https://github.com/ktosiek/pytest-vcr") + (synopsis "Plugin for managing VCR.py cassettes") + (description + "Plugin for managing VCR.py cassettes.") + (license license:expat)))) (define-public python-pytest-checkdocs (package -- cgit v1.2.3 From 7ff56a6bffdb064d9b76b3cf8942ea17ff08008f Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 18 Jul 2020 06:30:14 -0700 Subject: gnu: rust-lock-api-0.3: Update to 0.3.4. * gnu/packages/crates-io.scm (rust-lock-api-0.3): Update to 0.3.4. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 092af7257a..97f5d11f18 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -12711,7 +12711,7 @@ (define-public rust-locale-config-0.2 (define-public rust-lock-api-0.3 (package (name "rust-lock-api") - (version "0.3.3") + (version "0.3.4") (source (origin (method url-fetch) @@ -12720,7 +12720,7 @@ (define-public rust-lock-api-0.3 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0yzlz7f5xl5sm129dq8jqsrcrkyv7jjnqwd4zr4ijsdlxjaxxckr")))) + "0xgc5dzmajh0akbh5d6d7rj9mh5rzpk74pyrc946v2ixgakj9nn4")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From 810a56494a4481458bb0f55e99d10b3954d65b06 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 18 Jul 2020 07:41:55 -0700 Subject: gnu: Add rust-itertools-0.5. * gnu/packages/crates-io.scm (rust-itertools-0.5): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 97f5d11f18..c129cf207a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11531,6 +11531,27 @@ (define-public rust-itertools-0.7 (("rust-permutohedron" ,rust-permutohedron-0.2) ("rust-quickcheck" ,rust-quickcheck-0.5)))))) +(define-public rust-itertools-0.5 + (package + (inherit rust-itertools-0.7) + (name "rust-itertools") + (version "0.5.10") + (source + (origin + (method url-fetch) + (uri (crate-uri "itertools" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1z4lyrakgynvhylya72qb3vizmxmd62whjmg4r8k01d4inbxccs8")))) + (arguments + `(#:tests? #f ; Tests fail to compile + #:cargo-inputs + (("rust-either" ,rust-either-1.5)) + #:cargo-development-inputs + (("rust-permutohedron" ,rust-permutohedron-0.2) + ("rust-quickcheck" ,rust-quickcheck-0.4)))))) + (define-public rust-itertools-num-0.1 (package (name "rust-itertools-num") -- cgit v1.2.3 From 0dc782c8a79280ccd4941c5cbaf1197fc0fac47d Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 18 Jul 2020 07:22:30 -0700 Subject: gnu: rust-odds-0.3: Do not skip build. * gnu/packages/crates-io.scm (rust-odds-0.3): Do not skip build. [arguments]: In cargo-development-inputs replace rust-itertools-0.8 with 0.7, rust-lazy-static-1 with 0.2, rust-quickcheck-0.8 with 0.4. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c129cf207a..df2040ddad 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -15488,16 +15488,15 @@ (define-public rust-odds-0.3 "0rdnxa0na4897yb0svb3figz35g4imxjv61yfm2j21gbh5q8v8d9")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-rawpointer" ,rust-rawpointer-0.1) ("rust-rawslice" ,rust-rawslice-0.1) ("rust-unchecked-index" ,rust-unchecked-index-0.2)) #:cargo-development-inputs - (("rust-itertools" ,rust-itertools-0.8) - ("rust-lazy-static" ,rust-lazy-static-1) + (("rust-itertools" ,rust-itertools-0.7) + ("rust-lazy-static" ,rust-lazy-static-0.2) ("rust-memchr" ,rust-memchr-2) - ("rust-quickcheck" ,rust-quickcheck-0.8)))) + ("rust-quickcheck" ,rust-quickcheck-0.4)))) (home-page "https://github.com/bluss/odds") (synopsis "Extra functionality for slices, strings and other things") (description -- cgit v1.2.3 From cdb4b33c6cf9c4789b8ccaca43172faaf4a27723 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 18 Jul 2020 06:43:01 -0700 Subject: gnu: Add rust-odds-0.2. * gnu/packages/crates-io.scm (rust-odds-0.2): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index df2040ddad..ca356e877a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -15505,6 +15505,32 @@ (define-public rust-odds-0.3 Things in odds may move to more appropriate crates if we find them.") (license (list license:asl2.0 license:expat)))) +(define-public rust-odds-0.2 + (package + (inherit rust-odds-0.3) + (name "rust-odds") + (version "0.2.26") + (source + (origin + (method url-fetch) + (uri (crate-uri "odds" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "08pvngx0nf7yl9cgk4bahn1a0s8na5g9knbhq7y29kysp58h3bjf")))) + (arguments + `(#:tests? #f ; doc tests fail + #:cargo-inputs + (("rust-rawpointer" ,rust-rawpointer-0.1) + ("rust-rawslice" ,rust-rawslice-0.1) + ("rust-unchecked-index" ,rust-unchecked-index-0.2)) + #:cargo-development-inputs + (("rust-itertools" ,rust-itertools-0.5) + ("rust-lazy-static" ,rust-lazy-static-0.2) + ("rust-memchr" ,rust-memchr-2) + ("rust-quickcheck" ,rust-quickcheck-0.4)))))) + (define-public rust-onig-5.0 (package (name "rust-onig") -- cgit v1.2.3 From 125998c54ae7903a591847025f3c3f0e7e6a7a3b Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 18 Jul 2020 06:57:49 -0700 Subject: gnu: rust-petgraph-0.4: Do not skip build. * gnu/packages/crates-io.scm (rust-petgraph-0.4): [arguments] Correct dependencies, ignore failing test, do not skip build. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ca356e877a..6fc1c41027 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -17138,18 +17138,24 @@ (define-public rust-petgraph-0.4 "0kyfmca854s54jk26g2x1kjb04c3k7cjilaxyr0if8lhxv8mjdlw")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-fixedbitset" ,rust-fixedbitset-0.1) + ("rust-odds" ,rust-odds-0.2) ("rust-ordermap" ,rust-ordermap-0.3) - ("rust-quickcheck" ,rust-quickcheck-0.8) + ("rust-quickcheck" ,rust-quickcheck-0.4) ("rust-serde" ,rust-serde-1.0) ("rust-serde-derive" ,rust-serde-derive-1.0)) #:cargo-development-inputs - (("rust-defmac" ,rust-defmac-0.2) - ("rust-itertools" ,rust-itertools-0.8) - ("rust-odds" ,rust-odds-0.3) - ("rust-rand" ,rust-rand-0.4)))) + (("rust-defmac" ,rust-defmac-0.1) + ("rust-itertools" ,rust-itertools-0.7) + ("rust-rand" ,rust-rand-0.4)) + #:phases + (modify-phases %standard-phases + (add-before 'check 'ignore-failing-test + (lambda _ + (substitute* "tests/graph.rs" + (("fn dot\\(\\) \\{" all) + (string-append "#[ignore] " all)))))))) (home-page "https://github.com/petgraph/petgraph") (synopsis "Graph data structure library") (description -- cgit v1.2.3 From 87e6e9b7afd9aa0488c8a7a82b9bf8893784cb6a Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 18 Jul 2020 07:03:30 -0700 Subject: gnu: rust-fixedbitset-0.1: Do not skip build. * gnu/packages/crates-io.scm (rust-fixedbitset-0.1): [arguments] Do not skip build. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6fc1c41027..192c4ebcc2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7157,7 +7157,6 @@ (define-public rust-fixedbitset-0.1 (base32 "0czam11mi80dbyhf4rd4lz0ihcf7vkfchrdcrn45wbs0h40dxm46")))) (build-system cargo-build-system) - (arguments '(#:skip-build? #t)) (home-page "https://github.com/petgraph/fixedbitset") (synopsis "FixedBitSet is a simple bitset collection") (description "FixedBitSet is a simple bitset collection.") -- cgit v1.2.3 From 78e831817d54d8f0ad1d5d6ff64763e9c3294188 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 18 Jul 2020 07:05:59 -0700 Subject: gnu: Add rust-fixedbitset-0.2. * gnu/packages/crates-io.scm (rust-fixedbitset-0.2): New variable. (rust-fixedbitset-0.1): Inherit from rust-fixedbitset-0.2. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 192c4ebcc2..d64369c60f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7144,10 +7144,10 @@ (define-public rust-findshlibs-0.5 (license (list license:asl2.0 license:expat)))) -(define-public rust-fixedbitset-0.1 +(define-public rust-fixedbitset-0.2 (package (name "rust-fixedbitset") - (version "0.1.9") + (version "0.2.0") (source (origin (method url-fetch) @@ -7155,7 +7155,7 @@ (define-public rust-fixedbitset-0.1 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "0czam11mi80dbyhf4rd4lz0ihcf7vkfchrdcrn45wbs0h40dxm46")))) + "0kg03p777wc0dajd9pvlcnsyrwa8dhqwf0sd9r4dw0p82rs39arp")))) (build-system cargo-build-system) (home-page "https://github.com/petgraph/fixedbitset") (synopsis "FixedBitSet is a simple bitset collection") @@ -7163,6 +7163,20 @@ (define-public rust-fixedbitset-0.1 (license (list license:asl2.0 license:expat)))) +(define-public rust-fixedbitset-0.1 + (package + (inherit rust-fixedbitset-0.2) + (name "rust-fixedbitset") + (version "0.1.9") + (source + (origin + (method url-fetch) + (uri (crate-uri "fixedbitset" version)) + (file-name (string-append name "-" version ".crate")) + (sha256 + (base32 + "0czam11mi80dbyhf4rd4lz0ihcf7vkfchrdcrn45wbs0h40dxm46")))))) + (define-public rust-flame-0.2 (package (name "rust-flame") -- cgit v1.2.3 From 3943c9d6b6349364d45a168b139ec48ce47ec314 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 18 Jul 2020 07:11:56 -0700 Subject: gnu: Add rust-petgraph-0.5. * gnu/packages/crates-io.scm (rust-petgraph-0.5): New variable. (rust-petgraph-0.4): Inherit from rust-petgraph-0.5. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 43 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 35 insertions(+), 8 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d64369c60f..4c94296bcc 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -17136,8 +17136,42 @@ (define-public rust-pest-meta-2.1 "Pest meta language parser and validator.") (license (list license:asl2.0 license:expat)))) +(define-public rust-petgraph-0.5 + (package + (name "rust-petgraph") + (version "0.5.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "petgraph" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1dzxda6z17sfxly11m8ja3iargh73pw0s1sdgjyp0qp5dm51cza6")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-fixedbitset" ,rust-fixedbitset-0.2) + ("rust-ordermap" ,rust-ordermap-0.3) + ("rust-quickcheck" ,rust-quickcheck-0.8) + ("rust-serde" ,rust-serde-1.0) + ("rust-serde-derive" ,rust-serde-derive-1.0)) + #:cargo-development-inputs + (("rust-defmac" ,rust-defmac-0.1) + ("rust-itertools" ,rust-itertools-0.8) + ("rust-odds" ,rust-odds-0.2) + ("rust-rand" ,rust-rand-0.5)))) + (home-page "https://github.com/petgraph/petgraph") + (synopsis "Graph data structure library") + (description + "Graph data structure library. Provides graph types and graph +algorithms.") + (license (list license:expat license:asl2.0)))) + (define-public rust-petgraph-0.4 (package + (inherit rust-petgraph-0.5) (name "rust-petgraph") (version "0.4.13") (source @@ -17149,7 +17183,6 @@ (define-public rust-petgraph-0.4 (sha256 (base32 "0kyfmca854s54jk26g2x1kjb04c3k7cjilaxyr0if8lhxv8mjdlw")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-fixedbitset" ,rust-fixedbitset-0.1) @@ -17168,13 +17201,7 @@ (define-public rust-petgraph-0.4 (lambda _ (substitute* "tests/graph.rs" (("fn dot\\(\\) \\{" all) - (string-append "#[ignore] " all)))))))) - (home-page "https://github.com/petgraph/petgraph") - (synopsis "Graph data structure library") - (description - "Graph data structure library. Provides graph types and graph -algorithms.") - (license (list license:expat license:asl2.0)))) + (string-append "#[ignore] " all)))))))))) (define-public rust-phf-0.8 (package -- cgit v1.2.3 From 547551b33612596d5a9112f16d85f991697bf430 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 18 Jul 2020 07:14:43 -0700 Subject: gnu: rust-parking-lot-core-0.7: Update to 0.7.2. * gnu/packages/crates-io.scm (rust-parking-lot-core-0.7): Update to 0.7.2. [arguments]: In cargo-inputs replace rust-petgraph-0.4 with 0.5. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4c94296bcc..b6fdb53194 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -16567,7 +16567,7 @@ (define-public rust-parking-lot-0.7 (define-public rust-parking-lot-core-0.7 (package (name "rust-parking-lot-core") - (version "0.7.0") + (version "0.7.2") (source (origin (method url-fetch) @@ -16576,7 +16576,7 @@ (define-public rust-parking-lot-core-0.7 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1wdbrvh35nn09ga570vl5062dpwfbrwgzyrlhhy78ifzhj2870km")))) + "18s0cw5y32447c06fhg2mp3xfng22fn1h9fpx3il98sbimv7r36m")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -16584,7 +16584,7 @@ (define-public rust-parking-lot-core-0.7 ("rust-cfg-if" ,rust-cfg-if-0.1) ("rust-cloudabi" ,rust-cloudabi-0.0) ("rust-libc" ,rust-libc-0.2) - ("rust-petgraph" ,rust-petgraph-0.4) + ("rust-petgraph" ,rust-petgraph-0.5) ("rust-redox-syscall" ,rust-redox-syscall-0.1) ("rust-smallvec" ,rust-smallvec-1) ("rust-thread-id" ,rust-thread-id-3.3) -- cgit v1.2.3 From 381ea2b443a56ce60fe98c393c1e7dafceb6af33 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 18 Jul 2020 07:16:23 -0700 Subject: gnu: rust-parking-lot-0.10: Upgrade to 0.10.2. * gnu/packages/crates-io.scm (rust-parking-lot-core-0.10): Upgrade to 0.10.2. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b6fdb53194..3516c60390 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -16463,7 +16463,7 @@ (define-public rust-parity-wasm-0.40 (define-public rust-parking-lot-0.10 (package (name "rust-parking-lot") - (version "0.10.0") + (version "0.10.2") (source (origin (method url-fetch) @@ -16472,7 +16472,7 @@ (define-public rust-parking-lot-0.10 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1z0wgf2sd1266y768kxxs3313zjfzj9r3k7j4arfaz0bmd4qrscj")))) + "0pjhcbyk6n0g6jsr6s9nf4x8wribm1b2yf8fgc8drbqa77mh99yk")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From 099516cb3b4e054dd52258625af3027ef609e0c2 Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Thu, 16 Jul 2020 14:43:29 +0200 Subject: gnu: python-click: Update to 7.1.2. * gnu/packages/python-xyz.scm (python-click): Update to 7.1.2. [arguments] Fix the name of the file to modify. Set PYTHONPATH to make tests pass. Signed-off-by: Efraim Flashner --- gnu/packages/python-xyz.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c6afe0b03d..f55f888254 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2429,14 +2429,14 @@ (define-public python-cli-helpers (define-public python-click (package (name "python-click") - (version "7.0") + (version "7.1.2") (source (origin (method url-fetch) (uri (pypi-uri "click" version)) (sha256 (base32 - "1mzjixd4vjbjvzb6vylki9w1556a9qmdh35kzmq6cign46av952v")))) + "06kbzd6sjfkqan3miwj9wqyddfxc2b6hi7p5s4dvqjb3gif2bdfj")))) (build-system python-build-system) (arguments `(#:phases @@ -2445,12 +2445,13 @@ (define-public python-click (lambda* (#:key inputs #:allow-other-keys) (let ((glibc (assoc-ref inputs ,(if (%current-target-system) "cross-libc" "libc")))) - (substitute* "click/_unicodefun.py" + (substitute* "src/click/_unicodefun.py" (("'locale'") (string-append "'" glibc "/bin/locale'")))) #t)) (replace 'check (lambda _ + (setenv "PYTHONPATH" (string-append "./src:" (getenv "PYTHONPATH"))) (invoke "python" "-m" "pytest")))))) (native-inputs `(("python-pytest" ,python-pytest))) -- cgit v1.2.3 From a3c0a8f41021609377b6b6467dabe2c821e465d8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 20 Jul 2020 16:57:57 +0300 Subject: gnu: Add python-py3dns. * gnu/packages/python-xyz.scm (python-py3dns): New variable. --- gnu/packages/python-xyz.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f55f888254..a48f39429d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12321,6 +12321,37 @@ (define-public python-dnspython (define-public python2-dnspython (package-with-python2 python-dnspython)) +(define-public python-py3dns + (package + (name "python-py3dns") + (version "3.2.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "py3dns" version)) + (sha256 + (base32 + "1r25f0ys5p37bhld7m7n4gb0lrysaym3w318w2f8bncq7r3d81qz")))) + (build-system python-build-system) + ;; This package wants to read /etc/resolv.conf. We can't patch it without + ;; removing functionality so we copy from Nix and "just don't build it". + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda _ + (substitute* "setup.py" + (("import DNS") "") + (("DNS.__version__") (string-append "\"" ,version "\""))) + #t))) + #:tests? #f)) ; Also skip the tests. + (home-page "https://launchpad.net/py3dns") + (synopsis "Python 3 DNS library") + (description "This Python 3 module provides a DNS API for looking up DNS +entries from within Python 3 modules and applications. This module is a +simple, lightweight implementation.") + (license license:psfl))) + (define-public python-email-validator (package (name "python-email-validator") -- cgit v1.2.3 From 3c23ae88abddc484ad973f2e068886a92f05833e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 20 Jul 2020 17:03:24 +0300 Subject: gnu: python-zope-testrunner: Update to 5.2. * gnu/packages/python-web.scm (python-zope-testrunner): Update to 5.2. --- gnu/packages/python-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 0624cc967a..3bf1f7bc9a 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1158,14 +1158,14 @@ (define-public python2-zope-testing (define-public python-zope-testrunner (package (name "python-zope-testrunner") - (version "5.1") + (version "5.2") (source (origin (method url-fetch) (uri (pypi-uri "zope.testrunner" version)) (sha256 (base32 - "0w3q66cy4crpj7c0hw0vvvvwf3g931rnvw7wwa20av7yqvv6ajim")))) + "0jyyf1dcz156q95x2y7yw2v420q2xn3cff0c5aci7hmdmcbn0gc7")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; FIXME: Tests can't find zope.interface. -- cgit v1.2.3 From 845717bb8f8fc29756e2df625bc2c305fffd4a68 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 20 Jul 2020 17:14:04 +0300 Subject: gnu: python-zope-exceptions: Update to 4.4. * gnu/packages/python-web.scm (python-zope-exceptions): Update to 4.4. --- gnu/packages/python-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 3bf1f7bc9a..5f6329125c 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1112,14 +1112,14 @@ (define-public python2-zope-interface (define-public python-zope-exceptions (package (name "python-zope-exceptions") - (version "4.3") + (version "4.4") (source (origin (method url-fetch) (uri (pypi-uri "zope.exceptions" version)) (sha256 (base32 - "04bjskwas17yscl8bs3l44maxspw1gdji0zcmr499fs420y9r9az")))) + "1nkgfwawswmyc6i0b8g3ymvja4mb507m8yhid8s4rbxq3dmqhwhd")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; circular dependency with zope.testrunner -- cgit v1.2.3 From 7dc36cdc8f77ad3a542823278f9d03e70714b4c7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 20 Jul 2020 17:17:48 +0300 Subject: gnu: Add python-zope-exceptions-bootstrap. * gnu/packages/python-web.scm (python-zope-exceptions-bootstrap): New hidden package. --- gnu/packages/python-web.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 5f6329125c..ba8c1fe3c7 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1131,6 +1131,14 @@ (define-public python-zope-exceptions that have uses outside of the Zope framework.") (license license:zpl2.1))) +(define-public python-zope-exceptions-bootstrap + (package + (inherit python-zope-exceptions) + (arguments `(#:tests? #f)) + (propagated-inputs `()) + (native-inputs `()) + (properties `((hidden? . #t))))) + (define-public python2-zope-exceptions (package-with-python2 python-zope-exceptions)) -- cgit v1.2.3 From 2f938b634e0265fc6d3348cdcba9c788303c0136 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 20 Jul 2020 17:18:20 +0300 Subject: gnu: Add python-zope-testrunner-bootstrap. * gnu/packages/python-web.scm (python-zope-testrunner-bootstrap): New hidden package. --- gnu/packages/python-web.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index ba8c1fe3c7..a9f362e0bc 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1189,6 +1189,15 @@ (define-public python-zope-testrunner tests.") (license license:zpl2.1))) +(define-public python-zope-testrunner-bootstrap + (package + (inherit python-zope-testrunner) + (arguments `(#:tests? #f)) + (propagated-inputs + `(("python-six" ,python-six) + ("python-zope-exceptions" ,python-zope-exceptions-bootstrap))) + (properties `((hidden? . #t))))) + (define-public python2-zope-testrunner (package-with-python2 python-zope-testrunner)) -- cgit v1.2.3 From 6ae5d5da650fcf7814c5365ba138701d47a77dcc Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 20 Jul 2020 17:19:05 +0300 Subject: gnu: python-zope-exceptions: Enable tests. * gnu/packages/python-web.scm (python-zope-exceptions)[arguments]: Use custom 'check phase. [native-inputs]: Add python-zope-testrunner-bootstrap. --- gnu/packages/python-web.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index a9f362e0bc..ed37e47448 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1122,7 +1122,13 @@ (define-public python-zope-exceptions "1nkgfwawswmyc6i0b8g3ymvja4mb507m8yhid8s4rbxq3dmqhwhd")))) (build-system python-build-system) (arguments - '(#:tests? #f)) ; circular dependency with zope.testrunner + '(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "zope-testrunner" "--test-path=src")))))) + (native-inputs + `(("python-zope-testrunner" ,python-zope-testrunner-bootstrap))) (propagated-inputs `(("python-zope-interface" ,python-zope-interface))) (home-page "https://pypi.org/project/zope.exceptions/") -- cgit v1.2.3 From f3d446ccf4719f9e44d091f84d530bf09b7329c7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 20 Jul 2020 17:21:45 +0300 Subject: gnu: Add python-zope-proxy-bootstrap. * gnu/packages/python-web.scm (python-zope-proxy-bootstrap): New hidden package. --- gnu/packages/python-web.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index ed37e47448..81cee4dad3 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1319,6 +1319,13 @@ (define-public python-zope-proxy brokering, etc.) for which the proxy is responsible.") (license license:zpl2.1))) +(define-public python-zope-proxy-bootstrap + (package + (inherit python-zope-proxy) + (arguments `(#:tests? #f)) + (native-inputs `()) + (properties `((hidden? . #t))))) + (define-public python2-zope-proxy (package-with-python2 python-zope-proxy)) -- cgit v1.2.3 From e2ba910e38eadcedf22645d8ecfcb4bb45f4701a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 20 Jul 2020 17:22:53 +0300 Subject: gnu: Add python-zope-security-bootstrap. * gnu/packages/python-web.scm (python-zope-security-bootstrap): New hidden package. --- gnu/packages/python-web.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 81cee4dad3..b602119053 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1389,6 +1389,18 @@ (define-public python-zope-security security policies on Python objects.") (license license:zpl2.1))) +(define-public python-zope-security-bootstrap + (package + (inherit python-zope-security) + (arguments `(#:tests? #f)) + (propagated-inputs + `(("python-zope-i18nmessageid" ,python-zope-i18nmessageid) + ("python-zope-interface" ,python-zope-interface) + ("python-zope-proxy" ,python-zope-proxy-bootstrap) + ("python-zope-schema" ,python-zope-schema))) + (native-inputs `()) + (properties `((hidden? . #t))))) + (define-public python2-zope-security (package-with-python2 python-zope-security)) -- cgit v1.2.3 From 9085a0c97ad969dcd0d066036b49c861a44ac46a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 20 Jul 2020 17:25:15 +0300 Subject: gnu: python-zope-proxy: Run the tests. * gnu/packages/python-web.scm (python-zope-proxy)[arguments]: Don't skip tests. [native-inputs]: Add python-zope-security-bootstrap. --- gnu/packages/python-web.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index b602119053..bd37dfca6c 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1304,10 +1304,9 @@ (define-public python-zope-proxy (base32 "1g0rcfnbchpvqhm76aixqlz544dawrgmy8gw9zwmijhk6wfl9f26")))) (build-system python-build-system) - (arguments - '(#:tests? #f)) ; FIXME: Tests can't find zope.interface. (native-inputs - `(("python-zope-testrunner" ,python-zope-testrunner))) + `(("python-zope-security" ,python-zope-security-bootstrap) + ("python-zope-testrunner" ,python-zope-testrunner))) (propagated-inputs `(("python-zope-interface" ,python-zope-interface))) (home-page "https://pypi.org/project/zope.proxy/") -- cgit v1.2.3 From 556eec71d836016c12f615f69cf4099184280afb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 20 Jul 2020 17:26:48 +0300 Subject: gnu: python-zope-proxy: Update to 4.3.5. * gnu/packages/python-web.scm (python-zope-proxy): Update to 4.3.5. --- gnu/packages/python-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index bd37dfca6c..0f1c81d73a 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1295,14 +1295,14 @@ (define-public python2-zope-configuration (define-public python-zope-proxy (package (name "python-zope-proxy") - (version "4.3.4") + (version "4.3.5") (source (origin (method url-fetch) (uri (pypi-uri "zope.proxy" version)) (sha256 (base32 - "1g0rcfnbchpvqhm76aixqlz544dawrgmy8gw9zwmijhk6wfl9f26")))) + "14h7nyfbl5vpfk0rbviy4ygdfx0yx5kncvg6jpbdb0dhwna0ssm6")))) (build-system python-build-system) (native-inputs `(("python-zope-security" ,python-zope-security-bootstrap) -- cgit v1.2.3 From 6de5b0f03dbbf47d3d632d175e0abc283c673bbe Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 20 Jul 2020 17:31:45 +0300 Subject: gnu: python-zope-interface: Update to 5.1.0. * gnu/packages/python-web.scm (python-zope-interface): Update to 5.1.0. [arguments]: Skip tests. [native-inputs]: Add python-coverage, python-nose, python-zope-testing. --- gnu/packages/python-web.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 0f1c81d73a..02bd3fe58f 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1087,17 +1087,21 @@ (define-public python2-zope-event (define-public python-zope-interface (package (name "python-zope-interface") - (version "4.7.2") + (version "5.1.0") (source (origin (method url-fetch) (uri (pypi-uri "zope.interface" version)) (sha256 (base32 - "0r9kvb1q3lxrdhxabliv9nwhjsdmn1n0vcjv93rlqkyb7yyh24gx")))) + "03nrl6b8cb600dnnh46y149awvrm0gxyqgwq5hdw3lvys8mw9r20")))) (build-system python-build-system) + (arguments '(#:tests? #f)) ; test suite can't find python-zope-testing (native-inputs - `(("python-zope-event" ,python-zope-event))) + `(("python-coverage" ,python-coverage) + ("python-nose" ,python-nose) + ("python-zope-event" ,python-zope-event) + ("python-zope-testing" ,python-zope-testing))) (home-page "https://github.com/zopefoundation/zope.interface") (synopsis "Python implementation of the \"design by contract\" methodology") -- cgit v1.2.3 From 9c2e6516622d19ca2e484e2c168a1f94f2c96f76 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 20 Jul 2020 17:37:55 +0300 Subject: gnu: python-zope-schema: Update to 6.0.0. * gnu/packages/python-web.scm (python-zope-schema): Update to 6.0.0. [arguments]: Don't skip tests. Use custom 'check phase. --- gnu/packages/python-web.scm | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 02bd3fe58f..8a21895228 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1240,17 +1240,24 @@ (define-public python2-zope-i18nmessageid (define-public python-zope-schema (package (name "python-zope-schema") - (version "5.0.1") + (version "6.0.0") (source (origin (method url-fetch) (uri (pypi-uri "zope.schema" version)) (sha256 (base32 - "0q93j0x52a42khw12al90jw2bk0wly3jwghql3a25zpwwxvn24ya")))) + "09jg47bxhfg1ahr1jxb5y0cbiszyk1j6fn1r1r7s6svjl3lbryr0")))) (build-system python-build-system) (arguments - '(#:tests? #f)) ; FIXME: Tests can't find zope.event. + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (add-installed-pythonpath inputs outputs) + (if tests? + (invoke "zope-testrunner" "--test-path=src") + #t)))))) (propagated-inputs `(("python-zope-event" ,python-zope-event) ("python-zope-interface" ,python-zope-interface))) -- cgit v1.2.3 From b563526794c14eb2d4325d209ae4b3bcac1704c0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 20 Jul 2020 17:39:57 +0300 Subject: gnu: Add python-manuel. * gnu/packages/python-web.scm (python-manuel): New variable. --- gnu/packages/python-web.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 8a21895228..8abf6a7874 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -4132,3 +4132,25 @@ (define-public python-flask-restx decorators and tools to describe your API and expose its documentation properly using Swagger.") (license license:bsd-3))) + +(define-public python-manuel + (package + (name "python-manuel") + (version "1.10.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "manuel" version)) + (sha256 + (base32 + "1bdzay7j70fly5fy6wbdi8fbrxjrrlxnxnw226rwry1c8a351rpy")))) + (build-system python-build-system) + (propagated-inputs + `(("python-six" ,python-six))) + (native-inputs + `(("python-zope-testing" ,python-zope-testing))) + (home-page "https://pypi.org/project/manuel/") + (synopsis "Build tested documentation") + (description + "Manuel lets you mix and match traditional doctests with custom test syntax.") + (license license:asl2.0))) -- cgit v1.2.3 From 047c1f24de61b599ec83b76bdb18a82fdb7dce4b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 20 Jul 2020 17:41:52 +0300 Subject: gnu: python-zope-configuration: Update to 4.4.0. * gnu/packages/python-web.scm (python-zope-configuration): Update to 4.4.0. [arguments]: Don't skip tests. [native-inputs]: Add python-manuel. --- gnu/packages/python-web.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 8abf6a7874..1a33ebaf0e 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1277,18 +1277,17 @@ (define-public python2-zope-schema (define-public python-zope-configuration (package (name "python-zope-configuration") - (version "4.3.1") + (version "4.4.0") (source (origin (method url-fetch) (uri (pypi-uri "zope.configuration" version)) (sha256 (base32 - "1qb88764fd7nkkmqv7fl9bxd1jirynkg5vbqkpqdiffnkxzp85kf")))) + "0g6vrl7y27z9cj5xyrww9xlzk4npj55mgmlrcd9d2nj08jn2pw79")))) (build-system python-build-system) - (arguments - '(#:tests? #f)) ; FIXME: Tests can't find zope.interface. (native-inputs - `(("python-zope-testing" ,python-zope-testing) + `(("python-manuel" ,python-manuel) + ("python-zope-testing" ,python-zope-testing) ("python-zope-testrunner" ,python-zope-testrunner))) (propagated-inputs `(("python-zope-i18nmessageid" ,python-zope-i18nmessageid) -- cgit v1.2.3 From 54b040a31c12f85a04bb514b271a13db2fd5c6d7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 20 Jul 2020 17:44:42 +0300 Subject: gnu: Add python-persistent. * gnu/packages/python-web.scm (python-persistent): New variable. --- gnu/packages/python-web.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 1a33ebaf0e..57254df587 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -4153,3 +4153,28 @@ (define-public python-manuel (description "Manuel lets you mix and match traditional doctests with custom test syntax.") (license license:asl2.0))) + +(define-public python-persistent + (package + (name "python-persistent") + (version "4.6.4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "persistent" version)) + (sha256 + (base32 + "0imm9ji03lhkpcfmhid7x5209ix8g2rlgki9ik1qxks4b8sm8gzq")))) + (build-system python-build-system) + (propagated-inputs + `(("python-cffi" ,python-cffi) + ("python-zope-interface" ,python-zope-interface))) + (native-inputs + `(("python-manuel" ,python-manuel) + ("python-zope-testrunner" ,python-zope-testrunner))) + (home-page "https://github.com/zopefoundation/persistent/") + (synopsis "Translucent persistent objects") + (description "This package contains a generic persistence implementation for +Python. It forms the core protocol for making objects interact +\"transparently\" with a database such as the ZODB.") + (license license:zpl2.1))) -- cgit v1.2.3 From 79c36951e49c775239dd6846ad66924179c1236b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 20 Jul 2020 17:45:23 +0300 Subject: gnu: Add python-btrees. * gnu/packages/python-web.scm (python-btrees): New variable. --- gnu/packages/python-web.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 57254df587..e47912578d 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -4178,3 +4178,31 @@ (define-public python-persistent Python. It forms the core protocol for making objects interact \"transparently\" with a database such as the ZODB.") (license license:zpl2.1))) + +(define-public python-btrees + (package + (name "python-btrees") + (version "4.7.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "BTrees" version)) + (sha256 + (base32 + "0iiq0g9k1g6qgqq84q9h6639vlvzznk1rgdm0rfcnnqkbkmsbr3w")))) + (build-system python-build-system) + (propagated-inputs + `(("python-persistent" ,python-persistent) + ("python-zope-interface" ,python-zope-interface))) + (native-inputs + `(("python-persistent" ,python-persistent) + ("python-transaction" ,python-transaction) + ("python-zope-testrunner" ,python-zope-testrunner))) + (home-page "https://github.com/zopefoundation/BTrees") + (synopsis "Scalable persistent object containers") + (description + "This package contains a set of persistent object containers built around a +modified BTree data structure. The trees are optimized for use inside ZODB's +\"optimistic concurrency\" paradigm, and include explicit resolution of +conflicts detected by that mechanism.") + (license license:zpl2.1))) -- cgit v1.2.3 From 24ba0d37cfd1626695bad15128cfd114e72ab564 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 20 Jul 2020 17:46:38 +0300 Subject: gnu: Add python-zope-component-bootstrap. * gnu/packages/python-web.scm (python-zope-component-bootstrap): New hidden variable. --- gnu/packages/python-web.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index e47912578d..dbec6acaac 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1442,6 +1442,13 @@ (define-public python-zope-component facilities for defining, registering and looking up components.") (license license:zpl2.1))) +(define-public python-zope-component-bootstrap + (package + (inherit python-zope-component) + (arguments `(#:tests? #f)) + (native-inputs `()) + (properties `((hidden? . #t))))) + (define-public python2-zope-component (package-with-python2 python-zope-component)) -- cgit v1.2.3 From b25d148f997a9a71aae15e90d392ba9f5b552ee4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 20 Jul 2020 17:47:43 +0300 Subject: gnu: Add python-zope-configuration-bootstrap. * gnu/packages/python-web.scm (python-zope-configuration-bootstrap): New hidden variable. --- gnu/packages/python-web.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index dbec6acaac..ec98a5b246 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1299,6 +1299,13 @@ (define-public python-zope-configuration Markup Language.") (license license:zpl2.1))) +(define-public python-zope-configuration-bootstrap + (package + (inherit python-zope-configuration) + (arguments `(#:tests? #f)) + (native-inputs `()) + (properties `((hidden? . #t))))) + (define-public python2-zope-configuration (package-with-python2 python-zope-configuration)) -- cgit v1.2.3 From 50566124d10faa3205700448fab28b56c6408127 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 20 Jul 2020 17:48:40 +0300 Subject: gnu: Add python-zope-location-bootstrap. * gnu/packages/python-web.scm (python-zope-location-bootstrap): New hidden package. --- gnu/packages/python-web.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index ec98a5b246..3e358056b8 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1371,6 +1371,13 @@ (define-public python-zope-location Zope3, which are are special objects that have a structural location.") (license license:zpl2.1))) +(define-public python-zope-location-bootstrap + (package + (inherit python-zope-location) + (arguments `(#:tests? #f)) + (native-inputs `()) + (properties `((hidden? . #t))))) + (define-public python2-zope-location (package-with-python2 python-zope-location)) -- cgit v1.2.3 From 7d55bc5e2a9fd3c2e72b82090854ce86fa6e44a1 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 20 Jul 2020 17:49:44 +0300 Subject: gnu: Adsd python-transaction. * gnu/packages/python-web.scm (python-transaction): New variable. --- gnu/packages/python-web.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 3e358056b8..f23467bf8e 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -4227,3 +4227,27 @@ (define-public python-btrees \"optimistic concurrency\" paradigm, and include explicit resolution of conflicts detected by that mechanism.") (license license:zpl2.1))) + +(define-public python-transaction + (package + (name "python-transaction") + (version "3.0.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "transaction" version)) + (sha256 + (base32 + "0bdaks31bgfh78wnj3sij24bfysmqk25crsis6amz8kzrc0d82iv")))) + (build-system python-build-system) + (propagated-inputs + `(("python-zope-interface" ,python-zope-interface))) + (native-inputs + `(("python-coverage" ,python-coverage) + ("python-mock" ,python-mock) + ("python-nose" ,python-nose))) + (home-page "https://github.com/zopefoundation/transaction") + (synopsis "Transaction management for Python") + (description "This package contains a generic transaction implementation +for Python. It is mainly used by the ZODB.") + (license license:zpl2.1))) -- cgit v1.2.3 From 4874cae680b725fbd292c3c626ad1c5182282a80 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 20 Jul 2020 17:56:09 +0300 Subject: gnu: python-zope-security: Update to 5.1.1. * gnu/packages/python-web.scm (python-zope-security): Update to 5.1.1. [arguments]: Don't skip tests. [native-inputs]: Add python-btrees, python-zope-component-bootstrap, python-zope-location-bootstrap. Replace python-zope-configuration with python-zope-configuration-bootstrap. --- gnu/packages/python-web.scm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index f23467bf8e..319638e3e2 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1384,17 +1384,15 @@ (define-public python2-zope-location (define-public python-zope-security (package (name "python-zope-security") - (version "5.1.0") + (version "5.1.1") (source (origin (method url-fetch) (uri (pypi-uri "zope.security" version)) (sha256 (base32 - "1npfrgnm202v48wavpwn3450dsn7az12lfww95vbhxyjl11f14yb")))) + "11lfw67cigscfax9c5j63xcvz2qcj724zx5fcdqyc94am2glim0h")))) (build-system python-build-system) - (arguments - '(#:tests? #f)) ; FIXME: Tests can't find zope.testrunner. (propagated-inputs `(("python-zope-component" ,python-zope-component) ("python-zope-i18nmessageid" ,python-zope-i18nmessageid) @@ -1403,9 +1401,12 @@ (define-public python-zope-security ("python-zope-proxy" ,python-zope-proxy) ("python-zope-schema" ,python-zope-schema))) (native-inputs - `(("python-zope-configuration" ,python-zope-configuration) - ("python-zope-testrunner" ,python-zope-testrunner) - ("python-zope-testing" ,python-zope-testing))) + `(("python-btrees" ,python-btrees) + ("python-zope-component" ,python-zope-component-bootstrap) + ("python-zope-configuration" ,python-zope-configuration-bootstrap) + ("python-zope-location" ,python-zope-location-bootstrap) + ("python-zope-testing" ,python-zope-testing) + ("python-zope-testrunner" ,python-zope-testrunner))) (home-page "https://pypi.org/project/zope.security/") (synopsis "Zope security framework") (description "Zope.security provides a generic mechanism to implement -- cgit v1.2.3 From 6c451e16b74160ac9604914c02a6bafff51fb805 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Mon, 20 Jul 2020 11:27:35 +0200 Subject: gnu: guile-ssh: Update to 0.13.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/ssh.scm (guile-ssh): Update to 0.13.0. Signed-off-by: Ludovic Courtès --- gnu/packages/ssh.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index a612b9dd15..50316ea1be 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -297,7 +297,7 @@ (define-public openssh-sans-x (define-public guile-ssh (package (name "guile-ssh") - (version "0.12.0") + (version "0.13.0") (home-page "https://github.com/artyom-poptsov/guile-ssh") (source (origin (method git-fetch) @@ -307,7 +307,7 @@ (define-public guile-ssh (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "054hd9rzfhb48gc1hw3rphhp0cnnd4bs5qmidy5ygsyvy9ravlad")) + "1q96h98p6x7ah6nc0d2wfx503fmsj36riv9ka9s79z3lzwaf0k26")) (modules '((guix build utils))))) (build-system gnu-build-system) (outputs '("out" "debug")) -- cgit v1.2.3 From e8088f0b06c2193f2cce04a48aa1350229442a9f Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Mon, 20 Jul 2020 11:28:51 +0200 Subject: ssh: Speed up RPCs by using #:nodelay. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Partly fixes . * guix/ssh.scm (open-ssh-session): Enable #:nodelay. * m4/guix.m4 (GUIX_CHECK_GUILE_SSH): Add feature check for this new parameter. * doc/guix.texi (Requirements): Adjust. Co-authored-by: Ludovic Courtès --- doc/guix.texi | 4 ++-- guix/ssh.scm | 6 +++++- m4/guix.m4 | 6 ++++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 26ef937604..da5a2e2214 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -791,11 +791,11 @@ The following dependencies are optional: @itemize @item -@c Note: We need at least 0.12.0 for 'userauth-gssapi!'. +@c Note: We need at least 0.13.0 for #:nodelay. Support for build offloading (@pxref{Daemon Offload Setup}) and @command{guix copy} (@pxref{Invoking guix copy}) depends on @uref{https://github.com/artyom-poptsov/guile-ssh, Guile-SSH}, -version 0.12.0 or later. +version 0.13.0 or later. @item When @url{https://www.nongnu.org/lzip/lzlib.html, lzlib} is available, lzlib diff --git a/guix/ssh.scm b/guix/ssh.scm index 2d7ca7d01d..b9e6ff8564 100644 --- a/guix/ssh.scm +++ b/guix/ssh.scm @@ -129,7 +129,11 @@ (define* (open-ssh-session host #:key user port identity ;; We need lightweight compression when ;; exchanging full archives. #:compression compression - #:compression-level 3))) + #:compression-level 3 + + ;; Speed up RPCs by creating sockets with + ;; TCP_NODELAY. + #:nodelay #t))) ;; Honor ~/.ssh/config. (session-parse-config! session) diff --git a/m4/guix.m4 b/m4/guix.m4 index 7c27ae74df..cce03045db 100644 --- a/m4/guix.m4 +++ b/m4/guix.m4 @@ -142,14 +142,16 @@ dnl GUIX_CHECK_GUILE_SSH dnl dnl Check whether a recent-enough Guile-SSH is available. AC_DEFUN([GUIX_CHECK_GUILE_SSH], [ - dnl Check whether 'userauth-gssapi!' (introduced in 0.12.0) is present. + dnl Check whether '#:nodelay' paramater to 'make-session' (introduced in + dnl 0.13.0) is present. AC_CACHE_CHECK([whether Guile-SSH is available and recent enough], [guix_cv_have_recent_guile_ssh], [GUILE_CHECK([retval], [(and (@ (ssh channel) channel-send-eof) (@ (ssh popen) open-remote-pipe) (@ (ssh dist node) node-eval) - (@ (ssh auth) userauth-gssapi!))]) + (@ (ssh auth) userauth-gssapi!) + ((@ (ssh session) make-session) #:nodelay #t))]) if test "$retval" = 0; then guix_cv_have_recent_guile_ssh="yes" else -- cgit v1.2.3 From 181e0dddd68dc58190bd4831ea5d1ecbd420d83a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 20 Jul 2020 16:11:24 +0200 Subject: pack: 'self-contained-tarball' runs derivation in a UTF-8local. * guix/scripts/pack.scm (self-contained-tarball) [set-utf8-locale]: New variable. [build]: Use it. * tests/pack.scm ("self-contained-tarball"): Use a record instead of 'profile-derivation'. --- guix/scripts/pack.scm | 12 ++++++++++++ tests/pack.scm | 8 ++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm index 5bd405ade4..51afaeb379 100644 --- a/guix/scripts/pack.scm +++ b/guix/scripts/pack.scm @@ -181,6 +181,15 @@ (define database (file-append (store-database (list profile)) "/db/db.sqlite"))) + (define set-utf8-locale + ;; Arrange to not depend on 'glibc-utf8-locales' when using '--bootstrap'. + (and (or (not (profile? profile)) + (profile-locales? profile)) + #~(begin + (setenv "GUIX_LOCPATH" + #+(file-append glibc-utf8-locales "/lib/locale")) + (setlocale LC_ALL "en_US.utf8")))) + (define build (with-imported-modules (source-module-closure `((guix build utils) @@ -226,6 +235,9 @@ (define tar-supports-sort? "cf" "/dev/null" "--files-from=/dev/null" "--sort=name"))) + ;; Make sure non-ASCII file names are properly handled. + #+set-utf8-locale + ;; Add 'tar' to the search path. (setenv "PATH" #+(file-append archiver "/bin")) diff --git a/tests/pack.scm b/tests/pack.scm index 0c1406e687..cb7e110d18 100644 --- a/tests/pack.scm +++ b/tests/pack.scm @@ -57,10 +57,10 @@ (define %tar-bootstrap %bootstrap-coreutils&co) (unless (network-reachable?) (test-skip 1)) (test-assertm "self-contained-tarball" %store (mlet* %store-monad - ((profile (profile-derivation (packages->manifest - (list %bootstrap-guile)) - #:hooks '() - #:locales? #f)) + ((profile -> (profile + (content (packages->manifest (list %bootstrap-guile))) + (hooks '()) + (locales? #f))) (tarball (self-contained-tarball "pack" profile #:symlinks '(("/bin/Guile" -> "bin/guile")) -- cgit v1.2.3 From b3802495f607fd5e17c5acf0be2ee014036e2464 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 20 Jul 2020 16:12:29 +0200 Subject: pack: Build the store database under a UTF-8 locale. Fixes . Reported by branjam4@gmail.com. * guix/scripts/pack.scm (store-database)[build]: Add calls to 'setenv' and 'setlocale'. * tests/pack.scm ("self-contained-tarball + localstatedir, UTF-8 file names"): New test. --- guix/scripts/pack.scm | 5 +++++ tests/pack.scm | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 62 insertions(+), 1 deletion(-) diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm index 51afaeb379..13ade37515 100644 --- a/guix/scripts/pack.scm +++ b/guix/scripts/pack.scm @@ -149,6 +149,11 @@ (define (read-closure closure) (define db-file (store-database-file #:state-directory #$output)) + ;; Make sure non-ASCII file names are properly handled. + (setenv "GUIX_LOCPATH" + #+(file-append glibc-utf8-locales "/lib/locale")) + (setlocale LC_ALL "en_US.utf8") + (sql-schema #$schema) (let ((items (append-map read-closure '#$labels))) (with-database db-file db diff --git a/tests/pack.scm b/tests/pack.scm index cb7e110d18..e8455b4f37 100644 --- a/tests/pack.scm +++ b/tests/pack.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2018 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. @@ -27,8 +27,13 @@ (define-module (test-pack) #:use-module (guix grafts) #:use-module (guix tests) #:use-module (guix gexp) + #:use-module (guix modules) + #:use-module (gnu packages) + #:use-module ((gnu packages base) #:select (glibc-utf8-locales)) #:use-module (gnu packages bootstrap) #:use-module ((gnu packages compression) #:select (squashfs-tools)) + #:use-module ((gnu packages guile) #:select (guile-sqlite3)) + #:use-module ((gnu packages gnupg) #:select (guile-gcrypt)) #:use-module (srfi srfi-64)) (define %store @@ -136,6 +141,57 @@ (define bin (readlink bin)))))))) (built-derivations (list check)))) + (unless store (test-skip 1)) + (test-assertm "self-contained-tarball + localstatedir, UTF-8 file names" store + (mlet* %store-monad + ((guile (set-guile-for-build (default-guile))) + (tree (interned-file-tree + `("directory-with-utf8-file-names" directory + ("α" regular (data "alpha")) + ("λ" regular (data "lambda"))))) + (tarball (self-contained-tarball "tar-pack" tree + #:localstatedir? #t)) + (check (gexp->derivation + "check-tarball" + (with-extensions (list guile-sqlite3 guile-gcrypt) + (with-imported-modules (source-module-closure + '((guix store database))) + #~(begin + (use-modules (guix store database) + (rnrs io ports) + (srfi srfi-1)) + + (define (valid-file? basename data) + (define file + (string-append "./" #$tree "/" basename)) + + (string=? (call-with-input-file (pk 'file file) + get-string-all) + data)) + + (setenv "PATH" + (string-append #$%tar-bootstrap "/bin")) + (system* "tar" "xvf" #$tarball) + + (sql-schema + #$(local-file (search-path %load-path + "guix/store/schema.sql"))) + (with-database "var/guix/db/db.sqlite" db + ;; Make sure non-ASCII file names are properly + ;; handled. + (setenv "GUIX_LOCPATH" + #+(file-append glibc-utf8-locales + "/lib/locale")) + (setlocale LC_ALL "en_US.utf8") + + (mkdir #$output) + (exit + (and (every valid-file? + '("α" "λ") + '("alpha" "lambda")) + (integer? (path-id db #$tree))))))))))) + (built-derivations (list check)))) + (unless store (test-skip 1)) (test-assertm "docker-image + localstatedir" store (mlet* %store-monad -- cgit v1.2.3 From cffaf285c19ea5f0465c7ad2196b7a478ef21873 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 20 Jul 2020 20:35:20 +0200 Subject: gnu-maintenance: 'latest-html-release' honors #:file->signature. * guix/gnu-maintenance.scm (latest-html-release): Call FILE->SIGNATURE instead of the in-line ".tar.sign" policy. --- guix/gnu-maintenance.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm index 9fe229f680..a1273ab461 100644 --- a/guix/gnu-maintenance.scm +++ b/guix/gnu-maintenance.scm @@ -497,9 +497,8 @@ (define (url->release url) (version version) (urls (list (string-append base-url directory "/" url))) (signature-urls - (list (string-append base-url directory "/" - (file-sans-extension url) - ".sign"))))))) + (list (file->signature + (string-append base-url directory "/" url)))))))) (define candidates (filter-map url->release (html-links sxml))) -- cgit v1.2.3 From 7a6bb2fe5b69ca6d3fdd118c4d211cef94df6ddc Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 20 Jul 2020 20:36:53 +0200 Subject: gnu-maintenance: Add 'savannah' updater. * guix/gnu-maintenance.scm (savannah-package?, %savannah-base) (%savannah-updater): New variables. (latest-savannah-release): New procedure. (latest-xorg-release): Fix docstring. --- guix/gnu-maintenance.scm | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm index a1273ab461..702848ed95 100644 --- a/guix/gnu-maintenance.scm +++ b/guix/gnu-maintenance.scm @@ -62,6 +62,7 @@ (define-module (guix gnu-maintenance) %gnu-updater %gnu-ftp-updater + %savannah-updater %xorg-updater %kernel.org-updater)) @@ -614,8 +615,26 @@ (define (pure-gnu-package? package) (define gnu-hosted? (url-prefix-predicate "mirror://gnu/")) +(define savannah-package? + (url-prefix-predicate "mirror://savannah/")) + +(define %savannah-base + ;; One of the Savannah mirrors listed at + ;; that serves valid + ;; HTML (unlike .) + "https://nongnu.freemirror.org/nongnu") + +(define (latest-savannah-release package) + "Return the latest release of PACKAGE." + (let* ((uri (string->uri (origin-uri (package-source package)))) + (package (package-upstream-name package)) + (directory (dirname (uri-path uri)))) + (latest-html-release package + #:base-url %savannah-base + #:directory directory))) + (define (latest-xorg-release package) - "Return the latest release of PACKAGE, the name of an X.org package." + "Return the latest release of PACKAGE." (let ((uri (string->uri (origin-uri (package-source package))))) (false-if-ftp-error (latest-ftp-release @@ -661,6 +680,13 @@ (define %gnu-ftp-updater (pure-gnu-package? package)))) (latest latest-release*))) +(define %savannah-updater + (upstream-updater + (name 'savannah) + (description "Updater for packages hosted on savannah.gnu.org") + (pred (url-prefix-predicate "mirror://savannah/")) + (latest latest-savannah-release))) + (define %xorg-updater (upstream-updater (name 'xorg) -- cgit v1.2.3 From 36a5efd9676da5c4b0619213c445ca642a18b406 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 20 Jul 2020 20:38:51 +0200 Subject: download: Add Savannah mirror. * guix/download.scm (%mirrors): Add nongnu.freemirror.org. --- guix/download.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/guix/download.scm b/guix/download.scm index b7931e568f..6622e252b4 100644 --- a/guix/download.scm +++ b/guix/download.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2013, 2014, 2015 Andreas Enge ;;; Copyright © 2015 Federico Beffa ;;; Copyright © 2016 Alex Griffin @@ -94,8 +94,9 @@ (define %mirrors "http://mirror.yandex.ru/mirrors/ftp.gnome.org/") (hackage "http://hackage.haskell.org/") - (savannah + (savannah ; http://download0.savannah.gnu.org/mirmon/savannah/ "http://download.savannah.gnu.org/releases/" + "http://nongnu.freemirror.org/nongnu/" "http://ftp.cc.uoc.gr/mirrors/nongnu.org/" "http://ftp.twaren.net/Unix/NonGNU/" "http://mirror.csclub.uwaterloo.ca/nongnu/" -- cgit v1.2.3 From 1c26219f94b388a35f0ae93060806319958906ef Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 20 Jul 2020 21:16:17 +0200 Subject: upstream: Use 'warning' instead of 'format'. * guix/upstream.scm (update-package-source): Use 'warning' instead of 'format'. --- guix/upstream.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/guix/upstream.scm b/guix/upstream.scm index ff33c534fe..6a57bad710 100644 --- a/guix/upstream.scm +++ b/guix/upstream.scm @@ -26,6 +26,7 @@ (define-module (guix upstream) #:select (download-to-store url-fetch)) #:use-module (guix gnupg) #:use-module (guix packages) + #:use-module (guix diagnostics) #:use-module (guix ui) #:use-module (guix base32) #:use-module (guix gexp) @@ -477,10 +478,8 @@ (define (update-expression expr replacements) (warning (G_ "~a: could not locate source file") (location-file loc)) #f))) - (begin - (format (current-error-port) - (G_ "~a: ~a: no `version' field in source; skipping~%") - (location->string (package-location package)) - name))))) + (warning (package-location package) + (G_ "~a: no `version' field in source; skipping~%") + name)))) ;;; upstream.scm ends here -- cgit v1.2.3 From 59a47fb67853dd28891376fc970699f11c0f972f Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 20 Jul 2020 21:26:51 +0200 Subject: gnu-maintenance: 'kernel.org' and 'savannah' updaters rewrite URLs. This makes sure they return 'mirror://' URLs rather that URLs pointing to the specific mirror they talk to. * guix/gnu-maintenance.scm (url-prefix-rewrite) (adjusted-upstream-source): New procedures. (latest-savannah-release, latest-kernel.org-release): Use it. --- guix/gnu-maintenance.scm | 41 ++++++++++++++++++++++++++++++++--------- 1 file changed, 32 insertions(+), 9 deletions(-) diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm index 702848ed95..2a85504425 100644 --- a/guix/gnu-maintenance.scm +++ b/guix/gnu-maintenance.scm @@ -615,6 +615,22 @@ (define (pure-gnu-package? package) (define gnu-hosted? (url-prefix-predicate "mirror://gnu/")) +(define (url-prefix-rewrite old new) + "Return a one-argument procedure that rewrites URL prefix OLD to NEW." + (lambda (url) + (if (string-prefix? old url) + (string-append new (string-drop url (string-length old))) + url))) + +(define (adjusted-upstream-source source rewrite-url) + "Rewrite URLs in SOURCE by apply REWRITE-URL to each of them." + (upstream-source + (inherit source) + (urls (map rewrite-url (upstream-source-urls source))) + (signature-urls (and=> (upstream-source-signature-urls source) + (lambda (urls) + (map rewrite-url urls)))))) + (define savannah-package? (url-prefix-predicate "mirror://savannah/")) @@ -628,10 +644,13 @@ (define (latest-savannah-release package) "Return the latest release of PACKAGE." (let* ((uri (string->uri (origin-uri (package-source package)))) (package (package-upstream-name package)) - (directory (dirname (uri-path uri)))) - (latest-html-release package - #:base-url %savannah-base - #:directory directory))) + (directory (dirname (uri-path uri))) + (rewrite (url-prefix-rewrite %savannah-base + "mirror://savannah"))) + (adjusted-upstream-source (latest-html-release package + #:base-url %savannah-base + #:directory directory) + rewrite))) (define (latest-xorg-release package) "Return the latest release of PACKAGE." @@ -655,11 +674,15 @@ (define (file->signature file) (let* ((uri (string->uri (origin-uri (package-source package)))) (package (package-upstream-name package)) - (directory (dirname (uri-path uri)))) - (latest-html-release package - #:base-url %kernel.org-base - #:directory directory - #:file->signature file->signature))) + (directory (dirname (uri-path uri))) + (rewrite (url-prefix-rewrite %kernel.org-base + "mirror://kernel.org"))) + (adjusted-upstream-source (latest-html-release package + #:base-url %kernel.org-base + #:directory directory + #:file->signature + file->signature) + rewrite))) (define %gnu-updater ;; This is for everything at ftp.gnu.org. -- cgit v1.2.3 From 4071879c86d059ee087c8986915ea72b8c742b72 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 20 Jul 2020 23:19:37 +0200 Subject: json: Re-export 'define-json-mapping' from (json) when available. This prepares for the migration to Guile-JSON 4.3.0. * guix/json.scm (define-as-needed): New macro. (define-json-mapping): Use 'define-as-needed' instead of 'define-syntax-rule'. --- guix/json.scm | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/guix/json.scm b/guix/json.scm index 20f0bd8f13..3e3a28b749 100644 --- a/guix/json.scm +++ b/guix/json.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2018, 2019 Ludovic Courtès +;;; Copyright © 2018, 2019, 2020 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -18,15 +18,33 @@ (define-module (guix json) #:use-module (json) - #:use-module (srfi srfi-9) - #:export (define-json-mapping)) + #:use-module (srfi srfi-9)) ;;; Commentary: ;;; ;;; Helpers to map JSON objects to SRFI-9 records. Taken from (guix swh). +;;; This module is superseded by 'define-json-mapping' as found since version +;;; 4.2.0 of Guile-JSON and will be removed once migration is complete. ;;; ;;; Code: +(define-syntax define-as-needed + (lambda (s) + "Define the given syntax rule unless (json) already provides it." + (syntax-case s () + ((_ (macro args ...) body ...) + (if (module-defined? (resolve-interface '(json)) + (syntax->datum #'macro)) + #'(eval-when (expand load eval) + ;; Re-export MACRO from (json). + (module-re-export! (current-module) '(macro))) + #'(begin + ;; Using Guile-JSON < 4.2.0, so provide our own MACRO. + (define-syntax-rule (macro args ...) + body ...) + (eval-when (expand load eval) + (module-export! (current-module) '(macro))))))))) + (define-syntax-rule (define-json-reader json->record ctor spec ...) "Define JSON->RECORD as a procedure that converts a JSON representation, read from a port, string, or hash table, into a record created by CTOR and @@ -48,8 +66,11 @@ (define (json->record input) (symbol->string 'field)))))) (ctor (extract-field table spec) ...))))) -(define-syntax-rule (define-json-mapping rtd ctor pred json->record - (field getter spec ...) ...) +;; For some reason we cannot just have colliding definitions of +;; 'define-json-mapping' (that leads to a build failure in users of this +;; module), hence the use of 'define-as-needed'. +(define-as-needed (define-json-mapping rtd ctor pred json->record + (field getter spec ...) ...) "Define RTD as a record type with the given FIELDs and GETTERs, à la SRFI-9, and define JSON->RECORD as a conversion from JSON to a record of this type." (begin -- cgit v1.2.3 From 64066abdb026755062b747f3d5b0ebe0efae7fc7 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Mon, 13 Jul 2020 17:25:00 +0200 Subject: gnu: python-aionotify: Fix test cases with Python 3.8. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (patches): Add fix. * gnu/packages/patches/python-aionotify-0.2.0-py3.8.patch: New file. * gnu/local.mk: Add it. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 1 + .../patches/python-aionotify-0.2.0-py3.8.patch | 48 ++++++++++++++++++++++ gnu/packages/python-xyz.scm | 4 +- 3 files changed, 51 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/python-aionotify-0.2.0-py3.8.patch diff --git a/gnu/local.mk b/gnu/local.mk index 0eac01d72d..7bae1daf61 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1450,6 +1450,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-3.8-fix-tests.patch \ %D%/packages/patches/python-CVE-2018-14647.patch \ %D%/packages/patches/python-aiohttp-3.6.2-no-warning-fail.patch \ + %D%/packages/patches/python-aionotify-0.2.0-py3.8.patch \ %D%/packages/patches/python-alembic-exceptions-cause.patch \ %D%/packages/patches/python-argcomplete-1.11.1-fish31.patch \ %D%/packages/patches/python-axolotl-AES-fix.patch \ diff --git a/gnu/packages/patches/python-aionotify-0.2.0-py3.8.patch b/gnu/packages/patches/python-aionotify-0.2.0-py3.8.patch new file mode 100644 index 0000000000..ebeef34720 --- /dev/null +++ b/gnu/packages/patches/python-aionotify-0.2.0-py3.8.patch @@ -0,0 +1,48 @@ +Compatibility with Python 3.8, see upstream issue +https://github.com/rbarrois/aionotify/pull/15 + +diff --git a/setup.py b/setup.py +index 21a554f..094de64 100755 +--- a/setup.py ++++ b/setup.py +@@ -40,7 +40,7 @@ setup( + setup_requires=[ + ], + tests_require=[ +- 'asynctest', ++ 'asynctest; python_version<"3.8"', + ], + classifiers=[ + "Development Status :: 4 - Beta", +diff --git a/tests/test_usage.py b/tests/test_usage.py +index f156291..0476ff1 100644 +--- a/tests/test_usage.py ++++ b/tests/test_usage.py +@@ -8,7 +8,11 @@ import os.path + import tempfile + import unittest + +-import asynctest ++try: ++ testBase = unittest.IsolatedAsyncioTestCase ++except AttributeError: ++ import asynctest ++ testBase = asynctest.TestCase + + import aionotify + +@@ -25,11 +29,13 @@ if AIODEBUG: + TESTDIR = os.environ.get('AIOTESTDIR') or os.path.join(os.path.dirname(__file__), 'testevents') + + +-class AIONotifyTestCase(asynctest.TestCase): ++class AIONotifyTestCase(testBase): + forbid_get_event_loop = True + timeout = 3 + + def setUp(self): ++ if not getattr (self, 'loop', None): ++ self.loop = asyncio.get_event_loop() + if AIODEBUG: + self.loop.set_debug(True) + self.watcher = aionotify.Watcher() diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a48f39429d..748f48f229 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -19269,9 +19269,9 @@ (define-public python-aionotify (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1sk9i8czxgsbrswsf1nlb4c82vgnlzi8zrvrxdip92w2z8hqh43y")))) + (base32 "1sk9i8czxgsbrswsf1nlb4c82vgnlzi8zrvrxdip92w2z8hqh43y")) + (patches (search-patches "python-aionotify-0.2.0-py3.8.patch")))) (build-system python-build-system) - (native-inputs `(("python-asynctest" ,python-asynctest))) (home-page "https://github.com/rbarrois/aionotify") (synopsis "Asyncio-powered inotify library") (description -- cgit v1.2.3 From a022f5a4c1e6176f032df93d9e88b54c00b2c0d5 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 20 Jul 2020 23:31:48 +0200 Subject: gnu-maintenance: Call 'adjusted-upstream-source' only when there's a source. This is a followup to 59a47fb67853dd28891376fc970699f11c0f972f. * guix/gnu-maintenance.scm (latest-savannah-release): Call 'adjusted-upstream-source' only when 'latest-html-release' returns true. (latest-kernel.org-release): Likewise. --- guix/gnu-maintenance.scm | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm index 2a85504425..91203f5ca1 100644 --- a/guix/gnu-maintenance.scm +++ b/guix/gnu-maintenance.scm @@ -647,10 +647,10 @@ (define (latest-savannah-release package) (directory (dirname (uri-path uri))) (rewrite (url-prefix-rewrite %savannah-base "mirror://savannah"))) - (adjusted-upstream-source (latest-html-release package - #:base-url %savannah-base - #:directory directory) - rewrite))) + (and=> (latest-html-release package + #:base-url %savannah-base + #:directory directory) + (cut adjusted-upstream-source <> rewrite)))) (define (latest-xorg-release package) "Return the latest release of PACKAGE." @@ -677,12 +677,11 @@ (define (file->signature file) (directory (dirname (uri-path uri))) (rewrite (url-prefix-rewrite %kernel.org-base "mirror://kernel.org"))) - (adjusted-upstream-source (latest-html-release package - #:base-url %kernel.org-base - #:directory directory - #:file->signature - file->signature) - rewrite))) + (and=> (latest-html-release package + #:base-url %kernel.org-base + #:directory directory + #:file->signature file->signature) + (cut adjusted-upstream-source <> rewrite)))) (define %gnu-updater ;; This is for everything at ftp.gnu.org. -- cgit v1.2.3 From b579b1c1d19f68435d3c919d8a9fb7bc2c238b32 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 20 Jul 2020 23:36:33 +0200 Subject: gnu-maintenance: Handle lists returned by 'origin-uri'. This fixes "guix refresh man-pages", for instance. * guix/gnu-maintenance.scm (latest-savannah-release) (latest-kernel.org-release): Handle the case where 'origin-uri' returns a list. --- guix/gnu-maintenance.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm index 91203f5ca1..0b5bc8592c 100644 --- a/guix/gnu-maintenance.scm +++ b/guix/gnu-maintenance.scm @@ -642,7 +642,10 @@ (define %savannah-base (define (latest-savannah-release package) "Return the latest release of PACKAGE." - (let* ((uri (string->uri (origin-uri (package-source package)))) + (let* ((uri (string->uri + (match (origin-uri (package-source package)) + ((? string? uri) uri) + ((uri mirrors ...) uri)))) (package (package-upstream-name package)) (directory (dirname (uri-path uri))) (rewrite (url-prefix-rewrite %savannah-base @@ -672,7 +675,10 @@ (define %kernel.org-base (define (file->signature file) (string-append (file-sans-extension file) ".sign")) - (let* ((uri (string->uri (origin-uri (package-source package)))) + (let* ((uri (string->uri + (match (origin-uri (package-source package)) + ((? string? uri) uri) + ((uri mirrors ...) uri)))) (package (package-upstream-name package)) (directory (dirname (uri-path uri))) (rewrite (url-prefix-rewrite %kernel.org-base -- cgit v1.2.3 From 07a0be807911f15c18517d45e7b3e4339a33f192 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 20 Jul 2020 23:41:22 +0200 Subject: gnu-maintenance: Recognize "RC" as denoting a pre-release tarball. * guix/gnu-maintenance.scm (%alpha-tarball-rx): Add "RC". --- guix/gnu-maintenance.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm index 0b5bc8592c..2a4d94dbb0 100644 --- a/guix/gnu-maintenance.scm +++ b/guix/gnu-maintenance.scm @@ -240,7 +240,7 @@ (define %tarball-rx (make-regexp "^([^.]+)-([0-9]|[^-])+(-(src|gnu[0-9]))?\\.(tar\\.|zip$)")) (define %alpha-tarball-rx - (make-regexp "^.*-.*[0-9](-|~)?(alpha|beta|rc|cvs|svn|git)-?[0-9\\.]*\\.tar\\.")) + (make-regexp "^.*-.*[0-9](-|~)?(alpha|beta|rc|RC|cvs|svn|git)-?[0-9\\.]*\\.tar\\.")) (define (release-file? project file) "Return #f if FILE is not a release tarball of PROJECT, otherwise return -- cgit v1.2.3 From 9d6093cb38a8ad41ed1499fa1e57b5333ff1f61f Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Wed, 8 Jul 2020 21:30:39 +0100 Subject: gnu: carla: Update to 2.1.1. * gnu/packages/audio.scm (carla): Update to 2.1.1. Signed-off-by: Marius Bakke --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 22fd7d993f..20755f04ef 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -4106,7 +4106,7 @@ (define-public redkite (define-public carla (package (name "carla") - (version "2.0.0") + (version "2.1.1") (source (origin (method git-fetch) @@ -4117,7 +4117,7 @@ (define-public carla (file-name (git-file-name name version)) (sha256 (base32 - "0fqgncqlr86n38yy7pa118mswfacmfczj7w9xx6c6k0jav3wk29k")))) + "0c3y4a6cgi4bv1mg57i3qn5ia6pqjqlaylvkapj6bmpsw71ig22g")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no "check" target -- cgit v1.2.3 From 281456b421216e3bfe709eaa0ba939aab019b596 Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Wed, 8 Jul 2020 21:31:38 +0100 Subject: gnu: carla: Add gtk2 dependency. * gnu/packages/audio.scm (carla)[inputs]: Add gtk2 to allow bridging gtk2 plugins in gtk3 hosts. Signed-off-by: Marius Bakke --- gnu/packages/audio.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 20755f04ef..080261a5ca 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -4148,6 +4148,7 @@ (define-public carla ("file" ,file) ("liblo" ,liblo) ("libsndfile" ,libsndfile) + ("gtk2" ,gtk+-2) ;needed for bridging GTK2 plugins in GTK3 hosts ("gtk+" ,gtk+) ("python-pyliblo" ,python-pyliblo) ("python-pyqt" ,python-pyqt) -- cgit v1.2.3 From c82d5092f11e27d1c6683999e3d624f35f814285 Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Wed, 8 Jul 2020 22:22:19 +0100 Subject: gnu: Add ninjas2. * gnu/packages/music.scm (ninjas2): New variable. Signed-off-by: Marius Bakke --- gnu/packages/music.scm | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 3089a22c7c..02e3d279f0 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -912,6 +912,71 @@ (define-public libgme ;; demo and player directories are under the Expat license license:expat)))) +(define-public ninjas2 + (package + (name "ninjas2") + (version "0.2.0") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/clearly-broken-software/ninjas2") + (commit (string-append "v" version)) + ;; Bundles a specific commit of the DISTRHO plugin framework. + (recursive? #t))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1kwp6pmnfar2ip9693gprfbcfscklgri1k1ycimxzlqr61nkd2k9")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ;no tests + #:make-flags + (list (string-append "PREFIX=" (assoc-ref %outputs "out")) + (string-append "CC=" ,(cc-for-target))) + #:phases + (modify-phases %standard-phases + (delete 'configure) ;no configure target + (replace 'install ;no install target + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (lv2 (string-append out "/lib/lv2"))) + ;; Install LV2. + (for-each + (lambda (file) + (copy-recursively file + (string-append lv2 "/" (basename file)))) + (find-files "bin" "\\.lv2$" #:directories? #t)) + ;; Install executables. + (for-each + (lambda (file) + (install-file file bin)) + (find-files "bin" + (lambda (name stat) + (and + (equal? (dirname name) "bin") + (not (string-suffix? ".so" name)) + (not (string-suffix? ".lv2" name)))))) + #t)))))) + (inputs + `(("fftwf" ,fftwf) + ("jack" ,jack-1) ; for the standalone JACK application + ("libsamplerate" ,libsamplerate) + ("mesa" ,mesa) + ("libsndfile" ,libsndfile))) + (native-inputs + `(("ladspa" ,ladspa) + ("lv2" ,lv2) + ("pkg-config" ,pkg-config))) + (synopsis "Sample slicer audio plugin") + (description + "Ninjas 2 is a rewrite of the Ninjas sample slicer audio plugin. +Its goal is to be an easy to use sample slicer with quick slicing of samples +and auto-mapping slices to MIDI note numbers.") + (home-page "https://github.com/clearly-broken-software/ninjas2") + (license license:gpl3+))) + (define-public lilypond (package (name "lilypond") -- cgit v1.2.3 From 0a62d25bb2ef3210c7030cc9b07e9bc14d512ad7 Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Wed, 8 Jul 2020 22:31:48 +0100 Subject: gnu: Add bshapr. * gnu/packages/music.scm (bshapr): New variable. Signed-off-by: Marius Bakke --- gnu/packages/music.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 02e3d279f0..9d77bdde09 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1250,6 +1250,26 @@ (define-public bchoppr (home-page "https://github.com/sjaehn/BChoppr") (license license:gpl3+))) +(define-public bshapr + (package + (inherit bsequencer) + (name "bshapr") + (version "0.8") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sjaehn/BShapr") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0jlq5rjicc4fxlpk869dg0l5bwwz8k9aj2wfk9v89b0qw8l8kaxl")))) + (synopsis "Beat/envelope shaper LV2 plugin") + (description "B.Shapr is a beat/envelope shaper LV2 plugin.") + (home-page "https://github.com/sjaehn/BShapr") + (license license:gpl3+))) + (define-public solfege (package (name "solfege") -- cgit v1.2.3 From 7b866af58ccb0c1de5c3d28ced5885e599206c15 Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Wed, 8 Jul 2020 22:32:39 +0100 Subject: gnu: Add bjumblr. * gnu/packages/music.scm (bjumblr): New variable. Signed-off-by: Marius Bakke --- gnu/packages/music.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 9d77bdde09..c3bf54d0c7 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1270,6 +1270,31 @@ (define-public bshapr (home-page "https://github.com/sjaehn/BShapr") (license license:gpl3+))) +(define-public bjumblr + (package + (inherit bsequencer) + (name "bjumblr") + (version "0.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sjaehn/BJumblr") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "14z8113zkwykbhm1a8h2xs972dgifvlfij92b08jckyc7cbz84ys")))) + (inputs + `(("cairo", cairo) + ("libsndfile", libsndfile) + ("lv2", lv2))) + (synopsis "Pattern-controlled audio stream/sample re-sequencer LV2 plugin") + (description "B.Jumblr is a pattern-controlled audio stream / sample +re-sequencer LV2 plugin.") + (home-page "https://github.com/sjaehn/BJumblr") + (license license:gpl3+))) + (define-public solfege (package (name "solfege") -- cgit v1.2.3 From 8aca4f69d6a94c318cb7c6b9bd81b91eefe65797 Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Wed, 8 Jul 2020 22:43:14 +0100 Subject: gnu: Add ttaenc. * gnu/packages/audio.scm (ttaenc): New variable. Signed-off-by: Marius Bakke --- gnu/packages/audio.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 080261a5ca..dfef3a81e7 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -4074,6 +4074,45 @@ (define-public libltc (home-page "https://x42.github.io/libltc/") (license license:lgpl3+))) +(define-public ttaenc + (package + (name "ttaenc") + (version "3.4.1") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/tta/" + "tta/ttaenc-src" + "/ttaenc-" version "-src.tgz")) + (sha256 + (base32 + "1iixpr4b89g9g1hwn8ak8k8iflcww3r5f09a117qdidc2nqcijdj")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ;no tests + #:make-flags + (list (string-append "CC=" ,(cc-for-target)) + (string-append "INSDIR=" (assoc-ref %outputs "out") "/bin")) + #:phases + (modify-phases %standard-phases + (delete 'configure) ; no configure + (add-before 'install 'make-bindir + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out"))) + (mkdir-p (string-append out "/bin")) + #t)))))) + (synopsis "TTA lossless audio encoder") + (description + "TTA performs lossless compression on multichannel 8,16 and 24 bits +data of the Wav audio files. Being lossless means that no data- +quality is lost in the compression - when uncompressed, the data will +be identical to the original. The compression ratios of TTA depend on +the type of music file being compressed, but the compression size +will generally range between 30% - 70% of the original. TTA format +supports both of ID3v1/v2 and APEv2 tags.") + (home-page "http://tausoft.org/") + (license license:gpl2+))) + (define-public redkite (package (name "redkite") -- cgit v1.2.3 From 84d31a5c356bdff541cfaec70630330d69408e14 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Mon, 20 Jul 2020 19:51:28 -0500 Subject: gnu: scrot: Update to 1.4. * gnu/packages/xdisorg.scm (scrot): Update to 1.4. [inputs]: Add libxcomposite. --- gnu/packages/xdisorg.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 2308580f5c..20702c3a4f 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -38,6 +38,7 @@ ;;; Copyright © 2020 Boris A. Dekshteyn ;;; Copyright © 2020 Alex McGrath ;;; Copyright © 2020 Ivan Kozlov +;;; Copyright © 2020 Brett Gilio ;;; ;;; This file is part of GNU Guix. ;;; @@ -627,7 +628,7 @@ (define-public wmctrl (define-public scrot (package (name "scrot") - (version "1.3") + (version "1.4") (source (origin (method git-fetch) @@ -637,7 +638,8 @@ (define-public scrot (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0x70hd59ik37kqd8xqpwrz46np01jv324iz28x2s0kk36d7sblsj")))) + (base32 + "12xq6glg70icwsvbnfw9gm4dahlbnrc7b6adpd0mpf89h4sj2gds")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) @@ -647,6 +649,7 @@ (define-public scrot `(("giblib" ,giblib) ("libx11" ,libx11) ("libXcursor" ,libxcursor) + ("libxcomposite" ,libxcomposite) ("libXfixes" ,libxfixes))) (home-page "https://github.com/resurrecting-open-source-projects/scrot") (synopsis "Command-line screen capture utility for X Window System") -- cgit v1.2.3 From dc4adbf6852164d1222495e760ac15df4dc0dc16 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Mon, 20 Jul 2020 21:00:16 +0200 Subject: gnu: font-jetbrains-mono: Update to 2.001. * gnu/packages/fonts.scm (font-jetbrains-mono): Update to 2.001. Signed-off-by: Efraim Flashner --- gnu/packages/fonts.scm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 38b342f770..763e8028e2 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -1741,7 +1741,7 @@ (define-public font-dseg (define-public font-jetbrains-mono (package (name "font-jetbrains-mono") - (version "1.0.3") + (version "2.001") (source (origin (method url-fetch) @@ -1749,8 +1749,17 @@ (define-public font-jetbrains-mono (string-append "https://download.jetbrains.com/fonts/" "JetBrainsMono-" version ".zip")) (sha256 - (base32 "0zvhwmpdwpm4vywmm6i9a4najz0c7vfi411yikgkd66l5hwd1p6f")))) + (base32 "0r3dk3kn536rik4mvpcjin9mwmifl3v8mawvb4a5l59pww0vcxzq")))) (build-system font-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'install-license-files + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (string-append out "/share/doc/" ,name "-" ,version))) + (install-file "../LICENSE" doc) + #t)))))) (home-page "https://www.jetbrains.com/lp/mono/") (synopsis "Mono typeface for developers") (description -- cgit v1.2.3 From 5cdb0f4ad037ef61475a00157aa08ebbb3b70beb Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Tue, 21 Jul 2020 01:56:48 +0200 Subject: gnu: lshw: Update to B.02.19.2. * gnu/packages/linux.scm (lshw): Update to B.02.19.2. Signed-off-by: Efraim Flashner --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 2940a90f0f..b0077c0a98 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -6097,7 +6097,7 @@ (define (sbin-directory input-name) (define-public lshw (package (name "lshw") - (version "B.02.18") + (version "B.02.19.2") (source (origin (method url-fetch) (uri (string-append "https://www.ezix.org/software/" @@ -6105,7 +6105,7 @@ (define-public lshw ".tar.gz")) (sha256 (base32 - "0brwra4jld0d53d7jsgca415ljglmmx1l2iazpj4ndilr48yy8mf")))) + "100gm1c6gb2hkfws22h0xhvv7nz38p49lxd1csikj8qlhyn4gcwv")))) (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases (delete 'configure)) -- cgit v1.2.3 From 938bb06a7763c4e5c78d881fa8b6d1263360953d Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Tue, 21 Jul 2020 02:38:36 +0200 Subject: gnu: chromaprint: Update to 1.5.0. * gnu/packages/mp3.scm (chromaprint): Update to 1.5.0. Signed-off-by: Efraim Flashner --- gnu/packages/mp3.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index 2a4ca555dc..6c09c5c813 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2017, 2019 Pierre Langlois ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019 Ricardo Wurmus +;;; Copyright © 2020 Michael Rohleder ;;; ;;; This file is part of GNU Guix. ;;; @@ -505,7 +506,7 @@ (define-public eyed3 (define-public chromaprint (package (name "chromaprint") - (version "1.4.3") + (version "1.5.0") (source (origin (method url-fetch) (uri (string-append @@ -513,7 +514,7 @@ (define-public chromaprint version "/chromaprint-" version ".tar.gz")) (sha256 (base32 - "10kz8lncal4s2rp2rqpgc6xyjp0jzcrihgkx7chf127vfs5n067a")))) + "0sknmyl5254rc55bvkhfwpl4dfvz45xglk1rq8zq5crmwq058fjp")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; tests require googletest *sources* -- cgit v1.2.3 From a8f9b9380d9e3c3e77abaa1c7aecd0fb577c6add Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jul 2020 10:18:25 +0300 Subject: gnu: Add python-atpublic. * gnu/packages/python-check.scm (python-atpublic): New variable. --- gnu/packages/python-check.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index 09eb253f06..52f53f58cc 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -454,3 +454,37 @@ (define-public python-httmock (description "This package provides a library for replying fake data to Python software under test, when they make an HTTP query.") (license license:asl2.0))) + +(define-public python-atpublic + (package + (name "python-atpublic") + (version "1.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "atpublic" version)) + (sha256 + (base32 + "0i3sbxkdlbb4560rrlmwwd5y4ps7k73lp4d8wnmd7ag9k426gjkx")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-before 'build 'enable-c-implementation + (lambda _ + (setenv "ATPUBLIC_BUILD_EXTENSION" "yes") + #t)) + (replace 'check + (lambda _ + (invoke "python" "-m" "nose2" "-v")))))) + (native-inputs + `(("python-nose2" ,python-nose2))) + (home-page "https://public.readthedocs.io/") + (synopsis "@code{@@public} decorator for populating @code{__all__}") + (description + "This Python module adds a @code{@@public} decorator and function which +populates a module's @code{__all__} and optionally the module globals. With +it, the declaration of a name's public export semantics are not separated from +the implementation of that name.") + (license (list license:asl2.0 + license:lgpl3)))) ; only for setup_helpers.py -- cgit v1.2.3 From 99d48f7a2ccee277ecd5e5bd57179e6c8e8fdfa0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jul 2020 10:20:56 +0300 Subject: gnu: Add python-authres. * gnu/packages/mail.scm (python-authres): New variable. --- gnu/packages/mail.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 8b7a2bc00a..66e579946e 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -3199,3 +3199,42 @@ (define-public sylpheed client. Sylpheed provides intuitive user-interface. Sylpheed is also designed for keyboard-oriented operation.") (license license:gpl2+))) + +(define-public python-authres + (package + (name "python-authres") + (version "1.2.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "authres" version)) + (sha256 + (base32 + "1dr5zpqnb54h4f5ax8334l1dcp8j9083d7v4vdi1xqkwmnavklck")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (replace 'check + ;; Run doctests as described in the README. + (lambda _ + (invoke "python" "-m" "authres" "-v")))))) + (home-page "https://launchpad.net/authentication-results-python") + (synopsis "Email Authentication Results Header Module") + (description + "This module can be used to generate and parse RFC 5451/7001/7601 +Authentication-Results headers. It also supports Authentication Results +extensions: +@itemize +@item RFC 5617 DKIM/ADSP +@item RFC 6008 DKIM signature identification (header.b) +@item RFC 6212 Vouch By Reference (VBR) +@item RFC 6577 Sender Policy Framework (SPF) +@item RFC 7281 Authentication-Results Registration for S/MIME +@item RFC 7293 The Require-Recipient-Valid-Since Header Field +@item RFC 7489 Domain-based Message Authentication, Reporting, and Conformance (DMARC) +@item Authenticated Recieved Chain (ARC) (draft-ietf-dmarc-arc-protocol-08) +@end itemize +Note: RFC 7601 obsoletes RFC 5451, 6577, 7001, and 7410. Authres supports the +current standard. No backward compatibility issues have been noted.") + (license license:asl2.0))) -- cgit v1.2.3 From 4637019ce16a2c077b6f7e7fa3bbd2cd3b4ac664 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jul 2020 10:26:18 +0300 Subject: gnu: Add python-importlib-resources. * gnu/packages/python-xyz.scm (python-importlib-resources): New variable. --- gnu/packages/python-xyz.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 748f48f229..8bddd521b6 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6036,6 +6036,29 @@ (define-public python-pathlib2 older Python versions.") (license license:expat))) +(define-public python-importlib-resources + (package + (name "python-importlib-resources") + (version "3.0.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "importlib_resources" version)) + (sha256 + (base32 + "1hq626mx5jl9zfl0wdrjkxsnh8qd98fqv322n68b9251xjk4bxqr")))) + (build-system python-build-system) + (native-inputs + `(("python-setuptools-scm" ,python-setuptools-scm) + ("python-toml" ,python-toml))) + (home-page "http://importlib-resources.readthedocs.io/") + (synopsis "Read resources from Python packages") + (description + "@code{importlib_resources} is a backport of Python 3's standard library +@code{importlib.resources} module for Python 2.7, and Python 3.") + (properties `((python2-variant . ,(delay python2-importlib-resources)))) + (license license:asl2.0))) + (define-public python2-importlib-resources (package (name "python2-importlib-resources") -- cgit v1.2.3 From 5c4332e5100f3cb008a542a6327b704e42100b3c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jul 2020 10:42:13 +0300 Subject: gnu: Add python-dkimpy. * gnu/packages/mail.scm (python-dkimpy): New variable. --- gnu/packages/mail.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 66e579946e..56aba93479 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -107,6 +107,7 @@ (define-module (gnu packages mail) #:use-module (gnu packages perl-web) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages readline) @@ -3238,3 +3239,43 @@ (define-public python-authres Note: RFC 7601 obsoletes RFC 5451, 6577, 7001, and 7410. Authres supports the current standard. No backward compatibility issues have been noted.") (license license:asl2.0))) + +(define-public python-dkimpy + (package + (name "python-dkimpy") + (version "1.0.4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "dkimpy" version)) + (sha256 + (base32 + "14idcs0wiyc0iyi5bz3xqimxf3x6dizcjfn92s2ka5zxp95xdyvd")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'patch-source-shebangs 'patch-more-source + (lambda* (#:key inputs #:allow-other-keys) + (let ((openssl (assoc-ref inputs "openssl"))) + (substitute* "dkim/dknewkey.py" + (("/usr/bin/openssl") (string-append openssl "/bin/openssl")))) + #t)) + (replace 'check + (lambda _ + (invoke "python" "test.py")))))) + (propagated-inputs + `(("python-dnspython" ,python-dnspython))) + (native-inputs + `(("python-authres" ,python-authres) + ("python-pynacl" ,python-pynacl))) + (inputs + `(("openssl" ,openssl))) + (home-page "https://launchpad.net/dkimpy") + (synopsis "DKIM (DomainKeys Identified Mail)") + (description "Python module that implements @dfn{DKIM} (DomainKeys +Identified Mail) email signing and verification (RFC6376). It also provides +helper scripts for command line signing and verification. It supports DKIM +signing/verifying of ed25519-sha256 signatures (RFC 8463). It also supports +the RFC 8617 Authenticated Received Chain (ARC) protocol.") + (license license:bsd-3))) -- cgit v1.2.3 From 0449f4ebabe54085d75614088e9a9170e464bd9f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jul 2020 10:47:09 +0300 Subject: gnu: Add python-pytest-services. * gnu/packages/python-check.scm (python-pytest-services): New variable. --- gnu/packages/python-check.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index 52f53f58cc..e3f0f6acbe 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -387,6 +387,31 @@ (define-public python-pytest-benchmark rounds that are calibrated to the chosen timer.") (license license:bsd-2))) +(define-public python-pytest-services + (package + (name "python-pytest-services") + (version "1.3.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pytest-services" version)) + (sha256 + (base32 + "0b2zfv04w6m3gp2v44ifdhx22vcji069qnn95ry3zcyxib7cjnq3")))) + (build-system python-build-system) + (arguments '(#:tests? #f)) ; Tests not included in release tarball. + (propagated-inputs + `(("python-psutil" ,python-psutil) + ("python-requests" ,python-requests))) + (native-inputs + `(("python-pytest" ,python-pytest))) + (home-page "https://github.com/pytest-dev/pytest-services") + (synopsis "Services plugin for pytest testing framework") + (description + "This plugin provides a set of fixtures and utility functions to start +service processes for your tests with pytest.") + (license license:expat))) + (define-public python-pytest-flask (package (name "python-pytest-flask") -- cgit v1.2.3 From e297edbfe5b1d711677a93bcab80e47748c66cde Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jul 2020 10:49:31 +0300 Subject: gnu: Add python-brotli. * gnu/packages/python-compression.scm (python-brotli): New variable. --- gnu/packages/python-compression.scm | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm index f853bdc1ec..730b247414 100644 --- a/gnu/packages/python-compression.scm +++ b/gnu/packages/python-compression.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2017, 2019 Ricardo Wurmus ;;; Copyright © 2017 Nikita ;;; Copyright © 2017 Julien Lepiller -;;; Copyright © 2018, 2019 Efraim Flashner +;;; Copyright © 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2020 Nicolas Goaziou ;;; Copyright © 2020 Marius Bakke ;;; @@ -133,6 +133,26 @@ (define-public python-lzstring (define-public python2-lzstring (package-with-python2 python-lzstring)) +(define-public python-brotli + (package + (name "python-brotli") + (version "1.0.7") + (source + (origin + (method url-fetch) + (uri (pypi-uri "Brotli" version ".zip")) + (sha256 + (base32 + "19x5dqxckb62n37mpnczp21rfxqvgpm0ki5ds8ac65zx8hbxqf05")))) + (build-system python-build-system) + (native-inputs + `(("unzip" ,unzip))) + (home-page "https://github.com/google/brotli") + (synopsis "Python bindings for the Brotli compression library") + (description + "This package provides python bindings for the Brotli compression library.") + (license license:asl2.0))) + (define-public bitshuffle (package (name "bitshuffle") -- cgit v1.2.3 From 3f4bfc3899849d20e4f6181ab4df1c8b0e3285e2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jul 2020 10:51:10 +0300 Subject: gnu: Add python-pytest-aiohttp. * gnu/packages/python-check.scm (python-pytest-aiohttp): New variable. --- gnu/packages/python-check.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index e3f0f6acbe..2e3cfe05c5 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -412,6 +412,27 @@ (define-public python-pytest-services service processes for your tests with pytest.") (license license:expat))) +(define-public python-pytest-aiohttp + (package + (name "python-pytest-aiohttp") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pytest-aiohttp" version)) + (sha256 + (base32 + "0kx4mbs9bflycd8x9af0idcjhdgnzri3nw1qb0vpfyb3751qaaf9")))) + (build-system python-build-system) + (native-inputs + `(("python-pytest" ,python-pytest))) + (propagated-inputs + `(("python-aiohttp" ,python-aiohttp))) + (home-page "https://github.com/aio-libs/pytest-aiohttp/") + (synopsis "Pytest plugin for aiohttp support") + (description "This package provides a pytest plugin for aiohttp support.") + (license license:asl2.0))) + (define-public python-pytest-flask (package (name "python-pytest-flask") -- cgit v1.2.3 From a1d406e829e7f8fe95da24b5d6507ac53d0e24c0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jul 2020 10:54:26 +0300 Subject: gnu: Add python-jinxed. * gnu/packages/python-xyz.scm (python-jinxed): New variable. --- gnu/packages/python-xyz.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 8bddd521b6..b974843817 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -20560,3 +20560,33 @@ (define-public python-bashlex @end itemize ") (license license:gpl3+))) + +(define-public python-jinxed + (package + (name "python-jinxed") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "jinxed" version)) + (sha256 + (base32 + "1n7vl03rhjd0xhjgbjlh8x9f8yfbhamcwkgvs4jg7g5qj8f0wk89")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-before 'check 'set-environment-variables + (lambda* (#:key inputs #:allow-other-keys) + (let ((ncurses (assoc-ref inputs "ncurses"))) + (setenv "TERM" "LINUX") + (setenv "TERMINFO" (string-append ncurses "/share/terminfo")) + #t)))) + #:tests? #f)) ; _curses.error: setupterm: could not find terminal + (native-inputs + `(("ncurses" ,ncurses))) + (home-page "https://github.com/Rockhopper-Technologies/jinxed") + (synopsis "Jinxed Terminal Library") + (description + "Jinxed is an implementation of a subset of the Python curses library.") + (license license:mpl2.0))) -- cgit v1.2.3 From 4c03a607830f8ef550190fcceda18800e29cabb3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jul 2020 10:55:55 +0300 Subject: gnu: Add python-blessed. * gnu/packages/python-xyz.scm (python-blessed): New variable. --- gnu/packages/python-xyz.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b974843817..bb99f054bd 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -20590,3 +20590,34 @@ (define-public python-jinxed (description "Jinxed is an implementation of a subset of the Python curses library.") (license license:mpl2.0))) + +(define-public python-blessed + (package + (name "python-blessed") + (version "1.17.8") + (source + (origin + (method url-fetch) + (uri (pypi-uri "blessed" version)) + (sha256 + (base32 + "1wdj342sk22hfrg0n91x2qnqsbzbiyq9y009v3pxnvfzn9bx0wbn")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Don't get hung up on Windows test failures. + (delete-file "blessed/win_terminal.py") #t)))) + (build-system python-build-system) + (propagated-inputs + `(("python-jinxed" ,python-jinxed) + ("python-six" ,python-six) + ("python-wcwidth" ,python-wcwidth))) + (native-inputs + `(("python-mock" ,python-mock) + ("python-pytest" ,python-pytest))) + (home-page "https://github.com/jquast/blessed") + (synopsis "Wrapper around terminal capabilities") + (description + "Blessed is a thin, practical wrapper around terminal styling, screen +positioning, and keyboard input.") + (license license:expat))) -- cgit v1.2.3 From ff1233d86ad69b2ba1dece84ae9b08f7f84a26a3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jul 2020 10:58:19 +0300 Subject: gnu: Add python-geographiclib. * gnu/packages/geo.scm (python-geographiclib): New variable. --- gnu/packages/geo.scm | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 0dd269adcf..421ce8df36 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2018 Joshua Sierles, Nextjournal ;;; Copyright © 2018, 2019, 2020 Julien Lepiller ;;; Copyright © 2019, 2020 Guillaume Le Vaillant -;;; Copyright © 2019 Efraim Flashner +;;; Copyright © 2019, 2020 Efraim Flashner ;;; Copyright © 2019 Wiktor Żelazny ;;; Copyright © 2019 Hartmut Goebel ;;; Copyright © 2020 Marius Bakke @@ -2096,3 +2096,21 @@ (define-public qgis license:opl1.0+ license:public-domain license:qwt1.0)))) + +(define-public python-geographiclib + (package + (name "python-geographiclib") + (version "1.50") + (source + (origin + (method url-fetch) + (uri (pypi-uri "geographiclib" version)) + (sha256 + (base32 + "0cn6ap5fkh3mkfa57l5b44z3gvz7j6lpmc9rl4g2jny2gvp4dg8j")))) + (build-system python-build-system) + (home-page "https://geographiclib.sourceforge.io/1.50/python/") + (synopsis "Python geodesic routines from GeographicLib") + (description + "This is a python implementation of the geodesic routines in GeographicLib.") + (license license:expat))) -- cgit v1.2.3 From 7bef1f6cd5e59a7c62979d6e9322c55e4941f4c4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jul 2020 11:02:18 +0300 Subject: gnu: Add python-readme-renderer. * gnu/packages/python-xyz.scm (python-readme-renderer): New variable. --- gnu/packages/python-xyz.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index bb99f054bd..8af77ad3ac 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -20621,3 +20621,32 @@ (define-public python-blessed "Blessed is a thin, practical wrapper around terminal styling, screen positioning, and keyboard input.") (license license:expat))) + +(define-public python-readme-renderer + (package + (name "python-readme-renderer") + (version "26.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "readme_renderer" version)) + (sha256 + (base32 + "13fnrv7z3y0yfafzcjbl55cqxncvbxadr72ql4l29pgyvrqxpsfb")))) + (build-system python-build-system) + (propagated-inputs + `(("python-bleach" ,python-bleach) + ("python-docutils" ,python-docutils) + ("python-pygments" ,python-pygments) + ("python-six" ,python-six))) + (native-inputs + `(("python-mock" ,python-mock) + ("python-pytest" ,python-pytest))) + (home-page "https://github.com/pypa/readme_renderer") + (synopsis "Render README files in Warehouse") + (description + "Readme Renderer is a library that will safely render arbitrary README +files into HTML. It is designed to be used in Warehouse to render the +@code{long_description} for packages. It can handle Markdown, reStructuredText, +and plain text.") + (license license:asl2.0))) -- cgit v1.2.3 From 481b0923f455af6da8aff859c14402ac484a2ca2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jul 2020 11:02:42 +0300 Subject: gnu: Add python-geopy. * gnu/packages/geo.scm (python-geopy): New variable. --- gnu/packages/geo.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 421ce8df36..3b08b283b9 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -86,6 +86,7 @@ (define-module (gnu packages geo) #:use-module (gnu packages protobuf) #:use-module (gnu packages pulseaudio) #: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) @@ -2114,3 +2115,34 @@ (define-public python-geographiclib (description "This is a python implementation of the geodesic routines in GeographicLib.") (license license:expat))) + +(define-public python-geopy + (package + (name "python-geopy") + (version "2.0.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "geopy" version)) + (sha256 + (base32 + "0fx0cv0kgbvynpmjgsvq2fpsyngd5idiscdn8pd5201f1ngii3mq")))) + (build-system python-build-system) + (propagated-inputs + `(("python-geographiclib" ,python-geographiclib))) + (native-inputs + `(("python-async-generator" ,python-async-generator) + ("python-coverage" ,python-coverage) + ("python-flake8" ,python-flake8) + ("python-isort" ,python-isort) + ("python-pytest" ,python-pytest) + ("python-pytest-aiohttp" ,python-pytest-aiohttp) + ("python-readme-renderer" ,python-readme-renderer) + ("python-pytz" ,python-pytz))) + (home-page "https://github.com/geopy/geopy") + (synopsis "Geocoding library for Python") + (description "@code{geopy} is a Python client for several popular geocoding +web services. @code{geopy} makes it easy for Python developers to locate the +coordinates of addresses, cities, countries, and landmarks across the globe +using third-party geocoders and other data sources.") + (license license:expat))) -- cgit v1.2.3 From 404d4915db90ea783e46ce8297cee04e3603ac19 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jul 2020 11:10:39 +0300 Subject: gnu: Add python-zope-hookable. * gnu/packages/python-web.scm (python-zope-hookable): New variable. --- gnu/packages/python-web.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 319638e3e2..5cfc6b97e9 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1345,6 +1345,31 @@ (define-public python-zope-proxy-bootstrap (define-public python2-zope-proxy (package-with-python2 python-zope-proxy)) +(define-public python-zope-hookable + (package + (name "python-zope-hookable") + (version "5.0.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "zope.hookable" version)) + (sha256 + (base32 + "0hc82lfr7bk53nvbxvjkibkarngyrzgfk2i6bg8wshl0ly0pdl19")))) + (build-system python-build-system) + (native-inputs + `(("python-coverage" ,python-coverage) + ("python-zope-testing" ,python-zope-testing))) + (home-page "https://github.com/zopefoundation/zope.hookable") + (synopsis "Zope hookable") + (description "This package supports the efficient creation of hookable +objects, which are callable objects that are meant to be optionally replaced. +The idea is that you create a function that does some default thing and make i +hookable. Later, someone can modify what it does by calling its sethook method +and changing its implementation. All users of the function, including those +that imported it, will see the change.") + (license license:zpl2.1))) + (define-public python-zope-location (package (name "python-zope-location") -- cgit v1.2.3 From 2ed6491f9c07c06537ed43db12e23c829da96622 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jul 2020 11:11:11 +0300 Subject: gnu: Add python-zope-deferredimport. * gnu/packages/python-web.scm (python-zope-deferredimport): New variable. --- gnu/packages/python-web.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 5cfc6b97e9..77a6e95737 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1492,6 +1492,32 @@ (define-public python-zope-component-bootstrap (define-public python2-zope-component (package-with-python2 python-zope-component)) +(define-public python-zope-deferredimport + (package + (name "python-zope-deferredimport") + (version "4.3.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "zope.deferredimport" version)) + (sha256 + (base32 + "1q89v54dwniiqypjbwywwdfjdr4kdkqlyqsgrpplgvsygdg39cjp")))) + (build-system python-build-system) + (propagated-inputs + `(("python-zope-proxy" ,python-zope-proxy))) + (native-inputs + `(("python-zope-testrunner" ,python-zope-testrunner))) + (home-page "https://github.com/zopefoundation/zope.deferredimport") + (synopsis "Defer imports until used by code") + (description + "Often, especially for package modules, you want to import names for +convenience, but not actually perform the imports until necessary. The +@code{zope.deferredimport} package provided facilities for defining names in +modules that will be imported from somewhere else when used. You can also cause +deprecation warnings to be issued when a variable is used.") + (license license:zpl2.1))) + (define-public python-ndg-httpsclient (package (name "python-ndg-httpsclient") -- cgit v1.2.3 From 256e8a82fa98f63a1416a283de86a32b074e7f7b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jul 2020 11:14:08 +0300 Subject: gnu: python-zope-component: Update to 4.6.2. * gnu/packages/python-web.scm (python-zope-component): Update to 4.6.2. [arguments]: Run test suite. Use custom 'check phase. [native-inputs]: Add python-persistent, python-zope-configuration-bootstrap, python-zope-i18nmessageid, python-zope-location-bootstrap, python-zope-proxy-bootstrap, python-zope-testrunner. [propagated-inputs]: Move python-i18nmessageid to native-inputs. Add python-zope-deferredimport, python-zope-deprecation, python-zope-event, python-zope-hookable. --- gnu/packages/python-web.scm | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 77a6e95737..4e3387f21e 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1456,25 +1456,37 @@ (define-public python2-zope-security (define-public python-zope-component (package (name "python-zope-component") - (version "4.3.0") + (version "4.6.2") (source (origin (method url-fetch) (uri (pypi-uri "zope.component" version)) (sha256 (base32 - "1hlvzwj1kcfz1qms1dzhwsshpsf38z9clmyksb1gh41n8k3kchdv")))) + "14iwp95hh6q5dj4k9h1iw75cbp89bs27nany4dinyglb44c8jqli")))) (build-system python-build-system) (arguments - ;; Skip tests due to circular dependency with python-zope-security. - '(#:tests? #f)) + '(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs outputs #:allow-other-keys) + (add-installed-pythonpath inputs outputs) + (invoke "python" "setup.py" "test")))))) (native-inputs - `(("python-zope-testing" ,python-zope-testing))) - (propagated-inputs - `(("python-zope-event" ,python-zope-event) - ("python-zope-interface" ,python-zope-interface) + `(("python-persistent" ,python-persistent) + ("python-zope-configuration" ,python-zope-configuration-bootstrap) ("python-zope-i18nmessageid" ,python-zope-i18nmessageid) - ("python-zope-configuration" ,python-zope-configuration))) + ("python-zope-location" ,python-zope-location-bootstrap) + ("python-zope-proxy" ,python-zope-proxy-bootstrap) + ("python-zope-security" ,python-zope-security-bootstrap) + ("python-zope-testing" ,python-zope-testing) + ("python-zope-testrunner" ,python-zope-testrunner))) + (propagated-inputs + `(("python-zope-deferredimport" ,python-zope-deferredimport) + ("python-zope-deprecation" ,python-zope-deprecation) + ("python-zope-event" ,python-zope-event) + ("python-zope-hookable" ,python-zope-hookable) + ("python-zope-interface" ,python-zope-interface))) (home-page "https://github.com/zopefoundation/zope.component") (synopsis "Zope Component Architecture") (description "Zope.component represents the core of the Zope Component -- cgit v1.2.3 From 3f795cf8f7cf942f0d8756f8b6c06bc016c567cb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jul 2020 11:16:15 +0300 Subject: gnu: Add python-zope-copy. * gnu/packages/python-web.scm (python-zope-copy): New variable. --- gnu/packages/python-web.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 4e3387f21e..338d73d1a9 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1309,6 +1309,37 @@ (define-public python-zope-configuration-bootstrap (define-public python2-zope-configuration (package-with-python2 python-zope-configuration)) +(define-public python-zope-copy + (package + (name "python-zope-copy") + (version "4.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "zope.copy" version)) + (sha256 + (base32 + "06m75434krl57n6p73c2qj55k5i3fixg887j8ss01ih6zw4rvfs7")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "zope-testrunner" "--test-path=src" "\\[]")))))) + (propagated-inputs + `(("python-zope-interface" ,python-zope-interface))) + (native-inputs + `(("python-zope-component" ,python-zope-component-bootstrap) + ("python-zope-location" ,python-zope-location-bootstrap) + ("python-zope-testing" ,python-zope-testing) + ("python-zope-testrunner" ,python-zope-testrunner))) + (home-page "https://github.com/zopefoundation/zope.copy") + (synopsis "Pluggable object copying mechanism") + (description + "This package provides a pluggable mechanism for copying persistent objects.") + (license license:zpl2.1))) + (define-public python-zope-proxy (package (name "python-zope-proxy") -- cgit v1.2.3 From 83dd7825187fc533aeadc2113b70c704e1968e56 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jul 2020 11:17:58 +0300 Subject: gnu: Add python-authheaders. * gnu/packages/mail.scm (python-authheaders): New variable. --- gnu/packages/mail.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 56aba93479..e0aea51afb 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -3279,3 +3279,31 @@ (define-public python-dkimpy signing/verifying of ed25519-sha256 signatures (RFC 8463). It also supports the RFC 8617 Authenticated Received Chain (ARC) protocol.") (license license:bsd-3))) + +(define-public python-authheaders + (package + (name "python-authheaders") + (version "0.13.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "authheaders" version)) + (sha256 + (base32 + "14k6i72k5f8dyvps8vc0aq0cczc8lvqpgjfjzsy6qqychjvjcmwk")))) + (build-system python-build-system) + (propagated-inputs + `(("python-authres" ,python-authres) + ("python-dkimpy" ,python-dkimpy) + ("python-dnspython" ,python-dnspython) + ("python-publicsuffix2" ,python-publicsuffix2))) + (home-page "https://github.com/ValiMail/authentication-headers") + (synopsis "Library wrapping email authentication header verification and generation") + (description + "This is a Python library for the generation of email authentication +headers. The library can perform DKIM, SPF, and DMARC validation, and the +results are packaged into the Authentication-Results header. The library can +DKIM and ARC sign messages and output the corresponding signature headers.") + ;; The package's metadata claims it were MIT licensed, but the source file + ;; headers disagree. MPL-2 for the public suffix list. + (license (list license:zpl2.1 license:zlib license:mpl2.0)))) -- cgit v1.2.3 From 0d6fffc5fd8f37b5b49220f67c39548108768b60 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jul 2020 11:23:20 +0300 Subject: gnu: Add python-lazr-delegates. * gnu/packages/python-xyz.scm (python-delegates): New variable. --- gnu/packages/python-xyz.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 8af77ad3ac..db05a52d14 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -20650,3 +20650,34 @@ (define-public python-readme-renderer @code{long_description} for packages. It can handle Markdown, reStructuredText, and plain text.") (license license:asl2.0))) + +(define-public python-lazr-delegates + (package + (name "python-lazr-delegates") + (version "2.0.4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "lazr.delegates" version)) + (sha256 + (base32 + "1rdnl85j9ayp8n85l0ciip621j9dcziz5qnmv2m7krgwgcn31vfx")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "python" "setup.py" "nosetests")))))) + (native-inputs + `(("python-nose" ,python-nose))) + (propagated-inputs + `(("python-zope-interface" ,python-zope-interface))) + (home-page "https://launchpad.net/lazr.delegates") + (synopsis "Easily write objects that delegate behavior") + (description + "The @code{lazr.delegates} package makes it easy to write objects that +delegate behavior to another object. The new object adds some property or +behavior on to the other object, while still providing the underlying interface, +and delegating behavior.") + (license license:lgpl3))) -- cgit v1.2.3 From 85fb79f1f668042f72227bff6a33c3c6bd3df187 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jul 2020 11:25:52 +0300 Subject: gnu: Add python-lazr-config. * gnu/packages/python-xyz.scm (python-lazr-config): New variable. --- gnu/packages/python-xyz.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index db05a52d14..ef7a4f31c4 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -20681,3 +20681,37 @@ (define-public python-lazr-delegates behavior on to the other object, while still providing the underlying interface, and delegating behavior.") (license license:lgpl3))) + +(define-public python-lazr-config + (package + (name "python-lazr-config") + (version "2.2.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "lazr.config" version)) + (sha256 + (base32 + "11xpddgyhyj7sf27wbmrq5lnqk21wnprx3ajycgwlxjamh6sgffd")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "python" "-s" "-m" "nose" "-P" "lazr")))))) + (native-inputs + `(("python-nose" ,python-nose))) + (propagated-inputs + `(("python-lazr-delegates" ,python-lazr-delegates) + ("python-zope-interface" ,python-zope-interface))) + (home-page "https://launchpad.net/lazr.config") + (synopsis "Create configuration schemas and process and validate configurations") + (description + "The LAZR config system is typically used to manage process configuration. +Process configuration is for saying how things change when we run systems on +different machines, or under different circumstances. This system uses ini-like +file format of section, keys, and values. The config file supports inheritance +to minimize duplication of information across files. The format supports schema +validation.") + (license license:lgpl3))) -- cgit v1.2.3 From cd760d221c7a04542ff8edada678b836992f68b8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jul 2020 11:29:33 +0300 Subject: gnu: Add python-flufl-lock. * gnu/packages/python-xyz.scm (python-flufl-lock): New variable. --- gnu/packages/python-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ef7a4f31c4..7361fa765e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -20715,3 +20715,28 @@ (define-public python-lazr-config to minimize duplication of information across files. The format supports schema validation.") (license license:lgpl3))) + +(define-public python-flufl-lock + (package + (name "python-flufl-lock") + (version "4.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "flufl.lock" version)) + (sha256 + (base32 + "055941zyma3wfx25jhm8wcsghpv3jc3iwi1gdrdjhzcnfhn62lxq")))) + (build-system python-build-system) + (propagated-inputs + `(("python-atpublic" ,python-atpublic) + ("python-psutil" ,python-psutil))) + (home-page "https://flufllock.readthedocs.io") + (synopsis "NFS-safe file locking with timeouts for POSIX systems") + (description + "The @dfn{flufl.lock} package provides NFS-safe file locking with +timeouts for POSIX systems. It is similar to the @code{O_EXCL} option of the +@code{open} system call but uses a lockfile. Lock objects support lock-breaking +and have a maximum lifetime built-in.") + (license (list license:asl2.0 + license:lgpl3)))) ; only for setup_helpers.py -- cgit v1.2.3 From 2bf21531533a22a666a5309d80c045f1dc61fd12 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jul 2020 11:30:49 +0300 Subject: gnu: Add python-flufl-i18n. * gnu/packages/python-xyz.scm (python-flufl-i18n): New variable. --- gnu/packages/python-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7361fa765e..1046aadcd3 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -20716,6 +20716,32 @@ (define-public python-lazr-config validation.") (license license:lgpl3))) +(define-public python-flufl-i18n + (package + (name "python-flufl-i18n") + (version "3.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "flufl.i18n" version)) + (sha256 + (base32 + "1flwpn1xhgc957zj3zxw92dhdjh0lsy0hdvzq32dzqpsajfsvq1r")))) + (build-system python-build-system) + (propagated-inputs + `(("python-atpublic" ,python-atpublic))) + (home-page "https://flufli18n.readthedocs.io") + (synopsis "API for Python internationalization") + (description + "This package provides a high level, convenient API for managing +internationalization translation contexts in Python application. There is a +simple API for single-context applications, such as command line scripts which +only need to translate into one language during the entire course of thei +execution. There is a more flexible, but still convenient API for multi-context +applications, such as servers, which may need to switch language contexts for +different tasks.") + (license license:asl2.0))) + (define-public python-flufl-lock (package (name "python-flufl-lock") -- cgit v1.2.3 From 0f1e0882804601e181951b45921b618a7709cb85 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jul 2020 11:32:26 +0300 Subject: gnu: Add python-flufl-bounce. * gnu/packages/python-xyz.scm (python-flufl-bounce): New variable. --- gnu/packages/python-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 1046aadcd3..612098ece0 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -20716,6 +20716,32 @@ (define-public python-lazr-config validation.") (license license:lgpl3))) +(define-public python-flufl-bounce + (package + (name "python-flufl-bounce") + (version "3.0.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "flufl.bounce" version)) + (sha256 + (base32 + "01lg1b0jpf8605mzaz9miq3nray6s7a7gc8n4wzg5nsxl8fglcp4")))) + (build-system python-build-system) + (propagated-inputs + `(("python-atpublic" ,python-atpublic) + ("python-zope-interface" ,python-zope-interface))) + (native-inputs + `(("python-nose2" ,python-nose2))) + (home-page "https://fluflbounce.readthedocs.io/en/latest/") + (synopsis "Email bounce detectors") + (description "The @code{flufl.bounce} library provides a set of heuristics +and an API for detecting the original bouncing email addresses from a bounce +message. Many formats found in the wild are supported, as are VERP and +RFC 3464.") + (license (list license:asl2.0 + license:lgpl3)))) ; only for setup_headers.py + (define-public python-flufl-i18n (package (name "python-flufl-i18n") -- cgit v1.2.3 From bb9061c9e0ec39397eaf9a7cff481633608268dd Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jul 2020 11:33:58 +0300 Subject: gnu: Add python-flufl-testing. * gnu/packages/python-xyz.scm (python-flufl-testing): New variable. --- gnu/packages/python-xyz.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 612098ece0..beaed485bd 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -20792,3 +20792,24 @@ (define-public python-flufl-lock and have a maximum lifetime built-in.") (license (list license:asl2.0 license:lgpl3)))) ; only for setup_helpers.py + +(define-public python-flufl-testing + (package + (name "python-flufl-testing") + (version "0.8") + (source + (origin + (method url-fetch) + (uri (pypi-uri "flufl.testing" version)) + (sha256 + (base32 + "1nkm95mhcfhl4x5jgs6y97ikszaxsfh07nyawsih6cxxm6l62641")))) + (build-system python-build-system) + (native-inputs + `(("python-nose2" ,python-nose2))) + (home-page "https://gitlab.com/warsaw/flufl.testing") + (synopsis "Collection of test tool plugins") + (description + "This package contains a small collection of test tool plugins for +@code{nose2} and @code{flake8}.") + (license license:asl2.0))) -- cgit v1.2.3 From 3a98604f5f282fa2ba025bc9f9418c1cfe5bd54c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jul 2020 11:37:28 +0300 Subject: gnu: Add python-aiosmtpd. * gnu/packages/mail.scm (python-aiosmtpd): New variable. --- gnu/packages/mail.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index e0aea51afb..cde1f4041f 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -107,6 +107,7 @@ (define-module (gnu packages mail) #:use-module (gnu packages perl-web) #:use-module (gnu packages pkg-config) #: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) @@ -3307,3 +3308,38 @@ (define-public python-authheaders ;; The package's metadata claims it were MIT licensed, but the source file ;; headers disagree. MPL-2 for the public suffix list. (license (list license:zpl2.1 license:zlib license:mpl2.0)))) + +(define-public python-aiosmtpd + (package + (name "python-aiosmtpd") + (version "1.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "aiosmtpd" version)) + (sha256 + (base32 + "1xdfk741pjmz1cm8dsi4n5vq4517i175rm94696m3f7kcgk7xsmp")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'delete-failing-test + (lambda _ + (delete-file "aiosmtpd/tests/test_smtps.py") + #t)) + (replace 'check + (lambda _ + (invoke "python" "-m" "nose2" "-v")))))) + (native-inputs + `(("python-flufl-testing" ,python-flufl-testing) + ("python-nose2" ,python-nose2))) + (propagated-inputs + `(("python-atpublic" ,python-atpublic))) + (home-page "https://aiosmtpd.readthedocs.io/") + (synopsis "Asyncio based SMTP server") + (description + "This project is a reimplementation of the Python stdlib @code{smtpd.py} +based on asyncio.") + (license (list license:asl2.0 + license:lgpl3)))) ; only for setup_helpers.py -- cgit v1.2.3 From 41eb9da3886af857088b95ebadaa38fa173cd459 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jul 2020 11:54:35 +0300 Subject: gnu: Add python-rjsmin. * gnu/packages/python-xyz.scm (python-rjsmin): New variable. --- gnu/packages/python-xyz.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index beaed485bd..e16d3daf54 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13545,6 +13545,43 @@ (define-public python-argcomplete (define-public python2-argcomplete (package-with-python2 python-argcomplete)) +(define-public python-rjsmin + (package + (name "python-rjsmin") + (version "1.1.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "rjsmin" version)) + (sha256 + (base32 + "0cmc72rlkvzz8fl89bc83czkx0pcvhzj7yn7m29r8pgnf5fcfpdi")) + (modules '((guix build utils))) + (snippet + '(begin + (for-each delete-file (find-files "bench" "\\.js$")) + #t)))) + (build-system python-build-system) + (arguments + '(#:tests? #f ; Not all test files included. + #:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (add-installed-pythonpath inputs outputs) + (if tests? + (invoke "py.test" "-vv" "tests") + #t)))))) + (native-inputs + `(("python-pytest" ,python-pytest))) + (home-page "http://opensource.perlig.de/rjsmin/") + (synopsis "Javascript Minifier") + (description "@code{rJSmin} is a javascript minifier written in Python. The +minifier is based on the semantics of jsmin.c by Douglas Crockford. The module +is a re-implementation aiming for speed, so it can be used at runtime (rather +than during a preprocessing step).") + (license license:asl2.0))) + (define-public python-xopen (package (name "python-xopen") -- cgit v1.2.3 From bdcb84578d1ea94523dbca10fb6f8c136fac60f1 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jul 2020 12:01:05 +0300 Subject: gnu: Add python-rcssmin. * gnu/packages/python-xyz.scm (python-rcssmin): New variable. --- gnu/packages/python-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e16d3daf54..510729bea8 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13545,6 +13545,30 @@ (define-public python-argcomplete (define-public python2-argcomplete (package-with-python2 python-argcomplete)) +(define-public python-rcssmin + (package + (name "python-rcssmin") + (version "1.0.6") + (source + (origin + (method url-fetch) + (uri (pypi-uri "rcssmin" version)) + (sha256 + (base32 + "0w42l4dhxghcz7pj3q7hkxp015mvb8z2cq9sfxbl31npsfavd1ya")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "python" "run_tests.py" "tests")))))) + (home-page "http://opensource.perlig.de/rcssmin/") + (synopsis "CSS Minifier") + (description "The minifier is based on the semantics of the YUI compressor, +which itself is based on the rule list by Isaac Schlueter.") + (license license:asl2.0))) + (define-public python-rjsmin (package (name "python-rjsmin") -- cgit v1.2.3 From 97a01170398055f3fcb61e844c3314d8d5aec5dd Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jul 2020 12:04:15 +0300 Subject: gnu: Add python-robot-detection. * gnu/packages/python-web.scm (python-robot-detection): New variable. --- gnu/packages/python-web.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 338d73d1a9..5a2fa1ee7c 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -4346,3 +4346,25 @@ (define-public python-transaction (description "This package contains a generic transaction implementation for Python. It is mainly used by the ZODB.") (license license:zpl2.1))) + +(define-public python-robot-detection + (package + (name "python-robot-detection") + (version "0.4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "robot-detection" version)) + (sha256 + (base32 + "1xd2jm3yn31bnk1kqzggils2rxj26ylxsfz3ap7bhr3ilhnbg3rx")))) + (build-system python-build-system) + (arguments '(#:tests? #f)) ; Tests not shipped in pypi release. + (propagated-inputs `(("python-six" ,python-six))) + (home-page "https://github.com/rory/robot-detection") + (synopsis "Detect web crawlers") + (description + "@code{robot_detection} is a python module to detect if a given HTTP User +Agent is a web crawler. It uses the list of registered robots from +@url{http://www.robotstxt.org}.") + (license license:gpl3+))) -- cgit v1.2.3 From 88b2c1aae21a28957ef9b53f3e9aa82355a9027e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jul 2020 12:08:15 +0300 Subject: gnu: Add python-pysolr. * gnu/packages/python-web.scm (python-pysolr): New variable. --- gnu/packages/python-web.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 5a2fa1ee7c..6fd430a41f 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -4368,3 +4368,28 @@ (define-public python-robot-detection Agent is a web crawler. It uses the list of registered robots from @url{http://www.robotstxt.org}.") (license license:gpl3+))) + +(define-public python-pysolr + (package + (name "python-pysolr") + (version "3.9.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pysolr" version)) + (sha256 + (base32 + "1rj5jmscvxjwcmlfi6hmkj44l4x6n3ln5p7d8d18j566hzmmzw3f")))) + (build-system python-build-system) + (arguments + '(#:tests? #f)) ; Tests require network access. + (propagated-inputs + `(("python-requests" ,python-requests))) + (native-inputs + `(("python-setuptools-scm" ,python-setuptools-scm))) + (home-page "https://github.com/django-haystack/pysolr/") + (synopsis "Lightweight python wrapper for Apache Solr") + (description + "This module provides an interface that queries the Apache Solr server +using a pure Python implementation.") + (license license:bsd-3))) -- cgit v1.2.3 From 8ee76f611ab7eb598878d9e16c97f15accfedd87 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jul 2020 12:11:50 +0300 Subject: gnu: Add python-csscompressor. * gnu/packages/python-xyz.scm (python-csscompressor): New variable. --- gnu/packages/python-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 510729bea8..d509d51f4e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13545,6 +13545,32 @@ (define-public python-argcomplete (define-public python2-argcomplete (package-with-python2 python-argcomplete)) +(define-public python-csscompressor + (package + (name "python-csscompressor") + (version "0.9.5") + (source + (origin + (method url-fetch) + (uri (pypi-uri "csscompressor" version)) + (sha256 + (base32 + "018ssffvlpnc1salmnpyl52c11glzzwj4k9f757hl4pkpjnjp8mg")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "py.test")))))) + (native-inputs + `(("python-pytest" ,python-pytest))) + (home-page "https://github.com/sprymix/csscompressor") + (synopsis "Python port of YUI CSS Compressor") + (description + "This package provides a python port of YUI CSS Compressor.") + (license license:bsd-3))) + (define-public python-rcssmin (package (name "python-rcssmin") -- cgit v1.2.3 From f4a2f0491c7c8cf8bdc49fb469c8f10a09b8f5f3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jul 2020 12:13:17 +0300 Subject: gnu: gunicorn-bootstrap: Re-indent. * gnu/packages/python-web.scm (gunicorn-bootstrap): Remove stray tabs. --- gnu/packages/python-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 6fd430a41f..a202873fd0 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -3704,8 +3704,8 @@ (define-public gunicorn-bootstrap (package (inherit gunicorn) (name "gunicorn") - (arguments `(#:tests? #f)) - (properties '((hidden? . #t))) + (arguments `(#:tests? #f)) + (properties '((hidden? . #t))) (native-inputs `()))) (define-public python-translation-finder -- cgit v1.2.3 From e1302edbd9f8b333a2add8cfcbca82636c3ca0af Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jul 2020 12:24:49 +0300 Subject: gnu: Add python-django-picklefield. * gnu/packages/django.scm (python-django-picklefield): New variable. --- gnu/packages/django.scm | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index f723fcae50..55cc869fc4 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Hartmut Goebel -;;; Copyright © 2016, 2019 Efraim Flashner +;;; Copyright © 2016, 2019, 2020 Efraim Flashner ;;; Copyright © 2017 Nikita ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2017 Ricardo Wurmus @@ -572,6 +572,25 @@ (define-public python-dj-database-url (define-public python2-dj-database-url (package-with-python2 python-dj-database-url)) +(define-public python-django-picklefield + (package + (name "python-django-picklefield") + (version "2.1.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "django-picklefield" version)) + (sha256 + (base32 + "0imncys5s3vsy2q79nn7k5d670da1xgmcr9gmhn06fry6ibf39b7")))) + (build-system python-build-system) + (propagated-inputs `(("python-django" ,python-django))) + (native-inputs `(("python-tox" ,python-tox))) + (home-page "https://github.com/gintas/django-picklefield") + (synopsis "Pickled object field for Django") + (description "Pickled object field for Django") + (license license:expat))) + (define-public python-django-bulk-update (package (name "python-django-bulk-update") -- cgit v1.2.3 From 63c3f15dc2ff51f87c23bf9c7fd0cb5d3b9c5569 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jul 2020 12:27:28 +0300 Subject: gnu: Add python-django-q. * gnu/packages/django.scm (python-django-q): New variable. --- gnu/packages/django.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index 55cc869fc4..56b00c8d9a 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -831,6 +831,41 @@ (define-public python-django-rq (define-public python2-django-rq (package-with-python2 python-django-rq)) +(define-public python-django-q + (package + (name "python-django-q") + (version "1.3.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "django-q" version)) + (sha256 + (base32 + "0ac3rjxv37bn97a62ly8b7qvbv765z6paiinzpwxx83nal2icc42")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (setenv "DJANGO_SETTINGS_MODULE" "django_q.tests.settings") + (invoke "django-admin" "test" "django_q.tests" + "--pythonpath=.")))))) + (propagated-inputs + `(("python-arrow" ,python-arrow) + ("python-blessed" ,python-blessed) + ("python-django" ,python-django) + ("python-django-picklefield" ,python-django-picklefield))) + (native-inputs + `(("python-django-redis" ,python-django-redis) + ("python-pytest-django" ,python-pytest-django))) + (home-page "https://django-q.readthedocs.io/") + (synopsis "Multiprocessing distributed task queue for Django") + (description + "Django Q is a native Django task queue, scheduler and worker application +using Python multiprocessing.") + (license license:expat))) + (define-public python-django-sortedm2m (package (name "python-django-sortedm2m") -- cgit v1.2.3 From 4a82decd87f49e30c55c629a99ef483516042702 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jul 2020 12:29:56 +0300 Subject: gnu: Add python-django-haystack. * gnu/packages/django.scm (python-django-haystack): New variable. --- gnu/packages/django.scm | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index 56b00c8d9a..bb1f6a1981 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -32,6 +32,7 @@ (define-module (gnu packages django) #:use-module (gnu packages base) #:use-module (gnu packages databases) #:use-module (gnu packages check) + #:use-module (gnu packages geo) #:use-module (gnu packages python) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) @@ -281,6 +282,54 @@ (define-public python-pytest-django (define-public python2-pytest-django (package-with-python2 python-pytest-django)) +(define-public python-django-haystack + (package + (name "python-django-haystack") + (version "2.8.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "django-haystack" version)) + (sha256 + (base32 + "1302fqsrx8w474xk5cmnmg3hjqfprlxnjg9qlg86arsr4v4vqm4b")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'loosen-verion-restrictions + (lambda _ + (substitute* "setup.py" + (("geopy.*") "geopy',\n")) + #t)) + (add-before 'check 'set-gdal-lib-path + (lambda* (#:key inputs #:allow-other-keys) + (setenv "GDAL_LIBRARY_PATH" + (string-append (assoc-ref inputs "gdal") + "/lib")) + #t))) + #:tests? #f)) ; OSError: libgdal.so.27: cannot open shared object file + (propagated-inputs + `(("python-django" ,python-django))) + (native-inputs + `(("gdal" ,gdal) + ("python-coverage" ,python-coverage) + ("python-dateutil" ,python-dateutil) + ("python-geopy" ,python-geopy) + ("python-mock" ,python-mock) + ("python-nose" ,python-nose) + ("python-requests" ,python-requests) + ("python-setuptools-scm" ,python-setuptools-scm) + ("python-pysolr" ,python-pysolr) + ("python-whoosh" ,python-whoosh))) + (home-page "http://haystacksearch.org/") + (synopsis "Pluggable search for Django") + (description "Haystack provides modular search for Django. It features a +unified, familiar API that allows you to plug in different search backends +(such as Solr, Elasticsearch, Whoosh, Xapian, etc.) without having to modify +your code.") + (license license:bsd-3))) + (define-public python-django-filter (package (name "python-django-filter") -- cgit v1.2.3 From 04eba1d046aa058ef7a64b8b70caf6da13176667 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jul 2020 12:33:55 +0300 Subject: gnu: Add python-django-classy-tags. * gnu/packages/django.scm (python-django-classy-tags): New variable. --- gnu/packages/django.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index bb1f6a1981..69fedf7612 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -192,6 +192,31 @@ (define-public python-django-simple-math-captcha (define-public python2-django-simple-math-captcha (package-with-python2 python-django-simple-math-captcha)) +(define-public python-django-classy-tags + (package + (name "python-django-classy-tags") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "django-classy-tags" version)) + (sha256 + (base32 + "1cayqddvxd5prhybqi77lif2z4j7mmfmxgc61pq9i82q5gy2asmd")))) + (build-system python-build-system) + (arguments '(#:tests? #f)) ; Test script not distributed with release. + (propagated-inputs + `(("python-django" ,python-django) + ("python-six" ,python-six))) + (home-page "https://github.com/divio/django-classy-tags") + (synopsis "Class based template tags for Django") + (description + "@code{django-classy-tags} is an approach at making writing template tags +in Django easier, shorter and more fun. It provides an extensible argument +parser which reduces most of the boiler plate code you usually have to write +when coding custom template tags.") + (license license:bsd-3))) + (define-public python-django-taggit (package (name "python-django-taggit") -- cgit v1.2.3 From 5b1a9e07596759b4cb66b732e7661ecd6ec8a122 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jul 2020 12:42:20 +0300 Subject: gnu: python-django-allauth: Update to 0.40.0. * gnu/packages/django.scm (python-django-allauth): Update to 0.40.0. [arguments]: Remove 'skip-test-requiring-network-access phase. Adjust custom 'check phase. --- gnu/packages/django.scm | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index 69fedf7612..926d6d6dbd 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -392,36 +392,23 @@ (define-public python2-django-filter (define-public python-django-allauth (package (name "python-django-allauth") - (version "0.39.1") + (version "0.40.0") (source (origin (method url-fetch) (uri (pypi-uri "django-allauth" version)) (sha256 (base32 - "17l0acpr3cihdndzccjhgv58f9z170v2qwx7w0b8w6235x646i24")))) + "12f5gjidcpb7a0d1f601k0c5dcdmb6fg9sfn7xn5j8zfsg29y63a")))) (build-system python-build-system) (arguments '(#:phases (modify-phases %standard-phases - ;; TODO: Tagging the tests requiring the web could be done upstream. - (add-before 'check 'skip-test-requiring-network-access - (lambda _ - (substitute* "allauth/socialaccount/providers/openid/tests.py" - (("import override_settings") "import tag, override_settings") - (("def test_login") - "@tag('requires-web') - def test_login")))) (replace 'check (lambda _ - ;; TODO: investigate why this test fails - (delete-file "allauth/socialaccount/providers/cern/tests.py") (setenv "DJANGO_SETTINGS_MODULE" "test_settings") - (invoke "django-admin" - "test" - "allauth" - "--verbosity=2" - "--exclude-tag=requires-web")))))) + (invoke "django-admin" "test" "allauth.tests" + "--pythonpath=.")))))) (propagated-inputs `(("python-openid" ,python-openid) ("python-requests" ,python-requests) -- cgit v1.2.3 From 1c24d6d6629ec3096b8bd64176b5e063b2692fdb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jul 2020 13:53:42 +0300 Subject: gnu: python-django-rq: Fix test suite. * gnu/packages/django.scm (python-django-rq)[arguments]: Adjust custom 'check phase. --- gnu/packages/django.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index 926d6d6dbd..7c89757082 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -874,7 +874,7 @@ (define-public python-django-rq (invoke "redis-server" "--daemonize" "yes") (invoke "django-admin.py" "test" "django_rq" "--settings=django_rq.tests.settings" - "--pythonpath=")))))) + "--pythonpath=.")))))) (native-inputs `(("python-mock" ,python-mock) ("redis" ,redis))) -- cgit v1.2.3 From ba1c2e5b0d698ce6849f63af867d68cb1f8242b5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jul 2020 14:17:25 +0300 Subject: gnu: python-django-testing: Fix tests. * gnu/packages/django.scm (python-django-tagging)[arguments]: Use custom 'check phase. [inputs]: Add python-django. --- gnu/packages/django.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index 7c89757082..ce23946c90 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -1089,6 +1089,15 @@ (define-public python-django-tagging (base32 "0s7b4v45j783yaxs7rni10k24san0ya77nqz4s7zdf3jhfpk42r1")))) (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (setenv "DJANGO_SETTINGS_MODULE" "tagging.tests.settings") + (invoke "django-admin" "test" "--pythonpath=.")))))) + (inputs + `(("python-django" ,python-django))) (home-page "https://github.com/Fantomas42/django-tagging") (synopsis "Generic tagging application for Django") (description "This package provides a generic tagging application for -- cgit v1.2.3 From 18f1bd255d72dcd458f9e3a19a6de17fb531a238 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jul 2020 14:23:04 +0300 Subject: gnu: python-django-testing: Update to 0.5.0. * gnu/packages/django.scm (python-django-testing): Update to 0.5.0. [properties]: Add python2-variant. (python2-django-testing): Stay at 0.4.6. --- gnu/packages/django.scm | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index ce23946c90..625e4c0cda 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -1080,14 +1080,14 @@ (define-public pootle (define-public python-django-tagging (package (name "python-django-tagging") - (version "0.4.6") + (version "0.5.0") (source (origin (method url-fetch) (uri (pypi-uri "django-tagging" version)) (sha256 (base32 - "0s7b4v45j783yaxs7rni10k24san0ya77nqz4s7zdf3jhfpk42r1")))) + "13afxx30chssclxzd9gqnvwm9qyrdpnlbs6iswdfa18phfj8zmi8")))) (build-system python-build-system) (arguments `(#:phases @@ -1103,10 +1103,22 @@ (define-public python-django-tagging (description "This package provides a generic tagging application for Django projects, which allows association of a number of tags with any @code{Model} instance and makes retrieval of tags simple.") + (properties `((python2-variant . ,(delay python2-django-tagging)))) (license license:bsd-3))) (define-public python2-django-tagging - (package-with-python2 python-django-tagging)) + (let ((base (package-with-python2 + (strip-python2-variant python-django-tagging)))) + (package + (inherit base) + (version "0.4.6") + (source + (origin + (method url-fetch) + (uri (pypi-uri "django-tagging" version)) + (sha256 + (base32 + "0s7b4v45j783yaxs7rni10k24san0ya77nqz4s7zdf3jhfpk42r1"))))))) (define-public python-djangorestframework (package -- cgit v1.2.3 From 4fa01b7821f24d97228c657dabf1e66c82899146 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jul 2020 14:27:36 +0300 Subject: gnu: Add python-django-sekizai. * gnu/packages/django.scm (python-django-sekizai): New variable. --- gnu/packages/django.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index 625e4c0cda..119d23dadc 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -1144,6 +1144,35 @@ (define-public python-djangorestframework provides features like a web browseable API and authentication policies.") (license license:bsd-2))) +(define-public python-django-sekizai + (package + (name "python-django-sekizai") + (version "1.1.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "django-sekizai" version)) + (sha256 + (base32 + "1nc4sv109valdn6azmgm2j01k7khxy2wnji84z63x7fxsikfdxp2")))) + (build-system python-build-system) + (arguments '(#:tests? #f)) ; Tests not included with release. + (propagated-inputs + `(("python-django" ,python-django) + ("python-django-classy-tags" ,python-django-classy-tags) + ("python-six" ,python-six))) + (home-page "https://github.com/divio/django-sekizai") + (synopsis "Template blocks for Django projects") + (description "Sekizai means blocks in Japanese, and thats what this app +provides. A fresh look at blocks. With @code{django-sekizai} you can define +placeholders where your blocks get rendered and at different places in your +templates append to those blocks. This is especially useful for css and +javascript. Your subtemplates can now define css and javscript files to be +included, and the css will be nicely put at the top and the javascript to the +bottom, just like you should. Also sekizai will ignore any duplicate content in +a single block.") + (license license:bsd-3))) + (define-public python-django-crispy-forms (package (name "python-django-crispy-forms") -- cgit v1.2.3 From da3dbd61edc57007c78f51de45b6cbcafdfce844 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jul 2020 14:30:59 +0300 Subject: gnu: Add python-django-compressor. * gnu/packages/django.scm (python-django-compressor): New variable. --- gnu/packages/django.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index 119d23dadc..d2faff357e 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -34,6 +34,7 @@ (define-module (gnu packages django) #:use-module (gnu packages check) #:use-module (gnu packages geo) #:use-module (gnu packages python) + #:use-module (gnu packages python-compression) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages sphinx) @@ -1198,6 +1199,51 @@ (define-public python-django-crispy-forms forms using your favorite CSS framework, without writing template code.") (license license:expat))) +(define-public python-django-compressor + (package + (name "python-django-compressor") + (version "2.4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "django_compressor" version)) + (sha256 + (base32 + "0kx7bclfa0sxlsz6ka70zr9ra00lks0hmv1kc99wbanx6xhirvfj")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (if tests? + (begin + (setenv "DJANGO_SETTINGS_MODULE" "compressor.test_settings") + (invoke "django-admin" "test" + "--pythonpath=.")) + #t)))) + ;; Tests fail with beautifulsoup 4.9+ + ;; https://github.com/django-compressor/django-compressor/issues/998 + #:tests? #f)) + (propagated-inputs + `(("python-django-appconf" ,python-django-appconf) + ("python-rcssmin" ,python-rcssmin) + ("python-rjsmin" ,python-rjsmin))) + (native-inputs + `(("python-beautifulsoup4" ,python-beautifulsoup4) + ("python-brotli" ,python-brotli) + ("python-csscompressor" ,python-csscompressor) + ("python-django-sekizai" ,python-django-sekizai) + ("python-mock" ,python-mock))) + (home-page "https://django-compressor.readthedocs.io/en/latest/") + (synopsis + "Compress linked and inline JavaScript or CSS into single cached files") + (description + "Django Compressor combines and compresses linked and inline Javascript or +CSS in a Django templates into cacheable static files by using the compress +template tag.") + (license license:expat))) + (define-public python-django-override-storage (package (name "python-django-override-storage") -- cgit v1.2.3 From ba7816a2cec8280d9fb53b7b7d98f352ca4414c7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jul 2020 14:33:41 +0300 Subject: gnu: Add python-django-mailman3. * gnu/packages/mail.scm (python-django-mailman3): New variable. --- gnu/packages/mail.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index cde1f4041f..e735c84633 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2551,6 +2551,44 @@ (define-public mlmmj @end enumerate\n") (license license:expat))) +(define-public python-django-mailman3 + (package + (name "python-django-mailman3") + (version "1.3.4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "django-mailman3" version)) + (sha256 + (base32 + "1yrm7wpjy34xai72vn2vkhc9131cdrbqy08rrabf36kynj5vcdvy")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (setenv "DJANGO_SETTINGS_MODULE" + "django_mailman3.tests.settings_test") + (invoke "django-admin" "test" + "--pythonpath=.")))))) + (propagated-inputs + `(("python-django" ,python-django) + ("python-django-allauth" ,python-django-allauth) + ("python-django-gravatar2" ,python-django-gravatar2) + ("python-mailmanclient" ,python-mailmanclient) + ("python-pytz" ,python-pytz))) + (native-inputs + `(("python-mock" ,python-mock))) + (home-page "https://gitlab.com/mailman/django-mailman3") + (synopsis "Django library to help interaction with Mailman") + (description + "This package contains libraries and templates for Django-based interfaces +interacting with Mailman.") + (properties `((python2-variant . ,(delay python2-django-mailman)))) + (license license:gpl3+))) + +;; This is the last version to support Python-2. (define-public python2-django-mailman3 (package (name "python2-django-mailman3") -- cgit v1.2.3 From f1742465991c24c799569145191077b256e8647e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jul 2020 15:13:10 +0300 Subject: gnu: python-mailmanclient: Update to 3.3.1. * gnu/packages/mail.scm (python-mailmanclient): Update to 3.3.1. [home-page]: Update to new home-page url. [properties]: Add python2- variant. --- gnu/packages/mail.scm | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index e735c84633..051502b885 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2468,29 +2468,49 @@ (define-public opensmtpd-extras (define-public python-mailmanclient (package (name "python-mailmanclient") - (version "3.1.1") + (version "3.3.1") (source (origin (method url-fetch) (uri (pypi-uri "mailmanclient" version)) (sha256 (base32 - "0fdfs5g3pf30v2i7w18pdkv9xnfxmfcv66mzv56dck0a1igq07m3")))) + "0pjgzpvhdb6ql8asb20xr8d01m646zpghmcp9fmscks0n1k4di4g")))) (build-system python-build-system) (arguments `(#:tests? #f)) ; Requires mailman running (propagated-inputs - `(("python-six" ,python-six) - ("python-httplib2" ,python-httplib2))) - (home-page "https://launchpad.net/mailman.client") + `(("python-requests" ,python-requests))) + ;(native-inputs + ; `(("mailman" ,mailman) + ; ("python-falcon" ,python-falcon) + ; ("python-pytest" ,python-pytest) + ; ("python-pytest-services" ,python-pytest-services))) + (home-page "https://www.list.org/") (synopsis "Python bindings for the Mailman 3 REST API") (description "The mailmanclient library provides official Python bindings for the GNU Mailman 3 REST API.") + (properties `((python2-variant . ,(delay python2-mailmanclient)))) (license license:lgpl3+))) +;; This is the last version which supports Python-2. (define-public python2-mailmanclient - (package-with-python2 python-mailmanclient)) + (let ((base (package-with-python2 + (strip-python2-variant python-mailmanclient)))) + (package + (inherit base) + (version "3.1.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "mailmanclient" version)) + (sha256 + (base32 + "0fdfs5g3pf30v2i7w18pdkv9xnfxmfcv66mzv56dck0a1igq07m3")))) + (propagated-inputs + `(("python2-six" ,python2-six) + ("python2-httplib2" ,python2-httplib2)))))) (define-public mlmmj (package -- cgit v1.2.3 From b0c8358f84605a21a3f30cc404190f25d437c0bf Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jul 2020 15:15:46 +0300 Subject: gnu: Add mailman. * gnu/packages/mail.scm (mailman): New variable. --- gnu/packages/mail.scm | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 051502b885..ba6625749a 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2465,6 +2465,53 @@ (define-public opensmtpd-extras (license (list license:bsd-2 license:bsd-3 ; openbsd-compat license:isc)))) ; everything else +(define-public mailman + (package + (name "mailman") + (version "3.3.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "mailman" version)) + (sha256 + (base32 + "0idfiv48jjgc0jq4731094ddhraqq8bxnwmjk6sg5ask0jss9kxq")))) + (build-system python-build-system) + (propagated-inputs + `(("gunicorn" ,gunicorn) + ("python-aiosmtpd" ,python-aiosmtpd) + ("python-alembic" ,python-alembic) + ("python-atpublic" ,python-atpublic) + ("python-authheaders" ,python-authheaders) + ("python-authres" ,python-authres) + ("python-click" ,python-click) + ("python-dateutil" ,python-dateutil) + ("python-dnspython" ,python-dnspython) + ("python-falcon" ,python-falcon) + ("python-flufl-bounce" ,python-flufl-bounce) + ("python-flufl-i18n" ,python-flufl-i18n) + ("python-flufl-lock" ,python-flufl-lock) + ("python-importlib-resources" ,python-importlib-resources) + ("python-lazr-config" ,python-lazr-config) + ("python-passlib" ,python-passlib) + ("python-requests" ,python-requests) + ("python-sqlalchemy" ,python-sqlalchemy) + ("python-zope-component" ,python-zope-component) + ("python-zope-configuration" ,python-zope-configuration) + ("python-zope-event" ,python-zope-event) + ("python-zope-interface" ,python-zope-interface))) + (native-inputs + `(("python-nose" ,python-nose))) + (home-page "https://www.list.org") + (synopsis "Mailing list manager") + (description + "GNU Mailman is software for managing email discussion and mailing +lists. Both users and administrators generally perform their actions in a +web interface, although email and command-line interfaces are also provided. +The system features built-in archiving, automatic bounce processing, content +filtering, digest delivery, and more.") + (license license:gpl3+))) + (define-public python-mailmanclient (package (name "python-mailmanclient") -- cgit v1.2.3 From a3bdebefab867fdbc29f4b8a2ca78b24a6f23557 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jul 2020 15:26:23 +0300 Subject: gnu: Add python-mailman-hyperkitty. * gnu/packages/mail.scm (python-mailman-hyperkitty): New variable. --- gnu/packages/mail.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index ba6625749a..aff9c74c28 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2695,6 +2695,46 @@ (define-public python2-django-mailman3 interacting with Mailman.") (license license:gpl3+))) +(define-public python-mailman-hyperkitty + (package + (name "python-mailman-hyperkitty") + (version "1.1.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "mailman-hyperkitty" version)) + (sha256 + (base32 + "1lfqa9admhvdv71f528jmz2wl0i5cv77v6l64px2pm4zqr9ckkjx")) + (patches + (list + (origin + ;; see: https://gitlab.com/mailman/mailman-hyperkitty/issues/17 + ;; fixes test_archive_message_unserializable + (method url-fetch) + (uri "https://salsa.debian.org/mailman-team/mailman-hyperkitty/raw/debian/1.1.0-9/debian/patches/0002-Skip-the-test_archive_message_unserializable.patch") + (sha256 + (base32 + "0p1fwm46c4bl81lvsg3kjhn2r1lwgkpgxamb3xyqn7h9qdrw10hw"))))))) + (build-system python-build-system) + (propagated-inputs + `(("python-requests" ,python-requests) + ("python-zope-interface" ,python-zope-interface))) + (inputs + `(("mailman" ,mailman))) + (native-inputs + `(("python-mock" ,python-mock) + ("python-nose" ,python-nose) + ("python-nose2" ,python-nose2))) + (home-page "https://gitlab.com/mailman/mailman-hyperkitty/") + (synopsis "Mailman archiver plugin for HyperKitty") + (description + "Mailman3 allows emails sent to its mailing lists to be archived by any +software provided that there is a plugin (loadable by Mailman3) designed to +communicate with it properly. This module contains a Mailman3 archiver plugin +which sends emails to HyperKitty, the official Mailman3 web archiver.") + (license license:gpl3+))) + (define-public postorius (package (name "postorius") -- cgit v1.2.3 From 6fe7d216b22b2408806cb851e17ec1083e5068ba Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jul 2020 15:35:13 +0300 Subject: gnu: Add python-hyperkitty. * gnu/packages/mail.scm (python-hyperkitty): New variable. --- gnu/packages/mail.scm | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index aff9c74c28..3022f5c22f 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2735,6 +2735,59 @@ (define-public python-mailman-hyperkitty which sends emails to HyperKitty, the official Mailman3 web archiver.") (license license:gpl3+))) +(define-public python-hyperkitty + (package + (name "python-hyperkitty") + (version "1.3.3") + (source + (origin + (method url-fetch) + (uri (pypi-uri "HyperKitty" version)) + (sha256 + (base32 + "0p85r9q6mn5as5b39xp9hkkipnk0156acx540n2ygk3qb3jd4a5n")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + ;; It is unclear why this test fails. + (substitute* "hyperkitty/tests/commands/test_import.py" + (("def test_bad_content_type_part_two") + "@SkipTest\n def test_bad_content_type_part_two")) + (setenv "PYTHONPATH" (string-append ".:" (getenv "PYTHONPATH"))) + (invoke "example_project/manage.py" "test" + "--settings=hyperkitty.tests.settings_test")))))) + (propagated-inputs + `(("python-dateutil" ,python-dateutil) + ("python-django" ,python-django) + ("python-django-compressor" ,python-django-compressor) + ("python-django-extensions" ,python-django-extensions) + ("python-django-gravatar2" ,python-django-gravatar2) + ("python-django-haystack" ,python-django-haystack) + ("python-django-mailman3" ,python-django-mailman3) + ("python-django-q" ,python-django-q) + ("python-djangorestframework" ,python-djangorestframework) + ("python-flufl-lock" ,python-flufl-lock) + ("python-mailmanclient" ,python-mailmanclient) + ("python-networkx" ,python-networkx) + ("python-pytz" ,python-pytz) + ("python-robot-detection" ,python-robot-detection))) + (native-inputs + `(("python-beautifulsoup4" ,python-beautifulsoup4) + ("python-elasticsearch" ,python-elasticsearch) + ("python-isort" ,python-isort) + ("python-mock" ,python-mock) + ("python-whoosh" ,python-whoosh))) + (home-page "https://gitlab.com/mailman/hyperkitty") + (synopsis "Web interface to access GNU Mailman v3 archives") + (description + "The hyperkitty Django app provides a web user interface to access GNU +Mailman3 archives, and manage it. This interface uses django, and requires +some configuration.") + (license license:gpl3))) ; Some files are gpl2+ + (define-public postorius (package (name "postorius") -- cgit v1.2.3 From faec049c3be41e2ea4a767fde16bf378e2b00780 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jul 2020 15:40:51 +0300 Subject: gnu: postorius: Update to 1.3.3. * gnu/packages/mail.scm (postorius): Update to 1.3.3. [arguments]: Build with python-3. Add custom 'check phase. [inputs]: Replace python2-django, python2-django-mailman3, python2-django-mailmanclient with python- variants. Add python-readme-renderer. [native-inputs]: Add python-beautifulsoup4, python-isort, python-mock, python-vcrpy. --- gnu/packages/mail.scm | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 3022f5c22f..87e8e3f770 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2791,26 +2791,36 @@ (define-public python-hyperkitty (define-public postorius (package (name "postorius") - (version "1.0.3") + (version "1.3.3") (source (origin (method url-fetch) - (uri (pypi-uri "postorius" version "+post2.tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (uri (pypi-uri "postorius" version)) (sha256 (base32 - "1wymcpv2icjjy8h1ni52p6dr7wwxf71ivqgbqhzx4i82yqphcaq5")))) + "08jn23gblbkfl09qlykbpsmp39mmach3sl69h1j5cd5kkx839rwa")))) (build-system python-build-system) (arguments - `(; One test dependency relies on Persona, which was shut down in - ;; November 2016. - #:tests? #f - ;; The part of the frontend of Mailman is still python 2.7. - #:python ,python-2)) + '(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (add-installed-pythonpath inputs outputs) + (if tests? + (invoke "python" "example_project/manage.py" "test" + "--settings=test_settings" "postorius") + #t)))) + #:tests? #f)) ; Tests try to run a mailman instance to test against. (inputs - `(("python2-django" ,python2-django) - ("python2-django-mailman3" ,python2-django-mailman3) - ("python2-mailmanclient" ,python2-mailmanclient))) + `(("python-django" ,python-django) + ("python-django-mailman3" ,python-django-mailman3) + ("python-mailmanclient" ,python-mailmanclient) + ("python-readme-renderer" ,python-readme-renderer))) + (native-inputs + `(("python-beautifulsoup4" ,python-beautifulsoup4) + ("python-isort" ,python-isort) + ("python-mock" ,python-mock) + ("python-vcrpy" ,python-vcrpy))) (home-page "https://gitlab.com/mailman/postorius") (synopsis "Web user interface for GNU Mailman") (description -- cgit v1.2.3 From ff7a6c6d5b542c8a54fb00b55bbd4c663731408a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jul 2020 15:52:00 +0300 Subject: gnu: python-django-mailman3: Fix dangling python2- variant. * gnu/packages/mail.scm (python-django-mailman3)[properties]: Correctly identify the python2- variant. --- gnu/packages/mail.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 87e8e3f770..d4ef3a1f3e 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2652,7 +2652,7 @@ (define-public python-django-mailman3 (description "This package contains libraries and templates for Django-based interfaces interacting with Mailman.") - (properties `((python2-variant . ,(delay python2-django-mailman)))) + (properties `((python2-variant . ,(delay python2-django-mailman3)))) (license license:gpl3+))) ;; This is the last version to support Python-2. -- cgit v1.2.3 From 2313be9041202e3285622a9de9e599afc8e44f29 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jul 2020 16:05:47 +0300 Subject: gnu: python-pifpaf: Enable tests. * gnu/packages/python-xyz.scm (python-pifpaf)[arguments]: Enable tests. Use custom 'check phase. --- gnu/packages/python-xyz.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d509d51f4e..8350e4ed92 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -19902,7 +19902,12 @@ (define-public python-pifpaf "150av2pylsjy8ykrpyi0vzy2q24s9rhh2ya01zvwnvj9j5dspviz")))) (build-system python-build-system) (arguments - `(#:tests? #f)) + '(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "python" "setup.py" "testr" "--slowest" + "--testr-args=until-failure")))))) (propagated-inputs `(("python-click" ,python-click) ("python-daiquiri" ,python-daiquiri) -- cgit v1.2.3 From ad5cb62d4afab2b4a808121fe81c5b8db053d7fe Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 21 Jul 2020 12:28:20 +0200 Subject: doc: Mention the 'savannah' updater. * doc/guix.texi (Invoking guix refresh): Mention 'savannah' updater. --- doc/guix.texi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/guix.texi b/doc/guix.texi index da5a2e2214..8696a9b554 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -10047,6 +10047,8 @@ list of updaters). Currently, @var{updater} may be one of: @table @code @item gnu the updater for GNU packages; +@item savannah +the updater for packages hosted at @uref{https://savannah.gnu.org, Savannah}; @item gnome the updater for GNOME packages; @item kde -- cgit v1.2.3 From fa3d9c4db4407cebf9bdb2e251595bd25193c95e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 21 Jul 2020 12:30:24 +0200 Subject: upstream: 'download-tarball' gracefully handles missing signatures. This avoids a backtrace with "guix refresh -u rdiff-backup", which has ".asc" signatures instead of ".sig". * guix/upstream.scm (download-tarball): Gracefully handle the case where SIG is false. * guix/gnu-maintenance.scm (latest-savannah-release): Add comment about 'file->signature'. --- guix/gnu-maintenance.scm | 3 +++ guix/upstream.scm | 9 ++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm index 2a4d94dbb0..cd7109002b 100644 --- a/guix/gnu-maintenance.scm +++ b/guix/gnu-maintenance.scm @@ -650,6 +650,9 @@ (define (latest-savannah-release package) (directory (dirname (uri-path uri))) (rewrite (url-prefix-rewrite %savannah-base "mirror://savannah"))) + ;; Note: We use the default 'file->signature', which adds ".sig", but not + ;; all projects on Savannah follow that convention: some use ".asc" and + ;; perhaps some lack signatures altogether. (and=> (latest-html-release package #:base-url %savannah-base #:directory directory) diff --git a/guix/upstream.scm b/guix/upstream.scm index 6a57bad710..70cbfb45e8 100644 --- a/guix/upstream.scm +++ b/guix/upstream.scm @@ -326,10 +326,17 @@ (define* (download-tarball store url signature-url (built-derivations (list drv)) (return (derivation->output-path drv)))))))) (let-values (((status data) - (gnupg-verify* sig data #:key-download key-download))) + (if sig + (gnupg-verify* sig data + #:key-download key-download) + (values 'missing-signature data)))) (match status ('valid-signature tarball) + ('missing-signature + (warning (G_ "failed to download detached signature from ~a~%") + signature-url) + #f) ('invalid-signature (warning (G_ "signature verification failed for '~a' (key: ~a)~%") url data) -- cgit v1.2.3 From e5c00059560c6280aff3dac3c9c3a8b5477832ef Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 21 Jul 2020 17:30:23 +0200 Subject: lint: source: Always return a list. Fixes a regression introduced in c10526672e515f07c92dc447bbc592808f67238e. Previously we would return *unspecified* for a package whose source is not an origin. * guix/lint.scm (check-source): Add alternate 'if' branch. --- guix/lint.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/guix/lint.scm b/guix/lint.scm index a550caa237..e7855678ca 100644 --- a/guix/lint.scm +++ b/guix/lint.scm @@ -818,7 +818,8 @@ (define (warnings-for-uris uris) (warnings-for-uris (list (string->uri (git-reference-url (origin-uri origin)))))) (else - '()))))) + '())) + '()))) (define (check-source-file-name package) "Emit a warning if PACKAGE's origin has no meaningful file name." -- cgit v1.2.3 From b3679394ec5a703de957e4344d2e20b7e306cd39 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 21 Jul 2020 18:22:49 +0200 Subject: git-authenticate: Show fingerprint in missing-key error message. * guix/git-authenticate.scm (commit-signing-key): In the 'missing-key' case, add call to 'openpgp-format-fingerprint'. --- guix/git-authenticate.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/git-authenticate.scm b/guix/git-authenticate.scm index 99fd9c3594..6cfc7fabe1 100644 --- a/guix/git-authenticate.scm +++ b/guix/git-authenticate.scm @@ -146,7 +146,7 @@ (define* (commit-signing-key repo commit-id keyring (message (format #f (G_ "could not authenticate \ commit ~a: key ~a is missing") (oid->string commit-id) - data)))))) + (openpgp-format-fingerprint data))))))) ('good-signature data))))))) (define (read-authorizations port) -- cgit v1.2.3 From 85fcceeea146b2e2e84a063f042893a0c39e9e5f Mon Sep 17 00:00:00 2001 From: Mike Rosset Date: Mon, 20 Jul 2020 12:06:12 -0700 Subject: gnu: g-golf: Update to git revision 804. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/guile-xyz.scm (g-golf): Update to git revision 804. [inputs]: Add xorg-server input for test phase.. [arguments]: start-xorg-server phase now starts Xvfg before check phase. Signed-off-by: Ludovic Courtès --- gnu/packages/guile-xyz.scm | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 59266a045b..cf73c6b944 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1725,10 +1725,10 @@ (define-public guile-sly (license license:gpl3+))) (define-public g-golf - (let ((commit "4a4edf25e4877df9182c77843bdd98ab59e13ef7")) + (let ((commit "5d2903afb4b6b65c22f587835d8fdff91916e5ee")) (package (name "g-golf") - (version (git-version "1" "683" commit)) + (version (git-version "1" "804" commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1737,7 +1737,7 @@ (define-public g-golf (file-name (git-file-name name version)) (sha256 (base32 - "09p0gf71wbmlm9kri693a8fvr9hl3hhlmlidyadwjdh7853xg0h8")))) + "1xkb6a5d3i9s8lpb5cf06bd64p5srqnnhn5l0b2f5csbvyz8hmmh")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) @@ -1745,10 +1745,11 @@ (define-public g-golf ("texinfo" ,texinfo) ("gettext" ,gettext-minimal) ("libtool" ,libtool) - ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ("xorg-server" ,xorg-server))) (inputs `(("guile" ,guile-2.2) - ("guile-lib" ,guile-lib) + ("guile-lib" ,guile2.2-lib) ("clutter" ,clutter) ("gtk" ,gtk+) ("glib" ,glib))) @@ -1791,7 +1792,14 @@ (define-public g-golf (assoc-ref outputs "out")))))))) (setenv "GUILE_AUTO_COMPILE" "0") (setenv "GUILE_GGOLF_UNINSTALLED" "1") - #t)))))) + #t))) + (add-before 'check 'start-xorg-server + (lambda* (#:key inputs #:allow-other-keys) + ;; The test suite requires a running X server. + (system (format #f "~a/bin/Xvfb :1 &" + (assoc-ref inputs "xorg-server"))) + (setenv "DISPLAY" ":1") + #t))))) (home-page "https://www.gnu.org/software/g-golf/") (synopsis "Guile bindings for GObject Introspection") (description -- cgit v1.2.3 From 0c50cad2381e6b3c4189b9ff56ff3df63b289dc7 Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Thu, 16 Jul 2020 14:25:30 +0200 Subject: gnu: Add python-mamba. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-mamba): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 8350e4ed92..5969384358 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14538,6 +14538,28 @@ (define-public python-configparser (define-public python2-configparser (package-with-python2 python-configparser)) +(define-public python-mamba + (package + (name "python-mamba") + (version "0.11.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "mamba" version)) + (sha256 + (base32 + "0bpbgz9v63rpanjjpc8bnvrr8fkms5rzylh77xrcki1x6az7gnsz")))) + (build-system python-build-system) + (arguments `(#:tests? #f)) ; No test + (propagated-inputs + `(("python-clint" ,python-clint) + ("python-coverage" ,python-coverage))) + (home-page "https://nestorsalceda.com/mamba/") + (synopsis "Test runner for Python") + (description + "Mamba is a Behaviour-Driven Development tool for Python developers. +Is heavily influenced from RSpec, Mocha, Jasmine or Ginkgo.") + (license license:expat))) + (define-public python-mando (package (name "python-mando") -- cgit v1.2.3 From 0a93e8ce328c2dc43eaeddd1033ef67d456bc4df Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Thu, 16 Jul 2020 16:01:04 +0200 Subject: gnu: Add python-isbnlib. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-isbnlib): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 5969384358..07a52a0e5c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14455,6 +14455,27 @@ (define-public python2-astroid ,@(alist-delete "python-typed-ast" (package-propagated-inputs base))))))) +(define-public python-isbnlib + (package + (name "python-isbnlib") + (version "3.10.3") + (source + (origin + (method url-fetch) + (uri (pypi-uri "isbnlib" version)) + (sha256 + (base32 + "07qhykv0x60d5rsx5pj6s4q15ri4znczscll3xmpf6gyclac1592")))) + (build-system python-build-system) + (arguments '(#:tests? #f)) ; No test + (home-page "https://github.com/xlcnd/isbnlib") + (synopsis "Python library to work with ISBN strings") + (description "@code{python-isbnlib} is a (pure) python library that provides +several useful methods and functions to validate, clean, transform, hyphenate and +get metadata for ISBN strings. Its origin was as the core of isbntools. This short +version, is suitable to be include as a dependency in other projects.") + (license license:lgpl3+))) + (define-public python-isort (package (name "python-isort") -- cgit v1.2.3 From 1a1369dc3d0ba3e23f1f23581a0d1aac89e0db48 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 21 Jul 2020 13:09:56 -0400 Subject: gnu: Add emacs-qml-mode. * gnu/packages/emacs-xyz.scm (emacs-qml-mode): New variable. --- gnu/packages/emacs-xyz.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 10619efef0..5b68eb548c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7105,6 +7105,29 @@ (define-public emacs-counsel-projectile commands and replacements for existing functions.") (license license:gpl3+))) +(define-public emacs-qml-mode + (package + (name "emacs-qml-mode") + (version "0.4") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/coldnew/qml-mode") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1sncsvzjfgmhp4m8w5jd4y51k24n2jfpgvrkd64wlhhzbj3wb947")))) + (build-system emacs-build-system) + (home-page "https://github.com/coldnew/qml-mode/") + (synopsis "Qt Modeling Language (QML) mode for Emacs") + (description "This package provides the @code{qml-mode} major Emacs mode +for editing source files written in the Qt Modeling Language (QML) user +interface markup language. It provides syntax highlighting and basic +navigation commands. @code{qml-mode} is derived from code{js-mode}, the Emacs +builtin JavaScript mode.") + (license license:gpl2+))) + (define-public emacs-queue (package (name "emacs-queue") -- cgit v1.2.3 From d4b02a6fba7c364ab7c8d257cf9a32134e71ce3e Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Tue, 21 Jul 2020 12:51:04 -0500 Subject: gnu: emacs-telega: Patch to use telega-server from Guix. * gnu/packages/patches/emacs-telega-patch-server-functions.patch: New file. * gnu/local.mk (dist_patch_DATA): Reference new patch. * gnu/packages/emacs-xyz.scm (emacs-telega)[source]: Use new patch, bump revision. --- gnu/local.mk | 1 + gnu/packages/emacs-xyz.scm | 6 +++-- .../emacs-telega-patch-server-functions.patch | 31 ++++++++++++++++++++++ 3 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/emacs-telega-patch-server-functions.patch diff --git a/gnu/local.mk b/gnu/local.mk index 7bae1daf61..8ba36acf57 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -916,6 +916,7 @@ dist_patch_DATA = \ %D%/packages/patches/emacs-libgit-use-system-libgit2.patch \ %D%/packages/patches/emacs-scheme-complete-scheme-r5rs-info.patch \ %D%/packages/patches/emacs-source-date-epoch.patch \ + %D%/packages/patches/emacs-telega-patch-server-functions.patch \ %D%/packages/patches/emacs-telega-test-env.patch \ %D%/packages/patches/emacs-undohist-ignored.patch \ %D%/packages/patches/emacs-wordnut-require-adaptive-wrap.patch \ diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 5b68eb548c..94772c3f4c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -22266,7 +22266,7 @@ (define-public emacs-telega ;; Get the current version from `telega-version` in telega.el. ;; or by running M-x telega-version. (let ((commit "5c39c3a81e48222911db75ae30e5a8f8fa34efb5") - (revision "1") + (revision "2") (version "0.6.27")) (package (name "emacs-telega") @@ -22280,7 +22280,9 @@ (define-public emacs-telega (sha256 (base32 "0wyycgsb1ja73phs9a2dgi50m2p6sdvx3xdwclfyijx4hzwlv233")) - (patches (search-patches "emacs-telega-test-env.patch")) + (patches (search-patches + "emacs-telega-patch-server-functions.patch" + "emacs-telega-test-env.patch")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments diff --git a/gnu/packages/patches/emacs-telega-patch-server-functions.patch b/gnu/packages/patches/emacs-telega-patch-server-functions.patch new file mode 100644 index 0000000000..e3d49278d0 --- /dev/null +++ b/gnu/packages/patches/emacs-telega-patch-server-functions.patch @@ -0,0 +1,31 @@ +Remove interactive build for telega-server, as it fails on Guix. +Modify the `telega-server--find-bin' function to only use the version +of telega-server installed by Guix. + +Created by Brett Gilio + +--- a/telega-server.el ++++ b/telega-server.el +@@ -113,7 +113,6 @@ If already deferring, then just executes the BODY." + If BUILD-FLAGS is specified, then rebuild server without any + queries using this flags for building, could be empty string. + Otherwise query user about building flags." +- (interactive) + (telega-test-env 'quiet) + (when (or build-flags + (y-or-n-p "Build `telega-server'? ")) +@@ -137,11 +136,8 @@ Otherwise query user about building flags." + (defun telega-server--find-bin () + "Find telega-server executable. + Raise error if not found." +- (let ((exec-path (cons telega-directory exec-path))) +- (or (executable-find "telega-server") +- (progn (telega-server-build) +- (executable-find "telega-server")) +- (error "`telega-server' not found in exec-path")))) ++ (or (executable-find "telega-server") ++ (error "`telega-server' not found in exec-path"))) + + (defun telega-server-version () + "Return telega-server version." + -- cgit v1.2.3 From d2e0b16c48a7f7b5ba0501c1988988a962fe147c Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Tue, 21 Jul 2020 16:41:48 -0500 Subject: gnu: emacs-telega: Temporarily disable VOIP to work around issue. * gnu/packages/emacs-xyz.scm (emacs-telega). [source]: Bump to revision 3. [arguments]: Temporarily disable VOIP functionality as it does not currently work or link appropriately, causing issues on "foreign" distros. An issue has been opened upstream. https://github.com/zevlg/telega.el/issues/191 [native-inputs]: Remove libtgvoip. --- gnu/packages/emacs-xyz.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 94772c3f4c..d997360c8c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -22266,7 +22266,7 @@ (define-public emacs-telega ;; Get the current version from `telega-version` in telega.el. ;; or by running M-x telega-version. (let ((commit "5c39c3a81e48222911db75ae30e5a8f8fa34efb5") - (revision "2") + (revision "3") (version "0.6.27")) (package (name "emacs-telega") @@ -22294,7 +22294,13 @@ (define-public emacs-telega (guix build emacs-build-system) (guix build emacs-utils)) #:test-target "test" - #:make-flags (list "WITH_VOIP=t") + ;; TODO: Currently tgVOIP is not functional, thus we have disabled it + ;; temporarily. This functionality when enabled causes an erroneous + ;; linkage with libtgvoip.so and libopus.so (FFMPEG) against the + ;; system libraries on "foreign" distros. When tgVOIP becomes functional + ;; this needs to be investigated to prevent a linkage issue. + ;; Re-add libtgvoip to native-inputs at that time. + ;; #:make-flags (list "WITH_VOIP=t") #:phases (modify-phases %standard-phases (add-after 'unpack 'prefix-patch @@ -22398,7 +22404,6 @@ (define-public emacs-telega ("libwebp" ,libwebp))) ; sticker support. (native-inputs `(("tdlib" ,tdlib) - ("libtgvoip" ,libtgvoip) ; VoIP support. ;; Use Emacs with wide ints on 32-bit architectures. ("emacs" ,(match (%current-system) ((or "i686-linux" "armhf-linux") -- cgit v1.2.3 From 81678e5ef7be53d7e444abeeaaad71e8928d45fe Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Jul 2020 15:20:38 +0200 Subject: gnu: bubblewrap: Build with Python 3. * gnu/packages/virtualization.scm (bubblewrap)[native-inputs]: Change from PYTHON-2 to PYTHON-WRAPPER. --- gnu/packages/virtualization.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 7352e37786..d0223bce3d 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1714,7 +1714,7 @@ (define-public bubblewrap (inputs `(("libcap" ,libcap))) (native-inputs - `(("python-2" ,python-2) + `(("python" ,python-wrapper) ("util-linux" ,util-linux))) (home-page "https://github.com/containers/bubblewrap") (synopsis "Unprivileged sandboxing tool") -- cgit v1.2.3 From debcb84ad1c71081209bb504e81d9e6aae38de05 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Jul 2020 21:36:50 +0200 Subject: gnu: xorg-server: Update to 1.20.8. * gnu/packages/xorg.scm (xorg-server): Update to 1.20.8. (xorg-server-for-tests): Stay on 1.20.7. --- gnu/packages/xorg.scm | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 66d78ca322..f6c3eabc6d 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5326,16 +5326,15 @@ (define-public libxcb (define-public xorg-server (package (name "xorg-server") - (version "1.20.7") + (version "1.20.8") (source (origin (method url-fetch) - (uri (string-append - "mirror://xorg/individual/xserver/" - "xorg-server-" version ".tar.bz2")) + (uri (string-append "mirror://xorg/individual/xserver/" + "xorg-server-" version ".tar.bz2")) (sha256 (base32 - "18bfl04ihw1jr3h0fs522nnxxq5ixjay77y9dcymnkzk23q8cndx")) + "0ih15m7gh1z1ly6z7g82bkni719yisqmbk61a1wgp82bxrmn8yyi")) (patches (list ;; See: @@ -5454,10 +5453,19 @@ (define-public xorg-server ;; This package is intended to be used when building GTK+. ;; Note: It's currently marked as "hidden" to avoid having two non-eq? ;; packages with the same name and version. +;; TODO: Update this in the next rebuild cycle. (define-public xorg-server-for-tests (hidden-package (package - (inherit xorg-server)))) + (inherit xorg-server) + (version "1.20.7") + (source (origin + (inherit (package-source xorg-server)) + (uri (string-append "mirror://xorg/individual/xserver/" + "xorg-server-" version ".tar.bz2")) + (sha256 + (base32 + "18bfl04ihw1jr3h0fs522nnxxq5ixjay77y9dcymnkzk23q8cndx"))))))) (define-public xorg-server-xwayland (package -- cgit v1.2.3 From 94d8924728a736070dbfa1ed3c8aec4bf95eca6c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Jul 2020 21:48:04 +0200 Subject: gnu: OpenSC: Update to 0.20.0 [security fixes]. This fixes CVE-2019-6502, CVE-2019-15946, CVE-2019-15945, CVE-2019-19480, CVE-2019-19481, and CVE-2019-19479. * gnu/packages/security-token.scm (opensc): Update to 0.20.0. --- gnu/packages/security-token.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index a2054ce3e7..da8a58e7ad 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -257,7 +257,7 @@ (define-public ykclient (define-public opensc (package (name "opensc") - (version "0.19.0") + (version "0.20.0") (source (origin (method url-fetch) (uri (string-append @@ -265,7 +265,7 @@ (define-public opensc version "/opensc-" version ".tar.gz")) (sha256 (base32 - "09jqzl18z5qfrf4vf2nvbpdm3mphpgfkl3ww1clkaxh2z56hwnic")))) + "0qs8pabkrpj1z52bkdsk59s2z6q5m0hfh9d5j1f68qs4lksb9x5v")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 938f3190e786baab4116ea826bde21d102396cc2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Jul 2020 22:13:30 +0200 Subject: services: ganeti: Fix erroneous gexp. * gnu/services/ganeti.scm (ganeti-watcher-command): Add missing parens. --- gnu/services/ganeti.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/services/ganeti.scm b/gnu/services/ganeti.scm index f7d1aeb8da..8d30472371 100644 --- a/gnu/services/ganeti.scm +++ b/gnu/services/ganeti.scm @@ -660,7 +660,7 @@ (define ganeti-watcher-command #~(lambda () (system* #$(file-append ganeti "/sbin/ganeti-watcher") #$@(if rapi-ip - #~(string-append "--rapi-ip=" #$rapi-ip) + #~((string-append "--rapi-ip=" #$rapi-ip)) #~()) #$(string-append "--job-age=" (number->string job-age)) #$@(if verify-disks? -- cgit v1.2.3 From 2195ad6bd7df591c1f24b5717203b363bc3e1bfd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Jul 2020 22:18:50 +0200 Subject: gnu: libvnc: Update to 0.9.13. * gnu/packages/patches/libvnc-CVE-2018-20750.patch, gnu/packages/patches/libvnc-CVE-2019-15681.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/vnc.scm (libvnc): Update to 0.9.13. [source](patches): Remove. [arguments]: Add phase to patch 'cc' invocation. --- gnu/local.mk | 2 -- gnu/packages/patches/libvnc-CVE-2018-20750.patch | 44 ------------------------ gnu/packages/patches/libvnc-CVE-2019-15681.patch | 23 ------------- gnu/packages/vnc.scm | 15 +++++--- 4 files changed, 11 insertions(+), 73 deletions(-) delete mode 100644 gnu/packages/patches/libvnc-CVE-2018-20750.patch delete mode 100644 gnu/packages/patches/libvnc-CVE-2019-15681.patch diff --git a/gnu/local.mk b/gnu/local.mk index 8ba36acf57..570e6a3b49 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1241,8 +1241,6 @@ dist_patch_DATA = \ %D%/packages/patches/libutils-add-includes.patch \ %D%/packages/patches/libutils-remove-damaging-includes.patch \ %D%/packages/patches/libvdpau-va-gl-unbundle.patch \ - %D%/packages/patches/libvnc-CVE-2018-20750.patch \ - %D%/packages/patches/libvnc-CVE-2019-15681.patch \ %D%/packages/patches/libvpx-CVE-2016-2818.patch \ %D%/packages/patches/libxslt-generated-ids.patch \ %D%/packages/patches/libxt-guix-search-paths.patch \ diff --git a/gnu/packages/patches/libvnc-CVE-2018-20750.patch b/gnu/packages/patches/libvnc-CVE-2018-20750.patch deleted file mode 100644 index 146243670a..0000000000 --- a/gnu/packages/patches/libvnc-CVE-2018-20750.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 09e8fc02f59f16e2583b34fe1a270c238bd9ffec Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Mon, 7 Jan 2019 10:40:01 +0100 -Subject: [PATCH] Limit lenght to INT_MAX bytes in - rfbProcessFileTransferReadBuffer() - -This ammends 15bb719c03cc70f14c36a843dcb16ed69b405707 fix for a heap -out-of-bound write access in rfbProcessFileTransferReadBuffer() when -reading a transfered file content in a server. The former fix did not -work on platforms with a 32-bit int type (expected by rfbReadExact()). - -CVE-2018-15127 - - ---- - libvncserver/rfbserver.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/libvncserver/rfbserver.c b/libvncserver/rfbserver.c -index 7af84906..f2edbeea 100644 ---- a/libvncserver/rfbserver.c -+++ b/libvncserver/rfbserver.c -@@ -88,6 +88,8 @@ - #include - /* strftime() */ - #include -+/* INT_MAX */ -+#include - - #ifdef LIBVNCSERVER_WITH_WEBSOCKETS - #include "rfbssl.h" -@@ -1472,8 +1474,11 @@ char *rfbProcessFileTransferReadBuffer(rfbClientPtr cl, uint32_t length) - 0XFFFFFFFF, i.e. SIZE_MAX for 32-bit systems. On 64-bit systems, a length of 0XFFFFFFFF - will safely be allocated since this check will never trigger and malloc() can digest length+1 - without problems as length is a uint32_t. -+ We also later pass length to rfbReadExact() that expects a signed int type and -+ that might wrap on platforms with a 32-bit int type if length is bigger -+ than 0X7FFFFFFF. - */ -- if(length == SIZE_MAX) { -+ if(length == SIZE_MAX || length > INT_MAX) { - rfbErr("rfbProcessFileTransferReadBuffer: too big file transfer length requested: %u", (unsigned int)length); - rfbCloseClient(cl); - return NULL; diff --git a/gnu/packages/patches/libvnc-CVE-2019-15681.patch b/gnu/packages/patches/libvnc-CVE-2019-15681.patch deleted file mode 100644 index e328d87920..0000000000 --- a/gnu/packages/patches/libvnc-CVE-2019-15681.patch +++ /dev/null @@ -1,23 +0,0 @@ -From d01e1bb4246323ba6fcee3b82ef1faa9b1dac82a Mon Sep 17 00:00:00 2001 -From: Christian Beier -Date: Mon, 19 Aug 2019 22:32:25 +0200 -Subject: [PATCH] rfbserver: don't leak stack memory to the remote - -Thanks go to Pavel Cheremushkin of Kaspersky for reporting. ---- - libvncserver/rfbserver.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/libvncserver/rfbserver.c b/libvncserver/rfbserver.c -index 3bacc891..310e5487 100644 ---- a/libvncserver/rfbserver.c -+++ b/libvncserver/rfbserver.c -@@ -3724,6 +3724,8 @@ rfbSendServerCutText(rfbScreenInfoPtr rfbScreen,char *str, int len) - rfbServerCutTextMsg sct; - rfbClientIteratorPtr iterator; - -+ memset((char *)&sct, 0, sizeof(sct)); -+ - iterator = rfbGetClientIterator(rfbScreen); - while ((cl = rfbClientIteratorNext(iterator)) != NULL) { - sct.type = rfbServerCutText; diff --git a/gnu/packages/vnc.scm b/gnu/packages/vnc.scm index a084b30f59..ab89bad7aa 100644 --- a/gnu/packages/vnc.scm +++ b/gnu/packages/vnc.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2019 Todor Kondić ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020 Hartmut Goebel +;;; Copyright © 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -233,7 +234,7 @@ (define-public tigervnc-server (define-public libvnc (package (name "libvnc") - (version "0.9.12") + (version "0.9.13") (source (origin (method git-fetch) @@ -242,10 +243,16 @@ (define-public libvnc (commit (string-append "LibVNCServer-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1226hb179l914919f5nm2mlf8rhaarqbf48aa649p4rwmghyx9vm")) - (patches (search-patches "libvnc-CVE-2018-20750.patch" - "libvnc-CVE-2019-15681.patch")))) + (base32 "0zz0hslw8b1p3crnfy3xnmrljik359h83dpk64s697dqdcrzy141")))) (build-system cmake-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-cc-reference + (lambda _ + (substitute* "test/includetest.sh" + (("^cc -I") + "gcc -I")) + #t))))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs -- cgit v1.2.3 From cd9e977af282e7f9cb56d49d864a2cc6c3dacff3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Jul 2020 22:24:56 +0200 Subject: gnu: twm: Update to 1.0.11. * gnu/packages/xorg.scm (twm): Update to 1.0.11. [source](uri): Switch to '.xz' tarball. --- gnu/packages/xorg.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index f6c3eabc6d..e1a877703f 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5647,17 +5647,15 @@ (define-public libxaw (define-public twm (package (name "twm") - (version "1.0.10") + (version "1.0.11") (source (origin (method url-fetch) - (uri (string-append - "mirror://xorg/individual/app/" name "-" - version - ".tar.bz2")) + (uri (string-append "mirror://xorg/individual/app/twm-" + version ".tar.xz")) (sha256 (base32 - "1ms5cj1w3g26zg6bxdv1j9hl0pxr4300qnv003cz1q3cl7ffljb4")))) + "1iv8kdb18n9vk3is5fyh6l40ipq9mkgx8ppj86byf464vr1ais7l")))) (build-system gnu-build-system) (inputs `(("libxt" ,libxt) -- cgit v1.2.3 From 737e9d5665573c7407deb61e81a5d6c5d314815e Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Sat, 9 May 2020 00:12:18 +0200 Subject: gnu: nsd: Update to 4.3.1. * gnu/packages/dns.scm (nsd): Update to 4.3.1. Signed-off-by: Marius Bakke --- gnu/packages/dns.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index a36ac0184f..6f328d0c4e 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -335,14 +335,14 @@ (define-public libasr (define-public nsd (package (name "nsd") - (version "4.2.4") + (version "4.3.1") (source (origin (method url-fetch) (uri (string-append "https://www.nlnetlabs.nl/downloads/nsd/nsd-" version ".tar.gz")) (sha256 - (base32 "0z7j3vwqqj0hh8n5irb2yqwzl45k4sn2wczbq1b1lqv5cxv6vgcy")))) + (base32 "11w9kl99fs888f3zwx2j92i8lcp78vq91jac8s317a2icv74mczl")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From f3130c6674bb3941be6001bdcbca9f33bb2677e8 Mon Sep 17 00:00:00 2001 From: "B. Wilson" Date: Thu, 28 May 2020 07:32:28 +0900 Subject: gnu: Add intel-xed. * gnu/packages/assembly.scm (intel-xed): New variable. * gnu/packages/patches/intel-xed-fix-nondeterminism.patch: New file. * gnu/local.mk (dist_patch_DATA): Add reference to new patch. Signed-off-by: Marius Bakke --- gnu/local.mk | 1 + gnu/packages/assembly.scm | 94 +++++++++++++++++ .../patches/intel-xed-fix-nondeterminism.patch | 113 +++++++++++++++++++++ 3 files changed, 208 insertions(+) create mode 100644 gnu/packages/patches/intel-xed-fix-nondeterminism.patch diff --git a/gnu/local.mk b/gnu/local.mk index 570e6a3b49..d6de376e8e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1134,6 +1134,7 @@ dist_patch_DATA = \ %D%/packages/patches/ilmbase-fix-tests.patch \ %D%/packages/patches/inetutils-hurd.patch \ %D%/packages/patches/inkscape-poppler-0.76.patch \ + %D%/packages/patches/intel-xed-fix-nondeterminism.patch \ %D%/packages/patches/intltool-perl-compatibility.patch \ %D%/packages/patches/iputils-libcap-compat.patch \ %D%/packages/patches/irrlicht-use-system-libs.patch \ diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm index 50b64a7f65..cd02541514 100644 --- a/gnu/packages/assembly.scm +++ b/gnu/packages/assembly.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2019 Andy Tai ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2020 Christopher Lemmer Webber +;;; Copyright © 2020 B. Wilson ;;; ;;; This file is part of GNU Guix. ;;; @@ -47,6 +48,7 @@ (define-module (gnu packages assembly) #:use-module (gnu packages texinfo) #:use-module (gnu packages python) #:use-module (gnu packages sphinx) + #:use-module (gnu packages shells) #:use-module (gnu packages xml) #:use-module ((guix utils) #:select (%current-system))) @@ -405,3 +407,95 @@ (define-public armips instruction set, as well as complete support for the ARM7 and ARM9 instruction sets, both THUMB and ARM mode.") (license license:expat))) + +(define-public intel-xed + (package + (name "intel-xed") + (version "11.2.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/intelxed/xed") + (commit version))) + (sha256 (base32 "1jffayski2gpd54vaska7fmiwnnia8v3cka4nfyzjgl8xsky9v2s")) + (file-name (git-file-name name version)) + (patches (search-patches "intel-xed-fix-nondeterminism.patch")))) + (build-system gnu-build-system) + (native-inputs + `(("python-wrapper" ,python-wrapper) + ("tcsh" ,tcsh) + ;; As of the time of writing this comment, mbuild does not exist in the + ;; Python Package Index and seems to only be used by intel-xed, so we + ;; opt to include it here instead of packaging separately. Note also + ;; that the git repository contains no version tags, so we directly + ;; reference the "version" variable from setup.py instead. + ("mbuild" + ,(let ((name "mbuild") + (version "0.2496")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/intelxed/mbuild.git") + (commit "5304b94361fccd830c0e2417535a866b79c1c297"))) + (sha256 + (base32 + "0r3avc3035aklqxcnc14rlmmwpj3jp09vbcbwynhvvmcp8srl7dl")) + (file-name (git-file-name name version))))))) + (outputs '("out" "lib")) + (arguments + `(#:phases + ;; Upstream uses the custom Python build tool `mbuild', so we munge + ;; gnu-build-system to fit. The build process for this package is + ;; documented at https://intelxed.github.io/build-manual/. + (let* ((build-dir "build") + (kit-dir "kit")) + (modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda* (#:key inputs #:allow-other-keys) + (let ((mbuild (assoc-ref inputs "mbuild"))) + (setenv "PYTHONPATH" (string-append + (getenv "PYTHONPATH") ":" mbuild)) + (invoke "./mfile.py" + (string-append "--build-dir=" build-dir) + (string-append "--install-dir=" kit-dir) + "examples" + "doc" + "install")))) + (replace 'check + (lambda _ + ;; Skip broken test group `tests/tests-avx512pf'. + (invoke "tests/run-cmd.py" + (string-append "--build-dir=" kit-dir "/bin") + "--tests" "tests/tests-base" + "--tests" "tests/tests-avx512" + "--tests" "tests/tests-cet" + "--tests" "tests/tests-via" + "--tests" "tests/tests-syntax" + "--tests" "tests/tests-xop"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (lib (assoc-ref outputs "lib"))) + (copy-recursively (string-append kit-dir "/bin") + (string-append out "/bin")) + (copy-recursively (string-append kit-dir "/include") + (string-append lib "/include")) + (copy-recursively (string-append kit-dir "/lib") + (string-append lib "/lib")) + #t))))))) + (home-page "https://intelxed.github.io/") + (synopsis "Encoder and decoder for x86 (IA32 and Intel64) instructions") + (description "The Intel X86 Encoder Decoder (XED) is a software library and +for encoding and decoding X86 (IA32 and Intel64) instructions. The decoder +takes sequences of 1-15 bytes along with machine mode information and produces +a data structure describing the opcode, operands, and flags. The encoder takes +a similar data structure and produces a sequence of 1 to 15 bytes. Disassembly +is essentially a printing pass on the data structure. + +The library and development files are under the @code{lib} output, with a +family of command line utility wrappers in the default output. Each of the cli +tools is named like @code{xed*}. Documentation for the cli tools is sparse, so +this is a case where ``the code is the documentation.''") + (license license:asl2.0))) diff --git a/gnu/packages/patches/intel-xed-fix-nondeterminism.patch b/gnu/packages/patches/intel-xed-fix-nondeterminism.patch new file mode 100644 index 0000000000..c81bd0edde --- /dev/null +++ b/gnu/packages/patches/intel-xed-fix-nondeterminism.patch @@ -0,0 +1,113 @@ +This patch removes sources of build non-determinism in the upstream sources. + +In particular, many of the compiled sources are generated with Python code, +which in turn uses dictionaries to index the output C functions. However, +iterators over Python dictionaries have no guaranteed order, thus resulting in +the C functions being output in a random order between builds. + +The patch below fixes this by forcing an order during output in several key +places. Note, however, that future updates may uncover new such places that +just happen to be non-problematic at the time of this patch. If you are +reading this due to finding such issues, feel free to contact me at +elaexuotee@wilsonb.com for help. + +diff --git a/pysrc/ild_codegen.py b/pysrc/ild_codegen.py +index 628ec45..a9bff79 100755 +--- a/pysrc/ild_codegen.py ++++ b/pysrc/ild_codegen.py +@@ -188,14 +188,14 @@ def gen_l2_func_list(agi, target_nt_dict, arg_nt_dict, + ild_t_member): + """generate L2 functions""" + l2_func_list = [] +- for (nt_name,array) in target_nt_dict.items(): ++ for (nt_name,array) in sorted(target_nt_dict.items()): + target_opname = array.get_target_opname() + if array.is_const_lookup_fun(): + fo = gen_const_l2_function(agi, nt_name, + target_opname, ild_t_member) + l2_func_list.append(fo) + else: +- for arg_nt_seq,arg_arr in arg_nt_dict.items(): ++ for arg_nt_seq,arg_arr in sorted(arg_nt_dict.items()): + fo = gen_scalable_l2_function(agi, nt_name, + target_opname, ild_t_member, arg_arr, list(arg_nt_seq)) + l2_func_list.append(fo) +diff --git a/pysrc/ild_disp.py b/pysrc/ild_disp.py +index 942c036..cf80e29 100755 +--- a/pysrc/ild_disp.py ++++ b/pysrc/ild_disp.py +@@ -350,7 +350,8 @@ def work(agi, united_lookup, disp_nts, brdisp_nts, ild_gendir, + disp_dict = _gen_l3_array_dict(agi, disp_nts, _disp_token) + + +- nt_arr_list = list(brdisp_dict.values()) + list(disp_dict.values()) ++ nt_arr_list = ([v for (k,v) in sorted(brdisp_dict.items())] + ++ [v for (k,v) in sorted(disp_dict.items())]) + #create function that calls all initialization functions + init_f = ild_nt.gen_init_function(nt_arr_list, 'xed_ild_disp_l3_init') + +@@ -367,7 +368,7 @@ def work(agi, united_lookup, disp_nts, brdisp_nts, ild_gendir, + l2_functions = [] + eosz_op = ild_eosz.get_target_opname() + easz_op = ild_easz.get_target_opname() +- for nt_name,array in list(disp_dict.items()) + list(brdisp_dict.items()): ++ for nt_name,array in sorted(disp_dict.items()) + sorted(brdisp_dict.items()): + #Some DISP NTs depend on EOSZ, others on EASZ, we need to know + #that when we generate L2 functions + if eosz_op in array.get_arg_names(): +diff --git a/pysrc/ild_easz.py b/pysrc/ild_easz.py +index 02cd691..c53b9f2 100755 +--- a/pysrc/ild_easz.py ++++ b/pysrc/ild_easz.py +@@ -165,9 +165,10 @@ def work(agi, united_lookup, easz_nts, ild_gendir, debug): + return + nt_seq_arrays[tuple(nt_seq)] = array + #init function calls all single init functions for the created tables +- init_f = ild_nt.gen_init_function(list(nt_seq_arrays.values()), ++ nt_seq_values = [v for (k,v) in sorted(nt_seq_arrays.items())] ++ init_f = ild_nt.gen_init_function(nt_seq_values, + 'xed_ild_easz_init') +- ild_nt.dump_lu_arrays(agi, list(nt_seq_arrays.values()), _easz_c_fn, ++ ild_nt.dump_lu_arrays(agi, nt_seq_values, _easz_c_fn, + mbuild.join('include-private', _easz_header_fn), + init_f) + getter_fos = [] +diff --git a/pysrc/ild_eosz.py b/pysrc/ild_eosz.py +index 6643bc3..89d2d89 100755 +--- a/pysrc/ild_eosz.py ++++ b/pysrc/ild_eosz.py +@@ -200,10 +200,11 @@ def work(agi, united_lookup, eosz_nts, ild_gendir, debug): + return None + nt_seq_arrays[tuple(nt_seq)] = array + #init function calls all single init functions for the created tables +- init_f = ild_nt.gen_init_function(list(nt_seq_arrays.values()), ++ nt_seq_values = [v for (k,v) in sorted(nt_seq_arrays.items())] ++ init_f = ild_nt.gen_init_function(nt_seq_values, + 'xed_ild_eosz_init') + #dump init and lookup functions for EOSZ sequences +- ild_nt.dump_lu_arrays(agi, list(nt_seq_arrays.values()), _eosz_c_fn, ++ ild_nt.dump_lu_arrays(agi, nt_seq_values, _eosz_c_fn, + mbuild.join('include-private', _eosz_header_fn), + init_f) + #generate EOSZ getter functions - they get xed_decoded_inst_t* +diff --git a/pysrc/ild_imm.py b/pysrc/ild_imm.py +index 51c413c..0530bae 100755 +--- a/pysrc/ild_imm.py ++++ b/pysrc/ild_imm.py +@@ -322,12 +322,14 @@ def work(agi, united_lookup, imm_nts, ild_gendir, eosz_dict, + level='l3') + nt_dict[nt_name] = array + ++ nt_dict_values = [v for (k,v) in sorted(nt_dict.items())] ++ + #create function that calls all initialization functions for L3 +- init_f = ild_nt.gen_init_function(list(nt_dict.values()), ++ init_f = ild_nt.gen_init_function(nt_dict_values, + 'xed_ild_imm_l3_init') + + #dump L3 functions +- ild_nt.dump_lu_arrays(agi, list(nt_dict.values()), _l3_c_fn, ++ ild_nt.dump_lu_arrays(agi, nt_dict_values, _l3_c_fn, + mbuild.join('include-private',_l3_header_fn), + init_f) + -- cgit v1.2.3 From 569959dd6688d6556ae8d0c569ec45cffb5461d5 Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Wed, 8 Jul 2020 20:39:38 +0100 Subject: gnu: Add remid-lv2. * gnu/packages/music.scm (remid-lv2): New variable. Signed-off-by: Marius Bakke --- gnu/packages/music.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index c3bf54d0c7..fcdacb66be 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -5457,6 +5457,42 @@ (define-public zlfo (home-page "https://git.zrythm.org/cgit/ZLFO/") (license license:agpl3+))) +(define-public remid-lv2 + (package + (name "remid-lv2") + (version "0.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ssj71/reMID.lv2") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "062kriniidsrhzwrf89kfxm9wb0cmgrl07asnlmgil8vcl7gl9y5")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f)) ; no tests included + (inputs + `(("alsa-lib" ,alsa-lib) + ("glib" ,glib) + ("jack" ,jack-1) + ("lv2" ,lv2))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (home-page "https://github.com/ssj71/reMID.lv2") + (synopsis + "MIDI-controlled implementation of the SID 6581 chip used in the +Commodore 64") + (description + "The 6581 SID chip is the sound chip used in the Commodore 64 computer. +reMID is a MIDI implementation of the 6581 SID chip using the reSID library +to provide a virtual SID-based synthesizer, controllable in real-time via +MIDI. It includes support for scripted instruments that allow complex sonic +control of the chip.") + (license license:gpl2+))) + (define-public vl1-emulator (package (name "vl1-emulator") -- cgit v1.2.3 From 264070986f5c7a014b118c8768f1b937decfece8 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sat, 11 Jul 2020 19:13:58 -0300 Subject: gnu: Add chaiscript. * gnu/packages/cpp.scm (chaiscript): New variable. Signed-off-by: Marius Bakke --- gnu/packages/cpp.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index cfbd11618e..8b4b99d495 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2020 Roel Janssen ;;; Copyright © 2020 Ricardo Wurmus ;;; Copyright © 2020 Brice Waegeneire +;;; Copyright © 2020 Vinicius Monego ;;; ;;; This file is part of GNU Guix. ;;; @@ -167,6 +168,37 @@ (define-public xsimd batches.") (license license:bsd-3))) +(define-public chaiscript + (package + (name "chaiscript") + (version "6.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ChaiScript/ChaiScript") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0i1c88rn1wwz8nf3dpapcdkk4w623m3nksfy5yjai10k9irkzy3c")))) + (build-system cmake-build-system) + (home-page "https://chaiscript.com/") + (synopsis "Embedded scripting language designed for C++") + (description + "ChaiScript is one of the only embedded scripting language designed from +the ground up to directly target C++ and take advantage of modern C++ +development techniques. Being a native C++ application, it has some advantages +over existing embedded scripting languages: + +@enumerate +@item Uses a header-only approach, which makes it easy to integrate with +existing projects. +@item Maintains type safety between your C++ application and the user scripts. +@item Supports a variety of C++ techniques including callbacks, overloaded +functions, class methods, and stl containers. +@end enumerate\n") + (license license:bsd-3))) + (define-public fifo-map (let* ((commit "0dfbf5dacbb15a32c43f912a7e66a54aae39d0f9") (revision "0") -- cgit v1.2.3 From dbdfbec9570f3783714dee562d211c097794889c Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Tue, 21 Jul 2020 11:43:39 -0400 Subject: gnu: git-annex: Update to 8.20200720.1. * gnu/packages/haskell-apps.scm (git-annex): Update to 8.20200720.1. Signed-off-by: Marius Bakke --- gnu/packages/haskell-apps.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index 0197046453..4c8bf407ba 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -341,14 +341,14 @@ (define-public ghcid (define-public git-annex (package (name "git-annex") - (version "8.20200617") + (version "8.20200720.1") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "git-annex/git-annex-" version ".tar.gz")) (sha256 - (base32 "1vgpqbscvxm03ibxy6cjnp9vd1wpsr3gkajp4z3m9nnkmjz5r4q4")))) + (base32 "0g4wlfkwr9w21hvdywc7sk077rxlnigdr4m4yz41rc0s2nbjc9fn")))) (build-system haskell-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 20cc8f9487e949ed2d314219cc828c3663d4f12b Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Tue, 21 Jul 2020 19:32:50 +0200 Subject: gnu: patchelf: Update to 0.11. * gnu/packages/elf.scm (patchelf): Update to 0.11. Signed-off-by: Marius Bakke --- gnu/packages/elf.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm index 3aabc6e927..48558d5f14 100644 --- a/gnu/packages/elf.scm +++ b/gnu/packages/elf.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Marius Bakke ;;; Copyright © 2020 Mark Wielaard +;;; Copyright © 2020 Michael Rohleder ;;; ;;; This file is part of GNU Guix. ;;; @@ -214,7 +215,7 @@ (define-public libelf (define-public patchelf (package (name "patchelf") - (version "0.10") + (version "0.11") (source (origin (method url-fetch) (uri (string-append @@ -223,7 +224,7 @@ (define-public patchelf "/patchelf-" version ".tar.bz2")) (sha256 (base32 - "1wzwvnlyf853hw9zgqq5522bvf8gqadk8icgqa41a5n7593csw7n")))) + "16ms3ijcihb88j3x6cl8cbvhia72afmfcphczb9cfwr0gbc22chx")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From 7cce2a6bd437165b5c21df0abe2d989efa0030d5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 22 Jul 2020 01:38:19 +0200 Subject: Revert "gnu: patchelf: Update to 0.11." Patchelf has 700+ dependencies, so this should go through the staging branch. This reverts commit 20cc8f9487e949ed2d314219cc828c3663d4f12b. --- gnu/packages/elf.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm index 48558d5f14..3aabc6e927 100644 --- a/gnu/packages/elf.scm +++ b/gnu/packages/elf.scm @@ -7,7 +7,6 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Marius Bakke ;;; Copyright © 2020 Mark Wielaard -;;; Copyright © 2020 Michael Rohleder ;;; ;;; This file is part of GNU Guix. ;;; @@ -215,7 +214,7 @@ (define-public libelf (define-public patchelf (package (name "patchelf") - (version "0.11") + (version "0.10") (source (origin (method url-fetch) (uri (string-append @@ -224,7 +223,7 @@ (define-public patchelf "/patchelf-" version ".tar.bz2")) (sha256 (base32 - "16ms3ijcihb88j3x6cl8cbvhia72afmfcphczb9cfwr0gbc22chx")))) + "1wzwvnlyf853hw9zgqq5522bvf8gqadk8icgqa41a5n7593csw7n")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From e239135c56efded7af4f9377dfd5a5ea20ba99f3 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Wed, 22 Jul 2020 12:13:04 +0200 Subject: gnu: gp2c: Update to 0.0.11pl4. * gnu/packages/algebra.scm (gp2c): Update to 0.0.11pl4. --- gnu/packages/algebra.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index f8544e6b90..d12c28262b 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -273,7 +273,7 @@ (define-public pari-gp (define-public gp2c (package (name "gp2c") - (version "0.0.11pl3") + (version "0.0.11pl4") (source (origin (method url-fetch) (uri (string-append @@ -281,7 +281,7 @@ (define-public gp2c version ".tar.gz")) (sha256 (base32 - "0yymbrgyjw500hqgmkj5m4nmscd7c9rs9w2c96lxgrcyab8krhrm")))) + "1cnnh7diqc97q76q5pyhpbljbhc0sz8mlrbqgiwi0sjkgh8iqsj0")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl))) (inputs `(("pari-gp" ,pari-gp))) -- cgit v1.2.3 From 7dcf5296730ea5d675397b79900899cf515245a8 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Wed, 22 Jul 2020 12:20:24 +0200 Subject: arb: Update to 2.18.1. * gnu/packages/patches/arb-flint-2.6.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/algebra.scm (arb): Update to 2.18.1. [source](patches): Remove. --- gnu/local.mk | 3 +- gnu/packages/algebra.scm | 5 ++-- gnu/packages/patches/arb-flint-2.6.patch | 48 -------------------------------- 3 files changed, 3 insertions(+), 53 deletions(-) delete mode 100644 gnu/packages/patches/arb-flint-2.6.patch diff --git a/gnu/local.mk b/gnu/local.mk index d6de376e8e..a1bd6a644a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1,6 +1,6 @@ # GNU Guix --- Functional package management for GNU # Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès -# Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Andreas Enge +# Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Andreas Enge # Copyright © 2016 Mathieu Lirzin # Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Mark H Weaver # Copyright © 2016 Chris Marusich @@ -775,7 +775,6 @@ dist_patch_DATA = \ %D%/packages/patches/antlr3-3_1-fix-java8-compilation.patch \ %D%/packages/patches/antlr3-3_3-fix-java8-compilation.patch \ %D%/packages/patches/apr-skip-getservbyname-test.patch \ - %D%/packages/patches/arb-flint-2.6.patch \ %D%/packages/patches/aspell-default-dict-dir.patch \ %D%/packages/patches/ath9k-htc-firmware-binutils.patch \ %D%/packages/patches/ath9k-htc-firmware-gcc.patch \ diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index d12c28262b..0da33a0156 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -495,7 +495,7 @@ (define-public flint (define-public arb (package (name "arb") - (version "2.17.0") + (version "2.18.1") (source (origin (method git-fetch) (uri (git-reference @@ -504,8 +504,7 @@ (define-public arb (file-name (git-file-name name version)) (sha256 (base32 - "05lpy3hkl5f8ik19aw40cqydrb932xaf2n8hbq9ib5dnk7f010p1")) - (patches (search-patches "arb-flint-2.6.patch")))) + "15fx3dcbzgwddw9p1nysmx0dbh058afv5m8cj5pdjkcmcl7kw7z9")))) (build-system gnu-build-system) (propagated-inputs `(("flint" ,flint))) ; flint.h is included by arf.h diff --git a/gnu/packages/patches/arb-flint-2.6.patch b/gnu/packages/patches/arb-flint-2.6.patch deleted file mode 100644 index 98ff5e95b4..0000000000 --- a/gnu/packages/patches/arb-flint-2.6.patch +++ /dev/null @@ -1,48 +0,0 @@ -From d3d9983231e0f034e86a1e75761627eb8213b704 Mon Sep 17 00:00:00 2001 -From: fredrik -Date: Wed, 29 Apr 2020 13:41:36 +0200 -Subject: [PATCH] handle flint incompatibilities - ---- - fmpr.h | 4 ++++ - fmpz_extras.h | 4 ++++ - 2 files changed, 8 insertions(+) - -diff --git a/fmpr.h b/fmpr.h -index 2204d72e..c6a8c342 100644 ---- a/fmpr.h -+++ b/fmpr.h -@@ -22,7 +22,11 @@ - #include "flint/flint.h" - #include "flint/fmpz.h" - #include "flint/fmpq.h" -+#if __FLINT_RELEASE < 20600 - #include "flint/config.h" -+#else -+#include "flint/flint-config.h" -+#endif - #include "fmpz_extras.h" - - #ifndef flint_abort -diff --git a/fmpz_extras.h b/fmpz_extras.h -index 4fd0538f..486e28c8 100644 ---- a/fmpz_extras.h -+++ b/fmpz_extras.h -@@ -43,6 +43,8 @@ fmpz_add_inline(fmpz_t z, const fmpz_t x, const fmpz_t y) - fmpz_add(z, x, y); - } - -+#if __FLINT_RELEASE < 20600 -+ - static __inline__ void - fmpz_add_si(fmpz_t z, const fmpz_t x, slong y) - { -@@ -61,6 +63,8 @@ fmpz_sub_si(fmpz_t z, const fmpz_t x, slong y) - fmpz_add_ui(z, x, -y); - } - -+#endif -+ - static __inline__ void - fmpz_add_si_inline(fmpz_t z, const fmpz_t x, slong y) - { -- cgit v1.2.3 From cc339cd98dfcf4eb41875aa990dac9c709300188 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Wed, 22 Jul 2020 09:46:41 +0300 Subject: services: base: Export references-file. * gnu/services/base.scm (references-file): Export procedure. --- gnu/services/base.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 83dc406aac..491f35702a 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -177,6 +177,8 @@ (define-module (gnu services base) pam-limits-service-type pam-limits-service + references-file + %base-services)) ;;; Commentary: -- cgit v1.2.3 From 4656180d5de1fef2846bea9af27ae509f32376ba Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Wed, 22 Jul 2020 09:47:16 +0300 Subject: services: nix: Fix sandbox. * gnu/tests/package-management.scm: New file. * gnu/local.mk: Add this. * gnu/services/nix.scm (): New record. (nix-activation): Generate Nix config file which fixes sandbox. (nix-service-type): Add default value. (nix-shepherd-service): Allow provide Nix package. * doc/guix.texi (Miscellaneous Services)[Nix service]: Document record. --- doc/guix.texi | 21 +++++++ gnu/local.mk | 1 + gnu/services/nix.scm | 91 +++++++++++++++++---------- gnu/tests/package-management.scm | 130 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 211 insertions(+), 32 deletions(-) create mode 100644 gnu/tests/package-management.scm diff --git a/doc/guix.texi b/doc/guix.texi index 8696a9b554..feef91b59c 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -27599,6 +27599,27 @@ $ source /run/current-system/profile/etc/profile.d/nix.sh @end defvr +@deftp {Data Type} nix-configuration +This data type represents the configuration of the Nix daemon. + +@table @asis +@item @code{nix} (default: @code{nix}) +The Nix package to use. + +@item @code{sandbox} (default: @code{#t}) +Specifies whether builds are sandboxed by default. + +@item @code{build-sandbox-items} (default: @code{'()}) +This is a list of strings or objects appended to the +@code{build-sandbox-items} field of the configuration file. + +@item @code{extra-config} (default: @code{'()}) +This is a list of strings or objects appended to the configuration file. +It is used to pass extra text to be added verbatim to the configuration +file. +@end table +@end deftp + @node Setuid Programs @section Setuid Programs diff --git a/gnu/local.mk b/gnu/local.mk index a1bd6a644a..3eee908752 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -674,6 +674,7 @@ GNU_SYSTEM_MODULES = \ %D%/tests/mail.scm \ %D%/tests/messaging.scm \ %D%/tests/networking.scm \ + %D%/tests/package-management.scm \ %D%/tests/reconfigure.scm \ %D%/tests/rsync.scm \ %D%/tests/security-token.scm \ diff --git a/gnu/services/nix.scm b/gnu/services/nix.scm index 3c0065207d..75b2df02dc 100644 --- a/gnu/services/nix.scm +++ b/gnu/services/nix.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2019 Oleg Pykhalov +;;; Copyright © 2019, 2020 Oleg Pykhalov ;;; ;;; This file is part of GNU Guix. ;;; @@ -31,7 +31,9 @@ (define-module (gnu services nix) #:use-module (guix store) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) + #:use-module (ice-9 match) #:use-module (ice-9 format) + #:use-module (guix modules) #:export (nix-service-type)) ;;; Commentary: @@ -40,10 +42,17 @@ (define-module (gnu services nix) ;;; ;;; Code: - -;;; -;;; Accounts -;;; +(define-record-type* + nix-configuration make-nix-configuration + nix-configuration? + (package nix-configuration-package ;package + (default nix)) + (sandbox nix-configuration-sandbox ;boolean + (default #t)) + (build-sandbox-items nix-configuration-build-sandbox-items ;list of strings + (default '())) + (extra-config nix-configuration-extra-options ;list of strings + (default '()))) ;; Copied from gnu/services/base.scm (define* (nix-build-accounts count #:key @@ -74,32 +83,50 @@ (define (nix-accounts _) (id 40000)) (nix-build-accounts 10 #:group "nixbld"))) -(define (nix-activation _) - "Return the activation gexp." - (with-imported-modules '((guix build utils)) - #~(begin - (use-modules (guix build utils) - (srfi srfi-26)) - (for-each (cut mkdir-p <>) '("/nix/store" "/nix/var/log" - "/nix/var/nix/gcroots/per-user" - "/nix/var/nix/profiles/per-user")) - (chown "/nix/store" - (passwd:uid (getpw "root")) (group:gid (getpw "nixbld01"))) - (chmod "/nix/store" #o775) - (for-each (cut chmod <> #o777) '("/nix/var/nix/profiles" - "/nix/var/nix/profiles/per-user"))))) +(define nix-activation + ;; Return the activation gexp. + (match-lambda + (($ package sandbox build-sandbox-items extra-config) + (with-imported-modules (source-module-closure + '((guix build store-copy))) + #~(begin + (use-modules (guix build utils) + (ice-9 format) + (srfi srfi-1) + (srfi srfi-26)) + (for-each (cut mkdir-p <>) '("/nix/store" "/nix/var/log" + "/nix/var/nix/gcroots/per-user" + "/nix/var/nix/profiles/per-user")) + (chown "/nix/store" + (passwd:uid (getpw "root")) (group:gid (getpw "nixbld01"))) + (chmod "/nix/store" #o775) + (for-each (cut chmod <> #o777) '("/nix/var/nix/profiles" + "/nix/var/nix/profiles/per-user")) + (mkdir-p "/etc/nix") + (with-output-to-file "/etc/nix/nix.conf" + (lambda _ + (format #t "sandbox = ~a~%" (if #$sandbox "true" "false")) + ;; config.nix captures store file names. + (format #t "build-sandbox-paths = ~{~a ~}~%" + (append (append-map (cut call-with-input-file <> read) + '#$(map references-file + (list package))) + '#$build-sandbox-items)) + (for-each (cut display <>) '#$extra-config)))))))) -(define (nix-shepherd-service _) - "Return a for Nix." - (list - (shepherd-service - (provision '(nix-daemon)) - (documentation "Run nix-daemon.") - (requirement '()) - (start #~(make-forkexec-constructor - (list (string-append #$nix "/bin/nix-daemon")))) - (respawn? #f) - (stop #~(make-kill-destructor))))) +(define nix-shepherd-service + ;; Return a for Nix. + (match-lambda + (($ package _ ...) + (list + (shepherd-service + (provision '(nix-daemon)) + (documentation "Run nix-daemon.") + (requirement '()) + (start #~(make-forkexec-constructor + (list (string-append #$package "/bin/nix-daemon")))) + (respawn? #f) + (stop #~(make-kill-destructor))))))) (define nix-service-type (service-type @@ -108,7 +135,7 @@ (define nix-service-type (list (service-extension shepherd-root-service-type nix-shepherd-service) (service-extension account-service-type nix-accounts) (service-extension activation-service-type nix-activation))) - (default-value '()) - (description "Run the Nix daemon."))) + (description "Run the Nix daemon.") + (default-value (nix-configuration)))) ;;; nix.scm ends here diff --git a/gnu/tests/package-management.scm b/gnu/tests/package-management.scm new file mode 100644 index 0000000000..087eaf923e --- /dev/null +++ b/gnu/tests/package-management.scm @@ -0,0 +1,130 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2020 Oleg Pykhalov +;;; +;;; 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 package-management) + #:use-module (gnu packages base) + #:use-module (gnu packages package-management) + #:use-module (gnu services) + #:use-module (gnu services networking) + #:use-module (gnu services nix) + #:use-module (gnu system) + #:use-module (gnu system vm) + #:use-module (gnu tests) + #:use-module (guix gexp) + #:use-module (guix packages) + #:export (%test-nix)) + +;;; Commentary: +;;; +;;; This module provides a test definition for the nix-daemon +;;; +;;; Code: + +(define* (run-nix-test name test-os) + "Run tests in TEST-OS, which has nix-daemon running." + (define os + (marionette-operating-system + test-os + #:imported-modules '((gnu services herd)))) + + (define vm + (virtual-machine + (operating-system os) + (port-forwardings '((8080 . 80))) + (memory-size 1024))) + + (define test + (with-imported-modules '((gnu build marionette)) + #~(begin + (use-modules (srfi srfi-11) + (srfi srfi-64) + (gnu build marionette) + (web client) + (web response)) + + (define marionette + (make-marionette (list #$vm))) + + (mkdir #$output) + (chdir #$output) + + (test-begin #$name) + + ;; XXX: Shepherd reads the config file *before* binding its control + ;; socket, so /var/run/shepherd/socket might not exist yet when the + ;; 'marionette' service is started. + (test-assert "shepherd socket ready" + (marionette-eval + `(begin + (use-modules (gnu services herd)) + (let loop ((i 10)) + (cond ((file-exists? (%shepherd-socket-file)) + #t) + ((> i 0) + (sleep 1) + (loop (- i 1))) + (else + 'failure)))) + marionette)) + + (test-assert "Nix daemon running" + (marionette-eval + '(begin + ;; Wait for nix-daemon to be up and running. + (start-service 'nix-daemon) + (with-output-to-file "guix-test.nix" + (lambda () + (display "\ +with import ; + +derivation { + system = builtins.currentSystem; + name = \"guix-test\"; + builder = shell; + args = [\"-c\" \"mkdir $out\\necho FOO > $out/foo\"]; + PATH = coreutils; +} +"))) + (zero? (system* (string-append #$nix "/bin/nix-build") + "--substituters" "" "--debug" "--no-out-link" + "guix-test.nix"))) + marionette)) + + (test-end) + + (exit (= (test-runner-fail-count (test-runner-current)) 0))))) + + (gexp->derivation (string-append name "-test") test)) + +(define %nix-os + ;; Return operating system under test. + (let ((base-os + (simple-operating-system + (service nix-service-type) + (service dhcp-client-service-type)))) + (operating-system + (inherit base-os) + (packages (cons nix (operating-system-packages base-os)))))) + +(define %test-nix + (system-test + (name "nix") + (description "Connect to a running nix-daemon") + (value (run-nix-test name %nix-os)))) + +;;; package-management.scm ends here -- cgit v1.2.3 From d29821c67bb7f2a69e840053fcf8d1bf462bd022 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 22 Jul 2020 22:37:02 +0200 Subject: gnu: sudo: Update to 1.9.2. * gnu/packages/admin.scm (sudo): Update to 1.9.2. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index cdc030bc3a..ddf6bb8bea 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1366,7 +1366,7 @@ (define-public rottlog (define-public sudo (package (name "sudo") - (version "1.9.1") + (version "1.9.2") (source (origin (method url-fetch) (uri @@ -1376,7 +1376,7 @@ (define-public sudo version ".tar.gz"))) (sha256 (base32 - "1zxd6hxwhxqrm876wsn9bfajbfc4hc6l9ivzj5rjg80hzv71ch99")) + "05432672iilb7s52j9l9xzrlambb1wg3k7qvf5973i41y40x563w")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 2f648809e3eccd8997e671b2105b055e3d51db61 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 22 Jul 2020 17:12:48 -0500 Subject: gnu: quadrapassel: Update to 3.36.02. * gnu/packages/games.scm (quadrapassel): Update to 3.36.02. [inputs]: Add gsound. --- gnu/packages/games.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index f4d75eedd4..6d796a941d 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -7743,7 +7743,7 @@ (define-public libmanette (define-public quadrapassel (package (name "quadrapassel") - (version "3.32.0") + (version "3.36.02") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/quadrapassel/" @@ -7751,7 +7751,7 @@ (define-public quadrapassel "quadrapassel-" version ".tar.xz")) (sha256 (base32 - "1zhi1957knz9dm98drn2dh95mr33sdch590yddh1f8r6bzsfjvpy")))) + "0c80pzipxricyh4wydffsc94wj6ymnanqr9bg6wdx51hz1mmmilb")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t @@ -7774,6 +7774,7 @@ (define-public quadrapassel (inputs `(("clutter" ,clutter) ("clutter-gtk" ,clutter-gtk) + ("gsound" ,gsound) ("gtk+" ,gtk+) ("libcanberra" ,libcanberra) ("libmanette" ,libmanette) -- cgit v1.2.3 From 63c799c1c585214cce4bfe3b9f8493255afa561e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 22 Jul 2020 15:04:21 +0200 Subject: doc: Recommend running 'guix git authenticate' when cloning the repo. * doc/contributing.texi (Building from Git): Adjust instruction and recommend 'guix git authenticate'. --- doc/contributing.texi | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/doc/contributing.texi b/doc/contributing.texi index 4049073b96..f5d73e78aa 100644 --- a/doc/contributing.texi +++ b/doc/contributing.texi @@ -42,30 +42,27 @@ git clone https://git.savannah.gnu.org/git/guix.git @cindex authentication, of a Guix checkout How do you ensure that you obtained a genuine copy of the repository? -Guix itself provides a tool to @dfn{authenticate} your checkout, but you -must first make sure this tool is genuine in order to ``bootstrap'' the -trust chain. To do that, run: +To do that, run @command{guix git authenticate}, passing if the commit +and OpenPGP fingerprint of the @dfn{channel introduction} +(@pxref{Invoking guix git authenticate}): -@c XXX: Adjust instructions when there's a known tag to start from. +@c The commit and fingerprint below must match those of the channel +@c introduction in '%default-channels'. @example -git verify-commit `git log --format=%H build-aux/git-authenticate.scm` -@end example - -The output must look something like: - -@example -gpg: Signature made Fri 27 Dec 2019 01:27:41 PM CET -gpg: using RSA key 3CE464558A84FDC69DB40CFB090B11993D9AEBB5 -@dots{} -gpg: Signature made Fri 27 Dec 2019 01:25:22 PM CET -gpg: using RSA key 3CE464558A84FDC69DB40CFB090B11993D9AEBB5 -@dots{} +guix git authenticate 9edb3f66fd807b096b48283debdcddccfea34bad \ + "BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA" @end example @noindent -... meaning that changes to this file are all signed with key -@code{3CE464558A84FDC69DB40CFB090B11993D9AEBB5} (you may need to fetch -this key from a key server, if you have not done it yet). +This command completes with exit code zero on success; it prints an +error message and exits with a non-zero code otherwise. + +As you can see, there is a chicken-and-egg problem: you first need to +have Guix installed. Typically you would install Guix System +(@pxref{System Installation}) or Guix on top of another distro +(@pxref{Binary Installation}); in either case, you would verify the +OpenPGP signature on the installation medium. This ``bootstraps'' the +trust chain. The easiest way to set up a development environment for Guix is, of course, by using Guix! The following command starts a new shell where -- cgit v1.2.3 From 9e0d896bf3208a6dffa9b2798185dbf976bad9a8 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 22 Jul 2020 22:15:04 +0200 Subject: doc: Tweak mcron example. * doc/guix.texi (Scheduled Job Execution): In example, move '%min-level' definition after 'use-modules'. --- doc/guix.texi | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index feef91b59c..b0eba017a6 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -13843,12 +13843,14 @@ illustrates that. (with-imported-modules (source-module-closure '((guix build utils))) #~(begin - (define %min-level 20) (use-modules (guix build utils) (ice-9 popen) (ice-9 regex) (ice-9 textual-ports) (srfi srfi-2)) + + (define %min-level 20) + (setenv "LC_ALL" "C") ;ensure English output (and-let* ((input-pipe (open-pipe* OPEN_READ -- cgit v1.2.3 From 1c058c382a0fb80c96572c0f419a6660b2b5bb9d Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 15 Jul 2020 23:58:29 +0200 Subject: git: Factorize 'resolve-reference'. * guix/git.scm (resolve-reference): New procedure. (switch-to-ref): Use it. --- guix/git.scm | 79 ++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 42 insertions(+), 37 deletions(-) diff --git a/guix/git.scm b/guix/git.scm index 19c1cb59d3..ca67b1d37c 100644 --- a/guix/git.scm +++ b/guix/git.scm @@ -150,47 +150,52 @@ (define (url+commit->name url sha1) (last (string-split url #\/)) ".git" "") "-" (string-take sha1 7))) +(define (resolve-reference repository ref) + "Resolve the branch, commit or tag specified by REF, and return the +corresponding Git object." + (let resolve ((ref ref)) + (match ref + (('branch . branch) + (let ((oid (reference-target + (branch-lookup repository branch BRANCH-REMOTE)))) + (object-lookup repository oid))) + (('commit . commit) + (let ((len (string-length commit))) + ;; 'object-lookup-prefix' appeared in Guile-Git in Mar. 2018, so we + ;; can't be sure it's available. Furthermore, 'string->oid' used to + ;; read out-of-bounds when passed a string shorter than 40 chars, + ;; which is why we delay calls to it below. + (if (< len 40) + (if (module-defined? (resolve-interface '(git object)) + 'object-lookup-prefix) + (object-lookup-prefix repository (string->oid commit) len) + (raise (condition + (&message + (message "long Git object ID is required"))))) + (object-lookup repository (string->oid commit))))) + (('tag-or-commit . str) + (if (or (> (string-length str) 40) + (not (string-every char-set:hex-digit str))) + (resolve `(tag . ,str)) ;definitely a tag + (catch 'git-error + (lambda () + (resolve `(tag . ,str))) + (lambda _ + ;; There's no such tag, so it must be a commit ID. + (resolve `(commit . ,str)))))) + (('tag . tag) + (let ((oid (reference-name->oid repository + (string-append "refs/tags/" tag)))) + ;; OID may point to a "tag" object, but it can also point directly + ;; to a "commit" object, as surprising as it may seem. Return that + ;; object, whatever that is. + (object-lookup repository oid)))))) + (define (switch-to-ref repository ref) "Switch to REPOSITORY's branch, commit or tag specified by REF. Return the OID (roughly the commit hash) corresponding to REF." (define obj - (let resolve ((ref ref)) - (match ref - (('branch . branch) - (let ((oid (reference-target - (branch-lookup repository branch BRANCH-REMOTE)))) - (object-lookup repository oid))) - (('commit . commit) - (let ((len (string-length commit))) - ;; 'object-lookup-prefix' appeared in Guile-Git in Mar. 2018, so we - ;; can't be sure it's available. Furthermore, 'string->oid' used to - ;; read out-of-bounds when passed a string shorter than 40 chars, - ;; which is why we delay calls to it below. - (if (< len 40) - (if (module-defined? (resolve-interface '(git object)) - 'object-lookup-prefix) - (object-lookup-prefix repository (string->oid commit) len) - (raise (condition - (&message - (message "long Git object ID is required"))))) - (object-lookup repository (string->oid commit))))) - (('tag-or-commit . str) - (if (or (> (string-length str) 40) - (not (string-every char-set:hex-digit str))) - (resolve `(tag . ,str)) ;definitely a tag - (catch 'git-error - (lambda () - (resolve `(tag . ,str))) - (lambda _ - ;; There's no such tag, so it must be a commit ID. - (resolve `(commit . ,str)))))) - (('tag . tag) - (let ((oid (reference-name->oid repository - (string-append "refs/tags/" tag)))) - ;; OID may point to a "tag" object, but it can also point directly - ;; to a "commit" object, as surprising as it may seem. Return that - ;; object, whatever that is. - (object-lookup repository oid)))))) + (resolve-reference repository ref)) (reset repository obj RESET_HARD) (object-id obj)) -- cgit v1.2.3 From a620c9d51d57c8277ec75892c7eee8f9c84fa96f Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 15 Jul 2020 23:59:05 +0200 Subject: git: 'update-cached-checkout' has a new #:check-out? parameter. * guix/git.scm (update-cached-checkout): Add #:check-out? parameter and honor it. --- guix/git.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/guix/git.scm b/guix/git.scm index ca67b1d37c..7f8f9addfb 100644 --- a/guix/git.scm +++ b/guix/git.scm @@ -292,6 +292,7 @@ (define* (update-cached-checkout url #:key (ref '(branch . "master")) recursive? + (check-out? #t) starting-commit (log-port (%make-void-port "w")) (cache-directory @@ -306,7 +307,10 @@ (define* (update-cached-checkout url REF is pair whose key is [branch | commit | tag | tag-or-commit ] and value the associated data: [ | | | ]. -When RECURSIVE? is true, check out submodules as well, if any." +When RECURSIVE? is true, check out submodules as well, if any. + +When CHECK-OUT? is true, reset the cached working tree to REF; otherwise leave +it unchanged." (define canonical-ref ;; We used to require callers to specify "origin/" for each branch, which ;; made little sense since the cache should be transparent to them. So @@ -337,7 +341,10 @@ (define canonical-ref ;; Note: call 'commit-relation' from here because it's more efficient ;; than letting users re-open the checkout later on. - (let* ((oid (switch-to-ref repository canonical-ref)) + (let* ((oid (if check-out? + (switch-to-ref repository canonical-ref) + (object-id + (resolve-reference repository canonical-ref)))) (new (and starting-commit (commit-lookup repository oid))) (old (and starting-commit -- cgit v1.2.3 From 8e31736b0a60919cc1bfc5dc22c395b09243484a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 16 Jul 2020 00:01:17 +0200 Subject: guix system: 'reconfigure' disallows downgrades by default. This is similar to what 9744cc7b4636fafb772c94adb8f05961b5b39f16 did for 'guix pull'. * guix/scripts/system/reconfigure.scm (ensure-forward-reconfigure) (warn-about-backward-reconfigure, channel-relations) (check-forward-update): New procedures. * guix/scripts/system.scm (perform-action): Add #:validate-reconfigure. Call 'check-forward-update' when ACTION is 'reconfigure. (%options, show-help): Add "--allow-downgrades". (%default-options): Add 'validate-reconfigure' key. (process-action): Pass #:validate-reconfigure to 'perform-action'. * doc/guix.texi (Invoking guix system): Document 'guix system describe' more prominently, and document '--allow-downgrades'. --- doc/guix.texi | 35 +++++++++++-- guix/scripts/system.scm | 15 +++++- guix/scripts/system/reconfigure.scm | 97 ++++++++++++++++++++++++++++++++++++- 3 files changed, 141 insertions(+), 6 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index b0eba017a6..fb1c66dcf4 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -28388,11 +28388,16 @@ an older system generation at boot time should you need it. Upon completion, the new system is deployed under @file{/run/current-system}. This directory contains @dfn{provenance meta-data}: the list of channels in use (@pxref{Channels}) and -@var{file} itself, when available. This information is useful should -you later want to inspect how this particular generation was built. +@var{file} itself, when available. You can view it by running: -In fact, assuming @var{file} is self-contained, you can later rebuild -generation @var{n} of your operating system with: +@example +guix system describe +@end example + +This information is useful should you later want to inspect how this +particular generation was built. In fact, assuming @var{file} is +self-contained, you can later rebuild generation @var{n} of your +operating system with: @example guix time-machine \ @@ -28406,6 +28411,12 @@ system is not just a binary artifact: @emph{it carries its own source}. @xref{Service Reference, @code{provenance-service-type}}, for more information on provenance tracking. +By default, @command{reconfigure} @emph{prevents you from downgrading +your system}, which could (re)introduce security vulnerabilities and +also cause problems with ``stateful'' services such as database +management systems. You can override that behavior by passing +@option{--allow-downgrades}. + @item switch-generation @cindex generations Switch to an existing system generation. This action atomically @@ -28732,6 +28743,22 @@ appear in the @code{operating-system} declaration actually exist needed at boot time are listed in @code{initrd-modules} (@pxref{Initial RAM Disk}). Passing this option skips these tests altogether. +@item --allow-downgrades +Instruct @command{guix system reconfigure} to allow system downgrades. + +By default, @command{reconfigure} prevents you from downgrading your +system. It achieves that by comparing the provenance info of your +system (shown by @command{guix system describe}) with that of your +@command{guix} command (shown by @command{guix describe}). If the +commits for @command{guix} are not descendants of those used for your +system, @command{guix system reconfigure} errors out. Passing +@option{--allow-downgrades} allows you to bypass these checks. + +@quotation Note +Make sure you understand its security implications before using +@option{--allow-downgrades}. +@end quotation + @cindex on-error @cindex on-error strategy @cindex error strategy diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index f2b4367094..79bfcd7db2 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -736,6 +736,7 @@ (define (local-eval exp) (define* (perform-action action os #:key + (validate-reconfigure ensure-forward-reconfigure) save-provenance? skip-safety-checks? install-bootloader? @@ -778,7 +779,8 @@ (define bootcfg (operating-system-bootcfg os menu-entries))) (when (eq? action 'reconfigure) - (maybe-suggest-running-guix-pull)) + (maybe-suggest-running-guix-pull) + (check-forward-update validate-reconfigure)) ;; Check whether the declared file systems exist. This is better than ;; instantiating a broken configuration. Assume that we can only check if @@ -926,6 +928,9 @@ (define (show-help) (display (G_ " -e, --expression=EXPR consider the operating-system EXPR evaluates to instead of reading FILE, when applicable")) + (display (G_ " + --allow-downgrades for 'reconfigure', allow downgrades to earlier + channel revisions")) (display (G_ " --on-error=STRATEGY apply STRATEGY (one of nothing-special, backtrace, @@ -981,6 +986,11 @@ (define %options (option '(#\d "derivation") #f #f (lambda (opt name arg result) (alist-cons 'derivations-only? #t result))) + (option '("allow-downgrades") #f #f + (lambda (opt name arg result) + (alist-cons 'validate-reconfigure + warn-about-backward-reconfigure + result))) (option '("on-error") #t #f (lambda (opt name arg result) (alist-cons 'on-error (string->symbol arg) @@ -1053,6 +1063,7 @@ (define %default-options (graft? . #t) (debug . 0) (verbosity . #f) ;default + (validate-reconfigure . ,ensure-forward-reconfigure) (file-system-type . "ext4") (image-size . guess) (install-bootloader? . #t))) @@ -1138,6 +1149,8 @@ (define save-provenance? #:use-substitutes? (assoc-ref opts 'substitutes?) #:skip-safety-checks? (assoc-ref opts 'skip-safety-checks?) + #:validate-reconfigure + (assoc-ref opts 'validate-reconfigure) #:file-system-type (assoc-ref opts 'file-system-type) #:image-size (assoc-ref opts 'image-size) #:full-boot? (assoc-ref opts 'full-boot?) diff --git a/guix/scripts/system/reconfigure.scm b/guix/scripts/system/reconfigure.scm index 7885c33457..9013e035f7 100644 --- a/guix/scripts/system/reconfigure.scm +++ b/guix/scripts/system/reconfigure.scm @@ -34,9 +34,18 @@ (define-module (guix scripts system reconfigure) #:use-module (guix monads) #:use-module (guix store) #:use-module ((guix self) #:select (make-config.scm)) + #:autoload (guix describe) (current-profile) + #:use-module (guix channels) + #:autoload (guix git) (update-cached-checkout) + #:use-module (guix i18n) + #:use-module (guix diagnostics) + #:use-module ((guix utils) #:select (&fix-hint)) #:use-module (ice-9 match) #:use-module (srfi srfi-1) #:use-module (srfi srfi-11) + #:use-module (srfi srfi-34) + #:use-module (srfi srfi-35) + #:use-module ((guix config) #:select (%guix-package-name)) #:export (switch-system-program switch-to-system @@ -44,7 +53,11 @@ (define-module (guix scripts system reconfigure) upgrade-shepherd-services install-bootloader-program - install-bootloader)) + install-bootloader + + check-forward-update + ensure-forward-reconfigure + warn-about-backward-reconfigure)) ;;; Commentary: ;;; @@ -266,3 +279,85 @@ (define* (install-bootloader eval configuration bootcfg bootcfg-file device target)))))) + + +;;; +;;; Downgrade detection. +;;; + +(define (ensure-forward-reconfigure channel start commit relation) + "Raise an error if RELATION is not 'ancestor, meaning that START is not an +ancestor of COMMIT, unless CHANNEL specifies a commit." + (match relation + ('ancestor #t) + ('self #t) + (_ + (raise (make-compound-condition + (condition + (&message (message + (format #f (G_ "\ +aborting reconfiguration because commit ~a of channel '~a' is not a descendant of ~a") + commit (channel-name channel) + start))) + (&fix-hint + (hint (G_ "Use @option{--allow-downgrades} to force +this downgrade."))))))))) + +(define (warn-about-backward-reconfigure channel start commit relation) + "Warn about non-forward updates of CHANNEL from START to COMMIT, without +aborting." + (match relation + ((or 'ancestor 'self) + #t) + ('descendant + (warning (G_ "rolling back channel '~a' from ~a to ~a~%") + (channel-name channel) start commit)) + ('unrelated + (warning (G_ "moving channel '~a' from ~a to unrelated commit ~a~%") + (channel-name channel) start commit)))) + +(define (channel-relations old new) + "Return a list of channel/relation pairs, where each relation is a symbol as +returned by 'commit-relation' denoting how commits of channels in OLD relate +to commits of channels in NEW." + (filter-map (lambda (old) + (let ((new (find (lambda (channel) + (eq? (channel-name channel) + (channel-name old))) + new))) + (and new + (let-values (((checkout commit relation) + (update-cached-checkout + (channel-url new) + #:ref + `(commit . ,(channel-commit new)) + #:starting-commit + (channel-commit old) + #:check-out? #f))) + (list new + (channel-commit old) (channel-commit new) + relation))))) + old)) + +(define* (check-forward-update #:optional + (validate-reconfigure ensure-forward-reconfigure)) + "Call VALIDATE-RECONFIGURE passing it, for each channel, the channel, the +currently-deployed commit (as returned by 'guix system describe') and the +target commit (as returned by 'guix describe')." + ;; TODO: Make that functionality available to 'guix deploy'. + (define new + (or (and=> (current-profile) profile-channels) + '())) + + (define old + (system-provenance "/run/current-system")) + + (when (null? old) + (warning (G_ "cannot determine provenance for /run/current-system~%"))) + (when (and (null? new) (not (getenv "GUIX_UNINSTALLED"))) + (warning (G_ "cannot determine provenance of ~a~%") %guix-package-name)) + + (for-each (match-lambda + ((channel old new relation) + (validate-reconfigure channel old new relation))) + (channel-relations old new))) -- cgit v1.2.3 From 3a27a3dc8fbaf78a639d3e44267cd21c9adb9a7f Mon Sep 17 00:00:00 2001 From: Jesse Gibbons Date: Wed, 15 Jul 2020 23:08:36 -0600 Subject: gnu: guix-jupyter: Correct kernel search location. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit gnu/packages/package-management.scm: guix-jupyter: [phases]: Use guile 3.0 instead of 2.2. Signed-off-by: Ludovic Courtès --- gnu/packages/package-management.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 6e86305504..68a2e6e203 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2020 Mathieu Othacehe ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2020 Giacomo Leidi +;;; Copyright © 2020 Jesse Gibbons ;;; ;;; This file is part of GNU Guix. ;;; @@ -982,7 +983,7 @@ (define-public guix-jupyter "-s") "\",\n\t\t\"")) (("guix-jupyter-kernel.scm") - (string-append out "/share/guile/site/2.2/" + (string-append out "/share/guile/site/3.0/" "guix-jupyter-kernel.scm"))) #t)))))) (native-inputs -- cgit v1.2.3 From c984b70ccb0037406f36d2718c4bbb9a5539e7a3 Mon Sep 17 00:00:00 2001 From: Jesse Gibbons Date: Fri, 17 Jul 2020 08:56:47 -0600 Subject: gnu: jupyter-guile-kernel: Update to f25fb90 and build with Guile 3. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/guile-xyz.scm (jupyter-guile-kernel): Update to f25fb90. Re-indent package definition (using indent.el) [phases]: Replace /home with /usr/local [inputs]: Use GUILE-3.0 instead of GUILE-2.2, and GUILE-JSON-3 instead of GUILE-JSON-1. Signed-off-by: Ludovic Courtès --- gnu/packages/guile-xyz.scm | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index cf73c6b944..21f998524e 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -29,6 +29,7 @@ ;;; Copyright © 2020 Julien Lepiler ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 Masaya Tojo +;;; Copyright © 2020 Jesse Gibbons ;;; ;;; This file is part of GNU Guix. ;;; @@ -935,8 +936,8 @@ (define-public guile3.0-simple-zmq (deprecated-package "guile3.0-simple-zmq" guile-simple-zmq)) (define-public jupyter-guile-kernel - (let ((commit "a7db9245a886e104138474df46c3e88b95cff629") - (revision "1")) + (let ((commit "f25fb90b95529b17a006a807bd04e6aee12ea304") + (revision "2")) (package (name "jupyter-guile-kernel") (version (git-version "0.0.0" revision commit)) @@ -949,7 +950,7 @@ (define-public jupyter-guile-kernel (file-name (git-file-name name version)) (sha256 (base32 - "0aj04853bqm47ivfcmrgpb7w3wkis847kc7qrwsa5zcn9h38qh2f")))) + "0zr1fasdb2yv9kn21yll993y9higqss4jnfs030ndhjb93raa9sr")))) (build-system guile-build-system) (arguments '(#:phases (modify-phases %standard-phases @@ -984,7 +985,7 @@ (define-public jupyter-guile-kernel ;; Fix hard-coded file name in the kernel. (substitute* (string-append dir "/kernel.json") - (("/home/.*/guile-jupyter-kernel.scm") + (("/usr/local/.*/guile-jupyter-kernel.scm") (string-append out "/share/guile/site/" (target-guile-effective-version) "/guile-jupyter-kernel.scm")) @@ -1005,17 +1006,17 @@ (define-public jupyter-guile-kernel effective "/site-ccache\"")) deps))) - (string-append "--no-auto-compile\"" - (string-join -L ", \"-L\", " - 'prefix) - (string-join -C ", \"-C\", " - 'prefix) - ", \"-s")))) + (string-append "--no-auto-compile\"" + (string-join -L ", \"-L\", " + 'prefix) + (string-join -C ", \"-C\", " + 'prefix) + ", \"-s")))) #t)))))) (inputs `(("openssl" ,openssl) - ("guile" ,guile-2.2) - ("guile-json" ,guile-json-1) + ("guile" ,guile-3.0) + ("guile-json" ,guile-json-3) ("guile-simple-zmq" ,guile-simple-zmq))) (synopsis "Guile kernel for the Jupyter Notebook") (description -- cgit v1.2.3 From eb404f30adfa74ce9efcf3a5e5833204a9c3ee56 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Wed, 15 Jul 2020 16:20:12 +0530 Subject: gnu: Add font-catamaran. * gnu/packages/fonts.scm (font-catamaran): New variable. --- gnu/packages/fonts.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 763e8028e2..f4c62ee69c 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -1936,3 +1936,27 @@ (define-public font-mplus-testflight than 5,300 Kanji glyphs, as well major international phonetic symbols, operators and special symbols.") (license (license:non-copyleft "file:///LICENSE_E")))) + +(define-public font-catamaran + (let ((commit "7559b4906f9c9148fb22c6f89508c3053a78a296") + (revision "1")) + (package + (name "font-catamaran") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/VanillaandCream/Catamaran-Tamil") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1wpp41l7j2kpgnyavhgxcc5wp852a4wqsnwravn39gp980s84yxw")))) + (build-system font-build-system) + (home-page "https://github.com/VanillaandCream/Catamaran-Tamil") + (synopsis "9 weight Tamil and Latin type") + (description "Catamaran is a 9 weight Tamil and Latin type. Catamaran +is a stylish type with a polished yet relaxed feel. Its versatility makes it +suitable for a wide range of uses.") + (license license:silofl1.1)))) -- cgit v1.2.3 From 66c3a35b1bad6060a9b9af78b764449dbfdededf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Jul 2020 17:03:12 +0200 Subject: gnu: ungoogled-chromium: Add VA-API fix for some Intel systems. * gnu/packages/chromium.scm (%arch-patches): New variable. (ungoogled-chromium-snippet): Use it. --- gnu/packages/chromium.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index 7ce9b65abf..e4d6503dbb 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -310,6 +310,17 @@ (define %debian-patches (debian-patch "system/openjpeg.patch" %debian-revision "0zd6v5njx1pc7i0y6mslxvpx5j4cq01mmyx55qcqx8qzkm0gm48j"))) +(define %arch-patches + (list (origin + (method url-fetch) + (uri "https://git.archlinux.org/svntogit/packages.git/plain/trunk/\ +chromium-fix-vaapi-on-intel.patch?h=packages/chromium\ +&id=93b5b90621b4827084288197c6e0e09b987b372a") + (file-name "ungoogled-chromium-fix-vaapi-on-intel.patch") + (sha256 + (base32 + "16jbjjf4d9jp52rdrrxx5vm69nx3w0qrijgjpwapnmcif13z55g4"))))) + (define %ungoogled-origin (origin (method git-fetch) @@ -343,7 +354,7 @@ (define ungoogled-chromium-snippet (invoke "patch" "-p1" "--force" "--input" patch "--no-backup-if-mismatch")) (append - '#+%gentoo-patches '#+%debian-patches + '#+%gentoo-patches '#+%debian-patches '#+%arch-patches (find-files #$%chromium-gcc-patches "\\.patch$") '#+(list (local-file (search-patch -- cgit v1.2.3 From 300b795520baf106b662f045fe7d644643e8e7d1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Jul 2020 16:41:30 +0200 Subject: gnu: Clang: Install the CFI blacklist. * gnu/packages/llvm.scm (clang-from-llvm)[arguments]: Add phase to symlink cfi_blacklist.txt from CLANG-RUNTIME. --- gnu/packages/llvm.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index b7bc21ea6e..4a17ecd664 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -388,6 +388,25 @@ (define (move program) (("@GLIBC_LIBDIR@") (string-append libc "/lib")))))) #t))) + (add-after 'install 'symlink-cfi_blacklist + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (lib-share (string-append out "/lib/clang/" + ,version "/share")) + (compiler-rt (assoc-ref inputs "clang-runtime")) + ;; The location varies between Clang versions. + (cfi-blacklist + (cond ((file-exists? + (string-append compiler-rt "/cfi_blacklist.txt")) + (string-append compiler-rt "/cfi_blacklist.txt")) + (else (string-append compiler-rt + "/share/cfi_blacklist.txt"))))) + (mkdir-p lib-share) + ;; Symlink cfi_blacklist.txt to where Clang expects + ;; to find it. + (symlink cfi-blacklist + (string-append lib-share "/cfi_blacklist.txt")) + #t))) (add-after 'install 'install-clean-up-/share/clang (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From 71c237bdc88426c7b654f48a38c25b66dadee040 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Jul 2020 16:51:00 +0200 Subject: gnu: ungoogled-chromium: Enable all release optimizations. * gnu/packages/chromium.scm (ungoogled-chromium-snippet): Add substitution to allow using unbundled dependencies in "official" builds. (lld-as-ld, lld-wrapper, lld/wrapped): New variables. (ungoogled-chromium)[arguments]: Add "is_official_build" to #:configure-flags. Remove redundant or unnecessary flags, disable system protobuf. Use llvm-ar and llvm-nm instead of their binutils equivalents. [native-inputs]: Add LLD/WRAPPED. [inputs]: Remove PROTOBUF. --- gnu/packages/chromium.scm | 49 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 41 insertions(+), 8 deletions(-) diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index e4d6503dbb..7955981261 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -385,6 +385,13 @@ (define ungoogled-chromium-snippet (format #t "Replacing GN files...~%") (force-output) + (substitute* "tools/generate_shim_headers/generate_shim_headers.py" + ;; The "is_official_build" configure option enables certain + ;; release optimizations like those used in the commercial + ;; Chrome browser. Unfortunately it also requires using the + ;; bundled libraries: lose that restriction. + (("#if defined\\(OFFICIAL_BUILD\\)") + "#if 0")) (invoke "python" "build/linux/unbundle/replace_gn_files.py" "--system-libraries" "ffmpeg" "flac" "fontconfig" "freetype" "harfbuzz-ng" "icu" "libdrm" "libevent" @@ -414,6 +421,31 @@ (define xcb-proto/python2 `(("pkg-config" ,pkg-config) ("python" ,python-2))))) +;; 'make-ld-wrapper' can only work with an 'ld' executable, so we need +;; this trick to make it wrap 'lld'. +(define lld-as-ld + (computed-file "lld-ld" + #~(begin + (mkdir #$output) + (mkdir (string-append #$output "/bin")) + (symlink #$(file-append lld "/bin/lld") + (string-append #$output "/bin/ld"))))) + +;; Create a wrapper for LLD that inserts appropriate -rpath entries. +(define lld-wrapper + (make-ld-wrapper "lld-wrapper" + #:binutils lld-as-ld)) + +;; Clang looks for an 'ld.lld' executable, so we need to symlink it back. +(define lld/wrapped + (computed-file "lld-wrapped" + #~(begin + (mkdir #$output) + (mkdir (string-append #$output "/bin")) + (symlink #$(file-append lld-wrapper "/bin/ld") + (string-append #$output "/bin/lld")) + (symlink "lld" (string-append #$output "/bin/ld.lld"))))) + (define-public ungoogled-chromium (package (name "ungoogled-chromium") @@ -447,16 +479,14 @@ (define-public ungoogled-chromium ;; directory for an exhaustive list of supported flags. ;; (Note: The 'configure' phase will do that for you.) (list "is_debug=false" - "is_unsafe_developer_build=false" - "use_gold=false" - "use_lld=false" + ;; Use the "official" release optimizations, as opposed to + ;; a developer build. + "is_official_build=true" (string-append "max_jobs_per_link=" (number->string (parallel-job-count))) - "exclude_unwind_tables=true" "clang_use_chrome_plugins=false" "use_custom_libcxx=false" "use_sysroot=false" - "enable_precompiled_headers=false" "goma_dir=\"\"" "enable_nacl=false" "enable_nacl_nonsfi=false" @@ -499,7 +529,10 @@ (define-public ungoogled-chromium "use_pulseaudio=true" "link_pulseaudio=true" "icu_use_data_file=false" - "perfetto_use_system_protobuf=true" + + ;; FIXME: Using system protobuf with "is_official_build" causes an + ;; invalid opcode and "protoc-gen-plugin: Plugin killed by signal 4". + ;;"perfetto_use_system_protobuf=true" ;; VA-API acceleration is currently only supported on x86_64-linux. ,@(if (string-prefix? "x86_64" (or (%current-target-system) @@ -628,7 +661,7 @@ (define-public ungoogled-chromium (lambda* (#:key inputs #:allow-other-keys) ;; Make sure the right build tools are used. - (setenv "AR" "ar") (setenv "NM" "nm") + (setenv "AR" "llvm-ar") (setenv "NM" "llvm-nm") (setenv "CC" "clang") (setenv "CXX" "clang++") (setenv "CXXFLAGS" @@ -755,6 +788,7 @@ (define-public ungoogled-chromium ("clang" ,clang-10) ("gn" ,gn) ("gperf" ,gperf) + ("ld-wrapper" ,lld/wrapped) ("ninja" ,ninja) ("node" ,node) ("pkg-config" ,pkg-config) @@ -816,7 +850,6 @@ (define-public ungoogled-chromium ("opus" ,opus+custom) ("pango" ,pango) ("pciutils" ,pciutils) - ("protobuf" ,protobuf) ("pulseaudio" ,pulseaudio) ("re2" ,re2) ("snappy" ,snappy) -- cgit v1.2.3 From c4a9182e87c11121383a1828dbc68a81f0653793 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 22 Jul 2020 20:10:45 -0500 Subject: gnu: rdiff-backup: Update to 2.0.3. * gnu/packages/backup.scm (rdiff-backup): Update to 2.0.3. [native-inputs]: New field. [inputs]: Use python3 and latest librsync. [arguments]: Remove '#:python' argument. [home-page]: Old url redirects, so use the new url. --- gnu/packages/backup.scm | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 0d82a18aad..7a1fd142bf 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014, 2015 Eric Bavier +;;; Copyright © 2014, 2015, 2020 Eric Bavier ;;; Copyright © 2014 Ian Denhardt ;;; Copyright © 2015, 2016, 2017 Leo Famulari ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice @@ -404,23 +404,24 @@ (define-public btar (define-public rdiff-backup (package (name "rdiff-backup") - (version "1.2.8") + (version "2.0.3") (source (origin (method url-fetch) - (uri (string-append "mirror://savannah/rdiff-backup/rdiff-backup-" - version ".tar.gz")) + (uri (string-append "https://github.com/rdiff-backup/rdiff-backup/releases/" + "download/v" version "/rdiff-backup-" version ".tar.gz")) (sha256 (base32 - "1nwmmh816f96h0ff1jxk95ad38ilbhbdl5dgibx1d4cl81dsi48d")))) + "1qfmvwwb942srhg6gw77ncy4z5z54b4wfz8bpd5bpml8hp1d5qh4")))) (build-system python-build-system) + (native-inputs + `(("python-setuptools-scm" ,python-setuptools-scm))) (inputs - `(("python" ,python-2) - ("librsync" ,librsync-0.9))) + `(("python" ,python) + ("librsync" ,librsync))) (arguments - `(#:python ,python-2 - #:tests? #f)) - (home-page "https://www.nongnu.org/rdiff-backup/") + `(#:tests? #f)) ; Tests require root/sudo + (home-page "https://rdiff-backup.net/") (synopsis "Local/remote mirroring+incremental backup") (description "Rdiff-backup backs up one directory to another, possibly over a network. -- cgit v1.2.3 From e957bab76f9cdff32d393255719d83091fc540c4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 20 Jul 2020 22:44:58 +0200 Subject: gnu: ledger: Update to 3.2.1. * gnu/packages/finance.scm (ledger): Update to 3.2.1. --- gnu/packages/finance.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 1cd9014e45..518be91073 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -201,7 +201,7 @@ (define-public homebank (define-public ledger (package (name "ledger") - (version "3.2.0") + (version "3.2.1") (source (origin (method git-fetch) @@ -210,7 +210,7 @@ (define-public ledger (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1l5c9jf2wnly6ncm9civ8i7v47xld15g1y7wpl0hqwgbfyffwjci")))) + (base32 "0x6jxwss3wwzbzlwmnwb8yzjk8f9wfawif4f1b74z2qg6hc4r7f6")))) (build-system cmake-build-system) (arguments `(#:modules (,@%cmake-build-system-modules -- cgit v1.2.3 From edef1391385f4ca24a68b57012956925285367cd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 21 Jul 2020 00:07:09 +0200 Subject: gnu: sslh: Update to 1.21b. * gnu/packages/networking.scm (sslh): Update to 1.21b. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index d5f86fb09b..8df66af120 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1779,7 +1779,7 @@ (define-public enet (define-public sslh (package (name "sslh") - (version "1.21") + (version "1.21b") (source (origin (method git-fetch) @@ -1788,7 +1788,7 @@ (define-public sslh (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1hqnqzxaabqrvjh24p30yr9f71s2q6ddvlqmycf9b71qq5nj4xrf")))) + (base32 "1bws153l4x3vbwxshb92vqy3rnv8xfysmf7incp6hcmq43jsgjmr")))) (build-system gnu-build-system) (native-inputs `(;; Test dependencies. -- cgit v1.2.3 From 08644a01e3b2a3b1b26bad7148d9777143d9eba8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 21 Jul 2020 00:17:37 +0200 Subject: gnu: wla-dx: Update to 9.11. * gnu/packages/assembly.scm (wla-dx): Update to 9.11. --- gnu/packages/assembly.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm index cd02541514..aa92ccb1c9 100644 --- a/gnu/packages/assembly.scm +++ b/gnu/packages/assembly.scm @@ -308,7 +308,7 @@ (define-public rgbds (define-public wla-dx (package (name "wla-dx") - (version "9.10") + (version "9.11") (source (origin (method git-fetch) (uri (git-reference @@ -317,12 +317,12 @@ (define-public wla-dx (file-name (git-file-name name version)) (sha256 (base32 - "022isf7s9q5i0j4xj69zpp0lgw8p9n37sn7ii25v68r15zaahk2w")))) + "0i8pxvyaih79pqnyvqyqd9rwdid91pna76cap0k1n5zhg8xswf2f")))) (build-system cmake-build-system) (native-inputs `(("sphinx" ,python-sphinx))) ; to generate man pages (arguments - `(#:tests? #f)) ; no tests + `(#:tests? #f)) ; no tests (home-page "https://github.com/vhelin/wla-dx") (synopsis "Assemblers for various processors") (description "WLA DX is a set of tools to assemble assembly files to -- cgit v1.2.3 From dc4d01ac718f04c4eb9759b4f4199bd13a6a6413 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 23 Jul 2020 04:41:49 +0200 Subject: gnu: nsd: Update to 4.3.2. * gnu/packages/dns.scm (nsd): Update to 4.3.2. --- gnu/packages/dns.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 6f328d0c4e..8c4369dbd8 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -335,14 +335,14 @@ (define-public libasr (define-public nsd (package (name "nsd") - (version "4.3.1") + (version "4.3.2") (source (origin (method url-fetch) (uri (string-append "https://www.nlnetlabs.nl/downloads/nsd/nsd-" version ".tar.gz")) (sha256 - (base32 "11w9kl99fs888f3zwx2j92i8lcp78vq91jac8s317a2icv74mczl")))) + (base32 "0ac3mbn5z4nc18782m9aswdpi2m9f4665vidw0ciyigdh0pywp2v")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 90ff53af56722b01cc706da5d4801ff66a39a6b4 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 23 Jul 2020 00:19:15 -0400 Subject: gnu: linux-libre@4.4: Update to 4.4.231. * gnu/packages/linux.scm (linux-libre-4.4-version): Update to 4.4.231. (linux-libre-4.4-pristine-source): Update hash. (linux-libre-4.4-source): Remove %linux-libre-fix-atheros-9271-patch. (deblob-scripts-4.4): Update to 4.4.231. --- gnu/packages/linux.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b0077c0a98..f6c53b56ce 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -230,7 +230,7 @@ (define deblob-scripts-4.9 (define deblob-scripts-4.4 (linux-libre-deblob-scripts - "4.4.230" + "4.4.231" (base32 "0x2j1i88am54ih2mk7gyl79g25l9zz4r08xhl482l3fvjj2irwbw") (base32 "0hhin1jpfkd6nwrb6xqxjzl3hdxy4pn8a15hy2d3d83yw6pflbsf"))) @@ -415,10 +415,10 @@ (define-public linux-libre-4.9-pristine-source (%upstream-linux-source version hash) deblob-scripts-4.9))) -(define-public linux-libre-4.4-version "4.4.230") +(define-public linux-libre-4.4-version "4.4.231") (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) - (hash (base32 "1qx74qli8yjc2rkb7kig79c1yv7pfqa8zi1wi0rndn4d4yk62cfa"))) + (hash (base32 "1c6p5hv18isa328pvpa3qmmsg4qsssf2mwsx3hzn489rb8ycdxp7"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.4))) @@ -485,8 +485,7 @@ (define-public linux-libre-4.9-source (define-public linux-libre-4.4-source (source-with-patches linux-libre-4.4-pristine-source - (list %boot-logo-patch - %linux-libre-fix-atheros-9271-patch))) + (list %boot-logo-patch))) ;;; -- cgit v1.2.3 From 19783b7420b776e9b1801b9dec5018abf9c55645 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 23 Jul 2020 00:21:59 -0400 Subject: gnu: linux-libre@4.9: Update to 4.9.231. * gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.231. (linux-libre-4.9-pristine-source): Update hash. (linux-libre-4.9-source): Remove %linux-libre-fix-atheros-9271-patch. (deblob-scripts-4.9): Update to 4.9.231. --- gnu/packages/linux.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index f6c53b56ce..b3065c13bd 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -224,7 +224,7 @@ (define deblob-scripts-4.14 (define deblob-scripts-4.9 (linux-libre-deblob-scripts - "4.9.230" + "4.9.231" (base32 "1wvldzlv7q2xdbadas87dh593nxr4a8p5n0f8zpm72lja6w18hmg") (base32 "0fxajshb75siq39lj5h8xvhdj8lcmddkslwlyj65rhlwk6g2r4b2"))) @@ -407,10 +407,10 @@ (define-public linux-libre-4.14-pristine-source (%upstream-linux-source version hash) deblob-scripts-4.14))) -(define-public linux-libre-4.9-version "4.9.230") +(define-public linux-libre-4.9-version "4.9.231") (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "0z03djys7k3z6z55xrw8rj4mv5i4h763lckz2anwxwgbwdb95fnm"))) + (hash (base32 "1sz8xk767yy4lxqvy4229yrgkwnm43hdrbr54aa1flns5yh3p12g"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) @@ -480,8 +480,7 @@ (define-public linux-libre-4.14-source (define-public linux-libre-4.9-source (source-with-patches linux-libre-4.9-pristine-source - (list %boot-logo-patch - %linux-libre-fix-atheros-9271-patch))) + (list %boot-logo-patch))) (define-public linux-libre-4.4-source (source-with-patches linux-libre-4.4-pristine-source -- cgit v1.2.3 From ceaeae8f066998026b43557f58994f7711e299a4 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 23 Jul 2020 00:23:50 -0400 Subject: gnu: linux-libre@4.14: Update to 4.14.189. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.189. (linux-libre-4.14-pristine-source): Update hash. (linux-libre-4.14-source): Remove %linux-libre-fix-atheros-9271-patch. (deblob-scripts-4.14): Update to 4.14.189. (%linux-libre-fix-atheros-9271-patch): Delete variable. * gnu/packages/patches/linux-libre-fix-atheros-9271.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/linux.scm | 12 +- .../patches/linux-libre-fix-atheros-9271.patch | 225 --------------------- 3 files changed, 4 insertions(+), 234 deletions(-) delete mode 100644 gnu/packages/patches/linux-libre-fix-atheros-9271.patch diff --git a/gnu/local.mk b/gnu/local.mk index 3eee908752..447b9c3d4c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1253,7 +1253,6 @@ dist_patch_DATA = \ %D%/packages/patches/linbox-fix-pkgconfig.patch \ %D%/packages/patches/linkchecker-tests-require-network.patch \ %D%/packages/patches/linphoneqt-tabbutton.patch \ - %D%/packages/patches/linux-libre-fix-atheros-9271.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/linux.scm b/gnu/packages/linux.scm index b3065c13bd..a1e18ba834 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -218,7 +218,7 @@ (define deblob-scripts-4.19 (define deblob-scripts-4.14 (linux-libre-deblob-scripts - "4.14.188" + "4.14.189" (base32 "091jk9jkn9jf39bxpc7395bhcb7p96nkg3a8047380ki06lnfxh6") (base32 "1qij18inijj6c3ma8hv98yjagnzxdxyn134da9fd23ky8q6hbvky"))) @@ -399,10 +399,10 @@ (define-public linux-libre-4.19-pristine-source (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.188") +(define-public linux-libre-4.14-version "4.14.189") (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "0jq6cyxa0mxnvd33gi66a4x3xlfsih2aaifa6yyvgldihw9y0vvn"))) + (hash (base32 "1qgr6hb714xi7rav4za4vk4l7c0ma3ndf0f2ca3q8ly5gd2j3rd7"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) @@ -445,9 +445,6 @@ (define %linux-libre-arm-export-__sync_icache_dcache-patch (sha256 (base32 "1ifnfhpakzffn4b8n7x7w5cps9mzjxlkcfz9zqak2vaw8nzvl39f")))) -(define %linux-libre-fix-atheros-9271-patch - (search-patch "linux-libre-fix-atheros-9271.patch")) - (define (source-with-patches source patches) (origin (inherit source) @@ -475,8 +472,7 @@ (define-public linux-libre-4.19-source (define-public linux-libre-4.14-source (source-with-patches linux-libre-4.14-pristine-source - (list %boot-logo-patch - %linux-libre-fix-atheros-9271-patch))) + (list %boot-logo-patch))) (define-public linux-libre-4.9-source (source-with-patches linux-libre-4.9-pristine-source diff --git a/gnu/packages/patches/linux-libre-fix-atheros-9271.patch b/gnu/packages/patches/linux-libre-fix-atheros-9271.patch deleted file mode 100644 index 7527f9fdf0..0000000000 --- a/gnu/packages/patches/linux-libre-fix-atheros-9271.patch +++ /dev/null @@ -1,225 +0,0 @@ -Revert the following upstream commit, which broke Atheros 9271 support. -See: - https://bugzilla.kernel.org/show_bug.cgi?id=208251 - https://bugzilla.redhat.com/show_bug.cgi?id=1848631 - - -From b5c8896bc14f54e5c4dd5a6e42879f125b8abd2d Mon Sep 17 00:00:00 2001 -From: Qiujun Huang -Date: Sat, 4 Apr 2020 12:18:38 +0800 -Subject: ath9k: Fix general protection fault in ath9k_hif_usb_rx_cb - -commit 2bbcaaee1fcbd83272e29f31e2bb7e70d8c49e05 upstream. - -In ath9k_hif_usb_rx_cb interface number is assumed to be 0. -usb_ifnum_to_if(urb->dev, 0) -But it isn't always true. - -The case reported by syzbot: -https://lore.kernel.org/linux-usb/000000000000666c9c05a1c05d12@google.com -usb 2-1: new high-speed USB device number 2 using dummy_hcd -usb 2-1: config 1 has an invalid interface number: 2 but max is 0 -usb 2-1: config 1 has no interface number 0 -usb 2-1: New USB device found, idVendor=0cf3, idProduct=9271, bcdDevice= -1.08 -usb 2-1: New USB device strings: Mfr=1, Product=2, SerialNumber=3 -general protection fault, probably for non-canonical address -0xdffffc0000000015: 0000 [#1] SMP KASAN -KASAN: null-ptr-deref in range [0x00000000000000a8-0x00000000000000af] -CPU: 0 PID: 0 Comm: swapper/0 Not tainted 5.6.0-rc5-syzkaller #0 - -Call Trace -__usb_hcd_giveback_urb+0x29a/0x550 drivers/usb/core/hcd.c:1650 -usb_hcd_giveback_urb+0x368/0x420 drivers/usb/core/hcd.c:1716 -dummy_timer+0x1258/0x32ae drivers/usb/gadget/udc/dummy_hcd.c:1966 -call_timer_fn+0x195/0x6f0 kernel/time/timer.c:1404 -expire_timers kernel/time/timer.c:1449 [inline] -__run_timers kernel/time/timer.c:1773 [inline] -__run_timers kernel/time/timer.c:1740 [inline] -run_timer_softirq+0x5f9/0x1500 kernel/time/timer.c:1786 -__do_softirq+0x21e/0x950 kernel/softirq.c:292 -invoke_softirq kernel/softirq.c:373 [inline] -irq_exit+0x178/0x1a0 kernel/softirq.c:413 -exiting_irq arch/x86/include/asm/apic.h:546 [inline] -smp_apic_timer_interrupt+0x141/0x540 arch/x86/kernel/apic/apic.c:1146 -apic_timer_interrupt+0xf/0x20 arch/x86/entry/entry_64.S:829 - -Reported-and-tested-by: syzbot+40d5d2e8a4680952f042@syzkaller.appspotmail.com -Signed-off-by: Qiujun Huang -Signed-off-by: Kalle Valo -Link: https://lore.kernel.org/r/20200404041838.10426-6-hqjagain@gmail.com -Signed-off-by: Greg Kroah-Hartman ---- - drivers/net/wireless/ath/ath9k/hif_usb.c | 48 ++++++++++++++++++++++++-------- - drivers/net/wireless/ath/ath9k/hif_usb.h | 5 ++++ - 2 files changed, 42 insertions(+), 11 deletions(-) - -diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c -index 6049d3766c64..4ed21dad6a8e 100644 ---- b/drivers/net/wireless/ath/ath9k/hif_usb.c -+++ a/drivers/net/wireless/ath/ath9k/hif_usb.c -@@ -643,9 +643,9 @@ - - static void ath9k_hif_usb_rx_cb(struct urb *urb) - { -- struct rx_buf *rx_buf = (struct rx_buf *)urb->context; -- struct hif_device_usb *hif_dev = rx_buf->hif_dev; -- struct sk_buff *skb = rx_buf->skb; -+ struct sk_buff *skb = (struct sk_buff *) urb->context; -+ struct hif_device_usb *hif_dev = -+ usb_get_intfdata(usb_ifnum_to_if(urb->dev, 0)); - int ret; - - if (!skb) -@@ -685,15 +685,14 @@ - return; - free: - kfree_skb(skb); -- kfree(rx_buf); - } - - static void ath9k_hif_usb_reg_in_cb(struct urb *urb) - { -- struct rx_buf *rx_buf = (struct rx_buf *)urb->context; -- struct hif_device_usb *hif_dev = rx_buf->hif_dev; -- struct sk_buff *skb = rx_buf->skb; -+ struct sk_buff *skb = (struct sk_buff *) urb->context; - struct sk_buff *nskb; -+ struct hif_device_usb *hif_dev = -+ usb_get_intfdata(usb_ifnum_to_if(urb->dev, 0)); - int ret; - - if (!skb) -@@ -751,7 +750,6 @@ - return; - free: - kfree_skb(skb); -- kfree(rx_buf); - urb->context = NULL; - } - -@@ -797,7 +795,7 @@ - init_usb_anchor(&hif_dev->mgmt_submitted); - - for (i = 0; i < MAX_TX_URB_NUM; i++) { -- tx_buf = kzalloc(sizeof(*tx_buf), GFP_KERNEL); -+ tx_buf = kzalloc(sizeof(struct tx_buf), GFP_KERNEL); - if (!tx_buf) - goto err; - -@@ -834,9 +832,8 @@ - - static int ath9k_hif_usb_alloc_rx_urbs(struct hif_device_usb *hif_dev) - { -- struct rx_buf *rx_buf = NULL; -+ struct urb *urb = NULL; - struct sk_buff *skb = NULL; -- struct urb *urb = NULL; - int i, ret; - - init_usb_anchor(&hif_dev->rx_submitted); -@@ -844,12 +841,6 @@ - - for (i = 0; i < MAX_RX_URB_NUM; i++) { - -- rx_buf = kzalloc(sizeof(*rx_buf), GFP_KERNEL); -- if (!rx_buf) { -- ret = -ENOMEM; -- goto err_rxb; -- } -- - /* Allocate URB */ - urb = usb_alloc_urb(0, GFP_KERNEL); - if (urb == NULL) { -@@ -864,14 +855,11 @@ - goto err_skb; - } - -- rx_buf->hif_dev = hif_dev; -- rx_buf->skb = skb; -- - usb_fill_bulk_urb(urb, hif_dev->udev, - usb_rcvbulkpipe(hif_dev->udev, - USB_WLAN_RX_PIPE), - skb->data, MAX_RX_BUF_SIZE, -- ath9k_hif_usb_rx_cb, rx_buf); -+ ath9k_hif_usb_rx_cb, skb); - - /* Anchor URB */ - usb_anchor_urb(urb, &hif_dev->rx_submitted); -@@ -897,8 +885,6 @@ - err_skb: - usb_free_urb(urb); - err_urb: -- kfree(rx_buf); --err_rxb: - ath9k_hif_usb_dealloc_rx_urbs(hif_dev); - return ret; - } -@@ -910,21 +896,14 @@ - - static int ath9k_hif_usb_alloc_reg_in_urbs(struct hif_device_usb *hif_dev) - { -- struct rx_buf *rx_buf = NULL; -+ struct urb *urb = NULL; - struct sk_buff *skb = NULL; -- struct urb *urb = NULL; - int i, ret; - - init_usb_anchor(&hif_dev->reg_in_submitted); - - for (i = 0; i < MAX_REG_IN_URB_NUM; i++) { - -- rx_buf = kzalloc(sizeof(*rx_buf), GFP_KERNEL); -- if (!rx_buf) { -- ret = -ENOMEM; -- goto err_rxb; -- } -- - /* Allocate URB */ - urb = usb_alloc_urb(0, GFP_KERNEL); - if (urb == NULL) { -@@ -939,14 +918,11 @@ - goto err_skb; - } - -- rx_buf->hif_dev = hif_dev; -- rx_buf->skb = skb; -- - usb_fill_int_urb(urb, hif_dev->udev, - usb_rcvintpipe(hif_dev->udev, - USB_REG_IN_PIPE), - skb->data, MAX_REG_IN_BUF_SIZE, -- ath9k_hif_usb_reg_in_cb, rx_buf, 1); -+ ath9k_hif_usb_reg_in_cb, skb, 1); - - /* Anchor URB */ - usb_anchor_urb(urb, &hif_dev->reg_in_submitted); -@@ -972,8 +948,6 @@ - err_skb: - usb_free_urb(urb); - err_urb: -- kfree(rx_buf); --err_rxb: - ath9k_hif_usb_dealloc_reg_in_urbs(hif_dev); - return ret; - } -diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.h b/drivers/net/wireless/ath/ath9k/hif_usb.h -index a94e7e1c86e9..5985aa15ca93 100644 ---- b/drivers/net/wireless/ath/ath9k/hif_usb.h -+++ a/drivers/net/wireless/ath/ath9k/hif_usb.h -@@ -86,11 +86,6 @@ - struct list_head list; - }; - --struct rx_buf { -- struct sk_buff *skb; -- struct hif_device_usb *hif_dev; --}; -- - #define HIF_USB_TX_STOP BIT(0) - #define HIF_USB_TX_FLUSH BIT(1) - -+- -cgit 1.2.3-1.el7 - -- cgit v1.2.3 From 5d24e8735e0ce8e4619c0453a6033459240bf1f5 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 23 Jul 2020 00:26:25 -0400 Subject: gnu: linux-libre@4.19: Update to 4.19.134. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.134. (linux-libre-4.19-pristine-source): Update hash. (deblob-scripts-4.19): Update to 4.19.134. --- gnu/packages/linux.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index a1e18ba834..9d21e7f2a8 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -212,7 +212,7 @@ (define deblob-scripts-5.4 (define deblob-scripts-4.19 (linux-libre-deblob-scripts - "4.19.132" + "4.19.134" (base32 "02zs405awaxydbapka4nz8h6lmnc0dahgczqsrs5s2bmzjyyqkcy") (base32 "1w2wgxblpq09i33qmqgw5v3r5rm9vkkygr6m0sgv4zgczk9s29wr"))) @@ -391,10 +391,10 @@ (define-public linux-libre-5.4-pristine-source (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.133") +(define-public linux-libre-4.19-version "4.19.134") (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "1i6vfzg8xds4lvvzkxaak74727iq35hx4vxr14w65bq9gpzfacxr"))) + (hash (base32 "0vrsiqqsiv0z4jhafqch2g27ig28nmw69hw32a8lc5fkcm7shzbx"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From 1c97d12bdbb93b4df1a9859835a7a883dfb40b88 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 23 Jul 2020 00:27:46 -0400 Subject: gnu: linux-libre@5.7: Update to 5.7.10. * gnu/packages/linux.scm (linux-libre-5.7-version): Update to 5.7.10. (linux-libre-5.7-pristine-source): Update hash. (deblob-scripts-5.7): Update to 5.7.10. --- gnu/packages/linux.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 9d21e7f2a8..b88ea80609 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -200,7 +200,7 @@ (define (linux-libre-deblob-scripts version (define deblob-scripts-5.7 (linux-libre-deblob-scripts - "5.7.8" + "5.7.10" (base32 "1gharhw104wxp9dxjkzzvsqc2xn44mc9yvacc3v7jh7b6bb0a64a") (base32 "1n198gx18rxc7xflgiwya43inkwayc91pgb129kngfza8sm6v8ks"))) @@ -375,10 +375,10 @@ (define (%upstream-linux-source version hash) (sha256 hash))) -(define-public linux-libre-5.7-version "5.7.9") +(define-public linux-libre-5.7-version "5.7.10") (define-public linux-libre-5.7-pristine-source (let ((version linux-libre-5.7-version) - (hash (base32 "1y231c3lf94lgnnn8bzi2yfx40h4xsli2hq0kaxdd744lxk30zd8"))) + (hash (base32 "0i1x347q1rs9r11f7qic62d5465dzngxs0n44ryknmxpcl6469a7"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.7))) -- cgit v1.2.3 From 8570fe3b60083adde6a068aaf4fec5e7ec7aa4b9 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 23 Jul 2020 00:28:46 -0400 Subject: gnu: linux-libre: Update to 5.4.53. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.53. (linux-libre-5.4-pristine-source): Update hash. (deblob-scripts-5.4): Update to 5.4.53. --- gnu/packages/linux.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b88ea80609..14bccadce3 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -206,7 +206,7 @@ (define deblob-scripts-5.7 (define deblob-scripts-5.4 (linux-libre-deblob-scripts - "5.4.51" + "5.4.53" (base32 "0ckxn7k5zgcqk30dq943bnamr6a6zjbw2aqjl3x30f4kvh5f6k25") (base32 "10qb890is4z58vr8czh3xx69q62l3b3j38y410kgiw8nii3zx5lr"))) @@ -383,10 +383,10 @@ (define-public linux-libre-5.7-pristine-source (%upstream-linux-source version hash) deblob-scripts-5.7))) -(define-public linux-libre-5.4-version "5.4.52") +(define-public linux-libre-5.4-version "5.4.53") (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "0fjxx8xpp0v0wwfw6zd5nc21i2r82wzcsy2yyl7w5c90259zlzh3"))) + (hash (base32 "08bd7lgj2c26h3rm8lm7w6dvi8zhjiilmrxf1rpp5m90jbwvd9zs"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit v1.2.3 From 0b5960df47a288a688dfac8e48eb9281d09449dc Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Wed, 22 Jul 2020 23:54:52 -0500 Subject: gnu: polyml: Update to 5.8.1. * gnu/packages/sml.scm (polyml): Update to 5.8.1. --- gnu/packages/sml.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/sml.scm b/gnu/packages/sml.scm index 216272517b..6db8028177 100644 --- a/gnu/packages/sml.scm +++ b/gnu/packages/sml.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2017 Andy Patterson ;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; Copyright © 2018 Ricardo Wurmus -;;; Copyright © 2019 Brett Gilio +;;; Copyright © 2019, 2020 Brett Gilio ;;; ;;; This file is part of GNU Guix. ;;; @@ -33,7 +33,7 @@ (define-module (gnu packages sml) (define-public polyml (package (name "polyml") - (version "5.8") + (version "5.8.1") (source (origin (method git-fetch) (uri (git-reference @@ -42,7 +42,7 @@ (define-public polyml (file-name (git-file-name name version)) (sha256 (base32 - "1jabrf9cnmsppawga6q5pjiq1cdayilxp66fkxykczs6vv2gz7f9")))) + "1ag7n55ym1zxksi89dvs17j6iaa58v4mg47s92zpa1b49k4fql1k")))) (build-system gnu-build-system) (inputs `(("gmp" ,gmp) -- cgit v1.2.3 From 2597e47d9ef8bb868e341f6d1c01b76d81a9ae6b Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Thu, 23 Jul 2020 09:50:43 +0200 Subject: gnu: khal: Fix a failing test. * gnu/packages/calendar.scm (khal)[arguments]: Fix a failing test. Signed-off-by: Efraim Flashner --- gnu/packages/calendar.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm index 726687d488..53c73c969d 100644 --- a/gnu/packages/calendar.scm +++ b/gnu/packages/calendar.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2020 Marius Bakke +;;; Copyright © 2020 Tanguy Le Carrour ;;; ;;; This file is part of GNU Guix. ;;; @@ -195,6 +196,12 @@ (define-public khal "doc/build/man/khal.1" (string-append (assoc-ref outputs "out") "/share/man/man1")) #t)) + (add-before 'check 'fix-tests + (lambda _ + ;; Reported upstream: . + (substitute* "tests/cli_test.py" + (("Invalid value for \"\\[ICS\\]\"") "Invalid value for \\'[ICS]\\'")) + #t)) (replace 'check (lambda* (#:key inputs #:allow-other-keys) ;; The tests require us to choose a timezone. -- cgit v1.2.3 From f7b7c785b6e05ecd3efe98ac81ddc00432d683dd Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 23 Jul 2020 12:24:45 +0300 Subject: gnu: python-django: Update to 1.11.29. * gnu/packages/django.scm (python-django): Update to 1.11.29. --- gnu/packages/django.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index d2faff357e..9652165a9b 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -44,13 +44,13 @@ (define-module (gnu packages django) (define-public python-django (package (name "python-django") - (version "1.11.28") + (version "1.11.29") (source (origin (method url-fetch) (uri (pypi-uri "Django" version)) (sha256 (base32 - "1ss1jyip7mlbfjn27m0j6wx80s8h4ksg6g5annkgwigp8xgy6g5k")))) + "171jsi54fbnxzi2n3l4hkdmmwfnfrwacs180rw59l0bqcvxsw022")))) (build-system python-build-system) (arguments '(#:modules ((srfi srfi-1) -- cgit v1.2.3 From 3f8041f9cd75e91fcb10e9100c567a9b7ad20570 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 23 Jul 2020 12:25:11 +0300 Subject: gnu: python-django: Add optional inputs. * gnu/packages/django.scm (python-django)[propagated-inputs]: Add python-argon2-cffi, python-bcrypt. --- gnu/packages/django.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index 9652165a9b..2370de62f5 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -35,6 +35,7 @@ (define-module (gnu packages django) #:use-module (gnu packages geo) #:use-module (gnu packages python) #: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 sphinx) @@ -84,9 +85,6 @@ (define-public python-django ;; TODO: Install extras/django_bash_completion. (native-inputs `(("tzdata" ,tzdata-for-tests) - ;; bcrypt and argon2-cffi are extra requirements not yet in guix - ;;("python-argon2-cffi" ,python-argon2-cffi) ; >= 16.1.0 - ;;("python-bcrypt" ,python-bcrypt) ; not py-bcrypt! ;; Remaining packages are test requirements taken from ;; tests/requirements/py3.txt ("python-docutils" ,python-docutils) @@ -100,7 +98,9 @@ (define-public python-django ("python-sqlparse" ,python-sqlparse) ("python-tblib" ,python-tblib))) (propagated-inputs - `(("python-pytz" ,python-pytz))) + `(("python-argon2-cffi" ,python-argon2-cffi) + ("python-bcrypt" ,python-bcrypt) + ("python-pytz" ,python-pytz))) (home-page "https://www.djangoproject.com/") (synopsis "High-level Python Web framework") (description -- cgit v1.2.3 From adaff1a4811e5a00659346a196b3beca130e7e2e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 23 Jul 2020 14:14:52 +0200 Subject: gnu: warzone2100: Update to 3.4.1. * gnu/packages/games.scm (warzone2100): Update to 3.4.1. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 6d796a941d..556f813396 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4566,7 +4566,7 @@ (define-public tennix (define-public warzone2100 (package (name "warzone2100") - (version "3.4.0") + (version "3.4.1") (source (origin (method url-fetch) @@ -4574,7 +4574,7 @@ (define-public warzone2100 version "/warzone2100_src.tar.xz")) (sha256 - (base32 "0g4qwi9zw0s4pfgrz3fxhargsj3405rbrh9zy3b2j3arzss2h0gy")) + (base32 "0savalmw1kp1sf8vg5aqrl5hc77p4jacxy5y9qj8k2hi2vqdfb7a")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 821237566fbe5770b9cfd932b0ba510a377cd6dd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 23 Jul 2020 04:41:39 +0200 Subject: gnu: fio: Update to 3.21. * gnu/packages/benchmark.scm (fio): Update to 3.21. --- gnu/packages/benchmark.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm index 9b06cc4d58..5bd16ad7be 100644 --- a/gnu/packages/benchmark.scm +++ b/gnu/packages/benchmark.scm @@ -46,14 +46,14 @@ (define-module (gnu packages benchmark) (define-public fio (package (name "fio") - (version "3.20") + (version "3.21") (source (origin (method url-fetch) (uri (string-append "https://brick.kernel.dk/snaps/" "fio-" version ".tar.bz2")) (sha256 (base32 - "1mwqafn81a9pxy2kw9rl4p3r2brhg2ckwrcwzy0q4gffxgn3k9c7")))) + "0np1scxqfpd6fcnnnfyn8xdsh6lc5pyq3vk1jm1zk7sa58fvccd4")))) (build-system gnu-build-system) (arguments '(#:test-target "test" -- cgit v1.2.3 From 56d1ab2537465302b13aaaa3c07808c0b60395b5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 23 Jul 2020 04:42:15 +0200 Subject: gnu: rgbds: Update to 0.4.1. * gnu/packages/assembly.scm (rgbds): Update to 0.4.1. --- gnu/packages/assembly.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm index aa92ccb1c9..6587dc5aa2 100644 --- a/gnu/packages/assembly.scm +++ b/gnu/packages/assembly.scm @@ -261,7 +261,7 @@ (define-public libjit (define-public rgbds (package (name "rgbds") - (version "0.4.0") + (version "0.4.1") (source (origin (method git-fetch) (uri (git-reference @@ -270,7 +270,7 @@ (define-public rgbds (file-name (git-file-name name version)) (sha256 (base32 - "15680964nlsa83nqgxk7knxajn98lddz2hg6jnn8ffmnms5wdam7")))) + "05djzl3h18zg2z5p2a881wjbmgikzkhf67cgk00frhw4v05sq0lf")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 4f204533b7183adadfe5cbe7f8bcd7d11c430b44 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 23 Jul 2020 04:53:06 +0200 Subject: gnu: ansible: Update to 2.9.11. * gnu/packages/admin.scm (ansible): Update to 2.9.11. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index ddf6bb8bea..c0e7831d5b 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2165,13 +2165,13 @@ (define-public graphios (define-public ansible (package (name "ansible") - (version "2.9.10") + (version "2.9.11") (source (origin (method url-fetch) (uri (pypi-uri "ansible" version)) (sha256 - (base32 "1kfaxd7w8qiis2vv96kgrhiqh158qb0z4lspr9c8fsdi5m1z2rh8")))) + (base32 "1c9ayh61qwasgncmlw7rjx5r4g5n2cpg1d5blgn53zg7xhrx1yc8")))) (build-system python-build-system) (native-inputs `(("python-bcrypt" ,python-bcrypt) -- cgit v1.2.3 From e4d341fa74d005cc3cd1437a1908ba1993d54d5b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 23 Jul 2020 04:58:26 +0200 Subject: gnu: ccache: Update to 3.7.11. * gnu/packages/ccache.scm (ccache): Update to 3.7.11. --- gnu/packages/ccache.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ccache.scm b/gnu/packages/ccache.scm index 261f84de70..5a1128f44c 100644 --- a/gnu/packages/ccache.scm +++ b/gnu/packages/ccache.scm @@ -30,14 +30,14 @@ (define-module (gnu packages ccache) (define-public ccache (package (name "ccache") - (version "3.7.10") + (version "3.7.11") (source (origin (method url-fetch) (uri (string-append "https://github.com/ccache/ccache/releases/download/v" version "/ccache-" version ".tar.xz")) (sha256 - (base32 "0a7dajdpnh14nmd10ji897rzqn6847lr36hdbig2rv7sxbc6d58c")))) + (base32 "0s1g0ylrayzax68xlqnxx46f5bhvr2pcm1yzswmj0kcs14404icd")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl) ; for test/run ("which" ,(@ (gnu packages base) which)))) -- cgit v1.2.3 From 7235ce224e3d20b5f73474cac2d3b34b50d754a5 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Thu, 23 Jul 2020 12:13:59 -0500 Subject: gnu: Add mercury. * gnu/local.mk (GNU_SYSTEM_MODULES): Add mercury.scm. * gnu/packages/mercury.scm: New file. --- gnu/local.mk | 3 +- gnu/packages/mercury.scm | 251 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 253 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/mercury.scm diff --git a/gnu/local.mk b/gnu/local.mk index 447b9c3d4c..139c17e751 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -24,7 +24,7 @@ # Copyright © 2019, 2020 John Soo # Copyright © 2019 Jonathan Brielmaier # Copyright © 2019 Evan Straw -# Copyright © 2019 Brett Gilio +# Copyright © 2019, 2020 Brett Gilio # Copyright © 2019 Amin Bandali # Copyright © 2020 Brendan Tildesley # Copyright © 2020 Vincent Legoll @@ -363,6 +363,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/mc.scm \ %D%/packages/mcrypt.scm \ %D%/packages/medical.scm \ + %D%/packages/mercury.scm \ %D%/packages/mes.scm \ %D%/packages/messaging.scm \ %D%/packages/mingw.scm \ diff --git a/gnu/packages/mercury.scm b/gnu/packages/mercury.scm new file mode 100644 index 0000000000..a6ae451e63 --- /dev/null +++ b/gnu/packages/mercury.scm @@ -0,0 +1,251 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2020 Brett Gilio +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages mercury) + #:use-module (guix download) + #:use-module (guix git-download) + #:use-module (guix packages) + #:use-module (guix utils) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix build-system gnu) + #:use-module (gnu packages autotools) + #:use-module (gnu packages bdw-gc) + #:use-module (gnu packages readline) + #:use-module (gnu packages texinfo) + #:use-module (gnu packages flex) + #:use-module (gnu packages shells) + #:use-module (gnu packages bison) + #:use-module (gnu packages pkg-config) + #:use-module (ice-9 match)) ; match-lambda + +;; NOTE: Mercury uses a tightly coupled fork of BDWGC and +;; libatomic-ops. When updating the package, please check the GitHub +;; repository to ensure that the submodule commit matches what is +;; provided. +(define (gc-fork package-name package-url + package-commit package-hash) + (let ((commit package-commit)) + (package (inherit package-name) + (source + (origin + (method git-fetch) + (uri (git-reference + (url package-url) + (commit commit))) + (sha256 (base32 package-hash))))))) + +;; NOTE: Mercury /MUST/ bootstrap from a tarball release. +;; Once the bootstrapping compiler is established, this +;; minimal build can be used for further compiling Mercury +;; from a git checkout with additional grades enabled. +(define-public mercury-minimal + (package + (name "mercury-minimal") + (version "20.06") + (source (origin + (method url-fetch) + (uri (string-append + "https://dl.mercurylang.org/release/mercury-srcdist-" + version ".tar.gz")) + (sha256 + (base32 + "1gkr9w8lsdzqykqwd3f1a1phsqv090648i14ilhv8jdg85frdimr")))) + (build-system gnu-build-system) + (arguments + `(#:modules ((guix build gnu-build-system) + (guix build utils) + (ice-9 match)) + #:tests? #f ; Tests are run on the stage-2 compiler. + ;; TODO: Find a way to bypass all static linkages. + #:configure-flags (list "--enable-minimal-install") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'replace-boehm-gc + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (libgc (assoc-ref inputs "libgc")) + (libatomic-ops (assoc-ref inputs "libatomic-ops")) + (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))) + (delete-file-recursively new-name) + (invoke "mv" orig-name new-name) + (with-directory-excursion new-name + (apply patch-source-shebangs (list #:source src))))) + `((,libgc "source" "boehm_gc"))) + (map (match-lambda + ((src orig-name new-name) + (with-directory-excursion "." + (apply unpack (list #:source src))) + (delete-file-recursively new-name) + (invoke "mv" orig-name new-name) + (with-directory-excursion new-name + (apply patch-source-shebangs (list #:source src))))) + `((,libatomic-ops "source" "boehm_gc/libatomic_ops"))) + #t))) + (add-after 'replace-boehm-gc 'patch-paths + (lambda _ + (substitute* + (list "Makefile" + "Mmakefile" + "scripts/mercury_update_interface.in" + "scripts/mercury_config.in" + "scripts/mmake.in" + "scripts/Mmake.vars.in" + "scripts/mdb.in" + "scripts/rs6000_hack" + "scripts/fullarch" + "scripts/mmc.in" + "scripts/canonical_grade" + "scripts/mprof.in" + "scripts/gud.el" + "scripts/ml.in" + "scripts/canonical_grade.in" + "scripts/mdprof.in" + "scripts/vpath_find" + "scripts/mkfifo_using_mknod.in" + "scripts/prepare_install_dir.in" + "scripts/mprof_merge_runs" + "scripts/mtc" + "scripts/mgnuc.in" + "scripts/c2init.in" + "bindist/bindist.Makefile" + "boehm_gc/configure.ac" + "boehm_gc/Makefile.direct") + (("/bin/sh") (which "sh")) + (("/bin/pwd") (which "pwd")) + (("/bin/rm") (which "rm"))) + #t))))) + (native-inputs + `(("texinfo" ,texinfo) + ("flex" ,flex) + ("tcsh", tcsh) + ("bison" ,bison) + ("readline" ,readline) + ("libatomic-ops" ,(package-source + (gc-fork + libatomic-ops + "https://github.com/Mercury-Language/libatomic_ops.git" + "49b70d57f6922fd8be55a7dcb77955c8abfc9ae9" + "1flvwscsa6b2b8a38vhhcgl10bbkb5nnihw7s7iia60cinf7wcqm"))) + ("libgc" ,(package-source + (gc-fork + libgc-7 + "https://github.com/Mercury-Language/bdwgc.git" + "43ac2ea45261ba0a715534e9da41b2504904c46a" + "0bmzmbs7id0ndyhy9xli6fhfad1shrim6vmy2k8m1nqr5wb31q76"))) + ("pkg-config" ,pkg-config))) + (synopsis "Pure logic programming language (used only for +bootstrapping dependent Mercury)") + (description "Mercury is a logic/functional programming language which +combines the clarity and expressiveness of declarative programming with advanced +static analysis and error detection features. Its highly optimized execution +algorithm delivers efficiency far in excess of existing logic programming +systems, and close to conventional programming systems. Mercury addresses +the problems of large-scale program development, allowing modularity, +separate compilation, and numerous optimization/time trade-offs.") + (home-page "https://mercurylang.org") + (license license:gpl2))) + +;; NOTE: This package is quite large and will take an extensive +;; amount of time to compile, especially with bootcheck functionality +;; enabled. To ensure that we do not monopolize the CI & build servers, +;; please make sure that your changes are justified. +(define-public mercury + (package (inherit mercury-minimal) + (name "mercury") + (version "20.06") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Mercury-Language/mercury") + (commit (string-append + "version-" + (string-join (string-split version #\.) "_"))))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1pc51r7vlqmi689rkwdkk1ka2dyk36q11dqvl339cizng6mp72h6")))) + (arguments + (substitute-keyword-arguments + (package-arguments mercury-minimal) + ;; TODO: Find a way to bypass all static linkages. + ((#:configure-flags flags ''()) + `(list "")) + ((#:tests? _) #f) ; FIXME: Many test-cases failing. + ((#:phases phases) + `(modify-phases ,phases + (replace 'patch-paths + (lambda _ + (substitute* + (list "prepare.sh" + "Makefile" + "Mmakefile" + "scripts/mercury_update_interface.in" + "scripts/mercury_config.in" + "scripts/mmake.in" + "scripts/Mmake.vars.in" + "scripts/mdb.in" + "scripts/rs6000_hack" + "scripts/fullarch" + "scripts/mmc.in" + "scripts/mprof.in" + "scripts/gud.el" + "scripts/ml.in" + "scripts/canonical_grade.in" + "scripts/mdprof.in" + "scripts/vpath_find" + "scripts/mkfifo_using_mknod.in" + "scripts/prepare_install_dir.in" + "scripts/mprof_merge_runs" + "scripts/mtc" + "scripts/mgnuc.in" + "scripts/c2init.in" + "tools/bootcheck" + "boehm_gc/configure.ac" + "boehm_gc/Makefile.direct") + (("/bin/sh") (which "sh")) + (("/bin/pwd") (which "pwd")) + (("/bin/rm") (which "rm")) + (("boehm_gc/.git") "boehm_gc")) + #t)) + (replace 'bootstrap + (lambda _ + (invoke "./prepare.sh") + #t)))))) + ;; TODO: Uncomment phase when tests are enabled. + ;; (replace 'check + ;; (lambda _ + ;; (invoke "./tools/bootcheck") + ;; #t)) + ;; + ;; TODO: The mercury configuration system determines + ;; grade support by looking for available toolchains. + ;; Eventually we need to add inputs for Java, Erlang, + ;; C#, etc. in order to enable these extra grades. + (native-inputs + `(("mercury-minimal" ,mercury-minimal) + ("autoconf" ,autoconf) + ("automake" ,automake) + ,@(package-native-inputs mercury-minimal))) + (synopsis "Pure logic programming language"))) -- cgit v1.2.3 From e165a2492d73d37c8b95d6970d453b9d88911ee6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 23 Jul 2020 19:35:53 +0200 Subject: gnu: ungoogled-chromium: Avoid top-level reference to LLD. * gnu/packages/chromium.scm (lld-as-ld, lld-wrapper, lld/wrapped): Move into ... (make-lld-wrapper): ... here. New procedure. --- gnu/packages/chromium.scm | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index 7955981261..d828c25bc2 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -423,21 +423,21 @@ (define xcb-proto/python2 ;; 'make-ld-wrapper' can only work with an 'ld' executable, so we need ;; this trick to make it wrap 'lld'. -(define lld-as-ld - (computed-file "lld-ld" - #~(begin - (mkdir #$output) - (mkdir (string-append #$output "/bin")) - (symlink #$(file-append lld "/bin/lld") - (string-append #$output "/bin/ld"))))) - -;; Create a wrapper for LLD that inserts appropriate -rpath entries. -(define lld-wrapper - (make-ld-wrapper "lld-wrapper" - #:binutils lld-as-ld)) - -;; Clang looks for an 'ld.lld' executable, so we need to symlink it back. -(define lld/wrapped +(define (make-lld-wrapper lld) + (define lld-as-ld + (computed-file "lld-ld" + #~(begin + (mkdir #$output) + (mkdir (string-append #$output "/bin")) + (symlink #$(file-append lld "/bin/lld") + (string-append #$output "/bin/ld"))))) + + ;; Create a wrapper for LLD that inserts appropriate -rpath entries. + (define lld-wrapper + (make-ld-wrapper "lld-wrapper" + #:binutils lld-as-ld)) + + ;; Clang looks for an 'ld.lld' executable, so we need to symlink it back. (computed-file "lld-wrapped" #~(begin (mkdir #$output) @@ -788,7 +788,7 @@ (define-public ungoogled-chromium ("clang" ,clang-10) ("gn" ,gn) ("gperf" ,gperf) - ("ld-wrapper" ,lld/wrapped) + ("ld-wrapper" ,(make-lld-wrapper lld)) ("ninja" ,ninja) ("node" ,node) ("pkg-config" ,pkg-config) -- cgit v1.2.3 From 5f63905096e456097fca206f56ce9257f72faf64 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 22 Jul 2020 13:47:39 -0400 Subject: gnu: Fix Krita. Fixes . Reported by linka on #guix. * gnu/packages/patches/qtbase-fix-krita-deadlock.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/kde.scm (qtbase-for-krita): New variable. (krita)[inputs]: Replace qtbase with qtbase-for-krita. --- gnu/local.mk | 1 + gnu/packages/kde.scm | 10 +- .../patches/qtbase-fix-krita-deadlock.patch | 110 +++++++++++++++++++++ gnu/packages/qt.scm | 1 + 4 files changed, 121 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/qtbase-fix-krita-deadlock.patch diff --git a/gnu/local.mk b/gnu/local.mk index 139c17e751..2c0d5076d3 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1489,6 +1489,7 @@ dist_patch_DATA = \ %D%/packages/patches/qrcodegen-cpp-make-install.patch \ %D%/packages/patches/qt4-ldflags.patch \ %D%/packages/patches/qtbase-absolute-runpath.patch \ + %D%/packages/patches/qtbase-fix-krita-deadlock.patch \ %D%/packages/patches/qtbase-moc-ignore-gcc-macro.patch \ %D%/packages/patches/qtbase-use-TZDIR.patch \ %D%/packages/patches/qtscript-disable-tests.patch \ diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 9a80e362b6..9fa8ed7c15 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -360,6 +360,14 @@ (define-public kdiagram illustrate project schedules.") (license license:gpl2+))) +(define qtbase-for-krita + (package + (inherit qtbase) + (source (origin + (inherit (package-source qtbase)) + (patches (append (origin-patches (package-source qtbase)) + (search-patches "qtbase-fix-krita-deadlock.patch"))))))) + (define-public krita (package (name "krita") @@ -434,7 +442,7 @@ (define-public krita ("openexr" ,openexr) ("perl" ,perl) ("poppler-qt5" ,poppler-qt5) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-for-krita) ("qtdeclarative" ,qtdeclarative) ("qtmultimedia" ,qtmultimedia) ("qtsvg" ,qtsvg) diff --git a/gnu/packages/patches/qtbase-fix-krita-deadlock.patch b/gnu/packages/patches/qtbase-fix-krita-deadlock.patch new file mode 100644 index 0000000000..d3554be3c9 --- /dev/null +++ b/gnu/packages/patches/qtbase-fix-krita-deadlock.patch @@ -0,0 +1,110 @@ +Fix a deadlock in Krita: + +https://bugreports.qt.io/browse/QTBUG-83207 + +Patch copied from Qt bug tracker: + +https://codereview.qt-project.org/c/qt/qtbase/+/296034 + +From 276fa8383a7535765be7182883ef4aade17ce013 Mon Sep 17 00:00:00 2001 +From: Thiago Macieira +Date: Thu, 02 Apr 2020 12:08:41 -0300 +Subject: [PATCH] QLibrary: fix deadlock caused by fix to QTBUG-39642 + +Commit ae6f73e8566fa76470937aca737141183929a5ec inserted a mutex around +the entire load_sys(). We had reasoed that deadlocks would only occur if +the object creation in instance() recursed into its own instance(), +which was already a bug. But we had forgotten that dlopen()/ +LoadLibrary() executes initialization code from the module being loaded, +which could cause a recursion back into the same QPluginLoader or +QLibrary object. This recursion is benign because the module *is* loaded +and dlopen()/LoadLibrary() returns the same handle. + +[ChangeLog][QtCore][QLibrary and QPluginLoader] Fixed a deadlock that +would happen if the plugin or library being loaded has load-time +initialization code (C++ global variables) that recursed back into the +same QLibrary or QPluginLoader object. + +PS: QLibraryPrivate::loadPlugin() updates pluginState outside a mutex +lock, so pluginState should be made an atomic variable. Once that is +done, we'll only need locking the mutex to update errorString (no +locking before loading). + +Fixes: QTBUG-83207 +Task-number: QTBUG-39642 +Change-Id: Ibdc95e9af7bd456a94ecfffd160209304e5ab2eb +Reviewed-by: Volker Hilsheimer +Reviewed-by: David Faure +--- + +diff --git a/src/corelib/plugin/qlibrary.cpp b/src/corelib/plugin/qlibrary.cpp +index ddb053c..be9d92b 100644 +--- a/src/corelib/plugin/qlibrary.cpp ++++ b/src/corelib/plugin/qlibrary.cpp +@@ -576,9 +576,7 @@ + + Q_TRACE(QLibraryPrivate_load_entry, fileName); + +- mutex.lock(); + bool ret = load_sys(); +- mutex.unlock(); + if (qt_debug_component()) { + if (ret) { + qDebug() << "loaded library" << fileName; +diff --git a/src/corelib/plugin/qlibrary_unix.cpp b/src/corelib/plugin/qlibrary_unix.cpp +index 017aa97..a5c72f8 100644 +--- a/src/corelib/plugin/qlibrary_unix.cpp ++++ b/src/corelib/plugin/qlibrary_unix.cpp +@@ -123,6 +123,7 @@ + + bool QLibraryPrivate::load_sys() + { ++ QMutexLocker locker(&mutex); + QString attempt; + QFileSystemEntry fsEntry(fileName); + +@@ -213,6 +214,7 @@ + } + #endif + ++ locker.unlock(); + bool retry = true; + Handle hnd = nullptr; + for (int prefix = 0; retry && !hnd && prefix < prefixes.size(); prefix++) { +@@ -273,6 +275,8 @@ + } + } + #endif ++ ++ locker.relock(); + if (!hnd) { + errorString = QLibrary::tr("Cannot load library %1: %2").arg(fileName, qdlerror()); + } +diff --git a/src/corelib/plugin/qlibrary_win.cpp b/src/corelib/plugin/qlibrary_win.cpp +index 000bf76..ef58724 100644 +--- a/src/corelib/plugin/qlibrary_win.cpp ++++ b/src/corelib/plugin/qlibrary_win.cpp +@@ -78,6 +78,7 @@ + // fileName + // + // NB If it's a plugin we do not ever try the ".dll" extension ++ QMutexLocker locker(&mutex); + QStringList attempts; + + if (pluginState != IsAPlugin) +@@ -95,6 +96,7 @@ + attempts.prepend(QDir::rootPath() + fileName); + #endif + ++ locker.unlock(); + Handle hnd = nullptr; + for (const QString &attempt : qAsConst(attempts)) { + #ifndef Q_OS_WINRT +@@ -115,6 +117,7 @@ + #ifndef Q_OS_WINRT + SetErrorMode(oldmode); + #endif ++ locker.relock(); + if (!hnd) { + errorString = QLibrary::tr("Cannot load library %1: %2").arg( + QDir::toNativeSeparators(fileName), qt_error_string()); diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 0cb36427a0..e0e71c595d 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -342,6 +342,7 @@ (define-public qt-4 (define-public qtbase (package (name "qtbase") + ;; TODO Remove ((gnu packages kde) qtbase-for-krita) when upgrading qtbase. (version "5.14.2") (source (origin (method url-fetch) -- cgit v1.2.3 From e61b3bcd79a85babde19101118e9d51cd769fbbb Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 23 Jul 2020 16:53:52 -0400 Subject: Revert "gnu: Fix Krita." This reverts commit 5f63905096e456097fca206f56ce9257f72faf64. This commit caused `guix pull` to crash like this: ------ Backtrace: In ice-9/boot-9.scm: 222:29 19 (map1 _) 222:29 18 (map1 _) 222:29 17 (map1 _) 222:29 16 (map1 _) 222:17 15 (map1 (((gnu packages kde)) ((gnu packages libevent)) ((gnu packages libidn)) ((gnu packages #)) ((?)) ?)) 3297:17 14 (resolve-interface (gnu packages kde) #:select _ #:hide _ #:prefix _ #:renamer _ #:version _) In ice-9/threads.scm: 390:8 13 (_ _) In ice-9/boot-9.scm: 3223:13 12 (_) In ice-9/threads.scm: 390:8 11 (_ _) In ice-9/boot-9.scm: 3507:20 10 (_) 2806:4 9 (save-module-excursion _) 3527:26 8 (_) In unknown file: 7 (primitive-load-path "gnu/packages/kde" #) In ice-9/eval.scm: 626:19 6 (_ #) 293:34 5 (_ #) 173:47 4 (_ #(# #)) 159:9 3 (_ #(# #)) 191:35 2 (_ #(# #)) 223:20 1 (proc #(# #)) In unknown file: 0 (%resolve-variable (7 . qtbase) #) ERROR: In procedure %resolve-variable: error: qtbase: unbound variable ------ --- gnu/local.mk | 1 - gnu/packages/kde.scm | 10 +- .../patches/qtbase-fix-krita-deadlock.patch | 110 --------------------- gnu/packages/qt.scm | 1 - 4 files changed, 1 insertion(+), 121 deletions(-) delete mode 100644 gnu/packages/patches/qtbase-fix-krita-deadlock.patch diff --git a/gnu/local.mk b/gnu/local.mk index 2c0d5076d3..139c17e751 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1489,7 +1489,6 @@ dist_patch_DATA = \ %D%/packages/patches/qrcodegen-cpp-make-install.patch \ %D%/packages/patches/qt4-ldflags.patch \ %D%/packages/patches/qtbase-absolute-runpath.patch \ - %D%/packages/patches/qtbase-fix-krita-deadlock.patch \ %D%/packages/patches/qtbase-moc-ignore-gcc-macro.patch \ %D%/packages/patches/qtbase-use-TZDIR.patch \ %D%/packages/patches/qtscript-disable-tests.patch \ diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 9fa8ed7c15..9a80e362b6 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -360,14 +360,6 @@ (define-public kdiagram illustrate project schedules.") (license license:gpl2+))) -(define qtbase-for-krita - (package - (inherit qtbase) - (source (origin - (inherit (package-source qtbase)) - (patches (append (origin-patches (package-source qtbase)) - (search-patches "qtbase-fix-krita-deadlock.patch"))))))) - (define-public krita (package (name "krita") @@ -442,7 +434,7 @@ (define-public krita ("openexr" ,openexr) ("perl" ,perl) ("poppler-qt5" ,poppler-qt5) - ("qtbase" ,qtbase-for-krita) + ("qtbase" ,qtbase) ("qtdeclarative" ,qtdeclarative) ("qtmultimedia" ,qtmultimedia) ("qtsvg" ,qtsvg) diff --git a/gnu/packages/patches/qtbase-fix-krita-deadlock.patch b/gnu/packages/patches/qtbase-fix-krita-deadlock.patch deleted file mode 100644 index d3554be3c9..0000000000 --- a/gnu/packages/patches/qtbase-fix-krita-deadlock.patch +++ /dev/null @@ -1,110 +0,0 @@ -Fix a deadlock in Krita: - -https://bugreports.qt.io/browse/QTBUG-83207 - -Patch copied from Qt bug tracker: - -https://codereview.qt-project.org/c/qt/qtbase/+/296034 - -From 276fa8383a7535765be7182883ef4aade17ce013 Mon Sep 17 00:00:00 2001 -From: Thiago Macieira -Date: Thu, 02 Apr 2020 12:08:41 -0300 -Subject: [PATCH] QLibrary: fix deadlock caused by fix to QTBUG-39642 - -Commit ae6f73e8566fa76470937aca737141183929a5ec inserted a mutex around -the entire load_sys(). We had reasoed that deadlocks would only occur if -the object creation in instance() recursed into its own instance(), -which was already a bug. But we had forgotten that dlopen()/ -LoadLibrary() executes initialization code from the module being loaded, -which could cause a recursion back into the same QPluginLoader or -QLibrary object. This recursion is benign because the module *is* loaded -and dlopen()/LoadLibrary() returns the same handle. - -[ChangeLog][QtCore][QLibrary and QPluginLoader] Fixed a deadlock that -would happen if the plugin or library being loaded has load-time -initialization code (C++ global variables) that recursed back into the -same QLibrary or QPluginLoader object. - -PS: QLibraryPrivate::loadPlugin() updates pluginState outside a mutex -lock, so pluginState should be made an atomic variable. Once that is -done, we'll only need locking the mutex to update errorString (no -locking before loading). - -Fixes: QTBUG-83207 -Task-number: QTBUG-39642 -Change-Id: Ibdc95e9af7bd456a94ecfffd160209304e5ab2eb -Reviewed-by: Volker Hilsheimer -Reviewed-by: David Faure ---- - -diff --git a/src/corelib/plugin/qlibrary.cpp b/src/corelib/plugin/qlibrary.cpp -index ddb053c..be9d92b 100644 ---- a/src/corelib/plugin/qlibrary.cpp -+++ b/src/corelib/plugin/qlibrary.cpp -@@ -576,9 +576,7 @@ - - Q_TRACE(QLibraryPrivate_load_entry, fileName); - -- mutex.lock(); - bool ret = load_sys(); -- mutex.unlock(); - if (qt_debug_component()) { - if (ret) { - qDebug() << "loaded library" << fileName; -diff --git a/src/corelib/plugin/qlibrary_unix.cpp b/src/corelib/plugin/qlibrary_unix.cpp -index 017aa97..a5c72f8 100644 ---- a/src/corelib/plugin/qlibrary_unix.cpp -+++ b/src/corelib/plugin/qlibrary_unix.cpp -@@ -123,6 +123,7 @@ - - bool QLibraryPrivate::load_sys() - { -+ QMutexLocker locker(&mutex); - QString attempt; - QFileSystemEntry fsEntry(fileName); - -@@ -213,6 +214,7 @@ - } - #endif - -+ locker.unlock(); - bool retry = true; - Handle hnd = nullptr; - for (int prefix = 0; retry && !hnd && prefix < prefixes.size(); prefix++) { -@@ -273,6 +275,8 @@ - } - } - #endif -+ -+ locker.relock(); - if (!hnd) { - errorString = QLibrary::tr("Cannot load library %1: %2").arg(fileName, qdlerror()); - } -diff --git a/src/corelib/plugin/qlibrary_win.cpp b/src/corelib/plugin/qlibrary_win.cpp -index 000bf76..ef58724 100644 ---- a/src/corelib/plugin/qlibrary_win.cpp -+++ b/src/corelib/plugin/qlibrary_win.cpp -@@ -78,6 +78,7 @@ - // fileName - // - // NB If it's a plugin we do not ever try the ".dll" extension -+ QMutexLocker locker(&mutex); - QStringList attempts; - - if (pluginState != IsAPlugin) -@@ -95,6 +96,7 @@ - attempts.prepend(QDir::rootPath() + fileName); - #endif - -+ locker.unlock(); - Handle hnd = nullptr; - for (const QString &attempt : qAsConst(attempts)) { - #ifndef Q_OS_WINRT -@@ -115,6 +117,7 @@ - #ifndef Q_OS_WINRT - SetErrorMode(oldmode); - #endif -+ locker.relock(); - if (!hnd) { - errorString = QLibrary::tr("Cannot load library %1: %2").arg( - QDir::toNativeSeparators(fileName), qt_error_string()); diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index e0e71c595d..0cb36427a0 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -342,7 +342,6 @@ (define-public qt-4 (define-public qtbase (package (name "qtbase") - ;; TODO Remove ((gnu packages kde) qtbase-for-krita) when upgrading qtbase. (version "5.14.2") (source (origin (method url-fetch) -- cgit v1.2.3 From 4ba0f3b597f7099c5a780cad45b86c2e384507ea Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 23 Jul 2020 16:48:31 +0200 Subject: gnu: parallel: Update to 20200722. * gnu/packages/parallel.scm (parallel): Update to 20200722. --- gnu/packages/parallel.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index cad9383769..4e97496d37 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -55,14 +55,14 @@ (define-module (gnu packages parallel) (define-public parallel (package (name "parallel") - (version "20200622") + (version "20200722") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/parallel/parallel-" version ".tar.bz2")) (sha256 - (base32 "0gqxpk1hm323hwvw9isjxy2xv2wg8avav60bckjm0s57jbhsz3zz")))) + (base32 "0vqd8nhf4lkvbfy7nnibxjkpzpfandpklqm0hrix5vki5x7x80a8")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 5d26ba7ee3c07fad1f4054396eaeec6f992a9eac Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 23 Jul 2020 16:49:38 +0200 Subject: gnu: burp: Update to 2.3.30. * gnu/packages/backup.scm (burp): Update to 2.3.30. [source]: Use GIT-FETCH and GIT-FILE-NAME. [native-inputs]: Add autoconf and automake. --- gnu/packages/backup.scm | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 7a1fd142bf..532cb66c70 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -1067,14 +1067,16 @@ (define-public dump (define-public burp (package (name "burp") - (version "2.3.28") - (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/burp/burp-" version - "/burp-" version ".tar.bz2")) - (sha256 - (base32 - "18f8cjsb87skabvz4cl5pdln35qmim7x686js1xzpld6wyl9kv2k")))) + (version "2.3.30") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/grke/burp") + (commit version))) + (sha256 + (base32 "1f9i5d415psbr03fqd47p162qy25sypra1w8w16ym6jk1pvdjsgx")) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments `(#:phases @@ -1092,7 +1094,9 @@ (define-public burp ("uthash" ,uthash) ("zlib" ,zlib))) (native-inputs - `(("check" ,check) + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("check" ,check) ("pkg-config" ,pkg-config))) (home-page "https://burp.grke.org") (synopsis "Differential backup and restore") -- cgit v1.2.3 From 9f38cdac5e17d71fc27848383d7ec29e4514cd4f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 23 Jul 2020 16:58:23 +0200 Subject: gnu: burp: Add ACL support. * gnu/packages/backup.scm (burp)[inputs]: Add acl. --- gnu/packages/backup.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 532cb66c70..d464598ba2 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -1089,7 +1089,8 @@ (define-public burp (string-append prefix " 3600" suffix "\n"))) #t))))) (inputs - `(("librsync" ,librsync) + `(("acl" ,acl) + ("librsync" ,librsync) ("openssl" ,openssl) ("uthash" ,uthash) ("zlib" ,zlib))) -- cgit v1.2.3 From 0e001b1f412d26937eb7cc616dab6b8a8b6beeee Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 23 Jul 2020 18:06:34 +0200 Subject: gnu: wavpack: Update to 5.3.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/audio.scm (wavpack): Update to 5.3.2. [source]: Use GIT-FETCH and GIT-FILE-NAME. [arguments]: Replace the ‘bootstrap’ phase. [native-inputs]: Add autoconf, automake, and libtool. --- gnu/packages/audio.scm | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index dfef3a81e7..20f9e1bfba 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2858,17 +2858,31 @@ (define-public libsbsms (define-public wavpack (package (name "wavpack") - (version "5.3.0") - (source (origin - (method url-fetch) - (uri (string-append "http://www.wavpack.com/" - "wavpack-" version ".tar.xz")) - (sha256 - (base32 - "01r351ggha9pdfk7p601dlxac4ka1q89lgnb6zqk00zf1fd3fi5l")))) + (version "5.3.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dbry/WavPack") + (commit "e4e8d191e8dd74cbdbeaef3232c16a7ef517e68d"))) + (sha256 + (base32 "1zj8svk6giy1abq3940sz32ygz7zldppxl47852zgn5wfm3l2spx")) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments - '(#:configure-flags '("--disable-static"))) + '(#: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))) (home-page "http://www.wavpack.com/") (synopsis "Hybrid lossless audio codec") (description -- cgit v1.2.3 From e0cb11734bff5417c907ec3bd3bb9e0e9523b5ae Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 23 Jul 2020 19:17:59 +0200 Subject: gnu: jo: Update to 1.4. * gnu/packages/web.scm (jo): Update to 1.4. --- gnu/packages/web.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 47162c49de..c66ec376a0 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -6043,15 +6043,14 @@ (define-public python-httpretty (define-public jo (package (name "jo") - (version "1.3") + (version "1.4") (source (origin (method url-fetch) (uri (string-append "https://github.com/jpmens/jo/releases/download/" version "/jo-" version ".tar.gz")) (sha256 - (base32 - "0r6yb8pjsbcqfyac4240a0sj93pb91fv385bpk395cx3f5bcj9fy")))) + (base32 "18jna9xlpxci3cak3z85c448zv2zr41baclgym3hk433p0p4vii4")))) (build-system gnu-build-system) (home-page "https://github.com/jpmens/jo") (synopsis "Output JSON from a shell") -- cgit v1.2.3 From 07af5c5e7a778b1cb2e0d964ba753ff62a1dc827 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 23 Jul 2020 05:04:15 +0200 Subject: gnu: dnsmasq: Update to 2.82. * gnu/packages/dns.scm (dnsmasq): Update to 2.82. --- gnu/packages/dns.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 8c4369dbd8..3c69fd9858 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -80,7 +80,7 @@ (define-module (gnu packages dns) (define-public dnsmasq (package (name "dnsmasq") - (version "2.81") + (version "2.82") (source (origin (method url-fetch) (uri (string-append @@ -88,7 +88,7 @@ (define-public dnsmasq version ".tar.xz")) (sha256 (base32 - "1yzq6anwgr5rlnwydpszb51cyhp2vjq29b24ck19flbwac1sk73l")))) + "0cn1xd1s6xs78jmrmwjnh9m6w3q38pk6dyqy2phvasqiyd33cll4")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From e21793fb3ff8cac8499a135a04996ee4b8ccf083 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 23 Jul 2020 15:51:34 +0200 Subject: gnu: blender: Update to 2.83.3. * gnu/packages/graphics.scm (blender): Update to 2.83.3. --- gnu/packages/graphics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 5b18d14893..2d0e3c1867 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -206,14 +206,14 @@ (define-public autotrace (define-public blender (package (name "blender") - (version "2.83.0") + (version "2.83.3") (source (origin (method url-fetch) (uri (string-append "https://download.blender.org/source/" "blender-" version ".tar.xz")) (sha256 (base32 - "07rzm4xaj94pjxy2vlqfhi1adsqpshfkrzrq8kljmcbnw22vrqhl")))) + "18m27abp4j3xv48dr6ddr2mqcvx2vkjffr487z90059yv9k0yh2p")))) (build-system cmake-build-system) (arguments (let ((python-version (version-major+minor (package-version python)))) -- cgit v1.2.3 From 0448bfe2d769998ba33c288a07738e13b02113a4 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 22 Jul 2020 13:47:39 -0400 Subject: gnu: Fix Krita. Fixes . Reported by linka on #guix. * gnu/packages/patches/qtbase-fix-krita-deadlock.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/qt.scm (qtbase-for-krita): New variable. * gnu/packages/kde.scm (krita)[inputs]: Replace qtbase with qtbase-for-krita. --- gnu/local.mk | 1 + gnu/packages/kde.scm | 2 +- .../patches/qtbase-fix-krita-deadlock.patch | 110 +++++++++++++++++++++ gnu/packages/qt.scm | 10 ++ 4 files changed, 122 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/qtbase-fix-krita-deadlock.patch diff --git a/gnu/local.mk b/gnu/local.mk index 139c17e751..2c0d5076d3 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1489,6 +1489,7 @@ dist_patch_DATA = \ %D%/packages/patches/qrcodegen-cpp-make-install.patch \ %D%/packages/patches/qt4-ldflags.patch \ %D%/packages/patches/qtbase-absolute-runpath.patch \ + %D%/packages/patches/qtbase-fix-krita-deadlock.patch \ %D%/packages/patches/qtbase-moc-ignore-gcc-macro.patch \ %D%/packages/patches/qtbase-use-TZDIR.patch \ %D%/packages/patches/qtscript-disable-tests.patch \ diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 9a80e362b6..333dd483cb 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -434,7 +434,7 @@ (define-public krita ("openexr" ,openexr) ("perl" ,perl) ("poppler-qt5" ,poppler-qt5) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-for-krita) ("qtdeclarative" ,qtdeclarative) ("qtmultimedia" ,qtmultimedia) ("qtsvg" ,qtsvg) diff --git a/gnu/packages/patches/qtbase-fix-krita-deadlock.patch b/gnu/packages/patches/qtbase-fix-krita-deadlock.patch new file mode 100644 index 0000000000..d3554be3c9 --- /dev/null +++ b/gnu/packages/patches/qtbase-fix-krita-deadlock.patch @@ -0,0 +1,110 @@ +Fix a deadlock in Krita: + +https://bugreports.qt.io/browse/QTBUG-83207 + +Patch copied from Qt bug tracker: + +https://codereview.qt-project.org/c/qt/qtbase/+/296034 + +From 276fa8383a7535765be7182883ef4aade17ce013 Mon Sep 17 00:00:00 2001 +From: Thiago Macieira +Date: Thu, 02 Apr 2020 12:08:41 -0300 +Subject: [PATCH] QLibrary: fix deadlock caused by fix to QTBUG-39642 + +Commit ae6f73e8566fa76470937aca737141183929a5ec inserted a mutex around +the entire load_sys(). We had reasoed that deadlocks would only occur if +the object creation in instance() recursed into its own instance(), +which was already a bug. But we had forgotten that dlopen()/ +LoadLibrary() executes initialization code from the module being loaded, +which could cause a recursion back into the same QPluginLoader or +QLibrary object. This recursion is benign because the module *is* loaded +and dlopen()/LoadLibrary() returns the same handle. + +[ChangeLog][QtCore][QLibrary and QPluginLoader] Fixed a deadlock that +would happen if the plugin or library being loaded has load-time +initialization code (C++ global variables) that recursed back into the +same QLibrary or QPluginLoader object. + +PS: QLibraryPrivate::loadPlugin() updates pluginState outside a mutex +lock, so pluginState should be made an atomic variable. Once that is +done, we'll only need locking the mutex to update errorString (no +locking before loading). + +Fixes: QTBUG-83207 +Task-number: QTBUG-39642 +Change-Id: Ibdc95e9af7bd456a94ecfffd160209304e5ab2eb +Reviewed-by: Volker Hilsheimer +Reviewed-by: David Faure +--- + +diff --git a/src/corelib/plugin/qlibrary.cpp b/src/corelib/plugin/qlibrary.cpp +index ddb053c..be9d92b 100644 +--- a/src/corelib/plugin/qlibrary.cpp ++++ b/src/corelib/plugin/qlibrary.cpp +@@ -576,9 +576,7 @@ + + Q_TRACE(QLibraryPrivate_load_entry, fileName); + +- mutex.lock(); + bool ret = load_sys(); +- mutex.unlock(); + if (qt_debug_component()) { + if (ret) { + qDebug() << "loaded library" << fileName; +diff --git a/src/corelib/plugin/qlibrary_unix.cpp b/src/corelib/plugin/qlibrary_unix.cpp +index 017aa97..a5c72f8 100644 +--- a/src/corelib/plugin/qlibrary_unix.cpp ++++ b/src/corelib/plugin/qlibrary_unix.cpp +@@ -123,6 +123,7 @@ + + bool QLibraryPrivate::load_sys() + { ++ QMutexLocker locker(&mutex); + QString attempt; + QFileSystemEntry fsEntry(fileName); + +@@ -213,6 +214,7 @@ + } + #endif + ++ locker.unlock(); + bool retry = true; + Handle hnd = nullptr; + for (int prefix = 0; retry && !hnd && prefix < prefixes.size(); prefix++) { +@@ -273,6 +275,8 @@ + } + } + #endif ++ ++ locker.relock(); + if (!hnd) { + errorString = QLibrary::tr("Cannot load library %1: %2").arg(fileName, qdlerror()); + } +diff --git a/src/corelib/plugin/qlibrary_win.cpp b/src/corelib/plugin/qlibrary_win.cpp +index 000bf76..ef58724 100644 +--- a/src/corelib/plugin/qlibrary_win.cpp ++++ b/src/corelib/plugin/qlibrary_win.cpp +@@ -78,6 +78,7 @@ + // fileName + // + // NB If it's a plugin we do not ever try the ".dll" extension ++ QMutexLocker locker(&mutex); + QStringList attempts; + + if (pluginState != IsAPlugin) +@@ -95,6 +96,7 @@ + attempts.prepend(QDir::rootPath() + fileName); + #endif + ++ locker.unlock(); + Handle hnd = nullptr; + for (const QString &attempt : qAsConst(attempts)) { + #ifndef Q_OS_WINRT +@@ -115,6 +117,7 @@ + #ifndef Q_OS_WINRT + SetErrorMode(oldmode); + #endif ++ locker.relock(); + if (!hnd) { + errorString = QLibrary::tr("Cannot load library %1: %2").arg( + QDir::toNativeSeparators(fileName), qt_error_string()); diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 0cb36427a0..1cbf7991ab 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -342,6 +342,7 @@ (define-public qt-4 (define-public qtbase (package (name "qtbase") + ;; TODO Remove ((gnu packages kde) qtbase-for-krita) when upgrading qtbase. (version "5.14.2") (source (origin (method url-fetch) @@ -608,6 +609,15 @@ (define qtbase/next (patches (append (origin-patches (package-source qtbase)) (search-patches "qtbase-absolute-runpath.patch"))))))) +(define-public qtbase-for-krita + (hidden-package + (package + (inherit qtbase) + (source (origin + (inherit (package-source qtbase)) + (patches (append (origin-patches (package-source qtbase)) + (search-patches "qtbase-fix-krita-deadlock.patch")))))))) + (define-public qtsvg (package (inherit qtbase) (name "qtsvg") -- cgit v1.2.3 From 548d4d810d0b6f4bf490119dae378903b4888433 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Thu, 23 Jul 2020 18:57:47 -0500 Subject: gnu: duplicity: Update to 0.8.14. * gnu/packages/backup.scm (duplicity): Update to 0.8.14. [native-inputs]: Add gettext, python-future, python-pytest, python-pytest-runner, and python-setuptools-scm. Move other python2 packages to python. [propagated-inputs]: Ditto. [inputs]: Use latest librsync. [arguments]: Remove #:python argument. Adjust gpg substitution regex for latest source. --- gnu/packages/backup.scm | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index d464598ba2..fb6d000170 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -55,6 +55,7 @@ (define-module (gnu packages backup) #:use-module (gnu packages dbm) #:use-module (gnu packages dejagnu) #:use-module (gnu packages ftp) + #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gnupg) #:use-module (gnu packages golang) @@ -80,7 +81,7 @@ (define-module (gnu packages backup) (define-public duplicity (package (name "duplicity") - (version "0.7.19") + (version "0.8.14") (source (origin (method url-fetch) @@ -89,32 +90,36 @@ (define-public duplicity "-series/" version "/+download/duplicity-" version ".tar.gz")) (sha256 - (base32 "0ag9dknslxlasslwfjhqgcqbkb1mvzzx93ry7lch2lfzcdd91am6")))) + (base32 "1af7rppsd8kj66xhbc04x1di3rpncrz0prxq1z7npg11c769vb1x")))) (build-system python-build-system) (native-inputs - `(("util-linux" ,util-linux) ; setsid command, for the tests + `(("gettext" ,gnu-gettext) ; for msgfmt + ("util-linux" ,util-linux) ; setsid command, for the tests ("par2cmdline" ,par2cmdline) - ("python-pexpect" ,python2-pexpect) - ("python-fasteners" ,python2-fasteners) + ("python-fasteners" ,python-fasteners) + ("python-future" ,python-future) ; for tests + ("python-pexpect" ,python-pexpect) + ("python-pytest" ,python-pytest) + ("python-pytest-runner" ,python-pytest-runner) + ("python-setuptools-scm" ,python-setuptools-scm) ("tzdata" ,tzdata-for-tests) - ("mock" ,python2-mock))) + ("mock" ,python-mock))) (propagated-inputs - `(("lockfile" ,python2-lockfile) - ("urllib3" ,python2-urllib3))) + `(("lockfile" ,python-lockfile) + ("urllib3" ,python-urllib3))) (inputs - `(("librsync" ,librsync-0.9) + `(("librsync" ,librsync) ("lftp" ,lftp) ("gnupg" ,gnupg) ; gpg executable needed ("util-linux" ,util-linux))) ; for setsid (arguments - `(#:python ,python-2 ; setup assumes Python 2 - #:test-target "test" + `(#:test-target "test" #:phases (modify-phases %standard-phases (add-before 'build 'use-store-file-names (lambda* (#:key inputs #:allow-other-keys) (substitute* "duplicity/gpginterface.py" - (("self.call = 'gpg'") + (("self.call = u'gpg'") (string-append "self.call = '" (assoc-ref inputs "gnupg") "/bin/gpg'"))) (substitute* '("testing/functional/__init__.py" -- cgit v1.2.3 From c1f38577c8a04332b21460fa08bdf0c72093c897 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Fri, 24 Jul 2020 00:24:15 -0300 Subject: gnu: Add sleef. * gnu/packages/maths.scm (sleef): New variable. Signed-off-by: Brett Gilio --- gnu/packages/maths.scm | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index ee4d30cfbe..3991b2f88b 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -39,6 +39,7 @@ ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020 Nicolò Balzarotti ;;; Copyright © 2020 B. Wilson +;;; Copyright © 2020 Vinicius Monego ;;; ;;; This file is part of GNU Guix. ;;; @@ -511,6 +512,50 @@ (define-public gsl numbers.") (license license:gpl3+))) +(define-public sleef + (package + (name "sleef") + (version "3.4.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/shibatch/sleef") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1gvf7cfvszmgjrsqivwmyy1jnp3hy80dmszxx827lhjz8yqq5019")))) + (build-system cmake-build-system) + (arguments + '(#:configure-flags (list "-DCMAKE_BUILD_TYPE=Release" + (string-append "-DCMAKE_INSTALL_LIBDIR=" + (assoc-ref %outputs "out") + "/lib") + (string-append "-DCMAKE_INSTALL_PREFIX=" + (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + ;; SLEEF generates a header library during the build process and writes + ;; to it via shell redirection. Make the checkout writable so the + ;; build can succeed. + (add-after 'unpack 'make-git-checkout-writable + (lambda _ + (for-each make-file-writable (find-files ".")) + #t))))) + (inputs + `(("fftw" ,fftw) + ("gmp" ,gmp) + ("mpfr" ,mpfr) + ("openssl" ,openssl))) + (home-page "https://sleef.org/") + (synopsis "SIMD library for evaluating elementary functions and DFT") + (description + "SLEEF (SIMD Library for Evaluating Elementary Functions) is a library that +implements vectorized versions of all C99 real floating point math functions. +It can utilize SIMD instructions that are available on modern processors.") + (license (list license:boost1.0 ;sleef + license:cc-by4.0)))) ;simplex algorithm + (define-public glpk (package (name "glpk") -- cgit v1.2.3 From b1d3c122e1712cf390a24b600415b87df2d3bfdc Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 23 Jul 2020 17:42:29 +0200 Subject: gnu: gcc@10: Update to 10.2.0. * gnu/packages/gcc.scm (gcc-10): Update to 10.2.0. --- gnu/packages/gcc.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 9ff5e3d7c0..e0e236192f 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -567,14 +567,14 @@ (define-public gcc-9 (define-public gcc-10 (package (inherit gcc-8) - (version "10.1.0") + (version "10.2.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gcc/gcc-" version "/gcc-" version ".tar.xz")) (sha256 (base32 - "18kyds3ss4j7in8shlsbmjafdhin400mq739d0dnyrabhhiqm2dn")) + "130xdkhmz1bc2kzx061s3sfwk36xah1fw5w332c0nzwwpdl47pdq")) (patches (search-patches "gcc-9-strmov-store-file-names.patch" "gcc-5.0-libvtv-runpath.patch")))))) -- cgit v1.2.3 From 12dc9f58c422c06bf9950f21c54ca3df1dc40af1 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 24 Jul 2020 09:56:25 +0200 Subject: gnu: gcc: Fix libstdc++ misconfiguration. Fixes . Reported by Maxim Cournoyer and Erik Garrison. Until now, the generated would be incorrect (many _GLIBCXX_HAVE macros would be undefined), which in turn would lead to build failures for most C++ programs. * gnu/packages/gcc.scm (gcc-6)[inputs]: Add LIBSTDC++-HEADERS. (libstdc++, libstdc++-headers): New variables. * gnu/packages/gcc.scm (gfortran): Change first argument to 'custom-gcc' to remove dependency on LIBSTDC++-HEADERS. --- gnu/packages/gcc.scm | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index e0e236192f..a39ac3b84c 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -514,6 +514,12 @@ (define-public gcc-6 (inputs `(("isl" ,isl) + + ;; XXX: This gross hack allows us to have libstdc++'s + ;; in the search path, thereby avoiding misconfiguration of libstdc++: + ;; . + ("libstdc++" ,libstdc++-headers) + ,@(package-inputs gcc-4.7))))) (define-public gcc-7 @@ -607,6 +613,31 @@ (define-public (make-libstdc++ gcc) (propagated-inputs '()) (synopsis "GNU C++ standard library"))) +(define libstdc++ + ;; Libstdc++ matching the default GCC. + (make-libstdc++ gcc)) + +(define libstdc++-headers + ;; XXX: This package is for internal use to work around + ;; (see above). The main difference compared + ;; to the libstdc++ headers that come with 'gcc' is that + ;; is right under include/c++ and not under + ;; include/c++/x86_64-unknown-linux-gnu (aka. GPLUSPLUS_TOOL_INCLUDE_DIR). + (package + (inherit libstdc++) + (name "libstdc++-headers") + (outputs '("out")) + (build-system trivial-build-system) + (arguments + '(#:builder (let* ((out (assoc-ref %outputs "out")) + (libstdc++ (assoc-ref %build-inputs "libstdc++"))) + (mkdir out) + (mkdir (string-append out "/include")) + (symlink (string-append libstdc++ "/include") + (string-append out "/include/c++"))))) + (inputs `(("libstdc++" ,libstdc++))) + (synopsis "Headers of GNU libstdc++"))) + (define-public libstdc++-4.9 (make-libstdc++ gcc-4.9)) @@ -689,7 +720,13 @@ (define %generic-search-paths (define-public gfortran (hidden-package - (custom-gcc gcc "gfortran" '("fortran") + (custom-gcc (package + (inherit gcc) + ;; XXX: Remove LIBSTDC++-HEADERS from the inputs just to + ;; avoid a rebuild of all the GFORTRAN dependents. + ;; TODO: Remove this hack on the next rebuild cycle. + (inputs (alist-delete "libstdc++" (package-inputs gcc)))) + "gfortran" '("fortran") %generic-search-paths))) (define-public gdc-10 -- cgit v1.2.3 From a553892215157090ff892dc5cbbe85a25e837260 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 24 Jul 2020 11:27:51 +0200 Subject: pack: '-R' applies to propagated inputs too. Fixes . * guix/scripts/pack.scm (wrapped-manifest-entry): Recurse on 'dependencies' field. * tests/guix-pack-relocatable.sh: Add test. --- guix/scripts/pack.scm | 5 ++++- tests/guix-pack-relocatable.sh | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm index 13ade37515..5fb6aaae0c 100644 --- a/guix/scripts/pack.scm +++ b/guix/scripts/pack.scm @@ -875,7 +875,10 @@ (define (wrapped-manifest-entry entry . args) (item (apply wrapped-package (manifest-entry-item entry) (manifest-entry-output entry) - args)))) + args)) + (dependencies (map (lambda (entry) + (apply wrapped-manifest-entry entry args)) + (manifest-entry-dependencies entry))))) ;;; diff --git a/tests/guix-pack-relocatable.sh b/tests/guix-pack-relocatable.sh index 358cac5b26..52d7212594 100644 --- a/tests/guix-pack-relocatable.sh +++ b/tests/guix-pack-relocatable.sh @@ -111,3 +111,8 @@ esac tarball="`guix pack -R -S /share=share groff:doc`" (cd "$test_directory"; tar xvf "$tarball") test -d "$test_directory/share/doc/groff/html" + +# Ensure '-R' applies to propagated inputs. Failing to do that, it would fail +# with a profile collision error in this case because 'python-scipy' +# propagates 'python-numpy'. See . +guix pack -RR python-numpy python-scipy --no-grafts -n -- cgit v1.2.3 From ac928d3e9ebdb660f8104f3e4b890a2353787cdf Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 24 Jul 2020 12:04:22 +0200 Subject: import: github: Gracefully handle projects that have disappeared. Fixes . Reported by Alexandru-Sergiu Marton . * guix/import/github.scm (fetch-releases-or-tags): Use 'http-fetch' instead of 'json-fetch', and guard against 404 errors. Upon 404, emit a warning and return the empty vector. --- guix/import/github.scm | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/guix/import/github.scm b/guix/import/github.scm index 95a792d0ca..888b148ffb 100644 --- a/guix/import/github.scm +++ b/guix/import/github.scm @@ -26,10 +26,13 @@ (define-module (guix import github) #:use-module (srfi srfi-26) #:use-module (srfi srfi-34) #:use-module (guix utils) + #:use-module (guix i18n) + #:use-module (guix diagnostics) #:use-module ((guix download) #:prefix download:) #:use-module ((guix git-download) #:prefix download:) #:use-module (guix import utils) #:use-module (guix import json) + #:use-module (json) #:use-module (guix packages) #:use-module (guix upstream) #:use-module (guix http-client) @@ -162,12 +165,20 @@ (define headers `((Authorization . ,(string-append "token " (%github-token)))) '()))) - (match (json-fetch release-url #:headers headers) - (#() - ;; We got the empty list, presumably because the user didn't use GitHub's - ;; "release" mechanism, but hopefully they did use Git tags. - (json-fetch tag-url #:headers headers)) - (x x))) + (guard (c ((and (http-get-error? c) + (= 404 (http-get-error-code c))) + (warning (G_ "~a is unreachable (~a)~%") + release-url (http-get-error-code c)) + '#())) ;return an empty release set + (let* ((port (http-fetch release-url #:headers headers)) + (result (json->scm port))) + (close-port port) + (match result + (#() + ;; We got the empty list, presumably because the user didn't use GitHub's + ;; "release" mechanism, but hopefully they did use Git tags. + (json-fetch tag-url #:headers headers)) + (x x))))) (define (latest-released-version url package-name) "Return a string of the newest released version name given a string URL like -- cgit v1.2.3 From d51cb7f85f051b02d6e59829a7f9eb30ff044ad5 Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Thu, 23 Jul 2020 14:03:18 +0200 Subject: gnu: Add libtmcg. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/openpgp.scm: New file. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 1 + gnu/packages/openpgp.scm | 55 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 gnu/packages/openpgp.scm diff --git a/gnu/local.mk b/gnu/local.mk index 2c0d5076d3..b5de70e120 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -405,6 +405,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/openbox.scm \ %D%/packages/opencog.scm \ %D%/packages/openldap.scm \ + %D%/packages/openpgp.scm \ %D%/packages/openstack.scm \ %D%/packages/orpheus.scm \ %D%/packages/ots.scm \ diff --git a/gnu/packages/openpgp.scm b/gnu/packages/openpgp.scm new file mode 100644 index 0000000000..d3cb9027f7 --- /dev/null +++ b/gnu/packages/openpgp.scm @@ -0,0 +1,55 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2020 Justus Winter +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages openpgp) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix build-system gnu) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (gnu packages gnupg) + #:use-module (gnu packages multiprecision)) + +(define-public libtmcg + (package + (name "libtmcg") + (version "1.3.18") + (source (origin + (method url-fetch) + (uri (string-append "mirror://savannah/libtmcg/libTMCG-" version + ".tar.gz")) + (sha256 + (base32 + "179b5jx3mqs9hgsj8cfwk6x8qib60kw9szk9fkz6s1gl3v83mnyx")))) + (build-system gnu-build-system) + (arguments '(#:configure-flags '("--enable-silent-rules"))) + (inputs `(("gmp" ,gmp) + ("libgcrypt" ,libgcrypt))) + (synopsis + "C++ library for creating secure and fair online card games") + (description + "The library provides a sort of useful classes, algorithms, and +high-level protocols to support an application programmer in writing such +software. The most remarkable feature is the absence of a trusted third +party (TTP), i.e. neither a central game server nor trusted hardware +components are necessary. + +The corresponding cryptographic problem, actually called Mental Poker, has +been studied since 1979 (Shamir, Rivest, and Adleman) by many authors. +LibTMCG provides the first practical implementation of such protocols.") + (home-page "https://www.nongnu.org/libtmcg/") + (license license:gpl2+))) -- cgit v1.2.3 From 39222080911eaf3d7f74effe4467c1a04464aef3 Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Thu, 23 Jul 2020 14:03:19 +0200 Subject: gnu: Add dkgpg. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/openpgp.scm (dkgpg): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/openpgp.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/openpgp.scm b/gnu/packages/openpgp.scm index d3cb9027f7..94beab9929 100644 --- a/gnu/packages/openpgp.scm +++ b/gnu/packages/openpgp.scm @@ -21,6 +21,7 @@ (define-module (gnu packages openpgp) #:use-module (guix download) #:use-module (guix build-system gnu) #:use-module ((guix licenses) #:prefix license:) + #:use-module (gnu packages compression) #:use-module (gnu packages gnupg) #:use-module (gnu packages multiprecision)) @@ -53,3 +54,41 @@ (define-public libtmcg LibTMCG provides the first practical implementation of such protocols.") (home-page "https://www.nongnu.org/libtmcg/") (license license:gpl2+))) + +(define-public dkgpg + (package + (name "dkgpg") + (version "1.1.3") + (source (origin + (method url-fetch) + (uri (string-append "mirror://savannah/dkgpg/dkgpg-" version + ".tar.gz")) + (sha256 + (base32 + "1hpfg7akd5icj49i03z74hp9zj0xwl90bndn0hnw0hpb8lk7qcxg")))) + (build-system gnu-build-system) + (arguments '(#:configure-flags + '("--enable-silent-rules") + ;; https://savannah.nongnu.org/bugs/?58772 + #:parallel-tests? #f)) + (inputs `(("bzip2" ,bzip2) + ("gmp" ,gmp) + ("libgcrypt" ,libgcrypt) + ("libtmcg" ,libtmcg) + ("zlib" ,zlib))) + (synopsis + "Distributed Key Generation and Threshold Cryptography for OpenPGP") + (description + "The Distributed Privacy Guard (DKGPG) implements Distributed Key +Generation (DKG) and Threshold Cryptography for OpenPGP. The generated public +keys are compatible with the standard and thus can be used by any +RFC4880-compliant application (e.g. GnuPG). The main purposes of this +software are distributing power among multiple parties, eliminating single +points of failure, and increasing the difficulty of side-channel attacks on +private key material. + +DKGPG consists of a bunch of simple command-line programs. The current +implementation is in experimental state and should NOT be used in production +environments.") + (home-page "https://www.nongnu.org/dkgpg/") + (license license:gpl2+))) -- cgit v1.2.3 From dc6cd35e6d369f7591217065959234e5a23b008e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 Jul 2020 11:57:18 +0200 Subject: gnu: gpscorrelate: Update to 2.0. * gnu/packages/gps.scm (gpscorrelate): Update to 2.0. [arguments]: Remove #:tests?. [inputs]: Remove GTK+-2. Add GTK+. --- gnu/packages/gps.scm | 81 +++++++++++++++++++++++++--------------------------- 1 file changed, 39 insertions(+), 42 deletions(-) diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm index 5f9dcdbb65..975f2ced59 100644 --- a/gnu/packages/gps.scm +++ b/gnu/packages/gps.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2018 Mathieu Othacehe ;;; Copyright © 2020 Guillaume Le Vaillant ;;; Copyright © 2020 Vincent Legoll +;;; Copyright © 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -104,52 +105,48 @@ (define-public gpsbabel license:gpl2+)))) ; everything else (define-public gpscorrelate - ;; This program is "lightly maintained", so to speak, so we end up taking it - ;; directly from its Git repo. - (let ((commit "365f6e1b3f")) - (package - (name "gpscorrelate") - (version (string-append "1.6.1." commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/dfandrich/gpscorrelate") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "006a6l8p38a4h7y2959sqrmjjn29d8pd50zj9nypcp5ph18nybjb")))) - (build-system gnu-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; This is a rudimentary build system. - (substitute* "Makefile" - (("prefix[[:blank:]]*=.*$") - (string-append "prefix = " (assoc-ref outputs "out") - "\n"))) - #t))) - #:tests? #f)) - (inputs - `(("gtk+" ,gtk+-2) - ("libxml2" ,libxml2) - ("exiv2" ,exiv2))) - (native-inputs - `(("pkg-config" ,pkg-config) - ("docbook-xml" ,docbook-xml) - ("docbook-xsl" ,docbook-xsl) - ("libxslt" ,libxslt))) - (home-page "https://dfandrich.github.io/gpscorrelate/") - (synopsis "GPS photo correlation tool to geo-localize images") - (description - "GPS Correlate is a program to match a recorded GPS track with the EXIF + (package + (name "gpscorrelate") + (version "2.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dfandrich/gpscorrelate") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1kvybhfnygz79q3pgwc1q2x4ccmnsfscx2hzxnmzjbnc6arnqari")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; This is a rudimentary build system. + (substitute* "Makefile" + (("prefix[[:blank:]]*=.*$") + (string-append "prefix = " (assoc-ref outputs "out") + "\n"))) + #t))))) + (inputs + `(("gtk+" ,gtk+) + ("libxml2" ,libxml2) + ("exiv2" ,exiv2))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("docbook-xml" ,docbook-xml) + ("docbook-xsl" ,docbook-xsl) + ("libxslt" ,libxslt))) + (home-page "https://dfandrich.github.io/gpscorrelate/") + (synopsis "GPS photo correlation tool to geo-localize images") + (description + "GPS Correlate is a program to match a recorded GPS track with the EXIF tags in digital camera photos, and update the EXIF tags with the location that the photo was taken. It does this by using the timestamp in the photo and finding a data point in the GPS track that matches, or interpolating a point between two other data points.") - (license license:gpl2+)))) + (license license:gpl2+))) (define-public gama (package -- cgit v1.2.3 From 0b95f51eae50fbe627a354f50fa053a6d52b81aa Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 Jul 2020 12:11:42 +0200 Subject: gnu: enigma: Fix build with GCC >= 6. * gnu/packages/games.scm (enigma)[arguments]: Add phase to substitute faulty comparison. --- gnu/packages/games.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 556f813396..213acc6b9f 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -5841,6 +5841,14 @@ (define-public enigma (list "--with-system-enet") #:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-build-with-new-gcc + (lambda _ + ;; Fix build with GCC6 and later by avoiding comparing ifstream + ;; to NULL. Can be removed for versions > 1.21. + (substitute* "src/lev/Proxy.cc" + (("ifs != NULL") + "ifs")) + #t)) (add-after 'unpack 'find-sdl (lambda _ (substitute* "configure" -- cgit v1.2.3 From beb7a28110cfd9f6a134421aade9adaba12d1baa Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 Jul 2020 13:58:33 +0200 Subject: gnu: luminance-hdr: Update to 2.6.0. * gnu/packages/patches/luminance-hdr-qt-printer.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/image-viewers.scm (luminance-hdr): Update to 2.6.0. [inputs]: Add QTSVG and EIGEN. [arguments]: Add #:tests? #f. --- gnu/local.mk | 1 - gnu/packages/image-viewers.scm | 10 ++++---- .../patches/luminance-hdr-qt-printer.patch | 28 ---------------------- 3 files changed, 6 insertions(+), 33 deletions(-) delete mode 100644 gnu/packages/patches/luminance-hdr-qt-printer.patch diff --git a/gnu/local.mk b/gnu/local.mk index b5de70e120..f2a7b6b984 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1273,7 +1273,6 @@ dist_patch_DATA = \ %D%/packages/patches/lua-liblua-so.patch \ %D%/packages/patches/luajit-no_ldconfig.patch \ %D%/packages/patches/luit-posix.patch \ - %D%/packages/patches/luminance-hdr-qt-printer.patch \ %D%/packages/patches/lvm2-static-link.patch \ %D%/packages/patches/make-impure-dirs.patch \ %D%/packages/patches/mariadb-client-test-32bit.patch \ diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 610a3d77bf..f93b353dd6 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -329,7 +329,7 @@ (define-public catimg (define-public luminance-hdr (package (name "luminance-hdr") - (version "2.4.0") + (version "2.6.0") (source (origin (method url-fetch) (uri (string-append @@ -337,8 +337,7 @@ (define-public luminance-hdr version "/luminance-hdr-" version ".tar.bz2")) (sha256 (base32 - "00fldbcizrx8jcnjgq74n3zmbm27dxzl96fxa7q49689mfnlw08l")) - (patches (search-patches "luminance-hdr-qt-printer.patch")))) + "188q0l63nfasqfvwbq4mwx2vh7wsfi2bq9n5nksddspl1qz01lnp")))) (build-system cmake-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -346,8 +345,10 @@ (define-public luminance-hdr (inputs `(("qtbase" ,qtbase) ("qtdeclarative" ,qtdeclarative) + ("qtsvg" ,qtsvg) ("qtwebkit" ,qtwebkit) ("boost" ,boost) + ("eigen" ,eigen) ;; ("gtest" ,gtest) ("libraw" ,libraw) ("zlib" ,zlib) @@ -360,7 +361,8 @@ (define-public luminance-hdr ("gsl" ,gsl) ("libtiff" ,libtiff))) (arguments - '(#:phases + '(#:tests? #f ;XXX: some tests fail to compile + #:phases (modify-phases %standard-phases (add-after 'set-paths 'add-ilmbase-include-path (lambda* (#:key inputs #:allow-other-keys) diff --git a/gnu/packages/patches/luminance-hdr-qt-printer.patch b/gnu/packages/patches/luminance-hdr-qt-printer.patch deleted file mode 100644 index c65f9537cd..0000000000 --- a/gnu/packages/patches/luminance-hdr-qt-printer.patch +++ /dev/null @@ -1,28 +0,0 @@ -Allow the 'QtPrinter' header to be found, as described -at . - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index fbad8a2..8379c8a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -29,6 +29,7 @@ find_package(Qt5Xml) - find_package(Qt5Sql) - find_package(Qt5Network) - find_package(Qt5LinguistTools) -+find_package(Qt5PrintSupport REQUIRED) - IF(WIN32) - find_package(Qt5WinExtras) - ENDIF() -diff --git a/src/HelpBrowser/CMakeLists.txt b/src/HelpBrowser/CMakeLists.txt -index 04319a8..5537dae 100644 ---- a/src/HelpBrowser/CMakeLists.txt -+++ b/src/HelpBrowser/CMakeLists.txt -@@ -29,7 +29,7 @@ QT5_WRAP_UI(FILES_UI_H ${FILES_UI}) - - - ADD_LIBRARY(helpbrowser ${FILES_H} ${FILES_CPP} ${FILES_MOC} ${FILES_UI_H} ${FILES_HXX}) --qt5_use_modules(helpbrowser Core Concurrent Gui Widgets Xml WebKit WebKitWidgets) -+qt5_use_modules(helpbrowser Core Concurrent Gui Widgets Xml WebKit WebKitWidgets PrintSupport) - - SET(FILES_TO_TRANSLATE ${FILES_TO_TRANSLATE} ${FILES_CPP} ${FILES_H} ${FILES_UI} ${FILES_HXX} PARENT_SCOPE) - SET(LUMINANCE_MODULES_GUI ${LUMINANCE_MODULES_GUI} helpbrowser PARENT_SCOPE) -- cgit v1.2.3 From 9c7581a1273d049a95c0fa4f52fe29ec9145d101 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 24 Jul 2020 16:04:05 +0200 Subject: doc: Use an existing commit in channel example. Suggested by zimoun . * doc/guix.texi (Channels): Use the commit for 'v1.0.0' instead of a non-existing commit in example. --- doc/guix.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index fb1c66dcf4..0d090eef18 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -4379,7 +4379,7 @@ say, on another machine, by providing a channel specification in (list (channel (name 'guix) (url "https://git.savannah.gnu.org/git/guix.git") - (commit "d894ab8e9bfabcefa6c49d9ba2e834dd5a73a300")) + (commit "6298c3ffd9654d3231a6f25390b056483e8f407c")) (channel (name 'my-personal-packages) (url "https://example.org/personal-packages.git") -- cgit v1.2.3 From cb3bae900f6c85d4529842bf75f3cca0b4bb1df7 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 24 Jul 2020 17:44:20 +0200 Subject: doc: Mention the channel keyring branch. Reported by Pierre Neidhardt . * doc/guix.texi (Channels): Mention the keyring branch and the 'keyring-reference' bit in '.guix-channel'. --- doc/guix.texi | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index 0d090eef18..a6fc64bed8 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -4245,10 +4245,28 @@ time-machine}, the command looks up the introductory commit and verifies that it is signed by the specified OpenPGP key. From then on, it authenticates commits according to the rule above. -To summarize, as the author of a channel, there are two things you have +Additionally, your channel must provide all the OpenPGP keys that were +ever mentioned in @file{.guix-authorizations}, stored as @file{.key} +files, which can be either binary or ``ASCII-armored''. By default, +those @file{.key} files are searched for in the branch named +@code{keyring} but you can specify a different branch name in +@code{.guix-channel} like so: + +@lisp +(channel + (version 0) + (keyring-reference "my-keyring-branch")) +@end lisp + +To summarize, as the author of a channel, there are three things you have to do to allow users to authenticate your code: @enumerate +@item +Export the OpenPGP keys of past and present committers with @command{gpg +--export} and store them in @file{.key} files, by default in a branch +named @code{keyring} (we recommend making it an @dfn{orphan branch}). + @item Introduce an initial @file{.guix-authorizations} in the channel's repository. Do that in a signed commit (@pxref{Commit Access}, for -- cgit v1.2.3 From e85d7ed60905f059686650c3ab21b42500f09351 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 24 Jul 2020 17:45:55 +0200 Subject: quirks: Adjust patch to allow traveling back to Dec. 2018. Fixes . This fixes: guix time-machine --commit=897f303d2fa61497a931cf5fcb43349eb5f44c14 a commit dated Dec. 2018. * guix/quirks.scm (%bug-41214-patch)[accesses-guile-2.2-optimization-options?]: Add second 'match' clause. --- guix/quirks.scm | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/guix/quirks.scm b/guix/quirks.scm index d292f4e932..1cffe971fc 100644 --- a/guix/quirks.scm +++ b/guix/quirks.scm @@ -139,18 +139,30 @@ (define %bug-41214-patch (define (accesses-guile-2.2-optimization-options? source commit) (catch 'system-error (lambda () - (match (call-with-input-file - (string-append source "/guix/build/compile.scm") - read) - (('define-module ('guix 'build 'compile) - _ ... - #:use-module ('language 'tree-il 'optimize) - #:use-module ('language 'cps 'optimize) - #:export ('%default-optimizations - '%lightweight-optimizations - 'compile-files)) - #t) - (_ #f))) + (call-with-input-file (string-append source + "/guix/build/compile.scm") + (lambda (port) + (match (read port) + (('define-module ('guix 'build 'compile) + _ ... + #:use-module ('language 'tree-il 'optimize) + #:use-module ('language 'cps 'optimize) + #:export ('%default-optimizations + '%lightweight-optimizations + 'compile-files)) + #t) + (_ + ;; Before v1.0.0 (ca. Dec. 2018), the 'use-modules' form + ;; would show up in a subsequent 'cond-expand' clause. + ;; See . + (match (read port) + (('cond-expand + ('guile-2.2 ('use-modules ('language 'tree-il 'optimize) + _ ...)) + _ ...) + #t) + (_ + #f))))))) (const #f))) (define (build-with-guile-2.2 source) -- cgit v1.2.3 From 271f27864096728ebd05b61d2015ef3fade1dde6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 Jul 2020 00:40:37 +0200 Subject: gnu: LibRaw: Update to 0.20.0 [fixes CVE-2020-15503]. * gnu/packages/photo.scm (libraw): Update to 0.20.0. * gnu/packages/image.scm (freeimage)[source](patches): Add LibRaw compatibility patch. --- gnu/packages/image.scm | 14 +++++++++++++- gnu/packages/photo.scm | 4 ++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 3fdc6db8a1..c6af458286 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1030,7 +1030,19 @@ (define-public freeimage (delete-file-recursively (string-append "Source/" dir))) '("LibJPEG" "LibOpenJPEG" "LibPNG" "LibRawLite" "LibJXR" "LibWebP" "OpenEXR" "ZLib")))) - (patches (search-patches "freeimage-unbundle.patch")))) + (patches + (append + (search-patches "freeimage-unbundle.patch") + ;; Take one patch from Arch Linux that adds LibRaw 0.20 compatibility. + (list (origin + (method url-fetch) + (uri "https://raw.githubusercontent.com/archlinux\ +/svntogit-community/ca3e6a52f5a46dec87cbf85e9d84fe370e282c8c/trunk\ +/freeimage-libraw-0.20.patch") + (file-name "freeimage-libraw-compat.patch") + (sha256 + (base32 + "0cwjxjz0f4gs6igvwqg0p99mnrsrwzkal1l2n08yvz2xq9s5khki")))))))) (build-system gnu-build-system) (arguments '(#:phases diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 09767f464e..abdb751a5a 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -173,14 +173,14 @@ (define-public rapid-photo-downloader (define-public libraw (package (name "libraw") - (version "0.19.5") + (version "0.20.0") (source (origin (method url-fetch) (uri (string-append "https://www.libraw.org/data/LibRaw-" version ".tar.gz")) (sha256 (base32 - "1x827sh6vl8j3ll2ihkcr234y07f31hi1v7sl08jfw3irkbn58j0")))) + "18wlsvj6c1rv036ph3695kknpgzc3lk2ikgshy8417yfl8ykh2hz")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 457a9a134354af0e1773bf60ce6e079d90a7a1f7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 Jul 2020 00:43:17 +0200 Subject: gnu: libmatroska: Update to 1.6.0. * gnu/packages/video.scm (libmatroska): Update to 1.6.0. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 4120174484..8a0e6de5c9 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -818,14 +818,14 @@ (define-public libdv (define-public libmatroska (package (name "libmatroska") - (version "1.5.2") + (version "1.6.0") (source (origin (method url-fetch) (uri (string-append "https://dl.matroska.org/downloads/" "libmatroska/libmatroska-" version ".tar.xz")) (sha256 - (base32 "0qn9lfs0877wbv581yxw2gywxywxpvwslc5q07q4f7bqpyzxxiha")))) + (base32 "0cs03ghf7h65yvv8yf915bx4a47i6d3w2mjbs5zpz000spmrrj7y")))) (build-system cmake-build-system) (inputs `(("libebml" ,libebml))) -- cgit v1.2.3 From bceadaf42e002884bd25e779f4cd8ede8a0b0501 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 Jul 2020 00:43:43 +0200 Subject: gnu: libebml: Update to 1.4.0. * gnu/packages/xml.scm (libebml): Update to 1.4.0. --- gnu/packages/xml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index c3a9a1cfeb..6a212f79bb 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -95,14 +95,14 @@ (define-public expat (define-public libebml (package (name "libebml") - (version "1.3.10") + (version "1.4.0") (source (origin (method url-fetch) (uri (string-append "https://dl.matroska.org/downloads/libebml/" "libebml-" version ".tar.xz")) (sha256 - (base32 "0gjy5wv2hw1xhyxdgms8azs12f33ws8j7cvg8jy5k03v2bs959y6")))) + (base32 "1cy4hbk8qbxn4c6pwvlsvr1rp8vhfach9rwfg4c50qa94nlckaw0")))) (build-system cmake-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 630b75f76a1a296ff3e513c05dcd2dbf8e53f15e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 Jul 2020 00:45:37 +0200 Subject: gnu: exiv2: Update to 0.27.3. * gnu/packages/image.scm (exiv2): Update to 0.27.3. --- gnu/packages/image.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index c6af458286..f216815ddf 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1271,14 +1271,14 @@ (define-public libmng (define-public exiv2 (package (name "exiv2") - (version "0.27.2") + (version "0.27.3") (source (origin (method url-fetch) (uri (string-append "https://www.exiv2.org/builds/exiv2-" version "-Source.tar.gz")) (sha256 - (base32 "0gqminvj14xm3rgbnydbywf22608js80rp7nmxxk4497j5mzali6")))) + (base32 "0y77wfadjsrcxijdqgkr3q88b6mm9y3rg8kqsmaig8iah49md7x7")))) (build-system cmake-build-system) (arguments '(#:tests? #f)) ; no test suite (propagated-inputs -- cgit v1.2.3 From 7e482107e8b478d862615c72c3bc2a279dda5052 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 Jul 2020 00:48:11 +0200 Subject: gnu: fluidsynth: Update to 2.1.4. * gnu/packages/audio.scm (fluidsynth): Update to 2.1.4. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 20f9e1bfba..924fdd7f63 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1326,7 +1326,7 @@ (define-public g2reverb (define-public fluidsynth (package (name "fluidsynth") - (version "2.1.3") + (version "2.1.4") (source (origin (method git-fetch) (uri (git-reference @@ -1335,7 +1335,7 @@ (define-public fluidsynth (file-name (git-file-name name version)) (sha256 (base32 - "0dv6jprz2bzasvk91x2rv2pqyyvxkc72s4r6vsqw723a3kqa5bhc")))) + "1r3khwyw57ybg5m4x0rvdzq7hgw2484sd52k6bm19akbw8yicfna")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; no check target -- cgit v1.2.3 From bdbf4d54c470b851bfa88e8ed8900410eb84c1e1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 Jul 2020 00:48:34 +0200 Subject: gnu: spdlog: Update to 1.7.0. * gnu/packages/logging.scm (spdlog): Update to 1.7.0. --- gnu/packages/logging.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm index 789f32920d..bac9e18ea6 100644 --- a/gnu/packages/logging.scm +++ b/gnu/packages/logging.scm @@ -191,7 +191,7 @@ (define-public multitail (define-public spdlog (package (name "spdlog") - (version "1.6.1") + (version "1.7.0") (source (origin (method git-fetch) @@ -201,7 +201,7 @@ (define-public spdlog (file-name (git-file-name name version)) (sha256 (base32 - "1b1b3zmbyjgqz5yfdgaasi55x03d37z7l2pasvgikx3mm1gabq5a")))) + "1ryaa22ppj60461hcdb8nk7jwj84arp4iw4lyw594py92g4vnx3j")))) (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 8e619343691a3902a0af2d0fffead4d35b3d4053 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 Jul 2020 00:48:55 +0200 Subject: gnu: re2: Update to 2020-07-06. * gnu/packages/regex.scm (re2): Update to 2020-07-06. [source](modules, snippet): Remove. --- gnu/packages/regex.scm | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/gnu/packages/regex.scm b/gnu/packages/regex.scm index 60203ba5ca..cb7a08e207 100644 --- a/gnu/packages/regex.scm +++ b/gnu/packages/regex.scm @@ -30,7 +30,7 @@ (define-module (gnu packages regex) (define-public re2 (package (name "re2") - (version "2020-06-01") + (version "2020-07-06") (home-page "https://github.com/google/re2") (source (origin (method git-fetch) @@ -38,16 +38,7 @@ (define-public re2 (file-name (git-file-name name version)) (sha256 (base32 - "10jdgnp5dvkj3ay7grmdy539vv1srglnfxaqc5kb9v53cbql5hm8")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Fix test failure on 32-bit platforms, see - ;; . - (substitute* "re2/testing/compile_test.cc" - (("re->CompileToProg\\(920\\)") - "re->CompileToProg(850)")) - #t)))) + "12a9r9y7ry3hq0qf4znl9j7pn9mb5k6xp1f8nrk1sagfj1a504mq")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) -- cgit v1.2.3 From edfd70dbe48c1ee6bbe1276ce482ed31bce46338 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 Jul 2020 00:49:30 +0200 Subject: gnu: ffmpeg: Update to 4.3.1. * gnu/packages/video.scm (ffmpeg): Update to 4.3.1. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 8a0e6de5c9..a624750f49 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -937,14 +937,14 @@ (define-public libva-utils (define-public ffmpeg (package (name "ffmpeg") - (version "4.3") + (version "4.3.1") (source (origin (method url-fetch) (uri (string-append "https://ffmpeg.org/releases/ffmpeg-" version ".tar.xz")) (sha256 (base32 - "0pbrsv5v96yd8qzb9bk4kw7qk4xqpi03rsd5xfbwnjzlhijd02hx")))) + "1yrg9nri54iav86vxy5i8pj51dhikksa04x20d77nc3fsi09405d")))) (build-system gnu-build-system) (inputs `(("dav1d" ,dav1d) -- cgit v1.2.3 From 24128818d0f894b266ae4a8725ad063a0180b67f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 Jul 2020 00:49:51 +0200 Subject: gnu: libaacs: Update to 0.11.0. * gnu/packages/video.scm (libaacs): Update to 0.11.0. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index a624750f49..0dee73476e 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2746,14 +2746,14 @@ (define-public libbdplus (define-public libaacs (package (name "libaacs") - (version "0.10.0") + (version "0.11.0") (source (origin (method url-fetch) (uri (string-append "https://ftp.videolan.org/pub/videolan/libaacs/" version "/libaacs-" version ".tar.bz2")) (sha256 - (base32 "1zhjdcph8sqx7ak35s22kc736icwq135jlypggkp6vqyyygb3xlk")))) + (base32 "11skjqjlldmbjkyxdcz4fmcn6y4p95r1xagbcnjy4ndnzf0l723d")))) (inputs `(("libgcrypt" ,libgcrypt))) (native-inputs -- cgit v1.2.3 From ffac364a8e9036a8fd58100037d2390876b9bcc6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 Jul 2020 00:50:10 +0200 Subject: gnu: hitch: Update to 1.6.0. * gnu/packages/web.scm (hitch): Update to 1.6.0. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index c66ec376a0..391e3421e4 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5500,14 +5500,14 @@ (define-public goaccess (define-public hitch (package (name "hitch") - (version "1.5.2") + (version "1.6.0") (home-page "https://hitch-tls.org/") (source (origin (method url-fetch) (uri (string-append home-page "source/hitch-" version ".tar.gz")) (sha256 (base32 - "1nnzqqigfw78nqhp81a72x1s8d6v49ayw4w5df0zzm2cb1jgv95i")))) + "01n70yf8hx42jb801jv5q1xhrpqxyjnqhd98hjf81lvxpd5fnisf")))) (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 56a1ffeb68000068daf3fce3693cc9ee270388a6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 Jul 2020 00:50:32 +0200 Subject: gnu: libseccomp: Update to 2.5.0. * gnu/packages/linux.scm (libseccomp): Update to 2.5.0. [native-inputs]: Add GPERF. --- gnu/packages/linux.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 14bccadce3..b5facf6e89 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5700,7 +5700,7 @@ (define-public mtd-utils (define-public libseccomp (package (name "libseccomp") - (version "2.4.3") + (version "2.5.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/seccomp/libseccomp/" @@ -5708,10 +5708,11 @@ (define-public libseccomp "/libseccomp-" version ".tar.gz")) (sha256 (base32 - "07crwxqzvl5k2b90a47ii9wgvi09s9hsy5b5jddw9ylp351d25fg")))) + "1wql62cg8f95cwpy057cl764nni9g4sdn5lqj68x22kjs8w71yhz")))) (build-system gnu-build-system) (native-inputs - `(("which" ,which))) + `(("gperf" ,gperf) + ("which" ,which))) (synopsis "Interface to Linux's seccomp syscall filtering mechanism") (description "The libseccomp library provides an easy to use, platform independent, interface to the Linux Kernel's syscall filtering mechanism. The -- cgit v1.2.3 From 6a0f9c87295ef28e8e7537f445b430e051b7fb7f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 Jul 2020 00:50:49 +0200 Subject: gnu: rocksdb: Update to 6.11.4. * gnu/packages/databases.scm (rocksdb): Update to 6.11.4. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 0e6ad4e291..ca320f25e8 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1179,7 +1179,7 @@ (define-public emacs-recutils (define-public rocksdb (package (name "rocksdb") - (version "6.10.2") + (version "6.11.4") (source (origin (method git-fetch) (uri (git-reference @@ -1188,7 +1188,7 @@ (define-public rocksdb (file-name (git-file-name name version)) (sha256 (base32 - "1f2wqb6px812ijcivq3rsknqgkv01wblc6sd8wavhrw8qljgr3s1")) + "0n19p9cd13jg0lnibrzwkxs4xlrhyj3knypkd2ic41arbds0bdnl")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 2cb20a3e0145aa916f54703badabc9f30444ae5c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 Jul 2020 00:56:23 +0200 Subject: gnu: nginx: Update to 1.19.1. * gnu/packages/web.scm (nginx): Update to 1.19.1. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 391e3421e4..7107c9e0bc 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -229,14 +229,14 @@ (define-public nginx ;; ’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.0") + (version "1.19.1") (source (origin (method url-fetch) (uri (string-append "https://nginx.org/download/nginx-" version ".tar.gz")) (sha256 (base32 - "1j1n3rlvan6l9j3vw8axbbdm96w7s0x6ygmgqvbplzfd3wbid9j4")))) + "14jlcn8gywa4r9brmm41ddg2dczskslnn4dnr5xmqg7dcin7f150")))) (build-system gnu-build-system) (inputs `(("openssl" ,openssl) ("pcre" ,pcre) -- cgit v1.2.3 From f5bb997d1eb6f10afbdbadbe5a0d1daffd37068f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 Jul 2020 01:00:48 +0200 Subject: gnu: ccid: Update to 1.4.33. * gnu/packages/security-token.scm (ccid): Update to 1.4.33. --- gnu/packages/security-token.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index da8a58e7ad..cf6bf18373 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -65,15 +65,14 @@ (define-module (gnu packages security-token) (define-public ccid (package (name "ccid") - (version "1.4.32") + (version "1.4.33") (source (origin (method url-fetch) - (uri (string-append - "https://ccid.apdu.fr/files/" - name "-" version ".tar.bz2")) + (uri (string-append "https://ccid.apdu.fr/files/ccid-" + version ".tar.bz2")) (sha256 (base32 - "0f8nzk7379ip4x2ii5vn6h67jyx733pq0ywnnsj2llbxi2vllpsl")))) + "0974h2v9wq0j0ajw3c7yckaw8wqcppb2npfhfhmv9phijy9xlmjj")))) (build-system gnu-build-system) (arguments `(#:configure-flags (list (string-append "--enable-usbdropdir=" %output -- cgit v1.2.3 From 819b8b2728989b7ac070282b51f02562a3cddb06 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 Jul 2020 17:23:44 +0200 Subject: gnu: libseccomp: Do not build the static library. * gnu/packages/linux.scm (libseccomp)[arguments]: New field. --- gnu/packages/linux.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b5facf6e89..6fe2144234 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5710,6 +5710,8 @@ (define-public libseccomp (base32 "1wql62cg8f95cwpy057cl764nni9g4sdn5lqj68x22kjs8w71yhz")))) (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--disable-static"))) (native-inputs `(("gperf" ,gperf) ("which" ,which))) -- cgit v1.2.3 From 7a9a27a051a04a7fee2e7fe40127fedbe9112cfd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 Jul 2020 17:24:27 +0200 Subject: gnu: libseccomp: Skip test that fails in QEMU user-mode emulation. * gnu/packages/linux.scm (libseccomp)[arguments]: Add phase to skip one test. --- gnu/packages/linux.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 6fe2144234..6f98277c89 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5711,7 +5711,14 @@ (define-public libseccomp "1wql62cg8f95cwpy057cl764nni9g4sdn5lqj68x22kjs8w71yhz")))) (build-system gnu-build-system) (arguments - '(#:configure-flags '("--disable-static"))) + '(#:configure-flags '("--disable-static") + #:phases (modify-phases %standard-phases + (add-before 'check 'skip-load-test + (lambda _ + ;; This test does a native system call and fails when + ;; run under QEMU user-mode emulation. Just skip it. + (delete-file "tests/52-basic-load.tests") + #t))))) (native-inputs `(("gperf" ,gperf) ("which" ,which))) -- cgit v1.2.3