From 5cd1a056bc1330066afac72988cce8229c75482c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 3 Dec 2019 15:14:53 +0100 Subject: gnu: xinput: Update to 1.6.3. * gnu/packages/xorg.scm (xinput): Update to 1.6.3. --- 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 022cb49c20..b71efedf32 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3692,7 +3692,7 @@ (define-public xineramaproto (define-public xinput (package (name "xinput") - (version "1.6.2") + (version "1.6.3") (source (origin (method url-fetch) @@ -3702,7 +3702,7 @@ (define-public xinput ".tar.bz2")) (sha256 (base32 - "1i75mviz9dyqyf7qigzmxq8vn31i86aybm662fzjz5c086dx551n")))) + "1vb6xdd1xmk5f7pwc5zcbxfray5sf1vbnscqwf2yl8lv7gfq38im")))) (build-system gnu-build-system) (inputs `(("libxrender" ,libxrender) -- cgit v1.2.3 From 6d5811ef8ec2fa1a9596e8039b3a189dc182d645 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 3 Dec 2019 15:15:18 +0100 Subject: gnu: xkeyboard-config: Update to 2.28. * gnu/packages/xorg.scm (xkeyboard-config): Update to 2.28. --- 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 b71efedf32..706faff32e 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3837,7 +3837,7 @@ (define-public xkbutils (define-public xkeyboard-config (package (name "xkeyboard-config") - (version "2.27") + (version "2.28") (source (origin (method url-fetch) @@ -3847,7 +3847,7 @@ (define-public xkeyboard-config ".tar.bz2")) (sha256 (base32 - "07wh443lhwv1j0q6xnxnji7f7ahh7xphxj90fv02cdd6zv4aw3b9")))) + "1kmxc8hdw4qpvdlzp4ag8ygl34lqhs6sn3pcz1sl0kn61xdv5bb9")))) (build-system gnu-build-system) (inputs `(("gettext" ,gettext-minimal) -- cgit v1.2.3 From 64136870445f15242a75fca317fc8af35c4a8cee Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 4 Jan 2020 01:06:51 +0100 Subject: gnu: freeglut: Update to 3.2.1. * gnu/packages/gl.scm (freeglut): Update to 3.2.1. [inputs]: Remove MESA, XORGPROTO and XINPUT. --- gnu/packages/gl.scm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 077b009688..ad1b845b6f 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -96,7 +96,7 @@ (define-public glu (define-public freeglut (package (name "freeglut") - (version "3.0.0") + (version "3.2.1") (source (origin (method url-fetch) (uri (string-append @@ -104,16 +104,13 @@ (define-public freeglut version "/freeglut-" version ".tar.gz")) (sha256 (base32 - "18knkyczzwbmyg8hr4zh8a1i5ga01np2jzd1rwmsh7mh2n2vwhra")))) + "0s6sk49q8ijgbsrrryb7dzqx2fa744jhx1wck5cz5jia2010w06l")))) (build-system cmake-build-system) (arguments '(#:tests? #f)) ; no test target - (inputs `(("mesa" ,mesa) - ("libx11" ,libx11) + (inputs `(("libx11" ,libx11) ("libxi" ,libxi) ("libxrandr" ,libxrandr) - ("libxxf86vm" ,libxxf86vm) - ("xorgproto" ,xorgproto) - ("xinput" ,xinput))) + ("libxxf86vm" ,libxxf86vm))) (propagated-inputs ;; Headers from Mesa and GLU are needed. `(("glu" ,glu) -- cgit v1.2.3 From 5f6130473788c074536cee2d29dcb052c3140182 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 4 Jan 2020 01:09:59 +0100 Subject: gnu: freeglut: Do not build static libraries. * gnu/packages/gl.scm (freeglut)[arguments]: Add #:configure-flags. --- gnu/packages/gl.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index ad1b845b6f..23904a556b 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -106,7 +106,9 @@ (define-public freeglut (base32 "0s6sk49q8ijgbsrrryb7dzqx2fa744jhx1wck5cz5jia2010w06l")))) (build-system cmake-build-system) - (arguments '(#:tests? #f)) ; no test target + (arguments + '(#:tests? #f ;no test target + #:configure-flags '("-DFREEGLUT_BUILD_STATIC_LIBS=OFF"))) (inputs `(("libx11" ,libx11) ("libxi" ,libxi) ("libxrandr" ,libxrandr) -- cgit v1.2.3 From f0bce2e08feb157b3d8b5100b1ea26bbbd6141e3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 12 Jan 2020 20:26:07 +0100 Subject: gnu: nss, nss-certs: Update to 3.49. * gnu/packages/certs.scm (nss-certs): Update to 3.49. * gnu/packages/nss.scm (nss): Likewise. --- gnu/packages/certs.scm | 4 ++-- gnu/packages/nss.scm | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/certs.scm b/gnu/packages/certs.scm index f47260121b..1736d20c7e 100644 --- a/gnu/packages/certs.scm +++ b/gnu/packages/certs.scm @@ -76,7 +76,7 @@ (define certdata2pem (define-public nss-certs (package (name "nss-certs") - (version "3.46.1") + (version "3.49") (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -87,7 +87,7 @@ (define-public nss-certs "nss-" version ".tar.gz"))) (sha256 (base32 - "0l9ns44rlkp1bpblplspfbqmyhb8rhvc89y56kqh725rgpny1xrv")))) + "07g7pn0r29y2h5p2zibz273yhkx6k4wvy8m1308hcqzxqi6hjf37")))) (build-system gnu-build-system) (outputs '("out")) (native-inputs diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index 2e34f8e26f..2df4af9d50 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -70,7 +70,7 @@ (define-public nspr (define-public nss (package (name "nss") - (version "3.48") + (version "3.49") (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -81,7 +81,7 @@ (define-public nss "nss-" version ".tar.gz"))) (sha256 (base32 - "1b7qs1q7jqhw9dvkdznanzhc5dyq4bwx0biywszy3qx4hqm8571z")) + "07g7pn0r29y2h5p2zibz273yhkx6k4wvy8m1308hcqzxqi6hjf37")) ;; Create nss.pc and nss-config. (patches (search-patches "nss-pkgconfig.patch" "nss-freebl-stubs.patch" @@ -130,7 +130,7 @@ (define-public nss ;; leading to test failures: ;; . To ;; work around that, set the time to roughly the release date. - (invoke "faketime" "2019-12-01" "./nss/tests/all.sh"))) + (invoke "faketime" "2020-01-01" "./nss/tests/all.sh"))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From 6e332fd3706fbe81c67b50c9d6b27df18f363c34 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Mon, 13 Jan 2020 12:39:45 +0100 Subject: gnu: qtbase: Open links properly without xdg-utils in profile * gnu/packages/qt.scm (qtbase)[inputs]: Add XDG-UTILS. [arguments](patch-xdg-open): New phase. Signed-off-by: Marius Bakke --- gnu/packages/qt.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 514577678e..8dc771a5f8 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2019, 2020 Marius Bakke ;;; Copyright © 2018 John Soo ;;; Copyright © 2020 Mike Rosset +;;; Copyright © 2020 Jakub Kądziołka ;;; ;;; This file is part of GNU Guix. ;;; @@ -363,6 +364,7 @@ (define-public qtbase (build-system gnu-build-system) (propagated-inputs `(("mesa" ,mesa) + ;; Use which the package, not the function ("which" ,(@ (gnu packages base) which)))) (inputs `(("alsa-lib" ,alsa-lib) @@ -407,6 +409,7 @@ (define-public qtbase ("xcb-util-keysyms" ,xcb-util-keysyms) ("xcb-util-renderutil" ,xcb-util-renderutil) ("xcb-util-wm" ,xcb-util-wm) + ("xdg-utils" ,xdg-utils) ("zlib" ,zlib))) (native-inputs `(("bison" ,bison) @@ -428,6 +431,14 @@ (define-public qtbase "qmake/library/qmakebuiltins.cpp") (("/bin/sh") (which "sh"))) #t)) + (add-after 'configure 'patch-xdg-open + (lambda _ + (substitute* '("src/platformsupport/services/genericunix/qgenericunixservices.cpp") + (("^.*const char \\*browsers.*$" all) + (string-append "*browser = QStringLiteral(\"" + (which "xdg-open") + "\"); return true; \n" all))) + #t)) (replace 'configure (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) -- cgit v1.2.3 From e4da86f358f0a862d1e635a294a14607f6b854f1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 14 Jan 2020 18:09:10 +0100 Subject: gnu: source-highlight: Update to 3.1.9. * gnu/packages/pretty-print.scm (source-highlight): Update to 3.1.9. --- gnu/packages/pretty-print.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/pretty-print.scm b/gnu/packages/pretty-print.scm index 6f2b3f78ea..fc98478d4c 100644 --- a/gnu/packages/pretty-print.scm +++ b/gnu/packages/pretty-print.scm @@ -190,7 +190,7 @@ (define-public fmt (define-public source-highlight (package (name "source-highlight") - (version "3.1.8") + (version "3.1.9") (source (origin (method url-fetch) @@ -198,7 +198,7 @@ (define-public source-highlight version ".tar.gz")) (sha256 (base32 - "18xdalxg7yzrxc1njzgw7aryq2jdm7zq2yqz41sc7k6il5z6lcq1")))) + "148w47k3zswbxvhg83z38ifi85f9dqcpg7icvvw1cm6bg21x4zrs")))) (build-system gnu-build-system) ;; The ctags that comes with emacs does not support the --excmd options, ;; so can't be used -- cgit v1.2.3 From 89a6d2d1451986365f6161f3589d3753033faa0a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 14 Jan 2020 18:39:46 +0100 Subject: gnu: procps: Update to 3.3.16. * gnu/packages/linux.scm (procps): Update to 3.3.16. --- 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 5235d6cedc..7242894f46 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1224,14 +1224,14 @@ (define-public ddate (define-public procps (package (name "procps") - (version "3.3.15") + (version "3.3.16") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/procps-ng/Production/" "procps-ng-" version ".tar.xz")) (sha256 (base32 - "0r84kwa5fl0sjdashcn4vh7hgfm7ahdcysig3mcjvpmkzi7p9g8h")))) + "1br0g93ysqhlv13i1k4lfbimsgxnpy5rgs4lxfc9rkzdbpbaqplj")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) -- cgit v1.2.3 From 98ca002aaf14b38ae3445e801d497177888f8438 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Jan 2020 01:13:18 +0100 Subject: gnu: popt: Reverse source mirror entries. Commit 8f4cff0e21e4142d5f51022ef1efad569c3ca0bc accidentally caused rebuilds because the expected file name changed. * gnu/packages/popt.scm (popt)[source](uri): Add the Debian mirror last. --- gnu/packages/popt.scm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/gnu/packages/popt.scm b/gnu/packages/popt.scm index 6346c54f22..857455d213 100644 --- a/gnu/packages/popt.scm +++ b/gnu/packages/popt.scm @@ -62,13 +62,12 @@ (define-public popt (version "1.16") (source (origin (method url-fetch) - ;; The rpm5.org domain does not resolve since 2019-06-13, so we - ;; borrow Debians infrastructure for the source download. - (uri (list (string-append "https://deb.debian.org/debian/pool/main" - "/p/popt/popt_" version ".orig.tar.gz") - ;; Keep the old URL around in case it reappears. - (string-append "http://rpm5.org/files/popt/popt-" - version ".tar.gz"))) + (uri (list (string-append "http://rpm5.org/files/popt/popt-" + version ".tar.gz") + ;; The rpm5.org domain does not resolve since 2019-06-13, + ;; so fallback to Debians copy. + (string-append "https://deb.debian.org/debian/pool/main" + "/p/popt/popt_" version ".orig.tar.gz"))) (sha256 (base32 "1j2c61nn2n351nhj4d25mnf3vpiddcykq005w2h6kw79dwlysa77")))) -- cgit v1.2.3 From 703c190ccb9a07c22995449c3cecbdec1900b9b4 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 14 Jan 2020 22:55:24 -0500 Subject: gnu: linux-libre@4.4: Update to 4.4.210. * gnu/packages/linux.scm (linux-libre-4.4-version): Update to 4.4.210. (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 bb1f20c3dc..293b19660f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -389,10 +389,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.209") +(define-public linux-libre-4.4-version "4.4.210") (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) - (hash (base32 "0m94795grq3sbj7jlmwc0ncq3vap9lf1z00sdiys17kjs3bcfbnh"))) + (hash (base32 "1pg754s3138d2lq5y2zd1z7dagdy8pl4ifmp0754sa1rkjd3h0ns"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.4))) -- cgit v1.2.3 From 7d9e0febba786b7066a3dda217809231061eea4b Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 14 Jan 2020 22:56:26 -0500 Subject: gnu: linux-libre@4.9: Update to 4.9.210. * gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.210. (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 293b19660f..af1fa60746 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -381,10 +381,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.209") +(define-public linux-libre-4.9-version "4.9.210") (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "1qarm90l1r4y68v5swhf81z6v6gspa8sw9jab3fxrz8mz6zdan02"))) + (hash (base32 "04skcbbp1yv54hwipa1pjx04lb21013r0lh2swycq0kdhc1m54d0"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -- cgit v1.2.3 From f45330c89c3ec52c547ecbc9a37aeec87df1b394 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 14 Jan 2020 22:57:01 -0500 Subject: gnu: linux-libre@4.14: Update to 4.14.165. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.165. (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 af1fa60746..7f06b31ce9 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -373,10 +373,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.164") +(define-public linux-libre-4.14-version "4.14.165") (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "0jzbgpxlfy64q7zaqix87k8ci1fr9lkx1xr9m5zjniziydhi00x2"))) + (hash (base32 "1iw8w3kfm8cs97imc6zz2wqzq9bhhlygcg7r8qslwks0hqivbbmh"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit v1.2.3 From d3e22ad1522bd3fc17caed7d53dd05b5208e0e5b Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 14 Jan 2020 22:57:39 -0500 Subject: gnu: linux-libre@4.19: Update to 4.19.96. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.96. (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 7f06b31ce9..d40b875a7f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -365,10 +365,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.95") +(define-public linux-libre-4.19-version "4.19.96") (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "1c2g5wcf4zgy5q51qrf0s4hf3pr1j8gi8gn27w8cafn1xqrcmvaa"))) + (hash (base32 "0k8xcdmc3jffk4y7vxnwvrjnrzhjcw07ikp5a2c4zhbvpbax3h93"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From 871fc9512e5cd276ef1f722578c8cc698e8e5a81 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 14 Jan 2020 22:58:18 -0500 Subject: gnu: linux-libre: Update to 5.4.12. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.12. (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 d40b875a7f..bd45464f00 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -357,10 +357,10 @@ (define (%upstream-linux-source version hash) "linux-" version ".tar.xz")) (sha256 hash))) -(define-public linux-libre-5.4-version "5.4.11") +(define-public linux-libre-5.4-version "5.4.12") (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "0b6pamnhyzf4n6sl8lxcnllrn41xmbldipfca23j1n71spjkdgb2"))) + (hash (base32 "1yyh934ifzwgqlpd8wy50z9d68hla5arvy50pi6c499dsnicghyr"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit v1.2.3 From 0bce3ebdd3f79c4bdc5e1a00d08b132a9f92d2cf Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 14 Jan 2020 19:30:43 +0200 Subject: gnu: Add rust-rand-xoshiro-0.1. * gnu/packages/crates-io.scm (rust-rand-xoshiro-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 201f500666..2e3e8a9132 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7857,6 +7857,29 @@ (define-public rust-rand-xoshiro-0.3 "Xoshiro, xoroshiro and splitmix64 random number generators.") (license (list license:expat license:asl2.0)))) +(define-public rust-rand-xoshiro-0.1 + (package + (inherit rust-rand-xoshiro-0.3) + (name "rust-rand-xoshiro") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rand_xoshiro" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0ac9ha6ll8b6l1930bd99k29jrjpsbpddvr6ycrnbi5rkwb1id03")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-byteorder" ,rust-byteorder-1.3) + ("rust-rand-core" ,rust-rand-core-0.3)) + #:cargo-development-inputs + (("rust-rand" ,rust-rand-0.6)))))) + (define-public rust-rawpointer-0.1 (package (name "rust-rawpointer") -- cgit v1.2.3 From 35c08c2b52f4499552681f63a082d76b874f85a6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 14 Jan 2020 19:32:14 +0200 Subject: gnu: rust-rand-0.6: Update inputs. * gnu/packages/crates-io.scm (rust-rand-0.6)[arguments]: Move rust-autocfg-0.1 to cargo-inputs. Replace rust-rand-xoshiro-0.3 with rust-rand-xoshiro-0.1. --- 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 2e3e8a9132..dd720b0bd2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7482,10 +7482,10 @@ (define-public rust-rand-0.6 ("rust-rand-os" ,rust-rand-os-0.1) ("rust-rand-pcg" ,rust-rand-pcg-0.1) ("rust-rand-xorshift" ,rust-rand-xorshift-0.1) - ("rust-winapi" ,rust-winapi-0.3)) + ("rust-winapi" ,rust-winapi-0.3) + ("rust-autocfg" ,rust-autocfg-0.1)) ; build-dependency #:cargo-development-inputs - (("rust-autocfg" ,rust-autocfg-0.1) - ("rust-rand-xoshiro" ,rust-rand-xoshiro-0.3)))) + (("rust-rand-xoshiro" ,rust-rand-xoshiro-0.1)))) (home-page "https://crates.io/crates/rand") (synopsis "Random number generators and other randomness functionality") (description -- cgit v1.2.3 From ef3827da672a75f2ef263524ee1aafd2d38a105a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 14 Jan 2020 20:45:15 +0200 Subject: gnu: rust-cbindgen: Remove extra input. * gnu/packages/rust-apps.scm (rust-cbindgen)[arguments]: Remove rust-autogen-0.1 from cargo-development-inputs. --- gnu/packages/rust-apps.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 215955214c..78028f4562 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -86,9 +86,7 @@ (define-public rust-cbindgen ("serde-json" ,rust-serde-json-1.0) ("syn" ,rust-syn-1.0) ("tempfile" ,rust-tempfile-3.0) - ("toml" ,rust-toml-0.5)) - #:cargo-development-inputs - (("autocfg" ,rust-autocfg-0.1)))) + ("toml" ,rust-toml-0.5)))) (home-page "https://github.com/eqrion/cbindgen/") (synopsis "Tool for generating C bindings to Rust code") (description -- cgit v1.2.3 From 408156a98cc240aa110a72993700ee1fd8ffb3d5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 14 Jan 2020 20:47:12 +0200 Subject: gnu: rust-rawpointer-0.1: Don't hide package. * gnu/packages/crates-io.scm (rust-rawpointer-0.1)[arguments]: Skip build. [properties]: Remove field. --- 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 dd720b0bd2..ce82f8c208 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7893,12 +7893,12 @@ (define-public rust-rawpointer-0.1 (base32 "06ghpm9y7gacks78s3maakha07kbnwrxif5q37r2l7z1sali3b7b")))) (build-system cargo-build-system) + (arguments '(#:skip-build? #t)) (home-page "https://github.com/bluss/rawpointer/") (synopsis "Extra methods for raw pointers") (description "Extra methods for raw pointers. For example @code{.post_inc()} and @code{.pre_dec()} (c.f. @code{ptr++} and @code{--ptr}) and @code{ptrdistance}.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 0169e087dd403011522c7816c89b893e685f9440 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 14 Jan 2020 20:51:07 +0200 Subject: gnu; rust-rdrand-0.4: Don't hide package. * gnu/packages/crates-io.scm (rust-rdrand-0.4)[arguments]: Skip build. Add rust-rand-core-0.3 to cargo-inputs. [properties]: Remove field. [description]: Fix typo. --- gnu/packages/crates-io.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ce82f8c208..93a868286a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8009,12 +8009,15 @@ (define-public rust-rdrand-0.4 (base32 "1cjq0kwx1bk7jx3kzyciiish5gqsj7620dm43dc52sr8fzmm9037")))) (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-rand-core" ,rust-rand-core-0.3)))) (home-page "https://github.com/nagisa/rust_rdrand/") (synopsis "Random number generator") (description "This package is an implementation of random number generator based on -@code{rdrand} and @cpde{rdseed} instructions") - (properties '((hidden? . #t))) +@code{rdrand} and @code{rdseed} instructions") (license license:isc))) ;; This package requires features which are unavailable -- cgit v1.2.3 From 99b006627e4c47bb0d8e2d28b1c1a2fe9e0fa4c0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 14 Jan 2020 20:54:06 +0200 Subject: gnu: rust-redox-syscall-0.1: Don't hide package. * gnu/packages/crates-io.scm (rust-redox-syscall-0.1)[arguments]: Skip build. [properties]: Remove field. --- 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 93a868286a..6db6516e74 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8035,11 +8035,11 @@ (define-public rust-redox-syscall-0.1 (base32 "110y7dyfm2vci4x5vk7gr0q551dvp31npl99fnsx2fb17wzwcf94")))) (build-system cargo-build-system) + (arguments '(#:skip-build? #t)) (home-page "https://gitlab.redox-os.org/redox-os/syscall") (synopsis "Rust library to access raw Redox system calls") (description "This package provides a Rust library to access raw Redox system calls.") - (properties '((hidden? . #t))) (license license:expat))) (define-public rust-redox-termios-0.1 -- cgit v1.2.3 From 57c2ef35f77bab3b36f1fbc73524e6dc7eb2e72c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 14 Jan 2020 20:55:57 +0200 Subject: gnu: rust-redox-termios-0.1: Don't hide package. * gnu/packages/crates-io.scm (rust-redox-termios-0.1)[arguments]: Skip build. Add rust-redox-syscall-0.1 to cargo-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6db6516e74..343bd8fd97 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8055,11 +8055,14 @@ (define-public rust-redox-termios-0.1 (base32 "0xhgvdh62mymgdl3jqrngl8hr4i8xwpnbsxnldq0l47993z1r2by")))) (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-redox-syscall" ,rust-redox-syscall-0.1)))) (home-page "https://github.com/redox-os/termios") (synopsis "Rust library to access Redox termios functions") (description "This package provides a Rust library to access Redox termios functions.") - (properties '((hidden? . #t))) (license license:expat))) (define-public rust-ref-cast-0.2 -- cgit v1.2.3 From a198ee940f5b9c0b0cc19ccb75934c9183ea31d3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 14 Jan 2020 20:58:21 +0200 Subject: gnu: rust-remove-dir-all-0.5: Don't hide package. * gnu/packages/crates-io.scm (rust-remove-dir-all-0.5)[arguments]: Skip build. Add rust-winapi-0.3 to cargo-inputs. Add rust-doc-comment-0.3 to cargo-development-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 343bd8fd97..cb4e919f00 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8220,12 +8220,17 @@ (define-public rust-remove-dir-all-0.5 (base32 "0bkrlyg26mgizpiy1yb2hhpgscxcag8r5fnckqsvk25608vzm0sa")))) (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-winapi" ,rust-winapi-0.3)) + #:cargo-development-inputs + (("rust-doc-comment" ,rust-doc-comment-0.3)))) (home-page "https://github.com/XAMPPRocky/remove_dir_all") (synopsis "Implementation of remove_dir_all for Windows") (description "This package provides a safe, reliable implementation of @code{remove_dir_all} for Windows") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 77006df588e8cc158b3a1fc1273e6d1e3313d50d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 14 Jan 2020 21:00:22 +0200 Subject: gnu: rust-resolv-conf-0.6: Don't hide package. * gnu/packages/crates-io.scm (rust-resolv-conf-0.6)[arguments]: Skip build. Add rust-quick-error-1.2, rust-hostname-0.1 to cargo-inputs. [synopsis]: Appease 'guix lint'. [properties]: Remove field. --- gnu/packages/crates-io.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index cb4e919f00..139f27622b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8247,11 +8247,15 @@ (define-public rust-resolv-conf-0.6 (base32 "1jvdsmksdf6yiipm3aqahyv8n1cjd7wqc8sa0p0gzsax3fmb8qxj")))) (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)))) (home-page "https://github.com/tailhook/resolv-conf") - (synopsis "/etc/resolv.conf parser") + (synopsis "Parser for /etc/resolv.conf") (description "An /etc/resolv.conf parser crate for Rust.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 39d6888f1accd47ac1ead46dcf05b7193f77cc27 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 14 Jan 2020 21:03:18 +0200 Subject: gnu: rust-rustc-demangle-0.1: Don't hide package. * gnu/packages/crates-io.scm (rust-rustc-demangle-0.1)[arguments]: Skip build. Add rust-compiler-builtins-0.1, rust-rustc-std-workspace-core-1.0 to cargo-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 139f27622b..cd22af13fa 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8301,11 +8301,15 @@ (define-public rust-rustc-demangle-0.1 (base32 "10qp42sl1wrdbgbbh8rnay2grm976z7hqgz32c4y09l1c071qsac")))) (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-compiler-builtins" ,rust-compiler-builtins-0.1) + ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1.0)))) (home-page "https://github.com/alexcrichton/rustc-demangle") (synopsis "Rust compiler symbol demangling") (description "This package demanges the symbols from the Rust compiler.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 74146f9c72f40241b544e4df532875212a63e3d6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 14 Jan 2020 21:05:58 +0200 Subject: gnu: rust-rustc-hash-1.0: Don't hide package. * gnu/packages/crates-io.scm (rust-rustc-hash-1.0)[arguments]: Skip build. [home-page]: Update to new home-page. [properties]: Remove field. --- 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 cd22af13fa..f39de6c406 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8326,11 +8326,11 @@ (define-public rust-rustc-hash-1.0 (base32 "114bf72466bl63i5hh8fgqfnhihs0w1m9c9jz505095agfixnvg0")))) (build-system cargo-build-system) - (home-page "https://github.com/rust-lang-nursery/rustc-hash") + (arguments '(#:skip-build? #t)) + (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.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From a23dbdab6dbac44f91ef2835a63643ffec2171d0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 14 Jan 2020 21:08:44 +0200 Subject: gnu: rust-rustc-hash-1.0: Update to 1.0.1. * gnu/packages/crates-io.scm (rust-rustc-hash-1.0): Update to 1.0.1. [arguments]: Add rust-byteorder-1.3 to cargo-inputs. --- gnu/packages/crates-io.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f39de6c406..909941c4e2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8316,7 +8316,7 @@ (define-public rust-rustc-demangle-0.1 (define-public rust-rustc-hash-1.0 (package (name "rust-rustc-hash") - (version "1.0.0") + (version "1.0.1") (source (origin (method url-fetch) @@ -8324,9 +8324,12 @@ (define-public rust-rustc-hash-1.0 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "114bf72466bl63i5hh8fgqfnhihs0w1m9c9jz505095agfixnvg0")))) + "1f4cnbcmz2c3zjidqszc9c4fip37ch4xl74nkkp9dw291j5zqh3m")))) (build-system cargo-build-system) - (arguments '(#:skip-build? #t)) + (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 -- cgit v1.2.3 From 4de42e8eaff4a1a2793ae697067190ddab6fddeb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 14 Jan 2020 21:10:34 +0200 Subject: gnu: rust-rustc-serialize-0.3: Don't hide package. * gnu/packages/crates-io.scm (rust-rustc-serialize-0.3)[arguments]: Skip build. Add rust-rand-0.3 to cargo-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 909941c4e2..e3d0a74010 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8350,6 +8350,10 @@ (define-public rust-rustc-serialize-0.3 (base32 "1nkg3vasg7nk80ffkazizgiyv3hb1l9g3d8h17cajbkx538jiwfw")))) (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-rand" ,rust-rand-0.3)))) (home-page "https://github.com/rust-lang-deprecated/rustc-serialize") (synopsis "Generic serialization/deserialization support") (description @@ -8357,7 +8361,6 @@ (define-public rust-rustc-serialize-0.3 corresponding to the @code{derive(RustcEncodable, RustcDecodable)} mode in the compiler. Also includes support for hex, base64, and json encoding and decoding.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From e098c3aa847e1a62b6cdb1e228c01568a3028489 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 14 Jan 2020 21:12:17 +0200 Subject: gnu: rust-rustc-std-workspace-core-1.0: Don't hide package. * gnu/packages/crates-io.scm (rust-rustc-std-workspace-core-1.0) [arguments]: Skip build. [properties]: Remove field. --- 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 e3d0a74010..216c4b019e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8377,11 +8377,11 @@ (define-public rust-rustc-std-workspace-core-1.0 (base32 "1309xhwyai9xpz128xrfjqkmnkvgjwddznmj7brbd8i8f58zamhr")))) (build-system cargo-build-system) + (arguments '(#:skip-build? #t)) (home-page "https://crates.io/crates/rustc-std-workspace-core") (synopsis "Explicitly empty crate for rust-lang/rust integration") (description "This crate provides an explicitly empty crate for rust-lang/rust integration.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From a66dbe098953b71a7a62ec631c7622aa7663e4fa Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 14 Jan 2020 21:15:27 +0200 Subject: gnu: rust-safemem-0.3: Don't hide package. * gnu/packages/crates-io.scm (rust-safemem-0.3)[arguments]: Skip build. [properties]: Remove field. --- 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 216c4b019e..0a2c06b89b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8537,11 +8537,11 @@ (define-public rust-safemem-0.3 (base32 "1l1ljkm4lpyryrv2ndaxi1f7z1f3v9bwy1rzl9f9mbhx04iq9c6j")))) (build-system cargo-build-system) + (arguments '(#:skip-build? #t)) (home-page "https://github.com/abonander/safemem") (synopsis "Safe wrappers for memory-accessing functions") (description "Safe wrappers for memory-accessing functions, like @code{std::ptr::copy()}.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 251c3fa2ae2e30c509fde0c6de57ececbe39f5c6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 14 Jan 2020 21:16:28 +0200 Subject: gnu: rust-safemem-0.3: Update to 0.3.3. * gnu/packages/crates-io.scm (rust-safemem-0.3): Update to 0.3.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 0a2c06b89b..869504134b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8527,7 +8527,7 @@ (define-public rust-ryu-1.0 (define-public rust-safemem-0.3 (package (name "rust-safemem") - (version "0.3.2") + (version "0.3.3") (source (origin (method url-fetch) @@ -8535,7 +8535,7 @@ (define-public rust-safemem-0.3 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "1l1ljkm4lpyryrv2ndaxi1f7z1f3v9bwy1rzl9f9mbhx04iq9c6j")))) + "0wp0d2b2284lw11xhybhaszsczpbq1jbdklkxgifldcknmy3nw7g")))) (build-system cargo-build-system) (arguments '(#:skip-build? #t)) (home-page "https://github.com/abonander/safemem") -- cgit v1.2.3 From 0a293597cba4b1371d15deceeee6da846091c283 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 14 Jan 2020 21:19:47 +0200 Subject: gnu: rust-same-file-1.0: Don't hide package. * gnu/packages/crates-io.scm (rust-same-file-1.0)[arguments]: Skip build. Add rust-winapi-util-0.1 to cargo-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 869504134b..0fde0f8f8c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8558,12 +8558,15 @@ (define-public rust-same-file-1.0 (base32 "08a4zy10pjindf2rah320s6shgswk13mqw7s61m8i1y1xpf8spjq")))) (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-winapi-util" ,rust-winapi-util-0.1)))) (home-page "https://github.com/BurntSushi/same-file") (synopsis "Determine whether two file paths point to the same file") (description "This package provides a simple crate for determining whether two file paths point to the same file.") - (properties '((hidden? . #t))) (license (list license:unlicense license:expat)))) -- cgit v1.2.3 From a618b6b7cafbb18b653871b901e7f2487fb227ad Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 14 Jan 2020 21:21:36 +0200 Subject: gnu: rust-same-file-1.0: Upgrade to 1.0.6. * gnu/packages/crates-io.scm (rust-same-file-1.0): Update to 1.0.6. [arguments]: Add rust-doc-comment-0.3 to cargo-development-inputs. --- gnu/packages/crates-io.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0fde0f8f8c..63ffddb7e2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8548,7 +8548,7 @@ (define-public rust-safemem-0.3 (define-public rust-same-file-1.0 (package (name "rust-same-file") - (version "1.0.5") + (version "1.0.6") (source (origin (method url-fetch) @@ -8556,12 +8556,14 @@ (define-public rust-same-file-1.0 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "08a4zy10pjindf2rah320s6shgswk13mqw7s61m8i1y1xpf8spjq")))) + "00h5j1w87dmhnvbv9l8bic3y7xxsnjmssvifw2ayvgx9mb1ivz4k")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-winapi-util" ,rust-winapi-util-0.1)))) + (("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/same-file") (synopsis "Determine whether two file paths point to the same file") (description -- cgit v1.2.3 From 000f42f4f606f4fdf2e3adb3d9129d693aee0ab5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 14 Jan 2020 21:23:36 +0200 Subject: gnu: rust-schannel-0.1: Don't hide package. * gnu/packages/crates-io.scm (rust-schannel-0.1)[arguments]: Skip build. Add rust-lazy-static-1.3, rust-winapi-0.3 to cargo-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 63ffddb7e2..d8ad71db88 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8585,12 +8585,16 @@ (define-public rust-schannel-0.1 (base32 "0f9k4pm8yc3z0n1n8hazvnrvg52f0sfxjc91bhf3r76rb3rapxpj")))) (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-winapi" ,rust-winapi-0.3)))) (home-page "https://github.com/steffengy/schannel-rs") (synopsis "Rust bindings to the Windows SChannel APIs") (description "Rust bindings to the Windows SChannel APIs providing TLS client and server functionality.") - (properties '((hidden? . #t))) (license license:expat))) (define-public rust-scoped-threadpool-0.1 -- cgit v1.2.3 From 98e5e7305ad46ccc9187c621b39c8d3b6039cca9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 14 Jan 2020 21:25:35 +0200 Subject: gnu: rust-schannel-0.1: Update to 0.1.16. * gnu/packages/crates-io.scm (rust-channel-0.1): Update to 0.1.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 d8ad71db88..38a513098c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8575,7 +8575,7 @@ (define-public rust-same-file-1.0 (define-public rust-schannel-0.1 (package (name "rust-schannel") - (version "0.1.15") + (version "0.1.16") (source (origin (method url-fetch) @@ -8583,7 +8583,7 @@ (define-public rust-schannel-0.1 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "0f9k4pm8yc3z0n1n8hazvnrvg52f0sfxjc91bhf3r76rb3rapxpj")))) + "08d0p5iy574vdrax4l3laazic0crj7rp7vp3if5rrfkcdfq51xc7")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t -- cgit v1.2.3 From ff7173ebaeb64b078938da0d2583758bcb6db755 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 14 Jan 2020 21:27:48 +0200 Subject: gnu: rust-scoped-threadpool-0.1: Don't hide package. * gnu/packages/crates-io.scm (rust-scoped-threadpool-0.1)[arguments]: Skip build. Add rust-lazy-static-1.3 to cargo-development-inputs. [synopsis]: Appease 'guix lint'. [description]: Appease 'guix lint'. [properties]: Remove field. --- gnu/packages/crates-io.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 38a513098c..93199f4e3d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8610,16 +8610,19 @@ (define-public rust-scoped-threadpool-0.1 (base32 "1a26d3lk40s9mrf4imhbik7caahmw2jryhhb6vqv6fplbbgzal8x")))) (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-development-inputs + (("rust-lazy-static" ,rust-lazy-static-1.3)))) (home-page "https://github.com/Kimundi/scoped-threadpool-rs") - (synopsis "library for scoped and cached threadpools") + (synopsis "Library for scoped and cached threadpools") (description "This crate provides a stable, safe and scoped threadpool. It can be used to execute a number of short-lived jobs in parallel without the need to respawn the underlying threads. Jobs are runnable by borrowing the pool for a given -scope, during which an arbitrary number of them can be executed. These jobs can +scope, during which an arbitrary number of them can be executed. These jobs can access data of any lifetime outside of the pools scope, which allows working on non-'static references in parallel.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 3bcbc367e68191253d23936778e047aee617ed36 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 15 Jan 2020 09:26:13 +0200 Subject: gnu: rust-aho-corasick-0.7: Update to 0.7.6. * gnu/packages/crates-io.scm (rust-aho-corasick-0.7): Update to 0.7.6. [arguments]: Add rust-doc-comment-0.3 to cargo-development-inputs. --- gnu/packages/crates-io.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 93199f4e3d..8c11d44086 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -129,7 +129,7 @@ (define-public rust-afl-0.4 (define-public rust-aho-corasick-0.7 (package (name "rust-aho-corasick") - (version "0.7.3") + (version "0.7.6") (source (origin (method url-fetch) @@ -138,11 +138,13 @@ (define-public rust-aho-corasick-0.7 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0k1nqabiz37mnfnlrn084qi9yf8pj6a38qgbb3lc5zlr1jp89x76")))) + "0b8dh20fhdc59dhhnfi89n2bi80a8zbagzd5c122hf1vv2amxysq")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t - #:cargo-inputs (("rust-memchr" ,rust-memchr-2.2)))) + #:cargo-inputs (("rust-memchr" ,rust-memchr-2.2)) + #:cargo-development-inputs + (("rust-doc-comment" ,rust-doc-comment-0.3)))) (home-page "https://github.com/BurntSushi/aho-corasick") (synopsis "Fast multiple substring searching") (description -- cgit v1.2.3 From 89421b7c653efe6ffeaf97ccba590c5c154d3386 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 15 Jan 2020 09:36:42 +0200 Subject: gnu: rust-cbindgen: Update to 0.12.2. * gnu/packages/rust-apps.scm (rust-cbindgen): Update to 0.12.2. --- gnu/packages/rust-apps.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 78028f4562..fa1f56e96f 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 John Soo -;;; Copyright © 2019 Efraim Flashner +;;; Copyright © 2019, 2020 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -66,7 +66,7 @@ (define-public ripgrep (define-public rust-cbindgen (package (name "rust-cbindgen") - (version "0.9.1") + (version "0.12.2") (source (origin (method url-fetch) @@ -74,7 +74,7 @@ (define-public rust-cbindgen (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "1zgamxahlxmg4warzivaa8m1f8d6b45mhznm7n6d7p5l18acdblx")))) + "13jzbmjz1bmmfr0i80hw6ar484mgabx3hbpb2ynhk0ddqi0yr58m")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From 7d5c2e27da6bea19e76a5729c313a03663275fdf Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 15 Jan 2020 09:41:50 +0200 Subject: gnu: rust-foreign-types-macros-0.1: Appease guix lint. * gnu/packages/crates-io.scm (rust-foreign-types-macros-0.1)[synopsis]: Appease 'guix lint'. --- 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 8c11d44086..e190b32ecc 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3151,7 +3151,7 @@ (define-public rust-foreign-types-macros-0.1 ("rust-quote" ,rust-quote-1.0) ("rust-syn" ,rust-syn-0.15)))) (home-page "https://github.com/sfackler/foreign-types") - (synopsis "An internal crate used by foreign-types") + (synopsis "Internal crate used by foreign-types") (description "An internal crate used by foreign-types.") (license (list license:expat license:asl2.0)))) -- cgit v1.2.3 From dc576232f0cfedd6cd15aa720e40c60692ed87e2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 15 Jan 2020 09:42:44 +0200 Subject: gnu: rust-foreign-types-shared-0.2: Appease guix lint. * gnu/packages/crates-io.scm (rust-foreign-types-shared-0.2)[synopsis]: Appease 'guix lint'. --- 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 e190b32ecc..789318664a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3171,7 +3171,7 @@ (define-public rust-foreign-types-shared-0.2 (build-system cargo-build-system) (arguments `(#:skip-build? #t)) (home-page "https://github.com/sfackler/foreign-types") - (synopsis "An internal crate used by foreign-types") + (synopsis "Internal crate used by foreign-types") (description "An internal crate used by foreign-types.") (license (list license:asl2.0 -- cgit v1.2.3 From 61c998b394b4e2a02303f7d2e77d7f86e018e656 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 15 Jan 2020 09:44:13 +0200 Subject: gnu: rust-serde-json-1.0: Appease guix lint. * gnu/packages/crates-io.scm (rust-serde-json-1.0)[synopsis]: Appease 'guix lint'. --- 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 789318664a..d9713f3775 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9007,7 +9007,7 @@ (define-public rust-serde-json-1.0 ("rust-serde-derive" ,rust-serde-derive-1.0) ("rust-trybuild" ,rust-trybuild-1.0)))) (home-page "https://github.com/serde-rs/json") - (synopsis "A JSON serialization file format") + (synopsis "JSON serialization file format") (description "This package provides a JSON serialization file format.") (license (list license:expat license:asl2.0)))) -- cgit v1.2.3 From 5b1b86514f641c03da2845355fa82b5906783d64 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 15 Jan 2020 09:45:32 +0200 Subject: gnu: rust-winapi-0.3: Appease guix lint. * gnu/packages/crates-io.scm (rust-winapi-0.3)[synopsis]: Appease 'guix lint'. --- 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 d9713f3775..65a887f272 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -12068,7 +12068,7 @@ (define-public rust-winapi-0.3 (("winapi-i686-pc-windows-gnu" ,rust-winapi-i686-pc-windows-gnu-0.4) ("winapi-x86-64-pc-windows-gnu" ,rust-winapi-x86-64-pc-windows-gnu-0.4)))) (home-page "https://github.com/retep998/winapi-rs") - (synopsis "Raw FFI bindings for all of Windows API.") + (synopsis "Raw FFI bindings for all of Windows API") (description "Raw FFI bindings for all of Windows API.") (license (list license:asl2.0 -- cgit v1.2.3 From cd2c47135285f016a5826f79cfe1ed98968c6448 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 15 Jan 2020 09:49:56 +0200 Subject: gnu: rust-xattr-0.2: Don't hide package. * gnu/packages/crates-io.scm (rust-xattr-0.2)[arguments]: Skip build. Add rust-libc-0.2 to cargo-inputs. Add rust-tempfile-3.0 to cargo-development-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 65a887f272..fea5998af1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -12264,12 +12264,17 @@ (define-public rust-xattr-0.2 (base32 "0k556fb6f5jc907975j9c8iynl2fqz3rf0w6fiig83i4yi0kfk14")))) (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-libc" ,rust-libc-0.2)) + #:cargo-development-inputs + (("rust-tempfile" ,rust-tempfile-3.0)))) (home-page "https://github.com/Stebalien/xattr") (synopsis "Unix extended filesystem attributes") (description "This package provide a small library for setting, getting, and listing extended attributes.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From d998f94b1a5d9491c6b33492ad34c105b94d9121 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 15 Jan 2020 09:51:09 +0200 Subject: gnu: rust-xdg-2.2: Don't hide package. * gnu/packages/crates-io.scm (rust-xdg-2.2)[arguments]: Skip build. [properties]: Remove field. --- 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 fea5998af1..d940a58aa9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -12291,12 +12291,12 @@ (define-public rust-xdg-2.2 (base32 "0mws8a0fr3cqk5nh7aq9lmkmhzghvasqy4mhw6nnza06l4d6i2fh")))) (build-system cargo-build-system) + (arguments '(#:skip-build? #t)) (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") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 9778eb952122a7803c24b41fff2bd0b1534922b2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 15 Jan 2020 09:52:41 +0200 Subject: gnu: rust-blas-sys-0.7: Don't hide package. * gnu/packages/crates-io.scm (rust-blas-sys-0.7)[arguments]: Skip build. Add rust-libc-0.2 to cargo-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d940a58aa9..b529f50d3e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -690,11 +690,13 @@ (define-public rust-blas-sys-0.7 (base32 "0h14zjycwc76v15h8qll9z1xiryvmpvsb5gam97pqpdjrrwv5c8k")))) (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs (("rust-libc" ,rust-libc-0.2)))) (home-page "https://github.com/blas-lapack-rs/blas-sys") (synopsis "Bindings to BLAS (Fortran)") (description "Ths package provides bindings to BLAS (Fortran).") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From b443e045285d755b383a755512de39e9d12a5d50 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 15 Jan 2020 09:54:33 +0200 Subject: gnu: rust-cargon-0.0: Don't hide package. * gnu/packages/crates-io.scm (rust-cargon-0.0)[arguments]: Skip build. Add rust-gcc-0.3 to cargo-development-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b529f50d3e..39a0e9a80c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1028,12 +1028,15 @@ (define-public rust-cargon-0.0 (base32 "1cszlab7jk736p0lb50ag4l9nv72m7j41bwrmygl0lr4iz0350w2")))) (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-development-inputs + (("rust-gcc" ,rust-gcc-0.3)))) (home-page "https://github.com/bryant/argon2rs") (synopsis "Thin wrapper around the Argon2 C library") (description "This package provides a thin wrapper around the Argon2 C library. It is used in argon2rs' bench suite.") - (properties '((hidden? . #t))) (license license:wtfpl2))) (define-public rust-cast-0.2 -- cgit v1.2.3 From ffbefd8f91ef8a8627a7d68eab1227719fdd785c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 15 Jan 2020 09:56:07 +0200 Subject: gnu: rust-cblas-sys-0.1: Don't hide package. * gnu/packages/crates-io.scm (rust-cblas-sys-0.1)[arguments]: Skip build. Add rust-libc-0.2 to cargo-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 39a0e9a80c..0746ae91cd 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1077,11 +1077,13 @@ (define-public rust-cblas-sys-0.1 (base32 "0rgsn3klhhh09d8qf3b87zl4rwk93l2g0qzh9hhb0lff5kcfrzmn")))) (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs (("rust-libc" ,rust-libc-0.2)))) (home-page "https://github.com/blas-lapack-rs/cblas-sys") (synopsis "Bindings to CBLAS (C)") (description "The package provides bindings to CBLAS (C).") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 5d87eb8cf64c606fe7c6744f910645b9350307e4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 15 Jan 2020 09:58:25 +0200 Subject: gnu: rust-cc-1.0: Don't hide package. * gnu/packages/crates-io.scm (rust-cc-1.0)[arguments]: Skip build. Add rust-rayon-1.1 to cargo-inputs. Add rust-tempdir-0.3 to cargo-development-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0746ae91cd..7b47c309b2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1100,13 +1100,18 @@ (define-public rust-cc-1.0 (base32 "1zxzd559dbbf1iwdzmkj7czapzccs17kqqmsj9ayijpdix5rrbld")))) (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-rayon" ,rust-rayon-1.1)) + #:cargo-development-inputs + (("rust-tempdir" ,rust-tempdir-0.3)))) (home-page "https://github.com/alexcrichton/cc-rs") (synopsis "Invoke the native C compiler") (description "This package provides a build-time dependency for Cargo build scripts to assist in invoking the native C compiler to compile native C code into a static archive to be linked into Rustcode.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 971fb85cef7578d6cd8da1ad5eccbb31ddf220b4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 15 Jan 2020 10:04:52 +0200 Subject: gnu: rust-json-0.11: Don't hide package. * gnu/packages/crates-io.scm (rust-json-0.11)[arguments]: Skip build. [properties]: Remove field. --- 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 7b47c309b2..4b68b1a162 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4758,11 +4758,11 @@ (define-public rust-json-0.11 (base32 "1hj8c6xj5c2aqqszi8naaflmcdbya1i9byyjrq4iybxjb4q91mq1")))) (build-system cargo-build-system) + (arguments '(#:skip-build? #t)) (home-page "https://github.com/maciejhirsz/json-rust") (synopsis "JSON implementation in Rust") (description "This crate provides a JSON implementation in Rust, reducing friction with idiomatic Rust structs to ease interopability.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From bf33e72d317e90489a408085c9cad3d3020d8541 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 15 Jan 2020 10:06:00 +0200 Subject: gnu: rust-json-0.11: Update to 0.11.15. * gnu/packages/crates-io.scm (rust-json-0.11): Update to 0.11.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 4b68b1a162..a4ce24c857 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4748,7 +4748,7 @@ (define-public rust-jemallocator-0.3 (define-public rust-json-0.11 (package (name "rust-json") - (version "0.11.14") + (version "0.11.15") (source (origin (method url-fetch) @@ -4756,7 +4756,7 @@ (define-public rust-json-0.11 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "1hj8c6xj5c2aqqszi8naaflmcdbya1i9byyjrq4iybxjb4q91mq1")))) + "1rg9jxf6bpbwis3ixd5ak8rp37him7n4z8awz4ssrxl6hyplbhlj")))) (build-system cargo-build-system) (arguments '(#:skip-build? #t)) (home-page "https://github.com/maciejhirsz/json-rust") -- cgit v1.2.3 From ebe8fe562403f73c5d434d5a53a37c9ec4c26500 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 15 Jan 2020 10:08:08 +0200 Subject: gnu: rust-kernel32-sys-0.2: Don't hide package. * gnu/packages/crates-io.scm (rust-kernel32-sys-0.2)[arguments]: Skip build. Add rust-winapi-0.2 to cargo-inputs. Add rust-winapi-build-0.1 to cargo-development-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a4ce24c857..23e7a357e3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4779,11 +4779,15 @@ (define-public rust-kernel32-sys-0.2 (base32 "1389av0601a9yz8dvx5zha9vmkd6ik7ax0idpb032d28555n41vm")))) (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs (("rust-winapi" ,rust-winapi-0.2)) + #:cargo-development-inputs + (("rust-winapi-build" ,rust-winapi-build-0.1)))) (home-page "https://github.com/retep998/winapi-rs") (synopsis "Function definitions for the Windows API library kernel32") (description "Contains function definitions for the Windows API library kernel32.") - (properties '((hidden? . #t))) (license license:expat))) (define-public rust-language-tags-0.2 -- cgit v1.2.3 From 5d9e02a467ddbf774a03e186fa9d9f16b38a178e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 15 Jan 2020 10:11:01 +0200 Subject: gnu: rust-language-tags-0.2: Don't hide package. * gnu/packages/crates-io.scm (rust-language-tags-0.2)[arguments]: Skip build. Add rust-heapsize-0.3, rust-heapsize-plugin-0.1 to cargo-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 23e7a357e3..e699a18099 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4803,6 +4803,11 @@ (define-public rust-language-tags-0.2 (base32 "16hrjdpa827carq5x4b8zhas24d8kg4s16m6nmmn1kb7cr5qh7d9")))) (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-heapsize" ,rust-heapsize-0.3) + ("rust-heapsize-plugin" ,rust-heapsize-plugin-0.1)))) (home-page "https://github.com/pyfisch/rust-language-tags") (synopsis "Language tags for Rust") (description @@ -4811,7 +4816,6 @@ (define-public rust-language-tags-0.2 @code{Content-Language} and @code{Accept-Language} header fields. This package currently supports parsing (fully conformant parser), formatting and comparing language tags.") - (properties '((hidden? . #t))) (license license:expat))) (define-public rust-lazy-static-1.3 -- cgit v1.2.3 From ff5639f5ad1d0fb2905bb4ecaff1decda45bfa56 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 15 Jan 2020 10:13:14 +0200 Subject: gnu: rust-heapsize-0.3: Don't hide package. * gnu/packages/crates-io.scm (rust-heapsize-0.3)[arguments]: Skip build. Add rust-kernel32-sys-0.2 to cargo-inputs. [properties]: Don't inherit. --- gnu/packages/crates-io.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e699a18099..a1a461d5d2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4133,7 +4133,11 @@ (define-public rust-heapsize-0.3 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "0dmwc37vgsdjzk10443dj4f23439i9gch28jcwzmry3chrwx8v2m")))))) + "0dmwc37vgsdjzk10443dj4f23439i9gch28jcwzmry3chrwx8v2m")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs (("rust-kernel32-sys" ,rust-kernel32-sys-0.2)))) + (properties '()))) ;; This package makes use of removed features (define-public rust-heapsize-plugin-0.1 -- cgit v1.2.3 From 3e68f4004450b0ef3646d9512c23c3842884feca Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 15 Jan 2020 10:14:37 +0200 Subject: gnu: rust-heapsize-0.4: Don't hide package. * gnu/packages/crates-io.scm (rust-heapsize-0.4)[arguments]: Skip build. Add rust-winapi-0.3 to cargo-inputs. [properties]: Remove field. --- 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 a1a461d5d2..b5a91caf80 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4112,12 +4112,14 @@ (define-public rust-heapsize-0.4 (base32 "0q94q9ppqjgrw71swiyia4hgby2cz6dldp7ij57nkvhd6zmfcy8n")))) (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs (("rust-winapi" ,rust-winapi-0.3)))) (home-page "https://github.com/servo/heapsize") (synopsis "Measure the total runtime size of an object on the heap") (description "Infrastructure for measuring the total runtime size of an object on the heap.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) @@ -4136,8 +4138,7 @@ (define-public rust-heapsize-0.3 "0dmwc37vgsdjzk10443dj4f23439i9gch28jcwzmry3chrwx8v2m")))) (arguments `(#:skip-build? #t - #:cargo-inputs (("rust-kernel32-sys" ,rust-kernel32-sys-0.2)))) - (properties '()))) + #:cargo-inputs (("rust-kernel32-sys" ,rust-kernel32-sys-0.2)))))) ;; This package makes use of removed features (define-public rust-heapsize-plugin-0.1 -- cgit v1.2.3 From 09b79f3bd5ad562feb00cb06bd1028711d01a879 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 15 Jan 2020 10:16:18 +0200 Subject: gnu: rust-heapsize-plugin-0.1: Don't hide package. * gnu/packages/crates-io.scm (rust-heapsize-plugin-0.1)[arguments]: Skip build. Add rust-heapsize-0.3 to cargo-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b5a91caf80..777ed35bad 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4154,12 +4154,14 @@ (define-public rust-heapsize-plugin-0.1 (base32 "1i72isf699q9jl167g2kg4xd6h3cd05rc79zaph58aqjy0g0m9y9")))) (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs (("rust-heapsize" ,rust-heapsize-0.3)))) (home-page "https://github.com/servo/heapsize") (synopsis "Measure runtime size of an object on the heap") (description "This package automatically generates infrastructure for measuring the total runtime size of an object on the heap") - (properties `((hidden? . #t))) (license license:mpl2.0))) (define-public rust-hex-0.3 -- cgit v1.2.3 From fb01b0ce8999d48343cde3b72c8be3968402edbb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 15 Jan 2020 10:17:43 +0200 Subject: gnu: rust-hex-0.3: Don't hide package. * gnu/packages/crates-io.scm (rust-hex-0.3)[arguments]: Skip build. [properties]: Remove field. --- 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 777ed35bad..782b5959ba 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4177,11 +4177,11 @@ (define-public rust-hex-0.3 (base32 "0xsdcjiik5j750j67zk42qdnmm4ahirk3gmkmcqgq7qls2jjcl40")))) (build-system cargo-build-system) + (arguments '(#:skip-build? #t)) (home-page "https://github.com/KokaKiwi/rust-hex") (synopsis "Encode and decode data to/from hexadecimals") (description "This crate allows for encoding and decoding data into/from hexadecimal representation.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From d24881e4ebc587cf6a6fe1e3fd670965ede2e044 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 15 Jan 2020 10:52:26 +0100 Subject: gnu: gnubg: Fix links. The site at gnubg.org states that the software is now available at www.gnu.org/software/gnubg. * gnu/packages/games.scm (gnugb)[source]: Fix link. [home-page]: Likewise. --- gnu/packages/games.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 83e732aa3c..209307db48 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -42,7 +42,7 @@ ;;; Copyright © 2019 Julien Lepiller ;;; Copyright © 2019 Jesse Gibbons ;;; Copyright © 2019 Dan Frumin -;;; Copyright © 2019 Guillaume Le Vaillant +;;; Copyright © 2019, 2020 Guillaume Le Vaillant ;;; Copyright © 2019, 2020 Timotej Lazar ;;; Copyright © 2019 Josh Holland ;;; Copyright © 2017, 2019 Hartmut Goebel @@ -850,8 +850,8 @@ (define-public gnubg (source (origin (method url-fetch) - (uri (string-append "http://files.gnubg.org/media/sources/gnubg-release-" - version "-sources." "tar.gz")) + (uri (string-append "mirror://gnu/gnubg/gnubg-release-" + version "-sources.tar.gz")) (sha256 (base32 "11xwhcli1h12k6rnhhyq4jphzrhfik7i8ah3k32pqw803460n6yf")))) @@ -866,7 +866,7 @@ (define-public gnubg ("libcanberra" ,libcanberra))) (native-inputs `(("python-2" ,python-2) ("pkg-config" ,pkg-config))) - (home-page "http://gnubg.org") + (home-page "https://www.gnu.org/software/gnubg/") (synopsis "Backgammon game") (description "The GNU backgammon application (also known as \"gnubg\") can be used for playing, analyzing and teaching the game. It has an advanced -- cgit v1.2.3 From 93605bfd25665c181c22cdb2453138b3db1936bd Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 15 Jan 2020 11:21:36 +0100 Subject: gnu: gnubg: Add desktop file. * gnu/packages/games.scm (gnubg)[arguments]: Add an 'install-desktop-file' phase. --- gnu/packages/games.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 209307db48..975658de18 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -866,6 +866,26 @@ (define-public gnubg ("libcanberra" ,libcanberra))) (native-inputs `(("python-2" ,python-2) ("pkg-config" ,pkg-config))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'install-desktop-file + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (apps (string-append out "/share/applications"))) + (mkdir-p apps) + (with-output-to-file (string-append apps "/gnubg.desktop") + (lambda _ + (format #t + "[Desktop Entry]~@ + Name=GNU Backgammon~@ + Exec=~a/bin/gnubg -w~@ + Icon=gnubg~@ + Categories=Game;~@ + Terminal=false~@ + Type=Application~%" + out)))) + #t))))) (home-page "https://www.gnu.org/software/gnubg/") (synopsis "Backgammon game") (description "The GNU backgammon application (also known as \"gnubg\") can -- cgit v1.2.3 From 3f6ed3b2e6efce181d4b53b21663d814900ac57c Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 15 Jan 2020 07:04:55 -0500 Subject: gnu: MPD: Update to 0.21.18. * gnu/packages/mpd.scm (mpd): Update to 0.21.18. --- gnu/packages/mpd.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 1ff1f39389..08d8eb11de 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2014 Cyrill Schenkel ;;; Copyright © 2014 Ian Denhardt ;;; Copyright © 2015 Paul van der Walt -;;; Copyright © 2016, 2018, 2019 Leo Famulari +;;; Copyright © 2016, 2018, 2019, 2020 Leo Famulari ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2019 Evan Straw ;;; @@ -92,7 +92,7 @@ (define-public libmpdclient (define-public mpd (package (name "mpd") - (version "0.21.17") + (version "0.21.18") (source (origin (method url-fetch) (uri @@ -101,7 +101,7 @@ (define-public mpd "/mpd-" version ".tar.xz")) (sha256 (base32 - "0qka4g4dd6a6fxi03jnrd8ya70vfijmsxz642adfjqa626gam644")))) + "0hllkq426hql1s80xxvy28ypvw3dbfrrclbjc0lckmmgsmnfd0l7")))) (build-system meson-build-system) (arguments `(#:configure-flags '("-Ddocumentation=true"))) ;the default is 'false'... -- cgit v1.2.3 From 9edae6c05cd879393d59702f033f4c3ccce30dba Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 15 Jan 2020 07:28:27 -0500 Subject: gnu: ncmpcpp: Enable the clock feature. * gnu/packages/mpd.scm (ncmpcpp)[arguments]: Pass '--enable-clock' to #:configure-flags. --- gnu/packages/mpd.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 08d8eb11de..2550c124b5 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -237,7 +237,7 @@ (define-public ncmpcpp `(("pkg-config" ,pkg-config))) (arguments '(#:configure-flags - '("BOOST_LIB_SUFFIX=" "--with-taglib"))) + '("BOOST_LIB_SUFFIX=" "--with-taglib" "--enable-clock"))) (synopsis "Featureful ncurses based MPD client inspired by ncmpc") (description "Ncmpcpp is an mpd client with a UI very similar to ncmpc, but it provides new useful features such as support for regular expressions -- cgit v1.2.3 From 2c97c980a0ca5f77464cd74207e29d835376f85b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 8 Jan 2020 00:48:45 +0100 Subject: gnu: linux-libre: Include more framebuffer font sizes. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add the 32x16 Terminus font for ‘high-DPI’ screens, and a 6x10 font that allows for more (debugging) information to be displayed on standard-DPI ones, while still being pleasant to read. * gnu/packages/aux-files/linux-libre/4.14-arm.conf, gnu/packages/aux-files/linux-libre/4.14-i686.conf, gnu/packages/aux-files/linux-libre/4.14-x86_64.conf, gnu/packages/aux-files/linux-libre/4.19-arm.conf, gnu/packages/aux-files/linux-libre/4.19-arm64.conf, gnu/packages/aux-files/linux-libre/4.19-i686.conf, gnu/packages/aux-files/linux-libre/4.19-x86_64.conf, gnu/packages/aux-files/linux-libre/4.4-i686.conf, gnu/packages/aux-files/linux-libre/4.4-x86_64.conf, gnu/packages/aux-files/linux-libre/4.9-i686.conf, gnu/packages/aux-files/linux-libre/4.9-x86_64.conf, gnu/packages/aux-files/linux-libre/5.4-arm-veyron.conf, gnu/packages/aux-files/linux-libre/5.4-arm.conf, gnu/packages/aux-files/linux-libre/5.4-arm64.conf, gnu/packages/aux-files/linux-libre/5.4-i686.conf, gnu/packages/aux-files/linux-libre/5.4-x86_64.conf: Set CONFIG_FONTS=y, CONFIG_FONT_TER16x32=y, and CONFIG_FONT_6x10=y. --- gnu/packages/aux-files/linux-libre/4.14-arm.conf | 12 +++++++++++- gnu/packages/aux-files/linux-libre/4.14-i686.conf | 12 +++++++++++- gnu/packages/aux-files/linux-libre/4.14-x86_64.conf | 12 +++++++++++- gnu/packages/aux-files/linux-libre/4.19-arm.conf | 12 +++++++++++- gnu/packages/aux-files/linux-libre/4.19-arm64.conf | 12 +++++++++++- gnu/packages/aux-files/linux-libre/4.19-i686.conf | 12 +++++++++++- gnu/packages/aux-files/linux-libre/4.19-x86_64.conf | 12 +++++++++++- gnu/packages/aux-files/linux-libre/4.4-i686.conf | 12 +++++++++++- gnu/packages/aux-files/linux-libre/4.4-x86_64.conf | 12 +++++++++++- gnu/packages/aux-files/linux-libre/4.9-i686.conf | 12 +++++++++++- gnu/packages/aux-files/linux-libre/4.9-x86_64.conf | 12 +++++++++++- gnu/packages/aux-files/linux-libre/5.4-arm-veyron.conf | 12 +++++++++++- gnu/packages/aux-files/linux-libre/5.4-arm.conf | 12 +++++++++++- gnu/packages/aux-files/linux-libre/5.4-arm64.conf | 12 +++++++++++- gnu/packages/aux-files/linux-libre/5.4-i686.conf | 12 +++++++++++- gnu/packages/aux-files/linux-libre/5.4-x86_64.conf | 12 +++++++++++- 16 files changed, 176 insertions(+), 16 deletions(-) diff --git a/gnu/packages/aux-files/linux-libre/4.14-arm.conf b/gnu/packages/aux-files/linux-libre/4.14-arm.conf index bc7fe85aec..05fa8cc96f 100644 --- a/gnu/packages/aux-files/linux-libre/4.14-arm.conf +++ b/gnu/packages/aux-files/linux-libre/4.14-arm.conf @@ -8344,9 +8344,19 @@ CONFIG_LIBFDT=y CONFIG_OID_REGISTRY=y CONFIG_UCS2_STRING=y CONFIG_FONT_SUPPORT=y -# CONFIG_FONTS is not set +CONFIG_FONTS=y CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +# CONFIG_FONT_MINI_4x6 is not set +CONFIG_FONT_6x10=y +# CONFIG_FONT_10x18 is not set +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +CONFIG_FONT_TER16x32=y CONFIG_SG_SPLIT=y CONFIG_SG_POOL=y CONFIG_ARCH_HAS_SG_CHAIN=y diff --git a/gnu/packages/aux-files/linux-libre/4.14-i686.conf b/gnu/packages/aux-files/linux-libre/4.14-i686.conf index db020b5d96..db09a41d7d 100644 --- a/gnu/packages/aux-files/linux-libre/4.14-i686.conf +++ b/gnu/packages/aux-files/linux-libre/4.14-i686.conf @@ -9514,9 +9514,19 @@ CONFIG_SIGNATURE=y CONFIG_OID_REGISTRY=y CONFIG_UCS2_STRING=y CONFIG_FONT_SUPPORT=y -# CONFIG_FONTS is not set +CONFIG_FONTS=y CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +# CONFIG_FONT_MINI_4x6 is not set +CONFIG_FONT_6x10=y +# CONFIG_FONT_10x18 is not set +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +CONFIG_FONT_TER16x32=y # CONFIG_SG_SPLIT is not set CONFIG_SG_POOL=y CONFIG_ARCH_HAS_SG_CHAIN=y diff --git a/gnu/packages/aux-files/linux-libre/4.14-x86_64.conf b/gnu/packages/aux-files/linux-libre/4.14-x86_64.conf index bf071e01b7..508c943b47 100644 --- a/gnu/packages/aux-files/linux-libre/4.14-x86_64.conf +++ b/gnu/packages/aux-files/linux-libre/4.14-x86_64.conf @@ -9386,9 +9386,19 @@ CONFIG_SIGNATURE=y CONFIG_OID_REGISTRY=y CONFIG_UCS2_STRING=y CONFIG_FONT_SUPPORT=y -# CONFIG_FONTS is not set +CONFIG_FONTS=y CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +# CONFIG_FONT_MINI_4x6 is not set +CONFIG_FONT_6x10=y +# CONFIG_FONT_10x18 is not set +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +CONFIG_FONT_TER16x32=y # CONFIG_SG_SPLIT is not set CONFIG_SG_POOL=y CONFIG_ARCH_HAS_SG_CHAIN=y diff --git a/gnu/packages/aux-files/linux-libre/4.19-arm.conf b/gnu/packages/aux-files/linux-libre/4.19-arm.conf index 72161c09ff..239e6e5f23 100644 --- a/gnu/packages/aux-files/linux-libre/4.19-arm.conf +++ b/gnu/packages/aux-files/linux-libre/4.19-arm.conf @@ -8353,9 +8353,19 @@ CONFIG_LIBFDT=y CONFIG_OID_REGISTRY=y CONFIG_UCS2_STRING=y CONFIG_FONT_SUPPORT=y -# CONFIG_FONTS is not set +CONFIG_FONTS=y CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +# CONFIG_FONT_MINI_4x6 is not set +CONFIG_FONT_6x10=y +# CONFIG_FONT_10x18 is not set +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +CONFIG_FONT_TER16x32=y CONFIG_SG_SPLIT=y CONFIG_SG_POOL=y CONFIG_ARCH_HAS_SG_CHAIN=y diff --git a/gnu/packages/aux-files/linux-libre/4.19-arm64.conf b/gnu/packages/aux-files/linux-libre/4.19-arm64.conf index 47ec3c9765..45f9ab89ef 100644 --- a/gnu/packages/aux-files/linux-libre/4.19-arm64.conf +++ b/gnu/packages/aux-files/linux-libre/4.19-arm64.conf @@ -8090,9 +8090,19 @@ CONFIG_LIBFDT=y CONFIG_OID_REGISTRY=y CONFIG_UCS2_STRING=y CONFIG_FONT_SUPPORT=y -# CONFIG_FONTS is not set +CONFIG_FONTS=y CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +# CONFIG_FONT_MINI_4x6 is not set +CONFIG_FONT_6x10=y +# CONFIG_FONT_10x18 is not set +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +CONFIG_FONT_TER16x32=y CONFIG_SG_SPLIT=y CONFIG_SG_POOL=y CONFIG_ARCH_HAS_SG_CHAIN=y diff --git a/gnu/packages/aux-files/linux-libre/4.19-i686.conf b/gnu/packages/aux-files/linux-libre/4.19-i686.conf index 75a18ec5ef..03f51f4bf8 100644 --- a/gnu/packages/aux-files/linux-libre/4.19-i686.conf +++ b/gnu/packages/aux-files/linux-libre/4.19-i686.conf @@ -9435,9 +9435,19 @@ CONFIG_SIGNATURE=y CONFIG_OID_REGISTRY=y CONFIG_UCS2_STRING=y CONFIG_FONT_SUPPORT=y -# CONFIG_FONTS is not set +CONFIG_FONTS=y CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +# CONFIG_FONT_MINI_4x6 is not set +CONFIG_FONT_6x10=y +# CONFIG_FONT_10x18 is not set +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +CONFIG_FONT_TER16x32=y CONFIG_SG_POOL=y CONFIG_ARCH_HAS_SG_CHAIN=y CONFIG_SBITMAP=y diff --git a/gnu/packages/aux-files/linux-libre/4.19-x86_64.conf b/gnu/packages/aux-files/linux-libre/4.19-x86_64.conf index f151036410..685ca2adfb 100644 --- a/gnu/packages/aux-files/linux-libre/4.19-x86_64.conf +++ b/gnu/packages/aux-files/linux-libre/4.19-x86_64.conf @@ -9327,9 +9327,19 @@ CONFIG_SIGNATURE=y CONFIG_OID_REGISTRY=y CONFIG_UCS2_STRING=y CONFIG_FONT_SUPPORT=y -# CONFIG_FONTS is not set +CONFIG_FONTS=y CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +# CONFIG_FONT_MINI_4x6 is not set +CONFIG_FONT_6x10=y +# CONFIG_FONT_10x18 is not set +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +CONFIG_FONT_TER16x32=y CONFIG_SG_POOL=y CONFIG_ARCH_HAS_SG_CHAIN=y CONFIG_ARCH_HAS_PMEM_API=y diff --git a/gnu/packages/aux-files/linux-libre/4.4-i686.conf b/gnu/packages/aux-files/linux-libre/4.4-i686.conf index 75f40b4d1a..33a5f67d85 100644 --- a/gnu/packages/aux-files/linux-libre/4.4-i686.conf +++ b/gnu/packages/aux-files/linux-libre/4.4-i686.conf @@ -8612,9 +8612,19 @@ CONFIG_SIGNATURE=y CONFIG_OID_REGISTRY=y CONFIG_UCS2_STRING=y CONFIG_FONT_SUPPORT=y -# CONFIG_FONTS is not set +CONFIG_FONTS=y CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +# CONFIG_FONT_MINI_4x6 is not set +CONFIG_FONT_6x10=y +# CONFIG_FONT_10x18 is not set +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +CONFIG_FONT_TER16x32=y # CONFIG_SG_SPLIT is not set CONFIG_ARCH_HAS_SG_CHAIN=y CONFIG_ARCH_HAS_MMIO_FLUSH=y diff --git a/gnu/packages/aux-files/linux-libre/4.4-x86_64.conf b/gnu/packages/aux-files/linux-libre/4.4-x86_64.conf index d78da5c71e..aabd0dfee1 100644 --- a/gnu/packages/aux-files/linux-libre/4.4-x86_64.conf +++ b/gnu/packages/aux-files/linux-libre/4.4-x86_64.conf @@ -8418,9 +8418,19 @@ CONFIG_SIGNATURE=y CONFIG_OID_REGISTRY=y CONFIG_UCS2_STRING=y CONFIG_FONT_SUPPORT=y -# CONFIG_FONTS is not set +CONFIG_FONTS=y CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +# CONFIG_FONT_MINI_4x6 is not set +CONFIG_FONT_6x10=y +# CONFIG_FONT_10x18 is not set +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +CONFIG_FONT_TER16x32=y # CONFIG_SG_SPLIT is not set CONFIG_ARCH_HAS_SG_CHAIN=y CONFIG_ARCH_HAS_PMEM_API=y diff --git a/gnu/packages/aux-files/linux-libre/4.9-i686.conf b/gnu/packages/aux-files/linux-libre/4.9-i686.conf index 33512eacf6..d1a64e2772 100644 --- a/gnu/packages/aux-files/linux-libre/4.9-i686.conf +++ b/gnu/packages/aux-files/linux-libre/4.9-i686.conf @@ -9040,9 +9040,19 @@ CONFIG_SIGNATURE=y CONFIG_OID_REGISTRY=y CONFIG_UCS2_STRING=y CONFIG_FONT_SUPPORT=y -# CONFIG_FONTS is not set +CONFIG_FONTS=y CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +# CONFIG_FONT_MINI_4x6 is not set +CONFIG_FONT_6x10=y +# CONFIG_FONT_10x18 is not set +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +CONFIG_FONT_TER16x32=y # CONFIG_SG_SPLIT is not set CONFIG_SG_POOL=y CONFIG_ARCH_HAS_SG_CHAIN=y diff --git a/gnu/packages/aux-files/linux-libre/4.9-x86_64.conf b/gnu/packages/aux-files/linux-libre/4.9-x86_64.conf index 797f8f23e0..3d69605c19 100644 --- a/gnu/packages/aux-files/linux-libre/4.9-x86_64.conf +++ b/gnu/packages/aux-files/linux-libre/4.9-x86_64.conf @@ -8885,9 +8885,19 @@ CONFIG_SIGNATURE=y CONFIG_OID_REGISTRY=y CONFIG_UCS2_STRING=y CONFIG_FONT_SUPPORT=y -# CONFIG_FONTS is not set +CONFIG_FONTS=y CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +# CONFIG_FONT_MINI_4x6 is not set +CONFIG_FONT_6x10=y +# CONFIG_FONT_10x18 is not set +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +CONFIG_FONT_TER16x32=y # CONFIG_SG_SPLIT is not set CONFIG_SG_POOL=y CONFIG_ARCH_HAS_SG_CHAIN=y diff --git a/gnu/packages/aux-files/linux-libre/5.4-arm-veyron.conf b/gnu/packages/aux-files/linux-libre/5.4-arm-veyron.conf index 3f0cb3fb35..7d827afb2e 100644 --- a/gnu/packages/aux-files/linux-libre/5.4-arm-veyron.conf +++ b/gnu/packages/aux-files/linux-libre/5.4-arm-veyron.conf @@ -4814,9 +4814,19 @@ CONFIG_MPILIB=y CONFIG_LIBFDT=y CONFIG_OID_REGISTRY=y CONFIG_FONT_SUPPORT=y -# CONFIG_FONTS is not set +CONFIG_FONTS=y CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +# CONFIG_FONT_MINI_4x6 is not set +CONFIG_FONT_6x10=y +# CONFIG_FONT_10x18 is not set +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +CONFIG_FONT_TER16x32=y CONFIG_SG_POOL=y CONFIG_SBITMAP=y # CONFIG_STRING_SELFTEST is not set diff --git a/gnu/packages/aux-files/linux-libre/5.4-arm.conf b/gnu/packages/aux-files/linux-libre/5.4-arm.conf index 23d3c8c26c..a54228643b 100644 --- a/gnu/packages/aux-files/linux-libre/5.4-arm.conf +++ b/gnu/packages/aux-files/linux-libre/5.4-arm.conf @@ -9106,9 +9106,19 @@ CONFIG_LIBFDT=y CONFIG_OID_REGISTRY=y CONFIG_UCS2_STRING=y CONFIG_FONT_SUPPORT=y -# CONFIG_FONTS is not set +CONFIG_FONTS=y CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +# CONFIG_FONT_MINI_4x6 is not set +CONFIG_FONT_6x10=y +# CONFIG_FONT_10x18 is not set +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +CONFIG_FONT_TER16x32=y CONFIG_SG_SPLIT=y CONFIG_SG_POOL=y CONFIG_SBITMAP=y diff --git a/gnu/packages/aux-files/linux-libre/5.4-arm64.conf b/gnu/packages/aux-files/linux-libre/5.4-arm64.conf index f35eb8dc17..fabd25c6a4 100644 --- a/gnu/packages/aux-files/linux-libre/5.4-arm64.conf +++ b/gnu/packages/aux-files/linux-libre/5.4-arm64.conf @@ -9069,9 +9069,19 @@ CONFIG_UCS2_STRING=y CONFIG_HAVE_GENERIC_VDSO=y CONFIG_GENERIC_GETTIMEOFDAY=y CONFIG_FONT_SUPPORT=y -# CONFIG_FONTS is not set +CONFIG_FONTS=y CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +# CONFIG_FONT_MINI_4x6 is not set +CONFIG_FONT_6x10=y +# CONFIG_FONT_10x18 is not set +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +CONFIG_FONT_TER16x32=y CONFIG_SG_SPLIT=y CONFIG_SG_POOL=y CONFIG_ARCH_HAS_PMEM_API=y diff --git a/gnu/packages/aux-files/linux-libre/5.4-i686.conf b/gnu/packages/aux-files/linux-libre/5.4-i686.conf index 4a1ac43279..50a41f6cc9 100644 --- a/gnu/packages/aux-files/linux-libre/5.4-i686.conf +++ b/gnu/packages/aux-files/linux-libre/5.4-i686.conf @@ -10010,9 +10010,19 @@ CONFIG_HAVE_GENERIC_VDSO=y CONFIG_GENERIC_GETTIMEOFDAY=y CONFIG_GENERIC_VDSO_32=y CONFIG_FONT_SUPPORT=y -# CONFIG_FONTS is not set +CONFIG_FONTS=y CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +# CONFIG_FONT_MINI_4x6 is not set +CONFIG_FONT_6x10=y +# CONFIG_FONT_10x18 is not set +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +CONFIG_FONT_TER16x32=y CONFIG_SG_POOL=y CONFIG_ARCH_STACKWALK=y CONFIG_SBITMAP=y diff --git a/gnu/packages/aux-files/linux-libre/5.4-x86_64.conf b/gnu/packages/aux-files/linux-libre/5.4-x86_64.conf index 3dc7e8be03..30fdc4e86a 100644 --- a/gnu/packages/aux-files/linux-libre/5.4-x86_64.conf +++ b/gnu/packages/aux-files/linux-libre/5.4-x86_64.conf @@ -9954,9 +9954,19 @@ CONFIG_UCS2_STRING=y CONFIG_HAVE_GENERIC_VDSO=y CONFIG_GENERIC_GETTIMEOFDAY=y CONFIG_FONT_SUPPORT=y -# CONFIG_FONTS is not set +CONFIG_FONTS=y CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +# CONFIG_FONT_MINI_4x6 is not set +CONFIG_FONT_6x10=y +# CONFIG_FONT_10x18 is not set +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +CONFIG_FONT_TER16x32=y CONFIG_SG_POOL=y CONFIG_ARCH_HAS_PMEM_API=y CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y -- cgit v1.2.3 From 47b8608d99a48bf169252875f88ab1d9f1022db0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 14 Jan 2020 23:53:58 +0100 Subject: gnu: unbound: Update to 1.9.5 [fixes CVE-2019-18934]. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The Guix unbound package is not vulnerable in its default configuration, because we do not build with ‘--enable-ipsecmod’. * gnu/packages/dns.scm (unbound): Update to 1.9.5. --- gnu/packages/dns.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 60e392de0d..e5148d5bc9 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2016 John Darrington ;;; Copyright © 2016 ng0 -;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2016 Marius Bakke ;;; Copyright © 2017 Vasile Dumitrascu ;;; Copyright © 2017 Gregor Giesen @@ -390,14 +390,14 @@ (define-public nsd (define-public unbound (package (name "unbound") - (version "1.9.4") + (version "1.9.5") (source (origin (method url-fetch) (uri (string-append "https://www.unbound.net/downloads/unbound-" version ".tar.gz")) (sha256 - (base32 "1c2bjm13x8bkw0ds1mhn9ivd2gzmfrb0x5y76bkz09a04bxjagix")))) + (base32 "0myv8l886gmlh9nh4j3q5549idxnl51hf9cw20yxfqbwd47l13ca")))) (build-system gnu-build-system) (outputs '("out" "python")) (native-inputs -- cgit v1.2.3 From ea4c1e0b0e83af86decd40ee264a3aabd08abd98 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 15 Jan 2020 00:02:04 +0100 Subject: gnu: menumaker: Update to 0.99.11. * gnu/packages/wm.scm (menumaker): Update to 0.99.11. --- gnu/packages/wm.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 9832f0079c..52d7042806 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -987,15 +987,14 @@ (define-public awesome (define-public menumaker (package (name "menumaker") - (version "0.99.10") + (version "0.99.11") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/menumaker/" "menumaker-" version ".tar.gz")) (sha256 - (base32 - "1mm4cvg3kphkkd8nwrhcg6d9nm5ar7mgc0wf6fxk6zck1l7xn8ky")))) + (base32 "0dprndnhwm7b803zkp4pisiq06ic9iv8vr42in5is47jmvdim0wx")))) (build-system gnu-build-system) (inputs `(("python" ,python))) -- cgit v1.2.3 From 91815e8dc205d2a24511b1d3644a1e2fd8d73153 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 15 Jan 2020 00:24:19 +0100 Subject: gnu: pdsh: Update to 2.34. * gnu/packages/ssh.scm (pdsh): Update to 2.34. [source]: Remove redundant FILE-NAME field. --- gnu/packages/ssh.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index ec4f00d8e6..8f74ababe8 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016, 2019 Leo Famulari ;;; Copyright © 2016 Nicolas Goaziou ;;; Copyright © 2016 Christopher Allan Webber -;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2017 Stefan Reichör ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2017 ng0 @@ -675,16 +675,15 @@ (define-public autossh (define-public pdsh (package (name "pdsh") - (version "2.33") + (version "2.34") (source (origin (method url-fetch) (uri (string-append "https://github.com/chaos/pdsh/" "releases/download/pdsh-" version "/pdsh-" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0bwlkl9inj66iwvafg00pi3sk9n673phdi0kcc59y9nn55s0hs3k")))) + (base32 "1s91hmhrz7rfb6h3l5k97s393rcm1ww3svp8dx5z8vkkc933wyxl")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 3e8867196c581d8bf8dd6c92a91954ef058bae93 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 15 Jan 2020 00:33:46 +0100 Subject: gnu: gauche: Update to 0.9.9. * gnu/packages/scheme.scm (gauche): Update to 0.9.9. --- gnu/packages/scheme.scm | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index a320cbf831..b0da2ac36b 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -1001,7 +1001,7 @@ (define-public femtolisp (define-public gauche (package (name "gauche") - (version "0.9.7") + (version "0.9.9") (home-page "http://practical-scheme.net/gauche/index.html") (source (origin @@ -1010,11 +1010,10 @@ (define-public gauche "mirror://sourceforge/gauche/Gauche/Gauche-" version ".tgz")) (sha256 - (base32 - "181nycikma0rwrb1h6mi3kys11f8628pq8g5r3fg5hiz5sabscrd")) + (base32 "1yzpszhw52vkpr65r5d4khf3489mnnvnw58dd2wsvvx7499k5aac")) (modules '((guix build utils))) (snippet '(begin - ;; Remove libatomic-ops + ;; Remove libatomic-ops. (delete-file-recursively "gc/libatomic_ops") #t)))) (build-system gnu-build-system) @@ -1023,13 +1022,13 @@ (define-public gauche ("zlib" ,zlib))) (native-inputs `(("texinfo" ,texinfo) - ("openssl" ,openssl) ; needed for tests - ("pkg-config" ,pkg-config))) ; needed to find external libatomic-ops + ("openssl" ,openssl) ; needed for tests + ("pkg-config" ,pkg-config))) ; needed to find external libatomic-ops (arguments `(#:phases (modify-phases %standard-phases (add-after 'unpack 'patch-/bin/sh - ;; needed only for tests + ;; Needed only for tests. (lambda _ (substitute* '("configure" "test/www.scm" @@ -1046,14 +1045,14 @@ (define-public gauche (invoke "make" "info")) #t)) (add-before 'check 'patch-normalize-test - ;; neutralize sys-normalize-pathname test as it relies on - ;; the home directory; (setenv "HOME" xx) isn't enough) + ;; Neutralize sys-normalize-pathname test as it relies on + ;; the home directory; (setenv "HOME" xx) isn't enough). (lambda _ (substitute* "test/system.scm" (("~/abc") "//abc")) #t)) (add-before 'check 'patch-network-tests - ;; remove net checks + ;; Remove net checks. (lambda _ (substitute* "ext/Makefile" (("binary net termios") "binary termios")) -- cgit v1.2.3 From 078d2d0da7ed1f040a371d15cefff26e110aa920 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 15 Jan 2020 00:37:32 +0100 Subject: gnu: brial: Update to 1.2.6. * gnu/packages/sagemath.scm (brial): Update to 1.2.6. --- gnu/packages/sagemath.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/sagemath.scm b/gnu/packages/sagemath.scm index a749f5633a..0ebf30e83e 100644 --- a/gnu/packages/sagemath.scm +++ b/gnu/packages/sagemath.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Andreas Enge ;;; Copyright © 2019 Nicolas Goaziou -;;; Copyright © 2019 Tobias Geerinckx-Rice +;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -332,7 +332,7 @@ (define-public zn-poly (define-public brial (package (name "brial") - (version "1.2.5") + (version "1.2.6") (source (origin (method git-fetch) @@ -341,8 +341,7 @@ (define-public brial (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 - "1nv56fp3brpzanxj7vwvxqdafqfsfhdgq5imr3m94psw5gdfqwja")))) + (base32 "1mc1zjr3mxcx6bg0js5k9jx65japg7644b0aj1al75m4nwh2ygab")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) -- cgit v1.2.3 From e170faa80f9264693859c82b7a8416955d0d88fe Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 15 Jan 2020 00:40:23 +0100 Subject: gnu: brial: Use the source repository as home page. * gnu/packages/sagemath.scm (brial)[home-page]: Use upstream repository. --- gnu/packages/sagemath.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/sagemath.scm b/gnu/packages/sagemath.scm index 0ebf30e83e..4bafef13fe 100644 --- a/gnu/packages/sagemath.scm +++ b/gnu/packages/sagemath.scm @@ -364,7 +364,7 @@ (define-public brial Boolean variables. As a unique approach, binary decision diagrams are used as internal storage type for polynomial structures.") (license license:gpl2+) - (home-page "https://gitlab.com/sagemath/zn_poly"))) + (home-page "https://github.com/BRiAl/BRiAl/"))) (define-public lcalc (package -- cgit v1.2.3 From 3799d46ccffff4f3114b53441d3510404d2a6075 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 15 Jan 2020 00:42:51 +0100 Subject: gnu: zn-poly: Update to 0.9.2. * gnu/packages/sagemath.scm (zn-poly): Update to 0.9.2. --- gnu/packages/sagemath.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/sagemath.scm b/gnu/packages/sagemath.scm index 4bafef13fe..2cc50f7b6a 100644 --- a/gnu/packages/sagemath.scm +++ b/gnu/packages/sagemath.scm @@ -275,7 +275,7 @@ (define-public pynac (define-public zn-poly (package (name "zn-poly") - (version "0.9.1") + (version "0.9.2") (source (origin (method git-fetch) @@ -285,8 +285,7 @@ (define-public zn-poly (commit version))) (file-name (git-file-name "zn_poly" version)) (sha256 - (base32 - "0ra5vy585bqq7g3317iw6fp44iqgqvds3j0l1va6mswimypq4vxb")))) + (base32 "1wbc3apxcldxfcw1dnwnn7fvlfb6bwvlr8glvgv6hf79p9r2s4j0")))) (build-system gnu-build-system) (native-inputs `(("python" ,python-2))) -- cgit v1.2.3 From 353e9f733c7d9dacc809c86529e75c431c6fc80f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 15 Jan 2020 01:02:51 +0100 Subject: gnu: keepassxc: Update to 2.5.2. * gnu/packages/password-utils.scm (keepassxc): Update to 2.5.2. --- gnu/packages/password-utils.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index db5f54e1d9..e896e3db2d 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -114,7 +114,7 @@ (define-public pwgen (define-public keepassxc (package (name "keepassxc") - (version "2.5.1") + (version "2.5.2") (source (origin (method url-fetch) @@ -122,8 +122,7 @@ (define-public keepassxc "/releases/download/" version "/keepassxc-" version "-src.tar.xz")) (sha256 - (base32 - "0c5g5hn2cr2m00xgpxg884ihy8gnn09kc487y1m9jywshn5jaczg")))) + (base32 "0lvwc3nxyz7d7vymb6cmgwxylb9g6gsjnq247vbh4lk1ifjir58j")))) (build-system cmake-build-system) (arguments '(#:configure-flags '("-DWITH_XC_ALL=YES" -- cgit v1.2.3 From 9deae9828111274327955bc1e39ec446c6512e8a Mon Sep 17 00:00:00 2001 From: Mike Rosset Date: Tue, 14 Jan 2020 03:04:59 -0800 Subject: gnu: python-pyqt: Substitute the full path of . * gnu/packages/qt.scm (python-pyqt)[phases]: When building python-pyqtwebengine, qprinter.h can not be found. This substitutes the full path of qprinter.h in the qprinter sip specification file. --- gnu/packages/qt.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 514577678e..c634f45845 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1947,6 +1947,17 @@ (define-public python-pyqt ,@%gnu-build-system-modules) #:phases (modify-phases %standard-phases + ;; When building python-pyqtwebengine, can not be + ;; included. Here we substitute the full path to the header in the + ;; store. + (add-before 'configure 'substitute-source + (lambda* (#:key inputs #:allow-other-keys) + (let* ((qtbase (assoc-ref inputs "qtbase")) + (qtprinter.h (string-append "\"" qtbase "/include/qt5/QtPrintSupport/qprinter.h\""))) + (substitute* "sip/QtPrintSupport/qprinter.sip" + (("") + qtprinter.h)) + #t))) (replace 'configure (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From eb5af18e7e4299dea27e2b39d86e83cc40a4d0bb Mon Sep 17 00:00:00 2001 From: Mike Rosset Date: Tue, 14 Jan 2020 03:06:36 -0800 Subject: gnu: Add python-pyqtwebengine. * gnu/packages/qt.scm (python-pyqtwebengine): New variable. --- gnu/packages/qt.scm | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index c634f45845..89dbb94fea 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -38,6 +38,7 @@ (define-module (gnu packages qt) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) + #:use-module (guix build-system python) #:use-module (guix packages) #:use-module (guix deprecation) #:use-module (guix utils) @@ -1997,6 +1998,88 @@ (define-public python-pyqt contain over 620 classes.") (license license:gpl3))) +(define-public python-pyqtwebengine + (package + (name "python-pyqtwebengine") + (version "5.12.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://www.riverbankcomputing.com/static/Downloads/PyQtWebEngine/" + version "/PyQtWebEngine_gpl-" version ".tar.gz")) + (sha256 + (base32 + "0wylkd7fh2g27y3710rpxmj9wx0wpi3z7qbv6khiddm15rkh81w6")))) + (build-system gnu-build-system) + (native-inputs + `(("python" ,python) + ("python-sip" ,python-sip) + ;; qtbase is required for qmake + ("qtbase" ,qtbase))) + (inputs + `(("python" ,python-wrapper) + ("python-sip" ,python-sip) + ("python-pyqt" ,python-pyqt) + ("qtbase" ,qtbase) + ("qtsvg" ,qtsvg) + ("qtdeclarative" ,qtdeclarative) + ("qtwebchannel" ,qtwebchannel) + ("python-pyqt" ,python-pyqt) + ("qtwebengine" ,qtwebengine))) + (arguments + `(#:modules ((srfi srfi-1) + ,@%gnu-build-system-modules) + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (sipdir (string-append out "/share/sip")) + (pyqt-sipdir (string-append + (assoc-ref inputs "python-pyqt") "/share/sip")) + (python (assoc-ref inputs "python")) + (python-version + (last (string-split python #\-))) + (python-major+minor + (string-join + (take (string-split python-version #\.) 2) ".")) + (lib (string-append out "/lib/python" + python-major+minor + "/site-packages/PyQt5")) + (stubs (string-append lib "/PyQt5"))) + + (mkdir-p sipdir) + (invoke "python" "configure.py" + "-w" + "--no-dist-info" + "--destdir" lib + "--no-qsci-api" + "--stubsdir" stubs + "--sipdir" sipdir + "--pyqt-sipdir" pyqt-sipdir)))) + ;; Because this has a different prefix than python-pyqt then we need + ;; to make this a namespace of it's own + (add-after 'install 'make-namespace + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((__init__.py (string-append + (assoc-ref outputs "out") + "/lib/python3.7/site-packages/PyQt5/__init__.py"))) + (with-output-to-file __init__.py + (lambda _ (display " +from pkgutil import extend_path +__path__ = extend_path(__path__, __name__) +"))) + #t)))))) + (home-page "https://www.riverbankcomputing.com/software/pyqtwebengine/intro") + (synopsis "Python bindings for QtWebEngine") + (description + "PyQtWebEngine is a set of Python bindings for The Qt Company's Qt +WebEngine libraries. The bindings sit on top of PyQt5 and are implemented as a +set of three modules. Prior to v5.12 these bindings were part of PyQt +itself.") + (license license:gpl3))) + ;; XXX: This is useful because qtwebkit does not build reliably at this time. ;; Ultimately, it would be nicer to have a more modular set of python-pyqt-* ;; packages that could be used together. -- cgit v1.2.3 From 44ce3ebb46a4e63a892ef1aac2c7b5fa3dec28ce Mon Sep 17 00:00:00 2001 From: Mike Rosset Date: Tue, 14 Jan 2020 03:06:37 -0800 Subject: gnu: qutebrowser: Update to 1.9.0. * gnu/packages/web-browsers.scm (qutebrowser): Update to 1.9.0. qutebrowser no longer uses qtwebkit by default. It now defaults to qtwebengine. --- gnu/packages/web-browsers.scm | 39 +++++++++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 137dccab81..f55ee111f8 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -276,7 +276,7 @@ (define-public lynx (define-public qutebrowser (package (name "qutebrowser") - (version "1.8.3") + (version "1.9.0") (source (origin (method url-fetch) @@ -285,11 +285,10 @@ (define-public qutebrowser "qutebrowser-" version ".tar.gz")) (sha256 (base32 - "055zmzk3q0m3hx1742nfy2mdawfllrkvijnbzp1hiv01dj1bxaf8")))) + "1y0yq1qfr6g1s7kf3w2crd0b025dv2dfknhlz3v0001ns3rgwj17")))) (build-system python-build-system) (native-inputs - `(("asciidoc" ,asciidoc) - ("python-attrs" ,python-attrs))) ; for tests + `(("python-attrs" ,python-attrs))) ; for tests (inputs `(("python-colorama" ,python-colorama) ("python-cssutils" ,python-cssutils) @@ -298,23 +297,29 @@ (define-public qutebrowser ("python-pygments" ,python-pygments) ("python-pypeg2" ,python-pypeg2) ("python-pyyaml" ,python-pyyaml) + ;; FIXME: python-pyqtwebengine needs to come before python-pyqt so + ;; that it's __init__.py is used first. + ("python-pyqtwebengine" ,python-pyqtwebengine) ("python-pyqt" ,python-pyqt) - ("qtwebkit" ,qtwebkit))) + ;; While qtwebengine is provided by python-pyqtwebengine, it's + ;; included here so we can wrap QTWEBENGINEPROCESS_PATH. + ("qtwebengine" ,qtwebengine))) (arguments - `(;; FIXME: Tests have been added to Qutebrowser. But they currently fail on - ;; trying to locate QtWebEngine, and run it on a specific display. - ;; There does not seem to be a trivial way to suppress this test. - ;; Either fix this, or wait for a liberated QtWebEngine to make into GNU Guix. - ;; Change this according to . + `(;; FIXME: With the existance of qtwebengine, tests can now run. But + ;; they are still disabled because test phase hangs. It's not readily + ;; apparent as to why. #:tests? #f #:phases (modify-phases %standard-phases + (add-before 'check 'set-env-offscreen + (lambda _ + (setenv "QT_QPA_PLATFORM" "offscreen") + #t)) (add-after 'install 'install-more (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (app (string-append out "/share/applications")) (hicolor (string-append out "/share/icons/hicolor"))) - (invoke "a2x" "-f" "manpage" "doc/qutebrowser.1.asciidoc") (install-file "doc/qutebrowser.1" (string-append out "/share/man/man1")) (for-each @@ -331,11 +336,21 @@ (define-public qutebrowser (("Exec=qutebrowser") (string-append "Exec=" out "/bin/qutebrowser"))) (install-file "misc/org.qutebrowser.qutebrowser.desktop" app) + #t))) + (add-after 'wrap 'wrap-qt-process-path + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin/qutebrowser")) + (qt-process-path (string-append + (assoc-ref inputs "qtwebengine") + "/lib/qt5/libexec/QtWebEngineProcess"))) + (wrap-program bin + `("QTWEBENGINEPROCESS_PATH" ":" prefix (,qt-process-path))) #t)))))) (home-page "https://qutebrowser.org/") (synopsis "Minimal, keyboard-focused, vim-like web browser") (description "qutebrowser is a keyboard-focused browser with a minimal -GUI. It is based on PyQt5 and QtWebKit.") +GUI. It is based on PyQt5 and QtWebEngine.") (license license:gpl3+))) (define-public vimb -- cgit v1.2.3 From e2922f527ee8d891a41b5086637fa560a1c2ddd8 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 15 Jan 2020 10:05:54 +0100 Subject: substitute: 'http-multiple-get' processes each request only once. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . Reported by Gábor Boskovits . Fixes a regression introduced in 9e3f9ac3c00906f5bc647ea8398e4ed5a370614e. * guix/scripts/substitute.scm (http-multiple-get): In the "Connection: close" case, pass (drop requests (+ 1 processed)) to 'loop' as the remaining REQUESTS value. Previously, we would pass a list containing duplicates, and thus the final result would also contain duplicates. When sent to the daemon, that list would lead to a daemon error: got unexpected path `/gnu/store/…' from substituter --- guix/scripts/substitute.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm index 3bf9b8735f..dfb975a24a 100755 --- a/guix/scripts/substitute.scm +++ b/guix/scripts/substitute.scm @@ -557,7 +557,7 @@ (define batch (('connection 'close) (close-port p) (connect #f ;try again - (append tail (drop requests processed)) + (drop requests (+ 1 processed)) result)) (_ (loop tail (+ 1 processed) result)))))))))) ;keep going -- cgit v1.2.3 From 0030277f7984bf1368d002f0aa1a22168ddb4942 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 15 Jan 2020 15:02:20 +0100 Subject: gnu: Remove unnecessary uses of (guix build utils). * gnu/packages/crypto.scm: Remove use of (guix build utils). * gnu/packages/databases.scm: Likewise. --- gnu/packages/crypto.scm | 1 - gnu/packages/databases.scm | 1 - 2 files changed, 2 deletions(-) diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 1c6e759c83..3eb2466e3c 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -70,7 +70,6 @@ (define-module (gnu packages crypto) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system perl) - #:use-module (guix build utils) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26)) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 5d770f46e5..283ba02db2 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -126,7 +126,6 @@ (define-module (gnu packages databases) #:use-module (guix build-system cmake) #:use-module (guix build-system scons) #:use-module (guix build-system trivial) - #:use-module ((guix build utils) #:hide (which)) #:use-module (guix utils) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) -- cgit v1.2.3 From 5a2639f9cb367bc42a552a6fe9c7081f8b7c4cf0 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 15 Jan 2020 15:03:08 +0100 Subject: Avoid warnings for the 'delete' binding of (guix build utils). On Guile 3, importing (guix build utils) leads to warnings such as: WARNING: (gnu packages embedded): imported module (guix build utils) overrides core binding `delete' * gnu/packages/embedded.scm: Select 'alist-replace' from (guix build utils). * guix/ui.scm: Hide 'delete' from (guix build utils). --- gnu/packages/embedded.scm | 2 +- guix/ui.scm | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index 67c6fdafdc..1f73e78fe0 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -32,7 +32,7 @@ (define-module (gnu packages embedded) #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (guix build-system trivial) - #:use-module (guix build utils) + #:use-module ((guix build utils) #:select (alist-replace)) #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module ((gnu packages base) #:prefix base:) diff --git a/guix/ui.scm b/guix/ui.scm index 023e604085..b99a9e59f5 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -55,7 +55,9 @@ (define-module (guix ui) ;; in 5d669883ecc104403c5d3ba7d172e9c02234577c, #:hide ;; unwanted bindings instead of #:select'ing the needed ;; bindings. - #:hide (package-name->name+version)) + #:hide (package-name->name+version + ;; Avoid "overrides core binding" warning. + delete)) #:use-module (srfi srfi-1) #:use-module (srfi srfi-11) #:use-module (srfi srfi-19) -- cgit v1.2.3 From ea6d962b93a38dd11c1d43c647a7ac10c2f75fe8 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 15 Jan 2020 15:04:40 +0100 Subject: More module autoload adjustments. This is a followup to 7a0836cffdfe3ab9ee899602f218277646959144. * guix/scripts/package.scm: Adjust binding list of the (guix store roots) autoload. * guix/inferior.scm: Adjust binding list of the (guix cache) autoload. --- guix/inferior.scm | 5 +++-- guix/scripts/package.scm | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/guix/inferior.scm b/guix/inferior.scm index c4969cd56a..0236fb61ad 100644 --- a/guix/inferior.scm +++ b/guix/inferior.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. ;;; @@ -44,7 +44,8 @@ (define-module (guix inferior) #:use-module (guix derivations) #:use-module (guix base32) #:use-module (gcrypt hash) - #:autoload (guix cache) (maybe-remove-expired-cache-entries) + #:autoload (guix cache) (maybe-remove-expired-cache-entries + file-expiration-time) #:autoload (guix ui) (show-what-to-build*) #:autoload (guix build utils) (mkdir-p) #:use-module (srfi srfi-1) diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm index ea16435d2d..0fe25aee6f 100644 --- a/guix/scripts/package.scm +++ b/guix/scripts/package.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 Nikita Karetnikov ;;; Copyright © 2013, 2015 Mark H Weaver ;;; Copyright © 2014, 2016 Alex Kost @@ -39,7 +39,7 @@ (define-module (guix scripts package) #:use-module (guix scripts) #:use-module (guix scripts build) #:use-module (guix describe) - #:autoload (guix store roots) (gc-roots) + #:autoload (guix store roots) (gc-roots user-owned?) #:use-module ((guix build utils) #:select (directory-exists? mkdir-p)) #:use-module ((guix build syscalls) -- cgit v1.2.3 From 69f132554c6bd23df4610a21e636bde5f0578174 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 15 Jan 2020 18:05:26 +0100 Subject: import: cpan: Rewrite to use 'define-json-mapping'. * guix/import/cpan.scm (, ): New JSON-mapped record types. (metacpan-url->mirror-url): New procedure. (cpan-source-url): Rewrite in terms of it. (cpan-version): Remove. (cpan-module->sexp): Rewrite to take a instead of an alist, and rename 'meta' to 'release'. [convert-inputs]: Rewrite to use 'cpan-release-dependencies'. Update calls to 'convert-inputs' to pass a list of symbols. Replace 'assoc-ref' calls with the appropriate field accessors. (cpan->guix-package): Rename 'module-meta' to 'release'. (latest-release): Likewise, and use the appropriate accessors. * tests/cpan.scm (test-json): Remove "prereqs" record; add "dependency" list. ("source-url-http", "source-url-https"): Remove. ("metacpan-url->mirror-url, http") ("metacpan-url->mirror-url, https"): New tests. --- guix/import/cpan.scm | 151 ++++++++++++++++++++++++++++++++++----------------- tests/cpan.scm | 33 ++++++----- 2 files changed, 116 insertions(+), 68 deletions(-) diff --git a/guix/import/cpan.scm b/guix/import/cpan.scm index ec86f11743..4320f94c98 100644 --- a/guix/import/cpan.scm +++ b/guix/import/cpan.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2016 Alex Sassmannshausen ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2020 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,19 +28,39 @@ (define-module (guix import cpan) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) #:use-module (json) + #:use-module (guix json) #:use-module (gcrypt hash) #:use-module (guix store) #:use-module (guix utils) #:use-module (guix base32) #:use-module (guix ui) #:use-module ((guix download) #:select (download-to-store url-fetch)) - #:use-module ((guix import utils) #:select (factorize-uri - flatten assoc-ref*)) + #:use-module ((guix import utils) #:select (factorize-uri)) #:use-module (guix import json) #:use-module (guix packages) #:use-module (guix upstream) #:use-module (guix derivations) - #:export (cpan->guix-package + #:export (cpan-dependency? + cpan-dependency-relationship + cpan-dependency-phase + cpan-dependency-module + cpan-dependency-version + + cpan-release? + cpan-release-license + cpan-release-author + cpan-release-version + cpan-release-modle + cpan-release-distribution + cpan-release-download-url + cpan-release-abstract + cpan-release-home-page + cpan-release-dependencies + json->cpan-release + + cpan-fetch + cpan->guix-package + metacpan-url->mirror-url %cpan-updater)) ;;; Commentary: @@ -49,6 +70,45 @@ (define-module (guix import cpan) ;;; ;;; Code: +;; Dependency of a "release". +(define-json-mapping make-cpan-dependency cpan-dependency? + json->cpan-dependency + (relationship cpan-dependency-relationship "relationship" + string->symbol) ;requires | suggests + (phase cpan-dependency-phase "phase" + string->symbol) ;develop | configure | test | runtime + (module cpan-dependency-module) ;string + (version cpan-dependency-version)) ;string + +;; Release as returned by . +(define-json-mapping make-cpan-release cpan-release? + json->cpan-release + (license cpan-release-license) + (author cpan-release-author) + (version cpan-release-version "version" + (match-lambda + ((? number? version) + ;; Version is sometimes not quoted in the module json, so + ;; it gets imported into Guile as a number, so convert it + ;; to a string (example: "X11-Protocol-Other"). + (number->string version)) + ((? string? version) + ;; Sometimes we get a "v" prefix. Strip it. + (if (string-prefix? "v" version) + (string-drop version 1) + version)))) + (module cpan-release-module "main_module") ;e.g., "Test::Script" + (distribution cpan-release-distribution) ;e.g., "Test-Script" + (download-url cpan-release-download-url "download_url") + (abstract cpan-release-abstract "abstract") + (home-page cpan-release-home-page "resources" + (match-lambda + (#f #f) + ((lst ...) (assoc-ref lst "homepage")))) + (dependencies cpan-release-dependencies "dependency" + (lambda (vector) + (map json->cpan-dependency (vector->list vector))))) + (define string->license (match-lambda ;; List of valid values from https://metacpan.org/pod/CPAN::Meta::Spec. @@ -111,32 +171,25 @@ (define (package->upstream-name package) (_ #f))))) (define (cpan-fetch name) - "Return an alist representation of the CPAN metadata for the perl module MODULE, -or #f on failure. MODULE should be e.g. \"Test::Script\"" + "Return a record for Perl module MODULE, +or #f on failure. MODULE should be the distribution name, such as +\"Test-Script\" for the \"Test::Script\" module." ;; This API always returns the latest release of the module. - (json-fetch (string-append "https://fastapi.metacpan.org/v1/release/" name))) + (json->cpan-release + (json-fetch (string-append "https://fastapi.metacpan.org/v1/release/" + name)))) (define (cpan-home name) (string-append "https://metacpan.org/release/" name)) -(define (cpan-source-url meta) - "Return the download URL for a module's source tarball." +(define (metacpan-url->mirror-url url) + "Replace 'https://cpan.metacpan.org' in URL with 'mirror://cpan'." (regexp-substitute/global #f "http[s]?://cpan.metacpan.org" - (assoc-ref meta "download_url") + url 'pre "mirror://cpan" 'post)) -(define (cpan-version meta) - "Return the version number from META." - (match (assoc-ref meta "version") - ((? number? version) - ;; version is sometimes not quoted in the module json, so it gets - ;; imported into Guile as a number, so convert it to a string. - (number->string version)) - (version - ;; Sometimes we get a "v" prefix. Strip it. - (if (string-prefix? "v" version) - (string-drop version 1) - version)))) +(define cpan-source-url + (compose metacpan-url->mirror-url cpan-release-download-url)) (define (perl-package) "Return the 'perl' package. This is a lazy reference so that we don't @@ -179,42 +232,38 @@ (define (version-between? lower version upper) first perl-version last)))) (loop))))))))))) -(define (cpan-module->sexp meta) - "Return the `package' s-expression for a CPAN module from the metadata in -META." +(define (cpan-module->sexp release) + "Return the 'package' s-expression for a CPAN module from the release data +in RELEASE, a record." (define name - (assoc-ref meta "distribution")) + (cpan-release-distribution release)) (define (guix-name name) (if (string-prefix? "perl-" name) (string-downcase name) (string-append "perl-" (string-downcase name)))) - (define version (cpan-version meta)) - (define source-url (cpan-source-url meta)) + (define version (cpan-release-version release)) + (define source-url (cpan-source-url release)) (define (convert-inputs phases) ;; Convert phase dependencies into a list of name/variable pairs. - (match (flatten - (map (lambda (ph) - (filter-map (lambda (t) - (assoc-ref* meta "metadata" "prereqs" ph t)) - '("requires" "recommends" "suggests"))) - phases)) - (#f - '()) + (match (filter-map (lambda (dependency) + (and (memq (cpan-dependency-phase dependency) + phases) + (cpan-dependency-module dependency))) + (cpan-release-dependencies release)) ((inputs ...) (sort (delete-duplicates ;; Listed dependencies may include core modules. Filter those out. (filter-map (match-lambda - (("perl" . _) ;implicit dependency - #f) - ((module . _) - (and (not (core-module? module)) - (let ((name (guix-name (module->dist-name module)))) - (list name - (list 'unquote (string->symbol name))))))) + ("perl" #f) ;implicit dependency + ((? core-module?) #f) + (module + (let ((name (guix-name (module->dist-name module)))) + (list name + (list 'unquote (string->symbol name)))))) inputs)) (lambda args (match args @@ -247,19 +296,19 @@ (define (maybe-inputs guix-name inputs) ;; which says they are required during building. We ;; have not yet had a need for cross-compiled perl ;; modules, however, so we leave it out. - (convert-inputs '("configure" "build" "test"))) + (convert-inputs '(configure build test))) ,@(maybe-inputs 'propagated-inputs - (convert-inputs '("runtime"))) + (convert-inputs '(runtime))) (home-page ,(cpan-home name)) - (synopsis ,(assoc-ref meta "abstract")) + (synopsis ,(cpan-release-abstract release)) (description fill-in-yourself!) - (license ,(string->license (assoc-ref meta "license")))))) + (license ,(string->license (cpan-release-license release)))))) (define (cpan->guix-package module-name) "Fetch the metadata for PACKAGE-NAME from metacpan.org, and return the `package' s-expression corresponding to that package, or #f on failure." - (let ((module-meta (cpan-fetch (module->name module-name)))) - (and=> module-meta cpan-module->sexp))) + (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." @@ -285,7 +334,7 @@ (define (latest-release package) "Return an for the latest release of PACKAGE." (match (cpan-fetch (package->upstream-name package)) (#f #f) - (meta + (release (let ((core-inputs (match (package-direct-inputs package) (((_ inputs _ ...) ...) @@ -303,8 +352,8 @@ (define (latest-release package) (warning (G_ "input '~a' of ~a is in Perl core~%") module (package-name package))) core-inputs))) - (let ((version (cpan-version meta)) - (url (cpan-source-url meta))) + (let ((version (cpan-release-version release)) + (url (cpan-source-url release))) (upstream-source (package (package-name package)) (version version) diff --git a/tests/cpan.scm b/tests/cpan.scm index 189dd027e6..043d401032 100644 --- a/tests/cpan.scm +++ b/tests/cpan.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Eric Bavier ;;; Copyright © 2016 Alex Sassmannshausen +;;; Copyright © 2020 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -32,13 +33,6 @@ (define-module (test-cpan) (define test-json "{ \"metadata\" : { - \"prereqs\" : { - \"runtime\" : { - \"requires\" : { - \"Test::Script\" : \"1.05\", - } - } - } \"name\" : \"Foo-Bar\", \"version\" : \"0.1\" } @@ -47,6 +41,13 @@ (define test-json \"license\" : [ \"perl_5\" ], + \"dependency\": [ + { \"relationship\": \"requires\", + \"phase\": \"runtime\", + \"version\": \"1.05\", + \"module\": \"Test::Script\" + } + ], \"abstract\" : \"Fizzle Fuzz\", \"download_url\" : \"http://example.com/Foo-Bar-0.1.tar.gz\", \"author\" : \"Guix\", @@ -107,16 +108,14 @@ (define test-source (x (pk 'fail x #f)))))) -(test-equal "source-url-http" - ((@@ (guix import cpan) cpan-source-url) - `(("download_url" . - "http://cpan.metacpan.org/authors/id/T/TE/TEST/Foo-Bar-0.1.tar.gz"))) - "mirror://cpan/authors/id/T/TE/TEST/Foo-Bar-0.1.tar.gz") +(test-equal "metacpan-url->mirror-url, http" + "mirror://cpan/authors/id/T/TE/TEST/Foo-Bar-0.1.tar.gz" + (metacpan-url->mirror-url + "http://cpan.metacpan.org/authors/id/T/TE/TEST/Foo-Bar-0.1.tar.gz")) -(test-equal "source-url-https" - ((@@ (guix import cpan) cpan-source-url) - `(("download_url" . - "https://cpan.metacpan.org/authors/id/T/TE/TEST/Foo-Bar-0.1.tar.gz"))) - "mirror://cpan/authors/id/T/TE/TEST/Foo-Bar-0.1.tar.gz") +(test-equal "metacpan-url->mirror-url, https" + "mirror://cpan/authors/id/T/TE/TEST/Foo-Bar-0.1.tar.gz" + (metacpan-url->mirror-url + "https://cpan.metacpan.org/authors/id/T/TE/TEST/Foo-Bar-0.1.tar.gz")) (test-end "cpan") -- cgit v1.2.3 From 4aea90b1876179aab8d603a42533a6bdf97ccd3c Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 15 Jan 2020 18:35:14 +0100 Subject: import: cpan: Rewrite tests to use an HTTP server instead of mocking. * guix/import/cpan.scm (%metacpan-base-url): New variable. (module->dist-name, cpan-fetch): Refer to it instead of the hard-coded URL. * tests/cpan.scm ("cpan->guix-package"): Use 'with-http-server' instead of 'mock'. --- guix/import/cpan.scm | 12 ++++++-- tests/cpan.scm | 81 ++++++++++++++++++++++------------------------------ 2 files changed, 43 insertions(+), 50 deletions(-) diff --git a/guix/import/cpan.scm b/guix/import/cpan.scm index 4320f94c98..7a97c7f8e8 100644 --- a/guix/import/cpan.scm +++ b/guix/import/cpan.scm @@ -61,7 +61,9 @@ (define-module (guix import cpan) cpan-fetch cpan->guix-package metacpan-url->mirror-url - %cpan-updater)) + %cpan-updater + + %metacpan-base-url)) ;;; Commentary: ;;; @@ -70,6 +72,10 @@ (define-module (guix import cpan) ;;; ;;; Code: +(define %metacpan-base-url + ;; Base URL of the MetaCPAN API. + (make-parameter "https://fastapi.metacpan.org/v1/")) + ;; Dependency of a "release". (define-json-mapping make-cpan-dependency cpan-dependency? json->cpan-dependency @@ -149,7 +155,7 @@ (define (module->dist-name module) module is distributed with 'Test::Simple', so (module->dist-name \"ok\") would return \"Test-Simple\"" (assoc-ref (json-fetch (string-append - "https://fastapi.metacpan.org/v1/module/" + (%metacpan-base-url) "/module/" module "?fields=distribution")) "distribution")) @@ -176,7 +182,7 @@ (define (cpan-fetch name) \"Test-Script\" for the \"Test::Script\" module." ;; This API always returns the latest release of the module. (json->cpan-release - (json-fetch (string-append "https://fastapi.metacpan.org/v1/release/" + (json-fetch (string-append (%metacpan-base-url) "/release/" name)))) (define (cpan-home name) diff --git a/tests/cpan.scm b/tests/cpan.scm index 043d401032..b4db9e60e4 100644 --- a/tests/cpan.scm +++ b/tests/cpan.scm @@ -22,9 +22,10 @@ (define-module (test-cpan) #:use-module (guix import cpan) #:use-module (guix base32) #:use-module (gcrypt hash) - #:use-module (guix tests) + #:use-module (guix tests http) #:use-module (guix grafts) #:use-module (srfi srfi-64) + #:use-module (web client) #:use-module (ice-9 match)) ;; Globally disable grafts because they can trigger early builds. @@ -57,56 +58,42 @@ (define test-json (define test-source "foobar") +;; Avoid collisions with other tests. +(%http-server-port 10400) + (test-begin "cpan") (test-assert "cpan->guix-package" ;; Replace network resources with sample data. - (mock ((guix build download) url-fetch - (lambda* (url file-name - #:key - (mirrors '()) verify-certificate?) - (with-output-to-file file-name - (lambda () - (display - (match url - ("http://example.com/Foo-Bar-0.1.tar.gz" - test-source) - (_ (error "Unexpected URL: " url)))))))) - (mock ((guix http-client) http-fetch - (lambda (url . rest) - (match url - ("https://fastapi.metacpan.org/v1/release/Foo-Bar" - (values (open-input-string test-json) - (string-length test-json))) - ("https://fastapi.metacpan.org/v1/module/Test::Script?fields=distribution" - (let ((result "{ \"distribution\" : \"Test-Script\" }")) - (values (open-input-string result) - (string-length result)))) - (_ (error "Unexpected URL: " url))))) - (match (cpan->guix-package "Foo::Bar") - (('package - ('name "perl-foo-bar") - ('version "0.1") - ('source ('origin - ('method 'url-fetch) - ('uri ('string-append "http://example.com/Foo-Bar-" - 'version ".tar.gz")) - ('sha256 - ('base32 - (? string? hash))))) - ('build-system 'perl-build-system) - ('propagated-inputs - ('quasiquote - (("perl-test-script" ('unquote 'perl-test-script))))) - ('home-page "https://metacpan.org/release/Foo-Bar") - ('synopsis "Fizzle Fuzz") - ('description 'fill-in-yourself!) - ('license 'perl-license)) - (string=? (bytevector->nix-base32-string - (call-with-input-string test-source port-sha256)) - hash)) - (x - (pk 'fail x #f)))))) + (with-http-server `((200 ,test-json) + (200 ,test-source) + (200 "{ \"distribution\" : \"Test-Script\" }")) + (parameterize ((%metacpan-base-url (%local-url)) + (current-http-proxy (%local-url))) + (match (cpan->guix-package "Foo::Bar") + (('package + ('name "perl-foo-bar") + ('version "0.1") + ('source ('origin + ('method 'url-fetch) + ('uri ('string-append "http://example.com/Foo-Bar-" + 'version ".tar.gz")) + ('sha256 + ('base32 + (? string? hash))))) + ('build-system 'perl-build-system) + ('propagated-inputs + ('quasiquote + (("perl-test-script" ('unquote 'perl-test-script))))) + ('home-page "https://metacpan.org/release/Foo-Bar") + ('synopsis "Fizzle Fuzz") + ('description 'fill-in-yourself!) + ('license 'perl-license)) + (string=? (bytevector->nix-base32-string + (call-with-input-string test-source port-sha256)) + hash)) + (x + (pk 'fail x #f)))))) (test-equal "metacpan-url->mirror-url, http" "mirror://cpan/authors/id/T/TE/TEST/Foo-Bar-0.1.tar.gz" -- cgit v1.2.3 From a650ee0baa6dc257de428524239d456402a59ae0 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 15 Jan 2020 19:49:47 +0100 Subject: gnu: guix: Update to 4aea90b. * gnu/packages/package-management.scm (guix): Update to 4aea90b. --- 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 6becdb22a9..b9e416797c 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -110,8 +110,8 @@ (define-public guix ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.0.1") - (commit "f38eabe952608478230895e380ef441d65ea625e") - (revision 11)) + (commit "4aea90b1876179aab8d603a42533a6bdf97ccd3c") + (revision 12)) (package (name "guix") @@ -127,7 +127,7 @@ (define-public guix (commit commit))) (sha256 (base32 - "1wnm1wqa38dpd5bk6avyfm0rgx72vlx36a06scyg8d57kl47mzjf")) + "08h1v9pmhb6pcdhvnhc1gi0nqp78kf68657vlk10abrf7q0cqs6q")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 981bd6e69cc7d58889b8b14d582b5519be7f7246 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Jan 2020 20:07:37 +0100 Subject: gnu: popt: Add a source file name. * gnu/packages/popt.scm (popt)[source](file-name): New field. --- gnu/packages/popt.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/popt.scm b/gnu/packages/popt.scm index 857455d213..2e77368d20 100644 --- a/gnu/packages/popt.scm +++ b/gnu/packages/popt.scm @@ -68,6 +68,8 @@ (define-public popt ;; so fallback to Debians copy. (string-append "https://deb.debian.org/debian/pool/main" "/p/popt/popt_" version ".orig.tar.gz"))) + ;; Ensure the file name stays the same. + (file-name (string-append "popt-" version ".tar.gz")) (sha256 (base32 "1j2c61nn2n351nhj4d25mnf3vpiddcykq005w2h6kw79dwlysa77")))) -- cgit v1.2.3 From b244f166b9c74a87875671187c8c33ca2e083e53 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Jan 2020 20:08:46 +0100 Subject: gnu: python-sortedcontainers: Update to 2.1.0. * gnu/packages/python-xyz.scm (python-sortedcontainers): Update to 2.1.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 3825e308e8..a81137ff40 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15771,14 +15771,14 @@ (define-public python-cytoolz (define-public python-sortedcontainers (package (name "python-sortedcontainers") - (version "2.0.4") + (version "2.1.0") (source (origin (method url-fetch) (uri (pypi-uri "sortedcontainers" version)) (sha256 (base32 - "10hrk2k0hbf9x78vd3f0lj277m1yzfhzzxr0hja718liwb398wk0")))) + "0fm0w5id2yhqld95hg2m636vjgkz377rvgdfqaxc25vbylr9lklp")))) (build-system python-build-system) (native-inputs `(("python-tox" ,python-tox))) -- cgit v1.2.3 From 59fa08d6f8c295b4ad58b24996fbee21d24dc4ca Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Jan 2020 20:09:41 +0100 Subject: gnu: python-pytest-checkdocs: Add missing input. * gnu/packages/python-check.scm (python-pytest-checkdocs)[propagated-inputs]: Add PYTHON-DOCUTILS. --- gnu/packages/python-check.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index caa398752e..a4d065d5e7 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -120,7 +120,8 @@ (define-public python-pytest-checkdocs (base32 "0j6j1gvj6x451y3qsx4xbaq9p1w9gg3mwk7n0w80cy8vdyjkngb0")))) (build-system python-build-system) (propagated-inputs - `(("python-importlib-metadata" ,python-importlib-metadata) + `(("python-docutils" ,python-docutils) + ("python-importlib-metadata" ,python-importlib-metadata) ("python-more-itertools" ,python-more-itertools))) (native-inputs `(("python-setuptools-scm" ,python-setuptools-scm))) -- cgit v1.2.3 From 4dc04d11c8541ab4390236429ad989f46691aa53 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Jan 2020 20:10:06 +0100 Subject: gnu: python-importlib-metadata: Update to 1.4.0. * gnu/packages/python-xyz.scm (python-importlib-metadata): Update to 1.4.0. [propagated-inputs]: Remove PYTHON-CONFIGPARSER, PYTHON-CONTEXTLIB2, PYTHON-DOCUTILS, PYTHON-PATHLIB2, and PYTHON-RST.LINKER. [native-inputs]: Remove PYTHON-SPHINX. Add PYTHON-PACKAGING. --- gnu/packages/python-xyz.scm | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a81137ff40..6cf1fdfa2b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4964,24 +4964,19 @@ (define-public python-pathlib2 (define-public python-importlib-metadata (package (name "python-importlib-metadata") - (version "0.23") + (version "1.4.0") (source (origin (method url-fetch) (uri (pypi-uri "importlib_metadata" version)) (sha256 - (base32 "09mdqdfv5rdrwz80jh9m379gxmvk2vhjfz0fg53hid00icvxf65a")))) + (base32 "1n76444v7zn910xrhh8954jdn4byxbn9f1jck6b85a716mbh2z7i")))) (build-system python-build-system) (propagated-inputs - `(("python-configparser" ,python-configparser) - ("python-contextlib2" ,python-contextlib2) - ("python-docutils" ,python-docutils) - ("python-pathlib2" ,python-pathlib2) - ("python-rst.linker" ,python-rst.linker) - ("python-zipp" ,python-zipp))) + `(("python-zipp" ,python-zipp))) (native-inputs `(("python-setuptools-scm" ,python-setuptools-scm) - ("python-sphinx" ,python-sphinx))) + ("python-packaging" ,python-packaging))) (home-page "https://importlib-metadata.readthedocs.io/") (synopsis "Read metadata from Python packages") (description -- cgit v1.2.3 From 6b3cef844c5b7c5628fba57e6aed42c56d06cbca Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Jan 2020 20:10:26 +0100 Subject: gnu: python-zipp: Update to 1.0.0. * gnu/packages/python-compression.scm (python-zipp): Update to 1.0.0. [propagated-inputs]: Remove PYTHON-RST.LINKER. Add PYTHON-MORE-ITERTOOLS. Move PYTHON-CONTEXTLIB2 and PYTHON-PATHLIB2 ... [native-inputs]: ... here. Remove PYTHON-SPHINX. --- gnu/packages/python-compression.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm index 0f2bc78c12..6015b5aae3 100644 --- a/gnu/packages/python-compression.scm +++ b/gnu/packages/python-compression.scm @@ -211,22 +211,21 @@ (define-public bitshuffle-for-snappy (define-public python-zipp (package (name "python-zipp") - (version "0.5.1") + (version "1.0.0") (source (origin (method url-fetch) (uri (pypi-uri "zipp" version)) (sha256 (base32 - "1hsv4zwy1pwnbrr63wjjkpwrmnk36ngbkkqw01bj5hcwh1z3m56a")))) + "0v3qayhqv7vyzydpydwcp51bqciw8p2ajddw68x5k8zppc0vx3yk")))) (build-system python-build-system) (propagated-inputs + `(("python-more-itertools" ,python-more-itertools))) + (native-inputs `(("python-contextlib2" ,python-contextlib2) ("python-pathlib2" ,python-pathlib2) - ("python-rst.linker" ,python-rst.linker))) - (native-inputs - `(("python-setuptools-scm" ,python-setuptools-scm) - ("python-sphinx" ,python-sphinx) + ("python-setuptools-scm" ,python-setuptools-scm) ("python-unittest2" ,python-unittest2))) (home-page "https://github.com/jaraco/zipp") (synopsis -- cgit v1.2.3 From 8f137daf8af37a8f91f74370948fac3f01728a80 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Jan 2020 20:11:05 +0100 Subject: gnu: python-wheel: Update to 0.33.6. * gnu/packages/python-xyz.scm (python-wheel): Update to 0.33.6. [arguments]: Explicitly disable tests (they never ran before). [native-inputs, properties]: Remove. (python2-wheel): Use PACKAGE-WITH-PYTHON2. --- gnu/packages/python-xyz.scm | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 6cf1fdfa2b..9ad4609fb3 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1908,18 +1908,20 @@ (define-public python2-click (define-public python-wheel (package (name "python-wheel") - (version "0.32.3") + (version "0.33.6") (source (origin (method url-fetch) (uri (pypi-uri "wheel" version)) (sha256 (base32 - "1dhxl1bf18bx9szmqcnxbg6204hp3im8089q3hkwh5jfa6zh75q2")))) + "0ii6f34rvpjg3nmw4bc2h7fhdsy38y1h93hghncfs5akfrldmj8h")))) (build-system python-build-system) - (native-inputs - `(("python-jsonschema" ,python-jsonschema) - ("python-pytest-cov" ,python-pytest-cov))) + (arguments + ;; FIXME: The test suite runs "python setup.py bdist_wheel", which in turn + ;; fails to find the newly-built bdist_wheel library, even though it is + ;; available on PYTHONPATH. What search path is consulted by setup.py? + '(#:tests? #f)) (home-page "https://bitbucket.org/pypa/wheel/") (synopsis "Format for built Python packages") (description @@ -1930,15 +1932,10 @@ (define-public python-wheel unpacked archive preserves enough information to @code{Spread} (copy data and scripts to their final locations) at any later time. Wheel files can be installed with a newer @code{pip} or with wheel's own command line utility.") - (license license:expat) - (properties `((python2-variant . ,(delay python2-wheel)))))) + (license license:expat))) (define-public python2-wheel - (let ((wheel (package-with-python2 - (strip-python2-variant python-wheel)))) - (package (inherit wheel) - (native-inputs `(("python2-functools32" ,python2-functools32) - ,@(package-native-inputs wheel)))))) + (package-with-python2 python-wheel)) (define-public python-vcversioner (package -- cgit v1.2.3 From fd5c264ad8c97ce5e44fdcabd25132d019eee953 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Jan 2020 20:11:49 +0100 Subject: gnu: Add python2-importlib-resources. * gnu/packages/python-xyz.scm (python2-importlib-resources): New public variable. --- gnu/packages/python-xyz.scm | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9ad4609fb3..430ed4a13e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -26,7 +26,7 @@ ;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2016 Dylan Jeffers ;;; Copyright © 2016 David Craven -;;; Copyright © 2016, 2017, 2018, 2019 Marius Bakke +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Marius Bakke ;;; Copyright © 2016, 2017 Stefan Reichör ;;; Copyright © 2016 Dylan Jeffers ;;; Copyright © 2016, 2017, 2019 Alex Vong @@ -4958,6 +4958,31 @@ (define-public python-pathlib2 older Python versions.") (license license:expat))) +(define-public python2-importlib-resources + (package + (name "python2-importlib-resources") + (version "1.0.2") + (source (origin + (method url-fetch) + (uri (pypi-uri "importlib_resources" version)) + (sha256 + (base32 + "0y3hg12iby1qyaspnbisz4s4vxax7syikk3skznwqizqyv89y9yk")))) + (build-system python-build-system) + (arguments + `(#:python ,python-2)) + (native-inputs + `(("python-wheel" ,python2-wheel))) + (propagated-inputs + `(("python-pathlib2" ,python2-pathlib2) + ("python-typing" ,python2-typing))) + (home-page "https://gitlab.com/python-devs/importlib_resources") + (synopsis "Backport of @code{importlib.resources} from Python 3.7") + (description + "This package provides an implementation of @code{importlib.resources} +for older versions of Python.") + (license license:asl2.0))) + (define-public python-importlib-metadata (package (name "python-importlib-metadata") -- cgit v1.2.3 From f15bdfebc6bb516d235bdf51ecdd2b35f9709f00 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Jan 2020 20:12:09 +0100 Subject: gnu: Add python2-zipp. * gnu/packages/python-compression.scm (python2-zipp): New public variable. --- gnu/packages/python-compression.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm index 6015b5aae3..7de5be72a1 100644 --- a/gnu/packages/python-compression.scm +++ b/gnu/packages/python-compression.scm @@ -235,6 +235,9 @@ (define-public python-zipp wrapper. It provides a backport of the @code{Path} object.") (license license:expat))) +(define-public python2-zipp + (package-with-python2 python-zipp)) + (define-public python-zstandard (package (name "python-zstandard") -- cgit v1.2.3 From 5efa04dd935ecf6f7803501b1b8952810f4330ad Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Jan 2020 20:14:02 +0100 Subject: gnu: Add python2-importlib-metadata. * gnu/packages/python-xyz.scm (python2-importlib-metadata): New public variable. --- gnu/packages/python-xyz.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 430ed4a13e..6d8e9caefc 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5010,6 +5010,19 @@ (define-public python-importlib-metadata need to use the older and less efficient @code{pkg_resources} package.") (license license:asl2.0))) +(define-public python2-importlib-metadata + (let ((base (package-with-python2 (strip-python2-variant + python-importlib-metadata)))) + (package/inherit + base + (name "python2-importlib-metadata") + (propagated-inputs + `(("python-configparser" ,python2-configparser) + ("python-contextlib2" ,python2-contextlib2) + ("python-importlib-resources" ,python2-importlib-resources) + ("python-pathlib2" ,python2-pathlib2) + ,@(package-propagated-inputs base)))))) + (define-public python-jaraco-packaging (package (name "python-jaraco-packaging") -- cgit v1.2.3 From 8fda8b7d6addf5e354e58e449c1a4a8894cb658b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Jan 2020 20:18:05 +0100 Subject: gnu: python-elementpath: Move to (gnu packages xml). * gnu/packages/python-xyz.scm (python-elementpath): Move from here ... * gnu/packages/xml.scm (python-elementpath): ... to here. --- gnu/packages/python-xyz.scm | 25 ------------------------- gnu/packages/xml.scm | 26 ++++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 25 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 6d8e9caefc..1f8b936a12 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16621,31 +16621,6 @@ (define-public python-pyroutelib3 (description "Library for simple routing on OSM data") (license license:gpl3+))) -(define-public python-elementpath - (package - (name "python-elementpath") - (version "1.2.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "elementpath" version)) - (sha256 - (base32 - "1syn2z543brab23dskh3fjd9pqvz6npqbcicrs2d88dbg26xl08p")))) - (build-system python-build-system) - (home-page - "https://github.com/sissaschool/elementpath") - (synopsis - "XPath 1.0/2.0 parsers and selectors for ElementTree and lxml") - (description - "The proposal of this package is to provide XPath 1.0 and 2.0 selectors -for Python's ElementTree XML data structures, both for the standard -ElementTree library and for the @uref{http://lxml.de, lxml.etree} library. - -For lxml.etree this package can be useful for providing XPath 2.0 selectors, -because lxml.etree already has it's own implementation of XPath 1.0.") - (license license:expat))) - (define-public python-bibtexparser (package (name "python-bibtexparser") diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 5b9082cb26..83a2f1b713 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -21,6 +21,7 @@ ;;; Copyright © 2017 Stefan Reichör ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2018 Jack Hill +;;; Copyright © 2019 Giacomo Leidi ;;; ;;; This file is part of GNU Guix. ;;; @@ -2050,6 +2051,31 @@ (define-public xmlrpc-c modular implementation of XML-RPC for C and C++.") (license (list license:psfl license:expat)))) +(define-public python-elementpath + (package + (name "python-elementpath") + (version "1.2.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "elementpath" version)) + (sha256 + (base32 + "1syn2z543brab23dskh3fjd9pqvz6npqbcicrs2d88dbg26xl08p")))) + (build-system python-build-system) + (home-page + "https://github.com/sissaschool/elementpath") + (synopsis + "XPath 1.0/2.0 parsers and selectors for ElementTree and lxml") + (description + "The proposal of this package is to provide XPath 1.0 and 2.0 selectors +for Python's ElementTree XML data structures, both for the standard +ElementTree library and for the @uref{http://lxml.de, lxml.etree} library. + +For lxml.etree this package can be useful for providing XPath 2.0 selectors, +because lxml.etree already has it's own implementation of XPath 1.0.") + (license license:expat))) + (define-public python-xmltodict (package (name "python-xmltodict") -- cgit v1.2.3 From b2205ae4f691c42573af19721fd1bd54f186fb58 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Jan 2020 20:18:35 +0100 Subject: gnu: python-elementpath: Update to 1.3.3. * gnu/packages/xml.scm (python-elementpath): Update to 1.3.3. --- 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 83a2f1b713..7259efb0f7 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -2054,14 +2054,14 @@ (define-public xmlrpc-c (define-public python-elementpath (package (name "python-elementpath") - (version "1.2.0") + (version "1.3.3") (source (origin (method url-fetch) (uri (pypi-uri "elementpath" version)) (sha256 (base32 - "1syn2z543brab23dskh3fjd9pqvz6npqbcicrs2d88dbg26xl08p")))) + "1rb8892zli74wk1c4hyg77ja9wglq9hplgxwak1rmj3s9p6xnf0p")))) (build-system python-build-system) (home-page "https://github.com/sissaschool/elementpath") -- cgit v1.2.3 From 55e1475cb58c1b9535b35f8bdb157b1435c54755 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Jan 2020 20:19:26 +0100 Subject: gnu: python-lxml: Move to (gnu packages xml). * gnu/packages/python-xyz.scm (python-lxml): Move from here ... * gnu/packages/xml.scm (python-lxml): ... to here. * gnu/packages/django.scm, gnu/packages/drones.scm, gnu/packages/libreoffice.scm, gnu/packages/nutrition.scm, gnu/packages/openstack.scm, gnu/packages/pulseaudio.scm, gnu/packages/python-science.scm, gnu/packages/tryton.scm, gnu/packages/wireservice.scm: Adjust module imports. --- gnu/packages/django.scm | 3 ++- gnu/packages/drones.scm | 1 + gnu/packages/libreoffice.scm | 1 - gnu/packages/nutrition.scm | 3 ++- gnu/packages/openstack.scm | 1 + gnu/packages/pulseaudio.scm | 1 + gnu/packages/python-science.scm | 1 + gnu/packages/python-xyz.scm | 29 ----------------------------- gnu/packages/tryton.scm | 1 + gnu/packages/wireservice.scm | 3 ++- gnu/packages/xml.scm | 29 +++++++++++++++++++++++++++++ 11 files changed, 40 insertions(+), 33 deletions(-) diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index 7e7bc5d002..f0551d8269 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -36,7 +36,8 @@ (define-module (gnu packages django) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages sphinx) - #:use-module (gnu packages time)) + #:use-module (gnu packages time) + #:use-module (gnu packages xml)) (define-public python-django (package diff --git a/gnu/packages/drones.scm b/gnu/packages/drones.scm index 18b2621e4a..1bc096293e 100644 --- a/gnu/packages/drones.scm +++ b/gnu/packages/drones.scm @@ -23,6 +23,7 @@ (define-module (gnu packages drones) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages xml) #:use-module (guix download) #:use-module (guix utils) #:use-module (guix git-download) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 038031b800..93474dbdbf 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -75,7 +75,6 @@ (define-module (gnu packages libreoffice) #:use-module (gnu packages perl-compression) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) - #:use-module (gnu packages python-xyz) #:use-module (gnu packages rdf) #:use-module (gnu packages scanner) #:use-module (gnu packages tls) diff --git a/gnu/packages/nutrition.scm b/gnu/packages/nutrition.scm index 0e5533433e..bae166de3f 100644 --- a/gnu/packages/nutrition.scm +++ b/gnu/packages/nutrition.scm @@ -29,7 +29,8 @@ (define-module (gnu packages nutrition) #:use-module (gnu packages glib) #:use-module (gnu packages image) #:use-module (gnu packages python) - #:use-module (gnu packages python-xyz)) + #:use-module (gnu packages python-xyz) + #:use-module (gnu packages xml)) (define-public gourmet (package diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index c976d8aafb..0d87691cd7 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -33,6 +33,7 @@ (define-module (gnu packages openstack) #:use-module (gnu packages time) #:use-module (gnu packages tls) #:use-module (gnu packages version-control) + #:use-module (gnu packages xml) #:use-module (guix build-system python) #:use-module (guix download) #:use-module ((guix licenses) diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index 671dcd1563..8e67779e95 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -51,6 +51,7 @@ (define-module (gnu packages pulseaudio) #:use-module (gnu packages python-web) #:use-module (gnu packages pkg-config) #:use-module (gnu packages xiph) + #:use-module (gnu packages xml) #:use-module (gnu packages xorg)) (define-public libsndfile diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm index 4a262ec793..b4241362ba 100644 --- a/gnu/packages/python-science.scm +++ b/gnu/packages/python-science.scm @@ -37,6 +37,7 @@ (define-module (gnu packages python-science) #:use-module (gnu packages python-xyz) #:use-module (gnu packages sphinx) #:use-module (gnu packages time) + #:use-module (gnu packages xml) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix utils) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 1f8b936a12..479466cc81 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5784,35 +5784,6 @@ (define-public python-notify2 (define-public python2-notify2 (package-with-python2 python-notify2)) -(define-public python-lxml - (package - (name "python-lxml") - (version "4.4.2") - (source - (origin - (method url-fetch) - (uri (pypi-uri "lxml" version)) - (sha256 - (base32 "01nvb5j8vs9nk4z5s3250b1m22b4d08kffa36if3g1mdygdrvxpg")))) - (build-system python-build-system) - (arguments - `(#:phases (modify-phases %standard-phases - (replace 'check - (lambda _ - (invoke "make" "test")))))) - (inputs - `(("libxml2" ,libxml2) - ("libxslt" ,libxslt))) - (home-page "https://lxml.de/") - (synopsis "Python XML processing library") - (description - "The lxml XML toolkit is a Pythonic binding for the C libraries -libxml2 and libxslt.") - (license license:bsd-3))) ; and a few more, see LICENSES.txt - -(define-public python2-lxml - (package-with-python2 python-lxml)) - ;; beautifulsoup4 has a totally different namespace than 3.x, ;; and pypi seems to put it under its own name, so I guess we should too (define-public python-beautifulsoup4 diff --git a/gnu/packages/tryton.scm b/gnu/packages/tryton.scm index 31a2d481e5..a2952f2b80 100644 --- a/gnu/packages/tryton.scm +++ b/gnu/packages/tryton.scm @@ -27,6 +27,7 @@ (define-module (gnu packages tryton) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages time) + #:use-module (gnu packages xml) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system python)) diff --git a/gnu/packages/wireservice.scm b/gnu/packages/wireservice.scm index 362b69575f..eab76970f4 100644 --- a/gnu/packages/wireservice.scm +++ b/gnu/packages/wireservice.scm @@ -28,7 +28,8 @@ (define-module (gnu packages wireservice) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages sphinx) - #:use-module (gnu packages time)) + #:use-module (gnu packages time) + #:use-module (gnu packages xml)) ;; Common package definition for packages from https://github.com/wireservice. (define-syntax-rule (wireservice-package extra-fields ...) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 7259efb0f7..73ee26ed10 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -2076,6 +2076,35 @@ (define-public python-elementpath because lxml.etree already has it's own implementation of XPath 1.0.") (license license:expat))) +(define-public python-lxml + (package + (name "python-lxml") + (version "4.4.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "lxml" version)) + (sha256 + (base32 "01nvb5j8vs9nk4z5s3250b1m22b4d08kffa36if3g1mdygdrvxpg")))) + (build-system python-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "make" "test")))))) + (inputs + `(("libxml2" ,libxml2) + ("libxslt" ,libxslt))) + (home-page "https://lxml.de/") + (synopsis "Python XML processing library") + (description + "The lxml XML toolkit is a Pythonic binding for the C libraries +libxml2 and libxslt.") + (license license:bsd-3))) ; and a few more, see LICENSES.txt + +(define-public python2-lxml + (package-with-python2 python-lxml)) + (define-public python-xmltodict (package (name "python-xmltodict") -- cgit v1.2.3 From c950a2a51d1ad22cad4158ca13b88bf886df00d2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Jan 2020 20:20:25 +0100 Subject: gnu: Add python-xmlschema. * gnu/packages/xml.scm (python-xmlschema): New public variable. --- gnu/packages/xml.scm | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 73ee26ed10..9984e92f17 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice -;;; Copyright © 2016, 2017, 2018, 2019 Marius Bakke +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Marius Bakke ;;; Copyright © 2017 Adriano Peluso ;;; Copyright © 2017 Gregor Giesen ;;; Copyright © 2017 Alex Vong @@ -2105,6 +2105,44 @@ (define-public python-lxml (define-public python2-lxml (package-with-python2 python-lxml)) +(define-public python-xmlschema + (package + (name "python-xmlschema") + (version "1.0.18") + (source (origin + (method url-fetch) + (uri (pypi-uri "xmlschema" version)) + (sha256 + (base32 + "1inwqwr7d3qah9xf9rfzkpva433jpr4n7n43zybf2gdpz4q1g0ry")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key (tests? #t) #:allow-other-keys) + (if tests? + (begin + (setenv "PYTHONPATH" + (string-append "./build/lib:" + (getenv "PYTHONPATH"))) + (invoke "python" "xmlschema/tests/test_all.py")) + (format #t "test suite not run~%")) + #t))))) + (native-inputs + `(("python-lxml" ,python-lxml))) ;for tests + (propagated-inputs + `(("python-elementpath" ,python-elementpath))) + (home-page "https://github.com/sissaschool/xmlschema") + (synopsis "XML Schema validator and data conversion library") + (description + "The @code{xmlschema} library is an implementation of +@url{https://www.w3.org/2001/XMLSchema, XML Schema} for Python. It has +full support for the XSD 1.0 and 1.1 standards, an XPath-based API for +finding schema's elements and attributes; and can encode and decode +XML data to JSON and other formats.") + (license license:expat))) + (define-public python-xmltodict (package (name "python-xmltodict") -- cgit v1.2.3 From 49181f84af46fa5ca6146bdf61aab5fabf652641 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 15 Jan 2020 22:10:31 +0100 Subject: gnu: asymptote: Update to 2.62. * gnu/packages/plotutils.scm (asymptote): Update to 2.62. --- gnu/packages/plotutils.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index df9821b9d8..8a3afc9605 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2015 Eric Bavier -;;; Copyright © 2016, 2017, 2019 Nicolas Goaziou +;;; Copyright © 2016, 2017, 2019, 2020 Nicolas Goaziou ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. @@ -180,14 +180,14 @@ (define-public ploticus (define-public asymptote (package (name "asymptote") - (version "2.61") + (version "2.62") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/asymptote/" version "/asymptote-" version ".src.tgz")) (sha256 (base32 - "0gcd75yixn67lpiky70yhaa0ylr8g1cn65bpr9zx78h2vrpsmk7k")))) + "0510vnlpfyrvshsxr5lh3klwyhmn2cf4ba1ja476mbv5dcqqbc30")))) (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 fb5ecdecdf292bb6cec3d57862291f2ce5a60df5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 15 Jan 2020 02:58:01 +0100 Subject: gnu: mpop: Remove unnecessary libidn input. gnu/packages/mail.scm (mpop)[inputs]: Remove libidn. --- gnu/packages/mail.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 7d56949ae9..0fe66912cc 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2162,8 +2162,7 @@ (define-public mpop (base32 "0q4ifzvl1gcndvqqqk7n9mc599r4s2knxjc7alflwb366fql58gv")))) (build-system gnu-build-system) (inputs - `(("gnutls" ,gnutls) - ("libidn" ,libidn))) + `(("gnutls" ,gnutls))) (native-inputs `(("pkg-config" ,pkg-config))) (home-page "https://marlam.de/mpop/") -- cgit v1.2.3 From 4a30c51eb8922ce97dec67824f47c7ef884eec69 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 15 Jan 2020 02:45:56 +0100 Subject: gnu: mpop: Update to 1.4.7. * gnu/packages/mail.scm (mpop): Update to 1.4.7. --- 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 0fe66912cc..2151953803 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2152,14 +2152,14 @@ (define-public mb2md (define-public mpop (package (name "mpop") - (version "1.4.6") + (version "1.4.7") (source (origin (method url-fetch) (uri (string-append "https://marlam.de/mpop/releases/" "mpop-" version ".tar.xz")) (sha256 - (base32 "0q4ifzvl1gcndvqqqk7n9mc599r4s2knxjc7alflwb366fql58gv")))) + (base32 "0c6n5afn9pr4p7gxkv462lysrw52w9fhvavzm99c78dcp9dj5xnk")))) (build-system gnu-build-system) (inputs `(("gnutls" ,gnutls))) -- cgit v1.2.3 From e2e62bf55a6d327202bd05780db7569c4176b491 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 15 Jan 2020 20:58:46 +0100 Subject: gnu: mercurial: Run tests verbosely and respect settings. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/version-control.scm (mercurial)[arguments]: Invoke ‘run-tests.py’ directly and verbosely. Respect #:tests? and parallel-job-count. --- gnu/packages/version-control.scm | 49 ++++++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 20 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 741a98d8b5..5403bcf87a 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1244,26 +1244,35 @@ (define-public mercurial `(#:phases (modify-phases %standard-phases (replace 'check - (lambda _ - ;; The following tests are known to fail. - (for-each (lambda (file) - (delete-file (string-append "tests/" file))) - '("test-extdiff.t" - "test-hghave.t" - "test-hgwebdir.t" - "test-http-branchmap.t" - "test-logtoprocess.t" - "test-merge-combination.t" - "test-nointerrupt.t" - "test-patchbomb.t" - "test-pull-bundle.t" - "test-push-http.t" - "test-run-tests.t" - "test-serve.t" - "test-subrepo-deep-nested-change.t" - "test-subrepo-recursion.t" - "test-transplant.t")) - (invoke "make" "check")))))) + (lambda* (#:key tests? #:allow-other-keys) + (with-directory-excursion "tests" + ;; The following tests are known to fail. + (for-each (lambda (file) + (delete-file file)) + '("test-extdiff.t" + "test-hghave.t" + "test-hgwebdir.t" + "test-http-branchmap.t" + "test-logtoprocess.t" + "test-merge-combination.t" + "test-nointerrupt.t" + "test-patchbomb.t" + "test-pull-bundle.t" + "test-push-http.t" + "test-run-tests.t" + "test-serve.t" + "test-subrepo-deep-nested-change.t" + "test-subrepo-recursion.t" + "test-transplant.t")) + (when tests? + (invoke "./run-tests.py" + ;; ‘make check’ does not respect ‘-j’. + (string-append "-j" (number->string + (parallel-job-count))) + ;; The test suite takes a long time and produces little + ;; output by default. Prevent timeouts due to silence. + "-v")) + #t)))))) ;; The following inputs are only needed to run the tests. (native-inputs `(("python-nose" ,python-nose) -- cgit v1.2.3 From 1fffba664d71f3a8669b5eefd2c4a83dca5bacce Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 3 Jan 2020 00:59:01 +0100 Subject: gnu: Add manuskript. * gnu/packages/text-editors.scm (manuskript): New variable. --- gnu/packages/text-editors.scm | 106 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 105 insertions(+), 1 deletion(-) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 60eed99dbf..863ac7e584 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019 Efraim Flashner ;;; Copyright © 2019 Andreas Enge -;;; Copyright © 2019 Nicolas Goaziou +;;; Copyright © 2019, 2020 Nicolas Goaziou ;;; ;;; This file is part of GNU Guix. ;;; @@ -33,6 +33,7 @@ (define-module (gnu packages text-editors) #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) #:use-module (guix build-system glib-or-gtk) + #:use-module (guix build-system python) #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages) #:use-module (gnu packages assembly) @@ -45,6 +46,7 @@ (define-module (gnu packages text-editors) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) + #:use-module (gnu packages haskell-xyz) #:use-module (gnu packages libbsd) #:use-module (gnu packages libreoffice) #:use-module (gnu packages lua) @@ -354,6 +356,108 @@ (define-public ghostwriter environment with Markdown markup.") (license license:gpl3+))) ; icons/* under CC-BY-SA3 +(define-public manuskript + (package + (name "manuskript") + (version "0.10.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/olivierkes/manuskript.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0q413vym7hzjpyg3krj5y63hwpncdifjkyswqmr76zg5yqnklnh3")))) + (build-system python-build-system) + (arguments + `(#:tests? #f ;no test + #:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (share (string-append out "/share/manuskript"))) + ;; Install data. + (mkdir-p share) + (for-each + (lambda (d) + (let ((destination (string-append share "/" d))) + (mkdir-p destination) + (copy-recursively d destination))) + '("bin" "i18n" "icons" "libs" "manuskript" "resources")) + ;; Install documentation. + (let ((doc (string-append out + "/doc/manuskript-" ,version + "/sample-projects"))) + (mkdir-p doc) + (copy-recursively "sample-projects" doc)) + ;; Wrap executable in "$out/share/manuskript/bin" and + ;; link to it from "$out/bin". + (let ((bin (string-append out "/bin")) + (executable (string-append share "/bin/manuskript"))) + (wrap-program executable + (list "PYTHONPATH" 'prefix (list (getenv "PYTHONPATH")))) + (mkdir-p bin) + (with-directory-excursion bin + (symlink (string-append share "/bin/manuskript") + "manuskript"))) + ;; Install icons and create .desktop file. + (let ((apps (string-append out "/share/applications")) + (icons-dir (string-append out "/share/pixmaps"))) + (install-file "icons/Manuskript/manuskript.svg" icons-dir) + (mkdir-p apps) + (with-output-to-file (string-append apps "/manuskript.desktop") + (lambda _ + (format #t + "[Desktop Entry]~@ + Name=Manuskript~@ + MimeType=application/x-manuskript-book;~@ + Exec=~a/bin/manuskript %f~@ + Comment=Tool for writers~@ + Comment[es]=Herramienta para escritores/as~@ + Keywords=manuskript;office;write;edit;novel;text;msk~@ + Terminal=false~@ + Type=Application~@ + Icon=manuskript~@ + Categories=Office;WordProcessor;~%" + out)))) + #t)))))) + (inputs + `(("ghc-pandoc" ,ghc-pandoc) + ("python-lxml" ,python-lxml) + ("python-markdown" ,python-markdown) + ("python-pyqt" ,python-pyqt) + ("qtsvg" ,qtsvg))) + (home-page "http://www.theologeek.ch/manuskript/") + (synopsis "Tool for writers") + (description "Manuskript provides a rich environment to help +writers create their first draft and then further refine and edit +their masterpiece. With Manuskript you can: + +@itemize +@item Grow your premise from one sentence, to a paragraph, to a full +summary, +@item Create characters, +@item Conceive plots, +@item Construct outlines (Outline mode and/or Index cards), +@item Write with focus (Distraction free mode), +@item Build worlds, +@item Track items, +@item Edit and re-organize chapters and scenes, +@item View Story line, +@item Compose with fiction or non-fiction templates and writing modes, +@item Import and export document formats such as HTML, ePub, +OpenDocument, DocX, and more. +@end itemize + +Additionally Manuskript can help in many more ways with a spell +checker, markdown highlighter, frequency analyzer, and automatic save +in plain text file format.") + (license license:gpl3+))) + (define-public editorconfig-core-c (package (name "editorconfig-core-c") -- cgit v1.2.3 From 03d76f8a42996cca3f0604a3ae9a8fe289a940ed Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 15 Jan 2020 23:00:11 +0100 Subject: gnu: mercurial: Raise test time-outs. Let Guix handle them. Fixes . * gnu/packages/version-control.scm (mercurial)[arguments]: Raise individual test time-outs to 1 day. --- gnu/packages/version-control.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 5403bcf87a..417bccf99b 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1269,6 +1269,10 @@ (define-public mercurial ;; ‘make check’ does not respect ‘-j’. (string-append "-j" (number->string (parallel-job-count))) + ;; The default time-outs are too low for many systems. + ;; Raise them generously: Guix enforces its own. + "--timeout" "86400" + "--slowtimeout" "86400" ;; The test suite takes a long time and produces little ;; output by default. Prevent timeouts due to silence. "-v")) -- cgit v1.2.3 From 40b1cee620a55bf1fc5d8d897ed1ec147b2535c8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 15 Jan 2020 03:11:26 +0100 Subject: gnu: mpop: Mark up description. * gnu/packages/mail.scm (mpop)[description]: Use @acronym. --- 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 2151953803..c49ed76f1a 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2171,9 +2171,9 @@ (define-public mpop fetchmail replacement. mpop supports multiple accounts, header based mail filtering, delivery -to mbox files, maildir folders or a Mail Delivery Agent (MDA), -TLS/SSL, several authentication methods, Internationalized Domain -Names (IDN) and SOCKS proxies.") +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+))) (define-public mhonarc -- cgit v1.2.3 From fcc579e235197e0caec22995a70470545f268607 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Wed, 15 Jan 2020 16:21:55 -0600 Subject: gnu: emacs-telega: Update to 0.5.4-4. * gnu/packages/emacs-xyz.scm (emacs-telega): Update to 0.5.4-4. [propagated-inputs]: Add emacs-company to provide completions in telega-based buffers. --- 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 f91088351f..899a1d80b8 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -20422,8 +20422,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 "4497a3c19d9806eb9edfe13d326d6d9cbb895f64") - (revision "3") + (let ((commit "69565cc4de72e28148c8041de8930a122a39b800") + (revision "4") (version "0.5.4")) (package (name "emacs-telega") @@ -20436,7 +20436,7 @@ (define-public emacs-telega (commit commit))) (sha256 (base32 - "1g0gbbgs8rbcip6kqjxdmnsjlq0ixgknb0qcda7siaha9gd7fjh2")) + "0blvj07f1sbdmp68qwlwgnhnv42ib0mjai5ndf8scbi12drn4rmk")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments @@ -20523,6 +20523,7 @@ (define-public emacs-telega `(("ffmpeg" ,ffmpeg))) ; mp4/gif support. (propagated-inputs `(("emacs-visual-fill-column" ,emacs-visual-fill-column) + ("emacs-company" ,emacs-company) ("libwebp" ,libwebp))) ; sticker support. (native-inputs `(("tdlib" ,tdlib) -- cgit v1.2.3 From bcc8a8fd1e3ac64e096e8b9495e02ad6830a8e41 Mon Sep 17 00:00:00 2001 From: Christopher Howard Date: Fri, 10 Jan 2020 21:19:24 -0900 Subject: gnu: Add liquid-dsp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/sdr.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 1 + gnu/packages/sdr.scm | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 gnu/packages/sdr.scm diff --git a/gnu/local.mk b/gnu/local.mk index cb46ee7880..68e95921db 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -449,6 +449,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/scsi.scm \ %D%/packages/sdcc.scm \ %D%/packages/sdl.scm \ + %D%/packages/sdr.scm \ %D%/packages/search.scm \ %D%/packages/security-token.scm \ %D%/packages/selinux.scm \ diff --git a/gnu/packages/sdr.scm b/gnu/packages/sdr.scm new file mode 100644 index 0000000000..f6c9050503 --- /dev/null +++ b/gnu/packages/sdr.scm @@ -0,0 +1,58 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2019 Christopher Howard +;;; +;;; 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 sdr) + #: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) + #:use-module (gnu packages) + #:use-module (gnu packages algebra) + #:use-module (gnu packages autotools)) + +(define-public liquid-dsp + (package + (name "liquid-dsp") + (version "1.3.2") + (source + (origin (method git-fetch) + (uri (git-reference + (url "https://github.com/jgaeddert/liquid-dsp.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1n6dbg13q8ga5qhg1yiszwly4jj0rxqr6f1xwm9waaly5z493xsd")))) + (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf))) + (inputs + `(("fftw" ,fftw) + ("fftwf" ,fftwf))) + (home-page "https://liquidsdr.org") + (synopsis "Signal processing library for software-defined radios") + (description + "Liquid DSP is a @dfn{digital signal processing} (DSP) library designed +specifically for software-defined radios on embedded platforms. The aim is to +provide a lightweight DSP library that does not rely on a myriad of external +dependencies or proprietary and otherwise cumbersome frameworks. All signal +processing elements are designed to be flexible, scalable, and dynamic, +including filters, filter design, oscillators, modems, synchronizers, complex +mathematical operations, and much more.") + (license license:expat))) -- cgit v1.2.3 From 47e8709369b80e728f832207a83b61fcc789bb21 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sun, 12 Jan 2020 15:23:19 -0500 Subject: gnu: Add libnma. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome.scm (libnma): New variable. Co-authored-by: Ludovic Courtès --- gnu/packages/gnome.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a238dab814..06aafa7037 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -582,6 +582,44 @@ (define-public gnome-user-share (home-page "https://gitlab.gnome.org/GNOME/gnome-user-share") (license license:gpl2+))) +(define-public libnma + (package + (name "libnma") + (version "1.8.26") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1w9lld38risnk1krknfwln24kabdxnj274pyz4jhndphwigrshaf")))) + (build-system meson-build-system) + (arguments + `(#:glib-or-gtk? #t)) + (native-inputs + `(("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") + ("gtk-doc" ,gtk-doc) + ("gobject-introspection" ,gobject-introspection) + ("pkg-config" ,pkg-config))) + (inputs + `(("adwaita-icon-theme" ,adwaita-icon-theme) + ("gcr" ,gcr) + ("gtk+" ,gtk+) + ("iso-codes" ,iso-codes) + ("mobile-broadband-provider-info" ,mobile-broadband-provider-info) + ("network-manager" ,network-manager))) + (synopsis "Network Manager's applet library") + (description "Libnma is an applet library for Network Manager. It was +initially part of network-manager-applet and has now become a separate +project.") + (home-page "https://gitlab.gnome.org/GNOME/libnma") + + ;; Some files carry the "GPL-2.0+" SPDX identifier while others say + ;; "LGPL-2.1+". + (license license:gpl2+))) + (define-public gnome-menus (package (name "gnome-menus") -- cgit v1.2.3 From 89af09020ad6e1fde509601cd242713fe3ba7178 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 14 Jan 2020 16:53:34 -0500 Subject: gnu: Add rygel. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome.scm (rygel): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/gnome.scm | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 06aafa7037..b0f34fef5b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -582,6 +582,56 @@ (define-public gnome-user-share (home-page "https://gitlab.gnome.org/GNOME/gnome-user-share") (license license:gpl2+))) +(define-public rygel + (package + (name "rygel") + (version "0.38.3") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "003xficqb08r1dgid20i7cn889lbfwrglpx78rjd5nkvgxbimhh8")))) + (build-system gnu-build-system) + (native-inputs + `(("gettext" ,gettext-minimal) + ("gobject-introspection" ,gobject-introspection) + ("gtk-doc" ,gtk-doc) + ("pkg-config" ,pkg-config) + ("vala" ,vala))) + (inputs + `(("gdk-pixbuf" ,gdk-pixbuf) + ("gssdp" ,gssdp) + ("gstreamer" ,gstreamer) + ("gst-plugins-base" ,gst-plugins-base) + ("gtk+" ,gtk+) + ("gupnp" ,gupnp) + ("gupnp-av" ,gupnp-av) + ("gupnp-dlna" ,gupnp-dlna) + ("libgee" ,libgee) + ("libmediaart" ,libmediaart) + ("libsoup" ,libsoup) + ("libxslt" ,libxslt) + ("libunistring" ,libunistring) + ("tracker" ,tracker))) + (synopsis "Share audio, video, and pictures with other devices") + (description + "Rygel is a home media solution (@dfn{UPnP AV MediaServer and +MediaRenderer}) for GNOME that allows you to easily share audio, video, and +pictures, and to control a media player on your home network. + +Rygel achieves interoperability with other devices by trying to conform to the +strict requirements of DLNA and by converting media on-the-fly to formats that +client devices can handle.") + (home-page "https://wiki.gnome.org/Projects/Rygel") + (license (list + ;; For logo (data/icons/*). + license:cc-by-sa3.0 + ;; For all others. + license:lgpl2.1+)))) + (define-public libnma (package (name "libnma") -- cgit v1.2.3 From 04b201bb0feacd2997a66b73a574160f0b32697b Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 14 Jan 2020 17:18:28 -0500 Subject: gnu: Add sushi. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome.scm (sushi): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/gnome.scm | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index b0f34fef5b..a6a8307649 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -582,6 +582,60 @@ (define-public gnome-user-share (home-page "https://gitlab.gnome.org/GNOME/gnome-user-share") (license license:gpl2+))) +(define-public sushi + (package + (name "sushi") + (version "3.32.1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "02idvqjk76lii9xyg3b1yz4rw721709bdm5j8ikjym6amcghl0aj")))) + (build-system meson-build-system) + (arguments + `(#:glib-or-gtk? #t + #:phases + (modify-phases %standard-phases + (add-after 'glib-or-gtk-wrap 'wrap-typelib + (lambda* (#:key outputs #:allow-other-keys) + (let ((prog (string-append (assoc-ref outputs "out") + "/bin/sushi"))) + ;; Put existing typelibs before sushi's deps, so as to correctly + ;; infer gdk-pixbuf + (wrap-program prog + `("GI_TYPELIB_PATH" suffix (,(getenv "GI_TYPELIB_PATH")))) + #t)))))) + (native-inputs + `(("glib:bin" ,glib "bin") + ("gettext" ,gettext-minimal) + ("gobject-introspection" ,gobject-introspection) + ("pkg-config" ,pkg-config))) + (inputs + `(("clutter" ,clutter) + ("clutter-gst" ,clutter-gst) + ("clutter-gtk" ,clutter-gtk) + ("evince" ,evince) ; For file previewing. + ("freetype" ,freetype) + ("gdk-pixbuf" ,gdk-pixbuf) + ("gjs" ,gjs) + ("gst-plugins-base" ,gst-plugins-base) + ("gstreamer" ,gstreamer) + ("gtksourceview" ,gtksourceview-3) + ("harfbuzz" ,harfbuzz) + ("libepoxy" ,libepoxy) + ("libmusicbrainz" ,libmusicbrainz) + ("libxml2" ,libxml2) + ("neon" ,neon) + ("webkitgtk" ,webkitgtk))) + (synopsis "File previewer for the GNOME desktop") + (description "Sushi is a DBus-activated service that allows applications to +preview files on the GNOME desktop.") + (home-page "https://gitlab.gnome.org/GNOME/sushi") + (license license:gpl2+))) + (define-public rygel (package (name "rygel") -- cgit v1.2.3 From 305c908aac9ed3ec1be9361cb998d6a25c15fded Mon Sep 17 00:00:00 2001 From: Josh Holland Date: Thu, 9 May 2019 18:59:16 +0100 Subject: gnu: Add rcm. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/rcm.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add rcm.scm. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 1 + gnu/packages/rcm.scm | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+) create mode 100644 gnu/packages/rcm.scm diff --git a/gnu/local.mk b/gnu/local.mk index 68e95921db..f5c73ba1f5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -426,6 +426,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/ragel.scm \ %D%/packages/rails.scm \ %D%/packages/ratpoison.scm \ + %D%/packages/rcm.scm \ %D%/packages/rdesktop.scm \ %D%/packages/rdf.scm \ %D%/packages/re2c.scm \ diff --git a/gnu/packages/rcm.scm b/gnu/packages/rcm.scm new file mode 100644 index 0000000000..c61626d114 --- /dev/null +++ b/gnu/packages/rcm.scm @@ -0,0 +1,62 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2019 Josh Holland +;;; +;;; 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 rcm) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix build-system gnu) + #:use-module (guix licenses) + #:use-module (gnu packages python-xyz) + #:use-module (gnu packages perl)) + +(define-public rcm + (package + (name "rcm") + (version "1.3.3") + (source (origin + (method url-fetch) + (uri (string-append "https://thoughtbot.github.io/rcm/dist/rcm-" + version ".tar.gz")) + (sha256 + (base32 "1bqk7rrp1ckzvsvl9wghsr77m8xl3a7yc5gqdsisz492dx2j8mck")))) + (build-system gnu-build-system) + (arguments '(#:phases + (modify-phases %standard-phases + (add-after 'patch-source-shebangs 'patch-tests + (lambda _ + (substitute* '("test/rcrc-tilde.t" + "test/rcdn-hooks-run-in-order.t" + "test/rcup-hooks-run-in-order.t") + (("/bin/sh") (which "sh"))) + (substitute* "test/rcup-hooks.t" + (("/usr/bin/env") (which "env"))) + #t))) + #:parallel-tests? #f)) + (native-inputs `(("perl" ,perl) + ("python-cram" ,python-cram))) + (synopsis "Management suite for dotfiles") + (description "The rcm suite of tools is for managing dotfiles directories. This is +a directory containing all the @code{.*rc} files in your home directory +(@code{.zshrc}, @code{.vimrc}, and so on). These files have gone by many +names in history, such as “rc files” because they typically end in rc +or “dotfiles” because they begin with a period. This suite is useful +for committing your rc files to a central repository to share, but it also +scales to a more complex situation such as multiple source directories +shared between computers with some host-specific or task-specific files.") + (license bsd-3) + (home-page "https://github.com/thoughtbot/rcm"))) -- cgit v1.2.3 From 0aa6b3869584dba5916039b8e71b6532463e42ab Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 15 Jan 2020 23:34:46 +0100 Subject: serialize: Export 'dump-port*'. * guix/serialization.scm (dump): Export as 'dump-port*'. * guix/scripts/challenge.scm (dump-port*): Remove. --- guix/scripts/challenge.scm | 7 ++----- guix/serialization.scm | 3 ++- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/guix/scripts/challenge.scm b/guix/scripts/challenge.scm index ebeebd5cbe..65e2427033 100644 --- a/guix/scripts/challenge.scm +++ b/guix/scripts/challenge.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2016, 2017, 2019 Ludovic Courtès +;;; Copyright © 2015, 2016, 2017, 2019, 2020 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -25,7 +25,7 @@ (define-module (guix scripts challenge) #:use-module (guix monads) #:use-module (guix base32) #:use-module (guix packages) - #:use-module (guix progress) + #:use-module ((guix progress) #:hide (dump-port*)) #:use-module (guix serialization) #:use-module (guix scripts substitute) #:use-module (rnrs bytevectors) @@ -193,9 +193,6 @@ (define (select-reference item narinfos urls) ;;; Reporting. ;;; -(define dump-port* ;FIXME: deduplicate - (@@ (guix serialization) dump)) - (define (port-sha256* port size) ;; Like 'port-sha256', but limited to SIZE bytes. (let-values (((out get) (open-sha256-port))) diff --git a/guix/serialization.scm b/guix/serialization.scm index f793feb53d..9452303730 100644 --- a/guix/serialization.scm +++ b/guix/serialization.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 ;;; ;;; This file is part of GNU Guix. ;;; @@ -36,6 +36,7 @@ (define-module (guix serialization) write-string-pairs write-store-path read-store-path write-store-path-list read-store-path-list + (dump . dump-port*) &nar-error nar-error? -- cgit v1.2.3 From 65b510bbc4f2a9ce5bfe3355e6006e9d08f14532 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 15 Jan 2020 23:38:35 +0100 Subject: clojure-utils: Avoid use of '@@'. * guix/build/clojure-utils.scm (%doc-regex): Avoid @@, which doesn't work on Guile 3. (file-sans-extension): Likewise. --- guix/build/clojure-utils.scm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/guix/build/clojure-utils.scm b/guix/build/clojure-utils.scm index 9f7334bc8d..a9ffad3c8f 100644 --- a/guix/build/clojure-utils.scm +++ b/guix/build/clojure-utils.scm @@ -69,10 +69,7 @@ (define-syntax-rule (define-with-docs name docs val) (define-with-docs %doc-regex "Default regex for matching the base name of top-level documentation files." - (format #f - "(~a)|(\\.(html|markdown|md|txt)$)" - (@@ (guix build guile-build-system) - %documentation-file-regexp))) + "^(README.*|.*\\.html|.*\\.org|.*\\.md|\\.markdown|\\.txt)$") (define* (install-doc #:key doc-dirs @@ -185,10 +182,12 @@ (define (find-files* base-dir . args) (apply find-files "./" args)))) ;;; FIXME: should be moved to (guix build utils) -(define-with-docs file-sans-extension - "Strip extension from path, if any." - (@@ (guix build guile-build-system) - file-sans-extension)) +(define (file-sans-extension file) ;TODO: factorize + "Return the substring of FILE without its extension, if any." + (let ((dot (string-rindex file #\.))) + (if dot + (substring file 0 dot) + file))) (define (relative-path->clojure-lib-string path) "Convert PATH to a clojure library string." -- cgit v1.2.3 From 7fa9a685a29ef1440ccbaf15b5de4142d8d82aec Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sun, 12 Jan 2020 20:32:40 -0500 Subject: gnu: red-eclipse: Update to 2.0.0. * gnu/packages/games.scm (red-eclipse): Update to 2.0.0. [source]: Remove obsolete patch, and fetch submodules by making "recursive?" true. [arguments]: Remove "unpack-data" phase and adjust "add-store-data-package-path-as-default" phase. [inputs]: Add freetype and remove data-sources. * gnu/packages/patches/red-eclipse-remove-gamma-name-hack.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Delete file. --- gnu/local.mk | 1 - gnu/packages/games.scm | 96 +++------------------- .../red-eclipse-remove-gamma-name-hack.patch | 52 ------------ 3 files changed, 12 insertions(+), 137 deletions(-) delete mode 100644 gnu/packages/patches/red-eclipse-remove-gamma-name-hack.patch diff --git a/gnu/local.mk b/gnu/local.mk index f5c73ba1f5..e77af87f3e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1346,7 +1346,6 @@ dist_patch_DATA = \ %D%/packages/patches/rct-add-missing-headers.patch \ %D%/packages/patches/readline-link-ncurses.patch \ %D%/packages/patches/readline-6.2-CVE-2014-2524.patch \ - %D%/packages/patches/red-eclipse-remove-gamma-name-hack.patch \ %D%/packages/patches/reposurgeon-add-missing-docbook-files.patch \ %D%/packages/patches/ri-li-modernize_cpp.patch \ %D%/packages/patches/ripperx-missing-file.patch \ diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 975658de18..da6c6fd078 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3189,45 +3189,8 @@ (define-public powwow (license license:gpl2+))) (define-public red-eclipse - (let ((release "1.6.0") - (revision 0) - (data-sources - '(("acerspyro" "12b0bngl7hlxw4iwdbn99jp081yl6z1ic0s788nm349drbr2pck8") - ("actors" "0x7qqx67679q6ark9zz02skwhzgabid69kwi6zmhfpfgicn4927r") - ("appleflap" "08xslwqfqz3j4m03pv5ry2gdzj5k2ns51z8n6sln3sa94i9x8qkm") - ("blendbrush" "18zf5i2ax4p14x4c9nhk9fq6l1xgbxw62gm72vx59vbfdpjrw3cg") - ("caustics" "172fxwx7kbz5nmbjq98kr52ips505wb99fibgnpg8cj02syrya8k") - ("crosshairs" "14w8ysqzdsx9bzpfbl700jzngbh14rdghhjdf6zd6jlkvrl6754r") - ("dziq" "056imqszvp90j7cgz52ly0f31px64gsrmvm9k2c78ldbx87jnhc3") - ("elyvisions" "1bsgr0gr7njydj8fqclh0a27lrsyic3xfd5a4vwggw7g54azpgk2") - ("fonts" "00ibisza1qci0ghf2rynyf28l6r3nqhfzjf80k6gg76q4v7p1myx") - ("freezurbern" "07l9ldk9b82f12c13wcg5xxdf15bw0yjxk3vvk8v3ygrl2mwksyr") - ("john" "1jdmwkrdi5b9pivkm22rxhmkk1db9dx6l54wzcc23cvdz04ij93k") - ("jojo" "0f7kjy43fbk9kw8fip6bbw4gn3pryh0fndlahjfkaysrx98krdj3") - ("jwin" "0nc8dndnpqk2ad6316a8k6kgzsrkpwvk8s4gyh7aqfi4axfclril") - ("luckystrike" "04jiipqahphmvz5cd74dygr62dlvv6l4iglb8hzh4pp8frhls8bq") - ("maps" "0an46ipjvw4h0nxvb6qvnzp1cdkzlkiinqz4zh9lmxy1ds0gclim") - ("mayhem" "15k10imm2wr6c6fq35n4r99k7kz7n9zdnjlw6dmdq6fba67i6sbc") - ("mikeplus64" "0v4wiiivm3829j4phlavy22n4c6k6ib9ixxpdz7r6ysg5cdkaw33") - ("misc" "13rfgwrlfhflz6inbkg3fypyf8im0m49sw112b17qrw2zgp8i1rz") - ("nieb" "0z0h9jdn2gkkjil3vsvwidb1p2k09pi5n3wjxza12hhvqmcs7q8f") - ("nobiax" "08bfp4q6gbfis18bp1h4d0hqssk79jc4fhyjxnv21dbam4v4mnkn") - ("particles" "1vsx3fgg19xggxfhz3vlrh6nqhmw7kl9kmxrvb2j84blp00vd6z2") - ("philipk" "14irscg80607i5k5l2ci0n9nwibvda2f3xsykgv96d0vldrp5n5a") - ("projectiles" "09bnfsrywirwgjm6d7ff5nicx6w6b7w9568x9pb5q0ncaps3l85s") - ("props" "1dlabbprlkif8af3daf9nbgcwgxiymvj0yiphqhlri8ylfy2vpz4") - ("skyboxes" "14bi3md5y47cvb9ybipdvksz40gqsqw2r0lh3zzqb4acq367w18y") - ("snipergoth" "0m8rvvy5n8n9pm0b5cqvzsxsw51mqk8m7s1h3qc849b38isliwq2") - ("sounds" "0ivf3w5bphz5pzzx6kwcb67vbly1l19cgv3s0cyp8n87afiqj5rd") - ("textures" "0qdmgx7zbcqnb9rrga2izr93p5inirczhddfxs504rsnv0v8vyxm") - ("torley" "05ppyhghq859cbbxzj3dnl9fcx3ghy04ds1pylypwg2hsxzbjwcd") - ("trak" "0g3vq86q91a3syli38lwc8ca4ychfwsmmqf85kqzfzyd627ybclm") - ("ulukai" "0asa5fz400impklcg6dy2f7jiaqfc1sn1c36fpg8jd01gw66lw93") - ("unnamed" "0rz5683j7sfwkcycfypbv4b0ihp0qwn9rzskfsabwc1s5g324917") - ("vanities" "13f18783rc8cjf22p61zr8m5g1migzlx05fzl8xnbjdkqq4cdyix") - ("vegetation" "1y5d97nfmvax7y4fr0y5v0c8zb1ajkqwx76kjd4qc9n4spdsi5sc") - ("weapons" "103g1dhxv5ffz4ddg2xcbshbgv9606chsbas3pzk6h9ybqsyjrqh") - ("wicked" "1884rk34a2dj83gz82rc4zh3ch0dyj5221hvsr0a5h60578i7yj6")))) + (let ((release "2.0.0") + (revision 0)) (package (name "red-eclipse") (version (if (zero? revision) @@ -3238,13 +3201,12 @@ (define-public red-eclipse (origin (method git-fetch) (uri (git-reference - (url "https://github.com/red-eclipse/base.git") - (commit (string-append "v" release)))) + (url "https://github.com/redeclipse/base.git") + (commit (string-append "v" release)) + (recursive? #t))) ; for game data (file-name (git-file-name name version)) (sha256 - (base32 "0qy9kmq21wc4bdhwifasxc5dv1y5c53sn7dfmyc5y3zyz8wjyij4")) - (patches - (search-patches "red-eclipse-remove-gamma-name-hack.patch")))) + (base32 "0sz0mqhwx8r9n4mk3qrxw420nlsm3y0n48gd0lazgd64lfqjh3ab")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no check target @@ -3255,34 +3217,13 @@ (define-public red-eclipse (assoc-ref %outputs "out"))) #:phases (modify-phases %standard-phases - (add-after 'unpack 'unpack-data - (lambda* (#:key inputs #:allow-other-keys) - (delete-file-recursively "data") - (mkdir "data") - (with-directory-excursion "data" - (for-each (lambda (name) - (copy-recursively (assoc-ref inputs name) name)) - (list ,@(map car data-sources)))) - #t)) - (add-after 'unpack-data 'add-store-data-package-path-as-default + (add-after 'unpack 'add-store-data-package-path-as-default (lambda* (#:key outputs #:allow-other-keys) (substitute* "src/engine/server.cpp" - (("(else[[:space:]]*)((addpackagedir\\()\"data\"(\\);))" - _ - else_part - addpackagedir_original - addpackagedir_open - addpackagedir_close) - (string-append else_part - "{ " - addpackagedir_open - "\"" + (("data = \"data\"") + (string-append "data = \"" (assoc-ref outputs "out") - "/share/redeclipse/data\"" - addpackagedir_close - " " - addpackagedir_original - " }"))) + "/share/redeclipse/data\""))) #t)) (delete 'configure) ; no configure script (add-after 'set-paths 'set-sdl-paths @@ -3339,24 +3280,11 @@ (define-public red-eclipse `(("pkg-config" ,pkg-config))) (inputs `(("curl" ,curl) + ("freetype" ,freetype) ("glu" ,glu) ("sdl-union" ,(sdl-union (list sdl2 sdl2-image - sdl2-mixer))) - ;; Create origin records for the many separate data packages. - ,@(map (match-lambda - ((name hash) - (list name - (origin - (method git-fetch) - (uri - (git-reference - (url (string-append "https://github.com/" - "red-eclipse/" name ".git")) - (commit (string-append "v" release)))) - (sha256 (base32 hash)) - (file-name (git-file-name name version)))))) - data-sources))) + sdl2-mixer))))) (home-page "http://redeclipse.net/") (synopsis "Arena shooter derived from the Cube 2 engine") (description diff --git a/gnu/packages/patches/red-eclipse-remove-gamma-name-hack.patch b/gnu/packages/patches/red-eclipse-remove-gamma-name-hack.patch deleted file mode 100644 index 573920cb99..0000000000 --- a/gnu/packages/patches/red-eclipse-remove-gamma-name-hack.patch +++ /dev/null @@ -1,52 +0,0 @@ -From b16b4963c1ad81bb9ef784bc4913a4c8ab5f1bb4 Mon Sep 17 00:00:00 2001 -From: Lee Salzman -Date: Tue, 12 Sep 2017 14:45:10 -0400 -Subject: [PATCH] remove gamma name hack - ---- - src/engine/main.cpp | 6 +++--- - src/shared/cube.h | 8 -------- - 2 files changed, 3 insertions(+), 11 deletions(-) - -diff --git a/src/engine/main.cpp b/src/engine/main.cpp -index 1032004d..77c9233a 100644 ---- a/src/engine/main.cpp -+++ b/src/engine/main.cpp -@@ -278,10 +278,10 @@ static void setgamma(int val) - } - - static int curgamma = 100; --VARF(IDF_PERSIST, gamma, 30, 100, 300, -+VARFN(IDF_PERSIST, gamma, reqgamma, 30, 100, 300, - { -- if(initing || gamma == curgamma) return; -- curgamma = gamma; -+ if(initing || reqgamma == curgamma) return; -+ curgamma = reqgamma; - setgamma(curgamma); - }); - -diff --git a/src/shared/cube.h b/src/shared/cube.h -index 3864c492..7ff5e267 100644 ---- a/src/shared/cube.h -+++ b/src/shared/cube.h -@@ -3,19 +3,11 @@ - - #define _FILE_OFFSET_BITS 64 - --#ifdef __GNUC__ --#define gamma __gamma --#endif -- - #ifdef WIN32 - #define _USE_MATH_DEFINES - #endif - #include - --#ifdef __GNUC__ --#undef gamma --#endif -- - #include - #include - #include -- cgit v1.2.3 From 429c8284d232c3f9fbe3dc87a3da323f3a864c03 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 15 Jan 2020 20:26:46 -0500 Subject: gnu: icecat: Fix support for ffmpeg codecs. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . Thanks to Jakub Kądziołka and Amin Bandali for their helpful observations and suggestions. This is a followup to commit 8e5567195f5d29301d571612085b5afdb460619d. * gnu/packages/gnuzilla.scm (icecat)[inputs]: Add shared-mime-info. [arguments]: Add elf and binary I/O modules to #:modules. Add code to the 'fix-ffmpeg-runtime-linker' phase that sets the sandbox read-path whitelist to include libavcodec's RUNPATH, as well as shared-mime-info. --- gnu/packages/gnuzilla.scm | 37 +++++++++++++++++++++++++++++++------ 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 62b4390eab..0797cb06b8 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2015 Andreas Enge ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès -;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Mark H Weaver +;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Mark H Weaver ;;; Copyright © 2015 Sou Bunnbu ;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2016 Alex Griffin @@ -756,6 +756,7 @@ (define-public icecat ;; and related comments in the 'remove-bundled-libraries' phase. ;; UNBUNDLE-ME! ("nspr" ,nspr) ;; UNBUNDLE-ME! ("nss" ,nss) + ("shared-mime-info" ,shared-mime-info) ("sqlite" ,sqlite) ("startup-notification" ,startup-notification) ("unzip" ,unzip) @@ -882,6 +883,10 @@ (define-public icecat (ice-9 match) (srfi srfi-34) (srfi srfi-35) + (rnrs bytevectors) + (rnrs io ports) + (guix elf) + (guix build gremlin) ,@%gnu-build-system-modules) #:phases (modify-phases %standard-phases @@ -966,11 +971,31 @@ (define-public icecat #t)) (add-after 'link-libxul-with-libraries 'fix-ffmpeg-runtime-linker (lambda* (#:key inputs #:allow-other-keys) - ;; Arrange to load libavcodec.so by its absolute file name. - (substitute* "dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp" - (("libavcodec\\.so") - (string-append (assoc-ref inputs "ffmpeg") "/lib/libavcodec.so"))) - #t)) + (let* ((ffmpeg (assoc-ref inputs "ffmpeg")) + (libavcodec (string-append ffmpeg "/lib/libavcodec.so"))) + ;; Arrange to load libavcodec.so by its absolute file name. + (substitute* "dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp" + (("libavcodec\\.so") + libavcodec)) + ;; Populate the sandbox read-path whitelist as needed by ffmpeg. + (let* ((mime-info (assoc-ref inputs "shared-mime-info")) + (libavcodec-runpath (call-with-input-file libavcodec + (compose elf-dynamic-info-runpath + elf-dynamic-info + parse-elf + get-bytevector-all))) + (whitelist (cons (string-append mime-info "/share/mime/") + (map (lambda (dir) + (string-append dir "/")) + libavcodec-runpath))) + (whitelist-string (string-join whitelist ",")) + (port (open-file "browser/app/profile/icecat.js" "a"))) + (format #t "setting 'security.sandbox.content.read_path_whitelist' to '~a'~%" + whitelist-string) + (format port "~%pref(\"security.sandbox.content.read_path_whitelist\", ~S);~%" + whitelist-string) + (close-output-port port)) + #t))) (replace 'bootstrap (lambda _ (invoke "sh" "-c" "autoconf old-configure.in > old-configure") -- cgit v1.2.3 From 8cc9636c5ef1872050a668ef261708ecfe577600 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 16 Jan 2020 04:38:52 +0100 Subject: gnu: r-caret: Move to (gnu packages cran). * gnu/packages/statistics.scm (r-caret): Move variable from here... * gnu/packages/cran.scm (r-caret): ...to here. --- gnu/packages/cran.scm | 29 +++++++++++++++++++++++++++++ gnu/packages/statistics.scm | 29 ----------------------------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 8277026c32..dc40518224 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -18380,6 +18380,35 @@ (define-public r-acuityview it may be seen by an animal with less acute vision.") (license license:gpl2+))) +(define-public r-caret + (package + (name "r-caret") + (version "6.0-84") + (source + (origin + (method url-fetch) + (uri (cran-uri "caret" version)) + (sha256 + (base32 + "03898irgb70q0p01kq99yb6q6xji0jx4jmj0yxlv8wcwd841r0x1")))) + (build-system r-build-system) + (propagated-inputs + `(("r-foreach" ,r-foreach) + ("r-ggplot2" ,r-ggplot2) + ("r-lattice" ,r-lattice) + ("r-modelmetrics" ,r-modelmetrics) + ("r-nlme" ,r-nlme) + ("r-plyr" ,r-plyr) + ("r-recipes" ,r-recipes) + ("r-reshape2" ,r-reshape2) + ("r-withr" ,r-withr))) + (home-page "https://github.com/topepo/caret") + (synopsis "Classification and regression training") + (description + "This package provides misc functions for training and plotting +classification and regression models.") + (license license:gpl2+))) + (define-public r-adabag (package (name "r-adabag") diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index e7fd5bd084..07b486d8da 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5264,35 +5264,6 @@ (define-public r-car to Applied regression, Second Edition, Sage, 2011.") (license license:gpl2+))) -(define-public r-caret - (package - (name "r-caret") - (version "6.0-84") - (source - (origin - (method url-fetch) - (uri (cran-uri "caret" version)) - (sha256 - (base32 - "03898irgb70q0p01kq99yb6q6xji0jx4jmj0yxlv8wcwd841r0x1")))) - (build-system r-build-system) - (propagated-inputs - `(("r-foreach" ,r-foreach) - ("r-ggplot2" ,r-ggplot2) - ("r-lattice" ,r-lattice) - ("r-modelmetrics" ,r-modelmetrics) - ("r-nlme" ,r-nlme) - ("r-plyr" ,r-plyr) - ("r-recipes" ,r-recipes) - ("r-reshape2" ,r-reshape2) - ("r-withr" ,r-withr))) - (home-page "https://github.com/topepo/caret") - (synopsis "Classification and regression training") - (description - "This package provides misc functions for training and plotting -classification and regression models.") - (license license:gpl2+))) - (define-public r-rcppprogress (package (name "r-rcppprogress") -- cgit v1.2.3 From 91afb471954410a0e7a287ef65e1409eaf8d50e6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 16 Jan 2020 04:39:44 +0100 Subject: gnu: r-caret: Do not abbreviate "misc". * gnu/packages/cran.scm (r-caret)[description]: Replace "misc" with "miscellaneous". --- gnu/packages/cran.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index dc40518224..f23528e17e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -18405,7 +18405,7 @@ (define-public r-caret (home-page "https://github.com/topepo/caret") (synopsis "Classification and regression training") (description - "This package provides misc functions for training and plotting + "This package provides miscellaneous functions for training and plotting classification and regression models.") (license license:gpl2+))) -- cgit v1.2.3 From 62d8020a5e84de9c88172e5c823b3141b4cad665 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 16 Jan 2020 04:41:15 +0100 Subject: gnu: r-caret: Update to 6.0-85. * gnu/packages/cran.scm (r-caret): Update to 6.0-85. [propagated-inputs]: Add r-proc. --- 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 f23528e17e..02aa3677ac 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -18383,14 +18383,14 @@ (define-public r-acuityview (define-public r-caret (package (name "r-caret") - (version "6.0-84") + (version "6.0-85") (source (origin (method url-fetch) (uri (cran-uri "caret" version)) (sha256 (base32 - "03898irgb70q0p01kq99yb6q6xji0jx4jmj0yxlv8wcwd841r0x1")))) + "0jxbf2zcvbb5s2pnjzg182awjvylc57q7z5plx6gs6gm62zxjafs")))) (build-system r-build-system) (propagated-inputs `(("r-foreach" ,r-foreach) @@ -18399,6 +18399,7 @@ (define-public r-caret ("r-modelmetrics" ,r-modelmetrics) ("r-nlme" ,r-nlme) ("r-plyr" ,r-plyr) + ("r-proc" ,r-proc) ("r-recipes" ,r-recipes) ("r-reshape2" ,r-reshape2) ("r-withr" ,r-withr))) -- cgit v1.2.3 From e05b5da86c89d675eb1210c2cb26870b8eb9d657 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 16 Jan 2020 04:41:56 +0100 Subject: gnu: r-mvtnorm: Update to 1.0-12. * gnu/packages/statistics.scm (r-mvtnorm): Update to 1.0-12. [inputs]: Move gfortran from here... [native-inputs]: ...to here. --- gnu/packages/statistics.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 07b486d8da..d2238776fc 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3592,15 +3592,15 @@ (define-public r-r-rsp (define-public r-mvtnorm (package (name "r-mvtnorm") - (version "1.0-11") + (version "1.0-12") (source (origin (method url-fetch) (uri (cran-uri "mvtnorm" version)) (sha256 (base32 - "0lkjph661blc1nwfzg9w48a60wvj6ffh4zjwlisvracsx4nn2883")))) + "03rfmii9j8x8fjv7hp8qd28z0svl4w0x54k2f4jpwv4qa7079i24")))) (build-system r-build-system) - (inputs + (native-inputs `(("gfortran" ,gfortran))) (home-page "http://mvtnorm.R-forge.R-project.org") (synopsis "Package for multivariate normal and t-distributions") -- cgit v1.2.3 From ecdc8bec9b1aacc9742fb7d6a034ce329b9d0ae9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 16 Jan 2020 05:38:58 +0100 Subject: gnu: r-bit: Update to 1.1-15.1. * gnu/packages/statistics.scm (r-bit): Update to 1.1-15.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 d2238776fc..b8a988df53 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -739,14 +739,14 @@ (define-public r (define-public r-bit (package (name "r-bit") - (version "1.1-14") + (version "1.1-15.1") (source (origin (method url-fetch) (uri (cran-uri "bit" version)) (sha256 (base32 - "0m7jrqzpa1pk8ixcl814x06jf96nlvvr16x6did6cfk4zghsrfjw")))) + "0y351ajlrn9ywbiai46mjpwmw5pqc9ik2z24rf0bnbdcvaxdr7r8")))) (build-system r-build-system) (home-page "http://ff.r-forge.r-project.org") (synopsis "Class for vectors of 1-bit booleans") -- cgit v1.2.3 From 800219d569cc3a70dbd15e9a31c3aca40ab31ac3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 16 Jan 2020 05:39:07 +0100 Subject: gnu: r-stringi: Update to 1.4.5. * gnu/packages/statistics.scm (r-stringi): Update to 1.4.5. --- 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 b8a988df53..7d24817d35 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1015,14 +1015,14 @@ (define-public r-sendmailr (define-public r-stringi (package (name "r-stringi") - (version "1.4.3") + (version "1.4.5") (source (origin (method url-fetch) (uri (cran-uri "stringi" version)) (sha256 (base32 - "1vbr6g9p1iyzdj7wfw6afyizvnd1a2srfvkl72pq23vhdcwwpkhk")))) + "0gdmdf4i3ik8rcs7af1vlsfnilcmw3z28jx4278rpq2asigps89k")))) (build-system r-build-system) (inputs `(("icu4c" ,icu4c))) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 97e20ade4eb9843d8f0193c1d0e553c9ca67a940 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 16 Jan 2020 05:39:13 +0100 Subject: gnu: r-bh: Update to 1.72.0-3. * gnu/packages/statistics.scm (r-bh): Update to 1.72.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 7d24817d35..085fc2ab7f 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1260,13 +1260,13 @@ (define-public r-dbi (define-public r-bh (package (name "r-bh") - (version "1.72.0-2") + (version "1.72.0-3") (source (origin (method url-fetch) (uri (cran-uri "BH" version)) (sha256 (base32 - "0y1cxnzdajcdsc9jlaby53253hril65h496wval08qlxsqnfc3ia")))) + "1ay8vb6i730lipg8b8g3893vqglhw2kqpc29lwdrxdkb66iw33l8")))) (build-system r-build-system) (home-page "https://github.com/eddelbuettel/bh") (synopsis "R package providing subset of Boost headers") -- cgit v1.2.3 From 0d9fed2fe317d2f91c736bbb61d72d1e6c8144b2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 16 Jan 2020 05:39:18 +0100 Subject: gnu: r-hms: Update to 0.5.3. * gnu/packages/statistics.scm (r-hms): Update to 0.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 085fc2ab7f..f7286d9995 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2455,14 +2455,14 @@ (define-public r-withr (define-public r-hms (package (name "r-hms") - (version "0.5.2") + (version "0.5.3") (source (origin (method url-fetch) (uri (cran-uri "hms" version)) (sha256 (base32 - "0h24dsagn4kcr65arn73mpqapcg002kw4kyxfqyff95j6s6cjifl")))) + "1baki0qw5ijgiflvsdvqj3apg4yanf12vx14kwbqdzk5rz46fasf")))) (build-system r-build-system) (propagated-inputs `(("r-rlang" ,r-rlang) -- cgit v1.2.3 From 79f6c0c0bd4fe4b8992b8682d6cae8cbf294f522 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 16 Jan 2020 05:39:23 +0100 Subject: gnu: r-catools: Update to 1.17.1.4. * gnu/packages/statistics.scm (r-catools): Update to 1.17.1.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 f7286d9995..c366fa5d6f 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2617,13 +2617,13 @@ (define-public r-bitops (define-public r-catools (package (name "r-catools") - (version "1.17.1.3") + (version "1.17.1.4") (source (origin (method url-fetch) (uri (cran-uri "caTools" version)) (sha256 (base32 - "04m7vbydxb1nipday97w29p2miykyzxw572j9lda6jxmmp2kb1yp")))) + "151vsfakg32jn9msfdjcizhizm8k8yxlfpnsbagns9ihr59s3w49")))) (properties `((upstream-name . "caTools"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From b210274a8f2de4d65f73827a93a9a7d14ddddfbf Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 16 Jan 2020 05:39:30 +0100 Subject: gnu: r-rsqlite: Update to 2.2.0. * gnu/packages/statistics.scm (r-rsqlite): Update to 2.2.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 c366fa5d6f..d681bddf1c 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2778,13 +2778,13 @@ (define-public r-blob (define-public r-rsqlite (package (name "r-rsqlite") - (version "2.1.5") + (version "2.2.0") (source (origin (method url-fetch) (uri (cran-uri "RSQLite" version)) (sha256 (base32 - "0b1cjnk9g1lrxy0wajfq744qps7fila0xdh5j9chy1vrrwfiwzl0")))) + "1m38sj8rwbf3p2lhqabcp7c7djk7s9ng37cz39yxk706v9pi4380")))) (properties `((upstream-name . "RSQLite"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 703ae530c5605afdf5c3d4d16878c240e0ecf37d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 16 Jan 2020 05:39:36 +0100 Subject: gnu: r-gplots: Update to 3.0.1.2. * gnu/packages/statistics.scm (r-gplots): Update to 3.0.1.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 d681bddf1c..ec5f1e2f5b 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4216,14 +4216,14 @@ (define-public r-gdata (define-public r-gplots (package (name "r-gplots") - (version "3.0.1.1") + (version "3.0.1.2") (source (origin (method url-fetch) (uri (cran-uri "gplots" version)) (sha256 (base32 - "033plcfs9w8pmn84n24mdhiixdirc2a7pz6dvm61fpd20gwh7cbx")))) + "0vrm7wqrmqsmfrc070r9chpzb0vv60pay2lyar9qxfry6bsrvx86")))) (build-system r-build-system) (propagated-inputs `(("r-catools" ,r-catools) -- cgit v1.2.3 From c9be8171b3af76f317a4bf30fdfd866e401abea7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 16 Jan 2020 05:39:41 +0100 Subject: gnu: r-zoo: Update to 1.8-7. * gnu/packages/statistics.scm (r-zoo): Update to 1.8-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 ec5f1e2f5b..03f8e9ead8 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4286,13 +4286,13 @@ (define-public r-rocr (define-public r-zoo (package (name "r-zoo") - (version "1.8-6") + (version "1.8-7") (source (origin (method url-fetch) (uri (cran-uri "zoo" version)) (sha256 (base32 - "1k1pmzr9nfwbxq1xf0jzn3nawv4sgnkxkgzxnm1i887jcbrs85r2")))) + "1w4542zs53bm261g95086a60576v334g1jrhnbgdqni4izf2s1wy")))) (build-system r-build-system) (propagated-inputs `(("r-lattice" ,r-lattice))) -- cgit v1.2.3 From 3ff847630265e8a56c79448a66beb3f080586b97 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 16 Jan 2020 05:39:47 +0100 Subject: gnu: r-statmod: Update to 1.4.33. * gnu/packages/statistics.scm (r-statmod): Update to 1.4.33. --- 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 03f8e9ead8..617ad8c29b 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4442,13 +4442,13 @@ (define-public r-ggthemes (define-public r-statmod (package (name "r-statmod") - (version "1.4.32") + (version "1.4.33") (source (origin (method url-fetch) (uri (cran-uri "statmod" version)) (sha256 (base32 - "083yyp84xj85zg4bhz7i90bqzl3p6155ch4abwsfc9k1lv7s2rrg")))) + "1fbi5m4c0lingm2vvi0g6jf8f2mg1h01xwyz5rnymrq7gs0ibiks")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/statmod") (native-inputs -- cgit v1.2.3 From 96e11a632ddf6faf0df21badbafb377e87a2e593 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 16 Jan 2020 05:39:52 +0100 Subject: gnu: r-prabclus: Update to 2.3-2. * gnu/packages/statistics.scm (r-prabclus): Update to 2.3-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 617ad8c29b..0475573046 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4743,14 +4743,14 @@ (define-public r-mclust (define-public r-prabclus (package (name "r-prabclus") - (version "2.3-1") + (version "2.3-2") (source (origin (method url-fetch) (uri (cran-uri "prabclus" version)) (sha256 (base32 - "1h5k13w8mmmdy74l145zh64f339wy78z1nlg8xr3zg23gmv98cpg")))) + "0hg4d7y1w18jpgvw10z8833bbbcnlkwiasx0wh6iwa2pnnybq8gl")))) (build-system r-build-system) (propagated-inputs `(("r-mass" ,r-mass) -- cgit v1.2.3 From f4b6da32c572c681d4700093fe0c46c4fe4a4d21 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 16 Jan 2020 05:39:57 +0100 Subject: gnu: r-modelmetrics: Update to 1.2.2.1. * gnu/packages/statistics.scm (r-modelmetrics): Update to 1.2.2.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 0475573046..492944859a 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5063,14 +5063,14 @@ (define-public r-rcppeigen (define-public r-modelmetrics (package (name "r-modelmetrics") - (version "1.2.2") + (version "1.2.2.1") (source (origin (method url-fetch) (uri (cran-uri "ModelMetrics" version)) (sha256 (base32 - "158ddbw2snlyzd2q6mdaif5i67kq4qfvadylwjxgv1w2cmszrmk6")))) + "17yw46yr0n9hddvlhh73jdpmpdlpa581n5xjpwkr6cpr2f7xxpqc")))) (properties `((upstream-name . "ModelMetrics"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 0169d77858c1ab74d500462dcf5c23d9e2b10995 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 16 Jan 2020 05:40:03 +0100 Subject: gnu: r-ranger: Update to 0.12.1. * gnu/packages/statistics.scm (r-ranger): Update to 0.12.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 492944859a..ec2994dc33 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5385,14 +5385,14 @@ (define-public r-tclust (define-public r-ranger (package (name "r-ranger") - (version "0.11.2") + (version "0.12.1") (source (origin (method url-fetch) (uri (cran-uri "ranger" version)) (sha256 (base32 - "1sxyzxmjc6lm8wcmq15j6sscnza7aay4mr3dyri2zngx6fa8mb0k")))) + "1vr5akgh388iivrxi0g4pl2npq9dc4cim3ljk4kjf637q058wc7w")))) (build-system r-build-system) (propagated-inputs `(("r-rcpp" ,r-rcpp) -- cgit v1.2.3 From af67eba5bf1c4c468b05ae70d8dffe40d8f1d4da Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 16 Jan 2020 05:40:10 +0100 Subject: gnu: r-rgooglemaps: Update to 1.4.5.1. * gnu/packages/cran.scm (r-rgooglemaps): Update to 1.4.5.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 02aa3677ac..d2ebabeba8 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1293,14 +1293,14 @@ (define-public r-mapproj (define-public r-rgooglemaps (package (name "r-rgooglemaps") - (version "1.4.5") + (version "1.4.5.1") (source (origin (method url-fetch) (uri (cran-uri "RgoogleMaps" version)) (sha256 (base32 - "1acf0qc9597apcidjzrpvwhg9ihypr38jigc10jvqn33qbn1i9s7")))) + "1lrbl0nax7rzk460mh6rq9hydahdi3ckxk4kxx3xij29jl3lmijh")))) (properties `((upstream-name . "RgoogleMaps"))) (build-system r-build-system) (propagated-inputs `(("r-png" ,r-png))) -- cgit v1.2.3 From e899ef31c93016f598dfde779c5dfb332432165d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 16 Jan 2020 05:40:17 +0100 Subject: gnu: r-getoptlong: Update to 0.1.8. * gnu/packages/cran.scm (r-getoptlong): Update to 0.1.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 d2ebabeba8..9d234fb218 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1941,14 +1941,14 @@ (define-public r-dendextend (define-public r-getoptlong (package (name "r-getoptlong") - (version "0.1.7") + (version "0.1.8") (source (origin (method url-fetch) (uri (cran-uri "GetoptLong" version)) (sha256 (base32 - "1fl3w2n602ldybc5qj7qw4xmzzb804bsjkqwf6dswzj0vf0qiadr")))) + "1l8xkvyl152bsyvxazsvx2sm1vkygn75x0lsg3sbg7xp6drdn3kc")))) (properties `((upstream-name . "GetoptLong"))) (build-system r-build-system) (inputs -- cgit v1.2.3 From 71ecbda54cfe15b046eaf0b7e018b7954b573091 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 16 Jan 2020 05:40:23 +0100 Subject: gnu: r-prettyunits: Update to 1.1.0. * gnu/packages/cran.scm (r-prettyunits): Update to 1.1.0. [propagated-inputs]: Remove r-assertthat and r-magrittr. --- gnu/packages/cran.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 9d234fb218..955bda7658 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2034,18 +2034,15 @@ (define-public r-ffbase (define-public r-prettyunits (package (name "r-prettyunits") - (version "1.0.2") + (version "1.1.0") (source (origin (method url-fetch) (uri (cran-uri "prettyunits" version)) (sha256 (base32 - "0p3z42hnk53x7ky4d1dr2brf7p8gv3agxr71i99m01n2hq2ri91m")))) + "0453vvslpkj1ysyv0cy9hw98q5wlnj7bvvz7vzl5ld8ij82lwy5c")))) (build-system r-build-system) - (propagated-inputs - `(("r-assertthat" ,r-assertthat) - ("r-magrittr" ,r-magrittr))) (home-page "https://github.com/gaborcsardi/prettyunits") (synopsis "Pretty, human readable formatting of quantities") (description -- cgit v1.2.3 From 3b3c13870d0149de455036992d57816b902ea3de Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 16 Jan 2020 05:40:39 +0100 Subject: gnu: r-bdsmatrix: Update to 1.3-4. * gnu/packages/cran.scm (r-bdsmatrix): Update to 1.3-4. --- 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 955bda7658..31a72c50cc 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2362,14 +2362,14 @@ (define-public r-inline (define-public r-bdsmatrix (package (name "r-bdsmatrix") - (version "1.3-3") + (version "1.3-4") (source (origin (method url-fetch) (uri (cran-uri "bdsmatrix" version)) (sha256 (base32 - "17ddvz4gnih7rx0lr1gzk280xyh6x796cf2x794dvplpiiq83skh")))) + "1sh6pg43rgqvips4fx0k4vmp5i9lmniix0bqwj2yq5m06gs227i5")))) (properties `((upstream-name . "bdsmatrix"))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/bdsmatrix/") -- cgit v1.2.3 From e931661af8145a443f36b3b7e3db27e6ebb71917 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 16 Jan 2020 05:40:44 +0100 Subject: gnu: r-suppdists: Update to 1.1-9.5. * gnu/packages/cran.scm (r-suppdists): Update to 1.1-9.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 31a72c50cc..c8019027be 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2552,14 +2552,14 @@ (define-public r-energy (define-public r-suppdists (package (name "r-suppdists") - (version "1.1-9.4") + (version "1.1-9.5") (source (origin (method url-fetch) (uri (cran-uri "SuppDists" version)) (sha256 (base32 - "1ffx8wigqqvz2pnh06jjc0fnf4vq9z2rhwk2y3f9aszn18ap3dgw")))) + "01j6p94m1g363nph2158fq2rmd6z3h5dvcv6aidh2d6syw131xak")))) (properties `((upstream-name . "SuppDists"))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/SuppDists") -- cgit v1.2.3 From 59d78145d708522604be7e9bc7dbc73103b8c59a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 16 Jan 2020 05:40:50 +0100 Subject: gnu: r-squarem: Update to 2020.1. * gnu/packages/cran.scm (r-squarem): Update to 2020.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 c8019027be..d151b0a0eb 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2635,14 +2635,14 @@ (define-public r-cvst (define-public r-squarem (package (name "r-squarem") - (version "2017.10-1") + (version "2020.1") (source (origin (method url-fetch) (uri (cran-uri "SQUAREM" version)) (sha256 (base32 - "10xj26x7qjyvzndnbjl5krr9wabnb9cbrnp3m7xg673g8ddr12cv")))) + "0v4ax1v8diw2w7fdhfzz1z0bwixkmcrc39ax3y116f399rc06qbs")))) (properties `((upstream-name . "SQUAREM"))) (build-system r-build-system) (home-page "http://www.jhsph.edu/agingandhealth/People/Faculty_personal_pages/Varadhan.html") -- cgit v1.2.3 From eb311f69d7f740b25fbc02444db112f2d90b60c3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 16 Jan 2020 05:40:56 +0100 Subject: gnu: r-ddalpha: Update to 1.3.11. * gnu/packages/cran.scm (r-ddalpha): Update to 1.3.11. --- 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 d151b0a0eb..a5f9dcf700 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2907,14 +2907,14 @@ (define-public r-geometry (define-public r-ddalpha (package (name "r-ddalpha") - (version "1.3.10") + (version "1.3.11") (source (origin (method url-fetch) (uri (cran-uri "ddalpha" version)) (sha256 (base32 - "1064g7y8d7kmvd5kjc2m48yvidmh2ci1y0xgil3pcx4ix6mf0ljz")))) + "1sdnb47r534nh138zk3a6b2mgi74nvshc7p5m304vjs9jlx4l2y3")))) (build-system r-build-system) (propagated-inputs `(("r-bh" ,r-bh) -- cgit v1.2.3 From 5072462cb6e9f87120d0bbd5b6f5604e9e1a564b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 16 Jan 2020 05:41:03 +0100 Subject: gnu: r-psych: Update to 1.9.12.31. * gnu/packages/cran.scm (r-psych): Update to 1.9.12.31. [propagated-inputs]: Remove r-foreign. --- gnu/packages/cran.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a5f9dcf700..87cd03004e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3012,18 +3012,17 @@ (define-public r-ipred (define-public r-psych (package (name "r-psych") - (version "1.9.12") + (version "1.9.12.31") (source (origin (method url-fetch) (uri (cran-uri "psych" version)) (sha256 (base32 - "13r7fyjsl93m121awnwfhya8a0lw0l2byn60yqdbf9gp3lmb9ny0")))) + "02i9p6appf15hjdsi58g39bzs9as40f9qhy8m7ki30hd1fz1vrr5")))) (build-system r-build-system) (propagated-inputs - `(("r-foreign" ,r-foreign) - ("r-lattice" ,r-lattice) + `(("r-lattice" ,r-lattice) ("r-mnormt" ,r-mnormt) ("r-nlme" ,r-nlme))) (home-page "https://cran.r-project.org/web/packages/psych/") -- cgit v1.2.3 From c38f4c38741ec7fbd670b4c2977506a074c5e1da Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 16 Jan 2020 05:41:16 +0100 Subject: gnu: r-recipes: Update to 0.1.9. * gnu/packages/cran.scm (r-recipes): Update to 0.1.9. --- 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 87cd03004e..fd4b14bae5 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3100,14 +3100,14 @@ (define-public r-broom (define-public r-recipes (package (name "r-recipes") - (version "0.1.8") + (version "0.1.9") (source (origin (method url-fetch) (uri (cran-uri "recipes" version)) (sha256 (base32 - "1n32qc2a3n9cykm8dv9qcr77kdhqfsjiqf6kgfk9s0lnpx2zaldm")))) + "1fmnka583sqm6v5bhxbllb4cd5xfqbf268aij2xgxiwckv3c0ynm")))) (build-system r-build-system) (propagated-inputs `(("r-dplyr" ,r-dplyr) -- cgit v1.2.3 From 831e460610747f14c932c927f58c40b9e1ca530a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 16 Jan 2020 05:41:22 +0100 Subject: gnu: r-vcd: Update to 1.4-5. * gnu/packages/cran.scm (r-vcd): Update to 1.4-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 fd4b14bae5..60e8014687 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3637,14 +3637,14 @@ (define-public r-laeken (define-public r-vcd (package (name "r-vcd") - (version "1.4-4") + (version "1.4-5") (source (origin (method url-fetch) (uri (cran-uri "vcd" version)) (sha256 (base32 - "1lp99h0wvsc61l1dgcqjxdrcgpgw88ak430cdsv43kmm43qssqd5")))) + "0pqf1sdp0d60aqc7721hy2zfcp57902by0i28jqbn683dd50c21a")))) (build-system r-build-system) (propagated-inputs `(("r-colorspace" ,r-colorspace) -- cgit v1.2.3 From e8bcca8c1fd8fdd0cb176a5fbff9abc357435c12 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 16 Jan 2020 05:41:30 +0100 Subject: gnu: r-ggridges: Update to 0.5.2. * gnu/packages/cran.scm (r-ggridges): 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 60e8014687..f86091be1c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3748,14 +3748,14 @@ (define-public r-scatterplot3d (define-public r-ggridges (package (name "r-ggridges") - (version "0.5.1") + (version "0.5.2") (source (origin (method url-fetch) (uri (cran-uri "ggridges" version)) (sha256 (base32 - "0dhwcpy785ac2ny5bjp284595nnybi3554wd0yffsli0vzf7ry01")))) + "03pz257aw0mkh5k75rby9givkc1ky3n5scvhjhjiz9vry9fpffmh")))) (build-system r-build-system) (propagated-inputs `(("r-ggplot2" ,r-ggplot2) -- cgit v1.2.3 From 743b12c24126d1156b7f8c156015d96497fa6b1b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 16 Jan 2020 05:41:35 +0100 Subject: gnu: r-cli: Update to 2.0.1. * gnu/packages/cran.scm (r-cli): Update to 2.0.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 f86091be1c..d878ca1eba 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3795,14 +3795,14 @@ (define-public r-ggjoy (define-public r-cli (package (name "r-cli") - (version "2.0.0") + (version "2.0.1") (source (origin (method url-fetch) (uri (cran-uri "cli" version)) (sha256 (base32 - "1gv3zqdipj29ivkw5dsi1qdlra7q4lcrcqvlg9fns7d670yglfki")))) + "0x28i7kj4qndk6mnn99qn9w2nfldv8csjnsn0n8phfnxq5hnmp5y")))) (build-system r-build-system) (propagated-inputs `(("r-assertthat" ,r-assertthat) -- cgit v1.2.3 From b468f073fab2a2449d2e546108a0daf6c440f8bd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 16 Jan 2020 05:41:42 +0100 Subject: gnu: r-xfun: Update to 0.12. * gnu/packages/cran.scm (r-xfun): Update to 0.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 d878ca1eba..6a2a533649 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4008,13 +4008,13 @@ (define-public r-seriation (define-public r-xfun (package (name "r-xfun") - (version "0.11") + (version "0.12") (source (origin (method url-fetch) (uri (cran-uri "xfun" version)) (sha256 - (base32 "0dncw6bqkal7nyarrrrj9arxy0y3nkdzmrbibcjh84m1cxd4phiw")))) + (base32 "0sgh8kafi9x1glmmcp1ly827pm8q7fsfngbplr41fbb4nc9363df")))) (build-system r-build-system) (home-page "https://github.com/yihui/xfun") (synopsis "Miscellaneous functions") -- cgit v1.2.3 From b3f02e1af5ad1d41365a3653a449c99fbcde3b87 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 16 Jan 2020 05:41:48 +0100 Subject: gnu: r-tinytex: Update to 0.19. * gnu/packages/cran.scm (r-tinytex): Update to 0.19. --- 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 6a2a533649..4580385a7c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4152,14 +4152,14 @@ (define-public r-uuid (define-public r-tinytex (package (name "r-tinytex") - (version "0.18") + (version "0.19") (source (origin (method url-fetch) (uri (cran-uri "tinytex" version)) (sha256 (base32 - "04mpbhadixbxmnazj0q6cj973cajchscvyh1k6a5b3qk26dp5krr")))) + "0jlcrvcqcbkimg7w40z5vhlnakb829vfgqpspm3pfl8karwzgqp6")))) (build-system r-build-system) (propagated-inputs `(("r-xfun" ,r-xfun))) -- cgit v1.2.3 From dc196dfd44e83d2fa5da6afaf18fd99d813ab011 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 16 Jan 2020 05:41:54 +0100 Subject: gnu: r-trend: Update to 1.1.2. * gnu/packages/cran.scm (r-trend): Update to 1.1.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 4580385a7c..69c45e58a3 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4620,14 +4620,14 @@ (define-public r-cubature (define-public r-trend (package (name "r-trend") - (version "1.1.1") + (version "1.1.2") (source (origin (method url-fetch) (uri (cran-uri "trend" version)) (sha256 (base32 - "1bd567n15k2vpmgbx02584k5kglrc58mlb5kgd07wdss3knpa48q")))) + "09b6ycyfgs4xlhx6kn6qm5rl2acp58hzhv8qclzn3kb1wjjyvxy5")))) (build-system r-build-system) (propagated-inputs `(("r-extradistr" ,r-extradistr))) -- cgit v1.2.3 From b329d5f0b294cb9d11fc8c21846d5818886b5c67 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 16 Jan 2020 05:42:00 +0100 Subject: gnu: r-bibtex: Update to 0.4.2.2. * gnu/packages/cran.scm (r-bibtex): Update to 0.4.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 69c45e58a3..21771c59c6 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5768,14 +5768,14 @@ (define-public r-reticulate (define-public r-bibtex (package (name "r-bibtex") - (version "0.4.2.1") + (version "0.4.2.2") (source (origin (method url-fetch) (uri (cran-uri "bibtex" version)) (sha256 (base32 - "1ks1w59ldwmfd1sj8ap7smyhf8dhykv7xnwrl8z9xzkcfpv1rbc0")))) + "140hkjzdp3033cvji861rd06z1ixgpnn4n5amygqsmhnixk8ff07")))) (build-system r-build-system) (propagated-inputs `(("r-stringr" ,r-stringr))) (home-page "https://github.com/romainfrancois/bibtex") -- cgit v1.2.3 From 220875e123743de4783b76853f98b92d1685d10d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 16 Jan 2020 05:42:05 +0100 Subject: gnu: r-fansi: Update to 0.4.1. * gnu/packages/cran.scm (r-fansi): Update to 0.4.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 21771c59c6..93e2b35d1b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6011,14 +6011,14 @@ (define-public r-factoextra (define-public r-fansi (package (name "r-fansi") - (version "0.4.0") + (version "0.4.1") (source (origin (method url-fetch) (uri (cran-uri "fansi" version)) (sha256 (base32 - "02f2rx7v7wz6w97m2slwky2i5y8f9iafycmkyr3siy3z3k8fj171")))) + "028ywjy538psnmdnddvy5jr3idzffr4hikzr4x97x0m30g4fws9w")))) (build-system r-build-system) (native-inputs `(("r-knitr" ,r-knitr))) ; for vignettes -- cgit v1.2.3 From 4afe271458429d9d45b070cff150541b5173e98d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 16 Jan 2020 05:42:11 +0100 Subject: gnu: r-hdf5r: Update to 1.3.1. * gnu/packages/cran.scm (r-hdf5r): Update to 1.3.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 93e2b35d1b..c98620d278 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6053,14 +6053,14 @@ (define-public r-nbclust (define-public r-hdf5r (package (name "r-hdf5r") - (version "1.3.0") + (version "1.3.1") (source (origin (method url-fetch) (uri (cran-uri "hdf5r" version)) (sha256 (base32 - "1pq12vkfqxvcaznwaxvjdg3acimk5a20m8h18sixvxc34vnqxw8f")))) + "0hvi2cvyv6zlxgpawnmsihxclp2ln88slbrnmaxagmjswskxsrpx")))) (build-system r-build-system) (inputs `(("hdf5" ,hdf5) -- cgit v1.2.3 From 4a3351e3cd1821849cc6d3c0ec1814a0cb2fd5a8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 16 Jan 2020 05:42:16 +0100 Subject: gnu: r-insight: Update to 0.8.0. * gnu/packages/cran.scm (r-insight): Update to 0.8.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 c98620d278..2890a83550 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6383,14 +6383,14 @@ (define-public r-prediction (define-public r-insight (package (name "r-insight") - (version "0.7.1") + (version "0.8.0") (source (origin (method url-fetch) (uri (cran-uri "insight" version)) (sha256 (base32 - "0scjmr8qvwaswb9wfq2lxp1v5fl72way8cid9agrf0z1agp0adad")))) + "1bkcwvjpfy4q4k478x8x42yiqz6v0fk6z6hfp6fli3h63smlmck0")))) (build-system r-build-system) (home-page "https://easystats.github.io/insight/") (synopsis "Easy access to model information for various model objects") -- cgit v1.2.3 From 5ec991e6f3bd21447c10468e113e7d602eb608b2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 16 Jan 2020 05:42:22 +0100 Subject: gnu: r-sjmisc: Update to 2.8.3. * gnu/packages/cran.scm (r-sjmisc): Update to 2.8.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 2890a83550..242d6e3361 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6438,14 +6438,14 @@ (define-public r-sjlabelled (define-public r-sjmisc (package (name "r-sjmisc") - (version "2.8.2") + (version "2.8.3") (source (origin (method url-fetch) (uri (cran-uri "sjmisc" version)) (sha256 (base32 - "0rl0bmk91wc4dxdgy008fl0dwkx3ffvys30vgpnr78lb4pk45nb2")))) + "0w8l9grmp4q775jrf4q6rxx36ld5daz9b0gdxyyh42xfihk6m62h")))) (build-system r-build-system) (propagated-inputs `(("r-dplyr" ,r-dplyr) -- cgit v1.2.3 From 707608fdc4edfadec565562a8405657631371732 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 16 Jan 2020 05:42:28 +0100 Subject: gnu: r-proc: Update to 1.16.1. * gnu/packages/cran.scm (r-proc): Update to 1.16.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 242d6e3361..d1681c1db7 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6867,14 +6867,14 @@ (define-public r-blockfest (define-public r-proc (package (name "r-proc") - (version "1.15.3") + (version "1.16.1") (source (origin (method url-fetch) (uri (cran-uri "pROC" version)) (sha256 (base32 - "1jx8af9p6sxbypqvj1cci7q9sbyaw310inbjxibjcr3acj59h45h")))) + "0qkp1byl2xspxaaf0by6mvvrhg7wlz6fxmynz2hkh0ds24w7ig9m")))) (properties `((upstream-name . "pROC"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From c8cf595a31b85f643080e4961e3438ff958fe764 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 16 Jan 2020 05:42:36 +0100 Subject: gnu: r-multcomp: Update to 1.4-12. * gnu/packages/cran.scm (r-multcomp): Update to 1.4-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 d1681c1db7..406d256981 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8221,14 +8221,14 @@ (define-public r-th-data (define-public r-multcomp (package (name "r-multcomp") - (version "1.4-11") + (version "1.4-12") (source (origin (method url-fetch) (uri (cran-uri "multcomp" version)) (sha256 (base32 - "0jw9661hs4396wz9vflk3rak0ryzj1cg2pnndsn1gb4fjyf2vlhb")))) + "14c2f10rz546w7ly5f4r6wnd07yj5gic38an17gxny1vf2nsff0b")))) (build-system r-build-system) (propagated-inputs `(("r-codetools" ,r-codetools) -- cgit v1.2.3 From c7040fe4add6773851fb08d1e1ec7614a470bdef Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 16 Jan 2020 05:42:42 +0100 Subject: gnu: r-tmb: Update to 1.7.16. * gnu/packages/cran.scm (r-tmb): Update to 1.7.16. --- 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 406d256981..9ae74601c7 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8379,14 +8379,14 @@ (define-public r-bayesplot (define-public r-tmb (package (name "r-tmb") - (version "1.7.15") + (version "1.7.16") (source (origin (method url-fetch) (uri (cran-uri "TMB" version)) (sha256 (base32 - "1r2d8c5iazihba42sn33yarv0dcfiy989sx64zcf14zr8k6cgjzs")))) + "0lly12hdi99iklwr0vg9xkyhi038w4gncbf895qcwbndmqp0lx44")))) (properties `((upstream-name . "TMB"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 35bbec27cb5bbee788c2ebedf5d88c5968257153 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 16 Jan 2020 05:42:47 +0100 Subject: gnu: r-future-apply: Update to 1.4.0. * gnu/packages/cran.scm (r-future-apply): Update to 1.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 9ae74601c7..8a7401ac55 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -11688,14 +11688,14 @@ (define-public r-future (define-public r-future-apply (package (name "r-future-apply") - (version "1.3.0") + (version "1.4.0") (source (origin (method url-fetch) (uri (cran-uri "future.apply" version)) (sha256 (base32 - "0wd3bh114zkvrqlpn8gqz4ix1igr9hr8x72h2g00a7mqkfjfqx33")))) + "1kgq6dv96hdy35kysqkn606nj7s9dp4ibgpm6n46gqhc5n75lzkk")))) (properties `((upstream-name . "future.apply"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From f3247478432fecb5c36d703569ad513a1864166a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 16 Jan 2020 05:42:53 +0100 Subject: gnu: r-shinyjs: Update to 1.1. * gnu/packages/cran.scm (r-shinyjs): Update to 1.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 8a7401ac55..56ee6ae4ce 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -12104,14 +12104,14 @@ (define-public r-gamlss-dist (define-public r-shinyjs (package (name "r-shinyjs") - (version "1.0") + (version "1.1") (source (origin (method url-fetch) (uri (cran-uri "shinyjs" version)) (sha256 (base32 - "113zpijri0l80rlgrvqn6bxk0sdqgl79h7yhja2p76f9dc9i2sr8")))) + "14k8y313ppj23m9rhlk8jc94x6sbn3qrsnx6xrijiyv8m8dii1l9")))) (build-system r-build-system) (propagated-inputs `(("r-digest" ,r-digest) -- cgit v1.2.3 From 4db8ee8b9aba5fba08d865686c4e893814b17e80 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 16 Jan 2020 05:42:59 +0100 Subject: gnu: r-bookdown: Update to 0.17. * gnu/packages/cran.scm (r-bookdown): Update to 0.17. --- 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 56ee6ae4ce..961f994266 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -13616,13 +13616,13 @@ (define-public r-sparql (define-public r-bookdown (package (name "r-bookdown") - (version "0.16") + (version "0.17") (source (origin (method url-fetch) (uri (cran-uri "bookdown" version)) (sha256 (base32 - "1gwgvx1yg6q3wccnhidr3gshdvlgr42i4pvlg4h29kpsa7smjiv1")))) + "10b4gnd6z3w13pysqqan43blxcbk7bgbzc7wr83b23ag1lh2n40j")))) (build-system r-build-system) (propagated-inputs `(("r-htmltools" ,r-htmltools) -- cgit v1.2.3 From a0bb0df325233ef262789f15749f17ba53fce933 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 16 Jan 2020 05:43:04 +0100 Subject: gnu: r-rttf2pt1: Update to 1.3.8. * gnu/packages/cran.scm (r-rttf2pt1): Update to 1.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 961f994266..743110fb25 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -13911,14 +13911,14 @@ (define-public r-xyz (define-public r-rttf2pt1 (package (name "r-rttf2pt1") - (version "1.3.7") + (version "1.3.8") (source (origin (method url-fetch) (uri (cran-uri "Rttf2pt1" version)) (sha256 (base32 - "12hf9r3mhjr9sawdvf7qhjf1zph2q64f77i81jwvy7awidbm0kja")))) + "0b3f2zkmbyshn19cnaaf042d0zwf43l9jnkqizfhxxwb93a4c1jn")))) (properties `((upstream-name . "Rttf2pt1"))) (build-system r-build-system) (home-page "https://github.com/wch/Rttf2pt1") -- cgit v1.2.3 From 697e103ad08061edd94aa664e76af9fa20eaa499 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 16 Jan 2020 05:43:09 +0100 Subject: gnu: r-batchtools: Update to 0.9.12. * gnu/packages/cran.scm (r-batchtools): Update to 0.9.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 743110fb25..e49d939ba7 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15036,14 +15036,14 @@ (define-public r-blme (define-public r-batchtools (package (name "r-batchtools") - (version "0.9.11") + (version "0.9.12") (source (origin (method url-fetch) (uri (cran-uri "batchtools" version)) (sha256 (base32 - "02mj21ypcjv5fs7ajf63p6bq0cyvihdl55hlpqx6kmsfjin1cr0v")))) + "16x524hvy9d8p7r4fi1c8mixcvzgsjbf3y0vxaa56ssbbab4p7f9")))) (build-system r-build-system) (propagated-inputs `(("r-backports" ,r-backports) -- cgit v1.2.3 From 82ab1f4ca8260844eb76ffe99ef51de430aebc9d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 16 Jan 2020 05:43:14 +0100 Subject: gnu: r-umap: Update to 0.2.4.1. * gnu/packages/cran.scm (r-umap): Update to 0.2.4.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 e49d939ba7..fe1d2a5a36 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15346,14 +15346,14 @@ (define-public r-xgboost (define-public r-umap (package (name "r-umap") - (version "0.2.4.0") + (version "0.2.4.1") (source (origin (method url-fetch) (uri (cran-uri "umap" version)) (sha256 (base32 - "1dzbwq96k5vqr64wk6s26ks4311h570xg6gf0prr4vnn033pqnch")))) + "1pnh3hv8ihiz2nszqp797lkrdhhna2a6mzpizbsk0s9m8cj4wxva")))) (build-system r-build-system) (propagated-inputs `(("r-openssl" ,r-openssl) -- cgit v1.2.3 From dedbacdc755fe9781a792f83a48e9daf728dcbb5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 16 Jan 2020 05:43:20 +0100 Subject: gnu: r-parameters: Update to 0.4.0. * gnu/packages/cran.scm (r-parameters): 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 fe1d2a5a36..f6863aaf71 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15877,14 +15877,14 @@ (define-public r-assertr (define-public r-parameters (package (name "r-parameters") - (version "0.3.0") + (version "0.4.0") (source (origin (method url-fetch) (uri (cran-uri "parameters" version)) (sha256 (base32 - "0ifb9g1h8sn661q7jf9d8glk58gxdcym5ywbmx7phwn0y3is5wdv")))) + "0z1hdxgippchij28h8xbbz6l29kkyakwxxj5vxnpic40cpkqqdd6")))) (properties `((upstream-name . "parameters"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 951e1d4be70425aa5f77e801f5a8e9770ff68fde Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 16 Jan 2020 05:43:26 +0100 Subject: gnu: r-desolve: Update to 1.27.1. * gnu/packages/cran.scm (r-desolve): Update to 1.27.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 f6863aaf71..dfc35d7724 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -16034,13 +16034,13 @@ (define-public r-quadprog (define-public r-desolve (package (name "r-desolve") - (version "1.27") + (version "1.27.1") (source (origin (method url-fetch) (uri (cran-uri "deSolve" version)) (sha256 - (base32 "1qhjq4vxlxd9qmhf6i26x1k7bzhldlxzbby1zgcplicdvlqk951d")))) + (base32 "05sax045qrk550gsn2i7krb9rbg51rx88x4v190acsigqknxffrv")))) (properties `((upstream-name . "deSolve"))) (build-system r-build-system) (native-inputs -- cgit v1.2.3 From 4fac081a49e422024c144603ef513fb7382ee3b3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 16 Jan 2020 05:43:32 +0100 Subject: gnu: r-gdina: Update to 2.7.8. * gnu/packages/cran.scm (r-gdina): Update to 2.7.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 dfc35d7724..b150d1fcfd 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -17879,14 +17879,14 @@ (define-public r-alabama (define-public r-gdina (package (name "r-gdina") - (version "2.7.3") + (version "2.7.8") (source (origin (method url-fetch) (uri (cran-uri "GDINA" version)) (sha256 (base32 - "0875xfbm36gqzr0116xzlbm8rlff85rybr4s4hjzfflfvjdhgvfx")))) + "1aj2ssd7vpszl7p22srkkkpx4a7gkc38vrv3bq7j1zr32096y4zj")))) (properties `((upstream-name . "GDINA"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 8ef91aeb253aa7d3cd878421c20860ae9583c718 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 16 Jan 2020 05:43:37 +0100 Subject: gnu: r-poibin: Update to 1.5. * gnu/packages/cran.scm (r-poibin): Update to 1.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 b150d1fcfd..e998c587ce 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -18871,14 +18871,14 @@ (define-public r-knn-covertree (define-public r-poibin (package (name "r-poibin") - (version "1.4") + (version "1.5") (source (origin (method url-fetch) (uri (cran-uri "poibin" version)) (sha256 (base32 - "1rllgmk7yanb5amysl33kmi11lx86q5kqblyb8qqb3ckj2w4jhm2")))) + "1sxryvwwz6ldsnkzdy56p8c895s5yvpcai9ndyjv1x5q3l05wf9v")))) (properties `((upstream-name . "poibin"))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/poibin/") -- cgit v1.2.3 From 7241b44ad497d6a59c5cc55af2375ba4ba02143d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 16 Jan 2020 06:08:43 +0100 Subject: gnu: r-biocstyle: Update to 2.14.4. * gnu/packages/bioinformatics.scm (r-biocstyle): Update to 2.14.4. --- 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 0e4cb5b1db..0f7c7b7403 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus +;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus ;;; Copyright © 2015, 2016, 2017, 2018 Ben Woodcroft ;;; Copyright © 2015, 2016 Pjotr Prins ;;; Copyright © 2015 Andreas Enge @@ -7272,13 +7272,13 @@ (define-public r-biocviews (define-public r-biocstyle (package (name "r-biocstyle") - (version "2.14.2") + (version "2.14.4") (source (origin (method url-fetch) (uri (bioconductor-uri "BiocStyle" version)) (sha256 (base32 - "0nc1cbzp5zdwc0rss4r6v7cpgynmmnj3sczwmajr58nabkndwsvf")))) + "1x71in059zql40f4c87bd1gf96r945kdvwbq61jmch9d3d8nwxbb")))) (properties `((upstream-name . "BiocStyle"))) (build-system r-build-system) -- cgit v1.2.3 From fdf69f1ee0f604041028b325c6e9fec9577adb23 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 16 Jan 2020 06:09:16 +0100 Subject: gnu: r-s4vectors: Update to 0.24.2. * gnu/packages/bioinformatics.scm (r-s4vectors): Update to 0.24.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 0f7c7b7403..03ddd30004 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7345,13 +7345,13 @@ (define-public r-bioccheck (define-public r-s4vectors (package (name "r-s4vectors") - (version "0.24.1") + (version "0.24.2") (source (origin (method url-fetch) (uri (bioconductor-uri "S4Vectors" version)) (sha256 (base32 - "1rr7ml3gn83g8fbvhgvryyzlh4p3qgpwcrsz6ii4y7gh1hqxggpx")))) + "1s1h00k2ki7sd0hz4l8n41xr6ixszag7lm0ryrbb08idgcy16ipn")))) (properties `((upstream-name . "S4Vectors"))) (build-system r-build-system) -- cgit v1.2.3 From f7b5c1a02ff4fe4694252bf44e1650af93f4130b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 16 Jan 2020 06:09:21 +0100 Subject: gnu: r-iranges: Update to 2.20.2. * gnu/packages/bioinformatics.scm (r-iranges): Update to 2.20.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 03ddd30004..b72259042d 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7372,13 +7372,13 @@ (define-public r-s4vectors (define-public r-iranges (package (name "r-iranges") - (version "2.20.1") + (version "2.20.2") (source (origin (method url-fetch) (uri (bioconductor-uri "IRanges" version)) (sha256 (base32 - "0qssp04wfrc1r92hd3szy03n8sdz8vrqjdxa2mcrsc0k0n9bchz5")))) + "1jhnxb9yacmj2z82b6992gihjvj1a0gnjwbjiagyyx03fqnv23kg")))) (properties `((upstream-name . "IRanges"))) (build-system r-build-system) -- cgit v1.2.3 From d64124df89d61bf3429eb7bd7f50179be6740dd8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 16 Jan 2020 06:09:27 +0100 Subject: gnu: r-delayedarray: Update to 0.12.2. * gnu/packages/bioinformatics.scm (r-delayedarray): Update to 0.12.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 b72259042d..32eea9d153 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7783,13 +7783,13 @@ (define-public r-rsamtools (define-public r-delayedarray (package (name "r-delayedarray") - (version "0.12.1") + (version "0.12.2") (source (origin (method url-fetch) (uri (bioconductor-uri "DelayedArray" version)) (sha256 (base32 - "1yr4i2x127v814nxg53aibp77p3vg76f3n3hgknpwx3snfhc81xs")))) + "09lackgix5jpm16k0mz2zkibflfb4wzidbz4q32mlxmklf40037q")))) (properties `((upstream-name . "DelayedArray"))) (build-system r-build-system) -- cgit v1.2.3 From f8f181ae417d32bc3dec05731d9e8d6d84767b54 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 16 Jan 2020 06:09:49 +0100 Subject: gnu: r-affycoretools: Update to 1.58.4. * gnu/packages/bioconductor.scm (r-affycoretools): Update to 1.58.4. [propagated-inputs]: Add r-glimma. --- gnu/packages/bioconductor.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 863b97463a..689a7773c5 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016, 2017, 2018, 2019 Ricardo Wurmus +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus ;;; Copyright © 2016, 2017, 2018 Roel Janssen ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2019 Simon Tournier @@ -1053,14 +1053,14 @@ (define-public r-affycontam (define-public r-affycoretools (package (name "r-affycoretools") - (version "1.58.3") + (version "1.58.4") (source (origin (method url-fetch) (uri (bioconductor-uri "affycoretools" version)) (sha256 (base32 - "12r9ljkp3xix0xq8d1488c8wb3a4whb805v48ynmv985bs3phc71")))) + "1p283ysib04qzaayxmrpsmk5bq0jdq2rlky180jrlskpyg6risfw")))) (properties `((upstream-name . "affycoretools"))) (build-system r-build-system) (propagated-inputs @@ -1071,6 +1071,7 @@ (define-public r-affycoretools ("r-dbi" ,r-dbi) ("r-edger" ,r-edger) ("r-gcrma" ,r-gcrma) + ("r-glimma" ,r-glimma) ("r-ggplot2" ,r-ggplot2) ("r-gostats" ,r-gostats) ("r-gplots" ,r-gplots) -- cgit v1.2.3 From 7a8fcdacccea42d6a98d74cf01eb16304f3037b0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 16 Jan 2020 06:10:02 +0100 Subject: gnu: r-regioner: Update to 1.18.1. * gnu/packages/bioconductor.scm (r-regioner): Update to 1.18.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 689a7773c5..9b6201d7cb 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1166,14 +1166,14 @@ (define-public r-hpar (define-public r-regioner (package (name "r-regioner") - (version "1.18.0") + (version "1.18.1") (source (origin (method url-fetch) (uri (bioconductor-uri "regioneR" version)) (sha256 (base32 - "0m073hrqp62zpd2blnqm5ka539hcilir05m8av14vdhzhjzp13ya")))) + "0if7r6njz3ahm545383z5mzmzw8fdvw80a9lfz160j5pcgpx2dq9")))) (properties `((upstream-name . "regioneR"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 99e2a24978ff91a8d3a8fa700d2b01eca66cdbb3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 16 Jan 2020 06:10:08 +0100 Subject: gnu: r-inspect: Update to 1.16.2. * gnu/packages/bioconductor.scm (r-inspect): Update to 1.16.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 9b6201d7cb..b6414fdbaa 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -2000,14 +2000,14 @@ (define-public r-plgem (define-public r-inspect (package (name "r-inspect") - (version "1.16.1") + (version "1.16.2") (source (origin (method url-fetch) (uri (bioconductor-uri "INSPEcT" version)) (sha256 (base32 - "03cf9c94ra4f847ndlf8sn2cq1kl1055514wjq0lqbvlbfdj1dq3")))) + "1g8la7k4pnyr2hvk4yjd1bwvjy6nqbbb0fwxrrh2ifgqf4h21x2p")))) (properties `((upstream-name . "INSPEcT"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From ac9a9c374c4b03a410f8652666d8fc600c02ef11 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 16 Jan 2020 06:10:14 +0100 Subject: gnu: r-clusterprofiler: Update to 3.14.3. * gnu/packages/bioconductor.scm (r-clusterprofiler): Update to 3.14.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 b6414fdbaa..8a33aed0e9 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -3460,14 +3460,14 @@ (define-public r-enrichplot (define-public r-clusterprofiler (package (name "r-clusterprofiler") - (version "3.14.2") + (version "3.14.3") (source (origin (method url-fetch) (uri (bioconductor-uri "clusterProfiler" version)) (sha256 (base32 - "1y1l3yf1r1ykl9ngipvyzl5hbxxsfz7z5q5rcywkyss2b2b6gsg8")))) + "08pd7bmqmyxncj09ilz8yb9sf1pv9ni98y8b93pz2giy7pl407hg")))) (properties `((upstream-name . "clusterProfiler"))) (build-system r-build-system) -- cgit v1.2.3 From 516fa945b3884fe66e5854c64f4560fc5b6236be Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 16 Jan 2020 06:10:22 +0100 Subject: gnu: r-mlinterfaces: Update to 1.66.2. * gnu/packages/bioconductor.scm (r-mlinterfaces): Update to 1.66.2. [propagated-inputs]: Remove r-rda. --- gnu/packages/bioconductor.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 8a33aed0e9..ac0236aaed 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -3493,14 +3493,14 @@ (define-public r-clusterprofiler (define-public r-mlinterfaces (package (name "r-mlinterfaces") - (version "1.66.0") + (version "1.66.2") (source (origin (method url-fetch) (uri (bioconductor-uri "MLInterfaces" version)) (sha256 (base32 - "1vnzqd3y3jk1wgxybckzrcgwk0ly7zgcz5ki1ib0bk1jwv6xk5x8")))) + "1wc280iw9vllg6f58vsdj895yaqs8w42kl7jk8sgii009gwlaj8d")))) (properties `((upstream-name . "MLInterfaces"))) (build-system r-build-system) (propagated-inputs @@ -3518,7 +3518,6 @@ (define-public r-mlinterfaces ("r-mlbench" ,r-mlbench) ("r-pls" ,r-pls) ("r-rcolorbrewer" ,r-rcolorbrewer) - ("r-rda" ,r-rda) ("r-rpart" ,r-rpart) ("r-sfsmisc" ,r-sfsmisc) ("r-shiny" ,r-shiny) -- cgit v1.2.3 From 3f42bd81a59b8997a430b030ad5e9ff920af30e8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 16 Jan 2020 06:10:35 +0100 Subject: gnu: r-ropls: Update to 1.18.6. * gnu/packages/bioconductor.scm (r-ropls): Update to 1.18.6. --- 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 ac0236aaed..d7c5de7d77 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5164,14 +5164,14 @@ (define-public r-multidataset (define-public r-ropls (package (name "r-ropls") - (version "1.18.0") + (version "1.18.6") (source (origin (method url-fetch) (uri (bioconductor-uri "ropls" version)) (sha256 (base32 - "05w1zrq92w3jfwq5sdyj27m5qjg4zv7acywia8vd6y5fbgcnyzlp")))) + "1sm2fmygrra9gdcs90lmk5y1ag6arga6159kggx4ij8bkhyc66vb")))) (build-system r-build-system) (propagated-inputs `(("r-biobase" ,r-biobase) -- cgit v1.2.3 From e8ccb98a0823ca1d426cd00620c668226665315a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 16 Jan 2020 06:10:41 +0100 Subject: gnu: r-flowworkspace: Update to 3.34.1. * gnu/packages/bioconductor.scm (r-flowworkspace): Update to 3.34.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 d7c5de7d77..e2ee120773 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5586,14 +5586,14 @@ (define-public r-rprotobuflib (define-public r-flowworkspace (package (name "r-flowworkspace") - (version "3.34.0") + (version "3.34.1") (source (origin (method url-fetch) (uri (bioconductor-uri "flowWorkspace" version)) (sha256 (base32 - "0hvbkxyylsygra31l1lxyvbsr5hc50lqy1y7gwrfgrfil4a2m762")))) + "1ijbc6z9ljhrw3cqr02smgplhrfg44gzrb1dq4gbrpq3nj4khhpn")))) (properties `((upstream-name . "flowWorkspace"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From d1ac643062b51ea69ed2413e2d4457ab8db4fd9d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 16 Jan 2020 06:10:46 +0100 Subject: gnu: r-variancepartition: Update to 1.16.1. * gnu/packages/bioconductor.scm (r-variancepartition): Update to 1.16.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 e2ee120773..ef34b99649 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -6451,14 +6451,14 @@ (define-public r-wavetiling (define-public r-variancepartition (package (name "r-variancepartition") - (version "1.16.0") + (version "1.16.1") (source (origin (method url-fetch) (uri (bioconductor-uri "variancePartition" version)) (sha256 (base32 - "1ygx7f2sp4b7ilgspm6vqcbjxs7br9s6g3gwcdb978kx03ymp4i8")))) + "02pzsff14j4am2d949mh8xgi0c7k44g09q4lr6nqm08vf92brb6g")))) (properties `((upstream-name . "variancePartition"))) (build-system r-build-system) -- cgit v1.2.3 From ba07842c349444743c8fb19f08a42e5e6aa71035 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Thu, 16 Jan 2020 08:42:59 +0000 Subject: gnu: cuirass: Update to 0.0.1-27.46f73b6. * gnu/packages/ci.scm (cuirass): Update to 0.0.1-27.46f73b6. --- 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 b49ac0f7c1..2006dc5173 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 "e20ff86d97f7dd92dad140b5919e3cbdf2fb1ce6") - (revision "26")) + (let ((commit "46f73b6b7c05389c67b02d32c8946ca665611cba") + (revision "27")) (package (name "cuirass") (version (string-append "0.0.1-" revision "." (string-take commit 7))) @@ -60,7 +60,7 @@ (define-public cuirass (file-name (string-append name "-" version)) (sha256 (base32 - "1c3rcfmx7vm13x3nid9xbl18rrqljh5vb71qxps4yqid75br4hrb")))) + "1zw4g4y0cc76i0s0hdc7jbyhwkn8pz03k6x02dslq42000cyjgi2")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) -- cgit v1.2.3 From ee9a735bc8f544cf8eedc6c6a7e4ed2962663013 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 16 Jan 2020 15:16:02 +0100 Subject: graph: Add '--load-path' option. * guix/scripts/graph.scm (%option): Add '--load-path' option. * doc/guix.texi: Document it. * tests/guix-graph.sh: Test it. --- doc/guix.texi | 9 +++++++++ guix/scripts/graph.scm | 8 ++++++++ tests/guix-graph.sh | 27 +++++++++++++++++++++++++-- 3 files changed, 42 insertions(+), 2 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index d2038d18e1..a490a09a46 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -70,6 +70,7 @@ Copyright @copyright{} 2019 Kyle Andrews@* Copyright @copyright{} 2019 Alex Griffin@* Copyright @copyright{} 2019 Guillaume Le Vaillant@* Copyright @copyright{} 2020 Leo Prikler@* +Copyright @copyright{} 2019 Simon Tournier@* Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or @@ -10038,6 +10039,14 @@ Display the graph for @var{system}---e.g., @code{i686-linux}. The package dependency graph is largely architecture-independent, but there are some architecture-dependent bits that this option allows you to visualize. + +@item --load-path=@var{directory} +@itemx -L @var{directory} +Add @var{directory} to the front of the package module search path +(@pxref{Package Modules}). + +This allows users to define their own packages and make them visible to +the command-line tools. @end table On top of that, @command{guix graph} supports all the usual package diff --git a/guix/scripts/graph.scm b/guix/scripts/graph.scm index 7558cb1e85..53f407b2fc 100644 --- a/guix/scripts/graph.scm +++ b/guix/scripts/graph.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2019 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -35,6 +36,7 @@ (define-module (guix scripts graph) #:use-module ((guix scripts build) #:select (show-transformation-options-help options->transformation + %standard-build-options %transformation-options)) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) @@ -473,6 +475,9 @@ (define %options (lambda (opt name arg result) (alist-cons 'system arg (alist-delete 'system result eq?)))) + (find (lambda (option) + (member "load-path" (option-names option))) + %standard-build-options) (option '(#\h "help") #f #f (lambda args (show-help) @@ -501,6 +506,9 @@ (define (show-help) (display (G_ " -s, --system=SYSTEM consider the graph for SYSTEM--e.g., \"i686-linux\"")) (newline) + (display (G_ " + -L, --load-path=DIR prepend DIR to the package module search path")) + (newline) (show-transformation-options-help) (newline) (display (G_ " diff --git a/tests/guix-graph.sh b/tests/guix-graph.sh index 2d4b3fac3f..4c37b61b38 100644 --- a/tests/guix-graph.sh +++ b/tests/guix-graph.sh @@ -1,5 +1,6 @@ # GNU Guix --- Functional package management for GNU # Copyright © 2015, 2016, 2019 Ludovic Courtès +# Copyright © 2019 Simon Tournier # # This file is part of GNU Guix. # @@ -20,10 +21,29 @@ # Test the 'guix graph' command-line utility. # -tmpfile1="t-guix-graph1-$$" -tmpfile2="t-guix-graph2-$$" +module_dir="t-guix-graph-$$" +mkdir "$module_dir" +trap "rm -rf $module_dir" EXIT + +tmpfile1="$module_dir/t-guix-graph1-$$" +tmpfile2="$module_dir/t-guix-graph2-$$" trap 'rm -f "$tmpfile1" "$tmpfile2"' EXIT + +cat > "$module_dir/foo.scm"< Date: Wed, 15 Jan 2020 18:00:02 +0100 Subject: size: Add '--load-path' option. * guix/scripts/size.scm (%option): Add '--load-path' option. * doc/guix.texi: Document it. --- doc/guix.texi | 7 +++++++ guix/scripts/size.scm | 8 ++++++++ 2 files changed, 15 insertions(+) diff --git a/doc/guix.texi b/doc/guix.texi index a490a09a46..cbaca4acdb 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -9838,6 +9838,13 @@ the case, @command{guix size} fails as it tries to load it. @itemx -s @var{system} Consider packages for @var{system}---e.g., @code{x86_64-linux}. +@item --load-path=@var{directory} +@itemx -L @var{directory} +Add @var{directory} to the front of the package module search path +(@pxref{Package Modules}). + +This allows users to define their own packages and make them visible to +the command-line tools. @end table @node Invoking guix graph diff --git a/guix/scripts/size.scm b/guix/scripts/size.scm index f549ce05b8..2446b84587 100644 --- a/guix/scripts/size.scm +++ b/guix/scripts/size.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2019 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -19,6 +20,7 @@ (define-module (guix scripts size) #:use-module (guix ui) #:use-module (guix scripts) + #:use-module (guix scripts build) #:use-module (guix store) #:use-module (guix monads) #:use-module (guix combinators) @@ -242,6 +244,9 @@ (define (show-help) -m, --map-file=FILE write to FILE a graphical map of disk usage")) (newline) (display (G_ " + -L, --load-path=DIR prepend DIR to the package module search path")) + (newline) + (display (G_ " -h, --help display this help and exit")) (display (G_ " -V, --version display version information and exit")) @@ -273,6 +278,9 @@ (define %options (option '(#\m "map-file") #t #f (lambda (opt name arg result) (alist-cons 'map-file arg result))) + (find (lambda (option) + (member "load-path" (option-names option))) + %standard-build-options) (option '(#\h "help") #f #f (lambda args (show-help) -- cgit v1.2.3 From 21f4fbdd8453e489fb89825c4226a0a0bda2bc17 Mon Sep 17 00:00:00 2001 From: zimoun Date: Wed, 15 Jan 2020 18:00:03 +0100 Subject: refresh: Add '--load-path' option. * guix/scripts/refresh.scm (%option): Add '--load-path' option. * doc/guix.texi: Document it. --- doc/guix.texi | 19 +++++++++++++------ guix/scripts/refresh.scm | 18 ++++++++++++++++++ 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index cbaca4acdb..a05ea17cda 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -70,7 +70,7 @@ Copyright @copyright{} 2019 Kyle Andrews@* Copyright @copyright{} 2019 Alex Griffin@* Copyright @copyright{} 2019 Guillaume Le Vaillant@* Copyright @copyright{} 2020 Leo Prikler@* -Copyright @copyright{} 2019 Simon Tournier@* +Copyright @copyright{} 2019, 2020 Simon Tournier@* Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or @@ -1096,7 +1096,7 @@ similar file. It can be converted to the OpenSSH format using @command{lsh-export-key} (@pxref{Converting keys,,, lsh, LSH Manual}): @example -$ lsh-export-key --openssh < /etc/lsh/host-key.pub +$ lsh-export-key --openssh < /etc/lsh/host-key.pub ssh-rsa AAAAB3NzaC1yc2EAAAAEOp8FoQAAAQEAs1eB46LV@dots{} @end example @@ -6032,9 +6032,9 @@ build file @file{build.xml} with tasks to build the specified jar archive. In this case the parameter @code{#:source-dir} can be used to specify the source sub-directory, defaulting to ``src''. -The @code{#:main-class} parameter can be used with the minimal ant -buildfile to specify the main class of the resulting jar. This makes the -jar file executable. The @code{#:test-include} parameter can be used to +The @code{#:main-class} parameter can be used with the minimal ant +buildfile to specify the main class of the resulting jar. This makes the +jar file executable. The @code{#:test-include} parameter can be used to specify the list of junit tests to run. It defaults to @code{(list "**/*Test.java")}. The @code{#:test-exclude} can be used to disable some tests. It defaults to @code{(list "**/Abstract*.java")}, @@ -9553,6 +9553,13 @@ the user whether to download it or not. This is the default behavior. @item --key-server=@var{host} Use @var{host} as the OpenPGP key server when importing a public key. +@item --load-path=@var{directory} +Add @var{directory} to the front of the package module search path +(@pxref{Package Modules}). + +This allows users to define their own packages and make them visible to +the command-line tools. + @end table The @code{github} updater uses the @@ -26114,7 +26121,7 @@ description: Install the given fonts on the specified ttys (fonts are per + virtual console on GNU/Linux). The value of this service is a list of + tty/font pairs. The font can be the name of a font provided by the `kbd' + package or any valid argument to `setfont', as in this example: -+ ++ + '(("tty1" . "LatGrkCyr-8x16") + ("tty2" . (file-append + font-tamzen diff --git a/guix/scripts/refresh.scm b/guix/scripts/refresh.scm index daf6fcf947..bc8e906054 100644 --- a/guix/scripts/refresh.scm +++ b/guix/scripts/refresh.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2018 Efraim Flashner ;;; Copyright © 2019 Ricardo Wurmus +;;; Copyright © 2020 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,6 +28,7 @@ (define-module (guix scripts refresh) #:use-module (guix ui) #:use-module (gcrypt hash) #:use-module (guix scripts) + #:use-module ((guix scripts build) #:select (%standard-build-options)) #:use-module (guix store) #:use-module (guix utils) #:use-module (guix packages) @@ -116,6 +118,19 @@ (define %options (leave (G_ "unsupported policy: ~a~%") arg))))) + ;; The short option -L is already used by --list-updaters, therefore + ;; it needs to be removed from %standard-build-options. + (let ((%load-path-option (find (lambda (option) + (member "load-path" + (option-names option))) + %standard-build-options))) + (option + (filter (lambda (name) (not (equal? #\L name))) + (option-names %load-path-option)) + (option-required-arg? %load-path-option) + (option-optional-arg? %load-path-option) + (option-processor %load-path-option))) + (option '(#\h "help") #f #f (lambda args (show-help) @@ -165,6 +180,9 @@ (define (show-help) 'always', 'never', and 'interactive', which is also used when 'key-download' is not specified")) (newline) + (display (G_ " + --load-path=DIR prepend DIR to the package module search path")) + (newline) (display (G_ " -h, --help display this help and exit")) (display (G_ " -- cgit v1.2.3 From 3c8396b578fe1b2efa942785e92a433c5f712b5d Mon Sep 17 00:00:00 2001 From: zimoun Date: Wed, 15 Jan 2020 18:00:04 +0100 Subject: edit: Add '--load-path' option. * guix/scripts/edit.scm (%option): Add '--load-path' option. * doc/guix.texi: Document it. --- doc/guix.texi | 4 ++++ guix/scripts/edit.scm | 10 +++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index a05ea17cda..87ad1212bf 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -8706,6 +8706,10 @@ have created your own packages on @code{GUIX_PACKAGE_PATH} recipes. In other cases, you will be able to examine the read-only recipes for packages currently in the store. +Instead of @code{GUIX_PACKAGE_PATH}, the command-line option +@code{--load-path=@var{directory}} (or in short @code{-L +@var{directory}}) allows you to add @var{directory} to the front of the +package module search path and so make your own packages visible. @node Invoking guix download @section Invoking @command{guix download} diff --git a/guix/scripts/edit.scm b/guix/scripts/edit.scm index da3d2775e8..a6fd1d2751 100644 --- a/guix/scripts/edit.scm +++ b/guix/scripts/edit.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015, 2016, 2019 Ludovic Courtès ;;; Copyright © 2015 Mathieu Lirzin +;;; Copyright © 2020 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -20,6 +21,7 @@ (define-module (guix scripts edit) #:use-module (guix ui) #:use-module (guix scripts) + #:use-module ((guix scripts build) #:select (%standard-build-options)) #:use-module (guix utils) #:use-module (gnu packages) #:use-module (srfi srfi-1) @@ -28,7 +30,10 @@ (define-module (guix scripts edit) guix-edit)) (define %options - (list (option '(#\h "help") #f #f + (list (find (lambda (option) + (member "load-path" (option-names option))) + %standard-build-options) + (option '(#\h "help") #f #f (lambda args (show-help) (exit 0))) @@ -39,6 +44,9 @@ (define %options (define (show-help) (display (G_ "Usage: guix edit PACKAGE... Start $VISUAL or $EDITOR to edit the definitions of PACKAGE...\n")) + (newline) + (display (G_ " + -L, --load-path=DIR prepend DIR to the package module search path")) (newline) (display (G_ " -h, --help display this help and exit")) -- cgit v1.2.3 From e8728862a15abd58702ff4be05440298c0734e57 Mon Sep 17 00:00:00 2001 From: zimoun Date: Wed, 15 Jan 2020 18:00:05 +0100 Subject: repl: Add '--load-path' option. * guix/scripts/repl.scm (%option): Add '--load-path' option. * doc/guix.texi: Document it. --- doc/guix.texi | 8 ++++++++ guix/scripts/repl.scm | 9 ++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index 87ad1212bf..788a2a7d4f 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -7996,6 +7996,14 @@ Accept connections on localhost on port 37146. @item --listen=unix:/tmp/socket Accept connections on the Unix-domain socket @file{/tmp/socket}. @end table + +@item --load-path=@var{directory} +@itemx -L @var{directory} +Add @var{directory} to the front of the package module search path +(@pxref{Package Modules}). + +This allows users to define their own packages and make them visible to +the command-line tool. @end table @c ********************************************************************* diff --git a/guix/scripts/repl.scm b/guix/scripts/repl.scm index e1cc759fc8..39a9b09656 100644 --- a/guix/scripts/repl.scm +++ b/guix/scripts/repl.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018, 2019 Ludovic Courtès +;;; Copyright © 2020 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -19,6 +20,7 @@ (define-module (guix scripts repl) #:use-module (guix ui) #:use-module (guix scripts) + #:use-module ((guix scripts build) #:select (%standard-build-options)) #:use-module (guix repl) #:use-module (guix utils) #:use-module (guix packages) @@ -52,7 +54,10 @@ (define %options (alist-cons 'type (string->symbol arg) result))) (option '("listen") #t #f (lambda (opt name arg result) - (alist-cons 'listen arg result))))) + (alist-cons 'listen arg result))) + (find (lambda (option) + (member "load-path" (option-names option))) + %standard-build-options))) (define (show-help) @@ -60,6 +65,8 @@ (define (show-help) Start a Guile REPL in the Guix execution environment.\n")) (display (G_ " -t, --type=TYPE start a REPL of the given TYPE")) + (display (G_ " + -L, --load-path=DIR prepend DIR to the package module search path")) (newline) (display (G_ " -h, --help display this help and exit")) -- cgit v1.2.3 From d14e4745b36a835c6babd5b5f5562e12294cd9cf Mon Sep 17 00:00:00 2001 From: zimoun Date: Wed, 15 Jan 2020 18:00:06 +0100 Subject: repl: Fix '--help' message. * guix/scripts/repl.scm: (show-help): Add '--listen' option message. --- guix/scripts/repl.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/guix/scripts/repl.scm b/guix/scripts/repl.scm index 39a9b09656..fc3e4e2131 100644 --- a/guix/scripts/repl.scm +++ b/guix/scripts/repl.scm @@ -65,6 +65,9 @@ (define (show-help) Start a Guile REPL in the Guix execution environment.\n")) (display (G_ " -t, --type=TYPE start a REPL of the given TYPE")) + (display (G_ " + --listen=ENDPOINT listen ENDPOINT instead of standard I/O")) + (newline) (display (G_ " -L, --load-path=DIR prepend DIR to the package module search path")) (newline) -- cgit v1.2.3 From 602f3b679325c30b62201999f1d4f211f08fc0e5 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 16 Jan 2020 16:49:23 +0100 Subject: gnu: Add python-speg. * gnu/packages/python-xyz.scm (python-speg): 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 479466cc81..97da0974e0 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17073,3 +17073,24 @@ (define-public python-funcparserlib functional combinators. Parser combinators are just higher-order functions that take parsers as their arguments and return them as result values.") (license license:expat))) + +(define-public python-speg + (package + (name "python-speg") + (version "0.3") + (source + (origin + (method url-fetch) + (uri (pypi-uri "speg" version ".zip")) + (sha256 + (base32 "0w9y4jf4787dzhy6rvhwi0mpl0r8qkqmqmyv2hpwdpv8w53yzjqh")))) + (arguments + `(#:tests? #f)) ;FIXME: tests fail, not sure why + (native-inputs + `(("unzip" ,unzip))) + (build-system python-build-system) + (home-page "https://github.com/avakar/speg") + (synopsis "PEG-based parser interpreter with memoization") + (description "This package is a PEG-based parser and interpreter with +memoization.") + (license license:expat))) -- cgit v1.2.3 From 07c8177b885f1fca367b9cf8befc3328392d79c2 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 16 Jan 2020 16:49:43 +0100 Subject: gnu: Add python-cson. * gnu/packages/python-xyz.scm (python-cson): New variable. --- gnu/packages/python-xyz.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 97da0974e0..41a2df0cf3 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17094,3 +17094,22 @@ (define-public python-speg (description "This package is a PEG-based parser and interpreter with memoization.") (license license:expat))) + +(define-public python-cson + (package + (name "python-cson") + (version "0.8") + (source + (origin + (method url-fetch) + (uri (pypi-uri "cson" version)) + (sha256 + (base32 "00cyvigg4npbph39ghkg77xbxisa6plf75vii24igxfizik0337f")))) + (build-system python-build-system) + (propagated-inputs + `(("python-speg" ,python-speg))) + (home-page "https://github.com/avakar/pycson") + (synopsis "Parser for Coffeescript Object Notation (CSON)") + (description "This package is a parser for Coffeescript Object +Notation (CSON).") + (license license:expat))) -- cgit v1.2.3 From 1b4c5af29c364969dbeb33681d641640283fbced Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 16 Jan 2020 17:00:53 +0100 Subject: gnu: asymptote: Fix GUI. Fixes bug#39147. * gnu/packages/plotutils.scm (asymptote)[inputs]: Add missing inputs. [arguments]: Wrap GUI executable "xasy". --- gnu/packages/plotutils.scm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index 8a3afc9605..7d9b2d8748 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm @@ -37,7 +37,9 @@ (define-module (gnu packages plotutils) #:use-module (gnu packages perl) #: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 qt) #:use-module (gnu packages texinfo) #:use-module (gnu packages tex) #:use-module (gnu packages compression) @@ -196,7 +198,7 @@ (define-public asymptote `(("emacs" ,emacs-minimal) ("gs" ,ghostscript) ;For tests ("perl" ,perl) - ("texinfo" ,texinfo) ;For generating documentation + ("texinfo" ,texinfo) ;For generating documentation ;; For the manual and the tests. ("texlive" ,(texlive-union (list texlive-amsfonts texlive-epsf @@ -214,6 +216,8 @@ (define-public asymptote ("gsl" ,gsl) ("libgc" ,libgc) ("python" ,python) + ("python-cson" ,python-cson) + ("python-pyqt" ,python-pyqt) ("readline" ,readline) ("zlib" ,zlib))) (arguments @@ -271,6 +275,14 @@ (define-public asymptote (for-each (cut install-file <> lisp-dir) (find-files "." "\\.el$")) (emacs-generate-autoloads ,name lisp-dir)) + #t)) + (add-after 'install-Emacs-data 'wrap-python-script + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; Make sure 'xasy' runs with the correct PYTHONPATH. + (let* ((out (assoc-ref outputs "out")) + (path (getenv "PYTHONPATH"))) + (wrap-program (string-append out "/share/asymptote/GUI/xasy.py") + `("PYTHONPATH" ":" prefix (,path)))) #t))))) (home-page "http://asymptote.sourceforge.net") (synopsis "Script-based vector graphics language") -- cgit v1.2.3 From a8fa39cd0877ac5db5cb46dbf7335b44454b94d8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 16 Jan 2020 02:08:25 +0100 Subject: gnu: lmdb: Update to 0.9.24. * gnu/packages/databases.scm (lmdb): Update to 0.9.24. --- 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 283ba02db2..be9611a7b2 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -23,7 +23,7 @@ ;;; Copyright © 2017 Jelle Licht ;;; Copyright © 2017 Adriano Peluso ;;; Copyright © 2017 Arun Isaac -;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2017, 2018 Alex Vong ;;; Copyright © 2017, 2018 Ben Woodcroft ;;; Copyright © 2017 Rutger Helling @@ -2064,7 +2064,7 @@ (define-public perl-db-file (define-public lmdb (package (name "lmdb") - (version "0.9.23") + (version "0.9.24") (source (origin (method git-fetch) @@ -2073,7 +2073,7 @@ (define-public lmdb (commit (string-append "LMDB_" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0ag7l5180ajvm73y59m7sn3p52xm8m972d08cshxhpwgwa4v35k6")))) + (base32 "088q6m8fvr12w43s461h7cvpg5hj8csaqj6n9pci150dz7bk5lxm")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit v1.2.3 From d7df48fad44fd10d795be4577acddcf106049d0b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 16 Jan 2020 17:25:01 +0100 Subject: gnu: neomutt: Update to 20191207. * gnu/packages/mail.scm (neomutt): Update to 20191207. --- 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 c49ed76f1a..d32fd3fc0d 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -405,7 +405,7 @@ (define-public mutt (define-public neomutt (package (name "neomutt") - (version "20191102") + (version "20191207") (source (origin (method git-fetch) @@ -414,7 +414,7 @@ (define-public neomutt (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0x5f9zbvxsxg5y2ir4xq4xw1q2snaxkidhdyhcxw5ljw3qqwhlyq")))) + (base32 "147yjpqnsbfy01fhsflxlixk0985r91a6bjmqq3cwmf7gka3sihm")))) (build-system gnu-build-system) (inputs `(("cyrus-sasl" ,cyrus-sasl) -- cgit v1.2.3 From a2548a3b5efb1ff17b19bc86e86940875c0a9f40 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 16 Jan 2020 18:06:36 +0100 Subject: gnu: Update copyright header. * gnu/packages/python-xyz.scm: Update copyright header. --- 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 41a2df0cf3..054974d44f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -51,7 +51,7 @@ ;;; Copyright © 2018 Mathieu Lirzin ;;; Copyright © 2018 Adam Massmann ;;; Copyright © 2016, 2018 Tomáš Čech -;;; Copyright © 2018, 2019 Nicolas Goaziou +;;; Copyright © 2018, 2019, 2020 Nicolas Goaziou ;;; Copyright © 2018 Oleg Pykhalov ;;; Copyright © 2018, 2019 Clément Lassieur ;;; Copyright © 2018, 2019 Maxim Cournoyer -- cgit v1.2.3 From 4fe01b09ea0b304b963b7fd9f168439ddfb515c1 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 16 Jan 2020 10:43:29 +0100 Subject: publish: Export 'signed-string'. * guix/scripts/publish.scm (signed-string): Export and improve docstring. * tests/publish.scm ("/*.narinfo") ("/*.narinfo with properly encoded '+' sign"): Adjust accordingly. --- guix/scripts/publish.scm | 4 +++- tests/publish.scm | 8 +++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/guix/scripts/publish.scm b/guix/scripts/publish.scm index 71a349d2fe..f5b2f5fd4e 100644 --- a/guix/scripts/publish.scm +++ b/guix/scripts/publish.scm @@ -64,6 +64,7 @@ (define-module (guix scripts publish) #:use-module ((guix build syscalls) #:select (set-thread-name)) #:export (%public-key %private-key + signed-string guix-publish)) @@ -237,7 +238,8 @@ (define %nix-cache-info ("Priority" . 100))) (define (signed-string s) - "Sign the hash of the string S with the daemon's key." + "Sign the hash of the string S with the daemon's key. Return a canonical +sexp for the signature." (let* ((public-key (%public-key)) (hash (bytevector->hash-data (sha256 (string->utf8 s)) #:key-type (key-type public-key)))) diff --git a/tests/publish.scm b/tests/publish.scm index 204cfb4974..e43310ef00 100644 --- a/tests/publish.scm +++ b/tests/publish.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 David Thompson -;;; Copyright © 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -153,8 +153,7 @@ (define %gzip-magic-bytes (signature (base64-encode (string->utf8 (canonical-sexp->string - ((@@ (guix scripts publish) signed-string) - unsigned-info)))))) + (signed-string unsigned-info)))))) (format #f "~aSignature: 1;~a;~a~%" unsigned-info (gethostname) signature)) (utf8->string @@ -184,8 +183,7 @@ (define %gzip-magic-bytes (signature (base64-encode (string->utf8 (canonical-sexp->string - ((@@ (guix scripts publish) signed-string) - unsigned-info)))))) + (signed-string unsigned-info)))))) (format #f "~aSignature: 1;~a;~a~%" unsigned-info (gethostname) signature)) -- cgit v1.2.3 From 84c5da08dda4fa8fd0e0f1e6a8a115190005f84a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 16 Jan 2020 10:57:19 +0100 Subject: guix package: Export 'transaction-upgrade-entry'. * guix/scripts/package.scm (transaction-upgrade-entry): Add 'store' parameter and use it instead of (%store). Export. * tests/packages.scm ("transaction-upgrade-entry, zero upgrades") ("transaction-upgrade-entry, one upgrade") ("transaction-upgrade-entry, superseded package"): Adjust accordingly. --- guix/scripts/package.scm | 8 +++++--- tests/packages.scm | 11 +++++++---- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm index 0fe25aee6f..f4d92a649e 100644 --- a/guix/scripts/package.scm +++ b/guix/scripts/package.scm @@ -63,6 +63,8 @@ (define-module (guix scripts package) delete-matching-generations guix-package + transaction-upgrade-entry ;mostly for testing + (%options . %package-options) (%default-options . %package-default-options) guix-package*)) @@ -205,7 +207,7 @@ (define (find-packages-by-description regexps) (package-full-name package2)) (> score1 score2)))))))))) -(define (transaction-upgrade-entry entry transaction) +(define (transaction-upgrade-entry store entry transaction) "Return a variant of TRANSACTION that accounts for the upgrade of ENTRY, a ." (define (supersede old new) @@ -242,7 +244,7 @@ (define (supersede old new) transaction) ((=) (let ((candidate-path (derivation->output-path - (package-derivation (%store) pkg)))) + (package-derivation store pkg)))) ;; XXX: When there are propagated inputs, assume we need to ;; upgrade the whole entry. (if (and (string=? path candidate-path) @@ -600,7 +602,7 @@ (define upgrade? (define upgraded (fold (lambda (entry transaction) (if (upgrade? (manifest-entry-name entry)) - (transaction-upgrade-entry entry transaction) + (transaction-upgrade-entry (%store) entry transaction) transaction)) transaction (manifest-entries manifest))) diff --git a/tests/packages.scm b/tests/packages.scm index 423c5061aa..1ff35ec9c4 100644 --- a/tests/packages.scm +++ b/tests/packages.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 © Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. @@ -100,7 +100,8 @@ (define %store (let* ((old (dummy-package "foo" (version "1"))) (tx (mock ((gnu packages) find-best-packages-by-name (const '())) - ((@@ (guix scripts package) transaction-upgrade-entry) + (transaction-upgrade-entry + #f ;no store access needed (manifest-entry (inherit (package->manifest-entry old)) (item (string-append (%store-prefix) "/" @@ -113,7 +114,8 @@ (define %store (new (dummy-package "foo" (version "2"))) (tx (mock ((gnu packages) find-best-packages-by-name (const (list new))) - ((@@ (guix scripts package) transaction-upgrade-entry) + (transaction-upgrade-entry + #f ;no store access needed (manifest-entry (inherit (package->manifest-entry old)) (item (string-append (%store-prefix) "/" @@ -130,7 +132,8 @@ (define %store (dep (deprecated-package "foo" new)) (tx (mock ((gnu packages) find-best-packages-by-name (const (list dep))) - ((@@ (guix scripts package) transaction-upgrade-entry) + (transaction-upgrade-entry + #f ;no store access needed (manifest-entry (inherit (package->manifest-entry old)) (item (string-append (%store-prefix) "/" -- cgit v1.2.3 From 47212fc763788660ff9051ccee1f6fa8a0db7bdd Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 16 Jan 2020 15:00:18 +0100 Subject: records: Improve reporting of "invalid field specifier" errors. Previously users would just see: error: invalid field specifier without source location or hints. * guix/records.scm (expand): Add optional 'parent-form' parameter and pass it to 'syntax-violation' when it is true. (make-syntactic-constructor): Pass S as a third argument to 'report-invalid-field-specifier'. * guix/ui.scm (report-load-error): For 'syntax-error', show SUBFORM or FORM in the message. * tests/records.scm ("define-record-type* & wrong field specifier"): Add a 'subform' parameter and adjust test accordingly. ("define-record-type* & wrong field specifier, identifier"): New test. * tests/guix-system.sh: Add test. --- guix/records.scm | 19 ++++++++++++++----- guix/ui.scm | 5 +++-- tests/guix-system.sh | 22 +++++++++++++++++++++- tests/records.scm | 34 +++++++++++++++++++++++++++++++--- 4 files changed, 69 insertions(+), 11 deletions(-) diff --git a/guix/records.scm b/guix/records.scm index 99507dc384..4bda5426a3 100644 --- a/guix/records.scm +++ b/guix/records.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 © 2018 Mark H Weaver ;;; ;;; This file is part of GNU Guix. @@ -70,14 +70,22 @@ (define (abi-check type cookie) "~a: record ABI mismatch; recompilation needed" (list #,type) '())))) - (define (report-invalid-field-specifier name bindings) - "Report the first invalid binding among BINDINGS." + (define* (report-invalid-field-specifier name bindings + #:optional parent-form) + "Report the first invalid binding among BINDINGS. PARENT-FORM is used for +error-reporting purposes." (let loop ((bindings bindings)) (syntax-case bindings () (((field value) rest ...) ;good (loop #'(rest ...))) ((weird _ ...) ;weird! - (syntax-violation name "invalid field specifier" #'weird))))) + ;; WEIRD may be an identifier, thus lacking source location info, and + ;; BINDINGS is a list, also lacking source location info. Hopefully + ;; PARENT-FORM provides source location info. + (apply syntax-violation name "invalid field specifier" + (if parent-form + (list parent-form #'weird) + (list #'weird))))))) (define (report-duplicate-field-specifier name ctor) "Report the first duplicate identifier among the bindings in CTOR." @@ -233,7 +241,8 @@ (define (field-value f) ;; Report precisely which one is faulty, instead of letting the ;; "source expression failed to match any pattern" error. (report-invalid-field-specifier 'name - #'(bindings (... ...)))))))))) + #'(bindings (... ...)) + s)))))))) (define-syntax-rule (define-field-property-predicate predicate property) "Define PREDICATE as a procedure that takes a syntax object and, when passed diff --git a/guix/ui.scm b/guix/ui.scm index b99a9e59f5..01aeee49eb 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -372,9 +372,10 @@ (define* (report-load-error file args #:optional frame) (format (current-error-port) (G_ "~amissing closing parenthesis~%") location)) (apply throw args))) - (('syntax-error proc message properties form . rest) + (('syntax-error proc message properties form subform . rest) (let ((loc (source-properties->location properties))) - (report-error loc (G_ "~a~%") message))) + (report-error loc (G_ "~s: ~a~%") + (or subform form) message))) (('unbound-variable _ ...) (report-unbound-variable-error args #:frame frame)) (((or 'srfi-34 '%exception) obj) diff --git a/tests/guix-system.sh b/tests/guix-system.sh index 1b2c425725..271627c2a5 100644 --- a/tests/guix-system.sh +++ b/tests/guix-system.sh @@ -1,5 +1,5 @@ # GNU Guix --- Functional package management for GNU -# Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +# Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès # Copyright © 2017 Tobias Geerinckx-Rice # Copyright © 2018 Chris Marusich # @@ -130,6 +130,26 @@ else fi fi +cat > "$tmpfile" < "$errorfile" +then false +else + # Here '%base-file-systems' appears as if it were a field specified of the + # enclosing 'operating-system' form due to parenthesis mismatch. + grep "$tmpfile:3:[0-9]\+:.*%base-file-system.*invalid field specifier" \ + "$errorfile" +fi + OS_BASE=' (host-name "antelope") (timezone "Europe/Paris") diff --git a/tests/records.scm b/tests/records.scm index 16b7a9c35e..2c55a61720 100644 --- a/tests/records.scm +++ b/tests/records.scm @@ -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 ;;; ;;; This file is part of GNU Guix. ;;; @@ -286,10 +286,11 @@ (define-record-type* foo make-foo (lambda () (eval exp (test-module)) #f) - (lambda (key proc message location form . args) + (lambda (key proc message location form subform . _) (and (eq? proc 'foo) (string-match "invalid field" message) - (equal? form '(baz 1 2 3 4 5)) + (equal? subform '(baz 1 2 3 4 5)) + (equal? form '(foo (baz 1 2 3 4 5))) ;; Make sure the location is that of the field specifier. ;; See . @@ -299,6 +300,33 @@ (define-record-type* foo make-foo ,@(alist-delete 'line loc))) (pk 'actual-loc location))))))) +(test-assert "define-record-type* & wrong field specifier, identifier" + (let ((exp '(begin + (define-record-type* foo make-foo + foo? + (bar foo-bar (default 42)) + (baz foo-baz)) + + (foo + baz))) ;syntax error + (loc (current-source-location))) ;keep this alignment! + (catch 'syntax-error + (lambda () + (eval exp (test-module)) + #f) + (lambda (key proc message location form subform . _) + (and (eq? proc 'foo) + (string-match "invalid field" message) + (equal? subform 'baz) + (equal? form '(foo baz)) + + ;; Here the location is that of the parent form. + (lset= equal? + (pk 'expected-loc + `((line . ,(- (assq-ref loc 'line) 2)) + ,@(alist-delete 'line loc))) + (pk 'actual-loc location))))))) + (test-assert "define-record-type* & missing initializers" (catch 'syntax-error (lambda () -- cgit v1.2.3 From e7921d5ecb9b9615396e5bbd286f132d97d016cc Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 16 Jan 2020 16:41:59 +0100 Subject: gnu: guile: Add 3.0.0. * gnu/packages/guile.scm (guile-3.0): New variable. (guile-next): Turn into an alias for GUILE-3.0. --- gnu/packages/guile.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 8d3f43e3f7..e940d38b17 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -283,19 +283,19 @@ (define-public guile-2.2.4 (base32 "07p3g0v2ba2vlfbfidqzlgbhnzdx46wh2rgc5gszq1mjyx5bks6r")))))) -(define-public guile-next - ;; This is the upcoming Guile 3.0, with JIT support. +(define-public guile-3.0 + ;; This is the latest Guile stable version. (package (inherit guile-2.2) - (name "guile-next") - (version "2.9.9") + (name "guile-next") ;to be renamed to "guile" + (version "3.0.0") (source (origin (inherit (package-source guile-2.2)) - (uri (string-append "ftp://alpha.gnu.org/gnu/guile/guile-" + (uri (string-append "ftp://ftp.gnu.org/gnu/guile/guile-" version ".tar.xz")) (sha256 (base32 - "0s99zzdzj29fb42q5fwn7vqg9k7y9ppq9vkv4p39zr93z8694wdz")))) + "0x8ca6q1qdmk29lh12gj6ngvgn7kp79w42rxfgwrpxm9jmjqs4y9")))) (native-search-paths (list (search-path-specification (variable "GUILE_LOAD_PATH") @@ -303,9 +303,9 @@ (define-public guile-next (search-path-specification (variable "GUILE_LOAD_COMPILED_PATH") (files '("lib/guile/3.0/site-ccache" - "share/guile/site/3.0"))))) - (properties '((ftp-server . "alpha.gnu.org") - (upstream-name . "guile"))))) + "share/guile/site/3.0"))))))) + +(define-public guile-next guile-3.0) (define* (make-guile-readline guile #:optional (name "guile-readline")) (package -- cgit v1.2.3 From 4f4086848bd6c2eb2c85ede3822778a116d1ce71 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 16 Jan 2020 16:43:35 +0100 Subject: gnu: guile-picture-language: Add "guile3.0-picture-language" variant. * gnu/packages/guile-xyz.scm (guile3.0-picture-language): New variable. --- gnu/packages/guile-xyz.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index dadbce8bab..cf6325340f 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2064,6 +2064,12 @@ (define-public guile-picture-language The picture values can directly be displayed in Geiser.") (license license:lgpl3+)))) +(define-public guile3.0-picture-language + (package + (inherit guile-picture-language) + (name "guile3.0-picture-language") + (inputs `(("guile" ,guile-3.0))))) + (define-public guile-studio (package (name "guile-studio") -- cgit v1.2.3 From fb8a77f456725ed6250bb57f58197f9954f30e57 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 16 Jan 2020 16:48:05 +0100 Subject: gnu: guile-syntax-highlight: Add "guile3.0-syntax-highlight" variant. * gnu/packages/guile-xyz.scm (guile-syntax-highlight)[source]: Add 'snippet' and 'modules'. (guile3.0-syntax-highlight): New field. --- gnu/packages/guile-xyz.scm | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index cf6325340f..9edb718faa 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -544,7 +544,15 @@ (define-public guile-syntax-highlight version ".tar.gz")) (sha256 (base32 - "1p771kq15x83483m23bhah1sz6vkalg3drm7x279f4j1cxligkzi")))) + "1p771kq15x83483m23bhah1sz6vkalg3drm7x279f4j1cxligkzi")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Allow builds with Guile 3.0. + (substitute* "configure" + (("2\\.2 2\\.0") + "3.0 2.2 2.0")) + #t)))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) @@ -558,6 +566,12 @@ (define-public guile-syntax-highlight (home-page "http://dthompson.us/projects/guile-syntax-highlight.html") (license license:lgpl3+))) +(define-public guile3.0-syntax-highlight + (package + (inherit guile-syntax-highlight) + (name "guile3.0-syntax-highlight") + (inputs `(("guile" ,guile-3.0))))) + (define-public guile-sjson (package (name "guile-sjson") -- cgit v1.2.3 From 82c2f8840d3f0597e83a6d3cb3eb4a944ff9fb60 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 16 Jan 2020 17:07:19 +0200 Subject: gnu: rust-clicolors-control-1.0: Don't hide package. * gnu/packages/crates-io.scm (rust-clicolors-control-1.0)[arguments]: Skip build. Add rust-atty-0.2, rust-lazy-static-1.3, rust-libc-0.2, rust-winapi-0.3 to cargo-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 782b5959ba..e08ec90b56 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1321,12 +1321,18 @@ (define-public rust-clicolors-control-1.0 (base32 "1y80cgarxhrd1bz5yjm81r444v6flvy36aaxrrsac0yhfd6gvavk")))) (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-atty" ,rust-atty-0.2) + ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-libc" ,rust-libc-0.2) + ("rust-winapi" ,rust-winapi-0.3)))) (home-page "https://github.com/mitsuhiko/clicolors-control") (synopsis "Common utility library to control CLI colorization") (description "This package provides a common utility library to control CLI colorization.") - (properties '((hidden? . #t))) (license license:expat))) (define-public rust-clippy-0.0 -- cgit v1.2.3 From dca4e6324caec44a0060a9e053c9ed268d3ed23d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 16 Jan 2020 17:09:46 +0200 Subject: gnu: rust-clicolors-control-1.0: Update to 1.0.1. * gnu/packages/crates-io.scm (rust-clicolors-control-1.0): Update to 1.0.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 e08ec90b56..fcdc104099 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1311,7 +1311,7 @@ (define-public rust-clap-2 (define-public rust-clicolors-control-1.0 (package (name "rust-clicolors-control") - (version "1.0.0") + (version "1.0.1") (source (origin (method url-fetch) @@ -1319,7 +1319,7 @@ (define-public rust-clicolors-control-1.0 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "1y80cgarxhrd1bz5yjm81r444v6flvy36aaxrrsac0yhfd6gvavk")))) + "07klix8nbpwk0cg1k4h0kkiijm1jxvrzndqdkr7dqr6xvkjjw24h")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t -- cgit v1.2.3 From a9b5fe4d86d8ab1c1086e9949b42ccd23fc63afc Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 16 Jan 2020 17:11:26 +0200 Subject: gnu: rust-cmake-0.1: Don't hide package. * gnu/packages/crates-io.scm (rust-cmake-0.1)[arguments]: Skip build. Add rust-cc-1.0 to cargo-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index fcdc104099..a53b801650 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1397,13 +1397,15 @@ (define-public rust-cmake-0.1 (base32 "0qkwibkvx5xjazvv9v8gvdlpky2jhjxvcz014nrixgzqfyv2byw1")))) (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs (("rust-cc" ,rust-cc-1.0)))) (home-page "https://github.com/alexcrichton/cmake-rs") (synopsis "Rust build dependency for running cmake") (description "This package provides a build dependency for running @code{cmake} to build a native library. The CMake executable is assumed to be @code{cmake} unless the CMAKE environmental variable is set.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 0441e834a26d4442e27db5aad729d7869b3ee7b8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 16 Jan 2020 17:13:19 +0200 Subject: gnu: rust-fallible-iterator-0.2: Don't hide package. * gnu/packages/crates-io.scm (rust-fallible-iterator-0.2)[arguments]: Skip build. [properties]: Remove field. --- 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 a53b801650..aa5ae7fba2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2933,13 +2933,13 @@ (define-public rust-fallible-iterator-0.2 (base32 "1xq759lsr8gqss7hva42azn3whgrbrs2sd9xpn92c5ickxm1fhs4")))) (build-system cargo-build-system) + (arguments '(#:skip-build? #t)) (home-page "https://github.com/sfackler/rust-fallible-iterator") (synopsis "Fallible iterator traits") (description "If the @code{std} or @code{alloc} features are enabled, this crate provides implementations for @code{Box}, @code{Vec}, @code{BTreeMap}, and @code{BTreeSet}. If the @code{std} feature is enabled, this crate additionally provides implementations for @code{HashMap} and @code{HashSet}.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From ef8c91be7f92fe0a4c10ad6ff33fe479f297895a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 16 Jan 2020 17:16:32 +0200 Subject: gnu: rust-filetime-0.2: Don't hide package. * gnu/packages/crates-io.scm (rust-filetime-0.2)[arguments]: Skip build. Add rust-cfg-if-0.1, rust-libc-0.2, rust-redox-syscall-0.1, rust-winapi-0.3 to cargo-inputs. Add rust-tempdir-0.3 to cargo-development-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index aa5ae7fba2..3a9e013446 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2956,6 +2956,15 @@ (define-public rust-filetime-0.2 (base32 "0sflihq2l77xjrza7yjalnxsc7dxzg25rhzcfbd9vmyfah5kimvb")))) (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-cfg-if" ,rust-cfg-if-0.1) + ("rust-libc" ,rust-libc-0.2) + ("rust-redox-syscall" ,rust-redox-syscall-0.1) + ("rust-winapi" ,rust-winapi-0.3)) + #:cargo-development-inputs + (("rust-tempdir" ,rust-tempdir-0.3)))) (home-page "https://github.com/alexcrichton/filetime") (synopsis "Platform-agnostic accessors of timestamps in File metadata") (description @@ -2964,7 +2973,6 @@ (define-public rust-filetime-0.2 cross-platform differences in terms of where the timestamps are located, what they are called, and how to convert them into a platform-independent representation.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 1c9d47b6424099f379170cd5f13c319b2ee8acd5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 16 Jan 2020 17:19:00 +0200 Subject: gnu: rust-filetime-0.2: Update to 0.2.8. * gnu/packages/crates-io.scm (rust-filetime-0.2): Update to 0.2.8. [arguments]: Remove rust-tempdir-0.3 from cargo-development-inputs. Add rust-tempfile-3.0. --- 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 3a9e013446..2b4f80e236 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2946,7 +2946,7 @@ (define-public rust-fallible-iterator-0.2 (define-public rust-filetime-0.2 (package (name "rust-filetime") - (version "0.2.7") + (version "0.2.8") (source (origin (method url-fetch) @@ -2954,7 +2954,7 @@ (define-public rust-filetime-0.2 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "0sflihq2l77xjrza7yjalnxsc7dxzg25rhzcfbd9vmyfah5kimvb")))) + "0zfc90802dbw11bx6kmm8zw6r88k7glm4q6l8riqw35an3dd9xhz")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -2964,7 +2964,7 @@ (define-public rust-filetime-0.2 ("rust-redox-syscall" ,rust-redox-syscall-0.1) ("rust-winapi" ,rust-winapi-0.3)) #:cargo-development-inputs - (("rust-tempdir" ,rust-tempdir-0.3)))) + (("rust-tempfile" ,rust-tempfile-3.0)))) (home-page "https://github.com/alexcrichton/filetime") (synopsis "Platform-agnostic accessors of timestamps in File metadata") (description -- cgit v1.2.3 From ced246661782fd2701630776d99e68c09a45712b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 16 Jan 2020 17:22:01 +0200 Subject: gnu: rust-findshlibs-0.5: Don't hide package. * gnu/packages/crates-io.scm (rust-findshlibs-0.5)[arguments]: Skip build. Add rust-lazy-static-1.3, rust-libc-0.2 to cargo-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2b4f80e236..093f43a7f2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2989,12 +2989,16 @@ (define-public rust-findshlibs-0.5 (base32 "1n2vagn0q5yim32hxkwi1cjgp3yn1dm45p7z8nw6lapywihhs9mi")))) (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-libc" ,rust-libc-0.2)))) (home-page "https://github.com/gimli-rs/findshlibs") (synopsis "Find the set of shared libraries loaded in the current process") (description "Find the set of shared libraries loaded in the current process with a cross platform API.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 0c44bf848c48210166f07d67d49148651d6cbbb2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 16 Jan 2020 17:23:48 +0200 Subject: gnu: rust-fixedbitset-0.1: Don't hide package. * gnu/packages/crates-io.scm (rust-fixedbitset-0.1)[arguments]: Skip build. [properties]: Remove field. --- 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 093f43a7f2..5dcb2dad6d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3015,10 +3015,10 @@ (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.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 74de42eb660067096dfd8c6dc0ea759b388cf40e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 16 Jan 2020 17:26:56 +0200 Subject: gnu: rust-fnv-1.0: Don't hide package. * gnu/packages/crates-io.scm (rust-fnv-1.0)[arguments]: Skip build. [synopsis]: Appease 'guix lint'. [properties]: Remove field. --- 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 5dcb2dad6d..8c120799ca 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3128,11 +3128,11 @@ (define-public rust-fnv-1.0 (base32 "1ww56bi1r5b8id3ns9j3qxbi7w5h005rzhiryy0zi9h97raqbb9g")))) (build-system cargo-build-system) + (arguments '(#:skip-build? #t)) (home-page "https://github.com/servo/rust-fnv") - (synopsis "implementation of the Fowler-Noll-Vo hash function") + (synopsis "Implementation of the Fowler-Noll-Vo hash function") (description "The @code{fnv} hash function is a custom @code{Hasher} implementation that is more efficient for smaller hash keys.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 9eda3bcfdd1e81a84eac28c156abdacb2fa47ebb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 16 Jan 2020 17:32:20 +0200 Subject: gnu: rust-fs-extra-1.1: Don't hide package. * gnu/packages/crates-io.scm (rust-fs-extra-1.1)[arguments]: Skip build. [properties]: Remove field. --- 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 8c120799ca..e2eb14fdfd 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3237,12 +3237,12 @@ (define-public rust-fs-extra-1.1 (base32 "0x6675wdhsx277k1k1235jwcv38naf20d8kwrk948ds26hh4lajz")))) (build-system cargo-build-system) + (arguments '(#:skip-build? #t)) (home-page "https://github.com/webdesus/fs_extra") (synopsis "Extra filesystem methods") (description "Expanding opportunities standard library @code{std::fs} and @code{std::io}. Recursively copy folders with recept information about process and much more.") - (properties '((hidden? . #t))) (license license:expat))) (define-public rust-fuchsia-cprng-0.1 -- cgit v1.2.3 From 7f27e979bfa7f04cef5e936f2866964e6b26c2db Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 16 Jan 2020 17:33:18 +0200 Subject: gnu: rust-fuchsia-cprng-0.1: Don't hide package. * gnu/packages/crates-io.scm (rust-fuchsia-cprng-0.1)[arguments]: Skip build. [properties]: Remove field. --- gnu/packages/crates-io.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e2eb14fdfd..0fbe49881f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3258,11 +3258,12 @@ (define-public rust-fuchsia-cprng-0.1 (base32 "1fnkqrbz7ixxzsb04bsz9p0zzazanma8znfdqjvh39n14vapfvx0")))) (build-system cargo-build-system) - (home-page "https://fuchsia.googlesource.com/fuchsia/+/master/garnet/public/rust/fuchsia-cprng") + (arguments '(#:skip-build? #t)) + (home-page + "https://fuchsia.googlesource.com/fuchsia/+/master/garnet/public/rust/fuchsia-cprng") (synopsis "Fuchsia cryptographically secure pseudorandom number generator") (description "Rust crate for the Fuchsia cryptographically secure pseudorandom number generator") - (properties '((hidden? . #t))) (license license:bsd-3))) (define-public rust-fuchsia-zircon-0.3 -- cgit v1.2.3 From 7b4d3d869828e99523a37ad67525c439827b5d41 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 16 Jan 2020 17:36:22 +0200 Subject: gnu: rust-fuchsia-zircon-0.3: Don't hide package. * gnu/packages/crates-io.scm (rust-fuchsia-zircon-0.3)[arguments]: Skip build. Add rust-bitflags-1, rust-fuchsia-zircon-sys-0.3 to cargo-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0fbe49881f..59d75db17e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3279,10 +3279,14 @@ (define-public rust-fuchsia-zircon-0.3 (base32 "10jxc5ks1x06gpd0xg51kcjrxr35nj6qhx2zlc5n7bmskv3675rf")))) (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-fuchsia-zircon-sys" ,rust-fuchsia-zircon-sys-0.3)))) (home-page "https://fuchsia.googlesource.com/garnet/") (synopsis "Rust bindings for the Zircon kernel") (description "Rust bindings for the Zircon kernel.") - (properties '((hidden? . #t))) (license license:bsd-3))) (define-public rust-fuchsia-zircon-sys-0.3 -- cgit v1.2.3 From f32036911769a1a23f074d818a5fc9e2b6fae54b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 16 Jan 2020 17:38:08 +0200 Subject: gnu: rust-fuchsia-zircon-sys-0.3: Don't hide package. * gnu/packages/crates-io.scm (rust-fuchsia-zircon-sys-0.3)[arguments]: Skip build. [properties]: Remove field. --- 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 59d75db17e..a4add0da3a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3302,10 +3302,10 @@ (define-public rust-fuchsia-zircon-sys-0.3 (base32 "19zp2085qsyq2bh1gvcxq1lb8w6v6jj9kbdkhpdjrl95fypakjix")))) (build-system cargo-build-system) + (arguments '(#:skip-build? #t)) (home-page "https://fuchsia.googlesource.com/garnet/") (synopsis "Low-level Rust bindings for the Zircon kernel") (description "Low-level Rust bindings for the Zircon kernel.") - (properties '((hidden? . #t))) (license license:bsd-3))) (define-public rust-futf-0.1 -- cgit v1.2.3 From 3f5e2fd956c43ac269db8c492bd628a0285c6e88 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 16 Jan 2020 17:39:57 +0200 Subject: gnu: rust-futures-0.1: Don't hide package. * gnu/packages/crates-io.scm (rust-futures-0.1)[arguments]: Skip build. [home-page]: Update home-page. [properties]: Remove field. --- 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 a4add0da3a..3d248bd0b4 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3345,11 +3345,11 @@ (define-public rust-futures-0.1 (base32 "0saq8ffjw1pwf1pzhw3kq1z7dfq6wpd8x93dnni6vbkc799kkp25")))) (build-system cargo-build-system) - (home-page "https://github.com/rust-lang-nursery/futures-rs") + (arguments '(#:skip-build? #t)) + (home-page "https://github.com/rust-lang/futures-rs") (synopsis "Implementation of zero-cost futures in Rust") (description "An implementation of @code{futures} and @code{streams} featuring zero allocations, composability, and iterator-like interfaces.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From a075606f0ddae6a0857601823a10bd2bac52267d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 16 Jan 2020 17:41:25 +0200 Subject: gnu: rust-futures-0.1: Update to 0.1.29. * gnu/packages/crates-io.scm (rust-futures-0.1): Update to 0.1.29. --- 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 3d248bd0b4..8c16eeffab 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3335,7 +3335,7 @@ (define-public rust-futf-0.1 (define-public rust-futures-0.1 (package (name "rust-futures") - (version "0.1.28") + (version "0.1.29") (source (origin (method url-fetch) @@ -3343,7 +3343,7 @@ (define-public rust-futures-0.1 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "0saq8ffjw1pwf1pzhw3kq1z7dfq6wpd8x93dnni6vbkc799kkp25")))) + "1vq3cw37knnd0afw3rcjzh71i2l01v5m4ysinrrqdvnn2ql0z60v")))) (build-system cargo-build-system) (arguments '(#:skip-build? #t)) (home-page "https://github.com/rust-lang/futures-rs") -- cgit v1.2.3 From efd853489732ee013eb26f4a111f67b8142a942f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 16 Jan 2020 17:51:08 +0200 Subject: gnu: Add rust-rustc-std-workspace-std-1.0. * gnu/packages/crates-io.scm (rust-rustc-std-workspace-std-1.0): 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 8c16eeffab..00f3bf196a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8439,6 +8439,26 @@ (define-public rust-rustc-std-workspace-core-1.0 (license (list license:asl2.0 license:expat)))) +(define-public rust-rustc-std-workspace-std-1.0 + (package + (name "rust-rustc-std-workspace-std") + (version "1.0.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "rustc-std-workspace-std" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1vq4vaclamwhk0alf4f7wq3i9wxa993sxpmhy6qfaimy1ai7d9mb")))) + (build-system cargo-build-system) + (arguments '(#:skip-build? #t)) + (home-page "https://crates.io/crates/rustc-std-workspace-std") + (synopsis "Workaround for rustbuild") + (description "This package provides a workaround for rustbuild.") + (license (list license:expat license:asl2.0)))) + (define-public rust-rustc-test-0.3 (package (name "rust-rustc-test") -- cgit v1.2.3 From a630e32ac12d21e93438b6c55c6303f349a7d5ac Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 16 Jan 2020 17:45:28 +0200 Subject: gnu: rust-getopts-0.2: Don't hide package. * gnu/packages/crates-io.scm (rust-getopts-0.2)[arguments]: Skip build. Add rust-log-0.3 to cargo-development-inputs. [home-page]: Update home-page. [properties]: Remove field. --- gnu/packages/crates-io.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 00f3bf196a..dd5778366c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3673,10 +3673,13 @@ (define-public rust-getopts-0.2 (base32 "018yhq97zgcrcxwhj3pxh31h83704sgaiijdnpl0r1ir366c005r")))) (build-system cargo-build-system) - (home-page "https://github.com/rust-lang-nursery/getopts") + (arguments + `(#:skip-build? #t + #:cargo-development-inputs + (("rust-log" ,rust-log-0.3)))) + (home-page "https://github.com/rust-lang/getopts") (synopsis "Rust library for option parsing for CLI utilities") (description "This library provides getopts-like option parsing.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From fe195ef7d30b22ca12ebf770101460b1f0920fdf Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 16 Jan 2020 17:48:50 +0200 Subject: gnu: rust-getopts-0.2: Update to 0.2.21. * gnu/packages/crates-io.scm (rust-getopts-0.2): Update to 0.2.21. [arguments]: Add rust-unicode-width-0.1, rust-rustc-std-workspace-core-1.0, rust-rustc-std-workspace-std-1.0 to cargo-inputs. --- gnu/packages/crates-io.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index dd5778366c..ce5aef4534 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3663,7 +3663,7 @@ (define-public rust-generic-array-0.12 (define-public rust-getopts-0.2 (package (name "rust-getopts") - (version "0.2.17") + (version "0.2.21") (source (origin (method url-fetch) @@ -3671,10 +3671,14 @@ (define-public rust-getopts-0.2 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "018yhq97zgcrcxwhj3pxh31h83704sgaiijdnpl0r1ir366c005r")))) + "1mgb3qvivi26gs6ihqqhh8iyhp3vgxri6vwyrwg28w0xqzavznql")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t + #:cargo-inputs + (("rust-unicode-width" ,rust-unicode-width-0.1) + ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1.0) + ("rust-rustc-std-workspace-std" ,rust-rustc-std-workspace-std-1.0)) #:cargo-development-inputs (("rust-log" ,rust-log-0.3)))) (home-page "https://github.com/rust-lang/getopts") -- cgit v1.2.3 From fcc4e04d2271d7ae862a9f40775d3c3e3f083fdc Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 16 Jan 2020 17:55:15 +0200 Subject: gnu: rust-scoped-tls-0.1: Don't hide package. * gnu/packages/crates-io.scm (rust-scoped-tls-0.1)[arguments]: Skip build. [properties]: Don't inherit field. --- gnu/packages/crates-io.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ce5aef4534..f0f9387438 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8741,7 +8741,9 @@ (define-public rust-scoped-tls-0.1 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "0a2bn9d2mb07c6l16sadijy4p540g498zddfxyiq4rsqpwrglbrk")))))) + "0a2bn9d2mb07c6l16sadijy4p540g498zddfxyiq4rsqpwrglbrk")))) + (arguments '(#:skip-build? #t)) + (properties '()))) (define-public rust-scopeguard-1.0 (package -- cgit v1.2.3 From 671d08f30d5a12a4865fede3dfa56f604637ad63 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 16 Jan 2020 17:53:31 +0200 Subject: gnu: rust-scoped-tls-1.0: Don't hide package. * gnu/packages/crates-io.scm (rust-scoped-tls-1.0)[arguments]: Skip build. [properties]: Remove field. --- gnu/packages/crates-io.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f0f9387438..129d5d4770 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8720,12 +8720,12 @@ (define-public rust-scoped-tls-1.0 (base32 "1hj8lifzvivdb1z02lfnzkshpvk85nkgzxsy2hc0zky9wf894spa")))) (build-system cargo-build-system) + (arguments '(#:skip-build? #t)) (home-page "https://github.com/alexcrichton/scoped-tls") (synopsis "Rust library providing the old standard library's scoped_thread_local") (description "This crate provides a library implementation of the standard library's old @code{scoped_thread_local!} macro for providing scoped access to @dfn{thread local storage} (TLS) so any type can be stored into TLS.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) @@ -8741,9 +8741,7 @@ (define-public rust-scoped-tls-0.1 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "0a2bn9d2mb07c6l16sadijy4p540g498zddfxyiq4rsqpwrglbrk")))) - (arguments '(#:skip-build? #t)) - (properties '()))) + "0a2bn9d2mb07c6l16sadijy4p540g498zddfxyiq4rsqpwrglbrk")))))) (define-public rust-scopeguard-1.0 (package -- cgit v1.2.3 From ac20ab2b4e7f34f1c695c3e51b54bf29bdcb54ed Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 16 Jan 2020 17:57:30 +0200 Subject: gnu: rust-scopeguard-0.3: Don't hide package. * gnu/packages/crates-io.scm (rust-scopeguard-0.3)[arguments]: Skip build. [properties]: Don't inherit field. --- gnu/packages/crates-io.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 129d5d4770..87725e7937 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8780,7 +8780,9 @@ (define-public rust-scopeguard-0.3 (string-append name "-" version ".crate")) (sha256 (base32 - "09sy9wbqp409pkwmqni40qmwa99ldqpl48pp95m1xw8sc19qy9cl")))))) + "09sy9wbqp409pkwmqni40qmwa99ldqpl48pp95m1xw8sc19qy9cl")))) + (arguments '(#:skip-build? #t)) + (properties '()))) (define-public rust-scroll-0.9 (package -- cgit v1.2.3 From 1c70205f8277e4dc2f99d0c79a685028d4c64aed Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 16 Jan 2020 17:58:33 +0200 Subject: gnu: rust-scopeguard-1.0: Don't hide package. * gnu/packages/crates-io.scm (rust-scopeguard-1.0)[arguments]: Skip build. [properties]: Remove field. --- gnu/packages/crates-io.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 87725e7937..41ed200296 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8756,6 +8756,7 @@ (define-public rust-scopeguard-1.0 (base32 "03aay84r1f6w87ckbpj6cc4rnsxkxcfs13n5ynxjia0qkgjiabml")))) (build-system cargo-build-system) + (arguments '(#:skip-build? #t)) (home-page "https://github.com/bluss/scopeguard") (synopsis "Scope guard which will run a closure even out of scope") (description "This package provides a RAII scope guard that will run a @@ -8763,7 +8764,6 @@ (define-public rust-scopeguard-1.0 (assuming unwinding panic). Defines the macros @code{defer!}, @code{defer_on_unwind!}, @code{defer_on_success!} as shorthands for guards with one of the implemented strategies.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) @@ -8780,9 +8780,7 @@ (define-public rust-scopeguard-0.3 (string-append name "-" version ".crate")) (sha256 (base32 - "09sy9wbqp409pkwmqni40qmwa99ldqpl48pp95m1xw8sc19qy9cl")))) - (arguments '(#:skip-build? #t)) - (properties '()))) + "09sy9wbqp409pkwmqni40qmwa99ldqpl48pp95m1xw8sc19qy9cl")))))) (define-public rust-scroll-0.9 (package -- cgit v1.2.3 From bd8c62dbd1ef37c5f1a49d7100ca99b1f6f67749 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Jan 2020 21:42:15 +0100 Subject: gnu: python-zipp: Remove redundant inputs. The Python 3 variant do not need these. * gnu/packages/python-compression.scm (python-zipp)[native-inputs]: Remove PYTHON-CONTEXTLIB2, PYTHON-PATHLIB2, and PYTHON-UNITTEST2. [properties]: New field. (python2-zipp)[native-inputs]: Add PYTHON2-CONTEXTLIB2, PYTHON2-PATHLIB2, and PYTHON2-UNITTEST2. --- gnu/packages/python-compression.scm | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm index 7de5be72a1..70abc7bad1 100644 --- a/gnu/packages/python-compression.scm +++ b/gnu/packages/python-compression.scm @@ -223,20 +223,25 @@ (define-public python-zipp (propagated-inputs `(("python-more-itertools" ,python-more-itertools))) (native-inputs - `(("python-contextlib2" ,python-contextlib2) - ("python-pathlib2" ,python-pathlib2) - ("python-setuptools-scm" ,python-setuptools-scm) - ("python-unittest2" ,python-unittest2))) + `(("python-setuptools-scm" ,python-setuptools-scm))) (home-page "https://github.com/jaraco/zipp") (synopsis "Backport of pathlib-compatible object wrapper for zip files") (description "This package provides a @code{pathlib}-compatible @code{Zipfile} object wrapper. It provides a backport of the @code{Path} object.") + (properties `((python2-variant . ,(delay python2-zipp)))) (license license:expat))) (define-public python2-zipp - (package-with-python2 python-zipp)) + (let ((base (package-with-python2 (strip-python2-variant python-zipp)))) + (package/inherit + base + (native-inputs + `(("python-contextlib2" ,python2-contextlib2) + ("python-pathlib2" ,python2-pathlib2) + ("python-unittest2" ,python2-unittest2) + ,@(package-native-inputs base)))))) (define-public python-zstandard (package -- cgit v1.2.3 From cbd3e73f06ed0e47bd228f51ce0d88b5bc4d8d2c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Jan 2020 21:49:37 +0100 Subject: gnu: poetry: Remove redundant input. * gnu/packages/python-xyz.scm (poetry)[propagated-inputs]: Remove PYTHON-PATHLIB2. --- gnu/packages/python-xyz.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 054974d44f..31ea51be29 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10600,7 +10600,6 @@ (define-public poetry ("python-html5lib" ,python-html5lib) ("python-jsonschema" ,python-jsonschema) ("python-msgpack" ,python-msgpack) - ("python-pathlib2" ,python-pathlib2) ("python-pkginfo" ,python-pkginfo) ("python-pyparsing" ,python-pyparsing) ("python-pyrsistent" ,python-pyrsistent) -- cgit v1.2.3 From 7699e3228960457707f103e8e9e0db60de3891c5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Jan 2020 22:18:35 +0100 Subject: gnu: kentutils: Build with OpenSSL 1.0. * gnu/packages/bioinformatics.scm (kentutils)[inputs]: Change from OPENSSL to OPENSSL-1.0. --- gnu/packages/bioinformatics.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 32eea9d153..381c9dfe11 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -11322,7 +11322,7 @@ (define-public kentutils ("libpng" ,libpng) ("mariadb" ,mariadb "lib") ("mariadb-dev" ,mariadb "dev") - ("openssl" ,openssl))) + ("openssl" ,openssl-1.0))) (home-page "http://genome.cse.ucsc.edu/index.html") (synopsis "Assorted bioinformatics utilities") (description "This package provides the kentUtils, a selection of -- cgit v1.2.3 From fdd0c36963a62577f7a8f99a44f79a7330a0b151 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 16 Jan 2020 17:20:22 +0100 Subject: gnu: python-packaging: Fix test failures on non-x86_64 architectures. * gnu/packages/patches/python-packaging-test-arch.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/python-xyz.scm (python-packaging)[source](patches): New field. --- gnu/local.mk | 1 + .../patches/python-packaging-test-arch.patch | 65 ++++++++++++++++++++++ gnu/packages/python-xyz.scm | 1 + 3 files changed, 67 insertions(+) create mode 100644 gnu/packages/patches/python-packaging-test-arch.patch diff --git a/gnu/local.mk b/gnu/local.mk index e77af87f3e..e2a837fe92 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1319,6 +1319,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-libxml2-utf8.patch \ %D%/packages/patches/python-mox3-python3.6-compat.patch \ %D%/packages/patches/python-testtools.patch \ + %D%/packages/patches/python-packaging-test-arch.patch \ %D%/packages/patches/python-paste-remove-timing-test.patch \ %D%/packages/patches/python-pycrypto-CVE-2013-7459.patch \ %D%/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \ diff --git a/gnu/packages/patches/python-packaging-test-arch.patch b/gnu/packages/patches/python-packaging-test-arch.patch new file mode 100644 index 0000000000..df80a62544 --- /dev/null +++ b/gnu/packages/patches/python-packaging-test-arch.patch @@ -0,0 +1,65 @@ +Fix tests that are "hard coded" to expect x86_64 output by mocking the platform interface. + +Submitted upstream: +https://github.com/pypa/packaging/pull/176 + +diff --git a/tests/test_tags.py b/tests/test_tags.py +index 1eacf68..0a3f1b4 100644 +--- a/tests/test_tags.py ++++ b/tests/test_tags.py +@@ -435,37 +435,43 @@ class TestManylinuxPlatform: + linux_platform = list(tags._linux_platforms(is_32bit=False)) + assert linux_platform == ["linux_x86_64"] + +- def test_linux_platforms_manylinux1(self, monkeypatch): ++ def test_linux_platforms_manylinux1(self, is_x86, monkeypatch): + monkeypatch.setattr( + tags, "_is_manylinux_compatible", lambda name, _: name == "manylinux1" + ) +- if platform.system() != "Linux": ++ if platform.system() != "Linux" or not is_x86: + monkeypatch.setattr(distutils.util, "get_platform", lambda: "linux_x86_64") ++ monkeypatch.setattr(platform, "machine", lambda: "x86_64") + platforms = list(tags._linux_platforms(is_32bit=False)) +- assert platforms == ["manylinux1_x86_64", "linux_x86_64"] ++ arch = platform.machine() ++ assert platforms == ["manylinux1_" + arch, "linux_" + arch] + +- def test_linux_platforms_manylinux2010(self, monkeypatch): ++ def test_linux_platforms_manylinux2010(self, is_x86, monkeypatch): + monkeypatch.setattr( + tags, "_is_manylinux_compatible", lambda name, _: name == "manylinux2010" + ) +- if platform.system() != "Linux": ++ if platform.system() != "Linux" or not is_x86: + monkeypatch.setattr(distutils.util, "get_platform", lambda: "linux_x86_64") ++ monkeypatch.setattr(platform, "machine", lambda: "x86_64") + platforms = list(tags._linux_platforms(is_32bit=False)) +- expected = ["manylinux2010_x86_64", "manylinux1_x86_64", "linux_x86_64"] ++ arch = platform.machine() ++ expected = ["manylinux2010_" + arch, "manylinux1_" + arch, "linux_" + arch] + assert platforms == expected + +- def test_linux_platforms_manylinux2014(self, monkeypatch): ++ def test_linux_platforms_manylinux2014(self, is_x86, monkeypatch): + monkeypatch.setattr( + tags, "_is_manylinux_compatible", lambda name, _: name == "manylinux2014" + ) +- if platform.system() != "Linux": ++ if platform.system() != "Linux" or not is_x86: + monkeypatch.setattr(distutils.util, "get_platform", lambda: "linux_x86_64") ++ monkeypatch.setattr(platform, "machine", lambda: "x86_64") + platforms = list(tags._linux_platforms(is_32bit=False)) ++ arch = platform.machine() + expected = [ +- "manylinux2014_x86_64", +- "manylinux2010_x86_64", +- "manylinux1_x86_64", +- "linux_x86_64", ++ "manylinux2014_" + arch, ++ "manylinux2010_" + arch, ++ "manylinux1_" + arch, ++ "linux_" + arch, + ] + assert platforms == expected + diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 31ea51be29..ee2fc11eb1 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13054,6 +13054,7 @@ (define-public python-packaging (origin (method url-fetch) (uri (pypi-uri "packaging" version)) + (patches (search-patches "python-packaging-test-arch.patch")) (sha256 (base32 "1y2ip3a4ykkpgnwgn85j6hkspcl0cg3mzms97f40mk57vwqq67gy")))) -- cgit v1.2.3 From 3dfb3d44f316f95401558fb32b3b3e4e464f419c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 16 Jan 2020 17:22:28 +0100 Subject: gnu: python-importlib-metata: Delay python2 variant. This is a follow-up to commit 5efa04dd935ecf6f7803501b1b8952810f4330ad. * gnu/packages/python-xyz.scm (python-importlib-metadata)[properties]: New field. --- gnu/packages/python-xyz.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ee2fc11eb1..6bb2a5a5be 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5008,6 +5008,7 @@ (define-public python-importlib-metadata @code{pkg_resources} entry point API and metadata API. Along with @code{importlib.resources} in Python 3.7 and newer, this can eliminate the need to use the older and less efficient @code{pkg_resources} package.") + (properties `((python2-variant . ,(delay python2-importlib-metadata)))) (license license:asl2.0))) (define-public python2-importlib-metadata -- cgit v1.2.3 From 7152a7143186d7540c1f67decb7842c7a103903b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 16 Jan 2020 17:35:41 +0100 Subject: gnu: ldb: Downgrade to 1.5.6. 1.5.6 is actually newer and fixes problems with Python 3.8. * gnu/packages/samba.scm (ldb): Downgrade to 1.5.6. --- gnu/packages/samba.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index 8a1fad5e43..6cd875df46 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -362,14 +362,14 @@ (define-public tevent (define-public ldb (package (name "ldb") - (version "1.6.3") + (version "1.5.6") (source (origin (method url-fetch) (uri (string-append "https://www.samba.org/ftp/ldb/ldb-" version ".tar.gz")) (sha256 (base32 - "01livdy3g073bm6xnc8zqnqrxg53sw8q66d1903z62hd6g87whsa")) + "0nwpkqidsna4yz3vhjzzadm4hpviwnyk80yml8ay82gi1d6lg0pz")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From f2d56e39934d14f2107ede8598e228c461c7b44d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 16 Jan 2020 17:43:46 +0100 Subject: gnu: libpeas: Update to 1.24.1. * gnu/packages/gnome.scm (libpeas): Update to 1.24.1. [build-system]: Change to MESON-BUILD-SYSTEM. [arguments]: New field. [native-inputs]: Remove INTLTOOL. ADD GETTEXT-MINIMAL and XORG-SERVER-FOR-TESTS. --- gnu/packages/gnome.scm | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a6a8307649..9cf3cbb07d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -34,7 +34,7 @@ ;;; Copyright © 2018 Björn Höfling ;;; Copyright © 2018, 2019 Timothy Sample ;;; Copyright © 2019 Danny Milosavljevic -;;; Copyright © 2019 Marius Bakke +;;; Copyright © 2019, 2020 Marius Bakke ;;; Copyright © 2019 Florian Pelz ;;; Copyright © 2019 Giacomo Leidi ;;; Copyright © 2019 Jelle Licht @@ -1883,7 +1883,7 @@ (define-public libnotify (define-public libpeas (package (name "libpeas") - (version "1.22.0") + (version "1.24.1") (source (origin (method url-fetch) @@ -1892,8 +1892,19 @@ (define-public libpeas name "-" version ".tar.xz")) (sha256 (base32 - "0qm908kisyjzjxvygdl18hjqxvvgkq9w0phs2g55pck277sw0bsv")))) - (build-system gnu-build-system) + "1162dr7smmfb02czmhshr0f93hqj7w0nw29bys5lzfvwarxcyflw")))) + (build-system meson-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")) + (disp ":1")) + (setenv "DISPLAY" disp) + ;; Tests require a running X server. + (system (format #f "~a/bin/Xvfb ~a &" xorg-server disp)) + #t)))))) (inputs `(("gtk+" ,gtk+) ("glade" ,glade3) @@ -1901,9 +1912,10 @@ (define-public libpeas ("python-pygobject" ,python-pygobject))) (native-inputs `(("pkg-config" ,pkg-config) + ("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) - ("intltool" ,intltool))) + ("xorg-server" ,xorg-server-for-tests))) (propagated-inputs ;; The .pc file "Requires" gobject-introspection. `(("gobject-introspection" ,gobject-introspection))) -- cgit v1.2.3 From 9f7f5ba2d26b4e64d808419ee2212a302ec81a59 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 16 Jan 2020 18:25:41 +0100 Subject: gnu: caribou: Build with Python 3. * gnu/packages/gnome.scm (caribou)[native-inputs]: Change from PYTHON-2 to PYTHON. [inputs]: Change from PYTHON2-PYGOBJECT to PYTHON-PYGOBJECT. --- 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 9cf3cbb07d..064ce86956 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6376,7 +6376,7 @@ (define-public caribou ("gobject-introspection" ,gobject-introspection) ("intltool" ,intltool) ("pkg-config" ,pkg-config) - ("python" ,python-2) ; incompatible with Python 3 (print syntax) + ("python" ,python) ("vala" ,vala) ("xsltproc" ,libxslt))) (propagated-inputs @@ -6389,7 +6389,7 @@ (define-public caribou `(("clutter" ,clutter) ("dconf" ,dconf) ("gtk+-2" ,gtk+-2) - ("python-pygobject" ,python2-pygobject))) + ("python-pygobject" ,python-pygobject))) (synopsis "Text entry and UI navigation application") (home-page "https://wiki.gnome.org/Projects/Caribou") (description -- cgit v1.2.3 From 34aa9144786658498ff8d4b6b36ac0ae5bf1d454 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 16 Jan 2020 18:42:27 +0100 Subject: gnu: python-graphviz: Update to 0.13.2. * gnu/packages/graphviz.scm (python-graphviz): Update to 0.13.2. [native-inputs]: Add GRAPHVIZ, PYTHON-MOCK, PYTHON-PYTEST, PYTHON-PYTEST-COV, and PYTHON-PYTEST-MOCK. [arguments]: Replace 'check' phase. --- gnu/packages/graphviz.scm | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm index eb4b211daf..365fe1a113 100644 --- a/gnu/packages/graphviz.scm +++ b/gnu/packages/graphviz.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2017 Gábor Boskovits ;;; Copyright © 2018 Mathieu Lirzin +;;; Copyright © 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -166,16 +167,31 @@ (define-public graphviz-2.38 (define-public python-graphviz (package (name "python-graphviz") - (version "0.8.4") + (version "0.13.2") (source (origin (method url-fetch) (uri (pypi-uri "graphviz" version ".zip")) (sha256 (base32 - "17v8h7j2yz8hy1jf7q8p0ik8dmf32m58lc6v11x7aqc4pnfa2n29")))) + "009alrilzx0v7kl41khbq7k6k8b8pxyvbsi1b1ai933f6kpbxb30")))) (build-system python-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests #:allow-other-keys) + (if tests + (invoke "pytest" "-vv") + (format #t "test suite not run~%")) + #t))))) (native-inputs - `(("unzip" ,unzip))) + `(("unzip" ,unzip) + + ;; For tests. + ("graphviz" ,graphviz) + ("python-mock" ,python-mock) + ("python-pytest" ,python-pytest) + ("python-pytest-cov" ,python-pytest-cov) + ("python-pytest-mock" ,python-pytest-mock))) (home-page "https://github.com/xflr6/graphviz") (synopsis "Simple Python interface for Graphviz") (description -- cgit v1.2.3 From eebc03bbb827ec8def27eee9dd79a5bd70534b51 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 16 Jan 2020 18:44:09 +0100 Subject: gnu: python-objgraph: Update to 3.4.1. * gnu/packages/python-xyz.scm (python-objgraph): Update to 3.4.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 6bb2a5a5be..5d20144f06 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9985,14 +9985,14 @@ (define-public python2-greenlet (define-public python-objgraph (package (name "python-objgraph") - (version "3.4.0") + (version "3.4.1") (source (origin (method url-fetch) (uri (pypi-uri "objgraph" version)) (sha256 (base32 - "184m09am5gpbqfaiy7l0hwh476mczbrly1dffs0rw2p1d1i2q32a")))) + "19qmqsh984zq1rzzjy4vqnmviaqnymcyl8h7z99pnicbgwnm2adz")))) (build-system python-build-system) (propagated-inputs `(("python-graphviz" ,python-graphviz))) -- cgit v1.2.3 From ffe58d1d44bb6e9eff3c489b07649426280e326a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 16 Jan 2020 18:44:32 +0100 Subject: gnu: Add python2-objgraph. * gnu/packages/python-xyz.scm (python2-objgraph): New public variable. --- gnu/packages/python-xyz.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 5d20144f06..76d38807d3 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10006,6 +10006,9 @@ (define-public python-objgraph graphviz.") (license license:expat))) +(define-public python2-objgraph + (package-with-python2 python-objgraph)) + (define-public python-gevent (package (name "python-gevent") -- cgit v1.2.3 From 070dc95066ec70c4227ae178d90da9ae69badad1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 15 Jan 2020 01:07:23 +0100 Subject: gnu: ethtool: Update to 5.4. * gnu/packages/networking.scm (ethtool): Update to 5.4. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 28c683ea83..5f03c8f172 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -427,14 +427,14 @@ (define-public libndp (define-public ethtool (package (name "ethtool") - (version "5.3") + (version "5.4") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/software/network/" "ethtool/ethtool-" version ".tar.xz")) (sha256 (base32 - "1i14zrg4a84zjpwvqi8an0zx0hm06g614a79zc2syrkhrvdw1npk")))) + "0srbqp4a3x9ryrbm5q854375y04ni8j0bmsrl89nmsyn4x4ixy12")))) (build-system gnu-build-system) (home-page "https://www.kernel.org/pub/software/network/ethtool/") (synopsis "Display or change Ethernet device settings") -- cgit v1.2.3 From 2c31cf87e3f8476c45e32ced1534f5a7bc2d01b5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 15 Jan 2020 01:21:15 +0100 Subject: gnu: noweb: Use HTTPS home page. * gnu/packages/noweb.scm (noweb)[home-page, license]: Use HTTPS. --- gnu/packages/noweb.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/noweb.scm b/gnu/packages/noweb.scm index 0954e79952..0a0010c6dd 100644 --- a/gnu/packages/noweb.scm +++ b/gnu/packages/noweb.scm @@ -82,7 +82,7 @@ (define-public noweb (string-append "TEXINPUTS=" out "/share/texmf/tex/latex"))) #:tests? #f)) ; no tests - (home-page "http://www.cs.tufts.edu/~nr/noweb/") + (home-page "https://www.cs.tufts.edu/~nr/noweb/") (synopsis "Literate programming tool") (description "Noweb is designed to meet the needs of literate programmers while @@ -92,4 +92,4 @@ (define-public noweb WEB's 27. The noweb manual is only 4 pages; an additional page explains how to customize its LaTeX output. noweb works “out of the box” with any programming language, and supports TeX, LaTeX, HTML, and troff back ends.") - (license (fsf-free "http://www.cs.tufts.edu/~nr/noweb/#copyright")))) + (license (fsf-free "https://www.cs.tufts.edu/~nr/noweb/#copyright")))) -- cgit v1.2.3 From bd9f588b37a86845604fbe8506bdfe162ba578b3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 15 Jan 2020 01:31:20 +0100 Subject: gnu: noweb: Embed store references to external binaries. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/noweb.scm (noweb)[argument]: Add ‘bind-early’ phase. [inputs]: Add perl. --- gnu/packages/noweb.scm | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/gnu/packages/noweb.scm b/gnu/packages/noweb.scm index 0a0010c6dd..2fcd24c6e2 100644 --- a/gnu/packages/noweb.scm +++ b/gnu/packages/noweb.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Ludovic Courtès +;;; Copyright © 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -20,7 +21,8 @@ (define-module (gnu packages noweb) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) - #:use-module (guix licenses)) + #:use-module (guix licenses) + #:use-module (gnu packages perl)) (define-public noweb (package @@ -37,6 +39,18 @@ (define-public noweb (arguments '(#:phases (modify-phases %standard-phases + (add-after 'unpack 'bind-early + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (substitute* (list "src/lib/nwmtime" + "src/shell/htmltoc") + (("exec perl ") + (format #f "exec ~a " (which "perl")))) + (substitute* "src/shell/noweb" + ((" cpif ") + (format #f " ~a/cpif " bin))) + #t))) (add-before 'install 'pre-install (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) @@ -82,6 +96,8 @@ (define-public noweb (string-append "TEXINPUTS=" out "/share/texmf/tex/latex"))) #:tests? #f)) ; no tests + (inputs + `(("perl" ,perl))) (home-page "https://www.cs.tufts.edu/~nr/noweb/") (synopsis "Literate programming tool") (description -- cgit v1.2.3 From dc26c8c533eec6bbcfecbfea00add44cadf2abfb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 15 Jan 2020 01:33:38 +0100 Subject: gnu: noweb: Update to 2.12. * gnu/packages/noweb.scm (noweb): Update to 2.12. [source]: Switch to git repository. [arguments]: Remove obsolete substitution. [license]: Add BSD-2. --- gnu/packages/noweb.scm | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/gnu/packages/noweb.scm b/gnu/packages/noweb.scm index 2fcd24c6e2..77e88cc5d2 100644 --- a/gnu/packages/noweb.scm +++ b/gnu/packages/noweb.scm @@ -19,7 +19,7 @@ (define-module (gnu packages noweb) #:use-module (guix packages) - #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix build-system gnu) #:use-module (guix licenses) #:use-module (gnu packages perl)) @@ -27,14 +27,16 @@ (define-module (gnu packages noweb) (define-public noweb (package (name "noweb") - (version "2.11b") - (source (origin - (method url-fetch) - (uri (string-append "ftp://www.eecs.harvard.edu/pub/nr/noweb-" - version ".tgz")) - (sha256 - (base32 - "10hdd6mrk26kyh4bnng4ah5h1pnanhsrhqa7qwqy6dyv3rng44y9")))) + (version "2.12") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/nrnrnr/noweb") + (commit (string-append "v" (string-join (string-split version #\.) + "_"))))) + (sha256 + (base32 "1160i2ghgzqvnb44kgwd6s3p4jnk9668rmc15jlcwl7pdf3xqm95")))) (build-system gnu-build-system) (arguments '(#:phases @@ -83,11 +85,6 @@ (define-public noweb (lambda _ ;; Jump in the source. (chdir "src") - - ;; The makefile reads "source: FAQ", but FAQ isn't - ;; available. - (substitute* "Makefile" - (("FAQ") "")) #t))) #:make-flags (let ((out (assoc-ref %outputs "out"))) (list (string-append "BIN=" out "/bin") @@ -108,4 +105,6 @@ (define-public noweb WEB's 27. The noweb manual is only 4 pages; an additional page explains how to customize its LaTeX output. noweb works “out of the box” with any programming language, and supports TeX, LaTeX, HTML, and troff back ends.") - (license (fsf-free "https://www.cs.tufts.edu/~nr/noweb/#copyright")))) + (license + (list bsd-2 ; dual-licenced under this and… + (fsf-free "https://www.cs.tufts.edu/~nr/noweb/#copyright"))))) -- cgit v1.2.3 From 6cfbb7cb830d778d467b62636adc4323f324252e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 15 Jan 2020 03:28:17 +0100 Subject: gnu: mcelog: Update to 168. * gnu/packages/linux.scm (mcelog): Update to 168. --- 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 bd45464f00..62c0249b77 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4764,14 +4764,14 @@ (define-public module-init-tools (define-public mcelog (package (name "mcelog") - (version "154") + (version "168") (source (origin (method url-fetch) (uri (string-append "https://git.kernel.org/cgit/utils/cpu/mce/" "mcelog.git/snapshot/v" version ".tar.gz")) (sha256 (base32 - "07628cr05f50m7lsvw26wxlnb7qcl0x6rymdpp5spqzhz91l58p3")) + "1c4faayg1gcm3002b2fdrfnv76z92mvfzccvx8w9crjp0d17sp24")) (file-name (string-append name "-" version ".tar.gz")) (modules '((guix build utils))) (snippet -- cgit v1.2.3 From a82b6003e6ed8393212593a3fd233e22949f1460 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 15 Jan 2020 03:52:03 +0100 Subject: gnu: multipath-tools: Update to 0.8.3. * gnu/packages/linux.scm (multipath-tools): Update to 0.8.3. --- 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 62c0249b77..377398b9e0 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3662,7 +3662,7 @@ (define-public mdadm-static (define-public multipath-tools (package (name "multipath-tools") - (version "0.8.2") + (version "0.8.3") (source (origin (method url-fetch) (uri (string-append "https://git.opensvc.com/?p=multipath-tools/" @@ -3670,7 +3670,7 @@ (define-public multipath-tools (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0kb4mhzwyygdbikikmby6hj39pb3nrzv05v526c75wnycwnpxg31")) + "1c6ay97wlfv1fl0y8hcfpxhkps14hlnw9gzmj7884micsp7pa9yv")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From ad83280f500ec6c2fe279ea002fb01c168732445 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 16 Jan 2020 01:41:41 +0100 Subject: gnu: global: Update to 6.6.4. * gnu/packages/code.scm (global): Update to 6.6.4. --- gnu/packages/code.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index 2e6b50db69..6af1d413b8 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -114,14 +114,14 @@ (define-public complexity (define-public global ; a global variable (package (name "global") - (version "6.6.3") + (version "6.6.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/global/global-" version ".tar.gz")) (sha256 (base32 - "0735pj47dnspf20n0j1px24p59nwjinlmlb2n32ln1hvdkprivnb")))) + "1515642wsjz7x3rsgaqk4sc7n0z2znl7idsk8jz8wgy5aswqqzlq")))) (build-system gnu-build-system) (inputs `(("ncurses" ,ncurses) ("libltdl" ,libltdl) -- cgit v1.2.3 From 694c29762439de70845f07e845b4281299203e7a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 16 Jan 2020 01:46:11 +0100 Subject: gnu: ecasound: Use HTTPS home page. * gnu/packages/audio.scm (ecasound)[source, home-page]: Use HTTPS. --- 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 2b0e68fdc4..997326d5f6 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3991,7 +3991,7 @@ (define-public ecasound (version "2.9.2") (source (origin (method url-fetch) - (uri (string-append "http://nosignal.fi/download/ecasound-" + (uri (string-append "https://nosignal.fi/download/ecasound-" version ".tar.gz")) (sha256 (base32 "15rcs28fq2wfvfs66p5na7adq88b55qszbhshpizgdbyqzgr2jf1")))) @@ -4012,7 +4012,7 @@ (define-public ecasound ("ncurses" ,ncurses) ("ladspa" ,ladspa) ("lilv" ,lilv))) - (home-page "http://nosignal.fi/ecasound/index.php") + (home-page "https://nosignal.fi/ecasound/index.php") (synopsis "Multitrack audio processing") (description "Ecasound is a software package designed for multitrack audio processing. It can be used for simple tasks like audio playback, recording and -- cgit v1.2.3 From ec67d06996baa818ac2e8111a293b0f944e7288a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 16 Jan 2020 01:46:21 +0100 Subject: gnu: ecasound: Update to 2.9.3. * gnu/packages/audio.scm (ecasound): Update to 2.9.3. --- gnu/packages/audio.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 997326d5f6..07407d8ebe 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3988,17 +3988,17 @@ (define-public carla (define-public ecasound (package (name "ecasound") - (version "2.9.2") + (version "2.9.3") (source (origin (method url-fetch) (uri (string-append "https://nosignal.fi/download/ecasound-" version ".tar.gz")) (sha256 - (base32 "15rcs28fq2wfvfs66p5na7adq88b55qszbhshpizgdbyqzgr2jf1")))) + (base32 "1m7njfjdb7sqf0lhgc4swihgdr4snkg8v02wcly08wb5ar2fr2s6")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) - ;; would be nice to add mikmod to inputs if that gets packaged - ;; eventually + ;; It would be nice to add mikmod to inputs if that gets packaged + ;; eventually. (inputs `(("alsa-lib" ,alsa-lib) ("jack" ,jack-1) ("mpg123" ,mpg123) -- cgit v1.2.3 From c301dcef1c4165cf06611ad24b3ca4b5fb1cdac9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 16 Jan 2020 01:58:15 +0100 Subject: gnu: handbrake: Update to 1.3.1. * gnu/packages/video.scm (handbrake): Update to 1.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 2b3b9d982d..1a172797db 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2682,14 +2682,14 @@ (define-public mps-youtube (define-public handbrake (package (name "handbrake") - (version "1.3.0") + (version "1.3.1") (source (origin (method url-fetch) (uri (string-append "https://download.handbrake.fr/releases/" version "/HandBrake-" version "-source.tar.bz2")) (sha256 (base32 - "15hxncswmaj62hb40fxixsa6d519zb712z9xbdq979q4rasjxa59")) + "09rcrq0kjs1lc1as7w3glbpbfvzldwpx3xv0pfmkn4pl7acxw1f0")) (modules '((guix build utils))) (snippet ;; Remove "contrib" and source not necessary for -- cgit v1.2.3 From ef201cfee7daca9250ecd416ba255966ecd9194a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 16 Jan 2020 02:08:14 +0100 Subject: gnu: cgit: Update to 1.2.2. * gnu/packages/version-control.scm (cgit): Update to 1.2.2. [inputs]: Update git-source to 2.25.0. --- gnu/packages/version-control.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 417bccf99b..27254f32e0 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -678,7 +678,8 @@ (define-public git-remote-gcrypt (define-public cgit (package (name "cgit") - (version "1.2.1") + ;; Update the ‘git-source’ input as well. + (version "1.2.2") (source (origin (method url-fetch) (uri (string-append @@ -686,7 +687,7 @@ (define-public cgit version ".tar.xz")) (sha256 (base32 - "1gw2j5xc5qdx2hwiwkr8h6kgya7v9d9ff9j32ga1dys0cca7qm1w")))) + "0dmjsisigjz5k4gw7gm55qhm3wazzbm4cg7a5dwf0gqg9nacx5rz")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; XXX: fail to build the in-source git. @@ -764,11 +765,11 @@ (define (quoted-file-name input path) ("git-source" ,(origin (method url-fetch) - ;; XXX CGit is currently incompatible with Git > 2.18. - (uri "mirror://kernel.org/software/scm/git/git-2.18.2.tar.xz") + ;; cgit is tightly bound to git. Use GIT_VER from the Makefile, + ;; which may not match the current (package-version git). + (uri "mirror://kernel.org/software/scm/git/git-2.25.0.tar.xz") (sha256 - (base32 - "1gmcz5k8sa6phzhhv6zjl8izbyqnxcdb8ns8kd2czyak0g409vrq")))) + (base32 "1l58v42aazj0x9276gk8r9mwyl9pgp9w99aakz4xfhzv7wd2jq60")))) ("openssl" ,openssl) ("groff" ,groff) ("python" ,python) -- cgit v1.2.3 From 6e02ef79f574855db28e23d891db690925119e7b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 16 Jan 2020 22:00:12 +0200 Subject: gnu: translate-shell: Fix emacs install phase. * gnu/packages/dictionaries.scm (translate-shell)[arguments]: Update the 'emacs-install phase to install the .el files into the correct folder. --- gnu/packages/dictionaries.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm index 1aa54d9167..af6cef71d3 100644 --- a/gnu/packages/dictionaries.scm +++ b/gnu/packages/dictionaries.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2015, 2016 Ludovic Courtès -;;; Copyright © 2016, 2017, 2018 Efraim Flashner +;;; Copyright © 2016, 2017, 2018, 2020 Efraim Flashner ;;; Copyright © 2016 Sou Bunnbu ;;; Copyright © 2017, 2018, 2019 Nicolas Goaziou ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice @@ -283,8 +283,7 @@ (define-public translate-shell (add-after 'install 'emacs-install (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (dest (string-append out "/share/emacs/site-lisp/guix.d/" - ,name "-" ,version)) + (dest (string-append out "/share/emacs/site-lisp")) (emacs (string-append (assoc-ref inputs "emacs") "/bin/emacs"))) (install-file "google-translate-mode.el" dest) (emacs-generate-autoloads ,name dest))))) -- cgit v1.2.3 From add8d50911f55464a1ecd003521997d6c7d912f3 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 6 Jan 2020 20:09:51 +0000 Subject: gnu: Add python-git-multimail. * gnu/packages/version-control.scm (python-git-multimail): New variable. --- gnu/packages/version-control.scm | 42 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 27254f32e0..e0fe4e25a8 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -73,6 +73,7 @@ (define-module (gnu packages version-control) #:use-module (gnu packages guile) #:use-module (gnu packages image) #:use-module (gnu packages linux) + #:use-module (gnu packages mail) #:use-module (gnu packages maths) #:use-module (gnu packages nano) #:use-module (gnu packages ncurses) @@ -784,6 +785,47 @@ (define (quoted-file-name input path) a built-in cache to decrease server I/O pressure.") (license license:gpl2))) +(define-public python-git-multimail + (package + (name "python-git-multimail") + (version "1.5.0.post1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "git-multimail" version)) + (sha256 + (base32 + "1zkrbsa70anwpw86ysfwalrb7nsr064kygfiyikyq1pl9pcl969y")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "git-multimail/git_multimail.py" + (("GIT_EXECUTABLE = 'git'") + (string-append "GIT_EXECUTABLE = '" + (assoc-ref inputs "git") "/bin/git" + "'")) + (("/usr/sbin/sendmail") + (string-append (assoc-ref inputs "sendmail") + "/usr/sbin/sendmail"))) + #t))))) + (inputs + `(("git" ,git) + ("sendmail" ,sendmail))) + (home-page "https://github.com/git-multimail/git-multimail") + (synopsis "Send notification emails for Git pushes") + (description + "This hook sends emails describing changes introduced by pushes to a Git +repository. For each reference that was changed, it emits one ReferenceChange +email summarizing how the reference was changed, followed by one Revision +email for each new commit that was introduced by the reference change. + +This script is designed to be used as a post-receive hook in a Git +repository") + (license license:gpl2))) + (define-public python-ghp-import (package (name "python-ghp-import") -- cgit v1.2.3 From 584e46b1e03c18755ee4527164d751ddb20d8d18 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 16 Jan 2020 22:39:23 +0100 Subject: gnu: asymptote: Add missing input. * gnu/packages/plotutils.scm (asymptote)[inputs]: Add missing input for GUI. --- gnu/packages/plotutils.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index 7d9b2d8748..237baa932c 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm @@ -217,6 +217,7 @@ (define-public asymptote ("libgc" ,libgc) ("python" ,python) ("python-cson" ,python-cson) + ("python-numpy" ,python-numpy) ("python-pyqt" ,python-pyqt) ("readline" ,readline) ("zlib" ,zlib))) -- cgit v1.2.3 From 3597c0396b9bd6440c02462107c743c6aeb29672 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 16 Jan 2020 21:42:27 +0100 Subject: lzlib: Define 'dictionary-size+match-length-limit'. * guix/lzlib.scm (%compression-levels): Splice the rest of each element. (dictionary-size+match-length-limit): New procedure. (make-lzip-output-port, make-lzip-input-port/compressed): Use it. * tests/lzlib.scm ("Bytevector of size relative to Lzip internal buffers (2 * dictionary)"): Use 'dictionary-size+match-length-limit' instead of 'assoc-ref'. --- guix/lzlib.scm | 42 ++++++++++++++++++++++++++---------------- tests/lzlib.scm | 3 +-- 2 files changed, 27 insertions(+), 18 deletions(-) diff --git a/guix/lzlib.scm b/guix/lzlib.scm index 24c7b4b448..2fc326ba34 100644 --- a/guix/lzlib.scm +++ b/guix/lzlib.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Pierre Neidhardt -;;; Copyright © 2019 Ludovic Courtès +;;; Copyright © 2019, 2020 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -32,7 +32,8 @@ (define-module (guix lzlib) call-with-lzip-input-port call-with-lzip-output-port %default-member-length-limit - %default-compression-level)) + %default-compression-level + dictionary-size+match-length-limit)) ;;; Commentary: ;;; @@ -569,20 +570,27 @@ (define* (lzwrite encoder bv lz-port ;; Alist of (levels (dictionary-size match-length-limit)). 0 is the fastest. ;; See bbexample.c in lzlib's source. (define %compression-levels - `((0 (65535 16)) - (1 (,(bitwise-arithmetic-shift-left 1 20) 5)) - (2 (,(bitwise-arithmetic-shift-left 3 19) 6)) - (3 (,(bitwise-arithmetic-shift-left 1 21) 8)) - (4 (,(bitwise-arithmetic-shift-left 3 20) 12)) - (5 (,(bitwise-arithmetic-shift-left 1 22) 20)) - (6 (,(bitwise-arithmetic-shift-left 1 23) 36)) - (7 (,(bitwise-arithmetic-shift-left 1 24) 68)) - (8 (,(bitwise-arithmetic-shift-left 3 23) 132)) - (9 (,(bitwise-arithmetic-shift-left 1 25) 273)))) + `((0 65535 16) + (1 ,(bitwise-arithmetic-shift-left 1 20) 5) + (2 ,(bitwise-arithmetic-shift-left 3 19) 6) + (3 ,(bitwise-arithmetic-shift-left 1 21) 8) + (4 ,(bitwise-arithmetic-shift-left 3 20) 12) + (5 ,(bitwise-arithmetic-shift-left 1 22) 20) + (6 ,(bitwise-arithmetic-shift-left 1 23) 36) + (7 ,(bitwise-arithmetic-shift-left 1 24) 68) + (8 ,(bitwise-arithmetic-shift-left 3 23) 132) + (9 ,(bitwise-arithmetic-shift-left 1 25) 273))) (define %default-compression-level 6) +(define (dictionary-size+match-length-limit level) + "Return two values: the dictionary size for LEVEL, and its match-length +limit. LEVEL must be a compression level, an integer between 0 and 9." + (match (assv-ref %compression-levels level) + ((dictionary-size match-length-limit) + (values dictionary-size match-length-limit)))) + (define* (make-lzip-input-port port) "Return an input port that decompresses data read from PORT, a file port. PORT is automatically closed when the resulting port is closed." @@ -602,8 +610,9 @@ (define* (make-lzip-output-port port "Return an output port that compresses data at the given LEVEL, using PORT, a file port, as its sink. PORT is automatically closed when the resulting port is closed." - (define encoder (apply lz-compress-open - (car (assoc-ref %compression-levels level)))) + (define encoder + (call-with-values (lambda () (dictionary-size+match-length-limit level)) + lz-compress-open)) (define (write! bv start count) (lzwrite encoder bv port start count)) @@ -626,8 +635,9 @@ (define* (make-lzip-input-port/compressed port (level %default-compression-level)) "Return an input port that compresses data read from PORT, with the given LEVEL. PORT is automatically closed when the resulting port is closed." - (define encoder (apply lz-compress-open - (car (assoc-ref %compression-levels level)))) + (define encoder + (call-with-values (lambda () (dictionary-size+match-length-limit level)) + lz-compress-open)) (define input-buffer (make-bytevector 8192)) (define input-len 0) diff --git a/tests/lzlib.scm b/tests/lzlib.scm index d8d0e6edf8..63d1e15641 100644 --- a/tests/lzlib.scm +++ b/tests/lzlib.scm @@ -87,8 +87,7 @@ (define (compress-and-decompress data) (test-assert* "Bytevector of size relative to Lzip internal buffers (2 * dictionary)" (compress-and-decompress (random-bytevector - (* 2 (car (car (assoc-ref (@@ (guix lzlib) %compression-levels) - (@@ (guix lzlib) %default-compression-level)))))))) + (* 2 (dictionary-size+match-length-limit %default-compression-level))))) (test-assert* "Bytevector of size relative to Lzip internal buffers (64KiB)" (compress-and-decompress (random-bytevector (* 64 1024)))) -- cgit v1.2.3 From 72c678af55390ce01bec590f760ab95af67663b2 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 16 Jan 2020 21:45:36 +0100 Subject: import: crate: Export 'string->license'. * guix/import/crate.scm (string->license): Export. * tests/crate.scm (string->license): Remove. --- guix/import/crate.scm | 3 ++- tests/crate.scm | 5 +---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/guix/import/crate.scm b/guix/import/crate.scm index 405a26a877..57823c3639 100644 --- a/guix/import/crate.scm +++ b/guix/import/crate.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 David Craven -;;; Copyright © 2019 Ludovic Courtès +;;; Copyright © 2019, 2020 Ludovic Courtès ;;; Copyright © 2019 Martin Becze ;;; ;;; This file is part of GNU Guix. @@ -40,6 +40,7 @@ (define-module (guix import crate) #:use-module (srfi srfi-26) #:export (crate->guix-package guix-package->crate-name + string->license crate-recursive-import %crate-updater)) diff --git a/tests/crate.scm b/tests/crate.scm index 61933a8de8..aa51faebf9 100644 --- a/tests/crate.scm +++ b/tests/crate.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 David Thompson ;;; Copyright © 2016 David Craven -;;; Copyright © 2019 Ludovic Courtès +;;; Copyright © 2019, 2020 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -233,9 +233,6 @@ (define test-leaf-bob-dependencies (define test-source-hash "") -(define string->license - (@@ (guix import crate) string->license)) - (test-begin "crate") (test-equal "guix-package->crate-name" -- cgit v1.2.3 From cfd1ed84013df85f0e473884ef4038b4bd7120d4 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 16 Jan 2020 21:47:36 +0100 Subject: import: cran: Avoid uses of '@@' in the tests. * guix/import/cran.scm (description->alist, description->package): Export. : Set! 'listify'. * tests/cran.scm (description-alist, "description->package"): Remove use of '@@' to access the relevant bindings. --- guix/import/cran.scm | 9 ++++++++- tests/cran.scm | 6 +++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/guix/import/cran.scm b/guix/import/cran.scm index 13771ec598..bcb37ed250 100644 --- a/guix/import/cran.scm +++ b/guix/import/cran.scm @@ -54,7 +54,10 @@ (define-module (guix import cran) cran-package? bioconductor-package? bioconductor-data-package? - bioconductor-experiment-package?)) + bioconductor-experiment-package? + + description->alist + description->package)) ;;; Commentary: ;;; @@ -270,6 +273,10 @@ (define (listify meta field) (string-any char-set:whitespace item))) (map string-trim-both items)))))) +;; Trick Guile 3 so that it keeps the 'listify' binding accessible *and* +;; private even though this module is declarative. +(set! listify listify) + (define default-r-packages (list "base" "compiler" diff --git a/tests/cran.scm b/tests/cran.scm index d785ec5db1..70d2277198 100644 --- a/tests/cran.scm +++ b/tests/cran.scm @@ -53,7 +53,7 @@ (define description " ") (define description-alist - ((@@ (guix import cran) description->alist) description)) + (description->alist description)) (define simple-alist '(("Key" . "Value") @@ -72,7 +72,7 @@ (define simple-alist "Date/Publication"))) (lset= string=? keys (map car description-alist)))) -(test-equal "listify: return empty list if key cannot be found" +(test-equal "listifyx: return empty list if key cannot be found" '() ((@@ (guix import cran) listify) simple-alist "Letters")) @@ -105,7 +105,7 @@ (define simple-alist ("mirror://cran/src/contrib/My-Example_1.2.3.tar.gz" "source") (_ (error "Unexpected URL: " url)))))))) - (match ((@@ (guix import cran) description->package) 'cran description-alist) + (match (description->package 'cran description-alist) (('package ('name "r-my-example") ('version "1.2.3") -- cgit v1.2.3 From 9d6c6cb20ef240221fc9a8e155f4bfa53e71bce4 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 16 Jan 2020 22:49:41 +0100 Subject: import: elpa: Rewrite test to use an HTTP server instead of mocking. * guix/import/elpa.scm (elpa-url): Add 'gnu/http'. (elpa->guix-package): Handle it. * tests/elpa.scm (elpa-package-info-mock, auctex-readme-mock) (elpa-version->string, package-source-url, ensure-list) (package-home-page, make-elpa-package): Remove. : Call '%http-server-port'. (eval-test-with-elpa): Remove uses of 'mock'. Use 'with-http-server' and parameterize 'current-http-proxy' instead. --- guix/import/elpa.scm | 5 ++- tests/elpa.scm | 101 +++++++++++++++++---------------------------------- 2 files changed, 37 insertions(+), 69 deletions(-) diff --git a/guix/import/elpa.scm b/guix/import/elpa.scm index 83354d3f04..2d4487dba0 100644 --- a/guix/import/elpa.scm +++ b/guix/import/elpa.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Federico Beffa -;;; Copyright © 2015, 2016, 2017, 2018 Ludovic Courtès +;;; Copyright © 2015, 2016, 2017, 2018, 2020 Ludovic Courtès ;;; Copyright © 2018 Oleg Pykhalov ;;; ;;; This file is part of GNU Guix. @@ -72,6 +72,7 @@ (define* (elpa-url #:optional (repo 'gnu)) "Retrieve the URL of REPO." (let ((elpa-archives '((gnu . "https://elpa.gnu.org/packages") + (gnu/http . "http://elpa.gnu.org/packages") ;for testing (melpa-stable . "https://stable.melpa.org/packages") (melpa . "https://melpa.org/packages")))) (assq-ref elpa-archives repo))) @@ -251,7 +252,7 @@ (define* (elpa->guix-package name #:optional (repo 'gnu)) (package ;; ELPA is known to contain only GPLv3+ code. Other repos may contain ;; code under other license but there's no license metadata. - (let ((license (and (eq? 'gnu repo) 'license:gpl3+))) + (let ((license (and (memq repo '(gnu gnu/http)) 'license:gpl3+))) (elpa-package->sexp package license))))) diff --git a/tests/elpa.scm b/tests/elpa.scm index 44e3914f2e..b70539bda6 100644 --- a/tests/elpa.scm +++ b/tests/elpa.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Federico Beffa +;;; Copyright © 2020 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -18,10 +19,11 @@ (define-module (test-elpa) #:use-module (guix import elpa) - #:use-module (guix tests) + #:use-module (guix tests http) #:use-module (srfi srfi-1) #:use-module (srfi srfi-64) - #:use-module (ice-9 match)) + #:use-module (ice-9 match) + #:use-module (web client)) (define elpa-mock-archive '(1 @@ -37,77 +39,42 @@ (define elpa-mock-archive nil "Integrated environment for *TeX*" tar ((:url . "http://www.gnu.org/software/auctex/"))]))) -(define auctex-readme-mock "This is the AUCTeX description.") - -(define* (elpa-package-info-mock name #:optional (repo "gnu")) - "Simulate retrieval of 'archive-contents' file from REPO and extraction of -information about package NAME. (Function 'elpa-package-info'.)" - (let* ((archive elpa-mock-archive) - (info (filter (lambda (p) (eq? (first p) (string->symbol name))) - (cdr archive)))) - (if (pair? info) (first info) #f))) - -(define elpa-version->string - (@@ (guix import elpa) elpa-version->string)) - -(define package-source-url - (@@ (guix import elpa) package-source-url)) - -(define ensure-list - (@@ (guix import elpa) ensure-list)) - -(define package-home-page - (@@ (guix import elpa) package-home-page)) - -(define make-elpa-package - (@@ (guix import elpa) make-elpa-package)) +;; Avoid collisions with other tests. +(%http-server-port 10300) (test-begin "elpa") (define (eval-test-with-elpa pkg) - (mock - ;; replace the two fetching functions - ((guix import elpa) fetch-elpa-package - (lambda* (name #:optional (repo "gnu")) - (let ((pkg (elpa-package-info-mock name repo))) - (match pkg - ((name version reqs synopsis kind . rest) - (let* ((name (symbol->string name)) - (ver (elpa-version->string version)) - (url (package-source-url kind name ver repo))) - (make-elpa-package name ver - (ensure-list reqs) synopsis kind - (package-home-page (first rest)) - auctex-readme-mock - url))) - (_ #f))))) - (mock - ((guix build download) url-fetch - (lambda (url file . _) - (call-with-output-file file - (lambda (port) - (display "fake tarball" port))))) - - (match (elpa->guix-package pkg) - (('package - ('name "emacs-auctex") - ('version "11.88.6") - ('source - ('origin - ('method 'url-fetch) - ('uri ('string-append - "https://elpa.gnu.org/packages/auctex-" 'version ".tar")) - ('sha256 ('base32 (? string? hash))))) - ('build-system 'emacs-build-system) - ('home-page "http://www.gnu.org/software/auctex/") - ('synopsis "Integrated environment for *TeX*") - ('description (? string?)) - ('license 'license:gpl3+)) - #t) - (x - (pk 'fail x #f)))))) + ;; Set up an HTTP server and use it as a pseudo-proxy so that + ;; 'elpa->guix-package' talks to it. + (with-http-server `((200 ,(object->string elpa-mock-archive)) + (200 "This is the description.") + (200 "fake tarball contents")) + (parameterize ((current-http-proxy (%local-url))) + (match (elpa->guix-package pkg 'gnu/http) + (('package + ('name "emacs-auctex") + ('version "11.88.6") + ('source + ('origin + ('method 'url-fetch) + ('uri ('string-append + "http://elpa.gnu.org/packages/auctex-" 'version ".tar")) + ('sha256 ('base32 (? string? hash))))) + ('build-system 'emacs-build-system) + ('home-page "http://www.gnu.org/software/auctex/") + ('synopsis "Integrated environment for *TeX*") + ('description "This is the description.") + ('license 'license:gpl3+)) + #t) + (x + (pk 'fail x #f)))))) (test-assert "elpa->guix-package test 1" (eval-test-with-elpa "auctex")) (test-end "elpa") + +;; Local Variables: +;; eval: (put 'with-http-server 'scheme-indent-function 1) +;; End: -- cgit v1.2.3 From 9e016129e16962d4f751d934fdc0fbd6c6d64ef8 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 16 Jan 2020 23:13:08 +0100 Subject: gnu: guile-fibers: Add "guile3.0-fibers" variant. * gnu/packages/guile-xyz.scm (guile-fibers)[source]: Add 'modules' and 'snippet'. (guile3.0-fibers): New variable. --- gnu/packages/guile-xyz.scm | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 9edb718faa..bb9b259bd1 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -496,7 +496,29 @@ (define-public guile-fibers version ".tar.gz")) (sha256 (base32 - "0vjkg72ghgdgphzbjz9ig8al8271rq8974viknb2r1rg4lz92ld0")))) + "0vjkg72ghgdgphzbjz9ig8al8271rq8974viknb2r1rg4lz92ld0")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Allow builds with Guile 3.0. + (substitute* "configure" + (("search=\"2\\.2\"") + "search=\"3.0 2.2\"")) + + ;; Explicitly include system headers rather than relying on + ;; to do it for us. + (substitute* "epoll.c" + (("#include.*libguile\\.h.*$" all) + (string-append "#include \n" + "#include \n" + all "\n"))) + + ;; Import (ice-9 threads) for 'current-processor-count'. + (substitute* "tests/channels.scm" + (("#:use-module \\(fibers\\)") + (string-append "#:use-module (fibers)\n" + "#:use-module (ice-9 threads)\n"))) + #t)))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases @@ -532,6 +554,16 @@ (define-public guile-fibers (home-page "https://github.com/wingo/fibers") (license license:lgpl3+))) +(define-public guile3.0-fibers + (package + (inherit guile-fibers) + (name "guile3.0-fibers") + (arguments + ;; The code uses 'scm_t_uint64' et al., which are deprecated in 3.0. + `(#:configure-flags '("CFLAGS=-Wno-error=deprecated-declarations") + ,@(package-arguments guile-fibers))) + (inputs `(("guile" ,guile-3.0))))) + (define-public guile-syntax-highlight (package (name "guile-syntax-highlight") -- cgit v1.2.3 From 40d2bddd01dd054e68aadc98f77380a8b9977f3c Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 5 Jan 2020 02:20:35 +0100 Subject: gnu: Add xmoto. * gnu/packages/games.scm (xmoto): New variable. * gnu/packages/patches/xmoto-remove-glext.patch: New file. * gnu/packages/patches/xmoto-reproducible.patch: New file. * gnu/packages/patches/xmoto-utf8.patch: New file. * gnu/local.mk (dist_patch_DATA): Reference new files. --- gnu/local.mk | 3 + gnu/packages/games.scm | 87 ++++++++++++++++++++++++++- gnu/packages/patches/xmoto-remove-glext.patch | 23 +++++++ gnu/packages/patches/xmoto-reproducible.patch | 24 ++++++++ gnu/packages/patches/xmoto-utf8.patch | 16 +++++ 5 files changed, 152 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/xmoto-remove-glext.patch create mode 100644 gnu/packages/patches/xmoto-reproducible.patch create mode 100644 gnu/packages/patches/xmoto-utf8.patch diff --git a/gnu/local.mk b/gnu/local.mk index e2a837fe92..f0bfdfb970 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1483,6 +1483,9 @@ dist_patch_DATA = \ %D%/packages/patches/xf86-video-voodoo-pcitag.patch \ %D%/packages/patches/xfce4-panel-plugins.patch \ %D%/packages/patches/xfce4-settings-defaults.patch \ + %D%/packages/patches/xmoto-utf8.patch \ + %D%/packages/patches/xmoto-remove-glext.patch \ + %D%/packages/patches/xmoto-reproducible.patch \ %D%/packages/patches/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/games.scm b/gnu/packages/games.scm index da6c6fd078..bb7f451edc 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -30,7 +30,7 @@ ;;; Copyright © 2017, 2019 Marius Bakke ;;; Copyright © 2017, 2018 Rutger Helling ;;; Copyright © 2017 Roel Janssen -;;; Copyright © 2017, 2018, 2019 Nicolas Goaziou +;;; Copyright © 2017, 2018, 2019, 2020 Nicolas Goaziou ;;; Copyright © 2018 okapi ;;; Copyright © 2018 Tim Gesthuizen ;;; Copyright © 2018 Madalin Ionel-Patrascu @@ -9463,3 +9463,88 @@ (define-public kjumpingcube This package is part of the KDE games module.") (license (list license:gpl2+ license:fdl1.2+)))) + +(define-public xmoto + (package + (name "xmoto") + (version "0.5.11") + (source + (origin + (method url-fetch) + (uri (string-append + "http://download.tuxfamily.org/xmoto/xmoto/" version "/" + "xmoto-" version "-src.tar.gz")) + (sha256 + (base32 "1ci6r8zd0l7z28cy92ddf9dmqbdqwinz2y1cny34c61b57wsd155")) + (patches + (search-patches + "xmoto-remove-glext.patch" ;fixes licensing issue + "xmoto-reproducible.patch" + "xmoto-utf8.patch")) + ;; Unbundle ODE. + (modules '((guix build utils))) + (snippet + `(begin + (delete-file-recursively "src/ode") + #t)))) + (build-system gnu-build-system) + (arguments + ;; XXX: First flag prevents a build error with GCC7+. The second + ;; flag works around missing text in game. Both are fixed + ;; upstream. Remove once xmoto 0.5.12+ is released. + `(#:make-flags '("CXXFLAGS=-fpermissive -D_GLIBCXX_USE_CXX11_ABI=0") + #:phases + (modify-phases %standard-phases + (add-after 'install 'install-desktop-file + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (apps (string-append out "/share/applications")) + (pixmaps (string-append out "/share/pixmaps"))) + (install-file "extra/xmoto.desktop" apps) + (install-file "extra/xmoto.xpm" pixmaps) + #t))) + (add-after 'install-desktop-file 'install-fonts + (lambda* (#:key outputs inputs #:allow-other-keys) + (let ((font-dir (string-append (assoc-ref inputs "font-dejavu") + "/share/fonts/truetype/")) + (target-dir (string-append (assoc-ref outputs "out") + "/share/xmoto/Textures/Fonts/"))) + (for-each (lambda (f) + (let ((font (string-append font-dir f)) + (target (string-append target-dir f))) + (delete-file target) + (symlink font target))) + '("DejaVuSans.ttf" "DejaVuSansMono.ttf")) + #t))) + (add-after 'install-fonts 'install-man-page + (lambda* (#:key outputs #:allow-other-keys) + (install-file "xmoto.6" + (string-append (assoc-ref outputs "out") + "/share/man/man6")) + #t))))) + (native-inputs + `(("gettext" ,gettext-minimal))) + (inputs + `(("curl" ,curl) + ("font-dejavu" ,font-dejavu) + ("glu" ,glu) + ("libjpeg" ,libjpeg) + ("libpng" ,libpng) + ("libxdg-basedir" ,libxdg-basedir) + ("libxml2" ,libxml2) + ("lua" ,lua-5.2) + ("ode" ,ode) + ("sdl" ,(sdl-union (list sdl sdl-mixer sdl-net sdl-ttf))) + ("sqlite" ,sqlite) + ("zlib" ,zlib))) + (home-page "https://xmoto.tuxfamily.org/") + (synopsis "2D motocross platform game") + (description "X-Moto is a challenging 2D motocross platform game, +where physics play an all important role in the gameplay. You need to +control your bike to its limit, if you want to have a chance finishing +the more difficult of the challenges.") + (license (list license:gpl2+ ;whole project + license:bsd-4 ;src/bzip + license:bsd-3 ;src/md5sum + license:lgpl2.1+ ;src/iqsort.h + license:expat)))) diff --git a/gnu/packages/patches/xmoto-remove-glext.patch b/gnu/packages/patches/xmoto-remove-glext.patch new file mode 100644 index 0000000000..ad0c848d1d --- /dev/null +++ b/gnu/packages/patches/xmoto-remove-glext.patch @@ -0,0 +1,23 @@ +Description: Allow building without upstream-supplied glext.h +Author: Stephen Kitt +Bug: http://todo.xmoto.tuxfamily.org/index.php?do=details&task_id=803 + +--- xmoto-0.5.9+dfsg.orig/src/include/xm_OpenGL.h ++++ xmoto-0.5.9+dfsg/src/include/xm_OpenGL.h +@@ -1,7 +1,6 @@ + #ifdef ENABLE_OPENGL + /* Pull in OpenGL headers */ + /* following scissored from SDL_opengl.h */ +-#define __glext_h_ /* Don't let gl.h include glext.h */ + #ifdef HAVE_APPLE_OPENGL_FRAMEWORK + #include /* Header File For The OpenGL Library */ + #include /* Header File For The GLU Library */ +@@ -12,8 +11,5 @@ + #include /* Header File For The OpenGL Library */ + #include /* Header File For The GLU Library */ + #endif +-#undef __glext_h_ +- +-#include "../glext.h" + + #endif diff --git a/gnu/packages/patches/xmoto-reproducible.patch b/gnu/packages/patches/xmoto-reproducible.patch new file mode 100644 index 0000000000..606f4ec714 --- /dev/null +++ b/gnu/packages/patches/xmoto-reproducible.patch @@ -0,0 +1,24 @@ +Description: Avoid __DATE__ and __TIME__ to build reproducibly +Author: Stephen Kitt + +--- a/src/GameInit.cpp ++++ b/src/GameInit.cpp +@@ -248,7 +248,6 @@ + Logger::setActiv(XMSession::instance()->noLog() == false); /* apply log activ mode */ + + LogInfo(std::string("X-Moto " + XMBuild::getVersionString(true)).c_str()); +- LogInfo("compiled at "__DATE__" "__TIME__); + if(SwapEndian::bigendien) { + LogInfo("Systeme is bigendien"); + } else { +--- a/src/states/StateOptions.cpp ++++ b/src/states/StateOptions.cpp +@@ -1233,8 +1233,6 @@ + int p=25; + makeWindowOptions_infos_line(v_window, "Version", "X-Moto " + XMBuild::getVersionString(true), p); + p+=20; +- makeWindowOptions_infos_line(v_window, "Compilation date", __DATE__ " " __TIME__, p); +- p+=20; + makeWindowOptions_infos_line(v_window, "User data directory", XMFS::getUserDir(FDT_DATA), p); + p+=20; + makeWindowOptions_infos_line(v_window, "User config directory", XMFS::getUserDir(FDT_CONFIG), p); diff --git a/gnu/packages/patches/xmoto-utf8.patch b/gnu/packages/patches/xmoto-utf8.patch new file mode 100644 index 0000000000..e5d0dfb2a4 --- /dev/null +++ b/gnu/packages/patches/xmoto-utf8.patch @@ -0,0 +1,16 @@ +Description: Build with g++'s new utf8.h +Author: Stephen Kitt + +--- a/src/helpers/utf8.h ++++ b/src/helpers/utf8.h +@@ -18,8 +18,8 @@ + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + =============================================================================*/ + +-#ifndef __UTF8_H__ +-#define __UTF8_H__ ++#ifndef __XMOTO_UTF8_H__ ++#define __XMOTO_UTF8_H__ + + #include + #include -- cgit v1.2.3 From af4796d5caad9500c1f24a91e7fb7529df7d3fec Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 16 Jan 2020 23:23:38 +0100 Subject: gnu: xmoto: Slight description rewording. * gnu/packages/games.scm (xmoto)[description]: Slight rewording. --- gnu/packages/games.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index bb7f451edc..42444045b4 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -9539,10 +9539,10 @@ (define-public xmoto ("zlib" ,zlib))) (home-page "https://xmoto.tuxfamily.org/") (synopsis "2D motocross platform game") - (description "X-Moto is a challenging 2D motocross platform game, -where physics play an all important role in the gameplay. You need to -control your bike to its limit, if you want to have a chance finishing -the more difficult of the challenges.") + (description "X-Moto is a challenging 2D motocross platform game, where +physics play an all important role in the gameplay. You need to control your +bike to its limit, if you want to have a chance finishing the more difficult +challenges.") (license (list license:gpl2+ ;whole project license:bsd-4 ;src/bzip license:bsd-3 ;src/md5sum -- cgit v1.2.3 From 37c52b5b15c6debed78dba41a74370a051ad7878 Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Thu, 16 Jan 2020 18:43:10 +0100 Subject: gnu: Refactor renpy build. * gnu/packages/game-development.scm (python2-renpy)[arguments]: Use directory excursions instead of invoking `chdir' directly in phases. --- gnu/packages/game-development.scm | 54 +++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 31 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 7aef6b09d2..697ede89e1 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1086,39 +1086,31 @@ (define-public python2-renpy (setenv "RENPY_DEPS_INSTALL" (string-join (map cdr inputs) ":")) #t)) (replace 'build - (lambda args - (apply - (lambda* (build-root #:key inputs outputs #:allow-other-keys) - ;; The "module" subdirectory contains a python (really cython) - ;; project, which is built using a script, that is thankfully - ;; named "setup.py". - (chdir "module") - (apply (assoc-ref %standard-phases 'build) args) - ;; the above causes renpy.__init__ to be compiled but does not - ;; compile anything else, hence we do that here - (chdir build-root) - (delete-file "renpy/__init__.pyc") - (invoke "python" "-m" "compileall" "renpy")) - (getcwd) args) + (lambda* (#:key inputs outputs #:allow-other-keys #:rest args) + ;; The "module" subdirectory contains a python (really cython) + ;; project, which is built using a script, that is thankfully + ;; named "setup.py". + (with-directory-excursion "module" + (apply (assoc-ref %standard-phases 'build) args)) + ;; the above causes renpy.__init__ to be compiled but does not + ;; compile anything else, hence we do that here + (delete-file "renpy/__init__.pyc") + (invoke "python" "-m" "compileall" "renpy") #t)) (replace 'install - (lambda args - (apply - (lambda* (build-root #:key inputs outputs #:allow-other-keys) - ;; Again, we have to wrap the module installation. - ;; Additionally, we want to install the python code - ;; (both source and compiled) in the same directory. - (let* ((out (assoc-ref outputs "out")) - (site (string-append "/lib/python" - ,(version-major+minor - (package-version python-2)) - "/site-packages"))) - (chdir "module") - (apply (assoc-ref %standard-phases 'install) args) - (chdir build-root) - (copy-recursively "renpy" - (string-append out site "/renpy")))) - (getcwd) args) + (lambda* (#:key inputs outputs #:allow-other-keys #:rest args) + ;; Again, we have to wrap the module installation. + ;; Additionally, we want to install the python code + ;; (both source and compiled) in the same directory. + (let* ((out (assoc-ref outputs "out")) + (site (string-append "/lib/python" + ,(version-major+minor + (package-version python-2)) + "/site-packages"))) + (with-directory-excursion "module" + (apply (assoc-ref %standard-phases 'install) args)) + (copy-recursively "renpy" + (string-append out site "/renpy"))) #t))))) (inputs `(("ffmpeg" ,ffmpeg) -- cgit v1.2.3 From 4337140c93beb50cf28cf51268df86f96239a9ad Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 16 Jan 2020 23:39:39 +0100 Subject: gnu: Update copyright line. * gnu/packages/game-development.scm: Update copyright line. --- gnu/packages/game-development.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 697ede89e1..23cf913644 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2017, 2019 Rutger Helling ;;; Copyright © 2018 Marius Bakke ;;; Copyright © 2019 Pierre Neidhardt -;;; Copyright © 2019 Leo Prikler +;;; Copyright © 2019, 2020 Leo Prikler ;;; Copyright © 2019 Jethro Cao ;;; Copyright © 2020 Nicolas Goaziou ;;; -- cgit v1.2.3 From 09c2fc2a100e7d9373818e60443ca568a1dafc05 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 16 Jan 2020 17:28:43 +0100 Subject: gnu: miniupnpc: Update to 2.1.20191224. * gnu/packages/upnp.scm (miniupnpc): Update to 2.1.20191224. --- gnu/packages/upnp.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/upnp.scm b/gnu/packages/upnp.scm index 390a3387ab..8f3c887a68 100644 --- a/gnu/packages/upnp.scm +++ b/gnu/packages/upnp.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 Sree Harsha Totakura ;;; Copyright © 2015 Federico Beffa -;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2016, 2017, 2018, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Theodoros Foradis ;;; Copyright © 2019 Jens Mølgaard ;;; @@ -42,14 +42,14 @@ (define-module (gnu packages upnp) (define-public miniupnpc (package (name "miniupnpc") - (version "2.1.20190824") + (version "2.1.20191224") (source (origin (method url-fetch) (uri (string-append "https://miniupnp.tuxfamily.org/files/" "miniupnpc-" version ".tar.gz")) (sha256 - (base32 "0rg1i51lnyq8zgflhcg981kq4348vgq03ndmbgiv7knd1vmfzb8z")))) + (base32 "1kv6dpj93gckvwvgzxl4vdqpwnicb0c8p0xw53m2gh5naiw44ys4")))) (build-system gnu-build-system) (native-inputs `(("python" ,python-2))) -- cgit v1.2.3 From 02d6e27e15d66ef557b90479a7920aabd15e42bf Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 16 Jan 2020 17:06:00 +0100 Subject: gnu: intel-vaapi-driver: Update to 2.4.0. * gnu/packages/video.scm (intel-vaapi-driver): Update to 2.4.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 1a172797db..5629d58b96 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2803,7 +2803,7 @@ (define-public handbrake (define-public intel-vaapi-driver (package (name "intel-vaapi-driver") - (version "2.3.0") + (version "2.4.0") (source (origin (method url-fetch) @@ -2811,7 +2811,7 @@ (define-public intel-vaapi-driver "releases/download/" version "/intel-vaapi-driver-" version ".tar.bz2")) (sha256 - (base32 "1qyzxh3p8cw4fv8bz9zd4kc8hajlaps7xryzh6pad814n3m5sbjw")))) + (base32 "12fhydgwpvyh97gxqlgv77wsf9yax321h46vi49j4sxghpcxvqki")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From df01360f7897e8eacdc4c1156443018b15f42fdc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 17 Jan 2020 00:08:41 +0100 Subject: gnu: python-publicsuffix2: Update to 2.20191221. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-web.scm (python-publicsuffix2): Update to 2.20191221. [arguments]: Add ‘ignore-maintainer-inputs’ phase. --- gnu/packages/python-web.scm | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 179e64e0a1..611c85a9ad 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -14,7 +14,7 @@ ;;; Copyright © 2015 Cyril Roelandt ;;; Copyright © 2015, 2016, 2017, 2019 Leo Famulari ;;; Copyright © 2016, 2019 Hartmut Goebel -;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2015, 2017 Ben Woodcroft ;;; Copyright © 2015, 2016 Christopher Allan Webber ;;; Copyright © 2017 Adriano Peluso @@ -2748,17 +2748,26 @@ (define-public python2-publicsuffix (define-public python-publicsuffix2 (package (name "python-publicsuffix2") - (version "2.20160818") + (version "2.20191221") (source (origin (method url-fetch) - (uri (pypi-uri "publicsuffix2" version ".tar.bz2")) + (uri (pypi-uri "publicsuffix2" version)) (sha256 - (base32 - "1bb55yka9vkn7i6y1kjzxa516kh6v4gsrxa90w5wdz5p5n968r68")))) + (base32 "0yzysvfj1najr1mb4pcqrbmjir3xpb69rlffln95a3cdm8qwry00")))) (build-system python-build-system) (arguments - '(#:tests? #f)) ; The test suite requires network access. + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'ignore-maintainer-inputs + (lambda _ + ;; Comment out a demand for python-requests, which is used only by + ;; the unused ‘update_psl’ helper command. + (substitute* "setup.py" + (("'requests " match) + (format "# ~a" match))) + #t))) + #:tests? #f)) ; the test suite requires network access (home-page "https://github.com/pombredanne/python-publicsuffix2") (synopsis "Get a public suffix for a domain name using the Public Suffix List") (description "Get a public suffix for a domain name using the Public Suffix -- cgit v1.2.3 From 5976d0b07ef1c7476914bbec8a3f7a37df84907d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 17 Jan 2020 03:24:59 +0100 Subject: gnu: wavemon: Update to 0.9.1. * gnu/packages/hardware.scm (wavemon): Update to 0.9.1. --- gnu/packages/hardware.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index dab49c7cc0..4c9c45bc48 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -238,7 +238,7 @@ (define-public msr-tools (define-public wavemon (package (name "wavemon") - (version "0.9.0") + (version "0.9.1") (source (origin (method git-fetch) @@ -247,7 +247,7 @@ (define-public wavemon (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "07cid0h3mcyr74nnrzzf8k5n1p9a4y3wij43jbiaqmkpxilcc1i6")))) + (base32 "109ycwnjjqc2vpnd8b86njfifczlxglnyv4rh2qmbn2i5nw2wryg")))) (build-system gnu-build-system) (arguments `(#:make-flags -- cgit v1.2.3 From 90b8f4e292da0d6980be89915607b64879f0d35c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 17 Jan 2020 03:51:29 +0100 Subject: gnu: stgit: Update to 0.21. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/version-control.scm (stgit): Update to 0.21. [native-inputs]: Add perl. [arguments]: Build with default Python (3). Add ‘hard-code-version’ and ‘patch-tests’ phases. Fix and run all remaining tests in the ‘check’ phase. --- gnu/packages/version-control.scm | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index e0fe4e25a8..20db6b4b08 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1049,7 +1049,7 @@ (define-public git-flow (define-public stgit (package (name "stgit") - (version "0.18") + (version "0.21") (source (origin (method git-fetch) @@ -1058,20 +1058,36 @@ (define-public stgit (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0ydgg744m671nkhg7h4q2z3b9vpbc9914rbc0wcgimqfqsxkxx2y")))) + (base32 "00pmz93znl418lsjwy4mr0chp8i2w27h1xjysa05f62smsv91yyc")))) (build-system python-build-system) + (native-inputs + `(("perl" ,perl))) (inputs `(("git" ,git))) (arguments - `(#:python ,python-2 - #:phases + `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'hard-code-version + (lambda _ + ;; setup.py tries to cleverly extract the version number from the + ;; git history, which the source checkout lacks. Hard-code one. + (substitute* "setup.py" + (("get_ver\\(\\)") + (format #f "'~a'" ,version))) + #t)) + (add-before 'check 'patch-tests + (lambda _ + (substitute* (list "t/t1900-mail.sh" + "t/t7504-commit-msg-hook.sh") + (("/bin/sh") + (which "bash"))) + #t)) (replace 'check (lambda _ - ;; Two tests will fail -> disable them. TODO: fix the failing tests - (delete-file "t/t3300-edit.sh") - (delete-file "t/t7504-commit-msg-hook.sh") - (invoke "make" "test")))))) + (invoke "make" + "PERL_PATH=perl" + (string-append "SHELL_PATH=" (which "bash")) + "test")))))) (home-page "http://procode.org/stgit/") (synopsis "Stacked Git") (description -- cgit v1.2.3 From 7b99aa043c4e661fd86cfe25e7b51f5081f42e5d Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 17 Jan 2020 04:07:11 +0100 Subject: gnu: Add ocaml-4.09. * gnu/packages/ocaml.scm (ocaml-4.09): New variable. [argument]: Remove the no longer needed configure phase. --- gnu/packages/ocaml.scm | 50 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 18 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 3253d0285a..ce0398b0d4 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -131,10 +131,10 @@ (define janestreet-arguments "/lib/ocaml/site-lib")) #:phases (modify-phases %standard-phases (delete 'configure)))) -(define-public ocaml-4.07 +(define-public ocaml-4.09 (package (name "ocaml") - (version "4.07.1") + (version "4.09.0") (source (origin (method url-fetch) (uri (string-append @@ -143,7 +143,7 @@ (define-public ocaml-4.07 "/ocaml-" version ".tar.xz")) (sha256 (base32 - "1f07hgj5k45cylj1q3k5mk8yi02cwzx849b1fwnwia8xlcfqpr6z")))) + "1v3z5ar326f3hzvpfljg4xj8b9lmbrl53fn57yih1bkbx3gr3yzj")))) (build-system gnu-build-system) (native-search-paths (list (search-path-specification @@ -162,10 +162,7 @@ (define-public ocaml-4.07 ("gcc:lib" ,(canonical-package gcc) "lib") ("zlib" ,zlib))) ;also needed for objdump support (arguments - `(#:modules ((guix build gnu-build-system) - (guix build utils) - (web server)) - #:phases + `(#:phases (modify-phases %standard-phases (add-after 'unpack 'patch-/bin/sh-references (lambda* (#:key inputs #:allow-other-keys) @@ -184,21 +181,11 @@ (define-public ocaml-4.07 quoted-sh)))) (find-files "." "\\.ml$")) #t)))) - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (mandir (string-append out "/share/man"))) - ;; Custom configure script doesn't recognize - ;; --prefix= syntax (with equals sign). - (invoke "./configure" - "--prefix" out - "--mandir" mandir)))) (replace 'build (lambda _ (invoke "make" "-j" (number->string (parallel-job-count)) "world.opt"))) - (delete 'check) - (add-after 'install 'check + (replace 'check (lambda _ (with-directory-excursion "testsuite" (invoke "make" "all"))))))) @@ -214,6 +201,33 @@ (define-public ocaml-4.07 ;; distributed under lgpl2.0. (license (list license:qpl license:lgpl2.0)))) +(define-public ocaml-4.07 + (package + (inherit ocaml-4.09) + (version "4.07.1") + (source (origin + (method url-fetch) + (uri (string-append + "http://caml.inria.fr/pub/distrib/ocaml-" + (version-major+minor version) + "/ocaml-" version ".tar.xz")) + (sha256 + (base32 + "1f07hgj5k45cylj1q3k5mk8yi02cwzx849b1fwnwia8xlcfqpr6z")))) + (arguments + (substitute-keyword-arguments (package-arguments ocaml-4.09) + ((#:phases phases) + `(modify-phases ,phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (mandir (string-append out "/share/man"))) + ;; Custom configure script doesn't recognize + ;; --prefix= syntax (with equals sign). + (invoke "./configure" + "--prefix" out + "--mandir" mandir)))))))))) + (define-public ocaml ocaml-4.07) (define-public ocamlbuild -- cgit v1.2.3 From 4711a24074da962c50fa446215060ed50eb52970 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 16 Jan 2020 22:23:21 +0200 Subject: gnu: rust-glob-0.2: Don't hide package. * gnu/packages/crates-io.scm (rust-glob-0.2)[arguments]: Skip build. Add rust-tempdir-0.3 to cargo-development-inputs. [properties]: Don't inherit field. --- gnu/packages/crates-io.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 41ed200296..ebc2afeae3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3828,7 +3828,12 @@ (define-public rust-glob-0.2 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "1ysvi72slkw784fcsymgj4308c3y03gwjjzqxp80xdjnkbh8vqcb")))))) + "1ysvi72slkw784fcsymgj4308c3y03gwjjzqxp80xdjnkbh8vqcb")))) + (arguments + `(#:skip-build? #t + #:cargo-development-inputs + (("rust-tempdir" ,rust-tempdir-0.3)))) + (properties '()))) (define-public rust-globset-0.4 (package -- cgit v1.2.3 From 5a3217e52cd5364684b8a295357187a53a26e437 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 16 Jan 2020 22:24:19 +0200 Subject: gnu: rust-glob-0.3: Don't hide package. * gnu/packages/crates-io.scm (rust-glob-0.3)[arguments]: Skip build. Add rust-tempdir-0.3 to cargo-development-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ebc2afeae3..bb073700c7 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3807,12 +3807,15 @@ (define-public rust-glob-0.3 (base32 "0x25wfr7vg3mzxc9x05dcphvd3nwlcmbnxrvwcvrrdwplcrrk4cv")))) (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-development-inputs + (("rust-tempdir" ,rust-tempdir-0.3)))) (home-page "https://github.com/rust-lang-nursery/glob") (synopsis "Match file paths against Unix shell style patterns") (description "This package provides support for matching file paths against Unix shell style patterns.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) @@ -3828,12 +3831,7 @@ (define-public rust-glob-0.2 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "1ysvi72slkw784fcsymgj4308c3y03gwjjzqxp80xdjnkbh8vqcb")))) - (arguments - `(#:skip-build? #t - #:cargo-development-inputs - (("rust-tempdir" ,rust-tempdir-0.3)))) - (properties '()))) + "1ysvi72slkw784fcsymgj4308c3y03gwjjzqxp80xdjnkbh8vqcb")))))) (define-public rust-globset-0.4 (package -- cgit v1.2.3 From af9ca877b0d64d15683a5076f25efc2d2069eae7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 16 Jan 2020 22:26:02 +0200 Subject: gnu: rust-hostname-0.1: Don't hide package. * gnu/packages/crates-io.scm (rust-hostname-0.1)[arguments]: Skip build. Add rust-libc-0.2, rust-winutil-0.1 to cargo-inputs. [host-name]: Update to new host-name. [properties]: Remove field. --- gnu/packages/crates-io.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index bb073700c7..2602d2a38c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4407,11 +4407,15 @@ (define-public rust-hostname-0.1 (base32 "0kprf862qaa7lwdms6aw7f3275h0j2rwhs9nz5784pm8hdmb9ki1")))) (build-system cargo-build-system) - (home-page "https://github.com/fengcen/hostname") + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-winutil" ,rust-winutil-0.1)))) + (home-page "https://github.com/svartalf/hostname") (synopsis "Get hostname for Rust") (description "Get hostname for Rust.") - (properties '((hidden? . #t))) (license license:expat))) (define-public rust-idna-0.1 -- cgit v1.2.3 From 7499a9c78108ebc4e9aaf054cc30d71d89227d01 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 16 Jan 2020 22:29:16 +0200 Subject: gnu: rust-iovec-0.1: Don't hide package. * gnu/package/crates-io.scm (rust-iovec-0.1)[arguments]: Skip build. Add rust-libc-0.2, rust-winapi-0.2 to cargo-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2602d2a38c..9c07f81397 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4599,11 +4599,15 @@ (define-public rust-iovec-0.1 (base32 "025vi072m22299z3fg73qid188z2iip7k41ba6v5v5yhwwby9rnv")))) (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-winapi" ,rust-winapi-0.2)))) (home-page "https://github.com/carllerche/iovec") (synopsis "Portable buffer type for scatter/gather I/O operations") (description "Portable buffer type for scatter/gather I/O operations.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From a6e28a92c17a6c25d6b36e2c8b49049d67652345 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 16 Jan 2020 22:30:13 +0200 Subject: gnu: rust-iovec-0.1: Update to 0.1.4. * gnu/packages/crates-io.scm (rust-iovec-0.1): Update to 0.1.4. [arguments] Remove rust-winapi-0.2 from cargo-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 9c07f81397..6ddb747add 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4589,7 +4589,7 @@ (define-public rust-intervaltree-0.2 (define-public rust-iovec-0.1 (package (name "rust-iovec") - (version "0.1.2") + (version "0.1.4") (source (origin (method url-fetch) @@ -4597,13 +4597,11 @@ (define-public rust-iovec-0.1 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "025vi072m22299z3fg73qid188z2iip7k41ba6v5v5yhwwby9rnv")))) + "0ph73qygwx8i0mblrf110cj59l00gkmsgrpzz1rm85syz5pymcxj")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t - #:cargo-inputs - (("rust-libc" ,rust-libc-0.2) - ("rust-winapi" ,rust-winapi-0.2)))) + #:cargo-inputs (("rust-libc" ,rust-libc-0.2)))) (home-page "https://github.com/carllerche/iovec") (synopsis "Portable buffer type for scatter/gather I/O operations") (description -- cgit v1.2.3 From 1403c31e3eaa0ee535489b969f1d59f8da78fd5f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 16 Jan 2020 22:32:02 +0200 Subject: gnu: rust-itoa-0.1: Don't hide package. * gnu/packages/crates-io.scm (rust-itoa-0.1)[arguments]: Skip build. [properties]: Don't inherit field. --- gnu/packages/crates-io.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6ddb747add..1ab69e9a32 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4702,7 +4702,9 @@ (define-public rust-itoa-0.1 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "18g7p2hrb3dk84z3frfgmszfc9hjb4ps9vp99qlb1kmf9gm8hc5f")))))) + "18g7p2hrb3dk84z3frfgmszfc9hjb4ps9vp99qlb1kmf9gm8hc5f")))) + (arguments '(#:skip-build? #t)) + (properties '()))) (define-public rust-js-sys-0.3 (package -- cgit v1.2.3 From 6c92f52b2ea1998678713505f4c5af70efc3792b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 16 Jan 2020 22:32:53 +0200 Subject: gnu: rust-itoa-0.4: Don't hide package. * gnu/packages/crates-io.scm (rust-itoa-0.4)[arguments]: Skip build. [properties]: Remove field. --- gnu/packages/crates-io.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1ab69e9a32..8879096115 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4682,11 +4682,11 @@ (define-public rust-itoa-0.4 (base32 "0zvg2d9qv3avhf3d8ggglh6fdyw8kkwqg3r4622ly5yhxnvnc4jh")))) (build-system cargo-build-system) + (arguments '(#:skip-build? #t)) (home-page "https://github.com/dtolnay/itoa") (synopsis "Fast functions for printing integer primitives") (description "This crate provides fast functions for printing integer primitives to an @code{io::Write}.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) @@ -4702,9 +4702,7 @@ (define-public rust-itoa-0.1 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "18g7p2hrb3dk84z3frfgmszfc9hjb4ps9vp99qlb1kmf9gm8hc5f")))) - (arguments '(#:skip-build? #t)) - (properties '()))) + "18g7p2hrb3dk84z3frfgmszfc9hjb4ps9vp99qlb1kmf9gm8hc5f")))))) (define-public rust-js-sys-0.3 (package -- cgit v1.2.3 From 759dfa989e5f5fbc91ac618243333112c641cf15 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 16 Jan 2020 22:34:48 +0200 Subject: gnu: rust-libc-0.2: Don't hide package. * gnu/packages/crates-io.scm (rust-libc-0.2)[arguments]: Skip build. Add rust-rustc-std-workspace-core-1.0 to cargo-inputs. [description]: Appease 'guix lint'. [properties]: Remove field. --- gnu/packages/crates-io.scm | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 8879096115..8f62e89a75 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4964,19 +4964,21 @@ (define-public rust-libc-0.2 (base32 "1s14bjxnz6haw0gr1h3j4sr7s2s407hpgm8dxhwnl7yzgxia0c8s")))) (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1.0)))) (home-page "https://github.com/rust-lang/libc") (synopsis "Raw FFI bindings to platform libraries like libc") (description - "libc provides all of the definitions necessary to easily -interoperate with C code (or \"C-like\" code) on each of the platforms -that Rust supports. This includes type definitions (e.g., c_int), -constants (e.g., EINVAL) as well as function headers (e.g., malloc). + "The rust libc crate provides all of the definitions necessary to easily +interoperate with C code (or \"C-like\" code) on each of the platforms that Rust +supports. This includes type definitions (e.g., c_int), constants (e.g., EINVAL) +as well as function headers (e.g., malloc). -This crate exports all underlying platform types, functions, and -constants under the crate root, so all items are accessible as -@samp{libc::foo}. The types and values of all the exported APIs match -the platform that libc is compiled for.") - (properties '((hidden? . #t))) +This crate exports all underlying platform types, functions, and constants under +the crate root, so all items are accessible as @samp{libc::foo}. The types and +values of all the exported APIs match the platform that libc is compiled for.") (license (list license:expat license:asl2.0)))) -- cgit v1.2.3 From 290436d1109ae6f19bd8fbeb49ec7b3a858e98b9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 16 Jan 2020 22:37:07 +0200 Subject: gnu: rust-libc-0.2: Update to 0.2.66. * gnu/packages/crates-io.scm (rust-libc-0.2): Update to 0.2.66. --- 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 8f62e89a75..9e81019f83 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4954,7 +4954,7 @@ (define-public rust-lexical-core-0.4 (define-public rust-libc-0.2 (package (name "rust-libc") - (version "0.2.65") + (version "0.2.66") (source (origin (method url-fetch) @@ -4962,7 +4962,7 @@ (define-public rust-libc-0.2 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "1s14bjxnz6haw0gr1h3j4sr7s2s407hpgm8dxhwnl7yzgxia0c8s")))) + "0n0mwry21fxfwc063k33mvxk8xj7ia5ar8m42c9ymbam2ksb25fm")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t -- cgit v1.2.3 From cc0e8ce608d7374c1d80a24876fdfbbb698cca9d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 16 Jan 2020 22:40:03 +0200 Subject: gnu: rust-libloading-0.5: Don't hide package. * gnu/packages/crates-io.scm (rust-libloading-0.5)[arguments]: Skip build. Add rust-winapi-0.3 to cargo-inputs. Add rust-cc-1.0 to cargo-development-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9e81019f83..f01dd5370e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5048,6 +5048,12 @@ (define-public rust-libloading-0.5 (base32 "0lyply8rcqc8agajzxs7bq6ivba9dnn1i68kgb9z2flnfjh13cgj")))) (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-winapi" ,rust-winapi-0.3)) + #:cargo-development-inputs + (("rust-cc" ,rust-cc-1.0)))) (home-page "https://github.com/nagisa/rust_libloading/") (synopsis "Rust library for loading dynamic libraries") (description @@ -5056,7 +5062,6 @@ (define-public rust-libloading-0.5 dangling-Symbols that may occur after a Library is unloaded. Using this library allows loading dynamic libraries (also known as shared libraries) as well as use functions and static variables these libraries contain.") - (properties '((hidden? . #t))) (license license:isc))) (define-public rust-libssh2-sys-0.2 -- cgit v1.2.3 From 468e15b1af5fab3c841bfac16a1bcd61ab014dcd Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 16 Jan 2020 22:44:55 +0200 Subject: gnu: rust-lock-api-0.1: Don't hide package. * gnu/packages/crates-io.scm (rust-lock-api-0.1)[arguments]: Skip build. Add rust-scopeguard-0.3, rust-owning-ref-0.4 to cargo-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f01dd5370e..a14d302e12 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5157,7 +5157,11 @@ (define-public rust-lock-api-0.1 (sha256 (base32 "0b24q9mh258xa52ap636q1sxz0j5vrnp0hwbbh7ddjka3wwz3sv2")))) - (properties '((hidden? . #t))))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-scopeguard" ,rust-scopeguard-0.3) + ("rust-owning-ref" ,rust-owning-ref-0.4)))))) (define-public rust-log-0.4 (package -- cgit v1.2.3 From bd843a2ff6ccf5a4dc28795ad5671a8c7c28ee11 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 16 Jan 2020 22:45:57 +0200 Subject: gnu: rust-lock-api-0.3: Update to 0.3.3. * gnu/packages/crates-io.scm (rust-lock-api-0.3): Update to 0.3.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 a14d302e12..780173bb65 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5104,7 +5104,7 @@ (define-public rust-libssh2-sys-0.2 (define-public rust-lock-api-0.3 (package (name "rust-lock-api") - (version "0.3.1") + (version "0.3.3") (source (origin (method url-fetch) @@ -5113,7 +5113,7 @@ (define-public rust-lock-api-0.3 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1p04271jikw69ja0ap0plrfwm9incf1iny48g0b3ma9k4mw2x4gq")))) + "0yzlz7f5xl5sm129dq8jqsrcrkyv7jjnqwd4zr4ijsdlxjaxxckr")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t -- cgit v1.2.3 From 33ed8296c0837344f932d6885de41b23c2b12dd3 Mon Sep 17 00:00:00 2001 From: Alex Sassmannshausen Date: Thu, 16 Jan 2020 17:17:48 +0100 Subject: gnu: services: Allow extra content in mysql configuration. * gnu/services/databases.scm (): New field. (mysql-configuration-file): Use it. --- gnu/services/databases.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/services/databases.scm b/gnu/services/databases.scm index a26eeb20cc..473ece4e97 100644 --- a/gnu/services/databases.scm +++ b/gnu/services/databases.scm @@ -463,7 +463,8 @@ (define-record-type* mysql-configuration make-mysql-configuration mysql-configuration? (mysql mysql-configuration-mysql (default mariadb)) - (port mysql-configuration-port (default 3306))) + (port mysql-configuration-port (default 3306)) + (extra-content mysql-configuration-extra-content (default ""))) (define %mysql-accounts (list (user-group @@ -478,11 +479,12 @@ (define %mysql-accounts (define mysql-configuration-file (match-lambda - (($ mysql port) + (($ mysql port extra-content) (mixed-text-file "my.cnf" "[mysqld] datadir=/var/lib/mysql socket=/run/mysqld/mysqld.sock port=" (number->string port) " +" extra-content " ")))) (define (%mysql-activation config) -- cgit v1.2.3 From 33865d3259204ad0e5448dec28e6e49ecf468a72 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Thu, 16 Jan 2020 19:25:22 +0100 Subject: gnu: Add cl-misc-extensions. * gnu/packages/lisp-xyz.scm (sbcl-misc-extensions, cl-misc-extensions, ecl-misc-extensions): New variables. --- gnu/packages/lisp-xyz.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index ae59a97a21..187c4ed96a 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -9200,3 +9200,39 @@ (define-public cl-archive (define-public ecl-archive (sbcl-package->ecl-package sbcl-archive)) + +(define-public sbcl-misc-extensions + (let ((commit "101c05112bf2f1e1bbf527396822d2f50ca6327a") + (revision "1")) + (package + (name "sbcl-misc-extensions") + (version (git-version "3.3" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.common-lisp.net/misc-extensions/devel.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0gz5f4p70qzilnxsnf5lih2n9m4wjcw8hlw4w8mpn9jyhyppyyv0")))) + (build-system asdf-build-system/sbcl) + (synopsis "Collection of small macros and extensions for Common Lisp") + (description + "This project is intended as a catchall for small, general-purpose +extensions to Common Lisp. It contains: + +@itemize +@item @code{new-let}, a macro that combines and generalizes @code{let}, +@code{let*} and @code{multiple-value-bind}, +@item @code{gmap}, an iteration macro that generalizes @code{map}. +@end itemize\n") + (home-page "https://common-lisp.net/project/misc-extensions/") + (license license:public-domain)))) + +(define-public cl-misc-extensions + (sbcl-package->cl-source-package sbcl-misc-extensions)) + +(define-public ecl-misc-extensions + (sbcl-package->ecl-package sbcl-misc-extensions)) -- cgit v1.2.3 From 7765f4a484a074785422bbd0a347e5f9cd4c47ae Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Thu, 16 Jan 2020 19:41:21 +0100 Subject: gnu: Add cl-mt19937. * gnu/packages/lisp-xyz.scm (sbcl-mt19937, cl-mt19937, ecl-mt19937): New variables. --- 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 187c4ed96a..53de2452f0 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -9236,3 +9236,29 @@ (define-public cl-misc-extensions (define-public ecl-misc-extensions (sbcl-package->ecl-package sbcl-misc-extensions)) + +(define-public sbcl-mt19937 + (package + (name "sbcl-mt19937") + (version "1.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://common-lisp.net/project/asdf-packaging/" + "mt19937-latest.tar.gz")) + (sha256 + (base32 + "1iw636b0iw5ygkv02y8i41lh7xj0acglv0hg5agryn0zzi2nf1xv")))) + (build-system asdf-build-system/sbcl) + (synopsis "Mersenne Twister pseudo-random number generator") + (description + "MT19937 is a portable Mersenne Twister pseudo-random number generator +for Common Lisp.") + (home-page "https://www.cliki.net/mt19937") + (license license:public-domain))) + +(define-public cl-mt19937 + (sbcl-package->cl-source-package sbcl-mt19937)) + +(define-public ecl-mt19937 + (sbcl-package->ecl-package sbcl-mt19937)) -- cgit v1.2.3 From 7ca8925f3d407ae0d2c7f60f878b580fda53b662 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Thu, 16 Jan 2020 20:03:43 +0100 Subject: gnu: Add cl-fset. * gnu/packages/lisp-xyz.scm (sbcl-fset, cl-fset): 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 53de2452f0..49b25188aa 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -9262,3 +9262,41 @@ (define-public cl-mt19937 (define-public ecl-mt19937 (sbcl-package->ecl-package sbcl-mt19937)) + +(define-public sbcl-fset + (let ((commit "6d2f9ded8934d2b42f2571a0ba5bda091037d852") + (revision "1")) + (package + (name "sbcl-fset") + (version (git-version "1.3.2" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/slburson/fset") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "127acblwrbqicx47h6sgvknz1cqyfn8p4xkhkn1m7hxh8w5gk1zy")) + (snippet '(begin + ;; Remove obsolete copy of system definition. + (delete-file "Code/fset.asd") + #t)))) + (build-system asdf-build-system/sbcl) + (inputs + `(("misc-extensions" ,sbcl-misc-extensions) + ("mt19937" ,sbcl-mt19937) + ("named-readtables" ,sbcl-named-readtables))) + (synopsis "Functional set-theoretic collections library") + (description + "FSet is a functional set-theoretic collections library for Common Lisp. +Functional means that all update operations return a new collection rather than +modifying an existing one in place. Set-theoretic means that collections may +be nested arbitrarily with no additional programmer effort; for instance, sets +may contain sets, maps may be keyed by sets, etc.") + (home-page "https://common-lisp.net/project/fset/Site/index.html") + (license license:llgpl)))) + +(define-public cl-fset + (sbcl-package->cl-source-package sbcl-fset)) -- cgit v1.2.3 From f7ce86edbc45d34171022a07cc5d39de664bd874 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Thu, 16 Jan 2020 21:49:44 +0100 Subject: gnu: Add cl-cont. * gnu/packages/lisp-xyz.scm (sbcl-cl-cont, cl-cont, ecl-cl-cont): New variables. --- 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 49b25188aa..8dc58aecbf 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -9300,3 +9300,38 @@ (define-public sbcl-fset (define-public cl-fset (sbcl-package->cl-source-package sbcl-fset)) + +(define-public sbcl-cl-cont + (let ((commit "fc1fa7e6eb64894fdca13e688e6015fad5290d2a") + (revision "1")) + (package + (name "sbcl-cl-cont") + (version (git-version "0.3.8" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.common-lisp.net/cl-cont/cl-cont.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1zf8zvb0i6jm3hhfks4w74hibm6avgc6f9s1qwgjrn2bcik8lrvz")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("closer-mop" ,sbcl-closer-mop))) + (native-inputs + `(("rt" ,sbcl-rt))) + (synopsis "Delimited continuations for Common Lisp") + (description + "This is a library that implements delimited continuations by +transforming Common Lisp code to continuation passing style.") + (home-page "https://common-lisp.net/project/cl-cont/") + (license license:llgpl)))) + +(define-public cl-cont + (sbcl-package->cl-source-package sbcl-cl-cont)) + +(define-public ecl-cl-cont + (sbcl-package->ecl-package sbcl-cl-cont)) -- cgit v1.2.3 From 4101c7148da3b7cbacdba611bbfe0487544446dd Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Thu, 16 Jan 2020 22:39:34 +0100 Subject: gnu: Add cl-coroutine. * gnu/packages/lisp-xyz.scm (sbcl-cl-coroutine, cl-coroutine, ecl-cl-coroutine): New variables. --- gnu/packages/lisp-xyz.scm | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 8dc58aecbf..97af7f25f0 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -9335,3 +9335,50 @@ (define-public cl-cont (define-public ecl-cl-cont (sbcl-package->ecl-package sbcl-cl-cont)) + +(define-public sbcl-cl-coroutine + (let ((commit "de098f8d5debd8b14ef6864b5bdcbbf5ddbcfd72") + (revision "1")) + (package + (name "sbcl-cl-coroutine") + (version (git-version "0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/takagi/cl-coroutine.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1cqdhdjxffgfs116l1swjlsmcbly0xgcgrckvaajd566idj9yj4l")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("cl-cont" ,sbcl-cl-cont))) + (native-inputs + `(("prove" ,sbcl-prove))) + (arguments + `(;; TODO: Fix the tests. They fail with: + ;; "Component CL-COROUTINE-ASD::CL-COROUTINE-TEST not found" + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-tests + (lambda _ + (substitute* "cl-coroutine-test.asd" + (("cl-test-more") + "prove")) + #t))))) + (synopsis "Coroutine library for Common Lisp") + (description + "This is a coroutine library for Common Lisp implemented using the +continuations of the @code{cl-cont} library.") + (home-page "https://github.com/takagi/cl-coroutine") + (license license:llgpl)))) + +(define-public cl-coroutine + (sbcl-package->cl-source-package sbcl-cl-coroutine)) + +(define-public ecl-cl-coroutine + (sbcl-package->ecl-package sbcl-cl-coroutine)) -- cgit v1.2.3 From 5b8bc813bacbc9f3b9820ffff660096285751c56 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 17 Jan 2020 09:37:03 +0100 Subject: gnu: Add cl-vom. * gnu/packages/lisp-xyz.scm (sbcl-vom, cl-vom, ecl-vom): 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 97af7f25f0..0b707328b5 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -9382,3 +9382,34 @@ (define-public cl-coroutine (define-public ecl-cl-coroutine (sbcl-package->ecl-package sbcl-cl-coroutine)) + +(define-public sbcl-vom + (let ((commit "1aeafeb5b74c53741b79497e0ef4acf85c92ff24") + (revision "1")) + (package + (name "sbcl-vom") + (version (git-version "0.1.4" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/orthecreedence/vom.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0536kppj76ax4lrxhv42npkfjsmx45km2g439vf9jmw3apinz9cy")))) + (build-system asdf-build-system/sbcl) + (synopsis "Tiny logging utility for Common Lisp") + (description + "Vom is a logging library for Common Lisp. It's goal is to be useful +and small. It does not provide a lot of features as other loggers do, but +has a small codebase that's easy to understand and use.") + (home-page "https://github.com/orthecreedence/vom") + (license license:expat)))) + +(define-public cl-vom + (sbcl-package->cl-source-package sbcl-vom)) + +(define-public ecl-vom + (sbcl-package->ecl-package sbcl-vom)) -- cgit v1.2.3 From 37b48dc181afecfcfc0792454b0a67c80c8aff00 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 17 Jan 2020 10:04:48 +0100 Subject: gnu: Add cl-libuv. * gnu/packages/lisp-xyz.scm (sbcl-cl-libuv, cl-libuv, ecl-cl-libuv): New variables. --- gnu/packages/lisp-xyz.scm | 51 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 0b707328b5..a0d5b1c5a6 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -51,6 +51,7 @@ (define-module (gnu packages lisp-xyz) #:use-module (gnu packages compression) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) + #:use-module (gnu packages libevent) #:use-module (gnu packages libffi) #:use-module (gnu packages lisp) #:use-module (gnu packages maths) @@ -9413,3 +9414,53 @@ (define-public cl-vom (define-public ecl-vom (sbcl-package->ecl-package sbcl-vom)) + +(define-public sbcl-cl-libuv + (let ((commit "32100c023c518038d0670a103eaa4d50dd785d29") + (revision "1")) + (package + (name "sbcl-cl-libuv") + (version (git-version "0.1.6" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/orthecreedence/cl-libuv.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1kwix4si8a8hza34ab2k7whrh7z0yrmx39v2wc3qblv9m244jkh1")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("cffi" ,sbcl-cffi) + ("cffi-grovel" ,sbcl-cffi-grovel) + ("libuv" ,libuv))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "lib.lisp" + (("/usr/lib/libuv.so") + (string-append (assoc-ref inputs "libuv") + "/lib/libuv.so"))) + #t)) + (add-after 'fix-paths 'fix-system-definition + (lambda _ + (substitute* "cl-libuv.asd" + (("#:cffi #:alexandria") + "#:cffi #:cffi-grovel #:alexandria")) + #t))))) + (synopsis "Common Lisp bindings to libuv") + (description + "This library provides low-level libuv bindings for Common Lisp.") + (home-page "https://github.com/orthecreedence/cl-libuv") + (license license:expat)))) + +(define-public cl-libuv + (sbcl-package->cl-source-package sbcl-cl-libuv)) + +(define-public ecl-cl-libuv + (sbcl-package->ecl-package sbcl-cl-libuv)) -- cgit v1.2.3 From 1cc1dfbbb0be2e367cc9dcdcd825eea4aa11db6e Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 17 Jan 2020 10:29:49 +0100 Subject: gnu: Add cl-async-base. * gnu/packages/lisp-xyz.scm (sbcl-cl-async-base, cl-async-base, ecl-cl-async-base): New variables. --- gnu/packages/lisp-xyz.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index a0d5b1c5a6..f0a1c02155 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -9464,3 +9464,39 @@ (define-public cl-libuv (define-public ecl-cl-libuv (sbcl-package->ecl-package sbcl-cl-libuv)) + +(define-public sbcl-cl-async-base + (let ((commit "f6423e44404a44434d803605e0d2e17199158e28") + (revision "1")) + (package + (name "sbcl-cl-async-base") + (version (git-version "0.6.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/orthecreedence/cl-async.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "11xi9dxb8mjgwzrkj88i0xkgk26z9w9ddxzbv6xsvfc1d4x5cf4x")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("bordeaux-threads" ,sbcl-bordeaux-threads) + ("cffi" ,sbcl-cffi) + ("cl-libuv" ,sbcl-cl-libuv))) + (arguments + `(#:asd-file "cl-async.asd")) + (synopsis "Base system for cl-async") + (description + "Cl-async is a library for general purpose, non-blocking programming in +Common Lisp. It uses the libuv library as backend.") + (home-page "https://orthecreedence.github.io/cl-async/") + (license license:expat)))) + +(define-public cl-async-base + (sbcl-package->cl-source-package sbcl-cl-async-base)) + +(define-public ecl-cl-async-base + (sbcl-package->ecl-package sbcl-cl-async-base)) -- cgit v1.2.3 From 370cf7f13de758aa1885aa1bdc1ab55c0a063e7c Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 17 Jan 2020 10:38:25 +0100 Subject: gnu: Add cl-async-util. * gnu/packages/lisp-xyz.scm (sbcl-cl-async-util, cl-async-util, ecl-cl-async-util): New variables. --- 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 f0a1c02155..0b9800740c 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -9500,3 +9500,22 @@ (define-public cl-async-base (define-public ecl-cl-async-base (sbcl-package->ecl-package sbcl-cl-async-base)) + +(define-public sbcl-cl-async-util + (package + (inherit sbcl-cl-async-base) + (name "sbcl-cl-async-util") + (inputs + `(("cffi" ,sbcl-cffi) + ("cl-async-base" ,sbcl-cl-async-base) + ("cl-libuv" ,sbcl-cl-libuv) + ("cl-ppcre" ,sbcl-cl-ppcre) + ("fast-io" ,sbcl-fast-io) + ("vom" ,sbcl-vom))) + (synopsis "Internal utilities for cl-async"))) + +(define-public cl-async-util + (sbcl-package->cl-source-package sbcl-cl-async-util)) + +(define-public ecl-cl-async-util + (sbcl-package->ecl-package sbcl-cl-async-util)) -- cgit v1.2.3 From 8a0178dd6ab01c27ba6947b67ee215c452a118a6 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 17 Jan 2020 10:56:22 +0100 Subject: gnu: Add cl-async. * gnu/packages/lisp-xyz.scm (sbcl-cl-async, cl-async, ecl-cl-async): New variables. --- 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 0b9800740c..64cada8fde 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -9519,3 +9519,25 @@ (define-public cl-async-util (define-public ecl-cl-async-util (sbcl-package->ecl-package sbcl-cl-async-util)) + +(define-public sbcl-cl-async + (package + (inherit sbcl-cl-async-base) + (name "sbcl-cl-async") + (inputs + `(("babel" ,sbcl-babel) + ("cffi" ,sbcl-cffi) + ("cl-async-base" ,sbcl-cl-async-base) + ("cl-async-util" ,sbcl-cl-async-util) + ("cl-libuv" ,sbcl-cl-libuv) + ("cl-ppcre" ,sbcl-cl-ppcre) + ("static-vectors" ,sbcl-static-vectors) + ("trivial-features" ,sbcl-trivial-features) + ("trivial-gray-streams" ,sbcl-trivial-gray-streams))) + (synopsis "Asynchronous operations for Common Lisp"))) + +(define-public cl-async + (sbcl-package->cl-source-package sbcl-cl-async)) + +(define-public ecl-cl-async + (sbcl-package->ecl-package sbcl-cl-async)) -- cgit v1.2.3 From 19f36366c9e99126da49c764d0febb63ceb58d1c Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 17 Jan 2020 11:03:28 +0100 Subject: gnu: Add cl-async-repl. * gnu/packages/lisp-xyz.scm (sbcl-cl-async-repl, cl-async-repl, ecl-cl-async-repl): New variables. --- 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 64cada8fde..ded5489114 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -9541,3 +9541,21 @@ (define-public cl-async (define-public ecl-cl-async (sbcl-package->ecl-package sbcl-cl-async)) + +(define-public sbcl-cl-async-repl + (package + (inherit sbcl-cl-async-base) + (name "sbcl-cl-async-repl") + (inputs + `(("bordeaux-threads" ,sbcl-bordeaux-threads) + ("cl-async" ,sbcl-cl-async))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-cl-async-base) + ((#:asd-file _ "") "cl-async-repl.asd"))) + (synopsis "REPL integration for cl-async"))) + +(define-public cl-async-repl + (sbcl-package->cl-source-package sbcl-cl-async-repl)) + +(define-public ecl-cl-async-repl + (sbcl-package->ecl-package sbcl-cl-async-repl)) -- cgit v1.2.3 From ae51aa9136013cdf63efd1f7906668d6d011d4f3 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 17 Jan 2020 11:17:38 +0100 Subject: gnu: Add cl-async-ssl. * gnu/packages/lisp-xyz.scm (sbcl-cl-async-ssl, cl-async-ssl, ecl-cl-async-ssl): New variables. --- gnu/packages/lisp-xyz.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index ded5489114..c4e27e1507 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -9559,3 +9559,35 @@ (define-public cl-async-repl (define-public ecl-cl-async-repl (sbcl-package->ecl-package sbcl-cl-async-repl)) + +(define-public sbcl-cl-async-ssl + (package + (inherit sbcl-cl-async-base) + (name "sbcl-cl-async-ssl") + (inputs + `(("cffi" ,sbcl-cffi) + ("cl-async" ,sbcl-cl-async) + ("openssl" ,openssl) + ("vom" ,sbcl-vom))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-cl-async-base) + ((#:asd-file _ "") "cl-async-ssl.asd") + ((#:phases phases '%standard-phases) + `(modify-phases ,phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/ssl/package.lisp" + (("libcrypto\\.so") + (string-append (assoc-ref inputs "openssl") + "/lib/libcrypto.so")) + (("libssl\\.so") + (string-append (assoc-ref inputs "openssl") + "/lib/libssl.so"))) + #t)))))) + (synopsis "SSL wrapper around cl-async socket implementation"))) + +(define-public cl-async-ssl + (sbcl-package->cl-source-package sbcl-cl-async-ssl)) + +(define-public ecl-cl-async-ssl + (sbcl-package->ecl-package sbcl-cl-async-ssl)) -- cgit v1.2.3 From 34f9b5814c99b4437997613d3935e4dc1c599fe2 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 17 Jan 2020 11:30:49 +0100 Subject: gnu: Add cl-blackbird. * gnu/packages/lisp-xyz.scm (sbcl-blackbird, cl-blackbird, ecl-blackbird): New variables. --- 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 c4e27e1507..2033a3e65c 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -9591,3 +9591,38 @@ (define-public cl-async-ssl (define-public ecl-cl-async-ssl (sbcl-package->ecl-package sbcl-cl-async-ssl)) + +(define-public sbcl-blackbird + (let ((commit "d361f81c1411dec07f6c2dcb11c78f7aea9aaca8") + (revision "1")) + (package + (name "sbcl-blackbird") + (version (git-version "0.5.2" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/orthecreedence/blackbird.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0xfds5yaya64arzr7w1x38karyz11swzbhxx1afldpradj9dh19c")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("vom" ,sbcl-vom))) + (native-inputs + `(("cl-async" ,sbcl-cl-async) + ("fiveam" ,sbcl-fiveam))) + (synopsis "Promise implementation for Common Lisp") + (description + "This is a standalone promise implementation for Common Lisp. It is +the successor to the now-deprecated cl-async-future project.") + (home-page "http://orthecreedence.github.io/blackbird/") + (license license:expat)))) + +(define-public cl-blackbird + (sbcl-package->cl-source-package sbcl-blackbird)) + +(define-public ecl-blackbird + (sbcl-package->ecl-package sbcl-blackbird)) -- cgit v1.2.3 From c5eedf80ac0d543f15229a58f7d90832b435b28f Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 17 Jan 2020 11:42:29 +0100 Subject: gnu: Add cl-async-future. * gnu/packages/lisp-xyz.scm (sbcl-cl-async-future, cl-async-future, ecl-cl-async-future): New variables. --- 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 2033a3e65c..ad28cd7157 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -9626,3 +9626,38 @@ (define-public cl-blackbird (define-public ecl-blackbird (sbcl-package->ecl-package sbcl-blackbird)) + +(define-public sbcl-cl-async-future + (let ((commit "ee36c22a69a9516407458d2ed8b475f1fc473959") + (revision "1")) + (package + (name "sbcl-cl-async-future") + (version (git-version "0.4.4.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/orthecreedence/cl-async-future.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0z0sc7qlzzxk99f4l26zp6rai9kv0kj0f599sxai5s44p17zbbvh")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("blackbird" ,sbcl-blackbird))) + (native-inputs + `(("cl-async" ,sbcl-cl-async) + ("eos" ,sbcl-eos))) + (synopsis "Futures implementation for Common Lisp") + (description + "This is futures implementation for Common Lisp. It plugs in nicely +to cl-async.") + (home-page "http://orthecreedence.github.io/cl-async/future") + (license license:expat)))) + +(define-public cl-async-future + (sbcl-package->cl-source-package sbcl-cl-async-future)) + +(define-public ecl-cl-async-future + (sbcl-package->ecl-package sbcl-cl-async-future)) -- cgit v1.2.3 From 8ea00edfccba9bffbbca6ffbf69f2f20d0b32354 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 17 Jan 2020 12:00:02 +0100 Subject: gnu: Add cl-green-threads. * gnu/packages/lisp-xyz.scm (sbcl-green-threads, cl-green-threads, ecl-green-threads): New variables. --- gnu/packages/lisp-xyz.scm | 48 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index ad28cd7157..9dc30a3cc4 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -9661,3 +9661,51 @@ (define-public cl-async-future (define-public ecl-cl-async-future (sbcl-package->ecl-package sbcl-cl-async-future)) + +(define-public sbcl-green-threads + (let ((commit "fff5ebecb441a37e5c511773716aafd84a3c5840") + (revision "1")) + (package + (name "sbcl-green-threads") + (version (git-version "0.3" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/thezerobit/green-threads.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1czw7nr0dwfps76h8hjvglk1wdh53yqbfbvv30whwbgqx33iippz")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("cl-async-future" ,sbcl-cl-async-future) + ("cl-cont" ,sbcl-cl-cont))) + (native-inputs + `(("prove" ,sbcl-prove))) + (arguments + `(;; TODO: Fix the tests. They fail with: + ;; "The function BLACKBIRD::PROMISE-VALUES is undefined" + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-tests + (lambda _ + (substitute* "green-threads-test.asd" + (("cl-test-more") + "prove")) + #t))))) + (synopsis "Cooperative multitasking library for Common Lisp") + (description + "This library allows for cooperative multitasking with help of cl-cont +for continuations. It tries to mimic the API of bordeaux-threads as much as +possible.") + (home-page "https://github.com/thezerobit/green-threads") + (license license:bsd-3)))) + +(define-public cl-green-threads + (sbcl-package->cl-source-package sbcl-green-threads)) + +(define-public ecl-green-threads + (sbcl-package->ecl-package sbcl-green-threads)) -- cgit v1.2.3 From 91e295470ef706779047699f1ae90c998669f8eb Mon Sep 17 00:00:00 2001 From: Alex Sassmannshausen Date: Fri, 17 Jan 2020 14:04:51 +0100 Subject: gnu: guile-config: Update to 0.3.1. * gnu/packages/guile-xyz.scm (guile-config): Update to 0.3.1. --- gnu/packages/guile-xyz.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index bb9b259bd1..cb4a082bf6 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1336,15 +1336,16 @@ (define-public guile-dbd-postgresql (define-public guile-config (package (name "guile-config") - (version "0.3") + (version "0.3.1") (source (origin (method git-fetch) (uri (git-reference (url "https://gitlab.com/a-sassmannshausen/guile-config") - (commit "ce12de3f438c6b2b59c43ee21bcd58251835fdf3"))) - (file-name "guile-config-0.3-checkout") - (sha256 (base32 "02zbpin0r9m2vxmr7mv68v3xdn247dcck56kbzjn0gj4c2rhih85")))) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 (base32 + "0gglsqwpw77gvrqcny8irpqfl7qdf2v8n9ggwrswanxalj4vcbvf")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) -- cgit v1.2.3 From cfc4e4982343f664d4edecda274c94025bbf7ecb Mon Sep 17 00:00:00 2001 From: Alex Sassmannshausen Date: Fri, 17 Jan 2020 14:06:58 +0100 Subject: gnu: guile-hall: Update to 0.2.1. * gnu/packages/guile-xyz.scm (guile-hall): Update to 0.2.1. --- gnu/packages/guile-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index cb4a082bf6..4a1d3d751d 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1370,7 +1370,7 @@ (define-public guile-config (define-public guile-hall (package (name "guile-hall") - (version "0.2") + (version "0.2.1") (source (origin (method git-fetch) @@ -1379,7 +1379,7 @@ (define-public guile-hall (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "1bkbqgj24xh5b65sw2m98iggpi67b72szx1dsiq3cpzlcxplmgaz")))) + "0dwx5iyg0dmdf64wq0b4w306bapr86jwnw35npgbjq4cqm8qbzqn")))) (build-system gnu-build-system) (arguments `(#:modules -- cgit v1.2.3 From 0ac6b836ee5f3c7e9c9fe36d25df28c53023719e Mon Sep 17 00:00:00 2001 From: Alex Sassmannshausen Date: Fri, 17 Jan 2020 14:08:42 +0100 Subject: gnu: guile-config: Add variant for Guile 3.0. * gnu/packages/guile-xyz.scm (guile3.0-config): New variable. --- gnu/packages/guile-xyz.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 4a1d3d751d..1f4667726b 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1367,6 +1367,13 @@ (define-public guile-config "https://gitlab.com/a-sassmannshausen/guile-config") (license license:gpl3+))) +(define-public guile3.0-config + (package + (inherit guile-config) + (name "guile3.0-config") + (inputs `(("guile" ,guile-next) + ,@(alist-delete "guile" (package-inputs guile-config)))))) + (define-public guile-hall (package (name "guile-hall") -- cgit v1.2.3 From df18ea6f275abaa160a8593accb29fd273d8fc13 Mon Sep 17 00:00:00 2001 From: Alex Sassmannshausen Date: Fri, 17 Jan 2020 14:10:03 +0100 Subject: gnu: guile-hall: Add variant for Guile 3.0. * gnu/packages/guile-xyz.scm (guile3.0-hall): New variable. --- gnu/packages/guile-xyz.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 1f4667726b..755d1ef62d 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1452,6 +1452,17 @@ (define-public guile-hall (home-page "https://gitlab.com/a-sassmannshausen/guile-hall") (license license:gpl3+))) +(define-public guile3.0-hall + (package + (inherit guile-hall) + (name "guile3.0-hall") + (inputs `(("guile" ,guile-next) + ,@(alist-delete "guile" (package-inputs guile-hall)))) + (propagated-inputs + `(("guile-config" ,guile3.0-config) + ,@(alist-delete "guile-config" + (package-propagated-inputs guile-hall)))))) + (define-public guile-ics (package (name "guile-ics") -- cgit v1.2.3 From 886a76073e4654449f413831897ffde736a07c91 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 17 Jan 2020 11:19:42 +0100 Subject: packages: Prevent inlining of 'find-best-packages-by-name'. This allows 'tests/packages.scm' to mock it. * gnu/packages.scm (find-best-packages-by-name): Set! it at the top level to prevent it from being inline on Guile 3. --- gnu/packages.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages.scm b/gnu/packages.scm index 143469b288..d22c992bb1 100644 --- a/gnu/packages.scm +++ b/gnu/packages.scm @@ -369,6 +369,9 @@ (define (find-best-packages-by-name name version) (string=? (package-version p) highest)) matches)))))) +;; Prevent Guile 3 from inlining this procedure so we can mock it in tests. +(set! find-best-packages-by-name find-best-packages-by-name) + (define (generate-package-cache directory) "Generate under DIRECTORY a cache of all the available packages. -- cgit v1.2.3 From fd4c832bdbc4bc3e9479ad1bab6590d03ae78b60 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 17 Jan 2020 11:23:34 +0100 Subject: lint: derivation: Adjust exception handling for Guile 3. This makes sure the "derivation: invalid arguments" test passes on Guile 3.0.0. Without this change, the lint warning would only include the format string instead of the key and arguments. * guix/lint.scm (exception-with-kind-and-args?): New procedure. (check-derivation): Use it. --- guix/lint.scm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/guix/lint.scm b/guix/lint.scm index d2f24c61f8..697bd24a1e 100644 --- a/guix/lint.scm +++ b/guix/lint.scm @@ -905,16 +905,31 @@ (define (follow-redirects-to-github uri) (origin-uris origin)) '()))) +(cond-expand + (guile-3 + ;; Guile 3.0.0 does not export this predicate. + (define exception-with-kind-and-args? + (exception-predicate &exception-with-kind-and-args))) + (else ;Guile 2 + (define exception-with-kind-and-args? + (const #f)))) + (define (check-derivation package) "Emit a warning if we fail to compile PACKAGE to a derivation." (define (try system) - (catch #t + (catch #t ;TODO: Remove 'catch' when Guile 2.x is no longer supported. (lambda () (guard (c ((store-protocol-error? c) (make-warning package (G_ "failed to create ~a derivation: ~a") (list system (store-protocol-error-message c)))) + ((exception-with-kind-and-args? c) + (make-warning package + (G_ "failed to create ~a derivation: ~s") + (list system + (cons (exception-kind c) + (exception-args c))))) ((message-condition? c) (make-warning package (G_ "failed to create ~a derivation: ~a") -- cgit v1.2.3 From fcb2318e51d33a9319619f9486a7ac486db2af37 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 17 Jan 2020 11:27:37 +0100 Subject: lint: vulnerabilities: Avoid 'mock' in test. * guix/lint.scm (check-vulnerabilities): Add 'package-vulnerabilities' optional parameter. * tests/lint.scm ("cve: one vulnerability"): Use it instead of 'mock'. --- guix/lint.scm | 7 +++++-- tests/lint.scm | 18 ++++++++++-------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/guix/lint.scm b/guix/lint.scm index 697bd24a1e..24fbf05202 100644 --- a/guix/lint.scm +++ b/guix/lint.scm @@ -1029,8 +1029,11 @@ (define package-vulnerabilities (package-version package)))) ((force lookup) name version))))) -(define (check-vulnerabilities package) - "Check for known vulnerabilities for PACKAGE." +(define* (check-vulnerabilities package + #:optional (package-vulnerabilities + package-vulnerabilities)) + "Check for known vulnerabilities for PACKAGE. Obtain the list of +vulnerability records for PACKAGE by calling PACKAGE-VULNERABILITIES." (let ((package (or (package-replacement package) package))) (match (package-vulnerabilities package) (() diff --git a/tests/lint.scm b/tests/lint.scm index 3a9b539a24..4ce45b4a70 100644 --- a/tests/lint.scm +++ b/tests/lint.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013 Cyril Roelandt ;;; Copyright © 2014, 2015, 2016 Eric Bavier -;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2015, 2016 Mathieu Lirzin ;;; Copyright © 2016 Hartmut Goebel ;;; Copyright © 2017 Alex Kost @@ -756,14 +756,16 @@ (define (warning-contains? str warnings) (test-equal "cve: one vulnerability" "probably vulnerable to CVE-2015-1234" - (mock ((guix lint) package-vulnerabilities + (let ((dummy-vulnerabilities (lambda (package) - (list (make-struct/no-tail (@@ (guix cve) ) - "CVE-2015-1234" - (list (cons (package-name package) - (package-version package))))))) - (single-lint-warning-message - (check-vulnerabilities (dummy-package "pi" (version "3.14")))))) + (list (make-struct/no-tail + (@@ (guix cve) ) + "CVE-2015-1234" + (list (cons (package-name package) + (package-version package)))))))) + (single-lint-warning-message + (check-vulnerabilities (dummy-package "pi" (version "3.14")) + dummy-vulnerabilities)))) (test-equal "cve: one patched vulnerability" '() -- cgit v1.2.3 From a9e255127a92cdf4cd4ea63d342c984b3f51f0c0 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 17 Jan 2020 12:00:53 +0100 Subject: doc: cookbook: Avoid URL reference to the manual. * doc/guix-cookbook.texi (Other build systems): Use @xref instead of @uref, and remove section number. --- doc/guix-cookbook.texi | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/doc/guix-cookbook.texi b/doc/guix-cookbook.texi index 7c3860fbf5..477b7e3dff 100644 --- a/doc/guix-cookbook.texi +++ b/doc/guix-cookbook.texi @@ -1139,14 +1139,10 @@ For the other build systems, such as ASDF, Emacs, Perl, Ruby and many more, the process is very similar to the GNU build system except for a few specialized arguments. -Learn more about build systems in -@itemize -@item -@uref{https://www.gnu.org/software/guix/manual/en/html_node/Build-Systems.html#Build-Systems, the manual, section 4.2 Build systems}, -@item -the source code in the @samp{$GUIX_CHECKOUT/guix/build} and +@xref{Build Systems,,, guix, GNU Guix Reference Manual}, for more +information on build systems, or check the source code in the +@samp{$GUIX_CHECKOUT/guix/build} and @samp{$GUIX_CHECKOUT/guix/build-system} directories. -@end itemize @node Programmable and automated package definition @subsection Programmable and automated package definition -- cgit v1.2.3 From 0688ca7471b8c82f802db7ddaed8695f59c751ff Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 17 Jan 2020 12:01:54 +0100 Subject: doc: Replace some invalid uses of @var with @code. * doc/guix.texi (Build Systems): Replace invalid uses of @var with @code. --- doc/guix.texi | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 788a2a7d4f..c737a71698 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -5930,12 +5930,12 @@ Guile Reference Manual}). The value of these arguments is usually evaluated in the @dfn{build stratum}---i.e., by a Guile process launched by the daemon (@pxref{Derivations}). -The main build system is @var{gnu-build-system}, which implements the +The main build system is @code{gnu-build-system}, which implements the standard build procedure for GNU and many other packages. It is provided by the @code{(guix build-system gnu)} module. @defvr {Scheme Variable} gnu-build-system -@var{gnu-build-system} represents the GNU Build System, and variants +@code{gnu-build-system} represents the GNU Build System, and variants thereof (@pxref{Configuration, configuration and makefile conventions,, standards, GNU Coding Standards}). @@ -5988,8 +5988,8 @@ is false), copying them to the @code{debug} output when available @vindex %standard-phases The build-side module @code{(guix build gnu-build-system)} defines -@var{%standard-phases} as the default list of build phases. -@var{%standard-phases} is a list of symbol/procedure pairs, where the +@code{%standard-phases} as the default list of build phases. +@code{%standard-phases} is a list of symbol/procedure pairs, where the procedure implements the actual phase. The list of phases used for a particular package can be changed with the @@ -6012,7 +6012,7 @@ have to mention them. Other @code{} objects are defined to support other conventions and tools used by free software packages. They inherit most -of @var{gnu-build-system}, and differ mainly in the set of inputs +of @code{gnu-build-system}, and differ mainly in the set of inputs implicitly added to the build process, and in the list of phases executed. Some of these build systems are listed below. @@ -6160,7 +6160,7 @@ parameters, respectively. Compile directory and main class can be specified with the @code{#:compile-dir} and @code{#:main-class} parameters, respectively. Other parameters are documented below. -This build system is an extension of @var{ant-build-system}, but with the +This build system is an extension of @code{ant-build-system}, but with the following phases changed: @table @code @@ -6193,7 +6193,7 @@ Apart from the above, this build system also contains an additional phase: @item install-doc This phase installs all top-level files with base name matching -@var{%doc-regex}. A different regex can be specified with the +@code{%doc-regex}. A different regex can be specified with the @code{#:doc-regex} parameter. All files (recursively) inside the documentation directories specified in @code{#:doc-dirs} are installed as well. @end table @@ -6270,7 +6270,7 @@ This variable is exported by @code{(guix build-system glib-or-gtk)}. It is intended for use with packages making use of GLib or GTK+. This build system adds the following two phases to the ones defined by -@var{gnu-build-system}: +@code{gnu-build-system}: @table @code @item glib-or-gtk-wrap @@ -6444,7 +6444,7 @@ This variable is exported by @code{(guix build-system qt)}. It is intended for use with applications using Qt or KDE. This build system adds the phase @code{qt-wrap} to the ones defined by -@var{cmake-build-system}, after the @code{install} phase. +@code{cmake-build-system}, after the @code{install} phase. This phase searches for Qt5 plugin paths, QML paths and some XDG in the inputs and output. In case some path is found, all programs in the output's @@ -6584,7 +6584,7 @@ This variable is exported by @code{(guix build-system emacs)}. It implements an installation procedure similar to the packaging system of Emacs itself (@pxref{Packages,,, emacs, The GNU Emacs Manual}). -It first creates the @code{@var{package}-autoloads.el} file, then it +It first creates the @code{@code{package}-autoloads.el} file, then it byte compiles all Emacs Lisp files. Differently from the Emacs packaging system, the Info documentation files are moved to the standard documentation directory and the @file{dir} file is deleted. Each @@ -6611,7 +6611,7 @@ and @code{#:ninja} if needed. The default Meson is @code{meson-for-build}, which is special because it doesn't clear the @code{RUNPATH} of binaries and libraries when they are installed. -This build system is an extension of @var{gnu-build-system}, but with the +This build system is an extension of @code{gnu-build-system}, but with the following phases changed to some specific for Meson: @table @code @@ -6656,10 +6656,10 @@ is not enabled by default. It can be enabled with @code{#:glib-or-gtk?}. @end defvr @defvr {Scheme Variable} linux-module-build-system -@var{linux-module-build-system} allows building Linux kernel modules. +@code{linux-module-build-system} allows building Linux kernel modules. @cindex build phases -This build system is an extension of @var{gnu-build-system}, but with the +This build system is an extension of @code{gnu-build-system}, but with the following phases changed: @table @code -- cgit v1.2.3 From 282f91790a5bbd0d9b3223c4bfd45b66e418c200 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 17 Jan 2020 13:48:23 +0100 Subject: import: opam: Avoid uses of '@@' in tests. * guix/import/opam.scm (string-pat, multiline-string, list-pat) (dict, condition): Export. (opam-fetch): Add optional 'repository' parameter. (opam->guix-package): Add #:repository parameter and pass it to 'opam-fetch'. * tests/opam.scm ("opam->guix-package"): Remove use of 'mock' and pass TEST-REPO to 'opam->guix-package' instead. ("parse-strings", "parse-multiline-strings") ("parse-lists", "parse-dicts", "parse-conditions"): Remove uses of '@@', which are no longer needed. --- guix/import/opam.scm | 21 ++++++++++++---- tests/opam.scm | 67 +++++++++++++++++++++++++--------------------------- 2 files changed, 48 insertions(+), 40 deletions(-) diff --git a/guix/import/opam.scm b/guix/import/opam.scm index e258c4197f..394415fdd4 100644 --- a/guix/import/opam.scm +++ b/guix/import/opam.scm @@ -1,3 +1,4 @@ +;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Julien Lepiller ;;; ;;; This file is part of GNU Guix. @@ -38,7 +39,14 @@ (define-module (guix import opam) #:use-module ((guix licenses) #:prefix license:) #:export (opam->guix-package opam-recursive-import - %opam-updater)) + %opam-updater + + ;; The following patterns are exported for testing purposes. + string-pat + multiline-string + list-pat + dict + condition)) ;; Define a PEG parser for the opam format (define-peg-pattern comment none (and "#" (* STRCHR) "\n")) @@ -233,8 +241,8 @@ (define (dependency-list->inputs lst) (list dependency (list 'unquote (string->symbol dependency)))) (ocaml-names->guix-names lst))) -(define (opam-fetch name) - (and-let* ((repository (get-opam-repository)) +(define* (opam-fetch name #:optional (repository (get-opam-repository))) + (and-let* ((repository repository) (version (find-latest-version name repository)) (file (string-append repository "/packages/" name "/" name "." version "/opam"))) `(("metadata" ,@(get-metadata file)) @@ -242,8 +250,11 @@ (define (opam-fetch name) (substring version 1) version))))) -(define (opam->guix-package name) - (and-let* ((opam-file (opam-fetch name)) +(define* (opam->guix-package name #:key repository) + "Import OPAM package NAME from REPOSITORY (a directory name) or, if +REPOSITORY is #f, from the official OPAM repository. Return a 'package' sexp +or #f on failure." + (and-let* ((opam-file (opam-fetch name repository)) (version (assoc-ref opam-file "version")) (opam-content (assoc-ref opam-file "metadata")) (url-dict (metadata-ref opam-content "url")) diff --git a/tests/opam.scm b/tests/opam.scm index d3626fd010..68b5908e3f 100644 --- a/tests/opam.scm +++ b/tests/opam.scm @@ -85,36 +85,33 @@ (define test-repo (with-output-to-file (string-append my-package "/opam") (lambda _ (format #t "~a" test-opam-file)))) - (mock ((guix import opam) get-opam-repository - (lambda _ - test-repo)) - (match (opam->guix-package "foo") - (('package - ('name "ocaml-foo") - ('version "1.0.0") - ('source ('origin - ('method 'url-fetch) - ('uri "https://example.org/foo-1.0.0.tar.gz") - ('sha256 - ('base32 - (? string? hash))))) - ('build-system 'ocaml-build-system) - ('propagated-inputs - ('quasiquote - (("ocaml-zarith" ('unquote 'ocaml-zarith))))) - ('native-inputs - ('quasiquote - (("ocaml-alcotest" ('unquote 'ocaml-alcotest)) - ("ocamlbuild" ('unquote 'ocamlbuild))))) - ('home-page "https://example.org/") - ('synopsis "Some example package") - ('description "This package is just an example.") - ('license #f)) - (string=? (bytevector->nix-base32-string - test-source-hash) - hash)) - (x - (pk 'fail x #f)))))) + (match (opam->guix-package "foo" #:repository test-repo) + (('package + ('name "ocaml-foo") + ('version "1.0.0") + ('source ('origin + ('method 'url-fetch) + ('uri "https://example.org/foo-1.0.0.tar.gz") + ('sha256 + ('base32 + (? string? hash))))) + ('build-system 'ocaml-build-system) + ('propagated-inputs + ('quasiquote + (("ocaml-zarith" ('unquote 'ocaml-zarith))))) + ('native-inputs + ('quasiquote + (("ocaml-alcotest" ('unquote 'ocaml-alcotest)) + ("ocamlbuild" ('unquote 'ocamlbuild))))) + ('home-page "https://example.org/") + ('synopsis "Some example package") + ('description "This package is just an example.") + ('license #f)) + (string=? (bytevector->nix-base32-string + test-source-hash) + hash)) + (x + (pk 'fail x #f))))) ;; Test the opam file parser ;; We fold over some test cases. Each case is a pair of the string to parse and the @@ -123,7 +120,7 @@ (define test-repo (fold (lambda (test acc) (display test) (newline) (and acc - (let ((result (peg:tree (match-pattern (@@ (guix import opam) string-pat) (car test))))) + (let ((result (peg:tree (match-pattern string-pat (car test))))) (if (equal? result (cdr test)) #t (pk 'fail (list (car test) result (cdr test)) #f))))) @@ -138,7 +135,7 @@ (define test-repo (fold (lambda (test acc) (display test) (newline) (and acc - (let ((result (peg:tree (match-pattern (@@ (guix import opam) multiline-string) (car test))))) + (let ((result (peg:tree (match-pattern multiline-string (car test))))) (if (equal? result (cdr test)) #t (pk 'fail (list (car test) result (cdr test)) #f))))) @@ -150,7 +147,7 @@ (define test-repo (test-assert "parse-lists" (fold (lambda (test acc) (and acc - (let ((result (peg:tree (match-pattern (@@ (guix import opam) list-pat) (car test))))) + (let ((result (peg:tree (match-pattern list-pat (car test))))) (if (equal? result (cdr test)) #t (pk 'fail (list (car test) result (cdr test)) #f))))) @@ -164,7 +161,7 @@ (define test-repo (test-assert "parse-dicts" (fold (lambda (test acc) (and acc - (let ((result (peg:tree (match-pattern (@@ (guix import opam) dict) (car test))))) + (let ((result (peg:tree (match-pattern dict (car test))))) (if (equal? result (cdr test)) #t (pk 'fail (list (car test) result (cdr test)) #f))))) @@ -176,7 +173,7 @@ (define test-repo (test-assert "parse-conditions" (fold (lambda (test acc) (and acc - (let ((result (peg:tree (match-pattern (@@ (guix import opam) condition) (car test))))) + (let ((result (peg:tree (match-pattern condition (car test))))) (if (equal? result (cdr test)) #t (pk 'fail (list (car test) result (cdr test)) #f))))) -- cgit v1.2.3 From 6f918d69b4824226c877c0ca6385360a1dd38bbd Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 17 Jan 2020 13:50:53 +0100 Subject: import: texlive: Avoid uses of '@@' in tests. * guix/import/texlive.scm (fetch-sxml, sxml->package): Export. * tests/texlive.scm : Call '%http-server-port'. ("fetch-sxml: returns SXML for valid XML"): Use 'with-http-server' and set 'current-http-proxy' instead of using 'mock'. ("sxml->package"): Remove use of '@@'. --- guix/import/texlive.scm | 5 ++++- tests/texlive.scm | 14 +++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/guix/import/texlive.scm b/guix/import/texlive.scm index d528aace9a..a84683ef6f 100644 --- a/guix/import/texlive.scm +++ b/guix/import/texlive.scm @@ -38,7 +38,10 @@ (define-module (guix import texlive) #:use-module (guix packages) #:use-module (gnu packages) #:use-module (guix build-system texlive) - #:export (texlive->guix-package)) + #:export (texlive->guix-package + + fetch-sxml + sxml->package)) ;;; Commentary: ;;; diff --git a/tests/texlive.scm b/tests/texlive.scm index e28eda175c..f7e5515c4c 100644 --- a/tests/texlive.scm +++ b/tests/texlive.scm @@ -20,10 +20,12 @@ (define-module (test-texlive) #:use-module (gnu packages tex) #:use-module (guix import texlive) #:use-module (guix tests) + #:use-module (guix tests http) #:use-module (guix build utils) #:use-module (srfi srfi-1) #:use-module (srfi srfi-64) #:use-module (srfi srfi-26) + #:use-module (web client) #:use-module (ice-9 match)) (test-begin "texlive") @@ -67,12 +69,14 @@ (define sxml (keyval (@ (value "tests") (key "topic"))) "\n null\n"))) +;; Avoid collisions with other tests. +(%http-server-port 10200) + (test-equal "fetch-sxml: returns SXML for valid XML" sxml - (mock ((guix http-client) http-fetch - (lambda (url) - xml)) - ((@@ (guix import texlive) fetch-sxml) "foo"))) + (with-http-server `((200 ,xml)) + (parameterize ((current-http-proxy (%local-url))) + (fetch-sxml "foo")))) ;; TODO: (test-assert "sxml->package" @@ -86,7 +90,7 @@ (define sxml (with-output-to-file (string-append directory "/foo") (lambda () (display "source"))))) - (let ((result ((@@ (guix import texlive) sxml->package) sxml))) + (let ((result (sxml->package sxml))) (match result (('package ('name "texlive-latex-foo") -- cgit v1.2.3 From 57b6caefc2ad60fc9c2e61750740e1b1c455f8e2 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Mon, 6 Jan 2020 12:07:56 +0100 Subject: gnu: Add corsix-th. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/games.scm (corsix-th): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/games.scm | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 42444045b4..5a40a18f8d 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -462,6 +462,62 @@ (define-public cataclysm-dda (define-public cataclysm-dark-days-ahead (deprecated-package "cataclysm-dark-days-ahead" cataclysm-dda)) +(define-public corsix-th + (package + (name "corsix-th") + (version "0.63") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/CorsixTH/CorsixTH.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1rkyk8g55xny276s0hr5k8mq6f4nzz56d3k2mp09dzfymrqb8hgi")))) + (build-system cmake-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'wrap-binary + (lambda _ + ;; Set Lua module paths and default MIDI soundfont on startup. + (let* ((out (assoc-ref %outputs "out")) + (fluid (assoc-ref %build-inputs "fluid-3")) + (lua-version ,(version-major+minor (package-version lua))) + (lua-cpath + (map (lambda (lib) + (string-append + (assoc-ref %build-inputs (string-append "lua-" lib)) + "/lib/lua/" lua-version "/?.so")) + '("filesystem" "lpeg")))) + (wrap-program (string-append out "/bin/corsix-th") + `("LUA_CPATH" ";" = ,lua-cpath) + `("SDL_SOUNDFONTS" ":" suffix + (,(string-append fluid "/share/soundfonts/FluidR3Mono_GM.sf3"))))) + #t))) + #:tests? #f)) ; TODO need busted package to run tests + ;; Omit Lua-Socket dependency to disable automatic updates. + (inputs + `(("ffmpeg" ,ffmpeg) + ("fluid-3" ,fluid-3) + ("freetype" ,freetype) + ("lua" ,lua) + ("lua-filesystem" ,lua-filesystem) + ("lua-lpeg" ,lua-lpeg) + ("sdl2" ,sdl2) + ("sdl2-mixer" ,sdl2-mixer))) + (home-page "https://corsixth.com") + (synopsis "Implementation of the @i{Theme Hospital} game engine") + (description + "This package provides a reimplementation of the 1997 Bullfrog business +simulation game @i{Theme Hospital}. As well as faithfully recreating the +original engine, CorsixTH adds support for high resolutions, custom levels and +more. This package does @emph{not} provide the game assets.") + (license (list + license:expat ; main license + license:bsd-3)))) ; CorsixTH/Src/random.c + (define-public cowsay (package (name "cowsay") -- cgit v1.2.3 From cd819b45e9ba4c1d56355f26c1ee7529e543e23f Mon Sep 17 00:00:00 2001 From: Peng Mei Yu Date: Tue, 7 Jan 2020 18:18:00 +0800 Subject: gnu: Add imv. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/image-viewers.scm (imv): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/image-viewers.scm | 62 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index eef2866b4b..9397322e96 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2019 Nicolas Goaziou ;;; Copyright © 2019 Guy Fleury Iteriteka ;;; Copyright © 2019 Pierre Langlois +;;; Copyright © 2020 Peng Mei Yu ;;; ;;; This file is part of GNU Guix. ;;; @@ -40,11 +41,15 @@ (define-module (gnu packages image-viewers) #:use-module (gnu packages autotools) #:use-module (gnu packages algebra) #:use-module (gnu packages boost) + #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages curl) + #:use-module (gnu packages documentation) #:use-module (gnu packages fontutils) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) #:use-module (gnu packages ghostscript) + #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) @@ -59,6 +64,7 @@ (define-module (gnu packages image-viewers) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) + #:use-module (gnu packages xdisorg) #:use-module (gnu packages xorg) #:use-module (gnu packages)) @@ -524,3 +530,59 @@ (define-public chafa displayed in a terminal.") (home-page "https://hpjansson.org/chafa/") (license license:lgpl3+))) + +(define-public imv + (package + (name "imv") + (version "4.1.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/eXeC64/imv") + (commit (string-append "v" version)))) + (sha256 + (base32 + "0gk8g178i961nn3bls75a8qpv6wvfvav6hd9lxca1skaikd33zdx")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (delete 'configure)) + #:make-flags + (list "CC=gcc" + (string-append "PREFIX=" (assoc-ref %outputs "out")) + (string-append "CONFIGPREFIX=" + (assoc-ref %outputs "out") "/etc")))) + (inputs + `(("asciidoc" ,asciidoc) + ("freeimage" ,freeimage) + ("glu" ,glu) + ("librsvg" ,librsvg) + ("libxkbcommon" ,libxkbcommon) + ("pango" ,pango) + ("wayland" ,wayland))) + (native-inputs + `(("cmocka" ,cmocka) + ("pkg-config" ,pkg-config))) + (synopsis "Image viewer for tiling window managers") + (description "@code{imv} is a command line image viewer intended for use +with tiling window managers. Features include: + +@itemize +@item Native Wayland and X11 support. +@item Support for dozens of image formats including: +@itemize +@item PNG +@item JPEG +@item Animated GIFs +@item SVG +@item TIFF +@item Various RAW formats +@item Photoshop PSD files +@end itemize +@item Configurable key bindings and behavior. +@item Highly scriptable with IPC via imv-msg. +@end itemize\n") + (home-page "https://github.com/eXeC64/imv") + (license license:expat))) -- cgit v1.2.3 From 51c8777095ee8863943432cc71a63b6fa6c5b8c0 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 17 Jan 2020 14:21:33 +0100 Subject: gnu: imv: Record the absolute file name of 'imv-x11' and 'imv-wayland'. * gnu/packages/image-viewers.scm (imv)[arguments]: Add 'record-absolute-file-names' phase. --- gnu/packages/image-viewers.scm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 9397322e96..935cecd93c 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2013, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2014 Ian Denhardt ;;; Copyright © 2015, 2016 Alex Kost ;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner @@ -548,7 +548,17 @@ (define-public imv (arguments '(#:phases (modify-phases %standard-phases - (delete 'configure)) + (delete 'configure) + (add-after 'install 'record-absolute-file-names + (lambda* (#:key outputs #:allow-other-keys) + ;; 'imv' is a script that execs 'imv-x11' or 'imv-wayland'. + ;; Record their absolute file name. + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (substitute* (string-append bin "/imv") + (("imv-") + (string-append bin "/imv-"))) + #t)))) #:make-flags (list "CC=gcc" (string-append "PREFIX=" (assoc-ref %outputs "out")) -- cgit v1.2.3 From 05f8a143e437c0e55f118a0b2a191675a4b76ef1 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 17 Jan 2020 14:24:48 +0100 Subject: git-authenticate: Add new key for atheia. * build-aux/git-authenticate.scm (%committers): Add atheia's 2nd key, as seen in commit df18ea6f275abaa160a8593accb29fd273d8fc13. --- build-aux/git-authenticate.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-aux/git-authenticate.scm b/build-aux/git-authenticate.scm index 106c843c25..8b8736e402 100644 --- a/build-aux/git-authenticate.scm +++ b/build-aux/git-authenticate.scm @@ -60,6 +60,8 @@ (define %committers "7F73 0343 F2F0 9F3C 77BF 79D3 2E25 EE8B 6180 2BB3") ("atheia" "3B12 9196 AE30 0C3C 0E90 A26F A715 5567 3271 9948") + ("atheia (2nd)" ;from commit df18ea6f275abaa160a8593accb29fd273d8fc13 + "9A2B 401E D001 0650 1584 BAAC 8BC4 F447 6E8A 8E00") ("bavier" ;; primary: "34FF 38BC D151 25A6 E340 A0B5 3453 2F9F AFCA 8B8E" "A0C5 E352 2EF8 EF5C 64CD B7F0 FD73 CAC7 19D3 2566") -- cgit v1.2.3 From b2504b1205aa77bcc4c1d0b2c4b402c07982cd7a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 17 Jan 2020 14:43:25 +0100 Subject: git-authenticate: Adjust atheia's key info. This is a followup to 05f8a143e437c0e55f118a0b2a191675a4b76ef1. * build-aux/git-authenticate.scm (%committers): Adjust atheia's key info. --- build-aux/git-authenticate.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build-aux/git-authenticate.scm b/build-aux/git-authenticate.scm index 8b8736e402..980a6d8e9f 100644 --- a/build-aux/git-authenticate.scm +++ b/build-aux/git-authenticate.scm @@ -59,8 +59,7 @@ (define %committers ("arunisaac" "7F73 0343 F2F0 9F3C 77BF 79D3 2E25 EE8B 6180 2BB3") ("atheia" - "3B12 9196 AE30 0C3C 0E90 A26F A715 5567 3271 9948") - ("atheia (2nd)" ;from commit df18ea6f275abaa160a8593accb29fd273d8fc13 + ;; primary: "3B12 9196 AE30 0C3C 0E90 A26F A715 5567 3271 9948" "9A2B 401E D001 0650 1584 BAAC 8BC4 F447 6E8A 8E00") ("bavier" ;; primary: "34FF 38BC D151 25A6 E340 A0B5 3453 2F9F AFCA 8B8E" -- cgit v1.2.3 From abbb98714b455f36373c17f00c82db9d1c41d5db Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 17 Jan 2020 17:11:34 +0100 Subject: ui: Ignore 'raise-exception' frames when reporting exceptions. * guix/ui.scm (last-frame-with-source): Check whether FRAME corresponds to 'raise-exception' and skip it if it does. --- guix/ui.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/guix/ui.scm b/guix/ui.scm index 01aeee49eb..4857a88827 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -175,7 +175,11 @@ (define (frame-with-source frame) (previous frame)) (if (not frame) previous - (if (frame-source frame) + + ;; On Guile 3, the latest frame with source may be that of + ;; 'raise-exception' in boot-9.scm. Skip it. + (if (and (frame-source frame) + (not (eq? 'raise-exception (frame-procedure-name frame)))) frame (loop (frame-previous frame) frame))))) -- cgit v1.2.3 From 1bb30aa35b0a7cf999c570113b5836cff46bc8fa Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 17 Jan 2020 17:12:44 +0100 Subject: guix system: Add workaround in test for Guile 3.0.0. * tests/guix-system.sh: For the 'GRUB-config' test, add workaround for the reported line number in Guile 3.0.0. --- tests/guix-system.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/guix-system.sh b/tests/guix-system.sh index 271627c2a5..3a831cba1d 100644 --- a/tests/guix-system.sh +++ b/tests/guix-system.sh @@ -120,7 +120,12 @@ EOF if guix system build "$tmpfile" -n 2> "$errorfile" then false else - if test "`guile -c '(display (effective-version))'`" = 2.2 + if test "`guile -c '(display (effective-version))'`" = 3.0 + then + # FIXME: With Guile 3.3.0 the error is reported on line 11. + # See . + grep "$tmpfile:[0-9]\+:[0-9]\+:.*GRUB-config.*[Uu]nbound variable" "$errorfile" + elif test "`guile -c '(display (effective-version))'`" = 2.2 then # FIXME: With Guile 2.2.0 the error is reported on line 4. # See . -- cgit v1.2.3 From 7b2a47a702b7393cd968640079f8703c932d1405 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 17 Jan 2020 17:14:20 +0100 Subject: build: Allow builds with Guile 3.0. * configure.ac: Add "3.0" in 'GUILE_PKG' invocation. * doc/guix.texi (Requirements): Mention 3.0.x. --- configure.ac | 2 +- doc/guix.texi | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 69ab9a97b8..06e86c209f 100644 --- a/configure.ac +++ b/configure.ac @@ -93,7 +93,7 @@ m4_pattern_forbid([^GUIX_]) dnl Search for 'guile' and 'guild'. This macro defines dnl 'GUILE_EFFECTIVE_VERSION'. -GUILE_PKG([2.2]) +GUILE_PKG([3.0 2.2]) GUILE_PROGS if test "x$GUILD" = "x"; then AC_MSG_ERROR(['guild' binary not found; please check your guile-2.x installation.]) diff --git a/doc/guix.texi b/doc/guix.texi index c737a71698..ae6c9d791c 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -744,7 +744,8 @@ GNU Guix is available for download from its website at GNU Guix depends on the following packages: @itemize -@item @url{https://gnu.org/software/guile/, GNU Guile}, version 2.2.x; +@item @url{https://gnu.org/software/guile/, GNU Guile}, version 3.0.x or +2.2.x; @item @url{https://notabug.org/cwebber/guile-gcrypt, Guile-Gcrypt}, version 0.1.0 or later; @item -- cgit v1.2.3 From 30810aff713149d53cb25f36ae6d721ec66385da Mon Sep 17 00:00:00 2001 From: Prafulla Giri Date: Sat, 28 Dec 2019 12:48:52 +0545 Subject: guix-install.sh: Create an init profile during installation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Create an init profile (/etc/profile.d/guix.sh) during installation for better integration with foreign distros. This file, read by login-shells sets a few environment variables (PATH, GUIX_PROFILE, GUIX_LOCALE, along with XDG_DATA_DIRS) and makes guix-installed packages readily available for the users. Other environment variables, as listed by `guix package --search-paths=prefix`, are also exported. Checks are in place to prevent the init profile from needlessly polluting the user's environment. * etc/guix-install.sh (sys_create_init_profile): New function to create /etc/profile.d/guix.sh init profile. Signed-off-by: Ludovic Courtès --- etc/guix-install.sh | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 111e25fbcb..b57d71981f 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -393,6 +393,26 @@ sys_authorize_build_farms() done } +sys_create_init_profile() +{ # Create /etc/profile.d/guix.sh for better desktop integration + cat <<"EOF" > /etc/profile.d/guix.sh +# _GUIX_PROFILE: `guix pull` profile +_GUIX_PROFILE="$HOME/.config/guix/current" +[ -L $_GUIX_PROFILE ] && export PATH="$_GUIX_PROFILE/bin${PATH:+:}$PATH" + +# GUIX_PROFILE: User's default profile +GUIX_PROFILE="$HOME/.guix-profile" +[ -L $GUIX_PROFILE ] || return +GUIX_LOCPATH="$GUIX_PROFILE/lib/locale" +export GUIX_PROFILE GUIX_LOCPATH + +eval `guix package --search-paths=prefix 2> /dev/null` + +# set XDG_DATA_DIRS to include Guix installations +export XDG_DATA_DIRS="$GUIX_PROFILE/share${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS" +EOF +} + welcome() { cat<<"EOF" @@ -449,6 +469,7 @@ main() sys_create_build_user sys_enable_guix_daemon sys_authorize_build_farms + sys_create_init_profile _msg "${INF}cleaning up ${tmp_path}" rm -r "${tmp_path}" -- cgit v1.2.3 From 50299ade040e934fa5533768aacb081eb340af3f Mon Sep 17 00:00:00 2001 From: Wiktor Żelazny Date: Sat, 11 Jan 2020 12:30:05 +0100 Subject: doc: Add booting instructions for Libreboot. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * doc/guix.texi (Booting): Mention the relevant command for USB. Instructions for DVD and for Coreboot are missing. Signed-off-by: Ludovic Courtès --- doc/guix.texi | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/guix.texi b/doc/guix.texi index ae6c9d791c..56fa4ff079 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -71,6 +71,7 @@ Copyright @copyright{} 2019 Alex Griffin@* Copyright @copyright{} 2019 Guillaume Le Vaillant@* Copyright @copyright{} 2020 Leo Prikler@* Copyright @copyright{} 2019, 2020 Simon Tournier@* +Copyright @copyright{} 2020 Wiktor Żelazny@* Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or @@ -2004,6 +2005,8 @@ Access to @file{/dev/srX} usually requires root privileges. Once this is done, you should be able to reboot the system and boot from the USB stick or DVD. The latter usually requires you to get in the BIOS or UEFI boot menu, where you can choose to boot from the USB stick. +In order to boot from Libreboot, switch to the command mode by pressing +the @kbd{c} key and type @command{search_grub usb}. @xref{Installing Guix in a VM}, if, instead, you would like to install Guix System in a virtual machine (VM). -- cgit v1.2.3 From d276ffcac9ad7f5f0feee8de25628b8f37338aec Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 17 Jan 2020 14:22:35 +0100 Subject: gnu: Add cl-asdf. * gnu/packages/lisp.scm (cl-asdf): New variable. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp.scm | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index f2f483e0d4..f5fef32d8d 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2018 Alex Vong ;;; Copyright © 2018, 2019 Pierre Neidhardt ;;; Copyright © 2018, 2019 Pierre Langlois -;;; Copyright © 2019 Katherine Cox-Buday +;;; Copyright © 2019, 2020 Katherine Cox-Buday ;;; Copyright © 2019 Jesse Gildersleve ;;; Copyright © 2019, 2020 Guillaume Le Vaillant ;;; @@ -88,6 +88,41 @@ (define (asdf-substitutions lisp) :collect `(:directory (,dir \"systems\"))" ,lisp)))) +(define-public cl-asdf + (package + (name "cl-asdf") + (version "3.3.3") + (source + (origin + (method url-fetch) + (uri + (string-append "https://common-lisp.net/project/asdf/archives/asdf-" + version ".lisp")) + (sha256 + (base32 "18lr6kxvzhr79c9rx3sdricz30aby866fj0m24w27zxsqlyvn3rd")))) + (build-system trivial-build-system) + (arguments + `(#:modules ((guix build utils) + (guix build lisp-utils)) + #:builder + (begin + (use-modules (guix build utils) + (guix build lisp-utils)) + (let* ((out (string-append (assoc-ref %outputs "out"))) + (asdf-install (string-append out %source-install-prefix + "/source/asdf/")) + (asdf (string-append (assoc-ref %build-inputs "source")))) + (mkdir-p asdf-install) + (copy-file asdf (string-append asdf-install "asdf.lisp")))))) + (home-page "https://common-lisp.net/project/asdf/") + (synopsis "Another System Definition Facility") + (description + "ASDF is what Common Lisp hackers use to build and load software. It is +the successor of the Lisp DEFSYSTEM of yore. ASDF stands for Another System +Definition Facility.") + ;; MIT License + (license license:expat))) + (define-public gcl (let ((commit "d3335e2b3deb63f930eb0328e9b05377744c9512") (revision "2")) ;Guix package revision -- cgit v1.2.3 From 2f66c315b8d816685d87ce1e0721a12598be582e Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 17 Jan 2020 15:28:42 +0100 Subject: gnu: sbcl: Use system ASDF instead of bundled one. * gnu/packages/lisp.scm (sbcl)[source]: Remove snippet. [native-inputs]: Add cl-asdf and sort the list. [arguments]: Add 'replace-asdf' phase. Co-authored-by: Guillaume Le Vaillant --- gnu/packages/lisp.scm | 38 +++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index f5fef32d8d..bc4fc6c62a 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -364,14 +364,7 @@ (define-public sbcl (uri (string-append "mirror://sourceforge/sbcl/sbcl/" version "/sbcl-" version "-source.tar.bz2")) (sha256 - (base32 "1krgd69cirp4ili2pfsh1a0mfvq722jbknlvmf17qhsxh1b94dlh")) - (modules '((guix build utils))) - (snippet - ;; Add sbcl-bundle-systems to 'default-system-source-registry'. - `(begin - (substitute* "contrib/asdf/asdf.lisp" - ,@(asdf-substitutions name)) - #t)))) + (base32 "1krgd69cirp4ili2pfsh1a0mfvq722jbknlvmf17qhsxh1b94dlh")))) (build-system gnu-build-system) (outputs '("out" "doc")) (native-inputs @@ -400,11 +393,12 @@ (define-public sbcl `(("clisp" ,clisp))) (_ `(("clisp" ,clisp)))) - ("which" ,which) - ("inetutils" ,inetutils) ;for hostname(1) + ("cl-asdf" ,cl-asdf) ("ed" ,ed) - ("texlive" ,(texlive-union (list texlive-tex-texinfo))) + ("inetutils" ,inetutils) ;for hostname(1) ("texinfo" ,texinfo) + ("texlive" ,(texlive-union (list texlive-tex-texinfo))) + ("which" ,which) ("zlib" ,zlib))) (arguments `(#:modules ((guix build gnu-build-system) @@ -413,6 +407,24 @@ (define-public sbcl #:phases (modify-phases %standard-phases (delete 'configure) + (add-after 'unpack 'replace-asdf + ;; SBCL developers have not committed to keeping ASDF up to date + ;; due to breaking changes [1]. Guix can handle this situation + ;; easily, and it behooves us to have more control over what version + ;; of ASDF we use to build software; therefore, replace the contrib + ;; ASDF with the version packaged into Guix. + ;; [1] - https://bugs.launchpad.net/sbcl/+bug/1823442 + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((cl-asdf (assoc-ref inputs "cl-asdf")) + (guix-asdf (string-append + cl-asdf + "/share/common-lisp/source/asdf/asdf.lisp")) + (out (string-append (assoc-ref outputs "out"))) + (contrib-asdf "contrib/asdf/asdf.lisp")) + (copy-file guix-asdf contrib-asdf) + (substitute* contrib-asdf + ,@(asdf-substitutions name))) + #t)) (add-before 'build 'patch-unix-tool-paths (lambda* (#:key outputs inputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) @@ -512,8 +524,8 @@ (define (quoted-path input path) new-doc/sbcl-dir) (delete-file-recursively old-doc-dir) #t)))) - ;; No 'check' target, though "make.sh" (build phase) runs tests. - #:tests? #f)) + ;; No 'check' target, though "make.sh" (build phase) runs tests. + #:tests? #f)) (native-search-paths (list (search-path-specification (variable "XDG_DATA_DIRS") -- cgit v1.2.3 From 24de1f5a36119b75c465bc5fb60a73dc5c749f3a Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 17 Jan 2020 15:48:17 +0100 Subject: gnu: sbcl-cl-async-util: Add missing input. * gnu/packages/lisp-xyz.scm (sbcl-cl-async-util)[inputs]: Add bordeaux-threads. --- gnu/packages/lisp-xyz.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 9dc30a3cc4..11ea65656c 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -9506,7 +9506,8 @@ (define-public sbcl-cl-async-util (inherit sbcl-cl-async-base) (name "sbcl-cl-async-util") (inputs - `(("cffi" ,sbcl-cffi) + `(("bordeaux-threads" ,sbcl-bordeaux-threads) + ("cffi" ,sbcl-cffi) ("cl-async-base" ,sbcl-cl-async-base) ("cl-libuv" ,sbcl-cl-libuv) ("cl-ppcre" ,sbcl-cl-ppcre) -- cgit v1.2.3 From cd4eb53c33ee60f397b2b8c47e656e5ed857c480 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 17 Jan 2020 16:44:48 +0100 Subject: gnu: ecl: Use system ASDF instead of bundled one. * gnu/packages/lisp.scm (ecl)[source]: Remove snippet. [native-inputs]: Add cl-asdf. [arguments]: Add 'replace-asdf' phase. --- gnu/packages/lisp.scm | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index bc4fc6c62a..f82288a5ac 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -230,28 +230,36 @@ (define-public ecl "https://common-lisp.net/project/ecl/static/files/release/" name "-" version ".tgz")) (sha256 - (base32 "0m0j24w5d5a9dwwqyrg0d35c0nys16ijb4r0nyk87yp82v38b9bn")) - (modules '((guix build utils))) - (snippet - ;; Add ecl-bundle-systems to 'default-system-source-registry'. - `(begin - (substitute* "contrib/asdf/asdf.lisp" - ,@(asdf-substitutions name)) - #t)))) + (base32 "0m0j24w5d5a9dwwqyrg0d35c0nys16ijb4r0nyk87yp82v38b9bn")))) (build-system gnu-build-system) ;; src/configure uses 'which' to confirm the existence of 'gzip'. - (native-inputs `(("which" ,which))) + (native-inputs `(("cl-asdf" ,cl-asdf) + ("which" ,which))) (inputs `(("gmp" ,gmp) ("libatomic-ops" ,libatomic-ops) ("libgc" ,libgc) ("libffi" ,libffi))) (arguments - '(#:configure-flags '("--without-rt") + `(#:configure-flags '("--without-rt") #:tests? #t #:parallel-tests? #f #:phases (modify-phases %standard-phases (delete 'check) + (add-after 'unpack 'replace-asdf + ;; Use system ASDF instead of bundled one. + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((cl-asdf (assoc-ref inputs "cl-asdf")) + (guix-asdf (string-append + cl-asdf + "/share/common-lisp/source/asdf/asdf.lisp")) + (out (string-append (assoc-ref outputs "out"))) + (contrib-asdf "contrib/asdf/asdf.lisp")) + (copy-file guix-asdf contrib-asdf) + ;; Add ecl-bundle-systems to 'default-system-source-registry'. + (substitute* contrib-asdf + ,@(asdf-substitutions name))) + #t)) (add-after 'install 'wrap (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((ecl (assoc-ref outputs "out")) -- cgit v1.2.3 From a3143063aeeecb5c02f75a6e1ddc0cc295e0e4f8 Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Fri, 17 Jan 2020 11:15:47 -0500 Subject: Update email address for Amin Bandali. * .mailmap: Add name and email addresses for Amin Bandali. * gnu/local.mk, gnu/packages/emacs-xyz.scm, gnu/packages/emacs.scm, gnu/packages/fpga.scm, gnu/packages/lean.scm, gnu/packages/maths.scm: Update email address for Amin Bandali. Signed-off-by: Tobias Geerinckx-Rice --- .mailmap | 1 + gnu/local.mk | 2 +- gnu/packages/emacs-xyz.scm | 2 +- gnu/packages/emacs.scm | 2 +- gnu/packages/fpga.scm | 2 +- gnu/packages/lean.scm | 2 +- gnu/packages/maths.scm | 2 +- 7 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.mailmap b/.mailmap index daab7c91a1..23b5b6a1c4 100644 --- a/.mailmap +++ b/.mailmap @@ -6,6 +6,7 @@ Al McElrath Alex Sassmannshausen Alexander I. Grafov Alírio Eyng +Amin Bandali Amirouche Boubekki Andreas Enge Andreas Enge diff --git a/gnu/local.mk b/gnu/local.mk index f0bfdfb970..286bcb67dd 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -25,7 +25,7 @@ # Copyright © 2019 Jonathan Brielmaier # Copyright © 2019 Evan Straw # Copyright © 2019 Brett Gilio -# Copyright © 2019 Amin Bandali +# Copyright © 2019 Amin Bandali # # This file is part of GNU Guix. # diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 899a1d80b8..32e8ae17da 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -51,7 +51,7 @@ ;;; Copyright © 2019 Baptiste Strazzulla ;;; Copyright © 2019 Giacomo Leidi ;;; Copyright © 2019 Jens Mølgaard -;;; Copyright © 2019 Amin Bandali +;;; Copyright © 2019 Amin Bandali ;;; Copyright © 2019 Jelle Licht ;;; Copyright © 2019 Björn Höfling ;;; Copyright © 2019 Stephen Webber diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index ebe47d7186..b26c928e87 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -19,7 +19,7 @@ ;;; Copyright © 2019 Jesse John Gildersleve ;;; Copyright © 2019 Valentin Ignatev ;;; Copyright © 2019 Leo Prikler -;;; Copyright © 2019 Amin Bandali +;;; Copyright © 2019 Amin Bandali ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index 556eae3624..988129f373 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2016 Danny Milosavljevic ;;; Copyright © 2016, 2017 Theodoros Foradis ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice -;;; Copyright © 2019 Amin Bandali +;;; Copyright © 2019 Amin Bandali ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/packages/lean.scm b/gnu/packages/lean.scm index 235113d475..e71b4c93ae 100644 --- a/gnu/packages/lean.scm +++ b/gnu/packages/lean.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2019 Amin Bandali +;;; Copyright © 2019 Amin Bandali ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index a94460d34b..37664849f9 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -29,7 +29,7 @@ ;;; Copyright © 2018 Marius Bakke ;;; Copyright © 2018 Eric Brown ;;; Copyright © 2018 Julien Lepiller -;;; Copyright © 2018 Amin Bandali +;;; Copyright © 2018 Amin Bandali ;;; Copyright © 2019 Nicolas Goaziou ;;; Copyright © 2019 Steve Sprang ;;; Copyright © 2019 Robert Smith -- cgit v1.2.3 From d6ab5f4fa71a965c4e0dffd5eecb7a4345c9c89f Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 5 Jan 2020 18:52:49 +0100 Subject: gnu: Add chipmunk. * gnu/packages/game-development.scm (chipmunk): New variable. --- gnu/packages/game-development.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 23cf913644..3865340b24 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -2021,3 +2021,31 @@ (define-public ode computer games, 3D authoring tools and simulation tools.") ;; Software is dual-licensed. (license (list license:lgpl2.1+ license:expat)))) + +(define-public chipmunk + (package + (name "chipmunk") + (version "7.0.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/slembcke/Chipmunk2D.git") + (commit (string-append "Chipmunk-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1qmkn01g06p3rnhmbyffmjns6wj5vhgf9cscigk3wzxcpwv1hyxb")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ;no test + #:configure-flags '("-DBUILD_STATIC=OFF" + "-DBUILD_DEMOS=OFF"))) + (inputs + `(("freeglut" ,freeglut) + ("libxmu" ,libxmu) + ("libxrandr" ,libxrandr))) + (home-page "http://chipmunk2d.net/") + (synopsis "Fast and lightweight 2D game physics library") + (description "Chipmunk is a simple, lightweight, fast and portable 2D +rigid body physics library written in C.") + (license license:expat))) -- cgit v1.2.3 From dc4469e9683c73fd4d03c1708cc4178b300f53a5 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 17 Jan 2020 12:33:31 -0500 Subject: gnu: red-eclipse: Remove proprietary libraries and pre-compiled binaries. * gnu/packages/games.scm (red-eclipse)[source]: Add 'modules' and 'snippet'. [home-page]: Use HTTPS. [license]: Update license. --- gnu/packages/games.scm | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 5a40a18f8d..8d29b82da3 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3262,7 +3262,13 @@ (define-public red-eclipse (recursive? #t))) ; for game data (file-name (git-file-name name version)) (sha256 - (base32 "0sz0mqhwx8r9n4mk3qrxw420nlsm3y0n48gd0lazgd64lfqjh3ab")))) + (base32 "0sz0mqhwx8r9n4mk3qrxw420nlsm3y0n48gd0lazgd64lfqjh3ab")) + (modules '((guix build utils))) + (snippet + ;; Remove proprietary libraries and other pre-compiled binaries. + '(begin + (delete-file-recursively "bin") + #t)))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no check target @@ -3341,19 +3347,22 @@ (define-public red-eclipse ("sdl-union" ,(sdl-union (list sdl2 sdl2-image sdl2-mixer))))) - (home-page "http://redeclipse.net/") + (home-page "https://redeclipse.net/") (synopsis "Arena shooter derived from the Cube 2 engine") (description "Red Eclipse is an arena shooter, created from the Cube2 engine. Offering an innovative parkour system and distinct but all potent weapons, Red Eclipse provides fast paced and accessible gameplay.") ;; The engine is under Zlib; data files are covered by the other - ;; licenses. More details at . + ;; licenses. More details at file:///doc/all-licenses.txt. (license (list license:expat license:zlib + license:cc-by-sa4.0 license:cc-by-sa3.0 license:cc-by3.0 - license:cc0))))) + license:cc0 + license:public-domain + license:silofl1.1))))) (define-public grue-hunter (package -- cgit v1.2.3 From 63ca1a89086574c52eeab8f223687e8614e33ffe Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 4 Jan 2020 22:36:03 -0500 Subject: gnu: Add opensp. * gnu/packages/finance.scm (opensp): New variable. --- gnu/packages/finance.scm | 53 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 19f990848c..466e91c142 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2019 Tanguy Le Carrour ;;; Copyright © 2019 Martin Becze ;;; Copyright © 2019 Sebastian Schott +;;; Copyright © 2020 Kei Kebreau ;;; ;;; This file is part of GNU Guix. ;;; @@ -52,10 +53,12 @@ (define-module (gnu packages finance) #:use-module (gnu packages compression) #:use-module (gnu packages crypto) #:use-module (gnu packages databases) + #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) #:use-module (gnu packages dns) #:use-module (gnu packages emacs) #:use-module (gnu packages dbm) + #:use-module (gnu packages gettext) #:use-module (gnu packages gnome) #:use-module (gnu packages glib) #:use-module (gnu packages gnupg) @@ -1202,3 +1205,53 @@ (define-public bitcoin-abc fees that BTC. Bitcoin ABC is the reference implementation of the Bitcoin Cash protocol. This package provides the Bitcoin Cash command line client and a client based on Qt. This is a fork of Bitcoin Core."))) + +(define-public opensp + (package + (name "opensp") + (version "1.5.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/openjade/opensp/" + version "/OpenSP-" version ".tar.gz")) + (sha256 + (base32 + "1khpasr6l0a8nfz6kcf3s81vgdab8fm2dj291n5r2s53k228kx2p")))) + (build-system gnu-build-system) + (native-inputs + `(("gettext" ,gettext-minimal))) + (inputs + `(("docbook-xml" ,docbook-xml-4.1.2) + ("docbook-xsl" ,docbook-xsl) + ("xmlto" ,xmlto))) + (arguments + `(;; TODO: Fix and enable tests. + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-docbook-paths + (lambda* (#:key inputs #:allow-other-keys) + (let ((xmldoc (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook")) + (xsldoc (string-append (assoc-ref inputs "docbook-xsl") + "/xml/xsl/docbook-xsl-" + ,(package-version docbook-xsl)))) + (substitute* (find-files "docsrc" "\\.xml$") + (("/usr/share/sgml/docbook/xml-dtd-4.1.2") xmldoc) + (("http://.*/docbookx\\.dtd") + (string-append xmldoc "/docbookx.dtd"))) + ;; Directly pass the path to the stylesheet to xmlto. + (substitute* "docsrc/Makefile.in" + (("\\$\\(XMLTO\\)") + (string-append "$(XMLTO) -x " xsldoc + "/manpages/docbook.xsl"))) + #t)))))) + (home-page "http://openjade.sourceforge.net/") + (synopsis "Suite of SGML/XML processing tools") + (description "OpenSP is an object-oriented toolkit for SGML parsing and +entity management.") + (license + ;; expat license with added clause regarding advertising + (license:non-copyleft + "file://COPYING" + "See COPYING in the distribution.")))) -- cgit v1.2.3 From 952fe2da0c1c2029076855bbbf7934360fc82b3a Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 4 Jan 2020 22:49:24 -0500 Subject: gnu: Add libofx. * gnu/packages/finance.scm (libofx): New variable. --- gnu/packages/finance.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 466e91c142..616eac3123 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -52,6 +52,7 @@ (define-module (gnu packages finance) #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages crypto) + #:use-module (gnu packages curl) #:use-module (gnu packages databases) #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) @@ -70,9 +71,11 @@ (define-module (gnu packages finance) #:use-module (gnu packages libunwind) #:use-module (gnu packages libusb) #:use-module (gnu packages linux) + #:use-module (gnu packages man) #:use-module (gnu packages multiprecision) #:use-module (gnu packages networking) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages popt) #:use-module (gnu packages protobuf) #:use-module (gnu packages python) #:use-module (gnu packages python-crypto) @@ -1206,6 +1209,49 @@ (define-public bitcoin-abc Cash protocol. This package provides the Bitcoin Cash command line client and a client based on Qt. This is a fork of Bitcoin Core."))) +(define-public libofx + (package + (name "libofx") + (version "0.9.15") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libofx/libofx") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1jx56ma351p8af8dvavygjwf6ipa7qbgq7bpdsymwj27apdnixfy")))) + (build-system gnu-build-system) + (arguments + '(#:configure-flags + (list (string-append "--with-opensp-includes=" + (assoc-ref %build-inputs "opensp") + "/include/OpenSP")))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("gengetopt" ,gengetopt) + ("help2man" ,help2man) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config))) + (inputs + `(("curl" ,curl) + ("libxml++-2" ,libxml++-2) + ("opensp" ,opensp))) + (home-page "http://libofx.sourceforge.net/") + (synopsis "Library supporting the Open Financial Exchange format") + (description + "The LibOFX library is a API designed to allow applications to very easily +support OFX command responses, usually provided by financial institutions. The +following three utilities are included with the library: +@enumerate +@item @code{ofxdump} +@item @code{ofx2qif} +@item @code{ofxconnect} +@end enumerate") + (license license:gpl2+))) + (define-public opensp (package (name "opensp") -- cgit v1.2.3 From dfb01912865898545c278e691f43db31aed301aa Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 2 Jan 2020 22:01:28 -0500 Subject: gnu: gnucash: Enable libofx support. * gnu/packages/gnucash.scm (gnucash)[arguments]: Remove '-DWITH_OFX=OFF' configure flag to enable libofx support. [inputs]: Add libofx. [propagated-inputs]: Add dconf. --- gnu/packages/gnucash.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnucash.scm b/gnu/packages/gnucash.scm index 8050fee43e..43aad3ed02 100644 --- a/gnu/packages/gnucash.scm +++ b/gnu/packages/gnucash.scm @@ -37,6 +37,7 @@ (define-module (gnu packages gnucash) #:use-module (gnu packages databases) #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) + #:use-module (gnu packages finance) #:use-module (gnu packages gettext) #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) @@ -76,6 +77,7 @@ (define-public gnucash ("libdbi" ,libdbi) ("libdbi-drivers" ,libdbi-drivers) ("libgnomecanvas" ,libgnomecanvas) + ("libofx" ,libofx) ("libxml2" ,libxml2) ("libxslt" ,libxslt) ("webkitgtk" ,webkitgtk) @@ -90,11 +92,12 @@ (define-public gnucash ("googletest" ,googletest) ("gnucash-docs" ,gnucash-docs) ("pkg-config" ,pkg-config))) + (propagated-inputs + ;; dconf is required at runtime according to README.dependencies. + `(("dconf" ,dconf))) (outputs '("out" "doc" "debug")) (arguments `(#:test-target "check" - #:configure-flags - (list "-DWITH_OFX=OFF") ; libofx is not available yet #:make-flags '("GUILE_AUTO_COMPILE=0") #:modules ((guix build cmake-build-system) ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) -- cgit v1.2.3 From 8b08cf4fdd55aca99fbd7dd8de974f1d6744e10a Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 17 Jan 2020 15:23:30 -0500 Subject: gnu: libofx: Fix description typo. * gnu/packages/finance.scm (libofx): Change "a API" to "an API". --- gnu/packages/finance.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 616eac3123..378491227c 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -1242,7 +1242,7 @@ (define-public libofx (home-page "http://libofx.sourceforge.net/") (synopsis "Library supporting the Open Financial Exchange format") (description - "The LibOFX library is a API designed to allow applications to very easily + "The LibOFX library is an API designed to allow applications to very easily support OFX command responses, usually provided by financial institutions. The following three utilities are included with the library: @enumerate -- cgit v1.2.3 From d0bb1c2f5c150937939fd138c37b6cc367b542e1 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 17 Jan 2020 21:26:42 +0100 Subject: gnu: chipmunk: Use HTTPS home page URI. * gnu/packages/game-development.scm (chipmunk)[home-page]: Use HTTPS URI. --- gnu/packages/game-development.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 3865340b24..ee8dea23b5 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -2044,7 +2044,7 @@ (define-public chipmunk `(("freeglut" ,freeglut) ("libxmu" ,libxmu) ("libxrandr" ,libxrandr))) - (home-page "http://chipmunk2d.net/") + (home-page "https://chipmunk-physics.net/") (synopsis "Fast and lightweight 2D game physics library") (description "Chipmunk is a simple, lightweight, fast and portable 2D rigid body physics library written in C.") -- cgit v1.2.3 From a3bf43481902ff10d02934d252cfb7aaaf3873e6 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Fri, 17 Jan 2020 21:03:21 +0000 Subject: gnu: diffoscope: Update to 135. * gnu/packages/diffoscope (diffoscope): Update to 135. --- 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 a362285051..6be2b7f9fc 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -67,7 +67,7 @@ (define-module (gnu packages diffoscope) #:use-module (ice-9 match)) (define-public diffoscope - (let ((version "134")) + (let ((version "135")) (package (name "diffoscope") (version version) @@ -79,7 +79,7 @@ (define-public diffoscope (file-name (git-file-name name version)) (sha256 (base32 - "04078cn3lazcrpgzzzy1s9721hprkylrvfa58izm4dcvgd7a593z")))) + "0rkpvajkp3qryi6dxkrh8aq5xg79aybnw8iy73wsblcnfq6yhba7")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 04d29de1143e21a379974d4e8752b6dcf0fa1885 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 17 Jan 2020 21:58:23 +0100 Subject: gnu: guix: Update to 50299ad. * gnu/packages/package-management.scm (guix): Update to 50299ad. --- 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 b9e416797c..c622906cd1 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -110,8 +110,8 @@ (define-public guix ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.0.1") - (commit "4aea90b1876179aab8d603a42533a6bdf97ccd3c") - (revision 12)) + (commit "50299ade040e934fa5533768aacb081eb340af3f") + (revision 13)) (package (name "guix") @@ -127,7 +127,7 @@ (define-public guix (commit commit))) (sha256 (base32 - "08h1v9pmhb6pcdhvnhc1gi0nqp78kf68657vlk10abrf7q0cqs6q")) + "0rbnyy0vqmsl7z350cdazm5xzx74cdia3nxp0msk8xalyb76hff4")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From da7651806102d637253cb9f5677b96d6a178fc05 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 17 Jan 2020 21:59:03 +0100 Subject: gnu: guix: Add "guile3.0-guix" variant. * gnu/packages/package-management.scm (guile3.0-guix): New variable. --- gnu/packages/package-management.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index c622906cd1..422d4f1959 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -397,6 +397,21 @@ (define-public guix-daemon (define-public guile2.0-guix (deprecated-package "guile2.0-guix" guix)) +(define-public guile3.0-guix + (package + (inherit guix) + (name "guile3.0-guix") + (inputs + `(("guile" ,guile-3.0) + ,@(alist-delete "guile" (package-inputs guix)))) + (propagated-inputs + `(("gnutls" ,guile3.0-gnutls) + ("guile-gcrypt" ,guile3.0-gcrypt) + ("guile-json" ,guile3.0-json) + ("guile-sqlite3" ,guile3.0-sqlite3) + ("guile-ssh" ,guile3.0-ssh) + ("guile-git" ,guile3.0-git))))) + (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 -- cgit v1.2.3 From 06dfce791341c1bfe3420601ed7cf2e387335049 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 17 Jan 2020 22:20:29 +0100 Subject: gnu: gunicorn: Use HTTPS home page. * gnu/packages/python-web.scm (gunicorn)[home-page]: Use HTTPS. --- gnu/packages/python-web.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 611c85a9ad..7f365e3506 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -3422,7 +3422,7 @@ (define-public gunicorn ("python-pytest-cov" ,python-pytest-cov) ("python-sphinx" ,python-sphinx) ("texinfo" ,texinfo))) - (home-page "http://gunicorn.org/") + (home-page "https://gunicorn.org/") (synopsis "Python WSGI HTTP Server for UNIX") (description "Gunicorn ‘Green Unicorn’ is a Python WSGI HTTP Server for UNIX. It’s a pre-fork worker model ported from Ruby’s -- cgit v1.2.3 From 13b09bfc5599a94f4c57f834d0b03000a8660d96 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 17 Jan 2020 22:22:15 +0100 Subject: gnu: python-maxminddb, python-geoip2: Use HTTPS home page. * gnu/packages/geo.scm (python-maxminddb, python-geoip2)[home-page]: Use HTTPS. --- 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 d57d9b8dda..61b8e55e52 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1308,7 +1308,7 @@ (define-public python-maxminddb `(#:tests? #f)) ;; Tests require a copy of the maxmind database (inputs `(("libmaxminddb" ,libmaxminddb))) - (home-page "http://www.maxmind.com/") + (home-page "https://www.maxmind.com/") (synopsis "Reader for the MaxMind DB format") (description "MaxMind DB is a binary file format that stores data indexed by IP address subnets (IPv4 or IPv6). This is a Python module for reading @@ -1332,7 +1332,7 @@ (define-public python-geoip2 (inputs `(("python-maxminddb" ,python-maxminddb) ("python-requests" ,python-requests))) - (home-page "http://www.maxmind.com/") + (home-page "https://www.maxmind.com/") (synopsis "MaxMind GeoIP2 API") (description "Provides an API for the GeoIP2 web services and databases. The API also works with MaxMind’s free GeoLite2 databases.") -- cgit v1.2.3 From d61043c74f234d707737b4710d9478a57f2a8fc2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 17 Jan 2020 22:24:21 +0100 Subject: gnu: vpnc: Use HTTPS home page. * gnu/packages/vpn.scm (vpnc)[home-page]: Use HTTPS. --- gnu/packages/vpn.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 44d27dc119..e29c1e7d03 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -118,7 +118,7 @@ (define-public vpnc 1DES, MD5, SHA1, DH1/2/5 and IP tunneling. It runs entirely in userspace. Only \"Universal TUN/TAP device driver support\" is needed in the kernel.") (license license:gpl2+) ; some file are bsd-2, see COPYING - (home-page "http://www.unix-ag.uni-kl.de/~massar/vpnc/"))) + (home-page "https://www.unix-ag.uni-kl.de/~massar/vpnc/"))) (define-public vpnc-scripts (let ((commit "1000e0f6dd7d6bff163169a46359211c1fc3a6d2")) -- cgit v1.2.3 From bcd57eba43176c36a2530279e11f5343bb64b5b5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 17 Jan 2020 22:27:31 +0100 Subject: gnu: Remove leading newline from (gnu packages java). * gnu/packages/java.scm: Remove leading newline. --- gnu/packages/java.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index c4cbcbdc1b..7b07510491 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1,4 +1,3 @@ - ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus ;;; Copyright © 2016 Leo Famulari -- cgit v1.2.3 From 7420c1ee9062180ce320c2630a9c2b90d34a8dc9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 17 Jan 2020 22:30:18 +0100 Subject: gnu: antlr@2: Use HTTPS home page. * gnu/packages/java.scm (antlr2)[source, home-page]: Use HTTPS. --- 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 7b07510491..8c7ccda896 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -6808,7 +6808,7 @@ (define-public antlr2 (version "2.7.7") (source (origin (method url-fetch) - (uri (string-append "http://www.antlr2.org/download/antlr-" + (uri (string-append "https://www.antlr2.org/download/antlr-" version ".tar.gz")) (sha256 (base32 @@ -6855,7 +6855,7 @@ (define-public antlr2 ("java" ,icedtea "jdk"))) (inputs `(("java" ,icedtea))) - (home-page "http://www.antlr2.org") + (home-page "https://www.antlr2.org") (synopsis "Framework for constructing recognizers, compilers, and translators") (description "ANTLR, ANother Tool for Language Recognition, (formerly PCCTS) is a language tool that provides a framework for constructing recognizers, -- cgit v1.2.3 From a264250b89a3b6b98ebe42d2ca9cffe65dddacba Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 17 Jan 2020 22:31:01 +0100 Subject: gnu: antlr3: Use HTTPS home page. * gnu/packages/java.scm (antlr3)[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 8c7ccda896..0fe874cd51 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -7079,7 +7079,7 @@ (define-public antlr3 `(("stringtemplate" ,java-stringtemplate-3) ("antlr" ,antlr2) ("stringtemplate4" ,java-stringtemplate-4.0.6))) - (home-page "http://www.antlr3.org") + (home-page "https://www.antlr3.org") (synopsis "Framework for constructing recognizers, compilers, and translators") (description "ANTLR, ANother Tool for Language Recognition, (formerly PCCTS) is a language tool that provides a framework for constructing recognizers, -- cgit v1.2.3 From 50a67a46335d724ce83e13a3a6d880e755954d81 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 17 Jan 2020 22:29:26 +0100 Subject: gnu: vamp: Use HTTPS home page. * gnu/packages/audio.scm (vamp)[home-page]: Use HTTPS. --- gnu/packages/audio.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 07407d8ebe..6020063b2e 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2621,7 +2621,7 @@ (define-public vamp `(("libsndfile" ,libsndfile))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://vamp-plugins.org") + (home-page "https://vamp-plugins.org") (synopsis "Modular and extensible audio processing system") (description "Vamp is an audio processing plugin system for plugins that extract -- cgit v1.2.3 From 9a50f47c49a98318828aa0130fce436e795175d5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 17 Jan 2020 22:35:17 +0100 Subject: gnu: xonsh: Use HTTPS home page. * gnu/packages/shells.scm (xonsh)[home-page]: Use HTTPS. --- gnu/packages/shells.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 1d2f754e4a..a679810e97 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -483,7 +483,7 @@ (define-public xonsh #:tests? #f)) (inputs `(("python-ply" ,python-ply))) - (home-page "http://xon.sh/") + (home-page "https://xon.sh/") (synopsis "Python-ish shell") (description "Xonsh is a Python-ish, BASHwards-looking shell language and command -- cgit v1.2.3 From 3497086b6b4f2b39f7e74c0fe824abc7c6f1d118 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 17 Jan 2020 22:39:09 +0100 Subject: gnu: Use HTTPS for sass-lang.com everywhere. * gnu/packages/ruby.scm (ruby-sass)[home-page]: Use HTTPS. * gnu/packages/web.scm (sassc)[home-page]: Likewise. --- gnu/packages/ruby.scm | 2 +- gnu/packages/web.scm | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index ad675dc488..fa913beab4 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -7755,7 +7755,7 @@ (define-public ruby-sass (native-inputs `(("ruby-sass-spec" ,ruby-sass-spec) ("ruby-mathn" ,ruby-mathn))) - (home-page "http://sass-lang.com/") + (home-page "https://sass-lang.com/") (synopsis "CSS extension language") (description "Sass is a CSS extension language. It extends CSS with features that don't exist yet like variables, nesting, mixins and inheritance.") diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 5b457ccc5b..904db3828b 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1565,8 +1565,7 @@ (define-public sassc `(#:make-flags (list "CC=gcc" (string-append "PREFIX=" (assoc-ref %outputs "out"))) - ;; I don't believe sassc contains any tests - #:tests? #f + #:tests? #f ; no test suite #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-Makefile @@ -1579,9 +1578,9 @@ (define-public sassc (("install: libsass-install-\\$\\(BUILD\\) \\\\") "install: \\")) #t)) - ;; This phase fails for some reason + ;; This phase fails for some reason. (delete 'bootstrap) - ;; There is no configure script + ;; There is no configure script. (delete 'configure) (add-before 'build 'setup-environment (lambda _ @@ -1593,7 +1592,7 @@ (define-public sassc (synopsis "CSS pre-processor") (description "SassC is a compiler written in C for the CSS pre-processor language known as SASS.") - (home-page "http://sass-lang.com/libsass") + (home-page "https://sass-lang.com/libsass") (license license:expat))) -- cgit v1.2.3 From d5730000e2a7c5788509988e9929681017812e04 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 17 Jan 2020 22:41:10 +0100 Subject: gnu: scotch: Use HTTPS home page. * gnu/packages/maths.scm (scotch)[home-page]: Use HTTPS. --- 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 37664849f9..99803cb5bf 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2644,7 +2644,7 @@ (define-public scotch (install-file f (string-append out "/lib"))) (find-files "../lib/" ".*metis\\..*")) #t)))))) - (home-page "http://www.labri.fr/perso/pelegrin/scotch/") + (home-page "https://www.labri.fr/perso/pelegrin/scotch/") (synopsis "Programs and libraries for graph algorithms") (description "SCOTCH is a set of programs and libraries which implement the static mapping and sparse matrix reordering algorithms developed within -- cgit v1.2.3 From 821aa687b439f509bec124f14e529d6da756132c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 17 Jan 2020 22:43:18 +0100 Subject: gnu: netcdf: Use HTTPS home page. * gnu/packages/maths.scm (netcdf)[home-page]: Use HTTPS. --- 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 99803cb5bf..5bb1f92f23 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1270,7 +1270,7 @@ (define-public netcdf #t))) #:parallel-tests? #f)) ;various race conditions - (home-page "http://www.unidata.ucar.edu/software/netcdf/") + (home-page "https://www.unidata.ucar.edu/software/netcdf/") (synopsis "Library for scientific data") (description "NetCDF is an interface for scientific data access and a software library that provides an implementation of the interface. The netCDF -- cgit v1.2.3 From e98f34228f9c14a24d31d2d1d1b78bd89b68f1bd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 17 Jan 2020 22:43:44 +0100 Subject: gnu: r-distillery: Use HTTPS home page. * gnu/packages/cran.scm (r-distillery)[home-page]: Use HTTPS. --- gnu/packages/cran.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index e998c587ce..a4c45d2f5b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2261,7 +2261,7 @@ (define-public r-distillery (base32 "1mi3ig9jq0kd7yrwc5m37lmrw04p1b4lirnbsxi10z3n5yay4429")))) (build-system r-build-system) - (home-page "http://www.ral.ucar.edu/staff/ericg") + (home-page "https://ral.ucar.edu/staff/ericg/") (synopsis "Functions for confidence intervals and object information") (description "This package provides some very simple method functions for confidence -- cgit v1.2.3 From bcb697fce78f83925e1ccd05579c3d3d5b3316d3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 17 Jan 2020 22:44:35 +0100 Subject: gnu: r-extremes: Use HTTPS home page. * gnu/packages/cran.scm (r-extremes)[home-page]: Use HTTPS. --- gnu/packages/cran.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a4c45d2f5b..34d187a02a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2286,7 +2286,7 @@ (define-public r-extremes (propagated-inputs `(("r-distillery" ,r-distillery) ("r-lmoments" ,r-lmoments))) - (home-page "http://www.assessment.ucar.edu/toolkit/") + (home-page "https://www.assessment.ucar.edu/toolkit/") (synopsis "Extreme value analysis") (description "ExtRemes is a suite of functions for carrying out analyses on the -- cgit v1.2.3 From c3c56a4eb585b54012e92a995edc6e70f815c224 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 17 Jan 2020 22:46:14 +0100 Subject: gnu: neomutt: Fix home page. * gnu/packages/mail.scm (neomutt)[home-page]: Drop unsupported www subdomain. --- 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 d32fd3fc0d..168e626d7e 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -489,7 +489,7 @@ (define-public neomutt (apply invoke bash (string-append (getcwd) "/configure") flags))))))) - (home-page "https://www.neomutt.org/") + (home-page "https://neomutt.org/") (synopsis "Command-line mail reader based on Mutt") (description "NeoMutt is a command-line mail reader which is based on mutt. -- cgit v1.2.3 From 0a44f9c4e45c0fc8426bda6b8b5983bdf49a7ed3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 17 Jan 2020 22:52:07 +0100 Subject: gnu: Use HTTPS for www.hdfgroup.org. * gnu/packages/maths.scm (hdf5)[home-page, license]: Use HTTPS. (hdf-java, h5check)[source]: Likewise. --- gnu/packages/maths.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 5bb1f92f23..bc03938621 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -908,12 +908,12 @@ (define-public hdf5 (find-files ex ".*")) (delete-file-recursively ex)) #t))))) - (home-page "http://www.hdfgroup.org") + (home-page "https://www.hdfgroup.org") (synopsis "Management suite for extremely large and complex data") (description "HDF5 is a suite that makes possible the management of extremely large and complex data collections.") (license (license:x11-style - "http://www.hdfgroup.org/ftp/HDF5/current/src/unpacked/COPYING")))) + "https://www.hdfgroup.org/ftp/HDF5/current/src/unpacked/COPYING")))) (define-public hdf5-1.10 (package (inherit hdf5) @@ -942,7 +942,7 @@ (define-public hdf-java (origin (method url-fetch) (uri (string-append - "http://www.hdfgroup.org/ftp/HDF5/releases/HDF-JAVA/hdfjni-" + "https://www.hdfgroup.org/ftp/HDF5/releases/HDF-JAVA/hdfjni-" version "/src/CMake-hdfjava-" version ".tar.gz")) (sha256 (base32 "0m1gp2aspcblqzmpqbdpfp6giskws85ds6p5gz8sx7asyp7wznpr")) @@ -1175,7 +1175,7 @@ (define-public h5check (source (origin (method url-fetch) - (uri (string-append "http://www.hdfgroup.org/ftp/HDF5/tools/" + (uri (string-append "https://www.hdfgroup.org/ftp/HDF5/tools/" "h5check/src/h5check-" version ".tar.gz")) (sha256 (base32 -- cgit v1.2.3 From b7dfc5a707bebc4b6fecd8a6e5bcca618b5acc12 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 17 Jan 2020 23:20:38 +0100 Subject: gnu: hidapi: Don't use unstable tarball. * gnu/packages/libusb.scm (hidapi)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/libusb.scm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm index 878f9e58ed..ae904fe5a9 100644 --- a/gnu/packages/libusb.scm +++ b/gnu/packages/libusb.scm @@ -526,13 +526,14 @@ (define-public hidapi (package (name "hidapi") (version "0.8.0-rc1") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/signal11/hidapi/archive/hidapi-" - version ".tar.gz")) - (sha256 - (base32 - "0qdgyj9rgb7n0nk3ghfswrhzzknxqn4ibn3wj8g4r828pw07451w")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/signal11/hidapi.git") + (commit (string-append "hidapi-" version)))) + (sha256 + (base32 "13d5jkmh9nh4c2kjch8k8amslnxapa9vkqzrk1z6rqmw8qgvzbkj")))) (build-system gnu-build-system) (inputs `(("libusb" ,libusb) -- cgit v1.2.3 From 7f6592c453b960eb3cbb25d1960f9c266a007a28 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 17 Jan 2020 23:29:54 +0100 Subject: gnu: hidapi: Update to 0.9.0. This release was taken over by the libusb team. See . * gnu/packages/libusb.scm (hidapi): Update to 0.9.0. [source, home-page]: Switch to new upstream. --- gnu/packages/libusb.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm index ae904fe5a9..629bcf5fe5 100644 --- a/gnu/packages/libusb.scm +++ b/gnu/packages/libusb.scm @@ -525,15 +525,15 @@ (define-public gmtp (define-public hidapi (package (name "hidapi") - (version "0.8.0-rc1") + (version "0.9.0") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/signal11/hidapi.git") + (url "https://github.com/libusb/hidapi.git") (commit (string-append "hidapi-" version)))) (sha256 - (base32 "13d5jkmh9nh4c2kjch8k8amslnxapa9vkqzrk1z6rqmw8qgvzbkj")))) + (base32 "1p4g8lgwj4rki6lbn5l6rvwj0xlbn1xfh4d255bg5pvgczmwmc4i")))) (build-system gnu-build-system) (inputs `(("libusb" ,libusb) @@ -543,7 +543,7 @@ (define-public hidapi ("automake" ,automake) ("libtool" ,libtool) ("pkg-config" ,pkg-config))) - (home-page "http://www.signal11.us/oss/hidapi/") + (home-page "https://github.com/libusb/hidapi") (synopsis "HID API library") (description "HIDAPI is a library which allows an application to interface with USB and Bluetooth -- cgit v1.2.3 From b410c0355aeb8a282a2ee6204676efa8fe77b67a Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Fri, 17 Jan 2020 17:27:38 -0600 Subject: gnu: synergy: Update to 1.11.0. * gnu/packages/synergy.scm (synergy): Update to 1.11.0. [arguments]: Remove upstreamed patches. --- gnu/packages/synergy.scm | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/gnu/packages/synergy.scm b/gnu/packages/synergy.scm index 9de3ee57e4..367bb323b3 100644 --- a/gnu/packages/synergy.scm +++ b/gnu/packages/synergy.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014, 2015, 2016 Eric Bavier +;;; Copyright © 2014, 2015, 2016, 2020 Eric Bavier ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2017 Vasile Dumitrascu ;;; Copyright © 2019 Ricardo Wurmus @@ -37,17 +37,17 @@ (define-module (gnu packages synergy) (define-public synergy (package (name "synergy") - (version "1.10.1") + (version "1.11.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/symless/synergy-core.git") - (commit (string-append "v" version "-stable")))) + (commit (string-append version "-stable")))) (file-name (git-file-name name version)) (sha256 (base32 - "112w2xrp04cysd14xk1ax7cllqpcki0pyica4ivrdngr5qw0r9hp")) + "1jk60xw4h6s5crha89wk4y8rrf1f3bixgh5mzh3cq3xyrkba41gh")) (modules '((guix build utils))) (snippet ;; Remove unnecessary bundled source and binaries @@ -64,13 +64,6 @@ (define-public synergy (setenv "CPLUS_INCLUDE_PATH" (string-append (assoc-ref inputs "avahi") "/include/avahi-compat-libdns_sd")) - ;; See https://github.com/symless/synergy-core/pull/6359/ - (substitute* "src/gui/src/ScreenSetupView.cpp" - (("#include " m) - (string-append m "\n#include "))) - (substitute* "src/gui/src/ActionDialog.cpp" - (("#include " m) - (string-append m "\n#include "))) #t))))) (inputs `(("avahi" ,avahi) -- cgit v1.2.3 From ec80220c4d783c0affbcace63d109e035b6fe478 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 17 Jan 2020 22:22:04 -0500 Subject: gnu: linux-libre@4.14: Update to 4.14.166. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.166. (linux-libre-4.14-pristine-source): Update hash. --- 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 377398b9e0..f36cff4090 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2013, 2014, 2015, 2016 Andreas Enge ;;; Copyright © 2012 Nikita Karetnikov -;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Mark H Weaver +;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Mark H Weaver ;;; Copyright © 2015 Federico Beffa ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer ;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner @@ -373,10 +373,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.165") +(define-public linux-libre-4.14-version "4.14.166") (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "1iw8w3kfm8cs97imc6zz2wqzq9bhhlygcg7r8qslwks0hqivbbmh"))) + (hash (base32 "003wax7dsahlv1iv9yqhkjbxx20crmwyd9464cx974i03a0vzclb"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit v1.2.3 From 8e324fe6791522bef5d7e86db8f379190e4e8780 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 17 Jan 2020 22:23:13 -0500 Subject: gnu: linux-libre@4.19: Update to 4.19.97. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.97. (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 f36cff4090..981169d27e 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -365,10 +365,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.96") +(define-public linux-libre-4.19-version "4.19.97") (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "0k8xcdmc3jffk4y7vxnwvrjnrzhjcw07ikp5a2c4zhbvpbax3h93"))) + (hash (base32 "1nln2ksfm0ddkqdmhvxwzqq96av1myx89kr1wxs54m2yw0la7clg"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From 54775af942560094ef5e046abacfb5a5ad4f8e62 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 17 Jan 2020 22:23:50 -0500 Subject: gnu: linux-libre: Update to 5.4.13. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.13. (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 981169d27e..beea8b6433 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -357,10 +357,10 @@ (define (%upstream-linux-source version hash) "linux-" version ".tar.xz")) (sha256 hash))) -(define-public linux-libre-5.4-version "5.4.12") +(define-public linux-libre-5.4-version "5.4.13") (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "1yyh934ifzwgqlpd8wy50z9d68hla5arvy50pi6c499dsnicghyr"))) + (hash (base32 "1mva73ywb2r5lrmzp5m7hyy0zpgxdg91nw42c1z1sz3ydpcjkys9"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit v1.2.3 From 32dad069b0c7e08d9908d2f62db90d72293b3de1 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Sat, 7 Dec 2019 21:44:48 -0600 Subject: gnu: Add perl-lwp-useragent-cached. * gnu/packages/web.scm (perl-lwp-useragent-cached): New variable. --- gnu/packages/web.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 904db3828b..b2d282710a 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -3486,6 +3486,28 @@ (define-public perl-lwp-protocol-https https schemed URLs with LWP.") (license license:perl-license))) +(define-public perl-lwp-useragent-cached + (package + (name "perl-lwp-useragent-cached") + (version "0.08") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://cpan/authors/id/O/OL/OLEG/" + "LWP-UserAgent-Cached-" version ".tar.gz")) + (sha256 + (base32 + "1hw7wy7f82kl61xjwkgmhv1ixgg56dhgfr45wxn6ahc0qys5mkix")))) + (build-system perl-build-system) + (propagated-inputs + `(("perl-libwww" ,perl-libwww))) + (home-page "https://metacpan.org/release/LWP-UserAgent-Cached") + (synopsis "Simple caching for LWP::UserAgent") + (description "LWP::UserAgent::Cached is an LWP::UserAgent subclass with +cache support. It returns responses from the local filesystem if available +instead of making an HTTP request.") + (license license:perl-license))) + (define-public perl-lwp-useragent-determined (package (name "perl-lwp-useragent-determined") -- cgit v1.2.3 From ccb6b98bfe4a40f68d862dcc8be12028a6635704 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Sat, 7 Dec 2019 21:45:53 -0600 Subject: gnu: Add perl-term-readline-gnu. * gnu/packages/perl.scm (perl-term-readline-gnu): New variable. --- gnu/packages/perl.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index c94afbc4b9..13f038d466 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -52,10 +52,12 @@ (define-module (gnu packages perl) #:use-module (gnu packages compression) #:use-module (gnu packages freedesktop) #:use-module (gnu packages less) + #:use-module (gnu packages ncurses) #:use-module (gnu packages perl-check) #:use-module (gnu packages perl-compression) #:use-module (gnu packages perl-web) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages readline) #:use-module (gnu packages textutils)) ;;; @@ -8491,6 +8493,40 @@ (define-public perl-term-readkey screen size, and retrieval/modification of the control characters.") (license (package-license perl)))) +(define-public perl-term-readline-gnu + (package + (name "perl-term-readline-gnu") + (version "1.36") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://cpan/authors/id/H/HA/HAYASHI/" + "Term-ReadLine-Gnu-" version ".tar.gz")) + (sha256 + (base32 + "09b9mcmp09kdfh5jaqdr528yny8746hvn3f185aqd6rw06jgf24s")))) + (build-system perl-build-system) + (inputs + `(("readline" ,readline) + ("ncurses" ,ncurses))) + (arguments + `(#:tests? #f ; Tests fail without other Term::ReadLine interfaces present + #:phases (modify-phases %standard-phases + (add-before 'configure 'patch-search-lib + (lambda _ + (substitute* "Makefile.PL" + ;; The configuration provides no way to pass + ;; additional directories to search for the ncurses + ;; library, so just skip the search. + (("&search_lib\\('-lncurses'\\)") "'-lncurses'"))))))) + (home-page "https://metacpan.org/release/Term-ReadLine-Gnu") + (synopsis "GNU Readline/History Library interface for Perl") + (description "This module implements an interface to the GNU Readline +library. It gives you input line editing facilities, input history management +facilities, completion facilities, etc. Term::ReadLine::Gnu is upwards +compatible with Term::ReadLine.") + (license (package-license perl)))) + (define-public perl-term-size-any (package (name "perl-term-size-any") -- cgit v1.2.3 From adff7395bc425afa722bf3fadc8e2fe24563ecf7 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Fri, 13 Dec 2019 21:40:15 -0600 Subject: wip: gnu: youtube-viewer: Update to 3.7.0. * gnu/packages/video.scm (youtube-viewer): Update to 3.7.0. [inputs]: Add perl-lwp-useragent-cached, perl-term-readline-gnu, and xdg-utils. [arguments]: Patch xdg-open reference in "refer-to-inputs" phase. --- gnu/packages/video.scm | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 5629d58b96..e62031d85a 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2016 Dmitry Nikolaev ;;; Copyright © 2016 Andy Patterson ;;; Copyright © 2016, 2017 ng0 -;;; Copyright © 2016, 2018, 2019 Eric Bavier +;;; Copyright © 2016, 2018, 2019, 2020 Eric Bavier ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2017 Feng Shu ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice @@ -1721,7 +1721,7 @@ (define-public you-get (define-public youtube-viewer (package (name "youtube-viewer") - (version "3.5.8") + (version "3.7.0") (source (origin (method git-fetch) (uri (git-reference @@ -1730,12 +1730,10 @@ (define-public youtube-viewer (file-name (git-file-name name version)) (sha256 (base32 - "0zz0r3vd2pg9zzykhrq0vnvqp5842dbgsg8cfygw9vzb9j8mlq0a")))) + "1h0m8rn7najdrzvg5md9albiax287273b40ncrihh9amsvvb47c9")))) (build-system perl-build-system) (native-inputs `(("perl-module-build" ,perl-module-build))) - ;; FIXME: Add optional dependencies once available: - ;; perl-lwp-useragent-cached and perl-term-readline-gnu (inputs `(("perl-data-dump" ,perl-data-dump) ("perl-file-sharedir" ,perl-file-sharedir) @@ -1743,8 +1741,11 @@ (define-public youtube-viewer ("perl-json" ,perl-json) ("perl-libwww" ,perl-libwww) ("perl-lwp-protocol-https" ,perl-lwp-protocol-https) + ("perl-lwp-useragent-cached" ,perl-lwp-useragent-cached) ("perl-mozilla-ca" ,perl-mozilla-ca) + ("perl-term-readline-gnu" ,perl-term-readline-gnu) ("perl-unicode-linebreak" ,perl-unicode-linebreak) + ("xdg-utils" ,xdg-utils) ;; Some videos play without youtube-dl, but others silently fail to. ("youtube-dl" ,youtube-dl))) @@ -1761,6 +1762,11 @@ (define-public youtube-viewer (("'youtube-dl'") (format #f "'~a/bin/youtube-dl'" (assoc-ref inputs "youtube-dl")))) + (substitute* '("bin/gtk2-youtube-viewer" + "bin/gtk3-youtube-viewer") + (("'xdg-open'") + (format #f "'~a/bin/xdg-open'" + (assoc-ref inputs "xdg-utils")))) #t)) (add-after 'install 'install-desktop (lambda* (#:key outputs #:allow-other-keys) -- cgit v1.2.3 From e24c672e740664c1340a4ff8bf43a21b4bd3e5d1 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Sat, 18 Jan 2020 17:27:25 +0800 Subject: gnu: Add python-asynctest. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-asynctest): New variable. Signed-off-by: 宋文武 --- gnu/packages/python-xyz.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 76d38807d3..e14bbc1bbd 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17117,3 +17117,36 @@ (define-public python-cson (description "This package is a parser for Coffeescript Object Notation (CSON).") (license license:expat))) + +(define-public python-asynctest + (package + (name "python-asynctest") + (version "0.13.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "asynctest" version)) + (sha256 + (base32 + "1b3zsy7p84gag6q8ai2ylyrhx213qdk2h2zb6im3xn0m5n264y62")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "python" "-X" "dev" "-m" "unittest" "-v" "test"))) + (add-after 'unpack 'disable-tests + (lambda* _ + (substitute* "test/test_selector.py" + ;; XXX: This test fails for unknown reason inside the build + ;; environment. + (("def test_events_watched_outside_test_are_ignored") + "@unittest.skip('disabled by guix') + def test_events_watched_outside_test_are_ignored"))))))) + (home-page "https://github.com/Martiusweb/asynctest") + (synopsis "Extension of unittest for testing asyncio libraries") + (description + "The package asynctest is built on top of the standard unittest module +and cuts down boilerplate code when testing libraries for asyncio.") + (license license:asl2.0))) -- cgit v1.2.3 From 1cc9c38e902aeb03295e9728b4cf40ff2b302716 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Sat, 18 Jan 2020 17:41:21 +0800 Subject: gnu: Add python-aionotify. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-aionotify): New variable. Signed-off-by: 宋文武 --- 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 e14bbc1bbd..2bef867630 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17150,3 +17150,25 @@ (define-public python-asynctest "The package asynctest is built on top of the standard unittest module and cuts down boilerplate code when testing libraries for asyncio.") (license license:asl2.0))) + +(define-public python-aionotify + (package + (name "python-aionotify") + (version "0.2.0") + (source + (origin + ;; Source tarball on PyPi lacks tests + (method git-fetch) + (uri (git-reference + (url "https://github.com/rbarrois/aionotify") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1sk9i8czxgsbrswsf1nlb4c82vgnlzi8zrvrxdip92w2z8hqh43y")))) + (build-system python-build-system) + (native-inputs `(("python-asynctest" ,python-asynctest))) + (home-page "https://github.com/rbarrois/aionotify") + (synopsis "Asyncio-powered inotify library") + (description + "@code{aionotify} is a simple, asyncio-based inotify library.") + (license license:bsd-3))) -- cgit v1.2.3 From e478fd9747c0a97212ec86871c68feb1641961bb Mon Sep 17 00:00:00 2001 From: zimoun Date: Fri, 17 Jan 2020 18:30:00 +0100 Subject: refresh: Fix internal variable name. * guix/scripts/refresh.scm (%option): Fix internal variable name. --- guix/scripts/refresh.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/guix/scripts/refresh.scm b/guix/scripts/refresh.scm index bc8e906054..efada1df5a 100644 --- a/guix/scripts/refresh.scm +++ b/guix/scripts/refresh.scm @@ -120,16 +120,16 @@ (define %options ;; The short option -L is already used by --list-updaters, therefore ;; it needs to be removed from %standard-build-options. - (let ((%load-path-option (find (lambda (option) + (let ((load-path-option (find (lambda (option) (member "load-path" (option-names option))) %standard-build-options))) (option (filter (lambda (name) (not (equal? #\L name))) - (option-names %load-path-option)) - (option-required-arg? %load-path-option) - (option-optional-arg? %load-path-option) - (option-processor %load-path-option))) + (option-names load-path-option)) + (option-required-arg? load-path-option) + (option-optional-arg? load-path-option) + (option-processor load-path-option))) (option '(#\h "help") #f #f (lambda args -- cgit v1.2.3 From 167a0ce0ae4ce0c60d365e14a9d80e02e43463b6 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sat, 18 Jan 2020 15:49:47 +0300 Subject: gnu: Add firefox-decrypt. * gnu/packages/gnuzilla.scm (firefox-decrypt): New variable. --- gnu/packages/gnuzilla.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 0797cb06b8..ae0c58eedb 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2019 Ivan Petkov +;;; Copyright © 2020 Oleg Pykhalov ;;; ;;; This file is part of GNU Guix. ;;; @@ -41,6 +42,7 @@ (define-module (gnu packages gnuzilla) #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (guix build-system cargo) + #:use-module (guix build-system trivial) #:use-module (gnu packages admin) #:use-module (gnu packages audio) #:use-module (gnu packages autotools) @@ -1127,3 +1129,43 @@ (define-public conkeror ;; The Conkeror web browser relied on XULRunner, which IceCat > 50 no longer ;; provides. See for the original web page. (deprecated-package "conkeror" icecat)) + +(define-public firefox-decrypt + (package + (name "firefox-decrypt") + (version "0.7.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Unode/firefox_decrypt.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "17yyyxp47z4m8hnflcq34rc1y871515kr3f1y42j1l0yx3g0il07")))) + (build-system trivial-build-system) + (inputs + `(("nss" ,nss) + ("python" ,python))) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (setenv "PATH" + (string-append + (assoc-ref %build-inputs "python") "/bin")) + (copy-file (string-append (assoc-ref %build-inputs "source") + "/firefox_decrypt.py") + "firefox_decrypt.py") + (substitute* "firefox_decrypt.py" + (("/usr/bin/env python") (which "python3")) + (("libnss3.so") (string-append (assoc-ref %build-inputs "nss") + "/lib/nss/libnss3.so"))) + (install-file "firefox_decrypt.py" (string-append %output "/bin")) + #t))) + (home-page "https://github.com/Unode/firefox_decrypt/") + (synopsis "Tool to extract passwords from Mozilla profiles") + (description "Firefox Decrypt is a tool to extract passwords from +Mozilla (Firefox, Waterfox, Thunderbird, SeaMonkey) profiles.") + (license license:gpl3+))) -- cgit v1.2.3 From 3747ecb1d3e9ddcc87e4e4e64f6f27b7c7dff884 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 18 Jan 2020 11:24:47 -0500 Subject: gnu: supertuxkart: Update to 1.1. * gnu/packages/games.scm (supertuxkart): Update to 1.1. [arguments]: Add "-DUSE_IPV6=FALSE" to #:configure-flags. [inputs]: Add harfbuzz. [home-page]: Follow permanent redirect. --- gnu/packages/games.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 8d29b82da3..fefb3055a8 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2389,7 +2389,7 @@ (define-public extremetuxracer (define-public supertuxkart (package (name "supertuxkart") - (version "1.0") + (version "1.1") (source (origin (method url-fetch) @@ -2397,7 +2397,7 @@ (define-public supertuxkart version "/supertuxkart-" version "-src.tar.xz")) (sha256 (base32 - "106rlp99hq18b4q1kdri3pl06cc4v7iqfp1hp9k2f8751lzz923d")) + "1s0ai07g3sswck9mr0142989mrgzzq1njc1qxk5als5b245jpc79")) (modules '((guix build utils))) (snippet ;; Delete bundled library sources @@ -2405,7 +2405,7 @@ (define-public supertuxkart ;; Supertuxkart uses modified versions of the Irrlicht engine ;; and the bullet library. The developers gave an explanation ;; here: http://forum.freegamedev.net/viewtopic.php?f=17&t=3906 - ;; FIXME: try to unbundle angelscript + ;; FIXME: try to unbundle angelscript and libraqm (for-each delete-file-recursively '("lib/zlib" "lib/libpng" @@ -2423,6 +2423,9 @@ (define-public supertuxkart "-DNO_IRR_COMPILE_WITH_ZLIB_=TRUE" "-DUSE_SYSTEM_GLEW=TRUE" "-DUSE_SYSTEM_ENET=TRUE" + ;; In order to use the system ENet library, IPv6 support (added in + ;; SuperTuxKart version 1.1) must be disabled. + "-DUSE_IPV6=FALSE" ;; FIXME: needs libopenglrecorder "-DBUILD_RECORDER=0" ;; Irrlicht returns an integer instead of a boolean @@ -2434,6 +2437,7 @@ (define-public supertuxkart ("libvorbis" ,libvorbis) ("freetype" ,freetype) ("fribidi" ,fribidi) + ("harfbuzz" ,harfbuzz) ("mesa" ,mesa) ("libx11" ,libx11) ("libxrandr" ,libxrandr) @@ -2445,7 +2449,7 @@ (define-public supertuxkart ("enet" ,enet))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "https://supertuxkart.net/") + (home-page "https://supertuxkart.net/Main_Page") (synopsis "3D kart racing game") (description "SuperTuxKart is a 3D kart racing game, with a focus on having fun over realism. You can play with up to 4 friends on one PC, racing -- cgit v1.2.3 From 2072bc08385a2703ef7beb1227bf8faae678072a Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sat, 18 Jan 2020 18:39:41 +0100 Subject: gnu: Add mariadb-connector-c. * gnu/packages/databases.scm (mariadb-connector-c): New variable. --- gnu/packages/databases.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index be9611a7b2..e90fdfef7c 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -38,6 +38,7 @@ ;;; Copyright © 2019 Gábor Boskovits ;;; Copyright © 2019 Pierre Langlois ;;; Copyright © 2019 Guillaume Le Vaillant +;;; Copyright © 2020 Pierre Neidhardt ;;; ;;; This file is part of GNU Guix. ;;; @@ -940,6 +941,31 @@ (define-public mariadb/fixed-install-db "/share/mysql"))) #t))))))) +(define-public mariadb-connector-c + (package + (name "mariadb-connector-c") + (version "3.1.6") + (source (origin + (method url-fetch) + (uri (string-append + "https://downloads.mariadb.org/f/connector-c-" + version "/mariadb-connector-c-" + version "-src.tar.gz")) + (sha256 + (base32 + "083724f5daaqyzdcx508caz6fk2hs89jff85zg28ih43vxkvnrnj")))) + (inputs + `(("openssl" ,openssl))) + (build-system cmake-build-system) + (arguments + ;; No tests. + '(#:tests? #f)) + (home-page "https://mariadb.com/kb/en/mariadb-connector-c/") + (synopsis "Client library to connect to MySQL or MariaDB") + (description "The MariaDB Connector/C is used to connect applications +developed in C/C++ to MariaDB and MySQL databases.") + (license license:lgpl2.1+))) + ;; Don't forget to update the other postgresql packages when upgrading this one. (define-public postgresql (package -- cgit v1.2.3 From 147367271c2daef0869ed6538fbe9f76a6765af7 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sat, 18 Jan 2020 21:07:30 +0300 Subject: gnu: cmatrix: Update to 2.0. * gnu/packages/games.scm (cmatrix)[version]: Update to 2.0. [source]: Download using git-fetch. [native-inputs]: Add AUTOCONF and AUTOMAKE. --- gnu/packages/games.scm | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index fefb3055a8..dd4e5993c5 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -1631,16 +1631,21 @@ (define-public talkfilters (define-public cmatrix (package (name "cmatrix") - (version "1.2a") + (version "2.0") (source (origin - (method url-fetch) - (uri (string-append "http://www.asty.org/cmatrix/dist/cmatrix-" version - ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/abishekvashok/cmatrix.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0k06fw2n8nzp1pcdynhajp5prba03gfgsbj91bknyjr5xb5fd9hz")))) + "1h9jz4m4s5l8c3figaq46ja0km1gimrkfxm4dg7mf4s84icmasbm")))) (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake))) (arguments '(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 64b47a2900ae62a9106ef2ce837a78db3502132e Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sat, 18 Jan 2020 21:49:27 +0300 Subject: gnu: Add shlomif-cmake-modules. * gnu/packages/games.scm (shlomif-cmake-modules): New variable. (fortune-mod)[native-inputs]: Take "cmake-rules" to a separate variable. --- gnu/packages/games.scm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index dd4e5993c5..bc5f14039e 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -5920,6 +5920,14 @@ (define-public crispy-doom original.") (home-page "https://www.chocolate-doom.org/wiki/index.php/Crispy_Doom"))) +(define shlomif-cmake-modules + (origin + (method url-fetch) + (uri (string-append "https://bitbucket.org/shlomif/shlomif-cmake-modules/" + "raw/c505713d7a7cda608f97f01577e5868a711b883e/" + "shlomif-cmake-modules/Shlomif_Common.cmake")) + (sha256 + (base32 "0kx9s1qqhhzprp1w3b67xmsns0n0v506bg5hgrshxaxpy6lqiwb2")))) (define-public fortune-mod (package (name "fortune-mod") @@ -5972,14 +5980,7 @@ (define-public fortune-mod ("perl-class-xsaccessor" ,perl-class-xsaccessor) ("perl-io-all" ,perl-io-all) ("perl-test-runvalgrind" ,perl-test-runvalgrind) - ("cmake-rules" - ,(origin - (method url-fetch) - (uri (string-append "https://bitbucket.org/shlomif/shlomif-cmake-modules/" - "raw/c505713d7a7cda608f97f01577e5868a711b883e/" - "shlomif-cmake-modules/Shlomif_Common.cmake")) - (sha256 - (base32 "0kx9s1qqhhzprp1w3b67xmsns0n0v506bg5hgrshxaxpy6lqiwb2")))))) + ("cmake-rules" ,shlomif-cmake-modules))) (home-page "http://www.shlomifish.org/open-source/projects/fortune-mod/") (synopsis "The Fortune Cookie program from BSD games") (description "Fortune is a command-line utility which displays a random -- cgit v1.2.3 From c5799025e48d88a0688355f2a9838b8a807884d7 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sat, 18 Jan 2020 21:50:21 +0300 Subject: gnu: Add rinutils. * gnu/packages/games.scm (rinutils): New variable. --- gnu/packages/games.scm | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index bc5f14039e..2f9b3b5c71 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -5928,6 +5928,67 @@ (define shlomif-cmake-modules "shlomif-cmake-modules/Shlomif_Common.cmake")) (sha256 (base32 "0kx9s1qqhhzprp1w3b67xmsns0n0v506bg5hgrshxaxpy6lqiwb2")))) + +(define-public rinutils + (package + (name "rinutils") + (version "0.2.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/shlomif/rinutils.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1fpxyg86ggv0h7j8aarjjxrvwlj7jycd3bw066c0dwkq2fszxsf2")))) + (native-inputs + `(("perl" ,perl) + ;; The following is only needed for tests. + ("perl-file-find-object" ,perl-file-find-object) + ("perl-test-differences" ,perl-test-differences) + ("perl-class-xsaccessor" ,perl-class-xsaccessor) + ("perl-io-all" ,perl-io-all) + ("perl-test-runvalgrind" ,perl-test-runvalgrind) + ("cmake-rules" ,shlomif-cmake-modules) + ("pkg-config" ,pkg-config))) + (inputs + `(("cmocka" ,cmocka) + ("perl-env-path", perl-env-path) + ("perl-inline" ,perl-inline) + ("perl-inline-c" ,perl-inline-c) + ("perl-string-shellquote" ,perl-string-shellquote) + ("perl-test-trailingspace" ,perl-test-trailingspace) + ("perl-file-find-object-rule" ,perl-file-find-object-rule) + ("perl-text-glob" ,perl-text-glob) + ("perl-number-compare" ,perl-number-compare) + ("perl-moo" ,perl-moo))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-build-env + (lambda* (#:key inputs #:allow-other-keys) + (use-modules (guix build utils)) + (let* ((cmake-rules (assoc-ref inputs "cmake-rules"))) + (copy-file cmake-rules + (string-append "cmake/" + (strip-store-file-name cmake-rules))) + #t))) + (replace 'check + (lambda _ + (with-directory-excursion "../source" + (setenv "FCS_TEST_BUILD" "1") + (setenv "RINUTILS_TEST_BUILD" "1") + ;; TODO: Run tests after setting RINUTILS_TEST_TIDY to `1', + ;; which requires tidy-all. + ;; (setenv "RINUTILS_TEST_TIDY" "1") + (invoke "perl" "CI-testing/continuous-integration-testing.pl"))))))) + (build-system cmake-build-system) + (home-page "https://www.shlomifish.org/open-source/projects/") + (synopsis "C11 / gnu11 utilities C library") + (description "This package provides C11 / gnu11 utilities C library") + (license license:expat))) + (define-public fortune-mod (package (name "fortune-mod") -- cgit v1.2.3 From 815e12f395217e14607d3054ac0ed290612e1c1f Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sat, 18 Jan 2020 21:21:38 +0300 Subject: gnu: fortune-mod: Update to 2.12.0. * gnu/packages/games.scm (fortune-mod): Update to 2.12.0. [native-inputs]: Add RINUTILS. --- gnu/packages/games.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 2f9b3b5c71..234dad8202 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -5992,7 +5992,7 @@ (define-public rinutils (define-public fortune-mod (package (name "fortune-mod") - (version "2.6.2") + (version "2.12.0") (source (origin (method git-fetch) @@ -6002,7 +6002,7 @@ (define-public fortune-mod (file-name (git-file-name name version)) (sha256 (base32 - "11xff87s8ifw2dqs90n0rjq0psv4i7ykybygmibsqjj7id3xxw4c")))) + "0laxgqsdg7kvpvvm1f54b94ga9r0cr9g3ffii8avg8fy65x6pzc9")))) (build-system cmake-build-system) (arguments `(#:test-target "check" @@ -6041,7 +6041,8 @@ (define-public fortune-mod ("perl-class-xsaccessor" ,perl-class-xsaccessor) ("perl-io-all" ,perl-io-all) ("perl-test-runvalgrind" ,perl-test-runvalgrind) - ("cmake-rules" ,shlomif-cmake-modules))) + ("cmake-rules" ,shlomif-cmake-modules) + ("rinutils" ,rinutils))) (home-page "http://www.shlomifish.org/open-source/projects/fortune-mod/") (synopsis "The Fortune Cookie program from BSD games") (description "Fortune is a command-line utility which displays a random -- cgit v1.2.3 From 81e3ba033feee78174da4499b3be0565f879f7b9 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Sat, 18 Jan 2020 14:01:19 -0600 Subject: gnu: python-language-server: Update to 0.31.6. * gnu/packages/python-xyz.scm (python-language-server): Update to 0.31.6. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 2bef867630..f1b0f991c6 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3052,14 +3052,14 @@ (define-public python-pydocstyle (define-public python-language-server (package (name "python-language-server") - (version "0.31.4") + (version "0.31.6") (source (origin (method url-fetch) (uri (pypi-uri "python-language-server" version)) (sha256 (base32 - "1nrs56jpx7dvghaas0kc5k9lxas5vr3awj3k87p4akki43nsblb8")))) + "0cqrffd5272p2hifa35rf1h1g6dss741jmjkwa43jninifmbz0df")))) (build-system python-build-system) (propagated-inputs `(("python-pluggy" ,python-pluggy) -- cgit v1.2.3 From 4f620bbf620e0848b1b29874e04bc6a4d6eee4f8 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 18 Jan 2020 23:58:06 +0100 Subject: gnu: qview: Update to 3.0. * gnu/packages/image-viewers.scm (qview): Update to 3.0. --- gnu/packages/image-viewers.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 935cecd93c..85d3a153e7 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -461,16 +461,16 @@ (define-public mcomix (define-public qview (package (name "qview") - (version "2.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/jurplel/qView.git") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1s29hz44rb5dwzq8d4i4bfg77dr0v3ywpvidpa6xzg7hnnv3mhi5")))) + (version "3.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jurplel/qView.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "15a91bs3wcqhgf76wzigbn10hayg628j84pq4j2vaxar94ak0vk7")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From c2c73f583d401a84e94a1e1e5b61da9c41f15683 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 12:52:51 +0100 Subject: Use HTTPS for www.emacswiki.org. * doc/contributing.texi (The Perfect Setup): Use HTTPS for ParEdit wiki page. * gnu/packages/emacs-xyz.scm (emacs-wget, emacs-iedit)[home-page]: Use HTTPS. (emacs-transpose-frame)[source]: Likewise. --- doc/contributing.texi | 2 +- gnu/packages/emacs-xyz.scm | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/contributing.texi b/doc/contributing.texi index 5d5d50c3c0..c6586a2adf 100644 --- a/doc/contributing.texi +++ b/doc/contributing.texi @@ -240,7 +240,7 @@ that it finds source files from your checkout: To actually edit the code, Emacs already has a neat Scheme mode. But in addition to that, you must not miss -@url{http://www.emacswiki.org/emacs/ParEdit, Paredit}. It provides +@url{https://www.emacswiki.org/emacs/ParEdit, Paredit}. It provides facilities to directly operate on the syntax tree, such as raising an s-expression or wrapping it, swallowing or rejecting the following s-expression, etc. diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 32e8ae17da..34ea293ac6 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1243,7 +1243,7 @@ (define-public emacs-wget "wget" (string-append (assoc-ref outputs "out") "/share/emacs/site-lisp/")) #t))))) - (home-page "http://www.emacswiki.org/emacs/EmacsWget") + (home-page "https://www.emacswiki.org/emacs/EmacsWget") (synopsis "Simple file downloader for Emacs based on wget") (description "Emacs-wget is an emacs interface for the wget file downloader.") @@ -5669,7 +5669,7 @@ (define-public emacs-iedit (sha256 (base32 "0wr3w2id95wx2rma8n1ifjrv9rx37ly26ijc5zi58id0yrip3hnc")))) (build-system emacs-build-system) - (home-page "http://www.emacswiki.org/emacs/Iedit") + (home-page "https://www.emacswiki.org/emacs/Iedit") (synopsis "Edit multiple regions in the same way simultaneously") (description "This package is an Emacs minor mode and allows you to edit one @@ -9782,7 +9782,7 @@ (define-public emacs-transpose-frame (source (origin (method url-fetch) - (uri "http://www.emacswiki.org/emacs/download/transpose-frame.el") + (uri "https://www.emacswiki.org/emacs/download/transpose-frame.el") (file-name (string-append "transpose-frame-" version ".el")) (sha256 (base32 -- cgit v1.2.3 From e6711212505f5426a6f5707445b04a14e17e55ee Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 12:38:35 +0100 Subject: gnu: Use HTTPS for docbook.org. * gnu/packages/docbook.scm (docbook-xml)[home-page, source]: Use HTTPS. (docbook-xml-4.4, docbook-xml-4.3, docbook-xml-4.2, docbook-xml-4.1.2) [source]: Likewise. (docbook-xsl)[home-page]: Likewise. --- gnu/packages/docbook.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index d114e24ee7..098c2b4dfb 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -40,7 +40,7 @@ (define-public docbook-xml (version "4.5") (source (origin (method url-fetch) - (uri (string-append "http://www.docbook.org/xml/" version + (uri (string-append "https://www.docbook.org/xml/" version "/docbook-xml-" version ".zip")) (sha256 (base32 @@ -66,7 +66,7 @@ (define-public docbook-xml #t)) #:modules ((guix build utils)))) (native-inputs `(("unzip" ,unzip))) - (home-page "http://docbook.org") + (home-page "https://docbook.org") (synopsis "DocBook XML DTDs for document authoring") (description "DocBook is general purpose XML and SGML document type particularly well @@ -79,7 +79,7 @@ (define-public docbook-xml-4.4 (version "4.4") (source (origin (method url-fetch) - (uri (string-append "http://www.docbook.org/xml/" version + (uri (string-append "https://www.docbook.org/xml/" version "/docbook-xml-" version ".zip")) (sha256 (base32 @@ -90,7 +90,7 @@ (define-public docbook-xml-4.3 (version "4.3") (source (origin (method url-fetch) - (uri (string-append "http://www.docbook.org/xml/" version + (uri (string-append "https://www.docbook.org/xml/" version "/docbook-xml-" version ".zip")) (sha256 (base32 @@ -101,7 +101,7 @@ (define-public docbook-xml-4.2 (version "4.2") (source (origin (method url-fetch) - (uri (string-append "http://www.docbook.org/xml/" version + (uri (string-append "https://www.docbook.org/xml/" version "/docbook-xml-" version ".zip")) (sha256 (base32 @@ -112,7 +112,7 @@ (define-public docbook-xml-4.1.2 (version "4.1.2") (source (origin (method url-fetch) - (uri (string-append "http://www.docbook.org/xml/" version + (uri (string-append "https://www.docbook.org/xml/" version "/docbkx412.zip")) (sha256 (base32 @@ -174,7 +174,7 @@ (define-public docbook-xsl (native-inputs `(("bzip2" ,bzip2) ("xz" ,xz) ;needed for repacked tarballs ("tar" ,tar))) - (home-page "http://docbook.org") + (home-page "https://docbook.org") (synopsis "DocBook XSL style sheets for document authoring") (description "This package provides XSL style sheets for DocBook.") -- cgit v1.2.3 From f460f8da68f915dee5aa3ce97e05ba38c92f3106 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 18:25:04 +0100 Subject: gnu: Use HTTPS for avahi.org everywhere. * gnu/packages/avahi.scm (avahi)[home-page]: Use HTTPS. * gnu/services/avahi.scm (avahi-service): Likewise in docstring. --- gnu/packages/avahi.scm | 2 +- gnu/services/avahi.scm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/avahi.scm b/gnu/packages/avahi.scm index e84fed6a71..ba609cf12e 100644 --- a/gnu/packages/avahi.scm +++ b/gnu/packages/avahi.scm @@ -36,7 +36,7 @@ (define-public avahi (name "avahi") (version "0.7") (replacement avahi/fixed) - (home-page "http://avahi.org") + (home-page "https://avahi.org") (source (origin (method url-fetch) (uri (string-append home-page "/download/avahi-" diff --git a/gnu/services/avahi.scm b/gnu/services/avahi.scm index 547d826551..54656708ca 100644 --- a/gnu/services/avahi.scm +++ b/gnu/services/avahi.scm @@ -175,7 +175,7 @@ (define-deprecated (avahi-service #:key (avahi avahi) debug? avahi-service-type "Return a service that runs @command{avahi-daemon}, a system-wide mDNS/DNS-SD responder that allows for service discovery and -\"zero-configuration\" host name lookups (see @uref{http://avahi.org/}), and +\"zero-configuration\" host name lookups (see @uref{https://avahi.org/}), and extends the name service cache daemon (nscd) so that it can resolve @code{.local} host names using @uref{http://0pointer.de/lennart/projects/nss-mdns/, nss-mdns}. Additionally, -- cgit v1.2.3 From 523745064f948dcbc17205abd6029aade9db5157 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 01:52:45 +0100 Subject: gnu: Use HTTPS for all r-lib.org subdomains. * gnu/packages/cran.scm (r-ps, r-fs)[home-page]: Use HTTPS. --- 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 34d187a02a..62a388c534 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1623,7 +1623,7 @@ (define-public r-ps (sha256 (base32 "1lcq7r0q4jb8x6k023zr2ydj2dg925bqqbkhx1phpnyjrk897498")))) (build-system r-build-system) - (home-page "http://ps.r-lib.org") + (home-page "https://ps.r-lib.org") (synopsis "List, query, and manipulate system processes") (description "The ps package implements an API to list, query, and manipulate system @@ -8695,7 +8695,7 @@ (define-public r-fs `(("r-rcpp" ,r-rcpp))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://fs.r-lib.org") + (home-page "https://fs.r-lib.org") (synopsis "Cross-platform file system operations based on libuv") (description "This package provides a cross-platform interface to file system -- cgit v1.2.3 From a0e82f85e0d5f99e0bd2d205a072346c3739483e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 03:55:31 +0100 Subject: gnu: Use HTTPS for elpa.gnu.org. * gnu/packages/emacs-xyz.scm (emacs-xr, emacs-orgalist, emacs-websocket) (emacs-oauth2, emacs-ediprolog)[home-page]: Use HTTPS. (emacs-ggtags, emacs-rudel, emacs-on-screen)[source]: Likewise. (emacs-adaptive-wrap, emacs-seq, emacs-sml-mode)[source, home-page]: Likewise. --- gnu/packages/emacs-xyz.scm | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 34ea293ac6..583faa6372 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -969,7 +969,7 @@ (define-public emacs-xr (base32 "1km4x92pii8c4bcimks4xzhmwpypdf183z0zh7raj062jz4jb74r")))) (build-system emacs-build-system) - (home-page "http://elpa.gnu.org/packages/xr.html") + (home-page "https://elpa.gnu.org/packages/xr.html") (synopsis "Convert string regexp to rx notation") (description "This is an inverse companion to the @code{rx} package for translating @@ -1787,7 +1787,7 @@ (define-public emacs-ggtags (source (origin (method url-fetch) - (uri (string-append "http://elpa.gnu.org/packages/ggtags-" + (uri (string-append "https://elpa.gnu.org/packages/ggtags-" version ".el")) (sha256 (base32 @@ -5382,7 +5382,7 @@ (define-public emacs-rudel (source (origin (method url-fetch) - (uri (string-append "http://elpa.gnu.org/packages/rudel-" + (uri (string-append "https://elpa.gnu.org/packages/rudel-" version ".tar")) (sha256 (base32 @@ -7998,7 +7998,7 @@ (define-public emacs-orgalist (base32 "0zbqkk540rax32s8szp5zgz3a02zw88fc1dmjmyw6h3ls04m91kl")))) (build-system emacs-build-system) - (home-page "http://elpa.gnu.org/packages/orgalist.html") + (home-page "https://elpa.gnu.org/packages/orgalist.html") (synopsis "Manage Org-like lists in non-Org buffers") (description "Write Org mode's plain lists in non-Org buffers. More specifically, Orgalist supports the syntax of Org mode for numbered, @@ -9018,13 +9018,13 @@ (define-public emacs-adaptive-wrap (source (origin (method url-fetch) (uri (string-append - "http://elpa.gnu.org/packages/adaptive-wrap-" + "https://elpa.gnu.org/packages/adaptive-wrap-" version ".el")) (sha256 (base32 "0qi7gjprcpywk2daivnlavwsx53hl5wcqvpxbwinvigg42vxh3ll")))) (build-system emacs-build-system) - (home-page "http://elpa.gnu.org/packages/adaptive-wrap.html") + (home-page "https://elpa.gnu.org/packages/adaptive-wrap.html") (synopsis "Smart line-wrapping with wrap-prefix") (description "This Emacs package provides the @code{adaptive-wrap-prefix-mode} @@ -10854,7 +10854,7 @@ (define-public emacs-websocket #:test-command '("emacs" "--batch" "-l" "websocket-test.el" "-f" "ert-run-tests-batch-and-exit"))) - (home-page "http://elpa.gnu.org/packages/websocket.html") + (home-page "https://elpa.gnu.org/packages/websocket.html") (synopsis "Emacs WebSocket client and server") (description "This is an Elisp library for WebSocket clients to talk to WebSocket servers, and for WebSocket servers to accept connections from @@ -10876,7 +10876,7 @@ (define-public emacs-oauth2 (base32 "0ydkc9jazsnbbvfhd47mql52y7k06n3z7r0naqxkwb99j9blqsmp")))) (build-system emacs-build-system) - (home-page "http://elpa.gnu.org/packages/oauth2.html") + (home-page "https://elpa.gnu.org/packages/oauth2.html") (synopsis "OAuth 2.0 authorization protocol implementation") (description "This package provides an Elisp implementation of the OAuth 2.0 draft. @@ -13004,12 +13004,12 @@ (define-public emacs-seq (source (origin (method url-fetch) - (uri (string-append "http://elpa.gnu.org/packages/seq-" version ".tar")) + (uri (string-append "https://elpa.gnu.org/packages/seq-" version ".tar")) (sha256 (base32 "0vrpx6nnyjb0gsypknzagimlhvcvi5y1rcdkpxyqr42415zr8d0n")))) (build-system emacs-build-system) - (home-page "http://elpa.gnu.org/packages/seq.html") + (home-page "https://elpa.gnu.org/packages/seq.html") (synopsis "Sequence manipulation functions") (description "Sequence-manipulation functions that complement basic functions provided by @file{subr.el}.") @@ -14574,7 +14574,7 @@ (define-public emacs-on-screen (origin (method url-fetch) (uri (string-append - "http://elpa.gnu.org/packages/on-screen-" version ".el")) + "https://elpa.gnu.org/packages/on-screen-" version ".el")) (file-name (string-append name "-" version ".el")) (sha256 (base32 "0ga4hw23ki583li2z2hr7l6hk1nc2kdg4afndg06cm9jn158wza7")))) @@ -14677,12 +14677,12 @@ (define-public emacs-sml-mode (source (origin (method url-fetch) - (uri (string-append "http://elpa.gnu.org/packages/sml-mode-" + (uri (string-append "https://elpa.gnu.org/packages/sml-mode-" version ".el")) (sha256 (base32 "1bdg9ywpvj85hxqah9w1raxlcrhkyx67nw22jwd1bd5j0fhmgqij")))) (build-system emacs-build-system) - (home-page "http://elpa.gnu.org/packages/sml-mode.html") + (home-page "https://elpa.gnu.org/packages/sml-mode.html") (synopsis "Major mode for editing (Standard) ML") (description "SML-MODE is a major Emacs mode for editing Standard ML. It provides syntax highlighting and automatic indentation and @@ -19395,7 +19395,7 @@ (define-public emacs-ediprolog (base32 "039ffvp7c810mjyargmgw1i87g0z8qs8qicq826sd9aiz9hprfaz")))) (build-system emacs-build-system) - (home-page "http://elpa.gnu.org/packages/ediprolog.html") + (home-page "https://elpa.gnu.org/packages/ediprolog.html") (synopsis "Emacs Does Interactive Prolog") (description "This package provides a major mode that let the user interact with SWI-Prolog in all buffers. For instance, one can consult Prolog -- cgit v1.2.3 From f1fa954a7daa500c60172d524e35b8cf53eb398e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 12:40:25 +0100 Subject: gnu: edirect: Use HTTPS home page. * gnu/packages/bioinformatics.scm (edirect)[home-page]: Use HTTPS. --- gnu/packages/bioinformatics.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 381c9dfe11..4a84273dd2 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -2796,7 +2796,7 @@ (define-public edirect ("perl-www-robotrules" ,perl-www-robotrules) ("perl-xml-simple" ,perl-xml-simple) ("perl" ,perl))) - (home-page "http://www.ncbi.nlm.nih.gov/books/NBK179288/") + (home-page "https://www.ncbi.nlm.nih.gov/books/NBK179288/") (synopsis "Tools for accessing the NCBI's set of databases") (description "Entrez Direct (EDirect) is a method for accessing the National Center -- cgit v1.2.3 From f433b6625e6ba245c01eeb8242db48a4c2f17d1a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 12:46:03 +0100 Subject: gnu: turn: Use HTTPS home page. * gnu/packages/ruby.scm (turn)[home-page]: Use HTTPS. --- gnu/packages/ruby.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index fa913beab4..c5c4d8672d 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5968,7 +5968,7 @@ (define-public ruby-turn colorful and informative. TURN displays each test on a separate line with failures being displayed immediately instead of at the end of the tests. Note that TURN is no longer being maintained.") - (home-page "http://rubygems.org/gems/turn") + (home-page "https://rubygems.org/gems/turn") (license license:expat))) (define-public ruby-mimemagic -- cgit v1.2.3 From 2299d83e2fdfb7c4394f0da536ced1da7df52b55 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 12:47:01 +0100 Subject: gnu: petsc: Use HTTPS home page. * gnu/packages/maths.scm (petsc)[home-page, license]: Use HTTPS. --- 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 bc03938621..85ceea1889 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1921,13 +1921,13 @@ (define-public petsc (copy-recursively exdir exdir') (delete-file-recursively exdir) #t)))))) - (home-page "http://www.mcs.anl.gov/petsc") + (home-page "https://www.mcs.anl.gov/petsc") (synopsis "Library to solve PDEs") (description "PETSc, pronounced PET-see (the S is silent), is a suite of data structures and routines for the scalable (parallel) solution of scientific applications modeled by partial differential equations.") (license (license:non-copyleft - "http://www.mcs.anl.gov/petsc/documentation/copyright.html")))) + "https://www.mcs.anl.gov/petsc/documentation/copyright.html")))) (define-public petsc-complex (package (inherit petsc) -- cgit v1.2.3 From ff289fe288765680b5ac489e95b9ae840f23b513 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 04:54:53 +0100 Subject: gnu: liblcf, easyrpg: Update to 0.6.1. * gnu/packages/easyrpg.scm (liblcf, easyrpg): Update to 0.6.1. --- gnu/packages/easyrpg.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/easyrpg.scm b/gnu/packages/easyrpg.scm index 046b9dfb92..05cdc42449 100644 --- a/gnu/packages/easyrpg.scm +++ b/gnu/packages/easyrpg.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Sou Bunnbu -;;; Copyright © 2019 Tobias Geerinckx-Rice +;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -39,7 +39,7 @@ (define-module (gnu packages easyrpg) (define-public liblcf (package (name "liblcf") - (version "0.6.0") + (version "0.6.1") (source (origin (method url-fetch) (uri (string-append @@ -47,7 +47,7 @@ (define-public liblcf "/liblcf-" version ".tar.gz")) (sha256 (base32 - "0dcw9l800314f5c29mqrcg64rkcb6cwqjfnpvwsmvc2l2q5hwlag")))) + "1qz387r4shbx48r3z7k8llkzz4b039zmak98wxpiwn6a23cssdn5")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) @@ -75,7 +75,7 @@ (define-public liblcf (define-public easyrpg-player (package (name "easyrpg-player") - (version "0.6.0") + (version "0.6.1") (source (origin (method url-fetch) (uri (string-append @@ -83,7 +83,7 @@ (define-public easyrpg-player "/easyrpg-player-" version ".tar.gz")) (sha256 (base32 - "0zdzp64sshjdl943jklsvzwzzja1fnapslvbd7xss51ym9ra4r6k")))) + "1x81d1952w6vb939155bvs5p3shgsncxy305770izpp4pva1a8z0")))) (build-system gnu-build-system) (arguments '(#:configure-flags -- cgit v1.2.3 From 17cb06a68f6e6c4ff8be1134d0f8125c04ab6f0d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 05:40:00 +0100 Subject: gnu: crispy-doom: Update to 5.6.4. * gnu/packages/games.scm (crispy-doom): Update to 5.6.4. --- 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 234dad8202..361d0a6a81 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -5890,7 +5890,7 @@ (define-public crispy-doom (package (inherit chocolate-doom) (name "crispy-doom") - (version "5.6.3") + (version "5.6.4") (source (origin (method git-fetch) (uri (git-reference @@ -5898,7 +5898,7 @@ (define-public crispy-doom (commit (string-append "crispy-doom-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0f319979wqfgm4pvsa6y5clg30p55l441kmrr8db0p5smyv3x2s4")))) + (base32 "1ls4v2kpb7vi7xji5yqbmyc5lfkz497h1vvj9w86wkrw8k59hlg2")))) (native-inputs (append (package-native-inputs chocolate-doom) @@ -5908,7 +5908,7 @@ (define-public crispy-doom `(#:phases (modify-phases %standard-phases (replace 'bootstrap - ;; the autogen.sh script in the source tree doesn't work + ;; The bundled autogen.sh script unconditionally runs ./configure. (lambda _ (invoke "autoreconf" "-vif")))))) (synopsis "Limit-removing enhanced-resolution Doom source port based on Chocolate Doom") -- cgit v1.2.3 From 106c6aa55009527920b3a2a3ab46b616ff6be454 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 05:40:10 +0100 Subject: gnu: golly: Update to 3.3. * gnu/packages/games.scm (golly): Update to 3.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 361d0a6a81..0fa6a123d3 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -710,7 +710,7 @@ (define-public freedroidrpg (define-public golly (package (name "golly") - (version "3.2") + (version "3.3") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/golly/golly/golly-" @@ -718,7 +718,7 @@ (define-public golly "-src.tar.gz")) (sha256 (base32 - "0cg9mbwmf4q6qxhqlnzrxh9y047banxdb8pd3hgj3smmja2zf0jd")))) + "1j3ksnar4rdam4xiyspgyrs1pifbvxfxkrn65brkwxpx39mpgzc8")))) (build-system gnu-build-system) (arguments '(#:make-flags (list "CC=gcc" -- cgit v1.2.3 From 2d4b248857f2758f545a1399969f372d1b717f55 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 05:45:03 +0100 Subject: gnu: scummvm: Update to 2.1.1. * gnu/packages/emulators.scm (scummvm): Update to 2.1.1. --- gnu/packages/emulators.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index ffcdc65265..20648374d0 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2016 Manolis Fragkiskos Ragkousis ;;; Copyright © 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2017, 2018, 2019 Nicolas Goaziou -;;; Copyright © 2017 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2017, 2018, 2019 Rutger Helling ;;; Copyright © 2019 Pierre Neidhardt ;;; Copyright © 2019 David Wilson @@ -1194,15 +1194,14 @@ (define-public retroarch (define-public scummvm (package (name "scummvm") - (version "2.1.0") + (version "2.1.1") (source (origin (method url-fetch) (uri (string-append "http://www.scummvm.org/frs/scummvm/" version "/scummvm-" version ".tar.xz")) (sha256 - (base32 - "09zp2mxmida6sz5vrr5bzyv8c3yjvq2xqmpmcllbadhmd9cwcl3b")))) + (base32 "1a6waf1ybp91nwva8g650cljlfb1di4l0jv13vg6yfgkas9pclsp")))) (build-system gnu-build-system) (arguments `(#:tests? #f ;require "git" @@ -1213,7 +1212,7 @@ (define-public scummvm ;; XXX: The following works around a build failure introduced when ;; Fluidsynth was updated to version 2.1. It has been applied ;; upstream as 68758a879e0c8ecc0d40962516d4e808aa4e15e5 and can be - ;; removed once ScummVM 2.1.1+ is out. + ;; removed once this commit makes it into a release. (lambda _ (substitute* "audio/softsynth/fluidsynth.cpp" (("#include ") "") -- cgit v1.2.3 From a6b937b329570e3b6a4bd64adbca3b4e7c7cc988 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 19 Jan 2020 09:30:34 +0200 Subject: gnu: hidapi: Declare a source file-name. * gnu/packages/libusb.scm (hidapi)[source]: Add file-name field. --- gnu/packages/libusb.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm index 629bcf5fe5..abf11400e3 100644 --- a/gnu/packages/libusb.scm +++ b/gnu/packages/libusb.scm @@ -532,6 +532,7 @@ (define-public hidapi (uri (git-reference (url "https://github.com/libusb/hidapi.git") (commit (string-append "hidapi-" version)))) + (file-name (git-file-name name version)) (sha256 (base32 "1p4g8lgwj4rki6lbn5l6rvwj0xlbn1xfh4d255bg5pvgczmwmc4i")))) (build-system gnu-build-system) -- cgit v1.2.3 From 9cd3282162802392b2f6c5d8f9037a2b87b3b569 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 19 Jan 2020 09:31:30 +0200 Subject: gnu: noweb: Declare a source file-name. * gnu/packages/noweb.scm (noweb)[source]: Add file-name field. --- gnu/packages/noweb.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/noweb.scm b/gnu/packages/noweb.scm index 77e88cc5d2..7d8d402b94 100644 --- a/gnu/packages/noweb.scm +++ b/gnu/packages/noweb.scm @@ -35,6 +35,7 @@ (define-public noweb (url "https://github.com/nrnrnr/noweb") (commit (string-append "v" (string-join (string-split version #\.) "_"))))) + (file-name (git-file-name name version)) (sha256 (base32 "1160i2ghgzqvnb44kgwd6s3p4jnk9668rmc15jlcwl7pdf3xqm95")))) (build-system gnu-build-system) -- cgit v1.2.3 From f7e3e8c82e72136720614ffda98a0249f699fad7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Jan 2020 10:35:10 +0100 Subject: gnu: nss, nss-certs: Update to 3.49.1. * gnu/packages/certs.scm (nss-certs): Update to 3.49.1. * gnu/packages/nss.scm (nss): Likewise. --- gnu/packages/certs.scm | 4 ++-- gnu/packages/nss.scm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/certs.scm b/gnu/packages/certs.scm index 1736d20c7e..864fe5def1 100644 --- a/gnu/packages/certs.scm +++ b/gnu/packages/certs.scm @@ -76,7 +76,7 @@ (define certdata2pem (define-public nss-certs (package (name "nss-certs") - (version "3.49") + (version "3.49.1") (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -87,7 +87,7 @@ (define-public nss-certs "nss-" version ".tar.gz"))) (sha256 (base32 - "07g7pn0r29y2h5p2zibz273yhkx6k4wvy8m1308hcqzxqi6hjf37")))) + "0vh23g16ldvnsrn2dnvdl2i133kizi660r7ilb00vfq2kvj45anr")))) (build-system gnu-build-system) (outputs '("out")) (native-inputs diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index 2df4af9d50..294891734d 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -70,7 +70,7 @@ (define-public nspr (define-public nss (package (name "nss") - (version "3.49") + (version "3.49.1") (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -81,7 +81,7 @@ (define-public nss "nss-" version ".tar.gz"))) (sha256 (base32 - "07g7pn0r29y2h5p2zibz273yhkx6k4wvy8m1308hcqzxqi6hjf37")) + "0vh23g16ldvnsrn2dnvdl2i133kizi660r7ilb00vfq2kvj45anr")) ;; Create nss.pc and nss-config. (patches (search-patches "nss-pkgconfig.patch" "nss-freebl-stubs.patch" -- cgit v1.2.3 From 11fbe0c3c38ceb75afb6b263f38688f20120ae20 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Jan 2020 10:35:52 +0100 Subject: gnu: cups: Update to 2.3.1. * gnu/packages/cups.scm (cups-minimal): Update to 2.3.1. --- gnu/packages/cups.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 0adca9addb..b71f448785 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -187,7 +187,7 @@ (define-public cups-filters (define-public cups-minimal (package (name "cups-minimal") - (version "2.3.0") + (version "2.3.1") (source (origin (method url-fetch) @@ -195,7 +195,7 @@ (define-public cups-minimal version "/cups-" version "-source.tar.gz")) (sha256 (base32 - "19d1jpdpxy0fclq37pchi7ldnw9dssxx3zskcgqai3h0rwlh5bxc")))) + "1kkpmj17205j8w9hdff2bfpk6lwdmr3gx0j4r35nhgvya24rvjhv")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From dfe3b39d1eaeabbff04461025c684ebc67757177 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Jan 2020 10:36:17 +0100 Subject: gnu: cups-filters: Update to 1.26.2. * gnu/packages/cups.scm (cups-filters): Update to 1.26.2. --- gnu/packages/cups.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index b71f448785..8fbb2ee4f6 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -58,7 +58,7 @@ (define-module (gnu packages cups) (define-public cups-filters (package (name "cups-filters") - (version "1.25.13") + (version "1.26.2") (source(origin (method url-fetch) (uri @@ -66,7 +66,7 @@ (define-public cups-filters "cups-filters-" version ".tar.xz")) (sha256 (base32 - "1z3b7p6pp6yzvzl2nip9q0gn4fr5k9qwpnnhqqkiaaf3b1nfswjj")) + "1a8x6zgw3m4717gw3842gsrgjl05q92xygy4rp5vwr1d1xjmyxp1")) (modules '((guix build utils))) (snippet ;; install backends, banners and filters to cups-filters output -- cgit v1.2.3 From ca69163cc5aac9ff15a358449ed229631434a4fa Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Jan 2020 10:36:55 +0100 Subject: gnu: MariaDB: Remove workaround package. * gnu/packages/databases.scm (mariadb)[arguments]: Add substitution for the 'mysql_install_db' script. (mariadb/fixed-install-db): Remove variable. (libdbi-drivers)[native-inputs]: Change from MARIADB/FIXED-INSTALL-DB to MARIADB. --- gnu/packages/databases.scm | 34 ++++++---------------------------- 1 file changed, 6 insertions(+), 28 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index ca15c77026..283c8920d9 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -879,6 +879,11 @@ (define-public mariadb (rename-file (string-append out "/bin/mysql_config") (string-append dev "/bin/mysql_config")) + + (substitute* (string-append out "/bin/mysql_install_db") + (("\\$basedir/share/mysql") + (string-append lib "/share/mysql"))) + ;; Embed an absolute reference to OpenSSL in mysql_config ;; and the pkg-config file to avoid propagation. (substitute* (list (string-append dev "/bin/mysql_config") @@ -914,33 +919,6 @@ (define-public mariadb as a drop-in replacement of MySQL.") (license license:gpl2))) -;; TODO: mysql_install_db is broken in MariaDB. This package is here as -;; a workaround for packages that need it. Merge with 'mariadb' in the next -;; rebuild cycle. -(define-public mariadb/fixed-install-db - (hidden-package - (package/inherit - mariadb - (name "mariadb-fixed") - (native-inputs '()) - (inputs - `(("mariadb" ,mariadb) - ("mariadb:lib" ,mariadb "lib"))) - (outputs '("out")) - (build-system trivial-build-system) - (arguments - `(#:modules ((guix build utils)) - #:builder - (begin - (use-modules ((guix build utils))) - (let ((out (assoc-ref %outputs "out"))) - (copy-recursively (assoc-ref %build-inputs "mariadb") out) - (substitute* (string-append out "/bin/mysql_install_db") - (("\\$basedir/share/mysql") - (string-append (assoc-ref %build-inputs "mariadb:lib") - "/share/mysql"))) - #t))))))) - ;; Don't forget to update the other postgresql packages when upgrading this one. (define-public postgresql (package @@ -3278,7 +3256,7 @@ (define-public libdbi-drivers `(;; For tests. ("inetutils" ,inetutils) ("glibc-locales" ,glibc-locales) - ("mariadb" ,mariadb/fixed-install-db))) + ("mariadb" ,mariadb))) (inputs `(("libdbi" ,libdbi) ("mariadb:dev" ,mariadb "dev") -- cgit v1.2.3 From b0b7954271b7ca466de82d70897f96ac7e2cf8fd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Jan 2020 10:40:42 +0100 Subject: gnu: OpenSSL@1.0: Update to 1.0.2u. * gnu/packages/tls.scm (openssl-1.0): Update to 1.0.2u. --- gnu/packages/tls.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 10d864348c..ece880f2f2 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -424,7 +424,7 @@ (define-public openssl-1.0 (package (inherit openssl) (name "openssl") - (version "1.0.2t") + (version "1.0.2u") (source (origin (method url-fetch) (uri (list (string-append "https://www.openssl.org/source/openssl-" @@ -436,7 +436,7 @@ (define-public openssl-1.0 "/openssl-" version ".tar.gz"))) (sha256 (base32 - "1g67ra0ph7gpz6fgvv1i96d792jmd6ymci5kk53vbikszr74djql")) + "05lxcs4hzyfqd5jn0d9p0fvqna62v2s4pc9qgmq0dpcknkzwdl7c")) (patches (search-patches "openssl-runpath.patch" "openssl-c-rehash-in.patch")))) (outputs '("out" -- cgit v1.2.3 From 7eb22b188bc68be7614c576e40d792ffe31a8bb1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Jan 2020 10:41:13 +0100 Subject: gnu: libinput: Update to 1.15.0. * gnu/packages/freedesktop.scm (libinput): Update to 1.15.0. --- 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 ed221439b4..205015bae1 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -180,14 +180,14 @@ (define-public xdg-utils (define-public libinput (package (name "libinput") - (version "1.14.3") + (version "1.15.0") (source (origin (method url-fetch) (uri (string-append "https://freedesktop.org/software/libinput/" "libinput-" version ".tar.xz")) (sha256 (base32 - "1dy58j8dvr7ri34bx0lppmh5638m956azgwk501w373hi42kmsqg")))) + "1qa3b2fd4pv8ysf0mgwnyhqv9v48zgy3sy0q3a3vxcmwcvpizgxz")))) (build-system meson-build-system) (arguments `(#:configure-flags '("-Ddocumentation=false") -- cgit v1.2.3 From fe19ab3f0344b092f72df44b27c6858c344d5898 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Jan 2020 10:41:47 +0100 Subject: gnu: libva: Update to 2.6.1. * gnu/packages/video.scm (libva): Update to 2.6.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 2b3b9d982d..a04bd3549a 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -738,7 +738,7 @@ (define-public libmatroska (define-public libva (package (name "libva") - (version "2.5.0") + (version "2.6.1") (source (origin (method url-fetch) @@ -750,7 +750,7 @@ (define-public libva (string-append "https://www.freedesktop.org/software/vaapi/releases/" "libva/libva-" version "/libva-" version ".tar.bz2"))) (sha256 - (base32 "0y38mw1ggxm15zq06r4qpwhd5wx4bppw1rsxpr6sq1m5d79rra1s")))) + (base32 "19df3r02k1p4cbyvifkdjyc8q7hi23f5b3x3390z52l25mjfnmvc")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 289d66d0cf2894146095030ccfcf3dcec352669e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Jan 2020 10:42:12 +0100 Subject: gnu: mesa: Update to 19.3.2. * gnu/packages/gl.scm (mesa): Update to 19.3.2. --- gnu/packages/gl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 23904a556b..42bed5d623 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -229,7 +229,7 @@ (define libva-without-mesa (define-public mesa (package (name "mesa") - (version "19.2.7") + (version "19.3.2") (source (origin (method url-fetch) @@ -241,7 +241,7 @@ (define-public mesa version "/mesa-" version ".tar.xz"))) (sha256 (base32 - "17jp8ghipgz62vqqz5llskxypkcmgf8gnlgnj0pyvnbgi6vryyg3")) + "1hg1gvcwvayksrdh9z8rfz66h3z1ffspmm2qgyy2nd8n8qrfwfjf")) (patches (search-patches "mesa-skip-disk-cache-test.patch")))) (build-system meson-build-system) -- cgit v1.2.3 From 86bbfc5004a0dcccfba96a7a17b396c1fed65530 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 12:48:24 +0100 Subject: gnu: pfff: Use HTTPS home page. * gnu/packages/textutils.scm (pfff)[home-page]: Use HTTPS. --- gnu/packages/textutils.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 86358fa02d..cc38ee25f1 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -462,7 +462,7 @@ (define-public pfff (base32 "1nxkfm7zliq3rmr7yp871sppwfnz71iz364m2sgazny71pzykggc")))) (build-system cmake-build-system) - (home-page "http://biit.cs.ut.ee/pfff/") + (home-page "https://biit.cs.ut.ee/pfff/") (synopsis "Probabilistic fast file fingerprinting tool") (description "pfff is a tool for calculating a compact digital fingerprint of a file -- cgit v1.2.3 From 62418049d156368c70eec69ca08490f7afff56aa Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 12:54:20 +0100 Subject: gnu: dillo: Use HTTPS home page. * gnu/packages/web-browsers.scm (dillo)[home-page]: Use HTTPS. [source]: Likewise. Don't hard-code NAME in source URI. --- gnu/packages/web-browsers.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index f55ee111f8..0c18191cc7 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -68,8 +68,8 @@ (define-public dillo (version "3.0.5") (source (origin (method url-fetch) - (uri (string-append "http://www.dillo.org/download/" - name "-" version ".tar.bz2")) + (uri (string-append "https://www.dillo.org/download/" + "dillo-" version ".tar.bz2")) (sha256 (base32 "12ql8n1lypv3k5zqgwjxlw1md90ixz3ag6j1gghfnhjq3inf26yv")))) @@ -90,7 +90,7 @@ (define-public dillo (synopsis "Very small and fast graphical web browser") (description "Dillo is a minimalistic web browser particularly intended for older or slower computers and embedded systems.") - (home-page "http://www.dillo.org") + (home-page "https://www.dillo.org") (license license:gpl3+))) (define-public links -- cgit v1.2.3 From 332cc03bf734c2ef3cf88f7a86178a7721609de2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 17:54:23 +0100 Subject: gnu: font-wqy-zenhei: Use HTTP home page. * gnu/packages/fonts.scm (font-wqy-zenhei)[home-page]: Use HTTP. --- gnu/packages/fonts.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 4bcba89e38..1cb8b1c053 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -511,7 +511,7 @@ (define-public font-wqy-zenhei (base32 "1mkmxq8g2hjcglb3zajfqj20r4r88l78ymsp2xyl5yav8w3f7dz4")))) (build-system font-build-system) - (home-page "https://wenq.org/wqy2/") + (home-page "http://wenq.org/wqy2/") (synopsis "CJK font") (description "WenQuanYi Zen Hei is a Hei-Ti style (sans-serif type) Chinese outline -- cgit v1.2.3 From c04cbcf70a4ee8d92c13f441d04c3420a3b9ba76 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 18:27:36 +0100 Subject: gnu: ecryptfs: Use HTTPS home page. * gnu/packages/linux.scm (ecryptfs)[home-page]: Use HTTPS. --- gnu/packages/linux.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index beea8b6433..936047dc1e 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4686,7 +4686,7 @@ (define-public ecryptfs-utils ("cryptsetup" ,cryptsetup) ("lvm2" ,lvm2) ("nss" ,nss))) - (home-page "http://ecryptfs.org/") + (home-page "https://ecryptfs.org/") (synopsis "eCryptfs cryptographic file system utilities") (description "eCryptfs is a POSIX-compliant stacked cryptographic file system for Linux. -- cgit v1.2.3 From b2e213c3e9c58dc9539a29dcb152fe20df767281 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 01:57:18 +0100 Subject: gnu: plantuml: Use HTTPS home page. * gnu/packages/uml.scm (plantuml)[home-page]: Use HTTPS. --- gnu/packages/uml.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/uml.scm b/gnu/packages/uml.scm index 4e8a580757..41fb66c3b9 100644 --- a/gnu/packages/uml.scm +++ b/gnu/packages/uml.scm @@ -82,7 +82,7 @@ (define-public plantuml (inputs `(("graphviz" ,graphviz) ("jre" ,icedtea))) - (home-page "http://plantuml.com/") + (home-page "https://plantuml.com/") (synopsis "Draw UML diagrams from simple textual description") (description "Plantuml is a tool to generate sequence, usecase, class, activity, -- cgit v1.2.3 From 1e05e837c773b61bb0dfa8b72e34d1ed3f2bf3c4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 12:41:14 +0100 Subject: gnu: elemental: Update home page. * gnu/packages/maths.scm (elemental)[home-page]: Use repository home page. --- 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 85ceea1889..8f4478b6bb 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4278,7 +4278,7 @@ (define-public elemental (base32 "1687xpjjzig27y2pnqv7hv09smpijyfdpz7qjgmcxf4shfajlfkc")))) (build-system cmake-build-system) - (home-page "http://libelemental.org") + (home-page "https://github.com/elemental/Elemental") (native-inputs `(("gfortran" ,gfortran))) (inputs -- cgit v1.2.3 From dcfdc9085554f422305b7ce74868e9f6f1cf081f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 01:56:34 +0100 Subject: gnu: java-jcommander: Use HTTPS home page. * gnu/packages/java.scm (java-jcommander)[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 0fe874cd51..6abd0c8360 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -8969,7 +8969,7 @@ (define-public java-jcommander #:jdk ,icedtea-8 #:tests? #f; requires testng which depends on jcommander #:source-dir "src/main/java")) - (home-page "http://jcommander.org") + (home-page "https://jcommander.org") (synopsis "Command line parameters parser") (description "JCommander is a very small Java framework that makes it trivial to parse command line parameters. Parameters are declared with -- cgit v1.2.3 From 5015343709c81a95f2713e035df58cf1a288a8ec Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 01:56:03 +0100 Subject: gnu: ghc-dense-linear-algebra: Use HTTPS home page. * gnu/packages/haskell-xyz.scm (ghc-dense-linear-algebra)[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 3a9880f58c..9599347d72 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -2797,7 +2797,7 @@ (define-public ghc-dense-linear-algebra (native-inputs `(("ghc-hspec" ,ghc-hspec) ("ghc-quickcheck" ,ghc-quickcheck))) - (home-page "http://hackage.haskell.org/package/dense-linear-algebra") + (home-page "https://hackage.haskell.org/package/dense-linear-algebra") (synopsis "Simple and incomplete implementation of linear algebra") (description "This library is simply a collection of linear-algebra related modules split from the statistics library.") -- cgit v1.2.3 From 46128e94fdd3475e02c6691545cb589cbe46a44f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 04:00:31 +0100 Subject: gnu: xautolock: Use HTTPS home page. * gnu/packages/xdisorg.scm (xautolock)[home-page]: Use HTTPS. [source]: Likewise. Don't use NAME in source URI. --- gnu/packages/xdisorg.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index c1f6876c7e..0f47821b7e 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -1616,8 +1616,8 @@ (define-public xautolock (version "2.2") (source (origin (method url-fetch) - (uri (string-append "http://www.ibiblio.org/pub/linux/X11/screensavers/" - name "-" version ".tgz")) + (uri (string-append "https://www.ibiblio.org/pub/linux/X11/" + "screensavers/xautolock-" version ".tgz")) (sha256 (base32 "18jd3k3pvlm5x1adyqw63z2b3f4ixh9mfvz9asvnskk3fm8jgw0i")))) @@ -1653,7 +1653,7 @@ (define-public xautolock (add-after 'install 'install/man (lambda _ (invoke "make" "install.man")))))) - (home-page "http://ibiblio.org/pub/Linux/X11/screensavers/") + (home-page "https://ibiblio.org/pub/Linux/X11/screensavers/") (synopsis "Program launcher for idle X sessions") (description "Xautolock monitors input devices under the X Window System, and launches a program of your choice if there is no activity after -- cgit v1.2.3 From 86081d9d7f88a7faee6fd14e8a085cb95ac1e36a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 15:05:58 +0100 Subject: gnu: minetest-data: Update to 5.1.1. * gnu/packages/games.scm (minetest-data)[version]: Update to 5.1.1. --- 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 0fa6a123d3..790da284da 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -1995,7 +1995,7 @@ (define-public mars (define minetest-data (package (name "minetest-data") - (version "5.1.0") + (version "5.1.1") (source (origin (method git-fetch) (uri (git-reference -- cgit v1.2.3 From 60e4f6e2333f1226823d392522c5993152fefdcd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 15:14:34 +0100 Subject: gnu: minetest: Update to 5.1.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/games.scm (minetest): Update to 5.1.1. [source]: Remove obsolete snippet… bit. --- gnu/packages/games.scm | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 790da284da..491cad15e7 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2029,7 +2029,7 @@ (define minetest-data (define-public minetest (package (name "minetest") - (version "5.1.0") + (version "5.1.1") (source (origin (method git-fetch) (uri (git-reference @@ -2038,16 +2038,10 @@ (define-public minetest (file-name (git-file-name name version)) (sha256 (base32 - "184n9gxfa7yr0j85z2x736maaymsnppd5jzm326wlqri3c0qqy3z")) + "0cjj63333b7j4ydfq0h9yc6d2jvmyjd7n7zbd08yrf0rcibrj2k0")) (modules '((guix build utils))) (snippet '(begin - ;; Mimic upstream commit 706b6aad06, for compatibility with - ;; newer jsoncpp. Remove this for > 5.1.0. - (substitute* "cmake/Modules/FindJson.cmake" - (("features\\.h") - "allocator.h")) - ;; Delete bundled libraries. (delete-file-recursively "lib") #t)))) -- cgit v1.2.3 From 9d1c4376190abb699d921e429f899108bd448b26 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 15:18:04 +0100 Subject: gnu: gramps: Update to 5.1.2. * gnu/packages/genealogy.scm (gramps): Update to 5.1.2. --- gnu/packages/genealogy.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/genealogy.scm b/gnu/packages/genealogy.scm index bb3ed3d0aa..869f69add8 100644 --- a/gnu/packages/genealogy.scm +++ b/gnu/packages/genealogy.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Guillaume Le Vaillant +;;; Copyright © 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -38,7 +39,7 @@ (define-module (gnu packages genealogy) (define-public gramps (package (name "gramps") - (version "5.1.1") + (version "5.1.2") (source (origin (method git-fetch) @@ -47,8 +48,7 @@ (define-public gramps (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "1zrvr543zzsiapda75vdd2669fgijmx4cv7nfj5d1jsyz4qnif7b")))) + (base32 "175iwvdp6c1a8rskl2wpk4yvzl437j7hm23v481974a85qy43iv8")))) (build-system python-build-system) (native-inputs `(("gettext" ,gettext-minimal) -- cgit v1.2.3 From 5448b16e81e573808821a8244f52065fda6eccad Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 15:28:00 +0100 Subject: gnu: odamex: Update to 0.8.1. * gnu/packages/games.scm (odamex): Update to 0.8.1. --- gnu/packages/games.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 491cad15e7..db3380118e 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -5820,7 +5820,7 @@ (define-public gzdoom (define-public odamex (package (name "odamex") - (version "0.8.0") + (version "0.8.1") (source (origin (method url-fetch) @@ -5828,10 +5828,9 @@ (define-public odamex "mirror://sourceforge/odamex/Odamex/" version "/" "odamex-src-" version ".tar.gz")) (sha256 - (base32 - "1sh6lqj7vsdmnqz17hw0b6vy7xx6dp41k2sdw99ympsfa2xd1d2j")))) + (base32 "1ywbqkfacc9fc5di3dn95y5ah2ys9i241j64q3f37a73x92llw1i")))) (build-system cmake-build-system) - (arguments `(#:tests? #f)) ; no tests. + (arguments `(#:tests? #f)) ; no tests (inputs `(("sdl" ,sdl) ("sdl-mixer" ,sdl-mixer) -- cgit v1.2.3 From b74f7f06aceae986878966b92cbada6f91c9617c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 15:41:32 +0100 Subject: gnu: teeworlds: Update to 0.7.4 [security fixes] This fixes CVE-2019-10877, CVE-2019-10878, and CVE-2019-10879. * gnu/packages/games.scm (teeworlds): Update to 0.7.4. [source]: Remove patch. [arguments]: Remove use-latest-json-parser substitution. * gnu/packages/patches/teeworlds-use-latest-wavpack.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/games.scm | 28 +---- .../patches/teeworlds-use-latest-wavpack.patch | 126 --------------------- 3 files changed, 3 insertions(+), 152 deletions(-) delete mode 100644 gnu/packages/patches/teeworlds-use-latest-wavpack.patch diff --git a/gnu/local.mk b/gnu/local.mk index 286bcb67dd..0af500f029 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1408,7 +1408,6 @@ dist_patch_DATA = \ %D%/packages/patches/tcsh-fix-autotest.patch \ %D%/packages/patches/tcsh-fix-out-of-bounds-read.patch \ %D%/packages/patches/teensy-loader-cli-help.patch \ - %D%/packages/patches/teeworlds-use-latest-wavpack.patch \ %D%/packages/patches/texinfo-5-perl-compat.patch \ %D%/packages/patches/texlive-bin-CVE-2018-17407.patch \ %D%/packages/patches/texlive-bin-luatex-poppler-compat.patch \ diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index db3380118e..58d0846404 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4530,7 +4530,7 @@ (define-public kiki-the-nano-bot (define-public teeworlds (package (name "teeworlds") - (version "0.7.2") + (version "0.7.4") (source (origin (method git-fetch) (uri (git-reference @@ -4539,7 +4539,7 @@ (define-public teeworlds (file-name (git-file-name name version)) (sha256 (base32 - "15l988qcsqgb6rjais0qd5sd2rjanm2708jmzvkariqzz0d6pb93")) + "1lxdb1k2cdj2421vyz1z0ximzfnpkh2y4y84zpn2gqsa1nzwbryb")) (modules '((guix build utils) (ice-9 ftw) (ice-9 regex) @@ -4551,9 +4551,7 @@ (define-public teeworlds (cut string-append base-dir <>)) (remove (cut string-match "(^.)|(^md5$)" <>) (scandir base-dir))) - #t)) - (patches - (search-patches "teeworlds-use-latest-wavpack.patch")))) + #t)))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests included @@ -4564,19 +4562,6 @@ (define-public teeworlds (modify-phases %standard-phases (replace 'configure (lambda* (#:key outputs #:allow-other-keys) - ;; The bundled json-parser uses an old API. - ;; To use the latest non-bundled version, we need to pass the - ;; length of the data in all 'json_parse_ex' calls. - (define (use-latest-json-parser file) - (substitute* file - (("engine/external/json-parser/json\\.h") - "json-parser/json.h") - (("json_parse_ex\\(&JsonSettings, pFileData, aError\\);") - "json_parse_ex(&JsonSettings, - pFileData, - strlen(pFileData), - aError);"))) - ;; Embed path to assets. (substitute* "src/engine/shared/storage.cpp" (("#define DATA_DIR.*") @@ -4608,13 +4593,6 @@ (define (use-latest-json-parser file) (substitute* "src/engine/client/sound.cpp" (("engine/external/wavpack/wavpack\\.h") "wavpack/wavpack.h")) - (for-each use-latest-json-parser - '("src/game/client/components/countryflags.cpp" - "src/game/client/components/menus_settings.cpp" - "src/game/client/components/skins.cpp" - "src/game/client/localization.cpp" - "src/game/editor/auto_map.h" - "src/game/editor/editor.cpp")) #t)) (replace 'build (lambda _ diff --git a/gnu/packages/patches/teeworlds-use-latest-wavpack.patch b/gnu/packages/patches/teeworlds-use-latest-wavpack.patch deleted file mode 100644 index 3ad1340d2e..0000000000 --- a/gnu/packages/patches/teeworlds-use-latest-wavpack.patch +++ /dev/null @@ -1,126 +0,0 @@ -Downloaded from https://salsa.debian.org/games-team/teeworlds/raw/master/debian/patches/new-wavpack.patch. - -From: Markus Koschany -Date: Thu, 25 Oct 2018 20:52:27 +0200 -Subject: new-wavpack - -Make wavpack compatible with Debian's version. ---- - src/engine/client/sound.cpp | 33 +++++++++++++++------------------ - src/engine/client/sound.h | 4 ---- - 2 files changed, 15 insertions(+), 22 deletions(-) - -diff --git a/src/engine/client/sound.cpp b/src/engine/client/sound.cpp -index 048ec24..80de3c5 100644 ---- a/src/engine/client/sound.cpp -+++ b/src/engine/client/sound.cpp -@@ -325,10 +325,6 @@ void CSound::RateConvert(int SampleID) - pSample->m_NumFrames = NumFrames; - } - --int CSound::ReadData(void *pBuffer, int Size) --{ -- return io_read(ms_File, pBuffer, Size); --} - - ISound::CSampleHandle CSound::LoadWV(const char *pFilename) - { -@@ -336,6 +332,8 @@ ISound::CSampleHandle CSound::LoadWV(const char *pFilename) - int SampleID = -1; - char aError[100]; - WavpackContext *pContext; -+ char aWholePath[1024]; -+ IOHANDLE File; - - // don't waste memory on sound when we are stress testing - if(g_Config.m_DbgStress) -@@ -349,25 +347,29 @@ ISound::CSampleHandle CSound::LoadWV(const char *pFilename) - return CSampleHandle(); - - lock_wait(m_SoundLock); -- ms_File = m_pStorage->OpenFile(pFilename, IOFLAG_READ, IStorage::TYPE_ALL); -- if(!ms_File) -+ File = m_pStorage->OpenFile(pFilename, IOFLAG_READ, IStorage::TYPE_ALL, aWholePath, sizeof(aWholePath)); -+ if(!File) - { - dbg_msg("sound/wv", "failed to open file. filename='%s'", pFilename); - lock_unlock(m_SoundLock); - return CSampleHandle(); - } -+ else -+ { -+ io_close(File); -+ } - - SampleID = AllocID(); - if(SampleID < 0) - { -- io_close(ms_File); -- ms_File = 0; -+ io_close(File); -+ File = 0; - lock_unlock(m_SoundLock); - return CSampleHandle(); - } - pSample = &m_aSamples[SampleID]; - -- pContext = WavpackOpenFileInput(ReadData, aError); -+ pContext = WavpackOpenFileInput(aWholePath, aError, OPEN_2CH_MAX, 0); - if (pContext) - { - int m_aSamples = WavpackGetNumSamples(pContext); -@@ -385,8 +387,8 @@ ISound::CSampleHandle CSound::LoadWV(const char *pFilename) - if(pSample->m_Channels > 2) - { - dbg_msg("sound/wv", "file is not mono or stereo. filename='%s'", pFilename); -- io_close(ms_File); -- ms_File = 0; -+ io_close(File); -+ File = 0; - lock_unlock(m_SoundLock); - return CSampleHandle(); - } -@@ -401,8 +403,8 @@ ISound::CSampleHandle CSound::LoadWV(const char *pFilename) - if(BitsPerSample != 16) - { - dbg_msg("sound/wv", "bps is %d, not 16, filname='%s'", BitsPerSample, pFilename); -- io_close(ms_File); -- ms_File = 0; -+ io_close(File); -+ File = 0; - lock_unlock(m_SoundLock); - return CSampleHandle(); - } -@@ -429,9 +431,6 @@ ISound::CSampleHandle CSound::LoadWV(const char *pFilename) - dbg_msg("sound/wv", "failed to open %s: %s", pFilename, aError); - } - -- io_close(ms_File); -- ms_File = NULL; -- - if(g_Config.m_Debug) - dbg_msg("sound/wv", "loaded %s", pFilename); - -@@ -560,7 +559,5 @@ bool CSound::IsPlaying(CSampleHandle SampleID) - return Ret; - } - --IOHANDLE CSound::ms_File = 0; -- - IEngineSound *CreateEngineSound() { return new CSound; } - -diff --git a/src/engine/client/sound.h b/src/engine/client/sound.h -index ff357c0..cec2cde 100644 ---- a/src/engine/client/sound.h -+++ b/src/engine/client/sound.h -@@ -21,10 +21,6 @@ public: - - static void RateConvert(int SampleID); - -- // TODO: Refactor: clean this mess up -- static IOHANDLE ms_File; -- static int ReadData(void *pBuffer, int Size); -- - virtual bool IsSoundEnabled() { return m_SoundEnabled != 0; } - - virtual CSampleHandle LoadWV(const char *pFilename); -- cgit v1.2.3 From 18bbaf6714a3876f1e83463f5d0389024a5ed8ef Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 16:23:03 +0100 Subject: gnu: quakespasm: Update to 0.93.2. * gnu/packages/games.scm (quakespasm): Update to 0.93.2. --- gnu/packages/games.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 58d0846404..3d2db7bdf3 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -5336,15 +5336,14 @@ (define-public tales-of-maj-eyal (define-public quakespasm (package (name "quakespasm") - (version "0.93.1") + (version "0.93.2") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/quakespasm/Source/quakespasm-" version ".tgz")) (sha256 - (base32 - "1bimv18f6rzhyjz78yvw2vqr5n0kdqbcqmq7cb3m951xgsxfcgpd")))) + (base32 "0qm0j5drybvvq8xadfyppkpk3rxqsxbywzm6iwsjwdf0iia3gss5")))) (arguments `(#:tests? #f #:make-flags '("CC=gcc" -- cgit v1.2.3 From b7388a080d80185a5aecd7586fea74376e94dd7e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 17:01:50 +0100 Subject: gnu: minetest-data, minetest: Use HTTPS home page. * gnu/packages/games.scm (minetest-data, minetest)[home-page]: Use HTTPS and www subdomain. --- 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 3d2db7bdf3..c945e3ab45 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2023,7 +2023,7 @@ (define minetest-data (synopsis "Main game data for the Minetest game engine") (description "Game data for the Minetest infinite-world block sandbox game.") - (home-page "http://minetest.net") + (home-page "https://www.minetest.net/") (license license:lgpl2.1+))) (define-public minetest @@ -2091,7 +2091,7 @@ (define-public minetest forming structures in every possible creation, on multiplayer servers or as a single player. Mods and texture packs allow players to personalize the game in different ways.") - (home-page "http://minetest.net") + (home-page "https://www.minetest.net/") (license license:lgpl2.1+))) (define glkterm -- cgit v1.2.3 From 6305b039651d842e307d90c770c38e763fed2116 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 18:03:05 +0100 Subject: gnu: Remove duplicate module imports from (gnu packages gnome). * gnu/packages/gnome.scm: Remove duplicate module imports. --- gnu/packages/gnome.scm | 2 -- 1 file changed, 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 064ce86956..26d827b82e 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -165,13 +165,11 @@ (define-module (gnu packages gnome) #:use-module (gnu packages virtualization) #:use-module (gnu packages vpn) #:use-module (gnu packages web) - #:use-module (gnu packages web) #:use-module (gnu packages webkit) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xiph) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) - #:use-module (gnu packages xorg) #:use-module (gnu artwork) #:use-module (guix build-system cargo) #:use-module (guix build-system cmake) -- cgit v1.2.3 From bed24ecfcd68ca6fbc21f02b477cffff3b4c0450 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 17:55:58 +0100 Subject: gnu: arc-theme: Fix build. * gnu/packages/web.scm (sassc/libsass-3.5): New public variable. * gnu/packages/gnome.scm (arc-theme)[native-inputs]: Use it. --- gnu/packages/gnome.scm | 2 +- gnu/packages/web.scm | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 26d827b82e..211333314f 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8290,7 +8290,7 @@ (define-public arc-theme ("inkscape" ,inkscape) ("optipng" ,optipng) ("pkg-config" ,pkg-config) - ("sassc" ,sassc))) + ("sassc" ,sassc/libsass-3.5))) (synopsis "A flat GTK+ theme with transparent elements") (description "Arc is a flat theme with transparent elements for GTK 3, GTK 2, and GNOME Shell which supports GTK 3 and GTK 2 based desktop environments diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index b2d282710a..032ba2206c 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1516,6 +1516,7 @@ (define-public serf (define-public libsass (package (name "libsass") + ;; When updating, check whether sassc/libsass-3.5 is still needed. (version "3.6.3") (source (origin (method git-fetch) @@ -1595,6 +1596,29 @@ (define-public sassc (home-page "https://sass-lang.com/libsass") (license license:expat))) +(define-public sassc/libsass-3.5 + ;; Newer libsass versions suffor from a memory leak when building (some?) + ;; GTK themes . + (package + (inherit sassc) + (name "sassc") + (inputs + `(("libsass" , + (package + (inherit libsass) + (name "libsass") + (version "3.5.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sass/libsass.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0830pjcvhzxh6yixj82x5k5r1xnadjqzi16kp53213icbly0r9ma")))))))))) + (define-public perl-apache-logformat-compiler (package -- cgit v1.2.3 From ad7287b20ea157d5e3c474b52b051e8edad21409 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Jan 2020 10:43:13 +0100 Subject: gnu: libwebp: Update to 1.1.0. * gnu/packages/image.scm (libwebp): Update to 1.1.0. --- 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 a518b69b8e..6306a3d20b 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1102,7 +1102,7 @@ (define-public vigra-c (define-public libwebp (package (name "libwebp") - (version "1.0.3") + (version "1.1.0") (source (origin ;; No tarballs are provided for >0.6.1. @@ -1113,7 +1113,7 @@ (define-public libwebp (file-name (git-file-name name version)) (sha256 (base32 - "1l8h9d3z3kla567ilmymrgg8vc2n763g8qss1hah8dg832hbqkxf")))) + "0r2yy9if0ndvpzadk39bigvsygyqnlv0xjb9w2aj6rs534mncazz")))) (build-system gnu-build-system) (inputs `(("freeglut" ,freeglut) -- cgit v1.2.3 From 58d1d46a5ebbc911952e00207139234050b7debd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Jan 2020 10:43:33 +0100 Subject: gnu: libxkbcommon: Update to 0.10.0. * gnu/packages/xdisorg.scm (libxkbcommon): Update to 0.10.0. --- 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 c1f6876c7e..459efd6626 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -302,14 +302,14 @@ (define-public xclip (define-public libxkbcommon (package (name "libxkbcommon") - (version "0.9.1") + (version "0.10.0") (source (origin (method url-fetch) (uri (string-append "https://xkbcommon.org/download/libxkbcommon-" version ".tar.xz")) (sha256 (base32 - "1q4v378sr9ad8fy9znl7k8xpf0wch655r9m6z0bcc7sw1azsminl")))) + "1wmnl0hngn6vrqrya4r8hvimlkr4jag39yjprls4gyrqvh667hsp")))) (build-system meson-build-system) (inputs `(("libx11" ,libx11) -- cgit v1.2.3 From 50adab10263c3e4b2c609a6cc5eef2fdddf57b29 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Jan 2020 10:43:53 +0100 Subject: gnu: libical: Update to 3.0.7. * gnu/packages/calendar.scm (libical): Update to 3.0.7. --- gnu/packages/calendar.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm index 5e7ac66260..5a88c98456 100644 --- a/gnu/packages/calendar.scm +++ b/gnu/packages/calendar.scm @@ -50,7 +50,7 @@ (define-module (gnu packages calendar) (define-public libical (package (name "libical") - (version "3.0.6") + (version "3.0.7") (source (origin (method url-fetch) (uri (string-append @@ -58,7 +58,7 @@ (define-public libical version "/libical-" version ".tar.gz")) (sha256 (base32 - "15sdmh8w4vszd7jhv9fdpd48anpkniq2k1jw7siy9v1jnz1232jw")))) + "1z33wzaazbd7drl6qbh1750whd78xl2cg0gjnxyya9m83vgndgha")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; test suite appears broken -- cgit v1.2.3 From 3c2ebce669ff3340f32683690aef94469b217aea Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Jan 2020 10:50:20 +0100 Subject: gnu: dejagnu: Update to 1.6.2. * gnu/packages/dejagnu.scm (dejagnu): Update to 1.6.2. --- gnu/packages/dejagnu.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/dejagnu.scm b/gnu/packages/dejagnu.scm index f2aca50f1a..0dee89dfc1 100644 --- a/gnu/packages/dejagnu.scm +++ b/gnu/packages/dejagnu.scm @@ -28,7 +28,7 @@ (define-module (gnu packages dejagnu) (define-public dejagnu (package (name "dejagnu") - (version "1.6.1") + (version "1.6.2") (source (origin (method url-fetch) @@ -36,7 +36,7 @@ (define-public dejagnu version ".tar.gz")) (sha256 (base32 - "14hnq1mh91vqprc43xdy4f15sycw6fbajrh7zi6cw2kyg6xjhnxz")))) + "0qfj2wd4qk1yn9yzam6g8nmyxfazcc0knjyyibycb2ainkhp21hd")))) (build-system gnu-build-system) (inputs `(("expect" ,expect))) (arguments -- cgit v1.2.3 From 2daded5a9152003c3e64cb47250084c8a3192035 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Jan 2020 20:25:12 +0100 Subject: gnu: python-pygments: Update to 2.5.2. * gnu/packages/python-xyz.scm (python-pygments): Update to 2.5.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 2c308796e7..d6f2ac8179 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2616,14 +2616,14 @@ (define-public python2-docutils (define-public python-pygments (package (name "python-pygments") - (version "2.4.2") + (version "2.5.2") (source (origin (method url-fetch) (uri (pypi-uri "Pygments" version)) (sha256 (base32 - "15v2sqm5g12bqa0c7wikfh9ck2nl97ayizy1hpqhmws5gqalq748")))) + "1zmhnswy0wxfn0xprs9aqsvx2c3kmzfn2wx14q8cv3vpkxdamj4q")))) (build-system python-build-system) (arguments ;; FIXME: Tests require sphinx, which depends on this. -- cgit v1.2.3 From 25b8d676c01bc9cd206a12bd2bdd767e47b4e693 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Jan 2020 21:48:25 +0100 Subject: gnu: ImageMagick: Update to 6.9.10-87. * gnu/packages/imagemagick.scm (imagemagick): Update to 6.9.10-87. --- gnu/packages/imagemagick.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm index e6a178713a..2b4bc5680d 100644 --- a/gnu/packages/imagemagick.scm +++ b/gnu/packages/imagemagick.scm @@ -48,14 +48,14 @@ (define-public imagemagick ;; The 7 release series has an incompatible API, while the 6 series is still ;; maintained. Don't update to 7 until we've made sure that the ImageMagick ;; users are ready for the 7-series API. - (version "6.9.10-78") + (version "6.9.10-87") (source (origin (method url-fetch) (uri (string-append "mirror://imagemagick/ImageMagick-" version ".tar.xz")) (sha256 (base32 - "178sai7r0w2hwv01is25c8mxf9lc2ba0l16qm45h9vv49y5dy08q")))) + "09m0nx7y6j5cq13r583kp3lbsc357cc3q0kcvzbya54r5lx20a5p")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch") -- cgit v1.2.3 From 1fa342323619372326106fb923e72ae7beecb5e6 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 18 Jan 2020 18:41:03 +0100 Subject: gnu: guile-commonmark: Add "guile3.0-commonmark" variant. * gnu/packages/guile-xyz.scm (guile-commonmark)[source]: Add 'modules' and 'snippet'. (guile3.0-commonmark): New variable. --- gnu/packages/guile-xyz.scm | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 755d1ef62d..7d5621eaa4 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2025,7 +2025,15 @@ (define-public guile-commonmark "/" name "-" version ".tar.gz")) (sha256 (base32 - "17lrsdisa3kckh24q114vfmzdc4wkqa6ccwl4hdlrng5wpn1iman")))) + "17lrsdisa3kckh24q114vfmzdc4wkqa6ccwl4hdlrng5wpn1iman")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Allow builds with Guile 3.0. + (substitute* "configure" + (("2\\.2 2\\.0") + "3.0 2.2 2.0")) + #t)))) (build-system gnu-build-system) (inputs `(("guile" ,guile-2.2))) @@ -2041,6 +2049,12 @@ (define-public guile-commonmark (home-page "https://github.com/OrangeShark/guile-commonmark") (license license:lgpl3+))) +(define-public guile3.0-commonmark + (package + (inherit guile-commonmark) + (name "guile3.0-commonmark") + (inputs `(("guile" ,guile-3.0))))) + (define-public guile2.0-commonmark (package (inherit guile-commonmark) -- cgit v1.2.3 From 3adf320e44e54017a67f219ce9667a379c393dad Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 19 Jan 2020 15:18:25 +0100 Subject: tests: install: "raid-root-os" test uses RAID-1 instead of RAID-0. Fixes . Thanks to Vagrant and Tobias! * gnu/tests/install.scm (%raid-root-os)[initrd-modules]: Add "raid1" instead of "raid0". (%raid-root-installation-script): Make the partitions twice as big. Invoke 'mdadm' with '--level=mirror' instead of '--level=stripe'; connect "yes" to its stdin. (%test-raid-root-os): Set #:target-size to 2.8 GiB. --- 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 8842d48df8..d475bda2c7 100644 --- a/gnu/tests/install.scm +++ b/gnu/tests/install.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. @@ -546,8 +546,8 @@ (define-os-with-source (%raid-root-os %raid-root-os-source) (target "/dev/vdb"))) (kernel-arguments '("console=ttyS0")) - ;; Add a kernel module for RAID-0 (aka. "stripe"). - (initrd-modules (cons "raid0" %base-initrd-modules)) + ;; Add a kernel module for RAID-1 (aka. "mirror"). + (initrd-modules (cons "raid1" %base-initrd-modules)) (mapped-devices (list (mapped-device (source (list "/dev/vda2" "/dev/vda3")) @@ -578,11 +578,11 @@ (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 600M \\ - mkpart primary ext2 600M 1200M \\ + mkpart primary ext2 3M 1.4G \\ + mkpart primary ext2 1.4G 2.8G \\ set 1 boot on \\ set 1 bios_grub on -mdadm --create /dev/md0 --verbose --level=stripe --raid-devices=2 \\ +yes | mdadm --create /dev/md0 --verbose --level=mirror --raid-devices=2 \\ /dev/vdb2 /dev/vdb3 mkfs.ext4 -L root-fs /dev/md0 mount /dev/md0 /mnt @@ -605,7 +605,7 @@ (define %test-raid-root-os %raid-root-os-source #:script %raid-root-installation-script - #:target-size (* 1300 MiB))) + #:target-size (* 2800 MiB))) (command (qemu-command/writable-image image))) (run-basic-test %raid-root-os `(,@command) "raid-root-os"))))) -- cgit v1.2.3 From a9f4a7eee379accded2bd1515d8acb0746ea0517 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 19 Jan 2020 21:54:46 +0100 Subject: repl: Add "-q". * guix/scripts/repl.scm (%options, show-help): Add "-q". (guix-repl): Add 'user-config' and use it. Honor 'ignore-dot-guile?'. --- doc/guix.texi | 4 ++++ guix/scripts/repl.scm | 22 ++++++++++++++++------ 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 56fa4ff079..dea4584286 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -8008,6 +8008,10 @@ Add @var{directory} to the front of the package module search path This allows users to define their own packages and make them visible to the command-line tool. + +@item -q +Inhibit loading of the @file{~/.guile} file. By default, that +configuration file is loaded when spawning a @code{guile} REPL. @end table @c ********************************************************************* diff --git a/guix/scripts/repl.scm b/guix/scripts/repl.scm index fc3e4e2131..721c0a7450 100644 --- a/guix/scripts/repl.scm +++ b/guix/scripts/repl.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 ;;; Copyright © 2020 Simon Tournier ;;; ;;; This file is part of GNU Guix. @@ -55,6 +55,9 @@ (define %options (option '("listen") #t #f (lambda (opt name arg result) (alist-cons 'listen arg result))) + (option '(#\q) #f #f + (lambda (opt name arg result) + (alist-cons 'ignore-dot-guile? #t result))) (find (lambda (option) (member "load-path" (option-names option))) %standard-build-options))) @@ -67,6 +70,8 @@ (define (show-help) -t, --type=TYPE start a REPL of the given TYPE")) (display (G_ " --listen=ENDPOINT listen ENDPOINT instead of standard I/O")) + (display (G_ " + -q inhibit loading of ~/.guile")) (newline) (display (G_ " -L, --load-path=DIR prepend DIR to the package module search path")) @@ -139,6 +144,11 @@ (define opts (leave (G_ "~A: extraneous argument~%") arg)) %default-options)) + (define user-config + (and=> (getenv "HOME") + (lambda (home) + (string-append home "/.guile")))) + (with-error-handling (let ((type (assoc-ref opts 'type))) (call-with-connection (assoc-ref opts 'listen) @@ -148,11 +158,11 @@ (define opts (save-module-excursion (lambda () (set-current-module user-module) - (and=> (getenv "HOME") - (lambda (home) - (let ((guile (string-append home "/.guile"))) - (when (file-exists? guile) - (load guile))))) + (when (and (not (assoc-ref opts 'ignore-dot-guile?)) + user-config + (file-exists? user-config)) + (load user-config)) + ;; Do not exit repl on SIGINT. ((@@ (ice-9 top-repl) call-with-sigint) (lambda () -- cgit v1.2.3 From eb6025322017e9096470b449a0dfb2be65668402 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 19 Jan 2020 21:56:04 +0100 Subject: repl: Adjust "--listen" help message. * guix/scripts/repl.scm (show-help): Adjust "--listen" string. --- guix/scripts/repl.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/scripts/repl.scm b/guix/scripts/repl.scm index 721c0a7450..a9268da29e 100644 --- a/guix/scripts/repl.scm +++ b/guix/scripts/repl.scm @@ -69,7 +69,7 @@ (define (show-help) (display (G_ " -t, --type=TYPE start a REPL of the given TYPE")) (display (G_ " - --listen=ENDPOINT listen ENDPOINT instead of standard I/O")) + --listen=ENDPOINT listen to ENDPOINT instead of standard input")) (display (G_ " -q inhibit loading of ~/.guile")) (newline) -- cgit v1.2.3 From 358f66a004bc232aca1c51d04776a2ae0c1fbc9a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 19 Jan 2020 22:01:33 +0100 Subject: repl: Avoid dependency on high-level package modules. * guix/scripts/repl.scm: Remove imports of (guix scripts build), (gnu packages), (guix utils), and (guix packages). (%options): Define "--load-path" option right here. --- guix/scripts/repl.scm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/guix/scripts/repl.scm b/guix/scripts/repl.scm index a9268da29e..ff1f208894 100644 --- a/guix/scripts/repl.scm +++ b/guix/scripts/repl.scm @@ -20,11 +20,7 @@ (define-module (guix scripts repl) #:use-module (guix ui) #:use-module (guix scripts) - #:use-module ((guix scripts build) #:select (%standard-build-options)) #:use-module (guix repl) - #:use-module (guix utils) - #:use-module (guix packages) - #:use-module (gnu packages) #:use-module (srfi srfi-1) #:use-module (srfi srfi-37) #:use-module (ice-9 match) @@ -58,9 +54,12 @@ (define %options (option '(#\q) #f #f (lambda (opt name arg result) (alist-cons 'ignore-dot-guile? #t result))) - (find (lambda (option) - (member "load-path" (option-names option))) - %standard-build-options))) + (option '(#\L "load-path") #t #f + (lambda (opt name arg result) + ;; XXX: Imperatively modify the search paths. + (set! %load-path (cons arg %load-path)) + (set! %load-compiled-path (cons arg %load-compiled-path)) + result)))) (define (show-help) -- cgit v1.2.3 From b782688d71f707a8a263abc69c2745d815c45ec7 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 19 Jan 2020 22:42:27 +0100 Subject: syscalls: Pass the right 'throw' arguments in 'call-with-file-lock/no-wait'. Reported by Matt Wette in . * guix/build/syscalls.scm (call-with-file-lock/no-wait): When re-throwing, pass KEY in addition to ARGS. --- guix/build/syscalls.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guix/build/syscalls.scm b/guix/build/syscalls.scm index 248d6761fc..ae79a9708f 100644 --- a/guix/build/syscalls.scm +++ b/guix/build/syscalls.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2015 David Thompson ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2017 Mathieu Othacehe @@ -1140,7 +1140,7 @@ (define (call-with-file-lock/no-wait file thunk handler) ;; at this point. (if (= ENOSYS (system-error-errno (cons key args))) #f - (apply throw args))) + (apply throw key args))) (_ (apply throw key args))))))) (dynamic-wind (lambda () -- cgit v1.2.3 From 7842ddcbc118cbc2799e22651732b7cdc06b93ee Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 19 Jan 2020 22:52:31 +0100 Subject: guix package: Create profiles/per-user/$USER upfront. Fixes . Reported by Matt Wette . * guix/scripts/package.scm (build-and-use-profile): Move 'ensure-default-profile' call to... (process-actions): ... here. --- guix/scripts/package.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm index f4d92a649e..1cb0d382bf 100644 --- a/guix/scripts/package.scm +++ b/guix/scripts/package.scm @@ -137,9 +137,6 @@ (define* (build-and-use-profile store profile manifest specified in MANIFEST, a manifest object. When ALLOW-COLLISIONS? is true, do not treat collisions in MANIFEST as an error. HOOKS is a list of \"profile hooks\" run when building the profile." - (when (equal? profile %current-profile) - (ensure-default-profile)) - (let* ((prof-drv (run-with-store store (profile-derivation manifest #:allow-collisions? allow-collisions? @@ -865,6 +862,12 @@ (define (transform-entry entry) (package-version item) (manifest-entry-version entry)))))) + (when (equal? profile %current-profile) + ;; Normally the daemon created %CURRENT-PROFILE when we connected, unless + ;; it's a version that lacks the fix for + ;; (aka. CVE-2019-18192). Ensure %CURRENT-PROFILE exists so that + ;; 'with-profile-lock' can create its lock file below. + (ensure-default-profile)) ;; First, acquire a lock on the profile, to ensure only one guix process ;; is modifying it at a time. -- cgit v1.2.3 From bac03797fde1bf0e9c73fe0eff5088e432b4e27d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 20 Jan 2020 01:50:12 +0100 Subject: gnu: glulxe: Use HTTPS home page. * gnu/packages/games.scm (glulxe)[home-page]: Use HTTPS. --- 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 c945e3ab45..256566ed90 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2164,7 +2164,7 @@ (define-public glulxe (install-file "glulxe" bin)) #t)) (delete 'configure)))) ; no configure script - (home-page "http://www.eblong.com/zarf/glulx/") + (home-page "https://www.eblong.com/zarf/glulx/") (synopsis "Interpreter for Glulx VM") (description "Glulx is a 32-bit portable virtual machine intended for writing and -- cgit v1.2.3 From 21de4160d3bc866cb832d12e98acc2bc38a59a5f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 20 Jan 2020 01:50:50 +0100 Subject: gnu: lsh: Use HTTPS home page. * gnu/packages/ssh.scm (lsh)[home-page]: Use HTTPS. --- gnu/packages/ssh.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 8f74ababe8..d203bb1455 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -617,7 +617,7 @@ (define-public lsh ;; Tests rely on $USER being set. (setenv "USER" "guix")))))) - (home-page "http://www.lysator.liu.se/~nisse/lsh/") + (home-page "https://www.lysator.liu.se/~nisse/lsh/") (synopsis "GNU implementation of the Secure Shell (ssh) protocols") (description "GNU lsh is a free implementation of the SSH version 2 protocol. It is -- cgit v1.2.3 From 63b066709bb01a382325ce7b3b863ba2b68599bc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 20 Jan 2020 01:53:45 +0100 Subject: gnu: Update pythonpaste.org home pages. * gnu/packages/check.scm (python-scripttest)[home-page]: Update URI. * gnu/packages/python-web.scm (python-paste, python-pastescript) (python-webtest, python-pastedeploy)[home-page]: Likewise. --- gnu/packages/check.scm | 3 ++- gnu/packages/python-web.scm | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 41b0c88ef9..5554965a06 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1021,7 +1021,8 @@ (define-public python-scripttest (build-system python-build-system) (native-inputs `(("python-pytest" ,python-pytest))) - (home-page "http://pythonpaste.org/scripttest/") + (home-page (string-append "https://web.archive.org/web/20161029233413/" + "http://pythonpaste.org/scripttest/")) (synopsis "Python library to test command-line scripts") (description "Scripttest is a Python helper library for testing interactive command-line applications. With it you can run a script in a diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 7f365e3506..7808b7631e 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1679,7 +1679,7 @@ (define-public python-pastedeploy (build-system python-build-system) (native-inputs `(("python-nose" ,python-nose))) - (home-page "http://pythonpaste.org/deploy/") + (home-page "https://pylonsproject.org/") (synopsis "Load, configure, and compose WSGI applications and servers") (description @@ -1712,7 +1712,7 @@ (define-public python-webtest ("python-webob" ,python-webob) ("python-six" ,python-six) ("python-beautifulsoup4" ,python-beautifulsoup4))) - (home-page "http://webtest.pythonpaste.org/") + (home-page "https://docs.pylonsproject.org/projects/webtest/") (synopsis "Helper to test WSGI applications") (description "Webtest allows you to test your Python web applications without starting an HTTP server. It supports anything that supports the @@ -2894,7 +2894,7 @@ (define-public python-paste ("python-nose" ,python-nose))) (propagated-inputs `(("python-six" ,python-six))) - (home-page "http://pythonpaste.org") + (home-page "https://pythonpaste.readthedocs.io/") (synopsis "Python web development tools, focusing on WSGI") (description @@ -2923,7 +2923,8 @@ (define-public python-pastescript (propagated-inputs `(("python-paste" ,python-paste) ("python-pastedeploy" ,python-pastedeploy))) - (home-page "http://pythonpaste.org/script/") + (home-page (string-append "https://web.archive.org/web/20161025192515/" + "http://pythonpaste.org/script/")) (arguments '(;; Unfortunately, this requires the latest unittest2, ;; but that requires traceback2 which requires linecache2 which requires -- cgit v1.2.3 From 7cde52031075d4ecf433ca301124b459dbc5f652 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 20 Jan 2020 01:54:37 +0100 Subject: gnu: ghc-missingh: Use HTTPS home page. * gnu/packages/haskell-xyz.scm (ghc-missingh)[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 9599347d72..c98daff082 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -7194,7 +7194,7 @@ (define-public ghc-missingh `(("ghc-errorcall-eq-instance" ,ghc-errorcall-eq-instance) ("ghc-quickcheck" ,ghc-quickcheck) ("ghc-hunit" ,ghc-hunit))) - (home-page "http://software.complete.org/missingh") + (home-page "https://software.complete.org/missingh") (synopsis "Large utility library") (description "MissingH is a library of all sorts of utility functions for Haskell -- cgit v1.2.3 From 8008605dbe179d02a14f19e58cce93917d4b803a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 20 Jan 2020 23:12:37 +0100 Subject: gnu: blender: Update to 2.81a. * gnu/packages/graphics.scm (blender): Update to 2.81a. --- gnu/packages/graphics.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 3ef420cf05..217ccb4ece 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2016 Andreas Enge ;;; Copyright © 2017 Manolis Fragkiskos Ragkousis ;;; Copyright © 2017, 2018 Ben Woodcroft -;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Mathieu Othacehe ;;; Copyright © 2018 Alex Kost ;;; Copyright © 2018 Kei Kebreau @@ -88,14 +88,14 @@ (define-module (gnu packages graphics) (define-public blender (package (name "blender") - (version "2.81") + (version "2.81a") (source (origin (method url-fetch) (uri (string-append "https://download.blender.org/source/" "blender-" version ".tar.xz")) (sha256 (base32 - "1prp0f2152f1sz23jlc86vndfvmplb7qhllikkirq7hgpykrshna")))) + "1zl0ar95qkxsrbqw9miz2hrjijlqjl06vg3clfk9rm7krr2l3b2j")))) (build-system cmake-build-system) (arguments (let ((python-version (version-major+minor (package-version python)))) -- cgit v1.2.3 From 3caef3bdb7ee49b0d52a6f6d2d146aebcfc59f2e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 20 Jan 2020 23:51:08 +0100 Subject: gnu: pngquant: Update to 2.12.6. * gnu/packages/image.scm (pngquant): Update to 2.12.6. --- gnu/packages/image.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index a518b69b8e..45055858b4 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2014, 2017 John Darrington ;;; Copyright © 2016, 2017, 2018 Leo Famulari ;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner -;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2016 Eric Bavier ;;; Copyright © 2016, 2017 Arun Isaac ;;; Copyright © 2016, 2017 Kei Kebreau @@ -321,7 +321,7 @@ (define-public libimagequant (define-public pngquant (package (name "pngquant") - (version "2.12.3") + (version "2.12.6") (source (origin (method git-fetch) @@ -330,7 +330,7 @@ (define-public pngquant (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1yiwbcihn4311fpfd568gg8zmmhqwg80jmhbhkb5msiipgd9xv33")))) + (base32 "15hanshahxqs6s9fyc3aym02251dcys7bf78g3inp0y233amdbl3")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit v1.2.3 From 5c65b790362c8008f649742e4e2b0b4d6448bc3b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 20 Jan 2020 02:54:37 +0100 Subject: gnu: cpuid: Update to 20200116. * gnu/packages/linux.scm (cpuid): Update to 20200116. --- 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 936047dc1e..8ea8a903a4 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5459,14 +5459,14 @@ (define-public proot-static (define-public cpuid (package (name "cpuid") - (version "20180519") + (version "20200116") (source (origin (method url-fetch) (uri (string-append "http://www.etallen.com/cpuid/cpuid-" version ".src.tar.gz")) (sha256 (base32 - "16pzwyifc9glpk1hm6bqb5d1a7cw0qnqiamh5sbvqg7j6sz26y4n")))) + "1gxi4iwy6j366l6bkj1yyxhrk1rxmwfp498gikfxn8xwhij9dn0a")))) (build-system gnu-build-system) (arguments '(#:make-flags '("CC=gcc") -- cgit v1.2.3 From c3b78dd97e1a6ced9d65ffb0921d6d9721b3281b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 20 Jan 2020 03:00:39 +0100 Subject: gnu: youtube-dl: Update to 2020.01.15. * gnu/packages/video.scm (youtube-dl): Update to 2020.01.15. --- 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 e62031d85a..fe1d9397ba 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1543,7 +1543,7 @@ (define-public libvpx-1.7 (define-public youtube-dl (package (name "youtube-dl") - (version "2020.01.01") + (version "2020.01.15") (source (origin (method url-fetch) (uri (string-append "https://github.com/ytdl-org/youtube-dl/" @@ -1551,7 +1551,7 @@ (define-public youtube-dl version ".tar.gz")) (sha256 (base32 - "0p8v18jpf0ijpqlgavqs5vky9v956dhhck7drsv7gkzfw2y6mc0a")))) + "0dyjc8nxyg9ry2ylmblh3fwavpais3mdfj6ndw4i0yc2vkw12rsm")))) (build-system python-build-system) (arguments ;; The problem here is that the directory for the man page and completion -- cgit v1.2.3 From b722a1f1e1caa24b2af08e0fc2f098e314dbaf3d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 20 Jan 2020 03:11:44 +0100 Subject: gnu: mpv: Update to 0.31.0. * gnu/packages/video.scm (mpv): Update to 0.31.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 fe1d9397ba..ad96593a54 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1349,7 +1349,7 @@ (define-public mplayer (define-public mpv (package (name "mpv") - (version "0.30.0") + (version "0.31.0") (source (origin (method git-fetch) (uri (git-reference @@ -1358,7 +1358,7 @@ (define-public mpv (file-name (git-file-name name version)) (sha256 (base32 - "17mxjgcfljlv6h0ik3332xsqbs0ybvk6dkwflyl0cjh15vl1iv6f")))) + "138m09l4wi6ifbi15z76j578plmxkclhlzfryasfcdp8hswhs59r")))) (build-system waf-build-system) (native-inputs `(("perl" ,perl) ; for zsh completion file -- cgit v1.2.3 From 2e5438e0f4d3764b24eb7ae597158d7cf56cbdf7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 20 Jan 2020 03:18:42 +0100 Subject: gnu: stunnel: Update to 5.56. * gnu/packages/web.scm (stunnel): Update to 5.56. --- gnu/packages/web.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 032ba2206c..9b568adb96 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -16,7 +16,7 @@ ;;; Copyright © 2016 Clément Lassieur ;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2016, 2017, 2018, 2019 Arun Isaac -;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2016 Bake Timmons ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2017, 2018 Marius Bakke @@ -5233,14 +5233,14 @@ (define-public httptunnel (define-public stunnel (package (name "stunnel") - (version "5.55") + (version "5.56") (source (origin (method url-fetch) (uri (string-append "https://www.stunnel.org/downloads/stunnel-" version ".tar.gz")) (sha256 - (base32 "0qjc0wkjf6bqz29fvwwsn9hnjhm6alsm10jcwx4jad2q3ks6kplh")))) + (base32 "08kb4gi9fzqngrczykvba6xhaxhq9m4wmdbhxvgrva5rasrvz13k")))) (build-system gnu-build-system) (native-inputs ;; For tests. -- cgit v1.2.3 From e121cb8706553a5b7652db0d638874aede3bcda1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 20 Jan 2020 04:01:16 +0100 Subject: gnu: cli-visualizer: Update to 1.8. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/audio.scm (cli-visualizer): Update to 1.8. [build-system]: Switch to cmake-build-system. [inputs]: Remove googletest. [arguments]: Disable tests. Remove #:make-flags and all phases apart from ‘install-examples’, previously ‘data’. --- gnu/packages/audio.scm | 51 ++++++++++++++++++++------------------------------ 1 file changed, 20 insertions(+), 31 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 6020063b2e..34135afe0c 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3577,52 +3577,41 @@ (define-public noise-repellent (define-public cli-visualizer (package (name "cli-visualizer") - (version "1.6") + (version "1.8") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/dpayne/cli-visualizer.git") - (commit version))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "0mirp8bk398di5xyq95iprmdyvplfghxqmrfj7jdnpy554vx7ppc")))) - (build-system gnu-build-system) + (base32 "003mbbwsz43mg3d7llphpypqa9g7rs1p1cdbqi1mbc2bfrc1gcq2")))) + (build-system cmake-build-system) (native-inputs - `(("which" ,which))) + ;; TODO: Try using the latest googletest for versions > 1.8. + `( ;; ("googletest" ,googletest-1.8) + ("which" ,which))) (inputs `(("fftw" ,fftw) - ;; TODO: Try using the latest googletest for versions > 1.6. - ("googletest" ,googletest-1.8) ("ncurses" ,ncurses) ("pulseaudio" ,pulseaudio))) (arguments - '(#:test-target "test" - #:make-flags - (list (string-append "PREFIX=" %output "/bin/") "ENABLE_PULSE=1") + '(#:tests? #f + ;; XXX Enable tests after patching them to use the system googletest. + ;; #:configure-flags (list "-DVIS_WITH_TESTS=true") #:phases (modify-phases %standard-phases - (add-after 'unpack 'remove-sudo - (lambda _ - (substitute* "install.sh" (("sudo") "")) - #t)) - (add-before 'check 'set-check-environment - (lambda _ - (setenv "CXX" "g++") - (setenv "CC" "gcc") - #t)) - (add-before 'install 'make-prefix - (lambda _ - (mkdir-p (string-append (assoc-ref %outputs "out") "/bin")) - #t)) - (add-after 'install 'data - (lambda _ - (for-each (lambda (file) - (install-file file - (string-append (assoc-ref %outputs "out") - "/share/doc"))) - (find-files "examples")) + (add-after 'install 'install-examples + (lambda* (#:key outputs #:allow-other-keys) + (with-directory-excursion "../source/examples" + (delete-file "mac_osx_config") + (for-each (lambda (file) + (install-file file + (string-append + (assoc-ref outputs "out") + "/share/doc"))) + (find-files "."))) #t))))) (home-page "https://github.com/dpayne/cli-visualizer/") (synopsis "Command-line audio visualizer") -- cgit v1.2.3 From 0b8472b2f38a695245ee7ff7e632b00f293d7ed5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 20 Jan 2020 01:47:35 +0100 Subject: gnu: r-dummies: Use HTTPS home page. * gnu/packages/cran.scm (r-dummies)[home-page]: Use HTTPS. --- gnu/packages/cran.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 62a388c534..ff2490bc31 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -17636,7 +17636,7 @@ (define-public r-dummies "01f84crqx17xd6xy55qxlvsj3knm8lhw7jl26p2rh2w3y0nvqlbm")))) (properties `((upstream-name . "dummies"))) (build-system r-build-system) - (home-page "http://www.decisionpatterns.com") + (home-page "https://decisionpatterns.com") (synopsis "Create dummy/indicator variables flexibly and efficiently") (description "This package lets you expand factors, characters and other eligible -- cgit v1.2.3 From 35437dbfe14bf34084bf33b01dc75d1430c7c16d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 20 Jan 2020 01:49:00 +0100 Subject: gnu: ghc-sdl2: Use HTTPS home page. * gnu/packages/haskell-xyz.scm (ghc-sdl2)[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 c98daff082..5773635227 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -9890,7 +9890,7 @@ (define-public ghc-sdl2 (native-inputs `(("ghc-weigh" ,ghc-weigh) ("pkg-config" ,pkg-config))) - (home-page "http://hackage.haskell.org/package/sdl2") + (home-page "https://hackage.haskell.org/package/sdl2") (synopsis "High- and low-level bindings to the SDL library") (description "This package contains bindings to the SDL 2 library, in both high- and -- cgit v1.2.3 From 3b02036ea0c0261895fca8129f8afef297d346e6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 20 Jan 2020 01:49:29 +0100 Subject: gnu: ghc-hashable-time: Use HTTPS home page. * gnu/packages/haskell-xyz.scm (ghc-hashable-time)[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 5773635227..fd2f11ce72 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -5008,7 +5008,7 @@ (define-public ghc-hashable-time `(#:cabal-revision ("2" "006phc5y9rrvsshdcmjmhxzxh8dpgs685mpqbkjm9c40xb1ydjbz"))) (inputs `(("ghc-hashable" ,ghc-hashable))) - (home-page "http://hackage.haskell.org/package/hashable-time") + (home-page "https://hackage.haskell.org/package/hashable-time") (synopsis "Hashable instances for Data.Time") (description "This package provides @code{Hashable} instances for types in -- cgit v1.2.3 From 0a2d61a5944c24d18329b3534c06a3b11010b19d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 13 Jan 2020 22:04:39 +0200 Subject: gnu: Add node-env-variable. * gnu/packages/node-xyz.scm (node-env-variable): New variable. * gnu/local.mk (GNU_SYSTEM_MODULES): Register it. --- gnu/local.mk | 1 + gnu/packages/node-xyz.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 gnu/packages/node-xyz.scm diff --git a/gnu/local.mk b/gnu/local.mk index 0af500f029..2c31b4e717 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -367,6 +367,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/nim.scm \ %D%/packages/ninja.scm \ %D%/packages/node.scm \ + %D%/packages/node-xyz.scm \ %D%/packages/noweb.scm \ %D%/packages/nss.scm \ %D%/packages/ntp.scm \ diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm new file mode 100644 index 0000000000..896c0628a6 --- /dev/null +++ b/gnu/packages/node-xyz.scm @@ -0,0 +1,46 @@ +;;; GNU Guix --- Functional package management for GNU +;;; 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 node-xyz) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix git-download) + #:use-module (guix build-system node)) + +(define-public node-env-variable + (package + (name "node-env-variable") + (version "0.0.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/bigpipe/env-variable") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0nnpxjxfhy4na7fixb7p3ww6ard5xgggfm83b78i333867r4gmsq")))) + (build-system node-build-system) + (arguments '(#:tests? #f)) ; No tests. + (home-page "https://github.com/bigpipe/env-variable") + (synopsis "Environment variables for Node with fallbacks") + (description "This package provides environment variables with +@code{process.env}, @code{window.name}, @code{location.hash} and +@code{localStorage} fallbacks.") + (license license:expat))) -- cgit v1.2.3 From 2f2e7be944c80d5fdb7fcab90ecf2ddf4b80c416 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 13 Jan 2020 22:04:40 +0200 Subject: gnu: Add node-long-stack-traces. * gnu/packages/node-xyz.scm (node-long-stack-traces): New variable. --- gnu/packages/node-xyz.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 896c0628a6..a8285eb49c 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -44,3 +44,26 @@ (define-public node-env-variable @code{process.env}, @code{window.name}, @code{location.hash} and @code{localStorage} fallbacks.") (license license:expat))) + + +(define-public node-long-stack-traces + (package + (name "node-long-stack-traces") + (version "0.1.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tlrobinson/long-stack-traces") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0famwsyc6xawi30v25zi65d8fhbvlvh976bqydf1dqn5gz200cl3")))) + (build-system node-build-system) + (arguments '(#:tests? #f)) ; No tests. + (home-page "https://github.com/tlrobinson/long-stack-traces") + (synopsis "Long stacktraces implemented in user-land JavaScript") + (description "This package provides long stacktraces for V8 implemented in +user-land JavaScript.") + (license license:expat))) ; in README -- cgit v1.2.3 From a971890b1da4543455d079b105364c390301986e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 13 Jan 2020 22:04:41 +0200 Subject: gnu: Add node-mersenne. * gnu/packages/node-xyz.scm (node-mersenne): New variable. --- gnu/packages/node-xyz.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index a8285eb49c..5040c8db91 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -67,3 +67,26 @@ (define-public node-long-stack-traces (description "This package provides long stacktraces for V8 implemented in user-land JavaScript.") (license license:expat))) ; in README + +(define-public node-mersenne + (package + (name "node-mersenne") + (version "0.0.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jwatte/node-mersenne") + ;; The actual release lacks a git tag. + (commit "f9fa01694ee49d6ae6ff9d90cfda594bddd3ccef"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "034iaiq2pdqn342p2404cpz364g282d2hkp9375hysnh9i968wbb")))) + (build-system node-build-system) + (arguments '(#:tests? #f)) ; No tests. + (home-page "http://www.enchantedage.com/node-mersenne") + (synopsis "Node.js module for generating Mersenne Twister random numbers") + (description "Thix package provides a node.js port of the Mersenne Twister +random number generator.") + (license license:bsd-3))) -- cgit v1.2.3 From c8bbff7ee13b6c2b1a97edcf530685216955b471 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 13 Jan 2020 22:04:42 +0200 Subject: gnu: Add node-statsd-parser. * gnu/packages/node-xyz.scm (node-statsd-parser): New variable. --- gnu/packages/node-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 5040c8db91..9a874f57b8 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -90,3 +90,25 @@ (define-public node-mersenne (description "Thix package provides a node.js port of the Mersenne Twister random number generator.") (license license:bsd-3))) + +(define-public node-statsd-parser + (package + (name "node-statsd-parser") + (version "0.0.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dscape/statsd-parser") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "049rnczsd6pv6bk282q4w72bhqc5cs562djgr7yncy7lk0wzq5j3")))) + (build-system node-build-system) + (arguments '(#:tests? #f)) ; No tests. + (home-page "https://github.com/dscape/statsd-parser") + (synopsis "Streaming parser for the statsd protocol") + (description "This package provides a streaming parser for the statsd +protocol used in @code{node-lynx}.") + (license license:asl2.0))) -- cgit v1.2.3 From d1095c47f1bedcc10f8bc10d80b7f2de3ad8989b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 13 Jan 2020 22:04:43 +0200 Subject: gnu: Add node-util-deprecate. * gnu/packages/node-xyz.scm (node-util-deprecate): New variable. --- gnu/packages/node-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 9a874f57b8..3e115970a5 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -112,3 +112,25 @@ (define-public node-statsd-parser (description "This package provides a streaming parser for the statsd protocol used in @code{node-lynx}.") (license license:asl2.0))) + +(define-public node-util-deprecate + (package + (name "node-util-deprecate") + (version "1.0.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/TooTallNate/util-deprecate") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1rk94nl3qc7znsk8400bnga30v0m7j2mmvz9ldwjinxv1d3n11xc")))) + (build-system node-build-system) + (arguments '(#:tests? #f)) ; No test suite. + (home-page "https://github.com/TooTallNate/util-deprecate") + (synopsis "Node.js `util.deprecate()` function with browser support") + (description "This package provides the Node.js @code{util.deprecate()} +function with browser support.") + (license license:expat))) -- cgit v1.2.3 From f6b8bd6eb7546382070e8c34124addc305e94673 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 13 Jan 2020 22:04:44 +0200 Subject: gnu: Add node-oop. * gnu/packages/node-xyz.scm (node-oop): New variable. --- gnu/packages/node-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 3e115970a5..b423e3267f 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -91,6 +91,31 @@ (define-public node-mersenne random number generator.") (license license:bsd-3))) +(define-public node-oop + ;; No releases, last commit was February 2013. + (let ((commit "f9d87cda0958886955c14a0a716e57021ed295dc") + (revision "1")) + (package + (name "node-oop") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/felixge/node-oop") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0mqrcf0xi2jbwffwkk00cljpqfsri1jk8s6kz8jny45apn7zjds1")))) + (build-system node-build-system) + (arguments '(#:tests? #f)) ; Tests run during build phase. + (home-page "https://github.com/felixge/node-oop") + (synopsis "Simple, light-weight oop module for Node") + (description "This library tries to bring basic oop features to JavaScript +while being as light-weight and simple as possible.") + (license license:expat)))) + (define-public node-statsd-parser (package (name "node-statsd-parser") -- cgit v1.2.3 From 1c83b1c0f3fcdaee96bc3cfd7227f043f547e123 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 13 Jan 2020 22:04:45 +0200 Subject: gnu: Add node-far. * gnu/packages/node-xyz.scm (node-far): New variable. --- gnu/packages/node-xyz.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index b423e3267f..e7135ed781 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -45,6 +45,36 @@ (define-public node-env-variable @code{localStorage} fallbacks.") (license license:expat))) +(define-public node-far + (package + (name "node-far") + (version "0.0.7") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/felixge/node-far") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "083rv1rszjn0i91zcpaghlid0kwhk0angmpj4hiflrlyhd6cmjzw")))) + (build-system node-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + ;; We skip the two tests which are supposed to fail. + (invoke "bin/node-far" "-v" "test/" "-e" "test.*fail.js")))))) + (inputs + `(("node-oop" ,node-oop))) + (home-page "https://github.com/felixge/node-far") + (synopsis "Node.js test runner") + (description "This package provides a simple test runner that finds and runs +multiple node.js files, while providing useful information about output and exit +codes.") + (license license:expat))) (define-public node-long-stack-traces (package -- cgit v1.2.3 From 1c8d53f8c5726610687f1ad228867b510dbfdf5f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 13 Jan 2020 22:04:46 +0200 Subject: gnu: Add node-stack-trace. * gnu/packages/node-xyz.scm (node-stack-trace): New variable. --- gnu/packages/node-xyz.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index e7135ed781..03d1a60faf 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -146,6 +146,40 @@ (define-public node-oop while being as light-weight and simple as possible.") (license license:expat)))) +(define-public node-stack-trace + ;; There have been improvements since the last release. + (let ((commit "4fd379ee78965ce7ce8820b436f1b1b590d5dbcf") + (revision "1")) + (package + (name "node-stack-trace") + (version (git-version "0.0.10" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/felixge/node-stack-trace") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1pk19wcpy8i95z5jr77fybd57qj7xmzmniap4dy47vjlmpkqia4i")))) + (build-system node-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-before 'check 'skip-intentionally-failing-test + (lambda _ + (substitute* "test/run.js" + (("far.include") "far.exclude(/test-parse.js/)\nfar.include")) + #t))))) + (native-inputs + `(("node-far" ,node-far) + ("node-long-stack-traces" ,node-long-stack-traces))) + (home-page "https://github.com/felixge/node-stack-trace") + (synopsis "Get v8 stack traces as an array of CallSite objects") + (description "Get v8 stack traces as an array of CallSite objects.") + (license license:expat)))) + (define-public node-statsd-parser (package (name "node-statsd-parser") -- cgit v1.2.3 From 317f925b7f4b7277cf3a79814bd7dbed8f1d1099 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 13 Jan 2020 22:04:47 +0200 Subject: gnu: Add node-color-name. * gnu/packages/node-xyz.scm (node-color-name): New variable. --- gnu/packages/node-xyz.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 03d1a60faf..44236ec469 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -22,6 +22,27 @@ (define-module (gnu packages node-xyz) #:use-module (guix git-download) #:use-module (guix build-system node)) +(define-public node-color-name + (package + (name "node-color-name") + (version "1.1.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/colorjs/color-name") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "09rbmj16nfwcwkhrybqxyy66bkrs50vpw6hkdqqb14l3gsyxpr74")))) + (build-system node-build-system) + (home-page "https://github.com/colorjs/color-name") + (synopsis "JSON with CSS color names") + (description + "This package provides a JSON list with color names and their values.") + (license license:expat))) + (define-public node-env-variable (package (name "node-env-variable") -- cgit v1.2.3 From d0759f613480c13b8c81716eb46dc3606b3a34b0 Mon Sep 17 00:00:00 2001 From: Florian Pelz Date: Wed, 15 Jan 2020 13:50:31 +0100 Subject: gnu: USB_ModeSwitch: Update to 2.6.0. * gnu/packages/usb-modeswitch.scm (usb-modeswitch): Update to 2.6.0. [source]: Remove snippet that deletes jimtcl, which is no longer bundled. Remove patch. Use HTTPS. [arguments]: Adapt to changed file names. [home-page] Use HTTPS. [license]: Fix missing BSD-2 license. * gnu/packages/patches/usb-modeswitch-accept-config-arg.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - .../patches/usb-modeswitch-accept-config-arg.patch | 42 ---------------------- gnu/packages/usb-modeswitch.scm | 23 +++++------- 3 files changed, 8 insertions(+), 58 deletions(-) delete mode 100644 gnu/packages/patches/usb-modeswitch-accept-config-arg.patch diff --git a/gnu/local.mk b/gnu/local.mk index 2c31b4e717..59589f292a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1445,7 +1445,6 @@ dist_patch_DATA = \ %D%/packages/patches/util-linux-tests.patch \ %D%/packages/patches/upower-builddir.patch \ %D%/packages/patches/upx-fix-CVE-2017-15056.patch \ - %D%/packages/patches/usb-modeswitch-accept-config-arg.patch \ %D%/packages/patches/valgrind-enable-arm.patch \ %D%/packages/patches/vboot-utils-fix-format-load-address.patch \ %D%/packages/patches/vboot-utils-fix-tests-show-contents.patch \ diff --git a/gnu/packages/patches/usb-modeswitch-accept-config-arg.patch b/gnu/packages/patches/usb-modeswitch-accept-config-arg.patch deleted file mode 100644 index 9c050f7ee6..0000000000 --- a/gnu/packages/patches/usb-modeswitch-accept-config-arg.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- old/usb_modeswitch.tcl 1970-01-01 01:00:00.000000000 +0100 -+++ usb_modeswitch.tcl 2019-06-12 08:39:42.140000000 +0200 -@@ -41,7 +41,7 @@ - global scsi usb config match device flags setup devdir loginit - - set flags(config) "" --Log "[ParseGlobalConfig]" -+Log "[ParseGlobalConfig $argv]" - - if {$flags(stordelay) > 0} { - SetStorageDelay $flags(stordelay) -@@ -496,9 +496,21 @@ - # end of proc {MatchDevice} - - --proc {ParseGlobalConfig} {} { -+proc {ParseGlobalConfig} {argv} { - - global flags -+ -+set configFileParam "" -+for {set i 0} {$i < [llength $argv]} {incr i} { -+ switch -glob -- [set v [lindex $argv $i]] { -+ --config-file=* { -+ set configFileParam $v -+ } -+ } -+} -+if {$configFileParam != ""} { -+ set configFile [string range $configFileParam [string length "--config-file="] end] -+} else { - set configFile "" - set places [list /etc/usb_modeswitch.conf /etc/sysconfig/usb_modeswitch /etc/default/usb_modeswitch] - foreach cfg $places { -@@ -507,6 +519,7 @@ - break - } - } -+} - if {$configFile == ""} {return} - - set rc [open $configFile r] diff --git a/gnu/packages/usb-modeswitch.scm b/gnu/packages/usb-modeswitch.scm index 7e4526ae46..8f3edc7f43 100644 --- a/gnu/packages/usb-modeswitch.scm +++ b/gnu/packages/usb-modeswitch.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright 2019 Florian Pelz +;;; Copyright 2019, 2020 Florian Pelz ;;; ;;; This file is part of GNU Guix. ;;; @@ -76,23 +76,15 @@ (define-public usb-modeswitch-data (define-public usb-modeswitch (package (name "usb-modeswitch") - (version "2.5.2") + (version "2.6.0") (source (origin (method url-fetch) (uri (string-append - "http://www.draisberghof.de/usb_modeswitch/" + "https://www.draisberghof.de/usb_modeswitch/" "usb-modeswitch-" version ".tar.bz2")) (sha256 (base32 - "19ifi80g9ns5dmspchjvfj4ykxssq9yrci8m227dgb3yr04srzxb")) - (modules '((guix build utils))) - (snippet - ;; Remove bundled jimtcl. - '(begin - (delete-file-recursively "jim") - #t)) - (patches - (search-patches "usb-modeswitch-accept-config-arg.patch")))) + "18wbbxc5cfsmikba0msdvd5qlaga27b32nhrzicyd9mdddp265f2")))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("libusb" ,libusb) ("jimtcl" ,jimtcl) @@ -145,7 +137,7 @@ (define-public usb-modeswitch (rename-file "usb_modeswitch.sh" "usb_modeswitch") (install-file "usb_modeswitch" udev) - (rename-file "usb_modeswitch.tcl" "usb_modeswitch_dispatcher") + (rename-file "usb_modeswitch_dispatcher.tcl" "usb_modeswitch_dispatcher") (substitute* "usb_modeswitch_dispatcher" (("/usr/bin/tclsh") (string-append jimtcl "/bin/jimsh")) @@ -155,7 +147,7 @@ (define-public usb-modeswitch (install-file "usb_modeswitch_dispatcher" dispatcher-bin) #t))))))) - (home-page "http://www.draisberghof.de/usb_modeswitch/") + (home-page "https://www.draisberghof.de/usb_modeswitch/") (synopsis "Mode switching tool for controlling `multi-mode' USB devices") (description "USB_ModeSwitch is a mode switching tool for controlling USB devices with multiple @dfn{modes}. When plugged in for the first time many @@ -163,4 +155,5 @@ (define-public usb-modeswitch containing installers for Windows drivers. USB_ModeSwitch replays the sequence the Windows drivers would send to switch their mode from storage to modem (or whatever the thing is supposed to do).") - (license license:gpl2+))) + (license (list license:gpl2+ ;"this program" according to home page + license:bsd-2)))) ;dispatcher.c -- cgit v1.2.3 From 17fe068ed7372dbae09043885b8f091105bef143 Mon Sep 17 00:00:00 2001 From: Florian Pelz Date: Wed, 15 Jan 2020 13:50:56 +0100 Subject: gnu: USB_ModeSwitch data: Update to 20191128. * gnu/packages/usb-modeswitch.scm (usb-modeswitch-data): Update to 20191128. [source] Use HTTPS. [home-page] Use HTTPS. --- gnu/packages/usb-modeswitch.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/usb-modeswitch.scm b/gnu/packages/usb-modeswitch.scm index 8f3edc7f43..6de810d23d 100644 --- a/gnu/packages/usb-modeswitch.scm +++ b/gnu/packages/usb-modeswitch.scm @@ -32,15 +32,15 @@ (define-module (gnu packages usb-modeswitch) (define-public usb-modeswitch-data (package (name "usb-modeswitch-data") - (version "20170806") + (version "20191128") (source (origin (method url-fetch) (uri (string-append - "http://www.draisberghof.de/usb_modeswitch/" + "https://www.draisberghof.de/usb_modeswitch/" "usb-modeswitch-data-" version ".tar.bz2")) (sha256 (base32 - "0b1wari3aza6qjggqd0hk2zsh93k1q8scgmwh6f8wr0flpr3whff")))) + "1ygahl3r26r38ai8yyblq9nhf3v5i6n6r6672p5wf88wg5h9n0rz")))) (build-system trivial-build-system) (native-inputs `(("tar" ,tar) ("bzip2" ,bzip2))) @@ -67,7 +67,7 @@ (define-public usb-modeswitch-data (install-file (string-append files "/40-usb_modeswitch.rules") udev-dir) (install-file (string-append files "/COPYING") license-dir))))) - (home-page "http://www.draisberghof.de/usb_modeswitch/") + (home-page "https://www.draisberghof.de/usb_modeswitch/") (synopsis "Data package for USB_ModeSwitch") (description "This package contains data about devices and a UDEV rules file for use with USB_ModeSwitch.") -- cgit v1.2.3 From dd39f0acc9ddff046f2ce26d517e7914bbae2b1e Mon Sep 17 00:00:00 2001 From: John Soo Date: Tue, 14 Jan 2020 08:35:29 -0800 Subject: gnu: Add rust-crossbeam-epoch-0.8. * gnu/packages/crates-io.scm (rust-crossbeam-epoch-0.8): New variable. (rust-crossbeam-epoch-0.7): Inherit from rust-crossbeam-epoch-0.8. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 42 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 34 insertions(+), 8 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 780173bb65..1f93a8fff8 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2019 Nicolas Goaziou ;;; Copyright © 2019 Giacomo Leidi ;;; Copyright © 2019 Tobias Geerinckx-Rice -;;; Copyright © 2019 John Soo +;;; Copyright © 2019, 2020 John Soo ;;; ;;; This file is part of GNU Guix. ;;; @@ -1847,8 +1847,40 @@ (define-public rust-crossbeam-deque-0.6 (base32 "04rcpgjs6ns57vag8a3dzx26190dhbvy2l0p9n22b9p1yf64pr05")))))) +(define-public rust-crossbeam-epoch-0.8 + (package + (name "rust-crossbeam-epoch") + (version "0.8.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "crossbeam-epoch" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1b2mgc2gxxvyzyxgd5wvn9k42gr6f9phi2swwjawpqswy3dynr2h")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-autocfg" ,rust-autocfg-0.1) + ("rust-cfg-if" ,rust-cfg-if-0.1) + ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.7) + ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-memoffset" ,rust-memoffset-0.5) + ("rust-scopeguard" ,rust-scopeguard-1.0)) + #:cargo-development-inputs + (("rust-rand" ,rust-rand-0.6)))) + (home-page + "https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-epoch") + (synopsis "Epoch-based garbage collection") + (description "Epoch-based garbage collection.") + (license (list license:expat license:asl2.0)))) + (define-public rust-crossbeam-epoch-0.7 (package + (inherit rust-crossbeam-epoch-0.8) (name "rust-crossbeam-epoch") (version "0.7.1") (source @@ -1860,7 +1892,6 @@ (define-public rust-crossbeam-epoch-0.7 (sha256 (base32 "1d408b9x82mdbnb405gw58v5mmdbj2rl28a1h7b9rmn25h8f7j84")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs @@ -1871,12 +1902,7 @@ (define-public rust-crossbeam-epoch-0.7 ("rust-memoffset" ,rust-memoffset-0.2) ("rust-scopeguard" ,rust-scopeguard-0.3)) #:cargo-development-inputs - (("rust-rand" ,rust-rand-0.4)))) - (home-page - "https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-epoch") - (synopsis "Epoch-based garbage collection") - (description "Epoch-based garbage collection.") - (license (list license:expat license:asl2.0)))) + (("rust-rand" ,rust-rand-0.4)))))) (define-public rust-crossbeam-queue-0.1 (package -- cgit v1.2.3 From 6f8794bd5006b2bafd8703dd134ff68d6d2f6b74 Mon Sep 17 00:00:00 2001 From: John Soo Date: Tue, 14 Jan 2020 07:33:11 -0800 Subject: gnu: Update rust-crossbeam-deque to 0.7.2. * gnu/packages/crates-io.scm (rust-crossbeam-deque-0.7): Update to 0.7.2. [arguments]: In cargo-inputs, replace rust-crossbeam-epoch-0.7 with 0.8, rust-crossbeam-utils-0.6 with 0.7. In cargo-development-inputs, replace rust-rand-0.4 with 0.6. * gnu/packages/gnome.scm (librsvg-next)[source]: Don't replace package-source for crossbeam-deque-0.7. Co-authored-by: Efraim Flashner Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 10 +++++----- gnu/packages/gnome.scm | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1f93a8fff8..0be958ef07 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1808,7 +1808,7 @@ (define-public rust-crossbeam-channel-0.3 (define-public rust-crossbeam-deque-0.7 (package (name "rust-crossbeam-deque") - (version "0.7.1") + (version "0.7.2") (source (origin (method url-fetch) @@ -1817,15 +1817,15 @@ (define-public rust-crossbeam-deque-0.7 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0was9x71cz5g1y3670cyy6jdmsdfg6k9mbf0ddz2k1mdd7hx535i")))) + "1jm3rqb3qfpfywrakyy81f61xnl4jsim7lam9digw6w6cdfr9an3")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-crossbeam-epoch" ,rust-crossbeam-epoch-0.7) - ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.6)) + (("rust-crossbeam-epoch" ,rust-crossbeam-epoch-0.8) + ("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/tree/master/crossbeam-deque") (synopsis "Concurrent work-stealing deque") diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 211333314f..8b7ac13457 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2200,7 +2200,7 @@ (define librsvg-next-source ("cloudabi" . #+(package-source rust-cloudabi-0.0)) ("criterion" . #+(package-source rust-criterion-0.2)) ("criterion-plot" . #+(package-source rust-criterion-plot-0.3)) - ("crossbeam-deque" . #+(package-source rust-crossbeam-deque-0.7)) + ;("crossbeam-deque" . #+(package-source rust-crossbeam-deque-0.7)) ;("crossbeam-epoch" . #+(package-source rust-crossbeam-epoch-0.7)) ("crossbeam-queue" . #+(package-source rust-crossbeam-queue-0.1)) ("crossbeam-utils" . #+(package-source rust-crossbeam-utils-0.6)) -- cgit v1.2.3 From 4edb32699e6923fba5371781ca3c6391b0032d86 Mon Sep 17 00:00:00 2001 From: John Soo Date: Tue, 14 Jan 2020 08:59:10 -0800 Subject: gnu: Add rust-crossbeam-queue-0.2. * gnu/packages/crates-io.scm (rust-crossbeam-queue-0.2): New variable. (rust-crossbeam-queue-0.1): Inherit from rust-crossbeam-queue-0.2. Signed-off-by: Efraim Flashner --- 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 0be958ef07..4339f1f574 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1904,10 +1904,10 @@ (define-public rust-crossbeam-epoch-0.7 #:cargo-development-inputs (("rust-rand" ,rust-rand-0.4)))))) -(define-public rust-crossbeam-queue-0.1 +(define-public rust-crossbeam-queue-0.2 (package (name "rust-crossbeam-queue") - (version "0.1.2") + (version "0.2.1") (source (origin (method url-fetch) @@ -1916,22 +1916,45 @@ (define-public rust-crossbeam-queue-0.1 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0jsa9dbxnwqcxfws09vaschf92d4imlbbikmcn4ka8z7rzb9r5vw")))) + "1nwkjh185bdwjrv1zj2g7an9lglv8sp4459268m4fwvi3v5fx5f6")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-crossbeam-utils" ,rust-crossbeam-utils-0.6)) + (("rust-cfg-if" ,rust-cfg-if-0.1) + ("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/tree/master/crossbeam-utils") - (synopsis "Concurrent queues") - (description "Concurrent queues.") + (synopsis "Concurrent queues in Rust") + (description + "This crate provides concurrent queues that can be shared among threads.") (license (list license:expat license:asl2.0 license:bsd-2)))) +(define-public rust-crossbeam-queue-0.1 + (package + (inherit rust-crossbeam-queue-0.2) + (name "rust-crossbeam-queue") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "crossbeam-queue" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0jsa9dbxnwqcxfws09vaschf92d4imlbbikmcn4ka8z7rzb9r5vw")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-crossbeam-utils" ,rust-crossbeam-utils-0.6)) + #:cargo-development-inputs + (("rust-rand" ,rust-rand-0.4)))))) + (define-public rust-crossbeam-utils-0.6 (package (name "rust-crossbeam-utils") -- cgit v1.2.3 From bc3c2aacd39165b1949ee440e773427f5e1fd075 Mon Sep 17 00:00:00 2001 From: John Soo Date: Tue, 14 Jan 2020 08:34:59 -0800 Subject: gnu: Add rust-memoffset-0.5. * gnu/packages/crates-io.scm (rust-memoffset-0.5): New variable. (rust-memoffset-0.2): Inherit from rust-memoffset-0.5. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4339f1f574..66d3b52d99 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5508,10 +5508,10 @@ (define-public rust-memmap-0.6 (base32 "1zy6s0ni0lx9rjzq3gq2zz9r8zgjmbp02332g3gsj4fyhv4s5zz2")))))) -(define-public rust-memoffset-0.2 +(define-public rust-memoffset-0.5 (package (name "rust-memoffset") - (version "0.2.1") + (version "0.5.3") (source (origin (method url-fetch) @@ -5520,16 +5520,37 @@ (define-public rust-memoffset-0.2 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1cvm2z7dy138s302ii7wlzcxbka5a8yfl5pl5di7lbdnw9hw578g")))) + "1fblqzc25hfaym8m0pj112s66pqq87avvaqm5hp5rskib2w9w63m")))) (build-system cargo-build-system) - (arguments `(#:skip-build? #t)) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-rustc-version" ,rust-rustc-version-0.2)) + #:cargo-development-inputs + (("rust-doc-comment" ,rust-doc-comment-0.3)))) (home-page "https://github.com/Gilnaa/memoffset") (synopsis - "offset_of functionality for Rust structs") - (description - "@code{offset_of} functionality for Rust structs.") + "C-like offset_of functionality for Rust structs") + (description "This package provides C-like @code{offset_of} functionality +for Rust structs.") (license license:expat))) +(define-public rust-memoffset-0.2 + (package + (inherit rust-memoffset-0.5) + (name "rust-memoffset") + (version "0.2.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "memoffset" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1cvm2z7dy138s302ii7wlzcxbka5a8yfl5pl5di7lbdnw9hw578g")))) + (arguments `(#:skip-build? #t)))) + (define-public rust-mime-0.3 (package (name "rust-mime") -- cgit v1.2.3 From 6b35ddf612c6edfdc9231134976f0af8d13fc424 Mon Sep 17 00:00:00 2001 From: John Soo Date: Tue, 14 Jan 2020 09:09:22 -0800 Subject: gnu: Update rust-rand-chacha-0.2 to 0.2.1. * gnu/packages/crates-io.scm (rust-rand-chacha-0.2): Update to 0.2.1. [arguments]: Remove rust-autocfg-0.1 from cargo-development-inputs. Signed-off-by: Efraim Flashner --- 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 66d3b52d99..10e19d4114 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7689,7 +7689,7 @@ (define-public rust-rand-0.3 (define-public rust-rand-chacha-0.2 (package (name "rust-rand-chacha") - (version "0.2.0") + (version "0.2.1") (source (origin (method url-fetch) @@ -7698,15 +7698,13 @@ (define-public rust-rand-chacha-0.2 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "178d36jfkc4v95s25scc2vibj2hd2hlk64cs6id4hvzg89whd4z1")))) + "0lv8imzzl4h2glm6sjj8mkvasgi8jym23ya48dakyln7m06sk8h3")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-c2-chacha" ,rust-c2-chacha-0.2) - ("rust-rand-core" ,rust-rand-core-0.5)) - #:cargo-development-inputs - (("rust-autocfg" ,rust-autocfg-0.1)))) + ("rust-rand-core" ,rust-rand-core-0.5)))) (home-page "https://crates.io/crates/rand-chacha") (synopsis "ChaCha random number generator") (description "ChaCha random number generator.") -- cgit v1.2.3 From 812ce80adaa0e2174ca9ee6c3a0fc9e2d6e6d0bd Mon Sep 17 00:00:00 2001 From: John Soo Date: Tue, 14 Jan 2020 09:12:54 -0800 Subject: gnu: Update rust-rand-core-0.5 to 0.5.1. * gnu/packages/crates-io.scm (rust-rand-core-0.5): Update to 0.5.1. [arguments]: Remove rust-serde-derive-1.0 from cargo-inputs. Signed-off-by: Efraim Flashner --- 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 10e19d4114..72bc1ad642 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7733,7 +7733,7 @@ (define-public rust-rand-chacha-0.1 (define-public rust-rand-core-0.5 (package (name "rust-rand-core") - (version "0.5.0") + (version "0.5.1") (source (origin (method url-fetch) @@ -7742,14 +7742,13 @@ (define-public rust-rand-core-0.5 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1jis94x9ri8xlxki2w2w5k29sjpfwgzkjylg7paganp74hrnhpk1")))) + "06bdvx08v3rkz451cm7z59xwwqn1rkfh6v9ay77b14f8dwlybgch")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-getrandom" ,rust-getrandom-0.1) - ("rust-serde" ,rust-serde-1.0) - ("rust-serde-derive" ,rust-serde-derive-1.0)))) + ("rust-serde" ,rust-serde-1.0)))) (home-page "https://crates.io/crates/rand-core") (synopsis "Core random number generator traits and tools for implementation") -- cgit v1.2.3 From 2d92286de65845ae8eb13911711f15e9fae684dd Mon Sep 17 00:00:00 2001 From: John Soo Date: Tue, 14 Jan 2020 09:20:57 -0800 Subject: gnu: rust-rand-hc-0.1: Don't hide package. * gnu/packages/crates-io.scm (rust-rand-hc-0.1):[arguments] Skip build. Add urst-rand-core-0.3 to cargo-inputs. [properties] Remove field. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 72bc1ad642..4f88c18877 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7805,11 +7805,13 @@ (define-public rust-rand-hc-0.1 (sha256 (base32 "1i0vl8q5ddvvy0x8hf1zxny393miyzxkwqnw31ifg6p0gdy6fh3v")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs (("rust-rand-core" ,rust-rand-core-0.3)))) (build-system cargo-build-system) (home-page "https://crates.io/crates/rand_hc") (synopsis "HC128 random number generator") (description "HC128 random number generator") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 56beba471bf33e2b831ee3c22a4ac66110521ba8 Mon Sep 17 00:00:00 2001 From: John Soo Date: Tue, 14 Jan 2020 09:22:31 -0800 Subject: gnu: Add rust-rand-hc-0.2. * gnu/packages/crates-io.scm (rust-rand-hc-0.2): New variable. (rust-rand-hc-0.1): Inherit from rust-rand-hc-0.2. Signed-off-by: Efraim Flashner --- 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 4f88c18877..87eaa741d4 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7793,10 +7793,10 @@ (define-public rust-rand-core-0.3 `(#:skip-build? #t #:cargo-inputs (("rand-core" ,rust-rand-core-0.4)))))) -(define-public rust-rand-hc-0.1 +(define-public rust-rand-hc-0.2 (package (name "rust-rand-hc") - (version "0.1.0") + (version "0.2.0") (source (origin (method url-fetch) @@ -7804,17 +7804,36 @@ (define-public rust-rand-hc-0.1 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "1i0vl8q5ddvvy0x8hf1zxny393miyzxkwqnw31ifg6p0gdy6fh3v")))) + "0g31sqwpmsirdlwr0svnacr4dbqyz339im4ssl9738cjgfpjjcfa")))) + (build-system cargo-build-system) (arguments `(#:skip-build? #t - #:cargo-inputs (("rust-rand-core" ,rust-rand-core-0.3)))) - (build-system cargo-build-system) + #:cargo-inputs + (("rust-rand-hc" ,rust-rand-core-0.5)))) (home-page "https://crates.io/crates/rand_hc") (synopsis "HC128 random number generator") - (description "HC128 random number generator") + (description "This package provides a cryptographically secure random number +generator that uses the HC-128 algorithm.") (license (list license:asl2.0 license:expat)))) +(define-public rust-rand-hc-0.1 + (package + (inherit rust-rand-hc-0.2) + (name "rust-rand-hc") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rand_hc" version)) + (file-name (string-append name "-" version ".crate")) + (sha256 + (base32 + "1i0vl8q5ddvvy0x8hf1zxny393miyzxkwqnw31ifg6p0gdy6fh3v")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs (("rust-rand-core" ,rust-rand-core-0.3)))))) + (define-public rust-rand-isaac-0.1 (package (name "rust-rand-isaac") -- cgit v1.2.3 From 544fff4f43f154de0afc0713a0d544c4f305bc3c Mon Sep 17 00:00:00 2001 From: John Soo Date: Tue, 14 Jan 2020 08:34:27 -0800 Subject: gnu: Add rust-crossbeam-utils-0.7. * gnu/packages/crates-io.scm (rust-crossbeam-utils-0.7): New variable. (rust-crossbeam-utils-0.6): Inherit from rust-crossbeam-utils-0.7. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 87eaa741d4..5f74ed3efd 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1955,10 +1955,10 @@ (define-public rust-crossbeam-queue-0.1 #:cargo-development-inputs (("rust-rand" ,rust-rand-0.4)))))) -(define-public rust-crossbeam-utils-0.6 +(define-public rust-crossbeam-utils-0.7 (package (name "rust-crossbeam-utils") - (version "0.6.5") + (version "0.7.0") (source (origin (method url-fetch) @@ -1967,15 +1967,16 @@ (define-public rust-crossbeam-utils-0.6 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0p5aa8k3wpsn17md4rx038ac2azm9354knbxdfvn7dd7yk76yc7q")))) + "1x1rn35q2v05qif14ijfg7800d3rf3ji2cg79awnacfw5jq6si6f")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-cfg-if" ,rust-cfg-if-0.1) + (("rust-autocfg" ,rust-autocfg-0.1) + ("rust-cfg-if" ,rust-cfg-if-0.1) ("rust-lazy-static" ,rust-lazy-static-1.3)) #:cargo-development-inputs - (("rust-rand" ,rust-rand-0.4)))) + (("rust-rand" ,rust-rand-0.6)))) (home-page "https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-utils") (synopsis "Utilities for concurrent programming") @@ -1983,6 +1984,28 @@ (define-public rust-crossbeam-utils-0.6 "Utilities for concurrent programming.") (license (list license:expat license:asl2.0)))) +(define-public rust-crossbeam-utils-0.6 + (package + (inherit rust-crossbeam-utils-0.7) + (name "rust-crossbeam-utils") + (version "0.6.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "crossbeam-utils" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0p5aa8k3wpsn17md4rx038ac2azm9354knbxdfvn7dd7yk76yc7q")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-cfg-if" ,rust-cfg-if-0.1) + ("rust-lazy-static" ,rust-lazy-static-1.3)) + #:cargo-development-inputs + (("rust-rand" ,rust-rand-0.4)))))) + (define-public rust-csv-1.1 (package (name "rust-csv") -- cgit v1.2.3 From d589f0d2bcb52f8d0c3524a72d7586fa39a2e051 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Mon, 20 Jan 2020 11:04:26 +0100 Subject: gnu: sbcl-ironclad: Update to 0.48. * gnu/packages/lisp-xyz.scm (sbcl-ironclad): Update to 0.48. [inputs]: Remove nibbles. --- 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 11ea65656c..d0cc685969 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -1669,7 +1669,7 @@ (define-public ecl-nibbles (define-public sbcl-ironclad (package (name "sbcl-ironclad") - (version "0.46") + (version "0.48") (source (origin (method git-fetch) @@ -1678,7 +1678,7 @@ (define-public sbcl-ironclad (commit (string-append "v" version)))) (sha256 (base32 - "1s391awi2lsl7m1dbjirgpkm4p9p8wd076pakgvsvpn1rrznisnd")) + "1wzczpgvgjc5h8ghz75kxi7iykmqxqchdhgdhkif9j99kyqvbyam")) (file-name (git-file-name name version)))) (build-system asdf-build-system/sbcl) (native-inputs @@ -1686,8 +1686,7 @@ (define-public sbcl-ironclad `(("rt" ,sbcl-rt))) (inputs `(("bordeaux-threads" ,sbcl-bordeaux-threads) - ("flexi-streams" ,sbcl-flexi-streams) - ("nibbles" ,sbcl-nibbles))) + ("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 84efaa3b8ea8913f9a99f40d8d96a62f2dd41b8c Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Mon, 13 Jan 2020 08:46:50 +0100 Subject: gnu: Add python-forbiddenfruit. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-forbiddenfruit): New variable. Signed-off-by: 宋文武 --- 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 f1b0f991c6..887c336883 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17172,3 +17172,32 @@ (define-public python-aionotify (description "@code{aionotify} is a simple, asyncio-based inotify library.") (license license:bsd-3))) + +(define-public python-forbiddenfruit + (package + (name "python-forbiddenfruit") + (version "0.1.3") + (source + (origin + ;; Source tarball on PyPi lacks Makefile that builds and runs tests + (method git-fetch) + (uri (git-reference + (url "https://github.com/clarete/forbiddenfruit") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1fp2xvdqpi910j9r3q68x38phpxbm700gjdi2m2j5gs91xdnyyh2")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "make" "SKIP_DEPS=1")))))) + (native-inputs + `(("python-nose" ,python-nose) + ("python-coverage" ,python-coverage))) + (home-page "https://github.com/clarete/forbiddenfruit") + (synopsis "Patch python built-in objects") + (description "This project allows Python code to extend built-in types.") + (license (list license:gpl3+ license:expat)))) -- cgit v1.2.3 From 9786258b4d6aabd686187c7eae9af5dfb523893a Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Mon, 13 Jan 2020 08:46:49 +0100 Subject: gnu: Add python-shouldbe. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-shouldbe): New variable. Signed-off-by: 宋文武 --- 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 887c336883..eb61d828f9 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17201,3 +17201,25 @@ (define-public python-forbiddenfruit (synopsis "Patch python built-in objects") (description "This project allows Python code to extend built-in types.") (license (list license:gpl3+ license:expat)))) + +(define-public python-shouldbe + (package + (name "python-shouldbe") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "shouldbe" version)) + (sha256 + (base32 + "16zbvjxf71dl4yfbgcr6idyim3mdrfvix1dv8b95p0s9z07372pj")))) + (build-system python-build-system) + (propagated-inputs + `(("python-forbiddenfruit" ,python-forbiddenfruit))) + (native-inputs + `(("python-nose" ,python-nose))) + (home-page "https://github.com/directxman12/should_be") + (synopsis "Python Assertion Helpers inspired by Shouldly") + (description + "Python Assertion Helpers inspired by Shouldly.") + (license license:isc))) -- cgit v1.2.3 From 72c2478add21060d8318ddfe23cf3c16c1b3412b Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Mon, 13 Jan 2020 08:46:51 +0100 Subject: gnu: Add python-k5test. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-k5test): New variable. Signed-off-by: 宋文武 --- gnu/packages/python-xyz.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index eb61d828f9..8dfbc8c363 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -112,6 +112,7 @@ (define-module (gnu packages python-xyz) #:use-module (gnu packages icu4c) #:use-module (gnu packages image) #:use-module (gnu packages imagemagick) + #:use-module (gnu packages kerberos) #:use-module (gnu packages libevent) #:use-module (gnu packages libffi) #:use-module (gnu packages linux) @@ -17223,3 +17224,37 @@ (define-public python-shouldbe (description "Python Assertion Helpers inspired by Shouldly.") (license license:isc))) + +(define-public python-k5test + (package + (name "python-k5test") + (version "0.9.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "k5test" version)) + (sha256 + (base32 + "1lqp3jgfngyhaxjgj3n230hn90wsylwilh120yjf62h7b1s02mh8")))) + (build-system python-build-system) + (propagated-inputs + `(("python-six" ,python-six) + ;; `which`, `kadmin.local` binaries called inside library + ("which" ,which) + ("mit-krb5" ,mit-krb5))) + (native-inputs `(("mit-krb5" ,mit-krb5))) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-paths + (lambda* _ + (substitute* "k5test/realm.py" + (("'kadmin_local'") "'kadmin.local'"))))))) + (home-page "https://github.com/pythongssapi/k5test") + (synopsis "Library for setting up self-contained Kerberos 5 environments") + (description + "@code{k5test} is a library for setting up self-contained Kerberos 5 +environments, and running Python unit tests inside those environments. It is +based on the file of the same name found alongside the MIT Kerberos 5 unit +tests.") + (license license:isc))) -- cgit v1.2.3 From a8ef4978f29c3fb069066430587f331f61432f21 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Mon, 13 Jan 2020 08:46:52 +0100 Subject: gnu: Add python-gssapi. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-gssapi): New variable. Signed-off-by: 宋文武 --- 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 8dfbc8c363..617c3b4c7a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17258,3 +17258,34 @@ (define-public python-k5test based on the file of the same name found alongside the MIT Kerberos 5 unit tests.") (license license:isc))) + +(define-public python-gssapi + (package + (name "python-gssapi") + (version "1.6.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "gssapi" version)) + (sha256 + (base32 + "1gymg4asvwrz7y13qpwp2s5g8qwq179d72gkj09q6bfcgs82l5wr")))) + (build-system python-build-system) + (propagated-inputs + `(("python-decorator" ,python-decorator) + ("python-six" ,python-six))) + (inputs + `(("mit-krb5" ,mit-krb5))) + ;; for tests + (native-inputs + `(("python-shouldbe" ,python-shouldbe) + ("python-parameterized" ,python-parameterized) + ("python-k5test" ,python-k5test) + ("python-nose" ,python-nose))) + (home-page "https://github.com/pythongssapi/python-gssapi") + (synopsis "Python GSSAPI Wrapper") + (description + "Python-GSSAPI provides both low-level and high level wrappers around the +GSSAPI C libraries. While it focuses on the Kerberos mechanism, it should +also be useable with other GSSAPI mechanisms.") + (license license:isc))) -- cgit v1.2.3 From c060511f2fcdd380894e6e5557dad1e89f01a544 Mon Sep 17 00:00:00 2001 From: John Soo Date: Tue, 14 Jan 2020 09:30:42 -0800 Subject: gnu: Add rust-rand-pcg-0.2. * gnu/packages/crates-io.scm (rust-rand-pcg-0.2): New variable. (rust-rand-pcg-0.1): Inherit from rust-rand-pcg-0.2. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5f74ed3efd..3a0263d504 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7950,10 +7950,10 @@ (define-public rust-rand-os-0.1 ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2) ("rust-winapi" ,rust-winapi-0.3)))))) -(define-public rust-rand-pcg-0.1 +(define-public rust-rand-pcg-0.2 (package (name "rust-rand-pcg") - (version "0.1.2") + (version "0.2.1") (source (origin (method url-fetch) @@ -7961,17 +7961,31 @@ (define-public rust-rand-pcg-0.1 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "0i0bdla18a8x4jn1w0fxsbs3jg7ajllz6azmch1zw33r06dv1ydb")))) + "0ab4h6s6x3py833jk61lwadq83qd1c8bih2hgi6yps9rnv0x1aqn")))) (build-system cargo-build-system) (home-page "https://crates.io/crates/rand_pcg") (synopsis - "Selected PCG random number generators") + "Selected PCG random number generators") (description - "Selected PCG random number generators") + "Implements a selection of PCG random number generators.") (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) +(define-public rust-rand-pcg-0.1 + (package + (inherit rust-rand-pcg-0.2) + (name "rust-rand-pcg") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "rand_pcg" version)) + (file-name (string-append name "-" version ".crate")) + (sha256 + (base32 + "0i0bdla18a8x4jn1w0fxsbs3jg7ajllz6azmch1zw33r06dv1ydb")))))) + (define-public rust-rand-xorshift-0.2 (package (name "rust-rand-xorshift") -- cgit v1.2.3 From 91107d058c4d4d1878496697bbc615a91865377d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 19 Jan 2020 12:01:23 +0200 Subject: gnu: rust-rand-pcg-0.1: Don't hide package. * gnu/packages/crates-io.scm (rust-rand-pcg-0.1)[arguments]: Skip build. Add rust-autocfg-0.1, rust-rand-core-0.4, rust-serde-1.0, rust-serde-derive-1.0 to cargo-inputs. Add rust-bincode-1.1 to cargo-development-inputs. [properties]: Don't inherit field. --- gnu/packages/crates-io.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3a0263d504..e88e9e5400 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7984,7 +7984,17 @@ (define-public rust-rand-pcg-0.1 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "0i0bdla18a8x4jn1w0fxsbs3jg7ajllz6azmch1zw33r06dv1ydb")))))) + "0i0bdla18a8x4jn1w0fxsbs3jg7ajllz6azmch1zw33r06dv1ydb")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-autocfg" ,rust-autocfg-0.1) + ("rust-rand-core" ,rust-rand-core-0.4) + ("rust-serde" ,rust-serde-1.0) + ("rust-serde-derive" ,rust-serde-derive-1.0)) + #:cargo-development-inputs + (("rust-bincode" ,rust-bincode-1.1)))) + (properties '()))) (define-public rust-rand-xorshift-0.2 (package -- cgit v1.2.3 From 1261bc7ac855ac1742d515b15d52b8f4516c8a63 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 19 Jan 2020 12:03:13 +0200 Subject: gnu: rust-rand-pcg-0.2: Don't hide package. * gnu/packages/crates-io.scm (rust-rand-pcg-0.2)[arguments]: Skip build. Add rust-rand-core-0.5, rust-serde-1.0 to cargo-inputs. Add rust-bincode-1.1 to cargo-development-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e88e9e5400..73016b6ae4 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7963,12 +7963,18 @@ (define-public rust-rand-pcg-0.2 (base32 "0ab4h6s6x3py833jk61lwadq83qd1c8bih2hgi6yps9rnv0x1aqn")))) (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-rand-core" ,rust-rand-core-0.5) + ("rust-serde" ,rust-serde-1.0)) + #:cargo-development-inputs + (("rust-bincode" ,rust-bincode-1.1)))) (home-page "https://crates.io/crates/rand_pcg") (synopsis "Selected PCG random number generators") (description "Implements a selection of PCG random number generators.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) @@ -7993,8 +7999,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)))) - (properties '()))) + (("rust-bincode" ,rust-bincode-1.1)))))) (define-public rust-rand-xorshift-0.2 (package -- cgit v1.2.3 From eb3cf81cddc8ce1b7ac2b85cce68735978ab4b09 Mon Sep 17 00:00:00 2001 From: John Soo Date: Tue, 14 Jan 2020 09:43:18 -0800 Subject: gnu: Add rust-rayon-core-1.7. * gnu/packages/crates-io.scm (rust-rayon-core-1.7): New variable. (rust-rayon-core-1.5): Inherit from rust-rayon-core-1.7. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 40 ++++++++++++++++++++++++++++++++++------ 1 file changed, 34 insertions(+), 6 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 73016b6ae4..39e43ed771 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8185,10 +8185,10 @@ (define-public rust-rayon-1.1 "Simple work-stealing parallelism for Rust.") (license (list license:asl2.0 license:expat)))) -(define-public rust-rayon-core-1.5 +(define-public rust-rayon-core-1.7 (package (name "rust-rayon-core") - (version "1.5.0") + (version "1.7.0") (source (origin (method url-fetch) @@ -8197,19 +8197,19 @@ (define-public rust-rayon-core-1.5 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1ljva6blaf1wmzvg77h1i9pd0hsmsbbcmdk7sjbw7h2s8gw0vgpb")))) + "1ac55kpnh2390ah7r071vnjbiy308qpznql0n597x5dgxx39pa08")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #: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-crossbeam-queue" ,rust-crossbeam-queue-0.2) + ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.7) ("rust-lazy-static" ,rust-lazy-static-1.3) ("rust-num-cpus" ,rust-num-cpus-1.10)) #:cargo-development-inputs (("rust-libc" ,rust-libc-0.2) - ("rust-rand" ,rust-rand-0.4) + ("rust-rand" ,rust-rand-0.7) ("rust-rand-xorshift" ,rust-rand-xorshift-0.2) ("rust-scoped-tls" ,rust-scoped-tls-1.0)))) (home-page "https://github.com/rayon-rs/rayon") @@ -8217,6 +8217,34 @@ (define-public rust-rayon-core-1.5 (description "Core APIs for Rayon.") (license (list license:expat license:asl2.0)))) +(define-public rust-rayon-core-1.5 + (package + (inherit rust-rayon-core-1.7) + (name "rust-rayon-core") + (version "1.5.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rayon-core" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1ljva6blaf1wmzvg77h1i9pd0hsmsbbcmdk7sjbw7h2s8gw0vgpb")))) + (arguments + `(#:skip-build? #t + #: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.3) + ("rust-num-cpus" ,rust-num-cpus-1.10)) + #:cargo-development-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-rand" ,rust-rand-0.4) + ("rust-rand-xorshift" ,rust-rand-xorshift-0.2) + ("rust-scoped-tls" ,rust-scoped-tls-1.0)))))) + (define-public rust-rdrand-0.4 (package (name "rust-rdrand") -- cgit v1.2.3 From 91b1ff70004f05d6bc54d9985f2dfde5a412f8a9 Mon Sep 17 00:00:00 2001 From: John Soo Date: Tue, 14 Jan 2020 09:46:23 -0800 Subject: gnu: Add rust-rayon-1.3. * gnu/packages/crates-io.scm (rust-rayon-1.3): New variable. (rust-rayon-1.1): Inherit from rust-rayon-1.3. Signed-off-by: Efraim Flashner --- 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 39e43ed771..2120a6398c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8151,8 +8151,42 @@ (define-public rust-rawslice-0.1 accessors.") (license (list license:asl2.0 license:expat)))) +(define-public rust-rayon-1.3 + (package + (name "rust-rayon") + (version "1.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rayon" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1650g13bxlmywhdlw65q3g1zyyb7l0wcm35v45kf31cwgwly6v6v")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-crossbeam-deque" ,rust-crossbeam-deque-0.7) + ("rust-either" ,rust-either-1.5) + ("rust-rayon-core" ,rust-rayon-core-1.7)) + #:cargo-development-inputs + (("rust-doc-comment" ,rust-doc-comment-0.3) + ("rust-docopt" ,rust-docopt-1.1) + ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-rand" ,rust-rand-0.7) + ("rust-rand-xorshift" ,rust-rand-xorshift-0.2) + ("rust-serde" ,rust-serde-1.0)))) + (home-page "https://github.com/rayon-rs/rayon") + (synopsis "Simple work-stealing parallelism for Rust") + (description + "Simple work-stealing parallelism for Rust.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-rayon-1.1 (package + (inherit rust-rayon-1.3) (name "rust-rayon") (version "1.1.0") (source @@ -8164,7 +8198,6 @@ (define-public rust-rayon-1.1 (sha256 (base32 "190hkbcdfvcphyyzkdg52zdia2y9d9yanpm072bmnzbn49p1ic54")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs @@ -8178,12 +8211,7 @@ (define-public rust-rayon-1.1 ("rust-rand" ,rust-rand-0.4) ("rust-rand-xorshift" ,rust-rand-xorshift-0.2) ("rust-serde" ,rust-serde-1.0) - ("rust-serde-derive" ,rust-serde-derive-1.0)))) - (home-page "https://github.com/rayon-rs/rayon") - (synopsis "Simple work-stealing parallelism for Rust") - (description - "Simple work-stealing parallelism for Rust.") - (license (list license:asl2.0 license:expat)))) + ("rust-serde-derive" ,rust-serde-derive-1.0)))))) (define-public rust-rayon-core-1.7 (package -- cgit v1.2.3 From ad30f7dc0138a56effb125faf2e7c3bfbdb84ea0 Mon Sep 17 00:00:00 2001 From: John Soo Date: Wed, 15 Jan 2020 07:24:27 -0800 Subject: gnu: Add rust-libgit2-sys-0.10. * gnu/packages/crates-io.scm (rust-libgit2-sys-0.10): New variable. (rust-libgit2-sys-0.8): Inherit from rust-libgit2-sys-0.10. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2120a6398c..23a2fd5f7d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5054,10 +5054,10 @@ (define-public rust-libc-0.2 (license (list license:expat license:asl2.0)))) -(define-public rust-libgit2-sys-0.8 +(define-public rust-libgit2-sys-0.10 (package (name "rust-libgit2-sys") - (version "0.8.2") + (version "0.10.0") (source (origin (method url-fetch) @@ -5065,7 +5065,7 @@ (define-public rust-libgit2-sys-0.8 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "0y2mibmx7wy91s2kmb2gfb29mrqlqaxpy5wcwr8s1lwws7b9w5sc")) )) + "0l9fvki7qxsl97vgzqwlv75nl213a5vxw7b1jaik97ala356pv6r")))) (build-system cargo-build-system) ;(arguments ; `(#:phases @@ -5092,6 +5092,20 @@ (define-public rust-libgit2-sys-0.8 (license (list license:asl2.0 license:expat)))) +(define-public rust-libgit2-sys-0.8 + (package + (inherit rust-libgit2-sys-0.10) + (name "rust-libgit2-sys") + (version "0.8.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "libgit2-sys" version)) + (file-name (string-append name "-" version ".crate")) + (sha256 + (base32 + "0y2mibmx7wy91s2kmb2gfb29mrqlqaxpy5wcwr8s1lwws7b9w5sc")))))) + (define-public rust-libgit2-sys-0.7 (package (inherit rust-libgit2-sys-0.8) @@ -5104,8 +5118,7 @@ (define-public rust-libgit2-sys-0.7 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "1wcvg2qqra2aviasvqcscl8gb2rnjnd6h998wy5dlmf2bnriqi28")))) - (build-system cargo-build-system))) + "1wcvg2qqra2aviasvqcscl8gb2rnjnd6h998wy5dlmf2bnriqi28")))))) (define-public rust-libloading-0.5 (package -- cgit v1.2.3 From 89e4d2ccdb7ac1092d9de570380420117c5aae05 Mon Sep 17 00:00:00 2001 From: John Soo Date: Tue, 14 Jan 2020 09:38:08 -0800 Subject: gnu: Add rust-rand-0.7. * gnu/packages/crates-io.scm (rust-rand-0.7): New variable. (rust-rand-0.6): Inherit from rust-rand-0.7. Signed-off-by: Efraim Flashner --- 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 23a2fd5f7d..fc26f6146b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7642,8 +7642,44 @@ (define-public rust-quote-0.6 (base32 "1nw0klza45hf127kfyrpxsxd5jw2l6h21qxalil3hkr7bnf7kx7s")))))) +(define-public rust-rand-0.7 + (package + (name "rust-rand") + (version "0.7.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "rand" version)) + (file-name (string-append name "-" version ".crate")) + (sha256 + (base32 + "00sdaimkbz491qgi6qxkv582yivl32m2jd401kzbn94vsiwicsva")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-getrandom" ,rust-getrandom-0.1) + ("rust-libc" ,rust-libc-0.2) + ("rust-log" ,rust-log-0.4) + ("rust-packed-simd" ,rust-packed-simd-0.3) + ("rust-rand-chacha" ,rust-rand-chacha-0.2) + ("rust-rand-core" ,rust-rand-core-0.5) + ("rust-rand-hc" ,rust-rand-hc-0.2) + ("rust-rand-pcg" ,rust-rand-pcg-0.2)) + #:cargo-development-inputs + (("rust-rand-hc" ,rust-rand-hc-0.2) + ("rust-rand-pcg" ,rust-rand-pcg-0.2)))) + (home-page "https://crates.io/crates/rand") + (synopsis "Random number generators and other randomness functionality") + (description + "Rand provides utilities to generate random numbers, to convert them to +useful types and distributions, and some randomness-related algorithms.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-rand-0.6 (package + (inherit rust-rand-0.7) (name "rust-rand") (version "0.6.5") (source @@ -7654,7 +7690,6 @@ (define-public rust-rand-0.6 (sha256 (base32 "1jl4449jcl4wgmzld6ffwqj5gwxrp8zvx8w573g1z368qg6xlwbd")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs @@ -7672,14 +7707,7 @@ (define-public rust-rand-0.6 ("rust-winapi" ,rust-winapi-0.3) ("rust-autocfg" ,rust-autocfg-0.1)) ; build-dependency #:cargo-development-inputs - (("rust-rand-xoshiro" ,rust-rand-xoshiro-0.1)))) - (home-page "https://crates.io/crates/rand") - (synopsis "Random number generators and other randomness functionality") - (description - "Rand provides utilities to generate random numbers, to convert them to -useful types and distributions, and some randomness-related algorithms.") - (license (list license:asl2.0 - license:expat)))) + (("rust-rand-xoshiro" ,rust-rand-xoshiro-0.1)))))) (define-public rust-rand-0.4 (package -- cgit v1.2.3 From 91d81ab2480ddaa2e5d691dcf29328241c1e581b Mon Sep 17 00:00:00 2001 From: John Soo Date: Wed, 15 Jan 2020 07:55:34 -0800 Subject: gnu: rust-term-0.4: Don't hide package. * gnu/packages/crates-io.scm (rust-term-0.4): [arguments] Skip build. Add rust-kernel32-sys-0.2, rust-winapi-0.2 to cargo-inputs. [properties]: Don't inherit field. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index fc26f6146b..7b9730c610 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10476,7 +10476,13 @@ (define-public rust-term-0.4 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "1wbh8ngqkqr3f6wz902yplf60bd5yapnckvrkgmzp5nffi7n8qzs")))))) + "1wbh8ngqkqr3f6wz902yplf60bd5yapnckvrkgmzp5nffi7n8qzs")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-kernel32-sys" ,rust-kernel32-sys-0.2) + ("rust-winapi" ,rust-winapi-0.2)))) + (properties '()))) (define-public rust-termcolor-1.0 (package -- cgit v1.2.3 From a9fd04214bddf15702920c8977bd3fdc9f4c225a Mon Sep 17 00:00:00 2001 From: John Soo Date: Wed, 15 Jan 2020 07:53:47 -0800 Subject: gnu: rust-term-0.5: Don't hide package. * gnu/packages/crates-io.scm (rust-term-0.5):[arguments] Skip build. Add rust-byteorder-1.3, rust-dirs-1.0, rust-winapi-0.3 to cargo-inputs. [properties] Remove field. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7b9730c610..417b3329c3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10456,11 +10456,16 @@ (define-public rust-term-0.5 (base32 "0hkgjrfisj6zjwz525639pmsvzhlc48a0h65nw87qrdp6jihdlgd")))) (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-byteorder" ,rust-byteorder-1.3) + ("rust-dirs" ,rust-dirs-1.0) + ("rust-winapi" ,rust-winapi-0.3)))) (home-page "https://github.com/Stebalien/term") (synopsis "Terminal formatting library") (description "This package provides a terminal formatting library in rust.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) @@ -10481,8 +10486,7 @@ (define-public rust-term-0.4 `(#:skip-build? #t #:cargo-inputs (("rust-kernel32-sys" ,rust-kernel32-sys-0.2) - ("rust-winapi" ,rust-winapi-0.2)))) - (properties '()))) + ("rust-winapi" ,rust-winapi-0.2)))))) (define-public rust-termcolor-1.0 (package -- cgit v1.2.3 From 28c006321ff838188698bc99e135ca0884714c10 Mon Sep 17 00:00:00 2001 From: John Soo Date: Wed, 15 Jan 2020 07:48:52 -0800 Subject: gnu: rust-rustc-test-0.3: Correct cargo-inputs. * gnu/packages/crates-io.scm (rust-rustc-test-0.3)[arguments]: Replace rust-term-0.5 with 0.4 in cargo-inputs. Move rust-rustc-version-0.2 from cargo-development-inputs to cargo-inputs. Signed-off-by: Efraim Flashner --- 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 417b3329c3..a3bdfa0500 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8743,10 +8743,9 @@ (define-public rust-rustc-test-0.3 (("rust-getopts" ,rust-getopts-0.2) ("rust-libc" ,rust-libc-0.2) ("rust-rustc-serialize" ,rust-rustc-serialize-0.3) - ("rust-term" ,rust-term-0.5) - ("rust-time" ,rust-time-0.1)) - #:cargo-development-inputs - (("rust-rustc-version" ,rust-rustc-version-0.2)))) + ("rust-term" ,rust-term-0.4) + ("rust-time" ,rust-time-0.1) + ("rust-rustc-version" ,rust-rustc-version-0.2)))) (home-page "https://github.com/servo/rustc-test") (synopsis "Fork of Rust's test crate") (description -- cgit v1.2.3 From cd088ebe89941ae7188b77b071d951d2cce96447 Mon Sep 17 00:00:00 2001 From: John Soo Date: Wed, 15 Jan 2020 07:40:44 -0800 Subject: gnu: Add rust-idna-0.2. * gnu/packages/crates-io.scm (rust-idna-0.2): New variable. (rust-idna-0.1): Inherit from rust-idna-0.2. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 34 +++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a3bdfa0500..6ec29d61c7 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4490,10 +4490,10 @@ (define-public rust-hostname-0.1 "Get hostname for Rust.") (license license:expat))) -(define-public rust-idna-0.1 +(define-public rust-idna-0.2 (package (name "rust-idna") - (version "0.1.5") + (version "0.2.0") (source (origin (method url-fetch) @@ -4502,7 +4502,7 @@ (define-public rust-idna-0.1 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0kl4gs5kaydn4v07c6ka33spm9qdh2np0x7iw7g5zd8z1c7rxw1q")))) + "1a9066imqpdrm1aavfasdyb1zahqaz8jmdcwdawvb1pf60y6gqh2")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -4511,14 +4511,38 @@ (define-public rust-idna-0.1 ("rust-unicode-bidi" ,rust-unicode-bidi-0.3) ("rust-unicode-normalization" ,rust-unicode-normalization-0.1)) #:cargo-development-inputs - (("rust-rustc-serialize" ,rust-rustc-serialize-0.3) - ("rust-rustc-test" ,rust-rustc-test-0.3)))) + (("rust-rustc-test" ,rust-rustc-test-0.3) + ("rust-serde-json" ,rust-serde-json-1.0)))) (home-page "https://github.com/servo/rust-url/") (synopsis "Internationalizing Domain Names in Applications and Punycode") (description "IDNA (Internationalizing Domain Names in Applications) and Punycode.") (license (list license:expat license:asl2.0)))) +(define-public rust-idna-0.1 + (package + (inherit rust-idna-0.2) + (name "rust-idna") + (version "0.1.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "idna" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0kl4gs5kaydn4v07c6ka33spm9qdh2np0x7iw7g5zd8z1c7rxw1q")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-matches" ,rust-matches-0.1) + ("rust-unicode-bidi" ,rust-unicode-bidi-0.3) + ("rust-unicode-normalization" ,rust-unicode-normalization-0.1)) + #:cargo-development-inputs + (("rust-rustc-serialize" ,rust-rustc-serialize-0.3) + ("rust-rustc-test" ,rust-rustc-test-0.3)))))) + (define-public rust-ignore-0.4 (package (name "rust-ignore") -- cgit v1.2.3 From 4fbc679a13bb5ed0d9ed64a1c60381819482aaae Mon Sep 17 00:00:00 2001 From: John Soo Date: Wed, 15 Jan 2020 08:14:22 -0800 Subject: gnu: rust-time-0.1: Don't hide package. * gnu/packages/crates-io.scm (rust-time-0.1)[arguments]: Skip build. Add rust-libc-0.2, rust-redox-syscall-0.1, rust-rustc-serialize-0.3, rust-winapi-0.3 to cargo-inputs. Add rust-log-0.3, rust-winapi-0.3 to cargo-development-inputs. [home-page] Update url. [properties] Remove field. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6ec29d61c7..c86f972c11 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10732,12 +10732,21 @@ (define-public rust-time-0.1 (base32 "161hqx0gw722ikydanpahky447vaxqncwmkj66rny282vzqpalx1")))) (build-system cargo-build-system) - (home-page "https://github.com/rust-lang-deprecated/time") + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-redox-syscall" ,rust-redox-syscall-0.1) + ("rust-rustc-serialize" ,rust-rustc-serialize-0.3) + ("rust-winapi" ,rust-winapi-0.3)) + #:cargo-development-inputs + (("rust-log" ,rust-log-0.3) + ("rust-winapi" ,rust-winapi-0.3)))) + (home-page "https://github.com/time-rs/time") (synopsis "Simple time handling in Rust") (description "This package provides utilities for working with time-related functions in Rust.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 101aa648d3701800a5c8a2d333d650326e5a0921 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 19 Jan 2020 12:56:51 +0200 Subject: gnu: rust-time-0.1: Update to 0.1.42. * gnu/packages/crates-io.scm (rust-time-0.1): Update to 0.1.42. [arguments]: Replace rust-log-0.3 with 0.4 in 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 c86f972c11..d7dc571f2e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10722,7 +10722,7 @@ (define-public rust-threadpool-1.7 (define-public rust-time-0.1 (package (name "rust-time") - (version "0.1.39") + (version "0.1.42") (source (origin (method url-fetch) @@ -10730,7 +10730,7 @@ (define-public rust-time-0.1 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "161hqx0gw722ikydanpahky447vaxqncwmkj66rny282vzqpalx1")))) + "0vsbvsz0ryxb35dy9j4anxvy8zlaplmjmi0a4z4l64bc135cz3fv")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -10740,7 +10740,7 @@ (define-public rust-time-0.1 ("rust-rustc-serialize" ,rust-rustc-serialize-0.3) ("rust-winapi" ,rust-winapi-0.3)) #:cargo-development-inputs - (("rust-log" ,rust-log-0.3) + (("rust-log" ,rust-log-0.4) ("rust-winapi" ,rust-winapi-0.3)))) (home-page "https://github.com/time-rs/time") (synopsis "Simple time handling in Rust") -- cgit v1.2.3 From f949981b78517d38c47e2b411873c69d44cc50b3 Mon Sep 17 00:00:00 2001 From: John Soo Date: Wed, 15 Jan 2020 08:47:02 -0800 Subject: gnu: Add rust-url-2.1. * gnu/packages/crates-io.scm (rust-url-2.1): New variable. (rust-url-1.7): Inherit from rust-url-2.1. Signed-off-by: Efraim Flashner --- 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 d7dc571f2e..5cc99fe93f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11829,8 +11829,40 @@ (define-public rust-untrusted-0.7 (properties '((hidden? . #t))) (license license:isc))) +(define-public rust-url-2.1 + (package + (name "rust-url") + (version "2.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "url" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1jw7cw8br4xvjb92ddrrh1r7jvqhyhiknnnfpgq9np63fs24m7c2")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-idna" ,rust-idna-0.2) + ("rust-matches" ,rust-matches-0.1) + ("rust-percent-encoding" ,rust-percent-encoding-2.1) + ("rust-serde" ,rust-serde-1.0)) + #:cargo-development-inputs + (("rust-bencher" ,rust-bencher-0.1) + ("rust-rustc-test" ,rust-rustc-test-0.3) + ("rust-serde-json" ,rust-serde-json-1.0)))) + (home-page "https://github.com/servo/rust-url") + (synopsis "URL library for Rust, based on the WHATWG URL Standard") + (description + "URL library for Rust, based on the WHATWG URL Standard.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-url-1.7 (package + (inherit rust-url-2.1) (name "rust-url") (version "1.7.2") (source @@ -11842,7 +11874,6 @@ (define-public rust-url-1.7 (sha256 (base32 "0nim1c90mxpi9wgdw2xh8dqd72vlklwlzam436akcrhjac6pqknx")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs @@ -11857,12 +11888,7 @@ (define-public rust-url-1.7 (("rust-bencher" ,rust-bencher-0.1) ("rust-rustc-serialize" ,rust-rustc-serialize-0.3) ("rust-rustc-test" ,rust-rustc-test-0.3) - ("rust-serde-json" ,rust-serde-json-1.0)))) - (home-page "https://github.com/servo/rust-url") - (synopsis "URL library for Rust, based on the WHATWG URL Standard") - (description - "URL library for Rust, based on the WHATWG URL Standard.") - (license (list license:asl2.0 license:expat)))) + ("rust-serde-json" ,rust-serde-json-1.0)))))) (define-public rust-utf-8-0.7 (package -- cgit v1.2.3 From a3c031ce4353a7fbe246b912d40653d17d9e2838 Mon Sep 17 00:00:00 2001 From: John Soo Date: Wed, 15 Jan 2020 09:03:28 -0800 Subject: gnu: Add rust-git2-0.11. * gnu/packages/crates-io.scm (rust-git2-0.11): New variable. (rust-git2-0.9): Inherit from rust-git2-0.11. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 44 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 6 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5cc99fe93f..6c3740f5d3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3827,10 +3827,10 @@ (define-public rust-gimli-0.18 DWARF debugging format.") (license (list license:asl2.0 license:expat)))) -(define-public rust-git2-0.9 +(define-public rust-git2-0.11 (package (name "rust-git2") - (version "0.9.1") + (version "0.11.0") (source (origin (method url-fetch) @@ -3839,23 +3839,23 @@ (define-public rust-git2-0.9 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0cayf5w7wkvclvs8brbi7lyfxbdklwls9s49mpf2brl655yjwjwj")))) + "1i0fgsr91r97hsjbgqnymkcyiyg0057m7m04116k3vmyqpvrwlbp")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) ("rust-libc" ,rust-libc-0.2) - ("rust-libgit2-sys" ,rust-libgit2-sys-0.8) + ("rust-libgit2-sys" ,rust-libgit2-sys-0.10) ("rust-log" ,rust-log-0.4) ("rust-openssl-probe" ,rust-openssl-probe-0.1) ("rust-openssl-sys" ,rust-openssl-sys-0.9) - ("rust-url" ,rust-url-1.7)) + ("rust-url" ,rust-url-2.1)) #:cargo-development-inputs (("rust-docopt" ,rust-docopt-1.1) ("rust-serde" ,rust-serde-1.0) ("rust-serde-derive" ,rust-serde-derive-1.0) - ("rust-tempdir" ,rust-tempdir-0.3) + ("rust-tempfile" ,rust-tempfile-3.1) ("rust-thread-id" ,rust-thread-id-3.3) ("rust-time" ,rust-time-0.1)))) (home-page "https://github.com/rust-lang/git2-rs") @@ -3866,6 +3866,38 @@ (define-public rust-git2-0.9 reading and writing git repositories.") (license (list license:asl2.0 license:expat)))) +(define-public rust-git2-0.9 + (package + (inherit rust-git2-0.11) + (name "rust-git2") + (version "0.9.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "git2" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0cayf5w7wkvclvs8brbi7lyfxbdklwls9s49mpf2brl655yjwjwj")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-libgit2-sys" ,rust-libgit2-sys-0.8) + ("rust-log" ,rust-log-0.4) + ("rust-openssl-probe" ,rust-openssl-probe-0.1) + ("rust-openssl-sys" ,rust-openssl-sys-0.9) + ("rust-url" ,rust-url-1.7)) + #:cargo-development-inputs + (("rust-docopt" ,rust-docopt-1.1) + ("rust-serde" ,rust-serde-1.0) + ("rust-serde-derive" ,rust-serde-derive-1.0) + ("rust-tempdir" ,rust-tempdir-0.3) + ("rust-thread-id" ,rust-thread-id-3.3) + ("rust-time" ,rust-time-0.1)))))) + (define-public rust-glob-0.3 (package (name "rust-glob") -- cgit v1.2.3 From b1ae24c9a4dc199bd817d678f10b6e6aedfcd2ed Mon Sep 17 00:00:00 2001 From: John Soo Date: Wed, 15 Jan 2020 08:59:27 -0800 Subject: gnu: Add rust-tempfile-3.1. * gnu/packages/crates-io.scm (rust-tempfile-3.1): New variable. (rust-tempfile-3.0): Inherit from rust-tempfile-3.1. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6c3740f5d3..e411d110b9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10437,10 +10437,10 @@ (define-public rust-tempdir-0.3 (license (list license:asl2.0 license:expat)))) -(define-public rust-tempfile-3.0 +(define-public rust-tempfile-3.1 (package (name "rust-tempfile") - (version "3.0.8") + (version "3.1.0") (source (origin (method url-fetch) @@ -10448,14 +10448,14 @@ (define-public rust-tempfile-3.0 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "1vqk7aq2l04my2r3jiyyxirnf8f90nzcvjasvrajivb85s7p7i3x")))) + "1a9cfdqw70n7bcnkx05aih9xdba8lqazmqlkjpkmn2la6gcj8vks")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-0.1) ("rust-libc" ,rust-libc-0.2) - ("rust-rand" ,rust-rand-0.6) + ("rust-rand" ,rust-rand-0.7) ("rust-redox-syscall" ,rust-redox-syscall-0.1) ("rust-remove-dir-all" ,rust-remove-dir-all-0.5) ("rust-winapi" ,rust-winapi-0.3)))) @@ -10467,6 +10467,29 @@ (define-public rust-tempfile-3.0 (license (list license:asl2.0 license:expat)))) +(define-public rust-tempfile-3.0 + (package + (inherit rust-tempfile-3.1) + (name "rust-tempfile") + (version "3.0.8") + (source + (origin + (method url-fetch) + (uri (crate-uri "tempfile" version)) + (file-name (string-append name "-" version ".crate")) + (sha256 + (base32 + "1vqk7aq2l04my2r3jiyyxirnf8f90nzcvjasvrajivb85s7p7i3x")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-cfg-if" ,rust-cfg-if-0.1) + ("rust-libc" ,rust-libc-0.2) + ("rust-rand" ,rust-rand-0.6) + ("rust-redox-syscall" ,rust-redox-syscall-0.1) + ("rust-remove-dir-all" ,rust-remove-dir-all-0.5) + ("rust-winapi" ,rust-winapi-0.3)))))) + (define-public rust-tendril-0.4 (package (name "rust-tendril") -- cgit v1.2.3 From 1ff4d9cbcaa7dcc3b06a857350ab7bf294d6b75a Mon Sep 17 00:00:00 2001 From: John Soo Date: Wed, 15 Jan 2020 09:31:56 -0800 Subject: gnu: rust-toml-0.5: Update to 0.5.6. * gnu/packages/crates-io.scm (rust-toml-0.5): Update to 0.5.6. [arguments]: Skip build. Add rust-indexmap-1.0, rust-serde-1.0 to cargo-inputs. Add rust-serde-derive-1.0, rust-serde-json-1.0 to cargo-development-inputs. [properties]: Remove field. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e411d110b9..a65207ef0d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11339,7 +11339,7 @@ (define-public rust-tokio-uds-0.2 (define-public rust-toml-0.5 (package (name "rust-toml") - (version "0.5.3") + (version "0.5.6") (source (origin (method url-fetch) @@ -11347,8 +11347,16 @@ (define-public rust-toml-0.5 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "093p48vpqm4bb8q3514xsij0dkljxlr3jp9ypxr4p48xjisvxan7")))) + "06n7j8z63hj6g0kj2x6sqwxnm4q3s0q5d873bdk41vqy1cb2vjgz")))) (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-indexmap" ,rust-indexmap-1.0) + ("rust-serde" ,rust-serde-1.0)) + #:cargo-development-inputs + (("rust-serde-derive" ,rust-serde-derive-1.0) + ("rust-serde-json" ,rust-serde-json-1.0)))) (home-page "https://github.com/alexcrichton/toml-rs") (synopsis "Rust encoder and decoder of TOML-formatted files and streams") (description @@ -11356,7 +11364,6 @@ (define-public rust-toml-0.5 files and streams. Provides implementations of the standard Serialize/Deserialize traits for TOML data to facilitate deserializing and serializing Rust structures.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 2157f749ec6d52c1287032da383dd1c4d9b9d61d Mon Sep 17 00:00:00 2001 From: John Soo Date: Wed, 15 Jan 2020 09:44:45 -0800 Subject: gnu: rust-memchr-2.2: Update to 2.2.1. * gnu/packages/crates-io.scm (rust-memchr-2.2): Update to 2.2.1. 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 a65207ef0d..dc358877f2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5525,7 +5525,7 @@ (define-public rust-md5-0.6 (define-public rust-memchr-2.2 (package (name "rust-memchr") - (version "2.2.0") + (version "2.2.1") (source (origin (method url-fetch) @@ -5534,7 +5534,7 @@ (define-public rust-memchr-2.2 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0f8wdra7yaggsr4jzlrvpd8yknnqhd990iijdr6llgc8gk2ppz1f")))) + "13j6ji9x9ydpi9grbss106gqqr3xn3bcfp28aydqfa4751qrfmw8")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t -- cgit v1.2.3 From 166aca480e1bdc0932a3d0427d00fcb138bcf907 Mon Sep 17 00:00:00 2001 From: John Soo Date: Wed, 15 Jan 2020 09:36:59 -0800 Subject: gnu: Add rust-hex-0.4. * gnu/packages/crates-io.scm (rust-hex-0.4): New variable. (rust-hex-0.3): Inherit from rust-hex-0.4. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index dc358877f2..7fb93494c2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4303,18 +4303,19 @@ (define-public rust-heapsize-plugin-0.1 total runtime size of an object on the heap") (license license:mpl2.0))) -(define-public rust-hex-0.3 +(define-public rust-hex-0.4 (package (name "rust-hex") - (version "0.3.2") + (version "0.4.0") (source (origin (method url-fetch) (uri (crate-uri "hex" version)) - (file-name (string-append name "-" version ".crate")) + (file-name + (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0xsdcjiik5j750j67zk42qdnmm4ahirk3gmkmcqgq7qls2jjcl40")))) + "0glsfrx2pxfsf6ivxj7vfrvd7g78j4z47ssgm5idm8p376z3jfq2")))) (build-system cargo-build-system) (arguments '(#:skip-build? #t)) (home-page "https://github.com/KokaKiwi/rust-hex") @@ -4324,6 +4325,20 @@ (define-public rust-hex-0.3 (license (list license:asl2.0 license:expat)))) +(define-public rust-hex-0.3 + (package + (inherit rust-hex-0.4) + (name "rust-hex") + (version "0.3.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "hex" version)) + (file-name (string-append name "-" version ".crate")) + (sha256 + (base32 + "0xsdcjiik5j750j67zk42qdnmm4ahirk3gmkmcqgq7qls2jjcl40")))))) + (define-public rust-hex-literal-0.2 (package (name "rust-hex-literal") -- cgit v1.2.3 From a842e3625990a2e90ffd5a6114526b1a81a6c4cb Mon Sep 17 00:00:00 2001 From: John Soo Date: Wed, 15 Jan 2020 09:45:54 -0800 Subject: gnu: Add rust-lazy-static-1.4. * gnu/packages/crates-io.scm (rust-lazy-static-1.4): New variable. (rust-lazy-static-1.3): Inherit from rust-lazy-static-1.4. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7fb93494c2..e2a835e264 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5009,10 +5009,10 @@ (define-public rust-language-tags-0.2 language tags.") (license license:expat))) -(define-public rust-lazy-static-1.3 +(define-public rust-lazy-static-1.4 (package (name "rust-lazy-static") - (version "1.3.0") + (version "1.4.0") (source (origin (method url-fetch) @@ -5020,11 +5020,13 @@ (define-public rust-lazy-static-1.3 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "052ac27w189hrf1j3hz7sga46rp84zl2hqnzyihxv78mgzr2jmxw")))) + "0in6ikhw8mgl33wjv6q6xfrb5b9jr16q8ygjy803fay4zcisvaz2")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t - #:cargo-inputs (("rust-spin" ,rust-spin-0.5)))) + #:cargo-inputs (("rust-spin" ,rust-spin-0.5)) + #:cargo-development-inputs + (("rust-doc-comment" ,rust-doc-comment-0.3)))) (home-page "https://github.com/rust-lang-nursery/lazy-static.rs") (synopsis "Macro for declaring lazily evaluated statics in Rust") (description @@ -5036,6 +5038,23 @@ (define-public rust-lazy-static-1.3 (license (list license:asl2.0 license:expat)))) +(define-public rust-lazy-static-1.3 + (package + (inherit rust-lazy-static-1.4) + (name "rust-lazy-static") + (version "1.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "lazy_static" version)) + (file-name (string-append name "-" version ".crate")) + (sha256 + (base32 + "052ac27w189hrf1j3hz7sga46rp84zl2hqnzyihxv78mgzr2jmxw")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs (("rust-spin" ,rust-spin-0.5)))))) + (define-public rust-lazycell-1.2 (package (name "rust-lazycell") -- cgit v1.2.3 From 7e7fd7fadc0923b0884a2666a92c45ae80bae926 Mon Sep 17 00:00:00 2001 From: John Soo Date: Wed, 15 Jan 2020 09:48:22 -0800 Subject: gnu: Add rust-humantime-1.3. * gnu/packages/crates-io.scm (rust-humantime-1.3): New variable. (rust-humantime-1.2): Inherit from rust-humantime-1.3. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e2a835e264..639446878d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4482,10 +4482,10 @@ (define-public rust-httparse-1.3 "This package provides a tiny, safe, speedy, zero-copy HTTP/1.x parser.") (license (list license:asl2.0 license:expat)))) -(define-public rust-humantime-1.2 +(define-public rust-humantime-1.3 (package (name "rust-humantime") - (version "1.2.0") + (version "1.3.0") (source (origin (method url-fetch) @@ -4494,7 +4494,7 @@ (define-public rust-humantime-1.2 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "057ilhy6vc9iqhhby5ymh45m051pgxwq2z437gwkbnqhw7rfb9rw")))) + "0krwgbf35pd46xvkqg14j070vircsndabahahlv3rwhflpy4q06z")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -4504,8 +4504,7 @@ (define-public rust-humantime-1.2 (("rust-chrono" ,rust-chrono-0.4) ("rust-rand" ,rust-rand-0.4) ("rust-time" ,rust-time-0.1)))) - (home-page - "https://github.com/tailhook/humantime") + (home-page "https://github.com/tailhook/humantime") (synopsis "Parser and formatter for Duration and SystemTime") (description @@ -4513,6 +4512,21 @@ (define-public rust-humantime-1.2 SystemTime}}.") (license (list license:expat license:asl2.0)))) +(define-public rust-humantime-1.2 + (package + (inherit rust-humantime-1.3) + (name "rust-humantime") + (version "1.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "humantime" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "057ilhy6vc9iqhhby5ymh45m051pgxwq2z437gwkbnqhw7rfb9rw")))))) + (define-public rust-hostname-0.1 (package (name "rust-hostname") -- cgit v1.2.3 From 8328cf26401ad714dd57e9245ce190e16f997204 Mon Sep 17 00:00:00 2001 From: John Soo Date: Wed, 15 Jan 2020 09:48:50 -0800 Subject: gnu: Add rust-env-logger-0.7. * gnu/packages/crates-io.scm (rust-env-logger-0.7): New variable. (rust-env-logger-0.6): Inherit from rust-env-logger-0.7. Signed-off-by: Efraim Flashner --- 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 639446878d..63c0f682e6 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2758,10 +2758,10 @@ (define-public rust-encoding-rs-io-0.1 "Streaming transcoding for encoding_rs.") (license (list license:asl2.0 license:expat)))) -(define-public rust-env-logger-0.6 +(define-public rust-env-logger-0.7 (package (name "rust-env-logger") - (version "0.6.2") + (version "0.7.1") (source (origin (method url-fetch) @@ -2770,25 +2770,46 @@ (define-public rust-env-logger-0.6 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1lx2s5nk96xx4i3m4zc4ghqgi8kb07dsnyiv8jk2clhax42dxz5a")))) + "0djx8h8xfib43g5w94r1m1mkky5spcw4wblzgnhiyg5vnfxknls4")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-atty" ,rust-atty-0.2) - ("rust-humantime" ,rust-humantime-1.2) + ("rust-humantime" ,rust-humantime-1.3) ("rust-log" ,rust-log-0.4) ("rust-regex" ,rust-regex-1.1) ("rust-termcolor" ,rust-termcolor-1.0)))) - (home-page - "https://github.com/sebasmagri/env_logger/") - (synopsis - "Logging implementation for @code{log}") + (home-page "https://github.com/sebasmagri/env_logger/") + (synopsis "Logging implementation for @code{log}") (description "This package provides a logging implementation for @code{log} which is configured via an environment variable.") (license (list license:expat license:asl2.0)))) +(define-public rust-env-logger-0.6 + (package + (inherit rust-env-logger-0.7) + (name "rust-env-logger") + (version "0.6.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "env_logger" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1lx2s5nk96xx4i3m4zc4ghqgi8kb07dsnyiv8jk2clhax42dxz5a")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-atty" ,rust-atty-0.2) + ("rust-humantime" ,rust-humantime-1.2) + ("rust-log" ,rust-log-0.4) + ("rust-regex" ,rust-regex-1.1) + ("rust-termcolor" ,rust-termcolor-1.0)))))) + (define-public rust-envmnt-0.6 (package (name "rust-envmnt") -- cgit v1.2.3 From 2cd2cb2b92061aa93d279d5ab7c7921cb2e199e7 Mon Sep 17 00:00:00 2001 From: John Soo Date: Wed, 15 Jan 2020 09:54:28 -0800 Subject: gnu: rust-grep-searcher-0.1: Update to 0.1.6. * gnu/packages/crates-io.scm (rust-grep-searcher-0.1): Update to 0.1.6. 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 63c0f682e6..e1c421a877 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4205,7 +4205,7 @@ (define-public rust-grep-regex-0.1 (define-public rust-grep-searcher-0.1 (package (name "rust-grep-searcher") - (version "0.1.5") + (version "0.1.6") (source (origin (method url-fetch) @@ -4214,7 +4214,7 @@ (define-public rust-grep-searcher-0.1 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0pj85m7q6k6jpl3q57v1gwq5jxmqnza2xg7jjcxky3q325z8lcjy")))) + "09ag16im12v6k0lzkyvbvamn1iw15kfx1jbfldb7z5xa7208l04a")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t -- cgit v1.2.3 From b42899c29c35d97c9f860642759303781e41e7ad Mon Sep 17 00:00:00 2001 From: John Soo Date: Wed, 15 Jan 2020 09:50:57 -0800 Subject: gnu: Add rust-crossbeam-channel-0.4. * gnu/packages/crates-io.scm (rust-crossbeam-channel-0.4): New variable. (rust-crossbeam-channel-0.3): Inherit from rust-crossbeam-channel-0.4. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 45 ++++++++++++++++++++++++++++++++++----------- 1 file changed, 34 insertions(+), 11 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e1c421a877..4c50ee5474 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1773,8 +1773,41 @@ (define-public rust-crossbeam-0.7 (description "Tools for concurrent programming.") (license (list license:expat license:asl2.0)))) +(define-public rust-crossbeam-channel-0.4 + (package + (name "rust-crossbeam-channel") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "crossbeam-channel" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "135ncx9680afs8jkjz8g3iq3naay9rn7942gxrdg2n9m1cxrmv5c")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-crossbeam-utils" ,rust-crossbeam-utils-0.7)) + #:cargo-development-inputs + (("rust-num-cpus" ,rust-num-cpus-1.10) + ("rust-rand" ,rust-rand-0.6) + ("rust-signal-hook" ,rust-signal-hook-0.1)))) + (home-page + "https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-channel") + (synopsis + "Multi-producer multi-consumer channels for message passing") + (description + "Multi-producer multi-consumer channels for message passing.") + (license (list license:expat + license:asl2.0 + license:bsd-2)))) + (define-public rust-crossbeam-channel-0.3 (package + (inherit rust-crossbeam-channel-0.4) (name "rust-crossbeam-channel") (version "0.3.8") (source @@ -1786,7 +1819,6 @@ (define-public rust-crossbeam-channel-0.3 (sha256 (base32 "0azpymyk0ld4akrjfy69ck5pzfgz1f2gb3smm2ywld92vsjd23hg")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs @@ -1794,16 +1826,7 @@ (define-public rust-crossbeam-channel-0.3 ("rust-smallvec" ,rust-smallvec-0.6)) #:cargo-development-inputs (("rust-rand" ,rust-rand-0.4) - ("rust-signal-hook" ,rust-signal-hook-0.1)))) - (home-page - "https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-channel") - (synopsis - "Multi-producer multi-consumer channels for message passing") - (description - "Multi-producer multi-consumer channels for message passing.") - (license (list license:expat - license:asl2.0 - license:bsd-2)))) + ("rust-signal-hook" ,rust-signal-hook-0.1)))))) (define-public rust-crossbeam-deque-0.7 (package -- cgit v1.2.3 From 9448d0effc5648f4ddad1bce4fe54323af3532a6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 19 Jan 2020 21:42:17 +0200 Subject: gnu: rust-crossbeam-channel-0.3: Update to 0.3.9. * gnu/packages/crates-io.scm (rust-crossbeam-channel-0.3)[arguments]: Remove rust-smallvec-0.6 from cargo-inputs. Add rust-rust-num-cpus-1.10 to cargo-development-inputs. Replace rust-rand-0.4 with 0.6. --- 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 4c50ee5474..dd75d462f6 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1809,7 +1809,7 @@ (define-public rust-crossbeam-channel-0.3 (package (inherit rust-crossbeam-channel-0.4) (name "rust-crossbeam-channel") - (version "0.3.8") + (version "0.3.9") (source (origin (method url-fetch) @@ -1818,14 +1818,14 @@ (define-public rust-crossbeam-channel-0.3 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0azpymyk0ld4akrjfy69ck5pzfgz1f2gb3smm2ywld92vsjd23hg")))) + "1ylyzb1m9qbvd1nd3vy38x9073wdmcy295ncjs7wf7ap476pzv68")))) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-crossbeam-utils" ,rust-crossbeam-utils-0.6) - ("rust-smallvec" ,rust-smallvec-0.6)) + (("rust-crossbeam-utils" ,rust-crossbeam-utils-0.6)) #:cargo-development-inputs - (("rust-rand" ,rust-rand-0.4) + (("rust-num-cpus" ,rust-num-cpus-1.10) + ("rust-rand" ,rust-rand-0.6) ("rust-signal-hook" ,rust-signal-hook-0.1)))))) (define-public rust-crossbeam-deque-0.7 -- cgit v1.2.3 From 19b310901c9d798722e6be849e335efc1fee0384 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sun, 5 Jan 2020 13:51:02 +0100 Subject: services: Add "sane" service. * gnu/services/desktop.scm (%desktop-services): Add "sane" service. --- gnu/services/desktop.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index 1be05fda4e..dec1c3fa0f 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -48,6 +48,7 @@ (define-module (gnu services desktop) #:use-module (gnu packages xfce) #:use-module (gnu packages avahi) #:use-module (gnu packages xdisorg) + #:use-module (gnu packages scanner) #:use-module (gnu packages suckless) #:use-module (gnu packages linux) #:use-module (gnu packages libusb) @@ -1154,6 +1155,8 @@ (define %desktop-services ;; Add udev rules for MTP devices so that non-root users can access ;; them. (simple-service 'mtp udev-service-type (list libmtp)) + ;; Add udev rules for scanners. + (simple-service 'sane udev-service-type (list sane-backends-minimal)) ;; Add polkit rules, so that non-root users in the wheel group can ;; perform administrative tasks (similar to "sudo"). polkit-wheel-service -- cgit v1.2.3 From 147a7f1fd2c33058600eda17153911cd36cc9c3f Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 20 Jan 2020 19:01:23 +0000 Subject: services: getmail: Fix stopping the shepherd service. * gnu/services/getmail.scm (getmail-shepherd-services): Add a stop component to the shepherd services. --- gnu/services/getmail.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/services/getmail.scm b/gnu/services/getmail.scm index b3d86cb65c..218e018b05 100644 --- a/gnu/services/getmail.scm +++ b/gnu/services/getmail.scm @@ -360,7 +360,8 @@ (define (getmail-shepherd-services configs) (list #$@environment-variables) #:log-file #$(string-append "/var/log/getmail-" - (symbol->string name))))))) + (symbol->string name)))) + (stop #~(make-kill-destructor))))) configs)) (define getmail-service-type -- cgit v1.2.3 From 2e1a31487122aa841d513c212f65d47294a927a6 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 20 Jan 2020 19:02:32 +0000 Subject: services: getmail: Fix some configuration documentation strings. * gnu/services/getmail.scm (getmail-retriever-configuration): Specify proper documentation strings for some of the fields. * doc/guix.texi (Mail Services): Update the documentation accordingly. --- doc/guix.texi | 14 +++++++------- gnu/services/getmail.scm | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index dea4584286..25dc8b9124 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -17715,21 +17715,21 @@ Defaults to @samp{"SimpleIMAPSSLRetriever"}. @end deftypevr @deftypevr {@code{getmail-retriever-configuration} parameter} string server -Space separated list of arguments to the userdb driver. +Username to login to the mail server with. Defaults to @samp{unset}. @end deftypevr @deftypevr {@code{getmail-retriever-configuration} parameter} string username -Space separated list of arguments to the userdb driver. +Username to login to the mail server with. Defaults to @samp{unset}. @end deftypevr @deftypevr {@code{getmail-retriever-configuration} parameter} non-negative-integer port -Space separated list of arguments to the userdb driver. +Port number to connect to. Defaults to @samp{#f}. @@ -17750,28 +17750,28 @@ Defaults to @samp{()}. @end deftypevr @deftypevr {@code{getmail-retriever-configuration} parameter} string keyfile -PEM-formatted key file to use for the TLS negotiation +PEM-formatted key file to use for the TLS negotiation. Defaults to @samp{""}. @end deftypevr @deftypevr {@code{getmail-retriever-configuration} parameter} string certfile -PEM-formatted certificate file to use for the TLS negotiation +PEM-formatted certificate file to use for the TLS negotiation. Defaults to @samp{""}. @end deftypevr @deftypevr {@code{getmail-retriever-configuration} parameter} string ca-certs -CA certificates to use +CA certificates to use. Defaults to @samp{""}. @end deftypevr @deftypevr {@code{getmail-retriever-configuration} parameter} parameter-alist extra-parameters -Extra retriever parameters +Extra retriever parameters. Defaults to @samp{()}. diff --git a/gnu/services/getmail.scm b/gnu/services/getmail.scm index 218e018b05..93e0ab1add 100644 --- a/gnu/services/getmail.scm +++ b/gnu/services/getmail.scm @@ -112,13 +112,13 @@ (define-configuration getmail-retriever-configuration @samp{passwd} and @samp{static}.") (server (string 'unset) - "Space separated list of arguments to the userdb driver.") + "Name or IP adddress of the server to retrieve mail from.") (username (string 'unset) - "Space separated list of arguments to the userdb driver.") + "Username to login to the mail server with.") (port (non-negative-integer #f) - "Space separated list of arguments to the userdb driver.") + "Port number to connect to.") (password (string "") "Override fields from passwd.") @@ -127,16 +127,16 @@ (define-configuration getmail-retriever-configuration "Override fields from passwd.") (keyfile (string "") - "PEM-formatted key file to use for the TLS negotiation") + "PEM-formatted key file to use for the TLS negotiation.") (certfile (string "") - "PEM-formatted certificate file to use for the TLS negotiation") + "PEM-formatted certificate file to use for the TLS negotiation.") (ca-certs (string "") - "CA certificates to use") + "CA certificates to use.") (extra-parameters (parameter-alist '()) - "Extra retriever parameters")) + "Extra retriever parameters.")) (define (serialize-getmail-destination-configuration field-name val) (serialize-configuration val getmail-destination-configuration-fields)) -- cgit v1.2.3 From c8defb2b2a4daf370497e6be1047a1fcf82143e1 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 20 Jan 2020 19:02:49 +0000 Subject: services: getmail: Adjust a couple of default configuration values. Change the message-log-syslog and message-log-verbose configuration values to match the Getmail defaults. * gnu/services/getmail.scm (getmail-options-configuration): Change defaults for message-log-syslog and message-log-verbose * doc/guix.texi (Mail Services): Update the Getmail documentation accordingly. --- doc/guix.texi | 4 ++-- gnu/services/getmail.scm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 25dc8b9124..2b5bfc6cb7 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -17902,7 +17902,7 @@ Defaults to @samp{""}. If true, getmail will record a log of its actions using the system logger. -Defaults to @samp{#t}. +Defaults to @samp{#f}. @end deftypevr @@ -17911,7 +17911,7 @@ If true, getmail will log information about messages not retrieved and the reason for not retrieving them, as well as starting and ending information lines. -Defaults to @samp{#t}. +Defaults to @samp{#f}. @end deftypevr diff --git a/gnu/services/getmail.scm b/gnu/services/getmail.scm index 93e0ab1add..7d77888517 100644 --- a/gnu/services/getmail.scm +++ b/gnu/services/getmail.scm @@ -203,11 +203,11 @@ (define-configuration getmail-options-configuration "Getmail will record a log of its actions to the named file. A value of @samp{\"\"} disables this feature.") (message-log-syslog - (boolean #t) + (boolean #f) "If true, getmail will record a log of its actions using the system logger.") (message-log-verbose - (boolean #t) + (boolean #f) "If true, getmail will log information about messages not retrieved and the reason for not retrieving them, as well as starting and ending information lines.") -- cgit v1.2.3 From b3e28b5ef5e23e564eeac8823ad2c837f7c40650 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 20 Jan 2020 19:05:30 +0000 Subject: tests: mail: Remove %getmail-os from the bottom of the file. This was left over when debugging the system test. * gnu/tests/mail.scm: Remove %getmail-os from the bottom of the file. --- gnu/tests/mail.scm | 2 -- 1 file changed, 2 deletions(-) diff --git a/gnu/tests/mail.scm b/gnu/tests/mail.scm index f064da5f53..bb446da8f9 100644 --- a/gnu/tests/mail.scm +++ b/gnu/tests/mail.scm @@ -572,5 +572,3 @@ (define %test-getmail (name "getmail") (description "Connect to a running Getmail server.") (value (run-getmail-test)))) - -%getmail-os -- cgit v1.2.3 From aa10ad7d4605ae27a925a9b78b1090f737d9865f Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 20 Jan 2020 20:30:25 +0000 Subject: gnu: guix-data-service: Update to 0.0.1-17.bf25a8d. * gnu/packages/web.scm (guix-data-service): Update to 0.0.1-17.bf25a8d. --- gnu/packages/web.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 9b568adb96..feeb3dac01 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -24,7 +24,7 @@ ;;; Copyright © 2017 Petter ;;; Copyright © 2017 Pierre Langlois ;;; Copyright © 2017 Rutger Helling -;;; Copyright © 2017, 2019 Christopher Baines +;;; Copyright © 2017, 2019, 2020 Christopher Baines ;;; Copyright © 2018, 2019 Julien Lepiller ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2018 Gábor Boskovits @@ -4239,8 +4239,8 @@ (define-public python2-feedparser (package-with-python2 python-feedparser)) (define-public guix-data-service - (let ((commit "c7e3a1bd0b0648561211f52bd9f674358da59223") - (revision "16")) + (let ((commit "bf25a8db0278b49ef2149c69ef5d6dd2201fd413") + (revision "17")) (package (name "guix-data-service") (version (string-append "0.0.1-" revision "." (string-take commit 7))) @@ -4252,7 +4252,7 @@ (define-public guix-data-service (file-name (git-file-name name version)) (sha256 (base32 - "08c6bpzmsh62ng4bx008xcgayrrxz815jbpb96n98didk2zyzfg0")))) + "0s6faybczdn10zwrkn22nfq5lvf538513hbmjfaqlkhfmwc4s1qd")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) -- cgit v1.2.3 From 20bf58bff470bfacb16cb5c1fd731c707f8dd077 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 16 Jan 2020 22:06:54 +0100 Subject: gnu: python-packaging: Add comment about upstream patch status. * gnu/packages/python-xyz.scm (python-packaging)[source]: Add comment, to prevent needless rebuild by updating the patch directly. --- gnu/packages/python-xyz.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 617c3b4c7a..dce1dddfba 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13059,6 +13059,8 @@ (define-public python-packaging (origin (method url-fetch) (uri (pypi-uri "packaging" version)) + ;; XXX: The URL in the patch file is wrong, it should be + ;; . (patches (search-patches "python-packaging-test-arch.patch")) (sha256 (base32 -- cgit v1.2.3 From 544ea9c2df82bd737319b29a0e4f9b2f39c6321a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Jan 2020 20:23:18 +0100 Subject: gnu: Add python-anytree. * gnu/packages/python-xyz.scm (python-anytree): New public 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 dce1dddfba..715a0109f7 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2584,6 +2584,30 @@ (define-public python-daemon ;; Only setup.py is gpl3+, everything else is apache 2.0 licensed. (license (list license:asl2.0 license:gpl3+)))) +(define-public python-anytree + (package + (name "python-anytree") + (version "2.8.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "anytree" version)) + (sha256 + (base32 + "1aycpc387wqz7h9w2p53qxn43qsh3m6by6ak4kkc66x9aprr63rz")))) + (build-system python-build-system) + (propagated-inputs + `(("python-six" ,python-six))) + (native-inputs + `(;; For tests. + ("graphviz" ,graphviz) ;for 'dot' + ("python-nose" ,python-nose))) + (home-page "https://github.com/c0fec0de/anytree") + (synopsis "Lightweight tree data library") + (description + "@code{anytree} is a simple, lightweight, and extensible tree data +structure for Python.") + (license license:asl2.0))) + (define-public python-docutils (package (name "python-docutils") -- cgit v1.2.3 From ae3909eb4c36255834b5780ad8aa29055181c964 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Jan 2020 20:36:24 +0100 Subject: gnu: python-parameterized: Update to 0.7.1. * gnu/packages/patches/python2-parameterized-docstring-test.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/check.scm (python-parameterized): Update to 0.7.1. [arguments]: Remove #:tests?. Add #:phases to override 'check' phase. [native-inputs]: Add PYTHON-MOCK and PYTHON-NOSE. [properties]: New field. (python2-parameterized)[source](patches): New field. --- gnu/local.mk | 1 + gnu/packages/check.scm | 26 ++++++++++++++++++---- .../python2-parameterized-docstring-test.patch | 18 +++++++++++++++ 3 files changed, 41 insertions(+), 4 deletions(-) create mode 100644 gnu/packages/patches/python2-parameterized-docstring-test.patch diff --git a/gnu/local.mk b/gnu/local.mk index 59589f292a..c0aa92c56f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1321,6 +1321,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-mox3-python3.6-compat.patch \ %D%/packages/patches/python-testtools.patch \ %D%/packages/patches/python-packaging-test-arch.patch \ + %D%/packages/patches/python2-parameterized-docstring-test.patch \ %D%/packages/patches/python-paste-remove-timing-test.patch \ %D%/packages/patches/python-pycrypto-CVE-2013-7459.patch \ %D%/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \ diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 5554965a06..e10e684d32 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -580,25 +580,43 @@ (define-public cpputest (define-public python-parameterized (package (name "python-parameterized") - (version "0.6.1") + (version "0.7.1") (source (origin (method url-fetch) (uri (pypi-uri "parameterized" version)) (sha256 (base32 - "1qj1939shm48d9ql6fm1nrdy4p7sdyj8clz1szh5swwpf1qqxxfa")))) + "1vapry9lyfb2mlpgk2wh9079hzxzq5120bsczncxxay663mdp53a")))) (build-system python-build-system) - (arguments '(#:tests? #f)) ; there are no tests + (arguments + '(#:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (if tests? + (invoke "nosetests" "-v") + (format #t "test suite not run~%")) + #t))))) + (native-inputs + `(("python-mock" ,python-mock) + ("python-nose" ,python-nose))) (home-page "https://github.com/wolever/parameterized") (synopsis "Parameterized testing with any Python test framework") (description "Parameterized is a Python library that aims to fix parameterized testing for every Python test framework. It supports nose, py.test, and unittest.") + (properties `((python2-variant . ,(delay python2-parameterized)))) (license license:bsd-2))) (define-public python2-parameterized - (package-with-python2 python-parameterized)) + (let ((base (package-with-python2 (strip-python2-variant + python-parameterized)))) + (package/inherit + base + (source + (origin + (inherit (package-source base)) + (patches (search-patches "python2-parameterized-docstring-test.patch"))))))) (define-public python-minimock (package diff --git a/gnu/packages/patches/python2-parameterized-docstring-test.patch b/gnu/packages/patches/python2-parameterized-docstring-test.patch new file mode 100644 index 0000000000..14691e1904 --- /dev/null +++ b/gnu/packages/patches/python2-parameterized-docstring-test.patch @@ -0,0 +1,18 @@ +Skip unicode docstring test, required when running on Python 2. + +See . + +--- a/parameterized/test.py ++++ b/parameterized/test.py +@@ -284,11 +284,6 @@ + " More" %(foo, ) + ) + +- @parameterized.expand([param("foo")]) +- def test_unicode_docstring(self, foo): +- u"""Döcumentation.""" +- self._assert_docstring(u"Döcumentation [with foo=%r]." %(foo, )) +- + @parameterized.expand([param("foo", )]) + def test_default_values_get_correct_value(self, foo, bar=12): + """Documentation""" -- cgit v1.2.3 From a5407c768d842335449304b4a06f3a34ca13eacc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Jan 2020 23:38:31 +0100 Subject: gnu: snappy: Update to 1.1.8. * gnu/packages/compression.scm (snappy): Update to 1.1.8. --- 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 cb73dcec75..98af41760f 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1084,7 +1084,7 @@ (define-public lrzip (define-public snappy (package (name "snappy") - (version "1.1.7") + (version "1.1.8") (source (origin (method git-fetch) @@ -1093,7 +1093,7 @@ (define-public snappy (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1x7r8sjmdqlqjz0xfiwdyrqpgaj5yrvrgb28ivgpvnxgar5qv6m2")) + (base32 "1j0kslq2dvxgkcxl1gakhvsa731yrcvcaipcp5k8k7ayicvkv9jv")) (patches (search-patches "snappy-add-O2-flag-in-CmakeLists.txt.patch")))) (build-system cmake-build-system) (arguments -- cgit v1.2.3 From 07b1d40899d3c3488f3162cbacfccf39c5e2043e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Jan 2020 23:38:51 +0100 Subject: gnu: e2fsprogs: Update to 1.45.5. * gnu/packages/linux.scm (e2fsprogs): Update to 1.45.5. --- 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 8ea8a903a4..829bb09447 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1316,7 +1316,7 @@ (define-public usbutils (define-public e2fsprogs (package (name "e2fsprogs") - (version "1.45.4") + (version "1.45.5") (source (origin (method url-fetch) (uri (string-append @@ -1325,7 +1325,7 @@ (define-public e2fsprogs name "-" version ".tar.xz")) (sha256 (base32 - "00nwl1ppjalxbnx40dsm895r3q793p8nni6n81saj7faj2szdyk5")))) + "1pmf8inp736l587rqq7qsd8bv0mmg5cwrivxg5p5awqgv70crypr")))) (build-system gnu-build-system) (inputs `(("util-linux" ,util-linux))) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From bb06336e818c5ea8af6a48c0070a1bd58fcbded5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Jan 2020 23:39:12 +0100 Subject: gnu: re2: Update to 2020-01-01. * gnu/packages/regex.scm (re2): Update to 2020-01-01. --- gnu/packages/regex.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/regex.scm b/gnu/packages/regex.scm index 75b2975421..ef0d5d854b 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 "2019-12-01") + (version "2020-01-01") (home-page "https://github.com/google/re2") (source (origin (method git-fetch) @@ -38,7 +38,7 @@ (define-public re2 (file-name (git-file-name name version)) (sha256 (base32 - "0drfhy32a0ndlwc4zi1khx07ifslkrc0w14hj8skqhddkrg55x0l")))) + "0gcli7y2ax3karx7m1q1r9qm49danaxbgxslywjwmya5nmr7x3p4")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) -- cgit v1.2.3 From 0fd80a2556694bb59c54b02c12d0d10399893ac0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Jan 2020 23:39:42 +0100 Subject: gnu: libvpx: Update to 1.8.2. * gnu/packages/video.scm (libvpx): Update to 1.8.2. --- 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 ad96593a54..d22f197c4d 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1484,7 +1484,7 @@ (define-public mpv-mpris (define-public libvpx (package (name "libvpx") - (version "1.8.1") + (version "1.8.2") (source (origin ;; XXX: Upstream does not provide tarballs for > 1.6.1. (method git-fetch) @@ -1494,7 +1494,7 @@ (define-public libvpx (file-name (git-file-name name version)) (sha256 (base32 - "0mm1dcfa268rwsrgzqpbbgq4lwrvdzgp90h9dxsnkhai70l7gipq")) + "0gyq4fkbd2fv7m1mm9xrvn6rk6f4jsmbv8bnlhingmnrvyncnmnr")) (patches (search-patches "libvpx-CVE-2016-2818.patch")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From fd4b27e4e472271c492eb7dd1ce8a8fe3f00b80f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Jan 2020 23:40:02 +0100 Subject: gnu: ffmpeg: Update to 4.2.2. * gnu/packages/video.scm (ffmpeg): Update to 4.2.2. --- 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 d22f197c4d..ee7108753f 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -828,14 +828,14 @@ (define-public libva-utils (define-public ffmpeg (package (name "ffmpeg") - (version "4.2.1") + (version "4.2.2") (source (origin (method url-fetch) (uri (string-append "https://ffmpeg.org/releases/ffmpeg-" version ".tar.xz")) (sha256 (base32 - "1m5nkc61ihgcf0b2wabm0zyqa8sj3c0w8fi6kr879lb0kdzciiyf")))) + "176jn1lcdf0gk7sa5l2mv0faqp5dsqdhx1gqcrgymqhfmdal4xfb")))) (build-system gnu-build-system) (inputs `(("dav1d" ,dav1d) -- cgit v1.2.3 From 80af75abcf81406fa53c3cae1a31cd42124bfa9f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Jan 2020 23:44:14 +0100 Subject: gnu: libsrtp: Update to 2.3.0. * gnu/packages/telephony.scm (libsrtp): Update to 2.3.0. --- gnu/packages/telephony.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 8e7384bf85..b9e3d6258a 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -246,7 +246,7 @@ (define-public sipwitch (define-public libsrtp (package (name "libsrtp") - (version "2.2.0") + (version "2.3.0") (source (origin (method git-fetch) (uri (git-reference @@ -255,7 +255,7 @@ (define-public libsrtp (file-name (git-file-name name version)) (sha256 (base32 - "1ac7xs1djb03j131f1gmqyfmrplblid9qqyxahs0shdy707r5ll6")))) + "1f7i3jdh1wzdv7zjlz7gs3xw5jqig9zw8z9awsqqcp54f94xdpvd")))) (native-inputs `(("psmisc" ,psmisc) ;some tests require 'killall' ("procps" ,procps))) -- cgit v1.2.3 From d18116d9b5b0cafd4390326b57c487d51804a9e8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Jan 2020 23:44:36 +0100 Subject: gnu: libsrtp: Build shared library. * gnu/packages/telephony.scm (libsrtp)[arguments]: Add #:phases. --- gnu/packages/telephony.scm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index b9e3d6258a..a645c58562 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -261,7 +261,19 @@ (define-public libsrtp ("procps" ,procps))) (build-system gnu-build-system) (arguments - '(#:test-target "runtest")) + '(#:test-target "runtest" + #:phases (modify-phases %standard-phases + (add-after 'build 'build-shared + (lambda* (#:key (make-flags '()) #:allow-other-keys) + ;; Build the shared library separately because + ;; the test runner requires a static build. + (apply invoke "make" "shared_library" make-flags) + #t)) + (add-after 'install 'remove-static-library + (lambda* (#:key outputs #:allow-other-keys) + (delete-file (string-append (assoc-ref outputs "out") + "/lib/libsrtp2.a")) + #t))))) (synopsis "Secure RTP (SRTP) Reference Implementation") (description "This package provides an implementation of the Secure Real-time Transport -- cgit v1.2.3 From 37f44547343ab3d9baf5115b1d8c50a8591c4056 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Jan 2020 23:47:50 +0100 Subject: gnu: xorg-server: Update to 1.20.7. * gnu/packages/xorg.scm (xorg-server): Update to 1.20.7. --- 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 022cb49c20..2392dc1cba 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5073,7 +5073,7 @@ (define-public libxcb (define-public xorg-server (package (name "xorg-server") - (version "1.20.6") + (version "1.20.7") (source (origin (method url-fetch) @@ -5082,7 +5082,7 @@ (define-public xorg-server "xorg-server-" version ".tar.bz2")) (sha256 (base32 - "1laib9z17jksgzb67z69blcmnpbvj7i7m604b5ns7s760iii85k3")) + "18bfl04ihw1jr3h0fs522nnxxq5ixjay77y9dcymnkzk23q8cndx")) (patches (list ;; See: -- cgit v1.2.3 From 43987c977c5c83a2980c8a07fd07061620e53ac1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Jan 2020 01:57:06 +0100 Subject: gnu: mailutils: Update to 3.8. * gnu/packages/mail.scm (mailutils): Update to 3.8. [arguments]: Adjust substitutions. --- gnu/packages/mail.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 168e626d7e..67afea68fb 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -141,14 +141,14 @@ (define-module (gnu packages mail) (define-public mailutils (package (name "mailutils") - (version "3.7") + (version "3.8") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/mailutils/mailutils-" version ".tar.xz")) (sha256 (base32 - "1gwajsl39f1dkzrjld0dm9px8hrj7l7rwzazz00h5rwghk9mhwhq")))) + "1wkn9ch664477r4d8jk9153w5msljsbj99907k7zgzpmywbs6ba7")))) (build-system gnu-build-system) (arguments '(#:phases @@ -160,10 +160,10 @@ (define-public mailutils (("/bin/cat") (which "cat"))) - ;; Tests try to invoke 'maidag' such that it looks up the + ;; Tests try to invoke 'mda' such that it looks up the ;; 'root' user, which does not exist in the build ;; environment. - (substitute* "maidag/tests/testsuite" + (substitute* "mda/tests/testsuite" (("root <") "nobody <") (("spool/root") "spool/nobody") (("root@localhost") "nobody@localhost")) -- cgit v1.2.3 From 7b24b76b98191f9dc3244df69abbaf018c19d77f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Jan 2020 11:28:11 +0100 Subject: gnu: mame: Build with libjpeg-turbo. * gnu/packages/emulators.scm (mame)[inputs]: Change from LIBJPEG-8 to LIBJPEG-TURBO. --- gnu/packages/emulators.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 20648374d0..f805c8b969 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1424,7 +1424,7 @@ (define-public mame ("flac" ,flac) ("fontconfig" ,fontconfig) ("glm" ,glm) - ("libjpeg" ,libjpeg-8) ;jpeg_read_header argument error in libjpeg-9 + ("libjpeg" ,libjpeg-turbo) ("libxi" ,libxi) ("libxinerama" ,libxinerama) ("lua" ,lua) -- cgit v1.2.3 From 96738cb11f0f0193e1e0019b8977e96603a6b087 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Jan 2020 11:28:45 +0100 Subject: gnu: stepmania: Build with libjpeg-turbo. * gnu/packages/games.scm (stepmania)[inputs]: Change from LIBJPEG-8 to LIBJPEG-TURBO. --- 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 256566ed90..83330590cf 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -6679,7 +6679,7 @@ (define-public stepmania ("gtk+" ,gtk+-2) ("jsoncpp" ,jsoncpp) ("libpng" ,libpng) - ("libjpeg" ,libjpeg-8) + ("libjpeg" ,libjpeg-turbo) ("libmad" ,libmad) ("libogg" ,libogg) ("libva" ,libva) -- cgit v1.2.3 From 89595f98d05a159d24f951fbc217e1a8d6f6e6c0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Jan 2020 11:29:24 +0100 Subject: gnu: qt@4: Build with libjpeg-turbo. * gnu/packages/qt.scm (qt-4)[inputs]: Change from LIBJPEG-8 to LIBJPEG-TURBO. --- gnu/packages/qt.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 89dbb94fea..9b59dc0f46 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -215,7 +215,7 @@ (define-public qt-4 ("xcb-util-renderutil" ,xcb-util-renderutil) ("xcb-util-wm" ,xcb-util-wm) ("zlib" ,zlib) - ("libjpeg" ,libjpeg-8) + ("libjpeg" ,libjpeg-turbo) ("libsm" ,libsm) ("openssl" ,openssl-1.0))) (native-inputs -- cgit v1.2.3 From 25623647e9c6f5cafea902ac3d8d6d7ac03c0b3c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Jan 2020 11:31:17 +0100 Subject: gnu: guile-git: Update to 0.3.0. * gnu/packages/guile.scm (guile-git): Update to 0.3.0. [source]: Download tarball with URL-FETCH. [source](file-name, modules, snippet): Remove. [native-inputs]: Remove AUTOCONF, AUTOMAKE and TEXINFO. --- gnu/packages/guile.scm | 31 +++++++------------------------ 1 file changed, 7 insertions(+), 24 deletions(-) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index e940d38b17..c8c44b7fcb 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -634,36 +634,19 @@ (define-public guile3.0-bytestructures (define-public guile-git (package (name "guile-git") - (version "0.2.0") + (version "0.3.0") (home-page "https://gitlab.com/guile-git/guile-git.git") (source (origin - (method git-fetch) - (uri (git-reference (url home-page) - (commit (string-append "v" version)))) + (method url-fetch) + (uri (string-append "https://gitlab.com/guile-git/guile-git/uploads/" + "4c563d8e7e1ff84396abe8ca7011bcaf/guile-git-" + version ".tar.gz")) (sha256 (base32 - "018hmfsh0rjwfvr4h7y10jc6k8a2k9xsirngghy3pjasin4nd2yz")) - (file-name (git-file-name name version)) - (modules '((guix build utils))) - (snippet - '(begin - ;; Allow builds with Guile 3.0. - (substitute* "configure.ac" - (("^GUILE_PKG.*") - "GUILE_PKG([3.0 2.2 2.0])\n")) - - ;; The 'guile.m4' that's shipped is too old and fails to - ;; recognize Guile 2.9/3.0. Delete it and pick the one - ;; provided by the Guile we're using. - (delete-file "m4/guile.m4") - - #t)))) + "0c5i3d16hp7gp9rd78vk9zc45js8bphf92m4lbb5gyi4l1yl7kkm")))) (build-system gnu-build-system) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("texinfo" ,texinfo) - ("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config))) (inputs `(("guile" ,guile-2.2) ("libgit2" ,libgit2))) -- cgit v1.2.3 From 9792adaa611e495ee1a53e5849a37fef7fa49edf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Jan 2020 21:38:40 +0100 Subject: gnu: gstreamer: Build with Meson. The package fails to build with GNU Make 4.3, and upstream no longer supports autotools. * gnu/packages/gstreamer.scm (gstreamer)[build-system]: Change to MESON-BUILD-SYSTEM. [arguments]: Remove #:configure-flags. Add #:phases. [native-inputs]: Add GTK-DOC. --- gnu/packages/gstreamer.scm | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 63b4179bc6..126972fd1b 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -116,19 +116,27 @@ (define-public gstreamer (sha256 (base32 "0kp93622y29pck8asvil1fmzf55s2gx76wv475a6izc3cwj49w73")))) - (build-system gnu-build-system) + (build-system meson-build-system) (outputs '("out" "doc")) (arguments - `(#:configure-flags - (list (string-append "--with-html-dir=" - (assoc-ref %outputs "doc") - "/share/gtk-doc/html")))) + '(#:phases + (modify-phases %standard-phases + (add-after 'install 'move-docs + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc"))) + (mkdir-p (string-append doc "/share")) + (copy-recursively (string-append out "/share/gtk-doc") + (string-append doc "/share/gtk-doc")) + (delete-file-recursively (string-append out "/share/gtk-doc")) + #t)))))) (propagated-inputs `(("glib" ,glib))) ; required by gstreamer-1.0.pc. (native-inputs `(("bison" ,bison) ("flex" ,flex) ("glib" ,glib "bin") ("gobject-introspection" ,gobject-introspection) + ("gtk-doc" ,gtk-doc) ("perl" ,perl) ("pkg-config" ,pkg-config) ("python-wrapper" ,python-wrapper))) -- cgit v1.2.3 From 738923b6e3ac85c78b1e97a9a85979495ed8ba51 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Jan 2020 21:40:02 +0100 Subject: gnu: gst-plugins-base: Build with Meson. * gnu/packages/gstreamer.scm (gst-plugins-base)[build-system]: Change to MESON-BUILD-SYSTEM. [outputs]: Remove. [arguments]: Enable parallel tests. Disable doc generation and Mesa dependency. --- gnu/packages/gstreamer.scm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 126972fd1b..e78afdabb8 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -171,8 +171,7 @@ (define-public gst-plugins-base (sha256 (base32 "0sl1hxlyq46r02k7z70v09vx1gi4rcypqmzra9jid93lzvi76gmi")))) - (build-system gnu-build-system) - (outputs '("out" "doc")) + (build-system meson-build-system) (propagated-inputs `(("glib" ,glib) ;required by gstreamer-sdp-1.0.pc ("gstreamer" ,gstreamer) ;required by gstreamer-plugins-base-1.0.pc @@ -206,11 +205,10 @@ (define-public gst-plugins-base ("gobject-introspection" ,gobject-introspection) ("python-wrapper" ,python-wrapper))) (arguments - `(#:parallel-tests? #f ; 'pipelines/tcp' fails in parallel - #:configure-flags - (list (string-append "--with-html-dir=" - (assoc-ref %outputs "doc") - "/share/gtk-doc/html")) + '(#:configure-flags '("-Dgl=disabled" + ;; FIXME: Documentation fails to build without + ;; enabling GL above, which causes other problems. + "-Ddoc=false") #:phases (modify-phases %standard-phases (add-before 'configure 'patch -- cgit v1.2.3 From 321f47c25d82fa510ea4e1891f719c4255272e39 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Jan 2020 21:40:42 +0100 Subject: gnu: gst-plugins-good: Build with Meson. * gnu/packages/gstreamer.scm (gst-plugins-good)[build-system]: Change to MESON-BUILD-SYSTEM. --- gnu/packages/gstreamer.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index e78afdabb8..310f5388bc 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -236,7 +236,7 @@ (define-public gst-plugins-good (sha256 (base32 "068k3cbv1yf3gbllfdzqsg263kzwh21y8dpwr0wvgh15vapkpfs0")))) - (build-system gnu-build-system) + (build-system meson-build-system) (inputs `(("aalib" ,aalib) ("cairo" ,cairo) -- cgit v1.2.3 From 2dc277dd997da8ada68349ea321192719edc814c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Jan 2020 21:41:41 +0100 Subject: gnu: gst-plugins-bad: Build with Meson. * gnu/packages/gstreamer.scm (gst-plugins-bad)[outputs]: Remove. [build-system]: Change to MESON-BUILD-SYSTEM. [arguments]: Enable tests, except for one. Disable documentation generation. --- gnu/packages/gstreamer.scm | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 310f5388bc..7bbb564d16 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -297,19 +297,24 @@ (define-public gst-plugins-bad (sha256 (base32 "0x0y0hm0ga3zqi5q4090hw5sjh59y1ry9ak16qsaascm72i7mjzi")))) - (outputs '("out" "doc")) - (build-system gnu-build-system) + (build-system meson-build-system) (arguments - '(#:tests? #f ; XXX: 13 of 53 tests fail - #:configure-flags - (list (string-append "--with-html-dir=" - (assoc-ref %outputs "doc") - "/share/gtk-doc/html")))) + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'disable-failing-test + (lambda _ + ;; FIXME: Why is this failing. + (substitute* "tests/check/meson.build" + ((".*elements/dash_mpd\\.c.*") + "")) + #t))))) (propagated-inputs `(("gst-plugins-base" ,gst-plugins-base))) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-mkenums, etc. ("gobject-introspection" ,gobject-introspection) + ;; TODO: Enable documentation for 1.18. + ;;("gtk-doc" ,gtk-doc) ("pkg-config" ,pkg-config) ("python" ,python))) (inputs -- cgit v1.2.3 From 1bf1e32b01624fe7833d6a6d1bd6cff7e4559c72 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Jan 2020 21:43:03 +0100 Subject: gnu: gst-plugins-ugly: Build with Meson. * gnu/packages/gstreamer.scm (gst-plugins-ugly)[build-system]: Change to MESON-BUILD-SYSTEM. --- gnu/packages/gstreamer.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 7bbb564d16..815340a14c 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -378,7 +378,7 @@ (define-public gst-plugins-ugly (sha256 (base32 "1jpvc32x6q01zjkfgh6gmq6aaikiyfwwnhj7bmvn52syhrdl202m")))) - (build-system gnu-build-system) + (build-system meson-build-system) (inputs `(("gst-plugins-base" ,gst-plugins-base) ("liba52" ,liba52) -- cgit v1.2.3 From 4bebd7e4e606c1fc7578c948094675e6f95c2619 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Jan 2020 21:43:32 +0100 Subject: gnu: gst-libav: Build with Meson. * gnu/packages/gstreamer.scm (gst-libav)[build-system]: Change to MESON-BUILD-SYSTEM. [arguments]: Remove. --- gnu/packages/gstreamer.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 815340a14c..d84d2009b5 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -419,9 +419,7 @@ (define-public gst-libav ;; Drop bundled ffmpeg. (delete-file-recursively "gst-libs/ext/libav") #t)))) - (build-system gnu-build-system) - (arguments - '(#:configure-flags '("--with-system-libav"))) + (build-system meson-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("python" ,python))) -- cgit v1.2.3 From c450ee975529f25607e67cb405a2a6b515cf655e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Jan 2020 21:44:02 +0100 Subject: gnu: python-gst: Build with Meson. * gnu/packages/gstreamer.scm (python-gst)[build-system]: Change to MESON-BUILD-SYSTEM. [arguments]: Adjust accordingly. --- gnu/packages/gstreamer.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index d84d2009b5..6fd683c9de 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -447,15 +447,16 @@ (define-public python-gst (sha256 (base32 "1a48ca66izmm8hnp608jv5isg3jxb0vlfmhns0bg9nbkilag7390")))) - (build-system gnu-build-system) + (build-system meson-build-system) (arguments - `(#:modules ((guix build gnu-build-system) + `(#:modules ((guix build meson-build-system) + (guix build utils) ((guix build python-build-system) #:prefix python:)) - #:imported-modules (,@%gnu-build-system-modules + #:imported-modules (,@%meson-build-system-modules (guix build python-build-system)) #:configure-flags (list (string-append - "--with-pygi-overrides-dir=" + "-Dpygi-overrides-dir=" (python:site-packages %build-inputs %outputs) "gi/overrides")))) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 48659aa22170a252c9b2e60f16fbe9f83a6deba4 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 20 Jan 2020 14:34:16 +0100 Subject: installer: Makes sure the installer proceeds after hitting "Edit". Fixes . Reported by Jonathan Brielmaier . * gnu/installer/newt/page.scm (run-file-textbox-page): Move 'loop' to the beginning of the body. Do not call 'loop' from the 'dynamic-wind' exit handler as we would not return the value of the second call to 'loop'. --- gnu/installer/newt/page.scm | 101 +++++++++++++++++++++++--------------------- 1 file changed, 52 insertions(+), 49 deletions(-) diff --git a/gnu/installer/newt/page.scm b/gnu/installer/newt/page.scm index bff5fae4e6..ef2d8368fb 100644 --- a/gnu/installer/newt/page.scm +++ b/gnu/installer/newt/page.scm @@ -566,35 +566,38 @@ (define* (run-file-textbox-page #:key (const #t)) (exit-button-callback-procedure (const #t))) - (let* ((info-textbox - (make-reflowed-textbox -1 -1 info-text - info-textbox-width - #:flags FLAG-BORDER)) - (file-textbox - (make-textbox -1 -1 - file-textbox-width - file-textbox-height - (logior FLAG-SCROLL FLAG-BORDER))) - (ok-button (make-button -1 -1 (G_ "OK"))) - (exit-button (make-button -1 -1 (G_ "Exit"))) - (edit-button (and edit-button? - (make-button -1 -1 (G_ "Edit")))) - (grid (vertically-stacked-grid - GRID-ELEMENT-COMPONENT info-textbox - GRID-ELEMENT-COMPONENT file-textbox - GRID-ELEMENT-SUBGRID - (apply - horizontal-stacked-grid - GRID-ELEMENT-COMPONENT ok-button - `(,@(if edit-button? - (list GRID-ELEMENT-COMPONENT edit-button) - '()) - ,@(if exit-button? - (list GRID-ELEMENT-COMPONENT exit-button) - '()))))) - (form (make-form))) + (let loop () + (let* ((info-textbox + (make-reflowed-textbox -1 -1 info-text + info-textbox-width + #:flags FLAG-BORDER)) + (file-textbox + (make-textbox -1 -1 + file-textbox-width + file-textbox-height + (logior FLAG-SCROLL FLAG-BORDER))) + (ok-button (make-button -1 -1 (G_ "OK"))) + (exit-button (make-button -1 -1 (G_ "Exit"))) + (edit-button (and edit-button? + (make-button -1 -1 (G_ "Edit")))) + (grid (vertically-stacked-grid + GRID-ELEMENT-COMPONENT info-textbox + GRID-ELEMENT-COMPONENT file-textbox + GRID-ELEMENT-SUBGRID + (apply + horizontal-stacked-grid + GRID-ELEMENT-COMPONENT ok-button + `(,@(if edit-button? + (list GRID-ELEMENT-COMPONENT edit-button) + '()) + ,@(if exit-button? + (list GRID-ELEMENT-COMPONENT exit-button) + '()))))) + (form (make-form))) + + (add-form-to-grid grid form #t) + (make-wrapped-grid-window grid title) - (let loop () (set-textbox-text file-textbox (receive (_w _h text) (reflow-text (read-all file) @@ -602,26 +605,26 @@ (define* (run-file-textbox-page #:key 0 0) text)) - (add-form-to-grid grid form #t) - (make-wrapped-grid-window grid title) - (receive (exit-reason argument) (run-form form) - (dynamic-wind - (const #t) - (lambda () - (case exit-reason - ((exit-component) - (cond - ((components=? argument ok-button) - (ok-button-callback-procedure)) - ((and exit-button? - (components=? argument exit-button)) - (exit-button-callback-procedure)) - ((and edit-button? - (components=? argument edit-button)) - (edit-file file)))))) - (lambda () - (if (components=? argument edit-button) - (loop) - (destroy-form-and-pop form)))))))) + (define result + (dynamic-wind + (const #t) + (lambda () + (case exit-reason + ((exit-component) + (cond + ((components=? argument ok-button) + (ok-button-callback-procedure)) + ((and exit-button? + (components=? argument exit-button)) + (exit-button-callback-procedure)) + ((and edit-button? + (components=? argument edit-button)) + (edit-file file)))))) + (lambda () + (destroy-form-and-pop form)))) + + (if (components=? argument edit-button) + (loop) ;recurse in tail position + result))))) -- cgit v1.2.3 From 37eda8c044d7923da36f2857040d48335ca6f439 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 20 Jan 2020 22:12:45 +0100 Subject: installer: Disable F12 hot key. Fixes . Reported by Brice Waegeneire . Previously, pressing F12 or shift-F2 in one of those forms would cause it to exit, usually with the default value #t because the caller had not provided a useful hotkey "callback". * gnu/installer/newt/page.scm (run-input-page, run-confirmation-page) (run-listbox-selection-page, run-checkbox-tree-page) (run-file-textbox-page): Pass #:flags FLAG-NOF12 to 'make-form'. --- gnu/installer/newt/page.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/installer/newt/page.scm b/gnu/installer/newt/page.scm index ef2d8368fb..8aea5a1109 100644 --- a/gnu/installer/newt/page.scm +++ b/gnu/installer/newt/page.scm @@ -107,7 +107,7 @@ (define* (run-input-page text title (list GRID-ELEMENT-COMPONENT input-visible-cb) '()))) GRID-ELEMENT-COMPONENT ok-button)) - (form (make-form))) + (form (make-form #:flags FLAG-NOF12))) (add-component-callback input-visible-cb @@ -181,7 +181,7 @@ (define* (run-confirmation-page text title (horizontal-stacked-grid GRID-ELEMENT-COMPONENT ok-button GRID-ELEMENT-COMPONENT exit-button))) - (form (make-form))) + (form (make-form #:flags FLAG-NOF12))) (add-form-to-grid grid form #t) (make-wrapped-grid-window grid title) @@ -315,7 +315,7 @@ (define (set-default-item listbox listbox-keys default-item) (if listbox-allow-multiple? FLAG-MULTIPLE 0)))) - (form (make-form)) + (form (make-form #:flags FLAG-NOF12)) (info-textbox (make-reflowed-textbox -1 -1 info-text info-textbox-width @@ -516,7 +516,7 @@ (define (fill-checkbox-tree checkbox-tree items) GRID-ELEMENT-COMPONENT ok-button GRID-ELEMENT-COMPONENT exit-button))) (keys (fill-checkbox-tree checkbox-tree items)) - (form (make-form))) + (form (make-form #:flags FLAG-NOF12))) (add-form-to-grid grid form #t) (make-wrapped-grid-window grid title) @@ -593,7 +593,7 @@ (define* (run-file-textbox-page #:key ,@(if exit-button? (list GRID-ELEMENT-COMPONENT exit-button) '()))))) - (form (make-form))) + (form (make-form #:flags FLAG-NOF12))) (add-form-to-grid grid form #t) (make-wrapped-grid-window grid title) -- cgit v1.2.3 From 346386f3f7a3a00720e5423fa5900a1b3facb702 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 20 Jan 2020 20:24:02 +0100 Subject: gnu: Add guile3.0-commonmark. * gnu/packages/guile-xyz.scm (guile3.0-commonmark): New variable. (guile-commonmark)[arguments]: Patch configure file. --- gnu/packages/guile-xyz.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 7d5621eaa4..2e768ad7da 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2035,6 +2035,15 @@ (define-public guile-commonmark "3.0 2.2 2.0")) #t)))) (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'support-guile-3.0 + (lambda _ + (substitute* "configure" + (("_guile_versions_to_search=\"2.2") + "_guile_versions_to_search=\"3.0 2.2")) + #t))))) (inputs `(("guile" ,guile-2.2))) (native-inputs @@ -2061,6 +2070,12 @@ (define-public guile2.0-commonmark (name "guile2.0-commonmark") (inputs `(("guile" ,guile-2.0))))) +(define-public guile3.0-commonmark + (package + (inherit guile-commonmark) + (name "guile3.0-commonmark") + (inputs `(("guile" ,guile-3.0))))) + (define-public mcron (package (name "mcron") -- cgit v1.2.3 From b0b725ed40f06f65f15994ea1e41347e708131ba Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 20 Jan 2020 20:26:53 +0100 Subject: gnu: Add guile3.0-wisp. * gnu/packages/guile-xyz.scm (guile3.0-wisp): New variable. --- gnu/packages/guile-xyz.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 2e768ad7da..58271364dc 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1569,6 +1569,22 @@ (define-public guile-wisp users and in some situations.") (license license:gpl3+))) +(define-public guile3.0-wisp + (package + (inherit guile-wisp) + (name "guile3.0-wisp") + (inputs `(("guile" ,guile-3.0))) + (arguments + (substitute-keyword-arguments (package-arguments guile-wisp) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'support-guile-3.0 + (lambda _ + (substitute* "configure" + (("_guile_versions_to_search=\"2.2") + "_guile_versions_to_search=\"3.0 2.2")) + #t)))))))) + (define-public guile-sly (package (name "guile-sly") -- cgit v1.2.3 From 77c95ee60caec530015d90aaf78107d45030691e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 20 Jan 2020 23:44:03 +0100 Subject: gnu: Add guile3.0-pfds. * gnu/packages/guile-xyz.scm (guile3.0-pfds): New variable. --- gnu/packages/guile-xyz.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 58271364dc..74cd67b044 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -767,6 +767,45 @@ (define-public guile-pfds @end itemize\n") (license license:bsd-3))) +(define-public guile3.0-pfds + (package + (inherit guile-pfds) + (name "guile3.0-pfds") + (native-inputs `(("guile" ,guile-3.0))) + (arguments + '(#:source-directory "src" + #:compile-flags '("--r6rs") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'move-files-around + (lambda _ + ;; See bug #39210. + (substitute* '("fingertrees.sls" + "queues/private/condition.sls" + "deques/private/condition.sls") + (("&assertion") "&violation")) + ;; Move files under a pfds/ directory to reflect the module + ;; hierarchy. + (mkdir-p "src/pfds") + (for-each (lambda (file) + (rename-file file + (string-append "src/pfds/" + file))) + '("bbtrees.sls" + "deques" + "deques.sls" + "dlists.sls" + "fingertrees.sls" + "hamts.sls" + "heaps.sls" + "private" + "psqs.sls" + "queues" + "queues.sls" + "sequences.sls" + "sets.sls")) + #t))))))) + (define-public guile-aa-tree (package (name "guile-aa-tree") -- cgit v1.2.3 From fa730a9780475846b038cb99b1dc47fd43c67e1c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 21 Jan 2020 00:05:50 +0100 Subject: Revert "gnu: Add guile3.0-commonmark." This reverts commit 346386f3f7a3a00720e5423fa5900a1b3facb702. A Guile 3.0 variant had already been added with commit 1fa342323619372326106fb923e72ae7beecb5e6. --- gnu/packages/guile-xyz.scm | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 74cd67b044..e9a15babfb 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2090,15 +2090,6 @@ (define-public guile-commonmark "3.0 2.2 2.0")) #t)))) (build-system gnu-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'support-guile-3.0 - (lambda _ - (substitute* "configure" - (("_guile_versions_to_search=\"2.2") - "_guile_versions_to_search=\"3.0 2.2")) - #t))))) (inputs `(("guile" ,guile-2.2))) (native-inputs @@ -2125,12 +2116,6 @@ (define-public guile2.0-commonmark (name "guile2.0-commonmark") (inputs `(("guile" ,guile-2.0))))) -(define-public guile3.0-commonmark - (package - (inherit guile-commonmark) - (name "guile3.0-commonmark") - (inputs `(("guile" ,guile-3.0))))) - (define-public mcron (package (name "mcron") -- cgit v1.2.3 From 21e733ce4eb5f15d195d129d659d1be373696a9c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 20 Jan 2020 20:32:36 +0100 Subject: gnu: supercollider: Update to 3.10.4. * gnu/packages/audio.scm (supercollider): Update to 3.10.4. [source]: Remove patch. * gnu/packages/patches/supercollider-boost-1.70-build-fix.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/audio.scm | 11 ++++----- .../supercollider-boost-1.70-build-fix.patch | 28 ---------------------- 3 files changed, 4 insertions(+), 36 deletions(-) delete mode 100644 gnu/packages/patches/supercollider-boost-1.70-build-fix.patch diff --git a/gnu/local.mk b/gnu/local.mk index c0aa92c56f..9d7b50ea87 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1388,7 +1388,6 @@ dist_patch_DATA = \ %D%/packages/patches/soundconverter-remove-gconf-dependency.patch \ %D%/packages/patches/spice-fix-test-armhf.patch \ %D%/packages/patches/steghide-fixes.patch \ - %D%/packages/patches/supercollider-boost-1.70-build-fix.patch \ %D%/packages/patches/superlu-dist-awpm-grid.patch \ %D%/packages/patches/superlu-dist-fix-mpi-deprecations.patch \ %D%/packages/patches/superlu-dist-scotchmetis.patch \ diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 34135afe0c..5c1285cce9 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2249,24 +2249,22 @@ (define-public qjackrcd (define-public supercollider (package (name "supercollider") - (version "3.10.3") + (version "3.10.4") (source (origin (method url-fetch) (uri (string-append "https://github.com/supercollider/supercollider" "/releases/download/Version-" version "/SuperCollider-" version "-Source-linux.tar.bz2")) - (patches - (search-patches "supercollider-boost-1.70-build-fix.patch")) (sha256 (base32 - "0srm6wbazidkrd4ckjy4ypyhkdwcnx2i7k9msjyngalh0mrc9zz1")))) + "0x11g3pfw11m6v18qfpfl5w99dbmf73g4z7wvwhrj1a4qv2dn084")))) (build-system cmake-build-system) (arguments `(#:configure-flags '("-DSYSTEM_BOOST=on" "-DSYSTEM_YAMLCPP=on" "-DSC_QT=off" "-DSC_EL=off") ;scel is packaged individually as - ;emacs-scel. + ;emacs-scel #:modules ((guix build utils) (guix build cmake-build-system) (ice-9 ftw)) @@ -2275,8 +2273,7 @@ (define-public supercollider (add-after 'unpack 'rm-bundled-libs (lambda _ ;; The build system doesn't allow us to unbundle the following - ;; libraries. hidapi is also heavily patched and upstream not - ;; actively maintained. + ;; libraries. hidapi is also heavily patched. (let ((keep-dirs '("nova-simd" "nova-tt" "hidapi" "TLSF-2.4.6" "oscpack_1_1_0" "." ".."))) (with-directory-excursion "./external_libraries" diff --git a/gnu/packages/patches/supercollider-boost-1.70-build-fix.patch b/gnu/packages/patches/supercollider-boost-1.70-build-fix.patch deleted file mode 100644 index 073044fccb..0000000000 --- a/gnu/packages/patches/supercollider-boost-1.70-build-fix.patch +++ /dev/null @@ -1,28 +0,0 @@ -Patches taken from https://gitweb.gentoo.org/repo/gentoo.git/tree/media-sound/supercollider/files/supercollider-3.10.2-boost-1.70.patch?id=a420618dc766bba0654dbe0ef67008fdc5e901c6 to fix supercollider build with boost 1.70. - -diff --git a/server/supernova/sc/sc_osc_handler.cpp b/server/supernova/sc/sc_osc_handler.cpp -index 5116a1be87..96e937ec25 100644 ---- a/server/supernova/sc/sc_osc_handler.cpp -+++ b/server/supernova/sc/sc_osc_handler.cpp -@@ -728,7 +728,8 @@ void sc_osc_handler::tcp_connection::handle_message() { - - - void sc_osc_handler::start_tcp_accept(void) { -- tcp_connection::pointer new_connection = tcp_connection::create(tcp_acceptor_.get_io_service()); -+ tcp_connection::pointer new_connection = -+ tcp_connection::create((boost::asio::io_context&)tcp_acceptor_.get_executor().context()); - - tcp_acceptor_.async_accept( - new_connection->socket(), -diff --git a/server/supernova/utilities/utils.hpp b/server/supernova/utilities/utils.hpp -index 35b8ab5ad..a7c191f2d 100644 ---- a/server/supernova/utilities/utils.hpp -+++ b/server/supernova/utilities/utils.hpp -@@ -23,6 +23,7 @@ - - #include - -+#include - #include - #include - #include -- cgit v1.2.3 From 570b89f4016d8e4913502176b6ca4ead511e2e8a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 21 Jan 2020 00:22:30 +0100 Subject: gnu: gzdoom: Update to 4.3.2. * gnu/packages/games.scm (gzdoom): Update to 4.3.2. [source]: Use GIT-FETCH and GIT-FILE-NAME. Apply system libgme patch. Update snippet. [arguments]: Allow system libgme. Update substitution file names. [inputs]: Use fluidsynth@2. * gnu/packages/patches/gzdoom-find-system-libgme.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 3 +- gnu/packages/games.scm | 55 +++++++++++++--------- .../patches/gzdoom-find-system-libgme.patch | 21 +++++++++ 3 files changed, 55 insertions(+), 24 deletions(-) create mode 100644 gnu/packages/patches/gzdoom-find-system-libgme.patch diff --git a/gnu/local.mk b/gnu/local.mk index 9d7b50ea87..626d91ce62 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -12,7 +12,7 @@ # Copyright © 2016, 2017, 2018, 2019 Alex Vong # Copyright © 2016, 2017, 2018, 2019 Efraim Flashner # Copyright © 2016, 2017, 2018, 2019 Jan (janneke) Nieuwenhuizen -# Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice +# Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice # Copyright © 2017, 2018 Clément Lassieur # Copyright © 2017 Mathieu Othacehe # Copyright © 2017, 2018, 2019 Gábor Boskovits @@ -984,6 +984,7 @@ dist_patch_DATA = \ %D%/packages/patches/gtkglext-disable-disable-deprecated.patch \ %D%/packages/patches/gtksourceview-2-add-default-directory.patch \ %D%/packages/patches/gzdoom-search-in-installed-share.patch \ + %D%/packages/patches/gzdoom-find-system-libgme.patch \ %D%/packages/patches/haskell-mode-unused-variables.patch \ %D%/packages/patches/haskell-mode-make-check.patch \ %D%/packages/patches/hdf4-architectures.patch \ diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 83330590cf..f348cafb67 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -5706,24 +5706,29 @@ (define-public colobot (define-public gzdoom (package (name "gzdoom") - (version "3.7.2") - (source (origin - (method url-fetch) - (uri - (string-append "https://zdoom.org/files/gzdoom/src/gzdoom-src-g" - version ".zip")) - (sha256 - (base32 - "0182f160m8d0c3nywjw3dxvnz93xjs4cn8akx7137cha4s05wdq7")) - (patches (search-patches "gzdoom-search-in-installed-share.patch")) - (modules '((guix build utils))) - (snippet - '(begin - (delete-file-recursively "bzip2") - (delete-file-recursively "game-music-emu") - (delete-file-recursively "jpeg") - (delete-file-recursively "zlib") - #t)))) + (version "4.3.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/coelckers/gzdoom.git") + (commit (string-append "g" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0i4hyg72z84fc6ca2ic9q82q5cbgrbd7bynl3kpkypxvyasq08wz")) + (patches (search-patches "gzdoom-search-in-installed-share.patch" + "gzdoom-find-system-libgme.patch")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Remove some bundled libraries. XXX There are more, but removing + ;; them would require, at least, patching the build system. + (with-directory-excursion "libraries" + (delete-file-recursively "bzip2") + (delete-file-recursively "game-music-emu") + (delete-file-recursively "jpeg") + (delete-file-recursively "zlib")) + #t)))) (arguments '(#:tests? #f #:configure-flags @@ -5733,8 +5738,12 @@ (define-public gzdoom "-DCMAKE_CXX_FLAGS:=" "-DSHARE_DIR=\\\"" out "/share/\\\" " "-DGUIX_OUT_PK3=\\\"" out "/share/games/doom\\\"") - ;; look for libraries at buildtime instead of - ;; dynamically finding them at runtime + + ;; The build requires some extra convincing not to use the bundled + ;; libgme previously deleted in the soure snippet. + "-DFORCE_INTERNAL_GME=OFF" + + ;; Link libraries at build time instead of loading them at run time. "-DDYN_OPENAL=OFF" "-DDYN_FLUIDSYNTH=OFF" "-DDYN_GTK=OFF" @@ -5754,19 +5763,19 @@ (define-public gzdoom (string-append "COMMAND " (which "sh")))) (substitute* - "src/sound/mididevices/music_fluidsynth_mididevice.cpp" + "libraries/zmusic/mididevices/music_fluidsynth_mididevice.cpp" (("/usr/share/sounds/sf2/FluidR3_GM.sf2") (string-append fluid-3 "/share/soundfonts/FluidR3Mono_GM.sf3"))) (substitute* - "src/sound/mididevices/music_timiditypp_mididevice.cpp" + "libraries/zmusic/mididevices/music_timiditypp_mididevice.cpp" (("exename = \"timidity\"") (string-append "exename = \"" timidity++ "/bin/timidity\""))) #t)))))) (build-system cmake-build-system) (inputs `(("bzip2" ,bzip2) ("fluid-3" ,fluid-3) - ("fluidsynth" ,fluidsynth-1) ;XXX: try using 2.x when updating + ("fluidsynth" ,fluidsynth) ("gtk+3" ,gtk+) ("libgme" ,libgme) ("libjpeg" ,libjpeg) diff --git a/gnu/packages/patches/gzdoom-find-system-libgme.patch b/gnu/packages/patches/gzdoom-find-system-libgme.patch new file mode 100644 index 0000000000..a7f277d614 --- /dev/null +++ b/gnu/packages/patches/gzdoom-find-system-libgme.patch @@ -0,0 +1,21 @@ +--- /CMakeLists.txt 2020-01-20 21:47:35.460119141 +0100 ++++ /CMakeLists.txt 2020-01-20 21:47:47.690112400 +0100 +@@ -195,12 +195,12 @@ + #endif() + + # GME +-#find_path( GME_INCLUDE_DIR gme/gme.h ) +-#find_library( GME_LIBRARIES gme ) +-#mark_as_advanced( GME_INCLUDE_DIR GME_LIBRARIES ) +-#FIND_PACKAGE_HANDLE_STANDARD_ARGS( GME +-# REQUIRED_VARS GME_LIBRARIES GME_INCLUDE_DIR +-#) ++find_path( GME_INCLUDE_DIR gme/gme.h ) ++find_library( GME_LIBRARIES gme ) ++mark_as_advanced( GME_INCLUDE_DIR GME_LIBRARIES ) ++FIND_PACKAGE_HANDLE_STANDARD_ARGS( GME ++ REQUIRED_VARS GME_LIBRARIES GME_INCLUDE_DIR ++) + + if( MSVC ) + # Eliminate unreferenced functions and data -- cgit v1.2.3 From 99db6db7be7a51a6250584dfe896afd797c73812 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 21 Jan 2020 23:50:29 +0100 Subject: gnu: Use HTTPS for bioconductor.org. * gnu/packages/bioinformatics.scm (r-homo-sapiens)[source]: Use HTTPS. * gnu/packages/bioconductor.scm (r-bsgenome-mmusculus-ucsc-mm9-masked, r-cghcall, r-diffbind, r-cghbase, r-ripseeker, r-chippeakanno, r-qdnaseq, r-marray, r-multtest)[home-page]: Likewise. * gnu/packages/graph.scm (r-rgraphviz)[home-page]: Likewise. --- gnu/packages/bioconductor.scm | 18 +++++++++--------- gnu/packages/bioinformatics.scm | 2 +- gnu/packages/graph.scm | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index ef34b99649..e2b4f6ea7f 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -297,7 +297,7 @@ (define-public r-bsgenome-mmusculus-ucsc-mm9-masked `(("r-bsgenome" ,r-bsgenome) ("r-bsgenome-mmusculus-ucsc-mm9" ,r-bsgenome-mmusculus-ucsc-mm9))) - (home-page "http://bioconductor.org/packages/BSgenome.Mmusculus.UCSC.mm9.masked/") + (home-page "https://bioconductor.org/packages/BSgenome.Mmusculus.UCSC.mm9.masked/") (synopsis "Full masked genome sequences for Mouse") (description "This package provides full genome sequences for Mus musculus (Mouse) as @@ -1400,7 +1400,7 @@ (define-public r-diffbind ("r-s4vectors" ,r-s4vectors) ("r-summarizedexperiment" ,r-summarizedexperiment) ("r-systempiper" ,r-systempiper))) - (home-page "http://bioconductor.org/packages/DiffBind") + (home-page "https://bioconductor.org/packages/DiffBind") (synopsis "Differential binding analysis of ChIP-Seq peak data") (description "This package computes differentially bound sites from multiple @@ -1429,7 +1429,7 @@ (define-public r-ripseeker ("r-rsamtools" ,r-rsamtools) ("r-genomicalignments" ,r-genomicalignments) ("r-rtracklayer" ,r-rtracklayer))) - (home-page "http://bioconductor.org/packages/RIPSeeker") + (home-page "https://bioconductor.org/packages/RIPSeeker") (synopsis "Identifying protein-associated transcripts from RIP-seq experiments") (description @@ -1458,7 +1458,7 @@ (define-public r-multtest ("r-biocgenerics" ,r-biocgenerics) ("r-biobase" ,r-biobase) ("r-mass" ,r-mass))) - (home-page "http://bioconductor.org/packages/multtest") + (home-page "https://bioconductor.org/packages/multtest") (synopsis "Resampling-based multiple hypothesis testing") (description "This package can do non-parametric bootstrap and permutation @@ -1569,7 +1569,7 @@ (define-public r-chippeakanno ("r-seqinr" ,r-seqinr) ("r-summarizedexperiment" ,r-summarizedexperiment) ("r-venndiagram" ,r-venndiagram))) - (home-page "http://bioconductor.org/packages/ChIPpeakAnno") + (home-page "https://bioconductor.org/packages/ChIPpeakAnno") (synopsis "Peaks annotation from ChIP-seq and ChIP-chip experiments") (description "The package includes functions to retrieve the sequences around the peak, @@ -1594,7 +1594,7 @@ (define-public r-marray (build-system r-build-system) (propagated-inputs `(("r-limma" ,r-limma))) - (home-page "http://bioconductor.org/packages/marray") + (home-page "https://bioconductor.org/packages/marray") (synopsis "Exploratory analysis for two-color spotted microarray data") (description "This package contains class definitions for two-color spotted microarray data. It also includes functions for data input, diagnostic plots, @@ -1615,7 +1615,7 @@ (define-public r-cghbase (propagated-inputs `(("r-biobase" ,r-biobase) ("r-marray" ,r-marray))) - (home-page "http://bioconductor.org/packages/CGHbase") + (home-page "https://bioconductor.org/packages/CGHbase") (synopsis "Base functions and classes for arrayCGH data analysis") (description "This package contains functions and classes that are needed by the @code{arrayCGH} packages.") @@ -1638,7 +1638,7 @@ (define-public r-cghcall ("r-impute" ,r-impute) ("r-dnacopy" ,r-dnacopy) ("r-snowfall" ,r-snowfall))) - (home-page "http://bioconductor.org/packages/CGHcall") + (home-page "https://bioconductor.org/packages/CGHcall") (synopsis "Base functions and classes for arrayCGH data analysis") (description "This package contains functions and classes that are needed by @code{arrayCGH} packages.") @@ -1667,7 +1667,7 @@ (define-public r-qdnaseq ("r-matrixstats" ,r-matrixstats) ("r-r-utils" ,r-r-utils) ("r-rsamtools" ,r-rsamtools))) - (home-page "http://bioconductor.org/packages/QDNAseq") + (home-page "https://bioconductor.org/packages/QDNAseq") (synopsis "Quantitative DNA sequencing for chromosomal aberrations") (description "The genome is divided into non-overlapping fixed-sized bins, number of sequence reads in each counted, adjusted with a simultaneous diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 4a84273dd2..edfccacb4e 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10161,7 +10161,7 @@ (define-public r-homo-sapiens (method url-fetch) ;; We cannot use bioconductor-uri here because this tarball is ;; located under "data/annotation/" instead of "bioc/". - (uri (string-append "http://www.bioconductor.org/packages/" + (uri (string-append "https://www.bioconductor.org/packages/" "release/data/annotation/src/contrib/" "Homo.sapiens_" version ".tar.gz")) diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm index 4095926af3..982def62c6 100644 --- a/gnu/packages/graph.scm +++ b/gnu/packages/graph.scm @@ -183,7 +183,7 @@ (define-public r-rgraphviz `(("r-graph" ,r-graph))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://bioconductor.org/packages/Rgraphviz") + (home-page "https://bioconductor.org/packages/Rgraphviz") (synopsis "Plotting capabilities for R graph objects") (description "This package interfaces R with the graphviz library for plotting R graph -- cgit v1.2.3 From efeda080efbe35171c1ee072ef316211385d67bf Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 20 Jan 2020 23:06:27 +0100 Subject: gnu: opam: Update to 2.0.6. * gnu/pckages/ocaml.scm (opam): Update to 2.0.6. --- gnu/packages/ocaml.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index ce0398b0d4..0689ac9b5b 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016 Eric Bavier ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2016, 2018, 2019 Efraim Flashner -;;; Copyright © 2016-2018 Julien Lepiller +;;; Copyright © 2016-2020 Julien Lepiller ;;; Copyright © 2017 Ben Woodcroft ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Peter Kreye @@ -444,7 +444,7 @@ (define-public ocaml-opam-file-format (define-public opam (package (name "opam") - (version "2.0.5") + (version "2.0.6") (source (origin (method git-fetch) (uri (git-reference @@ -453,7 +453,7 @@ (define-public opam (file-name (git-file-name name version)) (sha256 (base32 - "0pf2smq2sdcxryq5i87hz3dv05pb3zasb1is3kxq1pi1s4cn55mx")))) + "1vyga2jllsfsikppxyzljm4isfnnnl8k0rb44h8xaddjzdg1d4m8")))) (build-system ocaml-build-system) (arguments `(#:configure-flags @@ -497,6 +497,10 @@ (define-public opam "add_sys_mounts /gnu /run/current-system /usr")) (substitute* "src/client/opamInitDefaults.ml" (("\"bwrap\"") (string-append "\"" bwrap "\""))) + ;; Generating the documentation needs write access + (for-each + (lambda (f) (chmod f #o644)) + (find-files "doc" ".")) #t))) (add-before 'check 'pre-check (lambda _ -- cgit v1.2.3 From c2eb8c7ef7941e9c5791de2b2447a8d48adabbb4 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 20 Jan 2020 23:10:22 +0100 Subject: gnu: camlp5: Update to 7.10. * gnu/packages/ocaml.scm (camlp5): Upadte to 7.10. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 0689ac9b5b..34018ea5f6 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -537,7 +537,7 @@ (define-public opam (define-public camlp5 (package (name "camlp5") - (version "7.07") + (version "7.10") (source (origin (method git-fetch) @@ -546,7 +546,7 @@ (define-public camlp5 (commit (string-append "rel" (string-delete #\. version))))) (file-name (git-file-name name version)) (sha256 - (base32 "1c8v45553ccbqha2ypfranqlgw06rr5wjr2hlnrx5bf9jfq0h0dn")))) + (base32 "1a1lgsc8350afdwmsznsys7m0c0cks4nw6irqz2f92g8g4vkk9b7")))) (build-system gnu-build-system) (inputs `(("ocaml" ,ocaml))) -- cgit v1.2.3 From 795cf2a3b57c73eeec0fe853dbf47e140e44ff56 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 20 Jan 2020 23:26:18 +0100 Subject: gnu: ocaml-qcheck: Update to 0.12. * gnu/packages/ocaml.scm (ocaml-qcheck): Update to 0.12. --- gnu/packages/ocaml.scm | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 34018ea5f6..3beead8fd0 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1140,7 +1140,7 @@ (define-public ocaml-frontc (define-public ocaml-qcheck (package (name "ocaml-qcheck") - (version "0.11") + (version "0.12") (source (origin (method git-fetch) @@ -1149,14 +1149,22 @@ (define-public ocaml-qcheck (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0d2wih4zxn2zm7kxd9dnf5nlp838km3vz6wv80fa3m51609fb24i")))) + (base32 "1llnfynhlndwyjig7wrayjnds2b3mggp5lw20dwxhn2i2lkkb22m")))) (build-system dune-build-system) (arguments - `(#:test-target ".")) - (native-inputs + `(#:test-target "." + #:phases + (modify-phases %standard-phases + (add-before 'build 'fix-deprecated + (lambda _ + (substitute* "src/core/QCheck.ml" + (("Pervasives.compare") "compare")) + #t))))) + (propagated-inputs `(("ocaml-alcotest" ,ocaml-alcotest) - ("ocaml-ounit" ,ocaml-ounit) - ("ocamlbuild" ,ocamlbuild))) + ("ocaml-ounit" ,ocaml-ounit))) + (native-inputs + `(("ocamlbuild" ,ocamlbuild))) (home-page "https://github.com/c-cube/qcheck") (synopsis "QuickCheck inspired property-based testing for OCaml") (description "QuickCheck inspired property-based testing for OCaml. This -- cgit v1.2.3 From 73e01ae45605b5f0d3c37606259fa125a93f9754 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 20 Jan 2020 23:37:24 +0100 Subject: gnu: ocaml-qtest. Update to 2.10.1. * gnu/packages/ocaml.scm (ocaml-qtest): Update to 2.10.1. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 3beead8fd0..acea1fe396 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1176,7 +1176,7 @@ (define-public ocaml-qcheck (define-public ocaml-qtest (package (name "ocaml-qtest") - (version "2.9") + (version "2.10.1") (source (origin (method git-fetch) (uri (git-reference @@ -1185,7 +1185,7 @@ (define-public ocaml-qtest (file-name (git-file-name name version)) (sha256 (base32 - "1ifxc8jndwah82g5k8xaa7jskbv866j4zpd0w41f0pskg4y0z9g1")))) + "0gddzan4vzs0vklsxhirdjrvx3rp7hhh2yr20vi13nq8rwkn9w29")))) (build-system dune-build-system) (arguments `(#:jbuild? #t -- cgit v1.2.3 From 2e038f36f80246ef623e22921baf3731f113a124 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 20 Jan 2020 23:56:53 +0100 Subject: gnu: ocaml-bisect-ppx: Update to 1.4.2. * gnu/packages/ocaml.scm (ocaml-bisect-ppx): Update to 1.4.2. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index acea1fe396..37214bba94 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5128,7 +5128,7 @@ (define-public ocaml-tyxml (define-public ocaml-bisect-ppx (package (name "ocaml-bisect-ppx") - (version "1.4.1") + (version "1.4.2") (source (origin (method git-fetch) @@ -5138,7 +5138,7 @@ (define-public ocaml-bisect-ppx (file-name (git-file-name name version)) (sha256 (base32 - "1vp3qvrkz7q25nbmvd40vhsnz2k9aqh17bnd21i3q8q0xlr5hdag")))) + "0900vli5kw7s5kdam0n4cqsfsfqb7mdb3azn3i55595gilg1vyn8")))) (build-system dune-build-system) (propagated-inputs `(("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) -- cgit v1.2.3 From 2624921a64727d137505c6f104692d2b88845a98 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Tue, 21 Jan 2020 00:16:28 +0100 Subject: gnu: Add ocaml-mmap. * gnu/packages/ocaml.scm (ocaml-mmap): New variable. --- gnu/packages/ocaml.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 37214bba94..7e71f7627f 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1739,6 +1739,26 @@ (define-public ocaml-ssl through Transport Layer Security (@dfn{TLS}) encrypted connections.") (license license:lgpl2.1))) +(define-public ocaml-mmap + (package + (name "ocaml-mmap") + (version "1.1.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mirage/mmap") + (commit (string-append "v" version)))) + (sha256 + (base32 + "1jaismy5d1bhbbanysmr2k79px0yv6ya265dri3949nha1l23i60")))) + (build-system dune-build-system) + (home-page "https://github.com/mirage/mmap") + (synopsis "File mapping for OCaml") + (description "This project provides a @command{Mmap.map_file} function +for mapping files in memory. This function is the same as the +@command{Unix.map_file} funciton added in OCaml >= 4.06.") + (license (list license:qpl license:lgpl2.0)))) + (define-public ocaml-lwt (package (name "ocaml-lwt") -- cgit v1.2.3 From 16829d3b8a795d6a4bef32bfab1f10be2f466f23 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Tue, 21 Jan 2020 00:23:09 +0100 Subject: gnu: ocaml-lwt: Update to 5.1.1. * gnu/packages/ocaml.scm (ocaml-lwt): update to 5.1.1. --- gnu/packages/ocaml.scm | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 7e71f7627f..0fc4a24172 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1762,7 +1762,7 @@ (define-public ocaml-mmap (define-public ocaml-lwt (package (name "ocaml-lwt") - (version "4.1.0") + (version "5.1.1") (source (origin (method url-fetch) @@ -1770,29 +1770,22 @@ (define-public ocaml-lwt ".tar.gz")) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0mhh019bjkg5xfvpy1pxs4xdxb759fyydmgb6l4j0qww1qgr8klp")))) + "0gwdmhn0qx03agc45dplj73ia5y1gb42aan64ywfxmll3lsnr2h7")))) (build-system dune-build-system) (arguments - `(#:tests? #f; require lwt_ppx - #:jbuild? #t - #:phases - (modify-phases %standard-phases - (add-before 'build 'configure - (lambda _ - (invoke "ocaml" "src/util/configure.ml" "-use-libev" "true") - #t))))) + `(#:package "lwt")) (native-inputs - `(("ocaml-cppo" ,ocaml-cppo) - ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) - ("pkg-config" ,pkg-config) - ("ppx-tools-versioned" ,ocaml-ppx-tools-versioned))) + `(("ocaml-bisect-ppx" ,ocaml-bisect-ppx) + ("ocaml-cppo" ,ocaml-cppo) + ("pkg-config" ,pkg-config))) (inputs `(("libev" ,libev) ("glib" ,glib))) (propagated-inputs - `(("result" ,ocaml-result) - ("ocaml-ssl" ,ocaml-ssl) - ("ocaml-react" ,ocaml-react))) + `(("ocaml-mmap" ,ocaml-mmap) + ("ocaml-ocplib-endian" ,ocaml-ocplib-endian) + ("ocaml-result" ,ocaml-result) + ("ocaml-seq" ,ocaml-seq))) (home-page "https://github.com/ocsigen/lwt") (synopsis "Cooperative threads and I/O in monadic style") (description "Lwt provides typed, composable cooperative threads. These -- cgit v1.2.3 From 5aa573d8c796e50b2f1c4283f68b0f1a27cd4280 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Tue, 21 Jan 2020 00:39:32 +0100 Subject: gnu: ocaml-markup: Update to 0.8.2. gnu/packages/ocaml.scm (ocaml-markup): Update to 0.8.2. --- gnu/packages/ocaml.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 0fc4a24172..31e200f3d5 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5063,7 +5063,7 @@ (define-public ocaml-core-kernel (define-public ocaml-markup (package (name "ocaml-markup") - (version "0.8.1") + (version "0.8.2") (home-page "https://github.com/aantron/markup.ml") (source (origin @@ -5074,14 +5074,20 @@ (define-public ocaml-markup (file-name (git-file-name name version)) (sha256 (base32 - "0gzdjfnkv56vhmpvi9xpv1p05z50y55izhn156bkmb35s6izxds3")))) + "13zcrwzjmifniv3bvjbkd2ah8wwa3ld75bxh1d8hrzdvfxzh9szn")))) (build-system dune-build-system) + (arguments + `(#:package "markup")) + (inputs + `(("libev" ,libev))) (propagated-inputs `(("ocaml-bisect-ppx" ,ocaml-bisect-ppx) ("ocaml-uchar" ,ocaml-uchar) ("ocaml-uutf" ,ocaml-uutf) ("ocaml-lwt" ,ocaml-lwt))) - (native-inputs `(("ocaml-ounit" ,ocaml-ounit))) + (native-inputs + `(("ocaml-ounit" ,ocaml-ounit) + ("pkg-config" ,pkg-config))) (synopsis "Error-recovering functional HTML5 and XML parsers and writers") (description "Markup.ml provides an HTML parser and an XML parser. The parsers are wrapped in a simple interface: they are functions that transform -- cgit v1.2.3 From 568bd2e3822b3ad6d8190f1dc04c5a6e43dcb2fa Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 21 Jan 2020 00:49:36 +0100 Subject: gnu: dendropy: Update home page. * gnu/packages/bioinformatics.scm (dendropy)[home-page]: Update. --- gnu/packages/bioinformatics.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index edfccacb4e..18f07e5dc2 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -2439,7 +2439,7 @@ (define-public python-dendropy (base32 "097hfyv2kaf4x92i4rjx0paw2cncxap48qivv8zxng4z7nhid0x9")))) (build-system python-build-system) - (home-page "http://packages.python.org/DendroPy/") + (home-page "https://dendropy.org/") (synopsis "Library for phylogenetics and phylogenetic computing") (description "DendroPy is a library for phylogenetics and phylogenetic computing: reading, -- cgit v1.2.3 From b56f2b6366a387ff42d7a33998f08527df60875e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 21 Jan 2020 00:55:32 +0100 Subject: gnu: express-beta-diversity: Update home page. The original is not coming back: . * gnu/packages/bioinformatics.scm (express-beta-diversity)[home-page]: Use source code repository as home page. --- gnu/packages/bioinformatics.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 18f07e5dc2..81ffbb7cf8 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -2916,7 +2916,7 @@ (define-public express-beta-diversity #t)))))) (inputs `(("python" ,python-2))) - (home-page "http://kiwi.cs.dal.ca/Software/ExpressBetaDiversity") + (home-page "https://github.com/dparks1134/ExpressBetaDiversity") (synopsis "Taxon- and phylogenetic-based beta diversity measures") (description "Express Beta Diversity (EBD) calculates ecological beta diversity -- cgit v1.2.3 From b725655fce8444049f886955a143b005642f811a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 21 Jan 2020 01:28:41 +0100 Subject: gnu: grit: Update home page. * gnu/packages/bioinformatics.scm (grit)[home-page]: Use source code repository as home page. --- gnu/packages/bioinformatics.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 81ffbb7cf8..a0a5597ab5 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -3313,7 +3313,8 @@ (define-public grit ("python-networkx" ,python2-networkx))) (native-inputs `(("python-cython" ,python2-cython))) - (home-page "http://grit-bio.org") + ;; The canonical home page times out as of 2020-01-21. + (home-page "https://github.com/nboley/grit") (synopsis "Tool for integrative analysis of RNA-seq type assays") (description "GRIT is designed to use RNA-seq, TES, and TSS data to build and quantify -- cgit v1.2.3 From 030fe2fb7e2a75985fe289ef81ba7e03bf022365 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 21 Jan 2020 01:32:10 +0100 Subject: gnu: miso: Update home page. * gnu/packages/bioinformatics.scm (miso)[home-page]: Update. --- gnu/packages/bioinformatics.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index a0a5597ab5..6695c2fc16 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -4596,7 +4596,7 @@ (define-public miso ;; Use setuptools, or else the executables are not ;; installed. (("distutils.core") "setuptools") - ;; use "gcc" instead of "cc" for compilation + ;; Use "gcc" instead of "cc" for compilation. (("^defines") "cc.set_executables( compiler='gcc', @@ -4606,8 +4606,8 @@ (define-public miso #t)))) (build-system python-build-system) (arguments - `(#:python ,python-2 ; only Python 2 is supported - #:tests? #f)) ; no "test" target + `(#:python ,python-2 ; only Python 2 is supported + #:tests? #f)) ; no "test" target (inputs `(("samtools" ,samtools) ("python-numpy" ,python2-numpy) @@ -4615,9 +4615,9 @@ (define-public miso ("python-scipy" ,python2-scipy) ("python-matplotlib" ,python2-matplotlib))) (native-inputs - `(("python-mock" ,python2-mock) ;for tests - ("python-pytz" ,python2-pytz))) ;for tests - (home-page "http://genes.mit.edu/burgelab/miso/index.html") + `(("python-mock" ,python2-mock) ; for tests + ("python-pytz" ,python2-pytz))) ; for tests + (home-page "https://www.genes.mit.edu/burgelab/miso/index.html") (synopsis "Mixture of Isoforms model for RNA-Seq isoform quantitation") (description "MISO (Mixture-of-Isoforms) is a probabilistic framework that quantitates -- cgit v1.2.3 From 5832b88c45d2625f282d7057524a1d2664d0f8d0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 21 Jan 2020 01:41:59 +0100 Subject: gnu: prodigal: Update home page. * gnu/packages/bioinformatics.scm (prodigal)[home-page]: Use source code repository as home page. --- gnu/packages/bioinformatics.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 6695c2fc16..c51aa89218 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -4992,6 +4992,8 @@ (define-public pyicoteo (define-public prodigal (package (name "prodigal") + ;; Check for a new home page when updating this package: + ;; https://github.com/hyattpd/Prodigal/issues/36#issuecomment-536617588 (version "2.6.3") (source (origin (method git-fetch) @@ -5004,14 +5006,14 @@ (define-public prodigal "1fs1hqk83qjbjhrvhw6ni75zakx5ki1ayy3v6wwkn3xvahc9hi5s")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ;no check target + `(#:tests? #f ; no check target #:make-flags (list (string-append "INSTALLDIR=" (assoc-ref %outputs "out") "/bin")) #:phases (modify-phases %standard-phases (delete 'configure)))) - (home-page "http://prodigal.ornl.gov") + (home-page "https://github.com/hyattpd/Prodigal") (synopsis "Protein-coding gene prediction for Archaea and Bacteria") (description "Prodigal runs smoothly on finished genomes, draft genomes, and -- cgit v1.2.3 From 0eeaf1ac3cd5ea21cf126017b639efd964a759f5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 21 Jan 2020 01:43:36 +0100 Subject: gnu: raxml: Update home page. * gnu/packages/bioinformatics.scm (raxml)[home-page]: Update. --- gnu/packages/bioinformatics.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index c51aa89218..48f181db1b 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -5171,7 +5171,7 @@ (define-public raxml #t))))) (inputs `(("openmpi" ,openmpi))) - (home-page "http://sco.h-its.org/exelixis/web/software/raxml/index.html") + (home-page "https://cme.h-its.org/exelixis/web/software/raxml/index.html") (synopsis "Randomized Axelerated Maximum Likelihood phylogenetic trees") (description "RAxML is a tool for phylogenetic analysis and post-analysis of large -- cgit v1.2.3 From 0388046068e2c80afe201bf0a55795dfa8454c01 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 21 Jan 2020 01:44:54 +0100 Subject: gnu: sra-tools: Update home page. * gnu/packages/bioinformatics.scm (sra-tools)[home-page]: Update. --- gnu/packages/bioinformatics.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 48f181db1b..f4eec88b42 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6042,7 +6042,8 @@ (define-public sra-tools ("fuse" ,fuse) ("hdf5" ,hdf5) ("zlib" ,zlib))) - (home-page "http://www.ncbi.nlm.nih.gov/Traces/sra/sra.cgi?view=software") + (home-page + "https://trace.ncbi.nlm.nih.gov/Traces/sra/sra.cgi?view=software") (synopsis "Tools and libraries for reading and writing sequencing data") (description "The SRA Toolkit from NCBI is a collection of tools and libraries for -- cgit v1.2.3 From 72607005e465e4f7635f7a4f584457be9e6c9d77 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 21 Jan 2020 01:47:30 +0100 Subject: gnu: r-gage: Update home page. * gnu/packages/bioinformatics.scm (r-gage)[home-page]: Update. --- gnu/packages/bioinformatics.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index f4eec88b42..8454b3e25c 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9784,7 +9784,8 @@ (define-public r-gage `(("r-annotationdbi" ,r-annotationdbi) ("r-graph" ,r-graph) ("r-keggrest" ,r-keggrest))) - (home-page "http://www.biomedcentral.com/1471-2105/10/161") + (home-page (string-append "https://bmcbioinformatics.biomedcentral.com/" + "articles/10.1186/1471-2105-10-161")) (synopsis "Generally applicable gene-set enrichment for pathway analysis") (description "GAGE is a published method for gene set (enrichment or GSEA) or pathway -- cgit v1.2.3 From a19fb6a43648f6a3556d8139794ebd8646e792b8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 21 Jan 2020 01:59:49 +0100 Subject: gnu: Use HTTPS for (gnu packages bioinformatics) home pages. * gnu/packages/bioinformatics (bamm, ribodiff, python-biopython) (discrover, hisat, hisat2, htseq, fastqc, htslib, python2-pbcore, roary) (sortmerna, r-qtl, multiqc, r-deseq, r-fastseg, sambamba, trim-galore) (gess, kentutils, bismark, kallisto, sailfish, python-hicexplorer) (pplacer, python2-checkm-genome, r-velocyto)[home-page]: Use HTTPS. --- gnu/packages/bioinformatics.scm | 58 ++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 8454b3e25c..e8dac2a12b 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -261,7 +261,7 @@ (define-public bamm ("coreutils" ,coreutils))) (propagated-inputs `(("python-numpy" ,python2-numpy))) - (home-page "http://ecogenomics.github.io/BamM/") + (home-page "https://ecogenomics.github.io/BamM/") (synopsis "Metagenomics-focused BAM file manipulator") (description "BamM is a C library, wrapped in python, to efficiently generate and @@ -726,7 +726,7 @@ (define-public ribodiff (native-inputs `(("python-mock" ,python2-mock) ("python-nose" ,python2-nose))) - (home-page "http://public.bmi.inf.ethz.ch/user/zhongy/RiboDiff/") + (home-page "https://public.bmi.inf.ethz.ch/user/zhongy/RiboDiff/") (synopsis "Detect translation efficiency changes from ribosome footprints") (description "RiboDiff is a statistical tool that detects the protein translational efficiency change from Ribo-Seq (ribosome footprinting) and @@ -1056,7 +1056,7 @@ (define-public python-biopython (lambda _ (setenv "HOME" "/tmp") #t))))) (propagated-inputs `(("python-numpy" ,python-numpy))) - (home-page "http://biopython.org/") + (home-page "https://biopython.org/") (synopsis "Tools for biological computation in Python") (description "Biopython is a set of tools for biological computation including parsers @@ -2676,7 +2676,7 @@ (define-public discrover texlive-latex-pgf ; tikz texlive-latex-verbatimbox))) ("imagemagick" ,imagemagick))) - (home-page "http://dorina.mdc-berlin.de/public/rajewsky/discrover/") + (home-page "https://dorina.mdc-berlin.de/public/rajewsky/discrover/") (synopsis "Discover discriminative nucleotide sequence motifs") (description "Discrover is a motif discovery method to find binding sites of nucleic acid binding proteins.") @@ -3381,7 +3381,7 @@ (define-public hisat ;; Non-portable SSE instructions are used so building fails on platforms ;; other than x86_64. (supported-systems '("x86_64-linux")) - (home-page "http://ccb.jhu.edu/software/hisat/index.shtml") + (home-page "https://ccb.jhu.edu/software/hisat/index.shtml") (synopsis "Hierarchical indexing for spliced alignment of transcripts") (description "HISAT is a fast and sensitive spliced alignment program for mapping @@ -3435,7 +3435,7 @@ (define-public hisat2 `(("unzip" ,unzip) ; needed for archive from ftp ("perl" ,perl) ("pandoc" ,ghc-pandoc))) ; for documentation - (home-page "http://ccb.jhu.edu/software/hisat2/index.shtml") + (home-page "https://ccb.jhu.edu/software/hisat2/index.shtml") (synopsis "Graph-based alignment of genomic sequencing reads") (description "HISAT2 is a fast and sensitive alignment program for mapping next-generation sequencing reads (both DNA and RNA) to a population of human @@ -3495,7 +3495,7 @@ (define-public htseq (inputs `(("python-pysam" ,python-pysam) ("python-matplotlib" ,python-matplotlib))) - (home-page "http://www-huber.embl.de/users/anders/HTSeq/") + (home-page "https://htseq.readthedocs.io/") (synopsis "Analysing high-throughput sequencing data with Python") (description "HTSeq is a Python package that provides infrastructure to process data @@ -3970,7 +3970,7 @@ (define-public fastqc ("java-jbzip2" ,java-jbzip2))) (native-inputs `(("unzip" ,unzip))) - (home-page "http://www.bioinformatics.babraham.ac.uk/projects/fastqc/") + (home-page "https://www.bioinformatics.babraham.ac.uk/projects/fastqc/") (synopsis "Quality control tool for high throughput sequence data") (description "FastQC aims to provide a simple way to do some quality control @@ -4049,7 +4049,7 @@ (define-public htslib `(("zlib" ,zlib))) (native-inputs `(("perl" ,perl))) - (home-page "http://www.htslib.org") + (home-page "https://www.htslib.org") (synopsis "C library for reading/writing high-throughput sequencing data") (description "HTSlib is a C library for reading/writing high-throughput sequencing @@ -4743,7 +4743,7 @@ (define-public python2-pbcore `(("python-nose" ,python2-nose) ("python-sphinx" ,python2-sphinx) ("python-pyxb" ,python2-pyxb))) - (home-page "http://pacificbiosciences.github.io/pbcore/") + (home-page "https://pacificbiosciences.github.io/pbcore/") (synopsis "Library for reading and writing PacBio data files") (description "The pbcore package provides Python APIs for interacting with PacBio data @@ -5127,7 +5127,7 @@ (define-public roary ("r-minimal" ,r-minimal) ("r-ggplot2" ,r-ggplot2) ("coreutils" ,coreutils))) - (home-page "http://sanger-pathogens.github.io/Roary") + (home-page "https://sanger-pathogens.github.io/Roary/") (synopsis "High speed stand-alone pan genome pipeline") (description "Roary is a high speed stand alone pan genome pipeline, which takes @@ -6269,7 +6269,7 @@ (define-public sortmerna #t)))))) (inputs `(("zlib" ,zlib))) - (home-page "http://bioinfo.lifl.fr/RNA/sortmerna") + (home-page "https://bioinfo.lifl.fr/RNA/sortmerna/") (synopsis "Biological sequence analysis tool for NGS reads") (description "SortMeRNA is a biological sequence analysis tool for filtering, mapping @@ -8237,7 +8237,7 @@ (define-public r-qtl (base32 "03lmvydln8b7666b6w46qbryhf83vsd11d4y2v95rfgvqgq66l1i")))) (build-system r-build-system) - (home-page "http://rqtl.org/") + (home-page "https://rqtl.org/") (synopsis "R package for analyzing QTL experiments in genetics") (description "R/qtl is an extension library for the R statistics system. It is used to analyze experimental crosses for identifying @@ -8313,7 +8313,7 @@ (define-public r-r4rna (propagated-inputs `(("r-optparse" ,r-optparse) ("r-rcolorbrewer" ,r-rcolorbrewer))) - (home-page "http://www.e-rna.org/r-chie/index.cgi") + (home-page "https://www.e-rna.org/r-chie/index.cgi") (synopsis "Analysis framework for RNA secondary structure") (description "The R4RNA package aims to be a general framework for the analysis of RNA @@ -8933,7 +8933,7 @@ (define-public multiqc (("['\"]matplotlib.*?['\"]") "'matplotlib'")) #t))))) - (home-page "http://multiqc.info") + (home-page "https://multiqc.info") (synopsis "Aggregate bioinformatics analysis reports") (description "MultiQC is a tool to aggregate bioinformatics results across many @@ -9603,7 +9603,7 @@ (define-public r-deseq ("r-locfit" ,r-locfit) ("r-mass" ,r-mass) ("r-rcolorbrewer" ,r-rcolorbrewer))) - (home-page "http://www-huber.embl.de/users/anders/DESeq") + (home-page "https://www-huber.embl.de/users/anders/DESeq/") (synopsis "Differential gene expression analysis") (description "This package provides tools for estimating variance-mean dependence in @@ -9732,7 +9732,7 @@ (define-public r-fastseg ("r-genomicranges" ,r-genomicranges) ("r-iranges" ,r-iranges) ("r-s4vectors" ,r-s4vectors))) - (home-page "http://www.bioinf.jku.at/software/fastseg/index.html") + (home-page "https://www.bioinf.jku.at/software/fastseg/index.html") (synopsis "Fast segmentation algorithm for genetic sequencing data") (description "Fastseg implements a very fast and efficient segmentation algorithm. @@ -10897,7 +10897,7 @@ (define-public sambamba (inputs `(("lz4" ,lz4) ("htslib" ,htslib-for-sambamba))) - (home-page "http://lomereiter.github.io/sambamba") + (home-page "https://lomereiter.github.io/sambamba/") (synopsis "Tools for working with SAM/BAM data") (description "Sambamba is a high performance modern robust and fast tool (and library), written in the D programming language, for @@ -11014,7 +11014,7 @@ (define-public trim-galore ("cutadapt" ,cutadapt))) (native-inputs `(("unzip" ,unzip))) - (home-page "http://www.bioinformatics.babraham.ac.uk/projects/trim_galore/") + (home-page "https://www.bioinformatics.babraham.ac.uk/projects/trim_galore/") (synopsis "Wrapper around Cutadapt and FastQC") (description "Trim Galore! is a wrapper script to automate quality and adapter trimming as well as quality control, with some added functionality to @@ -11076,7 +11076,7 @@ (define-public gess ("python2-numpy" ,python2-numpy) ("python2-networkx" ,python2-networkx) ("python2-biopython" ,python2-biopython))) - (home-page "http://compbio.uthscsa.edu/GESS_Web/") + (home-page "https://compbio.uthscsa.edu/GESS_Web/") (synopsis "Detect exon-skipping events from raw RNA-seq data") (description "GESS is an implementation of a novel computational method to detect de @@ -11328,7 +11328,7 @@ (define-public kentutils ("mariadb" ,mariadb "lib") ("mariadb-dev" ,mariadb "dev") ("openssl" ,openssl-1.0))) - (home-page "http://genome.cse.ucsc.edu/index.html") + (home-page "https://genome.cse.ucsc.edu/index.html") (synopsis "Assorted bioinformatics utilities") (description "This package provides the kentUtils, a selection of bioinformatics utilities used in combination with the UCSC genome @@ -11488,7 +11488,7 @@ (define-public bismark (sha256 (base32 "138mwsr4nf5qif4mrxx286mpnagxd1xwl6k8aidrjgknaqg88zyr")))) ("uglify-js" ,uglify-js))) - (home-page "http://www.bioinformatics.babraham.ac.uk/projects/bismark/") + (home-page "https://www.bioinformatics.babraham.ac.uk/projects/bismark/") (synopsis "Map bisulfite treated sequence reads and analyze methylation") (description "Bismark is a program to map bisulfite treated sequencing reads to a genome of interest and perform methylation calls in a single step. @@ -11591,7 +11591,7 @@ (define-public kallisto `(("hdf5" ,hdf5) ("htslib" ,htslib) ("zlib" ,zlib))) - (home-page "http://pachterlab.github.io/kallisto/") + (home-page "https://pachterlab.github.io/kallisto/") (synopsis "Near-optimal RNA-Seq quantification") (description "Kallisto is a program for quantifying abundances of transcripts from @@ -11766,7 +11766,7 @@ (define-public sailfish ("zlib" ,zlib))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.cs.cmu.edu/~ckingsf/software/sailfish") + (home-page "https://www.cs.cmu.edu/~ckingsf/software/sailfish/") (synopsis "Mapping-based isoform quantification from RNA-Seq reads") (description "Sailfish is a tool for genomic transcript quantification from RNA-seq data. It requires a set of target transcripts (either from a @@ -13569,7 +13569,7 @@ (define-public python-hicexplorer ("python-six" ,python-six) ("python-tables" ,python-tables) ("python-unidecode" ,python-unidecode))) - (home-page "http://hicexplorer.readthedocs.io") + (home-page "https://hicexplorer.readthedocs.io") (synopsis "Process, analyze and visualize Hi-C data") (description "HiCExplorer is a powerful and easy to use set of tools to process, @@ -14651,7 +14651,7 @@ (define-public pplacer reference alignment. Pplacer is designed to be fast, to give useful information about uncertainty, and to offer advanced visualization and downstream analysis.") - (home-page "http://matsen.fhcrc.org/pplacer") + (home-page "https://matsen.fhcrc.org/pplacer/") (license license:gpl3)))) ;; This package is installed alongside 'pplacer'. It is a separate package so @@ -14707,14 +14707,14 @@ (define-public python2-checkm-genome (build-system python-build-system) (arguments `(#:python ,python-2 - #:tests? #f)) ; some tests are interactive + #:tests? #f)) ; some tests are interactive (propagated-inputs `(("python-dendropy" ,python2-dendropy) ("python-matplotlib" ,python2-matplotlib) ("python-numpy" ,python2-numpy) ("python-pysam" ,python2-pysam) ("python-scipy" ,python2-scipy))) - (home-page "http://pypi.python.org/pypi/checkm/") + (home-page "https://pypi.org/project/Checkm/") (synopsis "Assess the quality of putative genome bins") (description "CheckM provides a set of tools for assessing the quality of genomes @@ -15366,7 +15366,7 @@ (define-public r-velocyto ("r-rsamtools" ,r-rsamtools) ("r-edger" ,r-edger) ("r-igraph" ,r-igraph))) - (home-page "http://velocyto.org") + (home-page "https://velocyto.org") (synopsis "RNA velocity estimation in R") (description "This package provides basic routines for estimation of gene-specific -- cgit v1.2.3 From 5dc6d5ce9997e4caf66d154f91c3695e02e5386f Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 21 Jan 2020 13:56:06 +0100 Subject: gnu: upower: Install 'dbus-1/system.d/org.freedesktop.UPower.conf' to etc/. Fixes . Reported by Jesse Gibbons . * gnu/packages/gnome.scm (upower)[source]: Add 'modules' and 'snippet'. --- gnu/packages/gnome.scm | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 8b7ac13457..c304bdbc9b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2015 Andreas Enge -;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2014 Ian Denhardt ;;; Copyright © 2014, 2016 Eric Bavier ;;; Copyright © 2014, 2015 Federico Beffa @@ -4175,7 +4175,20 @@ (define-public upower (sha256 (base32 "1vxxvmz2cxb1qy6ibszaz5bskqdy9nd9fxspj9fv3gfmrjzzzdb4")) - (patches (search-patches "upower-builddir.patch")))) + (patches (search-patches "upower-builddir.patch")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Upstream commit + ;; + ;; moved 'dbus-1/system.d' from etc/ to share/. However, + ;; 'dbus-configuration-directory' in (gnu services dbus) + ;; expects it in etc/. Thus, move it back to its previous + ;; location. + (substitute* "src/Makefile.in" + (("^dbusconfdir =.*$") + "dbusconfdir = $(sysconfdir)/dbus-1/system.d\n")) + #t)))) (build-system glib-or-gtk-build-system) (arguments '( ;; The tests want to contact the system bus, which can't be done in the -- cgit v1.2.3 From b2f948be9f815582a49bd80a9594a881d7d1a56e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 21 Jan 2020 14:26:41 +0100 Subject: services: sane: Create the "scanner" account. * gnu/services/desktop.scm (%sane-accounts, sane-service-type): New variables. (%desktop-services): Use SANE-SERVICE-TYPE instead of 'simple-service'. * doc/guix.texi (Desktop Services): Document 'sane-service-type'. --- doc/guix.texi | 7 +++++++ gnu/services/desktop.scm | 28 ++++++++++++++++++++++++++-- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 2b5bfc6cb7..d674b9484f 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -15845,6 +15845,13 @@ this application is allowed location info access. An empty users list means that all users are allowed. @end deffn +@cindex scanner access +@deffn {Scheme Procedure} sane-service-type +This service provides access to scanners @i{via} +@uref{http://www.sane-project.org, SANE} by installing the necessary udev +rules. +@end deffn + @defvr {Scheme Variable} %standard-geoclue-applications The standard list of well-known GeoClue application configurations, granting authority to the GNOME date-and-time utility to ask for the diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index dec1c3fa0f..9dcdf38be1 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2015 Andy Wingo ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2016 Sou Bunnbu @@ -110,6 +110,7 @@ (define-module (gnu services desktop) accountsservice-service cups-pk-helper-service-type + sane-service-type gnome-desktop-configuration gnome-desktop-configuration? @@ -836,6 +837,29 @@ (define cups-pk-helper-service-type (service-extension polkit-service-type list))) (default-value cups-pk-helper))) + +;;; +;;; Scanner access via SANE. +;;; + +(define %sane-accounts + ;; The '60-libsane.rules' udev rules refers to the "scanner" group. + (list (user-group (name "scanner") (system? #t)))) + +(define sane-service-type + (service-type + (name 'sane) + (description + "This service provides access to scanners @i{via} +@uref{http://www.sane-project.org, SANE} by installing the necessary udev +rules.") + (default-value sane-backends-minimal) + (extensions + (list (service-extension udev-service-type list) + (service-extension account-service-type + (const %sane-accounts)))))) + + ;;; ;;; GNOME desktop service. @@ -1156,7 +1180,7 @@ (define %desktop-services ;; them. (simple-service 'mtp udev-service-type (list libmtp)) ;; Add udev rules for scanners. - (simple-service 'sane udev-service-type (list sane-backends-minimal)) + (service sane-service-type) ;; Add polkit rules, so that non-root users in the wheel group can ;; perform administrative tasks (similar to "sudo"). polkit-wheel-service -- cgit v1.2.3 From 04020a73b3dea169f806d4f0d04cd2505d50efa1 Mon Sep 17 00:00:00 2001 From: John Soo Date: Wed, 15 Jan 2020 09:34:03 -0800 Subject: gnu: Add rust-handlebars-2.0. * gnu/packages/crates-io.scm (rust-handlebars-2.0): 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 dd75d462f6..f79b5a7bb2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4282,6 +4282,44 @@ (define-public rust-half-1.3 IEEE 754-2008 binary16 type.") (license (list license:expat license:asl2.0)))) +(define-public rust-handlebars-2.0 + (package + (name "rust-handlebars") + (version "2.0.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "handlebars" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1m99gwjd7q7q79bk4f716wsdvcyhsrcsq4vbzcavbkmc48d194mg")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-hashbrown" ,rust-hashbrown-0.5) + ("rust-log" ,rust-log-0.4) + ("rust-pest" ,rust-pest-2.1) + ("rust-pest-derive" ,rust-pest-derive-2.1) + ("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)) + #:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.2) + ("rust-env-logger" ,rust-env-logger-0.6) + ("rust-maplit" ,rust-maplit-1.0) + ("rust-serde-derive" ,rust-serde-derive-1.0) + ("rust-tempfile" ,rust-tempfile-3.0)))) + (home-page "https://github.com/sunng87/handlebars-rust") + (synopsis "Handlebars templating implemented in Rust") + (description + "This package provides handlebars templating implemented in Rust. It is +the template engine that renders the official Rust website") + (license license:expat))) + (define-public rust-heapsize-0.4 (package (name "rust-heapsize") -- cgit v1.2.3 From 39bb7b29d96d24f33c242d53fc574933736c51f0 Mon Sep 17 00:00:00 2001 From: John Soo Date: Wed, 15 Jan 2020 09:42:35 -0800 Subject: gnu: Add rust-regex-1.3. * gnu/packages/crates-io.scm (rust-regex-1.3): New variable. (rust-regex-1.1): Inherit from rust-regex-1.3. Signed-off-by: Efraim Flashner --- 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 f79b5a7bb2..5936d690e9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8619,10 +8619,10 @@ (define-public rust-ref-cast-impl-0.2 "Derive implementation for ref_cast::RefCast.") (license (list license:asl2.0 license:expat)))) -(define-public rust-regex-1.1 +(define-public rust-regex-1.3 (package (name "rust-regex") - (version "1.1.7") + (version "1.3.3") (source (origin (method url-fetch) @@ -8631,7 +8631,7 @@ (define-public rust-regex-1.1 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1pabajpp0wzb7dm2x32gy8w7k0mwykr6zsvzn0fgpr6pww40hbqb")))) + "11syqmfvbsah805z6ih8vxf8p6jssdsz1gjsjqcwprz484cqql5m")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -8639,13 +8639,12 @@ (define-public rust-regex-1.1 (("rust-aho-corasick" ,rust-aho-corasick-0.7) ("rust-memchr" ,rust-memchr-2.2) ("rust-regex-syntax" ,rust-regex-syntax-0.6) - ("rust-thread-local" ,rust-thread-local-0.3) - ("rust-utf8-ranges" ,rust-utf8-ranges-1.0)) + ("rust-thread-local" ,rust-thread-local-1.0)) #:cargo-development-inputs (("rust-doc-comment" ,rust-doc-comment-0.3) ("rust-lazy-static" ,rust-lazy-static-1.3) ("rust-quickcheck" ,rust-quickcheck-0.8) - ("rust-rand" ,rust-rand-0.4)))) + ("rust-rand" ,rust-rand-0.6)))) (home-page "https://github.com/rust-lang/regex") (synopsis "Regular expressions for Rust") (description @@ -8653,6 +8652,34 @@ (define-public rust-regex-1.1 uses finite automata and guarantees linear time matching on all inputs.") (license (list license:expat license:asl2.0)))) +(define-public rust-regex-1.1 + (package + (inherit rust-regex-1.3) + (name "rust-regex") + (version "1.1.7") + (source + (origin + (method url-fetch) + (uri (crate-uri "regex" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1pabajpp0wzb7dm2x32gy8w7k0mwykr6zsvzn0fgpr6pww40hbqb")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-aho-corasick" ,rust-aho-corasick-0.7) + ("rust-memchr" ,rust-memchr-2.2) + ("rust-regex-syntax" ,rust-regex-syntax-0.6) + ("rust-thread-local" ,rust-thread-local-0.3) + ("rust-utf8-ranges" ,rust-utf8-ranges-1.0)) + #:cargo-development-inputs + (("rust-doc-comment" ,rust-doc-comment-0.3) + ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-quickcheck" ,rust-quickcheck-0.8) + ("rust-rand" ,rust-rand-0.4)))))) + (define-public rust-regex-automata-0.1 (package (name "rust-regex-automata") -- cgit v1.2.3 From 30b36e524af4459decf84ca0011707082c00ac31 Mon Sep 17 00:00:00 2001 From: John Soo Date: Wed, 15 Jan 2020 09:52:36 -0800 Subject: gnu: Add rust-dirs-2.0. * gnu/packages/crates-io.scm (rust-dirs-2.0): New variable. (rust-dirs-1.0): Inherit from rust-dirs-2.0. Signed-off-by: Efraim Flashner --- 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 5936d690e9..2589b18e97 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2332,24 +2332,25 @@ (define-public rust-digest-0.8 "Traits for cryptographic hash functions.") (license (list license:expat license:asl2.0)))) -(define-public rust-dirs-1.0 +(define-public rust-dirs-2.0 (package (name "rust-dirs") - (version "1.0.3") + (version "2.0.2") (source (origin (method url-fetch) (uri (crate-uri "dirs" version)) - (file-name (string-append name "-" version ".crate")) + (file-name + (string-append name "-" version ".tar.gz")) (sha256 (base32 - "02vigc566z5i6n9wr2x8sch39qp4arn89xhhrh18fhpm3jfc0ygn")))) - (build-system cargo-build-system) + "1qymhyq7w7wlf1dirq6gsnabdyzg6yi2yyxkx6c4ldlkbjdaibhk")))) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-libc" ,rust-libc-0.2) - ("rust-winapi" ,rust-winapi-0.3)))) + (("rust-cfg-if" ,rust-cfg-if-0.1) + ("rust-dirs-sys" ,rust-dirs-sys-0.3)))) + (build-system cargo-build-system) (home-page "https://github.com/soc/dirs-rs") (synopsis "Abstractions for standard locations for various platforms") (description @@ -2360,6 +2361,25 @@ (define-public rust-dirs-1.0 Windows, and the Standard Directory guidelines on macOS.") (license (list license:expat license:asl2.0)))) +(define-public rust-dirs-1.0 + (package + (inherit rust-dirs-2.0) + (name "rust-dirs") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "dirs" version)) + (file-name (string-append name "-" version ".crate")) + (sha256 + (base32 + "02vigc566z5i6n9wr2x8sch39qp4arn89xhhrh18fhpm3jfc0ygn")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-winapi" ,rust-winapi-0.3)))))) + (define-public rust-discard-1.0 (package (name "rust-discard") -- cgit v1.2.3 From 27f158ef23fd708a2c31f9f2f2a4e6c6f45761ec Mon Sep 17 00:00:00 2001 From: John Soo Date: Wed, 15 Jan 2020 09:55:46 -0800 Subject: gnu: rust-serde-1.0: Update to 1.0.104. * gnu/packages/crates-io.scm (rust-serde-1.0): Update to 1.0.104. 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 2589b18e97..0749cf31a2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9442,7 +9442,7 @@ (define-public rust-semver-parser-0.7 (define-public rust-serde-1.0 (package (name "rust-serde") - (version "1.0.101") + (version "1.0.104") (source (origin (method url-fetch) @@ -9450,7 +9450,7 @@ (define-public rust-serde-1.0 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "1p8r24hagcsrl92w5z32nfrg9040qkgqf8iwwnf7mzigpavwk5lp")))) + "0ja4mgw4p42syjk7jkzwhj2yg6llfrfm7vn8rvy7v3c1bzr1aha1")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t -- cgit v1.2.3 From ec438ab295703c83029d3d7e760d375c55e4b384 Mon Sep 17 00:00:00 2001 From: John Soo Date: Wed, 15 Jan 2020 09:56:41 -0800 Subject: gnu: rust-serde-cbor-0.10: Update to 0.10.2. * gnu/packages/crates-io.scm (rust-serde-cbor-0.10): Update 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 0749cf31a2..c7bb4129d3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9498,7 +9498,7 @@ (define-public rust-serde-bytes-0.11 (define-public rust-serde-cbor-0.10 (package (name "rust-serde-cbor") - (version "0.10.1") + (version "0.10.2") (source (origin (method url-fetch) @@ -9507,7 +9507,7 @@ (define-public rust-serde-cbor-0.10 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0jcb4j637vdlqk2z38jixaqmp6f92h36r17kclv5brjay32911ii")))) + "0kyizacjabsa78p9f7qvj31zirpnsgsr4zpfv1p6lwpcb3biw27p")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t -- cgit v1.2.3 From ea78979dd4460a2f3dd0c49287b68c0045af7c8c Mon Sep 17 00:00:00 2001 From: John Soo Date: Wed, 15 Jan 2020 09:59:34 -0800 Subject: gnu: rust-serde-json-1.0: Update to 1.0.44. * gnu/packages/crates-io.scm (rust-serde-json-1.0): Update to 1.0.44. 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 c7bb4129d3..06a1669dbf 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9553,7 +9553,7 @@ (define-public rust-serde-derive-1.0 (define-public rust-serde-json-1.0 (package (name "rust-serde-json") - (version "1.0.41") + (version "1.0.44") (source (origin (method url-fetch) @@ -9561,7 +9561,7 @@ (define-public rust-serde-json-1.0 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "1hipk84x40454mf599752mi7l08wb8qakz8vd6d3zp57d0mfnwig")))) + "1mysl675nqhzzkbcrqy4x63cbbsrrx3gcc7k8ydx1gajrkh7bia8")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t -- cgit v1.2.3 From b6510b1a62b7b20567708db34fa45a6b70d5ebce Mon Sep 17 00:00:00 2001 From: John Soo Date: Wed, 15 Jan 2020 10:01:02 -0800 Subject: gnu: rust-serde-yaml-0.8: Update to 0.8.11. * gnu/packages/crates-io.scm (rust-serde-yaml-0.8): Update to 0.8.11. [arguments]: Remove rust-version-sync-0.8 from cargo-development-inputs. Signed-off-by: Efraim Flashner --- 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 06a1669dbf..72523a9613 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9611,7 +9611,7 @@ (define-public rust-serde-test-1.0 (define-public rust-serde-yaml-0.8 (package (name "rust-serde-yaml") - (version "0.8.9") + (version "0.8.11") (source (origin (method url-fetch) @@ -9620,7 +9620,7 @@ (define-public rust-serde-yaml-0.8 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "10mmjpnshgrwij01a13679nxy1hnh5yfr0343kh0y9p5j2d8mc1q")))) + "0d9wdjrlx9gxg80kzc6pvdwz5pwhja2n8n0bxja9vv61kzqif6v9")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -9631,8 +9631,7 @@ (define-public rust-serde-yaml-0.8 ("rust-yaml-rust" ,rust-yaml-rust-0.4)) #:cargo-development-inputs (("rust-serde-derive" ,rust-serde-derive-1.0) - ("rust-unindent" ,rust-unindent-0.1) - ("rust-version-sync" ,rust-version-sync-0.8)))) + ("rust-unindent" ,rust-unindent-0.1)))) (home-page "https://github.com/dtolnay/serde-yaml") (synopsis "YAML support for Serde") -- cgit v1.2.3 From cb806c7c63e6c05facd1bb146d54593ba3e43808 Mon Sep 17 00:00:00 2001 From: John Soo Date: Wed, 15 Jan 2020 10:14:17 -0800 Subject: gnu: Add rust-dirs-sys-0.3. * gnu/packages/crates-io.scm (rust-dirs-sys-0.3): 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 72523a9613..200147140f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2380,6 +2380,35 @@ (define-public rust-dirs-1.0 (("rust-libc" ,rust-libc-0.2) ("rust-winapi" ,rust-winapi-0.3)))))) +(define-public rust-dirs-sys-0.3 + (package + (name "rust-dirs-sys") + (version "0.3.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "dirs-sys" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0yyykdcmbc476z1v9m4z5jb8y91dw6kgzpkiqi2ig07xx0yv585g")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-cfg-if" ,rust-cfg-if-0.1) + ("rust-libc" ,rust-libc-0.2) + ("rust-redox-users" ,rust-redox-users-0.3) + ("rust-winapi" ,rust-winapi-0.3)))) + (home-page "https://github.com/soc/dirs-sys-rs") + (synopsis + "System-level helper functions for the dirs and directories crates") + (description + "This package provides system-level helper functions for the @code{dirs} +and @code{directories} crates.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-discard-1.0 (package (name "rust-discard") -- cgit v1.2.3 From e320b20650ea02bfdbd8097de2b543a5038bad29 Mon Sep 17 00:00:00 2001 From: John Soo Date: Wed, 15 Jan 2020 10:22:30 -0800 Subject: gnu: Add rust-blake2-rfc-0.2. * gnu/packages/crates-io.scm (rust-blake2-rfc-0.2): 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 200147140f..dce7a6daed 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -677,6 +677,35 @@ (define-public rust-bitflags-1 (license (list license:asl2.0 license:expat)))) +(define-public rust-blake2-rfc-0.2 + (package + (name "rust-blake2-rfc") + (version "0.2.18") + (source + (origin + (method url-fetch) + (uri (crate-uri "blake2-rfc" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0034g47hyq2bzmk40895ill1mbnpmmjakdq3dmm9clidvl5m6vax")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-arrayvec" ,rust-arrayvec-0.4) + ("rust-clippy" ,rust-clippy-0.0) + ("rust-constant-time-eq" ,rust-constant-time-eq-0.1)) + #:cargo-development-inputs + (("rust-data-encoding" ,rust-data-encoding-2.1)))) + (home-page "https://github.com/cesarb/blake2-rfc") + (synopsis "Rust implementation of BLAKE2 based on RFC 7693") + (description + "This package provides a pure Rust implementation of BLAKE2 based on RFC +7693.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-blas-sys-0.7 (package (name "rust-blas-sys") -- cgit v1.2.3 From b43885e9e25493fd66b90769e99bc6e215ee7ecf Mon Sep 17 00:00:00 2001 From: John Soo Date: Wed, 15 Jan 2020 10:19:58 -0800 Subject: gnu: Add rust-redox-users-0.3. * gnu/packages/crates-io.scm (rust-redox-users-0.3): 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 dce7a6daed..4728ecde60 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8647,6 +8647,34 @@ (define-public rust-redox-termios-0.1 "This package provides a Rust library to access Redox termios functions.") (license license:expat))) +(define-public rust-redox-users-0.3 + (package + (name "rust-redox-users") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "redox_users" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0vdn688q9wg997b1x5abx2gf7406rn1lvd62ypcgh1gj7g5dpkjf")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-failure" ,rust-failure-0.1) + ("rust-rand-os" ,rust-rand-os-0.1) + ("rust-redox-syscall" ,rust-redox-syscall-0.1) + ("rust-rust-argon2" ,rust-rust-argon2-0.5)))) + (home-page "https://gitlab.redox-os.org/redox-os/users") + (synopsis "Access Redox users and groups") + (description + "This package provides a Rust library to access Redox users and groups +functionality.") + (license license:expat))) + (define-public rust-ref-cast-0.2 (package (name "rust-ref-cast") -- cgit v1.2.3 From 5a9e88c7d174e5936914ab2969fdf061bc977a00 Mon Sep 17 00:00:00 2001 From: John Soo Date: Wed, 15 Jan 2020 10:29:08 -0800 Subject: gnu: Add rust-term-size-1.0. * gnu/packages/crates-io.scm (rust-term-size-1.0): 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 4728ecde60..167630e6af 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10828,6 +10828,33 @@ (define-public rust-term-0.4 (("rust-kernel32-sys" ,rust-kernel32-sys-0.2) ("rust-winapi" ,rust-winapi-0.2)))))) +(define-public rust-term-size-1.0 + (package + (name "rust-term-size") + (version "1.0.0-beta1") + (source + (origin + (method url-fetch) + (uri (crate-uri "term_size" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "13w9cqjhzh3mmx6zami8lxyf42xx53yy866zxhxqcm71k637v8d8")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-clippy" ,rust-clippy-0.0) + ("rust-kernel32-sys" ,rust-kernel32-sys-0.2) + ("rust-libc" ,rust-libc-0.2) + ("rust-winapi" ,rust-winapi-0.3)))) + (home-page "https://github.com/clap-rs/term_size-rs") + (synopsis "Determine terminal sizes and dimensions") + (description + "Functions for determining terminal sizes and dimensions") + (license (list license:asl2.0 license:expat)))) + (define-public rust-termcolor-1.0 (package (name "rust-termcolor") -- cgit v1.2.3 From 7a7ff5d36ca523b3b3f69cbd95a72e84d92733d5 Mon Sep 17 00:00:00 2001 From: John Soo Date: Wed, 15 Jan 2020 10:29:33 -0800 Subject: gnu: Add rust-term-size-0.3. * gnu/packages/crates-io.scm (rust-term-size-0.3): New variable. Signed-off-by: Efraim Flashner --- 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 167630e6af..823b54f879 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10855,6 +10855,28 @@ (define-public rust-term-size-1.0 "Functions for determining terminal sizes and dimensions") (license (list license:asl2.0 license:expat)))) +(define-public rust-term-size-0.3 + (package + (inherit rust-term-size-1.0) + (name "rust-term-size") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "term_size" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "09wk3173ngmb710qs9rwgibq4w250q8lgnwjvb9cypc1vdk9lnwy")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-clippy" ,rust-clippy-0.0) + ("rust-kernel32-sys" ,rust-kernel32-sys-0.2) + ("rust-libc" ,rust-libc-0.2) + ("rust-winapi" ,rust-winapi-0.2)))))) + (define-public rust-termcolor-1.0 (package (name "rust-termcolor") -- cgit v1.2.3 From 77a164a7236ec99f8827e1190f4f6af3fa448d1c Mon Sep 17 00:00:00 2001 From: John Soo Date: Wed, 15 Jan 2020 10:14:43 -0800 Subject: gnu: Add rust-argon2rs-0.2. * gnu/packages/crates-io.scm (rust-argon2rs-0.2): 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 823b54f879..4492f96c55 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -254,6 +254,33 @@ (define-public rust-arc-swap-0.3 (description "This package provides an atomically swappable Arc.") (license (list license:expat license:asl2.0)))) +(define-public rust-argon2rs-0.2 + (package + (name "rust-argon2rs") + (version "0.2.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "argon2rs" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "14mkgkrjd4b4zy92pflz6yb4j1wn2chbd8jczxknxbkdm2vb0rrz")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-blake2-rfc" ,rust-blake2-rfc-0.2) + ("rust-scoped-threadpool" ,rust-scoped-threadpool-0.1)) + #:cargo-development-inputs + (("rust-cargon" ,rust-cargon-0.0)))) + (home-page "https://github.com/bryant/argon2rs") + (synopsis "Rust password hashing library that runs on Argon2") + (description "This package provides a pure Rust password hashing library +that runs on Argon2.") + (license license:expat))) + (define-public rust-arrayvec-0.4 (package (name "rust-arrayvec") -- cgit v1.2.3 From 21f887c3557fb87d63458a68339ed4b315af53c7 Mon Sep 17 00:00:00 2001 From: John Soo Date: Wed, 15 Jan 2020 09:58:32 -0800 Subject: gnu: rust-serde-derive-1.0: Update to 1.0.104. * gnu/packages/crates-io.scm (rust-serde-derive-1.0): Update it. 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 4492f96c55..611283644e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9638,7 +9638,7 @@ (define-public rust-serde-cbor-0.10 (define-public rust-serde-derive-1.0 (package (name "rust-serde-derive") - (version "1.0.101") + (version "1.0.104") (source (origin (method url-fetch) @@ -9646,7 +9646,7 @@ (define-public rust-serde-derive-1.0 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "0bn0wz3j48248187mfmypyqnh73mq734snxxhr05vmgcl51kl4sb")))) + "0r7gjlwfry44b4ylz524ynjp9v3qiwdj4c588lh94aas78q9x3qj")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t -- cgit v1.2.3 From ef2f6487d72b6828c60f5f34b5654f5482c41bc4 Mon Sep 17 00:00:00 2001 From: John Soo Date: Wed, 15 Jan 2020 10:38:13 -0800 Subject: gnu: rust-regex-syntax-0.6: Update to 0.6.13. * gnu/packages/crates-io.scm (rust-regex-syntax-0.6): Update to 0.6.13. [arguments]: Remove rust-ucd-util-0.1 from cargo-inputs. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 611283644e..9fd5aa7505 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8850,7 +8850,7 @@ (define-public rust-regex-automata-0.1 (define-public rust-regex-syntax-0.6 (package (name "rust-regex-syntax") - (version "0.6.10") + (version "0.6.13") (source (origin (method url-fetch) @@ -8858,12 +8858,9 @@ (define-public rust-regex-syntax-0.6 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "0p47lf38yj2g2fnmvnraccqlxwk35zr76hlnqi8yva932nzqam6d")))) + "141xi6yiji0bc04c4skamd4ny9vnd1jrwc7qzfga425lyn8yhd77")))) (build-system cargo-build-system) - (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-ucd-util" ,rust-ucd-util-0.1)))) + (arguments '(#:skip-build? #t)) (home-page "https://github.com/rust-lang/regex") (synopsis "Regular expression parser") (description -- cgit v1.2.3 From c0e73f92ba4c0dc0218317a4346a2eda4a87d5f8 Mon Sep 17 00:00:00 2001 From: John Soo Date: Wed, 15 Jan 2020 20:01:01 -0800 Subject: gnu: Add rust-rustc-std-workspace-alloc-1.0. * gnu/packages/crates-io.scm (rust-rustc-std-workspace-alloc-1.0): New variable. Signed-off-by: Efraim Flashner --- 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 9fd5aa7505..1d44cb86f6 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9025,6 +9025,26 @@ (define-public rust-rustc-serialize-0.3 (license (list license:asl2.0 license:expat)))) +(define-public rust-rustc-std-workspace-alloc-1.0 + (package + (name "rust-rustc-std-workspace-alloc") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rustc-std-workspace-alloc" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "11psmqk6glglxl3zwh8slz6iynfxaifh4spd2wcnws552dqdarpz")))) + (build-system cargo-build-system) + (arguments `(#:skip-build? #t)) + (home-page "https://crates.io/crates/rustc-std-workspace-alloc") + (synopsis "Rust workspace hack") + (description "This package is a Rust workspace hack.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-rustc-std-workspace-core-1.0 (package (name "rust-rustc-std-workspace-core") -- cgit v1.2.3 From 5e5ca33cd9112584032225675d073e6175015c0b Mon Sep 17 00:00:00 2001 From: John Soo Date: Wed, 15 Jan 2020 20:08:32 -0800 Subject: gnu: Add rust-hashbrown-0.5. * gnu/packages/crates-io.scm (rust-hashbrown-0.5): 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 1d44cb86f6..3e3082824d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4425,6 +4425,40 @@ (define-public rust-handlebars-2.0 the template engine that renders the official Rust website") (license license:expat))) +(define-public rust-hashbrown-0.5 + (package + (name "rust-hashbrown") + (version "0.5.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "hashbrown" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0lr3gsicplw7czapsscmii87hgzpvxf5ch92v7pi95xsipxl3pp1")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-compiler-builtins" ,rust-compiler-builtins-0.1) + ("rust-rayon" ,rust-rayon-1.1) + ("rust-rustc-std-workspace-alloc" ,rust-rustc-std-workspace-alloc-1.0) + ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1.0) + ("rust-serde" ,rust-serde-1.0)) + #:cargo-development-inputs + (("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-rand" ,rust-rand-0.5) + ("rust-rayon" ,rust-rayon-1.1) + ("rust-rustc-hash" ,rust-rustc-hash-1.0) + ("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") + (description + "This package provides a Rust port of Google's SwissTable hash map.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-heapsize-0.4 (package (name "rust-heapsize") -- cgit v1.2.3 From 922b65d05ec013693ea54bdf8220048047cd2e04 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 20 Jan 2020 21:23:07 +0200 Subject: gnu: Add rust-rand-0.5. * gnu/packages/crates-io.scm (rust-rand-0.5): 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 3e3082824d..8c3c31a28a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8034,6 +8034,35 @@ (define-public rust-rand-0.6 #:cargo-development-inputs (("rust-rand-xoshiro" ,rust-rand-xoshiro-0.1)))))) +(define-public rust-rand-0.5 + (package + (inherit rust-rand-0.7) + (name "rust-rand") + (version "0.5.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "rand" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1fdcgja9167hlzkf4g5daqwp498lwiyq7aqm05whklpbsdyc8666")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-cloudabi" ,rust-cloudabi-0.0) + ("rust-fuchsia-cprng" ,rust-fuchsia-cprng-0.1) + ("rust-libc" ,rust-libc-0.2) + ("rust-log" ,rust-log-0.4) + ("rust-rand-core" ,rust-rand-core-0.3) + ("rust-serde" ,rust-serde-1.0) + ("rust-serde-derive" ,rust-serde-derive-1.0) + ("rust-stdweb" ,rust-stdweb-0.4) + ("rust-winapi" ,rust-winapi-0.3)) + #:cargo-development-inputs + (("rust-bincode" ,rust-bincode-1.1)))))) + (define-public rust-rand-0.4 (package (inherit rust-rand-0.6) -- cgit v1.2.3 From b72648d7f5565e7974d47664ed795b3468b5f54e Mon Sep 17 00:00:00 2001 From: John Soo Date: Wed, 15 Jan 2020 20:26:32 -0800 Subject: gnu: rust-quick-error-1.2: Update to 1.2.3. * gnu/packages/crates-io.scm (rust-quick-error-1.2): Update to 1.2.3. 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 8c3c31a28a..5691d948a3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7885,7 +7885,7 @@ (define-public rust-pulldown-cmark-0.4 (define-public rust-quick-error-1.2 (package (name "rust-quick-error") - (version "1.2.2") + (version "1.2.3") (source (origin (method url-fetch) @@ -7893,7 +7893,7 @@ (define-public rust-quick-error-1.2 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "1w6kgwwv7p7zr0yyg5rb315lkk24bimywklwx7fsvsbwi10bjx4j")))) + "1q6za3v78hsspisc197bg3g7rpc989qycy8ypr8ap8igv10ikl51")))) (build-system cargo-build-system) (home-page "https://github.com/tailhook/quick-error") (synopsis "Macro which makes error types pleasant to write") -- cgit v1.2.3 From a62d3de70421fb7edc81b183461316a6a7c449e0 Mon Sep 17 00:00:00 2001 From: John Soo Date: Wed, 15 Jan 2020 20:25:35 -0800 Subject: gnu: rust-quick-error-1.2: Don't hide package. * gnu/packages/crates-io.scm (rust-quick-error-1.2)[arguments]: Skip build. [properties] Remove field. Signed-off-by: Efraim Flashner --- 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 5691d948a3..203f725816 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7895,11 +7895,11 @@ (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 to write.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 8eeb7794bac7b8cfbb6ea156b347d88ace90326c Mon Sep 17 00:00:00 2001 From: John Soo Date: Wed, 15 Jan 2020 21:42:07 -0800 Subject: gnu: rust-cc-1.0: Update to 1.0.50. * gnu/packages/crates-io.scm (rust-cc-1.0): Update to 1.0.50. [arguments]: Remove rust-rayon-1.1 from cargo-inputs, add rust-jobserver-0.1. Remove rust-tempdir-0.3 from cargo-development-inputs, add rust-tempfile-3.1. Signed-off-by: Efraim Flashner --- 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 203f725816..c3f0f27c61 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1146,7 +1146,7 @@ (define-public rust-cblas-sys-0.1 (define-public rust-cc-1.0 (package (name "rust-cc") - (version "1.0.41") + (version "1.0.50") (source (origin (method url-fetch) @@ -1154,14 +1154,14 @@ (define-public rust-cc-1.0 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "1zxzd559dbbf1iwdzmkj7czapzccs17kqqmsj9ayijpdix5rrbld")))) + "1kdqm8ka7xg9h56b694pcz29ka33fsz27mzrphqc78gx96h8zqlm")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-rayon" ,rust-rayon-1.1)) + (("rust-jobserver" ,rust-jobserver-0.1)) #:cargo-development-inputs - (("rust-tempdir" ,rust-tempdir-0.3)))) + (("rust-tempfile" ,rust-tempfile-3.1)))) (home-page "https://github.com/alexcrichton/cc-rs") (synopsis "Invoke the native C compiler") (description -- cgit v1.2.3 From 874a5bc61daf310c99fa642fec4ec17552a81a09 Mon Sep 17 00:00:00 2001 From: John Soo Date: Wed, 15 Jan 2020 22:28:54 -0800 Subject: gnu: Add rust-tokio-signal-0.2. * gnu/packages/crates-io.scm (rust-tokio-signal-0.2): 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 c3f0f27c61..5b9f3498c0 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11537,6 +11537,42 @@ (define-public rust-tokio-reactor-0.1 "Event loop that drives Tokio I/O resources.") (license license:expat))) +(define-public rust-tokio-signal-0.2 + (package + (name "rust-tokio-signal") + (version "0.2.7") + (source + (origin + (method url-fetch) + (uri (crate-uri "tokio-signal" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "15l27cvhfcjsahwnm2pgsm0690w0xj1h1sbdl5wy6p50dqkwavfx")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-futures" ,rust-futures-0.1) + ("rust-libc" ,rust-libc-0.2) + ("rust-mio" ,rust-mio-0.6) + ("rust-mio-uds" ,rust-mio-uds-0.6) + ("rust-signal-hook" ,rust-signal-hook-0.1) + ("rust-tokio-executor" ,rust-tokio-executor-0.1) + ("rust-tokio-io" ,rust-tokio-io-0.1) + ("rust-tokio-reactor" ,rust-tokio-reactor-0.1) + ("rust-winapi" ,rust-winapi-0.3)) + #:cargo-development-inputs + (("rust-tokio" ,rust-tokio-0.1)))) + (home-page "https://github.com/tokio-rs/tokio") + (synopsis + "Asynchronous Unix signal handling backed futures") + (description + "An implementation of an asynchronous Unix signal handling backed +futures.") + (license license:expat))) + (define-public rust-tokio-sync-0.1 (package (name "rust-tokio-sync") -- cgit v1.2.3 From 7fcc421e8a40dfafa79611373d4d65fb7e57dee9 Mon Sep 17 00:00:00 2001 From: John Soo Date: Wed, 15 Jan 2020 22:29:35 -0800 Subject: gnu: Add rust-tokio-process-0.2. * gnu/packages/crates-io.scm (rust-tokio-process-0.2): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5b9f3498c0..a77246f4b1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11498,6 +11498,46 @@ (define-public rust-tokio-mock-task-0.1 (properties '((hidden? . #t))) (license license:expat))) +(define-public rust-tokio-process-0.2 + (package + (name "rust-tokio-process") + (version "0.2.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "tokio-process" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1s6vi5n5iax4ksx3bzpfdhfbngj49mvq5n40np1d4aycp3qnxgdg")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-crossbeam-queue" ,rust-crossbeam-queue-0.1) + ("rust-futures" ,rust-futures-0.1) + ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-libc" ,rust-libc-0.2) + ("rust-log" ,rust-log-0.4) + ("rust-mio" ,rust-mio-0.6) + ("rust-mio-named-pipes" ,rust-mio-named-pipes-0.1) + ("rust-tokio-io" ,rust-tokio-io-0.1) + ("rust-tokio-reactor" ,rust-tokio-reactor-0.1) + ("rust-tokio-signal" ,rust-tokio-signal-0.2) + ("rust-winapi" ,rust-winapi-0.3)) + #:cargo-development-inputs + (("rust-failure" ,rust-failure-0.1) + ("rust-log" ,rust-log-0.4) + ("rust-tokio" ,rust-tokio-0.1)))) + (home-page "https://github.com/tokio-rs/tokio") + (synopsis + "Asynchronous process management backed futures") + (description + "An implementation of an asynchronous process management backed +futures.") + (license license:expat))) + (define-public rust-tokio-reactor-0.1 (package (name "rust-tokio-reactor") -- cgit v1.2.3 From 272004aee52d492a538a243e4387b10628fc8f86 Mon Sep 17 00:00:00 2001 From: John Soo Date: Wed, 15 Jan 2020 22:21:51 -0800 Subject: gnu: Add rust-mio-named-pipes-0.1. * gnu/packages/crates-io.scm (rust-mio-named-pipes-0.1): 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 a77246f4b1..f4f32a79fd 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6057,6 +6057,36 @@ (define-public rust-mio-0.6 (description "Lightweight non-blocking IO.") (license license:expat))) +(define-public rust-mio-named-pipes-0.1 + (package + (name "rust-mio-named-pipes") + (version "0.1.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "mio-named-pipes" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1cwwfx1yr9vws8x971x34ijnirs377vcxi47frdirki5yppp9qzm")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-log" ,rust-log-0.4) + ("rust-mio" ,rust-mio-0.6) + ("rust-miow" ,rust-miow-0.3) + ("rust-winapi" ,rust-winapi-0.3)) + #:cargo-development-inputs + (("rust-env-logger" ,rust-env-logger-0.4) + ("rust-rand" ,rust-rand-0.4)))) + (home-page "https://github.com/alexcrichton/mio-named-pipes") + (synopsis "Windows named pipe bindings for mio") + (description + "A library for integrating Windows Named Pipes with mio.") + (license `(,license:asl2.0 ,license:expat)))) + (define-public rust-mio-uds-0.6 (package (name "rust-mio-uds") -- cgit v1.2.3 From 2f1fe591d1073465f05a73e21b10ee653c138c40 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 20 Jan 2020 21:32:49 +0200 Subject: gnu: Add rust-env-logger-0.4. * gnu/packages/crates-io.scm (rust-env-logger-0.4): 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 f4f32a79fd..c3f32d0b32 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2938,6 +2938,27 @@ (define-public rust-env-logger-0.6 ("rust-regex" ,rust-regex-1.1) ("rust-termcolor" ,rust-termcolor-1.0)))))) +(define-public rust-env-logger-0.4 + (package + (inherit rust-env-logger-0.7) + (name "rust-env-logger") + (version "0.4.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "env-logger" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0nydz2lidsvx9gs0v2zcz68rzqx8in7fzmiprgsrhqh17vkj3prx")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-log" ,rust-log-0.3) + ("rust-regex" ,rust-regex-0.2)))))) + (define-public rust-envmnt-0.6 (package (name "rust-envmnt") -- cgit v1.2.3 From 5381d5c49ff8b3637a791cfbaedd5a4583c1bb5c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 20 Jan 2020 21:35:21 +0200 Subject: gnu: Add rust-regex-0.2. * gnu/packages/crates-io.scm (rust-regex-0.2): 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 c3f32d0b32..2bd3367a97 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8927,6 +8927,34 @@ (define-public rust-regex-1.1 ("rust-quickcheck" ,rust-quickcheck-0.8) ("rust-rand" ,rust-rand-0.4)))))) +(define-public rust-regex-0.2 + (package + (inherit rust-regex-1.3) + (name "rust-regex") + (version "0.2.11") + (source + (origin + (method url-fetch) + (uri (crate-uri "regex" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1163ir1k5zjspirfjl4wqbviwrxlhmfwy95xxb69y4irkv4snack")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-aho-corasick" ,rust-aho-corasick-0.6) + ("rust-memchr" ,rust-memchr-2.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)) + #:cargo-development-inputs + (("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-quickcheck" ,rust-quickcheck-0.6) + ("rust-rand" ,rust-rand-0.4)))))) + (define-public rust-regex-automata-0.1 (package (name "rust-regex-automata") -- cgit v1.2.3 From d304015f22aa83ce7c414b5c88b04156f3e176c5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 20 Jan 2020 21:38:20 +0200 Subject: gnu: Add rust-aho-corasick-0.6. * gnu/packages/crates-io.scm (rust-aho-corasick-0.6.): 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 2bd3367a97..152bff7d40 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -151,6 +151,33 @@ (define-public rust-aho-corasick-0.7 "Fast multiple substring searching.") (license (list license:unlicense license:expat)))) +(define-public rust-aho-corasick-0.6 + (package + (inherit rust-aho-corasick-0.7) + (name "rust-aho-corasick") + (version "0.6.10") + (source + (origin + (method url-fetch) + (uri (crate-uri "aho-corasick" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "19f8v503ibvlyr824g5ynicrh1lsmp2i0zmpszr8lqay0qw3vkl1")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-memchr" ,rust-memchr-2.2)) + #:cargo-development-inputs + (("rust-csv" ,rust-csv-1.1) + ("rust-docopt" ,rust-docopt-1.1) + ("rust-memmap" ,rust-memmap-0.6) + ("rust-quickcheck" ,rust-quickcheck-0.7) + ("rust-rand" ,rust-rand-0.5) + ("rust-serde" ,rust-serde-1.0) + ("rust-serde-derive" ,rust-serde-derive-1.0)))))) + (define-public rust-ansi-term-0.11 (package (name "rust-ansi-term") -- cgit v1.2.3 From efbfc7e86c024abc044aa936560ad9d7d7610167 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 20 Jan 2020 21:40:27 +0200 Subject: gnu: Add rust-quickcheck-0.7. * gnu/packages/crates-io.scm (rust-quickcheck-0.7): 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 152bff7d40..284931aa5f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8012,6 +8012,28 @@ (define-public rust-quickcheck-0.8 "Automatic property based testing with shrinking.") (license (list license:expat license:unlicense)))) +(define-public rust-quickcheck-0.7 + (package + (inherit rust-quickcheck-0.8) + (name "rust-quickcheck") + (version "0.7.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "quickcheck" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "05pqzja6fwdyrs1za5vmxb9ifb993knmpdsrs1fs2wyz9qz7slyl")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-env-logger" ,rust-env-logger-0.5) + ("rust-log" ,rust-log-0.4) + ("rust-rand" ,rust-rand-0.5) + ("rust-rand-core" ,rust-rand-core-0.2)))))) + (define-public rust-quote-1.0 (package (name "rust-quote") -- cgit v1.2.3 From 54af2e59e29b58fe6a47355367a7a8d386c9c795 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 20 Jan 2020 21:42:42 +0200 Subject: gnu: Add rust-env-logger-0.5. * gnu/packages/crates-io.scm (rust-env-logger-0.5): 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 284931aa5f..54ac96045a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2965,6 +2965,28 @@ (define-public rust-env-logger-0.6 ("rust-regex" ,rust-regex-1.1) ("rust-termcolor" ,rust-termcolor-1.0)))))) +(define-public rust-env-logger-0.5 + (package + (inherit rust-env-logger-0.7) + (name "rust-env-logger") + (version "0.5.13") + (source + (origin + (method url-fetch) + (uri (crate-uri "env-logger" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0f0c4i4c65jh8lci0afl5yg74ac0lbnpxcp81chj114zwg9a9c0m")))) + (arguments + `(#:cargo-inputs + (("rust-atty" ,rust-atty-0.2) + ("rust-humantime" ,rust-humantime-1.2) + ("rust-log" ,rust-log-0.4) + ("rust-regex" ,rust-regex-1.1) + ("rust-termcolor" ,rust-termcolor-1.0)))))) + (define-public rust-env-logger-0.4 (package (inherit rust-env-logger-0.7) -- cgit v1.2.3 From 790c528525aa31839752ba3d59b1cc4c0e4c10de Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 20 Jan 2020 21:44:57 +0200 Subject: gnu: Add rust-rand-core-0.2. * gnu/packages/crates-io.scm (rust-rand-core-0.2): New variable. --- gnu/packages/crates-io.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 54ac96045a..e096a77067 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8333,6 +8333,25 @@ (define-public rust-rand-core-0.3 `(#:skip-build? #t #:cargo-inputs (("rand-core" ,rust-rand-core-0.4)))))) +(define-public rust-rand-core-0.2 + (package + (inherit rust-rand-core-0.5) + (name "rust-rand-core") + (version "0.2.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "rand-core" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0wikbw2a36bz8ywjyycjrd7db6ra3yzj14zs1ysxz2fiqhia8q8r")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-rand-core" ,rust-rand-core-0.3)))))) + (define-public rust-rand-hc-0.2 (package (name "rust-rand-hc") -- cgit v1.2.3 From 010ea34f7da6dbb390e48dd3f3a318201ac6bfa7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 20 Jan 2020 21:47:19 +0200 Subject: gnu: Add rust-regex-syntax-0.5. * gnu/packages/crates-io.scm (rust-regex-syntax-0.5): New variable. --- gnu/packages/crates-io.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e096a77067..1c06dd99bf 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9100,6 +9100,25 @@ (define-public rust-regex-syntax-0.6 (license (list license:asl2.0 license:expat)))) +(define-public rust-regex-syntax-0.5 + (package + (inherit rust-regex-syntax-0.6) + (name "rust-regex-syntax") + (version "0.5.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "regex-syntax" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "19zp25jr3dhmclg3qqjk3bh1yrn7bqi05zgr5v52szv3l97plw3x")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-ucd-util" ,rust-ucd-util-0.1)))))) + (define-public rust-remove-dir-all-0.5 (package (name "rust-remove-dir-all") -- cgit v1.2.3 From 7353994bad8c0b9eff31e36e612dc8951c832839 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 20 Jan 2020 21:49:03 +0200 Subject: gnu: Add rust-quickcheck-0.6. * gnu/packages/crates-io.scm (rust-quickcheck-0.6): New variable. --- gnu/packages/crates-io.scm | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1c06dd99bf..738d8aecf7 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2980,7 +2980,8 @@ (define-public rust-env-logger-0.5 (base32 "0f0c4i4c65jh8lci0afl5yg74ac0lbnpxcp81chj114zwg9a9c0m")))) (arguments - `(#:cargo-inputs + `(#:skip-build? #t + #:cargo-inputs (("rust-atty" ,rust-atty-0.2) ("rust-humantime" ,rust-humantime-1.2) ("rust-log" ,rust-log-0.4) @@ -8056,6 +8057,27 @@ (define-public rust-quickcheck-0.7 ("rust-rand" ,rust-rand-0.5) ("rust-rand-core" ,rust-rand-core-0.2)))))) +(define-public rust-quickcheck-0.6 + (package + (inherit rust-quickcheck-0.8) + (name "rust-quickcheck") + (version "0.6.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "quickcheck" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1dyazm2fcq0v9fscq1a7597zsvdl9f0j8c2bfj1jm2nlzz2sn6y0")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-env-logger" ,rust-env-logger-0.5) + ("rust-log" ,rust-log-0.4) + ("rust-rand" ,rust-rand-0.4)))))) + (define-public rust-quote-1.0 (package (name "rust-quote") -- cgit v1.2.3 From 66d4d23a0db21eccd59a23684b4b680ddb8ccd55 Mon Sep 17 00:00:00 2001 From: John Soo Date: Wed, 15 Jan 2020 22:08:50 -0800 Subject: gnu: Add rust-tokio-core-0.1. * gnu/packages/crates-io.scm (rust-tokio-core-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 738d8aecf7..9a72a5ca9a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11543,6 +11543,54 @@ (define-public rust-tokio-codec-0.1 "Utilities for encoding and decoding frames.") (license license:expat))) +(define-public rust-tokio-core-0.1 + (package + (name "rust-tokio-core") + (version "0.1.17") + (source + (origin + (method url-fetch) + (uri (crate-uri "tokio-core" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0wbgg59mxfvrhzv97y56nh3gmnmw3jj9dhgkmvz27410jjxzpvxf")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bytes" ,rust-bytes-0.4) + ("rust-futures" ,rust-futures-0.1) + ("rust-iovec" ,rust-iovec-0.1) + ("rust-log" ,rust-log-0.4) + ("rust-mio" ,rust-mio-0.6) + ("rust-scoped-tls" ,rust-scoped-tls-0.1) + ("rust-tokio" ,rust-tokio-0.1) + ("rust-tokio-executor" ,rust-tokio-executor-0.1) + ("rust-tokio-io" ,rust-tokio-io-0.1) + ("rust-tokio-reactor" ,rust-tokio-reactor-0.1) + ("rust-tokio-timer" ,rust-tokio-timer-0.2)) + #:cargo-development-inputs + (("rust-env-logger" ,rust-env-logger-0.4) + ("rust-flate2" ,rust-flate2-1.0) + ("rust-futures-cpupool" ,rust-futures-cpupool-0.1) + ("rust-http" ,rust-http-0.1) + ("rust-httparse" ,rust-httparse-1.3) + ("rust-libc" ,rust-libc-0.2) + ("rust-num-cpus" ,rust-num-cpus-1.10) + ("rust-serde" ,rust-serde-1.0) + ("rust-serde-derive" ,rust-serde-derive-1.0) + ("rust-serde-json" ,rust-serde-json-1.0) + ("rust-time" ,rust-time-0.1)))) + (home-page "https://tokio.rs") + (synopsis + "Core I/O and event loop primitives for asynchronous I/O in Rust") + (description + "Core I/O and event loop primitives for asynchronous I/O in Rust. +Foundation for the rest of the tokio crates.") + (license (list license:expat license:asl2.0)))) + (define-public rust-tokio-current-thread-0.1 (package (name "rust-tokio-current-thread") -- cgit v1.2.3 From 04d924db0c18aac3e54c6b1f0ebce002ce03c842 Mon Sep 17 00:00:00 2001 From: John Soo Date: Wed, 15 Jan 2020 22:30:20 -0800 Subject: gnu: Add rust-jobserver-0.1. * gnu/packages/crates-io.scm (rust-jobserver-0.1): 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 9a72a5ca9a..c72d082213 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5153,6 +5153,36 @@ (define-public rust-itoa-0.1 (base32 "18g7p2hrb3dk84z3frfgmszfc9hjb4ps9vp99qlb1kmf9gm8hc5f")))))) +(define-public rust-jobserver-0.1 + (package + (name "rust-jobserver") + (version "0.1.19") + (source + (origin + (method url-fetch) + (uri (crate-uri "jobserver" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1q2w80v8p2pbfm8ayhjs6zi11a1hp4535z4ck8kg872z8ldnrc37")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-libc" ,rust-libc-0.2)) + #:cargo-development-inputs + (("rust-futures" ,rust-futures-0.1) + ("rust-num-cpus" ,rust-num-cpus-1.10) + ("rust-tempdir" ,rust-tempdir-0.3) + ("rust-tokio-core" ,rust-tokio-core-0.1) + ("rust-tokio-process" ,rust-tokio-process-0.2)))) + (home-page "https://github.com/alexcrichton/jobserver-rs") + (synopsis "GNU make jobserver for Rust") + (description + "An implementation of the GNU make jobserver for Rust.") + (license (list license:expat license:asl2.0)))) + (define-public rust-js-sys-0.3 (package (name "rust-js-sys") -- cgit v1.2.3 From b94c6ac38e60de342265165e219167236f3fee6a Mon Sep 17 00:00:00 2001 From: John Soo Date: Wed, 15 Jan 2020 22:39:28 -0800 Subject: gnu: rust-pest-generator-2.1: Update dependencies. * gnu/packages/crates-io.scm (rust-pest-generator-2.1)[arguments]: Replace rust-quote-1.0 with 0.6 in cargo-inputs. Signed-off-by: Efraim Flashner --- 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 c72d082213..500ec9defb 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7473,7 +7473,7 @@ (define-public rust-pest-generator-2.1 (("rust-pest" ,rust-pest-2.1) ("rust-pest-meta" ,rust-pest-meta-2.1) ("rust-proc-macro2" ,rust-proc-macro2-0.4) - ("rust-quote" ,rust-quote-1.0) + ("rust-quote" ,rust-quote-0.6) ("rust-syn" ,rust-syn-0.15)))) (home-page "https://pest.rs/") (synopsis "Pest code generator") -- cgit v1.2.3 From 2760345fe9214b151e1cafd971278d011456573b Mon Sep 17 00:00:00 2001 From: John Soo Date: Wed, 15 Jan 2020 22:43:45 -0800 Subject: gnu: rust-pest-meta-2.1: Update dependencies. * gnu/packages/crates-io.scm (rust-pest-meta-2.1)[arguments]: Move rust-sha-1-0.8 from cargo-development-inputs to cargo-inputs. Signed-off-by: Efraim Flashner --- 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 500ec9defb..13c429e4e2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7498,9 +7498,8 @@ (define-public rust-pest-meta-2.1 `(#:skip-build? #t #:cargo-inputs (("rust-maplit" ,rust-maplit-1.0) - ("rust-pest" ,rust-pest-2.1)) - #:cargo-development-inputs - (("rust-sha-1" ,rust-sha-1-0.8)))) + ("rust-pest" ,rust-pest-2.1) + ("rust-sha-1" ,rust-sha-1-0.8)))) (home-page "https://pest.rs") (synopsis "Pest meta language parser and validator") (description -- cgit v1.2.3 From 699c454945e30edfa37ac3cf6c4b10e8be40443c Mon Sep 17 00:00:00 2001 From: John Soo Date: Thu, 16 Jan 2020 19:48:27 -0800 Subject: gnu: rust-pest-meta-2.1: Update to 2.1.2. * gnu/packages/crates-io.scm (rust-pest-meta-2.1): Update to 2.1.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 13c429e4e2..5d169872fc 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7483,7 +7483,7 @@ (define-public rust-pest-generator-2.1 (define-public rust-pest-meta-2.1 (package (name "rust-pest-meta") - (version "2.1.1") + (version "2.1.2") (source (origin (method url-fetch) @@ -7492,7 +7492,7 @@ (define-public rust-pest-meta-2.1 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0kaprdz3jis9bjfwhri1zncbsvack5m3gx2g5flspdy7wxnyljgj")))) + "0iymvrh7lcfi8iarkgq0hwgarr00np3l4xg4bx42rmvgi6czshyz")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t -- cgit v1.2.3 From 05f8588c2d921e64329c304d6ea5702a6147be8b Mon Sep 17 00:00:00 2001 From: John Soo Date: Thu, 16 Jan 2020 19:46:25 -0800 Subject: gnu: rust-pest-generator-2.1: Update to 2.1.1. * gnu/packages/crates-io.scm (rust-pest-generator-2.1): Update to 2.1.1. [arguments]: In cargo-inputs replace rust-proc-macro2-0.4 with 1.0, rust-quote-0.6 with 1.0, rust-syn-0.15 with 1.0. Signed-off-by: Efraim Flashner --- 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 5d169872fc..9bd96e7d4a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7456,7 +7456,7 @@ (define-public rust-pest-derive-2.1 (define-public rust-pest-generator-2.1 (package (name "rust-pest-generator") - (version "2.1.0") + (version "2.1.1") (source (origin (method url-fetch) @@ -7465,16 +7465,16 @@ (define-public rust-pest-generator-2.1 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0ipnv77lqhj4d4fpfxi8m168lcjp482kszaknlardmpgqiv0a4k3")))) + "1h3z8jccki87mn7gppy4292s1ah98z4md998w5pd04jpkclwz7vv")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-pest" ,rust-pest-2.1) ("rust-pest-meta" ,rust-pest-meta-2.1) - ("rust-proc-macro2" ,rust-proc-macro2-0.4) - ("rust-quote" ,rust-quote-0.6) - ("rust-syn" ,rust-syn-0.15)))) + ("rust-proc-macro2" ,rust-proc-macro2-1.0) + ("rust-quote" ,rust-quote-1.0) + ("rust-syn" ,rust-syn-1.0)))) (home-page "https://pest.rs/") (synopsis "Pest code generator") (description "Pest code generator.") -- cgit v1.2.3 From c8a2b343d37479c4b8a82e7bec9cab27139bf3ea Mon Sep 17 00:00:00 2001 From: John Soo Date: Wed, 15 Jan 2020 23:48:33 -0800 Subject: gnu: rust-kernel32-sys-0.2: Update dependencies. * gnu/packages/crates-io.scm (rust-kernel32-sys-0.2)[arguments]: Move rust-winapi-build-0.1 from cargo-development-inputs to 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 9bd96e7d4a..c8fe7597d2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5308,9 +5308,9 @@ (define-public rust-kernel32-sys-0.2 (build-system cargo-build-system) (arguments `(#:skip-build? #t - #:cargo-inputs (("rust-winapi" ,rust-winapi-0.2)) - #:cargo-development-inputs - (("rust-winapi-build" ,rust-winapi-build-0.1)))) + #:cargo-inputs + (("rust-winapi" ,rust-winapi-0.2) + ("rust-winapi-build" ,rust-winapi-build-0.1)))) (home-page "https://github.com/retep998/winapi-rs") (synopsis "Function definitions for the Windows API library kernel32") (description "Contains function definitions for the Windows API library -- cgit v1.2.3 From 8f414fa29dc54a40fdfa94a897eda0795f6cb355 Mon Sep 17 00:00:00 2001 From: John Soo Date: Thu, 16 Jan 2020 20:36:53 -0800 Subject: gnu: Add rust-arrayref-0.3. * gnu/packages/crates-io.scm (rust-arrayref-0.3): New variable. Signed-off-by: Efraim Flashner --- 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 c8fe7597d2..7bbaf60324 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -308,6 +308,30 @@ (define-public rust-argon2rs-0.2 that runs on Argon2.") (license license:expat))) +(define-public rust-arrayref-0.3 + (package + (name "rust-arrayref") + (version "0.3.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "arrayref" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1vphy316jbgmgckk4z7m8csvlyc8hih9w95iyq48h8077xc2wf0d")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-development-inputs + (("rust-quickcheck" ,rust-quickcheck-0.6)))) + (home-page "https://github.com/droundy/arrayref") + (synopsis "Macros to take array references of slices") + (description + "Macros to take array references of slices.") + (license license:bsd-2))) + (define-public rust-arrayvec-0.4 (package (name "rust-arrayvec") -- cgit v1.2.3 From d9b2c855bfaeacbe02321b92705653a2b613551d Mon Sep 17 00:00:00 2001 From: John Soo Date: Thu, 16 Jan 2020 19:59:26 -0800 Subject: gnu: Add rust-thread-local-1.0. * gnu/packages/crates-io.scm (rust-thread-local-1.0): New variable. (rust-thread-local-0.3): Inherit from rust-thread-local-1.0. 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 7bbaf60324..e001c8bbbb 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11413,10 +11413,10 @@ (define-public rust-thread-id-3.3 (license (list license:asl2.0 license:expat)))) -(define-public rust-thread-local-0.3 +(define-public rust-thread-local-1.0 (package (name "rust-thread-local") - (version "0.3.6") + (version "1.0.1") (source (origin (method url-fetch) @@ -11424,7 +11424,7 @@ (define-public rust-thread-local-0.3 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "06rzik99p8c5js8238yhc8rk6np543ylb1dy9nrw5v80j0r3xdf6")))) + "054vlrr1vsdy1h4b7n99mr24pnj8928ig9qwzg36wnkld4dns36l")))) (build-system cargo-build-system) (home-page "https://github.com/Amanieu/thread_local-rs") (synopsis "Per-object thread-local storage") @@ -11433,6 +11433,20 @@ (define-public rust-thread-local-0.3 (license (list license:asl2.0 license:expat)))) +(define-public rust-thread-local-0.3 + (package + (inherit rust-thread-local-1.0) + (name "rust-thread-local") + (version "0.3.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "thread_local" version)) + (file-name (string-append name "-" version ".crate")) + (sha256 + (base32 + "06rzik99p8c5js8238yhc8rk6np543ylb1dy9nrw5v80j0r3xdf6")))))) + (define-public rust-threadpool-1.7 (package (name "rust-threadpool") -- cgit v1.2.3 From 27b75426c50078574d1d41fa0e24e992fe7ae869 Mon Sep 17 00:00:00 2001 From: John Soo Date: Thu, 16 Jan 2020 19:57:17 -0800 Subject: gnu: rust-thread-local-0.3: Don't hide package. * gnu/packages/crates-io.scm (rust-thread-local-0.3)[arguments]: Skip build. Add rust-lazy-static-1.4 to cargo-inputs. [properties]: Don't inherit field. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e001c8bbbb..e7d377de3a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11445,7 +11445,11 @@ (define-public rust-thread-local-0.3 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "06rzik99p8c5js8238yhc8rk6np543ylb1dy9nrw5v80j0r3xdf6")))))) + "06rzik99p8c5js8238yhc8rk6np543ylb1dy9nrw5v80j0r3xdf6")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs (("rust-lazy-static" ,rust-lazy-static-1.4)))) + (properties '()))) (define-public rust-threadpool-1.7 (package -- cgit v1.2.3 From 0f414f0da94f5199fc4f7dc93d7adc22b938ac74 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 20 Jan 2020 22:21:13 +0200 Subject: gnu: rust-thread-local-1.0: Don't hide package. * gnu/packages/crates-io.scm (rust-thread-local-1.0)[arguments]: Skip build. Add rust-lazy-static-1.4 to cargo-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e7d377de3a..e70b869ea4 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11426,10 +11426,12 @@ (define-public rust-thread-local-1.0 (base32 "054vlrr1vsdy1h4b7n99mr24pnj8928ig9qwzg36wnkld4dns36l")))) (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs (("rust-lazy-static" ,rust-lazy-static-1.4)))) (home-page "https://github.com/Amanieu/thread_local-rs") (synopsis "Per-object thread-local storage") - (description "Per-object thread-local storage") - (properties '((hidden? . #t))) + (description "Per-object thread-local storage.") (license (list license:asl2.0 license:expat)))) @@ -11448,8 +11450,7 @@ (define-public rust-thread-local-0.3 "06rzik99p8c5js8238yhc8rk6np543ylb1dy9nrw5v80j0r3xdf6")))) (arguments `(#:skip-build? #t - #:cargo-inputs (("rust-lazy-static" ,rust-lazy-static-1.4)))) - (properties '()))) + #:cargo-inputs (("rust-lazy-static" ,rust-lazy-static-1.4)))))) (define-public rust-threadpool-1.7 (package -- cgit v1.2.3 From 5624b4292dba85cecf6c98c9016772a370c71e40 Mon Sep 17 00:00:00 2001 From: John Soo Date: Thu, 16 Jan 2020 20:40:00 -0800 Subject: gnu: Add rust-arrayvec-0.5. * gnu/packages/crates-io.scm (rust-arrayvec-0.5): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e70b869ea4..bbe7e9afec 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -332,10 +332,10 @@ (define-public rust-arrayref-0.3 "Macros to take array references of slices.") (license license:bsd-2))) -(define-public rust-arrayvec-0.4 +(define-public rust-arrayvec-0.5 (package (name "rust-arrayvec") - (version "0.4.10") + (version "0.5.1") (source (origin (method url-fetch) @@ -344,13 +344,12 @@ (define-public rust-arrayvec-0.4 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0wcch3ca9qvkixgdbd2afrv1xa27l83vpraf7frsh9l8pivgpiwj")))) + "1f5mca8kiiwhvhxd1mbnq68j6v6rk139sch567zwwzl6hs37vxyg")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-nodrop" ,rust-nodrop-0.1) - ("rust-serde" ,rust-serde-1.0)) + (("rust-serde" ,rust-serde-1.0)) #:cargo-development-inputs (("rust-bencher" ,rust-bencher-0.1) ("rust-matches" ,rust-matches-0.1) @@ -363,6 +362,30 @@ (define-public rust-arrayvec-0.4 ArrayVec and ArrayString.") (license (list license:expat license:asl2.0)))) +(define-public rust-arrayvec-0.4 + (package + (inherit rust-arrayvec-0.5) + (name "rust-arrayvec") + (version "0.4.10") + (source + (origin + (method url-fetch) + (uri (crate-uri "arrayvec" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0wcch3ca9qvkixgdbd2afrv1xa27l83vpraf7frsh9l8pivgpiwj")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-nodrop" ,rust-nodrop-0.1) + ("rust-serde" ,rust-serde-1.0)) + #:cargo-development-inputs + (("rust-bencher" ,rust-bencher-0.1) + ("rust-matches" ,rust-matches-0.1) + ("rust-serde-test" ,rust-serde-test-1.0)))))) + (define-public rust-ascii-0.9 (package (name "rust-ascii") -- cgit v1.2.3 From f8607be8a834607f69dd9be9b3790e35bad8951e Mon Sep 17 00:00:00 2001 From: John Soo Date: Thu, 16 Jan 2020 20:41:54 -0800 Subject: gnu: Add rust-blake2b-simd-0.5. * gnu/packages/crates-io.scm (rust-blake2b-simd-0.5): 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 bbe7e9afec..a10021c16c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -807,6 +807,33 @@ (define-public rust-blake2-rfc-0.2 7693.") (license (list license:asl2.0 license:expat)))) +(define-public rust-blake2b-simd-0.5 + (package + (name "rust-blake2b-simd") + (version "0.5.10") + (source + (origin + (method url-fetch) + (uri (crate-uri "blake2b-simd" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "12icvk8ixlivv3jv5nyrg01sajp4s279zb1kmif0nfja4ms2vyyq")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-arrayref" ,rust-arrayref-0.3) + ("rust-arrayvec" ,rust-arrayvec-0.5) + ("rust-constant-time-eq" ,rust-constant-time-eq-0.1)))) + (home-page "https://github.com/oconnor663/blake2_simd") + (synopsis "Pure Rust BLAKE2b implementation with dynamic SIMD") + (description + "This package provides a pure Rust implementation of the BLAKE2b and +BLAKE2bp hash functions.") + (license license:expat))) + (define-public rust-blas-sys-0.7 (package (name "rust-blas-sys") -- cgit v1.2.3 From 72803f5cd28669f0854d516204a9ecf84e781a13 Mon Sep 17 00:00:00 2001 From: John Soo Date: Thu, 16 Jan 2020 20:42:34 -0800 Subject: gnu: Add rust-rust-argon2-0.5. * gnu/packages/crates-io.scm (rust-rust-argon2-0.5): 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 a10021c16c..fb0d7ea10a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9325,6 +9325,34 @@ (define-public rust-ron-0.4 (license (list license:asl2.0 license:expat)))) +(define-public rust-rust-argon2-0.5 + (package + (name "rust-rust-argon2") + (version "0.5.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "rust-argon2" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1krjkmyfn37hy7sfs6lqia0fsvw130nn1z2850glsjcva7pym92c")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-base64" ,rust-base64-0.10) + ("rust-blake2b-simd" ,rust-blake2b-simd-0.5) + ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.6)) + #:cargo-development-inputs + (("rust-hex" ,rust-hex-0.3)))) + (home-page "https://github.com/sru-systems/rust-argon2") + (synopsis "Rust implementation of the Argon2 password hashing function") + (description "This package contans a rust implementation of the Argon2 +password hashing function.") + (license (list license:expat license:asl2.0)))) + (define-public rust-rustc-demangle-0.1 (package (name "rust-rustc-demangle") -- cgit v1.2.3 From e29315b2d996774874e68f4dc00515c0c3f34cb1 Mon Sep 17 00:00:00 2001 From: John Soo Date: Wed, 15 Jan 2020 10:02:38 -0800 Subject: gnu: Add tokei. * gnu/packages/rust-apps.scm (tokei): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/rust-apps.scm | 55 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 54 insertions(+), 1 deletion(-) diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index fa1f56e96f..1272d40d50 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2019 John Soo +;;; Copyright © 2019, 2020 John Soo ;;; Copyright © 2019, 2020 Efraim Flashner ;;; ;;; This file is part of GNU Guix. @@ -92,3 +92,56 @@ (define-public rust-cbindgen (description "This package provides a tool for generating C/C++ bindings to Rust code.") (license license:mpl2.0))) + +(define-public tokei + (package + (name "tokei") + (version "10.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "tokei" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "07f5laqw2k9l3k8wrg9h8p2m5d9hkfxngyacwrn3vs7mlnw8l81m")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-clap" ,rust-clap-2) + ("rust-crossbeam-channel" ,rust-crossbeam-channel-0.4) + ("rust-dirs" ,rust-dirs-2.0) + ("rust-encoding-rs-io" ,rust-encoding-rs-io-0.1) + ("rust-env-logger" ,rust-env-logger-0.7) + ("rust-grep-searcher" ,rust-grep-searcher-0.1) + ("rust-hex" ,rust-hex-0.4) + ("rust-ignore" ,rust-ignore-0.4) + ("rust-log" ,rust-log-0.4) + ("rust-rayon" ,rust-rayon-1.3) + ("rust-serde" ,rust-serde-1.0) + ("rust-serde-cbor" ,rust-serde-cbor-0.10) + ("rust-serde-derive" ,rust-serde-derive-1.0) + ("rust-serde-json" ,rust-serde-json-1.0) + ("rust-serde-yaml" ,rust-serde-yaml-0.8) + ("rust-term-size" ,rust-term-size-0.3) + ("rust-toml" ,rust-toml-0.5) + ;; Transitive build dependencies: + ("rust-cc" ,rust-cc-1.0) + ("rust-pkg-config" ,rust-pkg-config-0.3) + ("rust-vcpkg" ,rust-vcpkg-0.2)) + #:cargo-development-inputs + (("rust-git2" ,rust-git2-0.11) + ("rust-handlebars" ,rust-handlebars-2.0) + ("rust-ignore" ,rust-ignore-0.4) + ("rust-lazy-static" ,rust-lazy-static-1.4) + ("rust-regex" ,rust-regex-1.3) + ("rust-serde-json" ,rust-serde-json-1.0) + ("rust-tempfile" ,rust-tempfile-3.0)))) + (home-page "https://tokei.rs") + (synopsis "Count code, quickly") + (description + "Tokei is a program that displays statistics about your code. Tokei will +show number of files, total lines within those files and code, comments, and +blanks grouped by language.") + (license (list license:expat license:asl2.0)))) -- cgit v1.2.3 From 6dc67c2d11895f3516117a06b741690aed517784 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jan 2020 12:10:50 +0200 Subject: gnu: rust-failure-derive-0.1: Fix inputs. * gnu/packages/crates-io.scm (rust-failure-derive-0.1)[arguments]: Replace rust-quote-1.0 with 0.6 in cargo-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 fb0d7ea10a..3bf5d54020 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3276,7 +3276,7 @@ (define-public rust-failure-derive-0.1 `(#:skip-build? #t #:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-0.4) - ("rust-quote" ,rust-quote-1.0) + ("rust-quote" ,rust-quote-0.6) ("rust-syn" ,rust-syn-0.15) ("rust-synstructure" ,rust-synstructure-0.10)) #:cargo-development-inputs -- cgit v1.2.3 From c40e3d0bade9cc594c9959ce75d6c747d2973617 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jan 2020 12:52:11 +0200 Subject: gnu: tokei: Unbundle some dependencies. * gnu/packages/rust-apps.scm (tokei)[arguments]: Add custom phase to delete vendored sources and set environment variables. Remove rust-cc-1.0, rust-pkg-config-0.3, rust-toml-0.5 from cargo-inputs. [native-inputs]: Add libgit2, openssl, pkg-config, zlib. --- gnu/packages/rust-apps.scm | 40 +++++++++++++++++++++++++++++++++------- 1 file changed, 33 insertions(+), 7 deletions(-) diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 1272d40d50..8ad3c0ced4 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -22,7 +22,11 @@ (define-module (gnu packages rust-apps) #:use-module (guix build-system cargo) #:use-module (guix download) #:use-module (guix packages) - #:use-module (gnu packages crates-io)) + #:use-module (gnu packages compression) + #:use-module (gnu packages crates-io) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages tls) + #:use-module (gnu packages version-control)) (define-public ripgrep (package @@ -125,11 +129,7 @@ (define-public tokei ("rust-serde-json" ,rust-serde-json-1.0) ("rust-serde-yaml" ,rust-serde-yaml-0.8) ("rust-term-size" ,rust-term-size-0.3) - ("rust-toml" ,rust-toml-0.5) - ;; Transitive build dependencies: - ("rust-cc" ,rust-cc-1.0) - ("rust-pkg-config" ,rust-pkg-config-0.3) - ("rust-vcpkg" ,rust-vcpkg-0.2)) + ("rust-toml" ,rust-toml-0.5)) #:cargo-development-inputs (("rust-git2" ,rust-git2-0.11) ("rust-handlebars" ,rust-handlebars-2.0) @@ -137,7 +137,33 @@ (define-public tokei ("rust-lazy-static" ,rust-lazy-static-1.4) ("rust-regex" ,rust-regex-1.3) ("rust-serde-json" ,rust-serde-json-1.0) - ("rust-tempfile" ,rust-tempfile-3.0)))) + ("rust-tempfile" ,rust-tempfile-3.0)) + #:phases + (modify-phases %standard-phases + (add-after 'configure 'unvendor-libraries-from-crates + (lambda* (#:key inputs #:allow-other-keys) + (let ((openssl (assoc-ref inputs "openssl"))) + (setenv "OPENSSL_DIR" openssl) + (setenv "LIBGIT2_SYS_USE_PKG_CONFIG" "1") + (setenv "LIBSSH2_SYS_USE_PKG_CONFIG" "1") + (delete-file-recursively + (string-append "guix-vendor/rust-libgit2-sys-" + ,(package-version rust-libgit2-sys-0.10) + ".crate/libgit2")) + (delete-file-recursively + (string-append "guix-vendor/rust-libssh2-sys-" + ,(package-version rust-libssh2-sys-0.2) + ".crate/libssh2")) + (delete-file-recursively + (string-append "guix-vendor/rust-libz-sys-" + ,(package-version rust-libz-sys-1.0) + ".crate/src/zlib"))) + #t))))) + (native-inputs + `(("libgit2" ,libgit2) + ("openssl" ,openssl) + ("pkg-config" ,pkg-config) + ("zlib" ,zlib))) (home-page "https://tokei.rs") (synopsis "Count code, quickly") (description -- cgit v1.2.3 From 0c8538545036cfadd548e2c0afeca71d7e63c7fd Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jan 2020 13:07:11 +0200 Subject: gnu: rust-libgit2-sys-0.10: Don't hide package. * gnu/packages/crates-io.scm (rust-libgit2-sys-0.10)[arguments]: Add rust-libc-0.2, rust-libz-sys-1.0, rust-libssh2-sys-0.2, rust-openssl-sys-0.9, rust-cc-1.0, rust-pkg-config-0.3 to cargo-inputs. Add custom phase to unbundle vendored sources and set environment variables. [native-inputs]: Add libgit2, openssl, pkg-config, zlib. [properties]: Remove field. --- gnu/packages/crates-io.scm | 68 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 47 insertions(+), 21 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3bf5d54020..60664e3e17 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -25,7 +25,11 @@ (define-module (gnu packages crates-io) #:use-module (guix build-system cargo) #:use-module (guix download) #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix packages)) + #:use-module (guix packages) + #:use-module (gnu packages compression) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages tls) + #:use-module (gnu packages version-control)) ;;; ;;; Please: Try to add new module packages in alphabetic order. @@ -5567,28 +5571,46 @@ (define-public rust-libgit2-sys-0.10 (base32 "0l9fvki7qxsl97vgzqwlv75nl213a5vxw7b1jaik97ala356pv6r")))) (build-system cargo-build-system) - ;(arguments - ; `(#:phases - ; (modify-phases %standard-phases - ; (add-after 'unpack 'find-openssl - ; (lambda* (#:key inputs #:allow-other-keys) - ; (let ((openssl (assoc-ref inputs "openssl"))) - ; (setenv "OPENSSL_DIR" openssl)) - ; (delete-file-recursively "libgit2") - ; (setenv "LIBGIT2_SYS_USE_PKG_CONFIG" "1") - ; (setenv "LIBSSH2_SYS_USE_PKG_CONFIG" "1") - ; #t))))) - ;(native-inputs - ; `(("pkg-config" ,pkg-config))) - ;(inputs - ; `(("libgit2" ,libgit2) - ; ("openssl" ,openssl) - ; ("zlib" ,zlib))) + (arguments + `(#:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-libz-sys" ,rust-libz-sys-1.0) + ("rust-libssh2-sys" ,rust-libssh2-sys-0.2) + ("rust-openssl-sys" ,rust-openssl-sys-0.9) + ;; Build dependencies: + ("rust-cc" ,rust-cc-1.0) + ("rust-pkg-config" ,rust-pkg-config-0.3)) + #:phases + (modify-phases %standard-phases + (add-after 'configure 'dont-vendor-sources + (lambda* (#:key inputs #:allow-other-keys) + (let ((openssl (assoc-ref inputs "openssl"))) + (setenv "OPENSSL_DIR" openssl)) + (delete-file-recursively "libgit2") + (delete-file-recursively + (string-append "guix-vendor/rust-libgit2-sys-" + ,(package-version rust-libgit2-sys-0.10) + ".crate/libgit2")) + (delete-file-recursively + (string-append "guix-vendor/rust-libz-sys-" + ,(package-version rust-libz-sys-1.0) + ".crate/src/zlib")) + (delete-file-recursively + (string-append "guix-vendor/rust-libssh2-sys-" + ,(package-version rust-libssh2-sys-0.2) + ".crate/libssh2")) + (setenv "LIBGIT2_SYS_USE_PKG_CONFIG" "1") + (setenv "LIBSSH2_SYS_USE_PKG_CONFIG" "1") + #t))))) + (native-inputs + `(("libgit2" ,libgit2) + ("openssl" ,openssl) + ("pkg-config" ,pkg-config) + ("zlib" ,zlib))) (home-page "https://github.com/rust-lang/git2-rs") (synopsis "Native bindings to the libgit2 library") (description "This package provides native rust bindings to the @code{libgit2} library.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) @@ -5604,7 +5626,9 @@ (define-public rust-libgit2-sys-0.8 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "0y2mibmx7wy91s2kmb2gfb29mrqlqaxpy5wcwr8s1lwws7b9w5sc")))))) + "0y2mibmx7wy91s2kmb2gfb29mrqlqaxpy5wcwr8s1lwws7b9w5sc")))) + (arguments '()) + (properties '((hidden? . #t))))) (define-public rust-libgit2-sys-0.7 (package @@ -5618,7 +5642,9 @@ (define-public rust-libgit2-sys-0.7 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "1wcvg2qqra2aviasvqcscl8gb2rnjnd6h998wy5dlmf2bnriqi28")))))) + "1wcvg2qqra2aviasvqcscl8gb2rnjnd6h998wy5dlmf2bnriqi28")))) + (arguments '()) + (properties '((hidden? . #t))))) (define-public rust-libloading-0.5 (package -- cgit v1.2.3 From d7364e85e05a3faae0542d1b6470657863b11410 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jan 2020 13:13:08 +0200 Subject: gnu: rust-libssh2-sys-0.2: Don't hide package. * gnu/packages/crates-io.scm (rust-libssh2-sys-0.2)[arguments]: Add rust-libc-0.2, rust-libz-sys-1.0, rust-openssl-sys-0.9, rust-cc-1.0, rust-pkg-config-0.3, rust-vcpkg-0.2 to cargo-inputs. Add custom phase to unbundle vendored sources and set environment variables. [native-inputs]: Add libssh2, openssl, pkg-config, zlib. [properties]: Remove field. --- gnu/packages/crates-io.scm | 50 ++++++++++++++++++++++++++++++---------------- 1 file changed, 33 insertions(+), 17 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 60664e3e17..5c6d760208 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -28,6 +28,7 @@ (define-module (gnu packages crates-io) #:use-module (guix packages) #:use-module (gnu packages compression) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages ssh) #:use-module (gnu packages tls) #:use-module (gnu packages version-control)) @@ -5688,27 +5689,42 @@ (define-public rust-libssh2-sys-0.2 (base32 "1zb6gsw795nq848nk5x2smzpfnn1s15wjlzjnvr8ihlz2l5x2549")))) (build-system cargo-build-system) - ;(arguments - ; `(#:phases - ; (modify-phases %standard-phases - ; (add-after 'unpack 'find-openssl - ; (lambda* (#:key inputs #:allow-other-keys) - ; (let ((openssl (assoc-ref inputs "openssl"))) - ; (setenv "OPENSSL_DIR" openssl)) - ; (delete-file-recursively "libssh2") - ; (setenv "LIBSSH2_SYS_USE_PKG_CONFIG" "1") - ; #t))))) - ;(native-inputs - ; `(("pkg-config" ,pkg-config))) - ;(inputs - ; `(("libssh2" ,libssh2) - ; ("openssl" ,openssl) - ; ("zlib" ,zlib))) + (arguments + `(#:skip-build? #t ; it wants rust-openssl-src + #:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-libz-sys" ,rust-libz-sys-1.0) + ("rust-openssl-sys" ,rust-openssl-sys-0.9) + ;; Build dependencies: + ("rust-cc" ,rust-cc-1.0) + ("rust-pkg-config" ,rust-pkg-config-0.3) + ("rust-vcpkg" ,rust-vcpkg-0.2)) + #:phases + (modify-phases %standard-phases + (add-after 'configure 'dont-vendor-sources + (lambda* (#:key inputs #:allow-other-keys) + (let ((openssl (assoc-ref inputs "openssl"))) + (setenv "OPENSSL_DIR" openssl)) + (delete-file-recursively "libssh2") + (delete-file-recursively + (string-append "guix-vendor/rust-libssh2-sys-" + ,(package-version rust-libssh2-sys-0.2) + ".crate/libssh2")) + (delete-file-recursively + (string-append "guix-vendor/rust-libz-sys-" + ,(package-version rust-libz-sys-1.0) + ".crate/src/zlib")) + (setenv "LIBSSH2_SYS_USE_PKG_CONFIG" "1") + #t))))) + (native-inputs + `(("libssh2" ,libssh2) + ("openssl" ,openssl) + ("pkg-config" ,pkg-config) + ("zlib" ,zlib))) (home-page "https://github.com/alexcrichton/ssh2-rs") (synopsis "Native bindings to the libssh2 library") (description "This package provides native rust bindings to the @code{libssh2} library.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 128aa31fe6255caf7bb7fabdca0ea4f695eaca41 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jan 2020 13:20:00 +0200 Subject: gnu: rust-openssl-sys-0.9: Don't hide package. * gnu/packages/crates-io.scm (rust-openssl-sys-0.9)[arguments]: Add rust-libc-0.2, rust-autocfg-0.1, rust-cc-1.0, rust-pkg-config-0.3, rust-vcpkg-0.2 to cargo-inputs. Add custom phase to find packaged openssl. [native-inputs]: Add openssl, pkg-config. [properties]: Remove field. --- gnu/packages/crates-io.scm | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5c6d760208..18b31bbb91 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7035,22 +7035,30 @@ (define-public rust-openssl-sys-0.9 (sha256 (base32 "0vvk8vzrc73y8n5rf4yj3x8ygyxjaz7wxrbxiwqi7qy0gyp1cpa6")))) (build-system cargo-build-system) - ;(arguments - ; `(#:phases - ; (modify-phases %standard-phases - ; (add-after 'unpack 'find-openssl - ; (lambda* (#:key inputs #:allow-other-keys) - ; (let ((openssl (assoc-ref inputs "openssl"))) - ; (setenv "OPENSSL_DIR" openssl)) - ; #t))))) - ;(inputs - ; `(("openssl" ,openssl) - ; ("pkg-config" ,pkg-config))) + (arguments + `(#:skip-build? #t ; it wants rust-openssl-src + #:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ;; Build dependencies: + ("rust-autocfg" ,rust-autocfg-0.1) + ("rust-cc" ,rust-cc-1.0) + ("rust-pkg-config" ,rust-pkg-config-0.3) + ;("rust-openssl-src" ,rust-openssl-src-111) + ("rust-vcpkg" ,rust-vcpkg-0.2)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'find-openssl + (lambda* (#:key inputs #:allow-other-keys) + (let ((openssl (assoc-ref inputs "openssl"))) + (setenv "OPENSSL_DIR" openssl)) + #t))))) + (native-inputs + `(("openssl" ,openssl) + ("pkg-config" ,pkg-config))) (home-page "https://github.com/sfackler/rust-openssl") (synopsis "FFI bindings to OpenSSL") (description "This package provides FFI bindings to OpenSSL for use in rust crates.") - (properties '((hidden? . #t))) (license license:expat))) (define-public rust-ordermap-0.3 -- cgit v1.2.3 From 16a5dfdc3cf596fb7cf9b5e474825067fb5bcf07 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jan 2020 14:48:34 +0200 Subject: gnu: rust-libssh2-sys-0.2: Update to 0.2.14. * gnu/packages/crates-io.scm (rust-libssh2-sys-0.2): Update to 0.2.14. --- 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 18b31bbb91..3e2a2f5104 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5679,7 +5679,7 @@ (define-public rust-libloading-0.5 (define-public rust-libssh2-sys-0.2 (package (name "rust-libssh2-sys") - (version "0.2.12") + (version "0.2.14") (source (origin (method url-fetch) @@ -5687,7 +5687,7 @@ (define-public rust-libssh2-sys-0.2 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "1zb6gsw795nq848nk5x2smzpfnn1s15wjlzjnvr8ihlz2l5x2549")))) + "042gsgbvxgm5by4mk906j3zm4qdvzcfhjxrb55is1lrr6f0nxain")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t ; it wants rust-openssl-src -- cgit v1.2.3 From 393d721404af393333e4f3f9ef947c5fc0e05be5 Mon Sep 17 00:00:00 2001 From: John Soo Date: Tue, 21 Jan 2020 00:42:32 -0800 Subject: gnu: librsvg-next-source: Replace and update some dependencies. * gnu/packages/gnome.scm (librsvg-next-source): Update vendored replacements. Signed-off-by: Efraim Flashner --- gnu/packages/gnome.scm | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index c304bdbc9b..cadd4d0655 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2182,7 +2182,7 @@ (define librsvg-next-source (lambda (crate) (delete-file-recursively (string-append "vendor/" (car crate))) (invoke "tar" "xvf" (cdr crate) "-C" "vendor")) - '(;("aho-corasick" . #+(package-source rust-aho-corasick-0.7)) + '(("aho-corasick" . #+(package-source rust-aho-corasick-0.7)) ;; alga 0.9 ("approx" . #+(package-source rust-approx-0.3)) ("arrayvec" . #+(package-source rust-arrayvec-0.4)) @@ -2200,10 +2200,10 @@ (define librsvg-next-source ("cloudabi" . #+(package-source rust-cloudabi-0.0)) ("criterion" . #+(package-source rust-criterion-0.2)) ("criterion-plot" . #+(package-source rust-criterion-plot-0.3)) - ;("crossbeam-deque" . #+(package-source rust-crossbeam-deque-0.7)) - ;("crossbeam-epoch" . #+(package-source rust-crossbeam-epoch-0.7)) - ("crossbeam-queue" . #+(package-source rust-crossbeam-queue-0.1)) - ("crossbeam-utils" . #+(package-source rust-crossbeam-utils-0.6)) + ("crossbeam-deque" . #+(package-source rust-crossbeam-deque-0.7)) + ("crossbeam-epoch" . #+(package-source rust-crossbeam-epoch-0.8)) + ("crossbeam-queue" . #+(package-source rust-crossbeam-queue-0.2)) + ("crossbeam-utils" . #+(package-source rust-crossbeam-utils-0.7)) ;; cssparser 0.25 ;; cssparser-macros 0.3 ("csv" . #+(package-source rust-csv-1.1)) @@ -2232,7 +2232,7 @@ (define librsvg-next-source ;; glib 0.8 ;; glib-sys 0.9 ;; gobject-sys 0.9 -;; idna 0.2 + ("idna" . #+(package-source rust-idna-0.2)) ("itertools" . #+(package-source rust-itertools-0.8)) ("itoa" . #+(package-source rust-itoa-0.4)) ("language-tags" . #+(package-source rust-language-tags-0.2)) @@ -2246,8 +2246,8 @@ (define librsvg-next-source ;; markup5ever 0.9 ("matches" . #+(package-source rust-matches-0.1)) ;; matrixmultiply 0.2 - ;("memchr" . #+(package-source rust-memchr-2.2)) -;; memoffset 0.5 + ("memchr" . #+(package-source rust-memchr-2.2)) + ("memoffset" . #+(package-source rust-memoffset-0.5)) ;; nalgebra 0.18 ("new_debug_unreachable" . #+(package-source rust-new-debug-unreachable-1.0)) ("nodrop" . #+(package-source rust-nodrop-0.1)) @@ -2283,15 +2283,15 @@ (define librsvg-next-source ("rand_os" . #+(package-source rust-rand-os-0.1)) ("rand_pcg" . #+(package-source rust-rand-pcg-0.1)) ("rand_xorshift" . #+(package-source rust-rand-xorshift-0.1)) -;; rand_xoshiro 0.1 + ("rand_xoshiro" . #+(package-source rust-rand-xoshiro-0.1)) ;; rawpointer 0.2 -;; rayon 1.2 -;; rayon-core 1.6 + ("rayon" . #+(package-source rust-rayon-1.3)) + ("rayon-core" . #+(package-source rust-rayon-core-1.7)) ;; rctree 0.3 ("rdrand" . #+(package-source rust-rdrand-0.4)) -;; regex 1.3 + ("regex" . #+(package-source rust-regex-1.3)) ("regex-automata" . #+(package-source rust-regex-automata-0.1)) - ;("regex-syntax" . #+(package-source rust-regex-syntax-0.6)) + ("regex-syntax" . #+(package-source rust-regex-syntax-0.6)) ("rustc_version" . #+(package-source rust-rustc-version-0.2)) ("ryu" . #+(package-source rust-ryu-1.0)) ("same-file" . #+(package-source rust-same-file-1.0)) @@ -2309,14 +2309,14 @@ (define librsvg-next-source ("syn" . #+(package-source rust-syn-1.0)) ("tendril" . #+(package-source rust-tendril-0.4)) ("textwrap" . #+(package-source rust-textwrap-0.11)) - ("thread_local" . #+(package-source rust-thread-local-0.3)) + ("thread_local" . #+(package-source rust-thread-local-1.0)) ("tinytemplate" . #+(package-source rust-tinytemplate-1.0)) ("typenum" . #+(package-source rust-typenum-1.10)) ("unicode-bidi" . #+(package-source rust-unicode-bidi-0.3)) ("unicode-normalization" . #+(package-source rust-unicode-normalization-0.1)) ("unicode-width" . #+(package-source rust-unicode-width-0.1)) ("unicode-xid" . #+(package-source rust-unicode-xid-0.2)) -;; url 2.1 + ("url" . #+(package-source rust-url-2.1)) ("utf-8" . #+(package-source rust-utf-8-0.7)) ("walkdir" . #+(package-source rust-walkdir-2.2)) ("winapi" . #+(package-source rust-winapi-0.3)) -- cgit v1.2.3 From 33d69d20ad4d3b93848c60c8102a16a3b2f0746a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jan 2020 17:04:07 +0200 Subject: gnu: Add rust-quickcheck-0.5. * gnu/packages/crates-io.scm (rust-quickcheck-0.5): 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 3e2a2f5104..82aec47db1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8231,6 +8231,26 @@ (define-public rust-quickcheck-0.6 ("rust-log" ,rust-log-0.4) ("rust-rand" ,rust-rand-0.4)))))) +(define-public rust-quickcheck-0.5 + (package + (inherit rust-quickcheck-0.8) + (name "rust-quickcheck") + (version "0.5.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "quickcheck" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1jzm1ygfbn4igaq14b9nipc8yvsn6c8panpgd1qiy5r2insjllyd")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-env-logger" ,rust-env-logger-0.4) + ("rust-log" ,rust-log-0.3) + ("rust-rand" ,rust-rand-0.3)))))) + (define-public rust-quote-1.0 (package (name "rust-quote") -- cgit v1.2.3 From b86409a76fcdf8e1637505e55e7dc8c1baaf133d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jan 2020 17:06:40 +0200 Subject: gnu: rust-unicode-segmentation-1.3: Fix inputs. * gnu/packages/crates-io.scm (rust-unicode-segmentation-1.3)[arguments]: Replace rust-quickcheck-0.8 with 0.7 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 82aec47db1..d40b50c8c4 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -12715,7 +12715,7 @@ (define-public rust-unicode-segmentation-1.3 (arguments `(#:skip-build? #t #:cargo-development-inputs - (("rust-quickcheck" ,rust-quickcheck-0.8)))) + (("rust-quickcheck" ,rust-quickcheck-0.7)))) (home-page "https://github.com/unicode-rs/unicode-segmentation") (synopsis "Grapheme Cluster, Word and Sentence boundaries") (description -- cgit v1.2.3 From a8a5cc6841c1b45f58303eb0f7d97e4b7e1d49c8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jan 2020 17:24:31 +0200 Subject: gnu: Add rust-heck-0.3. * gnu/packages/crates-io.scm (rust-heck-0.3): 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 d40b50c8c4..831c4959c1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4674,6 +4674,32 @@ (define-public rust-heapsize-plugin-0.1 total runtime size of an object on the heap") (license license:mpl2.0))) +(define-public rust-heck-0.3 + (package + (name "rust-heck") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "heck" version)) + (file-name (string-append name "-" version ".crate")) + (sha256 + (base32 + "01a2v7yvkiqxakdqz4hw3w3g4sm52ivz9cs3qcsv2arxsmw4wmi0")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-unicode-segmentation" ,rust-unicode-segmentation-1.3)))) + (home-page "https://github.com/withoutboats/heck") + (synopsis "Case conversion library") + (description + "This library exists to provide case conversion between common cases like +CamelCase and snake_case. It is intended to be unicode aware, internally +consistent, and reasonably well performing.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-hex-0.4 (package (name "rust-hex") -- cgit v1.2.3 From 2e1100f377bd32994a23ec26207edfa92e6a0074 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jan 2020 17:26:30 +0200 Subject: gnu: Add rust-matrixmultiply-0.1. * gnu/packages/crates-io.scm (rust-matrixmultiply-0.1): 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 831c4959c1..0be0136a31 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6014,6 +6014,33 @@ (define-public rust-matches-0.1 (properties '((hidden? . #t))) (license license:expat))) +(define-public rust-matrixmultiply-0.1 + (package + (name "rust-matrixmultiply") + (version "0.1.15") + (source + (origin + (method url-fetch) + (uri (crate-uri "matrixmultiply" version)) + (file-name (string-append name "-" version ".crate")) + (sha256 + (base32 + "00p0fpjhm45qdzi37mgv7ggsy8b9gqvq4999yrbgyn1dxkf6gbfw")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs (("rust-rawpointer" ,rust-rawpointer-0.1)) + #:cargo-development-inputs (("rust-bencher" ,rust-bencher-0.1)))) + (home-page "https://github.com/bluss/matrixmultiply/") + (synopsis "General matrix multiplication for f32 and f64 matrices") + (description "General matrix multiplication for f32 and f64 matrices. +Operates on matrices with general layout (they can use arbitrary row and column +stride). Detects and uses AVX or SSE2 on x86 platforms transparently for higher +performance. Uses a microkernel strategy, so that the implementation is easy to +parallelize and optimize.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-md5-0.6 (package (name "rust-md5") -- cgit v1.2.3 From af996d9086d875d0f06acbecf5176ffb94f8e015 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jan 2020 17:28:18 +0200 Subject: gnu: rust-permutohedron-0.2: Don't hide package. * gnu/packages/crates-io.scm (rust-permutohedron-0.2)[arguments]: Skip build. [properties]: Remove field. --- 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 0be0136a31..57319c73f8 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7571,13 +7571,13 @@ (define-public rust-permutohedron-0.2 (base32 "0b1pzh48j86v46wxngch6k1kx9cdw3jr3lwa86gd6jd4bmxzz1xn")))) (build-system cargo-build-system) + (arguments '(#:skip-build? #t)) (home-page "https://github.com/bluss/permutohedron") (synopsis "Generate permutations of sequences") (description "Generate permutations of sequences. Either lexicographical order permutations, or a minimal swaps permutation sequence implemented using Heap's algorithm.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 328df292aa45226b9a53a7bf6d23f4f4d707a3ad Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jan 2020 17:44:06 +0200 Subject: gnu: rust-lzma-sys-0.1: Don't hide package. * gnu/packages/crates-io.scm (rust-lzma-sys-0.1)[arguments]: Add rust-libc-0.2, rust-cc-1.0, rust-pkg-config-0.3 to cargo-inputs. Add custom phase to delete vendored code. [native-inputs]: Add pkg-config, xz. [properties]: Remove field. --- gnu/packages/crates-io.scm | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 57319c73f8..4f1505e6fc 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5898,23 +5898,29 @@ (define-public rust-lzma-sys-0.1 (base32 "14gyj256yh0wm77jbvmlc39v7lfn0navpfrja4alczarzlc8ir2k")))) (build-system cargo-build-system) - ;(arguments - ; `(#:phases - ; (modify-phases %standard-phases - ; (add-after 'unpack 'unbundle-xz - ; (lambda* (#:key inputs #:allow-other-keys) - ; (let ((xz (assoc-ref inputs "xz"))) - ; (delete-file-recursively "xz-5.2")) - ; #t))))) - ;(inputs - ; `(("pkg-config" ,pkg-config) - ; ("xz" ,xz))) + (arguments + `(#:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-cc" ,rust-cc-1.0) + ("rust-pkg-config" ,rust-pkg-config-0.3)) + #:phases + (modify-phases %standard-phases + (add-after 'configure 'unbundle-xz + (lambda _ + (delete-file-recursively "xz-5.2") + (delete-file-recursively + (string-append "guix-vendor/rust-lzma-sys-" + ,(package-version rust-lzma-sys-0.1) + ".crate/xz-5.2")) + #t))))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("xz" ,xz))) (home-page "https://github.com/alexcrichton/xz2-rs") (synopsis "Bindings to liblzma for lzma and xz stream encoding/decoding") (description "This package contains the raw bindings to liblzma which contains an implementation of LZMA and xz stream encoding/decoding.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 3977728026ff0e480732b45d3f761732cad1d470 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jan 2020 17:45:53 +0200 Subject: gnu: rust-maplit-1.0: Don't hide package. * gnu/packages/crates-io.scm (rust-maplit-1.0)[arguments]: Skip build. [properties]: Remove field. --- 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 4f1505e6fc..2bee5e1dbf 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5958,11 +5958,11 @@ (define-public rust-maplit-1.0 (base32 "0hsczmvd6zkqgzqdjp5hfyg7f339n68w83n4pxvnsszrzssbdjq8")))) (build-system cargo-build-system) + (arguments '(#:skip-build? #t)) (home-page "https://github.com/bluss/maplit") (synopsis "Collection of Map macros") (description "This crate provides a collection of @code{literal} macros for @code{HashMap}, @code{HashSet}, @code{BTreeMap}, and @code{BTreeSet.}") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 132c15ae9cbdc59b0b7bd28b492e024fce3eeb10 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jan 2020 17:46:33 +0200 Subject: gnu: rust-maplit-1.0: Upgrade to 1.0.2. * gnu/packages/crates-io.scm (rust-maplit-1.0): Upgrade 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 2bee5e1dbf..8605cc4520 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5948,7 +5948,7 @@ (define-public rust-mac-0.1 (define-public rust-maplit-1.0 (package (name "rust-maplit") - (version "1.0.1") + (version "1.0.2") (source (origin (method url-fetch) @@ -5956,7 +5956,7 @@ (define-public rust-maplit-1.0 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "0hsczmvd6zkqgzqdjp5hfyg7f339n68w83n4pxvnsszrzssbdjq8")))) + "07b5kjnhrrmfhgqm9wprjw8adx6i225lqp49gasgqg74lahnabiy")))) (build-system cargo-build-system) (arguments '(#:skip-build? #t)) (home-page "https://github.com/bluss/maplit") -- cgit v1.2.3 From 5b7856ecd0df6bc4c663bc3c143136f3e8969add Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jan 2020 17:49:00 +0200 Subject: gnu: rust-matches-0.1: Don't hide package. * gnu/packages/crates-io.scm (rust-matches-0.1)[arguments]: Skip build. [properties]: Remove field. --- 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 8605cc4520..04808c4f2e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6013,11 +6013,11 @@ (define-public rust-matches-0.1 (base32 "020axl4q7rk9vz90phs7f8jas4imxal9y9kxl4z4v7a6719mrz3z")))) (build-system cargo-build-system) + (arguments '(#:skip-build? #t)) (home-page "https://github.com/SimonSapin/rust-std-candidates") - (synopsis "Macro to evaluate whether an expression matches a pattern.") + (synopsis "Macro to evaluate whether an expression matches a pattern") (description "This package provides a macro to evaluate, as a boolean, whether an expression matches a pattern.") - (properties '((hidden? . #t))) (license license:expat))) (define-public rust-matrixmultiply-0.1 -- cgit v1.2.3 From 6839095af7f6c8a8d5ad481db22cd4ece0a1b5e3 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Tue, 21 Jan 2020 16:44:18 +0100 Subject: gnu: mrustc: Update to 0.8.1. * gnu/packages/patches/mrustc-0.8.0-fix-variable-length-integer-receiving.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/rust.scm (mrustc): Update to 0.8.1. [source](patches): Remove it. [native-inputs]: Add zlib. --- gnu/local.mk | 1 - ...ustc-0.8.0-fix-variable-length-integer-receiving.patch | 15 --------------- gnu/packages/rust.scm | 9 ++++----- 3 files changed, 4 insertions(+), 21 deletions(-) delete mode 100644 gnu/packages/patches/mrustc-0.8.0-fix-variable-length-integer-receiving.patch diff --git a/gnu/local.mk b/gnu/local.mk index 9dd67ddd5c..bbafa062ed 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1180,7 +1180,6 @@ dist_patch_DATA = \ %D%/packages/patches/mozjs38-tracelogger.patch \ %D%/packages/patches/mozjs38-version-detection.patch \ %D%/packages/patches/mrrescue-support-love-11.patch \ - %D%/packages/patches/mrustc-0.8.0-fix-variable-length-integer-receiving.patch \ %D%/packages/patches/mtools-mformat-uninitialized.patch \ %D%/packages/patches/mumps-build-parallelism.patch \ %D%/packages/patches/mumps-shared-libseq.patch \ diff --git a/gnu/packages/patches/mrustc-0.8.0-fix-variable-length-integer-receiving.patch b/gnu/packages/patches/mrustc-0.8.0-fix-variable-length-integer-receiving.patch deleted file mode 100644 index 9e76653a07..0000000000 --- a/gnu/packages/patches/mrustc-0.8.0-fix-variable-length-integer-receiving.patch +++ /dev/null @@ -1,15 +0,0 @@ -https://github.com/thepowersgang/mrustc/issues/109 -From: Danny Milosavljevic -Date: Fri, 3 Jan 2019 13:00:00 +0100 - ---- mrustc/src/expand/proc_macro.cpp.orig 2019-02-01 14:16:54.208486062 +0100 -+++ mrustc/src/expand/proc_macro.cpp 2019-02-01 14:17:14.350925705 +0100 -@@ -977,7 +977,7 @@ - for(;;) - { - auto b = recv_u8(); -- v |= static_cast(b) << ofs; -+ v |= static_cast(b & 0x7F) << ofs; - if( (b & 0x80) == 0 ) - break; - ofs += 7; diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index cec565bbc8..70e8d0a814 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -91,7 +91,7 @@ (define-public mrustc (let ((rustc-version "1.19.0")) (package (name "mrustc") - (version "0.8.0") + (version "0.8.1") (source (origin (method git-fetch) (uri (git-reference @@ -100,9 +100,7 @@ (define-public mrustc (file-name (git-file-name name version)) (sha256 (base32 - "0a7v8ccyzp1sdkwni8h1698hxpfz2sxhcpx42n6l2pbm0rbjp08i")) - (patches - (search-patches "mrustc-0.8.0-fix-variable-length-integer-receiving.patch")))) + "00800zckq009kf9v3hb8kp1svryvq3jpg4439ksm3wcidjvszdzc")))) (outputs '("out" "cargo")) (build-system gnu-build-system) (inputs @@ -111,7 +109,8 @@ (define-public mrustc `(("bison" ,bison) ("flex" ,flex) ;; Required for the libstd sources. - ("rustc" ,(package-source rust-1.19)))) + ("rustc" ,(package-source rust-1.19)) + ("zlib" ,zlib))) (arguments `(#:test-target "local_tests" #:make-flags (list (string-append "LLVM_CONFIG=" -- cgit v1.2.3 From e61dc8d0d7d5c2f2543bcff974333c5973a10558 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jan 2020 17:51:01 +0200 Subject: gnu: rust-md5-0.6: Don't hide package. * gnu/packages/crates-io.scm (rust-md5-0.6)[arguments]: Skip build. [properties]: Remove field. --- 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 04808c4f2e..a45d6e49a4 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6060,10 +6060,10 @@ (define-public rust-md5-0.6 (base32 "17b2xm4h4cvxsdjsf3kdrzqv2za60kak961xzi5kmw6g6djcssvy")))) (build-system cargo-build-system) + (arguments '(#:skip-build? #t)) (home-page "https://github.com/stainless-steel/md5") (synopsis "MD5 hash function in Rust") (description "The package provides the MD5 hash function.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 161095512cd68c8fc9961587d167d1e097c4e546 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jan 2020 17:53:49 +0200 Subject: gnu: rust-memmap-0.7: Don't hide package. * gnu/packages/crates-io.scm (rust-memmap-0.7)[arguments]: Skip build. Add rust-libc-0.2, rust-winapi-0.3 to cargo-inputs. Add rust-tempdir-0.3 to cargo-development-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a45d6e49a4..168e6d131f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6122,12 +6122,18 @@ (define-public rust-memmap-0.7 (base32 "0ns7kkd1h4pijdkwfvw4qlbbmqmlmzwlq3g2676dcl5vwyazv1b5")))) (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-winapi" ,rust-winapi-0.3)) + #:cargo-development-inputs + (("rust-tempdir" ,rust-tempdir-0.3)))) (home-page "https://github.com/danburkert/memmap-rs") (synopsis "Rust library for cross-platform memory mapped IO") (description "This package provides a cross-platform Rust API for memory-mapped file IO.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 4a2590f0588a21647a690e0b995f102d32d8a7b5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jan 2020 17:56:45 +0200 Subject: gnu: rust-mime-0.3: Don't hide package. * gnu/packages/crates-io.scm (rust-mime-0.3)[arguments]: Skip build. Add rust-unicase-2.4 to cargo-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 168e6d131f..8c798bccd5 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6207,11 +6207,13 @@ (define-public rust-mime-0.3 (base32 "09clbyvdkwflp8anwjhqdib0sw8191gphcchdp80nc8ayhhwl9ry")))) (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs (("rust-unicase" ,rust-unicase-2.4)))) (home-page "https://github.com/hyperium/mime") (synopsis "Strongly Typed Mimes") (description "Support MIME (HTTP Media Types) as strong types in Rust.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From acb9657a73b8e7452f71e8d1b1f49549313dbb90 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jan 2020 17:57:40 +0200 Subject: gnu: rust-mime-0.3: Update to 0.3.16. * gnu/packages/crates-io.scm (rust-mime-0.3): Update to 0.3.16. [arguments]: Remove rust-unicase-2.4 from cargo-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 8c798bccd5..692e290e63 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6197,7 +6197,7 @@ (define-public rust-memoffset-0.2 (define-public rust-mime-0.3 (package (name "rust-mime") - (version "0.3.13") + (version "0.3.16") (source (origin (method url-fetch) @@ -6205,11 +6205,9 @@ (define-public rust-mime-0.3 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "09clbyvdkwflp8anwjhqdib0sw8191gphcchdp80nc8ayhhwl9ry")))) + "13dcm9lh01hdwfjcg74ppljyjfj1c6w3a3cwkhxf0w8wa37cfq1a")))) (build-system cargo-build-system) - (arguments - `(#:skip-build? #t - #:cargo-inputs (("rust-unicase" ,rust-unicase-2.4)))) + (arguments '(#:skip-build? #t)) (home-page "https://github.com/hyperium/mime") (synopsis "Strongly Typed Mimes") (description -- cgit v1.2.3 From 5660d292b39669936f87e49ed132cdfd7d8aaec4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jan 2020 17:59:58 +0200 Subject: gnu: rust-miniz-sys-0.1: Don't hide package. * gnu/packages/crates-io.scm (rust-miniz-sys-0.1)[arguments]: Add rust-libc-0.2, rust-cc-1.0 to cargo-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 692e290e63..4629bcf790 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6295,11 +6295,15 @@ (define-public rust-miniz-sys-0.1 (base32 "00l2r4anm8g35x0js2zfdnwfbrih9m43vphdpb77c5ga3kjkm7hy")))) (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ;; Build dependencies: + ("rust-cc" ,rust-cc-1.0)))) (home-page "https://github.com/alexcrichton/flate2-rs") (synopsis "Bindings to the miniz.c library") (description "This package provides bindings to the @code{miniz.c} library.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From af6655ed4db36951c4c81bfdd1c538c6c7f8520f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jan 2020 18:03:12 +0200 Subject: gnu: rust-miow-0.3: Don't hide package. * gnu/packages/crates-io.scm (rust-miow-0.3)[arguments]: Skip build. Add rust-socket2-0.3, rust-winapi-0.3 to cargo-inputs. Add rust-rand-0.4 to cargo-development-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4629bcf790..9470860b80 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6414,12 +6414,18 @@ (define-public rust-miow-0.3 (base32 "09ljvx6wg30f2xlv7b7hhpkw7k312n3hjgmrbhwzhz9x03ra0sir")))) (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-socket2" ,rust-socket2-0.3) + ("rust-winapi" ,rust-winapi-0.3)) + #:cargo-development-inputs + (("rust-rand" ,rust-rand-0.4)))) (home-page "https://github.com/alexcrichton/miow") (synopsis "Rust I/O library for Windows") (description "This package provides a zero overhead I/O library for Windows, focusing on IOCP and Async I/O abstractions.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) @@ -6435,7 +6441,9 @@ (define-public rust-miow-0.2 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "06g9b8sqlh5gxakwqq4rrib07afwanfnxgxajrldwcgk3hxjy7wc")))))) + "06g9b8sqlh5gxakwqq4rrib07afwanfnxgxajrldwcgk3hxjy7wc")))) + (arguments '()) + (properties '((hidden? . #t))))) (define-public rust-model-0.1 (package -- cgit v1.2.3 From ae637969b626d573115714615ca2325881fc9f68 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jan 2020 18:07:11 +0200 Subject: gnu: rust-miow-0.2: Don't hide package. * gnu/packages/crates-io.scm (rust-miow-0.2)[arguments]: Skip build. Add rust-kernel32-sys-0.2, rust-net2-0.2, rust-winapi-0.2, rust-ws2-32-sys-0.2 to cargo-inputs. Add rust-rand-0.3 to cargo-development-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9470860b80..7c257fa33b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6442,8 +6442,15 @@ (define-public rust-miow-0.2 (sha256 (base32 "06g9b8sqlh5gxakwqq4rrib07afwanfnxgxajrldwcgk3hxjy7wc")))) - (arguments '()) - (properties '((hidden? . #t))))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-kernel32-sys" ,rust-kernel32-sys-0.2) + ("rust-net2" ,rust-net2-0.2) + ("rust-winapi" ,rust-winapi-0.2) + ("rust-ws2-32-sys" ,rust-ws2-32-sys-0.2)) + #:cargo-development-inputs + (("rust-rand" ,rust-rand-0.3)))))) (define-public rust-model-0.1 (package -- cgit v1.2.3 From 8bbf9d390fb3091249c89a585473fc4f00603bc1 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jan 2020 18:09:23 +0200 Subject: gnu: rust-net2-0.2: Don't hide package. * gnu/packages/crates-io.scm (rust-net2-0.2)[arguments]: Skip build. Add rust-cfg-if-0.1, rust-libc-0.2, rust-winapi-0.3 to cargo-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7c257fa33b..163409c00d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6512,12 +6512,17 @@ (define-public rust-net2-0.2 (base32 "126g3fgfxp06zimc1l9iyxnn9cif1hjsg7sd81nlls5nnyghsma2")))) (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-cfg-if" ,rust-cfg-if-0.1) + ("rust-libc" ,rust-libc-0.2) + ("rust-winapi" ,rust-winapi-0.3)))) (home-page "https://github.com/rust-lang-nursery/net2-rs") (synopsis "Extensions to the standard library's networking types") (description "This library contains extensions to the standard library's networking types as proposed in RFC 1158.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 904e8a4697873ef459fd8ba40aafae82e2affcf1 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jan 2020 18:15:50 +0200 Subject: gnu: rust-libz-sys-1.0: Don't hide package. * gnu/packages/crates-io.scm (rust-libz-sys-1.0)[arguments]: Add rust-libc-0.2, rust-cc-1.0, rust-pkg-config-0.3, rust-vcpkg-0.2 to cargo-inputs. Add custom phase to delete vendored source. [native-inputs]: Add pkg-config, zlib. [properties]: Remove field. --- gnu/packages/crates-io.scm | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 163409c00d..e5c6b939dd 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6586,22 +6586,31 @@ (define-public rust-libz-sys-1.0 (base32 "1gjycyl2283525abks98bhxa4r259m617xfm5z52p3p3c8ry9d9f")))) (build-system cargo-build-system) - ;(arguments - ; `(#:phases - ; (modify-phases %standard-phases - ; (add-after 'unpack 'delete-vendored-zlib - ; (lambda _ - ; (delete-file-recursively "src/zlib") - ; #t))))) - ;(inputs - ; `(("pkg-config" ,pkg-config) - ; ("zlib" ,zlib))) + (arguments + `(#:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ;; Build dependencies: + ("rust-cc" ,rust-cc-1.0) + ("rust-pkg-config" ,rust-pkg-config-0.3) + ("rust-vcpkg" ,rust-vcpkg-0.2)) + #:phases + (modify-phases %standard-phases + (add-after 'configure 'delete-vendored-zlib + (lambda _ + (delete-file-recursively "src/zlib") + (delete-file-recursively + (string-append "guix-vendor/rust-libz-sys-" + ,(package-version rust-libz-sys-1.0) + ".crate/src/zlib")) + #t))))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("zlib" ,zlib))) (home-page "https://github.com/rust-lang/libz-sys") (synopsis "Bindings to the system libz library") (description "This package provides bindings to the system @code{libz} library (also known as zlib).") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 45ad04e72182aafcf3f4b7c67deb998aac3b98b4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jan 2020 18:19:39 +0200 Subject: gnu: rust-num-cpus-1.10: Don't hide package. * gnu/packages/crates-io.scm (rust-num-cpus-1.10)[arguments]: Skip build. Add rust-libc-0.2 to cargo-inputs. Add rust-doc-comment-0.3 to cargo-development-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e5c6b939dd..af58c09290 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6826,11 +6826,16 @@ (define-public rust-num-cpus-1.10 (base32 "0wrj3zvj6h3q26sqj9zxpd59frjb54n7jhjwf307clq31ic47vxw")))) (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-libc" ,rust-libc-0.2)) + #:cargo-development-inputs + (("rust-doc-comment" ,rust-doc-comment-0.3)))) (home-page "https://github.com/seanmonstar/num_cpus") (synopsis "Get the number of CPUs on a machine") (description "Get the number of CPUs on a machine.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 5e2ce6afad34cf9faa167406c9b8bd8eac68c078 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jan 2020 18:32:03 +0200 Subject: gnu: rust-jemalloc-sys-0.3: Don't hide package. * gnu/packages/crates-io.scm (rust-jemalloc-sys-0.3)[arguments]: Add rust-libc-0.2, rust-cc-1.0, rust-fs-extra-1.1 to cargo-inputs. Add custom phase to delete vendored sources. [native-inputs]: Add jemalloc. [properties]: Remove field. --- gnu/packages/crates-io.scm | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index af58c09290..04a9b49ba5 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -27,6 +27,7 @@ (define-module (gnu packages crates-io) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (gnu packages compression) + #:use-module (gnu packages jemalloc) #:use-module (gnu packages pkg-config) #:use-module (gnu packages ssh) #:use-module (gnu packages tls) @@ -5331,22 +5332,30 @@ (define-public rust-jemalloc-sys-0.3 (base32 "0ify9vlql01qhfxlj7d4p9jvcp90mj2h69nkbq7slccvbhzryfqd")))) (build-system cargo-build-system) - ;(arguments - ; `(#:phases - ; (modify-phases %standard-phases - ; (add-after 'unpack 'override-jemalloc - ; (lambda* (#:key inputs #:allow-other-keys) - ; (let ((jemalloc (assoc-ref inputs "jemalloc"))) - ; (delete-file-recursively "jemalloc") - ; (setenv "JEMALLOC_OVERRIDE" - ; (string-append jemalloc "/lib/libjemalloc_pic.a"))) - ; #t))))) - ;(inputs - ; `(("jemalloc" ,jemalloc))) + (arguments + `(#:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ;; Build dependencies: + ("rust-cc" ,rust-cc-1.0) + ("rust-fs-extra" ,rust-fs-extra-1.1)) + #:phases + (modify-phases %standard-phases + (add-after 'configure 'override-jemalloc + (lambda* (#:key inputs #:allow-other-keys) + (let ((jemalloc (assoc-ref inputs "jemalloc"))) + (delete-file-recursively "jemalloc") + (delete-file-recursively + (string-append "guix-vendor/rust-jemalloc-sys-" + ,(package-version rust-jemalloc-sys-0.3) + ".crate/jemalloc")) + (setenv "JEMALLOC_OVERRIDE" + (string-append jemalloc "/lib/libjemalloc_pic.a"))) + #t))))) + (native-inputs + `(("jemalloc" ,jemalloc))) (home-page "https://github.com/gnzlbg/jemallocator") (synopsis "Rust FFI bindings to jemalloc") (description "This package provides Rust FFI bindings to jemalloc.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From b07384b5647057a67cd46109bd0272a195165855 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Tue, 21 Jan 2020 16:47:10 +0100 Subject: gnu: mrustc: Clean up. * gnu/packages/rust.scm (mrust)[native-inputs]: Remove zlib. [inputs]: Remove llvm. Add zlib. [arguments]<#:make-flags>: Remove LLVM_CONFIG. Add RUSTC_TARGET. [patch-date]: Modify. [unpack-target-compiler]: Modify. [configure]: Add CXX. [build-minicargo]: Modify. [install]: Install run_rustc. --- gnu/packages/rust.scm | 45 +++++++++++++++++++++------------------------ 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 70e8d0a814..83af92493b 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -104,52 +104,45 @@ (define-public mrustc (outputs '("out" "cargo")) (build-system gnu-build-system) (inputs - `(("llvm" ,llvm-3.9.1))) + `(("zlib" ,zlib))) (native-inputs `(("bison" ,bison) ("flex" ,flex) ;; Required for the libstd sources. - ("rustc" ,(package-source rust-1.19)) - ("zlib" ,zlib))) + ("rustc" ,(package-source rust-1.19)))) (arguments `(#:test-target "local_tests" - #:make-flags (list (string-append "LLVM_CONFIG=" - (assoc-ref %build-inputs "llvm") - "/bin/llvm-config")) + #:make-flags + (list ,(string-append "RUSTC_TARGET=" + (or (%current-target-system) + (nix-system->gnu-triplet-for-rust)))) #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-date (lambda _ (substitute* "Makefile" (("shell date") "shell date -d @1")) + (substitute* "run_rustc/Makefile" + (("[$]Vtime ") "$V ")) #t)) (add-after 'patch-date 'unpack-target-compiler (lambda* (#:key inputs outputs #:allow-other-keys) - (substitute* "minicargo.mk" - ;; Don't try to build LLVM. - (("^[$][(]LLVM_CONFIG[)]:") "xxx:") - ;; Build for the correct target architecture. - (("^RUSTC_TARGET := x86_64-unknown-linux-gnu") - (string-append "RUSTC_TARGET := " - ,(or (%current-target-system) - (nix-system->gnu-triplet-for-rust))))) (invoke "tar" "xf" (assoc-ref inputs "rustc")) - (chdir "rustc-1.19.0-src") + (chdir ,(string-append "rustc-" rustc-version "-src")) (invoke "patch" "-p0" "../rust_src.patch") (chdir "..") #t)) (replace 'configure (lambda* (#:key inputs #:allow-other-keys) - (setenv "CC" (string-append (assoc-ref inputs "gcc") "/bin/gcc")) + (setenv "CC" (string-append (assoc-ref inputs "gcc") + "/bin/gcc")) + (setenv "CXX" (string-append (assoc-ref inputs "gcc") + "/bin/g++")) #t)) (add-after 'build 'build-minicargo - (lambda _ - (for-each (lambda (target) - (invoke "make" "-f" "minicargo.mk" target)) - '("output/libstd.hir" "output/libpanic_unwind.hir" - "output/libproc_macro.hir" "output/libtest.hir")) - ;; Technically the above already does it - but we want to be clear. - (invoke "make" "-C" "tools/minicargo"))) + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "-f" "minicargo.mk" "LIBS" make-flags) + (apply invoke "make" "-C" "tools/minicargo" make-flags))) (replace 'install (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -159,7 +152,8 @@ (define-public mrustc (cargo-bin (string-append cargo-out "/bin")) (lib (string-append out "/lib")) (lib/rust (string-append lib "/mrust")) - (gcc (assoc-ref inputs "gcc"))) + (gcc (assoc-ref inputs "gcc")) + (run_rustc (string-append out "/share/mrustc/run_rustc"))) ;; These files are not reproducible. (for-each delete-file (find-files "output" "\\.txt$")) (delete-file-recursively "output/local_tests") @@ -171,6 +165,9 @@ (define-public mrustc ;; minicargo uses relative paths to resolve mrustc. (install-file "tools/bin/minicargo" tools-bin) (install-file "tools/bin/minicargo" cargo-bin) + (mkdir-p run_rustc) + (copy-file "run_rustc/Makefile" + (string-append run_rustc "/Makefile")) #t)))))) (synopsis "Compiler for the Rust progamming language") (description "Rust is a systems programming language that provides memory -- cgit v1.2.3 From f51fa60b1679c6d06cfe248e901b8df47d71ad77 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jan 2020 18:49:10 +0200 Subject: gnu: rust-pcre2-sys-0.2: Unbundle vendored source. * gnu/packages/crates-io.scm (rust-pcre2-sys-0.2)[arguments]: Don't skip build. Add custom phase to delete vendored sources. [native-inputs]: Add pcre2, pkg-config. --- gnu/packages/crates-io.scm | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 04a9b49ba5..19a84f5cdb 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -28,6 +28,7 @@ (define-module (gnu packages crates-io) #:use-module (guix packages) #:use-module (gnu packages compression) #:use-module (gnu packages jemalloc) + #:use-module (gnu packages pcre) #:use-module (gnu packages pkg-config) #:use-module (gnu packages ssh) #:use-module (gnu packages tls) @@ -7548,11 +7549,23 @@ (define-public rust-pcre2-sys-0.2 "0nwdvc43dkb89qmm5q8gw1zyll0wsfqw7kczpn23mljra3874v47")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2) ("rust-pkg-config" ,rust-pkg-config-0.3) - ("rust-cc" ,rust-cc-1.0)))) + ("rust-cc" ,rust-cc-1.0)) + #:phases + (modify-phases %standard-phases + (add-after 'configure 'unbundle-sources + (lambda _ + (delete-file-recursively "pcre2") + (delete-file-recursively + (string-append "guix-vendor/rust-pcre2-sys-" + ,(package-version rust-pcre2-sys-0.2) + ".tar.gz/pcre2")) + #t))))) + (native-inputs + `(("pcre2" ,pcre2) + ("pkg-config" ,pkg-config))) (home-page "https://github.com/BurntSushi/rust-pcre2") (synopsis "Low level bindings to PCRE2") -- cgit v1.2.3 From 5b600fcae65df18c617adc0e5c35e98484e2b3cc Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Tue, 21 Jan 2020 20:30:06 +0100 Subject: gnu: mrustc: Update to 0.9. * gnu/packages/rust.scm (mrustc): update to 0.9. [arguments]<#:test-target]: Change to "test". <#:phases>[unpack-target-compiler]: Modify. [install]: Modify. (rust-1.19)[arguments]<#:phases>[build]: Modify. --- gnu/packages/rust.scm | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 83af92493b..8bed56ff72 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -91,7 +91,7 @@ (define-public mrustc (let ((rustc-version "1.19.0")) (package (name "mrustc") - (version "0.8.1") + (version "0.9") (source (origin (method git-fetch) (uri (git-reference @@ -100,7 +100,7 @@ (define-public mrustc (file-name (git-file-name name version)) (sha256 (base32 - "00800zckq009kf9v3hb8kp1svryvq3jpg4439ksm3wcidjvszdzc")))) + "194ny7vsks5ygiw7d8yxjmp1qwigd71ilchis6xjl6bb2sj97rd2")))) (outputs '("out" "cargo")) (build-system gnu-build-system) (inputs @@ -111,7 +111,7 @@ (define-public mrustc ;; Required for the libstd sources. ("rustc" ,(package-source rust-1.19)))) (arguments - `(#:test-target "local_tests" + `(#:test-target "test" #:make-flags (list ,(string-append "RUSTC_TARGET=" (or (%current-target-system) @@ -129,8 +129,13 @@ (define-public mrustc (lambda* (#:key inputs outputs #:allow-other-keys) (invoke "tar" "xf" (assoc-ref inputs "rustc")) (chdir ,(string-append "rustc-" rustc-version "-src")) - (invoke "patch" "-p0" "../rust_src.patch") + (invoke "patch" "-p0" ,(string-append "../rustc-" rustc-version + "-src.patch")) (chdir "..") + (setenv "RUSTC_VERSION" ,rustc-version) + (setenv "MRUSTC_TARGET_VER" + ,(version-major+minor rustc-version)) + (setenv "OUTDIR_SUF" "") #t)) (replace 'configure (lambda* (#:key inputs #:allow-other-keys) @@ -141,8 +146,15 @@ (define-public mrustc #t)) (add-after 'build 'build-minicargo (lambda* (#:key make-flags #:allow-other-keys) + ;; TODO: minicargo.mk: RUSTC_VERSION=$(RUSTC_VERSION) RUSTC_CHANNEL=$(RUSTC_SRC_TY) OUTDIR_SUF=$(OUTDIR_SUF) (apply invoke "make" "-f" "minicargo.mk" "LIBS" make-flags) (apply invoke "make" "-C" "tools/minicargo" make-flags))) + ;(add-after 'check 'check-locally + ; (lambda* (#:key make-flags #:allow-other-keys) + ; ;; The enum test wouldn't work otherwise. + ; ;; See . + ; (setenv "MRUSTC_TARGET_VER" ,(version-major+minor rustc-version)) + ; (apply invoke "make" "local_tests" make-flags))) (replace 'install (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -153,11 +165,12 @@ (define-public mrustc (lib (string-append out "/lib")) (lib/rust (string-append lib "/mrust")) (gcc (assoc-ref inputs "gcc")) - (run_rustc (string-append out "/share/mrustc/run_rustc"))) + (run_rustc (string-append out + "/share/mrustc/run_rustc"))) ;; These files are not reproducible. (for-each delete-file (find-files "output" "\\.txt$")) - (delete-file-recursively "output/local_tests") - (mkdir-p lib) + ;(delete-file-recursively "output/local_tests") + (mkdir-p (dirname lib/rust)) (copy-recursively "output" lib/rust) (mkdir-p bin) (mkdir-p tools-bin) @@ -285,8 +298,12 @@ (define rust-1.19 (setenv "CFG_RELEASE_CHANNEL" "stable") (setenv "CFG_LIBDIR_RELATIVE" "lib") (setenv "CFG_VERSION" "1.19.0-stable-mrustc") + (setenv "MRUSTC_TARGET_VER" ,(version-major+minor version)) ; bad: (setenv "CFG_PREFIX" "mrustc") ; FIXME output path. (mkdir-p "output") + ;; mrustc 0.9 doesn't check the search paths for crates anymore. + (copy-recursively (string-append rustc-bootstrap "/lib/mrust") + "output") (invoke (string-append rustc-bootstrap "/tools/bin/minicargo") "src/rustc" "--vendor-dir" "src/vendor" "--output-dir" "output/rustc-build" -- cgit v1.2.3 From a7d470e47dab0acd00da43860e19e12edd50bcbb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Jan 2020 21:18:11 +0100 Subject: gnu: ungoogled-chromium: Update to 79.0.3945.130-0.e2fae99. * gnu/packages/chromium.scm (%chromium-version): Set to 79.0.3945.130. (%ungoogled-revision): Set to e2fae99. (%debian-revision): Set to debian/79.0.3945.130-2. (%chromium-origin, %ungoogled-origin, %debian-origin): Update hashes. (ungoogled-chromium-source): Ignore comments in debian/patches/series. (libvpx/chromium, gentoo-patch): Remove variables. (ungoogled-chromium)[inputs]: Change from LIBVPX/CHROMIUM to LIBVPX. (ungoogled-chromium/wayland): Add 'ozone_platform="wayland"' in #:configure-flags. --- gnu/packages/chromium.scm | 42 ++++++++++-------------------------------- 1 file changed, 10 insertions(+), 32 deletions(-) diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index dc8e041219..ecded29abd 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -242,9 +242,9 @@ (define* (computed-origin-method gexp-promise hash-algo hash #:system system #:guile-for-build guile))) -(define %chromium-version "78.0.3904.108") -(define %ungoogled-revision "8f065138317a6152b20decc224027a5192ba76b1") -(define %debian-revision "e43d74632091324774a5049668782dba7b09cf72") +(define %chromium-version "79.0.3945.130") +(define %ungoogled-revision "e2fae994d786b6716fb473a47b0c880bcfdc2497") +(define %debian-revision "debian/79.0.3945.130-2") (define package-revision "0") (define %package-version (string-append %chromium-version "-" package-revision "." @@ -258,7 +258,7 @@ (define %chromium-origin %chromium-version ".tar.xz")) (sha256 (base32 - "03jvfz68nvmmrplygf96sh0l347p4h03c8vpw8yrglh6ycwkiigr")))) + "183vz3lf1588cr9s5vlnj65qvbmz36s8cg8k7dvr64cxmcqk86an")))) (define %ungoogled-origin (origin @@ -269,7 +269,7 @@ (define %ungoogled-origin (string-take %ungoogled-revision 7))) (sha256 (base32 - "0zix90jz82hpym9jmyf99yw19swaf13ps6szi60wccmz1gccv77g")))) + "15vmc07iba1zmzn4j7c5n2hyvyxzwwf9hc3kyym0m4jajlsyxr5f")))) (define %debian-origin (origin @@ -283,15 +283,7 @@ (define %debian-origin (string-take %debian-revision 7)))) (sha256 (base32 - "1l1ajjkn1y7ql5w4zb3c3vw57hkydvy1mac7y81rycx4g5djasaz")))) - -(define (gentoo-patch name hash revision) - (origin - (method url-fetch) - (uri (string-append "https://gitweb.gentoo.org/repo/gentoo.git/plain" - "/www-client/chromium/files/" name "?id=" revision)) - (file-name name) - (sha256 (base32 hash)))) + "1rbzxcwfp7v0c6rkvn9jl9by7p363cnbdyqazwiak1z03kmw3nkz")))) ;; This is a "computed" origin that does the following: ;; *) Runs the Ungoogled scripts on a pristine Chromium tarball. @@ -336,7 +328,7 @@ (define ungoogled-chromium-source ;; Ungoogled-Chromium contains a forked subset of the Debian ;; patches. Disable those, as we apply newer versions later. (substitute* "patches/series" - ((".*/debian_buster/.*") + ((".*/debian/.*") "")) (format #t "Ungooglifying...~%") @@ -361,6 +353,7 @@ (define ungoogled-chromium-source (let loop ((line (read-line))) (unless (eof-object? line) (when (and (> (string-length line) 1) + (not (string-prefix? "#" line)) ;; Skip the Debian-specific ones. (not (string-prefix? "debianization/" line)) (not (string-prefix? "buster/" line)) @@ -429,21 +422,6 @@ (define opus+custom `(cons "--enable-custom-modes" ,flags)))))) -;; Chromium 78 requires libvpx features that are not in any release. -(define libvpx/chromium - (package/inherit - libvpx - (version "m78-3904") - (source (origin - (inherit (package-source libvpx)) - (uri (git-reference - (url "https://chromium.googlesource.com/webm/libvpx") - (commit version))) - (file-name (git-file-name "libvpx" version)) - (sha256 - (base32 - "1pphjfmg0aqq93n5cq790884v1h84di8p9mk3r28sm053wszhm7g")))))) - (define-public ungoogled-chromium (package (name "ungoogled-chromium") @@ -808,7 +786,7 @@ (define-public ungoogled-chromium ("libjpeg-turbo" ,libjpeg-turbo) ("libpng" ,libpng) ("libva" ,libva) - ("libvpx" ,libvpx/chromium) + ("libvpx" ,libvpx) ("libwebp" ,libwebp) ("libx11" ,libx11) ("libxcb" ,libxcb) @@ -871,13 +849,13 @@ (define-public ungoogled-chromium/wayland `(("wayland" ,wayland) ("wayland-protocols" ,wayland-protocols) ,@(package-inputs ungoogled-chromium))) - (arguments (substitute-keyword-arguments (package-arguments ungoogled-chromium) ((#:configure-flags flags) `(append (list "use_ozone=true" "ozone_platform_wayland=true" "ozone_auto_platforms=false" + "ozone_platform=\"wayland\"" "use_xkbcommon=true" "use_system_minigbm=true" "use_system_libwayland=true" -- cgit v1.2.3 From 79e074ea10875ff75ca613179c70de12d64b19f5 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Thu, 16 Jan 2020 23:14:41 +0100 Subject: gnu: nim: Fix /bin/sh substitution in C code. * gnu/packages/nim.scm (nim)[arguments]: Patch the string length too. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/nim.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/nim.scm b/gnu/packages/nim.scm index 5694eae63b..22dac0b58a 100644 --- a/gnu/packages/nim.scm +++ b/gnu/packages/nim.scm @@ -50,10 +50,12 @@ (define-public nim #t))) (add-after 'patch-source-shebangs 'patch-more-shebangs (lambda _ - (substitute* (append '("tests/stdlib/tosprocterminate.nim" - "lib/pure/osproc.nim") - (find-files "c_code" "stdlib_osproc.c")) - (("/bin/sh") (which "sh"))) + (let ((sh (which "sh"))) + (substitute* '("tests/stdlib/tosprocterminate.nim" + "lib/pure/osproc.nim") + (("/bin/sh") sh)) + (substitute* (find-files "c_code" "stdlib_osproc.c") + (("\"/bin/sh\", 7") (format "~s, ~s" sh (string-length sh))))) #t)) (replace 'build (lambda _ -- cgit v1.2.3 From 0025a1d31eb1d0aedb9e13a60ba36b9a13b67461 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Jan 2020 21:10:49 +0100 Subject: gnu: gstreamer: Disable two tests on i686. * gnu/packages/gstreamer.scm (gstreamer)[arguments]: Add phase when building for i686 systems. --- gnu/packages/gstreamer.scm | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 6fd683c9de..ce4eb707e7 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -119,8 +119,22 @@ (define-public gstreamer (build-system meson-build-system) (outputs '("out" "doc")) (arguments - '(#:phases + `(#:phases (modify-phases %standard-phases + ;; FIXME: Since switching to the meson-build-system, two tests + ;; started failing on i686. See + ;; . + ,@(if (string-prefix? "i686" (or (%current-target-system) + (%current-system))) + `((add-after 'unpack 'disable-some-tests + (lambda _ + (substitute* "tests/check/gst/gstsystemclock.c" + (("tcase_add_test \\(tc_chain, test_stress_cleanup_unschedule.*") + "") + (("tcase_add_test \\(tc_chain, test_stress_reschedule.*") + "")) + #t))) + '()) (add-after 'install 'move-docs (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From e003b7591f6c0cff8aeaf0d2063fb8a038a068a1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Jan 2020 21:12:48 +0100 Subject: gnu: gst-plugins-bad: Disable failing test on armhf-linux. * gnu/packages/gstreamer.scm (gst-plugins-bad)[arguments]: Add phase when building for armhf-linux. --- gnu/packages/gstreamer.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index ce4eb707e7..7ff78b2a77 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -313,8 +313,19 @@ (define-public gst-plugins-bad "0x0y0hm0ga3zqi5q4090hw5sjh59y1ry9ak16qsaascm72i7mjzi")))) (build-system meson-build-system) (arguments - '(#:phases + `(#:phases (modify-phases %standard-phases + ,@(if (string-prefix? "arm" (or (%current-target-system) + (%current-system))) + ;; Disable test that fails on ARMv7. + ;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/issues/1188 + `((add-after 'unpack 'disable-asfmux-test + (lambda _ + (substitute* "tests/check/meson.build" + (("\\[\\['elements/asfmux\\.c'\\]\\],") + "")) + #t))) + '()) (add-after 'unpack 'disable-failing-test (lambda _ ;; FIXME: Why is this failing. -- cgit v1.2.3 From b3c2ebda5bcedcfb88475e53b7f36c3a42cac8b4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Jan 2020 21:13:35 +0100 Subject: gnu: gst-plugins-good: Disable failing tests on armhf-linux. * gnu/packages/gstreamer.scm (gst-plugins-good)[arguments]: Add phase when building for armhf-linux. --- gnu/packages/gstreamer.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 7ff78b2a77..1e26a3ce3e 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -283,6 +283,22 @@ (define-public gst-plugins-good (arguments `(#:phases (modify-phases %standard-phases + ,@(if (string-prefix? "arm" (or (%current-target-system) + (%current-system))) + ;; FIXME: These tests started failing on armhf after switching to Meson. + ;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/issues/689 + `((add-after 'unpack 'disable-tests-for-armhf + (lambda _ + (substitute* "tests/check/elements/rtpbin_buffer_list.c" + (("tcase_add_test \\(tc_chain, test_bufferlist\\);") + "")) + (substitute* "tests/check/elements/rtpulpfec.c" + (("tcase_add_loop_test.*rtpulpfecdec_recovered_from_many.*") + "") + (("tcase_add.*rtpulpfecdec_recovered_using_recovered_packet.*") + "")) + #t))) + '()) (add-after 'unpack 'disable-failing-tests (lambda _ -- cgit v1.2.3