From e0288fd80d080d7173d227976e1ce3526c1cc995 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 9 Dec 2019 22:24:38 +0100 Subject: gnu: cups-filters: Update to 1.25.13. * gnu/packages/cups.scm (cups-filters): Update to 1.25.13. --- 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 1f8e7bd179..4e4d4727c3 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.11") + (version "1.25.13") (source(origin (method url-fetch) (uri @@ -66,7 +66,7 @@ (define-public cups-filters "cups-filters-" version ".tar.xz")) (sha256 (base32 - "0ni8krr4rf5833livn9401cd41gspjvxj0iiqnc1rfg3x90i0fxh")) + "1z3b7p6pp6yzvzl2nip9q0gn4fr5k9qwpnnhqqkiaaf3b1nfswjj")) (modules '((guix build utils))) (snippet ;; install backends, banners and filters to cups-filters output -- cgit v1.2.3 From ed530aeb71dec4c77d3686438a83b5565654336c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 9 Dec 2019 22:25:02 +0100 Subject: gnu: imagemagick: Update to 6.9.10-78. * gnu/packages/imagemagick.scm (imagemagick): Update to 6.9.10-78. --- 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 74fbf9158a..6e10c323e8 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-68") + (version "6.9.10-78") (source (origin (method url-fetch) (uri (string-append "mirror://imagemagick/ImageMagick-" version ".tar.xz")) (sha256 (base32 - "1jxjxhnvznpbdigry2cgxx94cx6k6y3rs40a464n5yln29s1qlz1")))) + "178sai7r0w2hwv01is25c8mxf9lc2ba0l16qm45h9vv49y5dy08q")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch") -- cgit v1.2.3 From db942cdaff1b63ce945bc471f16ea7d3a23ddc65 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 9 Dec 2019 22:25:29 +0100 Subject: gnu: qpdf: Update to 9.1.0. * gnu/packages/pdf.scm (qpdf): Update to 9.1.0. --- gnu/packages/pdf.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index ebe0168ff2..3b6829c4bc 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -670,14 +670,14 @@ (define-public mupdf (define-public qpdf (package (name "qpdf") - (version "9.0.1") + (version "9.1.0") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/qpdf/qpdf/" version "/qpdf-" version ".tar.gz")) (sha256 (base32 - "0lhgb82s2402ad2yiswkj227vjlw9zypphdfdivfkbril7dg6495")) + "0ygd80wxcmh613n04x2kmf8wlsl0drxyd5wwdcrm1rzj0xwvpfrs")) (modules '((guix build utils))) (snippet ;; Replace shebang with the bi-lingual shell/Perl trick to remove -- cgit v1.2.3 From bb14766e757928f922efd9fbbb758f0e36b67adf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 9 Dec 2019 22:26:06 +0100 Subject: gnu: libdrm: Update to 2.4.100. * gnu/packages/xdisorg.scm (libdrm): Update to 2.4.100. --- 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 b1759eabb2..8e53afeb3f 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -421,7 +421,7 @@ (define-public pixman (define-public libdrm (package (name "libdrm") - (version "2.4.99") + (version "2.4.100") (source (origin (method url-fetch) @@ -431,7 +431,7 @@ (define-public libdrm ".tar.bz2")) (sha256 (base32 - "0pnsw4bmajzdbz8pk4wswdmw93shhympf2q9alhbnpfjgsf57gsd")) + "0p8a1l3a3s40i81mawm8nhrbk7p97ss05qkawp1yx73c30lchz67")) (patches (search-patches "libdrm-symbol-check.patch")))) (build-system meson-build-system) (arguments -- cgit v1.2.3 From 8d9d6adbab6cb21b44f86ab445ad60f8c115249b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 9 Dec 2019 22:26:32 +0100 Subject: gnu: libepoxy: Update to 1.5.4. * gnu/packages/gl.scm (libepoxy): Update to 1.5.4. --- 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 63e12efe06..a1350be26a 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -604,7 +604,7 @@ (define (dynamic-link-substitute file lib input) (define-public libepoxy (package (name "libepoxy") - (version "1.5.3") + (version "1.5.4") (source (origin (method url-fetch) (uri (string-append @@ -612,7 +612,7 @@ (define-public libepoxy version "/libepoxy-" version ".tar.xz")) (sha256 (base32 - "0ga3qjv50x37my6pw5xr14g5n6z78hy5s8s06kays8c3ab2mha80")))) + "1ll9fach4v30dsyd47s5ial4gaiwihzr2afb77vxxzzy3mlcrlhb")))) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 91304b79453440a90c366cb667a19d91eb5752e2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 9 Dec 2019 22:27:31 +0100 Subject: gnu: mesa: Update to 19.2.7. * gnu/packages/patches/mesa-timespec-test-32bit.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/gl.scm (mesa): Update to 19.2.7. [source](patches): Remove obsolete. --- gnu/local.mk | 1 - gnu/packages/gl.scm | 7 +++---- gnu/packages/patches/mesa-timespec-test-32bit.patch | 17 ----------------- 3 files changed, 3 insertions(+), 22 deletions(-) delete mode 100644 gnu/packages/patches/mesa-timespec-test-32bit.patch diff --git a/gnu/local.mk b/gnu/local.mk index 0faa0ba07c..a76f222abd 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1136,7 +1136,6 @@ dist_patch_DATA = \ %D%/packages/patches/mcrypt-CVE-2012-4527.patch \ %D%/packages/patches/mes-remove-store-name.patch \ %D%/packages/patches/mesa-skip-disk-cache-test.patch \ - %D%/packages/patches/mesa-timespec-test-32bit.patch \ %D%/packages/patches/mescc-tools-boot.patch \ %D%/packages/patches/meson-for-build-rpath.patch \ %D%/packages/patches/metabat-fix-compilation.patch \ diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index a1350be26a..6423a61f34 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.1") + (version "19.2.7") (source (origin (method url-fetch) @@ -241,10 +241,9 @@ (define-public mesa version "/mesa-" version ".tar.xz"))) (sha256 (base32 - "1s81kwcjkkahnf5y5mshmd3q9j057hhsai7awpq6yb6im2hkriac")) + "17jp8ghipgz62vqqz5llskxypkcmgf8gnlgnj0pyvnbgi6vryyg3")) (patches - (search-patches "mesa-skip-disk-cache-test.patch" - "mesa-timespec-test-32bit.patch")))) + (search-patches "mesa-skip-disk-cache-test.patch")))) (build-system meson-build-system) (propagated-inputs `(;; The following are in the Requires.private field of gl.pc. diff --git a/gnu/packages/patches/mesa-timespec-test-32bit.patch b/gnu/packages/patches/mesa-timespec-test-32bit.patch deleted file mode 100644 index 3e4890f3a4..0000000000 --- a/gnu/packages/patches/mesa-timespec-test-32bit.patch +++ /dev/null @@ -1,17 +0,0 @@ -Fix a test failure on 32-bit systems. - -Taken from upstream: -https://gitlab.freedesktop.org/mesa/mesa/commit/dd1dba80b9ee74ec8b90761285a8262e374bf8ef - -diff --git a/src/util/tests/timespec/timespec_test.cpp b/src/util/tests/timespec/timespec_test.cpp ---- a/src/util/tests/timespec/timespec_test.cpp -+++ b/src/util/tests/timespec/timespec_test.cpp -@@ -206,7 +206,7 @@ TEST(timespec_test, timespec_from_nsec) - - timespec_from_nsec(&a, UINT64_MAX); - EXPECT_EQ(a.tv_nsec, UINT64_MAX % NSEC_PER_SEC); -- EXPECT_EQ(a.tv_sec, UINT64_MAX / NSEC_PER_SEC); -+ EXPECT_EQ(a.tv_sec, (time_t)(UINT64_MAX / NSEC_PER_SEC)); - } - - TEST(timespec_test, timespec_from_usec) -- cgit v1.2.3 From 70255a1ac267d25734b49676a053630e5e645c84 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 9 Dec 2019 22:28:26 +0100 Subject: gnu: libinput: Update to 1.14.3. * gnu/packages/freedesktop.scm (libinput): Update to 1.14.3. --- 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 f911340858..379f96da0a 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -155,14 +155,14 @@ (define-public xdg-utils (define-public libinput (package (name "libinput") - (version "1.14.1") + (version "1.14.3") (source (origin (method url-fetch) (uri (string-append "https://freedesktop.org/software/libinput/" "libinput-" version ".tar.xz")) (sha256 (base32 - "0w7fas37mp2k06f12i3lnj717lw73asziknj6z51kh1m50ja6cz3")))) + "1dy58j8dvr7ri34bx0lppmh5638m956azgwk501w373hi42kmsqg")))) (build-system meson-build-system) (arguments `(#:configure-flags '("-Ddocumentation=false") -- cgit v1.2.3 From b7d8856a7f24e8d99ef48933393cdcc0b787cf80 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 9 Dec 2019 22:28:45 +0100 Subject: gnu: gtk+: Update to 3.24.13. * gnu/packages/gtk.scm (gtk+): Update to 3.24.13. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 777601ed97..3ef61c9b4a 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -722,7 +722,7 @@ (define-public gtk+-2 (define-public gtk+ (package (inherit gtk+-2) (name "gtk+") - (version "3.24.12") + (version "3.24.13") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -730,7 +730,7 @@ (define-public gtk+ name "-" version ".tar.xz")) (sha256 (base32 - "10xyyhlfb0yk4hglngxh2zsv9xrxkqv343df8h01dvagc6jyp10k")) + "1a9hi7k59q0kqx0n3xhsk1ly23w9g9ncllnay1756g0yrww5qxsc")) (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch" "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch")))) (outputs '("out" "bin" "doc")) -- cgit v1.2.3 From ed05d6b242f00ae3da2405fffe2fe2a85dc8d0d7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 9 Dec 2019 22:29:14 +0100 Subject: gnu: eudev: Update to 3.2.9. * gnu/packages/linux.scm (eudev): Update to 3.2.9. --- 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 383698b400..1565677a70 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2628,7 +2628,7 @@ (define-public eudev ;; The post-systemd fork, maintained by Gentoo. (package (name "eudev") - (version "3.2.8") + (version "3.2.9") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/gentoo/eudev") @@ -2636,7 +2636,7 @@ (define-public eudev (file-name (git-file-name name version)) (sha256 (base32 - "1g95yzzx4qxm5qhhylbi930lrq4gsbz207n72018nkvswj6gmpjw")) + "1g9z3d33m0i3hmbhm0wxpvkzf6ac7xj1drwcfrhzlfhhi63sg9h7")) (patches (search-patches "eudev-rules-directory.patch")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 049e4501623c6bcc19b31c48edc4e710faa61ae7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 9 Dec 2019 22:29:38 +0100 Subject: gnu: bluez: Update to 5.52. * gnu/packages/linux.scm (bluez): Update to 5.52. --- 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 1565677a70..8879112357 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3750,7 +3750,7 @@ (define-public sbc (define-public bluez (package (name "bluez") - (version "5.51") + (version "5.52") (source (origin (method url-fetch) (uri (string-append @@ -3758,7 +3758,7 @@ (define-public bluez version ".tar.xz")) (sha256 (base32 - "1fpbsl9kkfq6mn6n0dg4h0il4c7fzhwhn79gh907k5b2kwszpvgb")))) + "02jng21lp6fb3c2bh6vf9y7cj4gaxwk29dfc32ncy0lj0gi4q57p")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 3a24bf3a2a7fc89c04dba4c74419e9183e509eb0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 9 Dec 2019 22:29:58 +0100 Subject: gnu: libxkbcommon: Update to 0.9.1. * gnu/packages/xdisorg.scm (libxkbcommon): Update to 0.9.1. [build-system]: Change to MESON-BUILD-SYSTEM. [inputs]: Add WAYLAND and WAYLAND-PROTOCOLS. [native-inputs]: Add DOXYGEN. [arguments]: Adjust #:configure-flags for Meson. --- gnu/packages/xdisorg.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 8e53afeb3f..f82bd9e1e8 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -261,28 +261,31 @@ (define-public xclip (define-public libxkbcommon (package (name "libxkbcommon") - (version "0.8.4") + (version "0.9.1") (source (origin (method url-fetch) (uri (string-append "https://xkbcommon.org/download/libxkbcommon-" version ".tar.xz")) (sha256 (base32 - "12vc91ydhphd5sddz15560r41l7k0i7mq6nma8kkbzdp6bwwzpb0")))) - (build-system gnu-build-system) + "1q4v378sr9ad8fy9znl7k8xpf0wch655r9m6z0bcc7sw1azsminl")))) + (build-system meson-build-system) (inputs `(("libx11" ,libx11) ("libxcb" ,libxcb) + ("wayland" ,wayland) + ("wayland-protocols" ,wayland-protocols) ("xkeyboard-config" ,xkeyboard-config))) (native-inputs `(("bison" ,bison) + ("doxygen" ,doxygen) ("pkg-config" ,pkg-config))) (arguments `(#:configure-flags - (list (string-append "--with-xkb-config-root=" + (list (string-append "-Dxkb-config-root=" (assoc-ref %build-inputs "xkeyboard-config") "/share/X11/xkb") - (string-append "--with-x-locale-root=" + (string-append "-Dx-locale-root=" (assoc-ref %build-inputs "libx11") "/share/X11/locale")))) (home-page "https://xkbcommon.org/") -- cgit v1.2.3 From ddf31e9a49dffab297946f15cc8625a8984845cb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 9 Dec 2019 22:31:03 +0100 Subject: gnu: ALSA: Update to 1.2.1. * gnu/packages/linux.scm (alsa-lib): Update to 1.2.1.2. [arguments]: New field. (alsa-utils): Update to 1.2.1. (alsa-plugins): Likewise. --- gnu/packages/linux.scm | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8879112357..96e15ebaac 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1534,7 +1534,7 @@ (define-public ltrace (define-public alsa-lib (package (name "alsa-lib") - (version "1.1.9") + (version "1.2.1.2") (source (origin (method url-fetch) (uri (string-append @@ -1542,8 +1542,12 @@ (define-public alsa-lib version ".tar.bz2")) (sha256 (base32 - "0jwr9g4yxg9gj6xx0sb2r6wrdl8amrjd19hilkrq4rirynp770s8")))) + "0hvrx0ipzqbcx4y1cmr9bgm9niifzkrhsb1ddgzzdwbk6q72d3lm")))) (build-system gnu-build-system) + (arguments + '(#:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath=" + (assoc-ref %outputs "out") + "/lib")))) (home-page "https://www.alsa-project.org/") (synopsis "The Advanced Linux Sound Architecture libraries") (description @@ -1554,14 +1558,14 @@ (define-public alsa-lib (define-public alsa-utils (package (name "alsa-utils") - (version "1.1.9") + (version "1.2.1") (source (origin (method url-fetch) (uri (string-append "ftp://ftp.alsa-project.org/pub/utils/" name "-" version ".tar.bz2")) (sha256 (base32 - "0fi11b7r8hg1bdjw74s8sqx8rc4qb310jaj9lsia9labvfyjrpsx")))) + "039c19b7091is0czl9jlrfczp7pp1jpdri0vvc4k07gl3skhn48b")))) (build-system gnu-build-system) (arguments ;; XXX: Disable man page creation until we have DocBook. @@ -1608,14 +1612,14 @@ (define-public alsa-utils (define-public alsa-plugins (package (name "alsa-plugins") - (version "1.1.9") + (version "1.2.1") (source (origin (method url-fetch) (uri (string-append "ftp://ftp.alsa-project.org/pub/plugins/" name "-" version ".tar.bz2")) (sha256 (base32 - "01zrg0h2jw9dlj9233vjsn916yf4f2s667yry6xsn8d57lq745qn")))) + "1nj8cpbi05rb62yzs01c1k7lymdn1ch229b599hbhd0psixdx52d")))) (build-system gnu-build-system) ;; TODO: Split libavcodec and speex if possible. It looks like they can not ;; be split, there are references to both in files. -- cgit v1.2.3 From ab0cb26f1a068a8ff31f058f01f25f8d51729cf2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 9 Dec 2019 22:37:05 +0100 Subject: gnu: MariaDB: Update to 10.1.43. * gnu/packages/databases.scm (mariadb): Update to 10.1.43. [arguments]: Disable new test. [inputs]: Add LINUX-PAM. --- gnu/packages/databases.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index cb843672af..581f7b79a5 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -686,7 +686,7 @@ (define-public mysql (define-public mariadb (package (name "mariadb") - (version "10.1.41") + (version "10.1.43") (source (origin (method url-fetch) (uri (string-append "https://downloads.mariadb.com/MariaDB" @@ -694,7 +694,7 @@ (define-public mariadb version ".tar.gz")) (sha256 (base32 - "1wh0073lqw3d9xs150bf2q3qvjwa6886mfi9khmsn7p8vapw6irb")) + "1pxyq37q4p7515by7k8hs3l3css68f3bm3akx99vw4m1rxwwbm63")) (patches (search-patches "mariadb-client-test-32bit.patch")) (modules '((guix build utils))) (snippet @@ -815,6 +815,12 @@ (define-public mariadb disabled-tests) (close-port unstable-tests) + ;; XXX: This test fails because it expects a latin1 charset and + ;; collation. See . + (substitute* "mysql-test/r/gis_notembedded.result" + (("latin1_swedish_ci") "utf8_general_ci") + (("\tlatin1") "\tutf8")) + (substitute* "mysql-test/mysql-test-run.pl" (("/bin/ls") (which "ls")) (("/bin/sh") (which "sh"))) @@ -883,6 +889,7 @@ (define-public mariadb ("libaio" ,libaio) ("libxml2" ,libxml2) ("ncurses" ,ncurses) + ("pam" ,linux-pam) ("pcre" ,pcre) ("xz" ,xz) ("zlib" ,zlib))) -- cgit v1.2.3 From cb669c095156eef44c1ae8aecda9931a777794ad Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 9 Dec 2019 22:37:24 +0100 Subject: gnu: postgresql@10: Update to 10.11. * gnu/packages/databases.scm (postgresql): Update to 10.11. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 581f7b79a5..23c5ed32e0 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -910,14 +910,14 @@ (define-public mariadb (define-public postgresql (package (name "postgresql") - (version "10.10") + (version "10.11") (source (origin (method url-fetch) (uri (string-append "https://ftp.postgresql.org/pub/source/v" version "/postgresql-" version ".tar.bz2")) (sha256 (base32 - "0lzj46dwd9cw94gnqm36bxd7jlhfdyqjrfzr3c4xd3prfn2rnkxd")) + "02fcmvbh0mhplj3s2jd24s642ysx7bggnf0h8bs5amh7dgzi8p8d")) (patches (search-patches "postgresql-disable-resolve_symlinks.patch")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 99732a8f2286782f6e89280c0b398764aac5b31e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 10 Dec 2019 16:05:49 +0100 Subject: gnu: orc: Update to 0.4.31. * gnu/packages/patches/orc-typedef-enum.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/gstreamer.scm (orc): Update to 0.4.31. [source](patches): Remove. --- gnu/local.mk | 1 - gnu/packages/gstreamer.scm | 5 ++--- gnu/packages/patches/orc-typedef-enum.patch | 17 ----------------- 3 files changed, 2 insertions(+), 21 deletions(-) delete mode 100644 gnu/packages/patches/orc-typedef-enum.patch diff --git a/gnu/local.mk b/gnu/local.mk index a76f222abd..21102514a9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1212,7 +1212,6 @@ dist_patch_DATA = \ %D%/packages/patches/openssl-c-rehash-in.patch \ %D%/packages/patches/openssl-CVE-2019-1559.patch \ %D%/packages/patches/open-zwave-hidapi.patch \ - %D%/packages/patches/orc-typedef-enum.patch \ %D%/packages/patches/orpheus-cast-errors-and-includes.patch \ %D%/packages/patches/osip-CVE-2017-7853.patch \ %D%/packages/patches/ots-no-include-missing-file.patch \ diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 51b9d8f11c..bed9e36ce6 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -69,15 +69,14 @@ (define-module (gnu packages gstreamer) (define-public orc (package (name "orc") - (version "0.4.30") + (version "0.4.31") (source (origin (method url-fetch) (uri (string-append "https://gstreamer.freedesktop.org/data/src/" "orc/orc-" version ".tar.xz")) - (patches (search-patches "orc-typedef-enum.patch")) (sha256 (base32 - "0wj93im7i8a6546q2r8sp39yjfbxflkc0ygb0b8iqsd58qhvjhds")))) + "0xb0c7q3xv1ldmz5ipybazb01gy3cijj8622dcx7rbm9lq85zax0")))) (build-system meson-build-system) (arguments `(#:phases diff --git a/gnu/packages/patches/orc-typedef-enum.patch b/gnu/packages/patches/orc-typedef-enum.patch deleted file mode 100644 index 207bf32ba9..0000000000 --- a/gnu/packages/patches/orc-typedef-enum.patch +++ /dev/null @@ -1,17 +0,0 @@ -Orc 0.4.30 has a bug that causes duplicate symbols due to a missing typedef. - -Taken from upstream: -https://gitlab.freedesktop.org/gstreamer/orc/merge_requests/32 - -diff --git a/orc/orctarget.h b/orc/orctarget.h ---- a/orc/orctarget.h -+++ b/orc/orctarget.h -@@ -19,7 +19,7 @@ enum { - ORC_TARGET_FAST_DENORMAL = (1<<31) - }; - --enum { -+typedef enum { - ORC_TARGET_POWERPC_64BIT = (1<<0), - ORC_TARGET_POWERPC_LE = (1<<1), - ORC_TARGET_POWERPC_ALTIVEC = (1<<2), -- cgit v1.2.3 From 94249ba89cba7d50d346cecc3df388d6dd59e482 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 10 Dec 2019 16:07:53 +0100 Subject: gnu: gstreamer: Update to 1.16.2. * gnu/packages/gstreamer.scm (gstreamer, gst-plugins-base, gst-plugins-good, gst-plugins-ugly, gst-libav, python-gst): Update to 1.16.2. (gst-plugins-bad): Likewise. [arguments]: Remove #:make-flags. --- gnu/packages/gstreamer.scm | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index bed9e36ce6..323e3ccfee 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -106,7 +106,7 @@ (define-public orc (define-public gstreamer (package (name "gstreamer") - (version "1.16.1") + (version "1.16.2") (source (origin (method url-fetch) @@ -115,7 +115,7 @@ (define-public gstreamer version ".tar.xz")) (sha256 (base32 - "0z9pyhf6zm1r0spw6zym80bvbyx6h8xg9h6535csbnn48ws1q882")))) + "0kp93622y29pck8asvil1fmzf55s2gx76wv475a6izc3cwj49w73")))) (build-system gnu-build-system) (outputs '("out" "doc")) (arguments @@ -154,7 +154,7 @@ (define-public gstreamer (define-public gst-plugins-base (package (name "gst-plugins-base") - (version "1.16.1") + (version "1.16.2") (source (origin (method url-fetch) @@ -162,7 +162,7 @@ (define-public gst-plugins-base name "-" version ".tar.xz")) (sha256 (base32 - "0aybbwnzm15074smdk2bamj3ssck3hjvmilvgh49f19xjf4w8g2w")))) + "0sl1hxlyq46r02k7z70v09vx1gi4rcypqmzra9jid93lzvi76gmi")))) (build-system gnu-build-system) (outputs '("out" "doc")) (propagated-inputs @@ -213,7 +213,7 @@ (define-public gst-plugins-base (define-public gst-plugins-good (package (name "gst-plugins-good") - (version "1.16.1") + (version "1.16.2") (source (origin (method url-fetch) @@ -222,7 +222,7 @@ (define-public gst-plugins-good name "-" version ".tar.xz")) (sha256 (base32 - "07wgz9anf4ram2snp8n1wv6l0q3pd00iaw8bvw3wgklg05lvxflz")))) + "068k3cbv1yf3gbllfdzqsg263kzwh21y8dpwr0wvgh15vapkpfs0")))) (build-system gnu-build-system) (inputs `(("aalib" ,aalib) @@ -276,23 +276,18 @@ (define-public gst-plugins-good (define-public gst-plugins-bad (package (name "gst-plugins-bad") - (version "1.16.1") + (version "1.16.2") (source (origin (method url-fetch) (uri (string-append "https://gstreamer.freedesktop.org/src/" name "/" name "-" version ".tar.xz")) (sha256 (base32 - "1dddqacxgp77f3nl153x5a6139wdphc9phds2fpqb2cv6faiqj2n")))) + "0x0y0hm0ga3zqi5q4090hw5sjh59y1ry9ak16qsaascm72i7mjzi")))) (outputs '("out" "doc")) (build-system gnu-build-system) (arguments '(#:tests? #f ; XXX: 13 of 53 tests fail - - ;; FIXME: OpenEXR 2.4.0 requires C++ 11 or later. Remove when the - ;; default compiler is >= GCC 5. - #:make-flags '("CXXFLAGS=-std=gnu++11") - #:configure-flags (list (string-append "--with-html-dir=" (assoc-ref %outputs "doc") @@ -356,7 +351,7 @@ (define-public gst-plugins-bad (define-public gst-plugins-ugly (package (name "gst-plugins-ugly") - (version "1.16.1") + (version "1.16.2") (source (origin (method url-fetch) @@ -364,7 +359,7 @@ (define-public gst-plugins-ugly name "/" name "-" version ".tar.xz")) (sha256 (base32 - "07cajqjs8pqchpf2sm87hljx4ibwvkiavqxmacxsr5airar17yab")))) + "1jpvc32x6q01zjkfgh6gmq6aaikiyfwwnhj7bmvn52syhrdl202m")))) (build-system gnu-build-system) (inputs `(("gst-plugins-base" ,gst-plugins-base) @@ -391,7 +386,7 @@ (define-public gst-plugins-ugly (define-public gst-libav (package (name "gst-libav") - (version "1.16.1") + (version "1.16.2") (source (origin (method url-fetch) (uri (string-append @@ -399,7 +394,7 @@ (define-public gst-libav name "-" version ".tar.xz")) (sha256 (base32 - "1i31ra0l77cfahb6k5xpx45zwvpskzm848aijsbbx9x4x65799g8")) + "1wpfilc98bad9nsv3y1qapxp35dvn2mvwvrmqwrsj58cf09gc967")) (modules '((guix build utils))) (snippet '(begin @@ -427,7 +422,7 @@ (define-public gst-libav (define-public python-gst (package (name "python-gst") - (version "1.16.1") + (version "1.16.2") (source (origin (method url-fetch) (uri (string-append @@ -435,7 +430,7 @@ (define-public python-gst "gst-python-" version ".tar.xz")) (sha256 (base32 - "12bl6kc0ny2vyf6klas2bwqcv0pi55q9ns5zw261px16a6awhsdl")))) + "1a48ca66izmm8hnp608jv5isg3jxb0vlfmhns0bg9nbkilag7390")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) -- cgit v1.2.3 From ed8adb2240202575deffce4065b67ed7903ea0c4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 10 Dec 2019 16:09:30 +0100 Subject: gnu: check: Update to 0.13.0. * gnu/packages/check.scm (check): Update to 0.13.0. --- gnu/packages/check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index c0cb4ae7fd..a9b38f329d 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -78,7 +78,7 @@ (define-module (gnu packages check) (define-public check (package (name "check") - (version "0.12.0") + (version "0.13.0") (source (origin (method url-fetch) @@ -86,7 +86,7 @@ (define-public check version "/check-" version ".tar.gz")) (sha256 (base32 - "0d22h8xshmbpl9hba9ch3xj8vb9ybm5akpsbbh7yj07fic4h2hj6")))) + "02crar51gniijrrl9p8f9maibnwc33n76kw5cqr7xk3s8hqnncy4")))) (build-system gnu-build-system) (home-page "https://libcheck.github.io/check/") (synopsis "Unit test framework for C") -- cgit v1.2.3 From 0a2c10d5cc51b2b53fd5a129b52ab59506f3cb8f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 10 Dec 2019 16:11:00 +0100 Subject: gnu: nspr: Update to 4.24. * gnu/packages/nss.scm (nspr): Update to 4.24. --- gnu/packages/nss.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index 65f95aaa8a..fe2f443721 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -34,7 +34,7 @@ (define-module (gnu packages nss) (define-public nspr (package (name "nspr") - (version "4.22") + (version "4.24") (source (origin (method url-fetch) (uri (string-append @@ -42,7 +42,7 @@ (define-public nspr version "/src/nspr-" version ".tar.gz")) (sha256 (base32 - "0c6ljv3bdqhc169srbpjy0cs52xk715p04zy08rcjvl54k6bdr69")))) + "1l0ksiny032jijgk0g76wf0kiq673i01izj7jrs2h5d1yq6rm9ch")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl))) -- cgit v1.2.3 From 90076d2ce17d5b3c44ea663a44b40fa3084ead97 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 10 Dec 2019 16:11:22 +0100 Subject: gnu: nss: Update to 3.48. * gnu/packages/nss.scm (nss): Update to 3.48. --- gnu/packages/nss.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index fe2f443721..2e34f8e26f 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.46.1") + (version "3.48") (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -81,7 +81,7 @@ (define-public nss "nss-" version ".tar.gz"))) (sha256 (base32 - "0l9ns44rlkp1bpblplspfbqmyhb8rhvc89y56kqh725rgpny1xrv")) + "1b7qs1q7jqhw9dvkdznanzhc5dyq4bwx0biywszy3qx4hqm8571z")) ;; 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-10-01" "./nss/tests/all.sh"))) + (invoke "faketime" "2019-12-01" "./nss/tests/all.sh"))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From b5414ff4dbfbf55d196471102de07f5d93f92a79 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 10 Dec 2019 16:11:43 +0100 Subject: gnu: python-sphinx: Update to 2.2.2. * gnu/packages/sphinx.scm (python-sphinx): Update to 2.2.2. --- gnu/packages/sphinx.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm index b74137362c..8075406c99 100644 --- a/gnu/packages/sphinx.scm +++ b/gnu/packages/sphinx.scm @@ -46,14 +46,14 @@ (define-module (gnu packages sphinx) (define-public python-sphinx (package (name "python-sphinx") - (version "2.2.0") + (version "2.2.2") (source (origin (method url-fetch) (uri (pypi-uri "Sphinx" version)) (sha256 (base32 - "0ig8s94xg0p6h9y5s3ns9x8i10b24ihzvs65b5jwrhrgih7nnn0d")))) + "1wjcm382824rq8ijls9mlqwl2h8l26s201v5fwprhnins671m72m")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From 336cf4e779b0903b76a8824075f30082f41aa4b5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 10 Dec 2019 16:12:12 +0100 Subject: gnu: atk: Update to 2.34.1. * gnu/packages/gtk.scm (atk): Update to 2.34.1. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 3ef61c9b4a..a70a2a5650 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -89,7 +89,7 @@ (define-module (gnu packages gtk) (define-public atk (package (name "atk") - (version "2.32.0") + (version "2.34.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -97,7 +97,7 @@ (define-public atk name "-" version ".tar.xz")) (sha256 (base32 - "1k4i817bd2w5b9z394f2yyx95591l2746wa40am0vvz4gzdgwhfb")))) + "1jwp16r6p5z66k4b2v8zlzhyshhwlmyi27ippkrgqr8jsary7w6l")))) (build-system meson-build-system) (propagated-inputs `(("glib" ,glib))) ; required by atk.pc (native-inputs -- cgit v1.2.3 From 4ebc3339ba7b9a66306810cebf496bf2ce9a32eb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 10 Dec 2019 16:12:33 +0100 Subject: gnu: at-spi2-core: Update to 2.34.0. * gnu/packages/gtk.scm (at-spi2-core): Update to 2.34.0. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index a70a2a5650..315cd18aba 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -552,7 +552,7 @@ (define-public gdk-pixbuf+svg (define-public at-spi2-core (package (name "at-spi2-core") - (version "2.32.1") + (version "2.34.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -560,7 +560,7 @@ (define-public at-spi2-core name "-" version ".tar.xz")) (sha256 (base32 - "0lqd7gsl471v6538iighkvb21gjglcb9pklvas32rjpsxcvsjaiw")))) + "1ihixwhh3c16q6253qj9gf69741rb2pi51822a4rylsfcyywsafn")))) (build-system meson-build-system) (outputs '("out" "doc")) (arguments -- cgit v1.2.3 From 3d19c77d74d0d5b68e1265939c046f69915b699f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 10 Dec 2019 16:12:52 +0100 Subject: gnu: at-spi2-atk: Update to 2.34.1. * gnu/packages/gtk.scm (at-spi2-atk): Update to 2.34.1. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 315cd18aba..db88c84413 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -621,7 +621,7 @@ (define-public at-spi2-core (define-public at-spi2-atk (package (name "at-spi2-atk") - (version "2.32.0") + (version "2.34.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -629,7 +629,7 @@ (define-public at-spi2-atk name "-" version ".tar.xz")) (sha256 (base32 - "0p54wx6f6q7s8w0b1j0sgw87pikllp79q5g3lfiwqazs779ycl8b")))) + "05ncp7s5nddjinffs26mcvpbd63vk1m3cv5y530p3plgfhqgjvbp")))) (build-system meson-build-system) (arguments '(#:phases -- cgit v1.2.3 From 939c5b2cb6952cd8549bf17d6fd3bcbfb582f0bd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 10 Dec 2019 16:19:23 +0100 Subject: gnu: MariaDB: Do not propagate OpenSSL. * gnu/packages/databases.scm (mariadb)[propagated-inputs]: Remove. [inputs]: Add OPENSSL-1.0. [arguments]: Add absolute references to OpenSSL in "post-install" phase. --- gnu/packages/databases.scm | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 23c5ed32e0..0f04647a73 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -851,10 +851,11 @@ (define-public mariadb #t)) (add-after 'install 'post-install - (lambda* (#:key outputs #:allow-other-keys) + (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (dev (assoc-ref outputs "dev")) - (lib (assoc-ref outputs "lib"))) + (lib (assoc-ref outputs "lib")) + (openssl (assoc-ref inputs "openssl"))) (substitute* (string-append out "/bin/mysql_install_db") (("basedir=\"\"") (string-append "basedir=\"" out "\""))) @@ -876,6 +877,14 @@ (define-public mariadb (string-append dev "/share/pkgconfig")) (rename-file (string-append out "/bin/mysql_config") (string-append dev "/bin/mysql_config")) + + ;; 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") + (string-append dev "/share/pkgconfig/mariadb.pc")) + (("-lssl -lcrypto" all) + (string-append "-L" openssl "/lib " all))) + #t)))))) (native-inputs `(("bison" ,bison) @@ -889,13 +898,11 @@ (define-public mariadb ("libaio" ,libaio) ("libxml2" ,libxml2) ("ncurses" ,ncurses) + ("openssl" ,openssl-1.0) ("pam" ,linux-pam) ("pcre" ,pcre) ("xz" ,xz) ("zlib" ,zlib))) - (propagated-inputs - ;; mariadb.pc says -lssl -lcrypto, so propagate it. - `(("openssl" ,openssl-1.0))) ;; The test suite is very resource intensive and can take more than three ;; hours on a x86_64 system. Give slow and busy machines some leeway. (properties '((timeout . 64800))) ;18 hours -- cgit v1.2.3 From f8a8984c4b95538d027dd63e23d8340dfbea72e2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 11 Dec 2019 22:40:40 +0100 Subject: gnu: nss: Remove replacement package. The merge preceding this commit ignored the 'replacement' added to nss in commit 04b33ce205f38813b4dbd04b6ad3c7aa0be0b6f6, because the security fix is already present in NSS 3.48. This commit removes the remaining bits. * gnu/packages/patches/nss-CVE-2019-11745.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/nss.scm (nss/fixed): Remove variable. --- gnu/local.mk | 1 - gnu/packages/nss.scm | 8 -------- gnu/packages/patches/nss-CVE-2019-11745.patch | 24 ------------------------ 3 files changed, 33 deletions(-) delete mode 100644 gnu/packages/patches/nss-CVE-2019-11745.patch diff --git a/gnu/local.mk b/gnu/local.mk index 4d89f17bbe..21102514a9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1179,7 +1179,6 @@ dist_patch_DATA = \ %D%/packages/patches/ngircd-handle-zombies.patch \ %D%/packages/patches/nm-plugin-path.patch \ %D%/packages/patches/nsis-env-passthru.patch \ - %D%/packages/patches/nss-CVE-2019-11745.patch \ %D%/packages/patches/nss-freebl-stubs.patch \ %D%/packages/patches/nss-increase-test-timeout.patch \ %D%/packages/patches/nss-pkgconfig.patch \ diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index e81c859a51..2e34f8e26f 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -183,11 +183,3 @@ (define-public nss PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509 v3 certificates, and other security standards.") (license license:mpl2.0))) - -(define nss/fixed - (package - (inherit nss) - (source (origin - (inherit (package-source nss)) - (patches (append (search-patches "nss-CVE-2019-11745.patch") - (origin-patches (package-source nss)))))))) diff --git a/gnu/packages/patches/nss-CVE-2019-11745.patch b/gnu/packages/patches/nss-CVE-2019-11745.patch deleted file mode 100644 index ae0eeda3c8..0000000000 --- a/gnu/packages/patches/nss-CVE-2019-11745.patch +++ /dev/null @@ -1,24 +0,0 @@ -Fix CVE-2019-11745 (Out-of-bounds write when passing an output buffer smaller -than the block size to NSC_EncryptUpdate). - -Copied from Debian, equivalent to upstream fix: -. - -# HG changeset patch -# User Craig Disselkoen -# Date 1574189697 25200 -# Node ID 60bca7c6dc6dc44579b9b3e0fb62ca3b82d92eec -# Parent 64e55c9f658e2a75f0835d00a8a1cdc2f25c74d6 -Bug 1586176 - EncryptUpdate should use maxout not block size. r=franziskus - ---- a/nss/lib/softoken/pkcs11c.c -+++ b/nss/lib/softoken/pkcs11c.c -@@ -1285,7 +1285,7 @@ NSC_EncryptUpdate(CK_SESSION_HANDLE hSes - } - /* encrypt the current padded data */ - rv = (*context->update)(context->cipherInfo, pEncryptedPart, -- &padoutlen, context->blockSize, context->padBuf, -+ &padoutlen, maxout, context->padBuf, - context->blockSize); - if (rv != SECSuccess) { - return sftk_MapCryptError(PORT_GetError()); -- cgit v1.2.3 From eccd2c14d6b42142e85ed517e8cfa81a73b6bd88 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 11 Dec 2019 19:38:08 +0100 Subject: gnu: pcre2: Update to 10.34. * gnu/packages/patches/pcre2-fix-jit_match-crash.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/pcre.scm (pcre2): Update to 10.34. [source](patches): Remove. --- gnu/local.mk | 1 - .../patches/pcre2-fix-jit_match-crash.patch | 25 ---------------------- gnu/packages/pcre.scm | 5 ++--- 3 files changed, 2 insertions(+), 29 deletions(-) delete mode 100644 gnu/packages/patches/pcre2-fix-jit_match-crash.patch diff --git a/gnu/local.mk b/gnu/local.mk index 21102514a9..b1b5045469 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1222,7 +1222,6 @@ dist_patch_DATA = \ %D%/packages/patches/pam-mount-luks2-support.patch \ %D%/packages/patches/patchutils-test-perms.patch \ %D%/packages/patches/patch-hurd-path-max.patch \ - %D%/packages/patches/pcre2-fix-jit_match-crash.patch \ %D%/packages/patches/perl-autosplit-default-time.patch \ %D%/packages/patches/perl-deterministic-ordering.patch \ %D%/packages/patches/perl-finance-quote-unuse-mozilla-ca.patch \ diff --git a/gnu/packages/patches/pcre2-fix-jit_match-crash.patch b/gnu/packages/patches/pcre2-fix-jit_match-crash.patch deleted file mode 100644 index 7543319ee9..0000000000 --- a/gnu/packages/patches/pcre2-fix-jit_match-crash.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: Tobias Geerinckx-Rice -Date: Thu, 01 Aug 2019 21:12:52 +0200 -Subject: [PATCH] gnu: pcre2: Fix jit_match crash. - -Fixes , reported as a ‘secrity -problem’. - -Copied verbatim from upstream[0]. - -[0]: https://vcs.pcre.org/pcre2/code/trunk/src/pcre2_jit_compile.c?view=patch&r1=1089&r2=1092&pathrev=1092 - ---- trunk/src/pcre2_jit_compile.c 2019/05/10 13:15:20 1089 -+++ trunk/src/pcre2_jit_compile.c 2019/05/13 16:38:18 1092 -@@ -8571,7 +8571,10 @@ - PCRE2_SPTR bptr; - uint32_t c; - --GETCHARINC(c, cc); -+/* Patch by PH */ -+/* GETCHARINC(c, cc); */ -+ -+c = *cc++; - #if PCRE2_CODE_UNIT_WIDTH == 32 - if (c >= 0x110000) - return NULL; diff --git a/gnu/packages/pcre.scm b/gnu/packages/pcre.scm index 91c32d6e5d..560244619e 100644 --- a/gnu/packages/pcre.scm +++ b/gnu/packages/pcre.scm @@ -89,15 +89,14 @@ (define-public pcre (define-public pcre2 (package (name "pcre2") - (version "10.33") + (version "10.34") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/pcre/pcre2/" version "/pcre2-" version ".tar.bz2")) - (patches (search-patches "pcre2-fix-jit_match-crash.patch")) (sha256 (base32 - "1anqi7vpbfzag7imccrc6di1zl5rl63ab7rfpmajpw6d1kzlsl9m")))) + "1jlqnzcz2yi70dm40wyfa9w8is9z2kh4dl8zjnv3vqd9mgzp7i3l")))) (build-system gnu-build-system) (inputs `(("bzip2" ,bzip2) ("readline" ,readline) -- cgit v1.2.3 From f6943db7d39a060742b820e2f2f215b0bdeca690 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 11 Dec 2019 19:39:01 +0100 Subject: gnu: pcre2: Do not build static libraries. * gnu/packages/pcre.scm (pcre2)[arguments]: Add "--disable-static" to #:configure-flags. --- gnu/packages/pcre.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/pcre.scm b/gnu/packages/pcre.scm index 560244619e..ea45a3d06b 100644 --- a/gnu/packages/pcre.scm +++ b/gnu/packages/pcre.scm @@ -108,7 +108,8 @@ (define-public pcre2 "--enable-pcre2test-libreadline" "--enable-pcre2-16" "--enable-pcre2-32" - "--enable-jit") + "--enable-jit" + "--disable-static") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-paths -- cgit v1.2.3 From 371d95ebc778b7a8fec2df06a4d7da96a1488bf9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 11 Dec 2019 19:56:48 +0100 Subject: gnu: libwebp: Do not build static libraries. * gnu/packages/image.scm (libwebp)[arguments]: Add "--disable-static" to #:configure-flags. --- gnu/packages/image.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 0536779b64..b0005bd817 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1128,7 +1128,8 @@ (define-public libwebp (arguments '(#:configure-flags '("--enable-libwebpmux" "--enable-libwebpdemux" - "--enable-libwebpdecoder"))) + "--enable-libwebpdecoder" + "--disable-static"))) (home-page "https://developers.google.com/speed/webp/") (synopsis "Lossless and lossy image compression") (description -- cgit v1.2.3 From e500b9d908220d4d104c42d85a3c4fc3c38b7bc2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 11 Dec 2019 20:00:50 +0100 Subject: gnu: opus: Do not build static libraries. * gnu/packages/xiph.scm (opus)[arguments]: New field. --- gnu/packages/xiph.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm index 61d836a50b..1927da4c5b 100644 --- a/gnu/packages/xiph.scm +++ b/gnu/packages/xiph.scm @@ -352,6 +352,8 @@ (define opus (base32 "17gz8kxs4i7icsc1gj713gadiapyklynlwqlf0ai98dj4lg8xdb5")))) (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--disable-static"))) (synopsis "Versatile audio codec") (description "Opus is a totally open, royalty-free, highly versatile audio codec. Opus -- cgit v1.2.3 From 542432e8ff091be463f62a34e410b52481383287 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 11 Dec 2019 20:01:32 +0100 Subject: gnu: libogg: Do not build static libraries. * gnu/packages/xiph.scm (libogg)[arguments]: New field. --- gnu/packages/xiph.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm index 1927da4c5b..8ffe2c327d 100644 --- a/gnu/packages/xiph.scm +++ b/gnu/packages/xiph.scm @@ -69,6 +69,8 @@ (define libogg (base32 "1zlk33vxvxr0l9lhkbhkdwvylw96d2n0fnd3d8dl031hph9bqqy1")))) (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--disable-static"))) (synopsis "Library for manipulating the ogg multimedia format") (description "The libogg library allows to manipulate the ogg multimedia container -- cgit v1.2.3 From b134c7ba166b57ff56fbf144bf79b28ddace676f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 11 Dec 2019 20:03:13 +0100 Subject: gnu: libvorbis: Do not build static libraries. * gnu/packages/xiph.scm (libvorbis)[arguments]: Add "--disable-static" to #:configure-flags. --- gnu/packages/xiph.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm index 8ffe2c327d..3489206dd8 100644 --- a/gnu/packages/xiph.scm +++ b/gnu/packages/xiph.scm @@ -95,7 +95,8 @@ (define libvorbis "05dlzjkdpv46zb837wysxqyn8l636x3dw8v8ymlrwz2fg1dbn05g")))) (build-system gnu-build-system) (propagated-inputs `(("libogg" ,libogg))) - (arguments `(#:configure-flags '("LDFLAGS=-lm") + (arguments `(#:configure-flags '("LDFLAGS=-lm" + "--disable-static") #:parallel-tests? #f)) (synopsis "Library implementing the vorbis audio format") (description -- cgit v1.2.3 From 5c1f02727e6e366cbdc2782ef2c80c857af33124 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 11 Dec 2019 20:04:03 +0100 Subject: gnu: libtheora: Do not build static libraries. * gnu/packages/xiph.scm (libtheora)[arguments]: New field. --- gnu/packages/xiph.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm index 3489206dd8..f4c111164d 100644 --- a/gnu/packages/xiph.scm +++ b/gnu/packages/xiph.scm @@ -122,6 +122,8 @@ (define libtheora "0q8wark9ribij57dciym5vdikg2464p8q2mgqvfb78ksjh4s8vgk")) (patches (search-patches "libtheora-config-guess.patch")))) (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--disable-static"))) (inputs `(("libvorbis" ,libvorbis))) ;; The .pc files refer to libogg. (propagated-inputs `(("libogg" ,libogg))) -- cgit v1.2.3 From 28b4ff244dfbf141a9aae4f1ddcc1021372d412f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 11 Dec 2019 20:06:47 +0100 Subject: gnu: speexdsp: Do not build static libraries. * gnu/packages/xiph.scm (speexdsp)[arguments]: Add "--disable-static" in #:configure-flags. --- gnu/packages/xiph.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm index f4c111164d..34ed5dcab2 100644 --- a/gnu/packages/xiph.scm +++ b/gnu/packages/xiph.scm @@ -179,7 +179,8 @@ (define speexdsp "0wa7sqpk3x61zz99m7lwkgr6yv62ml6lfgs5xja65vlvdzy44838")))) (build-system gnu-build-system) (arguments - `(#:configure-flags '(,@(if (string=? "aarch64-linux" + `(#:configure-flags '("--disable-static" + ,@(if (string=? "aarch64-linux" (%current-system)) '("--enable-neon=no") ; neon defaults to armv7-a '())))) -- cgit v1.2.3 From 7711db7f4ec24015d7c2412ef1e624cbf8110ed3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 12 Dec 2019 14:16:01 +0100 Subject: gnu: r-with-tests: Update to 3.6.2. * gnu/packages/statistics.scm (r-with-tests): Update to 3.6.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 81ff0107b4..c3054473a2 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -183,7 +183,7 @@ (define-public libxls (define r-with-tests (package (name "r-with-tests") - (version "3.6.1") + (version "3.6.2") (source (origin (method url-fetch) (uri (string-append "mirror://cran/src/base/R-" @@ -191,7 +191,7 @@ (define r-with-tests version ".tar.gz")) (sha256 (base32 - "128kifbq0w25y8aq77w289ddax5i5w2djcfsqgffrb3i7syrxajv")))) + "0m69pfi0nxyriyb2yz74xfzaxwfkinnf9kpvf1rz727vvmfa8rdx")))) (build-system gnu-build-system) (arguments `(#:disallowed-references (,tzdata-for-tests) -- cgit v1.2.3 From 304162651aa4785eefdf447b4a9ea771e2a4d06d Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 30 Dec 2019 13:37:53 -0500 Subject: gnu: Add gnome-menus. * gnu/packages/gnome.scm (gnome-menus). New variable. --- gnu/packages/gnome.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index e0712bf99a..ad3e78c284 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -246,6 +246,29 @@ (define-public brasero features to enable users to create their discs easily and quickly.") (license license:gpl2+))) +(define-public gnome-menus + (package + (name "gnome-menus") + (version "3.32.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/gnome-menus/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0x2blzqrapmbsbfzxjcdcpa3vkw9hq5k96h9kvjmy9kl415wcl68")))) + (build-system gnu-build-system) + (native-inputs + `(("gettext" ,gettext-minimal) + ("glib" ,glib) + ("pkg-config" ,pkg-config))) + (synopsis "Menu support for GNOME desktop") + (description "GNOME Menus contains the libgnome-menu library, the layout +configuration files for the GNOME menu, as well as a simple menu editor.") + (home-page "https://gitlab.gnome.org/GNOME/gnome-menus") + (license license:gpl2))) + (define-public deja-dup (package (name "deja-dup") -- cgit v1.2.3 From 8caa5d7a5393331a52bd3358be359a2403adb99c Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 30 Dec 2019 21:25:12 +0100 Subject: gnu: giac: Update to 1.5.0-85. * gnu/packages/algebra.scm (giac): Update to 1.5.0-85. --- gnu/packages/algebra.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 6afd559c9c..f4d427334f 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -345,7 +345,7 @@ (define-public cmh (define-public giac (package (name "giac") - (version "1.5.0-75") + (version "1.5.0-85") (source (origin (method url-fetch) ;; "~parisse/giac" is not used because the maintainer regularly @@ -357,7 +357,7 @@ (define-public giac "source/giac_" version ".tar.gz")) (sha256 (base32 - "1k94xl6hvy9xqwc3ccgnhpdqgq3lkjbgpgq0njizmlg514dh2jhq")))) + "03icgrfhb1xiy95cqmfgmcb1lw3775mr2ybnzandmyn44iycs6rh")))) (build-system gnu-build-system) (arguments `(#:modules ((ice-9 ftw) -- cgit v1.2.3 From a88970fe1a128490b036d8c37cb45da5e99f2827 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 30 Dec 2019 21:27:43 +0100 Subject: gnu: emacs-modus-themes: Update to 0.3.0. * gnu/packages/emacs-xyz.scm (emacs-modus-themes): Update to 0.3.0. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index be7bec8df6..8362ce6e52 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19877,7 +19877,7 @@ (define-public emacs-doom-themes (define-public emacs-modus-themes (package (name "emacs-modus-themes") - (version "0.1.0") + (version "0.3.0") (source (origin (method git-fetch) @@ -19887,7 +19887,7 @@ (define-public emacs-modus-themes (file-name (git-file-name name version)) (sha256 (base32 - "15g63675c5df2p0kk2sqj2c8qriyh69lcbggknqlaxapr13giz4x")))) + "1xrrjhpdxi9bgx877gvq8xrc2ph5qp9y5j3ssdphy333x9km1px1")))) (build-system emacs-build-system) (home-page "https://gitlab.com/protesilaos/modus-themes") (synopsis "Emacs themes designed for colour-contrast accessibility") -- cgit v1.2.3 From d3bc1ea9afaa6209885bf328a363644c9abdd071 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 30 Dec 2019 21:40:14 +0100 Subject: gnu: python-folium: Update to 0.10.1. * gnu/packages/python-xyz.scm (python-folium): Update to 0.10.1. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f41e59c047..9b71982c3a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16534,14 +16534,14 @@ (define-public python-cached-property (define-public python-folium (package (name "python-folium") - (version "0.10.0") + (version "0.10.1") (source (origin (method url-fetch) (uri (pypi-uri "folium" version)) (sha256 (base32 - "18fzxijsgrb95r0a8anc9ba5ijyw3nlnv3rpavfbkqa5v878x84f")))) + "0gcc267wxwxr57ry86pqpbiyfvl0g48hfvgy0f2mz9s58g87kgzd")))) (build-system python-build-system) (propagated-inputs `(("python-branca" ,python-branca) -- cgit v1.2.3 From ddc291d74bae877d5e030a03d94964a8f3536817 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 30 Dec 2019 21:48:07 +0100 Subject: gnu: scintilla: Update to 4.2.2. * gnu/packages/text-editors.scm (scintilla): Update to 4.2.2. --- gnu/packages/text-editors.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index ac4c5b82ac..4ab6e1e2ec 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -444,7 +444,7 @@ (define-public texmacs (define-public scintilla (package (name "scintilla") - (version "4.2.1") + (version "4.2.2") (source (origin (method url-fetch) (uri (let ((v (apply string-append (string-split version #\.)))) @@ -452,7 +452,7 @@ (define-public scintilla "https://www.scintilla.org/scintilla" v ".tgz"))) (sha256 (base32 - "0l52s39zg8l3fcj86nqm3hzh0sa4i981dasil54a40dvz3d3cvrx")))) + "01gq31ggvasw4sy9xs544h7v1dmxrlxs5bzxpasqb9yi3ps3nl0f")))) (build-system gnu-build-system) (arguments `(#:make-flags (list "GTK3=1" "CC=gcc" "-Cgtk") -- cgit v1.2.3 From c7ca707b59304a978cab8c5c25401259c6c18214 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 30 Dec 2019 22:49:09 +0100 Subject: import: crate: Honor crate version for recursive imports. Fixes . Reported by Valentin Ignatev . * guix/import/crate.scm (crate-recursive-import): Add optional 'version' parameter and honor it. * guix/scripts/import/crate.scm (guix-import-crate): Pass VERSION as 2nd argument to 'crate-recursive-import'. --- guix/import/crate.scm | 9 ++++++--- guix/scripts/import/crate.scm | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/guix/import/crate.scm b/guix/import/crate.scm index 4c3f8000d0..405a26a877 100644 --- a/guix/import/crate.scm +++ b/guix/import/crate.scm @@ -231,10 +231,13 @@ (define version* string->license)) (append cargo-inputs cargo-development-inputs))))) -(define (crate-recursive-import crate-name) +(define* (crate-recursive-import crate-name #:optional version) (recursive-import crate-name #f - #:repo->guix-package (lambda (name repo) - (crate->guix-package name)) + #:repo->guix-package + (lambda (name repo) + (let ((version (and (string=? name crate-name) + version))) + (crate->guix-package name version))) #:guix-name crate-name->package-name)) (define (guix-package->crate-name package) diff --git a/guix/scripts/import/crate.scm b/guix/scripts/import/crate.scm index 92034dab3c..d834518c18 100644 --- a/guix/scripts/import/crate.scm +++ b/guix/scripts/import/crate.scm @@ -100,7 +100,7 @@ (define-values (name version) `(define-public ,(string->symbol name) ,pkg)) (_ #f)) - (crate-recursive-import name)) + (crate-recursive-import name version)) (let ((sexp (crate->guix-package name version))) (unless sexp (leave (G_ "failed to download meta-data for package '~a'~%") -- cgit v1.2.3 From 5f1553ce9ea15584c66d0aa4688e036313d2f0ab Mon Sep 17 00:00:00 2001 From: Amar Singh Date: Thu, 26 Dec 2019 09:17:35 +0530 Subject: gnu: nomad: Update to 0.1.2-alpha. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/guile-xyz.scm (nomad): Update to 0.1.2-alpha. Signed-off-by: Ludovic Courtès --- gnu/packages/guile-xyz.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 1faf0a5ecf..fa612b66e9 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2492,7 +2492,7 @@ (define-public guile-jpeg (define-public nomad (package (name "nomad") - (version "0.1.1-alpha") + (version "0.1.2-alpha") (source (origin (method git-fetch) (uri (git-reference @@ -2501,7 +2501,7 @@ (define-public nomad (file-name (git-file-name name version)) (sha256 (base32 - "0abz07hl5dh802ciy71xzkvkhyryypq1i94wna40a2wndbd73f7z")))) + "1dnkr1hmvfkwgxd75dcf93pg39yfgawvdpzdhv991yhghv0qxc9h")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) @@ -2510,7 +2510,9 @@ (define-public nomad ("pkg-config" ,pkg-config) ("libtool" ,libtool) ("guile" ,guile-2.2) - ("glib:bin" ,glib "bin"))) + ("glib:bin" ,glib "bin") + ("texinfo" ,texinfo) + ("perl" ,perl))) (inputs `(("guile" ,guile-2.2) ("guile-lib" ,guile-lib) -- cgit v1.2.3 From 0e9c253313da7bdd72a6e712c75e366714ef23ff Mon Sep 17 00:00:00 2001 From: Stephen Scheck Date: Thu, 26 Dec 2019 14:53:46 -0600 Subject: gnu: Add perl-net-bgp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/perl.scm (perl-net-bgp): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/perl.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index f732c0ed46..44b764618b 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -22,6 +22,7 @@ ;;; Copyright © 2018, 2019 Pierre Neidhardt ;;; Copyright © 2018 Kei Kebreau ;;; Copyright © 2019 Alex Griffin +;;; Copyright © 2019 Stephen J. Scheck ;;; ;;; This file is part of GNU Guix. ;;; @@ -6697,6 +6698,31 @@ (define-public perl-namespace-clean name, but they won't show up as methods on your class or instances.") (license (package-license perl)))) +(define-public perl-net-bgp + (package + (name "perl-net-bgp") + (version "0.17") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/S/SS/SSCHECK/Net-BGP-" version ".tar.gz")) + (sha256 (base32 "0za8x9cn5n2hasb14p7dr537lggvrcsl23pgldxf5y03wmk6h35y")))) + (build-system perl-build-system) + (home-page "https://metacpan.org/release/Net-BGP") + (synopsis "Object-oriented API to the BGP protocol") + (description + "This module is an implementation of the BGP-4 inter-domain routing protocol. +It encapsulates all of the functionality needed to establish and maintain a +BGP peering session and exchange routing update information with the peer. +It aims to provide a simple API to the BGP protocol for the purposes of +automation, logging, monitoring, testing, and similar tasks using the +power and flexibility of perl. The module does not implement the +functionality of a RIB (Routing Information Base) nor does it modify the +kernel routing table of the host system. However, such operations could be +implemented using the API provided by the module.") + (license perl-license))) + (define-public perl-net-dns-native (package (name "perl-net-dns-native") -- cgit v1.2.3 From 022ad24c4177c9bc29c3a751db544bc12d0804f4 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 30 Dec 2019 11:56:58 +0100 Subject: services: console-font: Update example with HDPI font suggestion. This solution was kindly provided by Bernard M. Wiedemann. * gnu/services/base.scm (console-font-service-type): Add ter132n (terminus 132 nomal) font example, for HDPI displays. * doc/guix.texi (Invoking guix system): Update to `guix system search console' example output. --- doc/guix.texi | 28 +++++++++++++++++++--------- gnu/services/base.scm | 6 +++++- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index efc59c1aaf..70e3dfea6a 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -25958,26 +25958,36 @@ supported: Display available service type definitions that match the given regular expressions, sorted by relevance: +@cindex HDPI +@cindex HiDPI +@cindex resolution @example -$ guix system search console font +$ guix system search console name: console-fonts -location: gnu/services/base.scm:729:2 +location: gnu/services/base.scm:806:2 extends: shepherd-root -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 like: +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")) -relevance: 20 ++ '(("tty1" . "LatGrkCyr-8x16") ++ ("tty2" . (file-append ++ font-tamzen ++ "/share/kbd/consolefonts/TamzenForPowerline10x20.psf")) ++ ("tty3" . (file-append ++ font-terminus ++ "/share/consolefonts/ter-132n"))) ; for HDPI +relevance: 9 name: mingetty -location: gnu/services/base.scm:1048:2 +location: gnu/services/base.scm:1190:2 extends: shepherd-root description: Provide console login using the `mingetty' program. relevance: 2 name: login -location: gnu/services/base.scm:775:2 +location: gnu/services/base.scm:860:2 extends: pam description: Provide a console log-in service as specified by its + configuration value, a `login-configuration' object. diff --git a/gnu/services/base.scm b/gnu/services/base.scm index b1eff89ecc..77215e411c 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2019 Efraim Flashner ;;; Copyright © 2019 Tobias Geerinckx-Rice ;;; Copyright © 2019 John Soo +;;; Copyright © 2019 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -818,7 +819,10 @@ (define console-font-service-type '((\"tty1\" . \"LatGrkCyr-8x16\") (\"tty2\" . (file-append font-tamzen - \"/share/kbd/consolefonts/TamzenForPowerline10x20.psf\"))) + \"/share/kbd/consolefonts/TamzenForPowerline10x20.psf\")) + (\"tty3\" . (file-append + font-terminus + \"/share/consolefonts/ter-132n\"))) ; for HDPI @end example\n"))) (define* (console-font-service tty #:optional (font "LatGrkCyr-8x16")) -- cgit v1.2.3 From f92ebd57e4edeae2cbae85e978e23655f8733f16 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 31 Dec 2019 00:03:58 +0100 Subject: gnu: crypto++: Create versioned shared library links. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes the build of dependents like amule. * gnu/packages/crypto.scm (crypto++)[arguments]: Add an ‘install-shared-library-links’ phase. --- gnu/packages/crypto.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index db39166d45..dd49c12e5b 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -633,6 +633,16 @@ (define-public crypto++ (lambda _ ;; By default, only the static library is built. (invoke "make" "shared"))) + (add-after 'install 'install-shared-library-links + ;; By default, only .so and .so.x.y.z are installed. + ;; Create all the ‘intermediates’ expected by dependent packages. + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (lib (string-append out "/lib"))) + (with-directory-excursion lib + (symlink "libcryptopp.so.8.0.0" "libcryptopp.so.8.0") + (symlink "libcryptopp.so.8.0.0" "libcryptopp.so.8") + #t)))) (add-after 'install 'install-pkg-config (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From e9e75da6e19437ad1fc4a25a87d2e7456b51b3b1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 12 Dec 2019 02:19:20 +0100 Subject: gnu: Add jfsutils. * gnu/packages/file-systems.scm (jfsutils): New public variable. --- gnu/local.mk | 2 ++ gnu/packages/file-systems.scm | 34 ++++++++++++++++++++++ gnu/packages/patches/jfsutils-add-sysmacros.patch | 26 +++++++++++++++++ .../patches/jfsutils-include-systypes.patch | 25 ++++++++++++++++ 4 files changed, 87 insertions(+) create mode 100644 gnu/packages/patches/jfsutils-add-sysmacros.patch create mode 100644 gnu/packages/patches/jfsutils-include-systypes.patch diff --git a/gnu/local.mk b/gnu/local.mk index 9d1028a5be..d6600df339 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1030,6 +1030,8 @@ dist_patch_DATA = \ %D%/packages/patches/java-xerces-build_dont_unzip.patch \ %D%/packages/patches/java-xerces-xjavac_taskdef.patch \ %D%/packages/patches/jbig2dec-ignore-testtest.patch \ + %D%/packages/patches/jfsutils-add-sysmacros.patch \ + %D%/packages/patches/jfsutils-include-systypes.patch \ %D%/packages/patches/kdbusaddons-kinit-file-name.patch \ %D%/packages/patches/libnftnl-dont-check-NFTNL_FLOWTABLE_SIZE.patch \ %D%/packages/patches/libvirt-create-machine-cgroup.patch \ diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index cb0a2a25bb..fbf0e2641f 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -111,6 +111,40 @@ (define-public httpfs2 single file can be mounted.") (license license:gpl2+))) +(define-public jfsutils + (package + (name "jfsutils") + (version "1.1.15") + (source + (origin + (method url-fetch) + (uri (string-append "http://jfs.sourceforge.net/project/pub/jfsutils-" + version ".tar.gz")) + (sha256 + (base32 "0kbsy2sk1jv4m82rxyl25gwrlkzvl3hzdga9gshkxkhm83v1aji4")) + (patches (search-patches "jfsutils-add-sysmacros.patch" + "jfsutils-include-systypes.patch")))) + (build-system gnu-build-system) + (inputs + `(("util-linux" ,util-linux))) + (home-page "http://jfs.sourceforge.net/home.html") + (synopsis "Utilities for managing JFS file systems") + (description + "The JFSutils are a collection of utilities for managing the @acronym{JFS, +Journaled File System}, a 64-bit journaling file system created by IBM and later +ported to the kernel Linux. The following commands are available: +@enumerate +@item @command{fsck.jfs}: check and repair a JFS file system or replay its +transaction log. +@item @command{logdump}: dump the JFS journal log. +@item @command{logredo}: replay the JFS journal log. +@item @command{mkfs.jfs}: create a new JFS file system. +@item @command{xchklog}: save a JFS fsck log to a file. +@item @command{xchkdmp}: dump the contents of such a log file. +@item @command{xpeek}: a JFS file system editor with a shell-like interface. +@end enumerate\n") + (license license:gpl3+))) ; no explicit version given + (define-public disorderfs (package (name "disorderfs") diff --git a/gnu/packages/patches/jfsutils-add-sysmacros.patch b/gnu/packages/patches/jfsutils-add-sysmacros.patch new file mode 100644 index 0000000000..2349e37c06 --- /dev/null +++ b/gnu/packages/patches/jfsutils-add-sysmacros.patch @@ -0,0 +1,26 @@ +From: Tobias Geerinckx-Rice +Date: Thu, 12 Dec 2019 02:15:37 +0100 +Subject: gnu: jfsutils: Include sys/sysmacros.h. + +Copied verbatim[0] from the Debian package. + +[0]: https://sources.debian.org/patches/jfsutils/1.1.15-4/add_sysmacros.patch + +Description: Include sys/sysmacros.h + Mentioned header needed for major() definition. +Author: Laszlo Boszormenyi (GCS) +Last-Update: 2018-12-11 + +--- + +--- jfsutils-1.1.15.orig/libfs/devices.c ++++ jfsutils-1.1.15/libfs/devices.c +@@ -49,6 +49,8 @@ + #include + #endif + ++#include ++ + #include "jfs_types.h" + #include "jfs_filsys.h" + #include "devices.h" diff --git a/gnu/packages/patches/jfsutils-include-systypes.patch b/gnu/packages/patches/jfsutils-include-systypes.patch new file mode 100644 index 0000000000..ef1515d02c --- /dev/null +++ b/gnu/packages/patches/jfsutils-include-systypes.patch @@ -0,0 +1,25 @@ +From: Tobias Geerinckx-Rice +Date: Thu, 12 Dec 2019 02:15:37 +0100 +Subject: gnu: jfsutils: Include sys/types.h. + +Copied verbatim[0] from the Debian package. + +[0]: https://sources.debian.org/patches/jfsutils/1.1.15-4/missing-includes.diff + +Description: Add missing include to fix FTBFS with eglibc 2.17 +Origin: vendor, http://patches.ubuntu.com/j/jfsutils/jfsutils_1.1.15-2ubuntu1.patch +Bug-Debian: http://bugs.debian.org/701433 +Last-Update: 2013-07-05 + +Index: b/fscklog/extract.c +=================================================================== +--- a/fscklog/extract.c 2006-06-05 19:31:40.000000000 +0000 ++++ b/fscklog/extract.c 2013-04-02 07:13:08.737654963 +0000 +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + + #include "devices.h" + #include "diskmap.h" -- cgit v1.2.3 From 0e5c0e46a288494b9ac2136f160d2328e5113c6f Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Mon, 30 Dec 2019 16:02:18 -0500 Subject: gnu: git-annex: Update to 7.20191230. * gnu/packages/haskell-apps.scm (git-annex): Update to 7.20191230. [inputs]: Add ghc-filepath-bytestring. Signed-off-by: Efraim Flashner --- gnu/packages/haskell-apps.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index 91436f9b61..5b5b20cd65 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -270,14 +270,14 @@ (define-public darcs (define-public git-annex (package (name "git-annex") - (version "7.20191218") + (version "7.20191230") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "git-annex/git-annex-" version ".tar.gz")) (sha256 - (base32 "1dy5255x2cx68313p6vchqy5q1l0na8ckf5mkfi080hkhq8vj2q6")))) + (base32 "1xsd4vhiv3zkcqjh2pxhbkjx75hcalcc9bpdlfc27wzxsxyrwz12")))) (build-system haskell-build-system) (arguments `(#:configure-flags @@ -356,6 +356,7 @@ (define-public git-annex ("ghc-esqueleto" ,ghc-esqueleto) ("ghc-exceptions" ,ghc-exceptions) ("ghc-feed" ,ghc-feed) + ("ghc-filepath-bytestring" ,ghc-filepath-bytestring) ("ghc-free" ,ghc-free) ("ghc-hslogger" ,ghc-hslogger) ("ghc-http-client" ,ghc-http-client) -- cgit v1.2.3 From 8dd723f55b430cae19f339a3e4601b854ecce5b9 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Tue, 31 Dec 2019 10:34:28 +0000 Subject: gnu: guix-data-service: Update to 0.0.1-14.f2343b5. * gnu/packages/web.scm (guix-data-service): Update to 0.0.1-14.f2343b5. --- 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 dd27454e79..69e644b4f1 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4194,8 +4194,8 @@ (define-public python2-feedparser (package-with-python2 python-feedparser)) (define-public guix-data-service - (let ((commit "82b797ee9869ebe24f7dbbcc56c3d500e75dc2d3") - (revision "13")) + (let ((commit "f2343b5fc9228b08be87a2a3a87cc6eda75d674c") + (revision "14")) (package (name "guix-data-service") (version (string-append "0.0.1-" revision "." (string-take commit 7))) @@ -4207,7 +4207,7 @@ (define-public guix-data-service (file-name (git-file-name name version)) (sha256 (base32 - "0m500f40b4dmw1nsjhci7v4jxk8fsn2pp0xkiw2s13rmdnqar31s")))) + "0kmhyrp1fj5ghayda77pzxl8z1gcr33349yirmjnki0l7fpc2nww")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) -- cgit v1.2.3 From 365892e90fe352e5a366e48e9661c8c06bf80baa Mon Sep 17 00:00:00 2001 From: Reza Alizadeh Majd Date: Tue, 31 Dec 2019 15:48:59 +0000 Subject: gnu: Add gitlab-runner. * gnu/packages/ci.scm (gitlab-runner): New variable. Signed-off-by: Mathieu Othacehe --- gnu/packages/ci.scm | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index b49ac0f7c1..31478988c6 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2017, 2019 Ricardo Wurmus ;;; Copyright © 2018 Clément Lassieur +;;; Copyright © 2019 Reza Alizadeh Majd ;;; ;;; This file is part of GNU Guix. ;;; @@ -25,6 +26,7 @@ (define-module (gnu packages ci) #:use-module ((guix licenses) #:prefix l:) #:use-module (gnu packages) #:use-module (guix packages) + #:use-module (guix download) #:use-module (guix git-download) #:use-module (gnu packages autotools) #:use-module (gnu packages base) @@ -44,7 +46,8 @@ (define-module (gnu packages ci) #:use-module (gnu packages version-control) #:use-module (gnu packages web) #:use-module (gnu packages xml) - #:use-module (guix build-system gnu)) + #:use-module (guix build-system gnu) + #:use-module (guix build-system go)) (define-public cuirass (let ((commit "e20ff86d97f7dd92dad140b5919e3cbdf2fb1ce6") @@ -152,3 +155,25 @@ (define-public cuirass intended as a replacement for Hydra.") (home-page "https://www.gnu.org/software/guix/") (license l:gpl3+)))) + +(define-public gitlab-runner + (package + (name "gitlab-runner") + (version "12.6.0") + (source + (origin + (method url-fetch) + (uri + (string-append + "https://gitlab.com/gitlab-org/gitlab-runner/archive/v" + version "/gitlab-runner-v" version ".tar.gz")) + (sha256 + (base32 "1gb3mflz57niyyn4kj5l4m1g2sa2w4cn8gig5dfr04ns9w9kj8jr")))) + (build-system go-build-system) + (arguments '(#:import-path "gitlab.com/gitlab-org/gitlab-runner")) + (home-page "https://docs.gitlab.com/runner/") + (synopsis "GitLab Runner") + (description "Gitlab Runner is used to run Gitlab's CI/CD jobs and send +back the results to Gitlab instance. It is used in conjunction with Gitlab +CI.") + (license l:expat))) -- cgit v1.2.3 From 9efcc4948143a845355f7869fe05dbcca0f74a34 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Tue, 31 Dec 2019 21:21:34 +0100 Subject: gnu: vim: Update to 8.2.0066. * gnu/packages/vim.scm (vim): Update to 8.2.0066. [arguments]: Work around new build-container-related test failures. Remove previous work-arounds. [native-inputs]: Add tzdata-for-tests. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/vim.scm | 45 +++++++++++++++++++++++++++++++-------------- 1 file changed, 31 insertions(+), 14 deletions(-) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index b33fe42ceb..1abc7ba4dd 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2019 HiPhish ;;; Copyright © 2019 Julien Lepiller +;;; Copyright © 2019 Jakub Kądziołka ;;; ;;; This file is part of GNU Guix. ;;; @@ -67,7 +68,7 @@ (define-module (gnu packages vim) (define-public vim (package (name "vim") - (version "8.1.0644") + (version "8.2.0066") (source (origin (method git-fetch) (uri (git-reference @@ -76,7 +77,7 @@ (define-public vim (file-name (git-file-name name version)) (sha256 (base32 - "1xksb2v8rw1zgrd5fwqvrh44lf277k85sad2y4ia1z17y7i8j2fl")))) + "1yrmbqfwyj2ri61ahgzrglznpy1p6f1ldqkazhyxpwl4azk4n7zx")))) (build-system gnu-build-system) (arguments `(#:test-target "test" @@ -92,26 +93,42 @@ (define-public vim "src/testdir/test_terminal.vim") (("/bin/sh") (which "sh"))) #t)) - (add-before 'check 'patch-failing-tests + (add-before 'check 'set-TZDIR + (lambda* (#:key inputs #:allow-other-keys) + ;; One of the tests tests timezone-dependent functions. + (setenv "TZDIR" + (string-append (assoc-ref inputs "tzdata") + "/share/zoneinfo")) + #t)) + (add-before 'check 'skip-failing-tests (lambda _ - ;; XXX A single test fails with “Can't create file /dev/stdout” (at - ;; Test_writefile_sync_dev_stdout line 5) while /dev/stdout exists. - (substitute* "src/testdir/test_writefile.vim" - (("/dev/stdout") "a-regular-file")) + ;; This test assumes that PID 1 is run as root and that the user + ;; running the test suite does not have permission to kill(1, 0) + ;; it. This is not true in the build container, where both PID 1 + ;; and the test suite are run as the same user. Skip the test. + ;; An alternative fix would be to patch the PID used to a random + ;; 32-bit value and hope it never shows up in the test environment. + (substitute* "src/testdir/test_swap.vim" + (("if !IsRoot\\(\\)") "if 0")) - ;; XXX: This test fails when run in the build container: - ;; . - (substitute* "src/testdir/test_search.vim" - ((".*'Test_incsearch_substitute_03'.*" all) - (string-append "\"" all "\n"))) + ;; This test checks how the terminal looks after executing some + ;; actions. The path of the bash binary is shown, which results in + ;; a difference being detected. Patching the expected result is + ;; non-trivial due to the special format used, so skip the test. + (substitute* "src/testdir/test_terminal.vim" + ((".*Test_terminal_postponed_scrollback.*" line) + (string-append line "return\n"))) #t))))) (inputs `(("gawk" ,gawk) ("ncurses" ,ncurses) ("perl" ,perl) - ("tcsh" ,tcsh))) ; For runtime/tools/vim32 + ("tcsh" ,tcsh))) ; For runtime/tools/vim32 (native-inputs - `(("libtool" ,libtool))) + `(("libtool" ,libtool) + + ;; For tests. + ("tzdata" ,tzdata-for-tests))) (home-page "https://www.vim.org/") (synopsis "Text editor based on vi") (description -- cgit v1.2.3 From 54b87d69eb9f41404f5dc7b0201622af9e1a399d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 1 Jan 2020 00:20:02 +0100 Subject: gnu: sudo: Update to 1.8.30. * gnu/packages/admin.scm (sudo): Update to 1.8.30. --- gnu/packages/admin.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 1725f2a563..a2238dc9da 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2016 Peter Feigl ;;; Copyright © 2016 John J. Foerch ;;; Copyright © 2016, 2017 ng0 -;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2016 John Darrington ;;; Copyright © 2017 Ben Sturmfels ;;; Copyright © 2017 Ethan R. Jones @@ -1200,7 +1200,7 @@ (define-public rottlog (define-public sudo (package (name "sudo") - (version "1.8.29") + (version "1.8.30") (source (origin (method url-fetch) (uri @@ -1210,7 +1210,7 @@ (define-public sudo version ".tar.gz"))) (sha256 (base32 - "0z4wyadh9cks17gdpfgx4kvbrlnyb6nai2sd6chk7qh4jsngylyf")) + "1rvrqlqrrjsd06dczgj9cwjdkpkqil5zzlwh87h06ms6qzfx6nm3")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 442277d01eacd859b21e60e4eac3820d5f868088 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 1 Jan 2020 01:07:40 +0100 Subject: gnu: vim: Update to 8.2.0069. * gnu/packages/vim.scm (vim): Update to 8.2.0069. --- gnu/packages/vim.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 1abc7ba4dd..9331959cb3 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2017 Marius Bakke -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019 HiPhish ;;; Copyright © 2019 Julien Lepiller ;;; Copyright © 2019 Jakub Kądziołka @@ -68,7 +68,7 @@ (define-module (gnu packages vim) (define-public vim (package (name "vim") - (version "8.2.0066") + (version "8.2.0069") (source (origin (method git-fetch) (uri (git-reference @@ -77,7 +77,7 @@ (define-public vim (file-name (git-file-name name version)) (sha256 (base32 - "1yrmbqfwyj2ri61ahgzrglznpy1p6f1ldqkazhyxpwl4azk4n7zx")))) + "0kxzfcpv96s1lbx97g6451p1i7yanws5bvzl05jh1ywaqv5f4y7g")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit v1.2.3 From 8e690499f82f4cb0fe0ca4f0aee7837185c94f46 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 1 Jan 2020 01:45:12 -0500 Subject: gnu: linux-libre@4.14: Update to 4.14.161. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.161. (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 96df2172e6..c813fd8850 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -372,10 +372,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.160") +(define-public linux-libre-4.14-version "4.14.161") (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "0b59xyr8if0qcbnwqa88y275g9rzhjbbp8589i8xxpmws6x2c0y6"))) + (hash (base32 "1jc1izlvgymp9x61r4yz2xhplwmp6x8laxqj9wy33iz6a2gn48wx"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit v1.2.3 From fed39c384dd04040a563904452251b18bcbf5d4d Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 1 Jan 2020 01:46:16 -0500 Subject: gnu: linux-libre@4.19: Update to 4.19.92. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.92. (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 c813fd8850..9e51f87f33 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -364,10 +364,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.91") +(define-public linux-libre-4.19-version "4.19.92") (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "0irl5jlh5rrdfz5g28x4ifbillvspwd8fy4wi3qhmv9dw7gc60zl"))) + (hash (base32 "18l3k0hgyanh6axgmmaaff139vpw6lf3fcf9iglpqwgspgw7rhr9"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From 8220e8937203aa88b4307415c8eba04e7d7808bc Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 1 Jan 2020 02:02:26 -0500 Subject: gnu: linux-libre: Update to 5.4.7. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.7. (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 9e51f87f33..cc3455b52b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -356,10 +356,10 @@ (define (%upstream-linux-source version hash) "linux-" version ".tar.xz")) (sha256 hash))) -(define-public linux-libre-5.4-version "5.4.6") +(define-public linux-libre-5.4-version "5.4.7") (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "1j4916izy2nrzq7g6m5m365r60hhhx9rqcanjvaxv5x3vsy639gx"))) + (hash (base32 "1jgwg5qb7lb30m5ywvpfagzrl6d0i524qpy3v99mina6j4fv5jdb"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit v1.2.3 From 0f5ae473b03fb64ec8efcf76b56037cb8c8cb818 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 1 Jan 2020 12:57:21 +0100 Subject: gnu: Add r-emplik. * gnu/packages/cran.scm (r-emplik): New variable. --- gnu/packages/cran.scm | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index dbc2b4614d..4f4ec592a8 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus ;;; Copyright © 2015 Andreas Enge ;;; Copyright © 2016, 2017 Ben Woodcroft ;;; Copyright © 2016, 2017, 2018 Roel Janssen @@ -18988,3 +18988,26 @@ (define-public r-influencer betweenness, Key Players, and bridging implementations are parallelized with OpenMP.") (license license:gpl2))) + +(define-public r-emplik + (package + (name "r-emplik") + (version "1.0-4.3") + (source + (origin + (method url-fetch) + (uri (cran-uri "emplik" version)) + (sha256 + (base32 + "1g4hz85bvw29c77zs0ig487z92jjl682vv457x81l077h0psvk7c")))) + (properties `((upstream-name . "emplik"))) + (build-system r-build-system) + (propagated-inputs + `(("r-quantreg" ,r-quantreg))) + (home-page "http://www.ms.uky.edu/~mai/EmpLik.html") + (synopsis "Empirical likelihood ratio for censored/truncated data") + (description + "This package provides empirical likelihood ratio tests for +means/quantiles/hazards from possibly censored and/or truncated data. It also +does regression.") + (license license:gpl2+))) -- cgit v1.2.3 From 9eb680b1dccd8068c65d12e54d2147220f02b4f2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 1 Jan 2020 12:57:41 +0100 Subject: gnu: Add r-imputeyn. * gnu/packages/cran.scm (r-imputeyn): New variable. --- gnu/packages/cran.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 4f4ec592a8..5bacec6a12 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19011,3 +19011,30 @@ (define-public r-emplik means/quantiles/hazards from possibly censored and/or truncated data. It also does regression.") (license license:gpl2+))) + +(define-public r-imputeyn + (package + (name "r-imputeyn") + (version "1.3") + (source + (origin + (method url-fetch) + (uri (cran-uri "imputeYn" version)) + (sha256 + (base32 + "1b21w1aa5f7yiq8k0wa86wvbg4ij7f6ldwn6asfqwb0b90rvsgvs")))) + (properties `((upstream-name . "imputeYn"))) + (build-system r-build-system) + (propagated-inputs + `(("r-boot" ,r-boot) + ("r-emplik" ,r-emplik) + ("r-mvtnorm" ,r-mvtnorm) + ("r-quadprog" ,r-quadprog) + ("r-survival" ,r-survival))) + (home-page "https://cran.r-project.org/web/packages/imputeYn/") + (synopsis "Impute last largest censored observation under weighted least squares") + (description + "This package allows for the imputation of the last largest censored +observantions. This method brings less bias and more efficient estimates for +AFT models.") + (license license:gpl2))) -- cgit v1.2.3 From 69442bd03136d90e9f80473b033cbc8b934f1794 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 1 Jan 2020 12:57:51 +0100 Subject: gnu: Add r-adapenetclass. * gnu/packages/cran.scm (r-adapenetclass): New variable. --- gnu/packages/cran.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 5bacec6a12..64804e4f25 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19038,3 +19038,27 @@ (define-public r-imputeyn observantions. This method brings less bias and more efficient estimates for AFT models.") (license license:gpl2))) + +(define-public r-adapenetclass + (package + (name "r-adapenetclass") + (version "1.2") + (source + (origin + (method url-fetch) + (uri (cran-uri "AdapEnetClass" version)) + (sha256 + (base32 + "01k3mj4g1ckbng7wkzzn9h0k9yf01cpnnkly0sjda574c5jhj0rc")))) + (properties `((upstream-name . "AdapEnetClass"))) + (build-system r-build-system) + (propagated-inputs + `(("r-glmnet" ,r-glmnet) + ("r-imputeyn" ,r-imputeyn) + ("r-lars" ,r-lars) + ("r-quadprog" ,r-quadprog))) + (home-page "https://cran.r-project.org/web/packages/AdapEnetClass/") + (synopsis "Class of adaptive elastic net methods for censored data") + (description + "This package provides methods for variable selection for AFT models.") + (license license:gpl2))) -- cgit v1.2.3 From be9d0ab2a5300768f2bf8f1ac21110de0a152de2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 1 Jan 2020 12:57:59 +0100 Subject: gnu: Add r-flock. * gnu/packages/cran.scm (r-flock): New variable. --- gnu/packages/cran.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 64804e4f25..c8d9dad9b6 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19062,3 +19062,25 @@ (define-public r-adapenetclass (description "This package provides methods for variable selection for AFT models.") (license license:gpl2))) + +(define-public r-flock + (package + (name "r-flock") + (version "0.7") + (source + (origin + (method url-fetch) + (uri (cran-uri "flock" version)) + (sha256 + (base32 + "1zg93p74icj4bhxnmnssj2xp6vw4yaksyavq03497v33xfpdxss7")))) + (properties `((upstream-name . "flock"))) + (build-system r-build-system) + (propagated-inputs `(("r-rcpp" ,r-rcpp))) + (home-page "https://cran.r-project.org/web/packages/flock/") + (synopsis "Process synchronization using file locks") + (description + "This package implements synchronization between R processes (spawned by +using the @code{parallel} package for instance) using file locks. It supports +both exclusive and shared locking.") + (license license:asl2.0))) -- cgit v1.2.3 From 1a1ba087584337e94a5d0228c84a7340cb51c805 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 1 Jan 2020 12:58:09 +0100 Subject: gnu: Add r-archivist. * gnu/packages/cran.scm (r-archivist): New variable. --- gnu/packages/cran.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c8d9dad9b6..c4b37e6cf6 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19084,3 +19084,39 @@ (define-public r-flock using the @code{parallel} package for instance) using file locks. It supports both exclusive and shared locking.") (license license:asl2.0))) + +(define-public r-archivist + (package + (name "r-archivist") + (version "2.3.4") + (source + (origin + (method url-fetch) + (uri (cran-uri "archivist" version)) + (sha256 + (base32 + "1i11hrcq1910jgd6diw6h3sxx624v57zjianm49pqvb2dvd0b8y7")))) + (properties `((upstream-name . "archivist"))) + (build-system r-build-system) + (propagated-inputs + `(("r-dbi" ,r-dbi) + ("r-digest" ,r-digest) + ("r-flock" ,r-flock) + ("r-httr" ,r-httr) + ("r-lubridate" ,r-lubridate) + ("r-magrittr" ,r-magrittr) + ("r-rcurl" ,r-rcurl) + ("r-rsqlite" ,r-rsqlite))) + (home-page "https://pbiecek.github.io/archivist/") + (synopsis "Tools for storing, restoring and searching for R objects") + (description + "Data exploration and modelling is a process in which a lot of data +artifacts are produced. Artifacts like: subsets, data aggregates, plots, +statistical models, different versions of data sets and different versions of +results. Archivist helps to store and manage artifacts created in R. It +allows you to store selected artifacts as binary files together with their +metadata and relations. Archivist allows sharing artifacts with others. It +can look for already created artifacts by using its class, name, date of the +creation or other properties. It also makes it easy to restore such +artifacts.") + (license license:gpl2))) -- cgit v1.2.3 From a581caa00d2a902b2d8a3049f53cb2908761bb4e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 1 Jan 2020 12:58:14 +0100 Subject: gnu: Add r-versions. * gnu/packages/cran.scm (r-versions): New variable. --- gnu/packages/cran.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c4b37e6cf6..c4de940502 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19120,3 +19120,24 @@ (define-public r-archivist creation or other properties. It also makes it easy to restore such artifacts.") (license license:gpl2))) + +(define-public r-versions + (package + (name "r-versions") + (version "0.3") + (source + (origin + (method url-fetch) + (uri (cran-uri "versions" version)) + (sha256 + (base32 + "0zm49j785dgv7fyr1yl9q5f0dsk8hhpim5q5bpkgrkzv7pwjribd")))) + (properties `((upstream-name . "versions"))) + (build-system r-build-system) + (home-page "https://cran.r-project.org/web/packages/versions/") + (synopsis "Query and install specific versions of CRAN packages") + (description + "This package allows you to install specified versions of R packages +hosted on CRAN and provides functions to list available versions and the +versions of currently installed packages.") + (license license:bsd-3))) -- cgit v1.2.3 From 7340ae0c6df6f2f79f8296f118ba82680c752399 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 1 Jan 2020 12:58:22 +0100 Subject: gnu: Add r-adapr. * gnu/packages/cran.scm (r-adapr): New variable. --- gnu/packages/cran.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c4de940502..155c618472 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19141,3 +19141,41 @@ (define-public r-versions hosted on CRAN and provides functions to list available versions and the versions of currently installed packages.") (license license:bsd-3))) + +(define-public r-adapr + (package + (name "r-adapr") + (version "2.0.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "adapr" version)) + (sha256 + (base32 + "1s57jdbi5pik56xjz1d4438ax6cywg2yq2s47h5g6wrwvpgr1qfw")))) + (properties `((upstream-name . "adapr"))) + (build-system r-build-system) + (propagated-inputs + `(("r-archivist" ,r-archivist) + ("r-devtools" ,r-devtools) + ("r-digest" ,r-digest) + ("r-doparallel" ,r-doparallel) + ("r-gdata" ,r-gdata) + ("r-ggplot2" ,r-ggplot2) + ("r-git2r" ,r-git2r) + ("r-igraph" ,r-igraph) + ("r-knitr" ,r-knitr) + ("r-plotly" ,r-plotly) + ("r-plyr" ,r-plyr) + ("r-rmarkdown" ,r-rmarkdown) + ("r-shiny" ,r-shiny) + ("r-shinydashboard" ,r-shinydashboard) + ("r-versions" ,r-versions))) + (home-page "https://cran.r-project.org/web/packages/adapr/") + (synopsis "Implementation of an accountable data analysis process") + (description + "This package tracks reading and writing within R scripts that are +organized into a directed acyclic graph. It contains an interactive Shiny +application @code{adaprApp()}. It uses Git and file hashes to track version +histories of inputs and outputs.") + (license license:lgpl2.0))) -- cgit v1.2.3 From 536a7ca2aaf7cf7bd386cca3d6ce4fa2eb43a025 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 1 Jan 2020 12:58:31 +0100 Subject: gnu: Add r-adapsamp. * gnu/packages/cran.scm (r-adapsamp): New variable. --- gnu/packages/cran.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 155c618472..6b88203859 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19179,3 +19179,30 @@ (define-public r-adapr application @code{adaprApp()}. It uses Git and file hashes to track version histories of inputs and outputs.") (license license:lgpl2.0))) + +(define-public r-adapsamp + (package + (name "r-adapsamp") + (version "1.1.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "AdapSamp" version)) + (sha256 + (base32 + "1jayjrsiib2ij4rxxj59g71r3xhzl5yqh0lhi8k6cfy03i7dkvis")))) + (properties `((upstream-name . "AdapSamp"))) + (build-system r-build-system) + (propagated-inputs `(("r-pracma" ,r-pracma))) + (home-page "https://cran.r-project.org/web/packages/AdapSamp/") + (synopsis "Adaptive sampling algorithms") + (description + "For distributions whose probability density functions are log-concave, +the adaptive rejection sampling algorithm can be used to build envelope +functions for sampling. For others, the modified adaptive rejection sampling +algorithm, the concave-convex adaptive rejection sampling algorithm, and the +adaptive slice sampling algorithm can be used. This R package mainly includes +these four functions: @code{rARS()}, @code{rMARS()}, @code{rCCARS()}, and +@code{rASS()}. These functions can realize sampling based on the algorithms +above.") + (license license:gpl2))) -- cgit v1.2.3 From 9380968a8fd0ef5445f5d9e4de12b5e054fa559d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 1 Jan 2020 12:58:39 +0100 Subject: gnu: Add r-adaptalint. * gnu/packages/cran.scm (r-adaptalint): New variable. --- gnu/packages/cran.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 6b88203859..b263b6a425 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19206,3 +19206,29 @@ (define-public r-adapsamp @code{rASS()}. These functions can realize sampling based on the algorithms above.") (license license:gpl2))) + +(define-public r-adaptalint + (package + (name "r-adaptalint") + (version "0.2.4") + (source + (origin + (method url-fetch) + (uri (cran-uri "adaptalint" version)) + (sha256 + (base32 + "15qdcvnnbgcps8j5k79354wsc9alswijv8lcafg2i3lghaw536yf")))) + (properties `((upstream-name . "adaptalint"))) + (build-system r-build-system) + (propagated-inputs + `(("r-dplyr" ,r-dplyr) + ("r-lintr" ,r-lintr) + ("r-purrr" ,r-purrr))) + (home-page "https://cran.r-project.org/web/packages/adaptalint/") + (synopsis "Check R code style") + (description + "This package provides tools to infer the code style (which style rules +are followed and which ones are not) from one package and use it to check +another. This makes it easier to find and correct the most important problems +first.") + (license license:gpl3))) -- cgit v1.2.3 From 273329d8701461b2cc1a36faec41b507d1ac6a84 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Wed, 1 Jan 2020 15:49:08 +0300 Subject: gnu: emacs-magit-todos: Update to 1.4.1. * gnu/packages/emacs-xyz.scm (emacs-magit-todos): Update to 1.4.1. --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 8362ce6e52..67f9517a5c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -26,7 +26,7 @@ ;;; Copyright © 2017 George Clemmer ;;; Copyright © 2017, 2018 Feng Shu ;;; Copyright © 2017 Jan Nieuwenhuizen -;;; Copyright © 2017, 2018, 2019 Oleg Pykhalov +;;; Copyright © 2017, 2018, 2019, 2020 Oleg Pykhalov ;;; Copyright © 2017 Mekeor Melire ;;; Copyright © 2017 Peter Mikkelsen ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice @@ -16238,7 +16238,7 @@ (define-public emacs-pcre2el (define-public emacs-magit-todos (package (name "emacs-magit-todos") - (version "1.4") + (version "1.4.1") (source (origin (method git-fetch) @@ -16248,7 +16248,7 @@ (define-public emacs-magit-todos (file-name (git-file-name name version)) (sha256 (base32 - "09pjb4k409gc0h51vb5az1shx02c1hx8cnvhi529n7dm4maildg5")))) + "1rcl6j53yabxqk3jzgaxvm3wqq7rayf1hdib2v2fapw5b0layym6")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-async" ,emacs-async) -- cgit v1.2.3 From 60769455342f88b0ac254db62938634cfe7093a2 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 1 Jan 2020 16:04:56 +0100 Subject: gnu: emacs-orgalist: Update to 1.10. * gnu/packages/emacs-xyz.scm (emacs-orgalist): Update to 1.10. --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 67f9517a5c..3d42f52e59 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -14,7 +14,7 @@ ;;; Copyright © 2016, 2017 Roel Janssen ;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2016, 2019 Alex Griffin -;;; Copyright © 2016, 2017, 2018, 2019 Nicolas Goaziou +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Nicolas Goaziou ;;; Copyright © 2016, 2017, 2018 Alex Vong ;;; Copyright © 2016, 2017, 2018, 2019 Arun Isaac ;;; Copyright © 2017 Christopher Baines @@ -7929,7 +7929,7 @@ (define-public emacs-monroe (define-public emacs-orgalist (package (name "emacs-orgalist") - (version "1.9") + (version "1.10") (source (origin (method url-fetch) @@ -7937,7 +7937,7 @@ (define-public emacs-orgalist "orgalist-" version ".el")) (sha256 (base32 - "1rmmcyiiqkq54hn74nhzxzl4nvd902hv6gq341jwhrm7yiagffi6")))) + "1m97m53d4sl7lvjk4nhcxkm3qv8zcvgfrfzkjgaxavf5ci7p4wb7")))) (build-system emacs-build-system) (home-page "http://elpa.gnu.org/packages/orgalist.html") (synopsis "Manage Org-like lists in non-Org buffers") -- cgit v1.2.3 From be93299dfe5800ca89f5f89e24e4af24b562707b Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 31 Dec 2019 10:21:20 -0500 Subject: gnu: Add gnome-getting-started-docs. * gnu/packages/gnome.scm (gnome-getting-started-docs): New variable. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/gnome.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ad3e78c284..8e96c61137 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -346,6 +346,34 @@ (define-public deja-dup either on a local, or remote machine via a number of methods.") (license license:gpl3+))) +(define-public gnome-getting-started-docs + (package + (name "gnome-getting-started-docs") + (version "3.32.2") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/gnome-getting-started-docs/" + (version-major+minor version) + "/gnome-getting-started-docs-" version ".tar.xz")) + (sha256 + (base32 "1v4k465mlzrhgcdddzs6bmm0yliyrfx6jg3gh0s17a08i0w5rbwq")))) + (build-system gnu-build-system) + (native-inputs + `(("gettext" ,gettext-minimal) + ("itstool" ,itstool) + ("pkg-config" ,pkg-config) + ("xmllint" ,libxml2))) + (synopsis "Help to get new users started with the GNOME desktop") + (description + "The GNOME Getting Started Documentation contains GNOME's intuitive +\"Getting Started\" tour, with video guides, that can be viewed with Yelp. + +It is normally used together with @command{gnome-initial-setup}, but is also +useful as a tutorial and users' guide for new or less experienced users.") + (home-page "https://live.gnome.org/DocumentationProject") + (license license:cc-by-sa3.0))) + (define-public dia ;; This version from GNOME's repository includes fixes for compiling with ;; recent versions of the build tools. The latest activity on the -- cgit v1.2.3 From 823b77fb0d22c21d74820d959ab07e0d63af2bfb Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 31 Dec 2019 11:03:46 -0500 Subject: gnu: Add gnome-user-docs. * gnu/packages/gnome.scm (gnome-user-docs): New variable. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/gnome.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 8e96c61137..9e2b0a4584 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -346,6 +346,32 @@ (define-public deja-dup either on a local, or remote machine via a number of methods.") (license license:gpl3+))) +(define-public gnome-user-docs + (package + (name "gnome-user-docs") + (version "3.32.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/gnome-user-docs/" + (version-major+minor version) + "/gnome-user-docs-" version ".tar.xz")) + (sha256 + (base32 "0dvsl0ldg8rf7yq0r4dv1pn41s7gjgcqp7agkbflkbmhrl6vbhig")))) + (build-system gnu-build-system) + (native-inputs + `(("gettext" ,gettext-minimal) + ("itstool" ,itstool) + ("pkg-config" ,pkg-config) + ("xmllint" ,libxml2))) + (synopsis "User documentation for the GNOME desktop") + (description + "The GNOME User Documentation explains how to use the GNOME desktop and its +components. It covers usage and setup of the core GNOME programs by end-users +and system administrators.") + (home-page "https://live.gnome.org/DocumentationProject") + (license license:cc-by3.0))) + (define-public gnome-getting-started-docs (package (name "gnome-getting-started-docs") -- cgit v1.2.3 From d252fbb49e3acf5b28af3b1845309915b092292e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 1 Jan 2020 17:15:47 +0100 Subject: gnu: smartmontools: Update to 7.1. * gnu/packages/admin.scm (smartmontools): Update to 7.1. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index a2238dc9da..2a0ad45e2a 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1830,7 +1830,7 @@ (define-public libcap-ng (define-public smartmontools (package (name "smartmontools") - (version "7.0") + (version "7.1") (source (origin (method url-fetch) (uri (string-append @@ -1838,7 +1838,7 @@ (define-public smartmontools version "/smartmontools-" version ".tar.gz")) (sha256 (base32 - "077nx2rn9szrg6isdh0938zbp7vr3dsyxl4jdyyzv1xwhqksrqg5")))) + "0imqb7ka4ia5573w8rnpck571pjjc9698pdjcapy9cfyk4n4swrz")))) (build-system gnu-build-system) (inputs `(("libcap-ng" ,libcap-ng))) (home-page "https://www.smartmontools.org/") -- cgit v1.2.3 From b94cf161d066b0fc1f3830ac38fbc98597a1f922 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 1 Jan 2020 19:56:11 +0100 Subject: Revert "gnu: Add gitlab-runner." This reverts commit 365892e90fe352e5a366e48e9661c8c06bf80baa. --- gnu/packages/ci.scm | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index 31478988c6..b49ac0f7c1 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -5,7 +5,6 @@ ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2017, 2019 Ricardo Wurmus ;;; Copyright © 2018 Clément Lassieur -;;; Copyright © 2019 Reza Alizadeh Majd ;;; ;;; This file is part of GNU Guix. ;;; @@ -26,7 +25,6 @@ (define-module (gnu packages ci) #:use-module ((guix licenses) #:prefix l:) #:use-module (gnu packages) #:use-module (guix packages) - #:use-module (guix download) #:use-module (guix git-download) #:use-module (gnu packages autotools) #:use-module (gnu packages base) @@ -46,8 +44,7 @@ (define-module (gnu packages ci) #:use-module (gnu packages version-control) #:use-module (gnu packages web) #:use-module (gnu packages xml) - #:use-module (guix build-system gnu) - #:use-module (guix build-system go)) + #:use-module (guix build-system gnu)) (define-public cuirass (let ((commit "e20ff86d97f7dd92dad140b5919e3cbdf2fb1ce6") @@ -155,25 +152,3 @@ (define-public cuirass intended as a replacement for Hydra.") (home-page "https://www.gnu.org/software/guix/") (license l:gpl3+)))) - -(define-public gitlab-runner - (package - (name "gitlab-runner") - (version "12.6.0") - (source - (origin - (method url-fetch) - (uri - (string-append - "https://gitlab.com/gitlab-org/gitlab-runner/archive/v" - version "/gitlab-runner-v" version ".tar.gz")) - (sha256 - (base32 "1gb3mflz57niyyn4kj5l4m1g2sa2w4cn8gig5dfr04ns9w9kj8jr")))) - (build-system go-build-system) - (arguments '(#:import-path "gitlab.com/gitlab-org/gitlab-runner")) - (home-page "https://docs.gitlab.com/runner/") - (synopsis "GitLab Runner") - (description "Gitlab Runner is used to run Gitlab's CI/CD jobs and send -back the results to Gitlab instance. It is used in conjunction with Gitlab -CI.") - (license l:expat))) -- cgit v1.2.3 From d7cefb0b8bdfa91a3cf1239c1054dd314c819d35 Mon Sep 17 00:00:00 2001 From: Evan Straw Date: Wed, 1 Jan 2020 03:20:22 +0000 Subject: gnu: rtl-sdr: Update to 0.6.0. * gnu/packages/ham-radio.scm (rtl-sdr): Update to 0.6.0. Signed-off-by: Ricardo Wurmus --- gnu/packages/ham-radio.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/gnu/packages/ham-radio.scm b/gnu/packages/ham-radio.scm index 9f0adca940..6b3f68cd7d 100644 --- a/gnu/packages/ham-radio.scm +++ b/gnu/packages/ham-radio.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017, 2018, 2019 Arun Isaac +;;; Copyright © 2019 Evan Straw ;;; ;;; This file is part of GNU Guix. ;;; @@ -36,15 +37,17 @@ (define-module (gnu packages ham-radio) (define-public rtl-sdr (package (name "rtl-sdr") - (version "0.5.3") + (version "0.6.0") (source (origin - (method url-fetch) - (uri (string-append "https://cgit.osmocom.org/rtl-sdr/snapshot/rtl-sdr-" - version ".tar.xz")) + (method git-fetch) + (uri (git-reference + (url "git://git.osmocom.org/rtl-sdr.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "08awca3v28sa4lxym4r81pzf0la0j86wbmpyhv3xd53an9gkpjy9")))) + "0lmvsnb4xw4hmz6zs0z5ilsah5hjz29g1s0050n59fllskqr3b8k")))) (build-system cmake-build-system) (inputs `(("libusb" ,libusb))) -- cgit v1.2.3 From 494135d51128210bb7cd31461b2800ea7ac6e6d3 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Wed, 1 Jan 2020 16:25:16 -0600 Subject: gnu: Add libtgvoip. * gnu/packages/telephony.scm (libtgvoip): New variable. --- gnu/packages/telephony.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 0c9de8bd0c..e7f294a999 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2019 Pierre Neidhardt ;;; Copyright © 2019 Jan Wielkiewicz ;;; Copyright © 2019 Ivan Vilata i Balaguer +;;; Copyright © 2020 Brett Gilio ;;; ;;; This file is part of GNU Guix. ;;; @@ -947,3 +948,27 @@ (define-public jami (define-public jami-client-gnome (deprecated-package "jami-client-gnome" jami)) + +(define-public libtgvoip + (package + (name "libtgvoip") + (version "2.4.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/zevlg/libtgvoip.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "04dbwd3lwdannhxb2sh6z02i3lka9sb5s039pki6ka4siq5xzk1j")))) + (build-system gnu-build-system) + (inputs + `(("openssl" ,openssl) + ("libopusenc" ,libopusenc))) + (synopsis "VoIP library for Telegram clients") + (description "A collection of libraries and header files for implementing +telephony functionality into custom Telegram clients.") + (home-page "https://github.com/zevlg/libtgvoip") + (license license:unlicense))) -- cgit v1.2.3 From 609ebcc0fab924e8ba2acd9cba77bf74f8955e6c Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Wed, 1 Jan 2020 16:25:51 -0600 Subject: gnu: emacs-telega: Build with support for VoIP. * gnu/packages/emacs-xyz.scm (emacs-telega): Add support for VoIP calling. [arguments]: Add make-flag to build with VoIP. [native-inputs]: Add libtgvoip. --- gnu/packages/emacs-xyz.scm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 3d42f52e59..4814891750 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -41,7 +41,7 @@ ;;; Copyright © 2018 Alex Branham ;;; Copyright © 2018 Thorsten Wilms ;;; Copyright © 2018, 2019 Pierre Langlois -;;; Copyright © 2018, 2019 Brett Gilio +;;; Copyright © 2018, 2019, 2020 Brett Gilio ;;; Copyright © 2019 Dimakakos Dimos ;;; Copyright © 2019 Brian Leung ;;; Copyright © 2019 mikadoZero @@ -103,6 +103,7 @@ (define-module (gnu packages emacs-xyz) #:use-module (gnu packages ncurses) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages telephony) #:use-module (gnu packages tex) #:use-module (gnu packages texinfo) #:use-module (gnu packages tcl) @@ -20157,7 +20158,7 @@ (define-public emacs-telega ;; Get the current version from `telega-version` in telega.el. ;; or by running M-x telega-version. (let ((commit "9bfb637b2e71f5f293debd35abd627a064faf8ef") - (revision "1") + (revision "2") (version "0.5.4")) (package (name "emacs-telega") @@ -20174,14 +20175,15 @@ (define-public emacs-telega (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments - `(#:test-target "test" - #:modules ((guix build gnu-build-system) + `(#:modules ((guix build gnu-build-system) ((guix build emacs-build-system) #:prefix emacs:) (guix build utils) (guix build emacs-utils)) #:imported-modules (,@%gnu-build-system-modules (guix build emacs-build-system) (guix build emacs-utils)) + #:test-target "test" + #:make-flags (list "WITH_VOIP=t") #:phases (modify-phases %standard-phases (add-after 'unpack 'prefix-patch @@ -20259,6 +20261,7 @@ (define-public emacs-telega ("libwebp" ,libwebp))) ; sticker support. (native-inputs `(("tdlib" ,tdlib) + ("libtgvoip" ,libtgvoip) ; VoIP support. ("emacs" ,emacs) ("python" ,python))) (synopsis "GNU Emacs client for the Telegram messenger") -- cgit v1.2.3 From 92d7f5b45d1f19e075d84dab0ebbd299334d328b Mon Sep 17 00:00:00 2001 From: "kanichos@yandex.ru" Date: Wed, 1 Jan 2020 13:15:49 +0300 Subject: gnu: ibus: Fix substitution. * gnu/packages/ibus.scm (ibus)[arguments]: Fix command substitution. Signed-off-by: Ricardo Wurmus --- gnu/packages/ibus.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 5057927174..42a8d5db32 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -116,7 +116,7 @@ (define-public ibus "/share/X11/locale"))) (substitute* "ui/gtk3/xkblayout.vala" (("\"(setxkbmap|xmodmap)\"" _ prog) - (string-append "\"" (assoc-ref inputs prog) "\""))) + (string-append "\"" (assoc-ref inputs prog) "/bin/" prog "\""))) #t)) (add-after 'wrap-program 'wrap-with-additional-paths (lambda* (#:key outputs #:allow-other-keys) -- cgit v1.2.3 From 7ff557a598ca6a6b145d1120c43b4fd34cb0ce1a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 1 Jan 2020 21:08:40 +0100 Subject: gnu: ranger: Update to 1.9.3. * gnu/packages/disk.scm (ranger): Update to 1.9.3. --- gnu/packages/disk.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 1a6a7c40f6..d2e1afdbce 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2012, 2013 Nikita Karetnikov ;;; Copyright © 2015 Mathieu Lirzin ;;; Copyright © 2015 Mark H Weaver -;;; Copyright © 2016, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2016, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2016, 2019 Efraim Flashner ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2016 Roel Janssen @@ -524,14 +524,14 @@ (define-public duperemove (define-public ranger (package (name "ranger") - (version "1.9.2") + (version "1.9.3") (source (origin (method url-fetch) (uri (string-append "https://ranger.github.io/" "ranger-" version ".tar.gz")) (sha256 (base32 - "12kbsqakbxs09y0x8hy66mmaf72rk0p850x7ryk2ghkq7wfin78f")))) + "0lfjrpv3z4h0knd3v94fijrw2zjba51mrp3mjqx2c98wr428l26f")))) (build-system python-build-system) (inputs `(("w3m" ,w3m))) -- cgit v1.2.3 From afeecd92aa2cb6fbfc36202f191e6fb52f7eb882 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 1 Jan 2020 21:17:34 +0100 Subject: gnu: libsigrokdecode: Update to 0.5.3. * gnu/packages/electronics.scm (libsigrokdecode): Update to 0.5.3. --- gnu/packages/electronics.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm index 8bee8354e4..2b88e6eceb 100644 --- a/gnu/packages/electronics.scm +++ b/gnu/packages/electronics.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Theodoros Foradis -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019 Clément Lassieur ;;; ;;; This file is part of GNU Guix. @@ -64,7 +64,7 @@ (define-public libserialport (define-public libsigrokdecode (package (name "libsigrokdecode") - (version "0.5.2") + (version "0.5.3") (source (origin (method url-fetch) (uri (string-append @@ -72,7 +72,7 @@ (define-public libsigrokdecode version ".tar.gz")) (sha256 (base32 - "1w434nl1syjkvwl08lji3r9sr60lbxp1nqys8hqwzv2lgiwrx3g0")))) + "1h1zi1kpsgf6j2z8j8hjpv1q7n49i3fhqjn8i178rka3cym18265")))) (outputs '("out" "doc")) (arguments `(#:phases -- cgit v1.2.3 From 26efd031ec6339d58d6a4a7630c99b50db88148c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 1 Jan 2020 21:27:31 +0100 Subject: gnu: sigrok-firmware-fx2lafw: Update to 0.1.7. * gnu/packages/electronics.scm (sigrok-firmware-fx2lafw): Update to 0.1.7. --- gnu/packages/electronics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm index 2b88e6eceb..3245a80d94 100644 --- a/gnu/packages/electronics.scm +++ b/gnu/packages/electronics.scm @@ -106,7 +106,7 @@ (define-public libsigrokdecode (define-public sigrok-firmware-fx2lafw (package (name "sigrok-firmware-fx2lafw") - (version "0.1.6") + (version "0.1.7") (source (origin (method url-fetch) (uri (string-append @@ -114,7 +114,7 @@ (define-public sigrok-firmware-fx2lafw "sigrok-firmware-fx2lafw-" version ".tar.gz")) (sha256 (base32 - "18x5zj3xbcylvb651dia6n4zxbdnv0j62r5af60d0l2g68knkjg4")))) + "0fyfd82mvrcf55v5a3afq1mh1kfswk4c37qrbln6x92jm3b41x53")))) (arguments `(#:implicit-inputs? #f)) (native-inputs -- cgit v1.2.3 From 4b492dccf6c700a7df6b62bc13c476c5128d7cc9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 1 Jan 2020 21:37:12 +0100 Subject: gnu: libsigrok: Update to 0.5.2. * gnu/packages/electronics.scm (libsigrok): Update to 0.5.2. --- gnu/packages/electronics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm index 3245a80d94..77b383d69c 100644 --- a/gnu/packages/electronics.scm +++ b/gnu/packages/electronics.scm @@ -137,7 +137,7 @@ (define-public sigrok-firmware-fx2lafw (define-public libsigrok (package (name "libsigrok") - (version "0.5.1") + (version "0.5.2") (source (origin (method url-fetch) (uri (string-append @@ -145,7 +145,7 @@ (define-public libsigrok version ".tar.gz")) (sha256 (base32 - "171b553dir5gn6w4f7n37waqk62nq2kf1jykx4ifjacdz5xdw3z4")))) + "0g6fl684bpqm5p2z4j12c62m45j1dircznjina63w392ns81yd2d")))) (outputs '("out" "doc")) (arguments `(#:tests? #f ; tests need USB access -- cgit v1.2.3 From 1aab0332154110e23c13d00ff1dfaaf093e2e36c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 1 Jan 2020 23:48:43 +0100 Subject: gnu: youtube-dl: Update to 2020.01.01. * gnu/packages/video.scm (youtube-dl): Update to 2020.01.01. --- gnu/packages/video.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index c4a31ebb4c..49e47673b9 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2016, 2018, 2019 Eric Bavier ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2017 Feng Shu -;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2017 Chris Marusich ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2017 Ethan R. Jones @@ -1542,7 +1542,7 @@ (define-public libvpx-1.7 (define-public youtube-dl (package (name "youtube-dl") - (version "2019.11.28") + (version "2020.01.01") (source (origin (method url-fetch) (uri (string-append "https://github.com/ytdl-org/youtube-dl/" @@ -1550,7 +1550,7 @@ (define-public youtube-dl version ".tar.gz")) (sha256 (base32 - "19xiwdn3l0kizyj7cik9vyhgrlwg7ss4wl4hy2pbbbqwh5vwppwk")))) + "0p8v18jpf0ijpqlgavqs5vky9v956dhhck7drsv7gkzfw2y6mc0a")))) (build-system python-build-system) (arguments ;; The problem here is that the directory for the man page and completion -- cgit v1.2.3 From 4c3cba940c2483fdce0c4f87a6e59c25a3d4c1ba Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 1 Jan 2020 23:49:27 +0100 Subject: gnu: emacs-php-mode: Update to 1.22.2. * gnu/packages/emacs-xyz.scm (emacs-php-mode): Update to 1.22.2. --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 4814891750..73e4654f84 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -29,7 +29,7 @@ ;;; Copyright © 2017, 2018, 2019, 2020 Oleg Pykhalov ;;; Copyright © 2017 Mekeor Melire ;;; Copyright © 2017 Peter Mikkelsen -;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2017 Mike Gerwitz ;;; Copyright © 2017, 2018, 2019 Maxim Cournoyer ;;; Copyright © 2018 Sohom Bhattacharjee @@ -9258,7 +9258,7 @@ (define-public emacs-cnfonts (define-public emacs-php-mode (package (name "emacs-php-mode") - (version "1.22.1") + (version "1.22.2") (source (origin (method git-fetch) (uri (git-reference @@ -9267,7 +9267,7 @@ (define-public emacs-php-mode (file-name (git-file-name name version)) (sha256 (base32 - "1yc7f39bv2ni8q5372r4kj04z7rikvc8w1mqx5c4zph5r02jab7i")))) + "1r4bpyavlndd4c78cv5cc97bc0gkd4cggiyz4kd2vg6zlyc1nld3")))) (build-system emacs-build-system) (home-page "https://github.com/ejmr/php-mode") (synopsis "Major mode for editing PHP code") -- cgit v1.2.3 From a1e9e36e03d00a0b5de61c5469db92cce74ea262 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 1 Jan 2020 23:51:55 +0100 Subject: gnu: Use HTTPS for kicad-pcb.org. * gnu/packages/engineering.scm (kicad, kicad-library, kicad-symbols)[home-page]: Use HTTPS. --- gnu/packages/engineering.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 9ace45ba5c..d2f1dcbb3c 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -855,7 +855,7 @@ (define-public kicad ("python" ,python) ("wxwidgets" ,wxwidgets) ("wxpython" ,python-wxpython))) - (home-page "http://kicad-pcb.org/") + (home-page "https://kicad-pcb.org/") (synopsis "Electronics Design Automation Suite") (description "Kicad is a program for the formation of printed circuit boards and electrical circuits. The software has a number of programs that @@ -919,7 +919,7 @@ (define-public kicad-library (sha256 (base32 "08qrz5zzsb5127jlnv24j0sgiryd5nqwg3lfnwi8j9a25agqk13j")))))) - (home-page "http://kicad-pcb.org/") + (home-page "https://kicad-pcb.org/") (synopsis "Libraries for kicad") (description "This package provides Kicad component, footprint and 3D render model libraries.") @@ -941,7 +941,7 @@ (define-public kicad-symbols (build-system cmake-build-system) (arguments `(#:tests? #f)) ; No tests exist - (home-page "http://kicad-pcb.org/") + (home-page "https://kicad-pcb.org/") (synopsis "Official KiCad schematic symbol libraries for KiCad 5") (description "This package contains the official KiCad schematic symbol libraries for KiCad 5.") -- cgit v1.2.3 From 7aed885ea3a096e6d94b806fa6bbd6e6913f289e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 1 Jan 2020 23:52:21 +0100 Subject: gnu: kicad: Update to 5.1.5. * gnu/packages/engineering.scm (kicad): Update to 5.1.5. --- gnu/packages/engineering.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index d2f1dcbb3c..1494155a39 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016, 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2016, 2017, 2018 Theodoros Foradis ;;; Copyright © 2017 Julien Lepiller -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Clément Lassieur ;;; Copyright © 2018, 2019 Jonathan Brielmaier ;;; Copyright © 2018, 2019 Arun Isaac @@ -795,7 +795,7 @@ (define-public ao (define-public kicad (package (name "kicad") - (version "5.1.4") + (version "5.1.5") (source (origin (method url-fetch) @@ -804,7 +804,7 @@ (define-public kicad "https://launchpad.net/kicad/" (version-major version) ".0/" version "/+download/kicad-" version ".tar.xz")) (sha256 - (base32 "1r60dgh6aalbpq1wsmpyxkz0nn4ck8ydfdjcrblpl69k5rks5k2j")))) + (base32 "0x3417f2pa7p65s9f7l49rqbnrzy8gz6i0n07mlbxqbnm0fmlql0")))) (build-system cmake-build-system) (arguments `(#:out-of-source? #t -- cgit v1.2.3 From 261e0356dc62f26667f91658e7dfcd3c38bf6712 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 1 Jan 2020 23:52:27 +0100 Subject: gnu: kicad-symbols: Update to 5.1.5. * gnu/packages/engineering.scm (kicad-symbols): Update to 5.1.5. --- gnu/packages/engineering.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 1494155a39..82697573e4 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -928,7 +928,7 @@ (define-public kicad-library (define-public kicad-symbols (package (name "kicad-symbols") - (version "5.1.4") + (version "5.1.5") (source (origin (method git-fetch) (uri (git-reference @@ -937,15 +937,19 @@ (define-public kicad-symbols (file-name (git-file-name name version)) (sha256 (base32 - "1lna4xlvzrxif3569pkp6mrg7fj62z3a3ri5j97lnmnnzhiddnh3")))) + "048b07ffsaav1ssrchw2p870lvb4rsyb5vnniy670k7q9p16qq6h")))) (build-system cmake-build-system) (arguments - `(#:tests? #f)) ; No tests exist + `(#:tests? #f)) ; no tests exist (home-page "https://kicad-pcb.org/") (synopsis "Official KiCad schematic symbol libraries for KiCad 5") (description "This package contains the official KiCad schematic symbol libraries for KiCad 5.") - ;; TODO: Exception: "To the extent that the creation of electronic designs that use 'Licensed Material' can be considered to be 'Adapted Material', then the copyright holder waives article 3 of the license with respect to these designs and any generated files which use data provided as part of the 'Licensed Material'." + ;; TODO: Exception: "To the extent that the creation of electronic designs + ;; that use 'Licensed Material' can be considered to be 'Adapted Material', + ;; then the copyright holder waives article 3 of the license with respect to + ;; these designs and any generated files which use data provided as part of + ;; the 'Licensed Material'." ;; See . (license license:cc-by-sa4.0))) -- cgit v1.2.3 From d2536ed15d82973e4bfab3e7859e98b82074946f Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Tue, 31 Dec 2019 23:07:45 +0100 Subject: gnu: Add xsecurelock. * gnu/packages/xdisorg.scm (xsecurelock): New variable. Signed-off-by: Brett Gilio --- gnu/packages/xdisorg.scm | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 9b198a02da..d27ba68d4e 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -72,6 +72,7 @@ (define-module (gnu packages xdisorg) #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) + #:use-module (gnu packages haskell-xyz) #:use-module (gnu packages icu4c) #:use-module (gnu packages man) #:use-module (gnu packages maths) @@ -1848,6 +1849,52 @@ (define-public sct temperature of the screen.") (license (license:non-copyleft "file://sct.c")))) ; "OpenBSD" license +(define-public xsecurelock + (package + (name "xsecurelock") + (version "1.6.0") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/google/xsecurelock/releases" + "/download/v" version "/xsecurelock-" version ".tar.gz")) + (sha256 + (base32 "070gknyv0s5hz9hkc6v73m2v7ssyjwgl93b5hd4glayfqxqjbmdp")))) + (build-system gnu-build-system) + (arguments + '(#:configure-flags + '("--with-pam-service-name=login" + "--with-xkb" + "--with-default-authproto-module=/run/setuid-programs/authproto_pam"))) + (native-inputs + `(("pandoc" ,ghc-pandoc) + ("pkg-config" ,pkg-config))) + (inputs + `(("fontconfig" ,fontconfig) + ("libX11" ,libx11) + ("libxcomposite" ,libxcomposite) + ("libxext" ,libxext) + ("libxfixes" ,libxfixes) + ("libxft" ,libxft) + ("libxmu" ,libxmu) + ("libxrandr" ,libxrandr) + ("libxscrnsaver" ,libxscrnsaver) + ("linux-pam" ,linux-pam))) + (home-page "https://github.com/google/xsecurelock") + (synopsis "X11 screen lock utility with the primary goal of security") + (description "@code{xsecurelock} is an X11 screen locker which uses +a modular design to avoid the usual pitfallsof screen locking utility design. + +As a consequence of the modular design, the usual screen locker service +shouldn't be used with @code{xsecurelock}. Instead, you need to add a helper +binary to setuid-binaries: +@example +(setuid-programs (cons* + (file-append xsecurelock \"/libexec/xsecurelock/authproto_pam\") + %setuid-programs)) +@end example") + (license license:asl2.0))) + (define-public wl-clipboard (package (name "wl-clipboard") -- cgit v1.2.3 From 4da75228eff7ed924e4cf9e66b6ed5693a5d1174 Mon Sep 17 00:00:00 2001 From: Alexandru-Sergiu Marton Date: Wed, 1 Jan 2020 18:49:51 +0200 Subject: gnu: Add ghc-say. * gnu/packages/haskell-xyz.scm (ghc-say): New variable. Signed-off-by: Brett Gilio --- gnu/packages/haskell-xyz.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 716d14d7fb..03ae83d50e 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -9690,6 +9690,40 @@ (define-public ghc-sandi (description "Reasonably fast data encoding library.") (license license:bsd-3))) +(define-public ghc-say + (package + (name "ghc-say") + (version "0.1.0.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/say/say-" + version + ".tar.gz")) + (sha256 + (base32 + "1r5kffjfwpas45g74sip8glrj1m9nygrnxjm7xgw898rq9pnafgn")))) + (build-system haskell-build-system) + (native-inputs + `(("ghc-hspec" ,ghc-hspec) + ("hspec-discover" ,hspec-discover) + ("ghc-unliftio" ,ghc-unliftio))) + (home-page "https://github.com/fpco/say") + (synopsis + "Send textual messages to a Handle in a thread-friendly way") + (description + "A thread safe API to write a line of textual data to a Handle, such +as sending some messages to the terminal - that has the following properties: +@itemize +@item Properly handle character encoding settings on the Handle +@item For reasonably sized messages, ensure that the entire message is written + in one chunk to avoid interleaving data with other threads +@item Avoid unnecessary memory allocations and copies +@item Minimize locking. +@end itemize") + (license license:expat))) + (define-public ghc-scientific (package (name "ghc-scientific") -- cgit v1.2.3 From fadc4f10aa3b9e7a131c413262ec74d171b842d0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 2 Jan 2020 13:14:00 +0100 Subject: gnu: ibus: Update to 1.5.21. * gnu/packages/ibus.scm (ibus): Update to 1.5.21. --- gnu/packages/ibus.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 42a8d5db32..23cd670920 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -57,7 +57,7 @@ (define-module (gnu packages ibus) (define-public ibus (package (name "ibus") - (version "1.5.20") + (version "1.5.21") (source (origin (method url-fetch) (uri (string-append "https://github.com/ibus/ibus/" @@ -65,7 +65,7 @@ (define-public ibus version "/ibus-" version ".tar.gz")) (sha256 (base32 - "0d6hcbw6ai91jl87lqnyn8bxi5y5kba5i9nz7knknyh69g5fbwac")))) + "1fd2d1jqpp1nn74x04zcilhhab0zar82n0kg614rma6n43kfbhdd")))) (build-system glib-or-gtk-build-system) (arguments `(#:tests? #f ; tests fail because there's no connection to dbus -- cgit v1.2.3 From 7922b6f795eb575084546ec9bfb9d40508a9378e Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 2 Jan 2020 06:37:51 -0500 Subject: gnu: gnome: Add missing inputs. * gnu/packages/gnome.scm (gnome)[propagated-inputs]: Add gnome-getting-started-docs, gnome-menus, gnome-user-docs, hicolor-icon-theme, gnome-online-accounts. Signed-off-by: Efraim Flashner --- gnu/packages/gnome.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 9e2b0a4584..036547f471 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7279,8 +7279,9 @@ (define-public gnome (propagated-inputs ;; TODO: Add or remove packages according to: ;; . + `( ;; GNOME-Core-OS-Services - `(("accountsservice" ,accountsservice) + ("accountsservice" ,accountsservice) ("network-manager" ,network-manager) ("packagekit" ,packagekit) ("upower" ,upower) @@ -7292,12 +7293,15 @@ (define-public gnome ("gnome-bluetooth" ,gnome-bluetooth) ("gnome-control-center" ,gnome-control-center) ("gnome-desktop" ,gnome-desktop) + ("gnome-getting-started-docs" ,gnome-getting-started-docs) ("gnome-keyring" ,gnome-keyring) + ("gnome-menus" ,gnome-menus) ("gnome-session" ,gnome-session) ("gnome-settings-daemon" ,gnome-settings-daemon) ("gnome-shell-extensions" ,gnome-shell-extensions) ("gnome-shell" ,gnome-shell) ("gnome-themes-extra" ,gnome-themes-extra) + ("gnome-user-docs" ,gnome-user-docs) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("gvfs" ,gvfs) ("mutter" ,mutter) @@ -7324,7 +7328,10 @@ (define-public gnome ("nautilus" ,nautilus) ("simple-scan" ,simple-scan) ("totem" ,totem) - ("yelp" ,yelp))) + ("yelp" ,yelp) + ;; Others + ("hicolor-icon-theme" ,hicolor-icon-theme) + ("gnome-online-accounts" ,gnome-online-accounts))) (synopsis "The GNU desktop environment") (home-page "https://www.gnome.org/") (description -- cgit v1.2.3 From df23842156281821117b19511a29e65455195d34 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Thu, 2 Jan 2020 09:55:17 -0600 Subject: gnu: emacs-doom-themes: Update to 2.1.6-4. * gnu/packages/emacs-xyz.scm (emacs-doom-themes): Update to 2.1.6-4. This commit revision carries several bug fixes. --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 73e4654f84..457e76a668 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19814,8 +19814,8 @@ (define-public emacs-quasi-monochrome (license license:gpl3+)))) (define-public emacs-doom-themes - (let ((commit "c2d0ed3fe73e415d29e05d56da08ba41018eec4f") - (revision "3") + (let ((commit "54039c5171e3f8c9cef1f82122549b66cd8c8f7b") + (revision "4") (version "2.1.6")) (package (name "emacs-doom-themes") @@ -19827,7 +19827,7 @@ (define-public emacs-doom-themes (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "1bdi7dkddyn0s357v2jv0mlhgsyc66kcvbl01ly370pqia6r0gpc")))) + (base32 "1iwdjq4q2gkhi6jwas3ywgmdz5dg14sfb3fzhqd7wih6j3i2l3cr")))) (build-system emacs-build-system) (native-inputs `(("emacs-ert-runner" ,emacs-ert-runner))) -- cgit v1.2.3 From 638a108f4a4eb79493af60a52b58085805e8b0d3 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Thu, 2 Jan 2020 10:42:05 -0600 Subject: gnu: tdlib: Update to 1.5.4. * gnu/packages/messaging.scm (tdlib): Update to 1.5.4. --- gnu/packages/messaging.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 549ee28400..0378a864db 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -16,7 +16,7 @@ ;;; Copyright © 2018 Leo Famulari ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2019 Tanguy Le Carrour -;;; Copyright © 2019 Brett Gilio +;;; Copyright © 2019, 2020 Brett Gilio ;;; Copyright © 2019 Timotej Lazar ;;; ;;; This file is part of GNU Guix. @@ -1950,9 +1950,9 @@ (define-public telegram-purple (license license:gpl2+))) (define-public tdlib - (let ((commit "afca63a4f43531058a079e91eb5c81f54ad744b5") + (let ((commit "80c35676a2eb1e9b71db355ee217bba79fbdce31") (revision "1") - (version "1.5.0")) + (version "1.5.4")) (package (name "tdlib") (version (git-version version revision commit)) @@ -1963,7 +1963,7 @@ (define-public tdlib (commit commit))) (sha256 (base32 - "1aa3p4k32mfshgc6fv58gwg8pnaix39rv455hfx6znj7llr8na6k")) + "09c0pygqirapgxxzcc3sr0x67qhz8cx2klznrbdyi0118r9s8a7a")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments -- cgit v1.2.3 From 70848cd06c932538bc876b8422a5e45ae3cfd722 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Thu, 2 Jan 2020 10:42:32 -0600 Subject: gnu: tdlib: Configure build for RELEASE and LTO. * gnu/packages/messaging.scm (tdlib)[arguments]: Pass configuration flags that support the RELEASE build type, and add preliminary support for LTO. --- gnu/packages/messaging.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 0378a864db..3202bd2f44 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1968,6 +1968,9 @@ (define-public tdlib (build-system cmake-build-system) (arguments `(#:tests? #t + #:configure-flags + (list "-DCMAKE_BUILD_TYPE=Release" + "-DTD_ENABLE_LTO=OFF") ; FIXME: Get LTO to work. #:phases (modify-phases %standard-phases (add-after 'unpack 'remove-failing-tests -- cgit v1.2.3 From 2822a5830eb4f523dbf2018729ba8c498304bd5e Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 13 Dec 2019 21:05:36 -0800 Subject: gnu: Add rust-bstr-0.1. * gnu/packages/crates-io.scm (rust-bstr-0.1): 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 b4bb599dcc..ea2a6d8ec1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2019 Nicolas Goaziou ;;; Copyright © 2019 Giacomo Leidi ;;; Copyright © 2019 Tobias Geerinckx-Rice +;;; Copyright © 2019 John Soo ;;; ;;; This file is part of GNU Guix. ;;; @@ -244,6 +245,39 @@ (define-public rust-blas-sys-0.7 (license (list license:asl2.0 license:expat)))) +(define-public rust-bstr-0.1 + (package + (name "rust-bstr") + (version "0.1.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "bstr" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0nzi9vqhl56ws8gq39f3aj4qjrr4l3g5lbkkcj8xq1x4cb74wq2r")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-memchr" ,rust-memchr-2.2) + ("rust-regex-automata" ,rust-regex-automata-0.1) + ("rust-serde" ,rust-serde-1.0)) + #:cargo-development-inputs + (("rust-quickcheck" ,rust-quickcheck-0.8) + ("rust-ucd-parse" ,rust-ucd-parse-0.1) + ("rust-unicode-segmentation" ,rust-unicode-segmentation-1.3)))) + (home-page "https://github.com/BurntSushi/bstr") + (synopsis + "String type that is not required to be valid UTF-8") + (description + "This package provides a string type that is not required to be valid +UTF-8.") + (license (list license:expat license:asl2.0)))) + (define-public rust-cargon-0.0 (package (name "rust-cargon") -- cgit v1.2.3 From 4aba4213c1392b5a771d365cf6bd0c969f376ac5 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 13 Dec 2019 21:10:31 -0800 Subject: gnu: Add rust-bstr-0.2. * gnu/packages/crates-io.scm (rust-bstr-0.2): New variable. (rust-bstr-0.1): Inherit from rust-bstr-0.2. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ea2a6d8ec1..2e4769a901 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -245,10 +245,10 @@ (define-public rust-blas-sys-0.7 (license (list license:asl2.0 license:expat)))) -(define-public rust-bstr-0.1 +(define-public rust-bstr-0.2 (package (name "rust-bstr") - (version "0.1.4") + (version "0.2.1") (source (origin (method url-fetch) @@ -257,7 +257,7 @@ (define-public rust-bstr-0.1 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0nzi9vqhl56ws8gq39f3aj4qjrr4l3g5lbkkcj8xq1x4cb74wq2r")))) + "0prq6yk3da0k5bg2czcgg1i4ynsq1l59xc89ycsv6v7p08p5gh3c")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -278,6 +278,21 @@ (define-public rust-bstr-0.1 UTF-8.") (license (list license:expat license:asl2.0)))) +(define-public rust-bstr-0.1 + (package + (inherit rust-bstr-0.2) + (name "rust-bstr") + (version "0.1.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "bstr" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0nzi9vqhl56ws8gq39f3aj4qjrr4l3g5lbkkcj8xq1x4cb74wq2r")))))) + (define-public rust-cargon-0.0 (package (name "rust-cargon") -- cgit v1.2.3 From c155a3cf45e034c1fa7dfb98e1057399b211c311 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 13 Dec 2019 21:14:19 -0800 Subject: gnu: Add rust-globset-0.4. * gnu/packages/crates-io.scm (rust-globset-0.4): 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 2e4769a901..55b0867261 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1166,6 +1166,40 @@ (define-public rust-glob-0.2 (base32 "1ysvi72slkw784fcsymgj4308c3y03gwjjzqxp80xdjnkbh8vqcb")))))) +(define-public rust-globset-0.4 + (package + (name "rust-globset") + (version "0.4.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "globset" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1wnqxq91liknmr2w93wjq2spyxbrd1pmnhd4nbi3921dr35a4nlj")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-aho-corasick" ,rust-aho-corasick-0.7) + ("rust-bstr" ,rust-bstr-0.2) + ("rust-fnv" ,rust-fnv-1.0) + ("rust-log" ,rust-log-0.4) + ("rust-regex" ,rust-regex-1.1)) + #:cargo-development-inputs + (("rust-glob" ,rust-glob-0.3)))) + (home-page + "https://github.com/BurntSushi/ripgrep/tree/master/globset") + (synopsis + "Cross platform single glob and glob set matching") + (description + "Cross platform single glob and glob set matching. Glob set matching is +the process of matching one or more glob patterns against a single candidate +path simultaneously, and returning all of the globs that matched.") + (license (list license:expat license:unlicense)))) + (define-public rust-heapsize-0.4 (package (name "rust-heapsize") -- cgit v1.2.3 From 8d0568fec5c5ee3a38864dfe52d428d181e3d8dc Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 13 Dec 2019 20:48:30 -0800 Subject: gnu: Add rust-serde-test-1.0. * gnu/packages/crates-io.scm (rust-serde-test-1.0): 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 55b0867261..b7247f53c0 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3399,6 +3399,34 @@ (define-public rust-serde-json-1.0 (properties '((hidden? . #t))) (license (list license:expat license:asl2.0)))) +(define-public rust-serde-test-1.0 + (package + (name "rust-serde-test") + (version "1.0.101") + (source + (origin + (method url-fetch) + (uri (crate-uri "serde_test" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0070ycbh47yhxb5vxwa15vi2wpdkw3v1m14v4mjryz1568fqkbsa")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-serde" ,rust-serde-1.0)) + #:cargo-development-inputs + (("rust-serde" ,rust-serde-1.0) + ("rust-serde-derive" ,rust-serde-derive-1.0)))) + (home-page "https://serde.rs") + (synopsis + "Token De/Serializer for testing De/Serialize implementations") + (description + "Token De/Serializer for testing De/Serialize implementations.") + (license (list license:expat license:asl2.0)))) + (define-public rust-shlex-0.1 (package (name "rust-shlex") -- cgit v1.2.3 From 6f9050865bb87a43a0dca8afbccedbcd47850ee5 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 13 Dec 2019 21:49:36 -0800 Subject: gnu: Add rust-pcre2-sys-0.2. * gnu/packages/crates-io.scm (rust-pcre2-sys-0.2): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b7247f53c0..59fd6c9149 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2311,6 +2311,32 @@ (define-public rust-parity-wasm-0.40 (license (list license:asl2.0 license:expat)))) +(define-public rust-pcre2-sys-0.2 + (package + (name "rust-pcre2-sys") + (version "0.2.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "pcre2-sys" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0nwdvc43dkb89qmm5q8gw1zyll0wsfqw7kczpn23mljra3874v47")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-pkg-config" ,rust-pkg-config-0.3) + ("rust-cc" ,rust-cc-1.0)))) + (home-page + "https://github.com/BurntSushi/rust-pcre2") + (synopsis "Low level bindings to PCRE2") + (description "Low level bindings to PCRE2.") + (license (list license:expat license:unlicense)))) + (define-public rust-peeking-take-while-0.1 (package (name "rust-peeking-take-while") -- cgit v1.2.3 From 0cb1001329fd41d54e62496ed2e992187f89e453 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 13 Dec 2019 21:29:49 -0800 Subject: gnu: Add rust-grep-cli-0.1. * gnu/packages/crates-io.scm (rust-grep-cli-0.1): 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 59fd6c9149..24e82e0034 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1200,6 +1200,40 @@ (define-public rust-globset-0.4 path simultaneously, and returning all of the globs that matched.") (license (list license:expat license:unlicense)))) +(define-public rust-grep-cli-0.1 + (package + (name "rust-grep-cli") + (version "0.1.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "grep-cli" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "05a502x5m4fijwx7zj9icxna2dx86scm76ap80zr89pnvpbfk1hp")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-atty" ,rust-atty-0.2) + ("rust-bstr" ,rust-bstr-0.2) + ("rust-globset" ,rust-globset-0.4) + ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-log" ,rust-log-0.4) + ("rust-regex" ,rust-regex-1.1) + ("rust-same-file" ,rust-same-file-1.0) + ("rust-termcolor" ,rust-termcolor-1.0) + ("rust-winapi-util" ,rust-winapi-util-0.1)))) + (home-page + "https://github.com/BurntSushi/ripgrep") + (synopsis + "Utilities for search oriented command line applications") + (description + "Utilities for search oriented command line applications.") + (license license:expat))) + (define-public rust-heapsize-0.4 (package (name "rust-heapsize") -- cgit v1.2.3 From bc0d1bb7183e2c5ba7a462d6e4d26a2307dcfdde Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 13 Dec 2019 21:52:17 -0800 Subject: gnu: Add rust-pcre2-0.2. * gnu/packages/crates-io.scm (rust-pcre2-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 24e82e0034..6a038fbe5b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2345,6 +2345,35 @@ (define-public rust-parity-wasm-0.40 (license (list license:asl2.0 license:expat)))) +(define-public rust-pcre2-0.2 + (package + (name "rust-pcre2") + (version "0.2.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "pcre2" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "103i66a998g1fjrqf9sdyvi8qi83hwglz3pjdcq9n2r207hsagb0")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build #t + #:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-log" ,rust-log-0.4) + ("rust-pcre2-sys" ,rust-pcre2-sys-0.2) + ("rust-thread-local" ,rust-thread-local-0.3)))) + (home-page + "https://github.com/BurntSushi/rust-pcre2") + (synopsis + "High level wrapper library for PCRE2") + (description + "High level wrapper library for PCRE2.") + (license (list license:expat license:unlicense)))) + (define-public rust-pcre2-sys-0.2 (package (name "rust-pcre2-sys") -- cgit v1.2.3 From 583a5fdfeb66d36582e3ba3ebcd3c3a12580b2aa Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 13 Dec 2019 21:25:02 -0800 Subject: gnu: Add rust-regex-1.1. * gnu/packages/crates-io.scm (rust-regex-1.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 45 +++++++++++++++++++++++++++++++++++++++------ 1 file changed, 39 insertions(+), 6 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6a038fbe5b..6296ce25a9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2360,18 +2360,16 @@ (define-public rust-pcre2-0.2 "103i66a998g1fjrqf9sdyvi8qi83hwglz3pjdcq9n2r207hsagb0")))) (build-system cargo-build-system) (arguments - `(#:skip-build #t + `(#:skip-build? #t #:cargo-inputs (("rust-libc" ,rust-libc-0.2) ("rust-log" ,rust-log-0.4) ("rust-pcre2-sys" ,rust-pcre2-sys-0.2) ("rust-thread-local" ,rust-thread-local-0.3)))) - (home-page - "https://github.com/BurntSushi/rust-pcre2") - (synopsis - "High level wrapper library for PCRE2") + (home-page "https://github.com/BurntSushi/rust-pcre2") + (synopsis "High level wrapper library for PCRE2") (description - "High level wrapper library for PCRE2.") + "This package provides a high level wrapper library for PCRE2.") (license (list license:expat license:unlicense)))) (define-public rust-pcre2-sys-0.2 @@ -3035,6 +3033,41 @@ (define-public rust-redox-termios-0.1 (properties '((hidden? . #t))) (license license:expat))) +(define-public rust-regex-1.1 + (package + (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")))) + (build-system cargo-build-system) + (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)))) + (home-page "https://github.com/rust-lang/regex") + (synopsis + "Regular expressions for Rust") + (description + "An implementation of regular expressions for Rust. This implementation +uses finite automata and guarantees linear time matching on all inputs.") + (license (list license:expat license:asl2.0)))) + (define-public rust-regex-syntax-0.6 (package (name "rust-regex-syntax") -- cgit v1.2.3 From 73dd517dfc4b025fd826301bd5113511d5bb8358 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 13 Dec 2019 22:00:54 -0800 Subject: gnu: Add rust-memchr-2.2. * gnu/packages/crates-io.scm (rust-memchr-2.2): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6296ce25a9..52b9429a50 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1805,6 +1805,32 @@ (define-public rust-md5-0.6 (license (list license:asl2.0 license:expat)))) +(define-public rust-memchr-2.2 + (package + (name "rust-memchr") + (version "2.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "memchr" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0f8wdra7yaggsr4jzlrvpd8yknnqhd990iijdr6llgc8gk2ppz1f")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build #t + #:cargo-inputs + (("rust-libc" ,rust-libc-0.2)) + #:cargo-development-inputs + (("rust-quickcheck" ,rust-quickcheck-0.8)))) + (home-page + "https://github.com/BurntSushi/rust-memchr") + (synopsis "Safe interface to memchr") + (description "Safe interface to memchr.") + (license (list license:expat license:unlicense)))) + (define-public rust-memmap-0.7 (package (name "rust-memmap") @@ -3048,7 +3074,7 @@ (define-public rust-regex-1.1 "1pabajpp0wzb7dm2x32gy8w7k0mwykr6zsvzn0fgpr6pww40hbqb")))) (build-system cargo-build-system) (arguments - `(#:skip-build #t + `(#:skip-build? #t #:cargo-inputs (("rust-aho-corasick" ,rust-aho-corasick-0.7) ("rust-memchr" ,rust-memchr-2.2) @@ -3061,8 +3087,7 @@ (define-public rust-regex-1.1 ("rust-quickcheck" ,rust-quickcheck-0.8) ("rust-rand" ,rust-rand-0.4)))) (home-page "https://github.com/rust-lang/regex") - (synopsis - "Regular expressions for Rust") + (synopsis "Regular expressions for Rust") (description "An implementation of regular expressions for Rust. This implementation uses finite automata and guarantees linear time matching on all inputs.") -- cgit v1.2.3 From 5d183b9fe80cf22e0f9636e68ffd2176f93f7eab Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 13 Dec 2019 22:02:08 -0800 Subject: gnu: Add rust-memchr-1.0. * gnu/packages/crates-io.scm (rust-memchr-1.0): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 52b9429a50..1ada30afec 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1831,6 +1831,21 @@ (define-public rust-memchr-2.2 (description "Safe interface to memchr.") (license (list license:expat license:unlicense)))) +(define-public rust-memchr-1.0 + (package + (inherit rust-memchr-2.2) + (name "rust-memchr") + (version "1.0.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "memchr" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0yjyja34pzhipdl855q3m21w1lyih4lw79x2dp3czwdla4pap3ql")))))) + (define-public rust-memmap-0.7 (package (name "rust-memmap") -- cgit v1.2.3 From cc657be8da6a6a28e79d708ac34377f3ac3d9239 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 13 Dec 2019 22:32:13 -0800 Subject: gnu: Add rust-bincode-1.1. * gnu/packages/crates-io.scm (rust-bincode-1.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1ada30afec..6ef16db087 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -203,6 +203,37 @@ (define-public rust-bencher-0.1 (license (list license:asl2.0 license:expat)))) +(define-public rust-bincode-1.1 + (package + (name "rust-bincode") + (version "1.1.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "bincode" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1xx6bp39irvsndk6prnmmq8m1l9p6q2qj21j6mfks2y81pjsa14z")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-autocfg" ,rust-autocfg-0.1) + ("rust-byteorder" ,rust-byteorder-1.3) + ("rust-serde" ,rust-serde-1.0)) + #:cargo-development-inputs + (("rust-serde-bytes" ,rust-serde-bytes-0.11) + ("rust-serde-derive" ,rust-serde-derive-1.0)))) + (home-page "https://github.com/servo/bincode") + (synopsis + "Binary serialization/deserialization strategy") + (description + "This package provides a binary serialization/deserialization strategy +that uses Serde for transforming structs into bytes and vice versa!") + (license license:expat))) + (define-public rust-bitflags-1 (package (name "rust-bitflags") -- cgit v1.2.3 From 352741cdbbee9d208915e1266c9a6551f58bf0aa Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 13 Dec 2019 22:35:54 -0800 Subject: gnu: Add rust-chrono-0.4. * gnu/packages/crates-io.scm (rust-chrono-0.4): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6ef16db087..1c735b8e7a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -389,6 +389,41 @@ (define-public rust-cc-1.0 (license (list license:asl2.0 license:expat)))) +(define-public rust-chrono-0.4 + (package + (name "rust-chrono") + (version "0.4.7") + (source + (origin + (method url-fetch) + (uri (crate-uri "chrono" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1glam3iqhshbamzgf0npn7hgghski92r31lm7gg8841hnxc1zn3p")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-num-integer" ,rust-num-integer-0.1) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-rustc-serialize" ,rust-rustc-serialize-0.3) + ("rust-serde" ,rust-serde-1.0) + ("rust-time" ,rust-time-0.1)) + #:cargo-development-inputs + (("rust-bincode" ,rust-bincode-1.1) + ("rust-doc-comment" ,rust-doc-comment-0.3) + ("rust-num-iter" ,rust-num-iter-0.1) + ("rust-serde-derive" ,rust-serde-derive-1.0) + ("rust-serde-json" ,rust-serde-json-1.0)))) + (home-page + "https://github.com/chronotope/chrono") + (synopsis "Date and time library for Rust") + (description "Date and time library for Rust.") + (license (list license:expat license:asl2.0)))) + (define-public rust-cfg-if-0.1 (package (name "rust-cfg-if") -- cgit v1.2.3 From e398ecc48dfceecc8da7e7f5e04c1d11a869b6f2 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 13 Dec 2019 22:38:30 -0800 Subject: gnu: Add rust-humantime-1.2. * gnu/packages/crates-io.scm (rust-humantime-1.2): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1c735b8e7a..c08964b198 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1379,6 +1379,37 @@ (define-public rust-hex-0.3 (license (list license:asl2.0 license:expat)))) +(define-public rust-humantime-1.2 + (package + (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")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-quick-error" ,rust-quick-error-1.2)) + #:cargo-development-inputs + (("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") + (synopsis + "Parser and formatter for Duration and SystemTime") + (description + "A parser and formatter for @code{std::time::{Duration, +SystemTime}}.") + (license (list license:expat license:asl2.0)))) + (define-public rust-hostname-0.1 (package (name "rust-hostname") -- cgit v1.2.3 From 45c312f66d3b36e08bba2f6a6359d93979eae2a1 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 13 Dec 2019 22:29:51 -0800 Subject: gnu: Add rust-serde-bytes-0.11. * gnu/packages/crates-io.scm (rust-serde-bytes-0.11): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c08964b198..8f58071c5a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3617,6 +3617,37 @@ (define-public rust-serde-1.0 (properties '((hidden? . #t))) (license (list license:expat license:asl2.0)))) +;; Circular dev dependency on bincode. +;; Probably not going away: https://github.com/rust-lang/cargo/issues/4242 +(define-public rust-serde-bytes-0.11 + (package + (name "rust-serde-bytes") + (version "0.11.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "serde_bytes" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1bl45kf3c71xclv7wzk5525nswm4bgsnjd3s1s15f4k2a8whfnij")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-serde" ,rust-serde-1.0)) + #:cargo-development-inputs + (("rust-bincode" ,rust-bincode-1.1) + ("rust-serde-derive" ,rust-serde-derive-1.0) + ("rust-serde-test" ,rust-serde-test-1.0)))) + (home-page "https://github.com/serde-rs/bytes") + (synopsis + "Hanlde of integer arrays and vectors for Serde") + (description + "Optimized handling of @code{&[u8]} and @code{Vec} for Serde.") + (license (list license:expat license:asl2.0)))) + (define-public rust-serde-derive-1.0 (package (name "rust-serde-derive") -- cgit v1.2.3 From 85e7ee5329fba7f3887540e064cdc5915fc89e7e Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 13 Dec 2019 22:41:23 -0800 Subject: gnu: Add rust-env-logger-0.6. * gnu/packages/crates-io.scm (rust-env-logger-0.6): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 8f58071c5a..cd23bb54c3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -834,6 +834,37 @@ (define-public rust-dtoa-0.2 (base32 "0g96cap6si1g6wi62hsdk2fnj3sf5vd4i97zj6163j8hhnsl3n0d")))))) +(define-public rust-env-logger-0.6 + (package + (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")))) + (build-system cargo-build-system) + (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)))) + (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-fallible-iterator-0.2 (package (name "rust-fallible-iterator") -- cgit v1.2.3 From 77032bf7045abd6068d6ad2689fa1d1b9b0eb2b8 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 13 Dec 2019 22:44:11 -0800 Subject: gnu: Add rust-rand-core-0.5. 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 cd23bb54c3..5b1e27e905 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2953,6 +2953,33 @@ (define-public rust-rand-chacha-0.1 (license (list license:asl2.0 license:expat)))) +(define-public rust-rand-core-0.5 + (package + (name "rust-rand-core") + (version "0.5.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rand_core" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1jis94x9ri8xlxki2w2w5k29sjpfwgzkjylg7paganp74hrnhpk1")))) + (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)))) + (home-page "https://crates.io/crates/rand-core") + (synopsis + "Core random number generator traits and tools for implementation") + (description + "Core random number generator traits and tools for implementation.") + (license (list license:expat license:asl2.0)))) + (define-public rust-rand-core-0.4 (package (name "rust-rand-core") -- cgit v1.2.3 From 55e6486224de711a158ea3818f9f76e0839726f3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 30 Dec 2019 20:48:31 +0200 Subject: gnu: rust-rand-core-0.4: Update package. * gnu/packages/crates-io.scm (rust-rand-core-0.4)[inherit]: New field, inherit from rust-rand-core-0.5. [arguments]: Skip build, add #:cargo-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5b1e27e905..44bdc96beb 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2982,6 +2982,7 @@ (define-public rust-rand-core-0.5 (define-public rust-rand-core-0.4 (package + (inherit rust-rand-core-0.5) (name "rust-rand-core") (version "0.4.2") (source @@ -2992,15 +2993,11 @@ (define-public rust-rand-core-0.4 (sha256 (base32 "1p09ynysrq1vcdlmcqnapq4qakl2yd1ng3kxh3qscpx09k2a6cww")))) - (build-system cargo-build-system) - (home-page "https://crates.io/crates/rand_core") - (synopsis - "Core random number generator traits and tools for implementation.") - (description - "Core random number generator traits and tools for implementation.") - (properties '((hidden? . #t))) - (license (list license:asl2.0 - license:expat)))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-serde" ,rust-serde-1.0) + ("rust-serde-derive" ,rust-serde-derive-1.0)))))) (define-public rust-rand-core-0.3 (package -- cgit v1.2.3 From 432e9b00da453f31992fd3642da14324a1f5e169 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 13 Dec 2019 22:47:53 -0800 Subject: gnu: Add rust-quickcheck-0.8. * gnu/packages/crates-io.scm (rust-quickcheck-0.8): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 44bdc96beb..6aa5e4be22 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2850,6 +2850,37 @@ (define-public rust-quick-error-1.2 (license (list license:asl2.0 license:expat)))) +;; Many circular dependencies. +;; Dev dependencies are allowed to have them in crates.io. +(define-public rust-quickcheck-0.8 + (package + (name "rust-quickcheck") + (version "0.8.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "quickcheck" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0mkl4wnvvjk4m32aq3an4ayfyvnmbxnzcybfm7n3fbsndb1xjdcw")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-env-logger" ,rust-env-logger-0.6) + ("rust-log" ,rust-log-0.4) + ("rust-rand" ,rust-rand-0.4) + ("rust-rand-core" ,rust-rand-core-0.5)))) + (home-page + "https://github.com/BurntSushi/quickcheck") + (synopsis + "Automatic property based testing with shrinking") + (description + "Automatic property based testing with shrinking.") + (license (list license:expat license:unlicense)))) + (define-public rust-quote-1.0 (package (name "rust-quote") -- cgit v1.2.3 From 3e240e15e54ad613faedb4f27f689f2a7054d29e Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 13 Dec 2019 22:54:55 -0800 Subject: gnu: Add rust-grep-pcre2-0.1. * gnu/packages/crates-io.scm (rust-grep-pcre2-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6aa5e4be22..a2c40fc787 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1331,6 +1331,31 @@ (define-public rust-grep-cli-0.1 "Utilities for search oriented command line applications.") (license license:expat))) +(define-public rust-grep-pcre2-0.1 + (package + (name "rust-grep-pcre2") + (version "0.1.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "grep-pcre2" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1wjc3gsan20gapga8nji6jcrmwn9n85q5zf2yfq6g50c7abkc2ql")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-grep-matcher" ,rust-grep-matcher-0.1) + ("rust-pcre2" ,rust-pcre2-0.2)))) + (home-page + "https://github.com/BurntSushi/ripgrep") + (synopsis "Use PCRE2 with the grep crate") + (description "Use PCRE2 with the grep crate.") + (license (list license:expat license:unlicense)))) + (define-public rust-heapsize-0.4 (package (name "rust-heapsize") @@ -1948,7 +1973,7 @@ (define-public rust-memchr-2.2 "0f8wdra7yaggsr4jzlrvpd8yknnqhd990iijdr6llgc8gk2ppz1f")))) (build-system cargo-build-system) (arguments - `(#:skip-build #t + `(#:skip-build? #t #:cargo-inputs (("rust-libc" ,rust-libc-0.2)) #:cargo-development-inputs @@ -1956,7 +1981,8 @@ (define-public rust-memchr-2.2 (home-page "https://github.com/BurntSushi/rust-memchr") (synopsis "Safe interface to memchr") - (description "Safe interface to memchr.") + (description "The @code{memchr} crate provides heavily optimized routines +for searching bytes.") (license (list license:expat license:unlicense)))) (define-public rust-memchr-1.0 -- cgit v1.2.3 From ef46db38a9527e9bd4b7489d5bed41cf10820955 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 13 Dec 2019 22:53:24 -0800 Subject: gnu: Add rust-grep-matcher-0.1. * gnu/packages/crates-io.scm (rust-grep-matcher-0.1): 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 a2c40fc787..6187a57763 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1331,6 +1331,34 @@ (define-public rust-grep-cli-0.1 "Utilities for search oriented command line applications.") (license license:expat))) +(define-public rust-grep-matcher-0.1 + (package + (name "rust-grep-matcher") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "grep-matcher" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "03j26zygfgwyam66bl5g922gimrvp4yyzl8qvaykyklnf247bl3r")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-memchr" ,rust-memchr-2.2)) + #:cargo-development-inputs + (("rust-regex" ,rust-regex-1.1)))) + (home-page "https://github.com/BurntSushi/ripgrep") + (synopsis "Trait for regular expressions") + (description + "This crate provides a low level interface for describing regular +expression matchers. The @code{grep} crate uses this interface in order to make +the regex engine it uses pluggable.") + (license (list license:expat license:unlicense)))) + (define-public rust-grep-pcre2-0.1 (package (name "rust-grep-pcre2") -- cgit v1.2.3 From 141397564e0bccaad0ea7502fd4fab23cd81bd6b Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 13 Dec 2019 22:50:39 -0800 Subject: gnu: Add rust-byteorder-1.3. * gnu/packages/crates-io.scm (rust-byteorder-1.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 6187a57763..ab4a5efb8a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -324,6 +324,35 @@ (define-public rust-bstr-0.1 (base32 "0nzi9vqhl56ws8gq39f3aj4qjrr4l3g5lbkkcj8xq1x4cb74wq2r")))))) +(define-public rust-byteorder-1.3 + (package + (name "rust-byteorder") + (version "1.3.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "byteorder" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1xbwjlmq2ziqjmjvkqxdx1yh136xxhilxd40bky1w4d7hn4xvhx7")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-development-inputs + (("rust-doc-comment" ,rust-doc-comment-0.3) + ("rust-quickcheck" ,rust-quickcheck-0.8) + ("rust-rand" ,rust-rand-0.4)))) + (home-page + "https://github.com/BurntSushi/byteorder") + (synopsis + "Reading/writing numbers in big-endian and little-endian") + (description + "Library for reading/writing numbers in big-endian and +little-endian.") + (license (list license:expat license:unlicense)))) + (define-public rust-cargon-0.0 (package (name "rust-cargon") -- cgit v1.2.3 From 472685a7e981b5d051368cab068ba9bb72fcb569 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 13 Dec 2019 23:02:49 -0800 Subject: gnu: Add rust-cast-0.2. * gnu/packages/crates-io.scm (rust-cast-0.2): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ab4a5efb8a..32afcca89b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -374,6 +374,31 @@ (define-public rust-cargon-0.0 (properties '((hidden? . #t))) (license license:wtfpl2))) +(define-public rust-cast-0.2 + (package + (name "rust-cast") + (version "0.2.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "cast" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "09yl2700crxa4n860b080msij25klvs1kfzazhp2aihchvr16q4j")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-development-inputs + (("rust-quickcheck" ,rust-quickcheck-0.8)))) + (home-page "https://github.com/japaric/cast.rs") + (synopsis + "Ergonomic, checked cast functions for primitive types") + (description + "Ergonomic, checked cast functions for primitive types.") + (license (list license:expat license:asl2.0)))) + (define-public rust-cblas-sys-0.1 (package (name "rust-cblas-sys") -- cgit v1.2.3 From 9b114884c84a4e502949fac6609b56b5f826f859 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 13 Dec 2019 23:09:01 -0800 Subject: gnu: Add rust-either-1.5. * gnu/packages/crates-io.scm (rust-either-1.5): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 32afcca89b..a7c8a90651 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -888,6 +888,31 @@ (define-public rust-dtoa-0.2 (base32 "0g96cap6si1g6wi62hsdk2fnj3sf5vd4i97zj6163j8hhnsl3n0d")))))) +(define-public rust-either-1.5 + (package + (name "rust-either") + (version "1.5.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "either" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0yyggfd5yq9hyyp0bd5jj0fgz3rwws42d19ri0znxwwqs3hcy9sm")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs (("rust-serde" ,rust-serde-1.0)))) + (home-page "https://github.com/bluss/either") + (synopsis + "Enum @code{Either} with variants @code{Left} and @code{Right}") + (description + "The enum @code{Either} with variants @code{Left} and +@code{Right} is a general purpose sum type with two cases.") + (license (list license:expat license:asl2.0)))) + (define-public rust-env-logger-0.6 (package (name "rust-env-logger") -- cgit v1.2.3 From 3885163bdd3774649277ceadaf527b8f759ba1f1 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 13 Dec 2019 23:14:40 -0800 Subject: gnu: Add rust-itertools-0.8. * gnu/packages/crates-io.scm (rust-itertools-0.8): 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 a7c8a90651..a437a5a4e1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1614,6 +1614,36 @@ (define-public rust-iovec-0.1 (license (list license:asl2.0 license:expat)))) +(define-public rust-itertools-0.8 + (package + (name "rust-itertools") + (version "0.8.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "itertools" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0n2k13b6w4x2x6np2lykh9bj3b3z4hwh2r4cn3z2dgnfq7cng12v")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-either" ,rust-either-1.5)) + #:cargo-development-inputs + (("rust-permutohedron" ,rust-permutohedron-0.2) + ("rust-quickcheck" ,rust-quickcheck-0.8) + ("rust-rand" ,rust-rand-0.4)))) + (home-page + "https://github.com/rust-itertools/itertools") + (synopsis + "Extra iterator adaptors, iterator methods, free functions, and macros") + (description + "Extra iterator adaptors, iterator methods, free functions, and macros.") + (license (list license:expat license:asl2.0)))) + (define-public rust-itoa-0.4 (package (name "rust-itoa") -- cgit v1.2.3 From d59e13641cdc4cddf82c31d22c23ed62ddee2c72 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 13 Dec 2019 23:17:08 -0800 Subject: gnu: Add rust-itertools-num-0.1. * gnu/packages/crates-io.scm (rust-itertools-num-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 a437a5a4e1..bb15f89e33 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1644,6 +1644,36 @@ (define-public rust-itertools-0.8 "Extra iterator adaptors, iterator methods, free functions, and macros.") (license (list license:expat license:asl2.0)))) +(define-public rust-itertools-num-0.1 + (package + (name "rust-itertools-num") + (version "0.1.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "itertools-num" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1rr7ig9nkpampcas23s91x7yac6qdnwssq3nap522xbgkqps4wm8")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-num-traits" ,rust-num-traits-0.2)) + #:cargo-development-inputs + (("rust-itertools" ,rust-itertools-0.8) + ("rust-quickcheck" ,rust-quickcheck-0.8)))) + (home-page + "https://github.com/bluss/itertools-num") + (synopsis + "Numerical iterator tools") + (description + "Numerical iterator tools. Extra iterators and iterator methods +and functions.") + (license (list license:expat license:asl2.0)))) + (define-public rust-itoa-0.4 (package (name "rust-itoa") -- cgit v1.2.3 From 7f87d5b5cde8ca0a1915168cf154a9557bd40ed4 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 13 Dec 2019 23:20:05 -0800 Subject: gnu: Add rust-num-complex-0.2. * gnu/packages/crates-io.scm (rust-num-complex-0.2): 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 bb15f89e33..4af6fca539 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2469,6 +2469,36 @@ (define-public rust-nodrop-union-0.1 (license (list license:asl2.0 license:expat)))) +(define-public rust-num-complex-0.2 + (package + (name "rust-num-complex") + (version "0.2.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "num-complex" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1z6zjdzx1g1hj4y132ddy83d3p3zvw06igbf59npxxrzzcqwzc7w")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-num-traits" ,rust-num-traits-0.2) + ("rust-rand" ,rust-rand-0.4) + ("rust-serde" ,rust-serde-1.0)) + #:cargo-development-inputs + (("rust-autocfg" ,rust-autocfg-0.1)))) + (home-page + "https://github.com/rust-num/num-complex") + (synopsis + "Complex numbers implementation for Rust") + (description + "Complex numbers implementation for Rust.") + (license (list license:expat license:asl2.0)))) + (define-public rust-num-cpus-1.10 (package (name "rust-num-cpus") -- cgit v1.2.3 From 5377314f86c89abe0c637d91ccaabaf084d4429d Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 13 Dec 2019 23:22:25 -0800 Subject: gnu: Add rust-criterion-plot-0.3. * gnu/packages/crates-io.scm (rust-criterion-plot-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 4af6fca539..4cc61c0c02 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -698,6 +698,35 @@ (define-public rust-core-foundation-sys-0.6 (license (list license:asl2.0 license:expat)))) +(define-public rust-criterion-plot-0.3 + (package + (name "rust-criterion-plot") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "criterion-plot" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "13pv09z4ryp70qyzablkibwa2mh6c2852qq1sjr9wjigvwnj3ybn")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-byteorder" ,rust-byteorder-1.3) + ("rust-cast" ,rust-cast-0.2) + ("rust-itertools" ,rust-itertools-0.8)) + #:cargo-development-inputs + (("rust-itertools-num" ,rust-itertools-num-0.1) + ("rust-num-complex" ,rust-num-complex-0.2) + ("rust-rand" ,rust-rand-0.4)))) + (home-page "https://github.com/bheisler/criterion.rs") + (synopsis "Criterion's plotting library") + (description "Criterion's plotting library.") + (license (list license:expat license:asl2.0)))) + (define-public rust-curl-sys-0.4 (package (name "rust-curl-sys") -- cgit v1.2.3 From fb17428e64718367a7076eb6f801cf9d7d09cccf Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 13 Dec 2019 23:39:01 -0800 Subject: gnu: Add rust-arrayvec-0.4. * gnu/packages/crates-io.scm (rust-arrayvec-0.4): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4cc61c0c02..79fbccdef1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -97,6 +97,37 @@ (define-public rust-antidote-1.0 (license (list license:asl2.0 license:expat)))) +(define-public rust-arrayvec-0.4 + (package + (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")))) + (build-system cargo-build-system) + (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)))) + (home-page "https://github.com/bluss/arrayvec") + (synopsis "Vector with fixed capacity") + (description + "This package provides a vector with fixed capacity, backed by an +array (it can be stored on the stack too). Implements fixed capacity +ArrayVec and ArrayString.") + (license (list license:expat license:asl2.0)))) + (define-public rust-atty-0.2 (package (name "rust-atty") -- cgit v1.2.3 From b96b4d3e267ca2d3bf2394f40c9af1b92ff338f7 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 13 Dec 2019 23:40:43 -0800 Subject: gnu: Add rust-csv-core-0.1. * gnu/packages/crates-io.scm (rust-csv-core-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 79fbccdef1..94b1a8d2ab 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -758,6 +758,33 @@ (define-public rust-criterion-plot-0.3 (description "Criterion's plotting library.") (license (list license:expat license:asl2.0)))) +(define-public rust-csv-core-0.1 + (package + (name "rust-csv-core") + (version "0.1.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "csv-core" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0k5zs0x0qmmn27pa5kcg86lg84s29491fw5sh3zswxswnavasp4v")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-memchr" ,rust-memchr-2.2)) + #:cargo-development-inputs + (("rust-arrayvec" ,rust-arrayvec-0.4)))) + (home-page "https://github.com/BurntSushi/rust-csv") + (synopsis + "Bare bones CSV parsing with no_std support") + (description + "Bare bones CSV parsing with no_std support.") + (license (list license:unlicense license:expat)))) + (define-public rust-curl-sys-0.4 (package (name "rust-curl-sys") -- cgit v1.2.3 From 0533bf006d776178b037bd727f149c4080513ca0 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 09:46:40 -0800 Subject: gnu: Add rust-utf8-ranges-1.0. * gnu/packages/crates-io.scm (rust-utf8-ranges-1.0): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 94b1a8d2ab..cd38f33b51 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5076,6 +5076,32 @@ (define-public rust-untrusted-0.7 (properties '((hidden? . #t))) (license license:isc))) +(define-public rust-utf8-ranges-1.0 + (package + (name "rust-utf8-ranges") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "utf8-ranges" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1ppzjsxmv1p1xfid8wwn07ciikk84k30frl28bwsny6za1vall4x")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-development-inputs + (("rust-doc-comment" ,rust-doc-comment-0.3) + ("rust-quickcheck" ,rust-quickcheck-0.8)))) + (home-page "https://github.com/BurntSushi/utf8-ranges") + (synopsis + "Convert ranges of Unicode codepoints to UTF-8 byte ranges") + (description + "Convert ranges of Unicode codepoints to UTF-8 byte ranges.") + (license (list license:expat license:unlicense)))) + (define-public rust-vcpkg-0.2 (package (name "rust-vcpkg") -- cgit v1.2.3 From 33c947de3916a4471d0e7f75978bdbbe0f6103ed Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 09:50:53 -0800 Subject: gnu: Add rust-regex-automata-0.1. * gnu/packages/crates-io.scm (rust-regex-automata-0.1): 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 cd38f33b51..3d3ef3154c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3601,6 +3601,40 @@ (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-automata-0.1 + (package + (name "rust-regex-automata") + (version "0.1.7") + (source + (origin + (method url-fetch) + (uri (crate-uri "regex-automata" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "11hzn3rz02vdgvx3ykhrbzkvs5c5sm59fyi3xwljn9qc48br5l1y")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-byteorder" ,rust-byteorder-1.3) + ("rust-regex-syntax" ,rust-regex-syntax-0.6) + ("rust-utf8-ranges" ,rust-utf8-ranges-1.0)) + #:cargo-development-inputs + (("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-regex" ,rust-regex-1.1) + ("rust-serde" ,rust-serde-1.0) + ("rust-serde-bytes" ,rust-serde-bytes-0.11) + ("rust-serde-derive" ,rust-serde-derive-1.0) + ("rust-toml" ,rust-toml-0.5)))) + (home-page "https://github.com/BurntSushi/regex-automata") + (synopsis + "Automata construction and matching using regular expressions") + (description + "Automata construction and matching using regular expressions.") + (license (list license:expat license:unlicense)))) + (define-public rust-regex-syntax-0.6 (package (name "rust-regex-syntax") -- cgit v1.2.3 From 6180193a2f8ebeb9e1e821db179a91628ad04d8c Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 09:58:51 -0800 Subject: gnu: Add rust-futures-channel-preview-0.3. * gnu/packages/crates-io.scm (rust-futures-channel-preview-0.3): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3d3ef3154c..d406f276d1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1263,6 +1263,31 @@ (define-public rust-futures-0.1 (license (list license:asl2.0 license:expat)))) +(define-public rust-futures-channel-preview-0.3 + (package + (name "rust-futures-channel-preview") + (version "0.3.0-alpha.17") + (source + (origin + (method url-fetch) + (uri (crate-uri "futures-channel-preview" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1blgpikhw391lzrfqcgg4xsn5xc0dlybni77ka7f0vb08zaixir1")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-futures-core-preview" ,rust-futures-core-preview-0.3)))) + (home-page "https://rust-lang.github.io/futures-rs/") + (synopsis + "Channels for asynchronous communication using futures-rs") + (description + "Channels for asynchronous communication using futures-rs.") + (license (list license:expat license:asl2.0)))) + (define-public rust-futures-core-preview-0.3 (package (name "rust-futures-core-preview") -- cgit v1.2.3 From 4b185ecc3cd87315f01781ca9d9f21f9a8eae9c4 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 10:03:09 -0800 Subject: gnu: Add rust-futures-executor-preview-0.3. * gnu/packages/crates-io.scm (rust-futures-executor-preview-0.3): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d406f276d1..b15ce0d215 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1331,6 +1331,36 @@ (define-public rust-futures-cpupool-0.1 (license (list license:asl2.0 license:expat)))) +(define-public rust-futures-executor-preview-0.3 + (package + (name "rust-futures-executor-preview") + (version "0.3.0-alpha.17") + (source + (origin + (method url-fetch) + (uri (crate-uri "futures-executor-preview" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "053g5kf2qa1xhdkwp3d1grrizzy4683mpbb3y0vvm00hwl7jdfl7")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-futures-channel-preview" ,rust-futures-channel-preview-0.3) + ("rust-futures-core-preview" ,rust-futures-core-preview-0.3) + ("rust-futures-util-preview" ,rust-futures-util-preview-0.3) + ("rust-num-cpus" ,rust-num-cpus-1.10) + ("rust-pin-utils" ,rust-pin-utils-0.1)))) + (home-page "https://github.com/rust-lang/futures-rs") + (synopsis + "Executors for asynchronous tasks based on futures-rs") + (description + "Executors for asynchronous tasks based on the futures-rs +library.") + (license (list license:expat license:asl2.0)))) + (define-public rust-futures-io-preview-0.3 (package (name "rust-futures-io-preview") -- cgit v1.2.3 From 14f2988004f390c22eb49ad776bb02faa196e4a4 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 10:13:26 -0800 Subject: gnu: Add rust-futures-select-macro-preview-0.3. * gnu/packages/crates-io.scm (rust-futures-select-macro-preview-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 b15ce0d215..7c6fd8da76 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1382,6 +1382,35 @@ (define-public rust-futures-io-preview-0.3 (license (list license:asl2.0 license:expat)))) +(define-public rust-futures-select-macro-preview-0.3 + (package + (name "rust-futures-select-macro-preview") + (version "0.3.0-alpha.17") + (source + (origin + (method url-fetch) + (uri (crate-uri "futures-select-macro-preview" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1a90ivjzkgz7msiz5si05xzi8xwsk5gar1gkrbmrgqpgkliqd7a6")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-proc-macro-hack" ,rust-proc-macro-hack-0.5) + ("rust-proc-macro2" ,rust-proc-macro2-0.4) + ("rust-quote" ,rust-quote-1.0) + ("rust-syn" ,rust-syn-0.15)))) + (home-page "https://github.com/rust-lang/futures-rs") + (synopsis + "Handle the first Future to complete") + (description + "The @code{select!} macro for waiting on multiple different +@code{Future}s at once and handling the first one to complete.") + (license (list license:expat license:asl2.0)))) + (define-public rust-futures-sink-preview-0.3 (package (name "rust-futures-sink-preview") -- cgit v1.2.3 From f9ff44d36d834f4bcd1a281290512309413077c1 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 10:27:41 -0800 Subject: gnu: Add rust-proc-macro-hack-0.5. * gnu/packages/crates-io.scm (rust-proc-macro-hack-0.5): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7c6fd8da76..ea3d76eb55 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3188,6 +3188,37 @@ (define-public rust-ppv-lite86-0.2 (license (list license:asl2.0 license:expat)))) +;; Cyclic dependencies with rust-demo-hack. +(define-public rust-proc-macro-hack-0.5 + (package + (name "rust-proc-macro-hack") + (version "0.5.7") + (source + (origin + (method url-fetch) + (uri (crate-uri "proc-macro-hack" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1www5lrvsk7pq04clgfmjlnnrshikgs1h51l17vrc7qy58bx878c")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-0.4) + ("rust-quote" ,rust-quote-1.0) + ("rust-syn" ,rust-syn-0.15)) + #:cargo-development-inputs + (("rust-demo-hack" ,rust-demo-hack-0.0) + ("rust-demo-hack-impl" ,rust-demo-hack-impl-0.0)))) + (home-page "https://github.com/dtolnay/proc-macro-hack") + (synopsis + "Procedural macros in expression position") + (description + "Procedural macros in expression position.") + (license (list license:expat license:asl2.0)))) + (define-public rust-proc-macro2-1.0 (package (name "rust-proc-macro2") -- cgit v1.2.3 From 9ee2b2abc719ad8add3fa3a1a1c193a232b34e9e Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 10:28:48 -0800 Subject: gnu: Add rust-demo-hack-0.0. * gnu/packages/crates-io.scm (rust-demo-hack-0.0): 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 ea3d76eb55..2c51988351 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -875,6 +875,30 @@ (define-public rust-defmac-0.1 (base32 "17giv0n0n1r64z0dahfvkjy3ys517jxyhs8sd9lmgvcljpjyryxa")))))) +(define-public rust-demo-hack-0.0 + (package + (name "rust-demo-hack") + (version "0.0.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "demo-hack" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0m0114p1g0zzrdph5bg03i8m8p70vrwn3whs191jrbjcrmh5lmnp")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-demo-hack-impl" ,rust-demo-hack-impl-0.0) + ("rust-proc-macro-hack" ,rust-proc-macro-hack-0.5)))) + (home-page "https://github.com/dtolnay/proc-macro-hack") + (synopsis "Demo of proc-macro-hack") + (description "Demo of proc-macro-hack.") + (license (list license:expat license:asl2.0)))) + (define-public rust-dirs-1.0 (package (name "rust-dirs") -- cgit v1.2.3 From 72676780bf40216729946f28fb746fbcefe0e724 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 10:29:29 -0800 Subject: gnu: Add rust-demo-hack-impl-0.0. * gnu/packages/crates-io.scm (rust-demo-hack-impl-0.0): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2c51988351..2480f1b71f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -899,6 +899,31 @@ (define-public rust-demo-hack-0.0 (description "Demo of proc-macro-hack.") (license (list license:expat license:asl2.0)))) +(define-public rust-demo-hack-impl-0.0 + (package + (name "rust-demo-hack-impl") + (version "0.0.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "demo-hack-impl" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1f1fdl60xjas9wlmcl9v6f56vgm3mzwr019kcifav5464rx3w3ld")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-proc-macro-hack" ,rust-proc-macro-hack-0.5) + ("rust-quote" ,rust-quote-1.0) + ("rust-syn" ,rust-syn-0.15)))) + (home-page "https://github.com/dtolnay/proc-macro-hack") + (synopsis "Demo of proc-macro-hack") + (description "Demo of proc-macro-hack.") + (license (list license:expat license:asl2.0)))) + (define-public rust-dirs-1.0 (package (name "rust-dirs") -- cgit v1.2.3 From e1dc622f1e43745845625e4ff69345c5534db967 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 10:57:08 -0800 Subject: gnu: Add rust-proc-macro-nested-0.1. * gnu/packages/crates-io.scm (rust-proc-macro-nested-0.1): 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 2480f1b71f..e306ab3bb0 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3268,6 +3268,28 @@ (define-public rust-proc-macro-hack-0.5 "Procedural macros in expression position.") (license (list license:expat license:asl2.0)))) +(define-public rust-proc-macro-nested-0.1 + (package + (name "rust-proc-macro-nested") + (version "0.1.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "proc-macro-nested" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0bmlksm8vl44wkwihmwr7jsjznhbg0n7aibcw1cs2jgjcp86x6in")))) + (build-system cargo-build-system) + (arguments `(#:skip-build? #t)) + (home-page "https://github.com/dtolnay/proc-macro-hack") + (synopsis + "Support for nested proc-macro-hack invocations") + (description + "Support for nested proc-macro-hack invocations.") + (license (list license:expat license:asl2.0)))) + (define-public rust-proc-macro2-1.0 (package (name "rust-proc-macro2") -- cgit v1.2.3 From d687f02fcf1add002ae8dfdb5fbf4797ac510de9 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 11:04:41 -0800 Subject: gnu: Add rust-bytes-0.4. * gnu/packages/crates-io.scm (rust-bytes-0.4): 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 e306ab3bb0..91569851b7 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -384,6 +384,36 @@ (define-public rust-byteorder-1.3 little-endian.") (license (list license:expat license:unlicense)))) +(define-public rust-bytes-0.4 + (package + (name "rust-bytes") + (version "0.4.12") + (source + (origin + (method url-fetch) + (uri (crate-uri "bytes" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0768a55q2fsqdjsvcv98ndg9dq7w2g44dvq1avhwpxrdzbydyvr0")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-byteorder" ,rust-byteorder-1.3) + ("rust-either" ,rust-either-1.5) + ("rust-iovec" ,rust-iovec-0.1) + ("rust-serde" ,rust-serde-1.0)) + #:cargo-development-inputs + (("rust-serde-test" ,rust-serde-test-1.0)))) + (home-page "https://github.com/tokio-rs/bytes") + (synopsis + "Types and traits for working with bytes") + (description + "Types and traits for working with bytes.") + (license license:expat))) + (define-public rust-cargon-0.0 (package (name "rust-cargon") -- cgit v1.2.3 From 81417d37422ef9d6236426e6e059f02c008400c1 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 11:11:00 -0800 Subject: gnu: Add rust-crossbeam-utils-0.6. * gnu/packages/crates-io.scm (rust-crossbeam-utils-0.6): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 91569851b7..516baf3f37 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -788,6 +788,34 @@ (define-public rust-criterion-plot-0.3 (description "Criterion's plotting library.") (license (list license:expat license:asl2.0)))) +(define-public rust-crossbeam-utils-0.6 + (package + (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")))) + (build-system cargo-build-system) + (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)))) + (home-page + "https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-utils") + (synopsis "Utilities for concurrent programming") + (description + "Utilities for concurrent programming.") + (license (list license:expat license:asl2.0)))) + (define-public rust-csv-core-0.1 (package (name "rust-csv-core") -- cgit v1.2.3 From 29a5b2e51b1cfa02165ed710a90f08049d65f9f5 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 11:41:29 -0800 Subject: gnu: Add rust-mio-0.6. * gnu/packages/crates-io.scm (rust-mio-0.6): 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 516baf3f37..1613e85680 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2544,6 +2544,42 @@ (define-public rust-miniz-sys-0.1 (license (list license:asl2.0 license:expat)))) +(define-public rust-mio-0.6 + (package + (name "rust-mio") + (version "0.6.19") + (source + (origin + (method url-fetch) + (uri (crate-uri "mio" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "08zzs227vrnyz5kvws6awzlgzb8zqpnihs71hkqlw07dlfb1kxc3")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-fuchsia-zircon" ,rust-fuchsia-zircon-0.3) + ("rust-fuchsia-zircon-sys" ,rust-fuchsia-zircon-sys-0.3) + ("rust-iovec" ,rust-iovec-0.1) + ("rust-kernel32-sys" ,rust-kernel32-sys-0.2) + ("rust-libc" ,rust-libc-0.2) + ("rust-log" ,rust-log-0.4) + ("rust-miow" ,rust-miow-0.2) + ("rust-net2" ,rust-net2-0.2) + ("rust-slab" ,rust-slab-0.4) + ("rust-winapi" ,rust-winapi-0.3)) + #:cargo-development-inputs + (("rust-bytes" ,rust-bytes-0.4) + ("rust-env-logger" ,rust-env-logger-0.6) + ("rust-tempdir" ,rust-tempdir-0.3)))) + (home-page "https://github.com/tokio-rs/mio") + (synopsis "Lightweight non-blocking IO") + (description "Lightweight non-blocking IO.") + (license license:expat))) + (define-public rust-miow-0.3 (package (name "rust-miow") -- cgit v1.2.3 From eafec2b41e6d1bd1f6817408f1bf6a16a6d2b0a1 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 11:44:50 -0800 Subject: gnu: Add rust-tokio-io-0.1. * gnu/packages/crates-io.scm (rust-tokio-io-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 1613e85680..4b60880655 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5001,6 +5001,36 @@ (define-public rust-time-0.1 (license (list license:asl2.0 license:expat)))) +;; Cyclic dependencies with tokio and tokio-current-thread +(define-public rust-tokio-io-0.1 + (package + (name "rust-tokio-io") + (version "0.1.12") + (source + (origin + (method url-fetch) + (uri (crate-uri "tokio-io" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "09jrz1hh4h1vj45qy09y7m7m8jsy1hl6g32clnky25mdim3dp42h")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bytes" ,rust-bytes-0.4) + ("rust-futures" ,rust-futures-0.1) + ("rust-log" ,rust-log-0.4)) + #:cargo-development-inputs + (("rust-tokio-current-thread" ,rust-tokio-current-thread-0.1)))) + (home-page "https://tokio.rs") + (synopsis + "Core I/O primitives for asynchronous I/O in Rust") + (description + "Core I/O primitives for asynchronous I/O in Rust.") + (license license:expat))) + (define-public rust-tokio-mock-task-0.1 (package (name "rust-tokio-mock-task") -- cgit v1.2.3 From 1cb21ed5a662c374f106b0854a2eed5b70cd8d1a Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 11:49:18 -0800 Subject: gnu: Add rust-tokio-executor-0.1. * gnu/packages/crates-io.scm (rust-tokio-executor-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4b60880655..16c9e5314a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5001,6 +5001,33 @@ (define-public rust-time-0.1 (license (list license:asl2.0 license:expat)))) +;; Cyclic dependency with rust-tokio. +(define-public rust-tokio-executor-0.1 + (package + (name "rust-tokio-executor") + (version "0.1.7") + (source + (origin + (method url-fetch) + (uri (crate-uri "tokio-executor" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0pjmgpg58k3hf5q9w6xjljsv8xy66lf734qnfwsc0g3pq3349sl3")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-crossbeam-utils" ,rust-crossbeam-utils-0.6) + ("rust-futures" ,rust-futures-0.1)) + #:cargo-development-inputs + (("rust-tokio" ,rust-tokio-0.1)))) + (home-page "https://github.com/tokio-rs/tokio") + (synopsis "Future execution primitives") + (description "Future execution primitives.") + (license license:expat))) + ;; Cyclic dependencies with tokio and tokio-current-thread (define-public rust-tokio-io-0.1 (package -- cgit v1.2.3 From a80b060e3525ff3146bdc589319209a64e716709 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 11:52:41 -0800 Subject: gnu: Add rust-tokio-codec-0.1. * gnu/packages/crates-io.scm (rust-tokio-codec-0.1): 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 16c9e5314a..e0306d5639 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5001,6 +5001,34 @@ (define-public rust-time-0.1 (license (list license:asl2.0 license:expat)))) +;; Cyclic dependency with tokio-io +(define-public rust-tokio-codec-0.1 + (package + (name "rust-tokio-codec") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "tokio-codec" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "17y3hi3dd0bdfkrzshx9qhwcf49xv9iynszj7iwy3w4nmz71wl2w")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bytes" ,rust-bytes-0.4) + ("rust-futures" ,rust-futures-0.1) + ("rust-tokio-io" ,rust-tokio-io-0.1)))) + (home-page "https://tokio.rs") + (synopsis + "Utilities for encoding and decoding frames") + (description + "Utilities for encoding and decoding frames.") + (license license:expat))) + ;; Cyclic dependency with rust-tokio. (define-public rust-tokio-executor-0.1 (package -- cgit v1.2.3 From bd4aeaf152d5d96a1570550f5366d936da3684c8 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 11:59:20 -0800 Subject: gnu: Add rust-futures-util-preview-0.3. * gnu/packages/crates-io.scm (rust-futures-util-preview-0.3): 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 e0306d5639..458d2abbb5 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1540,6 +1540,46 @@ (define-public rust-futures-sink-preview-0.3 (license (list license:asl2.0 license:expat)))) +(define-public rust-futures-util-preview-0.3 + (package + (name "rust-futures-util-preview") + (version "0.3.0-alpha.17") + (source + (origin + (method url-fetch) + (uri (crate-uri "futures-util-preview" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0kizm86wgr5qldyavskfi0r1msg6m4x2pkj0d4r04br2ig29i0dg")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-futures" ,rust-futures-0.1) + ("rust-futures-channel-preview" ,rust-futures-channel-preview-0.3) + ("rust-futures-core-preview" ,rust-futures-core-preview-0.3) + ("rust-futures-io-preview" ,rust-futures-io-preview-0.3) + ("rust-futures-select-macro-preview" + ,rust-futures-select-macro-preview-0.3) + ("rust-futures-sink-preview" ,rust-futures-sink-preview-0.3) + ("rust-memchr" ,rust-memchr-2.2) + ("rust-pin-utils" ,rust-pin-utils-0.1) + ("rust-proc-macro-hack" ,rust-proc-macro-hack-0.5) + ("rust-proc-macro-nested" ,rust-proc-macro-nested-0.1) + ("rust-rand" ,rust-rand-0.4) + ("rust-rand-core" ,rust-rand-core-0.5) + ("rust-slab" ,rust-slab-0.4) + ("rust-tokio-io" ,rust-tokio-io-0.1)))) + (home-page "https://github.com/rust-lang/futures-rs") + (synopsis + "Utilities and extension traits for futures-rs library") + (description + "Common utilities and extension traits for the futures-rs +library.") + (license (list license:expat license:asl2.0)))) + (define-public rust-gcc-0.3 (package (inherit rust-cc-1.0) -- cgit v1.2.3 From ceebedc4337a041461134588288a7121302ae6ae Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 11:55:23 -0800 Subject: gnu: Add rust-tokio-current-thread-0.1. * gnu/packages/crates-io.scm (rust-tokio-current-thread-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 458d2abbb5..acdbb1a2df 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5069,6 +5069,33 @@ (define-public rust-tokio-codec-0.1 "Utilities for encoding and decoding frames.") (license license:expat))) +(define-public rust-tokio-current-thread-0.1 + (package + (name "rust-tokio-current-thread") + (version "0.1.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "tokio-current-thread" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0hx4c8v88kk0ih8x5s564gsgwwf8n11kryvxm72l1f7isz51fqni")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-futures" ,rust-futures-0.1) + ("rust-tokio-executor" ,rust-tokio-executor-0.1)))) + (home-page "https://github.com/tokio-rs/tokio") + (synopsis + "Manage many tasks concurrently on the current thread") + (description + "Single threaded executor which manage many tasks concurrently on +the current thread.") + (license license:expat))) + ;; Cyclic dependency with rust-tokio. (define-public rust-tokio-executor-0.1 (package -- cgit v1.2.3 From 9d0864aae90dec46b49df59252ae076f79a75dae Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 12:10:43 -0800 Subject: gnu: Add rust-rand-xoshiro-0.3. * gnu/packages/crates-io.scm (rust-rand-xoshiro-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 acdbb1a2df..b5ab1b3676 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3802,6 +3802,35 @@ (define-public rust-rand-xorshift-0.1 (license (list license:asl2.0 license:expat)))) +(define-public rust-rand-xoshiro-0.3 + (package + (name "rust-rand-xoshiro") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rand_xoshiro" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "07w3qgrac8r356lz5vqff42rly6yd9vs3g5lx5pbn13rcmb05rqb")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-byteorder" ,rust-byteorder-1.3) + ("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://github.com/rust-random/rand") + (synopsis + "Xoshiro, xoroshiro and splitmix64 random number generators") + (description + "Xoshiro, xoroshiro and splitmix64 random number generators.") + (license (list license:expat license:asl2.0)))) + (define-public rust-rawpointer-0.1 (package (name "rust-rawpointer") -- cgit v1.2.3 From b43120651c185281377de68e27ba766d3eb04ad2 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 12:14:27 -0800 Subject: gnu: Add rust-rand-xorshift-0.2. * gnu/packages/crates-io.scm (rust-rand-xorshift-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 b5ab1b3676..09ea5d0292 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3802,6 +3802,33 @@ (define-public rust-rand-xorshift-0.1 (license (list license:asl2.0 license:expat)))) +(define-public rust-rand-xorshift-0.2 + (package + (name "rust-rand-xorshift") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rand_xorshift" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1a6wy76lc5fimm1n9n8fzhp4cfjwfwxh4hx63bg3vlh1d2w1dm3p")))) + (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-xorshift") + (synopsis "Xorshift random number generator") + (description + "Xorshift random number generator.") + (license (list license:expat license:asl2.0)))) + (define-public rust-rand-xoshiro-0.3 (package (name "rust-rand-xoshiro") -- cgit v1.2.3 From fbd9fd9b32b295d52824eaaacf137b1089e817e2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 2 Jan 2020 11:29:12 +0200 Subject: gnu: rust-rand-xorshift-0.1: Fix home-page. * gnu/packages/crates-io.scm (rust-rand-xorshift-0.1)[home-page]: Correct url of home-page. --- gnu/packages/crates-io.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 09ea5d0292..9f9cf0d27c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3794,7 +3794,7 @@ (define-public rust-rand-xorshift-0.1 (base32 "0p2x8nr00hricpi2m6ca5vysiha7ybnghz79yqhhx6sl4gkfkxyb")))) (build-system cargo-build-system) - (home-page "https://crates.io/crates/rand_xorshift") + (home-page "https://crates.io/crates/rand-xorshift") (synopsis "Xorshift random number generator") (description "Xorshift random number generator") -- cgit v1.2.3 From 22772b1c203d4ba66053d644acffbce13903c41a Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 12:22:58 -0800 Subject: gnu: Add rust-docopt-1.1. * gnu/packages/crates-io.scm (rust-docopt-1.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9f9cf0d27c..d85506cf5a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1047,6 +1047,32 @@ (define-public rust-doc-comment-0.3 (properties '((hidden? . #t))) (license license:expat))) +(define-public rust-docopt-1.1 + (package + (name "rust-docopt") + (version "1.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "docopt" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0s9rcpmnnivs502q69lc1h1wrwapkq09ikgbfbgqf31idmc5llkz")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-regex" ,rust-regex-1.1) + ("rust-serde" ,rust-serde-1.0) + ("rust-strsim" ,rust-strsim-0.9)))) + (home-page "https://github.com/docopt/docopt.rs") + (synopsis "Command line argument parsing") + (description "Command line argument parsing.") + (license (list license:expat license:unlicense)))) + (define-public rust-dtoa-0.4 (package (name "rust-dtoa") -- cgit v1.2.3 From c2f1c56a8ee16aa3588a06c5b19843c2ff9308c3 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 13:03:05 -0800 Subject: gnu: Add rust-memoffset-0.2. * gnu/packages/crates-io.scm (rust-memoffset-0.2): 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 d85506cf5a..dbc7878d52 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2547,6 +2547,28 @@ (define-public rust-memmap-0.6 (base32 "1zy6s0ni0lx9rjzq3gq2zz9r8zgjmbp02332g3gsj4fyhv4s5zz2")))))) +(define-public rust-memoffset-0.2 + (package + (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")))) + (build-system cargo-build-system) + (arguments `(#:skip-build? #t)) + (home-page "https://github.com/Gilnaa/memoffset") + (synopsis + "offset_of functionality for Rust structs") + (description + "@code{offset_of} functionality for Rust structs.") + (license license:expat))) + (define-public rust-mime-0.3 (package (name "rust-mime") -- cgit v1.2.3 From 9217494fb916d19856f3e8fcf5d287ec67ffce65 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 13:06:38 -0800 Subject: gnu: Add rust-crossbeam-epoch-0.7. * gnu/packages/crates-io.scm (rust-crossbeam-epoch-0.7): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index dbc7878d52..7f00b6b85a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -788,6 +788,37 @@ (define-public rust-criterion-plot-0.3 (description "Criterion's plotting library.") (license (list license:expat license:asl2.0)))) +(define-public rust-crossbeam-epoch-0.7 + (package + (name "rust-crossbeam-epoch") + (version "0.7.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "crossbeam-epoch" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1d408b9x82mdbnb405gw58v5mmdbj2rl28a1h7b9rmn25h8f7j84")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-arrayvec" ,rust-arrayvec-0.4) + ("rust-cfg-if" ,rust-cfg-if-0.1) + ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.6) + ("rust-lazy-static" ,rust-lazy-static-1.3) + ("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)))) + (define-public rust-crossbeam-utils-0.6 (package (name "rust-crossbeam-utils") -- cgit v1.2.3 From e05162fe16ff6623bb13e8c128a7e1c0eee6a47f Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 13:33:55 -0800 Subject: gnu: Add rust-ascii-0.9. * gnu/packages/crates-io.scm (rust-ascii-0.9): New variables. 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 7f00b6b85a..2e7347cfc3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -128,6 +128,33 @@ (define-public rust-arrayvec-0.4 ArrayVec and ArrayString.") (license (list license:expat license:asl2.0)))) +(define-public rust-ascii-0.9 + (package + (name "rust-ascii") + (version "0.9.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "ascii" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0dck6rsjnxlczyjnncn8hf16bxj42m1vi6s2n32c1jg2ijd9dz55")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-quickcheck" ,rust-quickcheck-0.8) + ("rust-serde" ,rust-serde-1.0) + ("rust-serde-test" ,rust-serde-test-1.0)))) + (home-page "https://github.com/tomprogrammer/rust-ascii") + (synopsis + "ASCII-only equivalents to char, str and String") + (description + "ASCII-only equivalents to @code{char}, @code{str} and @code{String}.") + (license (list license:expat license:asl2.0)))) + (define-public rust-atty-0.2 (package (name "rust-atty") -- cgit v1.2.3 From 878ff13ee17cd8f275bd41613a5cd4195038f815 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 13:37:42 -0800 Subject: gnu: Add rust-term-0.5.1. * gnu/packages/crates-io.scm (rust-term-0.5.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2e7347cfc3..0196015da5 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5030,6 +5030,23 @@ (define-public rust-term-0.4 (license (list license:asl2.0 license:expat)))) +(define-public rust-term-0.5.1 + (package + (inherit rust-term-0.4) + (name "rust-term") + (version "0.5.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "term" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0qbmqd8jbjlqr4608qdmvp6yin5ypifzi5s2xyhlw8g8s5ynfssy")))) + (arguments `(#:skip-build? #t)) + (properties '()))) + (define-public rust-termcolor-1.0 (package (name "rust-termcolor") -- cgit v1.2.3 From 2fac90978d86ad3edd8a38e084e4b73ad9e3ce15 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 13:40:19 -0800 Subject: gnu: Add rust-clippy-0.0. * gnu/packages/crates-io.scm (rust-clippy-0.0): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0196015da5..4f46be6141 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -675,6 +675,32 @@ (define-public rust-clicolors-control-1.0 (properties '((hidden? . #t))) (license license:expat))) +(define-public rust-clippy-0.0 + (package + (name "rust-clippy") + (version "0.0.302") + (source + (origin + (method url-fetch) + (uri (crate-uri "clippy" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1562x3sq9mgmc8j39gd34wqm7ybrdvpmj7cc1n450gwsawayw4fr")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-term" ,rust-term-0.5.1)))) + (home-page "https://github.com/rust-lang/rust-clippy") + (synopsis + "Lints to avoid common pitfalls in Rust") + (description + "This package provides a bunch of helpful lints to avoid common +pitfalls in Rust.") + (license (list license:expat license:asl2.0)))) + (define-public rust-cloudabi-0.0 (package (name "rust-cloudabi") -- cgit v1.2.3 From e45eb8086e1be367db5cf172663d38b9da8426e8 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 13:52:11 -0800 Subject: gnu: Add rust-lock-api-0.2. * gnu/packages/crates-io.scm (rust-lock-api-0.2): New variable. (rust-lock-api-0.1): Inherit from rust-lock-api-0.2. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 38 +++++++++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4f46be6141..d67005a479 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2402,9 +2402,37 @@ (define-public rust-libssh2-sys-0.2 (license (list license:asl2.0 license:expat)))) +(define-public rust-lock-api-0.2 + (package + (name "rust-lock-api") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "lock_api" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1zx7pksmgyggpczgw4qrr4vj2nkdk5lipgiysvr20slm552nv57d")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-owning-ref" ,rust-owning-ref-0.4) + ("rust-scopeguard" ,rust-scopeguard-1.0) + ("rust-serde" ,rust-serde-1.0)))) + (home-page "https://github.com/Amanieu/parking_lot") + (synopsis + "Wrappers to create fully-featured Mutex and RwLock types") + (description + "This package provides wrappers to create fully-featured @code{Mutex} and +@code{RwLock} types. It is compatible with @code{no_std}.") + (license (list license:expat license:asl2.0)))) (define-public rust-lock-api-0.1 (package + (inherit rust-lock-api-0.2) (name "rust-lock-api") (version "0.1.5") (source @@ -2415,15 +2443,7 @@ (define-public rust-lock-api-0.1 (sha256 (base32 "0b24q9mh258xa52ap636q1sxz0j5vrnp0hwbbh7ddjka3wwz3sv2")))) - (build-system cargo-build-system) - (home-page "https://github.com/Amanieu/parking_lot") - (synopsis "Wrappers to create fully-featured Mutex and RwLock types") - (description - "This package provides wrappers to create fully-featured @code{Mutex} and -@code{RwLock} types. It is compatible with @code{no_std}.") - (properties '((hidden? . #t))) - (license (list license:asl2.0 - license:expat)))) + (properties '((hidden? . #t))))) (define-public rust-log-0.4 (package -- cgit v1.2.3 From 88e267bee8ccf5dfdf131666ce1b15e26598ef88 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 30 Dec 2019 21:49:25 +0200 Subject: gnu: rust-ansi-term: Skip build. * gnu/packages/crates-io.scm (rust-ansi-term)[arguments]: Skip build. Add rust-winapi-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 d67005a479..19e1acbce1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -67,12 +67,15 @@ (define-public rust-ansi-term-0.11 (base32 "16wpvrghvd0353584i1idnsgm0r3vchg8fyrm0x8ayv1rgvbljgf")))) (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-winapi" ,rust-winapi-0.3)))) (home-page "https://github.com/ogham/rust-ansi-term") (synopsis "Library for ANSI terminal colours and styles") (description "This is a library for controlling colours and formatting, such as red bold text or blue underlined text, on ANSI terminals.") - (properties '((hidden? . #t))) (license license:expat))) (define-public rust-antidote-1.0 -- cgit v1.2.3 From c74508b67c103cdf71b8bae9e303b88eb0cc1679 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 13:44:58 -0800 Subject: gnu: Add rust-encode-unicode-0.3. * gnu/packages/crates-io.scm (rust-encode-unicode-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 19e1acbce1..efc8d91514 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1220,6 +1220,35 @@ (define-public rust-either-1.5 @code{Right} is a general purpose sum type with two cases.") (license (list license:expat license:asl2.0)))) +(define-public rust-encode-unicode-0.3 + (package + (name "rust-encode-unicode") + (version "0.3.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "encode_unicode" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1g8a8pixkxz6r927f4sc4r15qyc0szxdxb1732v8q7h0di4wkclh")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-ascii" ,rust-ascii-0.9) + ("rust-clippy" ,rust-clippy-0.0)) + #:cargo-development-inputs + (("rust-lazy-static" ,rust-lazy-static-1.3)))) + (home-page "https://github.com/tormol/encode_unicode") + (synopsis + "UTF-8 and UTF-16 support for char, u8 and u16") + (description + "UTF-8 and UTF-16 character types, iterators and related methods for +char, u8 and u16.") + (license (list license:expat license:asl2.0)))) + (define-public rust-env-logger-0.6 (package (name "rust-env-logger") -- cgit v1.2.3 From c3344a33347da2eabde1ad7ef575806adc98f165 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 14:09:35 -0800 Subject: gnu: Add rust-semver-0.9. * gnu/packages/crates-io.scm (rust-semver-0.9): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index efc8d91514..f2664bd9f5 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4553,6 +4553,37 @@ (define-public rust-security-framework-sys-0.3 (license (list license:asl2.0 license:expat)))) +(define-public rust-semver-0.9 + (package + (name "rust-semver") + (version "0.9.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "semver" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "00q4lkcj0rrgbhviv9sd4p6qmdsipkwkbra7rh11jrhq5kpvjzhx")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-semver-parser" ,rust-semver-parser-0.7) + ("rust-serde" ,rust-serde-1.0)) + #:cargo-development-inputs + (("rust-crates-index" ,rust-crates-index-0.13) + ("rust-serde-derive" ,rust-serde-derive-1.0) + ("rust-serde-json" ,rust-serde-json-1.0) + ("rust-tempdir" ,rust-tempdir-0.3)))) + (home-page "https://docs.rs/crate/semver") + (synopsis + "Semantic version parsing and comparison") + (description + "Semantic version parsing and comparison.") + (license (list license:expat license:asl2.0)))) + (define-public rust-semver-parser-0.9 (package (name "rust-semver-parser") -- cgit v1.2.3 From 2721bb84b8732441ee8a0305f4adc73cf1cd82d8 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 14:12:48 -0800 Subject: gnu: Add rust-rustc-version-0.2. * gnu/packages/crates-io.scm (rust-rustc-version-0.2): New version. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f2664bd9f5..3921fbfad8 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4346,6 +4346,31 @@ (define-public rust-rustc-std-workspace-core-1.0 (license (list license:asl2.0 license:expat)))) +(define-public rust-rustc-version-0.2 + (package + (name "rust-rustc-version") + (version "0.2.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "rustc_version" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "02h3x57lcr8l2pm0a645s9whdh33pn5cnrwvn5cb57vcrc53x3hk")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs (("rust-semver" ,rust-semver-0.9)))) + (home-page "https://github.com/Kimundi/rustc-version-rs") + (synopsis + "Library for querying the version of a installed rustc compiler") + (description + "This package provides a library for querying the version of a installed +rustc compiler.") + (license (list license:expat license:asl2.0)))) + (define-public rust-ryu-1.0 (package (name "rust-ryu") -- cgit v1.2.3 From a7a69153e21f8f349fbd35844811b96bd7875694 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 14:14:51 -0800 Subject: gnu: Add rust-afl-0.4. * gnu/packages/crates-io.scm (rust-afl-0.4): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3921fbfad8..ba3515bea9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -54,6 +54,37 @@ (define-public rust-adler32-1.0 (license (list license:bsd-3 license:zlib)))) +(define-public rust-afl-0.4 + (package + (name "rust-afl") + (version "0.4.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "afl" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0g2chc18ji7qxi0d03n2ai140qdcww958v5si6rcjnnhmri1vyfb")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-cc" ,rust-cc-1.0) + ("rust-clap" ,rust-clap-2) + ("rust-rustc-version" ,rust-rustc-version-0.2) + ("rust-xdg" ,rust-xdg-2.2)) + #:cargo-development-inputs + (("rust-rustc-version" ,rust-rustc-version-0.2) + ("rust-xdg" ,rust-xdg-2.2)))) + (home-page "https://github.com/rust-fuzz/afl.rs") + (synopsis + "Fuzzing Rust code with american-fuzzy-lop") + (description + "Fuzz Rust code with american-fuzzy-lop.") + (license license:asl2.0))) + (define-public rust-ansi-term-0.11 (package (name "rust-ansi-term") -- cgit v1.2.3 From bec483dff1aebd593a807b6bf9d551219751caab Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 14:19:59 -0800 Subject: gnu: Add rust-insta-0.8. * gnu/packages/crates-io.scm (rust-insta-0.8): 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 ba3515bea9..5d9f354734 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2084,6 +2084,42 @@ (define-public rust-hostname-0.1 (properties '((hidden? . #t))) (license license:expat))) +(define-public rust-insta-0.8 + (package + (name "rust-insta") + (version "0.8.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "insta" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "17rvqw9xm61prncbqi3cplphr3l2dl85sljdpyr3fz2mqjgbdfwb")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-chrono" ,rust-chrono-0.4) + ("rust-ci-info" ,rust-ci-info-0.3) + ("rust-console" ,rust-console-0.7) + ("rust-difference" ,rust-difference-2.0) + ("rust-failure" ,rust-failure-0.1) + ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-pest" ,rust-pest-2.1) + ("rust-pest-derive" ,rust-pest-derive-2.1) + ("rust-ron" ,rust-ron-0.4) + ("rust-serde" ,rust-serde-1.0) + ("rust-serde-json" ,rust-serde-json-1.0) + ("rust-serde-yaml" ,rust-serde-yaml-0.8) + ("rust-uuid" ,rust-uuid-0.7)))) + (home-page "https://github.com/mitsuhiko/insta") + (synopsis "Snapshot testing library for Rust") + (description + "This package provides a snapshot testing library for Rust.") + (license license:asl2.0))) + (define-public rust-iovec-0.1 (package (name "rust-iovec") -- cgit v1.2.3 From dd0caa87813c3bd177b3c70319360b4f67f28790 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 14:22:23 -0800 Subject: gnu: Add rust-speculate-0.1. * gnu/packages/crates-io.scm (rust-speculate-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5d9f354734..47734e7c21 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4915,6 +4915,33 @@ (define-public rust-sourcefile-0.1 (license (list license:asl2.0 license:expat)))) +(define-public rust-speculate-0.1 + (package + (name "rust-speculate") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "speculate" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0ph01n3fqkmnfr1wd13dqsi4znv06xy6p4h3hqqdzk81r0r5vd1w")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-0.4) + ("rust-quote" ,rust-quote-1.0) + ("rust-syn" ,rust-syn-0.15) + ("rust-unicode-xid" ,rust-unicode-xid-0.1)))) + (home-page "https://github.com/utkarshkukreti/speculate.rs") + (synopsis "RSpec inspired testing framework for Rust") + (description + "An RSpec inspired minimal testing framework for Rust.") + (license license:expat))) + (define-public rust-spin-0.5 (package (name "rust-spin") -- cgit v1.2.3 From cb347c762ac6c7e790800ecaf8a44d9770195945 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 14:20:56 -0800 Subject: gnu: Add rust-syn-0.15. * gnu/packages/crates-io.scm (rust-syn-0.15): 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 47734e7c21..db6bf3bda9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5148,6 +5148,35 @@ (define-public rust-syn-1.0 (properties '((hidden? . #t))) (license (list license:expat license:asl2.0)))) +(define-public rust-syn-0.15 + (package + (inherit rust-syn-1.0) + (name "rust-syn") + (version "0.15.44") + (source + (origin + (method url-fetch) + (uri (crate-uri "syn" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1id5g6x6zihv3j7hwrw3m1jp636bg8dpi671r7zy3jvpkavb794w")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-0.4) + ("rust-quote" ,rust-quote-1.0) + ("rust-unicode-xid" ,rust-unicode-xid-0.2)) + #:cargo-development-inputs + (("rust-insta" ,rust-insta-0.8) + ("rust-rayon" ,rust-rayon-1.1) + ("rust-ref-cast" ,rust-ref-cast-0.2) + ("rust-regex" ,rust-regex-1.1) + ("rust-termcolor" ,rust-termcolor-1.0) + ("rust-walkdir" ,rust-walkdir-2.2)))) + (properties '()))) + (define-public rust-synstructure-test-traits-0.1 (package (name "rust-synstructure-test-traits") -- cgit v1.2.3 From a605d8fbfbecbd62b0a724de5b4f52291d276f5a Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 14:24:57 -0800 Subject: gnu: Add rust-diff-0.1. * gnu/packages/crates-io.scm (rust-diff-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index db6bf3bda9..d470d9ba99 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1100,6 +1100,32 @@ (define-public rust-demo-hack-impl-0.0 (description "Demo of proc-macro-hack.") (license (list license:expat license:asl2.0)))) +(define-public rust-diff-0.1 + (package + (name "rust-diff") + (version "0.1.11") + (source + (origin + (method url-fetch) + (uri (crate-uri "diff" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0fhavni46a2rib93ig5fgbqmm48ysms5sxzb3h9bp7vp2bwnjarw")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-development-inputs + (("rust-quickcheck" ,rust-quickcheck-0.8) + ("rust-speculate" ,rust-speculate-0.1)))) + (home-page "https://github.com/utkarshkukreti/diff.rs") + (synopsis + "LCS based slice and string diffing implementation") + (description + "An LCS based slice and string diffing implementation.") + (license (list license:expat license:asl2.0)))) + (define-public rust-dirs-1.0 (package (name "rust-dirs") -- cgit v1.2.3 From 2a8864dd68d0f52c14f5b930f97c57c32fcffe33 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 14:28:38 -0800 Subject: gnu: Add rust-cpp-demangle-0.2. * gnu/packages/crates-io.scm (rust-cpp-demangle-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 d470d9ba99..389a019b55 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1051,6 +1051,35 @@ (define-public rust-defmac-0.1 (base32 "17giv0n0n1r64z0dahfvkjy3ys517jxyhs8sd9lmgvcljpjyryxa")))))) +(define-public rust-cpp-demangle-0.2 + (package + (name "rust-cpp-demangle") + (version "0.2.12") + (source + (origin + (method url-fetch) + (uri (crate-uri "cpp_demangle" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0a4hqsfc0sfdwy7pcr0rc1fjp2j47fxbkqfc2lfrbi4zlm5hq36k")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-afl" ,rust-afl-0.4) + ("rust-cfg-if" ,rust-cfg-if-0.1)) + #:cargo-development-inputs + (("rust-clap" ,rust-clap-2) + ("rust-diff" ,rust-diff-0.1) + ("rust-glob" ,rust-glob-0.3)))) + (home-page "https://github.com/gimli-rs/cpp_demangle") + (synopsis "Demangle C++ symbols") + (description + "This package provides a crate for demangling C++ symbols.") + (license (list license:expat license:asl2.0)))) + (define-public rust-demo-hack-0.0 (package (name "rust-demo-hack") -- cgit v1.2.3 From 6f37e139f0650f2f94043e3051400b2460e4e082 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 14:45:16 -0800 Subject: gnu: Add rust-indexmap-1.0. * gnu/packages/crates-io.scm (rust-indexmap-1.0): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 389a019b55..77e7c522f3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2139,6 +2139,48 @@ (define-public rust-hostname-0.1 (properties '((hidden? . #t))) (license license:expat))) +(define-public rust-indexmap-1.0 + (package + (name "rust-indexmap") + (version "1.0.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "indexmap" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "13f5k1kl2759y4xfy0vhays35fmrkmhqngbr2ny8smvrbz0ag0by")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-serde" ,rust-serde-1.0)) + #:cargo-development-inputs + (("rust-fnv" ,rust-fnv-1.0) + ("rust-itertools" ,rust-itertools-0.8) + ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-quickcheck" ,rust-quickcheck-0.8) + ("rust-rand" ,rust-rand-0.4) + ("rust-serde-test" ,rust-serde-test-1.0)))) + (home-page "https://github.com/bluss/indexmap") + (synopsis + "Hash table with consistent order and fast iteration") + (description + "This package provides a hash table with consistent order and fast iteration. + +The indexmap is a hash table where the iteration order of the +key-value pairs is independent of the hash values of the keys. It has +the usual hash table functionality, it preserves insertion order +except after removals, and it allows lookup of its elements by either +hash table key or numerical index. A corresponding hash set type is +also provided. + +This crate was initially published under the name ordermap, but it was +renamed to indexmap.") + (license (list license:expat license:asl2.0)))) + (define-public rust-insta-0.8 (package (name "rust-insta") -- cgit v1.2.3 From 622615106a53b03de59c0ff93332d61b0aca5a01 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 15:10:07 -0800 Subject: gnu: Add rust-crossbeam-deque-0.7. * gnu/packages/crates-io.scm (rust-crossbeam-deque-0.7): 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 77e7c522f3..585a9fa277 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -875,6 +875,33 @@ (define-public rust-criterion-plot-0.3 (description "Criterion's plotting library.") (license (list license:expat license:asl2.0)))) +(define-public rust-crossbeam-deque-0.7 + (package + (name "rust-crossbeam-deque") + (version "0.7.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "crossbeam-deque" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0was9x71cz5g1y3670cyy6jdmsdfg6k9mbf0ddz2k1mdd7hx535i")))) + (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)) + #:cargo-development-inputs + (("rust-rand" ,rust-rand-0.4)))) + (home-page + "https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-deque") + (synopsis "Concurrent work-stealing deque") + (description "Concurrent work-stealing deque.") + (license (list license:expat license:asl2.0)))) + (define-public rust-crossbeam-epoch-0.7 (package (name "rust-crossbeam-epoch") -- cgit v1.2.3 From 3a1a844255353d2a57838f649eacd5fb8a2abad5 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 15:13:29 -0800 Subject: gnu: Add rust-crossbeam-queue-0.1. * gnu/packages/crates-io.scm (rust-crossbeam-queue-0.1): 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 585a9fa277..a85e76c53a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -933,6 +933,34 @@ (define-public rust-crossbeam-epoch-0.7 (description "Epoch-based garbage collection.") (license (list license:expat license:asl2.0)))) +(define-public rust-crossbeam-queue-0.1 + (package + (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")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-crossbeam-utils" ,rust-crossbeam-utils-0.6)) + #:cargo-development-inputs + (("rust-rand" ,rust-rand-0.4)))) + (home-page + "https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-utils") + (synopsis "Concurrent queues") + (description "Concurrent queues.") + (license (list license:expat + license:asl2.0 + license:bsd-2)))) + (define-public rust-crossbeam-utils-0.6 (package (name "rust-crossbeam-utils") -- cgit v1.2.3 From b1c488a4057571e417fe65eebefcfc85ad562ac6 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 15:19:18 -0800 Subject: gnu: Add rust-smallvec-0.6. * gnu/packages/crates-io.scm (rust-smallvec-0.6): 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 a85e76c53a..6efd754b6c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5023,6 +5023,33 @@ (define-public rust-slab-0.4 (properties '((hidden? . #t))) (license license:expat))) +(define-public rust-smallvec-0.6 + (package + (name "rust-smallvec") + (version "0.6.10") + (source + (origin + (method url-fetch) + (uri (crate-uri "smallvec" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1dyl43rgzny79jjpgzi07y0ly2ggx1xwsn64csxj0j91bsf6lq5b")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-serde" ,rust-serde-1.0)) + #:cargo-development-inputs + (("rust-bincode" ,rust-bincode-1.1)))) + (home-page "https://github.com/servo/rust-smallvec") + (synopsis "Small vector optimization") + (description + "'Small vector' optimization: store up to a small number of items on the +stack.") + (license (list license:expat license:asl2.0)))) + (define-public rust-socket2-0.3 (package (name "rust-socket2") -- cgit v1.2.3 From d0f3fb7d8871fc28bbde49c2f3eeffd1c67fd467 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 15:22:14 -0800 Subject: gnu: Add rust-crossbeam-channel-0.3. * gnu/packages/crates-io.scm (rust-crossbeam-channel-0.3): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6efd754b6c..25393159e3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -875,6 +875,38 @@ (define-public rust-criterion-plot-0.3 (description "Criterion's plotting library.") (license (list license:expat license:asl2.0)))) +(define-public rust-crossbeam-channel-0.3 + (package + (name "rust-crossbeam-channel") + (version "0.3.8") + (source + (origin + (method url-fetch) + (uri (crate-uri "crossbeam-channel" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0azpymyk0ld4akrjfy69ck5pzfgz1f2gb3smm2ywld92vsjd23hg")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-crossbeam-utils" ,rust-crossbeam-utils-0.6) + ("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)))) + (define-public rust-crossbeam-deque-0.7 (package (name "rust-crossbeam-deque") -- cgit v1.2.3 From c3e66f66f531c96c469f75113f03f4d66265cac0 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 15:25:02 -0800 Subject: gnu: Add rust-crossbeam-0.7. * gnu/packages/crates-io.scm (rust-crossbeam-0.7): 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 25393159e3..933931d3a9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -875,6 +875,36 @@ (define-public rust-criterion-plot-0.3 (description "Criterion's plotting library.") (license (list license:expat license:asl2.0)))) +(define-public rust-crossbeam-0.7 + (package + (name "rust-crossbeam") + (version "0.7.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "crossbeam" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0g5jysq5x4gndc1v5sq9n3f1m97k7qihwdpigw6ar6knj14qm09d")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-cfg-if" ,rust-cfg-if-0.1) + ("rust-crossbeam-channel" ,rust-crossbeam-channel-0.3) + ("rust-crossbeam-deque" ,rust-crossbeam-deque-0.7) + ("rust-crossbeam-epoch" ,rust-crossbeam-epoch-0.7) + ("rust-crossbeam-queue" ,rust-crossbeam-queue-0.1) + ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.6)) + #:cargo-development-inputs + (("rust-rand" ,rust-rand-0.4)))) + (home-page "https://github.com/crossbeam-rs/crossbeam") + (synopsis "Tools for concurrent programming") + (description "Tools for concurrent programming.") + (license (list license:expat license:asl2.0)))) + (define-public rust-crossbeam-channel-0.3 (package (name "rust-crossbeam-channel") -- cgit v1.2.3 From 64e4035dd1978bdd67411212d9ec026ba159abfb Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 15:29:41 -0800 Subject: gnu: Add rust-crc32fast-1.2. * gnu/packages/crates-io.scm (rust-crc32fast-1.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 933931d3a9..86c84bb478 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -846,6 +846,35 @@ (define-public rust-core-foundation-sys-0.6 (license (list license:asl2.0 license:expat)))) +(define-public rust-crc32fast-1.2 + (package + (name "rust-crc32fast") + (version "1.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "crc32fast" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1c9dhkvf3brrzzplcijaywxi2w8wv5578i0ryhcm7x8dmzi5s4ms")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-cfg-if" ,rust-cfg-if-0.1)) + #:cargo-development-inputs + (("rust-bencher" ,rust-bencher-0.1) + ("rust-quickcheck" ,rust-quickcheck-0.8) + ("rust-rand" ,rust-rand-0.4)))) + (home-page "https://github.com/srijs/rust-crc32fast") + (synopsis + "Fast, SIMD-accelerated CRC32 (IEEE) checksum computation") + (description + "Fast, SIMD-accelerated CRC32 (IEEE) checksum computation.") + (license (list license:expat license:asl2.0)))) + (define-public rust-criterion-plot-0.3 (package (name "rust-criterion-plot") -- cgit v1.2.3 From f626a6413e1b1bcd12a3bd26f913ef4fbcd55eed Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 15:36:17 -0800 Subject: gnu: Add rust-miniz-oxide-0.2. * gnu/packages/crates-io.scm (rust-miniz-oxide-0.2): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 86c84bb478..fb4c5debc7 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3057,6 +3057,21 @@ (define-public rust-miniz-oxide-0.3 (properties '((hidden? . #t))) (license license:expat))) +(define-public rust-miniz-oxide-0.2 + (package + (inherit rust-miniz-oxide-0.3) + (name "rust-miniz-oxide") + (version "0.2.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "miniz_oxide" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "17f92krv9hhsyc38prpfyn99m2hqhr4fgszpsla66a6gcrnpbhxn")))))) + (define-public rust-miniz-sys-0.1 (package (name "rust-miniz-sys") -- cgit v1.2.3 From b5901bded496ed0b238652181d817a7ba5e32f6a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 30 Dec 2019 22:01:51 +0200 Subject: gnu: rust-miniz-oxide-0.3: Skip build. * gnu/packages/crates-io.scm (rust-miniz-oxide-0.3)[arguments]: Skip build. Add rust-adler32-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 fb4c5debc7..5a0a93413c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3048,13 +3048,15 @@ (define-public rust-miniz-oxide-0.3 (sha256 (base32 "1bmanbbcdmssfbgik3fs323g7vljc5wkjz7s61jsbbz2kg0nckrh")))) (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs (("rust-adler32" ,rust-adler32-1.0)))) (home-page "https://github.com/Frommi/miniz_oxide/tree/master/miniz_oxide") (synopsis "Pure rust replacement for the miniz DEFLATE/zlib encoder/decoder") (description "A pure rust replacement for the miniz DEFLATE/zlib encoder/decoder. Using @code{flate2} with the @code{rust_backend} feature provides an easy to use streaming API for miniz_oxide.") - (properties '((hidden? . #t))) (license license:expat))) (define-public rust-miniz-oxide-0.2 -- cgit v1.2.3 From 8e8c6d8ebad0e1c19dfb815963ae236338d4fddf Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 15:52:25 -0800 Subject: gnu: Add rust-tokio-sync-0.1. * gnu/packages/crates-io.scm (rust-tokio-sync-0.1): 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 5a0a93413c..5fc7078348 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5895,6 +5895,35 @@ (define-public rust-tokio-mock-task-0.1 (properties '((hidden? . #t))) (license license:expat))) +(define-public rust-tokio-sync-0.1 + (package + (name "rust-tokio-sync") + (version "0.1.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "tokio-sync" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1ryalh7dcmnz46xj1va8aaw3if6vd4mj87r67dqvrqhpyf7j8qi1")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-fnv" ,rust-fnv-1.0) + ("rust-futures" ,rust-futures-0.1)) + #:cargo-development-inputs + (("rust-env-logger" ,rust-env-logger-0.6) + ("rust-loom" ,rust-loom-0.1) + ("rust-tokio" ,rust-tokio-0.1) + ("rust-tokio-mock-task" ,rust-tokio-mock-task-0.1)))) + (home-page "https://tokio.rs") + (synopsis "Synchronization utilities") + (description "Synchronization utilities.") + (license license:expat))) + (define-public rust-toml-0.5 (package (name "rust-toml") -- cgit v1.2.3 From 1d537e0a61450332eba3fd719b548522dc8216d8 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 15:39:58 -0800 Subject: gnu: Add rust-miniz-oxide-c-api-0.2. * gnu/package/crates-io.scm (rust-miniz-oxide-c-api-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 5fc7078348..03293d4838 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3074,6 +3074,35 @@ (define-public rust-miniz-oxide-0.2 (base32 "17f92krv9hhsyc38prpfyn99m2hqhr4fgszpsla66a6gcrnpbhxn")))))) +(define-public rust-miniz-oxide-c-api-0.2 + (package + (name "rust-miniz-oxide-c-api") + (version "0.2.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "miniz_oxide_c_api" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1514mvlj8vl723xqxnww5cfqr2mhnqqqf18fn3df17yx8racly2v")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-crc32fast" ,rust-crc32fast-1.2) + ("rust-libc" ,rust-libc-0.2) + ("rust-miniz-oxide" ,rust-miniz-oxide-0.2)) + #:cargo-development-inputs + (("rust-cc" ,rust-cc-1.0)))) + (home-page "https://github.com/Frommi/miniz_oxide/") + (synopsis "DEFLATE compression and decompression API") + (description + "DEFLATE compression and decompression API designed to be Rust +drop-in replacement for miniz.") + (license license:expat))) + (define-public rust-miniz-sys-0.1 (package (name "rust-miniz-sys") -- cgit v1.2.3 From 77505242f46f7e4980968fe3b83aaa7aed8b7f58 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 16:24:00 -0800 Subject: gnu: Add rust-tokio-reactor-0.1. * gnu/packages/crates-io.scm (rust-tokio-reactor-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 03293d4838..e634da677f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5924,6 +5924,45 @@ (define-public rust-tokio-mock-task-0.1 (properties '((hidden? . #t))) (license license:expat))) +(define-public rust-tokio-reactor-0.1 + (package + (name "rust-tokio-reactor") + (version "0.1.9") + (source + (origin + (method url-fetch) + (uri (crate-uri "tokio-reactor" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1khip64cn63xvayq1db68kxcnhgw3cb449a4n2lbw4p1qzx6pwba")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-crossbeam-utils" ,rust-crossbeam-utils-0.6) + ("rust-futures" ,rust-futures-0.1) + ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-log" ,rust-log-0.4) + ("rust-mio" ,rust-mio-0.6) + ("rust-num-cpus" ,rust-num-cpus-1.10) + ("rust-parking-lot" ,rust-parking-lot-0.7) + ("rust-slab" ,rust-slab-0.4) + ("rust-tokio-executor" ,rust-tokio-executor-0.1) + ("rust-tokio-io" ,rust-tokio-io-0.1) + ("rust-tokio-sync" ,rust-tokio-sync-0.1)) + #:cargo-development-inputs + (("rust-num-cpus" ,rust-num-cpus-1.10) + ("rust-tokio" ,rust-tokio-0.1) + ("rust-tokio-io-pool" ,rust-tokio-io-pool-0.1)))) + (home-page "https://tokio.rs") + (synopsis + "Event loop that drives Tokio I/O resources") + (description + "Event loop that drives Tokio I/O resources.") + (license license:expat))) + (define-public rust-tokio-sync-0.1 (package (name "rust-tokio-sync") -- cgit v1.2.3 From 6be675ff7b57a9a2464cd704dc822e6b71ef3375 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 16:32:33 -0800 Subject: gnu: Add rust-tokio-tcp-0.1. * gnu/packages/crates-io.scm (rust-tokio-tcp-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e634da677f..c8ed2f9ad1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5992,6 +5992,37 @@ (define-public rust-tokio-sync-0.1 (description "Synchronization utilities.") (license license:expat))) +(define-public rust-tokio-tcp-0.1 + (package + (name "rust-tokio-tcp") + (version "0.1.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "tokio-tcp" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "06a15vg8bcd33ng3h9ldzlq7wl4jsw0p9qpy7v22ls5yah3b250x")))) + (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-mio" ,rust-mio-0.6) + ("rust-tokio-io" ,rust-tokio-io-0.1) + ("rust-tokio-reactor" ,rust-tokio-reactor-0.1)) + #:cargo-development-inputs + (("rust-env-logger" ,rust-env-logger-0.6) + ("rust-tokio" ,rust-tokio-0.1)))) + (home-page "https://tokio.rs") + (synopsis "TCP bindings for tokio") + (description "TCP bindings for tokio.") + (license license:expat))) + (define-public rust-toml-0.5 (package (name "rust-toml") -- cgit v1.2.3 From de232746709a6c7d766be0fee38e19df4e196235 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 16:38:56 -0800 Subject: gnu: Add rust-tokio-threadpool-0.1. * gnu/packages/crates-io.scm (rust-tokio-threadpool-0.1): 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 c8ed2f9ad1..c3949d282d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6023,6 +6023,44 @@ (define-public rust-tokio-tcp-0.1 (description "TCP bindings for tokio.") (license license:expat))) +(define-public rust-tokio-threadpool-0.1 + (package + (name "rust-tokio-threadpool") + (version "0.1.14") + (source + (origin + (method url-fetch) + (uri (crate-uri "tokio-threadpool" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1wkj3wixicsqvllm8w74b24knw6mdn00zslm8l9fm1p81gr8lmbj")))) + (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-futures" ,rust-futures-0.1) + ("rust-log" ,rust-log-0.4) + ("rust-num-cpus" ,rust-num-cpus-1.10) + ("rust-rand" ,rust-rand-0.4) + ("rust-slab" ,rust-slab-0.4) + ("rust-tokio-executor" ,rust-tokio-executor-0.1)) + #:cargo-development-inputs + (("rust-env-logger" ,rust-env-logger-0.6) + ("rust-futures-cpupool" ,rust-futures-cpupool-0.1) + ("rust-threadpool" ,rust-threadpool-1.7)))) + (home-page "https://github.com/tokio-rs/tokio") + (synopsis + "Task scheduler backed by a work-stealing thread pool") + (description + "This package provides a task scheduler backed by a work-stealing thread +pool.") + (license license:expat))) + (define-public rust-toml-0.5 (package (name "rust-toml") -- cgit v1.2.3 From 4d33dfd0c9612c91e19d30cd891fa8a7544ea21c Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 16:42:14 -0800 Subject: gnu: Add rust-flate2-1.0. * gnu/packages/crates-io.scm (rust-flate2-1.0): 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 c3949d282d..22b8e5ad6f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1602,6 +1602,46 @@ (define-public rust-fixedbitset-0.1 (license (list license:asl2.0 license:expat)))) +(define-public rust-flate2-1.0 + (package + (name "rust-flate2") + (version "1.0.9") + (source + (origin + (method url-fetch) + (uri (crate-uri "flate2" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1n639gc7sbmrkir6pif608xqpwcv60kigmp5cn9x7m8892nk82am")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-crc32fast" ,rust-crc32fast-1.2) + ("rust-futures" ,rust-futures-0.1) + ("rust-libc" ,rust-libc-0.2) + ("rust-libz-sys" ,rust-libz-sys-1.0) + ("rust-miniz-sys" ,rust-miniz-sys-0.1) + ("rust-miniz-oxide-c-api" ,rust-miniz-oxide-c-api-0.2) + ("rust-tokio-io" ,rust-tokio-io-0.1)) + #:cargo-development-inputs + (("rust-futures" ,rust-futures-0.1) + ("rust-quickcheck" ,rust-quickcheck-0.8) + ("rust-rand" ,rust-rand-0.4) + ("rust-tokio-io" ,rust-tokio-io-0.1) + ("rust-tokio-tcp" ,rust-tokio-tcp-0.1) + ("rust-tokio-threadpool" ,rust-tokio-threadpool-0.1)))) + (home-page "https://github.com/alexcrichton/flate2-rs") + (synopsis + "Bindings to miniz.c for DEFLATE compression and decompression") + (description + "Bindings to miniz.c for DEFLATE compression and decompression exposed as +Reader/Writer streams. Contains bindings for zlib, deflate, and gzip-based +streams.") + (license (list license:expat license:asl2.0)))) + (define-public rust-fnv-1.0 (package (name "rust-fnv") -- cgit v1.2.3 From a12a88b212a4f03a875e2b95d2f2a9de02a1b832 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 16:46:04 -0800 Subject: gnu: Add rust-stdweb-derive-0.5. * gnu/packages/crates-io.scm (rust-stdweb-derive-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 22b8e5ad6f..61b18fb003 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5387,6 +5387,34 @@ (define-public rust-static-assertions-0.3 (properties '((hidden? . #t))) (license (list license:expat license:asl2.0)))) +(define-public rust-stdweb-derive-0.5 + (package + (name "rust-stdweb-derive") + (version "0.5.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "stdweb-derive" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0c1rxx6rqcc4iic5hx320ki3vshpi8k58m5600iqzq4x2zcyn88f")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-0.4) + ("rust-quote" ,rust-quote-1.0) + ("rust-serde" ,rust-serde-1.0) + ("rust-serde-derive" ,rust-serde-derive-1.0) + ("rust-syn" ,rust-syn-0.15)))) + (home-page "https://github.com/koute/stdweb") + (synopsis "Derive macros for the stdweb crate") + (description + "Derive macros for the @code{stdweb} crate.") + (license (list license:expat license:asl2.0)))) + (define-public rust-stdweb-internal-runtime-0.1 (package (name "rust-stdweb-internal-runtime") -- cgit v1.2.3 From 8565f321ed243bcaa98f7aa54cefa64428462e3e Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 16:55:35 -0800 Subject: gnu: Add rust-foreign-types-macros-0.1. * gnu/packages/crates-io.scm (rust-foreign-types-macros-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 61b18fb003..a27f47398d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1663,6 +1663,32 @@ (define-public rust-fnv-1.0 (license (list license:asl2.0 license:expat)))) +(define-public rust-foreign-types-macros-0.1 + (package + (name "rust-foreign-types-macros") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "foreign-types-macros" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "16yjigjcsklcwy2ad32l24k1nwm9n3bsnyhxc3z9whjbsrj60qk6")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-0.4) + ("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") + (description + "An internal crate used by foreign-types.") + (license (list license:expat license:asl2.0)))) + (define-public rust-foreign-types-shared-0.2 (package (name "rust-foreign-types-shared") -- cgit v1.2.3 From ba5de732529a4b71a58e3516386f03a36e8964c3 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 16:52:22 -0800 Subject: gnu: Add rust-foreign-types-shared-0.1. * gnu/packages/crates-io.scm (rust-foreign-types-shared-0.1): New variable. (rust-foreign-types-shared-0.2)[arguments]: Skip build. [properties]: Remove field. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a27f47398d..6c2c58927c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1702,14 +1702,29 @@ (define-public rust-foreign-types-shared-0.2 (base32 "0kanxlif1vp0ffh2r9l610jqbkmb3183yqykxq1z5w1vay2rn7y6")))) (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") (description "An internal crate used by foreign-types.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) +(define-public rust-foreign-types-shared-0.1 + (package + (inherit rust-foreign-types-shared-0.2) + (name "rust-foreign-types-shared") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "foreign-types-shared" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0jxgzd04ra4imjv8jgkmdq59kj8fsz6w4zxsbmlai34h26225c00")))))) + (define-public rust-fs-extra-1.1 (package (name "rust-fs-extra") -- cgit v1.2.3 From 431abc6e47e06c7a1e9063560be1e2ab52f793ee Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 16:59:46 -0800 Subject: gnu: Add rust-foreign-types-0.3. * gnu/packages/crates-io.scm (rust-foreign-types-0.3): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6c2c58927c..a1b7ea6aae 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1663,6 +1663,32 @@ (define-public rust-fnv-1.0 (license (list license:asl2.0 license:expat)))) +(define-public rust-foreign-types-0.3 + (package + (name "rust-foreign-types") + (version "0.3.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "foreign-types" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1cgk0vyd7r45cj769jym4a6s7vwshvd0z4bqrb92q1fwibmkkwzn")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-foreign-types-macros" ,rust-foreign-types-macros-0.1) + ("rust-foreign-types-shared" ,rust-foreign-types-shared-0.1)))) + (home-page "https://github.com/sfackler/foreign-types") + (synopsis "Framework for Rust wrappers over C APIs") + (description + "This package provides a framework for Rust wrappers over C +APIs.") + (license (list license:expat license:asl2.0)))) + (define-public rust-foreign-types-macros-0.1 (package (name "rust-foreign-types-macros") -- cgit v1.2.3 From d6dd7e28b261eedf2e65f6a06db900e5ad521486 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 17:10:56 -0800 Subject: gnu: Add rust-openssl-0.10. * gnu/packages/crates-io.scm (rust-openssl-0.10): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a1b7ea6aae..46aafd15ee 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3621,6 +3621,37 @@ (define-public rust-numtoa-0.1 (properties '((hidden? . #t))) (license (list license:expat license:asl2.0)))) +(define-public rust-openssl-0.10 + (package + (name "rust-openssl") + (version "0.10.26") + (source + (origin + (method url-fetch) + (uri (crate-uri "openssl" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "11d505lwlrh5a0jc2l6q36gvsaqic3vizq5q860hiqcqkmwwag1s")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-cfg-if" ,rust-cfg-if-0.1) + ("rust-foreign-types" ,rust-foreign-types-0.3) + ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-libc" ,rust-libc-0.2) + ("rust-openssl-sys" ,rust-openssl-sys-0.9)) + #:cargo-development-inputs + (("rust-hex" ,rust-hex-0.3) + ("rust-tempdir" ,rust-tempdir-0.3)))) + (home-page "https://github.com/sfackler/rust-openssl") + (synopsis "OpenSSL bindings") + (description "OpenSSL bindings.") + (license license:asl2.0))) + (define-public rust-openssl-probe-0.1 (package (name "rust-openssl-probe") -- cgit v1.2.3 From 1f635121a2d04b3bbe33224951f85e83c8320a74 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 17:13:52 -0800 Subject: gnu: Add rust-sha1-0.6. * gnu/packages/crates-io.scm (rust-sha1-0.6): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 46aafd15ee..289adcc187 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5257,6 +5257,34 @@ (define-public rust-serde-test-1.0 "Token De/Serializer for testing De/Serialize implementations.") (license (list license:expat license:asl2.0)))) +(define-public rust-sha1-0.6 + (package + (name "rust-sha1") + (version "0.6.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "sha1" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "03gs2q4m67rn2p8xcdfxhip6mpgahdwm12bnb3vh90ahv9grhy95")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-serde" ,rust-serde-1.0)) + #:cargo-development-inputs + (("rust-openssl" ,rust-openssl-0.10) + ("rust-rand" ,rust-rand-0.4) + ("rust-serde-json" ,rust-serde-json-1.0)))) + (home-page "https://github.com/mitsuhiko/rust-sha1") + (synopsis "Minimal implementation of SHA1 for Rust") + (description + "Minimal implementation of SHA1 for Rust.") + (license license:bsd-3))) + (define-public rust-shlex-0.1 (package (name "rust-shlex") -- cgit v1.2.3 From cbdde03509b55b13e5b89839695ac7aa0a4a8784 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 17:15:14 -0800 Subject: gnu: Add rust-stdweb-internal-macros-0.2. * gnu/packages/crates-io.scm (rust-stdweb-internal-macros-0.2): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 289adcc187..9138c3ce63 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5541,6 +5541,37 @@ (define-public rust-stdweb-derive-0.5 "Derive macros for the @code{stdweb} crate.") (license (list license:expat license:asl2.0)))) +(define-public rust-stdweb-internal-macros-0.2 + (package + (name "rust-stdweb-internal-macros") + (version "0.2.7") + (source + (origin + (method url-fetch) + (uri (crate-uri "stdweb-internal-macros" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1yjrmkc6sb1035avic383pa3avk2s9k3n17yjcza8yb9nw47v3z6")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-base-x" ,rust-base-x-0.2) + ("rust-proc-macro2" ,rust-proc-macro2-0.4) + ("rust-quote" ,rust-quote-1.0) + ("rust-serde" ,rust-serde-1.0) + ("rust-serde-derive" ,rust-serde-derive-1.0) + ("rust-serde-json" ,rust-serde-json-1.0) + ("rust-sha1" ,rust-sha1-0.6) + ("rust-syn" ,rust-syn-0.15)))) + (home-page "https://github.com/koute/stdweb") + (synopsis "Internal procedural macros for the stdweb crate") + (description + "Internal procedural macros for the stdweb crate.") + (license (list license:expat license:asl2.0)))) + (define-public rust-stdweb-internal-runtime-0.1 (package (name "rust-stdweb-internal-runtime") -- cgit v1.2.3 From 75076f6cb34f20da836dce9f14730d37bc60dacf Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 17:25:07 -0800 Subject: gnu: Add rust-rayon-core-1.5. * gnu/packages/crates-io.scm (rust-rayon-core-1.5): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9138c3ce63..893312e622 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4558,6 +4558,38 @@ (define-public rust-rawpointer-0.1 (license (list license:asl2.0 license:expat)))) +(define-public rust-rayon-core-1.5 + (package + (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")))) + (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-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)))) + (home-page "https://github.com/rayon-rs/rayon") + (synopsis "Core APIs for Rayon") + (description "Core APIs for Rayon.") + (license (list license:expat license:asl2.0)))) + (define-public rust-rdrand-0.4 (package (name "rust-rdrand") -- cgit v1.2.3 From cb190d93e7c13ece51da57db1af165064b0bf137 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 17:29:31 -0800 Subject: gnu: Add rust-rayon-1.1. * gnu/packages/crates-io.scm (rust-rayon-1.1): 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 893312e622..55061cc355 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4558,6 +4558,40 @@ (define-public rust-rawpointer-0.1 (license (list license:asl2.0 license:expat)))) +(define-public rust-rayon-1.1 + (package + (name "rust-rayon") + (version "1.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rayon" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "190hkbcdfvcphyyzkdg52zdia2y9d9yanpm072bmnzbn49p1ic54")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-crossbeam-deque" ,rust-crossbeam-deque-0.6) + ("rust-either" ,rust-either-1.5) + ("rust-rayon-core" ,rust-rayon-core-1.5)) + #: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.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)))) + (define-public rust-rayon-core-1.5 (package (name "rust-rayon-core") -- cgit v1.2.3 From f27e3ece3e01360294ac6a73bb74b9b0f9ca38ff Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 17:31:06 -0800 Subject: gnu: Add rust-csv-1.1. * gnu/packages/crates-io.scm (rust-csv-1.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 55061cc355..95a54504a9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1080,6 +1080,36 @@ (define-public rust-crossbeam-utils-0.6 "Utilities for concurrent programming.") (license (list license:expat license:asl2.0)))) +(define-public rust-csv-1.1 + (package + (name "rust-csv") + (version "1.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "csv" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0qxvzq030hi915dszazv6a7f0apzzi7gn193ni0g2lzkawjxck55")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bstr" ,rust-bstr-0.2) + ("rust-csv-core" ,rust-csv-core-0.1) + ("rust-itoa" ,rust-itoa-0.4) + ("rust-ryu" ,rust-ryu-1.0) + ("rust-serde" ,rust-serde-1.0)) + #:cargo-development-inputs + (("rust-serde" ,rust-serde-1.0)))) + (home-page "https://github.com/BurntSushi/rust-csv") + (synopsis "Fast CSV parsing with support for serde") + (description + "Fast CSV parsing with support for serde.") + (license (list license:unlicense license:expat)))) + (define-public rust-csv-core-0.1 (package (name "rust-csv-core") -- cgit v1.2.3 From 2b201b83c7d28b8a24e2607347410ef1279b37a4 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 17:35:40 -0800 Subject: gnu: Add rust-approx-0.3. * gnu/packages/crates-io.scm (rust-approx-0.3): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 95a54504a9..6894f96748 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -131,6 +131,32 @@ (define-public rust-antidote-1.0 (license (list license:asl2.0 license:expat)))) +(define-public rust-approx-0.3 + (package + (name "rust-approx") + (version "0.3.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "approx" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1hx580xjdxl3766js9b49rnbnmr8gw8c060809l43k9f0xshprph")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-num-complex" ,rust-num-complex-0.2) + ("rust-num-traits" ,rust-num-traits-0.2)))) + (home-page "https://github.com/brendanzab/approx") + (synopsis + "Approximate floating point equality comparisons and assertions") + (description + "Approximate floating point equality comparisons and assertions.") + (license license:asl2.0))) + (define-public rust-arrayvec-0.4 (package (name "rust-arrayvec") -- cgit v1.2.3 From c3aaba1926ee153c6896d801fdce4d6a28a3b6fc Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 17:38:47 -0800 Subject: gnu: Add rust-criterion-0.2. * gnu/packages/crates-io.scm (rust-criterion-0.2): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 47 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6894f96748..05f6c5c333 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -901,6 +901,53 @@ (define-public rust-crc32fast-1.2 "Fast, SIMD-accelerated CRC32 (IEEE) checksum computation.") (license (list license:expat license:asl2.0)))) +(define-public rust-criterion-0.2 + (package + (name "rust-criterion") + (version "0.2.11") + (source + (origin + (method url-fetch) + (uri (crate-uri "criterion" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1543wlpc4p1kz7sqqa7ylr8bkdr8l4f34hy4bxj7krpkahwhaqq3")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-atty" ,rust-atty-0.2) + ("rust-cast" ,rust-cast-0.2) + ("rust-clap" ,rust-clap-2) + ("rust-criterion-plot" ,rust-criterion-plot-0.3) + ("rust-csv" ,rust-csv-1.1) + ("rust-itertools" ,rust-itertools-0.8) + ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-libc" ,rust-libc-0.2) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-rand-core" ,rust-rand-core-0.5) + ("rust-rand-os" ,rust-rand-os-0.2) + ("rust-rand-xoshiro" ,rust-rand-xoshiro-0.3) + ("rust-rayon" ,rust-rayon-1.1) + ("rust-rayon-core" ,rust-rayon-core-1.5) + ("rust-serde" ,rust-serde-1.0) + ("rust-serde-derive" ,rust-serde-derive-1.0) + ("rust-serde-json" ,rust-serde-json-1.0) + ("rust-tinytemplate" ,rust-tinytemplate-1.0) + ("rust-walkdir" ,rust-walkdir-2.2)) + #:cargo-development-inputs + (("rust-approx" ,rust-approx-0.3) + ("rust-quickcheck" ,rust-quickcheck-0.8) + ("rust-rand" ,rust-rand-0.4) + ("rust-tempdir" ,rust-tempdir-0.3)))) + (home-page "https://bheisler.github.io/criterion.rs/book/index.html") + (synopsis "Statistics-driven micro-benchmarking library") + (description + "Statistics-driven micro-benchmarking library.") + (license (list license:expat license:asl2.0)))) + (define-public rust-criterion-plot-0.3 (package (name "rust-criterion-plot") -- cgit v1.2.3 From 5aa00c0d8a7c38cb2cadc9c8f716c3a52b18f54a Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 17:33:58 -0800 Subject: gnu: Add rust-tinytemplate-1.0. * gnu/packages/crates-io.scm (rust-tinytemplate-1.0): 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 05f6c5c333..e16e7d6235 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6187,6 +6187,34 @@ (define-public rust-time-0.1 (license (list license:asl2.0 license:expat)))) +(define-public rust-tinytemplate-1.0 + (package + (name "rust-tinytemplate") + (version "1.0.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "tinytemplate" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "084w41m75i95sdid1wwlnav80jsl1ggyryl4nawxvb6amigvfx25")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-serde" ,rust-serde-1.0) + ("rust-serde-json" ,rust-serde-json-1.0)) + #:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.2) + ("rust-serde-derive" ,rust-serde-derive-1.0)))) + (home-page "https://github.com/bheisler/TinyTemplate") + (synopsis "Simple, lightweight template engine") + (description + "Simple, lightweight template engine.") + (license (list license:asl2.0 license:expat)))) + ;; Cyclic dependency with tokio-io (define-public rust-tokio-codec-0.1 (package -- cgit v1.2.3 From 2fcb9efc92b072a9cdd6771217733d6a13313263 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 17:40:57 -0800 Subject: gnu: Add rust-bumpalo-2.5. * gnu/packages/crates-io.scm (rust-bumpalo-2.5): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e16e7d6235..c9ba2fccf7 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -394,6 +394,31 @@ (define-public rust-blas-sys-0.7 (license (list license:asl2.0 license:expat)))) +(define-public rust-bumpalo-2.5 + (package + (name "rust-bumpalo") + (version "2.5.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "bumpalo" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "018b5calz3895v04shk9bn7i73r4zf8yf7p1dqg92s3xya13vm1c")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.2) + ("rust-quickcheck" ,rust-quickcheck-0.8)))) + (home-page "https://github.com/fitzgen/bumpalo") + (synopsis "Fast bump allocation arena for Rust") + (description + "This package provides a fast bump allocation arena for Rust.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-bstr-0.2 (package (name "rust-bstr") -- cgit v1.2.3 From 5ad1c79e205a14193f493146dbe2030f5b79e579 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 17:41:51 -0800 Subject: gnu: Add rust-wasm-bindgen-backend-0.2. * gnu/packages/crates-io.scm (rust-wasm-bindgen-backend-0.2): 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 c9ba2fccf7..6f3427c6a0 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7047,6 +7047,36 @@ (define-public rust-wasi-0.5 (properties '((hidden? . #t))) (license license:asl2.0))) +(define-public rust-wasm-bindgen-backend-0.2 + (package + (name "rust-wasm-bindgen-backend") + (version "0.2.48") + (source + (origin + (method url-fetch) + (uri (crate-uri "wasm-bindgen-backend" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1qxqkbjkjg4pphhcr91nk95c0gizx77dyq24mmijqnwzxxqc30jx")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bumpalo" ,rust-bumpalo-2.5) + ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-log" ,rust-log-0.4) + ("rust-proc-macro2" ,rust-proc-macro2-0.4) + ("rust-quote" ,rust-quote-1.0) + ("rust-syn" ,rust-syn-0.15) + ("rust-wasm-bindgen-shared" ,rust-wasm-bindgen-shared-0.2)))) + (home-page "https://rustwasm.github.io/wasm-bindgen/") + (synopsis "Backend code generation of the wasm-bindgen tool") + (description + "Backend code generation of the wasm-bindgen tool.") + (license (list license:expat license:asl2.0)))) + (define-public rust-wasm-bindgen-shared-0.2 (package (name "rust-wasm-bindgen-shared") -- cgit v1.2.3 From 502597f9cb6bc68cd9962f9dea28ad2bdfd793af Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 17:45:51 -0800 Subject: gnu: Add rust-base64-0.10. * gnu/packages/crates-io.scm (rust-base64-0.10): 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 6f3427c6a0..407d6b2531 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -279,6 +279,33 @@ (define-public rust-backtrace-sys-0.1 (license (list license:asl2.0 license:expat)))) +(define-public rust-base64-0.10 + (package + (name "rust-base64") + (version "0.10.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "base64" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "13k6bvd3n6dm7jqn9x918w65dd9xhx454bqphbnv0bkd6n9dj98b")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-byteorder" ,rust-byteorder-1.3)) + #:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.2) + ("rust-rand" ,rust-rand-0.4)))) + (home-page "https://github.com/marshallpierce/rust-base64") + (synopsis "Encodes and decodes base64 as bytes or utf8") + (description + "Encodes and decodes base64 as bytes or utf8.") + (license (list license:expat license:asl2.0)))) + (define-public rust-base-x-0.2 (package (name "rust-base-x") -- cgit v1.2.3 From a5ec784c3a9efa517f3557b8c7cab842d8d693bd Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 17:54:51 -0800 Subject: gnu: Add rust-trybuild-1.0. * gnu/packages/crates-io.scm (rust-trybuild-1.0): 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 407d6b2531..8a8969319b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6640,6 +6640,35 @@ (define-public rust-try-lock-0.2 (properties '((hidden? . #t))) (license license:expat))) +(define-public rust-trybuild-1.0 + (package + (name "rust-trybuild") + (version "1.0.9") + (source + (origin + (method url-fetch) + (uri (crate-uri "trybuild" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0df6ipayif05xn61iavdb0dcshm9y6wmcd140pp7dl91mirygs7j")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-glob" ,rust-glob-0.3) + ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-serde" ,rust-serde-1.0) + ("rust-serde-json" ,rust-serde-json-1.0) + ("rust-termcolor" ,rust-termcolor-1.0) + ("rust-toml" ,rust-toml-0.5)))) + (home-page "https://github.com/dtolnay/trybuild") + (synopsis "Test harness for ui tests of compiler diagnostics") + (description + "Test harness for ui tests of compiler diagnostics.") + (license (list license:expat license:asl2.0)))) + (define-public rust-typeable-0.1 (package (name "rust-typeable") -- cgit v1.2.3 From b9945ec24c09bf6244bfbdcfa56f1d698e7e3228 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 17:50:26 -0800 Subject: gnu: Add rust-wasm-bindgen-macro-support-0.2. * gnu/packages/crates-io.scm (rust-wasm-bindgen-macro-support-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 8a8969319b..8c222b888e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7133,6 +7133,35 @@ (define-public rust-wasm-bindgen-backend-0.2 "Backend code generation of the wasm-bindgen tool.") (license (list license:expat license:asl2.0)))) +(define-public rust-wasm-bindgen-macro-support-0.2 + (package + (name "rust-wasm-bindgen-macro-support") + (version "0.2.48") + (source + (origin + (method url-fetch) + (uri (crate-uri "wasm-bindgen-macro-support" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1mxi6rj11k67sks88pfqiqylnijxmb1s0gcgpj8mzfj5gvkqzkwm")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-0.4) + ("rust-quote" ,rust-quote-1.0) + ("rust-syn" ,rust-syn-0.15) + ("rust-wasm-bindgen-backend" ,rust-wasm-bindgen-backend-0.2) + ("rust-wasm-bindgen-shared" ,rust-wasm-bindgen-shared-0.2)))) + (home-page "https://rustwasm.github.io/wasm-bindgen/") + (synopsis "The @code{#[wasm_bindgen]} macro") + (description + "The part of the implementation of the @code{#[wasm_bindgen]} +attribute that is not in the shared backend crate.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-wasm-bindgen-shared-0.2 (package (name "rust-wasm-bindgen-shared") -- cgit v1.2.3 From 0dbbb5a6228de4e290254cb287e6f9c6f3360153 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 17:57:29 -0800 Subject: gnu: Add rust-wasm-bindgen-0.2. * gnu/packages/crates-io.scm (rust-wasm-bindgen-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 8c222b888e..acb0556be5 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7103,6 +7103,33 @@ (define-public rust-wasi-0.5 (properties '((hidden? . #t))) (license license:asl2.0))) +(define-public rust-wasm-bindgen-0.2 + (package + (name "rust-wasm-bindgen") + (version "0.2.48") + (source + (origin + (method url-fetch) + (uri (crate-uri "wasm-bindgen" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0m8vq3jkhz04fn3wjvb7ii7xql60w32nlvr10jcskcbbh2hpzsad")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-serde" ,rust-serde-1.0) + ("rust-serde-json" ,rust-serde-json-1.0) + ("rust-wasm-bindgen-macro" + ,rust-wasm-bindgen-macro-0.2)))) + (home-page "https://rustwasm.github.io/") + (synopsis "Easy support for interacting between JS and Rust") + (description + "Easy support for interacting between JS and Rust.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-wasm-bindgen-backend-0.2 (package (name "rust-wasm-bindgen-backend") -- cgit v1.2.3 From ca09e4ac2336c0a5904b00433ba596941e12b0ed Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 18:04:31 -0800 Subject: gnu: Add rust-console-error-panic-hook-0.1. * gnu/packages/crates-io.scm (rust-console-error-panic-hook-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index acb0556be5..2d1e7a364f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -881,6 +881,32 @@ (define-public rust-compiler-builtins-0.1 (license (list license:asl2.0 license:expat)))) +(define-public rust-console-error-panic-hook-0.1 + (package + (name "rust-console-error-panic-hook") + (version "0.1.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "console_error_panic_hook" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "04d2narcrzk9bnddz17rr2l819l82pr0h6d98s2w9q236n87dndq")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-cfg-if" ,rust-cfg-if-0.1) + ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)))) + (home-page "https://github.com/rustwasm/console_error_panic_hook") + (synopsis "Logs panics to console.error") + (description + "This package provides a panic hook for @code{wasm32-unknown-unknown} +that logs panics to @code{console.error}.") + (license (list license:expat license:asl2.0)))) + (define-public rust-constant-time-eq-0.1 (package (name "rust-constant-time-eq") -- cgit v1.2.3 From 1572b05d4f1059eecdd9e18f275b0526495d169d Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 18:06:55 -0800 Subject: gnu: Add rust-wasm-bindgen-futures-0.3. * gnu/packages/crates-io.scm (rust-wasm-bindgen-futures-0.3): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2d1e7a364f..9a74ab625c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7186,6 +7186,39 @@ (define-public rust-wasm-bindgen-backend-0.2 "Backend code generation of the wasm-bindgen tool.") (license (list license:expat license:asl2.0)))) +(define-public rust-wasm-bindgen-futures-0.3 + (package + (name "rust-wasm-bindgen-futures") + (version "0.3.24") + (source + (origin + (method url-fetch) + (uri (crate-uri "wasm-bindgen-futures" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0bf9x6qfjczspc4zs605z1n4j15cdd8kk2z7rah0yggw8b6zl5nc")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-futures" ,rust-futures-0.1) + ("rust-futures-channel-preview" + ,rust-futures-channel-preview-0.3) + ("rust-futures-util-preview" ,rust-futures-util-preview-0.3) + ("rust-js-sys" ,rust-js-sys-0.3) + ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)) + #:cargo-development-inputs + (("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.2)))) + (home-page "https://rustwasm.github.io/wasm-bindgen/") + (synopsis + "Bridging the gap between Rust Futures and JavaScript Promises") + (description + "Bridging the gap between Rust Futures and JavaScript Promises.") + (license (list license:expat license:asl2.0)))) + (define-public rust-wasm-bindgen-macro-support-0.2 (package (name "rust-wasm-bindgen-macro-support") -- cgit v1.2.3 From 0d978756b04db9e34b87a932368a6f60a3989804 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 18:12:58 -0800 Subject: gnu: Add rust-wasm-bindgen-test-0.2. * gnu/packages/crates-io.scm (rust-wasm-bindgen-test-0.2): 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 9a74ab625c..8d8c6b5a44 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7269,6 +7269,36 @@ (define-public rust-wasm-bindgen-shared-0.2 (license (list license:asl2.0 license:expat)))) +(define-public rust-wasm-bindgen-test-0.2 + (package + (name "rust-wasm-bindgen-test") + (version "0.2.48") + (source + (origin + (method url-fetch) + (uri (crate-uri "wasm-bindgen-test" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0gwslc2sfkghzzb3r0gvd8i5rig2nlqgpl1rn43y2w4mr1ci494k")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-console-error-panic-hook" ,rust-console-error-panic-hook-0.1) + ("rust-futures" ,rust-futures-0.1) + ("rust-js-sys" ,rust-js-sys-0.3) + ("rust-scoped-tls" ,rust-scoped-tls-1.0) + ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2) + ("rust-wasm-bindgen-futures" ,rust-wasm-bindgen-futures-0.3) + ("rust-wasm-bindgen-test-macro" ,rust-wasm-bindgen-test-macro-0.2)))) + (home-page "https://github.com/rustwasm/wasm-bindgen") + (synopsis "Internal testing crate for wasm-bindgen") + (description + "Internal testing crate for wasm-bindgen.") + (license (list license:expat license:asl2.0)))) + (define-public rust-wasm-bindgen-test-macro-0.2 (package (name "rust-wasm-bindgen-test-macro") -- cgit v1.2.3 From d616284320cb64cd885ab95449db4067e6842ee6 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 18:10:35 -0800 Subject: gnu: Add rust-js-sys-0.3. * gnu/packages/crates-io.scm (rust-js-sys-0.3): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 8d8c6b5a44..74758c46da 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2767,6 +2767,36 @@ (define-public rust-itoa-0.1 (base32 "18g7p2hrb3dk84z3frfgmszfc9hjb4ps9vp99qlb1kmf9gm8hc5f")))))) +(define-public rust-js-sys-0.3 + (package + (name "rust-js-sys") + (version "0.3.24") + (source + (origin + (method url-fetch) + (uri (crate-uri "js-sys" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "045fgafggkjdfg4f33vb87silyl9xpbifrhx1ciqi4wvm90nzhga")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)) + #:cargo-development-inputs + (("rust-futures" ,rust-futures-0.1) + ("rust-wasm-bindgen-futures" ,rust-wasm-bindgen-futures-0.3) + ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.2)))) + (home-page "https://rustwasm.github.io/wasm-bindgen/") + (synopsis "Bindings for all JS global objects and functions in WASM") + (description + "Bindings for all JS global objects and functions in all JS environments +like Node.js and browsers, built on @code{#[wasm_bindgen]} using the +wasm-bindgen crate.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-jemalloc-sys-0.3 (package (name "rust-jemalloc-sys") -- cgit v1.2.3 From 5d8dfefbacb0d216eb774d38c022bcc139825441 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 18:17:18 -0800 Subject: gnu: Add rust-core-arch-0.1. * gnu/packages/crates-io.scm (rust-core-arch-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 74758c46da..732e126405 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -929,6 +929,32 @@ (define-public rust-constant-time-eq-0.1 (properties '((hidden? . #t))) (license license:cc0))) +(define-public rust-core-arch-0.1 + (package + (name "rust-core-arch") + (version "0.1.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "core_arch" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "04vdvr9vj0f1cv2p54nsszmrrk9w1js4c0z4i0bdlajl1lydslim")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-development-inputs + (("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.2)))) + (home-page "https://github.com/rust-lang/stdarch") + (synopsis + "Rust's core library architecture-specific intrinsics") + (description + "@code{core::arch} - Rust's core library architecture-specific +intrinsics.") + (license (list license:expat license:asl2.0)))) + (define-public rust-core-foundation-sys-0.6 (package (name "rust-core-foundation-sys") -- cgit v1.2.3 From 31c1c18677422f5d9f7f7ef1f1596830bd628167 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 18:24:01 -0800 Subject: gnu: Add rust-ci-info-0.3. * gnu/packages/crates-io.scm (rust-ci-info-0.3): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 732e126405..46e36c00a7 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -700,6 +700,31 @@ (define-public rust-cfg-if-0.1 (license (list license:asl2.0 license:expat)))) +(define-public rust-ci-info-0.3 + (package + (name "rust-ci-info") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "ci-info" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "00pr17g6q6i752acrkycg0hkq3lm0p634anm41g3m6lqg8q83s75")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-serde" ,rust-serde-1.0) + ("rust-serde-derive" ,rust-serde-derive-1.0)))) + (home-page "https://github.com/sagiegurari/ci_info") + (synopsis "Provides current CI environment information") + (description + "This package provides current CI environment information.") + (license license:asl2.0))) + (define-public rust-clang-sys-0.28 (package (name "rust-clang-sys") -- cgit v1.2.3 From 57388f36ed1b34aab1ec89a74d827928abe36316 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 18:30:48 -0800 Subject: gnu: Add rust-scroll-derive-0.9. * gnu/packages/crates-io.scm (rust-scroll-derive-0.9): 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 46e36c00a7..845084c794 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5379,6 +5379,35 @@ (define-public rust-scopeguard-0.3 (base32 "09sy9wbqp409pkwmqni40qmwa99ldqpl48pp95m1xw8sc19qy9cl")))))) +(define-public rust-scroll-derive-0.9 + (package + (name "rust-scroll-derive") + (version "0.9.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "scroll_derive" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1jqg5mm8nvii6avl1z1rc89agzh2kwkppgpsnwfakxg78mnaj6lg")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-0.4) + ("rust-quote" ,rust-quote-1.0) + ("rust-syn" ,rust-syn-0.15)) + #:cargo-development-inputs + (("rust-scroll" ,rust-scroll-0.9)))) + (home-page "https://github.com/m4b/scroll_derive") + (synopsis "Derive Pread and Pwrite traits from the scroll crate") + (description + "This package provides a macros 1.1 derive implementation for Pread and +Pwrite traits from the scroll crate.") + (license license:expat))) + (define-public rust-security-framework-sys-0.3 (package (name "rust-security-framework-sys") -- cgit v1.2.3 From 1c9ad3cf2e7903cf714cf13f63cdbd66f7980104 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 18:32:17 -0800 Subject: gnu: Add rust-scroll-0.9. * gnu/packages/crates-io.scm (rust-scroll-0.9): 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 845084c794..6f8b39ff5d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5379,6 +5379,35 @@ (define-public rust-scopeguard-0.3 (base32 "09sy9wbqp409pkwmqni40qmwa99ldqpl48pp95m1xw8sc19qy9cl")))))) +(define-public rust-scroll-0.9 + (package + (name "rust-scroll") + (version "0.9.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "scroll" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "10q3w86bn22xrjlfg1c90dfi9c26qjkzn26nad0i9z8pxwad311g")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-scroll-derive" ,rust-scroll-derive-0.9)) + #:cargo-development-inputs + (("rust-byteorder" ,rust-byteorder-1.3) + ("rust-rayon" ,rust-rayon-1.1) + ("rust-rustc-version" ,rust-rustc-version-0.2)))) + (home-page "https://github.com/m4b/scroll") + (synopsis "Read/Write traits for byte buffers") + (description + "This package provides a suite of powerful, extensible, generic, +endian-aware Read/Write traits for byte buffers.") + (license license:expat))) + (define-public rust-scroll-derive-0.9 (package (name "rust-scroll-derive") -- cgit v1.2.3 From 6d95d023a038276d9efc07ec669993072b0fe2c7 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 18:20:14 -0800 Subject: gnu: Add rust-envmnt-0.6. * gnu/packages/crates-io.scm (rust-envmnt-0.6): 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 6f8b39ff5d..6d4b54994d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1744,6 +1744,30 @@ (define-public rust-env-logger-0.6 is configured via an environment variable.") (license (list license:expat license:asl2.0)))) +(define-public rust-envmnt-0.6 + (package + (name "rust-envmnt") + (version "0.6.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "envmnt" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "12zkq3p999bypyxmjnpiqw9r3hmifb3bcikd7j3as1fdcbq01fyl")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-indexmap" ,rust-indexmap-1.0)))) + (home-page "https://github.com/sagiegurari/envmnt") + (synopsis "Environment variables utility functions") + (description + "Environment variables utility functions.") + (license license:asl2.0))) + (define-public rust-fallible-iterator-0.2 (package (name "rust-fallible-iterator") -- cgit v1.2.3 From ea3616ea3583792f5b8eceb80b1f2f7ea1f1172f Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 18:34:39 -0800 Subject: gnu: Add rust-goblin-0.0. * gnu/packages/crates-io.scm (rust-goblin-0.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 6d4b54994d..5ec06e82fb 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2431,6 +2431,33 @@ (define-public rust-globset-0.4 path simultaneously, and returning all of the globs that matched.") (license (list license:expat license:unlicense)))) +(define-public rust-goblin-0.0 + (package + (name "rust-goblin") + (version "0.0.23") + (source + (origin + (method url-fetch) + (uri (crate-uri "goblin" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1g92bl76dgc3v3rins61l811pkwsl3jif1x35h2jx33b7dsv8mmc")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-log" ,rust-log-0.4) + ("rust-plain" ,rust-plain-0.2) + ("rust-scroll" ,rust-scroll-0.9)))) + (home-page "https://github.com/m4b/goblin") + (synopsis "Binary parsing and loading") + (description + "An impish, cross-platform, ELF, Mach-o, and PE binary parsing and +loading crate.") + (license license:expat))) + (define-public rust-grep-cli-0.1 (package (name "rust-grep-cli") -- cgit v1.2.3 From d3af7e3ec837cfc46a2cc6156d834aac585ce044 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 18:38:09 -0800 Subject: gnu: Add rust-test-assembler-0.1. * gnu/packages/crates-io.scm (rust-test-assembler-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5ec06e82fb..4157be255b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6346,6 +6346,31 @@ (define-public rust-termios-0.3 (properties '((hidden? . #t))) (license license:expat))) +(define-public rust-test-assembler-0.1 + (package + (name "rust-test-assembler") + (version "0.1.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "test-assembler" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1sdx9hk0dk3z9crm8834ysyxsi92chls8arpd0gs796kis6lik2w")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-byteorder" ,rust-byteorder-1.3)))) + (home-page "https://github.com/luser/rust-test-assembler") + (synopsis "Build complex binary streams") + (description + "This package provides a set of types for building complex binary +streams.") + (license license:expat))) + (define-public rust-textwrap-0.11 (package (name "rust-textwrap") -- cgit v1.2.3 From 1ac4b950a9956720e9f62ce839aeb289ca8a2073 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 18:39:54 -0800 Subject: gnu: Add rust-typed-arena-1.4. * gnu/packages/crates-io.scm (rust-typed-arena-1.4): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4157be255b..4ce1309c42 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6929,6 +6929,27 @@ (define-public rust-typeable-0.1 (properties '((hidden? . #t))) (license license:expat))) +(define-public rust-typed-arena-1.4 + (package + (name "rust-typed-arena") + (version "1.4.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "typed-arena" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1i8yczhwcy0nnrxqck1lql3i7hvg95l0vw0dbgfb92zkms96mh66")))) + (build-system cargo-build-system) + (arguments `(#:skip-build? #t)) + (home-page "https://github.com/SimonSapin/rust-typed-arena") + (synopsis "The arena allocator") + (description + "The arena, a fast but limited type of allocator.") + (license license:expat))) + (define-public rust-typemap-0.3 (package (name "rust-typemap") -- cgit v1.2.3 From ecc528c3691f7bfc1039cbdbd622ed3ed54fff05 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 18:42:22 -0800 Subject: gnu: Add rust-gimli-0.18. * gnu/packages/crates-io.scm (rust-gimli-0.18): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4ce1309c42..021406c8fa 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2361,6 +2361,45 @@ (define-public rust-getopts-0.2 (license (list license:asl2.0 license:expat)))) +(define-public rust-gimli-0.18 + (package + (name "rust-gimli") + (version "0.18.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "gimli" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0ma1zg2klqr47rasm7jn3zzd1j1pj2a8wkfbv5zsx10qh43phy4k")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-arrayvec" ,rust-arrayvec-0.4) + ("rust-byteorder" ,rust-byteorder-1.3) + ("rust-fallible-iterator" ,rust-fallible-iterator-0.2) + ("rust-indexmap" ,rust-indexmap-1.0) + ("rust-stable-deref-trait" ,rust-stable-deref-trait-1.1)) + #:cargo-development-inputs + (("rust-crossbeam" ,rust-crossbeam-0.7) + ("rust-getopts" ,rust-getopts-0.2) + ("rust-memmap" ,rust-memmap-0.7) + ("rust-num-cpus" ,rust-num-cpus-1.10) + ("rust-object" ,rust-object-0.12) + ("rust-rayon" ,rust-rayon-1.1) + ("rust-regex" ,rust-regex-1.1) + ("rust-test-assembler" ,rust-test-assembler-0.1) + ("rust-typed-arena" ,rust-typed-arena-1.4)))) + (home-page "https://github.com/gimli-rs/gimli") + (synopsis "Reading and writing the DWARF debugging format") + (description + "This package provides a library for reading and writing the +DWARF debugging format.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-glob-0.3 (package (name "rust-glob") -- cgit v1.2.3 From 033b098de867987c46027824500def6cba1d731c Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 18:44:32 -0800 Subject: gnu: Add rust-intervaltree-0.2. * gnu/packages/crates-io.scm (rust-intervaltree-0.2): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 021406c8fa..4044ab1887 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2792,6 +2792,31 @@ (define-public rust-insta-0.8 "This package provides a snapshot testing library for Rust.") (license license:asl2.0))) +(define-public rust-intervaltree-0.2 + (package + (name "rust-intervaltree") + (version "0.2.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "intervaltree" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "10k40gsv79kwnsqrzwmnmm6psa5fqws8yggavmbggvymv16hffdg")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-smallvec" ,rust-smallvec-0.6)))) + (home-page "https://github.com/main--/rust-intervaltree") + (synopsis "Immutable interval trees") + (description + "This package provides a simple and generic implementation of an +immutable interval tree.") + (license license:expat))) + (define-public rust-iovec-0.1 (package (name "rust-iovec") -- cgit v1.2.3 From 2f7e32aa0fd0e279aac6e6e35a63cb482a050e93 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 18:46:28 -0800 Subject: gnu: Add rust-lazycell-1.2. * gnu/packages/crates-io.scm (rust-lazycell-1.2): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4044ab1887..f20945454f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3085,6 +3085,29 @@ (define-public rust-lazy-static-1.3 (license (list license:asl2.0 license:expat)))) +(define-public rust-lazycell-1.2 + (package + (name "rust-lazycell") + (version "1.2.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "lazycell" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0gvqycmpv7parc98i6y64ai7rvxrn1947z2a6maa02g4kvxdd55j")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs (("rust-clippy" ,rust-clippy-0.0)))) + (home-page "https://github.com/indiv0/lazycell") + (synopsis "Lazily filled Cell struct") + (description + "This package provides a library providing a lazily filled Cell struct.") + (license (list license:expat license:asl2.0)))) + (define-public rust-libc-0.2 (package (name "rust-libc") -- cgit v1.2.3 From a10ff6fccc518d6a7d1070a28342931e5e78d87a Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 18:51:32 -0800 Subject: gnu: Add rust-half-1.3. * gnu/packages/crates-io.scm (rust-half-1.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 f20945454f..b2dcd1a8ed 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2584,6 +2584,30 @@ (define-public rust-grep-pcre2-0.1 (description "Use PCRE2 with the grep crate.") (license (list license:expat license:unlicense)))) +(define-public rust-half-1.3 + (package + (name "rust-half") + (version "1.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "half" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0diqajg3mgar511hxswl4kgqqz9a026yvn3103x5h2smknlc4lwk")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs (("rust-serde" ,rust-serde-1.0)))) + (home-page "https://github.com/starkat99/half-rs") + (synopsis "Half-precision floating point f16 type") + (description + "Half-precision floating point f16 type for Rust implementing the +IEEE 754-2008 binary16 type.") + (license (list license:expat license:asl2.0)))) + (define-public rust-heapsize-0.4 (package (name "rust-heapsize") -- cgit v1.2.3 From 0dd2eb4ad15bda7a8b6b7fae9d518b651858e3ce Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 18:54:04 -0800 Subject: gnu: Add rust-serde-cbor-0.10. * gnu/packages/crates-io.scm (rust-serde-cbor-0.10): 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 b2dcd1a8ed..12ac566882 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5736,6 +5736,33 @@ (define-public rust-serde-bytes-0.11 "Optimized handling of @code{&[u8]} and @code{Vec} for Serde.") (license (list license:expat license:asl2.0)))) +(define-public rust-serde-cbor-0.10 + (package + (name "rust-serde-cbor") + (version "0.10.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "serde_cbor" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0jcb4j637vdlqk2z38jixaqmp6f92h36r17kclv5brjay32911ii")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-byteorder" ,rust-byteorder-1.3) + ("rust-half" ,rust-half-1.3) + ("rust-serde" ,rust-serde-1.0)) + #:cargo-development-inputs + (("rust-serde-derive" ,rust-serde-derive-1.0)))) + (home-page "https://github.com/pyfisch/cbor") + (synopsis "CBOR support for serde") + (description "CBOR support for serde.") + (license (list license:expat license:asl2.0)))) + (define-public rust-serde-derive-1.0 (package (name "rust-serde-derive") -- cgit v1.2.3 From 99af41fa40742664c97c9ff7e651376eccae867b Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 18:56:39 -0800 Subject: gnu: Add rust-erased-serde-0.3. * gnu/packages/crates-io.scm (rust-erased-serde-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 12ac566882..5a9dde5325 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1768,6 +1768,34 @@ (define-public rust-envmnt-0.6 "Environment variables utility functions.") (license license:asl2.0))) +(define-public rust-erased-serde-0.3 + (package + (name "rust-erased-serde") + (version "0.3.9") + (source + (origin + (method url-fetch) + (uri (crate-uri "erased-serde" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0q7bnxs5zskfq5iillig55g7891dllcxh2p8y8k1p2j72syf9viv")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-serde" ,rust-serde-1.0)) + #:cargo-development-inputs + (("rust-serde-cbor" ,rust-serde-cbor-0.10) + ("rust-serde-derive" ,rust-serde-derive-1.0) + ("rust-serde-json" ,rust-serde-json-1.0)))) + (home-page "https://github.com/dtolnay/erased-serde") + (synopsis "Type-erased Serialize and Serializer traits") + (description + "Type-erased Serialize and Serializer traits.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-fallible-iterator-0.2 (package (name "rust-fallible-iterator") -- cgit v1.2.3 From 3c313f185f28e7d8e21f67057c752f5f02f24f93 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 18:57:25 -0800 Subject: gnu: Add rust-slog-2.4. * gnu/packages/crates-io.scm (rust-slog-2.4): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5a9dde5325..fa2147fc98 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5929,6 +5929,32 @@ (define-public rust-slab-0.4 (properties '((hidden? . #t))) (license license:expat))) +(define-public rust-slog-2.4 + (package + (name "rust-slog") + (version "2.4.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "slog" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "13jh74jlckzh5cygkhs0k4r82wnmw8ha2km829xwslhr83n2w6hy")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-erased-serde" ,rust-erased-serde-0.3)))) + (home-page "https://github.com/slog-rs/slog") + (synopsis "Structured, extensible, composable logging for Rust") + (description + "Structured, extensible, composable logging for Rust.") + (license (list license:mpl2.0 + license:expat + license:asl2.0)))) + (define-public rust-smallvec-0.6 (package (name "rust-smallvec") -- cgit v1.2.3 From baef2e88dd8c7148b3af9f59584f2595a789880b Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 19:00:03 -0800 Subject: gnu: Add rust-uuid-0.7. * gnu/packages/crates-io.scm (rust-uuid-0.7): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index fa2147fc98..5326fd029d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7414,6 +7414,41 @@ (define-public rust-utf8-ranges-1.0 "Convert ranges of Unicode codepoints to UTF-8 byte ranges.") (license (list license:expat license:unlicense)))) +(define-public rust-uuid-0.7 + (package + (name "rust-uuid") + (version "0.7.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "uuid" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0ank4xk20x3nrz926w8j9mz53bi3v8bykxmhlq2pffa8xc8wdnwh")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-byteorder" ,rust-byteorder-1.3) + ("rust-md5" ,rust-md5-0.6) + ("rust-rand" ,rust-rand-0.6) + ("rust-serde" ,rust-serde-1.0) + ("rust-sha1" ,rust-sha1-0.6) + ("rust-slog" ,rust-slog-2.4) + ("rust-winapi" ,rust-winapi-0.3)) + #:cargo-development-inputs + (("rust-bincode" ,rust-bincode-1.1) + ("rust-serde-derive" ,rust-serde-derive-1.0) + ("rust-serde-json" ,rust-serde-json-1.0) + ("rust-serde-test" ,rust-serde-test-1.0)))) + (home-page "https://github.com/uuid-rs/uuid") + (synopsis "Generate and parse UUIDs") + (description + "This package provides a library to generate and parse UUIDs.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-vcpkg-0.2 (package (name "rust-vcpkg") -- cgit v1.2.3 From d4eb88f03fb767b9c8574c0725c51fe9b96edafc Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 19:02:15 -0800 Subject: gnu: Add rust-object-0.12. * gnu/packages/crates-io.scm (rust-object-0.12): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5326fd029d..91177d2d1d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4073,6 +4073,37 @@ (define-public rust-numtoa-0.1 (properties '((hidden? . #t))) (license (list license:expat license:asl2.0)))) +(define-public rust-object-0.12 + (package + (name "rust-object") + (version "0.12.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "object" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1dch1ajjp05d16lig1dnvisfis0hrlrvw9lcwy1hwgdcym3z6jnz")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-flate2" ,rust-flate2-1.0) + ("rust-goblin" ,rust-goblin-0.0) + ("rust-parity-wasm" ,rust-parity-wasm-0.40) + ("rust-scroll" ,rust-scroll-0.9) + ("rust-uuid" ,rust-uuid-0.7)) + #:cargo-development-inputs + (("rust-memmap" ,rust-memmap-0.7)))) + (home-page "https://github.com/gimli-rs/object") + (synopsis "Parse object file formats") + (description + "This package provides a unified interface for parsing object file +formats.") + (license (list license:expat license:asl2.0)))) + (define-public rust-openssl-0.10 (package (name "rust-openssl") -- cgit v1.2.3 From 28547158f34cb8f32ae2f47c1d53289b10663955 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 19:10:05 -0800 Subject: gnu: Add rust-rustc-test-0.3. * gnu/package/crates-io.scm (rust-rustc-test-0.3): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 91177d2d1d..e42c426fce 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5389,6 +5389,37 @@ (define-public rust-rustc-std-workspace-core-1.0 (license (list license:asl2.0 license:expat)))) +(define-public rust-rustc-test-0.3 + (package + (name "rust-rustc-test") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rustc-test" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0a27mlcg0ck0hgsdvwk792x9z1k1qq1wj091f1l5yggbdbcsnx5w")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("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)))) + (home-page "https://github.com/servo/rustc-test") + (synopsis "Fork of Rust's test crate") + (description + "This package provides a fork of Rust's test crate that doesn't +require unstable language features.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-rustc-version-0.2 (package (name "rust-rustc-version") -- cgit v1.2.3 From 50d2e60ad0ab19f1e061b2d9cbf727a0a545325b Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 19:15:57 -0800 Subject: gnu: Add rust-backtrace-0.3. * gnu/packages/crates-io.scm (rust-backtrace-0.3): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e42c426fce..9921ec7a06 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -258,6 +258,45 @@ (define-public rust-autocfg-0.1 (license (list license:asl2.0 license:expat)))) +(define-public rust-backtrace-0.3 + (package + (name "rust-backtrace") + (version "0.3.32") + (source + (origin + (method url-fetch) + (uri (crate-uri "backtrace" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1rgsaha3b6wxh564s4jqn5hl5pkmg214blyjjs1svafib190zd8q")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-addr2line" ,rust-addr2line-0.9) + ("rust-backtrace-sys" ,rust-backtrace-sys-0.1) + ("rust-cfg-if" ,rust-cfg-if-0.1) + ("rust-compiler-builtins" ,rust-compiler-builtins-0.1) + ("rust-cpp-demangle" ,rust-cpp-demangle-0.2) + ("rust-findshlibs" ,rust-findshlibs-0.5) + ("rust-goblin" ,rust-goblin-0.0) + ("rust-libc" ,rust-libc-0.2) + ("rust-memmap" ,rust-memmap-0.7) + ("rust-rustc-demangle" ,rust-rustc-demangle-0.1) + ("rust-rustc-serialize" ,rust-rustc-serialize-0.3) + ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1.0) + ("rust-serde" ,rust-serde-1.0) + ("rust-winapi" ,rust-winapi-0.3)))) + (home-page "https://github.com/rust-lang/backtrace-rs") + (synopsis + "Acquire a stack trace (backtrace) at runtime in a Rust program") + (description + "This package provides a library to acquire a stack +trace (backtrace) at runtime in a Rust program.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-backtrace-sys-0.1 (package (name "rust-backtrace-sys") -- cgit v1.2.3 From 075929a8394fc35a0ad8795b4f8488e2b526e20b Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 19:13:39 -0800 Subject: gnu: Add rust-addr2line-0.9. * gnu/packages/crates-io.scm (rust-addr2line-0.9): 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 9921ec7a06..27f7974376 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -54,6 +54,44 @@ (define-public rust-adler32-1.0 (license (list license:bsd-3 license:zlib)))) +(define-public rust-addr2line-0.9 + (package + (name "rust-addr2line") + (version "0.9.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "addr2line" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "17rlf04nx3g3rcy661v24ksnmpk6vqn680g5b5sp8lk20iih2xnx")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-cpp-demangle" ,rust-cpp-demangle-0.2) + ("rust-fallible-iterator" ,rust-fallible-iterator-0.2) + ("rust-gimli" ,rust-gimli-0.18) + ("rust-intervaltree" ,rust-intervaltree-0.2) + ("rust-lazycell" ,rust-lazycell-1.2) + ("rust-object" ,rust-object-0.12) + ("rust-rustc-demangle" ,rust-rustc-demangle-0.1) + ("rust-smallvec" ,rust-smallvec-0.6)) + #:cargo-development-inputs + (("rust-backtrace" ,rust-backtrace-0.3) + ("rust-clap" ,rust-clap-2) + ("rust-findshlibs" ,rust-findshlibs-0.5) + ("rust-memmap" ,rust-memmap-0.7) + ("rust-rustc-test" ,rust-rustc-test-0.3)))) + (home-page "https://github.com/gimli-rs/addr2line") + (synopsis "Symbolication library written in Rust, using gimli") + (description + "This package provides a cross-platform symbolication library written in +Rust, using gimli.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-afl-0.4 (package (name "rust-afl") -- cgit v1.2.3 From 6f4595533a3d012baefc583886e3402f909efd1a Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 19:23:10 -0800 Subject: gnu: Add rust-rawslice-0.1. * gnu/packages/crates-io.scm (rust-rawslice-0.1): 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 27f7974376..caf514068e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5118,6 +5118,34 @@ (define-public rust-rawpointer-0.1 (license (list license:asl2.0 license:expat)))) +(define-public rust-rawslice-0.1 + (package + (name "rust-rawslice") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rawslice" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "09bympww1rpsd422da3w444q5w1znjbjh7mjninhq9gaaygkpci2")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-rawpointer" ,rust-rawpointer-0.1)) + #:cargo-development-inputs + (("rust-quickcheck" ,rust-quickcheck-0.8)))) + (home-page "https://github.com/bluss/rawslice/") + (synopsis "Reimplementation of the slice iterators, with extra features") + (description + "Reimplementation of the slice iterators, with extra features. +For example creation from raw pointers and start, end pointer +accessors.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-rayon-1.1 (package (name "rust-rayon") -- cgit v1.2.3 From 2ebc4f361b962e9c879cfacfd577a5cc1ee99390 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 19:24:50 -0800 Subject: gnu: Add rust-unchecked-index-0.2. * gnu/packages/crates-io.scm (rust-unchecked-index-0.2): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index caf514068e..0dfe93f8f4 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7394,6 +7394,27 @@ (define-public rust-ucd-util-0.1 (license (list license:asl2.0 license:expat)))) +(define-public rust-unchecked-index-0.2 + (package + (name "rust-unchecked-index") + (version "0.2.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "unchecked-index" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0p6qcai1mjayx59cpgk27d0zgw9hz9r1ira5jiqil66f4ba8dfpf")))) + (build-system cargo-build-system) + (arguments `(#:skip-build? #t)) + (home-page "https://github.com/bluss/unchecked-index") + (synopsis "Unchecked indexing wrapper using regular index syntax") + (description + "Unchecked indexing wrapper using regular index syntax.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-unicase-2.4 (package (name "rust-unicase") -- cgit v1.2.3 From 20690513d5b98d641f490b6a4a670e3a8dc2f724 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 19:26:56 -0800 Subject: gnu: Add rust-odds-0.3. * gnu/packages/crates-io.scm (rust-odds-0.3): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0dfe93f8f4..fcfba669ee 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4181,6 +4181,39 @@ (define-public rust-object-0.12 formats.") (license (list license:expat license:asl2.0)))) +(define-public rust-odds-0.3 + (package + (name "rust-odds") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "odds" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0rdnxa0na4897yb0svb3figz35g4imxjv61yfm2j21gbh5q8v8d9")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-rawpointer" ,rust-rawpointer-0.1) + ("rust-rawslice" ,rust-rawslice-0.1) + ("rust-unchecked-index" ,rust-unchecked-index-0.2)) + #:cargo-development-inputs + (("rust-itertools" ,rust-itertools-0.8) + ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-memchr" ,rust-memchr-2.2) + ("rust-quickcheck" ,rust-quickcheck-0.8)))) + (home-page "https://github.com/bluss/odds") + (synopsis "Extra functionality for slices, strings and other things") + (description + "Odds and ends collection miscellania. Extra functionality for +slices (@code{.find()}, @code{RevSlice}), strings and other things. +Things in odds may move to more appropriate crates if we find them.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-openssl-0.10 (package (name "rust-openssl") -- cgit v1.2.3 From 87d7db0b33c85ee75bcc0768760388714470d490 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 19:28:34 -0800 Subject: gnu: Add rust-petgraph-0.4. * gnu/packages/crates-io.scm (rust-petgraph-0.4): 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 fcfba669ee..3e9833dd6c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4496,6 +4496,40 @@ (define-public rust-permutohedron-0.2 (license (list license:asl2.0 license:expat)))) +(define-public rust-petgraph-0.4 + (package + (name "rust-petgraph") + (version "0.4.13") + (source + (origin + (method url-fetch) + (uri (crate-uri "petgraph" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0kyfmca854s54jk26g2x1kjb04c3k7cjilaxyr0if8lhxv8mjdlw")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-fixedbitset" ,rust-fixedbitset-0.1) + ("rust-ordermap" ,rust-ordermap-0.3) + ("rust-quickcheck" ,rust-quickcheck-0.8) + ("rust-serde" ,rust-serde-1.0) + ("rust-serde-derive" ,rust-serde-derive-1.0)) + #:cargo-development-inputs + (("rust-defmac" ,rust-defmac-0.2) + ("rust-itertools" ,rust-itertools-0.8) + ("rust-odds" ,rust-odds-0.3) + ("rust-rand" ,rust-rand-0.4)))) + (home-page "https://github.com/petgraph/petgraph") + (synopsis "Graph data structure library") + (description + "Graph data structure library. Provides graph types and graph +algorithms.") + (license (list license:expat license:asl2.0)))) + (define-public rust-pico-sys-0.0 (package (name "rust-pico-sys") -- cgit v1.2.3 From 0511c4cccd323f5dd72af692ea178223277a5ab2 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 19:34:33 -0800 Subject: gnu: Add parking-lot-core-0.5. * gnu/packages/crates-io.scm (parking-lot-core-0.5): 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 3e9833dd6c..142f3967b6 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4340,6 +4340,42 @@ (define-public rust-owning-ref-0.4 (properties '((hidden? . #t))) (license license:expat))) +(define-public rust-parking-lot-core-0.5 + (package + (name "rust-parking-lot-core") + (version "0.5.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "parking_lot_core" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1317j5a1yd03baza2kqqrxb4kr1vxa7rckw4frksl2vrncfcp26b")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-backtrace" ,rust-backtrace-0.3) + ("rust-cfg-if" ,rust-cfg-if-0.1) + ("rust-cloudabi" ,rust-cloudabi-0.0) + ("rust-libc" ,rust-libc-0.2) + ("rust-petgraph" ,rust-petgraph-0.4) + ("rust-rand" ,rust-rand-0.4) + ("rust-redox-syscall" ,rust-redox-syscall-0.1) + ("rust-smallvec" ,rust-smallvec-0.6) + ("rust-thread-id" ,rust-thread-id-3.3) + ("rust-winapi" ,rust-winapi-0.3)) + #:cargo-development-inputs + (("rust-rustc-version" ,rust-rustc-version-0.2)))) + (home-page "https://github.com/Amanieu/parking_lot") + (synopsis + "Advanced API for creating custom synchronization primitives") + (description + "An advanced API for creating custom synchronization primitives.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-parity-wasm-0.40 (package (name "rust-parity-wasm") -- cgit v1.2.3 From c3343640b15a22a5276dad4ba03077f0b965c94c Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 19:37:11 -0800 Subject: gnu: Add parking-lot-0.8. * gnu/packages/crates-io.scm (parking-lot-0.8): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 142f3967b6..d6cf021a41 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4340,6 +4340,37 @@ (define-public rust-owning-ref-0.4 (properties '((hidden? . #t))) (license license:expat))) +(define-public rust-parking-lot-0.8 + (package + (name "rust-parking-lot") + (version "0.8.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "parking_lot" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1rrcdalr8l5zx3bw28l376321l6dnd6rqnsqsl0ygk01fy0nfxzs")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-lock-api" ,rust-lock-api-0.2) + ("rust-parking-lot-core" ,rust-parking-lot-core-0.5)) + #:cargo-development-inputs + (("rust-bincode" ,rust-bincode-1.1) + ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-rand" ,rust-rand-0.4) + ("rust-rustc-version" ,rust-rustc-version-0.2)))) + (home-page "https://github.com/Amanieu/parking_lot") + (synopsis "Compact standard synchronization primitives") + (description + "More compact and efficient implementations of the standard +synchronization primitives.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-parking-lot-core-0.5 (package (name "rust-parking-lot-core") -- cgit v1.2.3 From 3b4f18354eaea491d29784f8d20126d5f05995bb Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 19:39:32 -0800 Subject: gnu: Add rust-console-0.7. * gnu/packages/crates-io.scm (rust-console-0.7): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d6cf021a41..57bf22b784 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -983,6 +983,39 @@ (define-public rust-compiler-builtins-0.1 (license (list license:asl2.0 license:expat)))) +(define-public rust-console-0.7 + (package + (name "rust-console") + (version "0.7.7") + (source + (origin + (method url-fetch) + (uri (crate-uri "console" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0a4n2syzik9lh02v2i4wdazvm05d99bib7dw0lqvz8mq2hn7r9cc")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-atty" ,rust-atty-0.2) + ("rust-clicolors-control" ,rust-clicolors-control-1.0) + ("rust-encode-unicode" ,rust-encode-unicode-0.3) + ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-libc" ,rust-libc-0.2) + ("rust-parking-lot" ,rust-parking-lot-0.8) + ("rust-regex" ,rust-regex-1.1) + ("rust-termios" ,rust-termios-0.3) + ("rust-unicode-width" ,rust-unicode-width-0.1) + ("rust-winapi" ,rust-winapi-0.3)))) + (home-page "https://github.com/mitsuhiko/console") + (synopsis "Terminal and console abstraction for Rust") + (description + "This package provides a terminal and console abstraction for Rust.") + (license license:expat))) + (define-public rust-console-error-panic-hook-0.1 (package (name "rust-console-error-panic-hook") -- cgit v1.2.3 From ad6f956c6601750b58684db8e4e8d58ef98d969e Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 19:46:28 -0800 Subject: gnu: Add rust-synstructure-0.10. * gnu/packages/crates-io.scm (rust-synstructure-0.10): 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 57bf22b784..e3d93cac17 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6681,6 +6681,35 @@ (define-public rust-syn-0.15 ("rust-walkdir" ,rust-walkdir-2.2)))) (properties '()))) +(define-public rust-synstructure-0.10 + (package + (name "rust-synstructure") + (version "0.10.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "synstructure" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0grirdkgh2wl4hf9a3nbiazpgccxgq54kn52ms0xrr6njvgkwd82")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-0.4) + ("rust-quote" ,rust-quote-1.0) + ("rust-syn" ,rust-syn-0.15) + ("rust-unicode-xid" ,rust-unicode-xid-0.1)) + #:cargo-development-inputs + (("rust-synstructure-test-traits" ,rust-synstructure-test-traits-0.1)))) + (home-page "https://github.com/mystor/synstructure") + (synopsis "Helper methods and macros for custom derives") + (description + "Helper methods and macros for custom derives.") + (license license:expat))) + (define-public rust-synstructure-test-traits-0.1 (package (name "rust-synstructure-test-traits") -- cgit v1.2.3 From a68b5dc3792fe93695cf95238a4284c0f74f5baf Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 19:49:20 -0800 Subject: gnu: Add rust-failure-derive-0.1. * gnu/packages/crates-io.scm (rust-failure-derive-0.1): 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 e3d93cac17..0f5766813d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1906,6 +1906,34 @@ (define-public rust-erased-serde-0.3 "Type-erased Serialize and Serializer traits.") (license (list license:asl2.0 license:expat)))) +(define-public rust-failure-derive-0.1 + (package + (name "rust-failure-derive") + (version "0.1.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "failure_derive" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1q97n7dp51j5hndzic9ng2fgn6f3z5ya1992w84l7vypby8n647a")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-0.4) + ("rust-quote" ,rust-quote-1.0) + ("rust-syn" ,rust-syn-0.15) + ("rust-synstructure" ,rust-synstructure-0.10)) + #:cargo-development-inputs + (("rust-failure" ,rust-failure-0.1)))) + (home-page "https://rust-lang-nursery.github.io/failure/") + (synopsis "Derives for the failure crate") + (description "Derives for the failure crate.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-fallible-iterator-0.2 (package (name "rust-fallible-iterator") -- cgit v1.2.3 From 688ac26a850c8b048438b1d63332e2810d68136e Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 19:40:47 -0800 Subject: gnu: Add rust-difference-2.0. * gnu/packages/crates-io.scm (rust-difference-2.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 0f5766813d..455504ea4a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1643,6 +1643,33 @@ (define-public rust-diff-0.1 "An LCS based slice and string diffing implementation.") (license (list license:expat license:asl2.0)))) +(define-public rust-difference-2.0 + (package + (name "rust-difference") + (version "2.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "difference" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1621wx4k8h452p6xzmzzvm7mz87kxh4yqz0kzxfjj9xmjxlbyk2j")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-getopts" ,rust-getopts-0.2)) + #:cargo-development-inputs + (("rust-quickcheck" ,rust-quickcheck-0.8) + ("rust-term" ,rust-term-0.5)))) + (home-page "https://github.com/johannhof/difference.rs") + (synopsis "Rust text diffing and assertion library") + (description + "This package provides a Rust text diffing and assertion library.") + (license license:expat))) + (define-public rust-dirs-1.0 (package (name "rust-dirs") -- cgit v1.2.3 From 4eea286c28179dc48de26860b121c3537ec96829 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 19:50:45 -0800 Subject: gnu: Add rust-failure-0.1. * gnu/packages/crates-io.scm (rust-failure-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 455504ea4a..a11b418f96 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1933,6 +1933,31 @@ (define-public rust-erased-serde-0.3 "Type-erased Serialize and Serializer traits.") (license (list license:asl2.0 license:expat)))) +(define-public rust-failure-0.1 + (package + (name "rust-failure") + (version "0.1.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "failure" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1qppmgv4i5jj6vrss91qackqnl0a12h7lnby4l7j5fdy78yxhnvr")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-backtrace" ,rust-backtrace-0.3) + ("rust-failure-derive" ,rust-failure-derive-0.1)))) + (home-page "https://rust-lang-nursery.github.io/failure/") + (synopsis "Experimental error handling abstraction") + (description + "Experimental error handling abstraction.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-failure-derive-0.1 (package (name "rust-failure-derive") -- cgit v1.2.3 From 1ac58b8297d4439b25f5da4811baaf6f92c6d93e Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 19:56:50 -0800 Subject: gnu: Add rust-pest-2.1. * gnu/packages/crates-io.scm (rust-pest-2.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a11b418f96..a310758a17 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4676,6 +4676,31 @@ (define-public rust-permutohedron-0.2 (license (list license:asl2.0 license:expat)))) +(define-public rust-pest-2.1 + (package + (name "rust-pest") + (version "2.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "pest" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "134686mwxm73asbiads53zfchqvvcrsrsyax2cghfcizmvg8ac4k")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-serde" ,rust-serde-1.0) + ("rust-serde-json" ,rust-serde-json-1.0) + ("rust-ucd-trie" ,rust-ucd-trie-0.1)))) + (home-page "https://pest.rs/") + (synopsis "The Elegant Parser") + (description "The Elegant Parser.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-petgraph-0.4 (package (name "rust-petgraph") -- cgit v1.2.3 From f04b12d8cc9e47319d2c32078f838928a2200715 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 20:02:33 -0800 Subject: gnu: Add rust-byte-tools-0.3. * gnu/packages/crates-io.scm (rust-byte-tools-0.3): 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 a310758a17..36bcdc622e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -571,6 +571,26 @@ (define-public rust-bstr-0.1 (base32 "0nzi9vqhl56ws8gq39f3aj4qjrr4l3g5lbkkcj8xq1x4cb74wq2r")))))) +(define-public rust-byte-tools-0.3 + (package + (name "rust-byte-tools") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "byte-tools" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1mqi29wsm8njpl51pfwr31wmpzs5ahlcb40wsjyd92l90ixcmdg3")))) + (build-system cargo-build-system) + (arguments `(#:skip-build? #t)) + (home-page "https://github.com/RustCrypto/utils") + (synopsis "Bytes related utility functions") + (description "Bytes related utility functions.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-byteorder-1.3 (package (name "rust-byteorder") -- cgit v1.2.3 From cc03fe2acc8c01a4e95c833d13c9b46759f5b63c Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 20:05:25 -0800 Subject: gnu: Add rust-block-padding-0.1. * gnu/packages/crates-io.scm (rust-block-padding-0.1): 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 36bcdc622e..b542c26f9d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -498,6 +498,30 @@ (define-public rust-blas-sys-0.7 (license (list license:asl2.0 license:expat)))) +(define-public rust-block-padding-0.1 + (package + (name "rust-block-padding") + (version "0.1.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "block-padding" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "02fz9wx5dmgpc79ndrb9xfxqlrkk7lg5wki2blz2zqg27spw6kbd")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-byte-tools" ,rust-byte-tools-0.3)))) + (home-page "https://github.com/RustCrypto/utils") + (synopsis "Padding and unpadding of messages divided into blocks") + (description + "Padding and unpadding of messages divided into blocks.") + (license (list license:asl1.1 license:expat)))) + (define-public rust-bumpalo-2.5 (package (name "rust-bumpalo") -- cgit v1.2.3 From ef58ab31667de44528b935d00a7e4b948bdd91d9 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 20:06:57 -0800 Subject: gnu: Add rust-block-buffer-0.7. * gnu/packages/crates-io.scm (rust-block-buffer-0.7): 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 b542c26f9d..a965a5e10d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -498,6 +498,33 @@ (define-public rust-blas-sys-0.7 (license (list license:asl2.0 license:expat)))) +(define-public rust-block-buffer-0.7 + (package + (name "rust-block-buffer") + (version "0.7.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "block-buffer" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "12v8wizynqin0hqf140kmp9s38q223mp1b0hkqk8j5pk8720v560")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-block-padding" ,rust-block-padding-0.1) + ("rust-byte-tools" ,rust-byte-tools-0.3) + ("rust-byteorder" ,rust-byteorder-1.3) + ("rust-generic-array" ,rust-generic-array-0.12)))) + (home-page "https://github.com/RustCrypto/utils") + (synopsis "Fixed size buffer for block processing of data") + (description + "Fixed size buffer for block processing of data.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-block-padding-0.1 (package (name "rust-block-padding") -- cgit v1.2.3 From 33d04000a5dab24d29fd43d89ef3d0001a27eada Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 20:09:14 -0800 Subject: gnu: Add rust-blobby-0.1. * gnu/packages/crates-io.scm (rust-blobby-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a965a5e10d..f7b06457ad 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -498,6 +498,33 @@ (define-public rust-blas-sys-0.7 (license (list license:asl2.0 license:expat)))) +(define-public rust-blobby-0.1 + (package + (name "rust-blobby") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "blobby" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1xicpf3s2mi5xqnx8ps5mdych4ib5nh2nfsbrsg8ar8bjk1girbg")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-byteorder" ,rust-byteorder-1.3)) + #:cargo-development-inputs + (("rust-byteorder" ,rust-byteorder-1.3) + ("rust-hex" ,rust-hex-0.3)))) + (home-page "https://github.com/RustCrypto/utils") + (synopsis "Iterator over simple binary blob storage") + (description + "Iterator over simple binary blob storage.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-block-buffer-0.7 (package (name "rust-block-buffer") -- cgit v1.2.3 From cf988f65f9079fabbb1cfb570e85eaca81757f35 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 20:18:38 -0800 Subject: gnu: Add rust-opaque-debug-0.2. * gnu/packages/crates-io.scm (rust-opaque-debug-0.2): New version. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f7b06457ad..91d96ca5a1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4425,6 +4425,27 @@ (define-public rust-odds-0.3 Things in odds may move to more appropriate crates if we find them.") (license (list license:asl2.0 license:expat)))) +(define-public rust-opaque-debug-0.2 + (package + (name "rust-opaque-debug") + (version "0.2.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "opaque-debug" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "02942l2gc7w5r4js7i9063x99szic5mzzk1055j83v4diqpbpxck")))) + (build-system cargo-build-system) + (arguments `(#:skip-build? #t)) + (home-page "https://github.com/RustCrypto/utils") + (synopsis "Macro for opaque Debug trait implementation") + (description + "Macro for opaque Debug trait implementation.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-openssl-0.10 (package (name "rust-openssl") -- cgit v1.2.3 From 98ad8786d2434b39e2e3c23793637e67fd873573 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 20:13:52 -0800 Subject: gnu: Add rust-digest-0.8. * gnu/packages/crates-io.scm (rust-digest-0.8): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 91d96ca5a1..fc65e8f3eb 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1768,6 +1768,31 @@ (define-public rust-difference-2.0 "This package provides a Rust text diffing and assertion library.") (license license:expat))) +(define-public rust-digest-0.8 + (package + (name "rust-digest") + (version "0.8.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "digest" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1madjl27f3kj5ql7kwgvb9c8b7yb7bv7yfgx7rqzj4i3fp4cil7k")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-blobby" ,rust-blobby-0.1) + ("rust-generic-array" ,rust-generic-array-0.13)))) + (home-page "https://github.com/RustCrypto/traits") + (synopsis "Traits for cryptographic hash functions") + (description + "Traits for cryptographic hash functions.") + (license (list license:expat license:asl2.0)))) + (define-public rust-dirs-1.0 (package (name "rust-dirs") -- cgit v1.2.3 From 061eda1ec428843e12dced4c34d3fe27670ddf7b Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 20:16:05 -0800 Subject: gnu: Add rust-fake-simd-0.1. * gnu/packages/crates-io.scm (rust-fake-simd-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index fc65e8f3eb..4fd7deac96 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2056,6 +2056,27 @@ (define-public rust-erased-serde-0.3 "Type-erased Serialize and Serializer traits.") (license (list license:asl2.0 license:expat)))) +(define-public rust-fake-simd-0.1 + (package + (name "rust-fake-simd") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "fake-simd" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1vfylvk4va2ivqx85603lyqqp0zk52cgbs4n5nfbbbqx577qm2p8")))) + (build-system cargo-build-system) + (arguments `(#:skip-build? #t)) + (home-page "https://github.com/RustCrypto/utils") + (synopsis "Crate for mimicking simd crate on stable Rust") + (description + "Crate for mimicking simd crate on stable Rust.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-failure-0.1 (package (name "rust-failure") -- cgit v1.2.3 From 31e4305fd646fb42fd8351fafed2c3c56aafe5bf Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 20:11:38 -0800 Subject: gnu: Add rust-generic-array-0.13. * gnu/packages/crates-io.scm (rust-generic-array-0.13): 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 4fd7deac96..f9c47eff63 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2703,6 +2703,36 @@ (define-public rust-gcc-0.3 (license (list license:asl2.0 license:expat)))) +(define-public rust-generic-array-0.13 + (package + (name "rust-generic-array") + (version "0.13.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "generic-array" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1kddwxpd58y807y1r3lijg7sw3gxm6nczl6wp57gamhv6mhygl8f")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-serde" ,rust-serde-1.0) + ("rust-typenum" ,rust-typenum-1.10)) + #:cargo-development-inputs + (("rust-bincode" ,rust-bincode-1.1) + ("rust-serde-json" ,rust-serde-json-1.0)))) + (home-page + "https://github.com/fizyk20/generic-array") + (synopsis + "Generic types implementing functionality of arrays") + (description + "Generic types implementing functionality of arrays.") + (license license:expat))) + (define-public rust-getopts-0.2 (package (name "rust-getopts") -- cgit v1.2.3 From 1885a4f1e2825b52b83f47bfcc35adc6c46dcc15 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 20:21:25 -0800 Subject: gnu: Add rust-sha1-asm-0.4. * gnu/packages/crates-io.scm (rust-sha1-asm-0.4): 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 f9c47eff63..5230a57b4b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6522,6 +6522,30 @@ (define-public rust-sha1-0.6 "Minimal implementation of SHA1 for Rust.") (license license:bsd-3))) +(define-public rust-sha1-asm-0.4 + (package + (name "rust-sha1-asm") + (version "0.4.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "sha1-asm" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1i1i8viy6y30mv9v5hwhg9w6b722qkyh9c6n8bn4d27jpv14pg0s")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-development-inputs + (("rust-cc" ,rust-cc-1.0)))) + (home-page "https://github.com/RustCrypto/asm-hashes") + (synopsis "Assembly implementation of SHA-1 compression function") + (description + "Assembly implementation of SHA-1 compression function.") + (license license:expat))) + (define-public rust-shlex-0.1 (package (name "rust-shlex") -- cgit v1.2.3 From 7f57a465f0a4d5490c2c8fe9dfa73eb03ab02f0b Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 20:24:56 -0800 Subject: gnu: Add rust-hex-literal-0.2. * gnu/packages/crates-io.scm (rust-hex-literal-impl-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 5230a57b4b..564f7c92e6 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3079,6 +3079,33 @@ (define-public rust-hex-0.3 (license (list license:asl2.0 license:expat)))) +(define-public rust-hex-literal-0.2 + (package + (name "rust-hex-literal") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "hex-literal" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0ni2nv3di0jpih2xnmlnr6s96zypkdr8xrw2cvk4f8fx5wb6inn3")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-hex-literal-impl" ,rust-hex-literal-impl-0.2) + ("rust-proc-macro-hack" ,rust-proc-macro-hack-0.5)))) + (home-page "https://github.com/RustCrypto/utils") + (synopsis + "Convert hexadecimal string to byte array at compile time") + (description + "Procedural macro for converting hexadecimal string to byte array at +compile time.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-humantime-1.2 (package (name "rust-humantime") -- cgit v1.2.3 From c0eabcef45303c83426c7cf49040ad01c0d87faa Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 20:27:43 -0800 Subject: gnu: Add rust-sha-1-0.8 * gnu/packages/crates-io.scm (rust-sha-1-0.8): 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 564f7c92e6..a69c3279bf 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6521,6 +6521,36 @@ (define-public rust-serde-test-1.0 "Token De/Serializer for testing De/Serialize implementations.") (license (list license:expat license:asl2.0)))) +(define-public rust-sha-1-0.8 + (package + (name "rust-sha-1") + (version "0.8.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "sha-1" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0s6fdy5wp3x4h2z4fcl2d9vjvrpzr87v4h49r51xcq8nm4qj35i3")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-block-buffer" ,rust-block-buffer-0.7) + ("rust-digest" ,rust-digest-0.8) + ("rust-fake-simd" ,rust-fake-simd-0.1) + ("rust-opaque-debug" ,rust-opaque-debug-0.2) + ("rust-sha1-asm" ,rust-sha1-asm-0.4)) + #:cargo-development-inputs + (("rust-digest" ,rust-digest-0.8) + ("rust-hex-literal" ,rust-hex-literal-0.2)))) + (home-page "https://github.com/RustCrypto/hashes") + (synopsis "SHA-1 hash function") + (description "SHA-1 hash function.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-sha1-0.6 (package (name "rust-sha1") -- cgit v1.2.3 From 546a1ac0ab2f1f8941e3a74f0ca5d840eaec87ed Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 20:28:49 -0800 Subject: gnu: Add rust-pest-meta-2.1. * gnu/packages/crates-io.scm (rust-pest-meta-2.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a69c3279bf..98783cac1c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4923,6 +4923,33 @@ (define-public rust-pest-2.1 (description "The Elegant Parser.") (license (list license:asl2.0 license:expat)))) +(define-public rust-pest-meta-2.1 + (package + (name "rust-pest-meta") + (version "2.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "pest_meta" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0kaprdz3jis9bjfwhri1zncbsvack5m3gx2g5flspdy7wxnyljgj")))) + (build-system cargo-build-system) + (arguments + `(#: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)))) + (home-page "https://pest.rs") + (synopsis "Pest meta language parser and validator") + (description + "Pest meta language parser and validator.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-petgraph-0.4 (package (name "rust-petgraph") -- cgit v1.2.3 From e514384efa010fcc977344689ea23abda2254f3c Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 20:23:31 -0800 Subject: gnu: Add rust-hex-literal-impl-0.2. * gnu/packages/crates-io.scm (rust-hex-literal-impl-0.2): 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 98783cac1c..249af60cf4 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3106,6 +3106,30 @@ (define-public rust-hex-literal-0.2 compile time.") (license (list license:asl2.0 license:expat)))) +(define-public rust-hex-literal-impl-0.2 + (package + (name "rust-hex-literal-impl") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "hex-literal-impl" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "04m6d1k57a9h3hhdgn0vq1hkfwjv9hfkw6q73bqn0my0qw45s286")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-proc-macro-hack" ,rust-proc-macro-hack-0.5)))) + (home-page "https://github.com/RustCrypto/utils") + (synopsis "Internal implementation of the hex-literal crate") + (description + "Internal implementation of the hex-literal crate.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-humantime-1.2 (package (name "rust-humantime") -- cgit v1.2.3 From 6db6226222ef978168ec0218d5ace1a28e13c33b Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 20:30:26 -0800 Subject: gnu: Add rust-pest-generator-2.1. * gnu/packages/crates-io.scm (rust-pest-generator-2.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 249af60cf4..cc1e4d5e33 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4947,6 +4947,33 @@ (define-public rust-pest-2.1 (description "The Elegant Parser.") (license (list license:asl2.0 license:expat)))) +(define-public rust-pest-generator-2.1 + (package + (name "rust-pest-generator") + (version "2.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "pest_generator" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0ipnv77lqhj4d4fpfxi8m168lcjp482kszaknlardmpgqiv0a4k3")))) + (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-1.0) + ("rust-syn" ,rust-syn-0.15)))) + (home-page "https://pest.rs/") + (synopsis "Pest code generator") + (description "Pest code generator.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-pest-meta-2.1 (package (name "rust-pest-meta") -- cgit v1.2.3 From d4e9927c856f6cc9bee7130589e2f10aaf87619c Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 20:35:29 -0800 Subject: gnu: Add rust-ron-0.4. * gnu/packages/crates-io.scm (rust-ron-0.4): 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 cc1e4d5e33..95d09a4bca 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5979,6 +5979,35 @@ (define-public rust-resolv-conf-0.6 (license (list license:asl2.0 license:expat)))) +(define-public rust-ron-0.4 + (package + (name "rust-ron") + (version "0.4.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "ron" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1mrqdgw3w0yypg24jyq9mphp4zr9lr0ks7yam82m4n34x6njijyr")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-base64" ,rust-base64-0.10) + ("rust-bitflags" ,rust-bitflags-1) + ("rust-serde" ,rust-serde-1.0)) + #:cargo-development-inputs + (("rust-serde-bytes" ,rust-serde-bytes-0.11) + ("rust-serde-json" ,rust-serde-json-1.0)))) + (home-page "https://github.com/ron-rs/ron") + (synopsis "Rusty Object Notation") + (description "Rusty Object Notation.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-rustc-demangle-0.1 (package (name "rust-rustc-demangle") -- cgit v1.2.3 From 864ce516ac6357c3b29aeecf1cef900ffac7e8e2 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 20:31:55 -0800 Subject: gnu: Add rust-pest-derive-2.1. * gnu/packages/crates-io.scm (rust-pest-derive-2.1): 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 95d09a4bca..d9a31919dc 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4947,6 +4947,30 @@ (define-public rust-pest-2.1 (description "The Elegant Parser.") (license (list license:asl2.0 license:expat)))) +(define-public rust-pest-derive-2.1 + (package + (name "rust-pest-derive") + (version "2.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "pest_derive" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1l5jfa6ril71cw5nsiw0r45br54dd8cj2r1nc2d1wq6wb3jilgc3")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-pest" ,rust-pest-2.1) + ("rust-pest-generator" ,rust-pest-generator-2.1)))) + (home-page "https://pest.rs/") + (synopsis "Pest's derive macro") + (description "Pest's derive macro.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-pest-generator-2.1 (package (name "rust-pest-generator") -- cgit v1.2.3 From a85ea2f68d949083a656fb53e5eee220956ae35c Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 20:39:39 -0800 Subject: gnu: Add rust-linked-hash-map-0.5. * gnu/packages/crates-io.scm (rust-linked-hash-map-0.5): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d9a31919dc..986d507c89 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4292,6 +4292,37 @@ (define-public rust-libz-sys-1.0 (license (list license:asl2.0 license:expat)))) +(define-public rust-linked-hash-map-0.5 + (package + (name "rust-linked-hash-map") + (version "0.5.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "linked-hash-map" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "10qgbvh00q36ql0jh00rxh2jlq6qvl11n6mig0cvkpf4xf5bd4df")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-clippy" ,rust-clippy-0.0) + ("rust-heapsize" ,rust-heapsize-0.4) + ("rust-serde" ,rust-serde-1.0) + ("rust-serde-test" ,rust-serde-test-1.0)))) + (home-page + "https://github.com/contain-rs/linked-hash-map") + (synopsis + "HashMap wrapper that holds key-value pairs in insertion order") + (description + "This package provides a HashMap wrapper that holds key-value +pairs in insertion order.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-nodrop-0.1 (package (name "rust-nodrop") -- cgit v1.2.3 From cab0911ea3250a93c3460521c1a5abe8a2142419 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 14 Dec 2019 20:42:22 -0800 Subject: gnu: Add rust-yaml-rust-0.4. * gnu/packages/crates-io.scm (rust-yaml-rust-0.4): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 986d507c89..4938ff8744 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8965,3 +8965,29 @@ (define-public rust-xdg-2.2 (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) + +(define-public rust-yaml-rust-0.4 + (package + (name "rust-yaml-rust") + (version "0.4.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "yaml-rust" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0ka3qhqc5lvk3hz14wmsj32jhmh44blcbfrx5hfxli2gg38kv4k5")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-linked-hash-map" ,rust-linked-hash-map-0.5)) + #:cargo-development-inputs + (("rust-quickcheck" ,rust-quickcheck-0.8)))) + (home-page "http://chyh1990.github.io/yaml-rust/") + (synopsis "The missing YAML 1.2 parser for rust") + (description + "The missing YAML 1.2 parser for rust.") + (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 5442b8bec125ef336d5d9742bc714e1c319ae092 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 15 Dec 2019 07:36:50 -0800 Subject: gnu: Add rust-encoding-index-tests-0.1 * gnu/packages/crates-io.scm (rust-encoding-index-tests-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4938ff8744..da342857df 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1973,6 +1973,29 @@ (define-public rust-encode-unicode-0.3 char, u8 and u16.") (license (list license:expat license:asl2.0)))) +(define-public rust-encoding-index-tests-0.1 + (package + (name "rust-encoding-index-tests") + (version "0.1.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "encoding_index_tests" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0s85y091gl17ixass49bzaivng7w8p82p6nyvz2r3my9w4mxhim2")))) + (build-system cargo-build-system) + (arguments `(#:skip-build? #t)) + (home-page "https://github.com/lifthrasiir/rust-encoding") + (synopsis + "Macros used to test index tables for character encodings") + (description + "Helper macros used to test index tables for character +encodings.") + (license license:cc0))) + (define-public rust-env-logger-0.6 (package (name "rust-env-logger") -- cgit v1.2.3 From 0826aa62d23dae62614470597b897dd8a306cb7e Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 15 Dec 2019 07:43:16 -0800 Subject: gnu: Add rust-encoding-index-korean-1.20141219. * gnu/packages/crates-io.scm (rust-encoding-index-korean-1.20141219): 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 da342857df..4a9ac9dd86 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1973,6 +1973,30 @@ (define-public rust-encode-unicode-0.3 char, u8 and u16.") (license (list license:expat license:asl2.0)))) +(define-public rust-encoding-index-korean-1.20141219 + (package + (name "rust-encoding-index-korean") + (version "1.20141219.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "encoding-index-korean" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "10cxabp5ppygbq4y6y680856zl9zjvq7ahpiw8zj3fmwwsw3zhsd")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-encoding-index-tests" ,rust-encoding-index-tests-0.1)))) + (home-page "https://github.com/lifthrasiir/rust-encoding") + (synopsis "Index tables for Korean character encodings") + (description + "Index tables for Korean character encodings.") + (license license:cc0))) + (define-public rust-encoding-index-tests-0.1 (package (name "rust-encoding-index-tests") -- cgit v1.2.3 From ef6e6faa96dcd4760a7149aa364ee96f684eb0bd Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 15 Dec 2019 07:40:18 -0800 Subject: gnu: Add rust-encoding-index-japanese-1.20141219. * gnu/packages/crates-io.scm (rust-encoding-index-japanese-1.20141219): 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 4a9ac9dd86..c4e342372b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1973,6 +1973,30 @@ (define-public rust-encode-unicode-0.3 char, u8 and u16.") (license (list license:expat license:asl2.0)))) +(define-public rust-encoding-index-japanese-1.20141219 + (package + (name "rust-encoding-index-japanese") + (version "1.20141219.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "encoding-index-japanese" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "148c1lmd640p1d7fzk0nv7892mbyavvwddgqvcsm78798bzv5s04")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-encoding-index-tests" ,rust-encoding-index-tests-0.1)))) + (home-page "https://github.com/lifthrasiir/rust-encoding") + (synopsis "Index tables for Japanese character encodings") + (description + "Index tables for Japanese character encodings.") + (license license:cc0))) + (define-public rust-encoding-index-korean-1.20141219 (package (name "rust-encoding-index-korean") -- cgit v1.2.3 From be9a61f2c2d903af8db23fe1389e2193fbe64c45 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 15 Dec 2019 07:45:12 -0800 Subject: gnu: Add rust-encoding-index-simpchinese-1.20141219. * gnu/packages/crates-io.scm (rust-encoding-index-simpchinese-1.20141219): 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 c4e342372b..7d63312382 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2021,6 +2021,30 @@ (define-public rust-encoding-index-korean-1.20141219 "Index tables for Korean character encodings.") (license license:cc0))) +(define-public rust-encoding-index-simpchinese-1.20141219 + (package + (name "rust-encoding-index-simpchinese") + (version "1.20141219.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "encoding-index-simpchinese" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1xria2i7mc5dqdrpqxasdbxv1qx46jjbm53if3y1i4cvj2a72ynq")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-encoding-index-tests" ,rust-encoding-index-tests-0.1)))) + (home-page "https://github.com/lifthrasiir/rust-encoding") + (synopsis "Index tables for simplified Chinese character encodings") + (description + "Index tables for simplified Chinese character encodings.") + (license license:cc0))) + (define-public rust-encoding-index-tests-0.1 (package (name "rust-encoding-index-tests") -- cgit v1.2.3 From eb7e4fcfbfa68a3b6695729f9c22a247ee13231e Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 15 Dec 2019 07:52:01 -0800 Subject: gnu: Add rust-encoding-index-tradchinese-1.20141219. * gnu/packages/crates-io.scm (rust-encoding-index-tradchinese-1.20141219): 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 7d63312382..764b64c169 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2068,6 +2068,30 @@ (define-public rust-encoding-index-tests-0.1 encodings.") (license license:cc0))) +(define-public rust-encoding-index-tradchinese-1.20141219 + (package + (name "rust-encoding-index-tradchinese") + (version "1.20141219.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "encoding-index-tradchinese" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "060ci4iz6xfvzk38syfbjvs7pix5hch3mvxkksswmqwcd3aj03px")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-encoding-index-tests" ,rust-encoding-index-tests-0.1)))) + (home-page "https://github.com/lifthrasiir/rust-encoding") + (synopsis "Index tables for traditional Chinese character encodings") + (description + "Index tables for traditional Chinese character encodings.") + (license license:cc0))) + (define-public rust-env-logger-0.6 (package (name "rust-env-logger") -- cgit v1.2.3 From 407b06a7cc0f86e1b8a02ddff949e376799de539 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 15 Dec 2019 07:48:49 -0800 Subject: gnu: Add rust-encoding-index-singlebyte-1.20141219. * gnu/packages/crates-io.scm (rust-encoding-index-singlebyte-1.20141219): 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 764b64c169..30ab6ae73b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2045,6 +2045,30 @@ (define-public rust-encoding-index-simpchinese-1.20141219 "Index tables for simplified Chinese character encodings.") (license license:cc0))) +(define-public rust-encoding-index-singlebyte-1.20141219 + (package + (name "rust-encoding-index-singlebyte") + (version "1.20141219.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "encoding-index-singlebyte" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0jp85bz2pprzvg9m95w4q0vibh67b6w3bx35lafay95jzyndal9k")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-encoding-index-tests" ,rust-encoding-index-tests-0.1)))) + (home-page "https://github.com/lifthrasiir/rust-encoding") + (synopsis "Index tables for various single-byte character encodings") + (description + "Index tables for various single-byte character encodings.") + (license license:cc0))) + (define-public rust-encoding-index-tests-0.1 (package (name "rust-encoding-index-tests") -- cgit v1.2.3 From 745dd6f58ba8e623a9a4da565e54786599c0426c Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 15 Dec 2019 07:57:32 -0800 Subject: gnu: Add rust-flame-0.2. * gnu/packages/crates-io.scm (rust-flame-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 30ab6ae73b..8f0cf3c760 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2363,6 +2363,33 @@ (define-public rust-fixedbitset-0.1 (license (list license:asl2.0 license:expat)))) +(define-public rust-flame-0.2 + (package + (name "rust-flame") + (version "0.2.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "flame" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0c5bmhyimzxch3pmh0w3z9n57saasgix4bmbbksr9vp1c5j71hhz")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-serde" ,rust-serde-1.0) + ("rust-serde-derive" ,rust-serde-derive-1.0) + ("rust-serde-json" ,rust-serde-json-1.0) + ("rust-thread-id" ,rust-thread-id-3.3)))) + (home-page "https://github.com/llogiq/flame") + (synopsis "Profiling and flamegraph library") + (description "A profiling and flamegraph library.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-flate2-1.0 (package (name "rust-flate2") -- cgit v1.2.3 From 1127d220152deaa30a14ac56ff367b550123ac8f Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 15 Dec 2019 08:04:32 -0800 Subject: gnu: Add rust-serde-yaml-0.8. * gnu/packages/crates-io.scm (rust-serde-yaml-0.8): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 8f0cf3c760..2e541199fd 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6853,6 +6853,37 @@ (define-public rust-serde-test-1.0 "Token De/Serializer for testing De/Serialize implementations.") (license (list license:expat license:asl2.0)))) +(define-public rust-serde-yaml-0.8 + (package + (name "rust-serde-yaml") + (version "0.8.9") + (source + (origin + (method url-fetch) + (uri (crate-uri "serde_yaml" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "10mmjpnshgrwij01a13679nxy1hnh5yfr0343kh0y9p5j2d8mc1q")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-dtoa" ,rust-dtoa-0.4) + ("rust-linked-hash-map" ,rust-linked-hash-map-0.5) + ("rust-serde" ,rust-serde-1.0) + ("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)))) + (home-page + "https://github.com/dtolnay/serde-yaml") + (synopsis "YAML support for Serde") + (description "YAML support for Serde.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-sha-1-0.8 (package (name "rust-sha-1") -- cgit v1.2.3 From 8fed953a5db4f9405345548304d58a26f935f5cd Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 15 Dec 2019 08:10:17 -0800 Subject: gnu: Add rust-flamer-0.3. * gnu/packages/crates-io.scm (rust-flamer-0.3): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2e541199fd..0ef5a9be00 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2390,6 +2390,32 @@ (define-public rust-flame-0.2 (description "A profiling and flamegraph library.") (license (list license:asl2.0 license:expat)))) +(define-public rust-flamer-0.3 + (package + (name "rust-flamer") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "flamer" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1b2d7jx80f3p7hqpgdi7wksaiq18k9w23p0cs2sxf7jbx2jx3bgj")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-flame" ,rust-flame-0.2) + ("rust-quote" ,rust-quote-1.0) + ("rust-syn" ,rust-syn-0.15)))) + (home-page "https://github.com/llogiq/flamer") + (synopsis "Macro to insert @code{flame::start_guard(_)}") + (description + "A procedural macro to insert @code{flame::start_guard(_)} calls.") + (license license:asl2.0))) + (define-public rust-flate2-1.0 (package (name "rust-flate2") -- cgit v1.2.3 From 5cc1677649bd2d903c7562c51fb06b559541761f Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 15 Dec 2019 08:11:55 -0800 Subject: gnu: Add rust-unicode-bidi-0.3. * gnu/packages/crates-io.scm (rust-unicode-bidi-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 0ef5a9be00..2df095e4ee 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8402,6 +8402,35 @@ (define-public rust-unicase-2.4 (license (list license:asl2.0 license:expat)))) +(define-public rust-unicode-bidi-0.3 + (package + (name "rust-unicode-bidi") + (version "0.3.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "unicode-bidi" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1malx8ljgm7v1gbaazkn7iicy5wj0bwcyadj3l727a38ch6bvwj9")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-flame" ,rust-flame-0.2) + ("rust-flamer" ,rust-flamer-0.3) + ("rust-matches" ,rust-matches-0.1) + ("rust-serde" ,rust-serde-1.0)) + #:cargo-development-inputs + (("rust-serde-test" ,rust-serde-test-1.0)))) + (home-page "https://github.com/servo/unicode-bidi") + (synopsis "Implementation of the Unicode Bidirectional Algorithm") + (description + "Implementation of the Unicode Bidirectional Algorithm.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-unicode-width-0.1 (package (name "rust-unicode-width") -- cgit v1.2.3 From 74ec6545e9e2be5abc63250b67abbb1516cda7f7 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 15 Dec 2019 08:15:01 -0800 Subject: gnu: Add rust-unicode-normalization-0.1. * gnu/packages/crates-io.scm (rust-unicode-normalization-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2df095e4ee..d23b5591f6 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8431,6 +8431,33 @@ (define-public rust-unicode-bidi-0.3 "Implementation of the Unicode Bidirectional Algorithm.") (license (list license:asl2.0 license:expat)))) +(define-public rust-unicode-normalization-0.1 + (package + (name "rust-unicode-normalization") + (version "0.1.8") + (source + (origin + (method url-fetch) + (uri (crate-uri "unicode-normalization" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "09i49va90rvia1agvgni4gicnqv50y5zy1naw8mr8bcqifh3j4ql")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-smallvec" ,rust-smallvec-0.6)))) + (home-page "https://github.com/unicode-rs/unicode-normalization") + (synopsis + "This crate provides functions for normalization of Unicode strings") + (description + "This crate provides functions for normalization of Unicode strings, +including Canonical and Compatible Decomposition and Recomposition, as +described in Unicode Standard Annex #15.") + (license (list license:expat license:asl2.0)))) + (define-public rust-unicode-width-0.1 (package (name "rust-unicode-width") -- cgit v1.2.3 From 15466f9acdca23a874ceaeaa15df18deab96738b Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 15 Dec 2019 08:17:48 -0800 Subject: gnu: Add rust-idna-0.1. * gnu/packages/crates-io.scm (rust-idna-0.1): 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 d23b5591f6..84410a6428 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3377,6 +3377,35 @@ (define-public rust-hostname-0.1 (properties '((hidden? . #t))) (license license:expat))) +(define-public rust-idna-0.1 + (package + (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")))) + (build-system cargo-build-system) + (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)))) + (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-indexmap-1.0 (package (name "rust-indexmap") -- cgit v1.2.3 From a4be6e9c894c9a9a2a50cec17ae4e54d3d64c221 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 15 Dec 2019 08:30:28 -0800 Subject: gnu: Add rust-stackvector-1.0. * gnu/packages/crates-io.scm (rust-stackvector-1.0): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 84410a6428..4cd2d146cd 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7254,6 +7254,32 @@ (define-public rust-stacker-0.1 (license (list license:asl2.0 license:expat)))) +(define-public rust-stackvector-1.0 + (package + (name "rust-stackvector") + (version "1.0.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "stackvector" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1bv820fhdad16islwli1g3iksk39ivf0zaqz4j1m08vq15jjaiqw")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-unreachable" ,rust-unreachable-1.0)) + #:cargo-development-inputs + (("rust-rustc-version" ,rust-rustc-version-0.2)))) + (home-page "https://github.com/Alexhuszagh/rust-stackvector") + (synopsis "Vector-like facade for stack-allocated arrays") + (description + "StackVec: vector-like facade for stack-allocated arrays.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-static-assertions-0.3 (package (name "rust-static-assertions") -- cgit v1.2.3 From 22e2e2de3f2c39eff1c821a9725171c73ad6e49d Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 15 Dec 2019 08:22:53 -0800 Subject: gnu: Add rust-url-1.7. * gnu/packages/crates-io.scm (rust-url-1.7): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4cd2d146cd..16e1345286 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8653,6 +8653,41 @@ (define-public rust-untrusted-0.7 (properties '((hidden? . #t))) (license license:isc))) +(define-public rust-url-1.7 + (package + (name "rust-url") + (version "1.7.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "url" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0nim1c90mxpi9wgdw2xh8dqd72vlklwlzam436akcrhjac6pqknx")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-encoding" ,rust-encoding-0.2) + ("rust-heapsize" ,rust-heapsize-0.4) + ("rust-idna" ,rust-idna-0.1) + ("rust-matches" ,rust-matches-0.1) + ("rust-percent-encoding" ,rust-percent-encoding-1.0) + ("rust-rustc-serialize" ,rust-rustc-serialize-0.3) + ("rust-serde" ,rust-serde-1.0)) + #:cargo-development-inputs + (("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)))) + (define-public rust-utf8-ranges-1.0 (package (name "rust-utf8-ranges") -- cgit v1.2.3 From 9fce9dd7586883d1c03ec507d86714519bfba5aa Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 15 Dec 2019 08:32:04 -0800 Subject: gnu: Add rust-bit-vec-0.5. * gnu/packages/crates-io.scm (rust-bit-vec-0.5): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 16e1345286..db95b45a1f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -456,6 +456,32 @@ (define-public rust-bincode-1.1 that uses Serde for transforming structs into bytes and vice versa!") (license license:expat))) +(define-public rust-bit-vec-0.5 + (package + (name "rust-bit-vec") + (version "0.5.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "bit-vec" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1fyh8221s6cxlmng01v8v2ljhavzawqqs8r1xjc66ap5sjavx6zm")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-serde" ,rust-serde-1.0)) + #:cargo-development-inputs + (("rust-serde-json" ,rust-serde-json-1.0)))) + (home-page "https://github.com/contain-rs/bit-vec") + (synopsis "Vector of bits") + (description + "This package provides a vector of bits.") + (license (list license:expat license:asl2.0)))) + (define-public rust-bitflags-1 (package (name "rust-bitflags") -- cgit v1.2.3 From e017969bf0effa75c03fbec68ef369a4b418dd30 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 15 Dec 2019 08:34:23 -0800 Subject: gnu: Add rust-bit-set-0.5. * gnu/packages/crates-io.scm (rust-bit-set-0.5): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index db95b45a1f..61a325df3d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -456,6 +456,32 @@ (define-public rust-bincode-1.1 that uses Serde for transforming structs into bytes and vice versa!") (license license:expat))) +(define-public rust-bit-set-0.5 + (package + (name "rust-bit-set") + (version "0.5.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "bit-set" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "100ac8867bvbx9kv634w4xjk98b71i8nq4wdcvpf3cf4ha4j6k78")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bit-vec" ,rust-bit-vec-0.5)) + #:cargo-development-inputs + (("rust-rand" ,rust-rand-0.4)))) + (home-page "https://github.com/contain-rs/bit-set") + (synopsis "Set of bits") + (description + "This package provides a set of bits.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-bit-vec-0.5 (package (name "rust-bit-vec") -- cgit v1.2.3 From 4fc46b9ad08e839f287ff5eab7f227e9ab3e0322 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 15 Dec 2019 08:42:44 -0800 Subject: gnu: Add rust-stream-cipher-0.3. * gnu/packages/crates-io.scm (rust-stream-cipher-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 61a325df3d..274d9f20cb 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7454,6 +7454,30 @@ (define-public rust-stdweb-internal-test-macro-0.1 (license (list license:asl2.0 license:expat)))) +(define-public rust-stream-cipher-0.3 + (package + (name "rust-stream-cipher") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "stream-cipher" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1g1nd8r6pph70rzk5yyvg7a9ji7pkap9ddiqpp4v9xa9ys0bqqc8")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-blobby" ,rust-blobby-0.1) + ("rust-generic-array" ,rust-generic-array-0.13)))) + (home-page "https://github.com/RustCrypto/traits") + (synopsis "Stream cipher traits") + (description "Stream cipher traits.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-streaming-stats-0.2 (package (name "rust-streaming-stats") -- cgit v1.2.3 From 6b69ca248a21c296942b73f9c87dd04d7ab468a8 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 15 Dec 2019 08:44:51 -0800 Subject: gnu: Add rust-c2-chacha-0.2. * gnu/packages/crates-io.scm (rust-c2-chacha-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 274d9f20cb..eecd0b1cbd 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -780,6 +780,35 @@ (define-public rust-bytes-0.4 "Types and traits for working with bytes.") (license license:expat))) +(define-public rust-c2-chacha-0.2 + (package + (name "rust-c2-chacha") + (version "0.2.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "c2-chacha" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "00a11qdc8mg3z0k613rhprkc9p6xz0y7b1681x32ixg0hr3x0r3x")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-byteorder" ,rust-byteorder-1.3) + ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-ppv-lite86" ,rust-ppv-lite86-0.2) + ("rust-stream-cipher" ,rust-stream-cipher-0.3)) + #:cargo-development-inputs + (("rust-hex-literal" ,rust-hex-literal-0.2)))) + (home-page "https://github.com/cryptocorrosion/cryptocorrosion") + (synopsis "The ChaCha family of stream ciphers") + (description + "The ChaCha family of stream ciphers.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-cargon-0.0 (package (name "rust-cargon") -- cgit v1.2.3 From ec5dfc42396225636142f45fdb063f792a95637e Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 15 Dec 2019 08:49:03 -0800 Subject: gnu: Add rust-rand-chacha-0.2. * gnu/packages/crates-io.scm (rust-rand-chacha-0.2): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 36 +++++++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index eecd0b1cbd..c7b9f75e87 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5765,8 +5765,35 @@ (define-public rust-rand-0.3 (base32 "0v679h38pjjqj5h4md7v2slsvj6686qgcn7p9fbw3h43iwnk1b34")))))) +(define-public rust-rand-chacha-0.2 + (package + (name "rust-rand-chacha") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rand_chacha" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "178d36jfkc4v95s25scc2vibj2hd2hlk64cs6id4hvzg89whd4z1")))) + (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)))) + (home-page "https://crates.io/crates/rand-chacha") + (synopsis "ChaCha random number generator") + (description "ChaCha random number generator.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-rand-chacha-0.1 (package + (inherit rust-rand-chacha-0.2) (name "rust-rand-chacha") (version "0.1.1") (source @@ -5777,13 +5804,8 @@ (define-public rust-rand-chacha-0.1 (sha256 (base32 "1vxwyzs4fy1ffjc8l00fsyygpiss135irjf7nyxgq2v0lqf3lvam")))) - (build-system cargo-build-system) - (home-page "https://crates.io/crates/rand_chacha") - (synopsis "ChaCha random number generator") - (description "ChaCha random number generator") - (properties '((hidden? . #t))) - (license (list license:asl2.0 - license:expat)))) + (arguments `()) + (properties '((hidden? . #t))))) (define-public rust-rand-core-0.5 (package -- cgit v1.2.3 From c1c211f3e829c330417402695c6ca550fb04e7d6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 30 Dec 2019 23:09:51 +0200 Subject: gnu: rust-rand-chacha-0.1: Skip build. * gnu/packages/crates-io.scm (rust-rand-chacha-0.1)[arguments]: Skip build. Add rust-rand-core-0.3 to cargo-inputs. Add rust-autocfg-0.1 to cargo-development-inputs. [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 c7b9f75e87..1552600389 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5804,8 +5804,12 @@ (define-public rust-rand-chacha-0.1 (sha256 (base32 "1vxwyzs4fy1ffjc8l00fsyygpiss135irjf7nyxgq2v0lqf3lvam")))) - (arguments `()) - (properties '((hidden? . #t))))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-rand-core" ,rust-rand-core-0.3)) + #:cargo-development-inputs + (("rust-autocfg" ,rust-autocfg-0.1)))))) (define-public rust-rand-core-0.5 (package -- cgit v1.2.3 From de6acef0bd32807cdc136553bdcde97f3dfd3e4e Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 15 Dec 2019 08:51:37 -0800 Subject: gnu: Add rust-wait-timeout-0.2. * gnu/packages/crates-io.scm (rust-wait-timeout-0.2): 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 1552600389..c3995f811e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8982,6 +8982,30 @@ (define-public rust-void-1.0 (properties '((hidden? . #t))) (license license:expat))) +(define-public rust-wait-timeout-0.2 + (package + (name "rust-wait-timeout") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "wait-timeout" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1xpkk0j5l9pfmjfh1pi0i89invlavfrd9av5xp0zhxgb29dhy84z")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs (("rust-libc" ,rust-libc-0.2)))) + (home-page "https://github.com/alexcrichton/wait-timeout") + (synopsis "Wait on a child process with a timeout") + (description + "This package provides a crate to wait on a child process with a timeout +specified across Unix and Windows platforms.") + (license (list license:expat license:asl2.0)))) + (define-public rust-walkdir-2.2 (package (name "rust-walkdir") -- cgit v1.2.3 From db294c80e90aecb5c9401f0e7157b52d8f2d4156 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 15 Dec 2019 08:52:54 -0800 Subject: gnu: Add rust-rusty-fork-0.2. * gnu/packages/crates-io.scm (rust-rusty-fork-0.2): 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 c3995f811e..bab91a1afe 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6538,6 +6538,34 @@ (define-public rust-rustc-version-0.2 rustc compiler.") (license (list license:expat license:asl2.0)))) +(define-public rust-rusty-fork-0.2 + (package + (name "rust-rusty-fork") + (version "0.2.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "rusty-fork" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1bjg8adk0i921088j52rn0hmvsry34q19g96x41pamqcw5j35n9x")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-fnv" ,rust-fnv-1.0) + ("rust-quick-error" ,rust-quick-error-1.2) + ("rust-tempfile" ,rust-tempfile-3.0) + ("rust-wait-timeout" ,rust-wait-timeout-0.2)))) + (home-page "https://github.com/altsysrq/rusty-fork") + (synopsis "Library for running Rust tests in sub-processes") + (description + "Cross-platform library for running Rust tests in sub-processes +using a fork-like interface.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-ryu-1.0 (package (name "rust-ryu") -- cgit v1.2.3 From 7472fe2082a0da27e4a864fb8bbc3e373a92e9aa Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 15 Dec 2019 08:54:49 -0800 Subject: gnu: Add rust-proptest-0.9. * gnu/packages/crates-io.scm (rust-proptest-0.9): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index bab91a1afe..7bc457472e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5630,6 +5630,45 @@ (define-public rust-proc-macro2-0.4 (base32 "0nd71fl24sys066jrha6j7i34nfkjv44yzw8yww9742wmc8j0gfg")))))) +(define-public rust-proptest-0.9 + (package + (name "rust-proptest") + (version "0.9.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "proptest" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "17sjg8isas4qk85807c4panih9k0lwa4k1mbajhciw5c5q17w56g")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bit-set" ,rust-bit-set-0.5) + ("rust-bitflags" ,rust-bitflags-1) + ("rust-byteorder" ,rust-byteorder-1.3) + ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-quick-error" ,rust-quick-error-1.2) + ("rust-rand" ,rust-rand-0.4) + ("rust-rand-chacha" ,rust-rand-chacha-0.2) + ("rust-rand-xorshift" ,rust-rand-xorshift-0.2) + ("rust-regex-syntax" ,rust-regex-syntax-0.6) + ("rust-rusty-fork" ,rust-rusty-fork-0.2) + ("rust-tempfile" ,rust-tempfile-3.0)) + #:cargo-development-inputs + (("rust-regex" ,rust-regex-1.1)))) + (home-page + "https://altsysrq.github.io/proptest-book/proptest/index.html") + (synopsis + "Hypothesis-like property-based testing and shrinking") + (description + "Hypothesis-like property-based testing and shrinking.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-quick-error-1.2 (package (name "rust-quick-error") -- cgit v1.2.3 From a87f77b9cbbb618edf539b4b25c585d8c574d60e Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 15 Dec 2019 08:58:39 -0800 Subject: gnu: Add rust-lexical-core-0.4. * gnu/packages/crates-io.scm (rust-lexical-core-0.4): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7bc457472e..54ad2ab846 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3881,6 +3881,41 @@ (define-public rust-lazycell-1.2 "This package provides a library providing a lazily filled Cell struct.") (license (list license:expat license:asl2.0)))) +(define-public rust-lexical-core-0.4 + (package + (name "rust-lexical-core") + (version "0.4.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "lexical-core" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1gr5y3ykghd3wjc00l3iizkj1dxylyhwi6fj6yn2qg06nzx771iz")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-cfg-if" ,rust-cfg-if-0.1) + ("rust-dtoa" ,rust-dtoa-0.4) + ("rust-ryu" ,rust-ryu-1.0) + ("rust-stackvector" ,rust-stackvector-1.0) + ("rust-static-assertions" ,rust-static-assertions-0.3)) + #:cargo-development-inputs + (("rust-approx" ,rust-approx-0.3) + ("rust-proptest" ,rust-proptest-0.9) + ("rust-quickcheck" ,rust-quickcheck-0.8) + ("rust-rustc-version" ,rust-rustc-version-0.2)))) + (home-page + "https://github.com/Alexhuszagh/rust-lexical/tree/master/lexical-core") + (synopsis + "Lexical, to- and from-string conversion routines") + (description + "Lexical, to- and from-string conversion routines.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-libc-0.2 (package (name "rust-libc") -- cgit v1.2.3 From 1b63d8ed7f4e691226f05c579fdb23dcb2d7ba52 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 15 Dec 2019 09:02:00 -0800 Subject: gnu: Add rust-paste-impl-0.1. * gnu/packages/crates-io.scm (rust-paste-impl-0.1). 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 54ad2ab846..b427136fe7 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5160,6 +5160,33 @@ (define-public rust-parity-wasm-0.40 (license (list license:asl2.0 license:expat)))) +(define-public rust-paste-impl-0.1 + (package + (name "rust-paste-impl") + (version "0.1.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "paste-impl" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1rkh8nixmb7r1y0mjnsz62p6r1bqah5ciri7bwhmgcmq4gk9drr6")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-proc-macro-hack" ,rust-proc-macro-hack-0.5) + ("rust-proc-macro2" ,rust-proc-macro2-0.4) + ("rust-quote" ,rust-quote-1.0) + ("rust-syn" ,rust-syn-0.15)))) + (home-page "https://github.com/dtolnay/paste") + (synopsis "Implementation detail of the paste crate") + (description + "Implementation detail of the paste crate.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-pcre2-0.2 (package (name "rust-pcre2") -- cgit v1.2.3 From ab0a2216d75369f7211b5b099c39630c901a02ec Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 15 Dec 2019 09:03:19 -0800 Subject: gnu: Add rust-paste-0.1. * gnu/packages/crates-io.scm (rust-paste-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b427136fe7..d1864186f9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5160,6 +5160,31 @@ (define-public rust-parity-wasm-0.40 (license (list license:asl2.0 license:expat)))) +(define-public rust-paste-0.1 + (package + (name "rust-paste") + (version "0.1.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "paste" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0ygs077hlq8qlx5y46sfgrmhlqqgkmvvhn4x3y10arawalf4ljhz")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-paste-impl" ,rust-paste-impl-0.1) + ("rust-proc-macro-hack" ,rust-proc-macro-hack-0.5)))) + (home-page "https://github.com/dtolnay/paste") + (synopsis "Macros for all your token pasting needs") + (description + "Macros for all your token pasting needs.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-paste-impl-0.1 (package (name "rust-paste-impl") -- cgit v1.2.3 From f01b62db996c27281cc3c7bd7d35107d6927b2ce Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 15 Dec 2019 09:05:39 -0800 Subject: gnu: Add rust-jemallocator-0.3. * gnu/packages/crates-io.scm (rust-jemallocator-0.3): 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 d1864186f9..e4e3f9f359 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3768,6 +3768,33 @@ (define-public rust-jemalloc-sys-0.3 (license (list license:asl2.0 license:expat)))) +(define-public rust-jemallocator-0.3 + (package + (name "rust-jemallocator") + (version "0.3.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "jemallocator" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0sabfa5118b7l4ars5n36s2fjyfn59w4d6mjs6rrmsa5zky67bj3")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-jemalloc-sys" ,rust-jemalloc-sys-0.3) + ("rust-libc" ,rust-libc-0.2)) + #:cargo-development-inputs + (("rust-paste" ,rust-paste-0.1)))) + (home-page "https://github.com/gnzlbg/jemallocator") + (synopsis "Rust allocator backed by jemalloc") + (description + "This package provides a Rust allocator backed by jemalloc.") + (license (list license:expat license:asl2.0)))) + (define-public rust-json-0.11 (package (name "rust-json") -- cgit v1.2.3 From cf47457707795272587bdcee5e2f32a3642543c6 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 15 Dec 2019 09:18:30 -0800 Subject: gnu: Add rust-nom-4.2. * gnu/packages/crates-io.scm (rust-nom-4.2): 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 e4e3f9f359..18c430c76b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4736,6 +4736,40 @@ (define-public rust-nodrop-union-0.1 (license (list license:asl2.0 license:expat)))) +(define-public rust-nom-4.2 + (package + (name "rust-nom") + (version "4.2.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "nom" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1mkvby8b4m61p4g1px0pwr58yfkphyp1jcfbp4qfp7l6iqdaklia")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lexical-core" ,rust-lexical-core-0.4) + ("rust-memchr" ,rust-memchr-2.2) + ("rust-regex" ,rust-regex-1.1)) + #:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.2) + ("rust-doc-comment" ,rust-doc-comment-0.3) + ("rust-jemallocator" ,rust-jemallocator-0.3) + ("rust-version-check" ,rust-version-check-0.9)))) + (home-page "https://github.com/Geal/nom") + (synopsis + "Byte-oriented, zero-copy, parser combinators library") + (description + "This package provides a byte-oriented, zero-copy, parser +combinators library.") + (license license:expat))) + (define-public rust-num-complex-0.2 (package (name "rust-num-complex") -- cgit v1.2.3 From 045cdf867934a30501a84e028f79ede9945f7749 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 15 Dec 2019 09:20:36 -0800 Subject: gnu: Add rust-cexpr-0.3. * gnu/package/crates-io.scm (rust-cexpr-0.3): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 18c430c76b..7764b0e70a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -899,6 +899,32 @@ (define-public rust-cc-1.0 (license (list license:asl2.0 license:expat)))) +(define-public rust-cexpr-0.3 + (package + (name "rust-cexpr") + (version "0.3.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "cexpr" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1by64ini3f058pwad3immx5cc12wr0m0kwgaxa8apzym03mj9ym7")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-nom" ,rust-nom-4.2)) + #:cargo-development-inputs + (("rust-clang-sys" ,rust-clang-sys-0.28)))) + (home-page "https://github.com/jethrogb/rust-cexpr") + (synopsis "C expression parser and evaluator") + (description + "This package provides a C expression parser and evaluator.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-chrono-0.4 (package (name "rust-chrono") -- cgit v1.2.3 From 95c9898db371022fffd423e5c0563f33e1b27017 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 15 Dec 2019 09:24:01 -0800 Subject: gnu: Add rust-seahash-3.0. * gnu/packages/crates-io.scm (rust-seahash-3.0): 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 7764b0e70a..53e87ec296 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7023,6 +7023,30 @@ (define-public rust-scroll-derive-0.9 Pwrite traits from the scroll crate.") (license license:expat))) +(define-public rust-seahash-3.0 + (package + (name "rust-seahash") + (version "3.0.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "seahash" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1pr8ijnxnp68ki4m4740yc5mr01zijf86yx07wbsqzwiyhghdmhq")))) + (build-system cargo-build-system) + (arguments `(#:skip-build? #t)) + (home-page + "https://gitlab.redox-os.org/redox-os/seahash") + (synopsis + "Hash function with proven statistical guarantees") + (description + "This package provides a blazingly fast, portable hash function with +proven statistical guarantees.") + (license license:expat))) + (define-public rust-security-framework-sys-0.3 (package (name "rust-security-framework-sys") -- cgit v1.2.3 From b3cddd572160bcfd03402d53b69cfe0651d98fe2 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 15 Dec 2019 09:35:44 -0800 Subject: gnu: Add rust-which-2.0. * gnu/packages/crates-io.scm (rust-which-2.0): 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 53e87ec296..d7ee7562a3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9503,6 +9503,34 @@ (define-public rust-wasm-bindgen-test-macro-0.2 (license (list license:asl2.0 license:expat)))) +(define-public rust-which-2.0 + (package + (name "rust-which") + (version "2.0.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "which" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0r7i793sc0xqnd2fxnqbksj7j1kx65bwn81b8z49750v4c8cnymm")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-failure" ,rust-failure-0.1) + ("rust-libc" ,rust-libc-0.2)) + #:cargo-development-inputs + (("rust-tempdir" ,rust-tempdir-0.3)))) + (home-page "https://github.com/harryfei/which-rs") + (synopsis "Rust equivalent of Unix command \"which\"") + (description + "This package provides a Rust equivalent of Unix command \"which\". +Locate installed execuable in cross platforms.") + (license license:expat))) + (define-public rust-widestring-0.4 (package (name "rust-widestring") -- cgit v1.2.3 From 5952f575df1b0900f3b5c9ed6fa3fb8ef2e7a6dd Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 15 Dec 2019 09:36:16 -0800 Subject: gnu: Add rust-bindgen-0.50. * gnu/packages/crates-io.scm (rust-bindgen-0.50): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d7ee7562a3..149141bd61 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -456,6 +456,51 @@ (define-public rust-bincode-1.1 that uses Serde for transforming structs into bytes and vice versa!") (license license:expat))) +(define-public rust-bindgen-0.50 + (package + (name "rust-bindgen") + (version "0.50.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "bindgen" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1k4n1d002vrfn1mlpww3ib7f275yn4rpxfwkqpr9bym27zg17ab5")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-cexpr" ,rust-cexpr-0.3) + ("rust-cfg-if" ,rust-cfg-if-0.1) + ("rust-clang-sys" ,rust-clang-sys-0.28) + ("rust-clap" ,rust-clap-2) + ("rust-env-logger" ,rust-env-logger-0.6) + ("rust-fxhash" ,rust-fxhash-0.2) + ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-log" ,rust-log-0.4) + ("rust-peeking-take-while" ,rust-peeking-take-while-0.1) + ("rust-proc-macro2" ,rust-proc-macro2-0.4) + ("rust-quote" ,rust-quote-1.0) + ("rust-regex" ,rust-regex-1.1) + ("rust-shlex" ,rust-shlex-0.1) + ("rust-which" ,rust-which-2.0)) + #:cargo-development-inputs + (("rust-clap" ,rust-clap-2) + ("rust-diff" ,rust-diff-0.1) + ("rust-shlex" ,rust-shlex-0.1)))) + (home-page + "https://rust-lang.github.io/rust-bindgen/") + (synopsis + "Automatically generates FFI bindings to C and C++libraries") + (description + "Automatically generates Rust FFI bindings to C and C++ +libraries.") + (license license:bsd-3))) + (define-public rust-bit-set-0.5 (package (name "rust-bit-set") -- cgit v1.2.3 From da1d28755ebc3bf9b97a3950f447b3de9a62c3da Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 15 Dec 2019 09:26:38 -0800 Subject: gnu: Add rust-fxhash-0.2. * gnu/packages/crates-io.scm (rust-fxhash-0.2): 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 149141bd61..15dba2fde7 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3027,6 +3027,34 @@ (define-public rust-futures-util-preview-0.3 library.") (license (list license:expat license:asl2.0)))) +(define-public rust-fxhash-0.2 + (package + (name "rust-fxhash") + (version "0.2.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "fxhash" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "037mb9ichariqi45xm6mz0b11pa92gj38ba0409z3iz239sns6y3")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-byteorder" ,rust-byteorder-1.3)) + #:cargo-development-inputs + (("rust-fnv" ,rust-fnv-1.0) + ("rust-seahash" ,rust-seahash-3.0)))) + (home-page "https://github.com/cbreeden/fxhash") + (synopsis "Hashing algorithm from hasher used in FireFox and Rustc") + (description + "This package provides a fast, non-secure, hashing algorithm +derived from an internal hasher used in FireFox and Rustc.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-gcc-0.3 (package (inherit rust-cc-1.0) -- cgit v1.2.3 From b364ad13666b9ae961cde5d563fb43350334f3fc Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 15 Dec 2019 09:41:39 -0800 Subject: gnu: Add rust-packed-simd-0.3. * gnu/packages/crates-io.scm (rust-packed-simd-0.3): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 15dba2fde7..97c3c91d48 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5231,6 +5231,36 @@ (define-public rust-owning-ref-0.4 (properties '((hidden? . #t))) (license license:expat))) +(define-public rust-packed-simd-0.3 + (package + (name "rust-packed-simd") + (version "0.3.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "packed_simd" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0822wqf6kzw4ig9ykndg348w2bxkhs3x64brzsvdxh2a1pyajpm8")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-cfg-if" ,rust-cfg-if-0.1) + ("rust-core-arch" ,rust-core-arch-0.1) + ("rust-sleef-sys" ,rust-sleef-sys-0.1)) + #:cargo-development-inputs + (("rust-arrayvec" ,rust-arrayvec-0.4) + ("rust-paste" ,rust-paste-0.1) + ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2) + ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.2)))) + (home-page "https://github.com/rust-lang/packed_simd") + (synopsis "Portable Packed SIMD vectors") + (description "Portable Packed SIMD vectors.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-parking-lot-0.8 (package (name "rust-parking-lot") -- cgit v1.2.3 From e3d04c3cccf0773a02ebe7fe36724f3527f6337c Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 15 Dec 2019 09:40:03 -0800 Subject: gnu: Add rust-sleef-sys-0.1. * gnu/packages/crates-io.scm (rust-sleef-sys-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 97c3c91d48..503e0f6e63 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7537,6 +7537,36 @@ (define-public rust-slab-0.4 (properties '((hidden? . #t))) (license license:expat))) +(define-public rust-sleef-sys-0.1 + (package + (name "rust-sleef-sys") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "sleef-sys" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1881q2yc17j2m1yvh01447c93ws1mspnrj3k2nbvwbvcm8z81kkv")))) + (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)) + #:cargo-development-inputs + (("rust-bindgen" ,rust-bindgen-0.50) + ("rust-cmake" ,rust-cmake-0.1) + ("rust-env-logger" ,rust-env-logger-0.6)))) + (home-page "https://github.com/gnzlbg/sleef-sys") + (synopsis + "Rust FFI bindings to the SLEEF Vectorized Math Library") + (description + "Rust FFI bindings to the SLEEF Vectorized Math Library.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-slog-2.4 (package (name "rust-slog") -- cgit v1.2.3 From e832840799196b6675ac42988f807a4f2d4e694f Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 15 Dec 2019 09:43:55 -0800 Subject: gnu: Add rust-bytecount-0.5. * gnu/packages/crates-io.scm (rust-bytecount-0.5): 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 503e0f6e63..bea81e16b9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -766,6 +766,35 @@ (define-public rust-byte-tools-0.3 (description "Bytes related utility functions.") (license (list license:asl2.0 license:expat)))) +(define-public rust-bytecount-0.5 + (package + (name "rust-bytecount") + (version "0.5.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "bytecount" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0z6a280kiy4kg5v3qw97pbyvwycr17fsm41804i8zpq7nmads3xy")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-packed-simd" ,rust-packed-simd-0.3)) + #:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.2) + ("rust-quickcheck" ,rust-quickcheck-0.8) + ("rust-rand" ,rust-rand-0.4)))) + (home-page "https://github.com/llogiq/bytecount") + (synopsis "Count occurrences of a given byte") + (description + "Count occurrences of a given byte, or the number of UTF-8 code points, +in a byte slice, fast.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-byteorder-1.3 (package (name "rust-byteorder") -- cgit v1.2.3 From d832bcb613012ffa13355b14c162819f43ad562d Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 15 Dec 2019 09:46:32 -0800 Subject: gnu: Add rust-aho-corasick-0.7. * gnu/packages/crates-io.scm (rust-aho-corasick-0.7): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index bea81e16b9..731953894c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -123,6 +123,29 @@ (define-public rust-afl-0.4 "Fuzz Rust code with american-fuzzy-lop.") (license license:asl2.0))) +(define-public rust-aho-corasick-0.7 + (package + (name "rust-aho-corasick") + (version "0.7.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "aho-corasick" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0k1nqabiz37mnfnlrn084qi9yf8pj6a38qgbb3lc5zlr1jp89x76")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs (("rust-memchr" ,rust-memchr-2.2)))) + (home-page "https://github.com/BurntSushi/aho-corasick") + (synopsis "Fast multiple substring searching") + (description + "Fast multiple substring searching.") + (license (list license:unlicense license:expat)))) + (define-public rust-ansi-term-0.11 (package (name "rust-ansi-term") -- cgit v1.2.3 From ab5a01f5795e332571d1f0fd77fbf4f9ae872c36 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 15 Dec 2019 09:49:08 -0800 Subject: gnu: Add rust-encoding-rs-0.8. * gnu/packages/crates-io.scm (rust-encoding-rs-0.8): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 731953894c..1cc1f53f47 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2320,6 +2320,37 @@ (define-public rust-encoding-index-tradchinese-1.20141219 "Index tables for traditional Chinese character encodings.") (license license:cc0))) +(define-public rust-encoding-rs-0.8 + (package + (name "rust-encoding-rs") + (version "0.8.17") + (source + (origin + (method url-fetch) + (uri (crate-uri "encoding_rs" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1v902qqnbd37vdq4rjvp6k05wmghrasfdcjy30gp1xpjg5f7hma1")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-cfg-if" ,rust-cfg-if-0.1) + ("rust-packed-simd" ,rust-packed-simd-0.3) + ("rust-serde" ,rust-serde-1.0)) + #:cargo-development-inputs + (("rust-bincode" ,rust-bincode-1.1) + ("rust-serde-derive" ,rust-serde-derive-1.0) + ("rust-serde-json" ,rust-serde-json-1.0)))) + (home-page "https://docs.rs/encoding_rs/") + (synopsis "Gecko-oriented implementation of the Encoding Standard") + (description + "This package provides a Gecko-oriented implementation of the Encoding +Standard.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-env-logger-0.6 (package (name "rust-env-logger") -- cgit v1.2.3 From 4d4bcff701714081c7a9bfafec2abb90837a9ad0 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 15 Dec 2019 09:51:22 -0800 Subject: gnu: Add rust-encoding-rs-io-0.1. * gnu/packages/crates-io.scm (rust-encoding-rs-io-0.1): 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 1cc1f53f47..201e1a2251 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2351,6 +2351,30 @@ (define-public rust-encoding-rs-0.8 Standard.") (license (list license:asl2.0 license:expat)))) +(define-public rust-encoding-rs-io-0.1 + (package + (name "rust-encoding-rs-io") + (version "0.1.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "encoding_rs_io" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0b7k9p7inkrcanh7h6q4m278y05gmcwi8p5r43h7grzl5dxfw6cn")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-encoding-rs" ,rust-encoding-rs-0.8)))) + (home-page "https://github.com/BurntSushi/encoding_rs_io") + (synopsis "Streaming transcoding for encoding_rs") + (description + "Streaming transcoding for encoding_rs.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-env-logger-0.6 (package (name "rust-env-logger") -- cgit v1.2.3 From b7a062bf104be21800d828f7b645388959fd52f2 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 15 Dec 2019 09:53:19 -0800 Subject: gnu: Add rust-grep-regex-0.1. * gnu/packages/crates-io.scm (rust-grep-regex-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 201e1a2251..e383088463 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3459,6 +3459,36 @@ (define-public rust-grep-pcre2-0.1 (description "Use PCRE2 with the grep crate.") (license (list license:expat license:unlicense)))) +(define-public rust-grep-regex-0.1 + (package + (name "rust-grep-regex") + (version "0.1.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "grep-regex" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1lbb8837gzy25n706mnidaps4jl63ym679zraj8nfy5g02zbz549")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-aho-corasick" ,rust-aho-corasick-0.7) + ("rust-grep-matcher" ,rust-grep-matcher-0.1) + ("rust-log" ,rust-log-0.4) + ("rust-regex" ,rust-regex-1.1) + ("rust-regex-syntax" ,rust-regex-syntax-0.6) + ("rust-thread-local" ,rust-thread-local-0.3) + ("rust-utf8-ranges" ,rust-utf8-ranges-1.0)))) + (home-page "https://github.com/BurntSushi/ripgrep") + (synopsis "Use Rust's regex library with the grep crate") + (description + "Use Rust's regex library with the grep crate.") + (license (list license:unlicense license:expat)))) + (define-public rust-half-1.3 (package (name "rust-half") -- cgit v1.2.3 From 37d10a5cbe950ea498d337244435051e279a6287 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 15 Dec 2019 09:55:57 -0800 Subject: gnu: Add rust-grep-searcher-0.1. * gnu/package/crates-io.scm (rust-grep-searcher-0.1): New version. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e383088463..3b019de559 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3489,6 +3489,39 @@ (define-public rust-grep-regex-0.1 "Use Rust's regex library with the grep crate.") (license (list license:unlicense license:expat)))) +(define-public rust-grep-searcher-0.1 + (package + (name "rust-grep-searcher") + (version "0.1.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "grep-searcher" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0pj85m7q6k6jpl3q57v1gwq5jxmqnza2xg7jjcxky3q325z8lcjy")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bstr" ,rust-bstr-0.2) + ("rust-bytecount" ,rust-bytecount-0.5) + ("rust-encoding-rs" ,rust-encoding-rs-0.8) + ("rust-encoding-rs-io" ,rust-encoding-rs-io-0.1) + ("rust-grep-matcher" ,rust-grep-matcher-0.1) + ("rust-log" ,rust-log-0.4) + ("rust-memmap" ,rust-memmap-0.7)) + #:cargo-development-inputs + (("rust-grep-regex" ,rust-grep-regex-0.1) + ("rust-regex" ,rust-regex-1.1)))) + (home-page "https://github.com/BurntSushi/ripgrep") + (synopsis "Line oriented regex searching as a library") + (description + "Fast line oriented regex searching as a library.") + (license (list license:unlicense license:expat)))) + (define-public rust-half-1.3 (package (name "rust-half") -- cgit v1.2.3 From 22268843fcd59d1e4dad65cb2c541438554668c2 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 15 Dec 2019 09:58:00 -0800 Subject: gnu: Add rust-grep-printer-0.1. * gnu/packages/crates-io.scm (rust-grep-printer-0.1): 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 3b019de559..dbcf018527 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3459,6 +3459,40 @@ (define-public rust-grep-pcre2-0.1 (description "Use PCRE2 with the grep crate.") (license (list license:expat license:unlicense)))) +(define-public rust-grep-printer-0.1 + (package + (name "rust-grep-printer") + (version "0.1.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "grep-printer" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0mxc1yx5sx89f00imlm5d3hxwdgglv9rzwdki8ba50gvq8a2nr8m")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-base64" ,rust-base64-0.10) + ("rust-bstr" ,rust-bstr-0.2) + ("rust-grep-matcher" ,rust-grep-matcher-0.1) + ("rust-grep-searcher" ,rust-grep-searcher-0.1) + ("rust-serde" ,rust-serde-1.0) + ("rust-serde-derive" ,rust-serde-derive-1.0) + ("rust-serde-json" ,rust-serde-json-1.0) + ("rust-termcolor" ,rust-termcolor-1.0)) + #:cargo-development-inputs + (("rust-grep-regex" ,rust-grep-regex-0.1)))) + (home-page "https://github.com/BurntSushi/ripgrep") + (synopsis "Standard printing of search results") + (description + "An implementation of the grep crate's Sink trait that provides +standard printing of search results, similar to grep itself.") + (license (list license:unlicense license:expat)))) + (define-public rust-grep-regex-0.1 (package (name "rust-grep-regex") -- cgit v1.2.3 From af88c95b28a9ab1595c7eb56a3dd7eb3942b48c8 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 15 Dec 2019 10:07:31 -0800 Subject: gnu: Add rust-stdweb-0.4. * gnu/packages/crates-io.scm (rust-stdweb-0.4): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index dbcf018527..f05d6271cc 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8010,6 +8010,47 @@ (define-public rust-static-assertions-0.3 (properties '((hidden? . #t))) (license (list license:expat license:asl2.0)))) +(define-public rust-stdweb-0.4 + (package + (name "rust-stdweb") + (version "0.4.17") + (source + (origin + (method url-fetch) + (uri (crate-uri "stdweb" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "094giad1v81rxxs4izf88ijc9c6w3c7cr5a7cwwr86mc22xn4hy3")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-discard" ,rust-discard-1.0) + ("rust-futures-channel-preview" ,rust-futures-channel-preview-0.3) + ("rust-futures-core-preview" ,rust-futures-core-preview-0.3) + ("rust-futures-executor-preview" ,rust-futures-executor-preview-0.3) + ("rust-futures-util-preview" ,rust-futures-util-preview-0.3) + ("rust-serde" ,rust-serde-1.0) + ("rust-serde-json" ,rust-serde-json-1.0) + ("rust-stdweb-derive" ,rust-stdweb-derive-0.5) + ("rust-stdweb-internal-macros" ,rust-stdweb-internal-macros-0.2) + ("rust-stdweb-internal-runtime" ,rust-stdweb-internal-runtime-0.1) + ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)) + #:cargo-development-inputs + (("rust-rustc-version" ,rust-rustc-version-0.2) + ("rust-serde-derive" ,rust-serde-derive-1.0) + ("rust-serde-json" ,rust-serde-json-1.0) + ("rust-stdweb-internal-test-macro" ,rust-stdweb-internal-test-macro-0.1) + ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.2)))) + (home-page "https://github.com/koute/stdweb") + (synopsis "Standard library for the client-side Web") + (description + "This package provides a standard library for the client-side +Web.") + (license (list license:expat license:asl2.0)))) + (define-public rust-stdweb-derive-0.5 (package (name "rust-stdweb-derive") -- cgit v1.2.3 From 417b483c6bdaf9b5e9aed1af205d9464979728e5 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 15 Dec 2019 09:59:20 -0800 Subject: gnu: Add rust-grep-0.2. * gnu/packages/crates-io.scm (rust-grep-0.2): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f05d6271cc..c9a72544f0 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3372,6 +3372,38 @@ (define-public rust-goblin-0.0 loading crate.") (license license:expat))) +(define-public rust-grep-0.2 + (package + (name "rust-grep") + (version "0.2.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "grep" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1pkhjladybzzciwg0mjk3vjz5fyi76hk0d3hgyzv2jxlyp8v4fyc")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-grep-cli" ,rust-grep-cli-0.1) + ("rust-grep-matcher" ,rust-grep-matcher-0.1) + ("rust-grep-pcre2" ,rust-grep-pcre2-0.1) + ("rust-grep-printer" ,rust-grep-printer-0.1) + ("rust-grep-regex" ,rust-grep-regex-0.1) + ("rust-grep-searcher" ,rust-grep-searcher-0.1)) + #:cargo-development-inputs + (("rust-termcolor" ,rust-termcolor-1.0) + ("rust-walkdir" ,rust-walkdir-2.2)))) + (home-page "https://github.com/BurntSushi/ripgrep") + (synopsis "Line oriented regex searching as a library") + (description + "Fast line oriented regex searching as a library.") + (license (list license:unlicense license:expat)))) + (define-public rust-grep-cli-0.1 (package (name "rust-grep-cli") -- cgit v1.2.3 From e1488b1dcc8439b281bc542be277386d0df85601 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 15 Dec 2019 10:13:39 -0800 Subject: gnu: Add rust-tokio-fs-0.1. * gnu/packages/crates-io.scm (rust-tokio-fs-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c9a72544f0..ec25014f3f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8776,6 +8776,38 @@ (define-public rust-tokio-executor-0.1 (description "Future execution primitives.") (license license:expat))) +(define-public rust-tokio-fs-0.1 + (package + (name "rust-tokio-fs") + (version "0.1.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "tokio-fs" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1bxp8585pi4j5g39ci2gkk99qnyilyhhila7cs8r6scdn0idrriz")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-futures" ,rust-futures-0.1) + ("rust-tokio-io" ,rust-tokio-io-0.1) + ("rust-tokio-threadpool" ,rust-tokio-threadpool-0.1)) + #:cargo-development-inputs + (("rust-rand" ,rust-rand-0.4) + ("rust-tempdir" ,rust-tempdir-0.3) + ("rust-tempfile" ,rust-tempfile-3.0) + ("rust-tokio" ,rust-tokio-0.1) + ("rust-tokio-codec" ,rust-tokio-codec-0.1) + ("rust-tokio-io" ,rust-tokio-io-0.1)))) + (home-page "https://tokio.rs") + (synopsis "Filesystem API for Tokio") + (description "Filesystem API for Tokio.") + (license license:expat))) + ;; Cyclic dependencies with tokio and tokio-current-thread (define-public rust-tokio-io-0.1 (package -- cgit v1.2.3 From 8c3e62578997e4a32e65be513872c1832e5adcb4 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 15 Dec 2019 10:15:59 -0800 Subject: gnu: Add rust-tokio-timer-0.2. * gnu/packages/crates-io.scm (rust-tokio-timer-0.2): 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 ec25014f3f..206db02451 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8994,6 +8994,36 @@ (define-public rust-tokio-threadpool-0.1 pool.") (license license:expat))) +(define-public rust-tokio-timer-0.2 + (package + (name "rust-tokio-timer") + (version "0.2.11") + (source + (origin + (method url-fetch) + (uri (crate-uri "tokio-timer" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "03m68ainkdy3b5pf20rjyknhk2ppx35bjdc2yfj2bv80sl96h47j")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-crossbeam-utils" ,rust-crossbeam-utils-0.6) + ("rust-futures" ,rust-futures-0.1) + ("rust-slab" ,rust-slab-0.4) + ("rust-tokio-executor" ,rust-tokio-executor-0.1)) + #:cargo-development-inputs + (("rust-rand" ,rust-rand-0.4) + ("rust-tokio" ,rust-tokio-0.1) + ("rust-tokio-mock-task" ,rust-tokio-mock-task-0.1)))) + (home-page "https://github.com/tokio-rs/tokio") + (synopsis "Timer facilities for Tokio") + (description "Timer facilities for Tokio.") + (license license:expat))) + (define-public rust-toml-0.5 (package (name "rust-toml") -- cgit v1.2.3 From d3af79f1046adc445a99c1dce5a4f6303877b91d Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 15 Dec 2019 10:23:27 -0800 Subject: gnu: Add rust-tokio-uds-0.2. * gnu/packages/crates-io.scm (rust-tokio-uds-0.2): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 206db02451..08d77611b1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9024,6 +9024,41 @@ (define-public rust-tokio-timer-0.2 (description "Timer facilities for Tokio.") (license license:expat))) +(define-public rust-tokio-uds-0.2 + (package + (name "rust-tokio-uds") + (version "0.2.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "tokio-uds" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0i94kxma6l7iy5hd5k7nvn7v9pnyw0s54bm9mjs0lap1l0xzqzq3")))) + (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-libc" ,rust-libc-0.2) + ("rust-log" ,rust-log-0.4) + ("rust-mio" ,rust-mio-0.6) + ("rust-mio-uds" ,rust-mio-uds-0.6) + ("rust-tokio-codec" ,rust-tokio-codec-0.1) + ("rust-tokio-io" ,rust-tokio-io-0.1) + ("rust-tokio-reactor" ,rust-tokio-reactor-0.1)) + #:cargo-development-inputs + (("rust-tempfile" ,rust-tempfile-3.0) + ("rust-tokio" ,rust-tokio-0.1)))) + (home-page "https://github.com/tokio-rs/tokio") + (synopsis "Unix Domain sockets for Tokio") + (description "Unix Domain sockets for Tokio.") + (license license:expat))) + (define-public rust-toml-0.5 (package (name "rust-toml") -- cgit v1.2.3 From eea77ec83cb30ac5153ad59960f5e5505156dba4 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 15 Dec 2019 10:18:21 -0800 Subject: gnu: Add rust-tokio-udp-0.1. * gnu/packages/crates-io.scm (rust-tokio-udp-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 08d77611b1..555f1cf9d2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9024,6 +9024,37 @@ (define-public rust-tokio-timer-0.2 (description "Timer facilities for Tokio.") (license license:expat))) +(define-public rust-tokio-udp-0.1 + (package + (name "rust-tokio-udp") + (version "0.1.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "tokio-udp" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "14kfj35s465czcspayacnzlxrazfvxzhhggq1rqlljhgp1sqa9k6")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bytes" ,rust-bytes-0.4) + ("rust-futures" ,rust-futures-0.1) + ("rust-log" ,rust-log-0.4) + ("rust-mio" ,rust-mio-0.6) + ("rust-tokio-codec" ,rust-tokio-codec-0.1) + ("rust-tokio-io" ,rust-tokio-io-0.1) + ("rust-tokio-reactor" ,rust-tokio-reactor-0.1)) + #:cargo-development-inputs + (("rust-env-logger" ,rust-env-logger-0.6)))) + (home-page "https://tokio.rs") + (synopsis "UDP bindings for tokio") + (description "UDP bindings for tokio.") + (license license:expat))) + (define-public rust-tokio-uds-0.2 (package (name "rust-tokio-uds") -- cgit v1.2.3 From 3285f25c5cb844c25dec09ea018bb4bfca1ae2ad Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 15 Dec 2019 10:21:18 -0800 Subject: gnu: Add rust-mio-uds-0.6. * gnu/packages/crates-io.scm (rust-mio-uds-0.6): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 555f1cf9d2..1feaada9b7 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4837,6 +4837,34 @@ (define-public rust-mio-0.6 (description "Lightweight non-blocking IO.") (license license:expat))) +(define-public rust-mio-uds-0.6 + (package + (name "rust-mio-uds") + (version "0.6.7") + (source + (origin + (method url-fetch) + (uri (crate-uri "mio-uds" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "09gimdbnj7b9yca99pk8lxh9jhl79msj795c8fxi2sqr9slmfqln")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-iovec" ,rust-iovec-0.1) + ("rust-libc" ,rust-libc-0.2) + ("rust-mio" ,rust-mio-0.6)) + #:cargo-development-inputs + (("rust-tempdir" ,rust-tempdir-0.3)))) + (home-page "https://github.com/alexcrichton/mio-uds") + (synopsis "Unix domain socket bindings for mio") + (description + "Unix domain socket bindings for mio.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-miow-0.3 (package (name "rust-miow") -- cgit v1.2.3 From 244999576336b7537fd9f289c5f245b2d69f4a3f Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 15 Dec 2019 10:27:24 -0800 Subject: gnu: Add rust-tokio-trace-core-0.2. * gnu/packages/crates-io.scm (rust-tokio-trace-core-0.2): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1feaada9b7..4a1caf44d3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9052,6 +9052,29 @@ (define-public rust-tokio-timer-0.2 (description "Timer facilities for Tokio.") (license license:expat))) +(define-public rust-tokio-trace-core-0.2 + (package + (name "rust-tokio-trace-core") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "tokio-trace-core" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "04y6c2r4ddzk02xb3hn60s9a1w92h0g8pzmxwaspqvwmsrba5j59")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-lazy-static" ,rust-lazy-static-1.3)))) + (home-page "https://tokio.rs") + (synopsis "Core primitives for tokio-trace") + (description "Core primitives for tokio-trace.") + (license license:expat))) + (define-public rust-tokio-udp-0.1 (package (name "rust-tokio-udp") -- cgit v1.2.3 From 9cb3f7ea456ef1b1971a43d5cab01c602eaa0081 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 15 Dec 2019 10:31:43 -0800 Subject: gnu: Add rust-http-0.1. * gnu/packages/crates-io.scm (rust-http-0.1): 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 4a1caf44d3..2762364c8d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3742,6 +3742,40 @@ (define-public rust-hex-literal-impl-0.2 "Internal implementation of the hex-literal crate.") (license (list license:asl2.0 license:expat)))) +(define-public rust-http-0.1 + (package + (name "rust-http") + (version "0.1.17") + (source + (origin + (method url-fetch) + (uri (crate-uri "http" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "06icxvrd26r6s7dzjavja7r47hgjb9851wblqh8frxnsy3q29lzf")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bytes" ,rust-bytes-0.4) + ("rust-fnv" ,rust-fnv-1.0) + ("rust-itoa" ,rust-itoa-0.4)) + #:cargo-development-inputs + (("rust-indexmap" ,rust-indexmap-1.0) + ("rust-quickcheck" ,rust-quickcheck-0.8) + ("rust-rand" ,rust-rand-0.4) + ("rust-seahash" ,rust-seahash-3.0) + ("rust-serde" ,rust-serde-1.0) + ("rust-serde-json" ,rust-serde-json-1.0)))) + (home-page "https://github.com/hyperium/http") + (synopsis "Set of types for representing HTTP requests and responses") + (description + "This package provides a set of types for representing HTTP +requests and responses.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-humantime-1.2 (package (name "rust-humantime") -- cgit v1.2.3 From a0adfccbc23a18349ab1fce943d96dd3738253f6 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 15 Dec 2019 10:34:59 -0800 Subject: gnu: Add rust-httparse-1.3. * gnu/packages/crates-io.scm (rust-httparse-1.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 2762364c8d..d149e2cf1b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3776,6 +3776,30 @@ (define-public rust-http-0.1 requests and responses.") (license (list license:asl2.0 license:expat)))) +(define-public rust-httparse-1.3 + (package + (name "rust-httparse") + (version "1.3.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "httparse" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "10vsfx1b8drhif08fbi0ha9d3v1f3h80w42rxh0y3hrvzl64nwz8")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-development-inputs + (("rust-pico-sys" ,rust-pico-sys-0.0)))) + (home-page "https://github.com/seanmonstar/httparse") + (synopsis "Zero-copy HTTP/1.x parser") + (description + "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 (package (name "rust-humantime") -- cgit v1.2.3 From a9ce2bd9207ebe5e70d492c2736e900438dcb886 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 15 Dec 2019 10:37:30 -0800 Subject: gnu: Add rust-tokio-0.1. * gnu/packages/crates-io.scm (rust-tokio-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 54 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d149e2cf1b..1b928fcc8b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8780,6 +8780,60 @@ (define-public rust-tinytemplate-1.0 "Simple, lightweight template engine.") (license (list license:asl2.0 license:expat)))) +(define-public rust-tokio-0.1 + (package + (name "rust-tokio") + (version "0.1.21") + (source + (origin + (method url-fetch) + (uri (crate-uri "tokio" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "11ra8jp3fj70a2zrqmd6as7wgpwiiyzjf50gz89i8r7wpksgqbzc")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bytes" ,rust-bytes-0.4) + ("rust-futures" ,rust-futures-0.1) + ("rust-mio" ,rust-mio-0.6) + ("rust-miow" ,rust-miow-0.3) + ("rust-num-cpus" ,rust-num-cpus-1.10) + ("rust-tokio-codec" ,rust-tokio-codec-0.1) + ("rust-tokio-current-thread" ,rust-tokio-current-thread-0.1) + ("rust-tokio-executor" ,rust-tokio-executor-0.1) + ("rust-tokio-fs" ,rust-tokio-fs-0.1) + ("rust-tokio-io" ,rust-tokio-io-0.1) + ("rust-tokio-reactor" ,rust-tokio-reactor-0.1) + ("rust-tokio-sync" ,rust-tokio-sync-0.1) + ("rust-tokio-tcp" ,rust-tokio-tcp-0.1) + ("rust-tokio-threadpool" ,rust-tokio-threadpool-0.1) + ("rust-tokio-timer" ,rust-tokio-timer-0.2) + ("rust-tokio-trace-core" ,rust-tokio-trace-core-0.2) + ("rust-tokio-udp" ,rust-tokio-udp-0.1) + ("rust-tokio-uds" ,rust-tokio-uds-0.2)) + #:cargo-development-inputs + (("rust-env-logger" ,rust-env-logger-0.6) + ("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 "Event-driven, non-blocking I/O platform") + (description + "An event-driven, non-blocking I/O platform for writing asynchronous I/O +backed applications.") + (license license:expat))) + ;; Cyclic dependency with tokio-io (define-public rust-tokio-codec-0.1 (package -- cgit v1.2.3 From c2fe39abc88214268d289d22353ef1a6a0998e33 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 15 Dec 2019 10:40:29 -0800 Subject: gnu: Add rust-ignore-0.4. * gnu/packages/crates-io.scm (rust-ignore-0.4): 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 1b928fcc8b..c6c8e901f5 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3880,6 +3880,42 @@ (define-public rust-idna-0.1 "IDNA (Internationalizing Domain Names in Applications) and Punycode.") (license (list license:expat license:asl2.0)))) +(define-public rust-ignore-0.4 + (package + (name "rust-ignore") + (version "0.4.7") + (source + (origin + (method url-fetch) + (uri (crate-uri "ignore" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "00mhksl41dnlsjqmka8c5a0m4spwm70ilm1qd9rngwq552hpzicd")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-crossbeam-channel" ,rust-crossbeam-channel-0.3) + ("rust-globset" ,rust-globset-0.4) + ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-log" ,rust-log-0.4) + ("rust-memchr" ,rust-memchr-2.2) + ("rust-regex" ,rust-regex-1.1) + ("rust-same-file" ,rust-same-file-1.0) + ("rust-thread-local" ,rust-thread-local-0.3) + ("rust-walkdir" ,rust-walkdir-2.2) + ("rust-winapi-util" ,rust-winapi-util-0.1)) + #:cargo-development-inputs + (("rust-tempfile" ,rust-tempfile-3.0)))) + (home-page "https://github.com/BurntSushi/ripgrep/tree/master/ignore") + (synopsis "Efficiently match ignore files such as .gitignore") + (description + "This package provides a fast library for efficiently matching +ignore files such as .gitignore against file paths.") + (license (list license:unlicense license:expat)))) + (define-public rust-indexmap-1.0 (package (name "rust-indexmap") -- cgit v1.2.3 From 85116b90b697a09df4a96132554a0b431c15c538 Mon Sep 17 00:00:00 2001 From: John Soo Date: Mon, 16 Dec 2019 10:28:16 -0800 Subject: gnu: Add rust-wasm-bindgen-macro-0.2. * gnu/packages/crates-io.scm (rust-wasm-bindgen-macro-0.2): 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 c6c8e901f5..e084688678 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10139,6 +10139,36 @@ (define-public rust-wasm-bindgen-futures-0.3 "Bridging the gap between Rust Futures and JavaScript Promises.") (license (list license:expat license:asl2.0)))) +(define-public rust-wasm-bindgen-macro-0.2 + (package + (name "rust-wasm-bindgen-macro") + (version "0.2.48") + (source + (origin + (method url-fetch) + (uri (crate-uri "wasm-bindgen-macro" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "07fqzzlbncccmnxbbkg9v4n53qc1lps5g0bb9wq3i9zp9gvm0zgh")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-quote" ,rust-quote-1.0) + ("rust-wasm-bindgen-macro-support" + ,rust-wasm-bindgen-macro-support-0.2)) + #:cargo-development-inputs + (("rust-trybuild" ,rust-trybuild-1.0) + ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)))) + (home-page "https://rustwasm.github.io/wasm-bindgen/") + (synopsis "Definition of the @code{#[wasm_bindgen]} attribute") + (description + "Definition of the @code{#[wasm_bindgen]} attribute, an internal +dependency.") + (license (list license:expat license:asl2.0)))) + (define-public rust-wasm-bindgen-macro-support-0.2 (package (name "rust-wasm-bindgen-macro-support") -- cgit v1.2.3 From 18fa12291bcc00e9f2de80a2ab93c66298633d0e Mon Sep 17 00:00:00 2001 From: John Soo Date: Wed, 18 Dec 2019 09:53:57 -0800 Subject: gnu: rust-openssl-sys-0.9: Update to 0.9.53. * gnu/packages/crates-io.scm (rust-openssl-sys-0.9): Update to 0.9.53. 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 e084688678..8af5dd7ea3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5540,14 +5540,14 @@ (define-public rust-openssl-src-111 (define-public rust-openssl-sys-0.9 (package (name "rust-openssl-sys") - (version "0.9.50") + (version "0.9.53") (source (origin (method url-fetch) (uri (crate-uri "openssl-sys" version)) (file-name (string-append name "-" version ".crate")) (sha256 - (base32 "1dn3capgiz77s6rpmc2sf8gadwkmhwgfd6mw4rcnnm9jp36dqhic")))) + (base32 "0vvk8vzrc73y8n5rf4yj3x8ygyxjaz7wxrbxiwqi7qy0gyp1cpa6")))) (build-system cargo-build-system) ;(arguments ; `(#:phases -- cgit v1.2.3 From 0f192fe602d73c18d9212d2b01cae2dcbeeb1f42 Mon Sep 17 00:00:00 2001 From: John Soo Date: Thu, 19 Dec 2019 09:26:50 -0800 Subject: gnu: Add rust-generic-array-0.12. * gnu/packages/crates-io.scm (rust-generic-array-0.12): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 8af5dd7ea3..b0506ecf1b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3216,6 +3216,21 @@ (define-public rust-generic-array-0.13 "Generic types implementing functionality of arrays.") (license license:expat))) +(define-public rust-generic-array-0.12 + (package + (inherit rust-generic-array-0.13) + (name "rust-generic-array") + (version "0.12.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "generic-array" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1v5jg7djicq34nbiv1dwaki71gkny002wyy9qfn3y0hfmrs053y6")))))) + (define-public rust-getopts-0.2 (package (name "rust-getopts") -- cgit v1.2.3 From 1f53105e8c919117c008778b118668dd2757c4ca Mon Sep 17 00:00:00 2001 From: John Soo Date: Thu, 19 Dec 2019 09:28:43 -0800 Subject: gnu: Add rust-ucd-parse-0.1. * gnu/packages/crates-io.scm (rust-ucd-parse-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b0506ecf1b..8655550384 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9521,6 +9521,32 @@ (define-public rust-typenum-1.10 (license (list license:asl2.0 license:expat)))) +(define-public rust-ucd-parse-0.1 + (package + (name "rust-ucd-parse") + (version "0.1.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "ucd-parse" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "13mq6c85r6ak10gjlq74mzdhsi0g0vps2y73by420513gfnipm97")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-regex" ,rust-regex-1.1)))) + (home-page "https://github.com/BurntSushi/ucd-generate") + (synopsis "Parse data files in the Unicode character database") + (description + "This package provides a library for parsing data files in the +Unicode character database.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-ucd-trie-0.1 (package (name "rust-ucd-trie") -- cgit v1.2.3 From b4971bb6a753f1b606e4c0485fec8641df3b3679 Mon Sep 17 00:00:00 2001 From: John Soo Date: Thu, 19 Dec 2019 09:31:35 -0800 Subject: gnu: Add rust-unicode-segmentation-1.3. * gnu/packages/crates-io.scm (rust-unicode-segmentation-1.3): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 8655550384..56ac838a60 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9687,6 +9687,31 @@ (define-public rust-unicode-normalization-0.1 described in Unicode Standard Annex #15.") (license (list license:expat license:asl2.0)))) +(define-public rust-unicode-segmentation-1.3 + (package + (name "rust-unicode-segmentation") + (version "1.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "unicode-segmentation" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1a9jqg7rb1yq6w2xc9jgxcs111yk5vxm9afjfvykfnrmzk6z8rqr")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-development-inputs + (("rust-quickcheck" ,rust-quickcheck-0.8)))) + (home-page "https://github.com/unicode-rs/unicode-segmentation") + (synopsis "Grapheme Cluster, Word and Sentence boundaries") + (description + "This crate provides Grapheme Cluster, Word and Sentence +boundaries according to Unicode Standard Annex #29 rules.") + (license (list license:expat license:asl2.0)))) + (define-public rust-unicode-width-0.1 (package (name "rust-unicode-width") -- cgit v1.2.3 From 7d041f88adb75a6f00e45ee26427cf80372929bb Mon Sep 17 00:00:00 2001 From: John Soo Date: Thu, 19 Dec 2019 09:34:16 -0800 Subject: gnu: Add rust-rand-os-0.2. * gnu/packages/crates-io.scm (rust-rand-os-0.2): New variable. (rust-rand-os-0.1): Inherit from rust-rand-os-0.2. 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 56ac838a60..cd9b6a31d6 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6625,8 +6625,34 @@ (define-public rust-rand-jitter-0.1 (license (list license:asl2.0 license:expat)))) +(define-public rust-rand-os-0.2 + (package + (name "rust-rand-os") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rand_os" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "06is69f8rfzs620g5b54k6cgy5yaycrsyqg55flyfrsf8g88733f")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-getrandom" ,rust-getrandom-0.1) + ("rust-rand-core" ,rust-rand-core-0.5)))) + (home-page "https://crates.io/crates/rand-os") + (synopsis "OS backed Random Number Generator") + (description "OS backed Random Number Generator") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-rand-os-0.1 (package + (inherit rust-rand-os-0.2) (name "rust-rand-os") (version "0.1.3") (source @@ -6637,13 +6663,8 @@ (define-public rust-rand-os-0.1 (sha256 (base32 "0wahppm0s64gkr2vmhcgwc0lij37in1lgfxg5rbgqlz0l5vgcxbv")))) - (build-system cargo-build-system) - (home-page "https://crates.io/crates/rand_os") - (synopsis "OS backed Random Number Generator") - (description "OS backed Random Number Generator") - (properties '((hidden? . #t))) - (license (list license:asl2.0 - license:expat)))) + (arguments `()) + (properties '((hidden? . #t))))) (define-public rust-rand-pcg-0.1 (package -- cgit v1.2.3 From 67ea3fb1c31d0dad611ecfe2d2820e253a9fbaaf Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 1 Jan 2020 20:08:59 +0200 Subject: gnu: rust-rand-os-0.1: Skip build. * gnu/packages/crates-io.scm (rust-rand-os-0.1)[arguments]: Skip build. Add ruxt-cloud-abi-0.0, rust-fuchsia-cprng-0.1, rust-libc-0.2, rust-log-0.4, rust-rand-core-0.4, rust-rdrand-0.4, rust-stdweb-0.4, rust-wasm-bindgen-0.2, rust-winapi-0.3 to cargo-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index cd9b6a31d6..808deb3d7a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6663,8 +6663,18 @@ (define-public rust-rand-os-0.1 (sha256 (base32 "0wahppm0s64gkr2vmhcgwc0lij37in1lgfxg5rbgqlz0l5vgcxbv")))) - (arguments `()) - (properties '((hidden? . #t))))) + (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.4) + ("rust-rdrand" ,rust-rdrand-0.4) + ("rust-stdweb" ,rust-stdweb-0.4) + ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2) + ("rust-winapi" ,rust-winapi-0.3)))))) (define-public rust-rand-pcg-0.1 (package -- cgit v1.2.3 From bf500b6efd9ac7db4a7e12ee5fd42d003272881d Mon Sep 17 00:00:00 2001 From: John Soo Date: Thu, 19 Dec 2019 09:46:22 -0800 Subject: gnu: Add rust-phf-shared-0.7. * gnu/packages/crates-io.scm (rust-phf-shared-0.7): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 808deb3d7a..839c4fde6b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6046,6 +6046,31 @@ (define-public rust-petgraph-0.4 algorithms.") (license (list license:expat license:asl2.0)))) +(define-public rust-phf-shared-0.7 + (package + (name "rust-phf-shared") + (version "0.7.24") + (source + (origin + (method url-fetch) + (uri (crate-uri "phf-shared" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "18371fla0vsj7d6d5rlfb747xbr2in11ar9vgv5qna72bnhp2kr3")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-siphasher" ,rust-siphasher-0.2) + ("rust-unicase" ,rust-unicase-2.4)))) + (home-page "https://github.com/sfackler/rust-phf") + (synopsis "Support code shared by PHF libraries") + (description + "Support code shared by PHF libraries.") + (license license:expat))) + (define-public rust-pico-sys-0.0 (package (name "rust-pico-sys") -- cgit v1.2.3 From 88866abaf88a689b2a413ff52ad7f8ea0416a5ce Mon Sep 17 00:00:00 2001 From: John Soo Date: Thu, 19 Dec 2019 09:51:43 -0800 Subject: gnu: Add rust-phf-generator-0.7. * gnu/packages/crates-io.scm (rust-phf-generator-0.7): 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 839c4fde6b..023b8478e4 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6046,6 +6046,30 @@ (define-public rust-petgraph-0.4 algorithms.") (license (list license:expat license:asl2.0)))) +(define-public rust-phf-generator-0.7 + (package + (name "rust-phf-generator") + (version "0.7.24") + (source + (origin + (method url-fetch) + (uri (crate-uri "phf_generator" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0qi62gxk3x3whrmw5c4i71406icqk11qmpgln438p6qm7k4lqdh9")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-phf-shared" ,rust-phf-shared-0.7) + ("rust-rand" ,rust-rand-0.4)))) + (home-page "https://github.com/sfackler/rust-phf") + (synopsis "PHF generation logic") + (description "PHF generation logic") + (license license:expat))) + (define-public rust-phf-shared-0.7 (package (name "rust-phf-shared") -- cgit v1.2.3 From ff9ca851229b5eed585ccb53c6c7a9c67c178419 Mon Sep 17 00:00:00 2001 From: John Soo Date: Thu, 19 Dec 2019 09:48:39 -0800 Subject: gnu: Add rust-siphasher-0.2. * gnu/packages/crates-io.scm (rust-siphasher-0.2): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 023b8478e4..e1a1f1c11d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7970,6 +7970,27 @@ (define-public rust-shlex-0.1 (license (list license:asl2.0 license:expat)))) +(define-public rust-siphasher-0.2 + (package + (name "rust-siphasher") + (version "0.2.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "siphasher" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1b53m53l24lyhr505lwqzrpjyq5qfnic71mynrcfvm43rybf938b")))) + (build-system cargo-build-system) + (arguments `(#:skip-build? #t)) + (home-page "https://docs.rs/siphasher") + (synopsis "SipHash functions from rust-core < 1.13") + (description + "SipHash functions from rust-core < 1.13.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-slab-0.4 (package (name "rust-slab") -- cgit v1.2.3 From e9f0f7bca366f378cb917e6ab1454ea552b444f5 Mon Sep 17 00:00:00 2001 From: John Soo Date: Thu, 19 Dec 2019 09:55:19 -0800 Subject: gnu: Add rust-parking-lot-0.9. * gnu/packages/crates-io.scm (rust-parking-lot-0.9): New variable. (rust-parking-lot-0.8): Inherit from rust-parking-lot-0.9. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e1a1f1c11d..18b6f8139f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5634,10 +5634,10 @@ (define-public rust-packed-simd-0.3 (description "Portable Packed SIMD vectors.") (license (list license:asl2.0 license:expat)))) -(define-public rust-parking-lot-0.8 +(define-public rust-parking-lot-0.9 (package (name "rust-parking-lot") - (version "0.8.0") + (version "0.9.0") (source (origin (method url-fetch) @@ -5646,13 +5646,13 @@ (define-public rust-parking-lot-0.8 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1rrcdalr8l5zx3bw28l376321l6dnd6rqnsqsl0ygk01fy0nfxzs")))) + "0lk2vq3hp88ygpgsrypdr3ss71fidnqbykva0csgxhmn5scb2hpq")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-lock-api" ,rust-lock-api-0.2) - ("rust-parking-lot-core" ,rust-parking-lot-core-0.5)) + (("rust-lock-api" ,rust-lock-api-0.3) + ("rust-parking-lot-core" ,rust-parking-lot-core-0.6)) #:cargo-development-inputs (("rust-bincode" ,rust-bincode-1.1) ("rust-lazy-static" ,rust-lazy-static-1.3) @@ -5665,6 +5665,31 @@ (define-public rust-parking-lot-0.8 synchronization primitives.") (license (list license:asl2.0 license:expat)))) +(define-public rust-parking-lot-0.8 + (package + (inherit rust-parking-lot-0.9) + (name "rust-parking-lot") + (version "0.8.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "parking_lot" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1rrcdalr8l5zx3bw28l376321l6dnd6rqnsqsl0ygk01fy0nfxzs")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-lock-api" ,rust-lock-api-0.2) + ("rust-parking-lot-core" ,rust-parking-lot-core-0.5)) + #:cargo-development-inputs + (("rust-bincode" ,rust-bincode-1.1) + ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-rand" ,rust-rand-0.4) + ("rust-rustc-version" ,rust-rustc-version-0.2)))))) + (define-public rust-parking-lot-core-0.5 (package (name "rust-parking-lot-core") -- cgit v1.2.3 From 1e09c20bfd02de628295a6baeb43403ec48da2cc Mon Sep 17 00:00:00 2001 From: John Soo Date: Thu, 19 Dec 2019 09:57:16 -0800 Subject: gnu: Add rust-once-cell-1.2. * gnu/packages/crates-io.scm (rust-once-cell-1.2): 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 18b6f8139f..8c074d0276 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5457,6 +5457,34 @@ (define-public rust-odds-0.3 Things in odds may move to more appropriate crates if we find them.") (license (list license:asl2.0 license:expat)))) +(define-public rust-once-cell-1.2 + (package + (name "rust-once-cell") + (version "1.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "once-cell" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1vdz8xlg3r05w3wfjimnc347hgm54i5nrqf72r4mlp0fcdplh7w9")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-parking-lot" ,rust-parking-lot-0.9)) + #:cargo-development-inputs + (("rust-crossbeam-utils" ,rust-crossbeam-utils-0.6) + ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-regex" ,rust-regex-1.1)))) + (home-page "https://github.com/matklad/once_cell") + (synopsis "Single assignment cells and lazy values") + (description + "Single assignment cells and lazy values.") + (license (list license:expat license:asl2.0)))) + (define-public rust-opaque-debug-0.2 (package (name "rust-opaque-debug") -- cgit v1.2.3 From 56fd36343d7c0c6dc89c0f309e781e141c7abe6d Mon Sep 17 00:00:00 2001 From: John Soo Date: Thu, 19 Dec 2019 10:04:21 -0800 Subject: gnu: Add rust-errno-dragonfly-0.1. * gnu/packages/crates-io.scm (rust-errno-dragonfly-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 8c074d0276..2fea68b6d3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2458,6 +2458,31 @@ (define-public rust-erased-serde-0.3 "Type-erased Serialize and Serializer traits.") (license (list license:asl2.0 license:expat)))) +(define-public rust-errno-dragonfly-0.1 + (package + (name "rust-errno-dragonfly") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "errno-dragonfly" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0rshlc00nv45f14v2l1w0ma2nf1jg5j7q9pvw7hh018r6r73bjhl")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-gcc" ,rust-gcc-0.3)))) + (home-page "https://github.com/mneumann/errno-dragonfly-rs") + (synopsis "Exposes errno functionality to stable Rust on DragonFlyBSD") + (description + "Exposes errno functionality to stable Rust on DragonFlyBSD.") + (license license:expat))) + (define-public rust-fake-simd-0.1 (package (name "rust-fake-simd") -- cgit v1.2.3 From 09486a9f7b14a3b0064914fa60d4efd14df1260c Mon Sep 17 00:00:00 2001 From: John Soo Date: Thu, 19 Dec 2019 09:42:59 -0800 Subject: gnu: Add rust-mac-0.1. * gnu/packages/crates-io.scm (rust-mac-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2fea68b6d3..c3f788a9ae 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4665,6 +4665,27 @@ (define-public rust-lzma-sys-0.1 (license (list license:asl2.0 license:expat)))) +(define-public rust-mac-0.1 + (package + (name "rust-mac") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "mac" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "194vc7vrshqff72rl56f9xgb0cazyl4jda7qsv31m5l6xx7hq7n4")))) + (build-system cargo-build-system) + (arguments `(#:skip-build? #t)) + (home-page "https://github.com/reem/rust-mac") + (synopsis "Collection of great and ubiqutitous macros") + (description + "This package provides a collection of great and ubiqutitous macros.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-maplit-1.0 (package (name "rust-maplit") -- cgit v1.2.3 From 205bb721aad1745b086382080e91078d4e6b8a63 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 15 Dec 2019 07:53:34 -0800 Subject: gnu: Add rust-encoding-0.2. * gnu/packages/crates-io.scm (rust-encoding-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 c3f788a9ae..fb7bea0f24 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2177,6 +2177,42 @@ (define-public rust-encode-unicode-0.3 char, u8 and u16.") (license (list license:expat license:asl2.0)))) +(define-public rust-encoding-0.2 + (package + (name "rust-encoding") + (version "0.2.33") + (source + (origin + (method url-fetch) + (uri (crate-uri "encoding" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1v1ndmkarh9z3n5hk53da4z56hgk9wa5kcsm7cnx345raqw983bb")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-encoding-index-japanese" + ,rust-encoding-index-japanese-1.20141219) + ("rust-encoding-index-korean" + ,rust-encoding-index-korean-1.20141219) + ("rust-encoding-index-simpchinese" + ,rust-encoding-index-simpchinese-1.20141219) + ("rust-encoding-index-singlebyte" + ,rust-encoding-index-singlebyte-1.20141219) + ("rust-encoding-index-tradchinese" + ,rust-encoding-index-tradchinese-1.20141219)) + #:cargo-development-inputs + (("rust-getopts" ,rust-getopts-0.2)))) + (home-page + "https://github.com/lifthrasiir/rust-encoding") + (synopsis "Character encoding support for Rust") + (description + "Character encoding support for Rust.") + (license license:expat))) + (define-public rust-encoding-index-japanese-1.20141219 (package (name "rust-encoding-index-japanese") -- cgit v1.2.3 From 386f3e46ad8a5e4fc5fea27d3d2579ed40dc512b Mon Sep 17 00:00:00 2001 From: John Soo Date: Thu, 19 Dec 2019 10:06:04 -0800 Subject: gnu: Add rust-errno-0.2. * gnu/packages/crates-io.scm (rust-errno-0.2): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index fb7bea0f24..d13005afba 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2494,6 +2494,32 @@ (define-public rust-erased-serde-0.3 "Type-erased Serialize and Serializer traits.") (license (list license:asl2.0 license:expat)))) +(define-public rust-errno-0.2 + (package + (name "rust-errno") + (version "0.2.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "errno" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0kn8mlygxxr02cm97401nppd2dbkwsalpcbai67rh6yh3rh73862")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-errno-dragonfly" ,rust-errno-dragonfly-0.1) + ("rust-libc" ,rust-libc-0.2) + ("rust-winapi" ,rust-winapi-0.3)))) + (home-page "https://github.com/lambda-fairy/rust-errno") + (synopsis "Cross-platform interface to the @code{errno} variable") + (description + "Cross-platform interface to the @code{errno} variable.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-errno-dragonfly-0.1 (package (name "rust-errno-dragonfly") -- cgit v1.2.3 From 2997d267baa70062c92236f593d98d2b718ffc37 Mon Sep 17 00:00:00 2001 From: John Soo Date: Thu, 19 Dec 2019 10:07:37 -0800 Subject: gnu: Add rust-error-chain-0.12. * gnu/packages/crates-io.scm (rust-error-chain-0.12): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d13005afba..513745f77f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2545,6 +2545,32 @@ (define-public rust-errno-dragonfly-0.1 "Exposes errno functionality to stable Rust on DragonFlyBSD.") (license license:expat))) +(define-public rust-error-chain-0.12 + (package + (name "rust-error-chain") + (version "0.12.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "error-chain" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1ndpw1ny2kxqpw6k1shq8k56z4vfpk4xz9zr8ay988k0rffrxd1s")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-backtrace" ,rust-backtrace-0.3)) + #:cargo-development-inputs + (("rust-version-check" ,rust-version-check-0.9)))) + (home-page "https://github.com/rust-lang-nursery/error-chain") + (synopsis "Yet another error boilerplate library") + (description + "Yet another error boilerplate library.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-fake-simd-0.1 (package (name "rust-fake-simd") -- cgit v1.2.3 From 372719b517820bcd797c9f6a6f3d88e1b48f3b49 Mon Sep 17 00:00:00 2001 From: John Soo Date: Thu, 19 Dec 2019 10:12:12 -0800 Subject: gnu: Add rust-caps-0.3. * gnu/packages/crates-io.scm (rust-caps-0.3): 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 513745f77f..d8846123a7 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -906,6 +906,33 @@ (define-public rust-c2-chacha-0.2 "The ChaCha family of stream ciphers.") (license (list license:asl2.0 license:expat)))) +(define-public rust-caps-0.3 + (package + (name "rust-caps") + (version "0.3.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "caps" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1vplgzx8nifzr3f0l8ca77jqnz3fdymdg0ickacgdvawc44a3n90")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-errno" ,rust-errno-0.2) + ("rust-error-chain" ,rust-error-chain-0.12) + ("rust-libc" ,rust-libc-0.2)))) + (home-page "https://github.com/lucab/caps-rs") + (synopsis "Pure-Rust library to work with Linux capabilities") + (description + "This package provides a pure-Rust library to work with Linux +capabilities") + (license (list license:expat license:asl2.0)))) + (define-public rust-cargon-0.0 (package (name "rust-cargon") -- cgit v1.2.3 From 0cc23d8fa3808908e9ef8d618b0342170310fb5e Mon Sep 17 00:00:00 2001 From: John Soo Date: Thu, 19 Dec 2019 10:15:05 -0800 Subject: gnu: Add rust-sysctl-0.4. * gnu/packages/crates-io.scm (rust-sysctl-0.4): 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 d8846123a7..0181086674 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8813,6 +8813,34 @@ (define-public rust-synstructure-test-traits-0.1 (properties '((hidden? . #t))) (license license:expat))) +(define-public rust-sysctl-0.4 + (package + (name "rust-sysctl") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "sysctl" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0p6bfjsw3v12nb2qsgm6r9klwb5qyh4w55zzmccv8r5aqb8g0085")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-byteorder" ,rust-byteorder-1.3) + ("rust-failure" ,rust-failure-0.1) + ("rust-libc" ,rust-libc-0.2) + ("rust-walkdir" ,rust-walkdir-2.2)))) + (home-page "https://github.com/johalun/sysctl-rs") + (synopsis "Simplified interface to libc::sysctl") + (description + "Simplified interface to libc::sysctl.") + (license license:expat))) + (define-public rust-tar-0.4 (package (name "rust-tar") -- cgit v1.2.3 From 0ecc0f2136ce03d89b5a1ee1004dfbb477b0f5d2 Mon Sep 17 00:00:00 2001 From: John Soo Date: Thu, 19 Dec 2019 10:16:46 -0800 Subject: gnu: Add rust-nix-0.15. * gnu/packages/crates-io.scm (rust-nic-0.15): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0181086674..e8e06ef590 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5324,6 +5324,41 @@ (define-public rust-linked-hash-map-0.5 (license (list license:asl2.0 license:expat)))) +(define-public rust-nix-0.15 + (package + (name "rust-nix") + (version "0.15.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "nix" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0aa2l7wg9pzx24ks4p97gdy09a4hhs1sr9drxnm75v906d7hnbiv")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-cfg-if" ,rust-cfg-if-0.1) + ("rust-libc" ,rust-libc-0.2) + ("rust-void" ,rust-void-1.0)) + #:cargo-development-inputs + (("rust-bytes" ,rust-bytes-0.4) + ("rust-caps" ,rust-caps-0.3) + ("rust-cc" ,rust-cc-1.0) + ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-rand" ,rust-rand-0.4) + ("rust-sysctl" ,rust-sysctl-0.4) + ("rust-tempfile" ,rust-tempfile-3.0)))) + (home-page "https://github.com/nix-rust/nix") + (synopsis "Rust friendly bindings to *nix APIs") + (description + "Rust friendly bindings to *nix APIs.") + (license license:expat))) + (define-public rust-nodrop-0.1 (package (name "rust-nodrop") -- cgit v1.2.3 From ac3977b379607f08e9e2aa93e701c319eb4b8fa8 Mon Sep 17 00:00:00 2001 From: John Soo Date: Thu, 19 Dec 2019 10:19:26 -0800 Subject: gnu: Add rust-os-pipe-0.8. * gnu/packages/crates-io.scm (rust-os-pipe-0.8): 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 e8e06ef590..d7e00959e2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5806,6 +5806,33 @@ (define-public rust-openssl-sys-0.9 (properties '((hidden? . #t))) (license license:expat))) +(define-public rust-os-pipe-0.8 + (package + (name "rust-os-pipe") + (version "0.8.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "os-pipe" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "049ax8shxik7mm68r2nf7xnrcq3z3p7hz54sbrcxwywxqsjdzs41")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-nix" ,rust-nix-0.15) + ("rust-winapi" ,rust-winapi-0.3)))) + (home-page + "https://github.com/oconnor663/os_pipe.rs") + (synopsis + "Cross-platform library for opening OS pipes") + (description + "A cross-platform library for opening OS pipes.") + (license license:expat))) + (define-public rust-owning-ref-0.4 (package (name "rust-owning-ref") -- cgit v1.2.3 From 7451f6ff8d93600b867a4c93aab5807321c4445f Mon Sep 17 00:00:00 2001 From: John Soo Date: Thu, 19 Dec 2019 10:20:38 -0800 Subject: gnu: Add rust-shared-child-0.3. * gnu/packages/crates-io.scm (rust-shared-child-0.3): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d7e00959e2..422dee6cdb 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8225,6 +8225,31 @@ (define-public rust-sha1-asm-0.4 "Assembly implementation of SHA-1 compression function.") (license license:expat))) +(define-public rust-shared-child-0.3 + (package + (name "rust-shared-child") + (version "0.3.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "shared-child" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1lmjmr7931dr9cpalw2n7ss4i9mnl7285j2dygxflk9y80xczswc")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-winapi" ,rust-winapi-0.3)))) + (home-page "https://github.com/oconnor663/shared_child.rs") + (synopsis "Use child processes from multiple threads") + (description + "A library for using child processes from multiple threads.") + (license license:expat))) + (define-public rust-shlex-0.1 (package (name "rust-shlex") -- cgit v1.2.3 From 0b85a418a77ef1f2098d2fcd4eb3e36652da17b7 Mon Sep 17 00:00:00 2001 From: John Soo Date: Thu, 19 Dec 2019 10:22:32 -0800 Subject: gnu: Add rust-duct-0.13. * gnu/packages/crates-io.scm (rust-duct-0.13): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 422dee6cdb..6f4bac13ee 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2150,6 +2150,37 @@ (define-public rust-dtoa-0.2 (base32 "0g96cap6si1g6wi62hsdk2fnj3sf5vd4i97zj6163j8hhnsl3n0d")))))) +(define-public rust-duct-0.13 + (package + (name "rust-duct") + (version "0.13.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "duct" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1ir3884i1yznkfdccqqbcb9v5sdpcgxlv41hgzncrqaljv18r0wj")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-once-cell" ,rust-once-cell-1.2) + ("rust-os-pipe" ,rust-os-pipe-0.8) + ("rust-shared-child" ,rust-shared-child-0.3)) + #:cargo-development-inputs + (("rust-tempdir" ,rust-tempdir-0.3)))) + (home-page + "https://github.com/oconnor663/duct.rs") + (synopsis + "Library for running child processes") + (description + "A library for running child processes.") + (license license:expat))) + (define-public rust-either-1.5 (package (name "rust-either") -- cgit v1.2.3 From 61a3fc72cdf6e2774f4b2ebbe9ea8aaf0602915d Mon Sep 17 00:00:00 2001 From: John Soo Date: Thu, 19 Dec 2019 10:24:03 -0800 Subject: gnu: Add rust-rustfix-0.4. * gnu/packages/crates-io.scm (rust-rustfix-0.4): 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 6f4bac13ee..7002e957b8 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2773,6 +2773,40 @@ (define-public rust-findshlibs-0.5 (license (list license:asl2.0 license:expat)))) +(define-public rust-rustfix-0.4 + (package + (name "rust-rustfix") + (version "0.4.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "rustfix" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "01zn0ysnass3mmrhxk90584y713vjfq1x97mi4saac99g9vsql3i")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-failure" ,rust-failure-0.1) + ("rust-log" ,rust-log-0.4) + ("rust-serde" ,rust-serde-1.0) + ("rust-serde-json" ,rust-serde-json-1.0)) + #:cargo-development-inputs + (("rust-difference" ,rust-difference-2.0) + ("rust-duct" ,rust-duct-0.13) + ("rust-env-logger" ,rust-env-logger-0.6) + ("rust-log" ,rust-log-0.4) + ("rust-proptest" ,rust-proptest-0.9) + ("rust-tempdir" ,rust-tempdir-0.3)))) + (home-page "https://github.com/rust-lang/rustfix") + (synopsis "Automatically apply the suggestions made by rustc") + (description + "Automatically apply the suggestions made by rustc.") + (license (list license:expat license:asl2.0)))) + (define-public rust-fixedbitset-0.1 (package (name "rust-fixedbitset") -- cgit v1.2.3 From c347c42e02e7b5e3ef2dbd2431819f698477da9d Mon Sep 17 00:00:00 2001 From: John Soo Date: Thu, 19 Dec 2019 10:26:34 -0800 Subject: gnu: Add rust-tester-0.5. * gnu/packages/crates-io.scm (rust-tester-0.5): 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 7002e957b8..d21eb6ea1a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9189,6 +9189,35 @@ (define-public rust-test-assembler-0.1 streams.") (license license:expat))) +(define-public rust-tester-0.5 + (package + (name "rust-tester") + (version "0.5.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "tester" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1xkgapz2i4j977f6kh1zp6sa5llbhy5vbnr6kfj8czsrdjr2r0ay")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-getopts" ,rust-getopts-0.2) + ("rust-libc" ,rust-libc-0.2) + ("rust-term" ,rust-term-0.4)))) + (home-page + "https://github.com/messense/rustc-test") + (synopsis + "Fork of Rust's test crate") + (description + "This package provides a fork of Rust's test crate that doesn't require +unstable language features.") + (license (list license:expat license:asl2.0)))) + (define-public rust-textwrap-0.11 (package (name "rust-textwrap") -- cgit v1.2.3 From 33fc4e29b154744a4fd15cf006c25953d63acdaa Mon Sep 17 00:00:00 2001 From: John Soo Date: Thu, 19 Dec 2019 10:27:38 -0800 Subject: gnu: Add rust-compiletest-rs-0.3. * gnu/packages/crates-io.scm (rust-compiletest-rs-0.3): 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 d21eb6ea1a..1b8467c9e2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1312,6 +1312,44 @@ (define-public rust-compiler-builtins-0.1 (license (list license:asl2.0 license:expat)))) +(define-public rust-compiletest-rs-0.3 + (package + (name "rust-compiletest-rs") + (version "0.3.22") + (source + (origin + (method url-fetch) + (uri (crate-uri "compiletest-rs" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1di7kl2zv7jcwqq343aafqhn31gfa600zh4mi6cp10mn6a9wq3pl")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-diff" ,rust-diff-0.1) + ("rust-filetime" ,rust-filetime-0.2) + ("rust-getopts" ,rust-getopts-0.2) + ("rust-libc" ,rust-libc-0.2) + ("rust-log" ,rust-log-0.4) + ("rust-miow" ,rust-miow-0.3) + ("rust-regex" ,rust-regex-1.1) + ("rust-rustfix" ,rust-rustfix-0.4) + ("rust-serde" ,rust-serde-1.0) + ("rust-serde-derive" ,rust-serde-derive-1.0) + ("rust-serde-json" ,rust-serde-json-1.0) + ("rust-tempfile" ,rust-tempfile-3.0) + ("rust-tester" ,rust-tester-0.5) + ("rust-winapi" ,rust-winapi-0.3)))) + (home-page "https://github.com/laumann/compiletest-rs") + (synopsis "Compiletest utility from the Rust compiler") + (description + "The compiletest utility from the Rust compiler as a standalone testing +harness.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-console-0.7 (package (name "rust-console") -- cgit v1.2.3 From 983903efb0924a6a2ab0c9b38ae178eebcc72c27 Mon Sep 17 00:00:00 2001 From: John Soo Date: Thu, 19 Dec 2019 10:31:23 -0800 Subject: gnu: Add rust-phf-0.7. * gnu/packages/crates-io.scm (rust-phf-0.7): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1b8467c9e2..1838957bc9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6425,6 +6425,31 @@ (define-public rust-petgraph-0.4 algorithms.") (license (list license:expat license:asl2.0)))) +(define-public rust-phf-0.7 + (package + (name "rust-phf") + (version "0.7.24") + (source + (origin + (method url-fetch) + (uri (crate-uri "phf" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "066xwv4dr6056a9adlkarwp4n94kbpwngbmd47ngm3cfbyw49nmk")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-phf-macros" ,rust-phf-macros-0.7) + ("rust-phf-shared" ,rust-phf-shared-0.7)))) + (home-page "https://github.com/sfackler/rust-phf") + (synopsis "Runtime support for perfect hash function data structures") + (description + "Runtime support for perfect hash function data structures.") + (license license:expat))) + (define-public rust-phf-generator-0.7 (package (name "rust-phf-generator") -- cgit v1.2.3 From b74dd0237cd641b6dd1823e9c8992a60d021f2c9 Mon Sep 17 00:00:00 2001 From: John Soo Date: Thu, 19 Dec 2019 10:30:23 -0800 Subject: gnu: Add rust-phf-macros-0.7. * gnu/packages/crates-io.scm (rust-phf-macros-0.7): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1838957bc9..3614a9f449 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6474,6 +6474,38 @@ (define-public rust-phf-generator-0.7 (description "PHF generation logic") (license license:expat))) +(define-public rust-phf-macros-0.7 + (package + (name "rust-phf-macros") + (version "0.7.24") + (source + (origin + (method url-fetch) + (uri (crate-uri "phf_macros" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0dzylcy14ksy60h265l433j9ra8xhg8xlq3pd5qk658m6f1mxd5x")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-phf-generator" ,rust-phf-generator-0.7) + ("rust-phf-shared" ,rust-phf-shared-0.7) + ("rust-proc-macro2" ,rust-proc-macro2-0.4) + ("rust-quote" ,rust-quote-1.0) + ("rust-syn" ,rust-syn-0.15)) + #:cargo-development-inputs + (("rust-compiletest-rs" ,rust-compiletest-rs-0.3)))) + (home-page + "https://github.com/sfackler/rust-phf") + (synopsis + "Macros to generate types in the phf crate") + (description + "Macros to generate types in the phf crate.") + (license license:expat))) + (define-public rust-phf-shared-0.7 (package (name "rust-phf-shared") -- cgit v1.2.3 From 01c2b09136b971b48796c607261da745292d15cd Mon Sep 17 00:00:00 2001 From: John Soo Date: Thu, 19 Dec 2019 10:33:37 -0800 Subject: gnu: Add rust-new-debug-unreachable-1.0. * gnu/packages/crates-io.scm (rust-new-debug-unreachable-1.0): 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 3614a9f449..8d19cc6db2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5427,6 +5427,30 @@ (define-public rust-linked-hash-map-0.5 (license (list license:asl2.0 license:expat)))) +(define-public rust-new-debug-unreachable-1.0 + (package + (name "rust-new-debug-unreachable") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "new_debug_unreachable" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0c1br326qa0rrzxrn2rd5ah7xaprig2i9r4rwsx06vnvc1f003zl")))) + (build-system cargo-build-system) + (arguments `(#:skip-build? #t)) + (home-page + "https://github.com/mbrubeck/rust-debug-unreachable") + (synopsis + "Panic in debug, @code{intrinsics::unreachable()} in release") + (description + "Panic in debug, @code{intrinsics::unreachable() }in +release (fork of debug_unreachable)") + (license license:expat))) + (define-public rust-nix-0.15 (package (name "rust-nix") -- cgit v1.2.3 From 8dee127458349c069aa3270e06dc96dd96881e86 Mon Sep 17 00:00:00 2001 From: John Soo Date: Thu, 19 Dec 2019 10:37:38 -0800 Subject: gnu: Add rust-string-cache-shared-0.3. * gnu/packages/crates-io.scm (rust-string-cache-shared-0.3): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 8d19cc6db2..5230dbda69 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8952,6 +8952,27 @@ (define-public rust-streaming-stats-0.2 (license (list license:unlicense license:expat)))) +(define-public rust-string-cache-shared-0.3 + (package + (name "rust-string-cache-shared") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "string-cache-shared" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1z7dpdix1m42x6ddshdcpjf91ml9mhvnskmiv5kd8hcpq0dlv25i")))) + (build-system cargo-build-system) + (arguments `(#:skip-build? #t)) + (home-page "https://github.com/servo/string-cache") + (synopsis "Code share between string_cache and string_cache_codegen") + (description + "Code share between string_cache and string_cache_codegen.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-strsim-0.9 (package (name "rust-strsim") -- cgit v1.2.3 From f0a4158583014ab0e8c47db7094352786f476ebb Mon Sep 17 00:00:00 2001 From: John Soo Date: Thu, 19 Dec 2019 10:35:52 -0800 Subject: gnu: Add rust-precomputed-hash-0.1. * gnu/packages/crates-io.scm (rust-precomputed-hash-0.1): 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 5230dbda69..8dd8a78a75 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6701,6 +6701,30 @@ (define-public rust-ppv-lite86-0.2 (license (list license:asl2.0 license:expat)))) +(define-public rust-precomputed-hash-0.1 + (package + (name "rust-precomputed-hash") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "precomputed-hash" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "075k9bfy39jhs53cb2fpb9klfakx2glxnf28zdw08ws6lgpq6lwj")))) + (build-system cargo-build-system) + (arguments `(#:skip-build? #t)) + (home-page + "https://github.com/emilio/precomputed-hash") + (synopsis + "Base dependency to expose a precomputed hash") + (description + "This package provides a library intending to be a base +dependency to expose a precomputed hash.") + (license license:expat))) + ;; Cyclic dependencies with rust-demo-hack. (define-public rust-proc-macro-hack-0.5 (package -- cgit v1.2.3 From a51fe3f0bebe08178034e85eba9eb4460f22156c Mon Sep 17 00:00:00 2001 From: John Soo Date: Thu, 19 Dec 2019 10:42:57 -0800 Subject: gnu: Add rust-string-cache-0.7. * gnu/packages/crates-io.scm (rust-string-cache-0.7): 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 8dd8a78a75..ebdab44cdc 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8976,6 +8976,40 @@ (define-public rust-streaming-stats-0.2 (license (list license:unlicense license:expat)))) +(define-public rust-string-cache-0.7 + (package + (name "rust-string-cache") + (version "0.7.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "string_cache" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "08sly9s92l0g0ai1iyj9pawl05xbwm4m8kl3zqkv2wkijw4h3mr5")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-new-debug-unreachable" + ,rust-new-debug-unreachable-1.0) + ("rust-phf-shared" ,rust-phf-shared-0.7) + ("rust-precomputed-hash" ,rust-precomputed-hash-0.1) + ("rust-serde" ,rust-serde-1.0) + ("rust-string-cache-codegen" ,rust-string-cache-codegen-0.4) + ("rust-string-cache-shared" ,rust-string-cache-shared-0.3)) + #:cargo-development-inputs + (("rust-rand" ,rust-rand-0.4)))) + (home-page "https://github.com/servo/string-cache") + (synopsis "String interning library for Rust") + (description + "This package provides a string interning library for Rust, +developed as part of the Servo project.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-string-cache-shared-0.3 (package (name "rust-string-cache-shared") -- cgit v1.2.3 From 9edb05476bd424cd23da11fa91e04b4cc58bf098 Mon Sep 17 00:00:00 2001 From: John Soo Date: Thu, 19 Dec 2019 10:40:02 -0800 Subject: gnu: Add rust-string-cache-codegen-0.4. * gnu/packages/crates-io.scm (rust-string-cache-codegen-0.4): 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 ebdab44cdc..1fd4906899 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9010,6 +9010,36 @@ (define-public rust-string-cache-0.7 developed as part of the Servo project.") (license (list license:asl2.0 license:expat)))) +(define-public rust-string-cache-codegen-0.4 + (package + (name "rust-string-cache-codegen") + (version "0.4.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "string-cache-codegen" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1npl9zq9cd16d7irksblgk7l7g6qknnzsmr12hrhky2fcpp1xshy")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-phf-generator" ,rust-phf-generator-0.7) + ("rust-phf-shared" ,rust-phf-shared-0.7) + ("rust-proc-macro2" ,rust-proc-macro2-0.4) + ("rust-quote" ,rust-quote-1.0) + ("rust-string-cache-shared" + ,rust-string-cache-shared-0.3)))) + (home-page "https://github.com/servo/string-cache") + (synopsis "Codegen library for string-cache") + (description + "This package provides a codegen library for string-cache, +developed as part of the Servo project.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-string-cache-shared-0.3 (package (name "rust-string-cache-shared") -- cgit v1.2.3 From 89bafcf7f70072f6b8b44313aa1cfe37f0d24964 Mon Sep 17 00:00:00 2001 From: John Soo Date: Thu, 19 Dec 2019 10:45:24 -0800 Subject: gnu: Add rust-tendril-0.4. * gnu/packages/crates-io.scm (rust-tendril-0.4): 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 1fd4906899..baf7083b74 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9290,6 +9290,36 @@ (define-public rust-tempfile-3.0 (license (list license:asl2.0 license:expat)))) +(define-public rust-tendril-0.4 + (package + (name "rust-tendril") + (version "0.4.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "tendril" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0fsx7blrrzgca8aa2yqy8zxyi8s7amskhgkk1ml5sbaqyalyszvh")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-encoding" ,rust-encoding-0.2) + ("rust-encoding-rs" ,rust-encoding-rs-0.8) + ("rust-futf" ,rust-futf-0.1) + ("rust-mac" ,rust-mac-0.1) + ("rust-utf-8" ,rust-utf-8-0.7)) + #:cargo-development-inputs + (("rust-rand" ,rust-rand-0.4)))) + (home-page "https://github.com/servo/tendril") + (synopsis "Compact buffer/string type for zero-copy parsing") + (description + "Compact buffer/string type for zero-copy parsing.") + (license (list license:expat license:asl2.0)))) + (define-public rust-term-0.4 (package (name "rust-term") -- cgit v1.2.3 From 8d701b2cffe8b35e5f306fe8378b6df0a52b450d Mon Sep 17 00:00:00 2001 From: John Soo Date: Thu, 19 Dec 2019 10:49:30 -0800 Subject: gnu: Add rust-markup5ever-0.8. * gnu/packages/crates-io.scm (rust-markup5ever-0.8): 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 baf7083b74..c10149e390 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4925,6 +4925,40 @@ (define-public rust-maplit-1.0 (license (list license:asl2.0 license:expat)))) +(define-public rust-markup5ever-0.8 + (package + (name "rust-markup5ever") + (version "0.8.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "markup5ever" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "08ayl9aqjnmf7ly1ipy6dk3wjvyfn4w51l40jzh1fh984ykldbzi")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-log" ,rust-log-0.4) + ("rust-phf" ,rust-phf-0.7) + ("rust-string-cache" ,rust-string-cache-0.7) + ("rust-tendril" ,rust-tendril-0.4)) + #:cargo-development-inputs + (("rust-phf-codegen" ,rust-phf-codegen-0.7) + ("rust-serde" ,rust-serde-1.0) + ("rust-serde-derive" ,rust-serde-derive-1.0) + ("rust-serde-json" ,rust-serde-json-1.0) + ("rust-string-cache-codegen" + ,rust-string-cache-codegen-0.4)))) + (home-page "https://github.com/servo/html5ever") + (synopsis "Common code for xml5ever and html5ever") + (description + "Common code for xml5ever and html5ever.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-matches-0.1 (package (name "rust-matches") -- cgit v1.2.3 From 4c81e9b99bd40dc50604189b287aadc7664414ab Mon Sep 17 00:00:00 2001 From: John Soo Date: Thu, 19 Dec 2019 10:47:08 -0800 Subject: gnu: Add rust-phf-codegen-0.7. * gnu/packages/crates-io.scm (rust-phf-codegen-0.7): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c10149e390..e6ef1d42c4 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6508,6 +6508,31 @@ (define-public rust-phf-0.7 "Runtime support for perfect hash function data structures.") (license license:expat))) +(define-public rust-phf-codegen-0.7 + (package + (name "rust-phf-codegen") + (version "0.7.24") + (source + (origin + (method url-fetch) + (uri (crate-uri "phf-codegen" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0zjiblicfm0nrmr2xxrs6pnf6zz2394wgch6dcbd8jijkq98agmh")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-phf-generator" ,rust-phf-generator-0.7) + ("rust-phf-shared" ,rust-phf-shared-0.7)))) + (home-page + "https://github.com/sfackler/rust-phf") + (synopsis "Codegen library for PHF types") + (description "Codegen library for PHF types.") + (license license:expat))) + (define-public rust-phf-generator-0.7 (package (name "rust-phf-generator") -- cgit v1.2.3 From 234e1bad153ce988e4e7fdaae22f68b6f7c502ce Mon Sep 17 00:00:00 2001 From: John Soo Date: Thu, 19 Dec 2019 10:50:54 -0800 Subject: gnu: Add rust-html5ever-0.23. * gnu/packages/crates-io.scm (rust-html5ever-0.23): 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 e6ef1d42c4..7281e9ed0a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4000,6 +4000,40 @@ (define-public rust-hex-literal-impl-0.2 "Internal implementation of the hex-literal crate.") (license (list license:asl2.0 license:expat)))) +(define-public rust-html5ever-0.23 + (package + (name "rust-html5ever") + (version "0.23.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "html5ever" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1dx8k7synrmf3fl6gcfm5q1cybfglvhc9xnvly3s5xcc0b45mrjw")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-log" ,rust-log-0.4) + ("rust-mac" ,rust-mac-0.1) + ("rust-markup5ever" ,rust-markup5ever-0.8)) + #:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.2) + ("rust-proc-macro2" ,rust-proc-macro2-0.4) + ("rust-quote" ,rust-quote-1.0) + ("rust-rustc-serialize" ,rust-rustc-serialize-0.3) + ("rust-rustc-test" ,rust-rustc-test-0.3) + ("rust-syn" ,rust-syn-0.15) + ("rust-typed-arena" ,rust-typed-arena-1.4)))) + (home-page "https://github.com/servo/html5ever") + (synopsis "High-performance browser-grade HTML5 parser") + (description + "High-performance browser-grade HTML5 parser.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-http-0.1 (package (name "rust-http") -- cgit v1.2.3 From d66f264903b114ae7471edf117bc3701bc52d949 Mon Sep 17 00:00:00 2001 From: John Soo Date: Thu, 19 Dec 2019 10:52:56 -0800 Subject: gnu: Add rust-pulldown-cmark-0.4. * gnu/packages/crates-io.scm (rust-pulldown-cmark-0.4): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7281e9ed0a..b847eba080 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6945,6 +6945,39 @@ (define-public rust-proptest-0.9 "Hypothesis-like property-based testing and shrinking.") (license (list license:asl2.0 license:expat)))) +(define-public rust-pulldown-cmark-0.4 + (package + (name "rust-pulldown-cmark") + (version "0.4.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "pulldown-cmark" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1db8vlhm3n72051bkq4am80q28rfrh88796i3y9ajf5hhk3lrdyi")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-getopts" ,rust-getopts-0.2) + ("rust-memchr" ,rust-memchr-2.2) + ("rust-unicase" ,rust-unicase-2.4)) + #:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.2) + ("rust-html5ever" ,rust-html5ever-0.23) + ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-regex" ,rust-regex-1.1) + ("rust-tendril" ,rust-tendril-0.4)))) + (home-page "https://github.com/raphlinus/pulldown-cmark") + (synopsis "Pull parser for CommonMark") + (description + "This package provides a pull parser for CommonMark.") + (license license:expat))) + (define-public rust-quick-error-1.2 (package (name "rust-quick-error") -- cgit v1.2.3 From e1fd0a817d192c5a5df72dd7422e36558fa78e46 Mon Sep 17 00:00:00 2001 From: John Soo Date: Thu, 19 Dec 2019 20:57:19 -0800 Subject: gnu: Add rust-model-0.1. * gnu/packages/crates-io.scm (rust-model-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b847eba080..30dd7645ef 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5342,6 +5342,32 @@ (define-public rust-miow-0.2 (base32 "06g9b8sqlh5gxakwqq4rrib07afwanfnxgxajrldwcgk3hxjy7wc")))))) +(define-public rust-model-0.1 + (package + (name "rust-model") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "model" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0kx6hy5i1fn2qs4x6hpng9jixpm68g83vm24z8bqqscr317yinb6")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-permutohedron" ,rust-permutohedron-0.2) + ("rust-proptest" ,rust-proptest-0.9)))) + (home-page "https://github.com/spacejam/model") + (synopsis "Model-based testing for data structures") + (description + "Model-based testing for data structures, with linearizability +checking.") + (license (list license:expat license:asl2.0)))) + (define-public rust-modifier-0.1 (package (name "rust-modifier") -- cgit v1.2.3 From da75b88316b50b205f0b47678c505db59823d39e Mon Sep 17 00:00:00 2001 From: John Soo Date: Thu, 19 Dec 2019 20:58:45 -0800 Subject: gnu: Add rust-arc-swap-0.3. * gnu/packages/crates-io.scm (rust-arc-swap-0.3): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 30dd7645ef..5da0b4fc07 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -218,6 +218,37 @@ (define-public rust-approx-0.3 "Approximate floating point equality comparisons and assertions.") (license license:asl2.0))) +(define-public rust-arc-swap-0.3 + (package + (name "rust-arc-swap") + (version "0.3.11") + (source + (origin + (method url-fetch) + (uri (crate-uri "arc-swap" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0ha8724dpki985v52ifq5sd98xvpa5q51hyma52di75dbqbn4imw")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-development-inputs + (("rust-crossbeam" ,rust-crossbeam-0.7) + ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.6) + ("rust-itertools" ,rust-itertools-0.8) + ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-model" ,rust-model-0.1) + ("rust-num-cpus" ,rust-num-cpus-1.10) + ("rust-parking-lot" ,rust-parking-lot-0.8) + ("rust-proptest" ,rust-proptest-0.9) + ("rust-version-sync" ,rust-version-sync-0.8)))) + (home-page "https://github.com/vorner/arc-swap") + (synopsis "Atomically swappable Arc") + (description "This package provides an atomically swappable Arc.") + (license (list license:expat license:asl2.0)))) + (define-public rust-arrayvec-0.4 (package (name "rust-arrayvec") -- cgit v1.2.3 From 9176bf5487d12414074b85549d1b42afcd3a91ba Mon Sep 17 00:00:00 2001 From: John Soo Date: Thu, 19 Dec 2019 21:02:01 -0800 Subject: gnu: Add rust-signal-hook-registry-1.0. * gnu/packages/crates-io.scm (rust-signal-hook-registry-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 5da0b4fc07..062189bd84 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8662,6 +8662,33 @@ (define-public rust-shlex-0.1 (license (list license:asl2.0 license:expat)))) +(define-public rust-signal-hook-registry-1.0 + (package + (name "rust-signal-hook-registry") + (version "1.0.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "signal-hook-registry" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1mw5v909fn99h5qb96ma4almlik80lr1c7xbakn24rql6bx4zvfd")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-arc-swap" ,rust-arc-swap-0.3) + ("rust-libc" ,rust-libc-0.2)) + #:cargo-development-inputs + (("rust-signal-hook" ,rust-signal-hook-0.1) + ("rust-version-sync" ,rust-version-sync-0.8)))) + (home-page "https://github.com/vorner/signal-hook") + (synopsis "Backend crate for signal-hook") + (description "Backend crate for signal-hook.") + (license (list license:expat license:asl2.0)))) + (define-public rust-siphasher-0.2 (package (name "rust-siphasher") -- cgit v1.2.3 From 23308c78916a0bce9b14fff54f6b0036b1682300 Mon Sep 17 00:00:00 2001 From: John Soo Date: Thu, 19 Dec 2019 21:06:14 -0800 Subject: gnu: Add rust-term-0.5. * gnu/packages/crates-io.scm (rust-term-0.5): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 062189bd84..826f752c4e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9551,6 +9551,21 @@ (define-public rust-term-0.4 (license (list license:asl2.0 license:expat)))) +(define-public rust-term-0.5 + (package + (inherit rust-term-0.4) + (name "rust-term") + (version "0.5.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "term" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0hkgjrfisj6zjwz525639pmsvzhlc48a0h65nw87qrdp6jihdlgd")))))) + (define-public rust-term-0.5.1 (package (inherit rust-term-0.4) -- cgit v1.2.3 From 4e6586c8d7af78d5fee30cdb5431b5228f7e5faa Mon Sep 17 00:00:00 2001 From: John Soo Date: Thu, 19 Dec 2019 21:04:26 -0800 Subject: gnu: Add rust-signal-hook-0.1. * gnu/packages/crates-io.scm (rust-signal-hook-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 826f752c4e..5d709bc610 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8662,6 +8662,37 @@ (define-public rust-shlex-0.1 (license (list license:asl2.0 license:expat)))) +(define-public rust-signal-hook-0.1 + (package + (name "rust-signal-hook") + (version "0.1.9") + (source + (origin + (method url-fetch) + (uri (crate-uri "signal-hook" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0nlw1gwi58ppds5klyy8vp2ickx3majvdp1pcdz8adm4zpqmiavj")))) + (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-registry" ,rust-signal-hook-registry-1.0) + ("rust-tokio-reactor" ,rust-tokio-reactor-0.1)) + #:cargo-development-inputs + (("rust-tokio" ,rust-tokio-0.1) + ("rust-version-sync" ,rust-version-sync-0.8)))) + (home-page "https://github.com/vorner/signal-hook") + (synopsis "Unix signal handling") + (description "Unix signal handling.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-signal-hook-registry-1.0 (package (name "rust-signal-hook-registry") -- cgit v1.2.3 From c28a8ff9324c6379b6650215f610b93787d7889a Mon Sep 17 00:00:00 2001 From: John Soo Date: Thu, 19 Dec 2019 21:16:27 -0800 Subject: gnu: Add rust-ordermap-0.3. * gnu/packages/crates-io.scm (rust-ordermap-0.3): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5d709bc610..31a9b4942a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6058,6 +6058,39 @@ (define-public rust-openssl-sys-0.9 (properties '((hidden? . #t))) (license license:expat))) +(define-public rust-ordermap-0.3 + (package + (name "rust-ordermap") + (version "0.3.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "ordermap" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0qr0a50l0qakbjcck93qdayd0xl8gzpp42x0n7b75cs4ybsx6vm8")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-serde" ,rust-serde-1.0)) + #:cargo-development-inputs + (("rust-fnv" ,rust-fnv-1.0) + ("rust-itertools" ,rust-itertools-0.8) + ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-quickcheck" ,rust-quickcheck-0.8) + ("rust-rand" ,rust-rand-0.4) + ("rust-serde-test" ,rust-serde-test-1.0)))) + (home-page "https://github.com/bluss/indexmap") + (synopsis "Hash table with consistent order and fast iteration") + (description + "This package provides a hash table with consistent order and fast +iteration. NOTE: This crate was renamed to @code{indexmap}. Please use it +under its new name.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-os-pipe-0.8 (package (name "rust-os-pipe") -- cgit v1.2.3 From 489c4189a88c744b68dad0d9e0faa99365f96642 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 20 Dec 2019 08:06:22 -0800 Subject: gnu: Add rust-getrandom-0.1. * gnu/packages/crates-io.scm (rust-getrandom-0.1): 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 31a9b4942a..deeb78f375 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3525,6 +3525,35 @@ (define-public rust-getopts-0.2 (license (list license:asl2.0 license:expat)))) +(define-public rust-getrandom-0.1 + (package + (name "rust-getrandom") + (version "0.1.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "getrandom" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0macrjfkgsjn6ikr94agapp4fkxmr8w7y2g7qis4icc4a17cwp76")))) + (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) + ("rust-log" ,rust-log-0.4) + ("rust-stdweb" ,rust-stdweb-0.4) + ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)))) + (home-page "https://github.com/rust-random/getrandom") + (synopsis "Retrieve random data from system source") + (description + "This package provides a small cross-platform library for +retrieving random data from system source.") + (license (list license:expat license:asl2.0)))) + (define-public rust-gimli-0.18 (package (name "rust-gimli") -- cgit v1.2.3 From 3ad38420ab6be8bbbe2b77079ef82d4ab6927a53 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 20 Dec 2019 08:14:22 -0800 Subject: gnu: Add rust-git2-0.9. * gnu/packages/crates-io.scm (rust-git2-0.9): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index deeb78f375..6b13bffec8 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3593,6 +3593,45 @@ (define-public rust-gimli-0.18 DWARF debugging format.") (license (list license:asl2.0 license:expat)))) +(define-public rust-git2-0.9 + (package + (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")))) + (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-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)))) + (home-page "https://github.com/rust-lang/git2-rs") + (synopsis "Rust bindings to libgit2") + (description + "Bindings to libgit2 for interoperating with git repositories. +This library is both threadsafe and memory safe and allows both +reading and writing git repositories.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-glob-0.3 (package (name "rust-glob") -- cgit v1.2.3 From b7a2cf62787543b5f5af0eb26227236a3ecff4bb Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 20 Dec 2019 08:12:00 -0800 Subject: gnu: Add rust-crates-index-0.13. * gnu/packages/crates-io.scm (rust-crates-index-0.13): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6b13bffec8..8735adc697 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1509,6 +1509,39 @@ (define-public rust-core-foundation-sys-0.6 (license (list license:asl2.0 license:expat)))) +(define-public rust-crates-index-0.13 + (package + (name "rust-crates-index") + (version "0.13.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "crates-index" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1n7pp6mk59hw3nqlh8irxc9pp0g5ziw7bprqsw2lxvg13cvdp76s")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-error-chain" ,rust-error-chain-0.12) + ("rust-git2" ,rust-git2-0.9) + ("rust-glob" ,rust-glob-0.3) + ("rust-serde" ,rust-serde-1.0) + ("rust-serde-derive" ,rust-serde-derive-1.0) + ("rust-serde-json" ,rust-serde-json-1.0)) + #:cargo-development-inputs + (("rust-tempdir" ,rust-tempdir-0.3)))) + (home-page + "https://github.com/frewsxcv/rust-crates-index") + (synopsis + "Retrieving and interacting with the crates.io index") + (description + "Library for retrieving and interacting with the crates.io index.") + (license license:asl2.0))) + (define-public rust-crc32fast-1.2 (package (name "rust-crc32fast") -- cgit v1.2.3 From 8dbe08652d176d7755ad5c1f50c5ad33898e228a Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 20 Dec 2019 08:08:58 -0800 Subject: gnu: Add rust-crossbeam-deque-0.6. * gnu/packages/crates-io.scm (rust-crossbeam-deque-0.6): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 8735adc697..05364f0fce 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1736,6 +1736,21 @@ (define-public rust-crossbeam-deque-0.7 (description "Concurrent work-stealing deque.") (license (list license:expat license:asl2.0)))) +(define-public rust-crossbeam-deque-0.6 + (package + (inherit rust-crossbeam-deque-0.7) + (name "rust-crossbeam-deque") + (version "0.6.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "crossbeam-deque" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "04rcpgjs6ns57vag8a3dzx26190dhbvy2l0p9n22b9p1yf64pr05")))))) + (define-public rust-crossbeam-epoch-0.7 (package (name "rust-crossbeam-epoch") -- cgit v1.2.3 From 3c5a75ac631021cbb57ed7735ce4c953e32fc473 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 20 Dec 2019 08:16:50 -0800 Subject: gnu: Add rust-lock-api-0.3. * gnu/packages/crates-io.scm (rust-lock-api-0.3): New variable. (rust-lock-api-0.2): Inherit from rust-lock-api-0.3. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 05364f0fce..756a4aa533 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4954,10 +4954,10 @@ (define-public rust-libssh2-sys-0.2 (license (list license:asl2.0 license:expat)))) -(define-public rust-lock-api-0.2 +(define-public rust-lock-api-0.3 (package (name "rust-lock-api") - (version "0.2.0") + (version "0.3.1") (source (origin (method url-fetch) @@ -4966,7 +4966,7 @@ (define-public rust-lock-api-0.2 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1zx7pksmgyggpczgw4qrr4vj2nkdk5lipgiysvr20slm552nv57d")))) + "1p04271jikw69ja0ap0plrfwm9incf1iny48g0b3ma9k4mw2x4gq")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -4982,6 +4982,21 @@ (define-public rust-lock-api-0.2 @code{RwLock} types. It is compatible with @code{no_std}.") (license (list license:expat license:asl2.0)))) +(define-public rust-lock-api-0.2 + (package + (inherit rust-lock-api-0.3) + (name "rust-lock-api") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "lock_api" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1zx7pksmgyggpczgw4qrr4vj2nkdk5lipgiysvr20slm552nv57d")))))) + (define-public rust-lock-api-0.1 (package (inherit rust-lock-api-0.2) -- cgit v1.2.3 From 15b17fde21a0a36e3a78ad3d2887bd6fc0fcbfcc Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 20 Dec 2019 08:18:02 -0800 Subject: gnu: Add rust-parking-lot-core-0.6. * gnu/packages/crates-io.scm (rust-parking-lot-core-0.6): New variable. (rust-parking-lot-core-0.5): Inherit from rust-parking-lot-core-0.6. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 756a4aa533..8d18cce4b2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6357,10 +6357,10 @@ (define-public rust-parking-lot-0.8 ("rust-rand" ,rust-rand-0.4) ("rust-rustc-version" ,rust-rustc-version-0.2)))))) -(define-public rust-parking-lot-core-0.5 +(define-public rust-parking-lot-core-0.6 (package (name "rust-parking-lot-core") - (version "0.5.0") + (version "0.6.2") (source (origin (method url-fetch) @@ -6369,7 +6369,7 @@ (define-public rust-parking-lot-core-0.5 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1317j5a1yd03baza2kqqrxb4kr1vxa7rckw4frksl2vrncfcp26b")))) + "0ay67dpnrn68ryyvp720m9i8hzp189fd4d6slrs1lvmcwywv2xmq")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -6393,6 +6393,21 @@ (define-public rust-parking-lot-core-0.5 "An advanced API for creating custom synchronization primitives.") (license (list license:asl2.0 license:expat)))) +(define-public rust-parking-lot-core-0.5 + (package + (inherit rust-parking-lot-core-0.6) + (name "rust-parking-lot-core") + (version "0.5.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "parking_lot_core" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1317j5a1yd03baza2kqqrxb4kr1vxa7rckw4frksl2vrncfcp26b")))))) + (define-public rust-parity-wasm-0.40 (package (name "rust-parity-wasm") -- cgit v1.2.3 From 215545b7d4302ee54f4d643c9ca8772ad1f240ec Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 20 Dec 2019 08:24:23 -0800 Subject: gnu: Add rust-ref-cast-0.2. * gnu/packages/crates-io.scm (rust-ref-cast-0.2): 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 8d18cce4b2..797c921c9c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7849,6 +7849,30 @@ (define-public rust-redox-termios-0.1 (properties '((hidden? . #t))) (license license:expat))) +(define-public rust-ref-cast-0.2 + (package + (name "rust-ref-cast") + (version "0.2.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "ref-cast" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0jgj1zxaikqm030flpifbp517fy4z21lly6ysbwyciii39bkzcf1")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-ref-cast-impl" ,rust-ref-cast-impl-0.2)))) + (home-page "https://github.com/dtolnay/ref-cast") + (synopsis "Safely cast &T to &U") + (description + "Safely cast &T to &U where the struct U contains a single field of type T.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-regex-1.1 (package (name "rust-regex") -- cgit v1.2.3 From f76bbcb6e35b4cfc71ac7daff54388f729ee9e40 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 20 Dec 2019 08:29:02 -0800 Subject: gnu: Add rust-futf-0.1. * gnu/packages/crates-io.scm (rust-futf-0.1): 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 797c921c9c..55825f2e39 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3225,6 +3225,30 @@ (define-public rust-fuchsia-zircon-sys-0.3 (properties '((hidden? . #t))) (license license:bsd-3))) +(define-public rust-futf-0.1 + (package + (name "rust-futf") + (version "0.1.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "futf" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0fxc18bnabird5jl941nsd6d25vq8cn8barmz4d30dlkzbiir73w")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-mac" ,rust-mac-0.1) + ("rust-new-debug-unreachable" ,rust-new-debug-unreachable-1.0)))) + (home-page "https://github.com/servo/futf") + (synopsis "Handling fragments of UTF-8") + (description "Handling fragments of UTF-8.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-futures-0.1 (package (name "rust-futures") -- cgit v1.2.3 From 6691d93d92ac1128ef7d269d500ca89cc6d6bfe7 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 20 Dec 2019 08:20:14 -0800 Subject: gnu: Add rust-ref-cast-impl-0.2. * gnu/packages/crates-io.scm (rust-ref-cast-impl-0.2): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 55825f2e39..1584805b37 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7897,6 +7897,32 @@ (define-public rust-ref-cast-0.2 "Safely cast &T to &U where the struct U contains a single field of type T.") (license (list license:asl2.0 license:expat)))) +(define-public rust-ref-cast-impl-0.2 + (package + (name "rust-ref-cast-impl") + (version "0.2.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "ref-cast-impl" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0hw0frpzna5rf5szix56zyzd0vackcb3svj94ndj629xi75dkb32")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-0.4) + ("rust-quote" ,rust-quote-1.0) + ("rust-syn" ,rust-syn-0.15)))) + (home-page "https://github.com/dtolnay/ref-cast") + (synopsis "Derive implementation for @code{ref_cast::RefCast}") + (description + "Derive implementation for ref_cast::RefCast.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-regex-1.1 (package (name "rust-regex") -- cgit v1.2.3 From 0c5b3abe7b41b010c5777b876d1e0f6171e2b7df Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 20 Dec 2019 08:31:56 -0800 Subject: gnu: Add rust-utf-8-0.7. * gnu/packges/crates-io.scm (rust-utf-8-0.7): 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 1584805b37..660605314e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11178,6 +11178,28 @@ (define-public rust-url-1.7 "URL library for Rust, based on the WHATWG URL Standard.") (license (list license:asl2.0 license:expat)))) +(define-public rust-utf-8-0.7 + (package + (name "rust-utf-8") + (version "0.7.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "utf-8" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1iw5rp4i3mfi9k51picbr5bgjqhjcmnxx7001clh5ydq31y2zr05")))) + (build-system cargo-build-system) + (arguments `(#:skip-build? #t)) + (home-page "https://github.com/SimonSapin/rust-utf8") + (synopsis + "Incremental, zero-copy UTF-8 decoding with error handling") + (description + "Incremental, zero-copy UTF-8 decoding with error handling.") + (license (list license:expat license:asl2.0)))) + (define-public rust-utf8-ranges-1.0 (package (name "rust-utf8-ranges") -- cgit v1.2.3 From f041cdbe8e75f76b42ac977e493c5567493ab5d4 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 20 Dec 2019 08:34:42 -0800 Subject: gnu: Add rust-parking-lot-core-0.7. * gnu/packages/crates-io.scm (rust-parking-lot-core-0.7): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 660605314e..537bfe8cb3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6381,6 +6381,31 @@ (define-public rust-parking-lot-0.8 ("rust-rand" ,rust-rand-0.4) ("rust-rustc-version" ,rust-rustc-version-0.2)))))) +(define-public rust-parking-lot-0.7 + (package + (inherit rust-parking-lot-0.9) + (name "rust-parking-lot") + (version "0.7.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "parking_lot" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0dz32cqx9200n1lk3kwyb599vabfid3f8sj1aq85sw42s2pb8hdb")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-lock-api" ,rust-lock-api-0.1) + ("rust-parking-lot-core" ,rust-parking-lot-core-0.4)) + #:cargo-development-inputs + (("rust-bincode" ,rust-bincode-1.1) + ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-rand" ,rust-rand-0.4) + ("rust-rustc-version" ,rust-rustc-version-0.2)))))) + (define-public rust-parking-lot-core-0.6 (package (name "rust-parking-lot-core") -- cgit v1.2.3 From 30a0767b36fb8d31262d3dbed5a6dad8eda31f41 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 20 Dec 2019 08:38:42 -0800 Subject: gnu: Add rust-tokio-io-pool-0.1. * gnu/packages/crates-io.scm (rust-tokio-io-pool-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 537bfe8cb3..ba772f33aa 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10345,6 +10345,36 @@ (define-public rust-tokio-io-0.1 "Core I/O primitives for asynchronous I/O in Rust.") (license license:expat))) +(define-public rust-tokio-io-pool-0.1 + (package + (name "rust-tokio-io-pool") + (version "0.1.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "tokio-io-pool" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "17lrjj7lcw13wchpbvr8cynmypd29h40clf9qxabh6fxva40kwm5")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-futures" ,rust-futures-0.1) + ("rust-num-cpus" ,rust-num-cpus-1.10) + ("rust-tokio" ,rust-tokio-0.1) + ("rust-tokio-executor" ,rust-tokio-executor-0.1)) + #:cargo-development-inputs + (("rust-tokio-current-thread" ,rust-tokio-current-thread-0.1)))) + (home-page "https://github.com/jonhoo/tokio-io-pool") + (synopsis "Execute short, I/O-heavy futures efficiently") + (description + "Alternative tokio thread pool for executing short, I/O-heavy +futures efficiently") + (license (list license:asl2.0 license:expat)))) + (define-public rust-tokio-mock-task-0.1 (package (name "rust-tokio-mock-task") -- cgit v1.2.3 From ade2e5e722245ab1caacc3efca1317abd5e28c4c Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 20 Dec 2019 08:36:33 -0800 Subject: gnu: Add rust-parking-lot-core-0.4. * gnu/packages/crates-io.scm (rust-parking-lot-core-0.4): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ba772f33aa..dc786c9022 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6457,6 +6457,21 @@ (define-public rust-parking-lot-core-0.5 (base32 "1317j5a1yd03baza2kqqrxb4kr1vxa7rckw4frksl2vrncfcp26b")))))) +(define-public rust-parking-lot-core-0.4 + (package + (inherit rust-parking-lot-core-0.6) + (name "rust-parking-lot-core") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "parking_lot_core" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1jcq8aq4wv9y5fip7jg12jdwjd5g5r3x857xdma8vcin769cgj4l")))))) + (define-public rust-parity-wasm-0.40 (package (name "rust-parity-wasm") -- cgit v1.2.3 From 10d5ee693b293740b18ceb5c22aacd184fc270fe Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 20 Dec 2019 08:42:51 -0800 Subject: gnu: Add rust-generator-0.6. * gnu/packages/crates-io.scm (rust-generator-0.6): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index dc786c9022..62b749fe9c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -510,6 +510,34 @@ (define-public rust-bincode-1.1 that uses Serde for transforming structs into bytes and vice versa!") (license license:expat))) +(define-public rust-generator-0.6 + (package + (name "rust-generator") + (version "0.6.18") + (source + (origin + (method url-fetch) + (uri (crate-uri "generator" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0p4iq1n53dy72dhma02wfjrazf2hq2745f9si9yi7jxviks7c8l7")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-log" ,rust-log-0.4) + ("rust-winapi" ,rust-winapi-0.3)) + #:cargo-development-inputs + (("rust-cc" ,rust-cc-1.0) + ("rust-rustc-version" ,rust-rustc-version-0.2)))) + (home-page "https://github.com/Xudong-Huang/generator-rs") + (synopsis "Stackfull Generator Library in Rust") + (description "Stackfull Generator Library in Rust.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-bindgen-0.50 (package (name "rust-bindgen") -- cgit v1.2.3 From 0e4a064bd9b178950b07300a2ea2fd100a9bbeb1 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 20 Dec 2019 08:41:14 -0800 Subject: gnu: Add rust-loom-0.1. * gnu/packages/crates-io.scm (rust-loom-0.1): 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 62b749fe9c..7f843f5668 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5098,6 +5098,35 @@ (define-public rust-log-0.3 (base32 "0nsn28syc49vvjhxcfc8261rd1frhjc0r4bn9v3mqvps3ra7f3w8")))))) +(define-public rust-loom-0.1 + (package + (name "rust-loom") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "loom" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1jmp5mffwwyqgp914cwz92ij2s6vk1hsnkvgndvzw74xrcfraibj")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-cfg-if" ,rust-cfg-if-0.1) + ("rust-futures" ,rust-futures-0.1) + ("rust-generator" ,rust-generator-0.6) + ("rust-scoped-tls" ,rust-scoped-tls-1.0) + ("rust-serde" ,rust-serde-1.0) + ("rust-serde-derive" ,rust-serde-derive-1.0) + ("rust-serde-json" ,rust-serde-json-1.0)))) + (home-page "https://github.com/tokio-rs/loom") + (synopsis "Model checker for concurrent code") + (description "Model checker for concurrent code.") + (license license:expat))) + (define-public rust-lzma-sys-0.1 (package (name "rust-lzma-sys") -- cgit v1.2.3 From 04a89218a471346eef9503bd0eb8b142850833d6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 1 Jan 2020 21:33:14 +0200 Subject: gnu: Add rust-version-sync-0.8. * gnu/packages/crates-io.scm (rust-version-sync-0.8): New variable. --- gnu/packages/crates-io.scm | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7f843f5668..c4b792e96e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Ivan Petkov -;;; Copyright © 2019 Efraim Flashner +;;; Copyright © 2019, 2020 Efraim Flashner ;;; Copyright © 2019 Nicolas Goaziou ;;; Copyright © 2019 Giacomo Leidi ;;; Copyright © 2019 Tobias Geerinckx-Rice @@ -11470,6 +11470,39 @@ (define-public rust-version-check-0.1 (base32 "1pf91pvj8n6akh7w6j5ypka6aqz08b3qpzgs0ak2kjf4frkiljwi")))))) +(define-public rust-version-sync-0.8 + (package + (name "rust-version-sync") + (version "0.8.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "version-sync" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "01pq0ia7ak7d69c3chjgdmaaq271yrspgbzmk6wmrwb74hx3skw4")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-itertools" ,rust-itertools-0.8) + ("rust-proc-macro2" ,rust-proc-macro2-0.4) + ("rust-pulldown-cmark" ,rust-pulldown-cmark-0.4) + ("rust-regex" ,rust-regex-1.1) + ("rust-semver-parser" ,rust-semver-parser-0.9) + ("rust-syn" ,rust-syn-0.15) + ("rust-toml" ,rust-toml-0.5) + ("rust-url" ,rust-url-1.7)))) + (home-page "https://github.com/mgeisler/version-sync") + (synopsis + "Ensure that version numbers are updated when the crate version changes") + (description + "Simple crate for ensuring that version numbers in README files are +updated when the crate version changes.") + (license license:expat))) + (define-public rust-void-1.0 (package (name "rust-void") -- cgit v1.2.3 From 9e225670771bc08345ad5e7c686348024fa43acd Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 15 Dec 2019 11:27:39 -0800 Subject: gnu: Add ripgrep. * gnu/packages/rust-apps.scm (ripgrep): New variable. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. Signed-off-by: Efraim Flashner --- gnu/local.mk | 1 + gnu/packages/rust-apps.scm | 63 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 gnu/packages/rust-apps.scm diff --git a/gnu/local.mk b/gnu/local.mk index d6600df339..1d265dc551 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -435,6 +435,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/ruby.scm \ %D%/packages/rush.scm \ %D%/packages/rust.scm \ + %D%/packages/rust-apps.scm \ %D%/packages/rust-cbindgen.scm \ %D%/packages/samba.scm \ %D%/packages/sagemath.scm \ diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm new file mode 100644 index 0000000000..e334e46daa --- /dev/null +++ b/gnu/packages/rust-apps.scm @@ -0,0 +1,63 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2019 John Soo +;;; +;;; 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 rust-apps) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix build-system cargo) + #:use-module (guix download) + #:use-module (guix packages) + #:use-module (gnu packages crates-io)) + +(define-public ripgrep + (package + (name "ripgrep") + (version "11.0.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "ripgrep" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0bn40lz9n08llq615p4qqqbi24zbkf0appfx3zgxg34a86ga9zds")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bstr" ,rust-bstr-0.1) + ("rust-clap" ,rust-clap-2) + ("rust-grep" ,rust-grep-0.2) + ("rust-ignore" ,rust-ignore-0.4) + ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-log" ,rust-log-0.4) + ("rust-num-cpus" ,rust-num-cpus-1.10) + ("rust-regex" ,rust-regex-1.1) + ("rust-serde-json" ,rust-serde-json-1.0) + ("rust-termcolor" ,rust-termcolor-1.0)) + #:cargo-development-inputs + (("rust-clap" ,rust-clap-2) + ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-serde" ,rust-serde-1.0) + ("rust-serde-derive" ,rust-serde-derive-1.0)))) + (home-page "https://github.com/BurntSushi/ripgrep") + (synopsis "Line-oriented search tool") + (description + "ripgrep is a line-oriented search tool that recursively searches +your current directory for a regex pattern while respecting your +gitignore rules.") + (license (list license:unlicense license:expat)))) -- cgit v1.2.3 From 6bc2b7a46624affdb7a79b32241a06550c69cb32 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 1 Jan 2020 22:17:11 +0200 Subject: gnu: rust-serde-derive-1.0: Skip build. * gnu/packages/crates-io.scm (rust-serde-derive-1.0)[arguments]: Skip build. Add rust-proc-macro2-1.0, rust-quote-1.0, rust-syn-1.0 to cargo-inputs. Add rust-serde-1.0 to cargo-development-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c4b792e96e..dc59e4a01d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8797,12 +8797,19 @@ (define-public rust-serde-derive-1.0 (base32 "0bn0wz3j48248187mfmypyqnh73mq734snxxhr05vmgcl51kl4sb")))) (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1.0) + ("rust-quote" ,rust-quote-1.0) + ("rust-syn" ,rust-syn-1.0)) + #:cargo-development-inputs + (("rust-serde" ,rust-serde-1.0)))) (home-page "https://serde.rs") (synopsis "Macros 1.1 implementation of #[derive(Serialize, Deserialize)]") (description "Macros 1.1 implementation of #[derive(Serialize, Deserialize)]") - (properties '((hidden? . #t))) (license (list license:expat license:asl2.0)))) (define-public rust-serde-json-1.0 -- cgit v1.2.3 From 5dd1df7d905e17394c77d2499ccb9f88e2f101af Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 1 Jan 2020 22:19:50 +0200 Subject: gnu: rust-rand-core-0.3: Skip build. * gnu/packages/crates-io.scm (rust-rand-core-0.3)[arguments]: Skip build. --- gnu/packages/crates-io.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index dc59e4a01d..802943faba 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7577,7 +7577,8 @@ (define-public rust-rand-core-0.3 "0jzdgszfa4bliigiy4hi66k7fs3gfwi2qxn8vik84ph77fwdwvvs")))) ;; This version is a 0.3 API wrapper around the 0.4 version. (arguments - `(#:cargo-inputs (("rand-core" ,rust-rand-core-0.4)))))) + `(#:skip-build? #t + #:cargo-inputs (("rand-core" ,rust-rand-core-0.4)))))) (define-public rust-rand-hc-0.1 (package -- cgit v1.2.3 From 8a74a7441648620aff2ba3d603d7dfc20eafb2a3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 2 Jan 2020 09:01:03 +0200 Subject: gnu: rust-proc-macro2-0.4: Skip build. * gnu/packages/crates-io.scm (rust-proc-macro2-0.4)[arguments]: Skip build. Add rust-unicode-xid-0.1 to cargo-inputs. Add rust-quote-0.6 to cargo-development-inputs. --- 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 802943faba..260ef13df7 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7261,7 +7261,13 @@ (define-public rust-proc-macro2-0.4 (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0nd71fl24sys066jrha6j7i34nfkjv44yzw8yww9742wmc8j0gfg")))))) + "0nd71fl24sys066jrha6j7i34nfkjv44yzw8yww9742wmc8j0gfg")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-unicode-xid" ,rust-unicode-xid-0.1)) + #:cargo-development-inputs + (("rust-quote" ,rust-quote-0.6)))))) (define-public rust-proptest-0.9 (package -- cgit v1.2.3 From bc75f6d6eda2624dc7e31ec2b5a9bfc6cd702913 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 2 Jan 2020 09:02:47 +0200 Subject: gnu: rust-proc-macro2-1.0: Skip build. * gnu/packages/crates-io.scm (rust-proc-macro2-1.0)[arguments]: Skip build. Add rust-unicode-xid-0.2 to cargo-inputs. Add rust-quote-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 260ef13df7..b27baf3107 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7241,12 +7241,17 @@ (define-public rust-proc-macro2-1.0 (base32 "09rgb5ab0jgw39kyad0lgqs4nb9yaf7mwcrgxqnsxbn4il54g7lw")))) (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-unicode-xid" ,rust-unicode-xid-0.2)) + #:cargo-development-inputs + (("rust-quote" ,rust-quote-1.0)))) (home-page "https://github.com/alexcrichton/proc-macro2") (synopsis "Stable implementation of the upcoming new `proc_macro` API") (description "This package provides a stable implementation of the upcoming new `proc_macro` API. Comes with an option, off by default, to also reimplement itself in terms of the upstream unstable API.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) (define-public rust-proc-macro2-0.4 -- cgit v1.2.3 From fab352f9072e6d84389a084e8df9421a18f81867 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 2 Jan 2020 09:24:15 +0200 Subject: gnu: rust-wasm-bindgen-shared-0.2: Skip build. * gnu/packages/crates-io.scm (rust-wasm-bindgen-shared-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 b27baf3107..7397400675 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11769,11 +11769,11 @@ (define-public rust-wasm-bindgen-shared-0.2 (base32 "08rnfhjyk0f6liv8n4rdsvhx7r02glkhcbj2lp9lcbkbfpad9hnr")))) (build-system cargo-build-system) + (arguments '(#:skip-build? #t)) (home-page "https://rustwasm.github.io/wasm-bindgen/") (synopsis "Shared support between wasm-bindgen and wasm-bindgen cli") (description "This package provides shared support between @code{wasm-bindgen} and @code{wasm-bindgen} cli, an internal dependency.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 9566322ed79a52a458221116e319fc83c13542e0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 2 Jan 2020 09:26:49 +0200 Subject: gnu: rust-wasm-bindgen-test-macro-0.2: Skip build. * gnu/packages/crates-io.scm (rust-wasm-bindgen-test-macro-0.2) [arguments]: Skip build. Add rust-proc-macro2-0.4, rust-quote-0.6 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 7397400675..a0733b0804 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11820,11 +11820,15 @@ (define-public rust-wasm-bindgen-test-macro-0.2 (base32 "0n28mr6vncf1k1qr2b5bvfxq4jvqkjdzq0z0ab6w2f5d6v8q3q3l")))) (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-0.4) + ("rust-quote" ,rust-quote-0.6)))) (home-page "https://github.com/rustwasm/wasm-bindgen") (synopsis "Internal testing macro for wasm-bindgen") (description "This library contains the internal testing macro for wasm-bindgen.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 7700a54d70703c561be6afec96bdfb28eecce65d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 2 Jan 2020 09:28:48 +0200 Subject: gnu: rust-widestring-0.4: Skip build. * gnu/packages/crates-io.scm (rust-widestring-0.4)[arguments]: Skip build. Add rust-winapi-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 a0733b0804..6d66f90a28 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11873,13 +11873,16 @@ (define-public rust-widestring-0.4 (base32 "1dhx6dndjsz1y7c9w06922412kdxyrrkqblvggm76mh8z17hxz7g")))) (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-development-inputs + (("rust-winapi" ,rust-winapi-0.3)))) (home-page "https://github.com/starkat99/widestring-rs") (synopsis "Wide string Rust FFI library") (description "A wide string Rust FFI library for converting to and from wide strings, such as those often used in Windows API or other FFI libraries. Both UTF-16 and UTF-32 types are provided, including support for malformed encoding.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From c579894d696382755bc84e6c99d2745e3c9ad766 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 2 Jan 2020 09:30:04 +0200 Subject: gnu: rust-winapi-0.2: Skip build. * gnu/packages/crates-io.scm (rust-winapi-0.2)[arguments]: Skip build. --- 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 6d66f90a28..83b0f84854 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11925,7 +11925,7 @@ (define-public rust-winapi-0.2 (sha256 (base32 "0yh816lh6lf56dpsgxy189c2ai1z3j8mw9si6izqb6wsjkbcjz8n")))) - (arguments '()))) + (arguments '(#:skip-build? #t)))) (define-public rust-winapi-build-0.1 (package -- cgit v1.2.3 From 3d47a31e70faadeca21c221be56886005ea43c7f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 2 Jan 2020 09:30:38 +0200 Subject: gnu: rust-winapi-0.3: Skip build. * gnu/packages/crates-io.scm (rust-winapi-0.3)[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 83b0f84854..a13ddf43be 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11901,14 +11901,14 @@ (define-public rust-winapi-0.3 (build-system cargo-build-system) ;; This package depends unconditionally on these two crates. (arguments - `(#:cargo-inputs + `(#:skip-build? #t + #:cargo-inputs (("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.") (description "Raw FFI bindings for all of Windows API.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 3cb422d1ecced23c78ed466921ef686ff8d6137e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 2 Jan 2020 09:31:58 +0200 Subject: gnu: rust-winapi-build-0.1: Skip build. * gnu/packages/crates-io.scm (rust-winapi-build-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 a13ddf43be..113c67fe35 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11940,11 +11940,11 @@ (define-public rust-winapi-build-0.1 (base32 "1g4rqsgjky0a7530qajn2bbfcrl2v0zb39idgdws9b1l7gp5wc9d")))) (build-system cargo-build-system) + (arguments '(#:skip-build? #t)) (home-page "https://github.com/retep998/winapi-rs") (synopsis "Common code for build.rs in WinAPI -sys crates") (description "Common code for build.rs in WinAPI -sys crates.") - (properties '((hidden? . #t))) (license license:expat))) (define-public rust-winapi-i686-pc-windows-gnu-0.4 -- cgit v1.2.3 From 9b03b9cc7e2ba16cd45802b6fe20d8e49ab9b5a5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 2 Jan 2020 09:33:38 +0200 Subject: gnu: rust-winapi-util-0.1: Skip build. * gnu/packages/crates-io.scm (rust-winapi-util-0.1)[arguments]: Skip build. Add rust-winapi-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 113c67fe35..8570471e37 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11982,12 +11982,14 @@ (define-public rust-winapi-util-0.1 (base32 "1j839dc6y8vszvrsb7yk0qvs0w6asnahxzbyans37vnsw6vbls3i")))) (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs (("rust-winapi" ,rust-winapi-0.3)))) (home-page "https://github.com/BurntSushi/winapi-util") (synopsis "Dumping ground for high level safe wrappers over winapi") (description "This package provides a dumping ground for high level safe wrappers over winapi.") - (properties '((hidden? . #t))) (license (list license:unlicense license:expat)))) -- cgit v1.2.3 From cccf9029eb29e29693704c48cfac5e615137b51d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 2 Jan 2020 09:35:37 +0200 Subject: gnu: rust-wincolor-1.0: Skip build. * gnu/packages/crates-io.scm (rust-wincolor-1.0)[arguments]: Skip build. Add rust-winapi-0.3, rust-winapi-util-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 8570471e37..c2d08655b2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -12028,12 +12028,16 @@ (define-public rust-wincolor-1.0 (base32 "1agaf3hcav113i86912ajnw6jxcy4rvkrgyf8gdj8kc031mh3xcn")))) (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-winapi" ,rust-winapi-0.3) + ("rust-winapi-util" ,rust-winapi-util-0.1)))) (home-page "https://github.com/BurntSushi/termcolor/tree/master/wincolor") (synopsis "Windows API for controlling text color in a Windows console") (description "This package provides a simple Windows specific API for controlling text color in a Windows console.") - (properties '((hidden? . #t))) (license (list license:unlicense license:expat)))) -- cgit v1.2.3 From 5524f3d597f537cac4cccb0992ee1050f377da40 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 2 Jan 2020 09:37:38 +0200 Subject: gnu: rust-winutil-0.1: Skip build. * gnu/packages/crates-io.scm (rust-winutil-0.1)[arguments]: Skip build. Add rust-winapi-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 c2d08655b2..48341cc89a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -12053,12 +12053,15 @@ (define-public rust-winutil-0.1 (sha256 (base32 "0vkyl3fbbf05n5ph5yz8sfaccrk9x3qsr25560w6w68ldf5i7bvx")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-winapi" ,rust-winapi-0.3)))) (build-system cargo-build-system) (home-page "https://bitbucket.org/DaveLancaster/winutil") (synopsis "Library wrapping a handful of useful winapi functions") (description "A simple library wrapping a handful of useful winapi functions.") - (properties '((hidden? . #t))) (license license:expat))) (define-public rust-ws2-32-sys-0.2 -- cgit v1.2.3 From ba33cf6d54deb2db01ce023d17071e43a86a61de Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 2 Jan 2020 09:39:36 +0200 Subject: gnu: rust-ws2-32-sys-0.2: Skip build. * gnu/packages/crates-io.scm (rust-ws2-32-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 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 48341cc89a..a0f4eb56d9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -12077,11 +12077,16 @@ (define-public rust-ws2-32-sys-0.2 (base32 "0ppscg5qfqaw0gzwv2a4nhn5bn01ff9iwn6ysqnzm4n8s3myz76m")))) (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 ws2_32") (description "Contains function definitions for the Windows API library ws2_32.") - (properties '((hidden? . #t))) (license license:expat))) (define-public rust-xattr-0.2 -- cgit v1.2.3 From c5c4876155350580fa205a7a560b662ece36b630 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 2 Jan 2020 15:59:52 +0200 Subject: gnu: rust-cbindgen: Move to rust-apps.scm * gnu/packages/rust-cbindgen.scm (rust-cbindgen): Move to ... * gnu/packages/rust-apps.scm: ... here. * gnu/local.mk (GNU_SYSTEM_MODULES): Remove it. --- gnu/local.mk | 1 - gnu/packages/gnuzilla.scm | 2 +- gnu/packages/rust-apps.scm | 64 +++++++++++++++++++++++++++++++ gnu/packages/rust-cbindgen.scm | 87 ------------------------------------------ 4 files changed, 65 insertions(+), 89 deletions(-) delete mode 100644 gnu/packages/rust-cbindgen.scm diff --git a/gnu/local.mk b/gnu/local.mk index 1d265dc551..8a21223de5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -436,7 +436,6 @@ GNU_SYSTEM_MODULES = \ %D%/packages/rush.scm \ %D%/packages/rust.scm \ %D%/packages/rust-apps.scm \ - %D%/packages/rust-cbindgen.scm \ %D%/packages/samba.scm \ %D%/packages/sagemath.scm \ %D%/packages/sawfish.scm \ diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index d5d9839e1a..a642f6a95f 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -70,7 +70,7 @@ (define-module (gnu packages gnuzilla) #:use-module (gnu packages gl) #:use-module (gnu packages assembly) #:use-module (gnu packages rust) - #:use-module (gnu packages rust-cbindgen) + #:use-module (gnu packages rust-apps) #:use-module (gnu packages llvm) #:use-module (gnu packages nss) #:use-module (gnu packages icu4c) diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index e334e46daa..0f3650f52f 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 John Soo +;;; Copyright © 2019 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -61,3 +62,66 @@ (define-public ripgrep your current directory for a regex pattern while respecting your gitignore rules.") (license (list license:unlicense license:expat)))) + +(define-public rust-cbindgen + (package + (name "rust-cbindgen") + (version "0.9.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "cbindgen" version)) + (file-name (string-append name "-" version ".crate")) + (sha256 + (base32 + "1zgamxahlxmg4warzivaa8m1f8d6b45mhznm7n6d7p5l18acdblx")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("clap" ,rust-clap-2) + ("log" ,rust-log-0.4) + ("proc-macro2" ,rust-proc-macro2-1.0) + ("quote" ,rust-quote-1.0) + ("serde" ,rust-serde-1.0) + ("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 + (("ansi-term" ,rust-ansi-term-0.11) + ("atty" ,rust-atty-0.2) + ("autocfg" ,rust-autocfg-0.1) + ("bitflags" ,rust-bitflags-1) + ("cfg-if" ,rust-cfg-if-0.1) + ("cloudabi" ,rust-cloudabi-0.0) + ("fuchsia-cprng" ,rust-fuchsia-cprng-0.1) + ("itoa" ,rust-itoa-0.4) + ("libc" ,rust-libc-0.2) + ("numtoa" ,rust-numtoa-0.1) + ("rand" ,rust-rand-0.6) + ("rand-chacha" ,rust-rand-chacha-0.1) + ("rand-core" ,rust-rand-core-0.3) + ("rand-hc" ,rust-rand-hc-0.1) + ("rand-isaac" ,rust-rand-isaac-0.1) + ("rand-jitter" ,rust-rand-jitter-0.1) + ("rand-os" ,rust-rand-os-0.1) + ("rand-pcg" ,rust-rand-pcg-0.1) + ("rand-xorshift" ,rust-rand-xorshift-0.1) + ("rdrand" ,rust-rdrand-0.4) + ("redox-syscall" ,rust-redox-syscall-0.1) + ("redox-termios" ,rust-redox-termios-0.1) + ("remove-dir-all" ,rust-remove-dir-all-0.5) + ("ryu" ,rust-ryu-1.0) + ("serde-derive" ,rust-serde-derive-1.0) + ("strsim" ,rust-strsim-0.8) + ("termion" ,rust-termion-1.5) + ("textwrap" ,rust-textwrap-0.11) + ("unicode-width" ,rust-unicode-width-0.1) + ("unicode-xid" ,rust-unicode-xid-0.2) + ("vec-map" ,rust-vec-map-0.8) + ("winapi" ,rust-winapi-0.3)))) + (home-page "https://github.com/eqrion/cbindgen/") + (synopsis "Tool for generating C bindings to Rust code") + (description + "This package provides a tool for generating C/C++ bindings to Rust code.") + (license license:mpl2.0))) diff --git a/gnu/packages/rust-cbindgen.scm b/gnu/packages/rust-cbindgen.scm deleted file mode 100644 index 2590af913f..0000000000 --- a/gnu/packages/rust-cbindgen.scm +++ /dev/null @@ -1,87 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2019 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 rust-cbindgen) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix build-system cargo) - #:use-module (gnu packages crates-io)) - -(define-public rust-cbindgen - (package - (name "rust-cbindgen") - (version "0.9.1") - (source - (origin - (method url-fetch) - (uri (crate-uri "cbindgen" version)) - (file-name (string-append name "-" version ".crate")) - (sha256 - (base32 - "1zgamxahlxmg4warzivaa8m1f8d6b45mhznm7n6d7p5l18acdblx")))) - (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("clap" ,rust-clap-2) - ("log" ,rust-log-0.4) - ("proc-macro2" ,rust-proc-macro2-1.0) - ("quote" ,rust-quote-1.0) - ("serde" ,rust-serde-1.0) - ("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 - (("ansi-term" ,rust-ansi-term-0.11) - ("atty" ,rust-atty-0.2) - ("autocfg" ,rust-autocfg-0.1) - ("bitflags" ,rust-bitflags-1) - ("cfg-if" ,rust-cfg-if-0.1) - ("cloudabi" ,rust-cloudabi-0.0) - ("fuchsia-cprng" ,rust-fuchsia-cprng-0.1) - ("itoa" ,rust-itoa-0.4) - ("libc" ,rust-libc-0.2) - ("numtoa" ,rust-numtoa-0.1) - ("rand" ,rust-rand-0.6) - ("rand-chacha" ,rust-rand-chacha-0.1) - ("rand-core" ,rust-rand-core-0.3) - ("rand-hc" ,rust-rand-hc-0.1) - ("rand-isaac" ,rust-rand-isaac-0.1) - ("rand-jitter" ,rust-rand-jitter-0.1) - ("rand-os" ,rust-rand-os-0.1) - ("rand-pcg" ,rust-rand-pcg-0.1) - ("rand-xorshift" ,rust-rand-xorshift-0.1) - ("rdrand" ,rust-rdrand-0.4) - ("redox-syscall" ,rust-redox-syscall-0.1) - ("redox-termios" ,rust-redox-termios-0.1) - ("remove-dir-all" ,rust-remove-dir-all-0.5) - ("ryu" ,rust-ryu-1.0) - ("serde-derive" ,rust-serde-derive-1.0) - ("strsim" ,rust-strsim-0.8) - ("termion" ,rust-termion-1.5) - ("textwrap" ,rust-textwrap-0.11) - ("unicode-width" ,rust-unicode-width-0.1) - ("unicode-xid" ,rust-unicode-xid-0.2) - ("vec-map" ,rust-vec-map-0.8) - ("winapi" ,rust-winapi-0.3)))) - (home-page "https://github.com/eqrion/cbindgen/") - (synopsis "Tool for generating C bindings to Rust code") - (description - "This package provides a tool for generating C/C++ bindings to Rust code.") - (license license:mpl2.0))) -- cgit v1.2.3 From 747c302bf7eda2896affbcaec315f0b7eb5a1a94 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 2 Jan 2020 16:05:48 +0200 Subject: gnu: crates-io.scm: Sort alphabetically. * gnu/packages/crates-io.scm: Sort packages alphabetically. (rust-term-0.5.1, rust-term-0.4)[inherit]: Inherit from rust-term-0.5. --- gnu/packages/crates-io.scm | 158 ++++++++++++++++++++++----------------------- 1 file changed, 79 insertions(+), 79 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a0f4eb56d9..dfcff856b8 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2918,40 +2918,6 @@ (define-public rust-findshlibs-0.5 (license (list license:asl2.0 license:expat)))) -(define-public rust-rustfix-0.4 - (package - (name "rust-rustfix") - (version "0.4.6") - (source - (origin - (method url-fetch) - (uri (crate-uri "rustfix" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "01zn0ysnass3mmrhxk90584y713vjfq1x97mi4saac99g9vsql3i")))) - (build-system cargo-build-system) - (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-failure" ,rust-failure-0.1) - ("rust-log" ,rust-log-0.4) - ("rust-serde" ,rust-serde-1.0) - ("rust-serde-json" ,rust-serde-json-1.0)) - #:cargo-development-inputs - (("rust-difference" ,rust-difference-2.0) - ("rust-duct" ,rust-duct-0.13) - ("rust-env-logger" ,rust-env-logger-0.6) - ("rust-log" ,rust-log-0.4) - ("rust-proptest" ,rust-proptest-0.9) - ("rust-tempdir" ,rust-tempdir-0.3)))) - (home-page "https://github.com/rust-lang/rustfix") - (synopsis "Automatically apply the suggestions made by rustc") - (description - "Automatically apply the suggestions made by rustc.") - (license (list license:expat license:asl2.0)))) - (define-public rust-fixedbitset-0.1 (package (name "rust-fixedbitset") @@ -7726,27 +7692,6 @@ (define-public rust-rand-pcg-0.1 (license (list license:asl2.0 license:expat)))) -(define-public rust-rand-xorshift-0.1 - (package - (name "rust-rand-xorshift") - (version "0.1.1") - (source - (origin - (method url-fetch) - (uri (crate-uri "rand_xorshift" version)) - (file-name (string-append name "-" version ".crate")) - (sha256 - (base32 - "0p2x8nr00hricpi2m6ca5vysiha7ybnghz79yqhhx6sl4gkfkxyb")))) - (build-system cargo-build-system) - (home-page "https://crates.io/crates/rand-xorshift") - (synopsis "Xorshift random number generator") - (description - "Xorshift random number generator") - (properties '((hidden? . #t))) - (license (list license:asl2.0 - license:expat)))) - (define-public rust-rand-xorshift-0.2 (package (name "rust-rand-xorshift") @@ -7774,6 +7719,27 @@ (define-public rust-rand-xorshift-0.2 "Xorshift random number generator.") (license (list license:expat license:asl2.0)))) +(define-public rust-rand-xorshift-0.1 + (package + (name "rust-rand-xorshift") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "rand_xorshift" version)) + (file-name (string-append name "-" version ".crate")) + (sha256 + (base32 + "0p2x8nr00hricpi2m6ca5vysiha7ybnghz79yqhhx6sl4gkfkxyb")))) + (build-system cargo-build-system) + (home-page "https://crates.io/crates/rand-xorshift") + (synopsis "Xorshift random number generator") + (description + "Xorshift random number generator") + (properties '((hidden? . #t))) + (license (list license:asl2.0 + license:expat)))) + (define-public rust-rand-xoshiro-0.3 (package (name "rust-rand-xoshiro") @@ -8336,6 +8302,40 @@ (define-public rust-rustc-version-0.2 rustc compiler.") (license (list license:expat license:asl2.0)))) +(define-public rust-rustfix-0.4 + (package + (name "rust-rustfix") + (version "0.4.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "rustfix" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "01zn0ysnass3mmrhxk90584y713vjfq1x97mi4saac99g9vsql3i")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-failure" ,rust-failure-0.1) + ("rust-log" ,rust-log-0.4) + ("rust-serde" ,rust-serde-1.0) + ("rust-serde-json" ,rust-serde-json-1.0)) + #:cargo-development-inputs + (("rust-difference" ,rust-difference-2.0) + ("rust-duct" ,rust-duct-0.13) + ("rust-env-logger" ,rust-env-logger-0.6) + ("rust-log" ,rust-log-0.4) + ("rust-proptest" ,rust-proptest-0.9) + ("rust-tempdir" ,rust-tempdir-0.3)))) + (home-page "https://github.com/rust-lang/rustfix") + (synopsis "Automatically apply the suggestions made by rustc") + (description + "Automatically apply the suggestions made by rustc.") + (license (list license:expat license:asl2.0)))) + (define-public rust-rusty-fork-0.2 (package (name "rust-rusty-fork") @@ -9930,30 +9930,8 @@ (define-public rust-tendril-0.4 "Compact buffer/string type for zero-copy parsing.") (license (list license:expat license:asl2.0)))) -(define-public rust-term-0.4 - (package - (name "rust-term") - (version "0.4.6") - (source - (origin - (method url-fetch) - (uri (crate-uri "term" version)) - (file-name (string-append name "-" version ".crate")) - (sha256 - (base32 - "1wbh8ngqkqr3f6wz902yplf60bd5yapnckvrkgmzp5nffi7n8qzs")))) - (build-system cargo-build-system) - (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)))) - (define-public rust-term-0.5 (package - (inherit rust-term-0.4) (name "rust-term") (version "0.5.2") (source @@ -9964,11 +9942,19 @@ (define-public rust-term-0.5 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0hkgjrfisj6zjwz525639pmsvzhlc48a0h65nw87qrdp6jihdlgd")))))) + "0hkgjrfisj6zjwz525639pmsvzhlc48a0h65nw87qrdp6jihdlgd")))) + (build-system cargo-build-system) + (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)))) (define-public rust-term-0.5.1 (package - (inherit rust-term-0.4) + (inherit rust-term-0.5) (name "rust-term") (version "0.5.1") (source @@ -9983,6 +9969,20 @@ (define-public rust-term-0.5.1 (arguments `(#:skip-build? #t)) (properties '()))) +(define-public rust-term-0.4 + (package + (inherit rust-term-0.5) + (name "rust-term") + (version "0.4.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "term" version)) + (file-name (string-append name "-" version ".crate")) + (sha256 + (base32 + "1wbh8ngqkqr3f6wz902yplf60bd5yapnckvrkgmzp5nffi7n8qzs")))))) + (define-public rust-termcolor-1.0 (package (name "rust-termcolor") -- cgit v1.2.3 From f9fde7ae62b33e782fec27b2fa8a0dfb26044d5f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 2 Jan 2020 16:12:43 +0200 Subject: gnu: rust-clippy-0.0: Build with rust-term-0.5. * gnu/packages/crates-io.scm (rust-clippy-0.0)[arguments]: Replace rust-term-0.5.1 with rust-term-0.5 in cargo-inputs. (rust-term-0.5.1): Remove variable. --- gnu/packages/crates-io.scm | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index dfcff856b8..5c75a2cc5b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1294,7 +1294,7 @@ (define-public rust-clippy-0.0 (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-term" ,rust-term-0.5.1)))) + (("rust-term" ,rust-term-0.5)))) (home-page "https://github.com/rust-lang/rust-clippy") (synopsis "Lints to avoid common pitfalls in Rust") @@ -9952,23 +9952,6 @@ (define-public rust-term-0.5 (license (list license:asl2.0 license:expat)))) -(define-public rust-term-0.5.1 - (package - (inherit rust-term-0.5) - (name "rust-term") - (version "0.5.1") - (source - (origin - (method url-fetch) - (uri (crate-uri "term" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0qbmqd8jbjlqr4608qdmvp6yin5ypifzi5s2xyhlw8g8s5ynfssy")))) - (arguments `(#:skip-build? #t)) - (properties '()))) - (define-public rust-term-0.4 (package (inherit rust-term-0.5) -- cgit v1.2.3 From a7542ad47abb44d8e33e7465d53d752968b74a21 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 2 Jan 2020 17:17:18 +0200 Subject: gnu: rust-serde-json-1.0: Skip build. * gnu/packages/crates-io.scm (rust-serde-json-1.0)[arguments]: Skip build. Add rust-indexmap-1.0, rust-itoa-0.4, rust-yru-1.0, rust-serde-1.0 to cargo-inputs. Add rust-serde-bytes-0.11, rust-serde-derive-1.0, rust-trybuild-1.0 to cargo-development-inputs. [properties]: Remove 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 5c75a2cc5b..473b7a3c0a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8837,11 +8837,21 @@ (define-public rust-serde-json-1.0 (base32 "1hipk84x40454mf599752mi7l08wb8qakz8vd6d3zp57d0mfnwig")))) (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-indexmap" ,rust-indexmap-1.0) + ("rust-itoa" ,rust-itoa-0.4) + ("rust-ryu" ,rust-ryu-1.0) + ("rust-serde" ,rust-serde-1.0)) + #:cargo-development-inputs + (("rust-serde-bytes" ,rust-serde-bytes-0.11) + ("rust-serde-derive" ,rust-serde-derive-1.0) + ("rust-trybuild" ,rust-trybuild-1.0)))) (home-page "https://github.com/serde-rs/json") (synopsis "A JSON serialization file format") (description "This package provides a JSON serialization file format.") - (properties '((hidden? . #t))) (license (list license:expat license:asl2.0)))) (define-public rust-serde-test-1.0 -- cgit v1.2.3 From 709f1d5371d5199093bab66624a3551d6c2b94f8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 2 Jan 2020 17:19:12 +0200 Subject: gnu: rust-clap-2: Skip build. * gnu/packages/crates-io.scm (rust-clap-2)[arguments]: Skip build. Add rust-ansi-term-0.11, rust-atty-0.2, rust-bitflags-1, rust-clippy-0.0, rust-strsim-0.8, rust-textwrap-0.11, rust-unicode-width-0.1, rust-vec-map-0.8, rust-yaml-rust-0.4 to cargo-inputs. Add rust-lazy-static-1.3, rust-regex-1.1, rust-version-sync-0.8 to cargo-development-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 473b7a3c0a..d87e53f949 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1248,12 +1248,27 @@ (define-public rust-clap-2 (base32 "1nf6ld3bims1n5vfzhkvcb55pdzh04bbhzf8nil5vvw05nxzarsh")))) (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-ansi-term" ,rust-ansi-term-0.11) + ("rust-atty" ,rust-atty-0.2) + ("rust-bitflags" ,rust-bitflags-1) + ("rust-clippy" ,rust-clippy-0.0) + ("rust-strsim" ,rust-strsim-0.8) + ("rust-textwrap" ,rust-textwrap-0.11) + ("rust-unicode-width" ,rust-unicode-width-0.1) + ("rust-vec-map" ,rust-vec-map-0.8) + ("rust-yaml-rust" ,rust-yaml-rust-0.4)) + #:cargo-development-inputs + (("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-regex" ,rust-regex-1.1) + ("rust-version-sync" ,rust-version-sync-0.8)))) (home-page "https://clap.rs/") (synopsis "Command Line Argument Parser") (description "This package provides a simple to use, efficient, and full-featured Command Line Argument Parser.") - (properties '((hidden? . #t))) (license license:expat))) (define-public rust-clicolors-control-1.0 -- cgit v1.2.3 From f916b7a4100ab7c61f22fa06462d049e77f0844f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 2 Jan 2020 17:21:35 +0200 Subject: gnu: rust-termcolor-1.0: Skip build. * gnu/packages/crates-io.scm (rust-termcolor-1.0)[arguments]: Skip build. Add rust-wincolor-1.0 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 d87e53f949..555463b72f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10004,11 +10004,14 @@ (define-public rust-termcolor-1.0 (base32 "0vjfsn1a8zvqhnrbygrz1id6yckwv1dncw3w4zj65qdx0f00kmln")))) (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-wincolor" ,rust-wincolor-1.0)))) (home-page "https://github.com/BurntSushi/termcolor") (synopsis "Library for writing colored text to a terminal") (description "This package provides a simple cross platform library for writing colored text to a terminal.") - (properties '((hidden? . #t))) (license (list license:unlicense license:expat)))) -- cgit v1.2.3 From 36dfd43dc3386b1ef58807b9d58b3c30deaf5e99 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 2 Jan 2020 17:24:14 +0200 Subject: gnu: rust-regex-syntax-0.6: Skip build. * gnu/packages/crates-io.scm (rust-regex-syntax-0.6)[arguments]: Skip build. Add rust-ucd-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 555463b72f..3077f05d4d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8094,11 +8094,14 @@ (define-public rust-regex-syntax-0.6 (base32 "0p47lf38yj2g2fnmvnraccqlxwk35zr76hlnqi8yva932nzqam6d")))) (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-ucd-util" ,rust-ucd-util-0.1)))) (home-page "https://github.com/rust-lang/regex") (synopsis "Regular expression parser") (description "This package provides a regular expression parser.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 7072c72d1fa905902ea1c309c3dda4491ec2f51a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 2 Jan 2020 17:35:35 +0200 Subject: gnu: rust-lazy-static-1.3: Skip build. * gnu/packages/crates-io.scm (rust-lazy-static-1.3)[arguments]: Skip build. Add rust-spin-0.5 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 3077f05d4d..7b60a821a4 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4774,6 +4774,9 @@ (define-public rust-lazy-static-1.3 (base32 "052ac27w189hrf1j3hz7sga46rp84zl2hqnzyihxv78mgzr2jmxw")))) (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs (("rust-spin" ,rust-spin-0.5)))) (home-page "https://github.com/rust-lang-nursery/lazy-static.rs") (synopsis "Macro for declaring lazily evaluated statics in Rust") (description @@ -4782,7 +4785,6 @@ (define-public rust-lazy-static-1.3 to be executed at runtime in order to be initialized. This includes anything requiring heap allocations, like vectors or hash maps, as well as anything that requires non-const function calls to be computed.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From cddb4ed0c378f6bc0f0b50e23855faa59aa0abc3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 2 Jan 2020 17:42:15 +0200 Subject: gnu: rust-log-0.4: Skip build. * gnu/packages/crates-io.scm (rust-log-0.4)[arguments]: Skip build. Add rust-cfg-if-0.1, rust-serde-1.0 to cargo-inputs. Add rust-serde-test-1.0 to cargo-development-inputs. --- 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 7b60a821a4..196b9a7778 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5060,11 +5060,17 @@ (define-public rust-log-0.4 (base32 "1xz18ixccl5c6np4linv3ypc7hpmmgpc5zzd2ymp2ssfx0mhbdhl")))) (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-cfg-if" ,rust-cfg-if-0.1) + ("rust-serde" ,rust-serde-1.0)) + #:cargo-development-inputs + (("rust-serde-test" ,rust-serde-test-1.0)))) (home-page "https://github.com/rust-lang/log") (synopsis "Lightweight logging facade for Rust") (description "This package provides a lightweight logging facade for Rust.") - (properties '((hidden? . #t))) (license (list license:expat license:asl2.0)))) (define-public rust-log-0.3 -- cgit v1.2.3 From 784f39f11dcbdd28bcbdcff6f0fbafa0da88f326 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 2 Jan 2020 17:44:37 +0200 Subject: gnu: rust-serde-1.0: Skip build. * gnu/packages/crates-io.scm (rust-serde-1.0)[arguments]: Skip build. Add rust-serde-derive-1.0 to cargo-inputs. Add rust-serde-derive-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 196b9a7778..5c91afd9ab 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8757,11 +8757,16 @@ (define-public rust-serde-1.0 (base32 "1p8r24hagcsrl92w5z32nfrg9040qkgqf8iwwnf7mzigpavwk5lp")))) (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-serde-derive" ,rust-serde-derive-1.0)) + #:cargo-development-inputs + (("rust-serde-derive" ,rust-serde-derive-1.0)))) (home-page "https://serde.rs") (synopsis "Generic serialization/deserialization framework") (description "This package provides a generic serialization/deserialization framework.") - (properties '((hidden? . #t))) (license (list license:expat license:asl2.0)))) ;; Circular dev dependency on bincode. -- cgit v1.2.3 From 390f419766a8ece4f2a8a22c99cb1d566171eda2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 2 Jan 2020 17:47:17 +0200 Subject: gnu: rust-tempfile-3.0: Skip build. * gnu/packages/crates-io.scm (rust-tempfile-3.0)[arguments]: Skip build. Add rust-cfg-if-0.1, rust-libc-0.2, rust-rand-0.6, rust-redox-syscall-0.1, rust-remove-dir-all-0.5, rust-winapi-0.3 to cargo-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 5c91afd9ab..1f7ccdbec9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9932,12 +9932,20 @@ (define-public rust-tempfile-3.0 (base32 "1vqk7aq2l04my2r3jiyyxirnf8f90nzcvjasvrajivb85s7p7i3x")))) (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-redox-syscall" ,rust-redox-syscall-0.1) + ("rust-remove-dir-all" ,rust-remove-dir-all-0.5) + ("rust-winapi" ,rust-winapi-0.3)))) (home-page "http://stebalien.com/projects/tempfile-rs") (synopsis "Library for managing temporary files and directories") (description "This package provides a library for managing temporary files and directories.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From badffd89bb4f930c05358b42226fee6a8696afa5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 2 Jan 2020 17:49:40 +0200 Subject: gnu: rust-rand-0.3: Skip build. * gnu/packages/crates-io.scm (rust-rand-0.3)[arguments]: Skip build. Add rust-libc-0.2, rust-rand-0.4 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 1f7ccdbec9..085193a785 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7468,7 +7468,13 @@ (define-public rust-rand-0.3 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "0v679h38pjjqj5h4md7v2slsvj6686qgcn7p9fbw3h43iwnk1b34")))))) + "0v679h38pjjqj5h4md7v2slsvj6686qgcn7p9fbw3h43iwnk1b34")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-rand" ,rust-rand-0.4)))) + (properties `()))) (define-public rust-rand-chacha-0.2 (package -- cgit v1.2.3 From c85ed23dc81fcbe88af1fbc4297c21248b10cdea Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 2 Jan 2020 17:51:54 +0200 Subject: gnu: rust-rand-0.4: Skip build. * gnu/packages/crates-io.scm (rust-rand-0.4)[arguments]: Skip build. Add rust-fuchsia-zircon-0.3, rust-libc-0.2, rust-winapi-0.3 to cargo-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 085193a785..578fb19dc9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7454,7 +7454,14 @@ (define-public rust-rand-0.4 (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1gfgnqfj2pyh27dcb720jpawskllwnbvxh816ddyykv269xz8ml3")))))) + "1gfgnqfj2pyh27dcb720jpawskllwnbvxh816ddyykv269xz8ml3")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-fuchsia-zircon" ,rust-fuchsia-zircon-0.3) + ("rust-libc" ,rust-libc-0.2) + ("rust-winapi" ,rust-winapi-0.3)))) + (properties `()))) (define-public rust-rand-0.3 (package -- cgit v1.2.3 From 05207cad49fca3c40a0a4d08d9cc0cf9965bd046 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 2 Jan 2020 17:56:11 +0200 Subject: gnu: rust-rand-0.6: Skip build. * gnu/packages/crates-io.scm (rust-rand-0.6)[arguments]: Skip build. Add rust-libc-0.2, rust-log-0.4, rust-packed-simd-0.3, rust-rand-chacha-0.1, rust-rand-core-0.4, rust-rand-hc-0.1, rust-rand-isaac-0.1, rust-rand-jitter-0.1, rust-rand-os-0.1, rust-rand-pcg-0.1, rust-rand-xorshift-0.1, rust-winapi-0.3 to cargo-inputs. Add rust-autocfg-0.1, rust-rand-xoshiro-0.3 to cargo-development-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 578fb19dc9..1058745b65 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7433,12 +7433,29 @@ (define-public rust-rand-0.6 (base32 "1jl4449jcl4wgmzld6ffwqj5gwxrp8zvx8w573g1z368qg6xlwbd")))) (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("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.1) + ("rust-rand-core" ,rust-rand-core-0.4) + ("rust-rand-hc" ,rust-rand-hc-0.1) + ("rust-rand-isaac" ,rust-rand-isaac-0.1) + ("rust-rand-jitter" ,rust-rand-jitter-0.1) + ("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)) + #:cargo-development-inputs + (("rust-autocfg" ,rust-autocfg-0.1) + ("rust-rand-xoshiro" ,rust-rand-xoshiro-0.3)))) (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.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) @@ -7460,8 +7477,7 @@ (define-public rust-rand-0.4 #:cargo-inputs (("rust-fuchsia-zircon" ,rust-fuchsia-zircon-0.3) ("rust-libc" ,rust-libc-0.2) - ("rust-winapi" ,rust-winapi-0.3)))) - (properties `()))) + ("rust-winapi" ,rust-winapi-0.3)))))) (define-public rust-rand-0.3 (package @@ -7480,8 +7496,7 @@ (define-public rust-rand-0.3 `(#:skip-build? #t #:cargo-inputs (("rust-libc" ,rust-libc-0.2) - ("rust-rand" ,rust-rand-0.4)))) - (properties `()))) + ("rust-rand" ,rust-rand-0.4)))))) (define-public rust-rand-chacha-0.2 (package -- cgit v1.2.3 From c282b97106abecfad32572b4f262d61162751640 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 2 Jan 2020 18:00:05 +0200 Subject: gnu: rust-rand-0.4: Update to 0.4.6. * gnu/packages/crates-io.scm (rust-rand-0.4): Update to 0.4.6. [arugments]: Remove rust-fuchsia-zircon-0.3, add rust-fuchsia-cprng-0.1, rust-rand-core-0.3, rust-rdrand-0.4 to cargo-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 1058745b65..1fe21fc7d0 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7463,7 +7463,7 @@ (define-public rust-rand-0.4 (package (inherit rust-rand-0.6) (name "rust-rand") - (version "0.4.3") + (version "0.4.6") (source (origin (method url-fetch) @@ -7471,11 +7471,13 @@ (define-public rust-rand-0.4 (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1gfgnqfj2pyh27dcb720jpawskllwnbvxh816ddyykv269xz8ml3")))) + "14qjfv3gggzhnma20k0sc1jf8y6pplsaq7n1j9ls5c8kf2wl0a2m")))) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-fuchsia-zircon" ,rust-fuchsia-zircon-0.3) + (("rust-fuchsia-cprng" ,rust-fuchsia-cprng-0.1) + ("rust-rand-core" ,rust-rand-core-0.3) + ("rust-rdrand" ,rust-rdrand-0.4) ("rust-libc" ,rust-libc-0.2) ("rust-winapi" ,rust-winapi-0.3)))))) -- cgit v1.2.3 From 2d41d861bfeba18a271305a016b06a11a02c1d5a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 2 Jan 2020 18:53:31 +0200 Subject: gnu: rust-cbindgen: Remove extra inputs. * gnu/packages/rust-apps.scm (rust-cbindgen)[arguments]: Remove all cargo-development-inputs except rust-autocfg-0.1. --- gnu/packages/rust-apps.scm | 33 +-------------------------------- 1 file changed, 1 insertion(+), 32 deletions(-) diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 0f3650f52f..215955214c 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -88,38 +88,7 @@ (define-public rust-cbindgen ("tempfile" ,rust-tempfile-3.0) ("toml" ,rust-toml-0.5)) #:cargo-development-inputs - (("ansi-term" ,rust-ansi-term-0.11) - ("atty" ,rust-atty-0.2) - ("autocfg" ,rust-autocfg-0.1) - ("bitflags" ,rust-bitflags-1) - ("cfg-if" ,rust-cfg-if-0.1) - ("cloudabi" ,rust-cloudabi-0.0) - ("fuchsia-cprng" ,rust-fuchsia-cprng-0.1) - ("itoa" ,rust-itoa-0.4) - ("libc" ,rust-libc-0.2) - ("numtoa" ,rust-numtoa-0.1) - ("rand" ,rust-rand-0.6) - ("rand-chacha" ,rust-rand-chacha-0.1) - ("rand-core" ,rust-rand-core-0.3) - ("rand-hc" ,rust-rand-hc-0.1) - ("rand-isaac" ,rust-rand-isaac-0.1) - ("rand-jitter" ,rust-rand-jitter-0.1) - ("rand-os" ,rust-rand-os-0.1) - ("rand-pcg" ,rust-rand-pcg-0.1) - ("rand-xorshift" ,rust-rand-xorshift-0.1) - ("rdrand" ,rust-rdrand-0.4) - ("redox-syscall" ,rust-redox-syscall-0.1) - ("redox-termios" ,rust-redox-termios-0.1) - ("remove-dir-all" ,rust-remove-dir-all-0.5) - ("ryu" ,rust-ryu-1.0) - ("serde-derive" ,rust-serde-derive-1.0) - ("strsim" ,rust-strsim-0.8) - ("termion" ,rust-termion-1.5) - ("textwrap" ,rust-textwrap-0.11) - ("unicode-width" ,rust-unicode-width-0.1) - ("unicode-xid" ,rust-unicode-xid-0.2) - ("vec-map" ,rust-vec-map-0.8) - ("winapi" ,rust-winapi-0.3)))) + (("autocfg" ,rust-autocfg-0.1)))) (home-page "https://github.com/eqrion/cbindgen/") (synopsis "Tool for generating C bindings to Rust code") (description -- cgit v1.2.3 From 7c4e4bac876190eae90635ba7d7f59892c31bcc6 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 2 Jan 2020 18:29:00 +0100 Subject: activation: Keep going when failing to create one of the setuid programs. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . Reported by Jakub Kądziołka . * gnu/build/activation.scm (activate-setuid-programs): Catch 'system-error' around 'make-setuid-program' calls. --- gnu/build/activation.scm | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/gnu/build/activation.scm b/gnu/build/activation.scm index c6c7e7fd3b..6d69628eb2 100644 --- a/gnu/build/activation.scm +++ b/gnu/build/activation.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2015 Mark H Weaver ;;; ;;; This file is part of GNU Guix. @@ -247,7 +247,19 @@ (define (make-setuid-program prog) string. + (format (current-error-port) + "warning: failed to make '~a' setuid-root: ~a~%" + program (strerror (system-error-errno args)))))) + programs)) (define (activate-special-files special-files) "Install the files listed in SPECIAL-FILES. Each element of SPECIAL-FILES -- cgit v1.2.3 From 09edf136efb570c3a84dd2dc2c043b28515e0c60 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 2 Jan 2020 18:32:10 +0100 Subject: ui: It's 2020 now! * guix/ui.scm (show-version-and-exit): Change year to 2020. --- guix/ui.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guix/ui.scm b/guix/ui.scm index 540671f3dd..023e604085 100644 --- a/guix/ui.scm +++ b/guix/ui.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, 2018 Mark H Weaver ;;; Copyright © 2013 Nikita Karetnikov ;;; Copyright © 2014 Cyril Roelandt @@ -494,7 +494,7 @@ (define* (show-version-and-exit #:optional (command (car (command-line)))) "Display version information for COMMAND and `(exit 0)'." (simple-format #t "~a (~a) ~a~%" command %guix-package-name %guix-version) - (format #t "Copyright ~a 2019 ~a" + (format #t "Copyright ~a 2020 ~a" ;; TRANSLATORS: Translate "(C)" to the copyright symbol ;; (C-in-a-circle), if this symbol is available in the user's ;; locale. Otherwise, do not translate "(C)"; leave it as-is. */ -- cgit v1.2.3 From 49dbeacb9dbe230abec10735ca51ffdcc83f4dd8 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 2 Jan 2020 18:58:32 +0100 Subject: gnu: guile-next: Update to 2.9.8. * gnu/packages/guile.scm (guile-next): Update to 2.9.8. --- gnu/packages/guile.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 43b3e026d1..30a72ec62c 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -288,14 +288,14 @@ (define-public guile-next (package (inherit guile-2.2) (name "guile-next") - (version "2.9.7") + (version "2.9.8") (source (origin (inherit (package-source guile-2.2)) (uri (string-append "ftp://alpha.gnu.org/gnu/guile/guile-" version ".tar.xz")) (sha256 (base32 - "1dskpj8a2gl3h8si4virq8z4y06v9ywyadfa92gn2fiip2qmkw0d")))) + "09icv9ymdb7hchn34c32s7x8ycilqj74mirmi4b3bm5zp1izd32a")))) (native-search-paths (list (search-path-specification (variable "GUILE_LOAD_PATH") -- cgit v1.2.3 From cfd9913fbea824b6a93e6808207cbd557a360d9b Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Wed, 1 Jan 2020 15:10:12 +0000 Subject: gnu: libosinfo: Update to 1.7.1. * gnu/packages/virtualization.scm (libosinfo): Update to 1.7.1. [source]: Switch the release tarball to xz compression. [build-system]: Switch to the meson build system. [arguments]: Switch the configure flags style to work with Meson. --- gnu/packages/virtualization.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 33bfdade0f..51ba3c602a 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -87,6 +87,7 @@ (define-module (gnu packages virtualization) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system go) + #:use-module (guix build-system meson) #:use-module (guix build-system python) #:use-module (guix download) #:use-module (guix git-download) @@ -302,21 +303,21 @@ (define-public qemu-minimal-2.10 (define-public libosinfo (package (name "libosinfo") - (version "1.5.0") + (version "1.7.1") (source (origin (method url-fetch) (uri (string-append "https://releases.pagure.org/libosinfo/libosinfo-" - version ".tar.gz")) + version ".tar.xz")) (sha256 (base32 - "12b0xj9fz9q91d1pz9xm6aqap5k1ip0m9m3qvqmwjy1lk1kjasdz")))) - (build-system gnu-build-system) + "1s97sv24bybggjx6hgqba2qdqz3ivfpd4cmkh4zm5y59sim109mv")))) + (build-system meson-build-system) (arguments `(#:configure-flags - (list (string-append "--with-usb-ids-path=" + (list (string-append "-Dwith-usb-ids-path=" (assoc-ref %build-inputs "usb.ids")) - (string-append "--with-pci-ids-path=" + (string-append "-Dwith-pci-ids-path=" (assoc-ref %build-inputs "pci.ids"))))) (inputs `(("libsoup" ,libsoup) -- cgit v1.2.3 From 08e69c79dc729a5bc95e218d8e4569072b8a4a79 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Thu, 2 Jan 2020 21:27:17 +0000 Subject: gnu: guix-data-service: Update to 0.0.1-15.4ed1400. * gnu/packages/web.scm (guix-data-service): Update to 0.0.1-15.4ed1400. --- 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 69e644b4f1..3a8a04c76d 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4194,8 +4194,8 @@ (define-public python2-feedparser (package-with-python2 python-feedparser)) (define-public guix-data-service - (let ((commit "f2343b5fc9228b08be87a2a3a87cc6eda75d674c") - (revision "14")) + (let ((commit "4ed14007c44f55869d30358b6da2235069dfcaf9") + (revision "15")) (package (name "guix-data-service") (version (string-append "0.0.1-" revision "." (string-take commit 7))) @@ -4207,7 +4207,7 @@ (define-public guix-data-service (file-name (git-file-name name version)) (sha256 (base32 - "0kmhyrp1fj5ghayda77pzxl8z1gcr33349yirmjnki0l7fpc2nww")))) + "06smgbw9jdyarnz877dsd6mjcd3nhs9hav5z6h8cngvpznjf3hy8")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) -- cgit v1.2.3 From 07f7bf3624b519498b694825eb6b9b0f45af7492 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Thu, 2 Jan 2020 21:44:51 +0100 Subject: gnu: Add go-github-com-fatih-color. * gnu/packages/golang.scm (go-github-com-fatih-color): New variable. --- gnu/packages/golang.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 76b93c0d14..5d2eef699b 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3036,3 +3036,25 @@ (define-public go-github-com-shirou-gopsutil sensors).") (home-page "https://github.com/shirou/gopsutil") (license license:bsd-3)))) + +(define-public go-github-com-fatih-color + (package + (name "go-github-com-fatih-color") + (version "1.8.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fatih/color.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1zc0zlilf03h121f9jqq3ar0hfm7706547zysxp2qxbm920pz7h0")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/fatih/color")) + (synopsis "Print colored text in Go") + (description "This package provides an ANSI color package to output +colorized or SGR defined output to the standard output.") + (home-page "https://godoc.org/github.com/fatih/color") + (license license:expat))) -- cgit v1.2.3 From ee46bc5983063d5662417d722e85e00abb6737de Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Thu, 2 Jan 2020 22:43:26 +0100 Subject: gnu: Add go-github-com-google-go-cmp-cmp. * gnu/packages/golang.scm (go-github-com-google-go-cmp-cmp): New variable. --- gnu/packages/golang.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 5d2eef699b..d66527c660 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3058,3 +3058,27 @@ (define-public go-github-com-fatih-color colorized or SGR defined output to the standard output.") (home-page "https://godoc.org/github.com/fatih/color") (license license:expat))) + +(define-public go-github-com-google-go-cmp-cmp + (package + (name "go-github-com-google-go-cmp-cmp") + (version "0.3.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/google/go-cmp.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1caw49i0plkjxir7kdf5qhwls3krqwfmi7g4h392rdfwi3kfahx1")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/google/go-cmp/cmp" + #:unpack-path "github.com/google/go-cmp")) + (synopsis "Determine equality of values in Go") + (description "This package provides a more powerful and safer +alternative to @code{reflect.DeepEqual} for comparing whether two values +are semantically equal in Go (for writing tests).") + (home-page "https://godoc.org/github.com/google/go-cmp/cmp") + (license license:asl2.0))) -- cgit v1.2.3 From 4dbc3c2c00ba4f0ff181bd326df89c1b6a46a3e8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 2 Jan 2020 00:17:38 +0100 Subject: gnu: freeciv: Update to 2.6.1. * gnu/packages/games.scm (freeciv): Update to 2.6.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 80ea82c123..284a7d8f04 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -24,7 +24,7 @@ ;;; Copyright © 2016 Steve Webber ;;; Copyright © 2017 Adonay "adfeno" Felipe Nogueira ;;; Copyright © 2017, 2018 Arun Isaac -;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2017, 2019 nee ;;; Copyright © 2017 Clément Lassieur ;;; Copyright © 2017, 2019 Marius Bakke @@ -4144,7 +4144,7 @@ (define-public kobodeluxe (define-public freeciv (package (name "freeciv") - (version "2.6.0") + (version "2.6.1") (source (origin (method url-fetch) @@ -4156,8 +4156,7 @@ (define-public freeciv (version-major+minor version) "/" version "/freeciv-" version ".tar.bz2"))) (sha256 - (base32 - "16f9wsnn7073s6chzbm3819swd0iw019p9nrzr3diiynk28kj83w")))) + (base32 "1qmrhrwm0ryvsh1zsxcxj128lhyvaxap7k39sam3hh8rl0fq9rnc")))) (build-system gnu-build-system) (inputs `(("curl" ,curl) -- cgit v1.2.3 From d6ca9faf0d26172f4e21eeaa18e3799258fd5f3a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 2 Jan 2020 00:21:41 +0100 Subject: gnu: freeciv: Fix typo in synopsis and description. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/games.scm (freeciv)[synopsis, description]: Add missing hyphen. ‘In’ → ‘into’ age. --- 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 284a7d8f04..79971d7611 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4167,11 +4167,11 @@ (define-public freeciv (native-inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.freeciv.org/") - (synopsis "Turn based empire building strategy game") - (description "Freeciv is a turn based empire building strategy game + (synopsis "Turn-based empire building strategy game") + (description "Freeciv is a turn-based empire building strategy game inspired by the history of human civilization. The game commences in prehistory and your mission is to lead your tribe from the Stone Age -to the Space Age.") +into the Space Age.") (license license:gpl2+))) (define-public no-more-secrets -- cgit v1.2.3 From 2702d665675245210f51e7a04f89028eed28da98 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 2 Jan 2020 00:58:41 +0100 Subject: gnu: deutex: Update to 5.2.1. * gnu/packages/game-development.scm (deutex): Update to 5.2.1. --- gnu/packages/game-development.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index febe15fa57..e895460dd1 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2016, 2017 Kei Kebreau ;;; Copyright © 2016, 2018, 2019 Ricardo Wurmus ;;; Copyright © 2016, 2017, 2018 Julian Graham -;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2017 Manolis Fragkiskos Ragkousis ;;; Copyright © 2017 Peter Mikkelsen ;;; Copyright © 2017 Arun Isaac @@ -155,7 +155,7 @@ (define-public bullet (define-public deutex (package (name "deutex") - (version "5.2.0") + (version "5.2.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/Doom-Utils/deutex" @@ -163,7 +163,7 @@ (define-public deutex "deutex-" version ".tar.xz")) (sha256 (base32 - "1d536d3i78k4ch8mjg7lqnamnyfpp2x5x7mzx5smqi9ad8lb6hqz")))) + "07w3asqxx89wl2wfv1z3cak8v83h3ys3b39mq9qq4gyf3xdhs76n")))) (build-system gnu-build-system) (native-inputs `(("asciidoc" ,asciidoc))) (home-page "https://github.com/Doom-Utils/deutex") -- cgit v1.2.3 From 623a0d8331ac959d5d6fbe94e7cc260baaf7d42d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 2 Jan 2020 01:08:45 +0100 Subject: gnu: bullet: Update to 2.89. * gnu/packages/game-development.scm (bullet): Update to 2.89. [source]: Adjust snippet. --- gnu/packages/game-development.scm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index e895460dd1..4dc56f43ac 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -93,7 +93,7 @@ (define-module (gnu packages game-development) (define-public bullet (package (name "bullet") - (version "2.88") + (version "2.89") (source (origin (method git-fetch) (uri (git-reference @@ -102,7 +102,7 @@ (define-public bullet (file-name (git-file-name name version)) (sha256 (base32 - "00qkif245yj7n2f262bgjaxv1bz3wmmcsfnjgy3qpzvlpzpns5z8")) + "10ncf2z474jnv7p5lv01ak2mk2hib3rj5rz1zr8v2v5pnciqbijl")) (modules '((guix build utils))) (snippet '(begin @@ -112,11 +112,10 @@ (define-public bullet '("Gwen" "clsocket" "enet" "glad" "imgui" "lua-5.2.3" "midi" "minizip" "openvr" "optionalX11" "serial" "zlib"))) - ;; These need files from ThirdPartyLibs + ;; These need files from ThirdPartyLibs. (substitute* "Extras/CMakeLists.txt" - (("BulletRobotics") "") - (("obj2sdf") "")) - ;; Tests fail on linking, cannot find -lBussIK + (("BulletRobotics") "")) + ;; Tests fail on linking, cannot find -lBussIK. (substitute* "test/CMakeLists.txt" ((" InverseDynamics") "../examples/ThirdPartyLibs/BussIK InverseDynamics")) @@ -133,7 +132,7 @@ (define-public bullet #:phases (modify-phases %standard-phases (add-after 'unpack 'remove-failing-tests - ;; These tests fail specifically after removing 3rd party code + ;; These tests fail specifically after removing 3rd party code. (lambda _ (substitute* "test/SharedMemory/CMakeLists.txt" (("ADD_TEST") "# ADD_TEST")) -- cgit v1.2.3 From ac6313280978e762dd74feaff123cfafc1c80462 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 2 Jan 2020 01:09:05 +0100 Subject: gnu: evince: Don't use NAME in source URI. * gnu/packages/gnome.scm (evince)[source]: Hard-code NAME. --- gnu/packages/gnome.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 036547f471..564ea07308 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -21,7 +21,7 @@ ;;; Copyright © 2016 Alex Griffin ;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2016 David Craven -;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2017 Hartmut Goebel ;;; Copyright © 2017, 2018 nee @@ -1006,9 +1006,9 @@ (define-public evince (version "3.34.1") (source (origin (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" + (uri (string-append "mirror://gnome/sources/evince/" (version-major+minor version) "/" - name "-" version ".tar.xz")) + "evince-" version ".tar.xz")) (sha256 (base32 "1pr6fvbaam1mzxjwyqd53hcxzdjzf73idn10j4j7n54nwg6hgr45")))) -- cgit v1.2.3 From 936d56427a76f0d60a5257288a620701f2da4a35 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 2 Jan 2020 01:09:10 +0100 Subject: gnu: evince: Update to 3.34.2. * gnu/packages/gnome.scm (evince): Update to 3.34.2. --- 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 564ea07308..22217aa588 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1003,7 +1003,7 @@ (define-public gnome-keyring (define-public evince (package (name "evince") - (version "3.34.1") + (version "3.34.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/evince/" @@ -1011,7 +1011,7 @@ (define-public evince "evince-" version ".tar.xz")) (sha256 (base32 - "1pr6fvbaam1mzxjwyqd53hcxzdjzf73idn10j4j7n54nwg6hgr45")))) + "05q6v9lssd21623mnj2p49clj9v9csw9kay7n4nklki025grbh1w")))) (build-system glib-or-gtk-build-system) (arguments `(#:configure-flags '("--disable-nautilus") -- cgit v1.2.3 From f89a27c6b6d6bc2fe874897e8c5a26f574df6ae0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 2 Jan 2020 01:14:34 +0100 Subject: gnu: file-roller: Don't use NAME in source URI. * gnu/packages/gnome.scm (file-roller)[source]: Hard-code NAME. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 22217aa588..275d115eeb 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5288,9 +5288,9 @@ (define-public file-roller (version "3.32.2") (source (origin (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" + (uri (string-append "mirror://gnome/sources/file-roller/" (version-major+minor version) "/" - name "-" version ".tar.xz")) + "file-roller-" version ".tar.xz")) (sha256 (base32 "0w8s6hakgsvb2nqwbv0lr8ki4cbf1pz5z3qwkb0b2k7ppbh7j2n6")))) -- cgit v1.2.3 From 170441660968b1b294154307903613302cbb18db Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 2 Jan 2020 22:59:14 +0100 Subject: gnu: emacs-orgalist: Update to 1.11. * gnu/packages/emacs-xyz.scm (emacs-orgalist): Update to 1.11. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 457e76a668..37a34fe236 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7930,7 +7930,7 @@ (define-public emacs-monroe (define-public emacs-orgalist (package (name "emacs-orgalist") - (version "1.10") + (version "1.11") (source (origin (method url-fetch) @@ -7938,7 +7938,7 @@ (define-public emacs-orgalist "orgalist-" version ".el")) (sha256 (base32 - "1m97m53d4sl7lvjk4nhcxkm3qv8zcvgfrfzkjgaxavf5ci7p4wb7")))) + "0zbqkk540rax32s8szp5zgz3a02zw88fc1dmjmyw6h3ls04m91kl")))) (build-system emacs-build-system) (home-page "http://elpa.gnu.org/packages/orgalist.html") (synopsis "Manage Org-like lists in non-Org buffers") -- cgit v1.2.3 From f4a20dca357987021e692e4b4718e8ddf8d649db Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 3 Jan 2020 00:11:48 +0100 Subject: gnu: Add python-zstandard. * gnu/packages/python-compression.scm (python-zstandard): New variable. --- gnu/packages/python-compression.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm index 705a7ffa3b..c7354bacc1 100644 --- a/gnu/packages/python-compression.scm +++ b/gnu/packages/python-compression.scm @@ -234,3 +234,23 @@ (define-public python-zipp "This package provides a @code{pathlib}-compatible @code{Zipfile} object wrapper. It provides a backport of the @code{Path} object.") (license license:expat))) + +(define-public python-zstandard + (package + (name "python-zstandard") + (version "0.13.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "zstandard" version)) + (sha256 + (base32 "0q9msi00s93iqm8vzd839r7yc51gz54z90h5bckqyjdxa6vxijz5")))) + (build-system python-build-system) + (native-inputs + `(("python-hypothesis" ,python-hypothesis))) + (home-page "https://github.com/indygreg/python-zstandard") + (synopsis "Zstandard bindings for Python") + (description "This project provides Python bindings for interfacing +with the Zstandard compression library. A C extension and CFFI +interface are provided.") + (license license:bsd-3))) -- cgit v1.2.3 From 2f907eea003a22a66c10416d99f914887d629321 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 3 Jan 2020 00:13:15 +0100 Subject: gnu: Add missing copyright header. --- gnu/packages/python-compression.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm index c7354bacc1..63335a5870 100644 --- a/gnu/packages/python-compression.scm +++ b/gnu/packages/python-compression.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2017 ng0 ;;; Copyright © 2017 Julien Lepiller ;;; Copyright © 2018, 2019 Efraim Flashner +;;; Copyright © 2020 Nicolas Goaziou ;;; ;;; This file is part of GNU Guix. ;;; -- cgit v1.2.3 From 28cdd818faf78d24841a965cf05a85b96fbd7ed5 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Fri, 3 Jan 2020 01:26:29 +0100 Subject: gnu: go-github-com-spf13-pflag: Update to 1.0.5. * gnu/packages/golang.scm (go-github-com-spf13-pflag): Update to 1.0.5. --- gnu/packages/golang.scm | 44 +++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index d66527c660..f94251abaf 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -1128,33 +1128,31 @@ (define-public go-github-com-jonboulle-clockwork (license license:asl2.0)))) (define-public go-github-com-spf13-pflag - (let ((commit "4f9190456aed1c2113ca51ea9b89219747458dc1") - (revision "0")) - (package - (name "go-github-com-spf13-pflag") - (version (git-version "0.0.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/spf13/pflag.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "12vrlcsbwjqlfc49rwky45mbcj74c0kb6z54354pzas6fwzyi1kc")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/spf13/pflag")) - (home-page "https://github.com/spf13/pflag") - (synopsis "Replacement for Go's @code{flag} package") - (description - "Pflag is library to replace Go's @code{flag} package. It implements + (package + (name "go-github-com-spf13-pflag") + (version "1.0.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/spf13/pflag.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0gpmacngd0gpslnbkzi263f5ishigzgh6pbdv9hp092rnjl4nd31")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/spf13/pflag")) + (home-page "https://github.com/spf13/pflag") + (synopsis "Replacement for Go's @code{flag} package") + (description + "Pflag is library to replace Go's @code{flag} package. It implements POSIX/GNU-style command-line options with double hyphens. It is is compatible with the @uref{https://www.gnu.org/software/libc/manual/html_node/Argument-Syntax.html, GNU extensions} to the POSIX recommendations for command-line options.") - (license license:bsd-3)))) + (license license:bsd-3))) (define-public go-github-com-sirupsen-logrus (package -- cgit v1.2.3 From 94b8fe80419b835dbcab989a48d272c2bb65798f Mon Sep 17 00:00:00 2001 From: "kanichos@yandex.ru" Date: Thu, 2 Jan 2020 13:52:44 +0300 Subject: gnu: Add libhangul. * gnu/packages/ibus.scm (libhangul): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/ibus.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 23cd670920..01d14c8c7a 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2017, 2018 Efraim Flashner ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2019 Meiyo Peng +;;; Copyright © 2020 kanichos ;;; ;;; This file is part of GNU Guix. ;;; @@ -688,3 +689,23 @@ (define-public ibus-rime compose phrases and sentences intelligently and provide very accurate traditional Chinese output.") (license gpl3+))) + +(define-public libhangul + (package + (name "libhangul") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (string-append "http://kldp.net/hangul/release/" + "3442-libhangul-" version ".tar.gz")) + (sha256 + (base32 + "0ni9b0v70wkm0116na7ghv03pgxsfpfszhgyj3hld3bxamfal1ar")))) + (build-system gnu-build-system) + (home-page "https://github.com/libhangul/libhangul") + (synopsis "Library to support hangul input method logic") + (description + "This package provides a library to support hangul input method logic, +hanja dictionary and small hangul character classification.") + (license lgpl2.1+))) -- cgit v1.2.3 From 30208c1078485f0392f476f5d89693f6d338016f Mon Sep 17 00:00:00 2001 From: "kanichos@yandex.ru" Date: Fri, 3 Jan 2020 07:19:27 +0100 Subject: gnu: Add ibus-libhangul. * gnu/packages/ibus.scm (ibus-libhangul): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/ibus.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 01d14c8c7a..70e10eae01 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -709,3 +709,47 @@ (define-public libhangul "This package provides a library to support hangul input method logic, hanja dictionary and small hangul character classification.") (license lgpl2.1+))) + +(define-public ibus-libhangul + (package + (name "ibus-libhangul") + (version "1.5.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/libhangul/ibus-hangul/" + "releases/download/" version + "/ibus-hangul-" version ".tar.gz")) + (sha256 + (base32 + "1400ba2p34vr9q285lqvjm73f6m677cgfdymmjpiwyrjgbbiqrjy")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'wrap + (lambda* (#:key inputs outputs #:allow-other-keys) + (wrap-program (string-append (assoc-ref outputs "out") + "/libexec/ibus-setup-hangul") + `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH"))) + `("LD_LIBRARY_PATH" ":" prefix + (,(string-append (assoc-ref inputs "libhangul") "/lib"))) + `("GI_TYPELIB_PATH" ":" prefix + (,(getenv "GI_TYPELIB_PATH")))) + #t))))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin"))) + (inputs + `(("ibus" ,ibus) + ("glib" ,glib) + ("python-pygobject" ,python-pygobject) + ("gtk+" ,gtk+) + ("libhangul" ,libhangul) + ("python" ,python))) + (home-page "https://github.com/libhangul/ibus-hangul") + (synopsis "Hangul engine for IBus") + (description + "ibus-hangul is a Korean input method engine for IBus.") + (license gpl2+))) -- cgit v1.2.3 From 1c00680589d002d1ca1fa84f25205f5502253527 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Fri, 3 Jan 2020 00:13:56 +0100 Subject: gnu: Add rgbds. * gnu/packages/assembly.scm (rgbds): New variable. --- gnu/packages/assembly.scm | 50 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm index fac3d478a5..7f42d22147 100644 --- a/gnu/packages/assembly.scm +++ b/gnu/packages/assembly.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2019 Guy Fleury Iteriteka ;;; Copyright © 2019 Andy Tai +;;; Copyright © 2020 Jakub Kądziołka ;;; ;;; This file is part of GNU Guix. ;;; @@ -36,6 +37,8 @@ (define-module (gnu packages assembly) #:use-module (gnu packages compression) #:use-module (gnu packages flex) #:use-module (gnu packages gettext) + #:use-module (gnu packages image) + #:use-module (gnu packages linux) #:use-module (gnu packages man) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) @@ -249,3 +252,50 @@ (define-public libjit functionality independent of any particular bytecode, language, or runtime") (license license:lgpl2.1+)))) + +(define-public rgbds + (package + (name "rgbds") + (version "0.3.9") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rednex/rgbds.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0pzd9ig3ahpgq7jbj82grllxx1v01d620insr2m8h0c6jj25n5hv")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'check + (lambda _ + (with-directory-excursion "test/asm" + (invoke "./test.sh")) + (with-directory-excursion "test/link" + (invoke "./test.sh"))))) + #:make-flags `("CC=gcc" + ,(string-append "PREFIX=" + (assoc-ref %outputs "out"))))) + (native-inputs + `(("bison" ,bison) + ("flex" ,flex) + ("pkg-config" ,pkg-config) + ("util-linux" ,util-linux))) + (inputs + `(("libpng" ,libpng))) + (home-page "https://github.com/rednex/rgbds") + (synopsis "Rednex Game Boy Development System") + (description + "RGBDS (Rednex Game Boy Development System) is an assembler/linker +package for the Game Boy and Game Boy Color. It consists of: +@itemize @bullet +@item rgbasm (assembler) +@item rgblink (linker) +@item rgbfix (checksum/header fixer) +@item rgbgfx (PNG-to-Game Boy graphics converter) +@end itemize") + (license license:expat))) -- cgit v1.2.3 From c9e7acbf0ed58772331f9e35890d5852c8fb9157 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Fri, 3 Jan 2020 01:29:04 +0100 Subject: gnu: Add sameboy. * gnu/packages/emulators.scm (sameboy): New variable. --- gnu/packages/emulators.scm | 47 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 63c1332c2f..ffcdc65265 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2017, 2018, 2019 Rutger Helling ;;; Copyright © 2019 Pierre Neidhardt ;;; Copyright © 2019 David Wilson +;;; Copyright © 2020 Jakub Kądziołka ;;; ;;; This file is part of GNU Guix. ;;; @@ -457,6 +458,52 @@ (define-public mgba ;; BSD-3. (license (list license:mpl2.0 license:lgpl2.1+ license:bsd-3)))) +(define-public sameboy + (package + (name "sameboy") + (version "0.12.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/LIJI32/SameBoy.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0m5rv2x8qck1kr43xq186pp4kaiay7gd1x775n9qrljcd7z4x6fs")))) + (build-system gnu-build-system) + (native-inputs + `(("rgbds" ,rgbds) + ("gcc" ,gcc-9) + ("pkg-config" ,pkg-config))) + (inputs + `(("sdl2" ,sdl2))) + (arguments + `(#:tests? #f ; There are no tests + #:make-flags `("CC=gcc" "CONF=release" + ,(string-append "DATA_DIR=" + (assoc-ref %outputs "out") + "/share/sameboy/")) + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (data (string-append out "/share/sameboy/"))) + (with-directory-excursion "build/bin/SDL" + (install-file "sameboy" bin) + (delete-file "sameboy") + (copy-recursively "." data)))))))) + (home-page "https://sameboy.github.io/") + (synopsis "Accurate Game Boy, Game Boy Color and Super Game Boy emulator") + (description "SameBoy is a user friendly Game Boy, Game Boy Color +and Super Game Boy emulator. SameBoy is accurate and includes a wide +range of debugging features. It has all the features one would expect +from an emulator---from save states to scaling filters.") + (license license:expat))) + (define-public mupen64plus-core (package (name "mupen64plus-core") -- cgit v1.2.3 From 26d52476a08a0a12d58cb8c924f4ea69dd232514 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Fri, 3 Jan 2020 13:50:25 +0300 Subject: gnu: tome4: Update to 1.6.5. * gnu/packages/games.scm (tome4): Update to 1.6.5. [arguments]: Use invoke in install phase --- gnu/packages/games.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 79971d7611..066e2c8cf3 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -37,7 +37,7 @@ ;;; Copyright © 2018 Benjamin Slade ;;; Copyright © 2018 Alex Vong ;;; Copyright © 2019 Pierre Neidhardt -;;; Copyright © 2019 Oleg Pykhalov +;;; Copyright © 2019, 2020 Oleg Pykhalov ;;; Copyright © 2019 Pierre Langlois ;;; Copyright © 2019 Julien Lepiller ;;; Copyright © 2019 Jesse Gibbons @@ -5181,7 +5181,7 @@ (define-public open-adventure (define-public tome4 (package (name "tome4") - (version "1.6.4") + (version "1.6.5") (synopsis "Single-player, RPG roguelike game set in the world of Eyal") (source (origin @@ -5190,7 +5190,7 @@ (define-public tome4 version ".tar.bz2")) (sha256 (base32 - "1hrh79aqmvwwd7idlr3lzpdpc9dgm1k5p7w2462chcjvd8vhfhb7")) + "0ifi057idid8xq7af8ybs99b6939hyfif1ml1ihjpx02vinmd419")) (modules '((guix build utils))) (snippet '(begin @@ -5249,11 +5249,11 @@ (define-public tome4 (wrapper (string-append bin "/" ,name))) ;; icon (mkdir-p pixmaps) - (system* unzip "-j" - (string-append - "game/engines/te4-" ,version ".teae") - (string-append - "data/gfx/" icon) "-d" pixmaps) + (invoke unzip "-j" + (string-append + "game/engines/te4-" ,version ".teae") + (string-append + "data/gfx/" icon) "-d" pixmaps) ;; game executable (install-file "t-engine" data) (mkdir-p bin) -- cgit v1.2.3 From fe9a113bb49532f8637fa05304bd0ffcf9bc0a5d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 3 Jan 2020 12:41:31 +0100 Subject: gnu: python-zstandard: Fix indentation. * gnu/packages/python-compression.scm (python-zstandard): Fix indentation. --- gnu/packages/python-compression.scm | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm index 63335a5870..0f2bc78c12 100644 --- a/gnu/packages/python-compression.scm +++ b/gnu/packages/python-compression.scm @@ -238,20 +238,20 @@ (define-public python-zipp (define-public python-zstandard (package - (name "python-zstandard") - (version "0.13.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "zstandard" version)) - (sha256 + (name "python-zstandard") + (version "0.13.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "zstandard" version)) + (sha256 (base32 "0q9msi00s93iqm8vzd839r7yc51gz54z90h5bckqyjdxa6vxijz5")))) - (build-system python-build-system) - (native-inputs - `(("python-hypothesis" ,python-hypothesis))) - (home-page "https://github.com/indygreg/python-zstandard") - (synopsis "Zstandard bindings for Python") - (description "This project provides Python bindings for interfacing -with the Zstandard compression library. A C extension and CFFI -interface are provided.") - (license license:bsd-3))) + (build-system python-build-system) + (native-inputs + `(("python-hypothesis" ,python-hypothesis))) + (home-page "https://github.com/indygreg/python-zstandard") + (synopsis "Zstandard bindings for Python") + (description "This project provides Python bindings for interfacing with +the Zstandard compression library. A C extension and CFFI interface are +provided.") + (license license:bsd-3))) -- cgit v1.2.3 From 8a66b9aa7b4c2ccc4c80c3f798f22a020b47386c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Jan 2020 00:22:53 +0100 Subject: gnu: fasm: Update to 1.73.21. * gnu/packages/assembly.scm (fasm): Update to 1.73.21. --- gnu/packages/assembly.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm index 7f42d22147..e7b755798a 100644 --- a/gnu/packages/assembly.scm +++ b/gnu/packages/assembly.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2013, 2015 Ludovic Courtès ;;; Copyright © 2013 Andreas Enge ;;; Copyright © 2016 Efraim Flashner -;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019 Guy Fleury Iteriteka ;;; Copyright © 2019 Andy Tai ;;; Copyright © 2020 Jakub Kądziołka @@ -146,14 +146,14 @@ (define-public lightning (define-public fasm (package (name "fasm") - (version "1.73.11") + (version "1.73.21") (source (origin (method url-fetch) (uri (string-append "https://flatassembler.net/fasm-" version ".tgz")) (sha256 - (base32 "1zhbs72qc8bw5158zh6mvzznfamcx5a1bsmbmq9ci0d7wb58sxmg")))) + (base32 "143zh7x3q0r2kclshh8n5w4i5pw4lh60si7rspvc725xxjpjkvcv")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests exist -- cgit v1.2.3 From caa66bde891d85ab93dcda17ecb2d825f788750d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Jan 2020 00:24:19 +0100 Subject: gnu: fasm: Expand acronym in description. * gnu/packages/assembly.scm (fasm)[description]: Expand @acronym. --- gnu/packages/assembly.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm index e7b755798a..4217b8fdad 100644 --- a/gnu/packages/assembly.scm +++ b/gnu/packages/assembly.scm @@ -177,9 +177,9 @@ (define-public fasm (supported-systems '("x86_64-linux" "i686-linux")) (synopsis "Assembler for x86 processors") (description - "FASM is an assembler that supports x86 and IA-64 Intel architectures. -It does multiple passes to optimize machine code. It has macro abilities and -focuses on operating system portability.") + "@acronym{FASM, the Flat ASseMbler} is an assembler that supports x86 and +IA-64 Intel architectures. It does multiple passes to optimize machine code. +It has macro abilities and focuses on operating system portability.") (home-page "https://flatassembler.net/") (license license:bsd-2))) -- cgit v1.2.3 From dbd0b46def98b35deca5001c15653b387ad357d3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Jan 2020 00:35:51 +0100 Subject: gnu: qbittorrent: Update to 4.2.1. * gnu/packages/bittorrent.scm (qbittorrent): Update to 4.2.1. --- gnu/packages/bittorrent.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index cab23b6753..045fbe65ab 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2016, 2017, 2018, 2019 Leo Famulari ;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2016 Tomáš Čech -;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2017 Jelle Licht ;;; Copyright © 2018 Fis Trivial ;;; Copyright © 2018 Nam Nguyen @@ -417,7 +417,7 @@ (define-public libtorrent-rasterbar (define-public qbittorrent (package (name "qbittorrent") - (version "4.2.0") + (version "4.2.1") (source (origin (method git-fetch) @@ -426,7 +426,7 @@ (define-public qbittorrent (commit (string-append "release-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "17vm6aa2k8k1q14z9r2r06c794bcr4m0l0fdsn08wid6mj1zjsbx")))) + (base32 "0bz4l7awkx4qf3gh9c8gj8fab989439zj8qy4x9r36wxdjg5cxil")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From f54d47b87cbdbec410f1d9abaa21863bbb92008a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Jan 2020 00:36:33 +0100 Subject: gnu: beep: Update to 1.4.7. * gnu/packages/terminals.scm (beep): Update to 1.4.7. --- gnu/packages/terminals.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index ae015d9fe7..b5c3b69f53 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2016 David Craven ;;; Copyright © 2016, 2017, 2019 Ludovic Courtès ;;; Copyright © 2016, 2017 José Miguel Sánchez García -;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2017 Kei Kebreau ;;; Copyright © 2017, 2018, 2019 Ricardo Wurmus ;;; Copyright © 2017 Petter @@ -396,7 +396,7 @@ (define-public picocom (define-public beep (package (name "beep") - (version "1.4.4") + (version "1.4.7") (source (origin (method git-fetch) @@ -409,7 +409,7 @@ (define-public beep (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1bk7g63qpiclbq20iz2x238by8s1b2iafdim7i6dq1i5n01s7lgx")))) + (base32 "0dnbvzzxvajc7pl1165wb3l74pfcqcdg12rcjcw86qqy954dx8my")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests -- cgit v1.2.3 From 77100119fb324b69c219d358ea7224441cc70519 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Jan 2020 00:40:15 +0100 Subject: gnu: mg: Update to 20180927. * gnu/packages/text-editors.scm (mg): Update to 20180927. --- gnu/packages/text-editors.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 4ab6e1e2ec..61f62706e4 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2017 Feng Shu ;;; Copyright © 2017 ng0 ;;; Copyright © 2014 Taylan Ulrich Bayırlı/Kammer -;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019 Efraim Flashner ;;; Copyright © 2019 Andreas Enge ;;; Copyright © 2019 Nicolas Goaziou @@ -249,7 +249,7 @@ (define-public e3 (define-public mg (package (name "mg") - (version "20180408") + (version "20180927") (source (origin (method git-fetch) (uri (git-reference @@ -258,7 +258,7 @@ (define-public mg (file-name (git-file-name name version)) (sha256 (base32 - "06w86xk7sjl2x2h3z6msn8kpmwj05qdimcym77wzhz5s94dzh1bl")) + "14vrm8lvwksf697sqks7xfd1xaqjlqjc9afjk33sksq5p27wr203")) (modules '((guix build utils))) (snippet '(begin (substitute* "GNUmakefile" -- cgit v1.2.3 From decade55ebc45ef2c57a2f0a681e1234e1b607cd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Jan 2020 01:01:43 +0100 Subject: gnu: libxls: Update to 1.5.2. * gnu/packages/statistics.scm (libxls): Update to 1.5.2. --- 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 dfbed894b1..5dd69da2ca 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2016 Ben Woodcroft ;;; Copyright © 2016, 2017 Raoul Bonnal ;;; Copyright © 2017 Kyle Meyer -;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2017 Alex Kost ;;; Copyright © 2018 Alex Branham ;;; @@ -159,14 +159,14 @@ (define-public jags (define-public libxls (package (name "libxls") - (version "1.5.1") + (version "1.5.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/libxls/libxls/releases/download/" "v" version "/libxls-" version ".tar.gz")) (sha256 - (base32 "0dam8qgbc5ykzaxmrjhpmfm8lnlcdk6cbpzyaya91qwwa80qbj1v")))) + (base32 "1akadsyl10rp101ccjmrxr7933c3v641k377bn74jv6cdkcm4zld")))) (build-system gnu-build-system) (home-page "https://github.com/libxls/libxls") (synopsis "Read binary (.xls) Excel spreadsheet files") -- cgit v1.2.3 From 599d0190607f73772cdcf26c3a7563b6a837c69b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Jan 2020 01:02:01 +0100 Subject: gnu: protozero: Update to 1.6.8. * gnu/packages/protobuf.scm (protozero): Update to 1.6.8. --- gnu/packages/protobuf.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/protobuf.scm b/gnu/packages/protobuf.scm index 5c22072132..9ef9587975 100644 --- a/gnu/packages/protobuf.scm +++ b/gnu/packages/protobuf.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2016 Daniel Pimentel ;;; Copyright © 2016 Leo Famulari ;;; Copyright © 2017, 2018, 2019 Ricardo Wurmus -;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -180,7 +180,7 @@ (define-public protobuf-c (define-public protozero (package (name "protozero") - (version "1.6.7") + (version "1.6.8") (source (origin (method git-fetch) @@ -189,7 +189,7 @@ (define-public protozero (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1ryvn3iwxiaih3mvyy45nbwxnhzfc8vby0xh9m6d6fpakhcpf6s3")))) + (base32 "1hfijpfylf1c71wa3mk70gjc88b6k1q7cxb87cwqdflw5q2x8ma6")))) (build-system cmake-build-system) (home-page "https://github.com/mapbox/protozero") (synopsis "Minimalistic protocol buffer decoder and encoder in C++") -- cgit v1.2.3 From 2559c243e7b20cd25f0a0fa842d0a2063a151446 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Jan 2020 01:08:17 +0100 Subject: gnu: opari2: Update to 2.0.5. * gnu/packages/profiling.scm (opari2): Update to 2.0.5. --- gnu/packages/profiling.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/profiling.scm b/gnu/packages/profiling.scm index 57f6b5ca81..5cc9113ffe 100644 --- a/gnu/packages/profiling.scm +++ b/gnu/packages/profiling.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Dave Love -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -173,13 +173,14 @@ (define-public otf2 (define-public opari2 (package (name "opari2") - (version "2.0.4") + (version "2.0.5") (source (origin (method url-fetch) (uri (string-append "https://www.vi-hps.org/cms/upload/packages/opari2/" "opari2-" version ".tar.gz")) - (sha256 (base32 "0cd1l30x8hygvbh6yay7mn483vjq3z4b7wnsffs80rznj93k57pn")))) + (sha256 + (base32 "1xaf25lcxk4ky1kzfks40ja9mayh8pnmrzch2107c8dcjrsxsd4h")))) (build-system gnu-build-system) (inputs `(("gfortran" ,gfortran))) (native-inputs `(("gawk" ,gawk) ; for tests -- cgit v1.2.3 From a1da1dee889ccf9ae02390fe933495f11cc64d6b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Jan 2020 01:13:03 +0100 Subject: gnu: whois: Update to 5.5.4. * gnu/packages/networking.scm (whois): Update to 5.5.4. --- gnu/packages/networking.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 482305de35..bbcae8f38c 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2015, 2016, 2017 Stefan Reichör ;;; Copyright © 2016 Raimon Grau -;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2016 John Darrington ;;; Copyright © 2016, 2017, 2018, 2019 Nicolas Goaziou ;;; Copyright © 2016 Eric Bavier @@ -559,15 +559,14 @@ (define-public iodine (define-public whois (package (name "whois") - (version "5.5.3") + (version "5.5.4") (source (origin (method url-fetch) (uri (string-append "mirror://debian/pool/main/w/whois/" "whois_" version ".tar.xz")) (sha256 - (base32 - "0imb87iz17a530fg1x9wnsm4bvr61hxydv29chfwzh015af3zhsm")))) + (base32 "0k97aiz7ngkjz3vhzvk27kqhnmqmkskdfx310c94qnh8fd7hiqfi")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no test suite -- cgit v1.2.3 From e4f7edf19ff5c93235a50c46a521971cadd67de2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Jan 2020 01:14:55 +0100 Subject: gnu: musl: Update to 1.1.24. * gnu/packages/musl.scm (musl): Update to 1.1.24. --- gnu/packages/musl.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/musl.scm b/gnu/packages/musl.scm index 1356b8d14d..6a6344efb5 100644 --- a/gnu/packages/musl.scm +++ b/gnu/packages/musl.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Vincent Legoll ;;; Copyright © 2016 Ricardo Wurmus -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,14 +28,14 @@ (define-module (gnu packages musl) (define-public musl (package (name "musl") - (version "1.1.22") + (version "1.1.24") (source (origin (method url-fetch) (uri (string-append "https://www.musl-libc.org/releases/" "musl-" version ".tar.gz")) (sha256 (base32 - "1qr9xqdzziy5bsyyqlh6k8yz056ll55d5yvc0gbhz61ginj422cb")))) + "18r2a00k82hz0mqdvgm7crzc7305l36109c0j9yjmkxj2alcjw0k")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; musl has no tests -- cgit v1.2.3 From 41dc70f4fff25a5f88f756c0a12a7beceb5d67f8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Jan 2020 01:30:31 +0100 Subject: gnu: x42-plugins: Update to 20191215. * gnu/packages/music.scm (x42-plugins): Update to 20191215. --- gnu/packages/music.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 9cd1c17a99..e84c477f57 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -4822,7 +4822,7 @@ (define-public sherlock-lv2 (define-public x42-plugins (package (name "x42-plugins") - (version "20191013") + (version "20191215") (source (origin (method url-fetch) @@ -4830,8 +4830,7 @@ (define-public x42-plugins (string-append "http://gareus.org/misc/x42-plugins/x42-plugins-" version ".tar.xz")) (sha256 - (base32 - "18kn1bmc0s6dp834kc51ibifzzn3bxwya4p8s8yq9f4mpmkghi24")))) + (base32 "1mwfvhsvc0qgjyiwd8pmmam1mav43lmv39fljhmj9yri558v5g1c")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no "check" target -- cgit v1.2.3 From a69b59e15b5f48f389a4f3d3adb1d2b54395bf4d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Jan 2020 01:31:50 +0100 Subject: gnu: zam-plugins: Update to 3.12. * gnu/packages/music.scm (zam-plugins): Update to 3.12. --- gnu/packages/music.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index e84c477f57..a0ba6a261d 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -4875,7 +4875,7 @@ (define-public x42-plugins (define-public zam-plugins (package (name "zam-plugins") - (version "3.11") + (version "3.12") (source (origin (method git-fetch) @@ -4889,8 +4889,7 @@ (define-public zam-plugins (recursive? #t))) (file-name (git-file-name name version)) (sha256 - (base32 - "0jlbxm0g93plgd3g4r9rsr0c7868ms49bs0ljpqb6kw6132hsapp")))) + (base32 "0icsbarc9azcp0kjjydmiqn401v60jmf16zdcp4040q8g7bpfmfa")))) (build-system gnu-build-system) (arguments `(#:tests? #f ;no "check" target -- cgit v1.2.3 From a96c00865aeba1c05b56822e6a0601dd81e85c67 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Jan 2020 01:32:07 +0100 Subject: gnu: eyed3: Update to 0.8.12. * gnu/packages/mp3.scm (eyed3): Update to 0.8.12. --- gnu/packages/mp3.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index 695a01a297..af3cc2540f 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2017, 2019 Pierre Langlois -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. @@ -476,13 +476,13 @@ (define-public mpc123 (define-public eyed3 (package (name "eyed3") - (version "0.8.11") + (version "0.8.12") (source (origin (method url-fetch) (uri (pypi-uri "eyeD3" version)) (sha256 - (base32 "1347mhjysbdpmmvdqm6lhskdw0qj9vjdn4n172ffnz958adrnk0f")))) + (base32 "0vabr7hh6vy1w8gn35vmx9qwiyrfv734d5ahifg7x3pv0c5fqkp5")))) (build-system python-build-system) (arguments `(#:tests? #f)) ; the required test data contains copyrighted material -- cgit v1.2.3 From f6c5e9871f34ee0ecf42ebcefda40380c18287c4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Jan 2020 01:32:25 +0100 Subject: gnu: synthv1: Update to 0.9.12. * gnu/packages/music.scm (synthv1): Update to 0.9.12. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index a0ba6a261d..f0cf33ead8 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1414,7 +1414,7 @@ (define-public jalv-select (define-public synthv1 (package (name "synthv1") - (version "0.9.11") + (version "0.9.12") (source (origin (method url-fetch) (uri @@ -1422,7 +1422,7 @@ (define-public synthv1 "/synthv1-" version ".tar.gz")) (sha256 (base32 - "116k2vca9dygvsd684wvxm61p0l1xrrgdph4qrrprlsr6vj0llgm")))) + "1amxrl1cqwgncw5437r572frgf6xhss3cfpbgh178i8phlq1q731")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ; there are no tests -- cgit v1.2.3 From 2e90d8225f6fbebfffa5a028a1a72809364f727f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Jan 2020 01:32:33 +0100 Subject: gnu: drumkv1: Update to 0.9.12. * gnu/packages/music.scm (drumkv1): Update to 0.9.12. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index f0cf33ead8..8152e16a6a 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1446,7 +1446,7 @@ (define-public synthv1 (define-public drumkv1 (package (name "drumkv1") - (version "0.9.11") + (version "0.9.12") (source (origin (method url-fetch) (uri @@ -1454,7 +1454,7 @@ (define-public drumkv1 "/drumkv1-" version ".tar.gz")) (sha256 (base32 - "1wnjn175l0mz51k9pjf3pdzv54c4jlh63saavld9lm6zfgfs13d7")))) + "0hmnmk9vvi43wl6say0dg7j088h7mmwmfdwjhsq89c7i7cpg78da")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ; there are no tests -- cgit v1.2.3 From e0a4cc97bf9f31144ef459d0c330698d689e50c2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Jan 2020 01:32:40 +0100 Subject: gnu: samplv1: Update to 0.9.12. * gnu/packages/music.scm (samplv1): Update to 0.9.12. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 8152e16a6a..53e8775061 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1479,7 +1479,7 @@ (define-public drumkv1 (define-public samplv1 (package (name "samplv1") - (version "0.9.11") + (version "0.9.12") (source (origin (method url-fetch) (uri @@ -1487,7 +1487,7 @@ (define-public samplv1 "/samplv1-" version ".tar.gz")) (sha256 (base32 - "17zs8kvvwqv00bm4lxpn09a5hxjlbz7k5mkl3k7jspw7rqn3djf2")))) + "0xzjxiqzcf1ygabrjsy0iachhnpy85rp9519fmj2f568r6ml6hzg")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ; there are no tests -- cgit v1.2.3 From b483ccd4cb1660d06a18de148e2a7baecf9c9b3a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Jan 2020 01:32:48 +0100 Subject: gnu: padthv1: Update to 0.9.12. * gnu/packages/music.scm (padthv1): Update to 0.9.12. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 53e8775061..f2a4cd4d8a 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1512,7 +1512,7 @@ (define-public samplv1 (define-public padthv1 (package (name "padthv1") - (version "0.9.11") + (version "0.9.12") (source (origin (method url-fetch) (uri @@ -1520,7 +1520,7 @@ (define-public padthv1 "/padthv1-" version ".tar.gz")) (sha256 (base32 - "02yfwyirjqxa075yqdnci9b9k57kdmkjvn9gnpdbnjp887pds76g")))) + "1zz3rz990k819q0rlzllqdwvag0x9k63443lb0mp8lwlczxnza6l")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ; there are no tests -- cgit v1.2.3 From 2de366484700e6e827ea8c2488c667d57a29bb3f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Jan 2020 01:33:06 +0100 Subject: gnu: qtractor: Update to 0.9.12. * gnu/packages/music.scm (qtractor): Update to 0.9.12. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index f2a4cd4d8a..a4a29bcf78 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2387,14 +2387,14 @@ (define-public aj-snapshot (define-public qtractor (package (name "qtractor") - (version "0.9.11") + (version "0.9.12") (source (origin (method url-fetch) (uri (string-append "http://downloads.sourceforge.net/qtractor/" "qtractor-" version ".tar.gz")) (sha256 (base32 - "1482da0lr77i57jby80cnn4bb9ws3v1i1j6m2hbwdnvqab9csvnx")))) + "06493sf4hr178jkvric3rmc2phh1ph2jlyh8kl9z248amq3zfnhy")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ; no "check" target -- cgit v1.2.3 From 07cb1dfc57a2ce95b41b4bef894bed413c4fb6ec Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Jan 2020 01:32:58 +0100 Subject: gnu: tuxguitar: Update to 1.5.3. * gnu/packages/music.scm (tuxguitar): Update to 1.5.3. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index a4a29bcf78..e607306282 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1733,7 +1733,7 @@ (define-public bristol (define-public tuxguitar (package (name "tuxguitar") - (version "1.5.2") + (version "1.5.3") (source (origin (method url-fetch) (uri (string-append @@ -1741,7 +1741,7 @@ (define-public tuxguitar version "/tuxguitar-" version "-src.tar.gz")) (sha256 (base32 - "10arfpgm2pw7mn922klklzn05lw5ifqx070shdrar81afmkfbbd9")))) + "1qy5kjcsl3c86kdlyvsf6dsfmfl1mv8zg0ln6g3qg3i8f35vlpp6")))) (build-system ant-build-system) (arguments `(#:build-target "build" -- cgit v1.2.3 From d774fabe4b44ec652c0209f3cb474a7c94f52e07 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Jan 2020 01:36:35 +0100 Subject: gnu: hexchat: Update to 2.14.3. * gnu/packages/messaging.scm (hexchat): Update to 2.14.3. [source]: Remove patch. * gnu/packages/patches/hexchat-crash-exit.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/messaging.scm | 7 +++--- gnu/packages/patches/hexchat-crash-exit.patch | 31 --------------------------- 3 files changed, 3 insertions(+), 36 deletions(-) delete mode 100644 gnu/packages/patches/hexchat-crash-exit.patch diff --git a/gnu/local.mk b/gnu/local.mk index 8a21223de5..c7dcc65082 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -997,7 +997,6 @@ dist_patch_DATA = \ %D%/packages/patches/hdf-eos5-remove-gctp.patch \ %D%/packages/patches/hdf-eos5-fix-szip.patch \ %D%/packages/patches/hdf-eos5-fortrantests.patch \ - %D%/packages/patches/hexchat-crash-exit.patch \ %D%/packages/patches/higan-remove-march-native-flag.patch \ %D%/packages/patches/hubbub-sort-entities.patch \ %D%/packages/patches/hurd-fix-eth-multiplexer-dependency.patch \ diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 3202bd2f44..6917d23f84 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2016, 2017, 2018, 2019 Clément Lassieur ;;; Copyright © 2017 Mekeor Melire ;;; Copyright © 2017, 2018 Arun Isaac -;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2017 Theodoros Foradis ;;; Copyright © 2017, 2018, 2019 Rutger Helling ;;; Copyright © 2018 Leo Famulari @@ -263,15 +263,14 @@ (define-public bitlbee-discord (define-public hexchat (package (name "hexchat") - (version "2.14.2") + (version "2.14.3") (source (origin (method url-fetch) (uri (string-append "https://dl.hexchat.net/hexchat/hexchat-" version ".tar.xz")) (sha256 (base32 - "064nq151nzsljv97dmkifyl162d2738vbgvm1phx7yv04pjvk4kp")) - (patches (search-patches "hexchat-crash-exit.patch")))) + "10p829jm1r6kidkgf5lhqhyqc5mxdcq96q3zhadsckasvc9rs6lh")))) (build-system meson-build-system) (native-inputs `(("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") ;need glib-genmarshal diff --git a/gnu/packages/patches/hexchat-crash-exit.patch b/gnu/packages/patches/hexchat-crash-exit.patch deleted file mode 100644 index e67fef73e0..0000000000 --- a/gnu/packages/patches/hexchat-crash-exit.patch +++ /dev/null @@ -1,31 +0,0 @@ -From d9c637ae8a1137d3ca512d2c560589903a4bd79d Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Tue, 30 Apr 2019 11:16:01 -0700 -Subject: [PATCH] Python plugin: Call EndInterpreter when deinit'ing the plugin - -This fixes https://github.com/hexchat/hexchat/issues/2237 , a -commonly-encountered bug when using Hexchat 2.14 on Python 3.7. -Thanks to @ncoghlan for the fix. - -Signed-off-by: Adam Williamson ---- - plugins/python/python.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/plugins/python/python.c b/plugins/python/python.c -index 4403474d..475756ba 100644 ---- a/plugins/python/python.c -+++ b/plugins/python/python.c -@@ -2806,6 +2806,9 @@ hexchat_plugin_deinit(void) - xchatout_buffer = NULL; - - if (interp_plugin) { -+ PyThreadState *tstate = ((PluginObject*)interp_plugin)->tstate; -+ PyThreadState_Swap(tstate); -+ Py_EndInterpreter(tstate); - Py_DECREF(interp_plugin); - interp_plugin = NULL; - } --- -2.21.0 - -- cgit v1.2.3 From 548d1f8861d6811517115ddb4796ade360978dd7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Jan 2020 01:52:06 +0100 Subject: gnu: gloox: Update to 1.0.23. * gnu/packages/messaging.scm (gloox): Update to 1.0.23. --- gnu/packages/messaging.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 6917d23f84..1c5866fc49 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1244,15 +1244,14 @@ (define-public ytalk (define-public gloox (package (name "gloox") - (version "1.0.22") + (version "1.0.23") (source (origin (method url-fetch) (uri (string-append "https://camaya.net/download/gloox-" version ".tar.bz2")) (sha256 - (base32 - "0r69gq8if9yy1amjzl7qrq9lzhhna7qgz905ln4wvkwchha1ppja")))) + (base32 "12jz8glg9zmyk0iyv1ywf5i0hq93dfq8lvn6lyjgy8730w66mjwp")))) (build-system gnu-build-system) (inputs `(("libidn" ,libidn) -- cgit v1.2.3 From 1abbe7c64bfcd2b0f600398950e07bfdd9d4e1b4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 31 Dec 2019 01:25:10 +0100 Subject: file-systems: Add support for JFS. * gnu/build/file-systems.scm (%jfs-endianness): New syntax. (jfs-superblock?, read-jfs-superblock, jfs-superblock-uuid) (jfs-superblock-volume-name, check-jfs-file-system): New procedures. (%partition-label-readers, %partition-uuid-readers, check-file-system): Register them. --- gnu/build/file-systems.scm | 49 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 47 insertions(+), 2 deletions(-) diff --git a/gnu/build/file-systems.scm b/gnu/build/file-systems.scm index 13c44aa728..9299cc2e4c 100644 --- a/gnu/build/file-systems.scm +++ b/gnu/build/file-systems.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2016, 2017 David Craven ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2019 Guillaume Le Vaillant +;;; Copyright © 2019 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -294,6 +295,45 @@ (define (iso9660-superblock-volume-name sblock) (string-trim-right (latin1->string (sub-bytevector sblock 40 32) (lambda (c) #f)) #\space)) + +;;; +;;; JFS file systems. +;;; + +;; Taken from /fs/jfs/jfs_superblock.h. + +(define-syntax %jfs-endianness + ;; Endianness of JFS file systems. + (identifier-syntax (endianness little))) + +(define (jfs-superblock? sblock) + "Return #t when SBLOCK is a JFS superblock." + (bytevector=? (sub-bytevector sblock 0 4) + (string->utf8 "JFS1"))) + +(define (read-jfs-superblock device) + "Return the raw contents of DEVICE's JFS superblock as a bytevector, or #f +if DEVICE does not contain a JFS file system." + (read-superblock device 32768 184 jfs-superblock?)) + +(define (jfs-superblock-uuid sblock) + "Return the UUID of JFS superblock SBLOCK as a 16-byte bytevector." + (sub-bytevector sblock 136 16)) + +(define (jfs-superblock-volume-name sblock) + "Return the volume name of SBLOCK as a string of at most 16 characters, or +#f if SBLOCK has no volume name." + (null-terminated-latin1->string (sub-bytevector sblock 152 16))) + +(define (check-jfs-file-system device) + "Return the health of a JFS file system on DEVICE." + (match (status:exit-val + (system* "jfs_fsck" "-p" "-v" device)) + (0 'pass) + (1 'errors-corrected) + (2 'reboot-required) + (_ 'fatal-error))) + ;;; ;;; LUKS encrypted devices. @@ -420,7 +460,9 @@ (define %partition-label-readers (partition-field-reader read-fat32-superblock fat32-superblock-volume-name) (partition-field-reader read-fat16-superblock - fat16-superblock-volume-name))) + fat16-superblock-volume-name) + (partition-field-reader read-jfs-superblock + jfs-superblock-volume-name))) (define %partition-uuid-readers (list (partition-field-reader read-iso9660-superblock @@ -432,7 +474,9 @@ (define %partition-uuid-readers (partition-field-reader read-fat32-superblock fat32-superblock-uuid) (partition-field-reader read-fat16-superblock - fat16-superblock-uuid))) + fat16-superblock-uuid) + (partition-field-reader read-jfs-superblock + jfs-superblock-uuid))) (define read-partition-label (cut read-partition-field <> %partition-label-readers)) @@ -527,6 +571,7 @@ (define check-procedure ((string-prefix? "ext" type) check-ext2-file-system) ((string-prefix? "btrfs" type) check-btrfs-file-system) ((string-suffix? "fat" type) check-fat-file-system) + ((string-prefix? "jfs" type) check-jfs-file-system) (else #f))) (if check-procedure -- cgit v1.2.3 From 43c4d27cdfed5ce98ecd4ce48fcd43e188e5a3aa Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 31 Dec 2019 01:32:42 +0100 Subject: uuid: Add support for JFS. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/system/uuid.scm (string->jfs-uuid): New procedure. (%uuid-parsers, %uuid-printers): Add ‘jfs’ file system type. --- gnu/system/uuid.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/system/uuid.scm b/gnu/system/uuid.scm index e7a3a0439d..225959e2b7 100644 --- a/gnu/system/uuid.scm +++ b/gnu/system/uuid.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016, 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2017 Danny Milosavljevic +;;; Copyright © 2019 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -43,6 +44,7 @@ (define-module (gnu system uuid) string->ext4-uuid string->btrfs-uuid string->fat-uuid + string->jfs-uuid iso9660-uuid->string ;; XXX: For lack of a better place. @@ -202,6 +204,7 @@ (define string->ext2-uuid string->dce-uuid) (define string->ext3-uuid string->dce-uuid) (define string->ext4-uuid string->dce-uuid) (define string->btrfs-uuid string->dce-uuid) +(define string->jfs-uuid string->dce-uuid) (define-syntax vhashq (syntax-rules (=>) @@ -215,13 +218,13 @@ (define-syntax vhashq (define %uuid-parsers (vhashq - ('dce 'ext2 'ext3 'ext4 'btrfs 'luks => string->dce-uuid) + ('dce 'ext2 'ext3 'ext4 'btrfs 'jfs 'luks => string->dce-uuid) ('fat32 'fat16 'fat => string->fat-uuid) ('iso9660 => string->iso9660-uuid))) (define %uuid-printers (vhashq - ('dce 'ext2 'ext3 'ext4 'btrfs 'luks => dce-uuid->string) + ('dce 'ext2 'ext3 'ext4 'btrfs 'jfs 'luks => dce-uuid->string) ('iso9660 => iso9660-uuid->string) ('fat32 'fat16 'fat => fat-uuid->string))) -- cgit v1.2.3 From 56dad973bce2ecb7c7093316f06efa07a4a26070 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 31 Dec 2019 01:18:22 +0100 Subject: gnu: Add jfsutils-static. gnu/packages/file-systems.scm (jfsutils/static): New public variable. --- gnu/packages/file-systems.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index fbf0e2641f..3a8848b3ad 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -145,6 +145,15 @@ (define-public jfsutils @end enumerate\n") (license license:gpl3+))) ; no explicit version given +(define-public jfsutils/static + (static-package + (package + (inherit jfsutils) + (name "jfsutils-static") + (inputs + `(("util-linux:static" ,util-linux "static") + ,@(package-inputs jfsutils)))))) + (define-public disorderfs (package (name "disorderfs") -- cgit v1.2.3 From 378994459a1f5234edb2bf7773dc14dbf71a9420 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 31 Dec 2019 01:22:22 +0100 Subject: gnu: Add jfs_fsck-static. * gnu/packages/file-systems.scm (jfs_fsck-static): New public variable. --- gnu/packages/file-systems.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 3a8848b3ad..a3dc993055 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -28,6 +28,7 @@ (define-module (gnu packages file-systems) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system linux-module) + #:use-module (guix build-system trivial) #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages acl) @@ -154,6 +155,38 @@ (define-public jfsutils/static `(("util-linux:static" ,util-linux "static") ,@(package-inputs jfsutils)))))) +(define-public jfs_fsck/static + (package + (name "jfs_fsck-static") + (version (package-version jfsutils)) + (source #f) + (build-system trivial-build-system) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils) + (ice-9 ftw) + (srfi srfi-26)) + (let* ((jfsutils (assoc-ref %build-inputs "jfsutils")) + (fsck "jfs_fsck") + (out (assoc-ref %outputs "out")) + (sbin (string-append out "/sbin"))) + (mkdir-p sbin) + (with-directory-excursion sbin + (install-file (string-append jfsutils "/sbin/" fsck) + ".") + (remove-store-references fsck) + (chmod fsck #o555)) + #t)))) + (inputs + `(("jfsutils" ,jfsutils/static))) + (home-page (package-home-page jfsutils)) + (synopsis "Statically-linked jfs_fsck command from jfsutils") + (description "This package provides statically-linked jfs_fsck command taken +from the jfsutils package. It is meant to be used in initrds.") + (license (package-license jfsutils)))) + (define-public disorderfs (package (name "disorderfs") -- cgit v1.2.3 From c7b5cfb014243528f481e8bb95b7a58de17d0772 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 31 Dec 2019 01:37:23 +0100 Subject: linux-initrd: Add support for JFS. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/system/linux-initrd.scm (file-system-packages): Add jfs_fsck/static. (file-system-type-modules): Add ‘jfs’ module. --- gnu/system/linux-initrd.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm index 0efb8fb222..dcc9b6b937 100644 --- a/gnu/system/linux-initrd.scm +++ b/gnu/system/linux-initrd.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2016 Mark H Weaver ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2017, 2019 Mathieu Othacehe +;;; Copyright © 2019 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,6 +31,7 @@ (define-module (gnu system linux-initrd) #:use-module (gnu packages compression) #:use-module (gnu packages disk) #:use-module (gnu packages linux) + #:use-module (gnu packages file-systems) #:use-module (gnu packages guile) #:use-module ((gnu packages xorg) #:select (console-setup xkeyboard-config)) @@ -240,6 +242,9 @@ (define* (file-system-packages file-systems #:key (volatile-root? #f)) '()) ,@(if (find (file-system-type-predicate "btrfs") file-systems) (list btrfs-progs/static) + '()) + ,@(if (find (file-system-type-predicate "jfs") file-systems) + (list jfs_fsck/static) '()))) (define-syntax vhash ;TODO: factorize @@ -269,6 +274,7 @@ (define file-system-type-modules ("9p" => '("9p" "9pnet_virtio")) ("btrfs" => '("btrfs")) ("iso9660" => '("isofs")) + ("jfs" => '("jfs")) (else '()))) (define (file-system-modules file-systems) -- cgit v1.2.3 From 4f51fdba01b574ef8b6f3cd31f9893b35c7b4ec6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 31 Dec 2019 01:42:19 +0100 Subject: tests: install: Test a JFS root file system. * gnu/tests/install.scm (%jfs-root-os, %jfs-root-installation-script) (%test-jfs-root-os): New variables. --- gnu/tests/install.scm | 78 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 76 insertions(+), 2 deletions(-) diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm index bce4c4b9d4..8842d48df8 100644 --- a/gnu/tests/install.scm +++ b/gnu/tests/install.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016, 2017, 2018, 2019 Ludovic Courtès -;;; Copyright © 2017 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -43,7 +43,8 @@ (define-module (gnu tests install) %test-separate-home-os %test-raid-root-os %test-encrypted-root-os - %test-btrfs-root-os)) + %test-btrfs-root-os + %test-jfs-root-os)) ;;; Commentary: ;;; @@ -810,4 +811,77 @@ (define %test-btrfs-root-os (command (qemu-command/writable-image image))) (run-basic-test %btrfs-root-os command "btrfs-root-os"))))) + +;;; +;;; JFS root file system. +;;; + +(define-os-with-source (%jfs-root-os %jfs-root-os-source) + ;; The OS we want to install. + (use-modules (gnu) (gnu tests) (srfi srfi-1)) + + (operating-system + (host-name "liberigilo") + (timezone "Europe/Paris") + (locale "en_US.UTF-8") + + (bootloader (bootloader-configuration + (bootloader grub-bootloader) + (target "/dev/vdb"))) + (kernel-arguments '("console=ttyS0")) + (file-systems (cons (file-system + (device (file-system-label "my-root")) + (mount-point "/") + (type "jfs")) + %base-file-systems)) + (users (cons (user-account + (name "charlie") + (group "users") + (supplementary-groups '("wheel" "audio" "video"))) + %base-user-accounts)) + (services (cons (service marionette-service-type + (marionette-configuration + (imported-modules '((gnu services herd) + (guix combinators))))) + %base-services)))) + +(define %jfs-root-installation-script + ;; Shell script of a simple installation. + "\ +. /etc/profile +set -e -x +guix --version + +export GUIX_BUILD_OPTIONS=--no-grafts +ls -l /run/current-system/gc-roots +parted --script /dev/vdb mklabel gpt \\ + mkpart primary ext2 1M 3M \\ + mkpart primary ext2 3M 2G \\ + set 1 boot on \\ + set 1 bios_grub on +jfs_mkfs -L my-root -q /dev/vdb2 +mount /dev/vdb2 /mnt +herd start cow-store /mnt +mkdir /mnt/etc +cp /etc/target-config.scm /mnt/etc/config.scm +guix system build /mnt/etc/config.scm +guix system init /mnt/etc/config.scm /mnt --no-substitutes +sync +reboot\n") + +(define %test-jfs-root-os + (system-test + (name "jfs-root-os") + (description + "Test basic functionality of an OS installed like one would do by hand. +This test is expensive in terms of CPU and storage usage since we need to +build (current-guix) and then store a couple of full system images.") + (value + (mlet* %store-monad ((image (run-install %jfs-root-os + %jfs-root-os-source + #:script + %jfs-root-installation-script)) + (command (qemu-command/writable-image image))) + (run-basic-test %jfs-root-os command "jfs-root-os"))))) + ;;; install.scm ends here -- cgit v1.2.3 From b24f561c5efc6cd5afb7afa9d8cf7a1e32dfbb35 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 31 Dec 2019 01:39:35 +0100 Subject: install: Add jfsutils to the installation image. * gnu/system/install.scm (installation-os)[packages]: Add jfsutils. --- gnu/system/install.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/system/install.scm b/gnu/system/install.scm index 4d1612ac7f..c15c2c7814 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2016 Andreas Enge ;;; Copyright © 2017 Marius Bakke -;;; Copyright © 2017 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -38,6 +38,7 @@ (define-module (gnu system install) #:use-module (gnu packages bash) #:use-module (gnu packages bootloaders) #:use-module (gnu packages certs) + #:use-module (gnu packages file-systems) #:use-module (gnu packages fonts) #:use-module (gnu packages fontutils) #:use-module (gnu packages guile) @@ -488,6 +489,7 @@ (define installation-os mdadm dosfstools ;mkfs.fat, for the UEFI boot partition btrfs-progs + jfsutils openssh ;we already have sshd, having ssh/scp can help wireless-tools iw wpa-supplicant-minimal iproute ;; XXX: We used to have GNU fdisk here, but as of version -- cgit v1.2.3 From 0aa203717eccf9cb6ed2ae0d9e91625aa60e32ec Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 3 Jan 2020 15:47:23 +0200 Subject: Revert "gnu: libetpan: Update to 1.9.4." This version of libetpan does not ship with libetpan-config, which prefents claws-mail from building. This reverts commit e2f5de145562540a497bfc5b580011c9cf9000fd. --- 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 57cc8eb9b1..12885f6f8d 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1087,7 +1087,7 @@ (define-public getmail (define-public libetpan (package (name "libetpan") - (version "1.9.4") + (version "1.9.3") (source (origin (method git-fetch) (uri (git-reference @@ -1095,7 +1095,7 @@ (define-public libetpan (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0g7an003simfdn7ihg9yjv7hl2czsmjsndjrp39i7cad8icixscn")))) + (base32 "19g4qskg71jv7sxfxsdkjmrxk9mk5kf9b6fhw06g6wvm3205n95f")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf-wrapper) ("automake" ,automake) -- cgit v1.2.3 From ba42da245bdb50aa98eecfeea8d207cefa209d48 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 3 Jan 2020 11:59:25 +0100 Subject: gnu: uglify-js: Move back next to sbcl-cl-uglify-js definition. This fixes the bug which prevented uglify-js from being defined properly, and cascaded back to all Common Lisp packages. * gnu/packages/bioinformatics.scm: Replace javascript module with lisp-xyz. * gnu/packages/cran.scm: Use lisp-xyz module. * gnu/packages/javascript.scm (uglify-js): Move from here... * gnu/packages/lisp-xyz.scm: ... To here. * gnu/packages/web.scm: Replace javascript module with lisp-xyz. * guix/build-system/minify.scm: Find uglify-js in the lisp-xyz module. --- gnu/packages/bioinformatics.scm | 2 +- gnu/packages/cran.scm | 1 + gnu/packages/javascript.scm | 48 ----------------------------------------- gnu/packages/lisp-xyz.scm | 47 ++++++++++++++++++++++++++++++++++++++++ gnu/packages/web.scm | 2 +- guix/build-system/minify.scm | 4 ++-- 6 files changed, 52 insertions(+), 52 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index b7b1777c24..613015c67e 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -85,10 +85,10 @@ (define-module (gnu packages bioinformatics) #:use-module (gnu packages imagemagick) #:use-module (gnu packages java) #:use-module (gnu packages java-compression) - #:use-module (gnu packages javascript) #:use-module (gnu packages jemalloc) #:use-module (gnu packages dlang) #:use-module (gnu packages linux) + #:use-module (gnu packages lisp-xyz) #:use-module (gnu packages logging) #:use-module (gnu packages machine-learning) #:use-module (gnu packages man) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index b263b6a425..2c43d3fc5f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -62,6 +62,7 @@ (define-module (gnu packages cran) #:use-module (gnu packages imagemagick) #:use-module (gnu packages java) #:use-module (gnu packages javascript) + #:use-module (gnu packages lisp-xyz) #:use-module (gnu packages machine-learning) #:use-module (gnu packages maths) #:use-module (gnu packages mpi) diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm index 6718274da2..83fa5ede4c 100644 --- a/gnu/packages/javascript.scm +++ b/gnu/packages/javascript.scm @@ -25,7 +25,6 @@ (define-module (gnu packages javascript) #:use-module (gnu packages) #:use-module (gnu packages base) #:use-module (gnu packages compression) - #:use-module (gnu packages lisp) #:use-module (gnu packages lisp-xyz) #:use-module (gnu packages readline) #:use-module (guix packages) @@ -453,50 +452,3 @@ (define-public mujs C++ template mechanisms, or worry about marking and unmarking garbage collection roots, or wrestle with obscure build systems.") (license license:isc))) - -(define-public uglify-js - (package - (inherit sbcl-cl-uglify-js) - (name "uglify-js") - (build-system trivial-build-system) - (arguments - `(#:modules ((guix build utils)) - #:builder - (let* ((bin (string-append (assoc-ref %outputs "out") "/bin/")) - (script (string-append bin "uglify-js"))) - (use-modules (guix build utils)) - (mkdir-p bin) - (with-output-to-file script - (lambda _ - (format #t "#!~a/bin/sbcl --script - (require :asdf) - (push (truename \"~a/lib/sbcl\") asdf:*central-registry*)" - (assoc-ref %build-inputs "sbcl") - (assoc-ref %build-inputs "sbcl-cl-uglify-js")) - ;; FIXME: cannot use progn here because otherwise it fails to - ;; find cl-uglify-js. - (for-each - write - '(;; Quiet, please! - (let ((*standard-output* (make-broadcast-stream)) - (*error-output* (make-broadcast-stream))) - (asdf:load-system :cl-uglify-js)) - (let ((file (cadr *posix-argv*))) - (if file - (format t "~a" - (cl-uglify-js:ast-gen-code - (cl-uglify-js:ast-mangle - (cl-uglify-js:ast-squeeze - (with-open-file (in file) - (parse-js:parse-js in)))) - :beautify nil)) - (progn - (format *error-output* - "Please provide a JavaScript file.~%") - (sb-ext:exit :code 1)))))))) - (chmod script #o755) - #t))) - (inputs - `(("sbcl" ,sbcl) - ("sbcl-cl-uglify-js" ,sbcl-cl-uglify-js))) - (synopsis "JavaScript compressor"))) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 3589640653..96d31118d7 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -823,6 +823,53 @@ (define-public sbcl-cl-uglify-js (define-public cl-uglify-js (sbcl-package->cl-source-package sbcl-cl-uglify-js)) +(define-public uglify-js + (package + (inherit sbcl-cl-uglify-js) + (name "uglify-js") + (build-system trivial-build-system) + (arguments + `(#:modules ((guix build utils)) + #:builder + (let* ((bin (string-append (assoc-ref %outputs "out") "/bin/")) + (script (string-append bin "uglify-js"))) + (use-modules (guix build utils)) + (mkdir-p bin) + (with-output-to-file script + (lambda _ + (format #t "#!~a/bin/sbcl --script + (require :asdf) + (push (truename \"~a/lib/sbcl\") asdf:*central-registry*)" + (assoc-ref %build-inputs "sbcl") + (assoc-ref %build-inputs "sbcl-cl-uglify-js")) + ;; FIXME: cannot use progn here because otherwise it fails to + ;; find cl-uglify-js. + (for-each + write + '(;; Quiet, please! + (let ((*standard-output* (make-broadcast-stream)) + (*error-output* (make-broadcast-stream))) + (asdf:load-system :cl-uglify-js)) + (let ((file (cadr *posix-argv*))) + (if file + (format t "~a" + (cl-uglify-js:ast-gen-code + (cl-uglify-js:ast-mangle + (cl-uglify-js:ast-squeeze + (with-open-file (in file) + (parse-js:parse-js in)))) + :beautify nil)) + (progn + (format *error-output* + "Please provide a JavaScript file.~%") + (sb-ext:exit :code 1)))))))) + (chmod script #o755) + #t))) + (inputs + `(("sbcl" ,sbcl) + ("sbcl-cl-uglify-js" ,sbcl-cl-uglify-js))) + (synopsis "JavaScript compressor"))) + (define-public sbcl-cl-strings (let ((revision "1") (commit "c5c5cbafbf3e6181d03c354d66e41a4f063f00ae")) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 3a8a04c76d..65038f7c66 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -103,7 +103,6 @@ (define-module (gnu packages web) #:use-module (gnu packages guile) #:use-module (gnu packages guile-xyz) #:use-module (gnu packages java) - #:use-module (gnu packages javascript) #:use-module (gnu packages jemalloc) #:use-module (gnu packages image) #:use-module (gnu packages imagemagick) @@ -111,6 +110,7 @@ (define-module (gnu packages web) #:use-module (gnu packages libidn) #:use-module (gnu packages libunistring) #:use-module (gnu packages linux) + #:use-module (gnu packages lisp-xyz) #:use-module (gnu packages lua) #:use-module (gnu packages markup) #:use-module (gnu packages ncurses) diff --git a/guix/build-system/minify.scm b/guix/build-system/minify.scm index 1418a71091..28a6781c06 100644 --- a/guix/build-system/minify.scm +++ b/guix/build-system/minify.scm @@ -44,8 +44,8 @@ (define %minify-build-system-modules (define (default-uglify-js) "Return the default package to minify JavaScript source files." ;; Lazily resolve the binding to avoid a circular dependency. - (let ((js-mod (resolve-interface '(gnu packages javascript)))) - (module-ref js-mod 'uglify-js))) + (let ((mod (resolve-interface '(gnu packages lisp-xyz)))) + (module-ref mod 'uglify-js))) (define* (lower name #:key source inputs native-inputs outputs system -- cgit v1.2.3 From aa5fadaf7234c6332eea81384fef3846c510c1d3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 3 Jan 2020 16:02:16 +0200 Subject: gnu: capstone: Don't use unstable tarball. * gnu/packages/engineering.scm (capstone)[source]: Download using git-fetch. --- gnu/packages/engineering.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 82697573e4..b63715d8c2 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus ;;; Copyright © 2015 Federico Beffa -;;; Copyright © 2016, 2018 Efraim Flashner +;;; Copyright © 2016, 2018, 2020 Efraim Flashner ;;; Copyright © 2016 David Thompson ;;; Copyright © 2016, 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2016, 2017, 2018 Theodoros Foradis @@ -1209,13 +1209,14 @@ (define-public capstone (name "capstone") (version "3.0.5") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/aquynh/capstone/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/aquynh/capstone") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1wbd1g3r32ni6zd9vwrq3kn7fdp9y8qwn9zllrrbk8n5wyaxcgci")))) + "0dgf82kxj4rs45d6s8sr984c38sll1n5scpypjlyh21gh2yl4qfw")))) (build-system gnu-build-system) (arguments `(#:tests? #f -- cgit v1.2.3 From 9930beb86084a40f17f71709d41f03338876feb3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 3 Jan 2020 16:10:29 +0200 Subject: gnu: python-apsw: Don't use unstable tarball. * gnu/packages/databases.scm (python-apsw)[source]: Download using release zip archive. [native-inputs]: Add unzip. --- gnu/packages/databases.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 73b7dc7d3a..113e640739 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2015 Eric Dvorsak ;;; Copyright © 2016 Hartmut Goebel ;;; Copyright © 2016 Christopher Allan Webber -;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2016, 2017, 2018 Roel Janssen ;;; Copyright © 2016 David Craven @@ -2630,13 +2630,14 @@ (define-public python-apsw (source (origin (method url-fetch) - (uri (string-append "https://github.com/rogerbinns/apsw/archive/" - version ".tar.gz")) - (file-name (string-append "apsw-" version ".tar.gz")) + (uri (string-append "https://github.com/rogerbinns/apsw/releases" + "/download/" version "/apsw-" version ".zip")) (sha256 (base32 - "00ai7m2pqi26qaflhz314d8k5i3syw7xzr145fhfl0crhyh6adz2")))) + "02mgxyznxg0va85r1lk6pvjh7qvar33fivj0bn534jb0yy271a9y")))) (build-system python-build-system) + (native-inputs + `(("unzip" ,unzip))) (inputs `(("sqlite" ,sqlite))) (arguments -- cgit v1.2.3 From 53a9970e3b5417f07b6d6dd741356223da40ba9f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 3 Jan 2020 16:15:58 +0200 Subject: gnu: python-apsw: Use 'replace' for 'check phase. * gnu/packages/databases.scm (python-apsw)[arguments]: Update build phase order and replace stock 'check phase. --- gnu/packages/databases.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 113e640739..cd21db8deb 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2652,8 +2652,7 @@ (define-public python-apsw (invoke "gcc" "-fPIC" "-shared" "-o" "./testextension.sqlext" "-I." "-Isqlite3" "src/testextension.c") #t)) - (delete 'check) - (add-after 'install 'check + (replace 'check (lambda* (#:key inputs outputs #:allow-other-keys) (add-installed-pythonpath inputs outputs) (invoke "python" "setup.py" "test") -- cgit v1.2.3 From 877aa9c3980d47c3572d50dea980774641ddab6c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 3 Jan 2020 16:19:59 +0200 Subject: gnu: python-apsw: Update to 3.28.0-r1. * gnu/packages/databases.scm (python-apsw): Update to 3.28.0-r1. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index cd21db8deb..393dbee6d0 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2626,7 +2626,7 @@ (define-public python2-pickleshare (define-public python-apsw (package (name "python-apsw") - (version "3.20.1-r1") + (version "3.28.0-r1") (source (origin (method url-fetch) @@ -2634,7 +2634,7 @@ (define-public python-apsw "/download/" version "/apsw-" version ".zip")) (sha256 (base32 - "02mgxyznxg0va85r1lk6pvjh7qvar33fivj0bn534jb0yy271a9y")))) + "0x62534l5hcgwrc4k2gxpdzc1sxlhm6m4nwlay74rnmr77qh8wly")))) (build-system python-build-system) (native-inputs `(("unzip" ,unzip))) -- cgit v1.2.3 From cfff8ebcaf6235610846a368210d5a9fcf05eb69 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 3 Jan 2020 15:19:49 +0100 Subject: Revert "gnu: sbcl: Update to 1.5.9." The boot0 package won't be needed anymore with 2.0.0. This reverts commit edf8152563a898438708ec9b2b17284a9d55d271. --- gnu/packages/lisp.scm | 60 ++++++++++++--------------------------------------- 1 file changed, 14 insertions(+), 46 deletions(-) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index a3ac957f63..452f58b39d 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -74,7 +74,6 @@ (define-module (gnu packages lisp) #:use-module (gnu packages texinfo) #:use-module (gnu packages version-control) #:use-module (gnu packages xorg) - #:use-module (srfi srfi-1) #:use-module (ice-9 match)) (define (asdf-substitutions lisp) @@ -319,9 +318,9 @@ (define-public clisp an interpreter, a compiler, a debugger, and much more.") (license license:gpl2+))) -(define sbcl-boot0 +(define-public sbcl (package - (name "sbcl-boot0") + (name "sbcl") (version "1.5.8") (source (origin @@ -358,8 +357,13 @@ (define sbcl-boot0 ;; 2019-09-05, ECL was last updated in 2016 while CLISP was last updated ;; in 2010. ;; - ;; For now we stick to CLISP for all systems. - `(("clisp" ,clisp) + ;; For now we stick to CLISP for all systems. We keep the `match' here to + ;; make it easier to change the host compiler for various architectures. + `(,@(match (%current-system) + ((or "x86_64-linux" "i686-linux") + `(("clisp" ,clisp))) + (_ + `(("clisp" ,clisp)))) ("which" ,which) ("inetutils" ,inetutils) ;for hostname(1) ("ed" ,ed) @@ -427,7 +431,11 @@ (define (quoted-path input path) (replace 'build (lambda* (#:key outputs #:allow-other-keys) (setenv "CC" "gcc") - (invoke "sh" "make.sh" "clisp" + (invoke "sh" "make.sh" ,@(match (%current-system) + ((or "x86_64-linux" "i686-linux") + `("clisp")) + (_ + `("clisp"))) (string-append "--prefix=" (assoc-ref outputs "out")) "--with-sb-core-compression" @@ -485,46 +493,6 @@ (define (quoted-path input path) (license (list license:public-domain license:bsd-2 (license:x11-style "file://src/code/loop.lisp"))))) -(define-public sbcl - ;; Since 1.5.9, SBCL requires itself to build. - ;; See https://bugs.launchpad.net/sbcl/+bug/1855272. - (package - (inherit sbcl-boot0) - (name "sbcl") - (version "1.5.9") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/sbcl/sbcl/" version "/sbcl-" - version "-source.tar.bz2")) - (sha256 - (base32 "1dmrlklil7x3j68mwmjfpd71vkphr24s4rx6d61jpc54x0jhvnyb")) - (modules '((guix build utils))) - (snippet - ;; Add sbcl-bundle-systems to 'default-system-source-registry'. - `(begin - (substitute* "contrib/asdf/asdf.lisp" - ,@(asdf-substitutions name)) - #t)))) - (build-system gnu-build-system) - (outputs '("out" "doc")) - (native-inputs - `(("sbcl" ,sbcl-boot0) - ,@(fold alist-delete (package-native-inputs sbcl-boot0) - '("clisp")))) - (arguments - (substitute-keyword-arguments (package-arguments sbcl-boot0) - ((#:phases phases) - `(modify-phases ,phases - (replace 'build - (lambda* (#:key outputs #:allow-other-keys) - (setenv "CC" "gcc") - (invoke "sh" "make.sh" "sbcl" - (string-append "--prefix=" - (assoc-ref outputs "out")) - "--with-sb-core-compression" - "--with-sb-xref-for-internals"))))))))) - (define-public ccl ;; Warning: according to upstream, CCL is not bootstrappable. ;; See https://github.com/Clozure/ccl/issues/222 from 2019-09-02: -- cgit v1.2.3 From 10a8fb475b739d7046b7c2e3a81788aa9c652f80 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 3 Jan 2020 15:41:52 +0100 Subject: gnu: sbcl: Update to 2.0.0. * gnu/packages/lisp.scm (sbcl): Update to 2.0.0. --- gnu/packages/lisp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 452f58b39d..f05ced583a 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -321,14 +321,14 @@ (define-public clisp (define-public sbcl (package (name "sbcl") - (version "1.5.8") + (version "2.0.0") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/sbcl/sbcl/" version "/sbcl-" version "-source.tar.bz2")) (sha256 - (base32 "0k7zjrky8r2krkd8780cph214hiihg9nh5rxn4nrhg6i6f8jymw4")) + (base32 "1krgd69cirp4ili2pfsh1a0mfvq722jbknlvmf17qhsxh1b94dlh")) (modules '((guix build utils))) (snippet ;; Add sbcl-bundle-systems to 'default-system-source-registry'. -- cgit v1.2.3 From 9512ba6b09b55c1551933c1885aa1ca39457aea8 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 3 Jan 2020 12:16:52 +0100 Subject: bootloader: Mark "grub.cfg" and "extlinux.conf" as non-substitutable. Suggested by . * gnu/bootloader/grub.scm (grub-configuration-file): Pass #:options to 'computed-file'. * gnu/bootloader/extlinux.scm (extlinux-configuration-file): Likewise. --- gnu/bootloader/extlinux.scm | 4 +++- gnu/bootloader/grub.scm | 8 ++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/gnu/bootloader/extlinux.scm b/gnu/bootloader/extlinux.scm index 40108584a8..5b4dd84965 100644 --- a/gnu/bootloader/extlinux.scm +++ b/gnu/bootloader/extlinux.scm @@ -74,7 +74,9 @@ (define builder (format port "~%")) #~()))))) - (computed-file "extlinux.conf" builder)) + (computed-file "extlinux.conf" builder + #:options '(#:local-build? #t + #:substitutable? #f))) diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm index fd62f627a0..adcdbdbab0 100644 --- a/gnu/bootloader/grub.scm +++ b/gnu/bootloader/grub.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2016 Chris Marusich ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2017 Mathieu Othacehe @@ -392,7 +392,11 @@ (define builder } fi~%")))) - (computed-file "grub.cfg" builder)) + ;; Since this file is rather unique, there's no point in trying to + ;; substitute it. + (computed-file "grub.cfg" builder + #:options '(#:local-build? #t + #:substitutable? #f))) -- cgit v1.2.3 From 52207b3938d3ccbeb661ba8d0af563cf1e0e3333 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 3 Jan 2020 12:39:48 +0100 Subject: gexp: 'gexp->script' marks its result as non-offloadable and non-substitutable. * guix/gexp.scm (gexp->script): Pass #:local-build? and #:substitutable? to 'gexp->derivation'. --- guix/gexp.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/guix/gexp.scm b/guix/gexp.scm index 12331052a6..912960fd1d 100644 --- a/guix/gexp.scm +++ b/guix/gexp.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 © 2018 Clément Lassieur ;;; Copyright © 2018 Jan Nieuwenhuizen ;;; Copyright © 2019 Mathieu Othacehe @@ -1602,7 +1602,12 @@ (define* (gexp->script name exp (chmod port #o555)))) #:system system #:target target - #:module-path module-path))) + #:module-path module-path + + ;; These derivations are not worth offloading or + ;; substituting. + #:local-build? #t + #:substitutable? #f))) (define* (gexp->file name exp #:key (set-load-path? #t) -- cgit v1.2.3 From f4cde9ac4aedb516c050a30fd999673da434bfa0 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 3 Jan 2020 15:47:12 +0100 Subject: download: Do not leak file descriptors on TLS ports. Fixes . * guix/build/download.scm (%tls-ports, register-tls-record-port): Remove. (tls-wrap): Remove call to 'register-tls-record-port'. Return a custom binary input/output port instead. This is a backport of what Guile 2.2's (web client) module has been doing. (close-connection): Define as an alias for 'close-port'. * guix/http-client.scm (http-fetch): Remove #:keep-alive? parameter, which was ignored and unused. Pass #:keep-alive? #f to 'http-get'. * guix/lint.scm (probe-uri): Use 'close-port' instead of 'close-connection'. * guix/scripts/substitute.scm (http-multiple-get): Likewise. --- guix/build/download.scm | 66 +++++++++++++++++++++++++-------------------- guix/http-client.scm | 13 +++++---- guix/lint.scm | 9 +++---- guix/scripts/substitute.scm | 7 +++-- 4 files changed, 52 insertions(+), 43 deletions(-) diff --git a/guix/build/download.scm b/guix/build/download.scm index 53a144f126..a7bb3b0d6e 100644 --- a/guix/build/download.scm +++ b/guix/build/download.scm @@ -28,6 +28,7 @@ (define-module (guix build download) #:use-module (guix build utils) #:use-module (guix progress) #:use-module (rnrs io ports) + #:use-module ((ice-9 binary-ports) #:select (unget-bytevector)) #:use-module (rnrs bytevectors) #:use-module (srfi srfi-1) #:use-module (srfi srfi-11) @@ -160,15 +161,6 @@ (define* (ftp-fetch uri file #:key timeout print-build-trace?) '(gnutls) '(make-session connection-end/client)) -(define %tls-ports - ;; Mapping of session record ports to the underlying file port. - (make-weak-key-hash-table)) - -(define (register-tls-record-port record-port port) - "Hold a weak reference from RECORD-PORT to PORT, where RECORD-PORT is a TLS -session record port using PORT as its underlying communication port." - (hashq-set! %tls-ports record-port port)) - (define %x509-certificate-directory ;; The directory where X.509 authority PEM certificates are stored. (make-parameter (or (getenv "GUIX_TLS_CERTIFICATE_DIRECTORY") @@ -311,17 +303,40 @@ (define (log level str) (apply throw args)))) (let ((record (session-record-port session))) - ;; Since we use `fileno' above, the file descriptor behind PORT would be - ;; closed when PORT is GC'd. If we used `port->fdes', it would instead - ;; never be closed. So we use `fileno', but keep a weak reference to - ;; PORT, so the file descriptor gets closed when RECORD is GC'd. - (register-tls-record-port record port) - - ;; Write HTTP requests line by line rather than byte by byte: - ;; . This is possible with Guile >= 2.2. - (setvbuf record 'line) - - record))) + (define (read! bv start count) + (define read-bv (get-bytevector-some record)) + (if (eof-object? read-bv) + 0 ; read! returns 0 on eof-object + (let ((read-bv-len (bytevector-length read-bv))) + (bytevector-copy! read-bv 0 bv start (min read-bv-len count)) + (when (< count read-bv-len) + (unget-bytevector record bv count (- read-bv-len count))) + read-bv-len))) + (define (write! bv start count) + (put-bytevector record bv start count) + (force-output record) + count) + (define (get-position) + (port-position record)) + (define (set-position! new-position) + (set-port-position! record new-position)) + (define (close) + (unless (port-closed? port) + (close-port port)) + (unless (port-closed? record) + (close-port record))) + + (setvbuf record 'block) + + ;; Return a port that wraps RECORD to ensure that closing it also + ;; closes PORT, the actual socket port, and its file descriptor. + ;; XXX: This wrapper would be unnecessary if GnuTLS could + ;; automatically close SESSION's file descriptor when RECORD is + ;; closed, but that doesn't seem to be possible currently (as of + ;; 3.6.9). + (make-custom-binary-input/output-port "gnutls wrapped port" read! write! + get-position set-position! + close)))) (define (ensure-uri uri-or-string) ;XXX: copied from (web http) (cond @@ -429,16 +444,9 @@ (define https-proxy (let ((proxy (getenv "https_proxy"))) #:verify-certificate? verify-certificate?) s))))) -(define (close-connection port) - "Like 'close-port', but (1) idempotent, and (2) also closes the underlying -port if PORT is a TLS session record port." - ;; FIXME: This is a partial workaround for , - ;; because 'http-fetch' & co. may return a chunked input port whose 'close' - ;; method calls 'close-port', not 'close-connection'. +(define (close-connection port) ;deprecated (unless (port-closed? port) - (close-port port)) - (and=> (hashq-ref %tls-ports port) - close-connection)) + (close-port port))) ;; XXX: This is an awful hack to make sure the (set-port-encoding! p ;; "ISO-8859-1") call in `read-response' passes, even during bootstrap diff --git a/guix/http-client.scm b/guix/http-client.scm index 067002a79a..5a5a33b4c0 100644 --- a/guix/http-client.scm +++ b/guix/http-client.scm @@ -70,14 +70,13 @@ (define-condition-type &http-get-error &error (define* (http-fetch uri #:key port (text? #f) (buffered? #t) - keep-alive? (verify-certificate? #t) + (verify-certificate? #t) (headers '((user-agent . "GNU Guile")))) "Return an input port containing the data at URI, and the expected number of bytes available or #f. If TEXT? is true, the data at URI is considered to be textual. Follow any HTTP redirection. When BUFFERED? is #f, return an -unbuffered port, suitable for use in `filtered-port'. When KEEP-ALIVE? is -true, send a 'Connection: keep-alive' HTTP header, in which case PORT may be -reused for future HTTP requests. HEADERS is an alist of extra HTTP headers. +unbuffered port, suitable for use in `filtered-port'. HEADERS is an alist of +extra HTTP headers. When VERIFY-CERTIFICATE? is true, verify HTTPS server certificates. @@ -100,7 +99,11 @@ (define* (http-fetch uri #:key port (text? #f) (buffered? #t) (setvbuf port 'none)) (let*-values (((resp data) (http-get uri #:streaming? #t #:port port - #:keep-alive? #t + ;; XXX: When #:keep-alive? is true, if DATA is + ;; a chunked-encoding port, closing DATA won't + ;; close PORT, leading to a file descriptor + ;; leak. + #:keep-alive? #f #:headers headers)) ((code) (response-code resp))) diff --git a/guix/lint.scm b/guix/lint.scm index cd2ea571ed..41ddff584d 100644 --- a/guix/lint.scm +++ b/guix/lint.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 Cyril Roelandt ;;; Copyright © 2014, 2015 Eric Bavier -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2015, 2016 Mathieu Lirzin ;;; Copyright © 2016 Danny Milosavljevic ;;; Copyright © 2016 Hartmut Goebel @@ -26,7 +26,7 @@ ;;; along with GNU Guix. If not, see . (define-module (guix lint) - #:use-module ((guix store) #:hide (close-connection)) + #:use-module (guix store) #:use-module (guix base32) #:use-module (guix diagnostics) #:use-module (guix download) @@ -54,8 +54,7 @@ (define-module (guix lint) #:use-module ((guix build download) #:select (maybe-expand-mirrors (open-connection-for-uri - . guix:open-connection-for-uri) - close-connection)) + . guix:open-connection-for-uri))) #:use-module (web request) #:use-module (web response) #:use-module (srfi srfi-1) @@ -453,7 +452,7 @@ (define response (force-output port) (read-response port)) (lambda () - (close-connection port)))) + (close-port port)))) (case (response-code response) ((302 ; found (redirection) diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm index 7eca2c6874..3bf9b8735f 100755 --- a/guix/scripts/substitute.scm +++ b/guix/scripts/substitute.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2014 Nikita Karetnikov ;;; Copyright © 2018 Kyle Meyer ;;; @@ -20,7 +20,7 @@ (define-module (guix scripts substitute) #:use-module (guix ui) - #:use-module ((guix store) #:hide (close-connection)) + #:use-module (guix store) #:use-module (guix utils) #:use-module (guix combinators) #:use-module (guix config) @@ -37,7 +37,6 @@ (define-module (guix scripts substitute) #:select (uri-abbreviation nar-uri-abbreviation (open-connection-for-uri . guix:open-connection-for-uri) - close-connection store-path-abbreviation byte-count->string)) #:use-module (guix progress) #:use-module ((guix build syscalls) @@ -556,7 +555,7 @@ (define batch ;; Note that even upon "Connection: close", we can read from BODY. (match (assq 'connection (response-headers resp)) (('connection 'close) - (close-connection p) + (close-port p) (connect #f ;try again (append tail (drop requests processed)) result)) -- cgit v1.2.3 From af0aefd8c10701fa32341506e36297e5105f6143 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 3 Jan 2020 16:01:11 +0100 Subject: import: cran: Fix file descriptor leak. Fixes . Reported by Ricardo Wurmus . * guix/import/cran.scm (bioconductor-packages-list): Close the port returned by 'http-fetch/cached'. (fetch-description): Likewise. --- guix/import/cran.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/guix/import/cran.scm b/guix/import/cran.scm index f3f1747e43..13771ec598 100644 --- a/guix/import/cran.scm +++ b/guix/import/cran.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus -;;; Copyright © 2015, 2016, 2017, 2019 Ludovic Courtès +;;; Copyright © 2015, 2016, 2017, 2019, 2020 Ludovic Courtès ;;; Copyright © 2017 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. @@ -161,7 +161,10 @@ (define* (bioconductor-packages-list #:optional type) ;; alist of attributes. (map (lambda (chunk) (description->alist (string-join chunk "\n"))) - (chunk-lines (read-lines (http-fetch/cached url))))))) + (let* ((port (http-fetch/cached url)) + (lines (read-lines port))) + (close-port port) + (chunk-lines lines)))))) (define* (latest-bioconductor-package-version name #:optional type) "Return the version string corresponding to the latest release of the @@ -206,7 +209,10 @@ (define (fetch-description repository name) (http-get-error-code c) (http-get-error-reason c)) #f)) - (description->alist (read-string (http-fetch url)))))) + (let* ((port (http-fetch url)) + (result (description->alist (read-string port)))) + (close-port port) + result)))) ((bioconductor) ;; Currently, the bioconductor project does not offer a way to access a ;; package's DESCRIPTION file over HTTP, so we determine the version, -- cgit v1.2.3 From 41bc208e0cc0e9eca63d7b2c00eef2b9068a28d1 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Thu, 12 Dec 2019 08:46:13 +0100 Subject: gnu: r-irkernel: Fix R kernel loading MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/cran.scm (r-irkernel): Absolute path to R binary [propagated-inputs]: Generate proper search paths by adding r-minimal Signed-off-by: Ludovic Courtès --- gnu/packages/cran.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 2c43d3fc5f..8277026c32 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -12575,6 +12575,12 @@ (define-public r-irkernel "--name" "ir" "--prefix" out (string-append out "/site-library/IRkernel/kernelspec")) + ;; Record the absolute file name of the 'R' executable in + ;; 'kernel.json'. + (substitute* (string-append out "/share/jupyter" + "/kernels/ir/kernel.json") + (("\\[\"R\",") + (string-append "[\"" (which "R") "\","))) #t)))))) (inputs `(("jupyter" ,jupyter))) @@ -12584,6 +12590,8 @@ (define-public r-irkernel ("r-evaluate" ,r-evaluate) ("r-irdisplay" ,r-irdisplay) ("r-jsonlite" ,r-jsonlite) + ;; sets R_LIBS_SITE, so R can actually find this package (IRkernel) + ("r-minimal" ,r-minimal) ("r-pbdzmq" ,r-pbdzmq) ("r-repr" ,r-repr) ("r-uuid" ,r-uuid))) -- cgit v1.2.3 From 3029b5856699062ae8ef8c0e79b40f8bb66d1708 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 3 Jan 2020 16:42:42 +0100 Subject: gnu: Add trivial-indent. * gnu/packages/lisp-xyz.scm (cl-trivial-indent, sbcl-trivial-indent): New variables. --- gnu/packages/lisp-xyz.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 96d31118d7..9264e46a91 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -7251,3 +7251,32 @@ (define-public sbcl-graph-json ((#:asd-file _ "") "graph.json.asd") ((#:asd-system-name _ #f) "graph-json"))) (synopsis "Serialize graphs to and from JSON format"))) + +(define-public sbcl-trivial-indent + (let ((commit "2d016941751647c6cc5bd471751c2cf68861c94a") + (revision "0")) + (package + (name "sbcl-trivial-indent") + (version (git-version "1.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/Shinmera/trivial-indent") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1sj90nqz17w4jq0ixz00gb9g5g6d2s7l8r17zdby27gxxh51w266")))) + (build-system asdf-build-system/sbcl) + (synopsis "Simple Common Lisp library to allow indentation hints for SWANK") + (description + "This library allows you to define custom indentation hints for your +macros if the one recognised by SLIME automatically produces unwanted +results.") + (home-page "https://shinmera.github.io/trivial-indent/") + (license license:zlib)))) + +(define-public cl-trivial-indent + (sbcl-package->cl-source-package sbcl-trivial-indent)) -- cgit v1.2.3 From 8dc5ff8fd0f3d007cb097c4055f73a053dc373c7 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 3 Jan 2020 16:43:04 +0100 Subject: gnu: Add documentation-utils. * gnu/packages/lisp-xyz.scm (cl-documentation-utils, sbcl-documentation-utils): New variables. --- gnu/packages/lisp-xyz.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 9264e46a91..65f2418ce7 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -7280,3 +7280,33 @@ (define-public sbcl-trivial-indent (define-public cl-trivial-indent (sbcl-package->cl-source-package sbcl-trivial-indent)) + +(define-public sbcl-documentation-utils + (let ((commit "98630dd5f7e36ae057fa09da3523f42ccb5d1f55") + (revision "0")) + (package + (name "sbcl-documentation-utils") + (version (git-version "1.2.0" revision commit)) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/Shinmera/documentation-utils.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "098qhkqskmmrh4wix34mawf7p5c87yql28r51r75yjxj577k5idq")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("trivial-indent" ,sbcl-trivial-indent))) + (synopsis "Few simple tools to document Common Lisp libraries") + (description + "This is a small library to help you with managing the Common Lisp +docstrings for your library.") + (home-page "https://shinmera.github.io/documentation-utils/") + (license license:zlib)))) + +(define-public cl-documentation-utils + (sbcl-package->cl-source-package sbcl-documentation-utils)) -- cgit v1.2.3 From aa47c9e7d3874bf0851373a7e41560d9e500874a Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 3 Jan 2020 16:43:28 +0100 Subject: gnu: Add form-fiddle. * gnu/packages/lisp-xyz.scm (cl-form-fiddle, sbcl-form-fiddle): New variables. --- gnu/packages/lisp-xyz.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 65f2418ce7..0a7b7582d8 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -7310,3 +7310,33 @@ (define-public sbcl-documentation-utils (define-public cl-documentation-utils (sbcl-package->cl-source-package sbcl-documentation-utils)) + +(define-public sbcl-form-fiddle + (let ((commit "e0c23599dbb8cff3e83e012f3d86d0764188ad18") + (revision "0")) + (package + (name "sbcl-form-fiddle") + (version (git-version "1.1.0" revision commit)) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/Shinmera/form-fiddle") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "041iznc9mpfyrl0sv5893ys9pbb2pvbn9g3clarqi7gsfj483jln")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("documentation-utils" ,sbcl-documentation-utils))) + (synopsis "Utilities to destructure Common Lisp lambda forms") + (description + "Often times we need to destructure a form definition in a Common Lisp +macro. This library provides a set of simple utilities to help with that.") + (home-page "https://shinmera.github.io/form-fiddle/") + (license license:zlib)))) + +(define-public cl-form-fiddle + (sbcl-package->cl-source-package sbcl-form-fiddle)) -- cgit v1.2.3 From e0786d13e8b8280c4d82474829a72a58e45b452f Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 3 Jan 2020 16:43:52 +0100 Subject: gnu: Add parachute. * gnu/packages/lisp-xyz.scm (cl-parachute, sbcl-parachute): 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 0a7b7582d8..7c04f1ac5b 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -7340,3 +7340,35 @@ (define-public sbcl-form-fiddle (define-public cl-form-fiddle (sbcl-package->cl-source-package sbcl-form-fiddle)) + +(define-public sbcl-parachute + (let ((commit "ca04dd8e43010a6dfffa26dbe1d62af86008d666") + (revision "0")) + (package + (name "sbcl-parachute") + (version (git-version "1.1.1" revision commit)) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/Shinmera/parachute") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1mvsm3r0r6a2bg75nw0q7n9vlby3ch45qjl7hnb5k1z2n5x5lh60")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("documentation-utils" ,sbcl-documentation-utils) + ("form-fiddle" ,sbcl-form-fiddle))) + (synopsis "Extensible and cross-compatible testing framework for Common Lisp") + (description + "Parachute is a simple-to-use and extensible testing framework. +In Parachute, things are organised as a bunch of named tests within a package. +Each test can contain a bunch of test forms that make up its body.") + (home-page "https://shinmera.github.io/parachute/") + (license license:zlib)))) + +(define-public cl-parachute + (sbcl-package->cl-source-package sbcl-parachute)) -- cgit v1.2.3 From f5b1da68c82c177da7696343d13de8bf92365ef1 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 3 Jan 2020 16:44:13 +0100 Subject: gnu: Add array-utils. * gnu/packages/lisp-xyz.scm (cl-array-utils, sbcl-array-utils): 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 7c04f1ac5b..764d34e7a6 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -7372,3 +7372,35 @@ (define-public sbcl-parachute (define-public cl-parachute (sbcl-package->cl-source-package sbcl-parachute)) + +(define-public sbcl-array-utils + (let ((commit "f90eb9070d0b2205af51126a35033574725e5c56") + (revision "0")) + (package + (name "sbcl-array-utils") + (version (git-version "1.1.1" revision commit)) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/Shinmera/array-utils") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0zhwfbpr53vs1ii4sx75dz2k9yhh1xpwdqqpg8nmfndxkmhpbi3x")))) + (build-system asdf-build-system/sbcl) + (native-inputs + `(("parachute" ,sbcl-parachute))) + (inputs + `(("documentation-utils" ,sbcl-documentation-utils))) + (synopsis "Tiny collection of array and vector utilities for Common Lisp") + (description + "A miniature toolkit that contains some useful shifting/popping/pushing +functions for arrays and vectors. Originally from Plump.") + (home-page "https://shinmera.github.io/array-utils/") + (license license:zlib)))) + +(define-public cl-array-utils + (sbcl-package->cl-source-package sbcl-array-utils)) -- cgit v1.2.3 From cbda07d4fc1e17348a6976422edbc3c44367a3d4 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 3 Jan 2020 16:44:34 +0100 Subject: gnu: Add plump. * gnu/packages/lisp-xyz.scm (cl-plump, sbcl-plump): 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 764d34e7a6..0aa7a21ec5 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -7404,3 +7404,38 @@ (define-public sbcl-array-utils (define-public cl-array-utils (sbcl-package->cl-source-package sbcl-array-utils)) + +(define-public sbcl-plump + (let ((commit "16f1231bf706cfbc54d9e55a853ca945e4452a08") + (revision "0")) + (package + (name "sbcl-plump") + (version (git-version "2.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/Shinmera/plump") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0705k8pbip51v74rccgwscwph439f2pma9f915qf1h4bhjx999ip")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("array-utils" ,sbcl-array-utils) + ("documentation-utils" ,sbcl-documentation-utils))) + (synopsis "Lenient XML / XHTML / HTML parser for Common Lisp") + (description + "Plump is a parser for HTML/XML-like documents, focusing on being +lenient towards invalid markup. It can handle things like invalid attributes, +bad closing tag order, unencoded entities, inexistent tag types, self-closing +tags and so on. It parses documents to a class representation and offers a +small set of DOM functions to manipulate it. It can be extended to parse to +your own classes.") + (home-page "https://shinmera.github.io/plump/") + (license license:zlib)))) + +(define-public cl-plump + (sbcl-package->cl-source-package sbcl-plump)) -- cgit v1.2.3 From aed6c010141a523d578c4e277fd5f7f62c47bc54 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sat, 14 Dec 2019 18:04:40 +0100 Subject: gnu: Add sdl2-cs. * gnu/packages/sdl.scm (sdl2-cs): New variable. --- gnu/packages/sdl.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 3974cc75ab..f7a34003d1 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2019 Kei Kebreau ;;; Copyright © 2019 Nicolas Goaziou ;;; Copyright © 2019 Marius Bakke +;;; Copyright © 2019 Pierre Neidhardt ;;; ;;; This file is part of GNU Guix. ;;; @@ -34,6 +35,7 @@ (define-module (gnu packages sdl) #:use-module ((guix licenses) #:hide (freetype)) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) @@ -46,6 +48,7 @@ (define-module (gnu packages sdl) #:use-module (gnu packages ibus) #:use-module (gnu packages image) #:use-module (gnu packages linux) + #:use-module (gnu packages mono) #:use-module (gnu packages mp3) #:use-module (gnu packages pkg-config) #:use-module (gnu packages pulseaudio) @@ -570,3 +573,46 @@ (define-public guile-sdl2 The bindings are written in pure Scheme using Guile's foreign function interface.") (license lgpl3+))) + +(define-public sdl2-cs + (let ((commit "1a3556441e1394eb0b5d46aeb514b8d1090b93f8")) + (package + (name "sdl2-cs") + (version (git-version "B1" "1" commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/flibitijibibo/SDL2-CS") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "007mzkqr9nmvfrvvhs2r6cm36lzgsww24kwshsz9c4fd97f9qk58")))) + (build-system gnu-build-system) + (arguments + '(#:tests? #f ; No tests. + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda _ + (invoke "make" "release"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (install-file "bin/Release/SDL2-CS.dll" (string-append out "/lib")) + #t)))))) + (native-inputs + `(("mono" ,mono))) + (inputs + `(("sdl2" ,sdl2) + ("sdl2-image" ,sdl2-image) + ("sdl2-mixer" ,sdl2-mixer) + ("sdl2-ttf" ,sdl2-ttf))) + (home-page "https://dthompson.us/projects/guile-sdl2.html") + (synopsis "C# wrapper for SDL2") + (description + "SDL2-CS provides C# bindings for the SDL2 C shared library. +The C# wrapper was written to be used for FNA's platform support. However, this +is written in a way that can be used for any general C# application.") + (license zlib)))) -- cgit v1.2.3 From bea58fa1599b0e579079a4008067b155e75800f3 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sun, 15 Dec 2019 15:42:15 +0100 Subject: gnu: Add mojoshader-cs. * gnu/packages/gl.scm (mojoshader-cs): New variable. --- gnu/packages/gl.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 63e12efe06..194e141faf 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -42,6 +42,7 @@ (define-module (gnu packages gl) #:use-module (gnu packages image) #:use-module (gnu packages linux) #:use-module (gnu packages llvm) + #:use-module (gnu packages mono) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) @@ -889,3 +890,41 @@ (define-public mojoshader-with-viewport-flip (description "This is the last version of the mojoshader library with the glProgramViewportFlip before it was replaced with glProgramViewportInfo.") (license license:zlib)))) + +(define-public mojoshader-cs + (let ((commit "10d0dba21ff1cfe332eb7de328a2adce01286bd7")) + (package + (name "mojoshader-cs") + (version (git-version "20191205" "1" commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/FNA-XNA/MojoShader") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "11mdhf3fmb9rsn2iv753gmb596j4dh5j2iipgw078vg0lj23rml7")))) + (build-system gnu-build-system) + (arguments + '(#:tests? #f ; No tests. + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda _ + (invoke "make" "-C" "csharp"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (install-file "csharp/bin/MojoShader-CS.dll" (string-append out "/lib")) + #t)))))) + (native-inputs + `(("mono" ,mono))) + (home-page "https://github.com/FNA-XNA/MojoShader") + (synopsis "C# wrapper for MojoShader") + (description + "Mojoshader-CS provides C# bindings for the Mojoshader library. +The C# wrapper was written to be used for FNA's platform support. However, this +is written in a way that can be used for any general C# application.") + (license license:zlib)))) -- cgit v1.2.3 From 7158fe4ded47a599ceb8d556132ba83fcc686962 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sun, 15 Dec 2019 15:58:34 +0100 Subject: gnu: Add fna. * gnu/packages/game-development.scm (fna): New variable. --- gnu/packages/game-development.scm | 53 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 4dc56f43ac..cfe271075a 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -71,6 +71,7 @@ (define-module (gnu packages game-development) #:use-module (gnu packages linux) #:use-module (gnu packages lua) #:use-module (gnu packages m4) + #:use-module (gnu packages mono) #:use-module (gnu packages mp3) #:use-module (gnu packages multiprecision) #:use-module (gnu packages music) @@ -1903,3 +1904,55 @@ (define-public openvr hardware from multiple vendors without requiring that applications have specific knowledge of the hardware they are targeting.") (license license:bsd-3))) + +(define-public fna + (package + (name "fna") + (version "19.12.01") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/FNA-XNA/FNA.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1vdyi9hac24fqcs8kpj6yk36bf5rrl4dvlvdd9fc701fawcf6lrr")))) + (build-system gnu-build-system) + (arguments + '(#:tests? #f ; No tests. + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'link-dep-src + (lambda* (#:key inputs #:allow-other-keys) + (let ((sdl2 (assoc-ref inputs "sdl2-cs-src")) + (mojoshader (assoc-ref inputs "mojoshader-src")) + (faudio (assoc-ref inputs "faudio-src")) + (theorafile (assoc-ref inputs "theorafile-src"))) + (symlink (string-append sdl2 "/src") "lib/SDL2-CS/src") + (symlink (string-append mojoshader "/csharp") "lib/MojoShader/csharp") + (symlink (string-append faudio "/csharp") "lib/FAudio/csharp") + (symlink (string-append theorafile "/csharp") "lib/Theorafile/csharp")))) + (delete 'configure) + (replace 'build + (lambda _ + (invoke "make" "release"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (install-file "bin/Release/FNA.dll" (string-append out "/lib")) + #t)))))) + (native-inputs + `(("mono" ,mono))) + (inputs `(("sdl2-cs-src" ,(package-source sdl2-cs)) + ("mojoshader-src" ,(package-source mojoshader-cs)) + ("faudio-src" ,(package-source faudio)) + ("theorafile-src" ,(package-source theorafile)))) + (home-page "https://fna-xna.github.io/") + (synopsis "Accuracy-focused XNA4 reimplementation") + (description "FNA is a Microsoft XNA Game Studio 4.0 reimplementation that +focuses solely on developing a fully accurate XNA4 runtime for the desktop.") + (license (list license:ms-pl ; FNA + license:lgpl2.1 ; LzxDecoder.cs + ;; Mono.Xna: + license:expat)))) -- cgit v1.2.3 From 20972e4e5ec145835835ad7d789ce11b550f04e5 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 10:53:09 +0100 Subject: gnu: Add antik-base. * gnu/packages/lisp-xyz.scm (sbcl-antik-base, cl-antik-base, ecl-antik-base): New variables. Co-authored-by: Guillaume Le Vaillant Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 48 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 46 insertions(+), 2 deletions(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 0aa7a21ec5..a11774a485 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -12,9 +12,9 @@ ;;; Copyright © 2018 Alex Vong ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2018, 2019 Pierre Langlois -;;; Copyright © 2019 Katherine Cox-Buday +;;; Copyright © 2019, 2020 Katherine Cox-Buday ;;; Copyright © 2019 Jesse Gildersleve -;;; Copyright © 2019 Guillaume Le Vaillant +;;; Copyright © 2019, 2020 Guillaume Le Vaillant ;;; Copyright © 2019 Brett Gilio ;;; ;;; This file is part of GNU Guix. @@ -7439,3 +7439,47 @@ (define-public sbcl-plump (define-public cl-plump (sbcl-package->cl-source-package sbcl-plump)) + +(define-public sbcl-antik-base + (let ((commit "e4711a69b3d6bf37b5727af05c3cfd03e8428ba3") + (revision "1")) + (package + (name "sbcl-antik-base") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.common-lisp.net/antik/antik.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "047ga2c38par2xbgg4qx6hwv06qhf1c1f67as8xvir6s80lip1km")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("cl-ppcre" ,sbcl-cl-ppcre) + ("iterate" ,sbcl-iterate) + ("metabang-bind" ,sbcl-metabang-bind) + ("named-readtables" ,sbcl-named-readtables) + ("split-sequence" ,sbcl-split-sequence))) + (native-inputs + `(("lisp-unit" ,sbcl-lisp-unit))) + (synopsis "Scientific and engineering computation in Common Lisp") + (description + "Antik provides a foundation for scientific and engineering +computation in Common Lisp. It is designed not only to facilitate +numerical computations, but to permit the use of numerical computation +libraries and the interchange of data and procedures, whether +foreign (non-Lisp) or Lisp libraries. It is named after the +Antikythera mechanism, one of the oldest examples of a scientific +computer known.") + (home-page "https://common-lisp.net/project/antik/") + (license license:gpl3)))) + +(define-public cl-antik-base + (sbcl-package->cl-source-package sbcl-antik-base)) + +(define-public ecl-antik-base + (sbcl-package->ecl-package sbcl-antik-base)) -- cgit v1.2.3 From 29411ae4f78329043d8d7946ab821b24a55fbb43 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 11:41:22 +0100 Subject: gnu: Add foreign-array. * gnu/packages/lisp-xyz.scm (sbcl-foreign-array, cl-foreign-array, ecl-foreign-array): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index a11774a485..6b1da4d4e7 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -7483,3 +7483,24 @@ (define-public cl-antik-base (define-public ecl-antik-base (sbcl-package->ecl-package sbcl-antik-base)) + +(define-public sbcl-foreign-array + (package + (inherit sbcl-antik-base) + (name "sbcl-foreign-array") + (arguments + (substitute-keyword-arguments (package-arguments sbcl-antik-base) + ((#:asd-file _ "") "foreign-array.asd") + ((#:asd-system-name _ #f) "foreign-array"))) + (inputs + `(("antik-base" ,sbcl-antik-base) + ("cffi" ,sbcl-cffi) + ("trivial-garbage" ,sbcl-trivial-garbage) + ("static-vectors" ,sbcl-static-vectors))) + (synopsis "Common Lisp library providing access to foreign arrays"))) + +(define-public cl-foreign-array + (sbcl-package->cl-source-package sbcl-foreign-array)) + +(define-public ecl-foreign-array + (sbcl-package->ecl-package sbcl-foreign-array)) -- cgit v1.2.3 From f67e34db3f4429d4d5bf915b71b191a3bad4a3e8 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 11:55:14 +0100 Subject: gnu: Add physical-dimension. * gnu/packages/lisp-xyz.scp (sbcl-physical-dimension, cl-physical-dimension): New variables. Signed-off-by: Guillaume Le Vaillant --- 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 6b1da4d4e7..74f3915b06 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -7504,3 +7504,21 @@ (define-public cl-foreign-array (define-public ecl-foreign-array (sbcl-package->ecl-package sbcl-foreign-array)) + +(define-public sbcl-physical-dimension + (package + (inherit sbcl-antik-base) + (name "sbcl-physical-dimension") + (inputs + `(("fare-utils" ,sbcl-fare-utils) + ("foreign-array" ,sbcl-foreign-array) + ("trivial-utf-8" ,sbcl-trivial-utf-8))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-antik-base) + ((#:asd-file _ "") "physical-dimension.asd") + ((#:asd-system-name _ #f) "physical-dimension"))) + (synopsis + "Common Lisp library providing computations with physical units"))) + +(define-public cl-physical-dimension + (sbcl-package->cl-source-package sbcl-physical-dimension)) -- cgit v1.2.3 From 812d06186ec4af0c670c75066ffa87baeb123a9b Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 12:03:17 +0100 Subject: gnu: Add science-data. * gnu/packages/lisp-xyz.scm (sbcl-science-data, cl-science-data): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 74f3915b06..ed3f172bc4 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -7522,3 +7522,20 @@ (define-public sbcl-physical-dimension (define-public cl-physical-dimension (sbcl-package->cl-source-package sbcl-physical-dimension)) + +(define-public sbcl-science-data + (package + (inherit sbcl-antik-base) + (name "sbcl-science-data") + (inputs + `(("physical-dimension" ,sbcl-physical-dimension) + ("drakma" ,sbcl-drakma))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-antik-base) + ((#:asd-file _ "") "science-data.asd") + ((#:asd-system-name _ #f) "science-data"))) + (synopsis + "Common Lisp library for scientific and engineering numerical data"))) + +(define-public cl-science-data + (sbcl-package->cl-source-package sbcl-science-data)) -- cgit v1.2.3 From 064dbb71292b7314345d901124d318008f3f5833 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 13:40:33 +0100 Subject: gnu: Add gsll. * gnu/packages/lisp-xyz.scm (sbcl-gsll, cl-gsll): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 63 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index ed3f172bc4..7627a2aede 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -53,6 +53,7 @@ (define-module (gnu packages lisp-xyz) #:use-module (gnu packages gtk) #:use-module (gnu packages libffi) #:use-module (gnu packages lisp) + #:use-module (gnu packages maths) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) @@ -7539,3 +7540,65 @@ (define-public sbcl-science-data (define-public cl-science-data (sbcl-package->cl-source-package sbcl-science-data)) + +(define-public sbcl-gsll + (let ((commit "1a8ada22f9cf5ed7372d352b2317f4ccdb6ab308") + (revision "1")) + (package + (name "sbcl-gsll") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.common-lisp.net/antik/gsll.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0z5nypfk26hxihb08p085644afawicrgb4xvadh3lmrn46qbjfn4")))) + (build-system asdf-build-system/sbcl) + (native-inputs + `(("lisp-unit" ,sbcl-lisp-unit))) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("cffi-grovel" ,sbcl-cffi-grovel) + ("cffi-libffi" ,sbcl-cffi-libffi) + ("foreign-array" ,sbcl-foreign-array) + ("gsl" ,gsl) + ("metabang-bind" ,sbcl-metabang-bind) + ("trivial-features" ,sbcl-trivial-features) + ("trivial-garbage" ,sbcl-trivial-garbage))) + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-cffi-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "gsll.asd" + ((":depends-on \\(#:foreign-array") + ":depends-on (#:foreign-array #:cffi-libffi")) + (substitute* "init/init.lisp" + (("libgslcblas.so" all) + (string-append + (assoc-ref inputs "gsl") "/lib/" all))) + (substitute* "init/init.lisp" + (("libgsl.so" all) + (string-append + (assoc-ref inputs "gsl") "/lib/" all)))))))) + (synopsis "GNU Scientific Library for Lisp") + (description + "The GNU Scientific Library for Lisp (GSLL) allows the use of the +GNU Scientific Library (GSL) from Common Lisp. This library provides a +full range of common mathematical operations useful to scientific and +engineering applications. The design of the GSLL interface is such +that access to most of the GSL library is possible in a Lisp-natural +way; the intent is that the user not be hampered by the restrictions +of the C language in which GSL has been written. GSLL thus provides +interactive use of GSL for getting quick answers, even for someone not +intending to program in Lisp.") + (home-page "https://common-lisp.net/project/gsll/") + (license license:gpl3)))) + +(define-public cl-gsll + (sbcl-package->cl-source-package sbcl-gsll)) -- cgit v1.2.3 From f1faf1ca54c2806348093d616093990c0de7ddc4 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 14:00:43 +0100 Subject: gnu: Add antik. * gnu/packages/lisp-xyz.scm (sbcl-antik, cl-antik): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 7627a2aede..a96e2ce8aa 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -7602,3 +7602,18 @@ (define-public sbcl-gsll (define-public cl-gsll (sbcl-package->cl-source-package sbcl-gsll)) + +(define-public sbcl-antik + (package + (inherit sbcl-antik-base) + (name "sbcl-antik") + (inputs + `(("gsll" ,sbcl-gsll) + ("physical-dimension" ,sbcl-physical-dimension))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-antik-base) + ((#:asd-file _ "") "antik.asd") + ((#:asd-system-name _ #f) "antik"))))) + +(define-public cl-antik + (sbcl-package->cl-source-package sbcl-antik)) -- cgit v1.2.3 From 7b0bb0d1cff43c300eb0990a03984a9a42ca09d4 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 14:12:19 +0100 Subject: gnu: Add cl-interpol. * gnu/packages/lisp-xyz.scm (sbcl-cl-interpol, cl-interpol, ecl-cl-interpol): New variables. Signed-off-by: Guillaume Le Vaillant --- 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 a96e2ce8aa..3590dbb1f2 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -7617,3 +7617,41 @@ (define-public sbcl-antik (define-public cl-antik (sbcl-package->cl-source-package sbcl-antik)) + +(define-public sbcl-cl-interpol + (let ((commit "1fd288d861db85bc4677cff3cdd6af75fda1afb4") + (revision "1")) + (package + (name "sbcl-cl-interpol") + (version (git-version "0.2.6" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/edicl/cl-interpol.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1hnikak52hmcq1r5f616m6qq1108qnkw80pja950nv1fq5p0ppjn")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("cl-unicode" ,sbcl-cl-unicode) + ("named-readtables" ,sbcl-named-readtables))) + (native-inputs + `(("flexi-streams" ,sbcl-flexi-streams))) + (synopsis "String interpolation for Common Lisp") + (description + "CL-INTERPOL is a library for Common Lisp which modifies the +reader so that you can have interpolation within strings similar to +Perl or Unix Shell scripts. It also provides various ways to insert +arbitrary characters into literal strings even if your editor/IDE +doesn't support them.") + (home-page "https://edicl.github.io/cl-interpol/") + (license license:bsd-3)))) + +(define-public cl-interpol + (sbcl-package->cl-source-package sbcl-cl-interpol)) + +(define-public ecl-cl-interpol + (sbcl-package->ecl-package sbcl-cl-interpol)) -- cgit v1.2.3 From 14ef7a9292ae03fd0beb07b339741f4e93ea29bc Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 14:53:14 +0100 Subject: gnu: Preparations to add symbol-munger and lisp-unit2. There is a cyclical dependency between symbol-munger and lisp-unit2. Here we add '*-boot0' packages to cut this cycle. * gnu/packages/lisp-xyz.scm (sbcl-symbol-munger-boot0, sbcl-lisp-unit2-boot0): New variables. Co-authored-by: Guillaume Le Vaillant Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 74 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 3590dbb1f2..de3359ba9f 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -7655,3 +7655,77 @@ (define-public cl-interpol (define-public ecl-cl-interpol (sbcl-package->ecl-package sbcl-cl-interpol)) + +(define sbcl-symbol-munger-boot0 + ;; There is a cyclical dependency between symbol-munger and lisp-unit2. + ;; See https://github.com/AccelerationNet/symbol-munger/issues/4 + (let ((commit "cc2bb4b7acd454d756484aec81ba487648385fc3") + (revision "1")) + (package + (name "sbcl-symbol-munger-boot0") + (version (git-version "0.0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/AccelerationNet/symbol-munger.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0diav5ricqsybqvbp4bkxyj3bn3v9n7xb2pqqc4vg1algsw2pyjl")))) + (build-system asdf-build-system/sbcl) + (arguments + `(#:asd-file "symbol-munger.asd" + #:asd-system-name "symbol-munger")) + (inputs + `(("iterate" ,sbcl-iterate) + ("alexandria" ,sbcl-alexandria))) + (native-inputs + `(("lisp-unit" ,sbcl-lisp-unit))) + (synopsis + "Capitalization and spacing conversion functions for Common Lisp") + (description + "This is a Common Lisp library to change the capitalization and spacing +of a string or a symbol. It can convert to and from Lisp, english, underscore +and camel-case rules.") + (home-page "https://github.com/AccelerationNet/symbol-munger") + ;; The package declares a BSD license, but all of the license + ;; text is MIT. + ;; See https://github.com/AccelerationNet/symbol-munger/issues/5 + (license license:expat)))) + +(define sbcl-lisp-unit2-boot0 + ;; There is a cyclical dependency between symbol-munger and lisp-unit2. + ;; See https://github.com/AccelerationNet/symbol-munger/issues/4 + (let ((commit "fb9721524d1e4e73abb223ee036d74ce14a5505c") + (revision "1")) + (package + (name "sbcl-lisp-unit2-boot0") + (version (git-version "0.2.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/AccelerationNet/lisp-unit2.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1rsqy8y0jqll6xn9a593848f5wvd5ribv4csry1ly0hmdhfnqzlp")))) + (build-system asdf-build-system/sbcl) + (arguments + `(#:asd-file "lisp-unit2.asd" + #:asd-system-name "lisp-unit2")) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("cl-interpol" ,sbcl-cl-interpol) + ("iterate" ,sbcl-iterate) + ("symbol-munger-boot0" ,sbcl-symbol-munger-boot0))) + (synopsis "Test Framework for Common Lisp") + (description + "LISP-UNIT2 is a Common Lisp library that supports unit testing in the +style of JUnit for Java. It is a new version of the lisp-unit library written +by Chris Riesbeck.") + (home-page "https://github.com/AccelerationNet/lisp-unit2") + (license license:expat)))) -- cgit v1.2.3 From edfa2261dcf0b7737399b8a509a81f542de6bbf1 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 15:07:30 +0100 Subject: gnu: Add symbol-munger. * gnu/packages/lisp-xyz.scm (sbcl-symbol-munger, cl-symbol-munger, ecl-symbol-munger): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index de3359ba9f..28dd7566b3 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -7729,3 +7729,43 @@ (define sbcl-lisp-unit2-boot0 by Chris Riesbeck.") (home-page "https://github.com/AccelerationNet/lisp-unit2") (license license:expat)))) + +(define-public sbcl-symbol-munger + (let ((commit "97598d4c3c53fd5da72ab78908fbd5d8c7a13416") + (revision "1")) + (package + (name "sbcl-symbol-munger") + (version (git-version "0.0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/AccelerationNet/symbol-munger.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0y8jywjy0ldyhp7bxf16fdvdd2qgqnd7nlhlqfpfnzxcqk4xy1km")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("iterate" ,sbcl-iterate))) + (native-inputs + `(("lisp-unit2-boot0" ,sbcl-lisp-unit2-boot0))) + (synopsis + "Capitalization and spacing conversion functions for Common Lisp") + (description + "This is a Common Lisp library to change the capitalization and spacing +of a string or a symbol. It can convert to and from Lisp, english, underscore +and camel-case rules.") + (home-page "https://github.com/AccelerationNet/symbol-munger") + ;; The package declares a BSD license, but all of the license + ;; text is MIT. + ;; See https://github.com/AccelerationNet/symbol-munger/issues/5 + (license license:expat)))) + +(define-public cl-symbol-munger + (sbcl-package->cl-source-package sbcl-symbol-munger)) + +(define-public ecl-symbol-munger + (sbcl-package->ecl-package sbcl-symbol-munger)) -- cgit v1.2.3 From b97dbb6448daa5febba8f2537a638cf9bdf70a91 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 15:13:28 +0100 Subject: gnu: Add lisp-unit2. * gnu/packages/lisp-xyz.scm (sbcl-lisp-unit2, cl-lisp-unit2, ecl-lisp-unit2): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 28dd7566b3..d7d3fc462c 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -7769,3 +7769,19 @@ (define-public cl-symbol-munger (define-public ecl-symbol-munger (sbcl-package->ecl-package sbcl-symbol-munger)) + +(define-public sbcl-lisp-unit2 + (package + (inherit sbcl-lisp-unit2-boot0) + (name "sbcl-lisp-unit2") + (inputs + `(("alexandria" ,sbcl-alexandria) + ("cl-interpol" ,sbcl-cl-interpol) + ("iterate" ,sbcl-iterate) + ("symbol-munger" ,sbcl-symbol-munger))))) + +(define-public cl-lisp-unit2 + (sbcl-package->cl-source-package sbcl-lisp-unit2)) + +(define-public ecl-lisp-unit2 + (sbcl-package->ecl-package sbcl-lisp-unit2)) -- cgit v1.2.3 From f4448e43b4ce907dd6dfd762ab441570406e7b34 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 15:22:52 +0100 Subject: gnu: Add cl-csv. * gnu/packages/lisp-xyz.scm (sbcl-cl-csv, cl-csv, ecl-cl-csv): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index d7d3fc462c..b1e4f593e4 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -7785,3 +7785,42 @@ (define-public cl-lisp-unit2 (define-public ecl-lisp-unit2 (sbcl-package->ecl-package sbcl-lisp-unit2)) + +(define-public sbcl-cl-csv + (let ((commit "3eba29c8364b033fbe0d189c2500559278b6a362") + (revision "1")) + (package + (name "sbcl-cl-csv") + (version (git-version "1.0.6" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/AccelerationNet/cl-csv.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "07h4ni89jzx93clx453hlnnb5g53hhlcmz5hghqv6ysam48lc8g6")))) + (build-system asdf-build-system/sbcl) + (arguments + ;; See: https://github.com/AccelerationNet/cl-csv/pull/34 + `(#:tests? #f)) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("cl-interpol" ,sbcl-cl-interpol) + ("iterate" ,sbcl-iterate))) + (native-inputs + `(("lisp-unit2" ,sbcl-lisp-unit2))) + (synopsis "Common lisp library for comma-separated values") + (description + "This is a Common Lisp library providing functions to read/write CSV +from/to strings, streams and files.") + (home-page "https://github.com/AccelerationNet/cl-csv") + (license license:bsd-3)))) + +(define-public cl-csv + (sbcl-package->cl-source-package sbcl-cl-csv)) + +(define-public ecl-cl-csv + (sbcl-package->ecl-package sbcl-cl-csv)) -- cgit v1.2.3 From 6f0c2c95d4c5f5590540acdf108037246d481678 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 15:36:00 +0100 Subject: gnu: Add external-program. * gnu/packages/lisp-xyz.scm (sbcl-external-program, cl-external-program, ecl-external-program): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index b1e4f593e4..c95d4704f3 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -7824,3 +7824,39 @@ (define-public cl-csv (define-public ecl-cl-csv (sbcl-package->ecl-package sbcl-cl-csv)) + +(define-public sbcl-external-program + (let ((commit "5888b8f1fd3953feeeacecbba4384ddda584a749") + (revision "1")) + (package + (name "sbcl-external-program") + (version (git-version "0.0.6" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sellout/external-program.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0vww1x3yilb3bjwg6k184vaj4vxyxw4vralhnlm6lk4xac67kc9z")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("trivial-features" ,sbcl-trivial-features))) + (native-inputs + `(("fiveam" ,sbcl-fiveam))) + (synopsis "Common Lisp library for running external programs") + (description + "EXTERNAL-PROGRAM enables running programs outside the Lisp +process. It is an attempt to make the RUN-PROGRAM functionality in +implementations like SBCL and CCL as portable as possible without +sacrificing much in the way of power.") + (home-page "https://github.com/sellout/external-program") + (license license:llgpl)))) + +(define-public cl-external-program + (sbcl-package->cl-source-package sbcl-external-program)) + +(define-public ecl-external-program + (sbcl-package->ecl-package sbcl-external-program)) -- cgit v1.2.3 From 710a281525bead70bafeb6b7b80b688af48e67eb Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 15:43:28 +0100 Subject: gnu: Add cl-ana.pathname-utils. * gnu/packages/lisp-xyz.scm (sbcl-cl-ana-boot0, sbcl-cl-ana.pathname-utils, cl-ana.pathname-utils, ecl-cl-ana-pathname-utils): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index c95d4704f3..7130c3aa84 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -7860,3 +7860,43 @@ (define-public cl-external-program (define-public ecl-external-program (sbcl-package->ecl-package sbcl-external-program)) + +(define sbcl-cl-ana-boot0 + (let ((commit "fa7cee4c50aa1c859652813049ba0da7c18a0df9") + (revision "1")) + (package + (name "sbcl-cl-ana-boot0") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ghollisjr/cl-ana.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0mr47l57m276dbpap7irr4fcnk5fgknhf6mgv4043s8h73amk5qh")))) + (build-system asdf-build-system/sbcl) + (synopsis "Common Lisp data analysis library") + (description + "CL-ANA is a data analysis library in Common Lisp providing tabular and +binned data analysis along with nonlinear least squares fitting and +visualization.") + (home-page "https://github.com/ghollisjr/cl-ana") + (license license:gpl3)))) + +(define-public sbcl-cl-ana.pathname-utils + (package + (inherit sbcl-cl-ana-boot0) + (name "sbcl-cl-ana.pathname-utils") + (arguments + (substitute-keyword-arguments (package-arguments sbcl-cl-ana-boot0) + ((#:asd-file _ "") "pathname-utils/cl-ana.pathname-utils.asd") + ((#:asd-system-name _ #f) "cl-ana.pathname-utils"))))) + +(define-public cl-ana.pathname-utils + (sbcl-package->cl-source-package sbcl-cl-ana.pathname-utils)) + +(define-public ecl-cl-ana.pathname-utils + (sbcl-package->ecl-package sbcl-cl-ana.pathname-utils)) -- cgit v1.2.3 From dc60235bc5e303fc51f2080066142a7c30047146 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 15:48:05 +0100 Subject: gnu: Add cl-ana.package-utils. * gnu/packages/lisp-xyz.scm (sbcl-cl-ana.package-utils, cl-ana.package-utils, ecl-cl-ana.package-utils): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 7130c3aa84..9f72cec472 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -7900,3 +7900,20 @@ (define-public cl-ana.pathname-utils (define-public ecl-cl-ana.pathname-utils (sbcl-package->ecl-package sbcl-cl-ana.pathname-utils)) + +(define-public sbcl-cl-ana.package-utils + (package + (inherit sbcl-cl-ana-boot0) + (name "sbcl-cl-ana.package-utils") + (inputs + `(("alexandria" ,sbcl-alexandria))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-cl-ana-boot0) + ((#:asd-file _ "") "package-utils/cl-ana.package-utils.asd") + ((#:asd-system-name _ #f) "cl-ana.package-utils"))))) + +(define-public cl-ana.package-utils + (sbcl-package->cl-source-package sbcl-cl-ana.package-utils)) + +(define-public ecl-cl-ana.package-utils + (sbcl-package->ecl-package sbcl-cl-ana.package-utils)) -- cgit v1.2.3 From d9d3a1a8de5fcf23edf5fb5d88e307ef6e04d416 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 15:51:59 +0100 Subject: gnu: Add cl-ana.string-utils. * gnu/packages/lisp-xyz.scm (sbcl-cl-ana.string-utils, cl-ana.string-utils, ecl-cl-ana.string-utils): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 9f72cec472..506f163949 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -7917,3 +7917,20 @@ (define-public cl-ana.package-utils (define-public ecl-cl-ana.package-utils (sbcl-package->ecl-package sbcl-cl-ana.package-utils)) + +(define-public sbcl-cl-ana.string-utils + (package + (inherit sbcl-cl-ana-boot0) + (name "sbcl-cl-ana.string-utils") + (inputs + `(("split-sequence" ,sbcl-split-sequence))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-cl-ana-boot0) + ((#:asd-file _ "") "string-utils/cl-ana.string-utils.asd") + ((#:asd-system-name _ #f) "cl-ana.string-utils"))))) + +(define-public cl-ana.string-utils + (sbcl-package->cl-source-package sbcl-cl-ana.string-utils)) + +(define-public ecl-cl-ana.string-utils + (sbcl-package->ecl-package sbcl-cl-ana.string-utils)) -- cgit v1.2.3 From 927895d76d60b6355b48b8b04d9f9e4d24f497e0 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 15:55:35 +0100 Subject: gnu: Add cl-ana.functional-utils. * gnu/packages/lisp-xyz.scm (sbcl-cl-ana.functional-utils, cl-ana.functional-utils, ecl-cl-ana.functional-utils): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 506f163949..fe5d4627a3 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -7934,3 +7934,18 @@ (define-public cl-ana.string-utils (define-public ecl-cl-ana.string-utils (sbcl-package->ecl-package sbcl-cl-ana.string-utils)) + +(define-public sbcl-cl-ana.functional-utils + (package + (inherit sbcl-cl-ana-boot0) + (name "sbcl-cl-ana.functional-utils") + (arguments + (substitute-keyword-arguments (package-arguments sbcl-cl-ana-boot0) + ((#:asd-file _ "") "functional-utils/cl-ana.functional-utils.asd") + ((#:asd-system-name _ #f) "cl-ana.functional-utils"))))) + +(define-public cl-ana.functional-utils + (sbcl-package->cl-source-package sbcl-cl-ana.functional-utils)) + +(define-public ecl-cl-ana.functional-utils + (sbcl-package->ecl-package sbcl-cl-ana.functional-utils)) -- cgit v1.2.3 From ea988c3b20983e0e43da6dcf45f236ef5a9c2e01 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 15:59:44 +0100 Subject: gnu: Add cl-ana.list-utils. * gnu/packages/lisp-xyz.scm (sbcl-cl-ana.list-utils, cl-ana.list-utils, ecl-cl-ana.list-utils): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index fe5d4627a3..155b828cb1 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -7949,3 +7949,22 @@ (define-public cl-ana.functional-utils (define-public ecl-cl-ana.functional-utils (sbcl-package->ecl-package sbcl-cl-ana.functional-utils)) + +(define-public sbcl-cl-ana.list-utils + (package + (inherit sbcl-cl-ana-boot0) + (name "sbcl-cl-ana.list-utils") + (inputs + `(("alexandria" ,sbcl-alexandria) + ("cl-ana.functional-utils" ,sbcl-cl-ana.functional-utils) + ("cl-ana.string-utils" ,sbcl-cl-ana.string-utils))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-cl-ana-boot0) + ((#:asd-file _ "") "list-utils/cl-ana.list-utils.asd") + ((#:asd-system-name _ #f) "cl-ana.list-utils"))))) + +(define-public cl-ana.list-utils + (sbcl-package->cl-source-package sbcl-cl-ana.list-utils)) + +(define-public ecl-cl-ana.list-utils + (sbcl-package->ecl-package sbcl-cl-ana.list-utils)) -- cgit v1.2.3 From 35b5ca24798a883ec7c8aa64016f92185e529fa1 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 16:03:34 +0100 Subject: gnu: Add cl-ana.generic-math. * gnu/packages/lisp-xyz.scm (sbcl-cl-ana.generic-math, cl-ana.generic-math, ecl-cl-ana.generic-math): New variables. Signed-off-by: Guillaume Le Vaillant --- 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 155b828cb1..0ead99e8db 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -7968,3 +7968,21 @@ (define-public cl-ana.list-utils (define-public ecl-cl-ana.list-utils (sbcl-package->ecl-package sbcl-cl-ana.list-utils)) + +(define-public sbcl-cl-ana.generic-math + (package + (inherit sbcl-cl-ana-boot0) + (name "sbcl-cl-ana.generic-math") + (inputs + `(("cl-ana.list-utils" ,sbcl-cl-ana.list-utils) + ("cl-ana.package-utils" ,sbcl-cl-ana.package-utils))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-cl-ana-boot0) + ((#:asd-file _ "") "generic-math/cl-ana.generic-math.asd") + ((#:asd-system-name _ #f) "cl-ana.generic-math"))))) + +(define-public cl-ana.generic-math + (sbcl-package->cl-source-package sbcl-cl-ana.generic-math)) + +(define-public ecl-cl-ana.generic-math + (sbcl-package->ecl-package sbcl-cl-ana.generic-math)) -- cgit v1.2.3 From 6d69c5b4929d46191184735ba36e45ba42145eef Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 16:08:19 +0100 Subject: gnu: Add cl-ana.math-functions. * gnu/packages/lisp-xyz.scm (sbcl-cl-ana.math-functions, cl-ana.math-functions): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 0ead99e8db..4f537e7345 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -7986,3 +7986,18 @@ (define-public cl-ana.generic-math (define-public ecl-cl-ana.generic-math (sbcl-package->ecl-package sbcl-cl-ana.generic-math)) + +(define-public sbcl-cl-ana.math-functions + (package + (inherit sbcl-cl-ana-boot0) + (name "sbcl-cl-ana.math-functions") + (inputs + `(("cl-ana.generic-math" ,sbcl-cl-ana.generic-math) + ("gsll" ,sbcl-gsll))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-cl-ana-boot0) + ((#:asd-file _ "") "math-functions/cl-ana.math-functions.asd") + ((#:asd-system-name _ #f) "cl-ana.math-functions"))))) + +(define-public cl-ana.math-functions + (sbcl-package->cl-source-package sbcl-cl-ana.math-functions)) -- cgit v1.2.3 From 39ba698b8358e33cdd62d26be3777abbcf5fda0a Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 16:49:21 +0100 Subject: gnu: Add cl-ana.calculus. * gnu/packages/lisp-xyz.scm (sbcl-cl-ana.calculus, cl-ana.calculus, ecl-cl-ana.calculus): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 4f537e7345..7ac1f81514 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -8001,3 +8001,20 @@ (define-public sbcl-cl-ana.math-functions (define-public cl-ana.math-functions (sbcl-package->cl-source-package sbcl-cl-ana.math-functions)) + +(define-public sbcl-cl-ana.calculus + (package + (inherit sbcl-cl-ana-boot0) + (name "sbcl-cl-ana.calculus") + (inputs + `(("cl-ana.generic-math" ,sbcl-cl-ana.generic-math))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-cl-ana-boot0) + ((#:asd-file _ "") "calculus/cl-ana.calculus.asd") + ((#:asd-system-name _ #f) "cl-ana.calculus"))))) + +(define-public cl-ana.calculus + (sbcl-package->cl-source-package sbcl-cl-ana.calculus)) + +(define-public ecl-cl-ana.calculus + (sbcl-package->ecl-package sbcl-cl-ana.calculus)) -- cgit v1.2.3 From ad09a96a8d774a485778de328b8a0563c1b8eaa6 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 16:53:15 +0100 Subject: gnu: Add cl-ana.symbol-utils. * gnu/packages/lisp-xyz.scm (sbcl-cl-ana.symbol-utils, cl-ana.symbol-utils, ecl-cl-ana.symbol-utils): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 7ac1f81514..e7288c8509 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -8018,3 +8018,20 @@ (define-public cl-ana.calculus (define-public ecl-cl-ana.calculus (sbcl-package->ecl-package sbcl-cl-ana.calculus)) + +(define-public sbcl-cl-ana.symbol-utils + (package + (inherit sbcl-cl-ana-boot0) + (name "sbcl-cl-ana.symbol-utils") + (inputs + `(("cl-ana.list-utils" ,sbcl-cl-ana.list-utils))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-cl-ana-boot0) + ((#:asd-file _ "") "symbol-utils/cl-ana.symbol-utils.asd") + ((#:asd-system-name _ #f) "cl-ana.symbol-utils"))))) + +(define-public cl-ana.symbol-utils + (sbcl-package->cl-source-package sbcl-cl-ana.symbol-utils)) + +(define-public ecl-cl-ana.symbol-utils + (sbcl-package->ecl-package sbcl-cl-ana.symbol-utils)) -- cgit v1.2.3 From 141d96e1b91b00998311b6826f5bd5b0871fb702 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 16:56:44 +0100 Subject: gnu: Add cl-ana.macro-utils. * gnu/packages/lisp-xyz.scm (sbcl-cl-ana.macro-utils, cl-ana.macro-utils, ecl-cl-ana.macro-utils): New packages. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index e7288c8509..fd9ad829fa 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -8035,3 +8035,24 @@ (define-public cl-ana.symbol-utils (define-public ecl-cl-ana.symbol-utils (sbcl-package->ecl-package sbcl-cl-ana.symbol-utils)) + +(define-public sbcl-cl-ana.macro-utils + (package + (inherit sbcl-cl-ana-boot0) + (name "sbcl-cl-ana.macro-utils") + (inputs + `(("alexandria" ,sbcl-alexandria) + ("cl-ana.list-utils" ,sbcl-cl-ana.list-utils) + ("cl-ana.string-utils" ,sbcl-cl-ana.string-utils) + ("cl-ana.symbol-utils" ,sbcl-cl-ana.symbol-utils) + ("split-sequence" ,sbcl-split-sequence))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-cl-ana-boot0) + ((#:asd-file _ "") "macro-utils/cl-ana.macro-utils.asd") + ((#:asd-system-name _ #f) "cl-ana.macro-utils"))))) + +(define-public cl-ana.macro-utils + (sbcl-package->cl-source-package sbcl-cl-ana.macro-utils)) + +(define-public ecl-cl-ana.macro-utils + (sbcl-package->ecl-package sbcl-cl-ana.macro-utils)) -- cgit v1.2.3 From 7468ca3cce3ae0cdc3c02bde4d6ce050e04a5709 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 17:01:10 +0100 Subject: gnu: Add cl-ana.binary-tree. * gnu/packages/lisp-xyz.scm (sbcl-cl-ana.binary-tree, cl-ana.binary-tree, ecl-cl-ana.binary-tree): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index fd9ad829fa..0ded742381 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -8056,3 +8056,22 @@ (define-public cl-ana.macro-utils (define-public ecl-cl-ana.macro-utils (sbcl-package->ecl-package sbcl-cl-ana.macro-utils)) + +(define-public sbcl-cl-ana.binary-tree + (package + (inherit sbcl-cl-ana-boot0) + (name "sbcl-cl-ana.binary-tree") + (inputs + `(("cl-ana.functional-utils" ,sbcl-cl-ana.functional-utils) + ("cl-ana.list-utils" ,sbcl-cl-ana.list-utils) + ("cl-ana.macro-utils" ,sbcl-cl-ana.macro-utils))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-cl-ana-boot0) + ((#:asd-file _ "") "binary-tree/cl-ana.binary-tree.asd") + ((#:asd-system-name _ #f) "cl-ana.binary-tree"))))) + +(define-public cl-ana.binary-tree + (sbcl-package->cl-source-package sbcl-cl-ana.binary-tree)) + +(define-public ecl-cl-ana.binary-tree + (sbcl-package->ecl-package sbcl-cl-ana.binary-tree)) -- cgit v1.2.3 From f69f023581bf0a52f21b303366ba0868ed53e08d Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 17:04:29 +0100 Subject: gnu: Add cl-ana.tensor. * gnu/packages/lisp-xyz.scm (sbcl-cl-ana.tensor, cl-ana.tensor, ecl-cl-ana.tensor): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 0ded742381..cb808a802d 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -8075,3 +8075,24 @@ (define-public cl-ana.binary-tree (define-public ecl-cl-ana.binary-tree (sbcl-package->ecl-package sbcl-cl-ana.binary-tree)) + +(define-public sbcl-cl-ana.tensor + (package + (inherit sbcl-cl-ana-boot0) + (name "sbcl-cl-ana.tensor") + (inputs + `(("alexandria" ,sbcl-alexandria) + ("cl-ana.generic-math" ,sbcl-cl-ana.generic-math) + ("cl-ana.list-utils" ,sbcl-cl-ana.list-utils) + ("cl-ana.macro-utils" ,sbcl-cl-ana.macro-utils) + ("cl-ana.symbol-utils" ,sbcl-cl-ana.symbol-utils))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-cl-ana-boot0) + ((#:asd-file _ "") "tensor/cl-ana.tensor.asd") + ((#:asd-system-name _ #f) "cl-ana.tensor"))))) + +(define-public cl-ana.tensor + (sbcl-package->cl-source-package sbcl-cl-ana.tensor)) + +(define-public ecl-cl-ana.tensor + (sbcl-package->ecl-package sbcl-cl-ana.tensor)) -- cgit v1.2.3 From 87e58e2b614b44b9b7f0c1d89d69ba7032266965 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 17:08:33 +0100 Subject: gnu: Add cl-ana.error-propogation. * gnu/packages/lisp-xyz.scm (sbcl-cl-ana.error-propogation, cl-ana.error-propogation): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index cb808a802d..50bd1a6eb1 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -8096,3 +8096,18 @@ (define-public cl-ana.tensor (define-public ecl-cl-ana.tensor (sbcl-package->ecl-package sbcl-cl-ana.tensor)) + +(define-public sbcl-cl-ana.error-propogation + (package + (inherit sbcl-cl-ana-boot0) + (name "sbcl-cl-ana.error-propogation") + (inputs + `(("cl-ana.generic-math" ,sbcl-cl-ana.generic-math) + ("cl-ana.math-functions" ,sbcl-cl-ana.math-functions))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-cl-ana-boot0) + ((#:asd-file _ "") "error-propogation/cl-ana.error-propogation.asd") + ((#:asd-system-name _ #f) "cl-ana.error-propogation"))))) + +(define-public cl-ana.error-propogation + (sbcl-package->cl-source-package sbcl-cl-ana.error-propogation)) -- cgit v1.2.3 From a2aeef614c271f29be8ee445244b0d7303c0656b Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 17:12:02 +0100 Subject: gnu: Add cl-ana.quantity. * gnu/packages/lisp-xyz.scm (sbcl-cl-ana.quantity, cl-ana.quantity): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 50bd1a6eb1..3721822e55 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -8111,3 +8111,22 @@ (define-public sbcl-cl-ana.error-propogation (define-public cl-ana.error-propogation (sbcl-package->cl-source-package sbcl-cl-ana.error-propogation)) + +(define-public sbcl-cl-ana.quantity + (package + (inherit sbcl-cl-ana-boot0) + (name "sbcl-cl-ana.quantity") + (inputs + `(("alexandria" ,sbcl-alexandria) + ("cl-ana.error-propogation" ,sbcl-cl-ana.error-propogation) + ("cl-ana.generic-math" ,sbcl-cl-ana.generic-math) + ("cl-ana.list-utils" ,sbcl-cl-ana.list-utils) + ("cl-ana.macro-utils" ,sbcl-cl-ana.macro-utils) + ("cl-ana.symbol-utils" ,sbcl-cl-ana.symbol-utils))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-cl-ana-boot0) + ((#:asd-file _ "") "quantity/cl-ana.quantity.asd") + ((#:asd-system-name _ #f) "cl-ana.quantity"))))) + +(define-public cl-ana.quantity + (sbcl-package->cl-source-package sbcl-cl-ana.quantity)) -- cgit v1.2.3 From fc029fe3a0648703450145792995c23d4386872f Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 17:15:46 +0100 Subject: gnu: Add cl-ana.table. * gnu/packages/lisp-xyz.scm (sbcl-cl-ana.table, cl-ana.table, ecl-cl-ana.table): New variables. Signed-off-by: Guillaume Le Vaillant --- 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 3721822e55..1d3dbb4ec5 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -8130,3 +8130,25 @@ (define-public sbcl-cl-ana.quantity (define-public cl-ana.quantity (sbcl-package->cl-source-package sbcl-cl-ana.quantity)) + +(define-public sbcl-cl-ana.table + (package + (inherit sbcl-cl-ana-boot0) + (name "sbcl-cl-ana.table") + (inputs + `(("alexandria" ,sbcl-alexandria) + ("cl-ana.functional-utils" ,sbcl-cl-ana.functional-utils) + ("cl-ana.list-utils" ,sbcl-cl-ana.list-utils) + ("cl-ana.macro-utils" ,sbcl-cl-ana.macro-utils) + ("cl-ana.string-utils" ,sbcl-cl-ana.string-utils) + ("cl-ana.symbol-utils" ,sbcl-cl-ana.symbol-utils))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-cl-ana-boot0) + ((#:asd-file _ "") "table/cl-ana.table.asd") + ((#:asd-system-name _ #f) "cl-ana.table"))))) + +(define-public cl-ana.table + (sbcl-package->cl-source-package sbcl-cl-ana.table)) + +(define-public ecl-cl-ana.table + (sbcl-package->ecl-package sbcl-cl-ana.table)) -- cgit v1.2.3 From eac5d1dd4cbd3ac06a1229c3bc6ce9f1e2bb9100 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 17:18:59 +0100 Subject: gnu: Add cl-ana.table-utils. * gnu/packages/lisp-xyz.scm (sbcl-cl-ana.table-utils, cl-ana.table-utils, ecl-cl-ana.table-utils): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 1d3dbb4ec5..ebbed9d7cd 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -8152,3 +8152,22 @@ (define-public cl-ana.table (define-public ecl-cl-ana.table (sbcl-package->ecl-package sbcl-cl-ana.table)) + +(define-public sbcl-cl-ana.table-utils + (package + (inherit sbcl-cl-ana-boot0) + (name "sbcl-cl-ana.table-utils") + (inputs + `(("cl-ana.string-utils" ,sbcl-cl-ana.string-utils) + ("cl-ana.symbol-utils" ,sbcl-cl-ana.symbol-utils) + ("cl-ana.table" ,sbcl-cl-ana.table))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-cl-ana-boot0) + ((#:asd-file _ "") "table-utils/cl-ana.table-utils.asd") + ((#:asd-system-name _ #f) "cl-ana.table-utils"))))) + +(define-public cl-ana.table-utils + (sbcl-package->cl-source-package sbcl-cl-ana.table-utils)) + +(define-public ecl-cl-ana.table-utils + (sbcl-package->ecl-package sbcl-cl-ana.table-utils)) -- cgit v1.2.3 From 769015b9d706613dfac5c8ba66e9cba7f0ac938e Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 17:23:59 +0100 Subject: gnu: Add cl-ana.hdf-cffi. * gnu/packages/lisp-xyz.scm (sbcl-cl-ana.hdf-cffi, cl-ana.hdf-cffi, ecl-cl-ana.hdf-cffi): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index ebbed9d7cd..32189c5994 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -8171,3 +8171,30 @@ (define-public cl-ana.table-utils (define-public ecl-cl-ana.table-utils (sbcl-package->ecl-package sbcl-cl-ana.table-utils)) + +(define-public sbcl-cl-ana.hdf-cffi + (package + (inherit sbcl-cl-ana-boot0) + (name "sbcl-cl-ana.hdf-cffi") + (inputs + `(("cffi" ,sbcl-cffi) + ("hdf5" ,hdf5-parallel-openmpi))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-cl-ana-boot0) + ((#:asd-file _ "") "hdf-cffi/cl-ana.hdf-cffi.asd") + ((#:asd-system-name _ #f) "cl-ana.hdf-cffi") + ((#:phases phases '%standard-phases) + `(modify-phases ,phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "hdf-cffi/hdf-cffi.lisp" + (("/usr/lib/i386-linux-gnu/hdf5/serial/libhdf5.so") + (string-append + (assoc-ref inputs "hdf5") + "/lib/libhdf5.so"))))))))))) + +(define-public cl-ana.hdf-cffi + (sbcl-package->cl-source-package sbcl-cl-ana.hdf-cffi)) + +(define-public ecl-cl-ana.hdf-cffi + (sbcl-package->ecl-package sbcl-cl-ana.hdf-cffi)) -- cgit v1.2.3 From e073d69534276d340a5c9275c25ef9e8848d0957 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 17:26:44 +0100 Subject: gnu: Add cl-ana.int-char. * gnu/packages/lisp-xyz.scm (sbcl-cl-ana.int-char, cl-ana.int-char, ecl-cl-ana.int-char): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 32189c5994..665e86e759 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -8198,3 +8198,18 @@ (define-public cl-ana.hdf-cffi (define-public ecl-cl-ana.hdf-cffi (sbcl-package->ecl-package sbcl-cl-ana.hdf-cffi)) + +(define-public sbcl-cl-ana.int-char + (package + (inherit sbcl-cl-ana-boot0) + (name "sbcl-cl-ana.int-char") + (arguments + (substitute-keyword-arguments (package-arguments sbcl-cl-ana-boot0) + ((#:asd-file _ "") "int-char/cl-ana.int-char.asd") + ((#:asd-system-name _ #f) "cl-ana.int-char"))))) + +(define-public cl-ana.int-char + (sbcl-package->cl-source-package sbcl-cl-ana.int-char)) + +(define-public ecl-cl-ana.int-char + (sbcl-package->ecl-package sbcl-cl-ana.int-char)) -- cgit v1.2.3 From 011cf6f5f24560c046649702ace61f99f11754ea Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 17:30:33 +0100 Subject: gnu: Add cl-ana.memoization. * gnu/packages/lisp-xyz.scm (sbcl-cl-ana.memoization, cl-ana.memoization, ecl-cl-ana.memoization): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 665e86e759..460787764e 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -8213,3 +8213,20 @@ (define-public cl-ana.int-char (define-public ecl-cl-ana.int-char (sbcl-package->ecl-package sbcl-cl-ana.int-char)) + +(define-public sbcl-cl-ana.memoization + (package + (inherit sbcl-cl-ana-boot0) + (name "sbcl-cl-ana.memoization") + (inputs + `(("alexandria" ,sbcl-alexandria))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-cl-ana-boot0) + ((#:asd-file _ "") "memoization/cl-ana.memoization.asd") + ((#:asd-system-name _ #f) "cl-ana.memoization"))))) + +(define-public cl-ana.memoization + (sbcl-package->cl-source-package sbcl-cl-ana.memoization)) + +(define-public ecl-cl-ana.memoization + (sbcl-package->ecl-package sbcl-cl-ana.memoization)) -- cgit v1.2.3 From bc9e1dd2a560d8b4ba09f80807ba7f72d41f5541 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 17:34:20 +0100 Subject: gnu: Add cl-ana.typespec. * gnu/packages/lisp-xyz.scm (sbcl-cl-ana.typespec, cl-ana.typespec, ecl-cl-ana.typespec): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 460787764e..d7f555d499 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -8230,3 +8230,27 @@ (define-public cl-ana.memoization (define-public ecl-cl-ana.memoization (sbcl-package->ecl-package sbcl-cl-ana.memoization)) + +(define-public sbcl-cl-ana.typespec + (package + (inherit sbcl-cl-ana-boot0) + (name "sbcl-cl-ana.typespec") + (inputs + `(("alexandria" ,sbcl-alexandria) + ("cffi" ,sbcl-cffi) + ("cl-ana.int-char" ,sbcl-cl-ana.int-char) + ("cl-ana.list-utils" ,sbcl-cl-ana.list-utils) + ("cl-ana.memoization" ,sbcl-cl-ana.memoization) + ("cl-ana.string-utils" ,sbcl-cl-ana.string-utils) + ("cl-ana.symbol-utils" ,sbcl-cl-ana.symbol-utils) + ("cl-ana.tensor" ,sbcl-cl-ana.tensor))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-cl-ana-boot0) + ((#:asd-file _ "") "typespec/cl-ana.typespec.asd") + ((#:asd-system-name _ #f) "cl-ana.typespec"))))) + +(define-public cl-ana.typespec + (sbcl-package->cl-source-package sbcl-cl-ana.typespec)) + +(define-public ecl-cl-ana.typespec + (sbcl-package->ecl-package sbcl-cl-ana.typespec)) -- cgit v1.2.3 From 465199817a8d06a2f3ccd5f6ae56f4db94e72bab Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 17:38:07 +0100 Subject: gnu: Add cl-ana.hdf-typespec. * gnu/packages/lisp-xyz.scm (sbcl-cl-ana.hdf-typespec, cl-ana.hdf-typespec, ecl-cl-ana.hdf-typespec): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index d7f555d499..66bb454a4d 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -8254,3 +8254,27 @@ (define-public cl-ana.typespec (define-public ecl-cl-ana.typespec (sbcl-package->ecl-package sbcl-cl-ana.typespec)) + +(define-public sbcl-cl-ana.hdf-typespec + (package + (inherit sbcl-cl-ana-boot0) + (name "sbcl-cl-ana.hdf-typespec") + (inputs + `(("alexandria" ,sbcl-alexandria) + ("cffi" ,sbcl-cffi) + ("cl-ana.hdf-cffi" ,sbcl-cl-ana.hdf-cffi) + ("cl-ana.list-utils" ,sbcl-cl-ana.list-utils) + ("cl-ana.memoization" ,sbcl-cl-ana.memoization) + ("cl-ana.string-utils" ,sbcl-cl-ana.string-utils) + ("cl-ana.symbol-utils" ,sbcl-cl-ana.symbol-utils) + ("cl-ana.typespec" ,sbcl-cl-ana.typespec))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-cl-ana-boot0) + ((#:asd-file _ "") "hdf-typespec/cl-ana.hdf-typespec.asd") + ((#:asd-system-name _ #f) "cl-ana.hdf-typespec"))))) + +(define-public cl-ana.hdf-typespec + (sbcl-package->cl-source-package sbcl-cl-ana.hdf-typespec)) + +(define-public ecl-cl-ana.hdf-typespec + (sbcl-package->ecl-package sbcl-cl-ana.hdf-typespec)) -- cgit v1.2.3 From 05216cf76d5565846447eaf961c5c03d21b49d8d Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 17:42:11 +0100 Subject: gnu: Add cl-ana.hdf-utils. * gnu/packages/lisp-xyz.scm (sbcl-cl-ana.hdf-utils, cl-ana.hdf-utils, ecl-cl-ana.hdf-utils): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 66bb454a4d..a1d75e8309 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -8278,3 +8278,28 @@ (define-public cl-ana.hdf-typespec (define-public ecl-cl-ana.hdf-typespec (sbcl-package->ecl-package sbcl-cl-ana.hdf-typespec)) + +(define-public sbcl-cl-ana.hdf-utils + (package + (inherit sbcl-cl-ana-boot0) + (name "sbcl-cl-ana.hdf-utils") + (inputs + `(("alexandria" ,sbcl-alexandria) + ("cffi" ,sbcl-cffi) + ("cl-ana.hdf-cffi" ,sbcl-cl-ana.hdf-cffi) + ("cl-ana.hdf-typespec" ,sbcl-cl-ana.hdf-typespec) + ("cl-ana.macro-utils" ,sbcl-cl-ana.macro-utils) + ("cl-ana.memoization" ,sbcl-cl-ana.memoization) + ("cl-ana.pathname-utils" ,sbcl-cl-ana.pathname-utils) + ("cl-ana.string-utils" ,sbcl-cl-ana.string-utils) + ("cl-ana.typespec" ,sbcl-cl-ana.typespec))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-cl-ana-boot0) + ((#:asd-file _ "") "hdf-utils/cl-ana.hdf-utils.asd") + ((#:asd-system-name _ #f) "cl-ana.hdf-utils"))))) + +(define-public cl-ana.hdf-utils + (sbcl-package->cl-source-package sbcl-cl-ana.hdf-utils)) + +(define-public ecl-cl-ana.hdf-utils + (sbcl-package->ecl-package sbcl-cl-ana.hdf-utils)) -- cgit v1.2.3 From 82900285e8eb873e0d431864b36704383399ad15 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 17:45:16 +0100 Subject: gnu: Add cl-ana.typed-table. * gnu/packages/lisp-xyz.scm (sbcl-cl-ana.typed-table, cl-ana.typed-table, ecl-cl-ana.typed-table): New variables. Signed-off-by: Guillaume Le Vaillant --- 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 a1d75e8309..32e7f26b1b 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -8303,3 +8303,25 @@ (define-public cl-ana.hdf-utils (define-public ecl-cl-ana.hdf-utils (sbcl-package->ecl-package sbcl-cl-ana.hdf-utils)) + +(define-public sbcl-cl-ana.typed-table + (package + (inherit sbcl-cl-ana-boot0) + (name "sbcl-cl-ana.typed-table") + (inputs + `(("alexandria" ,sbcl-alexandria) + ("cl-ana.list-utils" ,sbcl-cl-ana.list-utils) + ("cl-ana.string-utils" ,sbcl-cl-ana.string-utils) + ("cl-ana.symbol-utils" ,sbcl-cl-ana.symbol-utils) + ("cl-ana.table" ,sbcl-cl-ana.table) + ("cl-ana.typespec" ,sbcl-cl-ana.typespec))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-cl-ana-boot0) + ((#:asd-file _ "") "typed-table/cl-ana.typed-table.asd") + ((#:asd-system-name _ #f) "cl-ana.typed-table"))))) + +(define-public cl-ana.typed-table + (sbcl-package->cl-source-package sbcl-cl-ana.typed-table)) + +(define-public ecl-cl-ana.typed-table + (sbcl-package->ecl-package sbcl-cl-ana.typed-table)) -- cgit v1.2.3 From 8e2c140c03285dc4c5567aaf9191b34ccc89d92c Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 17:49:45 +0100 Subject: gnu: Add cl-ana.hdf-table. * gnu/packages/lisp-xyz.scm (sbcl-cl-ana.hdf-table, cl-ana.hdf-table, ecl-cl-ana.hdf-table): New variables. Signed-off-by: Guillaume Le Vaillant --- 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 32e7f26b1b..4f91975006 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -8325,3 +8325,29 @@ (define-public cl-ana.typed-table (define-public ecl-cl-ana.typed-table (sbcl-package->ecl-package sbcl-cl-ana.typed-table)) + +(define-public sbcl-cl-ana.hdf-table + (package + (inherit sbcl-cl-ana-boot0) + (name "sbcl-cl-ana.hdf-table") + (inputs + `(("alexandria" ,sbcl-alexandria) + ("cl-ana.binary-tree" ,sbcl-cl-ana.binary-tree) + ("cl-ana.hdf-cffi" ,sbcl-cl-ana.hdf-cffi) + ("cl-ana.hdf-typespec" ,sbcl-cl-ana.hdf-typespec) + ("cl-ana.hdf-utils" ,sbcl-cl-ana.hdf-utils) + ("cl-ana.list-utils" ,sbcl-cl-ana.list-utils) + ("cl-ana.memoization" ,sbcl-cl-ana.memoization) + ("cl-ana.table" ,sbcl-cl-ana.table) + ("cl-ana.typed-table" ,sbcl-cl-ana.typed-table) + ("cl-ana.typespec" ,sbcl-cl-ana.typespec))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-cl-ana-boot0) + ((#:asd-file _ "") "hdf-table/cl-ana.hdf-table.asd") + ((#:asd-system-name _ #f) "cl-ana.hdf-table"))))) + +(define-public cl-ana.hdf-table + (sbcl-package->cl-source-package sbcl-cl-ana.hdf-table)) + +(define-public ecl-cl-ana.hdf-table + (sbcl-package->ecl-package sbcl-cl-ana.hdf-table)) -- cgit v1.2.3 From cd874248e13e981865e9e69f06be31af831c5d1a Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 18:09:01 +0100 Subject: gnu: Add cl-ana.gsl-cffi. * gnu/packages/lisp-xyz.scm (sbcl-cl-ana.gsl-cffi, cl-ana.gsl-cffi, ecl-cl-ana.gsl-cffi): New variables. Co-authored-by: Guillaume Le Vaillant Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 4f91975006..9fece97139 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -8351,3 +8351,30 @@ (define-public cl-ana.hdf-table (define-public ecl-cl-ana.hdf-table (sbcl-package->ecl-package sbcl-cl-ana.hdf-table)) + +(define-public sbcl-cl-ana.gsl-cffi + (package + (inherit sbcl-cl-ana-boot0) + (name "sbcl-cl-ana.gsl-cffi") + (inputs + `(("cffi" ,sbcl-cffi) + ("gsl" ,gsl))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-cl-ana-boot0) + ((#:asd-file _ "") "gsl-cffi/cl-ana.gsl-cffi.asd") + ((#:asd-system-name _ #f) "cl-ana.gsl-cffi") + ((#:phases phases '%standard-phases) + `(modify-phases ,phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "gsl-cffi/gsl-cffi.lisp" + (("define-foreign-library gsl-cffi" all) + (string-append all " (:unix " + (assoc-ref inputs "gsl") + "/lib/libgsl.so)"))))))))))) + +(define-public cl-ana.gsl-cffi + (sbcl-package->cl-source-package sbcl-cl-ana.gsl-cffi)) + +(define-public ecl-cl-ana.gsl-cffi + (sbcl-package->ecl-package sbcl-cl-ana.gsl-cffi)) -- cgit v1.2.3 From 14b1a2152010d3f576c0cdb55629e65a8cd607af Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 18:15:02 +0100 Subject: gnu: Add cl-ana.ntuple-table. * gnu/packages/lisp-xyz.scm (sbcl-cl-ana.ntuple-table, cl-ana.ntuple-table): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 9fece97139..e06995a4f4 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -8378,3 +8378,24 @@ (define-public cl-ana.gsl-cffi (define-public ecl-cl-ana.gsl-cffi (sbcl-package->ecl-package sbcl-cl-ana.gsl-cffi)) + +(define-public sbcl-cl-ana.ntuple-table + (package + (inherit sbcl-cl-ana-boot0) + (name "sbcl-cl-ana.ntuple-table") + (inputs + `(("alexandria" ,sbcl-alexandria) + ("cffi" ,sbcl-cffi) + ("cl-ana.gsl-cffi" ,sbcl-cl-ana.gsl-cffi) + ("cl-ana.list-utils" ,sbcl-cl-ana.list-utils) + ("cl-ana.table" ,sbcl-cl-ana.table) + ("cl-ana.typed-table" ,sbcl-cl-ana.typed-table) + ("cl-ana.typespec" ,sbcl-cl-ana.typespec) + ("gsll" ,sbcl-gsll))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-cl-ana-boot0) + ((#:asd-file _ "") "ntuple-table/cl-ana.ntuple-table.asd") + ((#:asd-system-name _ #f) "cl-ana.ntuple-table"))))) + +(define-public cl-ana.ntuple-table + (sbcl-package->cl-source-package sbcl-cl-ana.ntuple-table)) -- cgit v1.2.3 From 89f01125ac2c7011d0befbf7e1844539f6a84f2e Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 18:19:07 +0100 Subject: gnu: Add cl-ana.csv-table. * gnu/packages/lisp-xyz.scm (sbcl-cl-ana.csv-table, cl-ana.csv-table): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index e06995a4f4..65a629596a 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -8399,3 +8399,22 @@ (define-public sbcl-cl-ana.ntuple-table (define-public cl-ana.ntuple-table (sbcl-package->cl-source-package sbcl-cl-ana.ntuple-table)) + +(define-public sbcl-cl-ana.csv-table + (package + (inherit sbcl-cl-ana-boot0) + (name "sbcl-cl-ana.csv-table") + (inputs + `(("alexandria" ,sbcl-alexandria) + ("antik" ,sbcl-antik) + ("cl-ana.list-utils" ,sbcl-cl-ana.list-utils) + ("cl-ana.table" ,sbcl-cl-ana.table) + ("cl-csv" ,sbcl-cl-csv) + ("iterate" ,sbcl-iterate))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-cl-ana-boot0) + ((#:asd-file _ "") "csv-table/cl-ana.csv-table.asd") + ((#:asd-system-name _ #f) "cl-ana.csv-table"))))) + +(define-public cl-ana.csv-table + (sbcl-package->cl-source-package sbcl-cl-ana.csv-table)) -- cgit v1.2.3 From 7d500ae4ebfdb721a4d98d0c0a8dd018fddc220c Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 18:22:15 +0100 Subject: gnu: Add cl-ana.reusable-table. * gnu/packages/lisp-xyz.scm (sbcl-cl-ana.reusable-table, cl-ana.reusable-table, ecl-cl-ana.reusable-table): New variables. Signed-off-by: Guillaume Le Vaillant --- 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 65a629596a..f192739145 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -8418,3 +8418,21 @@ (define-public sbcl-cl-ana.csv-table (define-public cl-ana.csv-table (sbcl-package->cl-source-package sbcl-cl-ana.csv-table)) + +(define-public sbcl-cl-ana.reusable-table + (package + (inherit sbcl-cl-ana-boot0) + (name "sbcl-cl-ana.reusable-table") + (inputs + `(("alexandria" ,sbcl-alexandria) + ("cl-ana.table" ,sbcl-cl-ana.table))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-cl-ana-boot0) + ((#:asd-file _ "") "reusable-table/cl-ana.reusable-table.asd") + ((#:asd-system-name _ #f) "cl-ana.reusable-table"))))) + +(define-public cl-ana.reusable-table + (sbcl-package->cl-source-package sbcl-cl-ana.reusable-table)) + +(define-public ecl-cl-ana.reusable-table + (sbcl-package->ecl-package sbcl-cl-ana.reusable-table)) -- cgit v1.2.3 From 01d659f530361bb81ef4aa8fceb7479b3ab54b49 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 18:26:02 +0100 Subject: gnu: Add cl-ana.linear-algebra. * gnu/packages/lisp-xyz.scm (sbcl-cl-ana.linear-algebra, cl-ana.linear-algebra): New variables. Signed-off-by: Guillaume Le Vaillant --- 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 f192739145..03a9e27f15 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -8436,3 +8436,21 @@ (define-public cl-ana.reusable-table (define-public ecl-cl-ana.reusable-table (sbcl-package->ecl-package sbcl-cl-ana.reusable-table)) + +(define-public sbcl-cl-ana.linear-algebra + (package + (inherit sbcl-cl-ana-boot0) + (name "sbcl-cl-ana.linear-algebra") + (inputs + `(("cl-ana.generic-math" ,sbcl-cl-ana.generic-math) + ("cl-ana.list-utils" ,sbcl-cl-ana.list-utils) + ("cl-ana.math-functions" ,sbcl-cl-ana.math-functions) + ("cl-ana.tensor" ,sbcl-cl-ana.tensor) + ("gsll" ,sbcl-gsll))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-cl-ana-boot0) + ((#:asd-file _ "") "linear-algebra/cl-ana.linear-algebra.asd") + ((#:asd-system-name _ #f) "cl-ana.linear-algebra"))))) + +(define-public cl-ana.linear-algebra + (sbcl-package->cl-source-package sbcl-cl-ana.linear-algebra)) -- cgit v1.2.3 From 05ec287988971b1365a2b7aa8a2c821da4cb1ae9 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 18:29:24 +0100 Subject: gnu: Add cl-ana.lorentz. * gnu/packages/lisp-xyz.scm (sbcl-cl-ana.lorentz, cl-ana.lorentz): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 03a9e27f15..4c3fa0d42a 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -8454,3 +8454,20 @@ (define-public sbcl-cl-ana.linear-algebra (define-public cl-ana.linear-algebra (sbcl-package->cl-source-package sbcl-cl-ana.linear-algebra)) + +(define-public sbcl-cl-ana.lorentz + (package + (inherit sbcl-cl-ana-boot0) + (name "sbcl-cl-ana.lorentz") + (inputs + `(("cl-ana.generic-math" ,sbcl-cl-ana.generic-math) + ("cl-ana.linear-algebra" ,sbcl-cl-ana.linear-algebra) + ("cl-ana.tensor" ,sbcl-cl-ana.tensor) + ("iterate" ,sbcl-iterate))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-cl-ana-boot0) + ((#:asd-file _ "") "lorentz/cl-ana.lorentz.asd") + ((#:asd-system-name _ #f) "cl-ana.lorentz"))))) + +(define-public cl-ana.lorentz + (sbcl-package->cl-source-package sbcl-cl-ana.lorentz)) -- cgit v1.2.3 From 28ffe4622580155f9f2207dd7f948291c8487b87 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 18:32:53 +0100 Subject: gnu: Add cl-ana.clos-utils. * gnu/packages/lisp-xyz.scm (sbcl-cl-ana.clos-utils, cl-ana.clos-utils, ecl-cl-ana.clos-utils): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 4c3fa0d42a..99ed78f23e 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -8471,3 +8471,23 @@ (define-public sbcl-cl-ana.lorentz (define-public cl-ana.lorentz (sbcl-package->cl-source-package sbcl-cl-ana.lorentz)) + +(define-public sbcl-cl-ana.clos-utils + (package + (inherit sbcl-cl-ana-boot0) + (name "sbcl-cl-ana.clos-utils") + (inputs + `(("cl-ana.list-utils" ,sbcl-cl-ana.list-utils) + ("cl-ana.symbol-utils" ,sbcl-cl-ana.symbol-utils) + ("cl-ana.tensor" ,sbcl-cl-ana.tensor) + ("closer-mop" ,sbcl-closer-mop))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-cl-ana-boot0) + ((#:asd-file _ "") "clos-utils/cl-ana.clos-utils.asd") + ((#:asd-system-name _ #f) "cl-ana.clos-utils"))))) + +(define-public cl-ana.clos-utils + (sbcl-package->cl-source-package sbcl-cl-ana.clos-utils)) + +(define-public ecl-cl-ana.clos-utils + (sbcl-package->ecl-package sbcl-cl-ana.clos-utils)) -- cgit v1.2.3 From 71b76a9bed19fb51b812c103b5ed53294a42d089 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 18:35:59 +0100 Subject: gnu: Add cl-ana.hash-table-utils. * gnu/packages/lisp-xyz.scm (sbcl-cl-ana.hash-table-utils, cl-ana.hash-table-utils, ecl-cl-ana.hash-table-utils): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 99ed78f23e..6d51e9b21d 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -8491,3 +8491,18 @@ (define-public cl-ana.clos-utils (define-public ecl-cl-ana.clos-utils (sbcl-package->ecl-package sbcl-cl-ana.clos-utils)) + +(define-public sbcl-cl-ana.hash-table-utils + (package + (inherit sbcl-cl-ana-boot0) + (name "sbcl-cl-ana.hash-table-utils") + (arguments + (substitute-keyword-arguments (package-arguments sbcl-cl-ana-boot0) + ((#:asd-file _ "") "hash-table-utils/cl-ana.hash-table-utils.asd") + ((#:asd-system-name _ #f) "cl-ana.hash-table-utils"))))) + +(define-public cl-ana.hash-table-utils + (sbcl-package->cl-source-package sbcl-cl-ana.hash-table-utils)) + +(define-public ecl-cl-ana.hash-table-utils + (sbcl-package->ecl-package sbcl-cl-ana.hash-table-utils)) -- cgit v1.2.3 From c20b30cbb46e849248445d942161ccd017df1d32 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 18:39:15 +0100 Subject: gnu: Add cl-ana.map. * gnu/packages/lisp-xyz.scm (sbcl-cl-ana.map, cl-ana.map, ecl-cl-ana.map): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 6d51e9b21d..00ce0ac134 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -8506,3 +8506,20 @@ (define-public cl-ana.hash-table-utils (define-public ecl-cl-ana.hash-table-utils (sbcl-package->ecl-package sbcl-cl-ana.hash-table-utils)) + +(define-public sbcl-cl-ana.map + (package + (inherit sbcl-cl-ana-boot0) + (name "sbcl-cl-ana.map") + (inputs + `(("cl-ana.hash-table-utils" ,sbcl-cl-ana.hash-table-utils))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-cl-ana-boot0) + ((#:asd-file _ "") "map/cl-ana.map.asd") + ((#:asd-system-name _ #f) "cl-ana.map"))))) + +(define-public cl-ana.map + (sbcl-package->cl-source-package sbcl-cl-ana.map)) + +(define-public ecl-cl-ana.map + (sbcl-package->ecl-package sbcl-cl-ana.map)) -- cgit v1.2.3 From 2f7d1dc5118c555c5a9d307a05ae59e1fe1df4e6 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 18:43:09 +0100 Subject: gnu: Add cl-ana.fitting. * gnu/packages/lisp-xyz.scm (sbcl-cl-ana.fitting, cl-ana.fitting): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 00ce0ac134..6737dc9b26 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -8523,3 +8523,22 @@ (define-public cl-ana.map (define-public ecl-cl-ana.map (sbcl-package->ecl-package sbcl-cl-ana.map)) + +(define-public sbcl-cl-ana.fitting + (package + (inherit sbcl-cl-ana-boot0) + (name "sbcl-cl-ana.fitting") + (inputs + `(("alexandria" ,sbcl-alexandria) + ("cl-ana.error-propogation" ,sbcl-cl-ana.error-propogation) + ("cl-ana.generic-math" ,sbcl-cl-ana.generic-math) + ("cl-ana.map" ,sbcl-cl-ana.map) + ("cl-ana.math-functions" ,sbcl-cl-ana.math-functions) + ("gsll" ,sbcl-gsll))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-cl-ana-boot0) + ((#:asd-file _ "") "fitting/cl-ana.fitting.asd") + ((#:asd-system-name _ #f) "cl-ana.fitting"))))) + +(define-public cl-ana.fitting + (sbcl-package->cl-source-package sbcl-cl-ana.fitting)) -- cgit v1.2.3 From dffb0c0e56f71973565feffe09201d3f777f7331 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 18:46:41 +0100 Subject: gnu: Add cl-ana.histogram. * gnu/packages/lisp-xyz.scm (sbcl-cl-ana.histogram, cl-ana.histogram): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 6737dc9b26..c0ea27ad3d 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -8542,3 +8542,28 @@ (define-public sbcl-cl-ana.fitting (define-public cl-ana.fitting (sbcl-package->cl-source-package sbcl-cl-ana.fitting)) + +(define-public sbcl-cl-ana.histogram + (package + (inherit sbcl-cl-ana-boot0) + (name "sbcl-cl-ana.histogram") + (inputs + `(("alexandria" ,sbcl-alexandria) + ("iterate" ,sbcl-iterate) + ("cl-ana.binary-tree" ,sbcl-cl-ana.binary-tree) + ("cl-ana.clos-utils" ,sbcl-cl-ana.clos-utils) + ("cl-ana.fitting" ,sbcl-cl-ana.fitting) + ("cl-ana.functional-utils" ,sbcl-cl-ana.functional-utils) + ("cl-ana.generic-math" ,sbcl-cl-ana.generic-math) + ("cl-ana.hash-table-utils" ,sbcl-cl-ana.hash-table-utils) + ("cl-ana.list-utils" ,sbcl-cl-ana.list-utils) + ("cl-ana.macro-utils" ,sbcl-cl-ana.macro-utils) + ("cl-ana.map" ,sbcl-cl-ana.map) + ("cl-ana.tensor" ,sbcl-cl-ana.tensor))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-cl-ana-boot0) + ((#:asd-file _ "") "histogram/cl-ana.histogram.asd") + ((#:asd-system-name _ #f) "cl-ana.histogram"))))) + +(define-public cl-ana.histogram + (sbcl-package->cl-source-package sbcl-cl-ana.histogram)) -- cgit v1.2.3 From d6c13a8e7b63e122964d2e6f5bb527f32bacb330 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 18:49:46 +0100 Subject: gnu: Add cl-ana.file-utils. * gnu/packages/lisp-xyz.scm (sbcl-cl-ana.file-utils, cl-ana.file-utils, ecl-cl-ana.file-utils): New variables. Signed-off-by: Guillaume Le Vaillant --- 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 c0ea27ad3d..e2656f520e 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -8567,3 +8567,21 @@ (define-public sbcl-cl-ana.histogram (define-public cl-ana.histogram (sbcl-package->cl-source-package sbcl-cl-ana.histogram)) + +(define-public sbcl-cl-ana.file-utils + (package + (inherit sbcl-cl-ana-boot0) + (name "sbcl-cl-ana.file-utils") + (inputs + `(("external-program" ,sbcl-external-program) + ("split-sequence" ,sbcl-split-sequence))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-cl-ana-boot0) + ((#:asd-file _ "") "file-utils/cl-ana.file-utils.asd") + ((#:asd-system-name _ #f) "cl-ana.file-utils"))))) + +(define-public cl-ana.file-utils + (sbcl-package->cl-source-package sbcl-cl-ana.file-utils)) + +(define-public ecl-cl-ana.file-utils + (sbcl-package->ecl-package sbcl-cl-ana.file-utils)) -- cgit v1.2.3 From a47ce94c75bd550f85b6cce46e8454113b8d13d6 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 18:53:21 +0100 Subject: gnu: Add cl-ana.statistics. * gnu/packages/lisp-xyz.scm (sbcl-cl-ana.statistics, cl-ana.statistics): New variables. Signed-off-by: Guillaume Le Vaillant --- 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 e2656f520e..9943b113f1 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -8585,3 +8585,21 @@ (define-public cl-ana.file-utils (define-public ecl-cl-ana.file-utils (sbcl-package->ecl-package sbcl-cl-ana.file-utils)) + +(define-public sbcl-cl-ana.statistics + (package + (inherit sbcl-cl-ana-boot0) + (name "sbcl-cl-ana.statistics") + (inputs + `(("cl-ana.generic-math" ,sbcl-cl-ana.generic-math) + ("cl-ana.histogram" ,sbcl-cl-ana.histogram) + ("cl-ana.list-utils" ,sbcl-cl-ana.list-utils) + ("cl-ana.macro-utils" ,sbcl-cl-ana.macro-utils) + ("cl-ana.map" ,sbcl-cl-ana.map))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-cl-ana-boot0) + ((#:asd-file _ "") "statistics/cl-ana.statistics.asd") + ((#:asd-system-name _ #f) "cl-ana.statistics"))))) + +(define-public cl-ana.statistics + (sbcl-package->cl-source-package sbcl-cl-ana.statistics)) -- cgit v1.2.3 From 81e6c659a5f43e05ec9dd11da172d167cd8c25a0 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 18:56:35 +0100 Subject: gnu: Add cl-ana.gnuplot-interface. * gnu/packages/lisp-xyz.scm (sbcl-cl-ana.gnuplot-interface, cl-ana.gnuplot-interface, ecl-cl-ana.gnuplot-interface): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 9943b113f1..5dca431a10 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -8603,3 +8603,20 @@ (define-public sbcl-cl-ana.statistics (define-public cl-ana.statistics (sbcl-package->cl-source-package sbcl-cl-ana.statistics)) + +(define-public sbcl-cl-ana.gnuplot-interface + (package + (inherit sbcl-cl-ana-boot0) + (name "sbcl-cl-ana.gnuplot-interface") + (inputs + `(("external-program" ,sbcl-external-program))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-cl-ana-boot0) + ((#:asd-file _ "") "gnuplot-interface/cl-ana.gnuplot-interface.asd") + ((#:asd-system-name _ #f) "cl-ana.gnuplot-interface"))))) + +(define-public cl-ana.gnuplot-interface + (sbcl-package->cl-source-package sbcl-cl-ana.gnuplot-interface)) + +(define-public ecl-cl-ana.gnuplot-interface + (sbcl-package->ecl-package sbcl-cl-ana.gnuplot-interface)) -- cgit v1.2.3 From 0f5350c12c9daade901ccea8d60e6fa4999042b6 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 19:02:27 +0100 Subject: gnu: Add cl-ana.plotting. * gnu/packages/lisp-xyz.scm (sbcl-cl-ana.plotting, cl-ana.plotting): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 5dca431a10..1b7af14cba 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -8620,3 +8620,31 @@ (define-public cl-ana.gnuplot-interface (define-public ecl-cl-ana.gnuplot-interface (sbcl-package->ecl-package sbcl-cl-ana.gnuplot-interface)) + +(define-public sbcl-cl-ana.plotting + (package + (inherit sbcl-cl-ana-boot0) + (name "sbcl-cl-ana.plotting") + (inputs + `(("alexandria" ,sbcl-alexandria) + ("cl-ana.error-propogation" ,sbcl-cl-ana.error-propogation) + ("cl-ana.functional-utils" ,sbcl-cl-ana.functional-utils) + ("cl-ana.generic-math" ,sbcl-cl-ana.generic-math) + ("cl-ana.gnuplot-interface" ,sbcl-cl-ana.gnuplot-interface) + ("cl-ana.histogram" ,sbcl-cl-ana.histogram) + ("cl-ana.list-utils" ,sbcl-cl-ana.list-utils) + ("cl-ana.macro-utils" ,sbcl-cl-ana.macro-utils) + ("cl-ana.map" ,sbcl-cl-ana.map) + ("cl-ana.math-functions" ,sbcl-cl-ana.math-functions) + ("cl-ana.pathname-utils" ,sbcl-cl-ana.pathname-utils) + ("cl-ana.string-utils" ,sbcl-cl-ana.string-utils) + ("cl-ana.tensor" ,sbcl-cl-ana.tensor) + ("external-program" ,sbcl-external-program) + ("split-sequence" ,sbcl-split-sequence))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-cl-ana-boot0) + ((#:asd-file _ "") "plotting/cl-ana.plotting.asd") + ((#:asd-system-name _ #f) "cl-ana.plotting"))))) + +(define-public cl-ana.plotting + (sbcl-package->cl-source-package sbcl-cl-ana.plotting)) -- cgit v1.2.3 From d521d67a508084ae43981a03853258bfd677fa1c Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 19:06:21 +0100 Subject: gnu: Add cl-ana.table-viewing. * gnu/packages/lisp-xyz.scm (sbcl-cl-ana.table-viewing, cl-ana.table-viewing): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 1b7af14cba..35b6ead833 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -8648,3 +8648,23 @@ (define-public sbcl-cl-ana.plotting (define-public cl-ana.plotting (sbcl-package->cl-source-package sbcl-cl-ana.plotting)) + +(define-public sbcl-cl-ana.table-viewing + (package + (inherit sbcl-cl-ana-boot0) + (name "sbcl-cl-ana.table-viewing") + (inputs + `(("alexandria" ,sbcl-alexandria) + ("cl-ana.generic-math" ,sbcl-cl-ana.generic-math) + ("cl-ana.histogram" ,sbcl-cl-ana.histogram) + ("cl-ana.macro-utils" ,sbcl-cl-ana.macro-utils) + ("cl-ana.plotting" ,sbcl-cl-ana.plotting) + ("cl-ana.string-utils" ,sbcl-cl-ana.string-utils) + ("cl-ana.table" ,sbcl-cl-ana.table))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-cl-ana-boot0) + ((#:asd-file _ "") "table-viewing/cl-ana.table-viewing.asd") + ((#:asd-system-name _ #f) "cl-ana.table-viewing"))))) + +(define-public cl-ana.table-viewing + (sbcl-package->cl-source-package sbcl-cl-ana.table-viewing)) -- cgit v1.2.3 From f97cc359df75f635bb7b1113b0b1818c510d7f88 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 19:09:40 +0100 Subject: gnu: Add cl-ana.serialization. * gnu/packages/lisp-xyz.scm (sbcl-cl-ana.serialization, cl-ana.serialization): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 35b6ead833..300c6c4f50 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -8668,3 +8668,23 @@ (define-public sbcl-cl-ana.table-viewing (define-public cl-ana.table-viewing (sbcl-package->cl-source-package sbcl-cl-ana.table-viewing)) + +(define-public sbcl-cl-ana.serialization + (package + (inherit sbcl-cl-ana-boot0) + (name "sbcl-cl-ana.serialization") + (inputs + `(("cl-ana.error-propogation" ,sbcl-cl-ana.error-propogation) + ("cl-ana.hdf-utils" ,sbcl-cl-ana.hdf-utils) + ("cl-ana.hdf-table" ,sbcl-cl-ana.hdf-table) + ("cl-ana.histogram" ,sbcl-cl-ana.histogram) + ("cl-ana.int-char" ,sbcl-cl-ana.int-char) + ("cl-ana.macro-utils" ,sbcl-cl-ana.macro-utils) + ("cl-ana.typespec" ,sbcl-cl-ana.typespec))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-cl-ana-boot0) + ((#:asd-file _ "") "serialization/cl-ana.serialization.asd") + ((#:asd-system-name _ #f) "cl-ana.serialization"))))) + +(define-public cl-ana.serialization + (sbcl-package->cl-source-package sbcl-cl-ana.serialization)) -- cgit v1.2.3 From 26b875f6a9971fae4b91f477fb8d2f7365e030b3 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 19:15:05 +0100 Subject: gnu: Add cl-ana.makeres. * gnu/packages/lisp-xyz.scm (sbcl-cl-ana.makeres, cl-ana.makeres): New variables. Signed-off-by: Guillaume Le Vaillant --- 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 300c6c4f50..2e28f86a6d 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -8688,3 +8688,38 @@ (define-public sbcl-cl-ana.serialization (define-public cl-ana.serialization (sbcl-package->cl-source-package sbcl-cl-ana.serialization)) + +(define-public sbcl-cl-ana.makeres + (package + (inherit sbcl-cl-ana-boot0) + (name "sbcl-cl-ana.makeres") + (inputs + `(("alexandria" ,sbcl-alexandria) + ("cl-ana.error-propogation" ,sbcl-cl-ana.error-propogation) + ("cl-ana.file-utils" ,sbcl-cl-ana.file-utils) + ("cl-ana.functional-utils" ,sbcl-cl-ana.functional-utils) + ("cl-ana.generic-math" ,sbcl-cl-ana.generic-math) + ("cl-ana.hash-table-utils" ,sbcl-cl-ana.hash-table-utils) + ("cl-ana.hdf-utils" ,sbcl-cl-ana.hdf-utils) + ("cl-ana.histogram" ,sbcl-cl-ana.histogram) + ("cl-ana.list-utils" ,sbcl-cl-ana.list-utils) + ("cl-ana.macro-utils" ,sbcl-cl-ana.macro-utils) + ("cl-ana.map" ,sbcl-cl-ana.map) + ("cl-ana.memoization" ,sbcl-cl-ana.memoization) + ("cl-ana.pathname-utils" ,sbcl-cl-ana.pathname-utils) + ("cl-ana.plotting" ,sbcl-cl-ana.plotting) + ("cl-ana.reusable-table" ,sbcl-cl-ana.reusable-table) + ("cl-ana.serialization" ,sbcl-cl-ana.serialization) + ("cl-ana.string-utils" ,sbcl-cl-ana.string-utils) + ("cl-ana.symbol-utils" ,sbcl-cl-ana.symbol-utils) + ("cl-ana.table" ,sbcl-cl-ana.table) + ("external-program" ,sbcl-external-program))) + (native-inputs + `(("cl-fad" ,sbcl-cl-fad))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-cl-ana-boot0) + ((#:asd-file _ "") "makeres/cl-ana.makeres.asd") + ((#:asd-system-name _ #f) "cl-ana.makeres"))))) + +(define-public cl-ana.makeres + (sbcl-package->cl-source-package sbcl-cl-ana.makeres)) -- cgit v1.2.3 From ad9e007e620d4274ac9e41b806bab86c66dfd734 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 19:18:01 +0100 Subject: gnu: Add cl-ana.makeres-macro. * gnu/packages/lisp-xyz.scm (sbcl-cl-ana.makeres-macro, cl-ana.makeres-macro): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 2e28f86a6d..46dd1c9415 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -8723,3 +8723,18 @@ (define-public sbcl-cl-ana.makeres (define-public cl-ana.makeres (sbcl-package->cl-source-package sbcl-cl-ana.makeres)) + +(define-public sbcl-cl-ana.makeres-macro + (package + (inherit sbcl-cl-ana-boot0) + (name "sbcl-cl-ana.makeres-macro") + (inputs + `(("cl-ana.list-utils" ,sbcl-cl-ana.list-utils) + ("cl-ana.makeres" ,sbcl-cl-ana.makeres))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-cl-ana-boot0) + ((#:asd-file _ "") "makeres-macro/cl-ana.makeres-macro.asd") + ((#:asd-system-name _ #f) "cl-ana.makeres-macro"))))) + +(define-public cl-ana.makeres-macro + (sbcl-package->cl-source-package sbcl-cl-ana.makeres-macro)) -- cgit v1.2.3 From 98e5f45e795bd4cdc02b5ce3860e1933c13e8a36 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 19:21:19 +0100 Subject: gnu: Add cl-ana.makeres-block. * gnu/packages/lisp-xyz.scm (sbcl-cl-ana.makeres-block, cl-ana.makeres-block): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 46dd1c9415..b4dc2248e5 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -8738,3 +8738,20 @@ (define-public sbcl-cl-ana.makeres-macro (define-public cl-ana.makeres-macro (sbcl-package->cl-source-package sbcl-cl-ana.makeres-macro)) + +(define-public sbcl-cl-ana.makeres-block + (package + (inherit sbcl-cl-ana-boot0) + (name "sbcl-cl-ana.makeres-block") + (inputs + `(("alexandria" ,sbcl-alexandria) + ("cl-ana.list-utils" ,sbcl-cl-ana.list-utils) + ("cl-ana.macro-utils" ,sbcl-cl-ana.macro-utils) + ("cl-ana.makeres" ,sbcl-cl-ana.makeres))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-cl-ana-boot0) + ((#:asd-file _ "") "makeres-block/cl-ana.makeres-block.asd") + ((#:asd-system-name _ #f) "cl-ana.makeres-block"))))) + +(define-public cl-ana.makeres-block + (sbcl-package->cl-source-package sbcl-cl-ana.makeres-block)) -- cgit v1.2.3 From 5ae0b25e061da27f2984a344ade05e04c41b8fff Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 19:24:09 +0100 Subject: gnu: Add cl-ana.makeres-progress. * gnu/packages/lisp-xyz.scm (sbcl-cl-ana.makeres-progress, cl-ana.makeres-progress): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index b4dc2248e5..a4b40fa13c 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -8755,3 +8755,19 @@ (define-public sbcl-cl-ana.makeres-block (define-public cl-ana.makeres-block (sbcl-package->cl-source-package sbcl-cl-ana.makeres-block)) + +(define-public sbcl-cl-ana.makeres-progress + (package + (inherit sbcl-cl-ana-boot0) + (name "sbcl-cl-ana.makeres-progress") + (inputs + `(("alexandria" ,sbcl-alexandria) + ("cl-ana.generic-math" ,sbcl-cl-ana.generic-math) + ("cl-ana.makeres" ,sbcl-cl-ana.makeres))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-cl-ana-boot0) + ((#:asd-file _ "") "makeres-progress/cl-ana.makeres-progress.asd") + ((#:asd-system-name _ #f) "cl-ana.makeres-progress"))))) + +(define-public cl-ana.makeres-progress + (sbcl-package->cl-source-package sbcl-cl-ana.makeres-progress)) -- cgit v1.2.3 From a9810e704932792b9b2ab34204c77105d64aa329 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 19:29:20 +0100 Subject: gnu: Add cl-ana.makeres-table. * gnu/packages/lisp-xyz.scm (sbcl-cl-ana.makeres-table, cl-ana.makeres-table): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index a4b40fa13c..5da1693d12 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -8771,3 +8771,31 @@ (define-public sbcl-cl-ana.makeres-progress (define-public cl-ana.makeres-progress (sbcl-package->cl-source-package sbcl-cl-ana.makeres-progress)) + +(define-public sbcl-cl-ana.makeres-table + (package + (inherit sbcl-cl-ana-boot0) + (name "sbcl-cl-ana.makeres-table") + (inputs + `(("cl-ana.csv-table" ,sbcl-cl-ana.csv-table) + ("cl-ana.hash-table-utils" ,sbcl-cl-ana.hash-table-utils) + ("cl-ana.hdf-table" ,sbcl-cl-ana.hdf-table) + ("cl-ana.hdf-utils" ,sbcl-cl-ana.hdf-utils) + ("cl-ana.list-utils" ,sbcl-cl-ana.list-utils) + ("cl-ana.macro-utils" ,sbcl-cl-ana.macro-utils) + ("cl-ana.makeres" ,sbcl-cl-ana.makeres) + ("cl-ana.makeres-macro" ,sbcl-cl-ana.makeres-macro) + ("cl-ana.memoization" ,sbcl-cl-ana.memoization) + ("cl-ana.ntuple-table" ,sbcl-cl-ana.ntuple-table) + ("cl-ana.reusable-table" ,sbcl-cl-ana.reusable-table) + ("cl-ana.string-utils" ,sbcl-cl-ana.string-utils) + ("cl-ana.table" ,sbcl-cl-ana.table))) + (native-inputs + `(("cl-fad" ,sbcl-cl-fad))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-cl-ana-boot0) + ((#:asd-file _ "") "makeres-table/cl-ana.makeres-table.asd") + ((#:asd-system-name _ #f) "cl-ana.makeres-table"))))) + +(define-public cl-ana.makeres-table + (sbcl-package->cl-source-package sbcl-cl-ana.makeres-table)) -- cgit v1.2.3 From 2e43d80da1dc8ed4258d7c2e64ccefdb3f0c04fe Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 20:22:06 +0100 Subject: gnu: Add cl-ana.makeres-graphviz. * gnu/packages/lisp-xyz.scm (sbcl-cl-ana.makeres-graphviz, cl-ana.makeres-graphviz): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 5da1693d12..329508ec12 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -8799,3 +8799,18 @@ (define-public sbcl-cl-ana.makeres-table (define-public cl-ana.makeres-table (sbcl-package->cl-source-package sbcl-cl-ana.makeres-table)) + +(define-public sbcl-cl-ana.makeres-graphviz + (package + (inherit sbcl-cl-ana-boot0) + (name "sbcl-cl-ana.makeres-graphviz") + (inputs + `(("cl-ana.makeres" ,sbcl-cl-ana.makeres) + ("external-program" ,sbcl-external-program))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-cl-ana-boot0) + ((#:asd-file _ "") "makeres-graphviz/cl-ana.makeres-graphviz.asd") + ((#:asd-system-name _ #f) "cl-ana.makeres-graphviz"))))) + +(define-public cl-ana.makeres-graphviz + (sbcl-package->cl-source-package sbcl-cl-ana.makeres-graphviz)) -- cgit v1.2.3 From d154dd5a1b0aba49bd024494064be3f20ec5e5ae Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 20:26:21 +0100 Subject: gnu: Add cl-ana.makeres-branch. * gnu/packages/lisp-xyz.scm (sbcl-cl-ana.makeres-branch, cl-ana.makeres-branch): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 329508ec12..1e76763f36 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -8814,3 +8814,22 @@ (define-public sbcl-cl-ana.makeres-graphviz (define-public cl-ana.makeres-graphviz (sbcl-package->cl-source-package sbcl-cl-ana.makeres-graphviz)) + +(define-public sbcl-cl-ana.makeres-branch + (package + (inherit sbcl-cl-ana-boot0) + (name "sbcl-cl-ana.makeres-branch") + (inputs + `(("alexandria" ,sbcl-alexandria) + ("cl-ana.generic-math" ,sbcl-cl-ana.generic-math) + ("cl-ana.hash-table-utils" ,sbcl-cl-ana.hash-table-utils) + ("cl-ana.list-utils" ,sbcl-cl-ana.list-utils) + ("cl-ana.map" ,sbcl-cl-ana.map) + ("cl-ana.makeres" ,sbcl-cl-ana.makeres))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-cl-ana-boot0) + ((#:asd-file _ "") "makeres-branch/cl-ana.makeres-branch.asd") + ((#:asd-system-name _ #f) "cl-ana.makeres-branch"))))) + +(define-public cl-ana.makeres-branch + (sbcl-package->cl-source-package sbcl-cl-ana.makeres-branch)) -- cgit v1.2.3 From 5f413815c9daa5b5bc8c948fa34e3b60b20b0322 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 20:30:28 +0100 Subject: gnu: Add cl-ana.makeres-utils. * gnu/packages/lisp-xyz.scm (sbcl-cl-ana.makeres-utils, cl-ana.makeres-utils): New variables. Signed-off-by: Guillaume Le Vaillant --- 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 1e76763f36..561256be5f 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -8833,3 +8833,34 @@ (define-public sbcl-cl-ana.makeres-branch (define-public cl-ana.makeres-branch (sbcl-package->cl-source-package sbcl-cl-ana.makeres-branch)) + +(define-public sbcl-cl-ana.makeres-utils + (package + (inherit sbcl-cl-ana-boot0) + (name "sbcl-cl-ana.makeres-utils") + (inputs + `(("alexandria" ,sbcl-alexandria) + ("cl-ana.file-utils" ,sbcl-cl-ana.file-utils) + ("cl-ana.fitting" ,sbcl-cl-ana.fitting) + ("cl-ana.functional-utils" ,sbcl-cl-ana.functional-utils) + ("cl-ana.generic-math" ,sbcl-cl-ana.generic-math) + ("cl-ana.histogram" ,sbcl-cl-ana.histogram) + ("cl-ana.list-utils" ,sbcl-cl-ana.list-utils) + ("cl-ana.macro-utils" ,sbcl-cl-ana.macro-utils) + ("cl-ana.makeres" ,sbcl-cl-ana.makeres) + ("cl-ana.map" ,sbcl-cl-ana.map) + ("cl-ana.pathname-utils" ,sbcl-cl-ana.pathname-utils) + ("cl-ana.plotting" ,sbcl-cl-ana.plotting) + ("cl-ana.reusable-table" ,sbcl-cl-ana.reusable-table) + ("cl-ana.string-utils" ,sbcl-cl-ana.string-utils) + ("cl-ana.symbol-utils" ,sbcl-cl-ana.symbol-utils) + ("cl-ana.table" ,sbcl-cl-ana.table))) + (native-inputs + `(("cl-fad" ,sbcl-cl-fad))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-cl-ana-boot0) + ((#:asd-file _ "") "makeres-utils/cl-ana.makeres-utils.asd") + ((#:asd-system-name _ #f) "cl-ana.makeres-utils"))))) + +(define-public cl-ana.makeres-utils + (sbcl-package->cl-source-package sbcl-cl-ana.makeres-utils)) -- cgit v1.2.3 From c16e3dfb1c74ec55b629823784c773d2860433bc Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 20:33:45 +0100 Subject: gnu: Add cl-ana.statistical-learning. * gnu/packages/lisp-xyz.scm (sbcl-cl-ana.statistical-learning, cl-ana.statistical-learning): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 561256be5f..3ef7588462 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -8864,3 +8864,28 @@ (define-public sbcl-cl-ana.makeres-utils (define-public cl-ana.makeres-utils (sbcl-package->cl-source-package sbcl-cl-ana.makeres-utils)) + +(define-public sbcl-cl-ana.statistical-learning + (package + (inherit sbcl-cl-ana-boot0) + (name "sbcl-cl-ana.statistical-learning") + (inputs + `(("cl-ana.generic-math" ,sbcl-cl-ana.generic-math) + ("cl-ana.functional-utils" ,sbcl-cl-ana.functional-utils) + ("cl-ana.histogram" ,sbcl-cl-ana.histogram) + ("cl-ana.linear-algebra" ,sbcl-cl-ana.linear-algebra) + ("cl-ana.list-utils" ,sbcl-cl-ana.list-utils) + ("cl-ana.macro-utils" ,sbcl-cl-ana.macro-utils) + ("cl-ana.math-functions" ,sbcl-cl-ana.math-functions) + ("cl-ana.map" ,sbcl-cl-ana.map) + ("cl-ana.statistics" ,sbcl-cl-ana.statistics))) + (native-inputs + `(("cl-fad" ,sbcl-cl-fad))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-cl-ana-boot0) + ((#:asd-file _ "") + "statistical-learning/cl-ana.statistical-learning.asd") + ((#:asd-system-name _ #f) "cl-ana.statistical-learning"))))) + +(define-public cl-ana.statistical-learning + (sbcl-package->cl-source-package sbcl-cl-ana.statistical-learning)) -- cgit v1.2.3 From 13e3bc1c800b531d33bc64a1fea64a66dc5f9300 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 3 Jan 2020 20:42:10 +0100 Subject: gnu: Add cl-ana. * gnu/packages/lisp-xyz.scm (sbcl-cl-ana, cl-ana): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 53 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 3ef7588462..41c2fba0c5 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -8889,3 +8889,56 @@ (define-public sbcl-cl-ana.statistical-learning (define-public cl-ana.statistical-learning (sbcl-package->cl-source-package sbcl-cl-ana.statistical-learning)) + +(define-public sbcl-cl-ana + (package + (inherit sbcl-cl-ana-boot0) + (name "sbcl-cl-ana") + (inputs + `(("cl-ana.binary-tree" ,sbcl-cl-ana.binary-tree) + ("cl-ana.calculus" ,sbcl-cl-ana.calculus) + ("cl-ana.clos-utils" ,sbcl-cl-ana.clos-utils) + ("cl-ana.csv-table" ,sbcl-cl-ana.csv-table) + ("cl-ana.error-propogation" ,sbcl-cl-ana.error-propogation) + ("cl-ana.file-utils" ,sbcl-cl-ana.file-utils) + ("cl-ana.fitting" ,sbcl-cl-ana.fitting) + ("cl-ana.generic-math" ,sbcl-cl-ana.generic-math) + ("cl-ana.hash-table-utils" ,sbcl-cl-ana.hash-table-utils) + ("cl-ana.hdf-table" ,sbcl-cl-ana.hdf-table) + ("cl-ana.histogram" ,sbcl-cl-ana.histogram) + ("cl-ana.int-char" ,sbcl-cl-ana.int-char) + ("cl-ana.linear-algebra" ,sbcl-cl-ana.linear-algebra) + ("cl-ana.lorentz" ,sbcl-cl-ana.lorentz) + ("cl-ana.map" ,sbcl-cl-ana.map) + ("cl-ana.makeres" ,sbcl-cl-ana.makeres) + ("cl-ana.makeres-block" ,sbcl-cl-ana.makeres-block) + ("cl-ana.makeres-branch" ,sbcl-cl-ana.makeres-branch) + ("cl-ana.makeres-graphviz" ,sbcl-cl-ana.makeres-graphviz) + ("cl-ana.makeres-macro" ,sbcl-cl-ana.makeres-macro) + ("cl-ana.makeres-progress" ,sbcl-cl-ana.makeres-progress) + ("cl-ana.makeres-table" ,sbcl-cl-ana.makeres-table) + ("cl-ana.makeres-utils" ,sbcl-cl-ana.makeres-utils) + ("cl-ana.math-functions" ,sbcl-cl-ana.math-functions) + ("cl-ana.ntuple-table" ,sbcl-cl-ana.ntuple-table) + ("cl-ana.package-utils" ,sbcl-cl-ana.package-utils) + ("cl-ana.pathname-utils" ,sbcl-cl-ana.pathname-utils) + ("cl-ana.plotting" ,sbcl-cl-ana.plotting) + ("cl-ana.quantity" ,sbcl-cl-ana.quantity) + ("cl-ana.reusable-table" ,sbcl-cl-ana.reusable-table) + ("cl-ana.serialization" ,sbcl-cl-ana.serialization) + ("cl-ana.statistics" ,sbcl-cl-ana.statistics) + ("cl-ana.statistical-learning" ,sbcl-cl-ana.statistical-learning) + ("cl-ana.table" ,sbcl-cl-ana.table) + ("cl-ana.table-utils" ,sbcl-cl-ana.table-utils) + ("cl-ana.table-viewing" ,sbcl-cl-ana.table-viewing) + ("cl-ana.tensor" ,sbcl-cl-ana.tensor) + ("libffi" ,libffi))) + (native-inputs + `(("cl-fad" ,sbcl-cl-fad))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-cl-ana-boot0) + ((#:asd-file _ "") "cl-ana.asd") + ((#:asd-system-name _ #f) "cl-ana"))))) + +(define-public cl-ana + (sbcl-package->cl-source-package sbcl-cl-ana)) -- cgit v1.2.3 From db1bc0d92e4a023d2b22487c324410e8dc4cda1f Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Sat, 28 Dec 2019 01:29:01 -0500 Subject: gnu: Add lean. * gnu/local.mk (GNU_SYSTEM_MODULES): Add lean.scm. * gnu/packages/lean.scm: New file. Signed-off-by: Brett Gilio --- gnu/local.mk | 2 ++ gnu/packages/lean.scm | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+) create mode 100644 gnu/packages/lean.scm diff --git a/gnu/local.mk b/gnu/local.mk index c7dcc65082..f9f299d422 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -25,6 +25,7 @@ # Copyright © 2019 Jonathan Brielmaier # Copyright © 2019 Evan Straw # Copyright © 2019 Brett Gilio +# Copyright © 2019 Amin Bandali # # This file is part of GNU Guix. # @@ -290,6 +291,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/key-mon.scm \ %D%/packages/kodi.scm \ %D%/packages/language.scm \ + %D%/packages/lean.scm \ %D%/packages/lego.scm \ %D%/packages/less.scm \ %D%/packages/lesstif.scm \ diff --git a/gnu/packages/lean.scm b/gnu/packages/lean.scm new file mode 100644 index 0000000000..235113d475 --- /dev/null +++ b/gnu/packages/lean.scm @@ -0,0 +1,65 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2019 Amin Bandali +;;; +;;; 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 lean) + #:use-module (gnu packages multiprecision) + #:use-module (guix build-system cmake) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix git-download)) + +(define-public lean + (package + (name "lean") + (version "3.5.0") + (home-page "https://github.com/leanprover-community/lean") + (source (origin + (method git-fetch) + (uri (git-reference (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1fdblq8ckrv6wqxfl4ybcs3ybfq7y096c9f5j4j75ymb14r401lr")))) + (build-system cmake-build-system) + (inputs + `(("gmp" ,gmp))) + (arguments + `(#:build-type "Release" ; default upstream build type + #:phases + (modify-phases %standard-phases + (add-after 'patch-source-shebangs 'patch-tests-shebangs + (lambda _ + (let ((sh (which "sh")) + (bash (which "bash"))) + (substitute* (find-files "tests/lean" "\\.sh$") + (("#![[:blank:]]?/bin/sh") + (string-append "#!" sh)) + (("#![[:blank:]]?/bin/bash") + (string-append "#!" bash)) + (("#![[:blank:]]?usr/bin/env bash") + (string-append "#!" bash))) + #t))) + (add-before 'configure 'chdir-to-src + (lambda _ (chdir "src") #t))))) + (synopsis "The Lean theorem prover and programming language") + (description + "Lean is a theorem prover and programming language with a small trusted +core based on dependent typed theory, aiming to bridge the gap between +interactive and automated theorem proving.") + (license license:asl2.0))) -- cgit v1.2.3 From 3bc6b9bb17d1aeee7f3a1bde01726f397a25ddbe Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Fri, 3 Jan 2020 16:22:22 -0600 Subject: gnu: ocaml-utop: Update to 2.4.3. * gnu/packages/ocaml.scm (ocaml-utop): Update to 2.4.3. --- 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 2988810fc7..898183130a 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3070,7 +3070,7 @@ (define-public ocaml-lambda-term (define-public ocaml-utop (package (name "ocaml-utop") - (version "2.4.2") + (version "2.4.3") (source (origin (method git-fetch) @@ -3079,7 +3079,7 @@ (define-public ocaml-utop (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0z8klqwqmq5i111p4awzvlvirhm1dxp0mbfagwfiwq1wg72v6zdm")))) + (base32 "1bl4943qpi3qy152dbdm5glhx19zsiylmn4rcxi8l66g58hikyjp")))) (build-system dune-build-system) (arguments `(#:jbuild? #t -- cgit v1.2.3 From 1614c6336a65202d8d98d145c8a20c7c01dee5f5 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Fri, 3 Jan 2020 16:22:46 -0600 Subject: gnu: ocaml-utop: Modify home-page. * gnu/packages/ocaml.scm (ocaml-utop)[home-page]: Change home-page to reflect permanent redirection. --- gnu/packages/ocaml.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 898183130a..c9454a52c5 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3092,7 +3092,7 @@ (define-public ocaml-utop ("react" ,ocaml-react) ("camomile" ,ocaml-camomile) ("zed" ,ocaml-zed))) - (home-page "https://github.com/diml/utop") + (home-page "https://github.com/ocaml-community/utop") (synopsis "Improved interface to the OCaml toplevel") (description "UTop is an improved toplevel for OCaml. It can run in a terminal or in Emacs. It supports line editing, history, real-time and context -- cgit v1.2.3 From eb1ebabffe8298495bdfbb5011c2d672541d02f3 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Fri, 3 Jan 2020 16:46:48 -0600 Subject: gnu: Add ocaml-lacaml. * gnu/packages/ocaml.scm (ocaml-lacaml): New variable. --- gnu/packages/ocaml.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index c9454a52c5..2e8072cbbe 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2018, 2019 Gabriel Hondet ;;; Copyright © 2018 Kei Kebreau ;;; Copyright © 2019 Ricardo Wurmus +;;; Copyright © 2020 Brett Gilio ;;; ;;; This file is part of GNU Guix. ;;; @@ -31,6 +32,7 @@ (define-module (gnu packages ocaml) #:use-module (gnu packages) + #:use-module (gnu packages algebra) #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages bison) @@ -5177,3 +5179,34 @@ (define-public ocaml-odoc advantage over ocamldoc is an accurate cross-referencer, which handles the complexity of the OCaml module system.") (license license:isc))) + +(define-public ocaml-lacaml + (package + (name "ocaml-lacaml") + (version "11.0.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mmottl/lacaml.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "180yb79a3qgx067qcpm50q12hrimjygf06rgkzbish9d1zfm670c")))) + (build-system dune-build-system) + (arguments + `(#:tests? #f)) ; No test target. + (native-inputs + `(("openblas" ,openblas) + ("lapack" ,lapack) + ("ocaml-base" ,ocaml-base) + ("ocaml-stdio" ,ocaml-stdio))) + (home-page "https://mmottl.github.io/lacaml/") + (synopsis + "OCaml-bindings to BLAS and LAPACK") + (description + "Lacaml interfaces the BLAS-library (Basic Linear Algebra Subroutines) and +LAPACK-library (Linear Algebra routines). It also contains many additional +convenience functions for vectors and matrices.") + (license license:lgpl2.1))) -- cgit v1.2.3 From 2e26dd69c8176a29a0f227b619036e918c5a49d1 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Fri, 3 Jan 2020 16:47:03 -0600 Subject: gnu: Add ocaml-fftw3. * gnu/packages/ocaml.scm (ocaml-fftw3): New variable. --- gnu/packages/ocaml.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 2e8072cbbe..a9e421a17c 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5180,6 +5180,39 @@ (define-public ocaml-odoc complexity of the OCaml module system.") (license license:isc))) +(define-public ocaml-fftw3 + (package + (name "ocaml-fftw3") + (version "0.8.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Chris00/fftw-ocaml.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0l66yagjkwdcib6q55wd8wiap50vi23qiahkghlvm28z7nvbclfk")))) + (build-system dune-build-system) + (arguments + `(#:tests? #t + #:test-target "tests")) + (propagated-inputs + `(("fftw" ,fftw) + ("fftwf" ,fftwf))) + (native-inputs + `(("ocaml-cppo" ,ocaml-cppo) + ("ocaml-lacaml" ,ocaml-lacaml))) + (home-page + "https://github.com/Chris00/fftw-ocaml") + (synopsis + "Bindings to FFTW3") + (description + "Bindings providing OCaml support for the seminal Fast Fourier Transform +library FFTW.") + (license license:lgpl2.1))) ; with static linking exception. + (define-public ocaml-lacaml (package (name "ocaml-lacaml") -- cgit v1.2.3 From bd45235e2cfec7acdd29297f0257a3faa3efea7d Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Fri, 3 Jan 2020 17:40:38 -0600 Subject: gnu: emacs-doom-themes: Add note about byte-compilation issue. * gnu/packages/emacs-xyz.scm (emacs-doom-themes): The byte-compilation issue has been worked around upstream, but arguably not as effective as the strategy we use in our package. Make a note about this issue, and mark the affecting commit number. --- gnu/packages/emacs-xyz.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 37a34fe236..d9d83b4fbe 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19853,6 +19853,10 @@ (define-public emacs-doom-themes ;; files. In order to cope with this issue, we disable ;; byte-compilation until this issue is resolved. ;; + ;; + ;; NOTE: Byte-comp has been disabled in/after commit 9cd6872. + ;; However our method of selective disabling is preferential to + ;; just widely disabling byte-compilation. (add-after 'move-themes 'disable-breaking-compilation (lambda _ (for-each (lambda (file) -- cgit v1.2.3 From 219a587de59434efeba0ce0b28d08f2e04e86495 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Fri, 3 Jan 2020 17:45:38 -0600 Subject: gnu: emacs-request: Update to 0.3.2. * gnu/packages/emacs-xyz.scm (emacs-request): Update to 0.3.2. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index d9d83b4fbe..fe4ae0c3b2 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -5323,7 +5323,7 @@ (define-public emacs-realgud (define-public emacs-request (package (name "emacs-request") - (version "0.3.1") + (version "0.3.2") (source (origin (method git-fetch) (uri (git-reference @@ -5332,7 +5332,7 @@ (define-public emacs-request (file-name (git-file-name name version)) (sha256 (base32 - "0fhhd349l4iqkrjxqzpckfk2w45x2g4cccpm1dqzv9m49md1wphx")))) + "1djywhvvb6kwdj0nd3axjvb7k2g06dzkc6hsf29w9rsk96vr8ryl")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-deferred" ,emacs-deferred))) -- cgit v1.2.3 From 5f31c040d8ea11c41010e6e8655fabf92cb9b461 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Fri, 3 Jan 2020 17:47:45 -0600 Subject: gnu: emacs-request: Disable tests. * gnu/packages/emacs-xyz.scm (emacs-request)[arguments]: Disabling test phase as it checks for network access. --- gnu/packages/emacs-xyz.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index fe4ae0c3b2..174de1a02b 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -5334,6 +5334,8 @@ (define-public emacs-request (base32 "1djywhvvb6kwdj0nd3axjvb7k2g06dzkc6hsf29w9rsk96vr8ryl")))) (build-system emacs-build-system) + (arguments + `(#:tests? #f)) ; requires network access. (propagated-inputs `(("emacs-deferred" ,emacs-deferred))) (home-page "https://github.com/tkf/emacs-request") -- cgit v1.2.3 From 6fd226df2b1d36d19ec7c392420568c93af9f620 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Fri, 3 Jan 2020 17:54:21 -0600 Subject: gnu: emacs-pyvenv: Update to 1.21. * gnu/packages/emacs-xyz.scm (emacs-pyvenv): Update to 1.21. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 174de1a02b..3933e8e525 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -6542,7 +6542,7 @@ (define-public emacs-find-file-in-project (define-public emacs-pyvenv (package (name "emacs-pyvenv") - (version "1.20") + (version "1.21") (source (origin (method git-fetch) (uri (git-reference @@ -6551,7 +6551,7 @@ (define-public emacs-pyvenv (file-name (git-file-name name version)) (sha256 (base32 - "1x052fsavb94x3scpqd6n9spqgzaahzbdxhg4qa5sy6hqsabn6zh")))) + "055sgk8zf4wb5nqsf3qasf5gg861zlb1831733f1qcrd2ij5gzxx")))) (build-system emacs-build-system) (arguments `(#:phases -- cgit v1.2.3 From 046dd621ecb29c4ec5e5fb85d59a09145191917f Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Fri, 3 Jan 2020 18:00:15 -0600 Subject: gnu: python-language-server: Update to 0.31.4. * gnu/packages/python-xyz.scm (python-language-server): Update to 0.31.4. --- gnu/packages/python-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9b71982c3a..db43bd72e4 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -57,7 +57,7 @@ ;;; Copyright © 2018, 2019 Maxim Cournoyer ;;; Copyright © 2018 Luther Thompson ;;; Copyright © 2018 Vagrant Cascadian -;;; Copyright © 2019 Brett Gilio +;;; Copyright © 2019, 2020 Brett Gilio ;;; Copyright © 2019 Sam ;;; Copyright © 2019 Jack Hill ;;; Copyright © 2019 Guillaume Le Vaillant @@ -3055,14 +3055,14 @@ (define-public python-pydocstyle (define-public python-language-server (package (name "python-language-server") - (version "0.31.2") + (version "0.31.4") (source (origin (method url-fetch) (uri (pypi-uri "python-language-server" version)) (sha256 (base32 - "1iq69wc1fyhirfyq25ih41wq9yvr7bchiw0i116adpdgcq6m9idq")))) + "1nrs56jpx7dvghaas0kc5k9lxas5vr3awj3k87p4akki43nsblb8")))) (build-system python-build-system) (propagated-inputs `(("python-pluggy" ,python-pluggy) -- cgit v1.2.3 From 16fcca6451277c74b47cc580fed07434d41470a4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Jan 2020 19:37:20 +0100 Subject: gnu: mg: Use @command mark-up in description. * gnu/packages/text-editors.scm (mg)[description]: Use @command. --- gnu/packages/text-editors.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 61f62706e4..60eed99dbf 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -297,9 +297,9 @@ (define-public mg (home-page "https://homepage.boetes.org/software/mg/") (synopsis "Microscopic GNU Emacs clone") (description - "Mg (mg) is a GNU Emacs style editor, with which it is \"broadly\" -compatible. This is a portable version of the mg maintained by the OpenBSD -team.") + "Mg (@command{mg}) is a GNU Emacs style editor, with which it is +\"broadly\" compatible. This is a portable version of the mg maintained by the +OpenBSD team.") (license license:public-domain))) (define-public ghostwriter -- cgit v1.2.3 From bafafa805b7ec44bec69514a768f49d529cc705f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Jan 2020 20:22:00 +0100 Subject: gnu: html-xml-utils: Update to 7.8. * gnu/packages/xml.scm (html-xml-utils): Update to 7.8. --- gnu/packages/xml.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index bdbaf9300b..5b9082cb26 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2016 Ben Woodcroft ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2016, 2017 ng0 -;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2016, 2017, 2018, 2019 Marius Bakke ;;; Copyright © 2017 Adriano Peluso ;;; Copyright © 2017 Gregor Giesen @@ -1164,7 +1164,7 @@ (define-public xmlstarlet (define-public html-xml-utils (package (name "html-xml-utils") - (version "7.7") + (version "7.8") (source (origin (method url-fetch) @@ -1172,8 +1172,7 @@ (define-public html-xml-utils "https://www.w3.org/Tools/HTML-XML-utils/html-xml-utils-" version ".tar.gz")) (sha256 - (base32 - "1vwqp5q276j8di9zql3kygf31z2frp2c59yjqlrvvwcvccvkcdwr")))) + (base32 "0p8df3c6mw879vdi8l63kbdqylkf1is10b067mh9kipgfy91rd4s")))) (build-system gnu-build-system) (home-page "https://www.w3.org/Tools/HTML-XML-utils/") (synopsis "Command line utilities to manipulate HTML and XML files") -- cgit v1.2.3 From d16d788422aafac53b8973d184ba5a231774b3f2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Jan 2020 23:48:09 +0100 Subject: gnu: libshout: Update to 2.4.3. * gnu/packages/xiph.scm (libshout): Update to 2.4.3. --- gnu/packages/xiph.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm index 61d836a50b..d7530f0392 100644 --- a/gnu/packages/xiph.scm +++ b/gnu/packages/xiph.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2015 Paul van der Walt ;;; Copyright © 2015, 2016, 2017, 2019 Efraim Flashner ;;; Copyright © 2017, 2018, 2019 Marius Bakke -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Leo Famulari ;;; ;;; This file is part of GNU Guix. @@ -483,7 +483,7 @@ (define-public icecast (define-public libshout (package (name "libshout") - (version "2.4.2") + (version "2.4.3") (source (origin (method url-fetch) (uri (string-append @@ -491,7 +491,7 @@ (define-public libshout "libshout-" version ".tar.gz")) (sha256 (base32 - "0qgwarqp2p6jy3zadds6dzj8z1jfb2mbwc3lsdlidf527h0a86ym")))) + "1zhdshas539cs8fsz8022ljxnnncr5lafhfd1dqr1gs125fzb2hd")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 553199c59e1e3b711d0ae64c130250a589e05909 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Jan 2020 23:49:02 +0100 Subject: gnu: polybar: Update to 3.4.2. * gnu/packages/wm.scm (polybar): Update to 3.4.2. --- gnu/packages/wm.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 7d11a048f2..9832f0079c 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2017 Mekeor Melire ;;; Copyright © 2017, 2019 Marius Bakke ;;; Copyright © 2017 Oleg Pykhalov -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2018, 2019 Meiyo Peng ;;; Copyright © 2019 Rutger Helling @@ -1243,14 +1243,14 @@ (define-public nitrogen (define-public polybar (package (name "polybar") - (version "3.4.1") + (version "3.4.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/polybar/polybar/releases/" "download/" version "/polybar-" version ".tar")) (sha256 - (base32 "1sy4xnx9rnj5z22kca8al84ivjg4mkvb9wj68pqq2y02l54gldwy")))) + (base32 "0fmnviz4b01aw50nkv4yibm8ykc5ff860ynw3xb1ymlsjrvwj8jd")))) (build-system cmake-build-system) (arguments ;; Test is disabled because it requires downloading googletest from the -- cgit v1.2.3 From 42678debec324e586a63ad8311a231b0c17dfea1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 4 Jan 2020 00:59:50 +0100 Subject: gnu: doctest: Update to 2.3.6. * gnu/packages/check.scm (doctest): Update to 2.3.6. --- gnu/packages/check.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index f61e96422b..6839cabb38 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -16,7 +16,7 @@ ;;; Copyright © 2016 Troy Sankey ;;; Copyright © 2016 Lukas Gradl ;;; Copyright © 2016 Hartmut Goebel -;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2017 Julien Lepiller ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2017, 2018 Arun Isaac @@ -379,7 +379,7 @@ (define-public cxxtest (define-public doctest (package (name "doctest") - (version "2.3.5") + (version "2.3.6") (home-page "https://github.com/onqtam/doctest") (source (origin (method git-fetch) @@ -387,7 +387,7 @@ (define-public doctest (file-name (git-file-name name version)) (sha256 (base32 - "0rddlzhnv0f5036q0m0p019pismka7sx6x8cnzk65sk77b1dsbhg")))) + "070gkwffi73i2p0azga9yxj8km32bp8bw4jvkvz1vzlpavyii5kn")))) (build-system cmake-build-system) (synopsis "C++ test framework") (description -- cgit v1.2.3 From d87d2567204f468a74bae1ef1415a9d08446e1ea Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 4 Jan 2020 01:02:55 +0100 Subject: gnu: soundtouch: Update to 2.1.2. * gnu/packages/audio.scm (soundtouch): Update to 2.1.2. --- gnu/packages/audio.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index dcd4711513..a26fbed461 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2016, 2017 Alex Griffin ;;; Copyright © 2016 ng0 ;;; Copyright © 2016 Lukas Gradl -;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Oleg Pykhalov ;;; Copyright © 2018 okapi ;;; Copyright © 2018 Maxim Cournoyer @@ -2733,7 +2733,7 @@ (define-public xmp (define-public soundtouch (package (name "soundtouch") - (version "2.1.1") + (version "2.1.2") (source (origin (method git-fetch) @@ -2742,7 +2742,7 @@ (define-public soundtouch (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0p6jzgfgqw061702dmd2b6r4arz48ac3mmx2qkvvzf8s5jjzykdh")))) + (base32 "174wgm3s0inmbnkrlnspxjwm2014qhjhkbdqa5r8rbfi0nzqxzsz")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) -- cgit v1.2.3 From 1074ec1dd7c718e5a66e6e555248c3a1c271d46f Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Fri, 3 Jan 2020 18:33:40 -0600 Subject: gnu: femtolisp: Update to 0.0.0-2. * gnu/packages/scheme.scm (femtolisp): Update to 0.0.0-2. This commit revision patches several bugs. --- gnu/packages/scheme.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index cc0bfffea4..16b4e822d2 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -948,8 +948,8 @@ (define-public stalin (license gpl2+)))) (define-public femtolisp - (let ((commit "68c5b1225572ecf2c52baf62f928063e5a30511b") - (revision "1")) + (let ((commit "ec7601076a976f845bc05ad6bd3ed5b8cde58a97") + (revision "2")) (package (name "femtolisp") (version (string-append "0.0.0-" revision "." (string-take commit 7))) @@ -961,7 +961,7 @@ (define-public femtolisp (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "04rnwllxnl86zw8c6pwxznn49bvkvh0f1lfliy085vjzvlq3rgja")))) + "1fcyiqlqn27nd4wxi27km8mhmlzpzzsxzpwsl1bxbmhraq468njw")))) ;; See "utils.h" for supported systems. Upstream bug: ;; https://github.com/JeffBezanson/femtolisp/issues/25 (supported-systems -- cgit v1.2.3 From d98e64b4e5b46a67b582df5032647bb169427d6d Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Fri, 3 Jan 2020 19:53:04 -0600 Subject: gnu: Rename module gprolog to prolog. * gnu/local.mk (GNU_SYSTEM_MODULES): Replace gprolog.scm => prolog.scm. * gnu/packages/{gprolog.scm -> prolog.scm}: Rename file so it is not implementation specific. --- gnu/local.mk | 2 +- gnu/packages/gprolog.scm | 68 ----------------------------------------------- gnu/packages/prolog.scm | 69 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 69 deletions(-) delete mode 100644 gnu/packages/gprolog.scm create mode 100644 gnu/packages/prolog.scm diff --git a/gnu/local.mk b/gnu/local.mk index f9f299d422..0db5f1cbd6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -229,7 +229,6 @@ GNU_SYSTEM_MODULES = \ %D%/packages/golang.scm \ %D%/packages/gperf.scm \ %D%/packages/gpodder.scm \ - %D%/packages/gprolog.scm \ %D%/packages/gps.scm \ %D%/packages/graph.scm \ %D%/packages/graphics.scm \ @@ -405,6 +404,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/popt.scm \ %D%/packages/printers.scm \ %D%/packages/profiling.scm \ + %D%/packages/prolog.scm \ %D%/packages/pth.scm \ %D%/packages/pulseaudio.scm \ %D%/packages/pumpio.scm \ diff --git a/gnu/packages/gprolog.scm b/gnu/packages/gprolog.scm deleted file mode 100644 index 166bf33294..0000000000 --- a/gnu/packages/gprolog.scm +++ /dev/null @@ -1,68 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013 Nikita Karetnikov -;;; Copyright © 2013 Mark H Weaver -;;; -;;; 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 gprolog) - #:use-module (guix download) - #:use-module (guix licenses) - #:use-module (guix packages) - #:use-module (guix build-system gnu) - #:use-module (srfi srfi-1)) - -(define-public gprolog - (package - (name "gprolog") - (version "1.4.5") - (source - (origin - (method url-fetch) - ;; Recent versions are not hosted on the GNU mirrors. - (uri (list (string-append "http://gprolog.org/gprolog-" version - ".tar.gz") - (string-append "mirror://gnu/gprolog/gprolog-" version - ".tar.gz"))) - (sha256 - (base32 - "0z4cc42n3k6i35b8mr816iwsvrpxshw6d7dgz6s2h1hy0l7g1p5z")))) - (build-system gnu-build-system) - (arguments - `(#:configure-flags - (list (string-append - "--with-install-dir=" %output "/share/gprolog")) - #:phases - (modify-phases %standard-phases - (add-before 'configure 'change-dir-n-fix-shells - (lambda _ - (chdir "src") - (substitute* "configure" - (("-/bin/sh") (string-append "-" (which "sh"))) - (("= /bin/sh") (string-append "= " (which "sh")))) - #t))))) - (home-page "https://www.gnu.org/software/gprolog/") - (synopsis "Prolog compiler") - (description - "GNU Prolog is a standards-compliant Prolog compiler with constraint -solving over finite domains. It accepts Prolog+ constraint programs and -produces a compiled, native binary which can function in a stand-alone -manner. It also features an interactive interpreter.") - (license (list gpl2+ lgpl3+)) - - ;; See 'configure' for the list of supported architectures. - (supported-systems (fold delete - %supported-systems - '("armhf-linux" "mips64el-linux"))))) diff --git a/gnu/packages/prolog.scm b/gnu/packages/prolog.scm new file mode 100644 index 0000000000..7c344988d5 --- /dev/null +++ b/gnu/packages/prolog.scm @@ -0,0 +1,69 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2013 Nikita Karetnikov +;;; Copyright © 2013 Mark H Weaver +;;; Copyright © 2020 Brett Gilio +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages prolog) + #:use-module (guix download) + #:use-module (guix licenses) + #:use-module (guix packages) + #:use-module (guix build-system gnu) + #:use-module (srfi srfi-1)) + +(define-public gprolog + (package + (name "gprolog") + (version "1.4.5") + (source + (origin + (method url-fetch) + ;; Recent versions are not hosted on the GNU mirrors. + (uri (list (string-append "http://gprolog.org/gprolog-" version + ".tar.gz") + (string-append "mirror://gnu/gprolog/gprolog-" version + ".tar.gz"))) + (sha256 + (base32 + "0z4cc42n3k6i35b8mr816iwsvrpxshw6d7dgz6s2h1hy0l7g1p5z")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list (string-append + "--with-install-dir=" %output "/share/gprolog")) + #:phases + (modify-phases %standard-phases + (add-before 'configure 'change-dir-n-fix-shells + (lambda _ + (chdir "src") + (substitute* "configure" + (("-/bin/sh") (string-append "-" (which "sh"))) + (("= /bin/sh") (string-append "= " (which "sh")))) + #t))))) + (home-page "https://www.gnu.org/software/gprolog/") + (synopsis "Prolog compiler") + (description + "GNU Prolog is a standards-compliant Prolog compiler with constraint +solving over finite domains. It accepts Prolog+ constraint programs and +produces a compiled, native binary which can function in a stand-alone +manner. It also features an interactive interpreter.") + (license (list gpl2+ lgpl3+)) + + ;; See 'configure' for the list of supported architectures. + (supported-systems (fold delete + %supported-systems + '("armhf-linux" "mips64el-linux"))))) -- cgit v1.2.3 From 3f37f3909712eb7269b6e8184c0d61bfc61b67f9 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Fri, 13 Dec 2019 21:46:26 -0600 Subject: gnu: Add swi-prolog. * gnu/packages/prolog.scm (swi-prolog): New variable. --- gnu/packages/prolog.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/gnu/packages/prolog.scm b/gnu/packages/prolog.scm index 7c344988d5..20e6119731 100644 --- a/gnu/packages/prolog.scm +++ b/gnu/packages/prolog.scm @@ -67,3 +67,46 @@ (define-public gprolog (supported-systems (fold delete %supported-systems '("armhf-linux" "mips64el-linux"))))) + +;; TODO: This current version of SWI-PROLOG using the +;; tarball from the official website is completely self-contained +;; such that all submodules are provided. Eventually replace this +;; and manually patch those submodules. +(define-public swi-prolog + (package + (name "swi-prolog") + (version "8.0.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://www.swi-prolog.org/download/stable/src/swipl-" + version ".tar.gz")) + (sha256 + (base32 + "1bnnwbdxnifb1qj42prsqhx8y0k2z596wgvh4bbnd0bw8w59rrff")))) + (build-system cmake-build-system) + (arguments + `(#:parallel-build? #f + #:tests? #t)) ; FIXME: + ;#:configure-flags + ; (list "-DINSTALL_DOCUMENTATION=OFF"))) ; FIXME: + (native-inputs + `(("zlib" ,zlib) + ("gmp" ,gmp) + ("readline" ,readline) + ;("texlive" ,texlive) + ("texinfo" ,texinfo) + ("libunwind" ,libunwind) + ("libjpeg", libjpeg) + ("libxft" ,libxft) + ("fontconfig" ,fontconfig) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("openssl" ,openssl))) + (home-page "https://www.swi-prolog.org/") + (synopsis "ISO/Edinburgh-style Prolog interpreter") + (description "SWI-Prolog is a fast and powerful ISO/Edinburgh-style Prolog +compiler with a rich set of built-in predicates. It offers a fast, robust and +small environment which enables substantial applications to be developed with +it.") + (license #f))) ; TODO: -- cgit v1.2.3 From a06a4f918243dc784f9089d60690559b72a4e308 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Fri, 3 Jan 2020 20:15:44 -0600 Subject: Revert "gnu: Add swi-prolog." This reverts commit 3f37f3909712eb7269b6e8184c0d61bfc61b67f9. --- gnu/packages/prolog.scm | 43 ------------------------------------------- 1 file changed, 43 deletions(-) diff --git a/gnu/packages/prolog.scm b/gnu/packages/prolog.scm index 20e6119731..7c344988d5 100644 --- a/gnu/packages/prolog.scm +++ b/gnu/packages/prolog.scm @@ -67,46 +67,3 @@ (define-public gprolog (supported-systems (fold delete %supported-systems '("armhf-linux" "mips64el-linux"))))) - -;; TODO: This current version of SWI-PROLOG using the -;; tarball from the official website is completely self-contained -;; such that all submodules are provided. Eventually replace this -;; and manually patch those submodules. -(define-public swi-prolog - (package - (name "swi-prolog") - (version "8.0.3") - (source - (origin - (method url-fetch) - (uri (string-append "https://www.swi-prolog.org/download/stable/src/swipl-" - version ".tar.gz")) - (sha256 - (base32 - "1bnnwbdxnifb1qj42prsqhx8y0k2z596wgvh4bbnd0bw8w59rrff")))) - (build-system cmake-build-system) - (arguments - `(#:parallel-build? #f - #:tests? #t)) ; FIXME: - ;#:configure-flags - ; (list "-DINSTALL_DOCUMENTATION=OFF"))) ; FIXME: - (native-inputs - `(("zlib" ,zlib) - ("gmp" ,gmp) - ("readline" ,readline) - ;("texlive" ,texlive) - ("texinfo" ,texinfo) - ("libunwind" ,libunwind) - ("libjpeg", libjpeg) - ("libxft" ,libxft) - ("fontconfig" ,fontconfig) - ("perl" ,perl) - ("pkg-config" ,pkg-config) - ("openssl" ,openssl))) - (home-page "https://www.swi-prolog.org/") - (synopsis "ISO/Edinburgh-style Prolog interpreter") - (description "SWI-Prolog is a fast and powerful ISO/Edinburgh-style Prolog -compiler with a rich set of built-in predicates. It offers a fast, robust and -small environment which enables substantial applications to be developed with -it.") - (license #f))) ; TODO: -- cgit v1.2.3 From e4ed9929532794b5b52c795b7356ff7413829eed Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Fri, 3 Jan 2020 21:43:34 -0600 Subject: gnu: gprolog: Use license prefix. * gnu/packages/prolog.scm (gprolog)[license]: Use prefix for list of licenses. --- gnu/packages/prolog.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/prolog.scm b/gnu/packages/prolog.scm index 7c344988d5..3eba35abed 100644 --- a/gnu/packages/prolog.scm +++ b/gnu/packages/prolog.scm @@ -20,7 +20,7 @@ (define-module (gnu packages prolog) #:use-module (guix download) - #:use-module (guix licenses) + #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix build-system gnu) #:use-module (srfi srfi-1)) @@ -61,7 +61,8 @@ (define-public gprolog solving over finite domains. It accepts Prolog+ constraint programs and produces a compiled, native binary which can function in a stand-alone manner. It also features an interactive interpreter.") - (license (list gpl2+ lgpl3+)) + (license (list license:gpl2+ + license:lgpl3+)) ;; See 'configure' for the list of supported architectures. (supported-systems (fold delete -- cgit v1.2.3 From 7eef98484c4eea2ce92fd53a86a001f006a78c16 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Fri, 3 Jan 2020 21:44:18 -0600 Subject: gnu: Add swi-prolog. * gnu/packages/prolog.scm (swi-prolog): New variable. --- gnu/packages/prolog.scm | 57 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/gnu/packages/prolog.scm b/gnu/packages/prolog.scm index 3eba35abed..4963691cb5 100644 --- a/gnu/packages/prolog.scm +++ b/gnu/packages/prolog.scm @@ -20,9 +20,23 @@ (define-module (gnu packages prolog) #:use-module (guix download) + #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) + #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) + #:use-module (gnu packages backup) + #:use-module (gnu packages compression) + #:use-module (gnu packages fontutils) + #:use-module (gnu packages image) + #:use-module (gnu packages libunwind) + #:use-module (gnu packages multiprecision) + #:use-module (gnu packages perl) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages readline) + #:use-module (gnu packages texinfo) + #:use-module (gnu packages tls) + #:use-module (gnu packages xorg) #:use-module (srfi srfi-1)) (define-public gprolog @@ -68,3 +82,46 @@ (define-public gprolog (supported-systems (fold delete %supported-systems '("armhf-linux" "mips64el-linux"))))) + +(define-public swi-prolog + (package + (name "swi-prolog") + (version "8.1.19") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/SWI-Prolog/swipl-devel.git") + (recursive? #t) ; TODO: Determine if this can be split out. + (commit (string-append "V" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0p1psf1lrkm9vdz5fggyfnr7hwyf6rvf80gygbw47hhfx46li8jh")))) + (build-system cmake-build-system) + (arguments + `(#:parallel-build? #t + #:tests? #f ; FIXME: Some tests require network access. + #:configure-flags + (list "-DINSTALL_DOCUMENTATION=ON" + "-DBUILD_PDF_DOCUMENTATION=ON" + "-DSWIPL_INSTALL_IN_LIB=OFF"))) ; FIXME: Breaks RUNPATH validation. + (native-inputs + `(("zlib" ,zlib) + ("gmp" ,gmp) + ("readline" ,readline) + ("texinfo" ,texinfo) + ("libarchive" ,libarchive) + ("libunwind" ,libunwind) + ("libjpeg", libjpeg) + ("libxft" ,libxft) + ("fontconfig" ,fontconfig) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("openssl" ,openssl))) + (home-page "https://www.swi-prolog.org/") + (synopsis "ISO/Edinburgh-style Prolog interpreter") + (description "SWI-Prolog is a fast and powerful ISO/Edinburgh-style Prolog +compiler with a rich set of built-in predicates. It offers a fast, robust and +small environment which enables substantial applications to be developed with +it.") + (license license:bsd-2))) -- cgit v1.2.3 From 4589148f573d4af54295994bc907565603e81525 Mon Sep 17 00:00:00 2001 From: "LaFreniere, Joseph" Date: Fri, 3 Jan 2020 21:50:25 -0600 Subject: gnu: Add emacs-company-posframe. * gnu/packages/emacs-xyz.scm (emacs-company-posframe): New variable. Signed-off-by: Brett Gilio --- gnu/packages/emacs-xyz.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 3933e8e525..cae6a36858 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3674,6 +3674,35 @@ (define-public emacs-company These are distributed in separate files and can be used individually.") (license license:gpl3+))) +(define-public emacs-company-posframe + (let ((version "0.1.0") + (revision "1") + (commit "67d899502384fb9ab2870aba0af41523dea7b64f")) + (package + (name "emacs-company-posframe") + (version (git-version version revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tumashu/company-posframe.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "051smlvz1siwglsd9k9l0m20mygrx4niflmyshha0064287aysxr")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-company" ,emacs-company) + ("emacs-posframe" ,emacs-posframe))) + (home-page "https://github.com/tumashu/company-posframe") + (synopsis "Use a posframe for @code{emacs-company}'s candidate menu") + (description + "Allows @code{emacs-company} to use child frames for its candidate menus. + +@code{emacs-company-posframe} is fast enough for daily use and supports CJK +languages.") + (license license:gpl3+)))) + (define-public emacs-irony-mode (package (name "emacs-irony-mode") -- cgit v1.2.3 From 198af489dee68146371ab5fcabe25bac99ea2d70 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Sat, 4 Jan 2020 17:16:41 +0100 Subject: gnu: Add jgmenu. * gnu/packages/xdisorg.scm (jgmenu): New variable. --- gnu/packages/xdisorg.scm | 49 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index d27ba68d4e..99a00e1df0 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -29,6 +29,7 @@ ;;; Copyright © 2019 Kyle Andrews ;;; Copyright © 2019 Josh Holland ;;; Copyright © 2019 Tanguy Le Carrour +;;; Copyright © 2020 Guillaume Le Vaillant ;;; ;;; This file is part of GNU Guix. ;;; @@ -1944,3 +1945,51 @@ (define-public autocutsel cutbuffer. When the cutbuffer is changed, it owns the clipboard selection. The cutbuffer and clipboard selection are always synchronized.") (license license:gpl2+))) + +(define-public jgmenu + (package + (name "jgmenu") + (version "3.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/johanmalm/jgmenu.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0q0m3sskgmjv28gzvjkphgg3yhwzc9w9fj9i342pibb50impjazy")))) + (build-system gnu-build-system) + (native-inputs + `(("perl" ,perl) + ("pkg-config" ,pkg-config))) + (inputs + `(("cairo" ,cairo) + ("librsvg" ,librsvg) + ("libx11" ,libx11) + ("libxml2" ,libxml2) + ("libxrandr" ,libxrandr) + ("pango" ,pango) + ("python" ,python))) + (arguments + '(#:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (let ((python (assoc-ref inputs "python"))) + (substitute* "src/jgmenu-pmenu.py" + (("#!/usr/bin/env python3") + (string-append "#!" python "/bin/python3"))) + #t))) + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (setenv "prefix" out) + (setenv "CC" "gcc") + #t)))))) + (synopsis "Simple X11 menu") + (description + "This is a simple menu for X11 designed for scripting and tweaking. It +can optionally use some appearance settings from XSettings, tint2 and GTK.") + (home-page "https://jgmenu.github.io/") + (license license:gpl2))) -- cgit v1.2.3 From 5a92e7c9542f60cfe9d932833bbe61d0af7a2860 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Sat, 4 Jan 2020 14:50:52 -0600 Subject: gnu: swi-prolog: Enable tests. * gnu/packages/prolog.scm (swi-prolog)[arguments]: Enable tests and work around tests that cause failure by trying to write to the store, or establishing a network connection. --- gnu/packages/prolog.scm | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/gnu/packages/prolog.scm b/gnu/packages/prolog.scm index 4963691cb5..bd89c9ad2f 100644 --- a/gnu/packages/prolog.scm +++ b/gnu/packages/prolog.scm @@ -100,11 +100,37 @@ (define-public swi-prolog (build-system cmake-build-system) (arguments `(#:parallel-build? #t - #:tests? #f ; FIXME: Some tests require network access. + #:tests? #t #:configure-flags (list "-DINSTALL_DOCUMENTATION=ON" "-DBUILD_PDF_DOCUMENTATION=ON" "-DSWIPL_INSTALL_IN_LIB=OFF"))) ; FIXME: Breaks RUNPATH validation. + #:phases + (modify-phases %standard-phases + ;; XXX: Delete a variety of tests which fail either attempting to + ;; establish a network connection, or attempts to write to the + ;; immutable store. Phases marked *-pre are disabled /before/ building. + ;; Phases marked *-post are disabled /after/ building. + (add-after 'unpack 'delete-failing-tests-pre + (lambda _ + (substitute* "src/CMakeLists.txt" + ((" save") "")) + (substitute* "src/test.pl" + (("testdir\\('Tests/save'\\).") "")) + (with-directory-excursion "src/Tests" + (for-each delete-file-recursively + '("save"))) + #t)) + (add-before 'check 'delete-failing-tests-post + (lambda _ + (with-directory-excursion "packages" + (for-each delete-file-recursively + '("http" + "pengines" + "RDF" + "semweb" + "ssl"))) + #t))))) (native-inputs `(("zlib" ,zlib) ("gmp" ,gmp) -- cgit v1.2.3 From 235c67341b5373f7d21edfd56a2ff19da4a25efb Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Sat, 4 Jan 2020 14:51:44 -0600 Subject: gnu: swi-prolog: Modify documentation installation. * gnu/packages/prolog.scm (swi-prolog)[arguments]: Remove configuration step for PDF documentation. --- gnu/packages/prolog.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/prolog.scm b/gnu/packages/prolog.scm index bd89c9ad2f..a85e58e19f 100644 --- a/gnu/packages/prolog.scm +++ b/gnu/packages/prolog.scm @@ -103,8 +103,7 @@ (define-public swi-prolog #:tests? #t #:configure-flags (list "-DINSTALL_DOCUMENTATION=ON" - "-DBUILD_PDF_DOCUMENTATION=ON" - "-DSWIPL_INSTALL_IN_LIB=OFF"))) ; FIXME: Breaks RUNPATH validation. + "-DSWIPL_INSTALL_IN_LIB=OFF") ; FIXME: Breaks RUNPATH validation. #:phases (modify-phases %standard-phases ;; XXX: Delete a variety of tests which fail either attempting to -- cgit v1.2.3 From bcd47c67b04c94e33631fd9a71fd907a9eed379b Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Sat, 4 Jan 2020 14:52:22 -0600 Subject: gnu: swi-prolog: Update to 8.1.20. * gnu/packages/prolog.scm (swi-prolog): Update to 8.1.20. --- gnu/packages/prolog.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/prolog.scm b/gnu/packages/prolog.scm index a85e58e19f..ca280f77fa 100644 --- a/gnu/packages/prolog.scm +++ b/gnu/packages/prolog.scm @@ -86,7 +86,7 @@ (define-public gprolog (define-public swi-prolog (package (name "swi-prolog") - (version "8.1.19") + (version "8.1.20") (source (origin (method git-fetch) (uri (git-reference @@ -96,7 +96,7 @@ (define-public swi-prolog (file-name (git-file-name name version)) (sha256 (base32 - "0p1psf1lrkm9vdz5fggyfnr7hwyf6rvf80gygbw47hhfx46li8jh")))) + "0blpw5g0gszi83wmvyhlh7pk4wlyx00vgaj6qr3ris36cdl8j10a")))) (build-system cmake-build-system) (arguments `(#:parallel-build? #t -- cgit v1.2.3 From b224ff4a2d962d0206262cd18cdae8c169e41a0c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 3 Jan 2020 09:37:25 +0100 Subject: gnu: nfs-utils: Update to 2.4.2. * gnu/packages/nfs.scm (nfs-utils): Update to 2.4.2. [source]: Remove patch. [arguments]: Update configure flags, remove fix-glibc-compatability phase, update substitutions. [inputs]: Add keyutils and rpcsvc-proto. * gnu/packages/patches/nfs-utils-missing-headers.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/nfs.scm | 45 ++++++++++++---------- .../patches/nfs-utils-missing-headers.patch | 19 --------- 3 files changed, 25 insertions(+), 40 deletions(-) delete mode 100644 gnu/packages/patches/nfs-utils-missing-headers.patch diff --git a/gnu/local.mk b/gnu/local.mk index 0db5f1cbd6..0c5a688933 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1200,7 +1200,6 @@ dist_patch_DATA = \ %D%/packages/patches/netsurf-system-utf8proc.patch \ %D%/packages/patches/netsurf-y2038-tests.patch \ %D%/packages/patches/netsurf-longer-test-timeout.patch \ - %D%/packages/patches/nfs-utils-missing-headers.patch \ %D%/packages/patches/ngircd-handle-zombies.patch \ %D%/packages/patches/nm-plugin-path.patch \ %D%/packages/patches/nsis-env-passthru.patch \ diff --git a/gnu/packages/nfs.scm b/gnu/packages/nfs.scm index 9d7acc3592..a3d5383c4d 100644 --- a/gnu/packages/nfs.scm +++ b/gnu/packages/nfs.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2016 John Darrington ;;; Copyright © 2017, 2018 Leo Famulari ;;; Copyright © 2018 Efraim Flashner +;;; Copyright © 2020 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -20,6 +21,7 @@ (define-module (gnu packages nfs) #:use-module (gnu packages) + #:use-module (gnu packages crypto) #:use-module (gnu packages linux) #:use-module (gnu packages libevent) #:use-module (gnu packages kerberos) @@ -42,32 +44,27 @@ (define-module (gnu packages nfs) (define-public nfs-utils (package (name "nfs-utils") - (version "2.1.1") + (version "2.4.2") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/linux/utils/nfs-utils/" version "/nfs-utils-" version ".tar.xz")) - (patches (search-patches "nfs-utils-missing-headers.patch")) (sha256 (base32 - "1vqrqzhg9nh2wj1icp7k8v9dibgnn521b45np79nnkmqf16bbbhg")))) + "0f0hm8jq1p5gra55v621qpbb3mryakaikzpy5znkvxym0dx76r24")))) (build-system gnu-build-system) (arguments `(#:configure-flags `("--without-tcp-wrappers" ,(string-append "--with-start-statd=" (assoc-ref %outputs "out") "/sbin/start-statd") - ,(string-append "--with-krb5=" (assoc-ref %build-inputs "mit-krb5"))) + ,(string-append "--with-krb5=" (assoc-ref %build-inputs "mit-krb5")) + ,(string-append "--with-pluginpath=" + (assoc-ref %outputs "out") + "/lib/libnfsidmap")) #:phases (modify-phases %standard-phases - (add-after 'unpack 'fix-glibc-compatability - (lambda _ - (substitute* '("utils/blkmapd/device-discovery.c" - "utils/blkmapd/dm-device.c") - (("") - "\n#include ")) - #t)) (add-before 'configure 'adjust-command-file-names (lambda _ ;; Remove assumptions of FHS from start-statd script @@ -81,6 +78,11 @@ (define-public nfs-utils (string-append "exec " (assoc-ref %outputs "out") "/sbin/rpc.statd"))) + ;; find rpcgen + (substitute* "configure" + (("/usr/local/bin/rpcgen") + (which "rpcgen"))) + ;; This hook tries to write to /var ;; That needs to be done by a service too. (substitute* `("Makefile.in") @@ -96,20 +98,23 @@ (define-public nfs-utils (substitute* `("utils/statd/statd.c") (("/usr/sbin/") (string-append (assoc-ref %outputs "out") "/sbin/"))) - (substitute* `("utils/osd_login/Makefile.in" - "utils/mount/Makefile.in" + (substitute* `("utils/mount/Makefile.in" + "utils/nfsdcld/Makefile.in" "utils/nfsdcltrack/Makefile.in") (("^sbindir = /sbin") (string-append "sbindir = " (assoc-ref %outputs "out") "/sbin"))) #t))))) - (inputs `(("libevent" ,libevent) - ("libnfsidmap" ,libnfsidmap) - ("sqlite" ,sqlite) - ("lvm2" ,lvm2) - ("util-linux" ,util-linux) - ("mit-krb5" ,mit-krb5) - ("libtirpc" ,libtirpc))) + (inputs + `(("keyutils" ,keyutils) + ("libevent" ,libevent) + ("libnfsidmap" ,libnfsidmap) + ("rpcsvc-proto" ,rpcsvc-proto) ;for 'rpcgen' + ("sqlite" ,sqlite) + ("lvm2" ,lvm2) + ("util-linux" ,util-linux) + ("mit-krb5" ,mit-krb5) + ("libtirpc" ,libtirpc))) (native-inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.kernel.org/pub/linux/utils/nfs-utils/") diff --git a/gnu/packages/patches/nfs-utils-missing-headers.patch b/gnu/packages/patches/nfs-utils-missing-headers.patch deleted file mode 100644 index 7f0542836e..0000000000 --- a/gnu/packages/patches/nfs-utils-missing-headers.patch +++ /dev/null @@ -1,19 +0,0 @@ -Fix compilation failure with glibc 2.26 caused by missing type -declarations: - ------- -rpc.c: In function ‘nsm_recv_getport’: -rpc.c:469:13: error: ‘UINT16_MAX’ undeclared (first use in this function) - if (port > UINT16_MAX) { ------- - ---- a/support/nsm/rpc.c.orig 2016-08-03 20:25:15.000000000 +0200 -+++ b/support/nsm/rpc.c 2017-08-26 07:41:11.884000000 +0200 -@@ -40,6 +40,7 @@ - - #include - #include -+#include - #include - #include - #include -- cgit v1.2.3 From 51c9221a72e56bf08d22fe96be1960ab5818ac65 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 3 Jan 2020 20:05:35 +0100 Subject: gnu: Add cogutil. * gnu/packages/opencog.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. --- gnu/local.mk | 3 ++- gnu/packages/opencog.scm | 62 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/opencog.scm diff --git a/gnu/local.mk b/gnu/local.mk index 0c5a688933..83bba6b644 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -7,7 +7,7 @@ # Copyright © 2016, 2017, 2018 Kei Kebreau # Copyright © 2016, 2017 Rene Saavedra # Copyright © 2016 Adonay "adfeno" Felipe Nogueira -# Copyright © 2016, 2017, 2018, 2019 Ricardo Wurmus +# Copyright © 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus # Copyright © 2016 Ben Woodcroft # Copyright © 2016, 2017, 2018, 2019 Alex Vong # Copyright © 2016, 2017, 2018, 2019 Efraim Flashner @@ -377,6 +377,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/onc-rpc.scm \ %D%/packages/opencl.scm \ %D%/packages/openbox.scm \ + %D%/packages/opencog.scm \ %D%/packages/openldap.scm \ %D%/packages/openstack.scm \ %D%/packages/orpheus.scm \ diff --git a/gnu/packages/opencog.scm b/gnu/packages/opencog.scm new file mode 100644 index 0000000000..944174c19b --- /dev/null +++ b/gnu/packages/opencog.scm @@ -0,0 +1,62 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2020 Ricardo Wurmus +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages opencog) + #:use-module (gnu packages) + #:use-module (gnu packages boost) + #:use-module (gnu packages check) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages python) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix git-download) + #:use-module (guix build-system cmake) + #:use-module (guix utils)) + +(define-public cogutil + ;; The last release was in 2016. Other OpenCog packages require a later + ;; version. + (let ((commit "b07b41b2eaf01627c78b27f1f28bb09ef7086f8e") + (revision "1")) + (package + (name "cogutil") + (version (git-version "2.0.3" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/opencog/cogutil.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1ymmcrinp0prlxsmxmwdjjl4kgaj7wzq39d5b1q2apgg94yfdhqb")))) + (build-system cmake-build-system) + (arguments + `(#:test-target "tests")) + (inputs + `(("boost" ,boost))) + (native-inputs + `(("cxxtest" ,cxxtest) + ("python" ,python-minimal) + ("pkg-config" ,pkg-config))) + (home-page "https://github.com/opencog/cogutil/") + (synopsis "Low-level C++ programming utilities used by OpenCog components") + (description "The OpenCog utilities is a miscellaneous collection of C++ +utilities use for typical programming tasks in multiple OpenCog projects.") + ;; Either of these licenses. + (license (list license:agpl3 license:asl2.0))))) -- cgit v1.2.3 From fc139475ddcfc26840beee743375339efae4e23a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 3 Jan 2020 22:57:27 +0100 Subject: gnu: Add atomspace. * gnu/packages/opencog.scm (atomspace): New variable. --- gnu/packages/opencog.scm | 49 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/gnu/packages/opencog.scm b/gnu/packages/opencog.scm index 944174c19b..1eb93167cd 100644 --- a/gnu/packages/opencog.scm +++ b/gnu/packages/opencog.scm @@ -20,6 +20,9 @@ (define-module (gnu packages opencog) #:use-module (gnu packages) #:use-module (gnu packages boost) #:use-module (gnu packages check) + #:use-module (gnu packages databases) + #:use-module (gnu packages guile) + #:use-module (gnu packages multiprecision) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module ((guix licenses) #:prefix license:) @@ -60,3 +63,49 @@ (define-public cogutil utilities use for typical programming tasks in multiple OpenCog projects.") ;; Either of these licenses. (license (list license:agpl3 license:asl2.0))))) + +(define-public atomspace + ;; The last release was in 2016 and doesn't build with our Boost package. + (let ((commit "86c848dfc7135b3c47deb581f8da54a60f6711c9") + (revision "1")) + (package + (name "atomspace") + (version (git-version "5.0.3" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/opencog/atomspace.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0vxzhszb0z8081li38hid07a5axzxyflsmq1mcn4b1k4z1j8ggch")))) + (build-system cmake-build-system) + (arguments + `(#:test-target "tests" + #:configure-flags + (list (string-append "-DGUILE_INCLUDE_DIR=" + (assoc-ref %build-inputs "guile") + "/include/guile/2.2/") + (string-append "-DGUILE_SITE_DIR=" + (assoc-ref %outputs "out") + "/share/guile/site/2.2/")))) + (inputs + `(("boost" ,boost) + ("cogutil" ,cogutil) + ("gmp" ,gmp) + ("guile" ,guile-2.2) + ("postgresql" ,postgresql))) + (native-inputs + `(("cxxtest" ,cxxtest) + ("python" ,python-minimal) + ("pkg-config" ,pkg-config))) + (home-page "https://github.com/opencog/atomspace/") + (synopsis "OpenCog hypergraph database, query system and rule engine") + (description "The OpenCog AtomSpace is an in-RAM @dfn{knowledge +representation} (KR) database, an associated query engine and graph-re-writing +system, and a rule-driven inferencing engine that can apply and manipulate +sequences of rules to perform reasoning. It is a layer that sits on top of +ordinary distributed (graph) databases, providing a large variety of advanced +features not otherwise available.") + (license license:agpl3)))) -- cgit v1.2.3 From d946ede596d4f94cde6494c98f60077778627113 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 3 Jan 2020 22:57:41 +0100 Subject: gnu: Add cogserver. * gnu/packages/opencog.scm (cogserver): New variable. --- gnu/packages/opencog.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/gnu/packages/opencog.scm b/gnu/packages/opencog.scm index 1eb93167cd..e969a7e9de 100644 --- a/gnu/packages/opencog.scm +++ b/gnu/packages/opencog.scm @@ -109,3 +109,46 @@ (define-public atomspace ordinary distributed (graph) databases, providing a large variety of advanced features not otherwise available.") (license license:agpl3)))) + +(define-public cogserver + ;; There are no releases. + (let ((commit "c8ad85fef446819e6bd711f0791887a5aa6a41f9") + (revision "1")) + (package + (name "cogserver") + (version (git-version "0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/opencog/cogserver.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0flwl2cbmnj7kjcx8vwk7rbhsp2si0a51ci0hx88a3xx1f76cp3f")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ; See https://github.com/opencog/cogserver/issues/24 + #:test-target "tests" + #:configure-flags + (list (string-append "-DGUILE_INCLUDE_DIR=" + (assoc-ref %build-inputs "guile") + "/include/guile/2.2/") + (string-append "-DGUILE_SITE_DIR=" + (assoc-ref %outputs "out") + "/share/guile/site/2.2/")))) + (inputs + `(("atomspace" ,atomspace) + ("boost" ,boost) + ("cogutil" ,cogutil) + ("gmp" ,gmp) + ("guile" ,guile-2.2))) + (native-inputs + `(("cxxtest" ,cxxtest) + ("python" ,python-minimal) + ("pkg-config" ,pkg-config))) + (home-page "https://github.com/opencog/cogserver/") + (synopsis "OpenCog network server") + (description "The OpenCog Cogserver is a network and job server for the +OpenCog framework.") + (license license:agpl3)))) -- cgit v1.2.3 From 1f6f0b6bca7788411e19ed4187a2ccc57ccc6186 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 4 Jan 2020 14:51:26 +0100 Subject: gnu: Add link-grammar. * gnu/packages/language.scm (link-grammar): New variable. --- gnu/packages/language.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index 1ed2483615..cec0ffa942 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 ng0 ;;; Copyright © 2019 Alex Vong +;;; Copyright © 2020 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -883,3 +884,27 @@ (define-public tegaki-wagomu-traditional-chinese (("zinnia") "wagomu")) #t)))))) (license lgpl2.1))) ; all files + +(define-public link-grammar + (package + (name "link-grammar") + (version "5.7.0") + (source (origin + (method url-fetch) + (uri (string-append "https://www.abisource.com/downloads/" + "link-grammar/" version + "/link-grammar-" version ".tar.gz")) + (sha256 + (base32 + "0ak1v469k56v3511kxxkxvx1nw6zcxcl0f1kcvc82ffacqbr4y96")))) + (build-system gnu-build-system) + (home-page "https://www.abisource.com/projects/link-grammar/") + (synopsis "Link grammar parser") + (description "The Link Grammar Parser is a syntactic parser of English, +Russian, Arabic and Persian (and other languages as well), based on Link +Grammar, an original theory of syntax and morphology. Given a sentence, the +system assigns to it a syntactic structure, which consists of a set of +labelled links connecting pairs of words. The parser also produces a +\"constituent\" (HPSG style phrase tree) representation of a sentence (showing +noun phrases, verb phrases, etc.).") + (license bsd-3))) -- cgit v1.2.3 From 3cc6b1232bc5aab709f429100be7b5fc72c17a67 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 4 Jan 2020 14:51:53 +0100 Subject: gnu: Add attention. * gnu/packages/opencog.scm (attention): New variable. --- gnu/packages/opencog.scm | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/gnu/packages/opencog.scm b/gnu/packages/opencog.scm index e969a7e9de..4cde45d9ab 100644 --- a/gnu/packages/opencog.scm +++ b/gnu/packages/opencog.scm @@ -152,3 +152,48 @@ (define-public cogserver (description "The OpenCog Cogserver is a network and job server for the OpenCog framework.") (license license:agpl3)))) + +(define-public attention + ;; There are no releases. + (let ((commit "87d43679280ce486cd6757765d2e1df6d502991d") + (revision "1")) + (package + (name "attention") + (version (git-version "0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/opencog/attention.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0sndslphicv6w9qpag168rqkxq5sf71l5qbfx6zhsd5bzlf5fhwv")))) + (build-system cmake-build-system) + (arguments + `(#:test-target "tests" + #:configure-flags + (list + (string-append "-DGUILE_INCLUDE_DIR=" + (assoc-ref %build-inputs "guile") + "/include/guile/2.2/") + (string-append "-DGUILE_SITE_DIR=" + (assoc-ref %outputs "out") + "/share/guile/site/2.2/")))) + (inputs + `(("atomspace" ,atomspace) + ("boost" ,boost) + ("cogserver" ,cogserver) + ("cogutil" ,cogutil) + ("gmp" ,gmp) + ("guile" ,guile-2.2))) + (native-inputs + `(("cxxtest" ,cxxtest) + ("python" ,python-minimal) + ("pkg-config" ,pkg-config))) + (home-page "https://github.com/opencog/attention/") + (synopsis "OpenCog attention allocation subsystem") + (description "Attention Allocation is an OpenCog subsystem meant to +control the application of processing and memory resources to specific +tasks.") + (license license:agpl3)))) -- cgit v1.2.3 From 0d66b9d6cd6894a82871468f0c14071a34def0f2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 4 Jan 2020 14:52:02 +0100 Subject: gnu: Add opencog. * gnu/packages/opencog.scm (opencog): New variable. --- gnu/packages/opencog.scm | 53 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/gnu/packages/opencog.scm b/gnu/packages/opencog.scm index 4cde45d9ab..f9551a8e9f 100644 --- a/gnu/packages/opencog.scm +++ b/gnu/packages/opencog.scm @@ -22,6 +22,8 @@ (define-module (gnu packages opencog) #:use-module (gnu packages check) #:use-module (gnu packages databases) #:use-module (gnu packages guile) + #:use-module (gnu packages language) + #:use-module (gnu packages linux) #:use-module (gnu packages multiprecision) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -197,3 +199,54 @@ (define-public attention control the application of processing and memory resources to specific tasks.") (license license:agpl3)))) + +(define-public opencog + ;; There are no recent releases. + (let ((commit "ceac90507610cb2d0ee98f97a2086865292b1204") + (revision "1")) + (package + (name "opencog") + (version (git-version "0.1.4" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/opencog/opencog.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1j8wv910fvrmph370wv5pv2f4bc2s9vl6i7bw3pkmwbdhxkhjbhm")))) + (build-system cmake-build-system) + (arguments + `(#:test-target "tests" + #:configure-flags + (list + (string-append "-DGUILE_INCLUDE_DIR=" + (assoc-ref %build-inputs "guile") + "/include/guile/2.2/") + (string-append "-DGUILE_SITE_DIR=" + (assoc-ref %outputs "out") + "/share/guile/site/2.2/")))) + (inputs + `(("attention" ,attention) + ("atomspace" ,atomspace) + ("boost" ,boost) + ("cogserver" ,cogserver) + ("cogutil" ,cogutil) + ("gmp" ,gmp) + ("guile" ,guile-2.2) + ("libuuid" ,util-linux) + ("link-grammar" ,link-grammar))) + (native-inputs + `(("cxxtest" ,cxxtest) + ("python" ,python-minimal) + ("pkg-config" ,pkg-config))) + (home-page "https://github.com/opencog/attention/") + (synopsis "Framework for integrated artificial intelligence") + (description "OpenCog is a framework for developing AI systems, +especially appropriate for integrative multi-algorithm systems, and artificial +general intelligence systems. It currently contains a functional core +framework, and a number of cognitive agents at varying levels of completion, +some already displaying interesting and useful functionalities alone and in +combination.") + (license license:agpl3)))) -- cgit v1.2.3 From 92afa57b9311812fd9e44a90939e0137e2180d11 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 4 Jan 2020 14:57:12 +0100 Subject: gnu: Add cl-zpb-ttf. * gnu/packages/lisp-xyz.scm (sbcl-zpb-ttf, ecl-zpb-ttf, cl-zpb-ttf): New variables. --- gnu/packages/lisp-xyz.scm | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 41c2fba0c5..6255af0ded 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2016 Federico Beffa ;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2016, 2017 Andy Patterson -;;; Copyright © 2017, 2019 Ricardo Wurmus +;;; Copyright © 2017, 2019, 2020 Ricardo Wurmus ;;; Copyright © 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Benjamin Slade @@ -371,6 +371,35 @@ (define-public ecl-cl-unicode (define-public cl-unicode (sbcl-package->cl-source-package sbcl-cl-unicode)) +(define-public sbcl-zpb-ttf + (package + (name "sbcl-zpb-ttf") + (version "1.0.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/xach/zpb-ttf.git") + (commit (string-append "release-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1wh66vjijzqlydnrihynpwp6796917xwrh0i9li93c17kyxa74ih")))) + (build-system asdf-build-system/sbcl) + (home-page "https://github.com/xach/zpb-ttf") + (synopsis "TrueType font file access for Common Lisp") + (description + "ZPB-TTF is a TrueType font file parser that provides an interface for +reading typographic metrics, glyph outlines, and other information from the +file.") + (license license:bsd-2))) + +(define-public ecl-zpb-ttf + (sbcl-package->ecl-package sbcl-zpb-ttf)) + +(define-public cl-zpb-ttf + (sbcl-package->cl-source-package sbcl-zpb-ttf)) + (define-public sbcl-clx (package (name "sbcl-clx") -- cgit v1.2.3 From f851fd6b2b4f8e23445aba863f2f063a251f2d9a Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 2 Dec 2019 23:59:57 +0100 Subject: build-system/guile: Add #:implicit-inputs?. * guix/build-system/guile.scm (lower): Add implicit-inputs? keyword parameter. [private-keywords]: Add it. Honor it. --- guix/build-system/guile.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/guix/build-system/guile.scm b/guix/build-system/guile.scm index 2c5cc968ce..3693014694 100644 --- a/guix/build-system/guile.scm +++ b/guix/build-system/guile.scm @@ -36,6 +36,7 @@ (define %guile-build-system-modules (define* (lower name #:key source inputs native-inputs outputs system target + (implicit-inputs? #t) #:allow-other-keys #:rest arguments) "Return a bag for NAME." @@ -45,7 +46,8 @@ (define* (lower name ;; procedures like 'package-for-guile-2.0' unchanged and simple. (define private-keywords - '(#:target #:inputs #:native-inputs)) + '(#:target #:inputs #:native-inputs + #:implicit-inputs?)) (bag (name name) @@ -56,8 +58,10 @@ (define private-keywords `(("source" ,source)) '()) ,@native-inputs - ,@(map (cute assoc <> (standard-packages)) - '("tar" "gzip" "bzip2" "xz" "locales")))) + ,@(if implicit-inputs? + (map (cute assoc <> (standard-packages)) + '("tar" "gzip" "bzip2" "xz" "locales")) + '()))) (outputs outputs) (build (if target guile-cross-build guile-build)) (arguments (strip-keyword-arguments private-keywords arguments)))) -- cgit v1.2.3 From d67fa5c824828dd27e3e14427e85e2c3e8160dae Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 11 Dec 2019 17:26:00 +0100 Subject: gnu: Add guile-hashing. * gnu/packages/guile-xyz.scm (guile-hashing): New variable. --- gnu/packages/guile-xyz.scm | 51 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index fa612b66e9..f720679329 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2740,3 +2740,54 @@ (define-public guile-semver comparing, and writing Semantic Versions. It also includes ranges in the style of the Node Package Manager (NPM).") (license license:gpl3+))) + +(define-public guile-hashing + (package + (name "guile-hashing") + (version "1.2.0") + (home-page "https://github.com/weinholt/hashing") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1362d3lmpv7slmv1zmr9wy8panq9sjr9787gc2hagd646mpsfpkl")))) + (build-system guile-build-system) + (arguments + `(#:modules ((guix build guile-build-system) + (guix build utils) + (srfi srfi-26) + (ice-9 ftw)) + #:implicit-inputs? #f ;needs nothing but Guile + #:phases (modify-phases %standard-phases + (add-before 'build 'move-sls-files + (lambda _ + ;; Move the source under hashing/ in order to match + ;; module names, and rename .sls files to .scm. + (define (target file) + (string-append "hashing/" file)) + + (define (sls->scm sls) + (string-append (string-drop-right sls 4) + ".scm")) + + (mkdir "hashing") + (for-each (lambda (file) + (rename-file file (sls->scm file))) + (find-files "." "\\.sls$")) + (for-each (lambda (file) + (rename-file file (target file))) + (scandir "." (cut string-suffix? ".scm" <>))) + (rename-file "private" "hashing/private") + #t))))) + (native-inputs + `(("guile" ,guile-2.2))) + (synopsis "Cryprographic hash functions implemented in Scheme") + (description + "The @code{(hashing @dots{})} modules implement cryptographic hash +functions in pure R6RS Scheme: CRC, HMAC, MD5, SHA-1, and SHA-2 (SHA-256, +SHA-512).") + (license license:expat))) -- cgit v1.2.3 From f918a8d9d80b9500d5f336c0d872fe06ef48c1e2 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 3 Jan 2020 19:55:47 +0100 Subject: gnu: guile-hashing: Add variant for Guile 3.0. * gnu/packages/guile-xyz.scm (guile3.0-hashing): New variable. --- gnu/packages/guile-xyz.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index f720679329..80ff00b23b 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.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 © 2014, 2015, 2018 Mark H Weaver ;;; Copyright © 2015, 2017 Christopher Allan Webber ;;; Copyright © 2016 Alex Sassmannshausen @@ -2791,3 +2791,10 @@ (define (sls->scm sls) functions in pure R6RS Scheme: CRC, HMAC, MD5, SHA-1, and SHA-2 (SHA-256, SHA-512).") (license license:expat))) + +(define-public guile3.0-hashing + (package + (inherit guile-hashing) + (name "guile3.0-hashing") + (native-inputs + `(("guile" ,guile-next))))) -- cgit v1.2.3 From d63ee94d63c667e0c63651d6b775460f4c67497d Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 6 Dec 2019 23:12:49 +0100 Subject: gexp: Add 'raw-derivation-file'. * guix/gexp.scm (): New record type. (raw-derivation-file-compiler): New gexp compiler. * tests/gexp.scm ("lower-gexp, raw-derivation-file") ("raw-derivation-file"): New tests. --- guix/gexp.scm | 26 ++++++++++++++++++++++++++ tests/gexp.scm | 31 ++++++++++++++++++++++++++++++- 2 files changed, 56 insertions(+), 1 deletion(-) diff --git a/guix/gexp.scm b/guix/gexp.scm index 912960fd1d..c4f4e80209 100644 --- a/guix/gexp.scm +++ b/guix/gexp.scm @@ -79,6 +79,9 @@ (define-module (guix gexp) file-append-base file-append-suffix + raw-derivation-file + raw-derivation-file? + load-path-expression gexp-modules @@ -265,6 +268,29 @@ (define-gexp-compiler (derivation-compiler (drv ) system target) (with-monad %store-monad (return drv))) +;; Expand to a raw ".drv" file for the lowerable object it wraps. In other +;; words, this gives the raw ".drv" file instead of its build result. +(define-record-type + (raw-derivation-file obj) + raw-derivation-file? + (obj raw-derivation-file-object)) ;lowerable object + +(define-gexp-compiler raw-derivation-file-compiler + compiler => (lambda (obj system target) + (mlet %store-monad ((obj (lower-object + (raw-derivation-file-object obj) + system #:target target))) + ;; Returning the .drv file name instead of the + ;; record ensures that 'lower-gexp' will classify it as a + ;; "source" and not as an "input". + (return (if (derivation? obj) + (derivation-file-name obj) + obj)))) + expander => (lambda (obj lowered output) + (if (derivation? lowered) + (derivation-file-name lowered) + lowered))) + ;;; ;;; File declarations. diff --git a/tests/gexp.scm b/tests/gexp.scm index 8b1596f66d..7c8985d846 100644 --- a/tests/gexp.scm +++ b/tests/gexp.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 ;;; ;;; This file is part of GNU Guix. ;;; @@ -879,6 +879,17 @@ (define (matching-input drv output) (eq? (derivation-input-derivation (lowered-gexp-guile lexp)) (%guile-for-build))))))) +(test-assertm "lower-gexp, raw-derivation-file" + (mlet* %store-monad ((thing -> (program-file "prog" #~(display "hi!"))) + (exp -> #~(list #$(raw-derivation-file thing))) + (drv (lower-object thing)) + (lexp (lower-gexp exp #:effective-version "2.0"))) + (return (and (equal? `(list ,(derivation-file-name drv)) + (lowered-gexp-sexp lexp)) + (equal? (list (derivation-file-name drv)) + (lowered-gexp-sources lexp)) + (null? (lowered-gexp-inputs lexp)))))) + (test-eq "lower-gexp, non-self-quoting input" + (guard (c ((gexp-input-error? c) @@ -1157,6 +1168,24 @@ (define-public %stupid-thing ,text)) (equal? `(list "foo" ,text) (call-with-input-file out read))))))))) +(test-assertm "raw-derivation-file" + (let* ((exp #~(let ((drv #$(raw-derivation-file coreutils))) + (when (file-exists? drv) + (symlink drv #$output))))) + (mlet* %store-monad ((dep (lower-object coreutils)) + (drv (gexp->derivation "drv-ref" exp)) + (out -> (derivation->output-path drv))) + (mbegin %store-monad + (built-derivations (list drv)) + (mlet %store-monad ((refs (references* out))) + (return (and (member (derivation-file-name dep) + (derivation-sources drv)) + (not (member (derivation-file-name dep) + (map derivation-input-path + (derivation-inputs drv)))) + (equal? (readlink out) (derivation-file-name dep)) + (equal? refs (list (derivation-file-name dep)))))))))) + (test-assert "text-file*" (run-with-store %store (mlet* %store-monad -- cgit v1.2.3 From 85ad4ffb25c941a2a37cb4af839de9ac141c8253 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Sun, 5 Jan 2020 02:00:24 +0100 Subject: gnu: bitlbee: Use HTTPS home page. * gnu/packages/messaging.scm (bitlbee)[home-page]: Use HTTPS. --- gnu/packages/messaging.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 1c5866fc49..b71e68a90f 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -17,7 +17,7 @@ ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2019 Tanguy Le Carrour ;;; Copyright © 2019, 2020 Brett Gilio -;;; Copyright © 2019 Timotej Lazar +;;; Copyright © 2019, 2020 Timotej Lazar ;;; ;;; This file is part of GNU Guix. ;;; @@ -214,7 +214,7 @@ (define-public bitlbee Google Talk), MSN Messenger, Yahoo! Messenger, AIM and ICQ, and the Twitter microblogging network (plus all other Twitter API compatible services like identi.ca and status.net).") - (home-page "http://www.bitlbee.org/") + (home-page "https://www.bitlbee.org/") (license (list license:gpl2+ license:bsd-2)))) (define-public bitlbee-discord -- cgit v1.2.3 From fe0686864dc57ecdda7ecbb318d2618ac46169ae Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Sat, 4 Jan 2020 17:54:30 +0100 Subject: gnu: Add xcur2png. * gnu/packages/xorg.scm (xcur2png): New variable. --- gnu/packages/xorg.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index fda61aff67..022cb49c20 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2018 Benjamin Slade ;;; Copyright © 2019 nee ;;; Copyright © 2019 Yoshinori Arai +;;; Copyright © 2020 Leo Prikler ;;; ;;; This file is part of GNU Guix. ;;; @@ -6425,3 +6426,29 @@ (define-public console-setup ;; by simple permissive licenses. See the 'COPYRIGHT' file. (license (list license:gpl2+ license:expat)))) + +(define-public xcur2png + (package + (name "xcur2png") + (version "0.7.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/eworm-de/xcur2png.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0858wn2p14bxpv9lvaz2bz1rk6zk0g8zgxf8iy595m8fqv4q2fya")))) + (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("libpng" ,libpng) + ("libxcursor" ,libxcursor))) + (synopsis "Decode X cursors") + (description + "xcur2png is a program decomposes an X cursor into a set of PNG images and +a configuration file reusable by xcursorgen.") + (home-page "https://github.com/eworm-de/xcur2png") + (license license:gpl3+))) -- cgit v1.2.3 From 45c552ec516f2c502e9e44f0cde26d73a7ebdb1d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 5 Jan 2020 02:09:33 +0100 Subject: gnu: Add libccd. * gnu/packages/game-development.scm (libccd): New variable. --- gnu/packages/game-development.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index cfe271075a..24c75b1e3e 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2019 Pierre Neidhardt ;;; Copyright © 2019 Leo Prikler ;;; Copyright © 2019 Jethro Cao +;;; Copyright © 2020 Nicolas Goaziou ;;; ;;; This file is part of GNU Guix. ;;; @@ -82,6 +83,7 @@ (define-module (gnu packages game-development) #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages sdl) + #:use-module (gnu packages sphinx) #:use-module (gnu packages stb) #:use-module (gnu packages texinfo) #:use-module (gnu packages tls) @@ -1956,3 +1958,32 @@ (define-public fna license:lgpl2.1 ; LzxDecoder.cs ;; Mono.Xna: license:expat)))) + +(define-public libccd + (package + (name "libccd") + (version "2.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/danfis/libccd.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0sfmn5pd7k5kyhbxnd689xmsa5v843r7sska96dlysqpljd691jc")))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags '("-DBUILD_DOCUMENTATION=ON" + "-DBUILD_TESTING=ON" + "-DENABLE_DOUBLE_PRECISION=ON"))) + (native-inputs + `(("python-sphinx" ,python-sphinx))) + (home-page "https://github.com/danfis/libccd") + (synopsis "Library for collision detection between two convex shapes") + (description "@code{libccd} is library for a collision detection +between two convex shapes. @code{libccd} implements variation on +Gilbert–Johnson–Keerthi algorithm plus Expand Polytope Algorithm (EPA) +and also implements algorithm Minkowski Portal Refinement (MPR, +a.k.a. XenoCollide) as described in Game Programming Gems 7.") + (license license:expat))) -- cgit v1.2.3 From 42399ad7c6876075d70cf6d1ea32bbf0cb41af29 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 5 Jan 2020 02:11:26 +0100 Subject: gnu: Add ode. * gnu/packages/game-development.scm (ode): New variable. --- gnu/packages/game-development.scm | 42 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 24c75b1e3e..7aef6b09d2 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1987,3 +1987,45 @@ (define-public libccd and also implements algorithm Minkowski Portal Refinement (MPR, a.k.a. XenoCollide) as described in Game Programming Gems 7.") (license license:expat))) + +(define-public ode + (package + (name "ode") + (version "0.16") + (source + (origin + (method url-fetch) + (uri (string-append "https://bitbucket.org/odedevs/ode/downloads/" + "ode-" version ".tar.gz")) + (sha256 + (base32 "09xzrarxwxcf6rdv5jsjfjh454jnn29dpcw3wh6ic50kkipvg8sb")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "libccd") + #t)))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags '("-DODE_WITH_LIBCCD_SYSTEM=ON") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'unbundle-libccd + (lambda _ + (substitute* "CMakeLists.txt" + (("configure_file\\(libccd/.*") "")) + #t))))) + (inputs + `(("glu" ,glu) + ("libccd" ,libccd) + ("mesa" ,mesa))) + (home-page "http://www.ode.org/") + (synopsis "High performance library for simulating rigid body dynamics") + (description "ODE is a high performance library for simulating +rigid body dynamics. It is fully featured, stable, mature and +platform independent with an easy to use C/C++ API. It has advanced +joint types and integrated collision detection with friction. ODE is +useful for simulating vehicles, objects in virtual reality +environments and virtual creatures. It is currently used in many +computer games, 3D authoring tools and simulation tools.") + ;; Software is dual-licensed. + (license (list license:lgpl2.1+ license:expat)))) -- cgit v1.2.3 From 1133596b426e7ff291fee024273fb7dd0af9564e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Jan 2020 14:42:52 +0100 Subject: installer: Fix typo. * gnu/installer/parted.scm (create-btrfs-file-system): Fix typo in docstring. --- gnu/installer/parted.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/installer/parted.scm b/gnu/installer/parted.scm index 3439f211e2..519996ff12 100644 --- a/gnu/installer/parted.scm +++ b/gnu/installer/parted.scm @@ -1012,7 +1012,7 @@ (define-syntax-rule (with-null-output-ports exp ...) (lambda () exp ...))))) (define (create-btrfs-file-system partition) - "Create an btrfs file-system for PARTITION file-name." + "Create a btrfs file-system for PARTITION file-name." (with-null-output-ports (invoke "mkfs.btrfs" "-f" partition))) -- cgit v1.2.3 From 8fec416cec6ffa5e2f1647eda8090fef1b0f71ac Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Jan 2020 19:26:54 +0100 Subject: installer: Add JFS support. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/installer/newt/partition.scm (run-fs-type-page): Add ‘jfs’ to the list box. * gnu/installer/parted.scm (user-fs-type-name, user-fs-type->mount-type) (partition-filesystem-user-type): Add ‘jfs’ mapping (create-jfs-file-system): New procedure. (format-user-partitions): Use it. * gnu/installer.scm (set-installer-path): Add jfsutils. --- gnu/installer.scm | 6 ++++-- gnu/installer/newt/partition.scm | 3 ++- gnu/installer/parted.scm | 15 ++++++++++++++- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/gnu/installer.scm b/gnu/installer.scm index 167653263f..1676a91801 100644 --- a/gnu/installer.scm +++ b/gnu/installer.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Mathieu Othacehe ;;; Copyright © 2019 Ludovic Courtès -;;; Copyright © 2019 Tobias Geerinckx-Rice +;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -32,6 +32,7 @@ (define-module (gnu installer) #:use-module (gnu packages connman) #:use-module (gnu packages cryptsetup) #:use-module (gnu packages disk) + #:use-module (gnu packages file-systems) #:use-module (gnu packages guile) #:use-module (gnu packages guile-xyz) #:autoload (gnu packages gnupg) (guile-gcrypt) @@ -295,7 +296,8 @@ (define set-installer-path cryptsetup dosfstools ;mkfs.fat e2fsprogs ;mkfs.ext4 - btrfs-progs + btrfs-progs ;mkfs.btrfs + jfsutils ;jfs_mkfs kbd ;chvt guix ;guix system init call util-linux ;mkwap diff --git a/gnu/installer/newt/partition.scm b/gnu/installer/newt/partition.scm index 74e9473171..3cba7f77dd 100644 --- a/gnu/installer/newt/partition.scm +++ b/gnu/installer/newt/partition.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018, 2019 Mathieu Othacehe ;;; Copyright © 2019 Ludovic Courtès +;;; Copyright © 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -120,7 +121,7 @@ (define (run-fs-type-page) (run-listbox-selection-page #:info-text (G_ "Please select the file-system type for this partition.") #:title (G_ "File-system type") - #:listbox-items '(ext4 btrfs fat16 fat32 swap) + #:listbox-items '(ext4 btrfs fat16 fat32 jfs swap) #:listbox-item->text user-fs-type-name #:sort-listbox-items? #f #:button-text (G_ "Exit") diff --git a/gnu/installer/parted.scm b/gnu/installer/parted.scm index 519996ff12..c2b02c9281 100644 --- a/gnu/installer/parted.scm +++ b/gnu/installer/parted.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018, 2019 Mathieu Othacehe ;;; Copyright © 2019 Ludovic Courtès +;;; Copyright © 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -221,6 +222,7 @@ (define (user-fs-type-name fs-type) ((btrfs) "btrfs") ((fat16) "fat16") ((fat32) "fat32") + ((jfs) "jfs") ((swap) "linux-swap"))) (define (user-fs-type->mount-type fs-type) @@ -229,7 +231,8 @@ (define (user-fs-type->mount-type fs-type) ((ext4) "ext4") ((btrfs) "btrfs") ((fat16) "fat") - ((fat32) "vfat"))) + ((fat32) "vfat") + ((jfs) "jfs"))) (define (partition-filesystem-user-type partition) "Return the filesystem type of PARTITION, to be stored in the FS-TYPE field @@ -242,6 +245,7 @@ (define (partition-filesystem-user-type partition) ((string=? name "btrfs") 'btrfs) ((string=? name "fat16") 'fat16) ((string=? name "fat32") 'fat32) + ((string=? name "jfs") 'jfs) ((or (string=? name "swsusp") (string=? name "linux-swap(v0)") (string=? name "linux-swap(v1)")) @@ -1031,6 +1035,11 @@ (define (create-fat32-file-system partition) (with-null-output-ports (invoke "mkfs.fat" "-F32" partition))) +(define (create-jfs-file-system partition) + "Create a JFS file-system for PARTITION file-name." + (with-null-output-ports + (invoke "jfs_mkfs" "-f" partition))) + (define (create-swap-partition partition) "Set up swap area on PARTITION file-name." (with-null-output-ports @@ -1101,6 +1110,10 @@ (define (format-user-partitions user-partitions) (and need-formatting? (not (eq? type 'extended)) (create-fat32-file-system file-name))) + ((jfs) + (and need-formatting? + (not (eq? type 'extended)) + (create-jfs-file-system file-name))) ((swap) (create-swap-partition file-name)) (else -- cgit v1.2.3 From 4a1a4354c87b395fb3456ec5ae92a65bd575004a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Jan 2020 17:45:55 +0100 Subject: doc: Add JFS to Guix System-supported file systems. * doc/guix.texi (Keyboard Layout and Networking and Partitioning): Note JFS support. --- doc/guix.texi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 70e3dfea6a..df1ba428a5 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -49,7 +49,7 @@ Copyright @copyright{} 2017 Christopher Allan Webber@* Copyright @copyright{} 2017, 2018, 2019 Marius Bakke@* Copyright @copyright{} 2017, 2019 Hartmut Goebel@* Copyright @copyright{} 2017, 2019 Maxim Cournoyer@* -Copyright @copyright{} 2017, 2018, 2019 Tobias Geerinckx-Rice@* +Copyright @copyright{} 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice@* Copyright @copyright{} 2017 George Clemmer@* Copyright @copyright{} 2017 Andy Wingo@* Copyright @copyright{} 2017, 2018, 2019 Arun Isaac@* @@ -2245,8 +2245,8 @@ bootloaders. Once you are done partitioning the target hard disk drive, you have to create a file system on the relevant partition(s)@footnote{Currently -Guix System only supports ext4 and btrfs file systems. In particular, code -that reads file system UUIDs and labels only works for these file system +Guix System only supports ext4, btrfs, and JFS file systems. In particular, +code that reads file system UUIDs and labels only works for these file system types.}. For the ESP, if you have one and assuming it is @file{/dev/sda1}, run: -- cgit v1.2.3 From 6925c85573265a39cc1d0e42e447580fd562db39 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 4 Jan 2020 16:07:55 +0100 Subject: gnu: cppcheck: Update to 1.90. * gnu/packages/check.scm (cppcheck): Update to 1.90. --- gnu/packages/check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 6839cabb38..77e78520fa 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -310,7 +310,7 @@ (define-public cmocka (define-public cppcheck (package (name "cppcheck") - (version "1.89") + (version "1.90") (source (origin (method git-fetch) (uri (git-reference @@ -318,7 +318,7 @@ (define-public cppcheck (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "07yn1zycsb7sn1v7fprihbl0ih4n2zkd7l9jvmkjcskvwn4n21h0")))) + (base32 "0h7ir2x0k005fm586dxmaphgv5cyz25k3k4sh02p7zb78gzx398h")))) (build-system cmake-build-system) (arguments '(#:configure-flags '("-DBUILD_TESTS=ON"))) -- cgit v1.2.3 From f38eabe952608478230895e380ef441d65ea625e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 4 Jan 2020 16:13:23 +0100 Subject: gnu: ncompress: Update to 4.2.4.6. * gnu/packages/compression.scm (ncompress): Update to 4.2.4.6. * gnu/packages/patches/ncompress-fix-softlinks.patch: Adjust. --- gnu/packages/compression.scm | 6 +++--- gnu/packages/patches/ncompress-fix-softlinks.patch | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index cf23e88547..cb73dcec75 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2016 Ben Woodcroft ;;; Copyright © 2016 Danny Milosavljevic -;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2016 David Craven ;;; Copyright © 2016, 2019 Kei Kebreau ;;; Copyright © 2016, 2018, 2019 Marius Bakke @@ -2091,7 +2091,7 @@ (define-public makeself-safeextract (define-public ncompress (package (name "ncompress") - (version "4.2.4.5") + (version "4.2.4.6") (source (origin (method git-fetch) (uri (git-reference @@ -2101,7 +2101,7 @@ (define-public ncompress (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0s3ik7k5a5vzcfiayhsxrc87drg3l425aqapspmw5py91b9jhc8r")))) + "1a4yir1ilafz0nzxdwigj204j4yy2zljbc501nsaqqm3dxdap8zn")))) (arguments '(#:make-flags (list "CC=gcc" (string-append "BINDIR=" %output "/bin") diff --git a/gnu/packages/patches/ncompress-fix-softlinks.patch b/gnu/packages/patches/ncompress-fix-softlinks.patch index 98752e8e64..d667e3ef74 100644 --- a/gnu/packages/patches/ncompress-fix-softlinks.patch +++ b/gnu/packages/patches/ncompress-fix-softlinks.patch @@ -1,4 +1,5 @@ -Patch taken from Debian sid. +Patch taken from Debian sid. Adapted to 4.2.4.6 for Guix by Tobias +Geerinckx-Rice . Description: Support uncompressing and compressing soft links. Historically, ncompress for Debian has been built using a command line @@ -17,8 +18,8 @@ Index: ncompress/GNUmakefile Makefile: Makefile.def GNUmakefile sed \ -- -e 's:options= :options= $$(CFLAGS) -DNOFUNCDEF -DUTIME_H -DLSTAT $$(LDFLAGS) :' \ -+ -e 's:options= :options= $$(CFLAGS) -DNOFUNCDEF -DUTIME_H $$(LDFLAGS) :' \ +- -e 's:options= :options= -DUTIME_H -DLSTAT :' \ ++ -e 's:options= :options= -DUTIME_H :' \ Makefile.def > Makefile check: -- cgit v1.2.3 From 5664a4712c8047067ab026fbce7e34db6918c0bd Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Sun, 5 Jan 2020 01:08:12 +0100 Subject: gnu: dtc: Use Python 3 instead of Python 2. * gnu/packages/bootloaders.scm (dtc)[inputs]: Use python instead of python-2. --- gnu/packages/bootloaders.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 21b32a1ab1..28ba16fb4b 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2019 nee ;;; Copyright © 2019 Mathieu Othacehe +;;; Copyright © 2020 Björn Höfling ;;; ;;; This file is part of GNU Guix. ;;; @@ -376,7 +377,7 @@ (define-public dtc ("swig" ,swig) ("valgrind" ,valgrind))) (inputs - `(("python-2" ,python-2))) + `(("python" ,python))) (arguments `(#:make-flags (list "CC=gcc" -- cgit v1.2.3 From fd885160fcfde710e415252463c1034f22f88e59 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 5 Jan 2020 03:09:35 +0100 Subject: gnu: guix: Update to f38eabe. * gnu/packages/package-management.scm (guix): Update to f38eabe. --- gnu/packages/package-management.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 1daab4e879..638e773309 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2017 Muriithi Frederick Muriuki ;;; Copyright © 2017, 2018 Oleg Pykhalov ;;; Copyright © 2017 Roel Janssen -;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Julien Lepiller ;;; Copyright © 2018, 2019 Rutger Helling ;;; Copyright © 2018 Sou Bunnbu @@ -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 "41b4b713f4892918a9a1950acdd89f33b977d143") - (revision 10)) + (commit "f38eabe952608478230895e380ef441d65ea625e") + (revision 11)) (package (name "guix") @@ -127,7 +127,7 @@ (define-public guix (commit commit))) (sha256 (base32 - "08sblj4xy78va6zlxmxdq2id58pjr8rjqxxycd77hiacsqbjh9g6")) + "1wnm1wqa38dpd5bk6avyfm0rgx72vlx36a06scyg8d57kl47mzjf")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From c3fd83aa3a41d08fd3573837ee0d4f2f65ea3280 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 5 Jan 2020 03:40:05 -0500 Subject: gnu: linux-libre@4.4: Update to 4.4.208. * gnu/packages/linux.scm (linux-libre-4.4-version): Update to 4.4.208. (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 cc3455b52b..c0dc9c0f7e 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -388,10 +388,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.207") +(define-public linux-libre-4.4-version "4.4.208") (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) - (hash (base32 "024flajnl3l4yk8sgqdrfrl21js4vsjcv4ivmjblj4l9fl3hdjb6"))) + (hash (base32 "03jj91z5dc0ybpjy9w6aanb3k53gcj7gsjc32h3ldf72hlmgz6aq"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.4))) -- cgit v1.2.3 From 1837bdcd9fddd62100cda3250cd95325d0d1c0b9 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 5 Jan 2020 03:41:13 -0500 Subject: gnu: linux-libre@4.9: Update to 4.9.208. * gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.208. (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 c0dc9c0f7e..adde74dcdb 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -380,10 +380,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.207") +(define-public linux-libre-4.9-version "4.9.208") (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "090181vij95py22jhx7baaxabb78w0j5hsfsnzp6bv2vgdz671na"))) + (hash (base32 "0njjw1i8dilihn1hz62zra4b9y05fb3r2k2sqlkd0wfn86c1rbdp"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -- cgit v1.2.3 From b307b587f6aff83643fb376561b19bbd89c76e84 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 5 Jan 2020 03:41:57 -0500 Subject: gnu: linux-libre@4.14: Update to 4.14.162. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.162. (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 adde74dcdb..0bd85f71e0 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -372,10 +372,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.161") +(define-public linux-libre-4.14-version "4.14.162") (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "1jc1izlvgymp9x61r4yz2xhplwmp6x8laxqj9wy33iz6a2gn48wx"))) + (hash (base32 "0jwbr7q17khv0174hl0kp78bsyhjv0mljfvrnbl9qdfl9hi70lgn"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit v1.2.3 From d6baede01b513316262e6e0fe3f5639b0648cfc2 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 5 Jan 2020 03:42:35 -0500 Subject: gnu: linux-libre@4.19: Update to 4.19.93. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.93. (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 0bd85f71e0..93820f47e6 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -364,10 +364,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.92") +(define-public linux-libre-4.19-version "4.19.93") (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "18l3k0hgyanh6axgmmaaff139vpw6lf3fcf9iglpqwgspgw7rhr9"))) + (hash (base32 "0d2qgwnmvnwbsijc8k85sgmywyrv55wpah6qwjk6kgx8h8zx5x9a"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From 7f16122efd59472ecc63a231054471c2bad5a46b Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 5 Jan 2020 03:43:09 -0500 Subject: gnu: linux-libre: Update to 5.4.8. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.8. (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 93820f47e6..21ebff1ab3 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -356,10 +356,10 @@ (define (%upstream-linux-source version hash) "linux-" version ".tar.xz")) (sha256 hash))) -(define-public linux-libre-5.4-version "5.4.7") +(define-public linux-libre-5.4-version "5.4.8") (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "1jgwg5qb7lb30m5ywvpfagzrl6d0i524qpy3v99mina6j4fv5jdb"))) + (hash (base32 "0llss8hbzkwqxx92y419vj2jvq0d8k52iivh3f59wgqr0b4i9i22"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit v1.2.3 From 7aa28eb339dd667d07cfb8b5347e159d5da3ccd7 Mon Sep 17 00:00:00 2001 From: David Trudgian Date: Sat, 4 Jan 2020 09:19:17 -0600 Subject: file-systems: Handle LUKS2 header. * gnu/build/file-systems.scm (luks-superblock?): Handle LUKS2 header. Signed-off-by: Danny Milosavljevic --- gnu/build/file-systems.scm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/gnu/build/file-systems.scm b/gnu/build/file-systems.scm index 9299cc2e4c..ee6375515f 100644 --- a/gnu/build/file-systems.scm +++ b/gnu/build/file-systems.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2019 Guillaume Le Vaillant ;;; Copyright © 2019 Tobias Geerinckx-Rice +;;; Copyright © 2019 David C. Trudgian ;;; ;;; This file is part of GNU Guix. ;;; @@ -343,6 +344,10 @@ (define (check-jfs-file-system device) ;; . We follow ;; version 1.2.1 of this document. +;; The LUKS2 header format is described in "LUKS2 On-Disk Format Specification": +;; . +;; It is a WIP document. + (define-syntax %luks-endianness ;; Endianness of LUKS headers. (identifier-syntax (endianness big))) @@ -356,12 +361,16 @@ (define %luks-magic (let ((magic (sub-bytevector sblock 0 6)) (version (bytevector-u16-ref sblock 6 %luks-endianness))) (and (bytevector=? magic %luks-magic) - (= version 1)))) + (or (= version 1) (= version 2))))) (define (read-luks-header file) "Read a LUKS header from FILE. Return the raw header on success, and #f if not valid header was found." - ;; Size in bytes of the LUKS header, including key slots. + ;; Size in bytes of the LUKS binary header, which includes key slots in + ;; LUKS1. In LUKS2 the binary header is partially backward compatible, so + ;; that UUID can be extracted as for LUKS1. Keyslots and other metadata are + ;; not part of this header in LUKS2, but are included in the JSON metadata + ;; area that follows. (read-superblock file 0 592 luks-superblock?)) (define (luks-header-uuid header) -- cgit v1.2.3 From 5f50c2e6b19495d9fa01050f66b99d7bd3e19cc9 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Sun, 5 Jan 2020 11:45:47 +0100 Subject: gnu: sdl-mixer: Use correct inputs for MOD file support. * gnu/packages/sdl.scm (sdl-mixer)[inputs]: Remove libmodplug. * gnu/packages/sdl.scm (sdl2-mixer)[inputs]: Add libmodplug. Signed-off-by: Danny Milosavljevic --- gnu/packages/sdl.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index f7a34003d1..beeec1b8ca 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2019 Nicolas Goaziou ;;; Copyright © 2019 Marius Bakke ;;; Copyright © 2019 Pierre Neidhardt +;;; Copyright © 2020 Timotej Lazar ;;; ;;; This file is part of GNU Guix. ;;; @@ -274,8 +275,7 @@ (define-public sdl-mixer (inputs `(("libvorbis" ,libvorbis) ("libflac" ,flac) ("libmad" ,libmad) - ("libmikmod" ,libmikmod) - ("libmodplug" ,libmodplug))) + ("libmikmod" ,libmikmod))) ;; FIXME: Add libfluidsynth (propagated-inputs `(("sdl" ,sdl))) (synopsis "SDL multi-channel audio mixer library") @@ -416,6 +416,10 @@ (define-public sdl2-mixer #t)) (sha256 (base32 "0694vsz5bjkcdgfdra6x9fq8vpzrl8m6q96gh58df7065hw5mkxl")))) + (inputs + ;; The default MOD library changed in SDL2 mixer. + `(("libmodplug" ,libmodplug) + ,@(alist-delete "libmikmod" (package-inputs sdl-mixer)))) (propagated-inputs (propagated-inputs-with-sdl2 sdl-mixer)))) -- cgit v1.2.3 From 36f1ba7bfe93308feca582b91dcc2dd4dbce86b8 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Sun, 5 Jan 2020 11:45:48 +0100 Subject: gnu: sdl-mixer: Remove unused configure flag. The flag --disable-music-mp3-shared is only used when building with smpeg instead of libmad, which is linked at build time by default. * gnu/packages/sdl.scm (sdl-mixer)[arguments]: Remove unused configure flag. Signed-off-by: Danny Milosavljevic --- gnu/packages/sdl.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index beeec1b8ca..92d8f9a922 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -270,8 +270,7 @@ (define-public sdl-mixer "--disable-music-mod-shared" "--disable-music-fluidsynth-shared" "--disable-music-ogg-shared" - "--disable-music-flac-shared" - "--disable-music-mp3-shared"))) + "--disable-music-flac-shared"))) (inputs `(("libvorbis" ,libvorbis) ("libflac" ,flac) ("libmad" ,libmad) -- cgit v1.2.3 From 64941afcf980b0c36fbd05bb6d4bc9ebeadb5b08 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Sun, 5 Jan 2020 11:45:49 +0100 Subject: gnu: sdl2-mixer: Fix configure flags. Some configure options were renamed between SDL / SDL2 mixer; add new variants to the derived package. * gnu/packages/sdl.scm (sdl2-mixer)[arguments]: Fix flags to disable dynamic library loading. Signed-off-by: Danny Milosavljevic --- gnu/packages/sdl.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 92d8f9a922..d441040cd6 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -415,6 +415,15 @@ (define-public sdl2-mixer #t)) (sha256 (base32 "0694vsz5bjkcdgfdra6x9fq8vpzrl8m6q96gh58df7065hw5mkxl")))) + (arguments + (substitute-keyword-arguments (package-arguments sdl-mixer) + ((#:configure-flags flags) + `(cons* + ;; These options were renamed in SDL2 mixer. Keeping the inherited + ;; variants produces a harmless warning. + "--disable-music-mod-modplug-shared" + "--disable-music-midi-fluidsynth-shared" + ,flags)))) (inputs ;; The default MOD library changed in SDL2 mixer. `(("libmodplug" ,libmodplug) -- cgit v1.2.3 From 6fbf92ee7834c3ed5879f4665981b033f92733c5 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Sun, 5 Jan 2020 11:45:50 +0100 Subject: gnu: sdl-mixer: Enable fluidsynth MIDI backend. * gnu/packages/sdl.scm (sdl-mixer)[inputs]: Add fluidsynth and alphabetize. [arguments]: Reformat. Signed-off-by: Danny Milosavljevic --- gnu/packages/sdl.scm | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index d441040cd6..80f3da9327 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -262,20 +262,21 @@ (define-public sdl-mixer "0alrhqgm40p4c92s26mimg9cm1y7rzr6m0p49687jxd9g6130i0n")))) (build-system gnu-build-system) (outputs '("out" "debug")) - ;; no check target - ;; use libmad instead of smpeg - ;; explicitly link against shared libraries instead of dlopening them - (arguments `(#:tests? #f - #:configure-flags '("--enable-music-mp3-mad-gpl" - "--disable-music-mod-shared" - "--disable-music-fluidsynth-shared" - "--disable-music-ogg-shared" - "--disable-music-flac-shared"))) - (inputs `(("libvorbis" ,libvorbis) - ("libflac" ,flac) - ("libmad" ,libmad) - ("libmikmod" ,libmikmod))) - ;; FIXME: Add libfluidsynth + (arguments + `(#:tests? #f ; No check target. + #:configure-flags + '("--enable-music-mp3-mad-gpl" ; Use libmad instead of smpeg. + ;; Explicitly link against shared libraries instead of dlopening them. + "--disable-music-flac-shared" + "--disable-music-fluidsynth-shared" + "--disable-music-mod-shared" + "--disable-music-ogg-shared"))) + (inputs + `(("fluidsynth" ,fluidsynth) + ("libflac" ,flac) + ("libmad" ,libmad) + ("libmikmod" ,libmikmod) + ("libvorbis" ,libvorbis))) (propagated-inputs `(("sdl" ,sdl))) (synopsis "SDL multi-channel audio mixer library") (description "SDL_mixer is a multi-channel audio mixer library for SDL. -- cgit v1.2.3 From ced47faaa7ab6f79a317b5ac41402f6ab2066731 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Sun, 5 Jan 2020 11:45:51 +0100 Subject: gnu: sdl2-mixer: Enable opus support. * gnu/packages/sdl.scm (sdl2-mixer)[inputs]: Add opusfile. [native-inputs]: Add pkg-config. [arguments]<#:configure-flags>: Add "--disable-music-opus-shared". Signed-off-by: Danny Milosavljevic --- gnu/packages/sdl.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 80f3da9327..80725561fb 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -420,15 +420,19 @@ (define-public sdl2-mixer (substitute-keyword-arguments (package-arguments sdl-mixer) ((#:configure-flags flags) `(cons* + "--disable-music-opus-shared" ;; These options were renamed in SDL2 mixer. Keeping the inherited ;; variants produces a harmless warning. "--disable-music-mod-modplug-shared" "--disable-music-midi-fluidsynth-shared" ,flags)))) (inputs - ;; The default MOD library changed in SDL2 mixer. - `(("libmodplug" ,libmodplug) + `(("opusfile" ,opusfile) + ;; The default MOD library changed in SDL2 mixer. + ("libmodplug" ,libmodplug) ,@(alist-delete "libmikmod" (package-inputs sdl-mixer)))) + (native-inputs + `(("pkgconfig" ,pkg-config))) ; Needed to find the opus library. (propagated-inputs (propagated-inputs-with-sdl2 sdl-mixer)))) -- cgit v1.2.3 From a8f753c293a4258c07126007b2e47d476b8a59e9 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 5 Jan 2020 14:17:59 +0000 Subject: gnu: guix-data-service: Update to 0.0.1-16.c7e3a1b. * gnu/packages/web.scm (guix-data-service): Update to 0.0.1-16.c7e3a1b. --- 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 65038f7c66..5b457ccc5b 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4194,8 +4194,8 @@ (define-public python2-feedparser (package-with-python2 python-feedparser)) (define-public guix-data-service - (let ((commit "4ed14007c44f55869d30358b6da2235069dfcaf9") - (revision "15")) + (let ((commit "c7e3a1bd0b0648561211f52bd9f674358da59223") + (revision "16")) (package (name "guix-data-service") (version (string-append "0.0.1-" revision "." (string-take commit 7))) @@ -4207,7 +4207,7 @@ (define-public guix-data-service (file-name (git-file-name name version)) (sha256 (base32 - "06smgbw9jdyarnz877dsd6mjcd3nhs9hav5z6h8cngvpznjf3hy8")))) + "08c6bpzmsh62ng4bx008xcgayrrxz815jbpb96n98didk2zyzfg0")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) -- cgit v1.2.3 From 7366d83191e4cdebc0fb81728f79a3d576fef73b Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sun, 5 Jan 2020 08:08:44 +0300 Subject: gnu: Add swh-plugins. * gnu/packages/audio.scm (swh-plugins): New variable. --- gnu/packages/audio.scm | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index a26fbed461..acc443839f 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2016 ng0 ;;; Copyright © 2016 Lukas Gradl ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice -;;; Copyright © 2018 Oleg Pykhalov +;;; Copyright © 2018, 2020 Oleg Pykhalov ;;; Copyright © 2018 okapi ;;; Copyright © 2018 Maxim Cournoyer ;;; Copyright © 2018 Clément Lassieur @@ -722,6 +722,36 @@ (define-public infamous-plugins envelope follower, distortion effects, tape effects and more.") (license license:gpl2+))) +(define-public swh-plugins + (package + (name "swh-plugins") + (version "0.4.17") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/swh/ladspa.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1c98z2xxz9pgcb4dg99gz8qrylh5cnag0j18a52d88ifsy24isvq")))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("gettext" ,gettext-minimal) ;for autopoint + ("libtool" ,libtool) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("which" ,which))) + (inputs + `(("fftwf" ,fftwf) + ("perl-xml-parser" ,perl-xml-parser))) + (build-system gnu-build-system) + (home-page "https://github.com/swh/ladspa/") + (synopsis "The SWH Plugins package for the LADSPA plugin system") + (description "This package provides Steve Harris's LADSPA plugins.") + (license license:gpl2+))) + (define-public swh-plugins-lv2 (package (name "swh-plugins-lv2") -- cgit v1.2.3 From 06c8e87224decebc0a3d5bdc7d2ca13cb2b08299 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Mon, 30 Dec 2019 12:37:08 -0500 Subject: gnu: arandr: Fix build. This is a follow-up to commit 218c785850d5ecf3a7646d81ce90445419a5103b. [arguments]: Remove unnecessary #:python flag. Add 'wrap-gi-typelib' phase. [inputs]: Remove python2-pygtk and add gtk+, python-pycairo, and python-pygobject. [native-inputs]: Replace python2-docutils with python-docutils. --- gnu/packages/xdisorg.scm | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 99a00e1df0..1b671c15ac 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -117,20 +117,28 @@ (define-public arandr #t)))) (build-system python-build-system) (arguments - `(#:python ,python-2 ;incompatible with python 3 - #:phases + `(#:phases (modify-phases %standard-phases (add-before 'build 'configure (lambda* (#:key inputs #:allow-other-keys) (substitute* "screenlayout/xrandr.py" (("\"xrandr\"") (string-append "\"" (assoc-ref inputs "xrandr") "/bin/xrandr\""))) + #t)) + (add-after 'install 'wrap-gi-typelib + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (gi-typelib-path (getenv "GI_TYPELIB_PATH"))) + (wrap-program (string-append out "/bin/arandr") + `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)))) #t))) #:tests? #f)) ;no tests - (inputs `(("pygtk" ,python2-pygtk) + (inputs `(("gtk+" ,gtk+) + ("pycairo" ,python-pycairo) + ("pygobject" ,python-pygobject) ("xrandr" ,xrandr))) (native-inputs `(("gettext" ,gettext-minimal) - ("python-docutils" ,python2-docutils))) + ("python-docutils" ,python-docutils))) (home-page "https://christian.amsuess.com/tools/arandr/") (synopsis "Another RandR graphical user interface") ;; TRANSLATORS: "X11 resize-and-rotate" should not be translated. -- cgit v1.2.3 From 71fc086ae90bfeb1484e08cd95a0d104c7cdf39d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 20 Nov 2019 21:36:56 +0200 Subject: services: host-name: Make service one-shot. * gnu/services/base.scm (host-name-service-type): Remove 'respawn?' keyword from shepherd-service-type, add 'one-shot?'. --- gnu/services/base.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 77215e411c..0c154d1c4e 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -706,7 +706,7 @@ (define host-name-service-type (provision '(host-name)) (start #~(lambda _ (sethostname #$name))) - (respawn? #f))))) + (one-shot? #t))))) (define (host-name-service name) "Return a service that sets the host name to @var{name}." -- cgit v1.2.3 From dcae4270db416a1dfd09cdf384454fbaa7b54c81 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 2 Jan 2020 01:15:48 +0100 Subject: gnu: file-roller: Update to 3.32.3. * gnu/packages/gnome.scm (file-roller): Update to 3.32.3. --- 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 275d115eeb..ec06e6d4d2 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5285,7 +5285,7 @@ (define-public shotwell (define-public file-roller (package (name "file-roller") - (version "3.32.2") + (version "3.32.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/file-roller/" @@ -5293,7 +5293,7 @@ (define-public file-roller "file-roller-" version ".tar.xz")) (sha256 (base32 - "0w8s6hakgsvb2nqwbv0lr8ki4cbf1pz5z3qwkb0b2k7ppbh7j2n6")))) + "0ap2hxvjljh4p6wsd9ikh2my3vsxp9r2nvjxxj3v87nwfyw1y4dy")))) (build-system meson-build-system) (native-inputs `(("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-database -- cgit v1.2.3 From e13fc37902046d2cf4158237e3f0959d244230bb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 5 Jan 2020 19:20:33 +0100 Subject: gnu: stellarium: Update to 0.19.3. * gnu/packages/astronomy.scm (stellarium): Update to 0.19.3. --- gnu/packages/astronomy.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index a909b46d6a..3bb236fde9 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 John Darrington -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2019 Efraim Flashner ;;; Copyright © 2019 by Amar Singh ;;; @@ -149,7 +149,7 @@ (define-public gnuastro (define-public stellarium (package (name "stellarium") - (version "0.19.2") + (version "0.19.3") (source (origin (method url-fetch) @@ -157,7 +157,7 @@ (define-public stellarium "/releases/download/v" version "/stellarium-" version ".tar.gz")) (sha256 - (base32 "10b05slj5fjakrjb20m68xql68plb64mwn0165dy2fry8z2hbl74")))) + (base32 "0p92rgclag0nkic9gk3p9vclb8xx9hv4zlgyij6cyh43s7c1avhp")))) (build-system cmake-build-system) (inputs `(("qtbase" ,qtbase) -- cgit v1.2.3 From 64997728ad305bcd56de7a5b39a30525dfdb48ac Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 4 Jan 2020 22:50:02 +0100 Subject: gnu: Add cl-aa. * gnu/packages/lisp-xyz.scm (sbcl-cl-aa, ecl-cl-aa, cl-aa): New variables. --- gnu/packages/lisp-xyz.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 6255af0ded..730f5d0456 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -400,6 +400,33 @@ (define-public ecl-zpb-ttf (define-public cl-zpb-ttf (sbcl-package->cl-source-package sbcl-zpb-ttf)) +(define-public sbcl-cl-aa + (package + (name "sbcl-cl-aa") + (version "0.1.5") + (source + (origin + (method url-fetch) + (uri (string-append "http://projects.tuxee.net/cl-vectors/" + "files/cl-vectors-" version ".tar.gz")) + (sha256 + (base32 + "04lhwi0kq8pkwhgd885pk80m1cp9sfvjjn5zj70s1dnckibhdmqh")))) + (build-system asdf-build-system/sbcl) + (arguments '(#:asd-file "cl-aa.asd")) + (home-page "http://projects.tuxee.net/cl-vectors/") + (synopsis "Polygon rasterizer") + (description + "This is a Common Lisp library implementing the AA polygon rasterization +algorithm from the @url{http://antigrain.com, Antigrain} project.") + (license license:expat))) + +(define-public ecl-cl-aa + (sbcl-package->ecl-package sbcl-cl-aa)) + +(define-public cl-aa + (sbcl-package->cl-source-package sbcl-cl-aa)) + (define-public sbcl-clx (package (name "sbcl-clx") -- cgit v1.2.3 From b571dfdb46747005d7f3f9f883d31c78a0e8488a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 4 Jan 2020 22:51:14 +0100 Subject: gnu: Add cl-paths. * gnu/packages/lisp-xyz.scm (sbcl-cl-paths, ecl-cl-paths, cl-paths): New variables. --- gnu/packages/lisp-xyz.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 730f5d0456..34e8cd5abf 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -427,6 +427,22 @@ (define-public ecl-cl-aa (define-public cl-aa (sbcl-package->cl-source-package sbcl-cl-aa)) +(define-public sbcl-cl-paths + (package + (inherit sbcl-cl-aa) + (name "sbcl-cl-paths") + (arguments '(#:asd-file "cl-paths.asd")) + (synopsis "Facilities to create and manipulate vectorial paths") + (description + "This package provides facilities to create and manipulate vectorial +paths."))) + +(define-public ecl-cl-paths + (sbcl-package->ecl-package sbcl-cl-paths)) + +(define-public cl-paths + (sbcl-package->cl-source-package sbcl-cl-paths)) + (define-public sbcl-clx (package (name "sbcl-clx") -- cgit v1.2.3 From 0dbd7c3c0baaf800c426ca46ce73a565ef339038 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 4 Jan 2020 22:52:26 +0100 Subject: gnu: Add cl-paths-ttf. * gnu/packages/lisp-xyz.scm (sbcl-cl-paths-ttf, ecl-cl-paths-ttf, cl-paths-ttf): 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 34e8cd5abf..e9297f3a80 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -443,6 +443,25 @@ (define-public ecl-cl-paths (define-public cl-paths (sbcl-package->cl-source-package sbcl-cl-paths)) +(define-public sbcl-cl-paths-ttf + (package + (inherit sbcl-cl-aa) + (name "sbcl-cl-paths-ttf") + (arguments '(#:asd-file "cl-paths-ttf.asd")) + (inputs + `(("cl-paths" ,sbcl-cl-paths) + ("zpb-ttf" ,sbcl-zpb-ttf))) + (synopsis "Facilities to create and manipulate vectorial paths") + (description + "This package provides facilities to create and manipulate vectorial +paths."))) + +(define-public ecl-cl-paths-ttf + (sbcl-package->ecl-package sbcl-cl-paths-ttf)) + +(define-public cl-paths-ttf + (sbcl-package->cl-source-package sbcl-cl-paths-ttf)) + (define-public sbcl-clx (package (name "sbcl-clx") -- cgit v1.2.3 From 94c621bdc0f4ada42f2117fcd4e51a492414890e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 4 Jan 2020 22:53:39 +0100 Subject: gnu: Add cl-vectors. * gnu/packages/lisp-xyz.scm (sbcl-cl-vectors, ecl-cl-vectors, cl-vectors): 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 e9297f3a80..11f386ccfc 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -462,6 +462,25 @@ (define-public ecl-cl-paths-ttf (define-public cl-paths-ttf (sbcl-package->cl-source-package sbcl-cl-paths-ttf)) +(define-public sbcl-cl-vectors + (package + (inherit sbcl-cl-aa) + (name "sbcl-cl-vectors") + (arguments '(#:asd-file "cl-vectors.asd")) + (inputs + `(("cl-aa" ,sbcl-cl-aa) + ("cl-paths" ,sbcl-cl-paths))) + (synopsis "Create, transform and render anti-aliased vectorial paths") + (description + "This is a pure Common Lisp library to create, transform and render +anti-aliased vectorial paths."))) + +(define-public ecl-cl-vectors + (sbcl-package->ecl-package sbcl-cl-vectors)) + +(define-public cl-vectors + (sbcl-package->cl-source-package sbcl-cl-vectors)) + (define-public sbcl-clx (package (name "sbcl-clx") -- cgit v1.2.3 From 7c62d384659d1292e418b951d516bb24d998bf2e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 4 Jan 2020 23:26:56 +0100 Subject: gnu: Add cl-spatial-trees. * gnu/packages/lisp-xyz.scm (sbcl-spatial-trees, ecl-spatial-trees, cl-spatial-trees): New variables. --- gnu/packages/lisp-xyz.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 11f386ccfc..5df6a308ff 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -481,6 +481,43 @@ (define-public ecl-cl-vectors (define-public cl-vectors (sbcl-package->cl-source-package sbcl-cl-vectors)) +(define-public sbcl-spatial-trees + ;; There have been no releases. + (let ((commit "81fdad0a0bf109c80a53cc96eca2e093823400ba") + (revision "1")) + (package + (name "sbcl-spatial-trees") + (version (git-version "0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rpav/spatial-trees.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "11rhc6h501dwcik2igkszz7b9n515cr99m5pjh4r2qfwgiri6ysa")))) + (build-system asdf-build-system/sbcl) + (arguments + '(#:tests? #f ; spatial-trees.test requires spatial-trees.nns + #:asd-file "spatial-trees.asd" + #:test-asd-file "spatial-trees.test.asd")) + (native-inputs + `(("fiveam" ,sbcl-fiveam))) + (home-page "https://github.com/rpav/spatial-trees") + (synopsis "Dynamic index data structures for spatially-extended data") + (description + "Spatial-trees is a set of dynamic index data structures for +spatially-extended data.") + (license license:bsd-3)))) + +(define-public ecl-spatial-trees + (sbcl-package->ecl-package sbcl-spatial-trees)) + +(define-public cl-spatial-trees + (sbcl-package->cl-source-package sbcl-spatial-trees)) + (define-public sbcl-clx (package (name "sbcl-clx") -- cgit v1.2.3 From 5dfde3f5862eb542407b70db4b53b6b33a59b38e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 4 Jan 2020 23:31:10 +0100 Subject: gnu: Add cl-flexichain. * gnu/packages/lisp-xyz.scm (sbcl-flexichain, ecl-flexichain, cl-flexichain): 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 5df6a308ff..45d79152c8 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -518,6 +518,38 @@ (define-public ecl-spatial-trees (define-public cl-spatial-trees (sbcl-package->cl-source-package sbcl-spatial-trees)) +(define-public sbcl-flexichain + ;; There are no releases. + (let ((commit "13d2a6c505ed0abfcd4c4ec7d7145059b06855d6") + (revision "1")) + (package + (name "sbcl-flexichain") + (version "1.5.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/robert-strandh/Flexichain.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0pfyvhsfbjd2sjb30grfs52r51a428xglv7bwydvpg2lc117qimg")))) + (build-system asdf-build-system/sbcl) + (home-page "https://github.com/robert-strandh/Flexichain.git") + (synopsis "Dynamically add elements to or remove them from sequences") + (description + "This package provides an implementation of the flexichain protocol, +allowing client code to dynamically add elements to, and delete elements from +a sequence (or chain) of such elements.") + (license license:lgpl2.1+)))) + +(define-public ecl-flexichain + (sbcl-package->ecl-package sbcl-flexichain)) + +(define-public cl-flexichain + (sbcl-package->cl-source-package sbcl-flexichain)) + (define-public sbcl-clx (package (name "sbcl-clx") -- cgit v1.2.3 From e088a010a257a439b6266209a3b0f9faba715ccf Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 4 Jan 2020 23:43:56 +0100 Subject: gnu: Add cl-pdf. * gnu/packages/lisp-xyz.scm (sbcl-cl-pdf, ecl-cl-pdf, cl-pdf): New variables. --- gnu/packages/lisp-xyz.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 45d79152c8..8d9cf53526 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -550,6 +550,40 @@ (define-public ecl-flexichain (define-public cl-flexichain (sbcl-package->cl-source-package sbcl-flexichain)) +(define-public sbcl-cl-pdf + ;; There are no releases + (let ((commit "752e337e6d6fc206f09d091a982e7f8e5c404e4e") + (revision "1")) + (package + (name "sbcl-cl-pdf") + (version (git-version "0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mbattyani/cl-pdf.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1cg3k3m3r11ipb8j008y8ipynj97l3xjlpi2knqc9ndmx4r3kb1r")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("iterate" ,sbcl-iterate) + ("zpb-ttf" ,sbcl-zpb-ttf))) + (home-page "https://github.com/mbattyani/cl-pdf") + (synopsis "Common Lisp library for generating PDF files") + (description + "CL-PDF is a cross-platform Common Lisp library for generating PDF +files.") + (license license:bsd-2)))) + +(define-public ecl-cl-pdf + (sbcl-package->ecl-package sbcl-cl-pdf)) + +(define-public cl-pdf + (sbcl-package->cl-source-package sbcl-cl-pdf)) + (define-public sbcl-clx (package (name "sbcl-clx") -- cgit v1.2.3 From 62af74b7148118f91a34eb1811935fda81a8e459 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 5 Jan 2020 20:44:30 +0100 Subject: gnu: Add agi-bio. * gnu/packages/opencog.scm (agi-bio): New variable. --- gnu/packages/opencog.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/gnu/packages/opencog.scm b/gnu/packages/opencog.scm index f9551a8e9f..a39b20542c 100644 --- a/gnu/packages/opencog.scm +++ b/gnu/packages/opencog.scm @@ -250,3 +250,46 @@ (define-public opencog some already displaying interesting and useful functionalities alone and in combination.") (license license:agpl3)))) + +(define-public agi-bio + ;; There are no releases. + (let ((commit "b5c6f3d99e8cca3798bf0cdf2c32f4bdb8098efb") + (revision "1")) + (package + (name "agi-bio") + (version (git-version "0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/opencog/agi-bio.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "083rqwlcnc99l4mxchj6r7x147nvfshmb39lkv15ik4cm9s3ldhw")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ; there are none + #:configure-flags + (list + (string-append "-DGUILE_INCLUDE_DIR=" + (assoc-ref %build-inputs "guile") + "/include/guile/2.2/") + (string-append "-DGUILE_SITE_DIR=" + (assoc-ref %outputs "out") + "/share/guile/site/2.2/")))) + (inputs + `(("atomspace" ,atomspace) + ("cogutil" ,cogutil) + ("gmp" ,gmp) + ("guile" ,guile-2.2))) + (native-inputs + `(("cxxtest" ,cxxtest) + ("python" ,python-minimal) + ("pkg-config" ,pkg-config))) + (home-page "https://github.com/opencog/agi-bio") + (synopsis "Genomic and proteomic data exploration and pattern mining") + (description "This is a package for genomic and proteomic research using +the OpenCog toolset with Guile. This includes experiments in applying pattern +mining and other OpenCog components.") + (license license:agpl3)))) -- cgit v1.2.3 From 537d08271ec1f8c7ae587d3e107057cfa4d15630 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 5 Jan 2020 21:38:59 +0100 Subject: gnu: agi-bio: Update hash. The previous hash corresponded to the previous commit. * gnu/packages/opencog.scm (agi-bio)[source]: Update hash. --- gnu/packages/opencog.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/opencog.scm b/gnu/packages/opencog.scm index a39b20542c..c6828d6603 100644 --- a/gnu/packages/opencog.scm +++ b/gnu/packages/opencog.scm @@ -266,7 +266,7 @@ (define-public agi-bio (file-name (git-file-name name version)) (sha256 (base32 - "083rqwlcnc99l4mxchj6r7x147nvfshmb39lkv15ik4cm9s3ldhw")))) + "0c3q0nhmd03nvqm1ih10y28n596cjvfhkcfvzw2fmz1sn3ywdah4")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; there are none -- cgit v1.2.3 From 641981d3afbfb55910f3989d6ff05197dab580ab Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Sun, 5 Jan 2020 17:06:02 -0600 Subject: gnu: coq-mathcomp: Update to 1.10.0. * gnu/packages/coq.scm (coq-mathcomp): Update to 1.10.0. [arguments]: Modify comment about tests. Remove redundant setting of COQLIB environment variable. --- gnu/packages/coq.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index 7b2cdfec5d..13ecd6c0ff 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2018 Julien Lepiller ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2019 Dan Frumin +;;; Copyright © 2020 Brett Gilio ;;; ;;; This file is part of GNU Guix. ;;; @@ -309,7 +310,7 @@ (define-public coq-gappa (define-public coq-mathcomp (package (name "coq-mathcomp") - (version "1.8.0") + (version "1.10.0") (source (origin (method git-fetch) @@ -318,14 +319,14 @@ (define-public coq-mathcomp (commit (string-append "mathcomp-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1sdrw3b6lc8crz02lp90a863rvyzhc9vcfsrdvc9m311yiaad4xv")))) + (base32 "1h5h1c2025r1ms5qryvwy6pikxmpmmjav6yl127xpzmqdi6w732d")))) (build-system gnu-build-system) (native-inputs `(("ocaml" ,ocaml) ("which" ,which) ("coq" ,coq))) (arguments - `(#:tests? #f ; no need to test formally-verified programs :) + `(#:tests? #f ; No tests. #:phases (modify-phases %standard-phases (delete 'configure) @@ -333,7 +334,6 @@ (define-public coq-mathcomp (lambda _ (chdir "mathcomp") #t)) (replace 'install (lambda* (#:key outputs #:allow-other-keys) - (setenv "COQLIB" (string-append (assoc-ref outputs "out") "/lib/coq/")) (invoke "make" "-f" "Makefile.coq" (string-append "COQLIB=" (assoc-ref outputs "out") "/lib/coq/") -- cgit v1.2.3 From 5a0d73911c93745391a687def9ba8c7d0d41be23 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Sun, 5 Jan 2020 19:03:07 -0600 Subject: gnu: libtgvoip: Update to 2.4.4. * gnu/packages/telephony.scm (libtgvoip): Update to 2.4.4. [source]: Change source URI to reflect upstream. [inputs]: Add pulseaudio and alsa-lib. This change corrects a bug, and allows for cross-compilation on armhf architectures. --- gnu/packages/telephony.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index e7f294a999..11eeeedce4 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -952,21 +952,23 @@ (define-public jami-client-gnome (define-public libtgvoip (package (name "libtgvoip") - (version "2.4.2") + (version "2.4.4") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/zevlg/libtgvoip.git") + (url "https://github.com/grishka/libtgvoip.git") (commit version))) (file-name (git-file-name name version)) (sha256 (base32 - "04dbwd3lwdannhxb2sh6z02i3lka9sb5s039pki6ka4siq5xzk1j")))) + "122kn3jx6v0kkldlzlpzvlwqxgp6pmzxsjhrhcxw12bx9c08sar5")))) (build-system gnu-build-system) (inputs - `(("openssl" ,openssl) - ("libopusenc" ,libopusenc))) + `(("alsa-lib" ,alsa-lib) + ("libopusenc" ,libopusenc) + ("openssl" ,openssl) + ("pulseaudio" ,pulseaudio))) (synopsis "VoIP library for Telegram clients") (description "A collection of libraries and header files for implementing telephony functionality into custom Telegram clients.") -- cgit v1.2.3 From 1792a70655507625cbe654a0eec1428f210d2fd3 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Sun, 5 Jan 2020 19:31:07 -0600 Subject: gnu: libtgvoip: Fix failing build on i686-linux. * gnu/local.mk (libtgvoip): Add patches for libtgvoip-disable-sse2.patch and libtgvoip-disable-webrtc.patch * gnu/packages/patches/libtgvoip-disable-sse2.patch: New file. * gnu/packages/patches/libtgvoip-disable-webrtc.patch: New file. * gnu/packages/telephony.scm (libtgvoip): Fix building on i686-linux. [source]: Reference patches for correcting failing build on i686-linux architecture. Reported-by: Diego Nicola Barbato Fixes . --- gnu/local.mk | 2 + gnu/packages/patches/libtgvoip-disable-sse2.patch | 51 ++++++++++++++++++++++ .../patches/libtgvoip-disable-webrtc.patch | 47 ++++++++++++++++++++ gnu/packages/telephony.scm | 6 +++ 4 files changed, 106 insertions(+) create mode 100644 gnu/packages/patches/libtgvoip-disable-sse2.patch create mode 100644 gnu/packages/patches/libtgvoip-disable-webrtc.patch diff --git a/gnu/local.mk b/gnu/local.mk index 83bba6b644..b7fa503257 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1113,6 +1113,8 @@ dist_patch_DATA = \ %D%/packages/patches/libsndfile-CVE-2017-8362.patch \ %D%/packages/patches/libsndfile-CVE-2017-12562.patch \ %D%/packages/patches/libtar-CVE-2013-4420.patch \ + %D%/packages/patches/libtgvoip-disable-sse2.patch \ + %D%/packages/patches/libtgvoip-disable-webrtc.patch \ %D%/packages/patches/libtheora-config-guess.patch \ %D%/packages/patches/libtommath-fix-linkage.patch \ %D%/packages/patches/libtool-skip-tests2.patch \ diff --git a/gnu/packages/patches/libtgvoip-disable-sse2.patch b/gnu/packages/patches/libtgvoip-disable-sse2.patch new file mode 100644 index 0000000000..0e4faeab26 --- /dev/null +++ b/gnu/packages/patches/libtgvoip-disable-sse2.patch @@ -0,0 +1,51 @@ +Copied from Debian. + +Description: Disable SSE2 code on i386 + This patch is not complete. A high-graded solution may use automatic switching + between SSE2 and C++ implementations based on the results of runtime checks. + The webrtc code already provides for one of them inside its GetCPUInfo function. +Bug-Debian: https://bugs.debian.org/892823 +Author: Nicholas Guriev +Last-Update: Tue, 29 Jan 2019 23:26:38 +0300 + +--- a/libtgvoip.gyp ++++ b/libtgvoip.gyp +@@ -871,11 +871,7 @@ + 'WEBRTC_POSIX', + ], + 'conditions': [ +- [ '" +Last-Update: Tue, 29 Jan 2019 23:26:44 +0300 + +--- a/libtgvoip.gyp ++++ b/libtgvoip.gyp +@@ -869,20 +869,18 @@ + '"<(OS)" == "linux"', { + 'defines': [ + 'WEBRTC_POSIX', +- 'WEBRTC_LINUX', + ], + 'conditions': [ + [ '"(pthread_self()); ++ return static_cast(pthread_self()); + #endif + #endif // defined(WEBRTC_POSIX) + } diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 11eeeedce4..8e7384bf85 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -960,6 +960,12 @@ (define-public libtgvoip (url "https://github.com/grishka/libtgvoip.git") (commit version))) (file-name (git-file-name name version)) + ;; Fix compilation on i686-linux architecture. + ;; NOTE: Applying these patches is order-dependent! + ;; The patch for WebRTC /must/ precede the patch for SSE2. + (patches + (search-patches "libtgvoip-disable-webrtc.patch" + "libtgvoip-disable-sse2.patch")) (sha256 (base32 "122kn3jx6v0kkldlzlpzvlwqxgp6pmzxsjhrhcxw12bx9c08sar5")))) -- cgit v1.2.3 From 11e46326e38c79734b694cd9483e12b2106f4d19 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 6 Jan 2020 08:58:54 +0200 Subject: gnu: python-docopt: Don't use unstable tarball. * gnu/packages/python-xyz.scm (python-docopt)[source]: Download using git-fetch. --- gnu/packages/python-xyz.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index db43bd72e4..af435e32ed 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14,7 +14,7 @@ ;;; Copyright © 2015, 2016, 2017, 2019 Leo Famulari ;;; Copyright © 2015, 2017 Ben Woodcroft ;;; Copyright © 2015, 2016 Erik Edrosa -;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2015, 2017 Kyle Meyer ;;; Copyright © 2015, 2016 Chris Marusich ;;; Copyright © 2016 Danny Milosavljevic @@ -8063,15 +8063,15 @@ (define-public python-docopt (version "0.6.2") (source (origin - (method url-fetch) + (method git-fetch) ;; The release on PyPI does not include tests. - (uri (string-append - "https://github.com/docopt/docopt/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (uri (git-reference + (url "https://github.com/docopt/docopt") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "16bf890xbdz3m30rsv2qacklh2rdn1zrfspfnwzx9g7vwz8yw4r1")))) + "0aad9gbswnnhssin2q0m5lmpm0ahyf80ahs2zjigbn5y7fvljnd0")))) (build-system python-build-system) (native-inputs `(("python-pytest" ,python-pytest))) -- cgit v1.2.3 From 854c5c95651ef9ab454d2e677dcb12bcf9f8f9b2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 6 Jan 2020 09:01:41 +0200 Subject: gnu: python-jsonpatch: Don't use unstable tarball. * gnu/packages/python-xyz.scm (python-jsonpatch)[source]: Download using git-fetch. --- gnu/packages/python-xyz.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index af435e32ed..f1d494157d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13316,14 +13316,15 @@ (define-public python-jsonpatch (version "1.16") (source (origin - (method url-fetch) + (method git-fetch) ;; pypi version lacks tests.js - (uri (string-append "https://github.com/stefankoegl/python-json-patch/" - "archive/v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (uri (git-reference + (url "https://github.com/stefankoegl/python-json-patch") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "085ykisl8v7mv9h7hvhdy3l2fjzs4214gx32r5k6nx4f76hbv6y5")))) + "0k9pff06lxama3nhsc7cdxbp83422bdy8ifs52i6xkas8hpyzfzr")))) (build-system python-build-system) (native-inputs `(("python-jsonpointer" ,python-jsonpointer))) -- cgit v1.2.3 From a9722d0dbf03ad43156711ecd3ed4d21dfe649e1 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 6 Jan 2020 09:03:17 +0200 Subject: gnu: python-jsonpatch-0.4: Don't use unstable tarball. * gnu/packages/python-xyz.scm (python-jsonpatch-0.4)[source]: Download using git-fetch. --- gnu/packages/python-xyz.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f1d494157d..72a72bbe50 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13343,13 +13343,14 @@ (define-public python-jsonpatch-0.4 (version "0.4") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/stefankoegl/python-json-patch/" - "archive/v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/stefankoegl/python-json-patch") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0j0cd9z9zyp8kppp464jxrfgrnbgkzl1yi10i5gsv8yz6d95929d")))))) + "1fq02y57kinyknxjcav0slcb0k9mwdffqw2hnlhdkpj7palh2mwk")))))) (define-public python2-jsonpatch-0.4 (package-with-python2 python-jsonpatch-0.4)) -- cgit v1.2.3 From 957c683354a9c35c630dac16a1015b54d1909b81 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 6 Jan 2020 09:15:33 +0200 Subject: gnu: python-mwclient: Update to 0.10.0. * gnu/packages/python-xyz.scm (python-mwclient): Update to 0.10.0. [source]: Download using git-fetch. [propagated-inputs]: Remove python-requests. [native-inputs]: Remove python-pytest-pep8, python-pytest-cov. Add python-pytest-runner. --- gnu/packages/python-xyz.scm | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 72a72bbe50..475f37f3ef 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12809,29 +12809,27 @@ (define-public python2-fudge (define-public python-mwclient (package (name "python-mwclient") - (version "0.8.4") + (version "0.10.0") (source (origin - (method url-fetch) + (method git-fetch) ;; The PyPI version wouldn't contain tests. - (uri (string-append "https://github.com/mwclient/mwclient/archive/" - "v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (uri (git-reference + (url "https://github.com/mwclient/mwclient") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1jj0yhilkjir00719fc7w133x7hdyhkxhk6xblla4asig45klsfv")))) + "1c3q6lwmb05yqywc4ya98ca7hsl15niili8rccl4n1yqp77c103v")))) (build-system python-build-system) (propagated-inputs - `(("python-requests" ,python-requests) - ("python-requests-oauthlib" - ,python-requests-oauthlib) + `(("python-requests-oauthlib" ,python-requests-oauthlib) ("python-six" ,python-six))) (native-inputs `(("python-mock" ,python-mock) ("python-pytest" ,python-pytest) - ("python-pytest-pep8" ,python-pytest-pep8) - ("python-pytest-cache" ,python-pytest-cache) ("python-pytest-cov" ,python-pytest-cov) + ("python-pytest-runner" ,python-pytest-runner) ("python-responses" ,python-responses))) (home-page "https://github.com/btongminh/mwclient") (synopsis "MediaWiki API client") -- cgit v1.2.3 From c83640728cc39edf8ef65a532b62c772f25ac9d3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 6 Jan 2020 09:34:36 +0200 Subject: gnu: python-urwidtrees: Don't use unstable tarball. * gnu/packages/python-xyz.scm (python-urwidtrees)[source]: Download using git-fetch. --- gnu/packages/python-xyz.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 475f37f3ef..eeb073e85c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5620,15 +5620,16 @@ (define-public python-urwidtrees (version "1.0.2") (source (origin - (method url-fetch) + (method git-fetch) ;; package author intends on distributing via github rather than pypi: ;; https://github.com/pazz/alot/issues/877#issuecomment-230173331 - (uri (string-append "https://github.com/pazz/urwidtrees/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (uri (git-reference + (url "https://github.com/pazz/urwidtrees") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "0d30lyd3s2a97rhqfax5w9ssqds2z6aydqx3c6j2c2lk3cb4ngvh")))) + "1n1kpidvkdnsqyb82vlvk78gmly96kh8351lqxn2pzgwwns6fml2")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; no tests -- cgit v1.2.3 From 26bb7fc627cb4839e7ed73f6b0784635bf5a10e1 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 6 Jan 2020 09:35:27 +0200 Subject: gnu: python-urwidtrees: Don't use setuptools. * gnu/packages/python-xyz.scm (python-urwidtrees)[arguments]: Build without setuptools. --- gnu/packages/python-xyz.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index eeb073e85c..56deb57a56 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5632,7 +5632,8 @@ (define-public python-urwidtrees "1n1kpidvkdnsqyb82vlvk78gmly96kh8351lqxn2pzgwwns6fml2")))) (build-system python-build-system) (arguments - '(#:tests? #f)) ; no tests + '(#:use-setuptools? #f + #:tests? #f)) ; no tests (propagated-inputs `(("python-urwid" ,python-urwid))) (home-page "https://github.com/pazz/urwidtrees") (synopsis "Tree widgets for urwid") -- cgit v1.2.3 From ac0ea38c2c1b928f6f1138512e71cb44dbbb88d7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 6 Jan 2020 09:39:24 +0200 Subject: gnu: python-whatever: Don't use unstable tarball. * gnu/packages/python-xyz.scm (python-whatever)[source]: Download using git-fetch. --- gnu/packages/python-xyz.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 56deb57a56..e6f6e41a74 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14613,12 +14613,13 @@ (define-public python-whatever (version "0.6") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/Suor/whatever/archive/" version - ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/Suor/whatever") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "1rchg9hrlvw4sn20lq1zspczr4x1pv57c02gv73igiqx1hqpy2nc")) - (file-name (string-append name "-" version ".tar.gz")))) + (base32 "1q7ajgqjfivxqsqgnhp4lc4p6jxyh4zprcsdbpd6dw54inaf0av5")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From e5d885c86a501a6994e9dcf7e4914c8a7befb7f9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 6 Jan 2020 11:39:30 +0200 Subject: gnu: perl-ole-storage-lite: Update to 0.20. * gnu/packages/perl.scm (perl-ole-storage-lite): Update to 0.20. --- gnu/packages/perl.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 44b764618b..c94afbc4b9 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2015 Eric Dvorsak ;;; Copyright © 2016, 2018 Mark H Weaver ;;; Copyright © 2016 Jochem Raat -;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2016 ng0 ;;; Copyright © 2016 Alex Sassmannshausen ;;; Copyright © 2016, 2018 Roel Janssen @@ -6882,7 +6882,7 @@ (define-public perl-object-signature (define-public perl-ole-storage-lite (package (name "perl-ole-storage-lite") - (version "0.19") + (version "0.20") (source (origin (method url-fetch) @@ -6892,7 +6892,7 @@ (define-public perl-ole-storage-lite ".tar.gz")) (sha256 (base32 - "179cxwqxb0f9dpx8954nvwjmggxxi5ndnang41yav1dx6mf0abp7")))) + "1fpqhhgb8blj4hhs97fsbnbhk29s9yms057a9s9yl20f3hbsc65b")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/OLE-Storage_Lite") (synopsis "Read and write OLE storage files") -- cgit v1.2.3 From 2ff17f06e7afc733b2459d563b0173f3fa346611 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 6 Jan 2020 11:43:23 +0200 Subject: gnu: perl-net-patricia: Fix build. * gnu/packages/networking.scm (perl-net-patricia)[arguments]: Add custom phase to prevent linking with 'nsl'. --- gnu/packages/networking.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index bbcae8f38c..5a8019a8fc 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -14,7 +14,7 @@ ;;; Copyright © 2016, 2017 Pjotr Prins ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2017 Leo Famulari -;;; Copyright © 2017, 2018, 2019 Efraim Flashner +;;; Copyright © 2017, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2017, 2018, 2019 Rutger Helling ;;; Copyright © 2017, 2019 Gábor Boskovits ;;; Copyright © 2017 Thomas Danckaert @@ -1237,6 +1237,14 @@ (define-public perl-net-patricia (base32 "0ln5f57vc8388kyh9vhx2infrdzfhbpgyby74h1qsnhwds95m0vh")))) (build-system perl-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'dont-link-with-nsl ; Borrowed from Debian. + (lambda _ + (substitute* "Makefile.PL" + (("-lnsl") "")) + #t))))) (inputs `(("perl-net-cidr-lite" ,perl-net-cidr-lite) ("perl-socket6" ,perl-socket6))) -- cgit v1.2.3 From 263ea4ebc30ee360e3422b70a3404c8330351566 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 6 Jan 2020 11:49:37 +0200 Subject: gnu: python-axolotl: Don't use unstable tarball. * gnu/packages/python-crypto.scm (python-axolotl)[source]: Download using git-fetch. --- gnu/packages/python-crypto.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 63d3be17c2..43a0d95ddc 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Eric Dvorsak -;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2015, 2016, 2017, 2019 Leo Famulari ;;; Copyright © 2016, 2017 Marius Bakke ;;; Copyright © 2017 Ben Sturmfels @@ -533,14 +533,14 @@ (define-public python-axolotl (version "0.1.39") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/tgalal/python-axolotl/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/tgalal/python-axolotl") + (commit version))) + (file-name (git-file-name name version)) (patches (search-patches "python-axolotl-AES-fix.patch")) (sha256 - (base32 "0badsgkgz0ir3hqynxzsfjgacppi874syvvmgccc6j164053x6zm")))) + (base32 "0xm9qgcwf6fq7rhzfcviwhbzcbj4i7wkxkab2z55fy1x82lya9g6")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From 0daf7e263a2bfbe2de4b9c6598ebf1fdc8fa3b61 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Mon, 6 Jan 2020 10:40:47 +0300 Subject: gnu: swh-plugins: Update home-page to new uri. * gnu/packages/audio.scm (swh-plugins)[home-page]: Update to new uri. --- 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 acc443839f..55a34460b1 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -747,7 +747,7 @@ (define-public swh-plugins `(("fftwf" ,fftwf) ("perl-xml-parser" ,perl-xml-parser))) (build-system gnu-build-system) - (home-page "https://github.com/swh/ladspa/") + (home-page "http://plugin.org.uk") (synopsis "The SWH Plugins package for the LADSPA plugin system") (description "This package provides Steve Harris's LADSPA plugins.") (license license:gpl2+))) -- cgit v1.2.3 From e916a202a1deffccb18d60ebfd1623150f9293be Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Mon, 6 Jan 2020 10:54:30 +0300 Subject: gnu: Add emacs-pfuture. * gnu/packages/emacs-xyz.scm (emacs-pfuture): New variable. --- gnu/packages/emacs-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index cae6a36858..ab052badbd 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -17757,6 +17757,28 @@ (define-public emacs-lsp-mode like @code{company}, @code{flycheck}, and @code{projectile}.") (license license:gpl3+))) +(define-public emacs-pfuture + (let ((commit "368254ee30692c709400db413c347e18e76a8a55")) + (package + (name "emacs-pfuture") + (version (git-version "1.6" "1" commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Alexander-Miller/pfuture.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "096raqpjx84njws85r7pqq1wi9w9bjwkr0ga1mbbhlna1mfn3mg4")))) + (build-system emacs-build-system) + (home-page + "https://github.com/Alexander-Miller/pfuture") + (synopsis "Simple wrapper around asynchronous processes for Emacs") + (description "This package provides a simple wrapper around asynchronous +processes for Emacs") + (license license:gpl3+)))) + (define-public emacs-lsp-ui (package (name "emacs-lsp-ui") -- cgit v1.2.3 From 83b7917a2d97791d487af442b25c0a5092a8e6fa Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Mon, 6 Jan 2020 10:57:06 +0300 Subject: gnu: Add emacs-treemacs. * gnu/packages/emacs-xyz.scm (emacs-treemacs): New variable. --- gnu/packages/emacs-xyz.scm | 51 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index ab052badbd..2eb5a66fb7 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -17779,6 +17779,57 @@ (define-public emacs-pfuture processes for Emacs") (license license:gpl3+)))) +(define-public emacs-treemacs + (package + (name "emacs-treemacs") + (version "2.6") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Alexander-Miller/treemacs.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "13gs8g05xj7np3i2q3bbxg6zgdiazzn1spxii4x0cyd4pg83c0i1")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-dash" ,emacs-dash) + ("emacs-s" ,emacs-s) + ("emacs-f" ,emacs-f) + ("emacs-ace-window" ,emacs-ace-window) + ("emacs-pfuture" ,emacs-pfuture) + ("emacs-hydra" ,emacs-hydra) + ("emacs-ht" ,emacs-ht))) + (native-inputs + `(("emacs-buttercup" ,emacs-buttercup) + ("emacs-el-mock" ,emacs-el-mock))) + (arguments + `(#:tests? #t ;TODO: Investigate ‘treemacs--parse-collapsed-dirs’ test failure. + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-makefile + (lambda _ + (substitute* "Makefile" + (("@\\$\\(CASK\\) exec ") "")) + #t)) + (add-after 'fix-makefile 'chdir-elisp + ;; Elisp directory is not in root of the source. + (lambda _ + (chdir "src/elisp"))) + (replace 'check + (lambda _ + (with-directory-excursion "../.." ;treemacs root + (chmod "test/test-treemacs.el" #o644) + (emacs-substitute-sexps "test/test-treemacs.el" + ("(describe \"treemacs--parse-collapsed-dirs\"" + "")) + (invoke "make" "test"))))))) + (home-page "https://github.com/Alexander-Miller/treemacs") + (synopsis "Emacs tree style file explorer") + (description "Powerful and flexible file tree project explorer.") + (license license:gpl3+))) + (define-public emacs-lsp-ui (package (name "emacs-lsp-ui") -- cgit v1.2.3 From 5097ce0ebdae6a27072fa3c5261925411a1611e8 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Mon, 6 Jan 2020 11:11:42 +0300 Subject: gnu: Add emacs-treemacs-extra. * gnu/packages/emacs-xyz.scm (emacs-treemacs-extra): New variable. --- gnu/packages/emacs-xyz.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 2eb5a66fb7..9339bf0713 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -17830,6 +17830,24 @@ (define-public emacs-treemacs (description "Powerful and flexible file tree project explorer.") (license license:gpl3+))) +(define-public emacs-treemacs-extra + (package + (inherit emacs-treemacs) + (name "emacs-treemacs-extra") + (propagated-inputs + `(,@(package-propagated-inputs emacs-treemacs) + ("emacs-evil" ,emacs-evil) + ("emacs-magit" ,emacs-magit) + ("emacs-projectile" ,emacs-projectile))) + (arguments + (substitute-keyword-arguments + (package-arguments emacs-treemacs) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'chdir-elisp 'copy-extra + (lambda _ + (copy-recursively "../extra" "."))))))))) + (define-public emacs-lsp-ui (package (name "emacs-lsp-ui") -- cgit v1.2.3 From f2bb968e47238732e014b6bbc6d5c2095f73b625 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Mon, 6 Jan 2020 10:58:26 +0300 Subject: gnu: Add emacs-lsp-java. * gnu/packages/emacs-xyz.scm (emacs-lsp-java): New variable. --- gnu/packages/emacs-xyz.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 9339bf0713..3bf8492ba4 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -17848,6 +17848,33 @@ (define-public emacs-treemacs-extra (lambda _ (copy-recursively "../extra" "."))))))))) +(define-public emacs-lsp-java + (package + (name "emacs-lsp-java") + (version "2.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emacs-lsp/lsp-java.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0hcnvbyaqyypgby1bfj4zbrbq97amk8hfx0sj4w73rl46yf4jk3j")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-lsp-mode" ,emacs-lsp-mode) + ("emacs-markdown-mode" ,emacs-markdown-mode) + ("emacs-dash" ,emacs-dash) + ("emacs-f" ,emacs-f) + ("emacs-ht" ,emacs-ht) + ("emacs-request" ,emacs-request) + ("emacs-treemacs" ,emacs-treemacs))) + (home-page "https://github.com/emacs-lsp/lsp-java/") + (synopsis "Java support for lsp-mode") + (description "Emacs Java IDE using Eclipse JDT Language Server.") + (license license:gpl3+))) + (define-public emacs-lsp-ui (package (name "emacs-lsp-ui") -- cgit v1.2.3 From 5912aa4d0ed54770fa89d2f65d64eaceecda12da Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Thu, 19 Dec 2019 00:00:50 +0300 Subject: gnu: Add emacs-lsp-lua-emmy. * gnu/packages/emacs-xyz.scm (emacs-lsp-lua-emmy): New variable. --- gnu/packages/emacs-xyz.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 3bf8492ba4..65c0ca16c1 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -17902,6 +17902,29 @@ (define-public emacs-lsp-ui and code peeking.") (license license:gpl3+))) +(define-public emacs-lsp-lua-emmy + (let ((commit "ab53fb2a8b8942804eb75bab5624fd19f1d360bf")) + (package + (name "emacs-lsp-lua-emmy") + (version (git-version "0.1.0" "1" commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/phenix3443/lsp-lua-emmy.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0rbizis73n1w5ig07fj1han74chbc1zpbp5bn37rj0gz608aqka8")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-lsp-mode" ,emacs-lsp-mode))) + (home-page "https://github.com/phenix3443/lsp-lua-emmy/") + (synopsis "Lua support in @code{lsp-mode} client for Emacs") + (description "This package provides a Lua language support in +@code{lsp-mode} client for Emacs.") + (license license:gpl3+)))) + (define-public emacs-lsp-ivy (let ((commit "caf1e1d7e22ed0b5fe18dd508d1a6f83dd163288") (revision "2")) -- cgit v1.2.3 From 6b61fc47e21efd5ea8e85bbf486d8ac204e4eab2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 6 Jan 2020 12:01:03 +0200 Subject: gnu: python2-numpy@1.8: Don't use unstable tarball. * gnu/packages/python-xyz.scm (python2-numpy-1.8)[source]: Download using git-fetch. --- gnu/packages/python-xyz.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e6f6e41a74..53244bc43a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3430,13 +3430,14 @@ (define-public python2-numpy-1.8 (version "1.8.2") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/numpy/numpy/archive/v" version ".tar.gz")) - (file-name (string-append "python2-numpy-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/numpy/numpy") + (commit (string-append "v" version)))) + (file-name (git-file-name "numpy" version)) (sha256 (base32 - "0sc20gz1b17xnyrkp5frca3ql5qfalpv916hfg2kqxpwr6jg0f1g")))) + "0ikgi15rsqwbkfsjjxrwh40lqyal2wvyp3923y6w6ch3dcr82sfk")))) (arguments (substitute-keyword-arguments (package-arguments python2-numpy) ((#:phases phases) -- cgit v1.2.3 From f711b71bd5ac7c8dca26852f9eec8461d31b73bd Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 6 Jan 2020 12:04:09 +0200 Subject: gnu: python2-unicodecsv: Don't use unstable tarball. * gnu/packages/python-xyz.scm (python2-unicodecsv)[source]: Download using git-fetch. --- gnu/packages/python-xyz.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 53244bc43a..7c1a4f85f5 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9523,15 +9523,16 @@ (define-public python2-unicodecsv (name "python2-unicodecsv") (version "0.14.1") (source (origin - (method url-fetch) + (method git-fetch) ;; The test suite is not included in the PyPi release. ;; https://github.com/jdunck/python-unicodecsv/issues/19 - (uri (string-append "https://github.com/jdunck/python-unicodecsv/" - "archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (uri (git-reference + (url "https://github.com/jdunck/python-unicodecsv") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "087nqanfcyp6mlfbbr5lva5f3w6iz1bybls9xlrb8icmc474wh4w")))) + "15hx2k41a2lpv4hcml9zp4cvlx1171mnb5s4s13xc1pxkq3vgdjy")))) (build-system python-build-system) (arguments `(;; It supports Python 3, but Python 3 can already do Unicode CSV. -- cgit v1.2.3 From 6def31e8fd5b5ba1ef06394257bfde610c2cfd18 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 6 Jan 2020 12:15:04 +0200 Subject: gnu: python-conda: Don't use unstable tarball. * gnu/packages/package-management.scm (python-conda)[source]: Download using git-fetch. [arguments]: Adjust custom 'remove-failing-tests to make a file writable. --- gnu/packages/package-management.scm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 638e773309..b82e2d8b3d 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2018, 2019 Rutger Helling ;;; Copyright © 2018 Sou Bunnbu ;;; Copyright © 2018, 2019 Eric Bavier -;;; Copyright © 2019 Efraim Flashner +;;; Copyright © 2019, 2020 Efraim Flashner ;;; Copyright © 2019 Jonathan Brielmaier ;;; ;;; This file is part of GNU Guix. @@ -621,13 +621,14 @@ (define-public python-conda (version "4.3.16") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/conda/conda/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/conda/conda") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1jq8hyrc5npb5sf4vw6s6by4602yj8f79vzpbwdfgpkn02nfk1dv")))) + "1qwy0awx4qf2pbk8z2b7q6wdcq7mvwpxxjhg27mbirdvs5hw7hb2")))) (build-system python-build-system) (arguments `(#:phases @@ -663,6 +664,8 @@ (define-public python-conda ;; directory left when you build with the --keep-failed ;; option (delete-file "gateways/disk/test_delete.py") + ;; This file is no longer writable after downloading with 'git-fetch' + (make-file-writable "conda_env/support/saved-env/environment.yml") #t)))) (replace 'check (lambda _ -- cgit v1.2.3 From 837da4d36ec0b0ee65ddd9cda7f6980ca62f434c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 6 Jan 2020 12:17:47 +0200 Subject: gnu: python-anaconda-client: Don't use unstable tarball. * gnu/packages/package-management.scm (python-anaconda-client)[source]: Download using git-fetch. --- gnu/packages/package-management.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index b82e2d8b3d..0e4f644f80 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -566,13 +566,14 @@ (define-public python-anaconda-client (version "1.6.3") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/Anaconda-Platform/" - "anaconda-client/archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/Anaconda-Platform/anaconda-client") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1wv4wi6k5jz7rlwfgvgfdizv77x3cr1wa2aj0k1595g7fbhkjhz2")))) + "0w1bfxnydjl9qp53r2gcvr6vlpdqqilcrzqxrll9sgg6vwdyiyyp")))) (build-system python-build-system) (propagated-inputs `(("python-pyyaml" ,python-pyyaml) -- cgit v1.2.3 From c27710859c3cb59c439571ddc56cf71c36a1c33c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 23 Dec 2019 16:05:04 +0200 Subject: system: linux-container: Recommend guix container. * gnu/system/linux-container.scm (container-script)[script]: Recommend using 'guix container' to get a shell inside the running container. --- gnu/system/linux-container.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/system/linux-container.scm b/gnu/system/linux-container.scm index 2ab679ff3f..c8807398b3 100644 --- a/gnu/system/linux-container.scm +++ b/gnu/system/linux-container.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2015 David Thompson ;;; Copyright © 2016, 2017, 2019 Ludovic Courtès ;;; Copyright © 2019 Arun Isaac +;;; Copyright © 2020 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -194,11 +195,13 @@ (define file-systems (define (explain pid) ;; XXX: We can't quite call 'bindtextdomain' so there's actually ;; no i18n. + ;; XXX: Should we really give both options? 'guix container exec' + ;; is a more verbose command. Hard to fail to enter the container + ;; when we list two options. (info (G_ "system container is running as PID ~a~%") pid) - ;; XXX: Should we recommend 'guix container exec'? It's more - ;; verbose and doesn't bring much. - (info (G_ "Run 'sudo nsenter -a -t ~a' to get a shell into it.~%") + (info (G_ "Run 'sudo guix container exec ~a /run/current-system/profile/bin/bash --login'\n") pid) + (info (G_ "or run 'sudo nsenter -a -t ~a' to get a shell into it.~%") pid) (newline (guix-warning-port))) (call-with-container file-systems -- cgit v1.2.3 From 769b96b62e8c09b078f73adc09fb860505920f8f Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Mon, 6 Jan 2020 12:06:51 +0100 Subject: gnu: sdl-mixer: Describe runtime configuration. * gnu/packages/sdl.scm (sdl-mixer)[description]: Add information about runtime MIDI playback options. Signed-off-by: Danny Milosavljevic --- gnu/packages/sdl.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 80725561fb..727a276dc5 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -281,8 +281,14 @@ (define-public sdl-mixer (synopsis "SDL multi-channel audio mixer library") (description "SDL_mixer is a multi-channel audio mixer library for SDL. It supports any number of simultaneously playing channels of 16 bit stereo -audio, plus a single channel of music. Supported format include FLAC, MOD, -MIDI, Ogg Vorbis, and MP3.") +audio, plus a single channel of music. Supported formats include FLAC, MOD, +MIDI, Ogg Vorbis, and MP3. + +This package supports two MIDI backends, selectable at runtime. To use the +newer @code{fluidsynth} library, install a soundfont such as @code{fluid-3} +and specify it using the @code{SDL_SOUNDFONTS} environment variable. For the +legacy @code{timidity} backend, install a patch set such as @code{freepats} +and set the path to the configuration file with @code{TIMIDITY_CFG}.") (home-page "https://www.libsdl.org/projects/SDL_mixer/") (license zlib))) -- cgit v1.2.3 From f2dc5f5bb64b377566526c3b35d47a314aa7f848 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 6 Jan 2020 14:26:19 +0200 Subject: gnu: make-lua-filesystem: Don't use unstable tarball. * gnu/packages/lua.scm (make-lua-filesystem)[source]: Download using git-fetch. Parameterize commit version. --- gnu/packages/lua.scm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index 23604868a5..df040cb6a6 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2014 Raimon Grau ;;; Copyright © 2014 Mark H Weaver ;;; Copyright © 2014 Andreas Enge -;;; Copyright © 2016, 2017 Efraim Flashner +;;; Copyright © 2016, 2017, 2020 Efraim Flashner ;;; Copyright © 2016, 2019 Ricardo Wurmus ;;; Copyright © 2016 doncatnip ;;; Copyright © 2016, 2017, 2019 Clément Lassieur @@ -250,14 +250,16 @@ (define (make-lua-filesystem name lua) (name name) (version "1.6.3") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/keplerproject/" - "luafilesystem/archive/v_" - "1_6_3" ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/keplerproject/luafilesystem") + (commit (string-append "v_" + (string-join + (string-split version #\.) "_"))))) + (file-name (git-file-name name version)) (sha256 (base32 - "0s10ckxin0bysd6gaywqhxkpw3ybjhprr8m655b8cx3pxjwd49am")))) + "1hxcnqj53540ysyw8fzax7f09pl98b8f55s712gsglcdxp2g2pri")))) (build-system gnu-build-system) (arguments `(#:make-flags -- cgit v1.2.3 From b63785ec79b6d31d423e986000946e3883397eea Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 6 Jan 2020 14:29:37 +0200 Subject: gnu: make-lua-sec: Don't use unstable tarball. * gnu/packages/lua.scm (make-lua-sec)[source]: Download using git-fetch. --- gnu/packages/lua.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index df040cb6a6..cf1282f969 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -295,12 +295,14 @@ (define (make-lua-sec name lua) (name name) (version "0.7") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/brunoos/luasec/archive/" - "luasec-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/brunoos/luasec") + (commit (string-append "luasec-" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0c9sdz3gvrsbvvdqzpnsappgwl40hfljlpfybqis6wia3mdyjxi1")))) + "1w2w030jn4lgbkmzp7j3znmj856vfj0ca8sn8r444r5zhmihd761")))) (build-system gnu-build-system) (arguments `(#:make-flags -- cgit v1.2.3 From bf73eb142b911c8ea1f21ca80ead94e6a269c9df Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 6 Jan 2020 14:31:20 +0200 Subject: gnu: lua-lgi: Don't use unstable tarball. * gnu/packages/lua.scm (lua-lgi)[source]: Download using git-fetch. --- gnu/packages/lua.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index cf1282f969..34d86cfcc7 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -344,14 +344,14 @@ (define-public lua-lgi (version "0.9.2") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/pavouk/lgi/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/pavouk/lgi") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 - "0kwcaj3ahi9gxfyp0lr5zgr6vi1mgsg9sz0980x0nwxlh9a11i6g")))) + (base32 + "03rbydnj411xpjvwsyvhwy4plm96481d7jax544mvk7apd8sd5jj")))) (build-system gnu-build-system) (arguments '(#:make-flags (list "CC=gcc" -- cgit v1.2.3 From 5545abecd252e36f7cd11fe60831db26b2081916 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 6 Jan 2020 14:33:21 +0200 Subject: gnu: make-lua-socket: Don't use unstable tarball. * gnu/packages/lua.scm (make-lua-socket)[source]: Download using git-fetch. --- gnu/packages/lua.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index 34d86cfcc7..ac4fa96e65 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -196,14 +196,14 @@ (define (make-lua-socket name lua) (name name) (version "3.0-rc1") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/diegonehab/luasocket/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/diegonehab/luasocket") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0j8jx8bjicvp9khs26xjya8c495wrpb7parxfnabdqa5nnsxjrwb")))) + "1chs7z7a3i3lck4x7rz60ziwbf793gw169hpjdfca8y4yf1hzsxk")))) (build-system gnu-build-system) (arguments `(#:make-flags -- cgit v1.2.3 From 3095616bbf46e334189394e751a967a7527f083e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 6 Jan 2020 14:44:27 +0200 Subject: gnu: lua-filesystem: Update to 1.7.0.2. * gnu/packages/lua.scm (lua-filesystem): Update to 1.7.0.2. --- gnu/packages/lua.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index ac4fa96e65..c62f4d4092 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -248,18 +248,18 @@ (define-public lua5.2-socket (define (make-lua-filesystem name lua) (package (name name) - (version "1.6.3") + (version "1.7.0.2") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/keplerproject/luafilesystem") - (commit (string-append "v_" + (commit (string-append "v" (string-join (string-split version #\.) "_"))))) (file-name (git-file-name name version)) (sha256 (base32 - "1hxcnqj53540ysyw8fzax7f09pl98b8f55s712gsglcdxp2g2pri")))) + "0zmprgkm9zawdf9wnw0v3w6ibaj442wlc6alp39hmw610fl4vghi")))) (build-system gnu-build-system) (arguments `(#:make-flags -- cgit v1.2.3 From 6298f327dbb1389598064760fd0f5d3b0af0b18b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 6 Jan 2020 14:48:06 +0200 Subject: gnu: lua5.1-sec: Update to 0.9. * gnu/packages/lua.scm (lua5.1-sec): Update to 0.9. --- gnu/packages/lua.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index c62f4d4092..0307e0f415 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -293,16 +293,16 @@ (define-public lua5.2-filesystem (define (make-lua-sec name lua) (package (name name) - (version "0.7") + (version "0.9") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/brunoos/luasec") - (commit (string-append "luasec-" version)))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "1w2w030jn4lgbkmzp7j3znmj856vfj0ca8sn8r444r5zhmihd761")))) + "0ssncgkggyr8i3z6zbvgrgsqj2q8676rnsikhpfwnk9n7sx4gwbl")))) (build-system gnu-build-system) (arguments `(#:make-flags -- cgit v1.2.3 From 251ce98c49eda6d6db654d32d623842fbe6cd2a1 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 6 Jan 2020 15:01:29 +0200 Subject: gnu: lua-luv: Update to 1.32.0-0. * gnu/packages/lua.scm (lua-luv): Update to 1.32.0-0. --- gnu/packages/lua.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index 0307e0f415..a69291ec8a 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -458,7 +458,7 @@ (define-public lua5.2-lpeg (define (make-lua-luv name lua) (package (name name) - (version "1.30.1-1") + (version "1.32.0-0") (source (origin ;; The release tarball includes the sources of libuv but does ;; not include the pkg-config files. @@ -469,7 +469,7 @@ (define (make-lua-luv name lua) (file-name (git-file-name name version)) (sha256 (base32 - "0b2zxrsjxzhzwfp28lchplrp272v6zkbpq1ddz7a0rf20l7dbls1")))) + "0c65c1lhbl0axnyks3910gjs0z0hw7w6jvl07g8kbpnbvfl4qajh")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; there are none -- cgit v1.2.3 From 3a695c01d7ee18f30f22df53f3c44dfac04017f1 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 6 Jan 2020 14:49:18 +0100 Subject: gnu: Add emacs-helm-cider. * gnu/packages/emacs-xyz.scm (emacs-helm-cider): New variable. --- gnu/packages/emacs-xyz.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 65c0ca16c1..2cab418bf5 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -20833,3 +20833,33 @@ (define-public emacs-hide-mode-line or simply disable the mode-line in buffers where it is not very useful.") (home-page "https://github.com/hlissner/emacs-hide-mode-line") (license license:expat))) + +(define-public emacs-helm-cider + ;; No new release since March 2018. + (let ((commit "9363cc537f06233345aa3af5cd46aa5681ad607b")) + (package + (name "emacs-helm-cider") + (version (git-version "0.4.0" "1" commit)) + (home-page "https://github.com/clojure-emacs/helm-cider") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0vfn4smqba1vsshz48ggkj8gs94la0sxb1sq4shrb41qj2x3dci7")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-helm" ,emacs-helm) + ("emacs-cider" ,emacs-cider))) + (synopsis "Helm interface to Clojure's CIDER") + (description "Helm-CIDER adds Helm interfaces to +@command{cider-apropos}, @command{cider-apropos-documentation}, +@command{cider-browse-ns} (namespaces). + +It also provides original Helm commands: @command{helm-cider-spec}, +@command{helm-cider-spec-ns}, @command{helm-cider-repl-history}, +@command{helm-cider-cheatsheet}.") + (license license:gpl3+)))) -- cgit v1.2.3 From 9961cde3835743643e562e0034a73356b1d1eb0f Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 6 Jan 2020 15:09:31 +0100 Subject: gnu: guix: Ensure the bootstrap binary tarballs aren't GC'd. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Previously, they could be GC'd by 'tests/guix-gc.sh' for instance, and thus lacking by the time 'tests/guix-daemon.sh' runs, thereby leading to a test failure. Reported by Gábor Boskovits. * gnu/packages/package-management.scm (guix)[arguments]: In 'copy-bootstrap-guile' phase, change 'intern' to register a GC root. --- gnu/packages/package-management.scm | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 0e4f644f80..6becdb22a9 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2015, 2017 Ricardo Wurmus ;;; Copyright © 2017 Muriithi Frederick Muriuki ;;; Copyright © 2017, 2018 Oleg Pykhalov @@ -176,16 +176,27 @@ (define-public guix ;; Copy the bootstrap guile tarball in the store used ;; by the test suite. (define (intern file recursive?) - (let ((base (strip-store-file-name file))) - ;; Note: don't use 'guix download' here because we - ;; need to set the 'recursive?' argument. - (invoke "./test-env" "guile" "-c" - (object->string - `(begin - (use-modules (guix)) - (with-store store - (add-to-store store ,base ,recursive? - "sha256" ,file))))))) + ;; Note: don't use 'guix download' here because we + ;; need to set the 'recursive?' argument. + (define base + (strip-store-file-name file)) + + (define code + `(begin + (use-modules (guix)) + (with-store store + (let* ((item (add-to-store store ,base + ,recursive? + "sha256" ,file)) + (root (string-append "/tmp/gc-root-" + (basename item)))) + ;; Register a root so that the GC tests + ;; don't delete those. + (symlink item root) + (add-indirect-root store root))))) + + (invoke "./test-env" "guile" "-c" + (object->string code))) (intern (assoc-ref inputs "boot-guile") #f) -- cgit v1.2.3 From 6a7c4636d4dec47eefa03c95da5a1315bd0e0413 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 6 Jan 2020 15:14:09 +0100 Subject: Adjust module autoloads. In Guile < 2.9.7, autoloading a module would give you access to all its bindings. In future versions, autoloading a module gives access only to the listed bindings, as per #:select (see ). This commit adjusts autoloads to the new semantics, allowing Guix to be built with Guile 2.9.7/2.9.8. * guix/build/download.scm : Remove call to 'module-autoload!'. (load-gnutls): New procedure. (tls-wrap): Call it. * guix/git.scm : Remove call to 'module-autoload!'. (load-git-submodules): New procedure. (update-submodules): Call it instead of 'resolve-interface'. * gnu/bootloader/grub.scm: Replace #:autoload with #:use-module. * gnu/packages.scm: Likewise. * gnu/packages/ssh.scm: Likewise. * gnu/packages/tex.scm: Likewise. * gnu/services/cuirass.scm: Likewise. * gnu/services/mcron.scm: Likewise. * guix/lint.scm: Augment list of bindings in #:autoload. * guix/scripts/build.scm: Likewise. * guix/scripts/gc.scm: Likewise. * guix/scripts/pack.scm: Likewise. * guix/scripts/publish.scm: Likewise. * guix/scripts/pull.scm: Likewise. * guix/utils.scm: Remove unnecessary #:autoload clauses; replace one of them with #:use-module. --- gnu/bootloader/grub.scm | 2 +- gnu/packages.scm | 6 +++--- gnu/packages/ssh.scm | 6 +++--- gnu/packages/tex.scm | 2 +- gnu/services/cuirass.scm | 6 +++--- gnu/services/mcron.scm | 4 ++-- guix/build/download.scm | 13 +++++++------ guix/git.scm | 21 ++++++++++++++------- guix/lint.scm | 3 ++- guix/scripts/build.scm | 6 +++--- guix/scripts/gc.scm | 2 +- guix/scripts/pack.scm | 6 ++++-- guix/scripts/publish.scm | 6 ++++-- guix/scripts/pull.scm | 6 ++++-- guix/utils.scm | 7 ++----- 15 files changed, 54 insertions(+), 42 deletions(-) diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm index adcdbdbab0..f13685ac9d 100644 --- a/gnu/bootloader/grub.scm +++ b/gnu/bootloader/grub.scm @@ -28,7 +28,7 @@ (define-module (gnu bootloader grub) #:use-module (gnu system uuid) #:use-module (gnu system file-systems) #:use-module (gnu system keyboard) - #:autoload (gnu packages bootloaders) (grub) + #:use-module (gnu packages bootloaders) #:autoload (gnu packages gtk) (guile-cairo guile-rsvg) #:autoload (gnu packages xorg) (xkeyboard-config) #:use-module (ice-9 match) diff --git a/gnu/packages.scm b/gnu/packages.scm index 959777ff8f..143469b288 100644 --- a/gnu/packages.scm +++ b/gnu/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 © 2013 Mark H Weaver ;;; Copyright © 2014 Eric Bavier ;;; Copyright © 2016, 2017 Alex Kost @@ -30,12 +30,12 @@ (define-module (gnu packages) #:select ((package-name->name+version . hyphen-separated-name->name+version) mkdir-p)) - #:autoload (guix profiles) (packages->manifest) + #:use-module (guix profiles) #:use-module (guix describe) #:use-module (guix deprecation) #:use-module (ice-9 vlist) #:use-module (ice-9 match) - #:autoload (ice-9 binary-ports) (put-bytevector) + #:use-module (ice-9 binary-ports) #:autoload (system base compile) (compile) #:use-module (srfi srfi-1) #:use-module (srfi srfi-11) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 45b8f0db00..ec4f00d8e6 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2013, 2014 Andreas Enge ;;; Copyright © 2014, 2015, 2016 Mark H Weaver ;;; Copyright © 2015, 2016, 2018, 2019 Efraim Flashner @@ -32,7 +32,7 @@ (define-module (gnu packages ssh) #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages base) - #:autoload (gnu packages boost) (boost) + #:use-module (gnu packages boost) #:use-module (gnu packages compression) #:use-module (gnu packages crypto) #:use-module (gnu packages elf) @@ -51,7 +51,7 @@ (define-module (gnu packages ssh) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages popt) - #:autoload (gnu packages protobuf) (protobuf) + #:use-module (gnu packages protobuf) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) #:use-module (gnu packages readline) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index d184d7616b..e4346d1232 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -71,7 +71,7 @@ (define-module (gnu packages tex) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (gnu packages xdisorg) - #:autoload (gnu packages texinfo) (texinfo) + #:use-module (gnu packages texinfo) #:use-module (ice-9 ftw) #:use-module (ice-9 match) #:use-module ((srfi srfi-1) #:hide (zip))) diff --git a/gnu/services/cuirass.scm b/gnu/services/cuirass.scm index d92421762a..7bfb021161 100644 --- a/gnu/services/cuirass.scm +++ b/gnu/services/cuirass.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Mathieu Lirzin -;;; Copyright © 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2017 Jan Nieuwenhuizen ;;; Copyright © 2018, 2019 Ricardo Wurmus @@ -25,8 +25,8 @@ (define-module (gnu services cuirass) #:use-module (guix gexp) #:use-module (guix records) #:use-module (gnu packages admin) - #:autoload (gnu packages ci) (cuirass) - #:autoload (gnu packages version-control) (git) + #:use-module (gnu packages ci) + #:use-module (gnu packages version-control) #:use-module (gnu services) #:use-module (gnu services base) #:use-module (gnu services shepherd) diff --git a/gnu/services/mcron.scm b/gnu/services/mcron.scm index 1327516b49..d9627c6bd0 100644 --- a/gnu/services/mcron.scm +++ b/gnu/services/mcron.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 ;;; ;;; This file is part of GNU Guix. ;;; @@ -19,7 +19,7 @@ (define-module (gnu services mcron) #:use-module (gnu services) #:use-module (gnu services shepherd) - #:autoload (gnu packages guile-xyz) (mcron) + #:use-module (gnu packages guile-xyz) #:use-module (guix deprecation) #:use-module (guix records) #:use-module (guix gexp) diff --git a/guix/build/download.scm b/guix/build/download.scm index a7bb3b0d6e..641dacefa1 100644 --- a/guix/build/download.scm +++ b/guix/build/download.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; @@ -155,11 +155,11 @@ (define* (ftp-fetch uri file #:key timeout print-build-trace?) ;; be bound if we need them, because (guix download) adds GnuTLS as an ;; input in that case. -;; XXX: Use this hack instead of #:autoload to avoid compilation errors. -;; See . -(module-autoload! (current-module) - '(gnutls) - '(make-session connection-end/client)) +(define (load-gnutls) + ;; XXX: Use this hack instead of #:autoload to avoid compilation errors. + ;; See . + (module-use! (current-module) (resolve-interface '(gnutls))) + (set! load-gnutls (const #t))) (define %x509-certificate-directory ;; The directory where X.509 authority PEM certificates are stored. @@ -245,6 +245,7 @@ (define (log level str) (format (current-error-port) "gnutls: [~a|~a] ~a" (getpid) level str)) + (load-gnutls) (let ((session (make-session connection-end/client)) (ca-certs (%x509-certificate-directory))) diff --git a/guix/git.scm b/guix/git.scm index 83af596ef5..15a0a6f9e5 100644 --- a/guix/git.scm +++ b/guix/git.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Mathieu Othacehe -;;; Copyright © 2018, 2019 Ludovic Courtès +;;; Copyright © 2018, 2019, 2020 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -48,11 +48,6 @@ (define-module (guix git) git-checkout-url git-checkout-branch)) -;; XXX: Use this hack instead of #:autoload to avoid compilation errors. -;; See . -(module-autoload! (current-module) - '(git submodule) '(repository-submodules)) - (define %repository-cache-directory (make-parameter (string-append (cache-directory #:ensure? #f) "/checkouts"))) @@ -200,11 +195,23 @@ (define-syntax-rule (with-repository directory repository exp ...) (call-with-repository directory (lambda (repository) exp ...))) +(define (load-git-submodules) + "Attempt to load (git submodules), which was missing until Guile-Git 0.2.0. +Return true on success, false on failure." + (match (false-if-exception (resolve-interface '(git submodule))) + (#f + (set! load-git-submodules (const #f)) + #f) + (iface + (module-use! (current-module) iface) + (set! load-git-submodules (const #t)) + #t))) + (define* (update-submodules repository #:key (log-port (current-error-port))) "Update the submodules of REPOSITORY, a Git repository object." ;; Guile-Git < 0.2.0 did not have (git submodule). - (if (false-if-exception (resolve-interface '(git submodule))) + (if (load-git-submodules) (for-each (lambda (name) (let ((submodule (submodule-lookup repository name))) (format log-port (G_ "updating submodule '~a'...~%") diff --git a/guix/lint.scm b/guix/lint.scm index 41ddff584d..e3544bd963 100644 --- a/guix/lint.scm +++ b/guix/lint.scm @@ -45,7 +45,8 @@ (define-module (guix lint) #:use-module (guix gnu-maintenance) #:use-module (guix cve) #:use-module ((guix swh) #:hide (origin?)) - #:autoload (guix git-download) (git-reference?) + #:autoload (guix git-download) (git-reference? + git-reference-url git-reference-commit) #:use-module (ice-9 match) #:use-module (ice-9 regex) #:use-module (ice-9 format) diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm index a853ac6c7d..1ab3a80e66 100644 --- a/guix/scripts/build.scm +++ b/guix/scripts/build.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 Mark H Weaver ;;; ;;; This file is part of GNU Guix. @@ -45,8 +45,8 @@ (define-module (guix scripts build) #:use-module (srfi srfi-37) #:autoload (gnu packages) (specification->package %package-module-path) #:autoload (guix download) (download-to-store) - #:autoload (guix git-download) (git-reference?) - #:autoload (guix git) (git-checkout?) + #:autoload (guix git-download) (git-reference? git-reference-url) + #:autoload (guix git) (git-checkout? git-checkout-url) #:use-module ((guix status) #:select (with-status-verbosity)) #:use-module ((guix progress) #:select (current-terminal-columns)) #:use-module ((guix build syscalls) #:select (terminal-columns)) diff --git a/guix/scripts/gc.scm b/guix/scripts/gc.scm index 3f20a2e192..31a05075b5 100644 --- a/guix/scripts/gc.scm +++ b/guix/scripts/gc.scm @@ -22,7 +22,7 @@ (define-module (guix scripts gc) #:use-module (guix store) #:use-module (guix store roots) #:autoload (guix build syscalls) (free-disk-space) - #:autoload (guix profiles) (generation-profile) + #:autoload (guix profiles) (generation-profile profile-generations) #:autoload (guix scripts package) (delete-generations) #:use-module (ice-9 match) #:use-module (ice-9 regex) diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm index b84e37cbf2..c8d8546e29 100644 --- a/guix/scripts/pack.scm +++ b/guix/scripts/pack.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2015, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2017, 2018 Ricardo Wurmus ;;; Copyright © 2018 Konrad Hinsen ;;; Copyright © 2018 Chris Marusich @@ -29,7 +29,9 @@ (define-module (guix scripts pack) #:use-module ((guix status) #:select (with-status-verbosity)) #:use-module ((guix self) #:select (make-config.scm)) #:use-module (guix grafts) - #:autoload (guix inferior) (inferior-package?) + #:autoload (guix inferior) (inferior-package? + inferior-package-name + inferior-package-version) #:use-module (guix monads) #:use-module (guix modules) #:use-module (guix packages) diff --git a/guix/scripts/publish.scm b/guix/scripts/publish.scm index 8fb67f9268..71a349d2fe 100644 --- a/guix/scripts/publish.scm +++ b/guix/scripts/publish.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 David Thompson -;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -51,7 +51,9 @@ (define-module (guix scripts publish) #:use-module (guix store) #:use-module ((guix serialization) #:select (write-file)) #:use-module (guix zlib) - #:autoload (guix lzlib) (lzlib-available?) + #:autoload (guix lzlib) (lzlib-available? + call-with-lzip-output-port + make-lzip-output-port) #:use-module (guix cache) #:use-module (guix ui) #:use-module (guix scripts) diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm index 04cc51829d..cb1be989e1 100644 --- a/guix/scripts/pull.scm +++ b/guix/scripts/pull.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2017 Marius Bakke ;;; ;;; This file is part of GNU Guix. @@ -33,7 +33,9 @@ (define-module (guix scripts pull) #:use-module (guix memoization) #:use-module (guix monads) #:use-module (guix channels) - #:autoload (guix inferior) (open-inferior) + #:autoload (guix inferior) (open-inferior + inferior-available-packages + close-inferior) #:use-module (guix scripts build) #:autoload (guix build utils) (which) #:use-module ((guix build syscalls) diff --git a/guix/utils.scm b/guix/utils.scm index 728039fbf0..3e8e59b8dc 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2013, 2014, 2015 Mark H Weaver ;;; Copyright © 2014 Eric Bavier ;;; Copyright © 2014 Ian Denhardt @@ -31,16 +31,13 @@ (define-module (guix utils) #:use-module (srfi srfi-26) #:use-module (srfi srfi-35) #:use-module (srfi srfi-39) - #:use-module (ice-9 binary-ports) #:use-module (ice-9 ftw) - #:autoload (rnrs io ports) (make-custom-binary-input-port) + #:use-module (rnrs io ports) ;need 'port-position' etc. #:use-module ((rnrs bytevectors) #:select (bytevector-u8-set!)) #:use-module (guix memoization) #:use-module ((guix build utils) #:select (dump-port mkdir-p delete-file-recursively)) #:use-module ((guix build syscalls) #:select (mkdtemp! fdatasync)) #:use-module (ice-9 format) - #:autoload (ice-9 popen) (open-pipe*) - #:autoload (ice-9 rdelim) (read-line) #:use-module (ice-9 regex) #:use-module (ice-9 match) #:use-module (ice-9 format) -- cgit v1.2.3 From 562b4e47cdc7621c5eda10869be061d8cc2e82d9 Mon Sep 17 00:00:00 2001 From: "kanichos@yandex.ru" Date: Wed, 1 Jan 2020 13:28:28 +0300 Subject: gnu: ibus-rime: Record the right file name in "rime.xml". MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/ibus.scm (ibus-rime)[arguments]: Add 'fix-file-names' phase. Co-authored-by: Ludovic Courtès --- gnu/packages/ibus.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 70e10eae01..512a1ff9ec 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -669,6 +669,13 @@ (define-public ibus-rime (assoc-ref inputs "rime-data") "/share/rime-data\"\n"))) #t)) + (add-after 'unpack 'fix-file-names + (lambda* (#:key outputs #:allow-other-keys) + ;; IBus uses the component file rime.xml to start the Rime + ;; engine. It must be patched with appropriate file names. + (substitute* "rime.xml" + (("/usr") (assoc-ref outputs "out"))) + #t)) (delete 'configure)))) (inputs `(("gdk-pixbuf" ,gdk-pixbuf) -- cgit v1.2.3 From 5757c641f2c547a45cb65f00a57af971381e6a42 Mon Sep 17 00:00:00 2001 From: "kanichos@yandex.ru" Date: Wed, 1 Jan 2020 13:59:49 +0300 Subject: gnu: gnome-characters: Wrap program to provide the necessary Typelib files. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome.scm (gnome-characters)[arguments]: Add #:phases with a 'wrap' phase. [inputs]: Add GNOME-DESKTOP. Co-authored-by: Ludovic Courtès --- gnu/packages/gnome.scm | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ec06e6d4d2..e71cc2fee2 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -548,7 +548,18 @@ (define-public gnome-characters (base32 "08cwz39iwgsyyb2wqhb8vfbmh1cwfkgfiy7adp08w7rwqi99x3dp")))) (build-system meson-build-system) - (arguments '(#:glib-or-gtk? #t)) + (arguments + `(#:glib-or-gtk? #t + #:phases (modify-phases %standard-phases + (add-after 'install 'wrap + (lambda* (#:key outputs #:allow-other-keys) + ;; GNOME Characters needs Typelib files from GTK and + ;; gnome-desktop. + (wrap-program (string-append (assoc-ref outputs "out") + "/bin/gnome-characters") + `("GI_TYPELIB_PATH" ":" prefix + (,(getenv "GI_TYPELIB_PATH")))) + #t))))) (native-inputs `(("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") @@ -558,7 +569,8 @@ (define-public gnome-characters (inputs `(("gjs" ,gjs) ("gtk+" ,gtk+) - ("libunistring" ,libunistring))) + ("libunistring" ,libunistring) + ("gnome-desktop" ,gnome-desktop))) (home-page "https://wiki.gnome.org/Apps/CharacterMap") (synopsis "Find and insert unusual characters") (description "Characters is a simple utility application to find -- cgit v1.2.3 From 6a6b8a3fcfc35a5e7b10e7c2a9a75e909354d4d6 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Wed, 1 Jan 2020 19:43:49 +0100 Subject: gnu: python-py3status: Fix patch of file path MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-py3status): Fix patch of file path. [arguments]: Replace single-quotes with double-quotes so that the regex matches again. The "replace-with" value is not changed as it's not necessary and would introduce escaping noise. Signed-off-by: Ludovic Courtès --- 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 7c1a4f85f5..194d8b8b0c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9912,7 +9912,7 @@ (define-public python-py3status (lambda* (#:key inputs #:allow-other-keys) (let ((file-path (assoc-ref inputs "file"))) (substitute* "py3status/parse_config.py" - (("\\['file', '-b'") + (("\\[\"file\", \"-b\"") (string-append "['" file-path "/bin/file', '-b'"))) #t)))) #:tests? #f)) ; TODO: Requires many libraries not in Guix. -- cgit v1.2.3 From 83460433b94487198750ad0bcc6f3869f68a8c8f Mon Sep 17 00:00:00 2001 From: "kanichos@yandex.ru" Date: Thu, 2 Jan 2020 15:13:45 +0300 Subject: activation: Check whether /proc/sys/kernel/modprobe exists. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/build/activation.scm (activate-modprobe): Check whether /proc/sys/kernel/modprobe exists before writing to it. Co-authored-by: Ludovic Courtès --- gnu/build/activation.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gnu/build/activation.scm b/gnu/build/activation.scm index 6d69628eb2..30f5e87d5a 100644 --- a/gnu/build/activation.scm +++ b/gnu/build/activation.scm @@ -281,9 +281,13 @@ (define install-special-file (define (activate-modprobe modprobe) "Tell the kernel to use MODPROBE to load modules." - (call-with-output-file "/proc/sys/kernel/modprobe" - (lambda (port) - (display modprobe port)))) + + ;; If the kernel was built without loadable module support, this file is + ;; unavailable, so check for its existence first. + (when (file-exists? "/proc/sys/kernel/modprobe") + (call-with-output-file "/proc/sys/kernel/modprobe" + (lambda (port) + (display modprobe port))))) (define (activate-firmware directory) "Tell the kernel to look for device firmware under DIRECTORY. This -- cgit v1.2.3 From 41a3ace54e745fb78f3df354c09668e2a551d429 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 6 Jan 2020 17:49:45 +0100 Subject: gnu: Add emacs-edn. * gnu/packages/emacs-xyz.scm (emacs-edn): New variable. --- gnu/packages/emacs-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 2cab418bf5..eef7b1da55 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -20863,3 +20863,27 @@ (define-public emacs-helm-cider @command{helm-cider-spec-ns}, @command{helm-cider-repl-history}, @command{helm-cider-cheatsheet}.") (license license:gpl3+)))) + +(define-public emacs-edn + ;; No release since February 2016 + (let ((commit "be9e32d1b49e35247b263b0243df7cfdc8d413ab")) + (package + (name "emacs-edn") + (version (git-version "1.1.2" "1" commit)) + (home-page "https://github.com/expez/edn.el") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1xp2hjhn52k6l1g6ypva6dsklpawni7gvjafbz6404f9dyxflh7l")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-peg" ,emacs-peg))) + (synopsis "Read and write EDN from Elisp") + (description "This is an Emacs Lisp library for reading and writing the +data format @code{edn}. See @url{https://github.com/edn-format/edn}.") + (license license:gpl3+)))) -- cgit v1.2.3 From 743cebb6b038724e70e15b98c6c68858a6934a57 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 6 Jan 2020 17:49:50 +0100 Subject: gnu: Add emacs-helm-clojuredocs. * gnu/packages/emacs-xyz.scm (emacs-helm-clojuredocs): New variable. --- gnu/packages/emacs-xyz.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index eef7b1da55..12bf9accc1 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -20887,3 +20887,35 @@ (define-public emacs-edn (description "This is an Emacs Lisp library for reading and writing the data format @code{edn}. See @url{https://github.com/edn-format/edn}.") (license license:gpl3+)))) + +(define-public emacs-helm-clojuredocs + (let ((commit "5a7f0f2cb401be0b09e73262a1c18265ab9a3cea")) + (package + (name "emacs-helm-clojuredocs") + (version (git-version "0.3" "1" commit)) + (home-page "https://github.com/mbuczko/helm-clojuredocs") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "015b8zxh91ljhqvn6z43gy08di54xcw9skw0i7frj3d7gk984qhl")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-helm" ,emacs-helm) + ("emacs-edn" ,emacs-edn))) + (synopsis "Search help on clojuredocs.org with Helm") + (description "This packages provides a Helm interface to lookup Clojure +documentation on @url{https://clojuredocs.org} with Helm. + +Two function are exposed: +@itemize +@item @command{helm-clojuredocs}: opens a Helm session with no initial +pattern. Searching starts with minimal 3 characters entered. +@item @command{helm-clojuredocs-at-point}: opens a Helm session with initial +pattern guessed from thing under current cursor position. +@end itemize\n") + (license license:gpl3+)))) -- cgit v1.2.3 From 54a80259274f5f779a19820f18d8f52f00cdfa3b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 6 Jan 2020 18:27:52 +0100 Subject: gnu: supertux: Update to 0.6.1. * gnu/packages/games.scm (supertux): Update to 0.6.1. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 066e2c8cf3..1a1739eb8e 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3747,7 +3747,7 @@ (define-public tuxpaint-config (define-public supertux (package (name "supertux") - (version "0.6.0") + (version "0.6.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/SuperTux/supertux/" @@ -3756,7 +3756,7 @@ (define-public supertux (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1h1s4abirkdv4ag22zvyk6zkk64skqbjmcnnba67ps4hdzxfbhy4")) + "0lqch5gcq6ccnspy93z9r13bp8w2j1vrd8jhvk5kp4qhrd1f069s")) (patches (search-patches "supertux-unbundle-squirrel.patch")))) (arguments -- cgit v1.2.3 From 8b03b1a185518fa0a6f3b306d2701f3a56fb6448 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 6 Jan 2020 18:28:59 +0100 Subject: gnu: supertux: Fix description. * gnu/packages/games.scm (supertux)[description]: Remove unnecessary words in GNU Guix. --- 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 1a1739eb8e..f4b74abe11 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3789,11 +3789,11 @@ (define-public supertux ("boost" ,boost) ("freetype" ,freetype) ("squirrel" ,squirrel))) - (native-inputs `(("pkg-config" ,pkg-config))) + (native-inputs + `(("pkg-config" ,pkg-config))) (synopsis "2D platformer game") - (description "SuperTux is a free classic 2D jump'n run sidescroller game -in a style similar to the original Super Mario games covered under -the GNU GPL.") + (description "SuperTux is a classic 2D jump'n run sidescroller game in +a style similar to the original Super Mario games.") (home-page "https://supertux.org/") (license license:gpl3+))) -- cgit v1.2.3 From 90a31c73b377dde99cadbf577c66f00649260952 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 6 Jan 2020 21:13:00 +0100 Subject: gnu: next: Update to 1.4.0. * gnu/packages/web-browsers.scm (next): Update to 1.4.0. --- gnu/packages/web-browsers.scm | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 4fdf5f5419..17c3ebf2a0 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -377,7 +377,7 @@ (define-public vimb (define next-gtk-webkit (package (name "next-gtk-webkit") - (version "1.3.4") + (version "1.4.0") (source (origin (method git-fetch) @@ -388,7 +388,7 @@ (define next-gtk-webkit (commit version))) (sha256 (base32 - "00iqv4xarabl98gdl1rzqkc5v0vfljx1nawsxqsx9x3a9mnxmgxi")) + "1gkmr746rqqg94698a051gv79fblc8n9dq0zg04llba44adhpmjl")) (file-name (git-file-name "next" version)))) (build-system glib-or-gtk-build-system) (arguments @@ -485,6 +485,24 @@ (define sbcl-next-password-manager ("prove-asdf" ,sbcl-prove-asdf))) (synopsis "Infinitely extensible web-browser (password manager)"))) +(define sbcl-next-hooks + (package + (inherit next-gtk-webkit) + (name "sbcl-next-hooks") + (build-system asdf-build-system/sbcl) + (arguments + `(#:tests? #t + #:asd-file "next.asd" + #:asd-system-name "next/hooks")) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("serapeum" ,sbcl-serapeum) + ("fare-quasiquote-extras" ,cl-fare-quasiquote-extras))) + (native-inputs + `(("trivial-features" ,sbcl-trivial-features) + ("prove-asdf" ,sbcl-prove-asdf))) + (synopsis "Infinitely extensible web-browser (hooks)"))) + (define-public next (let ((version (package-version next-gtk-webkit))) (package @@ -551,7 +569,6 @@ (define expected-fasl (string-append ("cl-annot" ,sbcl-cl-annot) ("cl-ansi-text" ,sbcl-cl-ansi-text) ("cl-css" ,sbcl-cl-css) - ("cl-hooks" ,sbcl-cl-hooks) ("cl-json" ,sbcl-cl-json) ("cl-markup" ,sbcl-cl-markup) ("cl-ppcre" ,sbcl-cl-ppcre) @@ -560,16 +577,19 @@ (define expected-fasl (string-append ("closer-mop" ,sbcl-closer-mop) ("dbus" ,cl-dbus) ("dexador" ,sbcl-dexador) + ("fare-quasiquote-extras" ,cl-fare-quasiquote-extras) ; For serapeum. Guix bug? ("ironclad" ,sbcl-ironclad) ("local-time" ,sbcl-local-time) ("log4cl" ,sbcl-log4cl) ("lparallel" ,sbcl-lparallel) ("mk-string-metrics" ,sbcl-mk-string-metrics) ("parenscript" ,sbcl-parenscript) + ("plump" ,sbcl-plump) ("quri" ,sbcl-quri) + ("serapeum" ,sbcl-serapeum) ("sqlite" ,sbcl-cl-sqlite) ("str" ,sbcl-cl-str) - ("swank" ,cl-slime-swank) + ("swank" ,sbcl-slime-swank) ("trivia" ,sbcl-trivia) ("trivial-clipboard" ,sbcl-trivial-clipboard) ("unix-opts" ,sbcl-unix-opts) @@ -578,9 +598,11 @@ (define expected-fasl (string-append ("next-download-manager" ,sbcl-next-download-manager) ("next-ring" ,sbcl-next-ring) ("next-history-tree" ,sbcl-next-history-tree) - ("next-password-manager" ,sbcl-next-password-manager))) + ("next-password-manager" ,sbcl-next-password-manager) + ("next-hooks" ,sbcl-next-hooks))) (native-inputs `(("trivial-features" ,sbcl-trivial-features) + ("trivial-types" ,sbcl-trivial-types) ("prove-asdf" ,sbcl-prove-asdf))) (synopsis "Infinitely extensible web-browser (with Lisp development files)")))) -- cgit v1.2.3 From c4970c53a6f9ce1b1d54c0bd59d62a4507f55b5b Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Tue, 7 Jan 2020 02:26:22 +0300 Subject: gnu: emacs-treemacs: Install icons and scripts. Reported by Christopher Howard . * gnu/packages/emacs-xyz.scm (emacs-treemacs)[inputs]: Add 'python'. [arguments]: Add 'patch-paths' and 'install-data' phases. --- gnu/packages/emacs-xyz.scm | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 12bf9accc1..067aee230c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -17804,6 +17804,8 @@ (define-public emacs-treemacs (native-inputs `(("emacs-buttercup" ,emacs-buttercup) ("emacs-el-mock" ,emacs-el-mock))) + (inputs + `(("python" ,python))) (arguments `(#:tests? #t ;TODO: Investigate ‘treemacs--parse-collapsed-dirs’ test failure. #:phases @@ -17824,7 +17826,35 @@ (define-public emacs-treemacs (emacs-substitute-sexps "test/test-treemacs.el" ("(describe \"treemacs--parse-collapsed-dirs\"" "")) - (invoke "make" "test"))))))) + (invoke "make" "test")))) + (add-before 'install 'patch-paths + (lambda* (#:key inputs outputs #:allow-other-keys) + (with-directory-excursion "../.." ;treemacs root + (chmod "src/elisp/treemacs-core-utils.el" #o644) + (emacs-substitute-variables "src/elisp/treemacs-core-utils.el" + ("treemacs-dir" + (string-append (assoc-ref outputs "out") "/"))) + (chmod "src/elisp/treemacs-icons.el" #o644) + (substitute* "src/elisp/treemacs-icons.el" + (("icons/default") "share/emacs-treemacs/images")) + (chmod "src/elisp/treemacs-customization.el" #o644) + (emacs-substitute-variables "src/elisp/treemacs-customization.el" + ("treemacs-python-executable" + (string-append (assoc-ref inputs "python") "/bin/python3"))) + (chmod "src/elisp/treemacs-async.el" #o644) + (substitute* "src/elisp/treemacs-async.el" + (("src/scripts") (string-append "share/" ,name "/scripts")))) + #t)) + (add-after 'install 'install-data + (lambda* (#:key outputs #:allow-other-keys) + (let ((images (string-append (assoc-ref outputs "out") + "/share/" ,name "/images"))) + (with-directory-excursion "../.." ;treemacs root + (copy-recursively "icons/default" images) + (copy-recursively "src/scripts" + (string-append (assoc-ref outputs "out") + "/share/" ,name "/scripts")) + #t))))))) (home-page "https://github.com/Alexander-Miller/treemacs") (synopsis "Emacs tree style file explorer") (description "Powerful and flexible file tree project explorer.") -- cgit v1.2.3 From 136919ba4976ec20bbfbd14587e87c4780653226 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Mon, 6 Jan 2020 20:56:19 -0600 Subject: gnu: Add ocaml-cairo2. * gnu/packages/ocaml.scm (ocaml-cairo2): New variable. Co-authored-by: Julien Lepiller . --- gnu/packages/ocaml.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index a9e421a17c..738706b23f 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5243,3 +5243,33 @@ (define-public ocaml-lacaml LAPACK-library (Linear Algebra routines). It also contains many additional convenience functions for vectors and matrices.") (license license:lgpl2.1))) + +(define-public ocaml-cairo2 + (package + (name "ocaml-cairo2") + (version "0.6.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Chris00/ocaml-cairo.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0wzysis9fa850s68qh8vrvqc6svgllhwra3kzll2ibv0wmdqrich")))) + (build-system dune-build-system) + (arguments + `(#:test-target "tests")) + (inputs + `(("cairo" ,cairo) + ("gtk+-2" ,gtk+-2) + ("lablgtk" ,lablgtk))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (home-page "https://github.com/Chris00/ocaml-cairo") + (synopsis "Binding to Cairo, a 2D Vector Graphics Library") + (description "Ocaml-cairo2 is a binding to Cairo, a 2D graphics library +with support for multiple output devices. Currently supported output targets +include the X Window System, Quartz, Win32, image buffers, PostScript, PDF, +and SVG file output.") + (license license:lgpl3+))) -- cgit v1.2.3 From d977e243644c3ce6c6e7dc682b09ae409fcd8077 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Mon, 6 Jan 2020 20:57:28 -0600 Subject: gnu: Add lablgtk3. * gnu/packages/ocaml.scm (lablgtk3): New variable. Co-authored-by: Julien Lepiller . --- gnu/packages/ocaml.scm | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 738706b23f..3253d0285a 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5273,3 +5273,48 @@ (define-public ocaml-cairo2 include the X Window System, Quartz, Win32, image buffers, PostScript, PDF, and SVG file output.") (license license:lgpl3+))) + +(define-public lablgtk3 + (package + (name "lablgtk") + (version "3.0.beta8") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/garrigue/lablgtk.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "08pgwnia240i2rw1rbgiahg673kwa7b6bvhsg3z4b47xr5sh9pvz")))) + (build-system dune-build-system) + (arguments + `(#:tests? #t + #:test-target "." + #:phases + (modify-phases %standard-phases + (add-before 'build 'make-writable + (lambda _ + (for-each (lambda (file) + (chmod file #o644)) + (find-files "." ".")) + #t))))) + (propagated-inputs + `(("ocaml-cairo2" ,ocaml-cairo2))) + (inputs + `(("camlp5" ,camlp5) + ("gtk+" ,gtk+) + ("gtksourceview-3" ,gtksourceview-3) + ("gtkspell3" ,gtkspell3))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (home-page "https://github.com/garrigue/lablgtk") + (synopsis "OCaml interface to GTK+3") + (description "LablGtk is an OCaml interface to GTK+ 1.2, 2.x and 3.x. It +provides a strongly-typed object-oriented interface that is compatible with the +dynamic typing of GTK+. Most widgets and methods are available. LablGtk +also provides bindings to gdk-pixbuf, the GLArea widget (in combination with +LablGL), gnomecanvas, gnomeui, gtksourceview, gtkspell, libglade (and it can +generate OCaml code from .glade files), libpanel, librsvg and quartz.") + ;; Version 2 only, with linking exception. + (license license:lgpl2.0))) -- cgit v1.2.3 From 1ac40045029aacc2d360f4bd24d716c1306a54e8 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Mon, 6 Jan 2020 01:32:09 -0600 Subject: gnu: coq: Update to 8.10.2. * gnu/packages/coq.scm (coq): Update to 8.10.2. [inputs]: Replace lablgtk with lablgtk3. [arguments]: Remove remove-lablgtk-references phase, as it no longer appears to be necessary. --- gnu/packages/coq.scm | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index 13ecd6c0ff..45aaa83711 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -44,7 +44,7 @@ (define-module (gnu packages coq) (define-public coq (package (name "coq") - (version "8.9.1") + (version "8.10.2") (source (origin (method git-fetch) @@ -53,7 +53,8 @@ (define-public coq (commit (string-append "V" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1p4z967s18wkblayv12ygqsrqlyk5ax1pz40yf4kag8pva6gblhk")))) + (base32 + "0ji2rzd70b3hcwfw97qk7rv3m2977ylqnq82l1555dp3njr8nm3q")))) (native-search-paths (list (search-path-specification (variable "COQPATH") @@ -61,7 +62,7 @@ (define-public coq (build-system ocaml-build-system) (outputs '("out" "ide")) (inputs - `(("lablgtk" ,lablgtk) + `(("lablgtk" ,lablgtk3) ("python" ,python-2) ("camlp5" ,camlp5) ("ocaml-num" ,ocaml-num))) @@ -74,13 +75,6 @@ (define-public coq (lambda _ (for-each make-file-writable (find-files ".")) #t)) - (add-after 'unpack 'remove-lablgtk-references - (lambda _ - ;; This is not used anywhere, but creates a reference to lablgtk in - ;; every binary - (substitute* '("config/coq_config.mli" "configure.ml") - ((".*coqideincl.*") "")) - #t)) (replace 'configure (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From a5727da96aa131604fe1552b8938e3a2998b2745 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Mon, 6 Jan 2020 01:34:23 -0600 Subject: gnu: coq: Reword several comments. * gnu/packages/coq.scm (coq): Reword several comments to improve readability. --- gnu/packages/coq.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index 45aaa83711..89b1c2149b 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -95,8 +95,8 @@ (define-public coq (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin"))) - ;; These are exact copies of the version without the .opt suffix. - ;; Remove them to save 35 MiB in the result + ;; These files are exact copies without `.opt` extension. + ;; Removing these saves 35 MiB in the resulting package. (delete-file (string-append bin "/coqtop.opt")) (delete-file (string-append bin "/coqidetop.opt"))) #t)) @@ -112,9 +112,9 @@ (define-public coq (lambda _ (with-directory-excursion "test-suite" ;; These two tests fail. - ;; This one fails because the output is not formatted as expected. + ;; Fails because the output is not formatted as expected. (delete-file-recursively "coq-makefile/timing") - ;; This one fails because we didn't build coqtop.byte. + ;; Fails because we didn't build coqtop.byte. (delete-file-recursively "coq-makefile/findlib-package") (invoke "make"))))))) (home-page "https://coq.inria.fr") @@ -123,7 +123,7 @@ (define-public coq "Coq is a proof assistant for higher-order logic, which allows the development of computer programs consistent with their formal specification. It is developed using Objective Caml and Camlp5.") - ;; The code is distributed under lgpl2.1. + ;; The source code is distributed under lgpl2.1. ;; Some of the documentation is distributed under opl1.0+. (license (list license:lgpl2.1 license:opl1.0+)))) -- cgit v1.2.3 From 346825571cd37782a880e17fbb76afc2f14d4959 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Mon, 6 Jan 2020 01:35:55 -0600 Subject: gnu: coq-flocq: Update to 3.2.0. * gnu/packages/coq.scm (coq-flocq): Update to 3.2.0. [source]: Use GIT-FETCH and GIT-FILE-NAME. [native-inputs]: Add autoconf and automake for remake. [arguments]: Add remove-failing-examples phase to work around union error. --- gnu/packages/coq.scm | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index 89b1c2149b..ff6a436b94 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -21,6 +21,7 @@ (define-module (gnu packages coq) #:use-module (gnu packages) + #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages bison) #:use-module (gnu packages boost) @@ -207,18 +208,22 @@ (define (coq-prog name) (define-public coq-flocq (package (name "coq-flocq") - (version "3.1.0") - (source (origin - (method url-fetch) - ;; Use the ‘Latest version’ link for a stable URI across releases. - (uri (string-append "https://gforge.inria.fr/frs/download.php/" - "file/37901/flocq-" version ".tar.gz")) - (sha256 - (base32 - "02szrgz9m0ac51la1lqpiv6i2g0zbgx9gz5rp0q1g00ajldyna5c")))) + (version "3.2.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.inria.fr/flocq/flocq.git") + (commit (string-append "flocq-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "15bi36x7zj0glsb3s2gwqd4wswhfzh36rbp7imbyff53a7nna95l")))) (build-system gnu-build-system) (native-inputs - `(("ocaml" ,ocaml) + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("ocaml" ,ocaml) ("which" ,which) ("coq" ,coq))) (arguments @@ -227,6 +232,12 @@ (define-public coq-flocq "/lib/coq/user-contrib/Flocq")) #:phases (modify-phases %standard-phases + (add-after 'unpack 'remove-failing-examples + (lambda _ + (substitute* "Remakefile.in" + ;; Fails on a union error. + (("Double_rounding_odd_radix.v") "")) + #t)) (add-before 'configure 'fix-remake (lambda _ (substitute* "remake.cpp" -- cgit v1.2.3 From 59265e5ff4cc73ce4a889281b96a8ae0af21505b Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Mon, 6 Jan 2020 01:37:15 -0600 Subject: gnu: coq-flocq: Use HTTPS home page URI. * gnu/packages/coq.scm (coq-flocq)[home-page]: Use HTTPS URI. --- gnu/packages/coq.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index ff6a436b94..a669836b84 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -254,7 +254,7 @@ (define-public coq-flocq (replace 'install (lambda _ (invoke "./remake" "install")))))) - (home-page "http://flocq.gforge.inria.fr/") + (home-page "https://flocq.gforge.inria.fr/") (synopsis "Floating-point formalization for the Coq system") (description "Flocq (Floats for Coq) is a floating-point formalization for the Coq system. It provides a comprehensive library of theorems on a multi-radix -- cgit v1.2.3 From f24dc271493d2644b9023609cc8294bc2c4eefa2 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Mon, 6 Jan 2020 01:37:59 -0600 Subject: gnu: coq-gappa: Update to 1.4.2. * gnu/packages/coq.scm (coq-gappa): Update to 1.4.2. [source]: Use GIT-FETCH and GIT-FILE-NAME. [native-inputs]: Add autoconf and automake for remake, as well as campl5 for parsing. [propagated-inputs]: coq-gabba now depends on coq-flocq. [arguments]: Temporarily disable check chase until error resolution is identified. --- gnu/packages/coq.scm | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index a669836b84..64582a5594 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -265,25 +265,33 @@ (define-public coq-flocq (define-public coq-gappa (package (name "coq-gappa") - (version "1.3.4") - (source (origin - (method url-fetch) - (uri (string-append "https://gforge.inria.fr/frs/download.php/file/37918/gappa-" - version ".tar.gz")) - (sha256 - (base32 - "1wdg07dk4lbq7dr80ywzna0lclwgi8bddzc6yfx19z1zn9yljzxh")))) + (version "1.4.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.inria.fr/gappa/coq.git") + (commit (string-append "gappalib-coq-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0r7jwp5xssdfzivs2flp7mzrscqhgl63mryhhf1cvndpgzqwfk2f")))) (build-system gnu-build-system) (native-inputs - `(("ocaml" ,ocaml) + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("ocaml" ,ocaml) ("which" ,which) ("coq" ,coq) + ("camlp5" ,camlp5) ("bison" ,bison) ("flex" ,flex))) (inputs `(("gmp" ,gmp) ("mpfr" ,mpfr) ("boost" ,boost))) + (propagated-inputs + `(("coq-flocq" ,coq-flocq))) (arguments `(#:configure-flags (list (string-append "--libdir=" (assoc-ref %outputs "out") @@ -297,8 +305,10 @@ (define-public coq-gappa #t)) (replace 'build (lambda _ (invoke "./remake"))) - (replace 'check - (lambda _ (invoke "./remake" "check"))) + ;; FIXME: Figure out why failures occur, and re-enable check phase. + (delete 'check) + ;; (replace 'check + ;; (lambda _ (invoke "./remake" "check"))) (replace 'install (lambda _ (invoke "./remake" "install")))))) (home-page "http://gappa.gforge.inria.fr/") -- cgit v1.2.3 From a61fe4c04e075a170af72a9b8b04b136af249b69 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Mon, 6 Jan 2020 01:39:24 -0600 Subject: gnu: coq-gappa: Use HTTPS home page URI. * gnu/packages/coq.scm (coq-gappa)[home-page]: Use HTTPS URI. --- gnu/packages/coq.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index 64582a5594..acae58a10d 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -311,7 +311,7 @@ (define-public coq-gappa ;; (lambda _ (invoke "./remake" "check"))) (replace 'install (lambda _ (invoke "./remake" "install")))))) - (home-page "http://gappa.gforge.inria.fr/") + (home-page "https://gappa.gforge.inria.fr/") (synopsis "Verify and formally prove properties on numerical programs") (description "Gappa is a tool intended to help verifying and formally proving properties on numerical programs dealing with floating-point or fixed-point -- cgit v1.2.3 From d481db8baf809e0537a4d4aa4fe9b8e22b1d86e6 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Mon, 6 Jan 2020 01:39:52 -0600 Subject: gnu: coq-coquelicot: Update to 3.0.3. * gnu/packages/coq.scm (coq-coquelicot): Update to 3.0.3. [source]: Use GIT-FETCH and GIT-FILE-NAME. [native-inputs]: Add autoconf and automake. --- gnu/packages/coq.scm | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index acae58a10d..0e4a1f260e 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -367,17 +367,22 @@ (define-public coq-mathcomp (define-public coq-coquelicot (package (name "coq-coquelicot") - (version "3.0.2") - (source (origin - (method url-fetch) - (uri (string-append "https://gforge.inria.fr/frs/download.php/" - "file/37523/coquelicot-" version ".tar.gz")) - (sha256 - (base32 - "1biia7nfqf7vaqq5gmykl4rwjyvrcwss6r2jdf0in5pvp2rnrj2w")))) + (version "3.0.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.inria.fr/coquelicot/coquelicot.git") + (commit (string-append "coquelicot-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0m5wbr2s8lnf8b7cfwv15hyzsmbcaz6hgdn7aazcrkxnwr87vgkp")))) (build-system gnu-build-system) (native-inputs - `(("ocaml" ,ocaml) + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("ocaml" ,ocaml) ("which" ,which) ("coq" ,coq))) (propagated-inputs -- cgit v1.2.3 From c0228096411bb4b81cf1dce6d0ed35a2129270c1 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Mon, 6 Jan 2020 01:40:27 -0600 Subject: gnu: coq-coquelicot: Truncate home-page. * gnu/packages/coq.scm (coq-coquelicot)[home-page]: Truncate home-page. --- gnu/packages/coq.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index 0e4a1f260e..2666b429fe 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -404,7 +404,7 @@ (define-public coq-coquelicot (lambda _ (invoke "./remake" "check"))) (replace 'install (lambda _ (invoke "./remake" "install")))))) - (home-page "http://coquelicot.saclay.inria.fr/index.html") + (home-page "http://coquelicot.saclay.inria.fr") (synopsis "Coq library for Reals") (description "Coquelicot is an easier way of writing formulas and theorem statements, achieved by relying on total functions in place of dependent types -- cgit v1.2.3 From 8f1216552ceb02e8a16579637041d7b5f1eb96f3 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Mon, 6 Jan 2020 02:19:57 -0600 Subject: gnu: coq-interval: Update to 3.4.1. * gnu/packages/coq.scm (coq-interval): Update to 3.4.1. [source]: Use GIT-FETCH and GIT-FILE-NAME. [native-inputs]: Add autoconf and automake for remake. --- gnu/packages/coq.scm | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index 2666b429fe..08e0584e19 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -453,17 +453,22 @@ (define-public coq-bignums (define-public coq-interval (package (name "coq-interval") - (version "3.4.0") - (source (origin - (method url-fetch) - (uri (string-append "https://gforge.inria.fr/frs/download.php/" - "file/37524/interval-" version ".tar.gz")) - (sha256 - (base32 - "023j9sd64brqvjdidqkn5m8d7a93zd9r86ggh573z9nkjm2m7vvg")))) + (version "3.4.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.inria.fr/coqinterval/interval.git") + (commit (string-append "interval-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "03q3dfqi3r3f7aji5s06ig4aav9ajcwswwdzi5lrgr69z0m487k4")))) (build-system gnu-build-system) (native-inputs - `(("ocaml" ,ocaml) + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("ocaml" ,ocaml) ("which" ,which) ("coq" ,coq))) (propagated-inputs -- cgit v1.2.3 From cd5406effa34fa5cfda7eb7bbd2ccaf5201cf523 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Mon, 6 Jan 2020 02:20:41 -0600 Subject: gnu: coq-equations: Update to 1.2.1. * gnu/packages/coq.scm (coq-equations): Update to 1.2.1. [arguments]: Replace configure phase to run configure shell script. Remove redundant COQLIB. --- gnu/packages/coq.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index 08e0584e19..0bb9ce7c4a 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -549,16 +549,16 @@ (define-public coq-autosubst (define-public coq-equations (package (name "coq-equations") - (version "1.2") + (version "1.2.1") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/mattam82/Coq-Equations.git") - (commit (string-append "v" version "-8.9")))) + (commit (string-append "v" version "-8.10")))) (file-name (git-file-name name version)) (sha256 (base32 - "1q3wvicr43bgy7xn1diwh4j43mnrhprrc2xd22qlbz9cl6bhf8bj")))) + "023q5dww3drw35dm9bi9p9d0wrj9k7vax7hfdsprf8l340pb4s0k")))) (build-system gnu-build-system) (native-inputs `(("ocaml" ,ocaml) @@ -570,10 +570,9 @@ (define-public coq-equations (modify-phases %standard-phases (replace 'configure (lambda* (#:key outputs #:allow-other-keys) - (invoke "coq_makefile" "-f" "_CoqProject" "-o" "Makefile"))) + (invoke "sh" "./configure.sh"))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) - (setenv "COQLIB" (string-append (assoc-ref outputs "out") "/lib/coq/")) (invoke "make" (string-append "COQLIB=" (assoc-ref outputs "out") "/lib/coq/") -- cgit v1.2.3 From e6de152dc17df5fb15a618214efe375582919442 Mon Sep 17 00:00:00 2001 From: Konrad Hinsen Date: Thu, 28 Nov 2019 22:11:55 +0100 Subject: gnu: lapack: Update to 3.9.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/maths.scm (lapack): Update to 3.9.0. Signed-off-by: Ludovic Courtès --- gnu/packages/maths.scm | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 0ed61ad4a1..be6e5b21e4 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -583,7 +583,7 @@ (define-public arpack-ng-openmpi (define-public lapack (package (name "lapack") - (version "3.7.1") + (version "3.9.0") (source (origin (method url-fetch) @@ -591,26 +591,18 @@ (define-public lapack version ".tgz")) (sha256 (base32 - "1j51r7n5w4k7r3lrvy7710xrpkg40wf4rqnmngfz6ck9ypckzign")))) + "1155qixp26c12yrxc76z9mlfw2h3xxymxxv5znpgzh5gaykpndgj")))) (build-system cmake-build-system) (home-page "http://www.netlib.org/lapack/") (inputs `(("fortran" ,gfortran) - ("python" ,python-2))) + ("python" ,python-wrapper))) (arguments `(#:configure-flags (list "-DBUILD_SHARED_LIBS:BOOL=YES" "-DLAPACKE=ON" - ;; Build the 'LAPACKE_clatms' functions. - "-DLAPACKE_WITH_TMG=ON") - #:phases - (modify-phases %standard-phases - (add-before 'check 'patch-python - (lambda* (#:key inputs #:allow-other-keys) - (let ((python (assoc-ref inputs "python"))) - (substitute* "lapack_testing.py" - (("/usr/bin/env python") python))) - #t))))) + "-DLAPACKE_WITH_TMG=ON" + "-DBUILD_TESTING=ON"))) (synopsis "Library for numerical linear algebra") (description "LAPACK is a Fortran 90 library for solving the most commonly occurring -- cgit v1.2.3 From 7a0836cffdfe3ab9ee899602f218277646959144 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 7 Jan 2020 10:35:02 +0100 Subject: More module autoload changes. This is a followup to 6a7c4636d4dec47eefa03c95da5a1315bd0e0413. * guix/scripts/build.scm: Adjust #:autoload clauses. * guix/scripts/gc.scm: Likewise. --- guix/scripts/build.scm | 4 ++-- guix/scripts/gc.scm | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm index 1ab3a80e66..bf307d1421 100644 --- a/guix/scripts/build.scm +++ b/guix/scripts/build.scm @@ -43,10 +43,10 @@ (define-module (guix scripts build) #:use-module (srfi srfi-26) #:use-module (srfi srfi-34) #:use-module (srfi srfi-37) - #:autoload (gnu packages) (specification->package %package-module-path) + #:use-module (gnu packages) #:autoload (guix download) (download-to-store) #:autoload (guix git-download) (git-reference? git-reference-url) - #:autoload (guix git) (git-checkout? git-checkout-url) + #:autoload (guix git) (git-checkout git-checkout? git-checkout-url) #:use-module ((guix status) #:select (with-status-verbosity)) #:use-module ((guix progress) #:select (current-terminal-columns)) #:use-module ((guix build syscalls) #:select (terminal-columns)) diff --git a/guix/scripts/gc.scm b/guix/scripts/gc.scm index 31a05075b5..ab7c13315f 100644 --- a/guix/scripts/gc.scm +++ b/guix/scripts/gc.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2012, 2013, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -22,7 +22,9 @@ (define-module (guix scripts gc) #:use-module (guix store) #:use-module (guix store roots) #:autoload (guix build syscalls) (free-disk-space) - #:autoload (guix profiles) (generation-profile profile-generations) + #:autoload (guix profiles) (generation-profile + profile-generations + generation-number) #:autoload (guix scripts package) (delete-generations) #:use-module (ice-9 match) #:use-module (ice-9 regex) -- cgit v1.2.3 From 058d0251bd14fdbb06ce223bbecc8eb1a0d74382 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 7 Jan 2020 11:45:56 +0100 Subject: download, git: Refer to the right module in 'module-use!' call. This fixes a regression introduced in 6a7c4636d4dec47eefa03c95da5a1315bd0e0413. * guix/build/download.scm (load-gnutls): Call 'resolve-module' instead of 'current-module'. * guix/git.scm (load-git-submodules): Likewise. --- guix/build/download.scm | 3 ++- guix/git.scm | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/guix/build/download.scm b/guix/build/download.scm index 641dacefa1..0f2d5f402a 100644 --- a/guix/build/download.scm +++ b/guix/build/download.scm @@ -158,7 +158,8 @@ (define* (ftp-fetch uri file #:key timeout print-build-trace?) (define (load-gnutls) ;; XXX: Use this hack instead of #:autoload to avoid compilation errors. ;; See . - (module-use! (current-module) (resolve-interface '(gnutls))) + (module-use! (resolve-module '(guix build download)) + (resolve-interface '(gnutls))) (set! load-gnutls (const #t))) (define %x509-certificate-directory diff --git a/guix/git.scm b/guix/git.scm index 15a0a6f9e5..a12f1eec8e 100644 --- a/guix/git.scm +++ b/guix/git.scm @@ -203,7 +203,7 @@ (define (load-git-submodules) (set! load-git-submodules (const #f)) #f) (iface - (module-use! (current-module) iface) + (module-use! (resolve-module '(guix git)) iface) (set! load-git-submodules (const #t)) #t))) -- cgit v1.2.3 From fa0c1a21c96626ea054442e92f8d0d0009da8e1f Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Tue, 7 Jan 2020 16:50:48 +0100 Subject: gnu: sdl-mixer: Fix fluidsynth in dependents. Fixes . Reported by Pierre Neidhardt . * gnu/packages/sdl.scm (sdl-mixer)[arguments]<#:phases>[fix-fluidsynth]: New phase. --- gnu/packages/sdl.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 727a276dc5..df86d677ee 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -270,7 +270,18 @@ (define-public sdl-mixer "--disable-music-flac-shared" "--disable-music-fluidsynth-shared" "--disable-music-mod-shared" - "--disable-music-ogg-shared"))) + "--disable-music-ogg-shared") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-fluidsynth + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "configure" + (("EXTRA_LDFLAGS -lfluidsynth") + (string-append "EXTRA_LDFLAGS " + "-L" + (assoc-ref inputs "fluidsynth") + "/lib -lfluidsynth"))) + #t))))) (inputs `(("fluidsynth" ,fluidsynth) ("libflac" ,flac) -- cgit v1.2.3 From 0ed75a5f068541339bc1db6271796a3d382bb681 Mon Sep 17 00:00:00 2001 From: David Wilson Date: Thu, 2 Jan 2020 15:28:52 -0800 Subject: gnu: vimb: Update to 3.6.0. * gnu/packages/web-browsers.scm (vimb): Update to 3.6.0. --- gnu/packages/web-browsers.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 17c3ebf2a0..e5df56493e 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -341,7 +341,7 @@ (define-public qutebrowser (define-public vimb (package (name "vimb") - (version "3.5.0") + (version "3.6.0") (source (origin (method git-fetch) @@ -349,7 +349,7 @@ (define-public vimb (url "https://github.com/fanglingsu/vimb/") (commit version))) (sha256 - (base32 "13q7mk1hhjri0s30a98r8ncy0skf6m6lrnbqaf0jimf6sbwgiirf")) + (base32 "0228khh3lqbal046k6akqah7s5igq9s0wjfjbdjam75kjj42pbhj")) (file-name (git-file-name name version)))) (build-system glib-or-gtk-build-system) (arguments -- cgit v1.2.3 From 9020252114fba444556152a36b98b2015bb1d362 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 7 Jan 2020 00:40:48 -0500 Subject: gnu: icecat: Update to 68.4.0-guix0-preview1 [security fixes]. Includes fixes for CVE-2019-17015, CVE-2019-17016, CVE-2019-17017, CVE-2019-17021, CVE-2019-17022, and CVE-2019-17024. * gnu/packages/gnuzilla.scm (%icecat-version, %icecat-build-id): Update. (icecat-source): Update hash of upstream firefox source tarball, 'upstream-icecat-base-version', and commit and hash of gnuzilla checkout. * gnu/packages/patches/icecat-makeicecat.patch: Adapt to upstream changes. --- gnu/packages/gnuzilla.scm | 12 ++++++------ gnu/packages/patches/icecat-makeicecat.patch | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index a642f6a95f..df93c2e509 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -550,8 +550,8 @@ (define* (computed-origin-method gexp-promise hash-algo hash #:system system #:guile-for-build guile))) -(define %icecat-version "68.3.0-guix0-preview1") -(define %icecat-build-id "20191204000000") ;must be of the form YYYYMMDDhhmmss +(define %icecat-version "68.4.0-guix0-preview1") +(define %icecat-build-id "20200107000000") ;must be of the form YYYYMMDDhhmmss ;; 'icecat-source' is a "computed" origin that generates an IceCat tarball ;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat' @@ -573,11 +573,11 @@ (define icecat-source "firefox-" upstream-firefox-version ".source.tar.xz")) (sha256 (base32 - "0sfwp9vyjizj1lkvj6z51r85dl41q3l8380fkdyqdbp7f2d18cg1")))) + "077r2v7q94g8pszkl537lry0dcg9086287m9bmc0g0b98b9nzasq")))) - (upstream-icecat-base-version "68.3.0") ; maybe older than base-version + (upstream-icecat-base-version "68.4.0") ; maybe older than base-version ;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version)) - (gnuzilla-commit "85e99badac11983f6d50b0d9942f66a30f55b8e5") + (gnuzilla-commit "235b4d1181a32b71c61f6464504de8d0dae9f566") (gnuzilla-source (origin (method git-fetch) @@ -589,7 +589,7 @@ (define icecat-source (string-take gnuzilla-commit 8))) (sha256 (base32 - "00mb734yvm0r7i64mbg7hvrvhbwkcii9f9hjgwi37aizd9k0n78a")))) + "0fy9my1p8d60ibya7mc0310bglk2lrgl4bzy943k6jn9xxh8877f")))) (makeicecat-patch (local-file (search-patch "icecat-makeicecat.patch")))) diff --git a/gnu/packages/patches/icecat-makeicecat.patch b/gnu/packages/patches/icecat-makeicecat.patch index daa67f6a7a..fde209e8e3 100644 --- a/gnu/packages/patches/icecat-makeicecat.patch +++ b/gnu/packages/patches/icecat-makeicecat.patch @@ -25,7 +25,7 @@ index 8be2362..48716f2 100755 -wget -N https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${FFVERSION}esr/source/firefox-${FFVERSION}esr.source.tar.xz.asc -gpg --recv-keys --keyserver keyserver.ubuntu.com 14F26682D0916CDD81E37B6D61B7B526D98F0353 -gpg --verify firefox-${FFVERSION}esr.source.tar.xz.asc --echo -n e131149a70e7ae867d9b0ea081e8c081d056500ee51bb9270df247e977badc69 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - +-echo -n 58ab6fd342698107585da91e240c02e9b1067ca667143abfbee89184cf16f91c firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - - -echo Extracting Firefox tarball -tar -xf firefox-${FFVERSION}esr.source.tar.xz @@ -37,7 +37,7 @@ index 8be2362..48716f2 100755 +# wget -N https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${FFVERSION}esr/source/firefox-${FFVERSION}esr.source.tar.xz.asc +# gpg --recv-keys --keyserver keyserver.ubuntu.com 14F26682D0916CDD81E37B6D61B7B526D98F0353 +# gpg --verify firefox-${FFVERSION}esr.source.tar.xz.asc -+# echo -n e131149a70e7ae867d9b0ea081e8c081d056500ee51bb9270df247e977badc69 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - ++# echo -n 58ab6fd342698107585da91e240c02e9b1067ca667143abfbee89184cf16f91c firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - +# +# echo Extracting Firefox tarball +# tar -xf firefox-${FFVERSION}esr.source.tar.xz -- cgit v1.2.3 From 3293fad24a18fda7687a2ad8773ab9e01a1e05e6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 20 Dec 2019 19:22:40 +0100 Subject: gnu: googletest: Update to 1.10.0. * gnu/packages/check.scm (googletest): Update to 1.10.0. (googletest-1.8): New public variable. * gnu/packages/audio.scm (cli-visualizer)[inputs]: Change from GOOGLETEST to GOOGLETEST-1.8. * gnu/packages/serialization.scm (msgpack)[native-inputs]: Likewise. --- gnu/packages/audio.scm | 3 ++- gnu/packages/check.scm | 20 +++++++++++++++++--- gnu/packages/serialization.scm | 2 +- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 55a34460b1..cf06732e18 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3592,7 +3592,8 @@ (define-public cli-visualizer `(("which" ,which))) (inputs `(("fftw" ,fftw) - ("googletest" ,googletest) + ;; TODO: Try using the latest googletest for versions > 1.6. + ("googletest" ,googletest-1.8) ("ncurses" ,ncurses) ("pulseaudio" ,pulseaudio))) (arguments diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 9de658e790..367f87e2e2 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -25,7 +25,7 @@ ;;; Copyright © 2017, 2019 Kei Kebreau ;;; Copyright © 2017 ng0 ;;; Copyright © 2015, 2017, 2018 Ricardo Wurmus -;;; Copyright © 2016, 2017, 2018, 2019 Marius Bakke +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Marius Bakke ;;; Copyright © 2017, 2018 Ludovic Courtès ;;; Copyright © 2018 Fis Trivial ;;; Copyright © 2019 Pierre Langlois @@ -505,7 +505,7 @@ (define-public go-github.com-smartystreets-goconvey (define-public googletest (package (name "googletest") - (version "1.8.1") + (version "1.10.0") (source (origin (method git-fetch) @@ -514,7 +514,7 @@ (define-public googletest (commit (string-append "release-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0270msj6n7mggh4xqqjp54kswbl7mkcc8px1p5dqdpmw5ngh9fzk")))) + (base32 "1zbmab9295scgg4z2vclgfgjchfjailjnvzc6f5x9jvlsdi3dpwz")))) (build-system cmake-build-system) (arguments `(#:configure-flags '("-DBUILD_SHARED_LIBS=ON"))) @@ -527,6 +527,20 @@ (define-public googletest generation.") (license license:bsd-3))) +(define-public googletest-1.8 + (package/inherit + googletest + (version "1.8.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/google/googletest.git") + (commit (string-append "release-" version)))) + (file-name (git-file-name "googletest" version)) + (sha256 + (base32 + "0270msj6n7mggh4xqqjp54kswbl7mkcc8px1p5dqdpmw5ngh9fzk")))))) + (define-public cpputest (package (name "cpputest") diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index 137ecce4e4..cf80237f11 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -123,7 +123,7 @@ (define-public msgpack (base32 "1ljqmgscdb0f8w8kx2lnswnisyxchcmijbjbmswkv0g187bvqg23")))) (build-system cmake-build-system) (native-inputs - `(("googletest" ,googletest) + `(("googletest" ,googletest-1.8) ("pkg-config" ,pkg-config))) (propagated-inputs `(("zlib" ,zlib))) ;; Msgpack installs two headers (zbuffer.h, -- cgit v1.2.3 From aa8f64b2507bfef63b81db45cc6708e04de913d7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 21 Dec 2019 00:39:32 +0100 Subject: gnu: python-patsy: Update to 0.5.1. * gnu/packages/statistics.scm (python-patsy): Update to 0.5.1. [source](uri): Adjust for new archive. [native-inputs]: Remove UNZIP. --- gnu/packages/statistics.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 536de0fd7b..e7fd5bd084 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1843,13 +1843,13 @@ (define-public r-xtable (define-public python-patsy (package (name "python-patsy") - (version "0.4.1") + (version "0.5.1") (source (origin (method url-fetch) - (uri (pypi-uri "patsy" version ".zip")) + (uri (pypi-uri "patsy" version)) (sha256 (base32 - "1m6knyq8hbqlx242y4da02j0x86j4qggs1j7q186w3jv0j0c476w")))) + "149rbrdzwns0ay88caf1zsm1r53v1q5np1mrb36na50y432cw5gi")))) (build-system python-build-system) (arguments `(#:phases @@ -1861,8 +1861,7 @@ (define-public python-patsy ("python-scipy" ,python-scipy) ("python-six" ,python-six))) (native-inputs - `(("python-nose" ,python-nose) - ("unzip" ,unzip))) + `(("python-nose" ,python-nose))) (home-page "https://github.com/pydata/patsy") (synopsis "Describe statistical models and build design matrices") (description -- cgit v1.2.3 From 2316f027f806965062fc842f0ad5be28582c54c5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 19 Dec 2019 19:15:21 +0100 Subject: gnu: rocksdb: Update to 6.5.2. * gnu/packages/databases.scm (rocksdb): Update to 6.5.2. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 32c57f3607..ca15c77026 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1128,7 +1128,7 @@ (define-public emacs-recutils (define-public rocksdb (package (name "rocksdb") - (version "5.18.3") + (version "6.5.2") (source (origin (method git-fetch) (uri (git-reference @@ -1137,7 +1137,7 @@ (define-public rocksdb (file-name (git-file-name name version)) (sha256 (base32 - "1v2slmmr1dsgf8z0qcfg1y9x1al96859rg48b66p9nsawczd5zv9")) + "01f5lcrcr809jhkkvxhv743hwpcxszj4r30hy9qy1i0mvjky02vf")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From be23ce2c7cdb696ff20f65750f939f316991e92f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 21 Dec 2019 15:18:13 +0100 Subject: gnu: Ceph: Update to 14.2.5. This also removes test-specific code to ease the Python 3 transition, and because it is mostly obsolete. * gnu/packages/patches/ceph-detect-rocksdb.patch, gnu/packages/patches/ceph-skip-unittest_blockdev.patch, gnu/packages/patches/ceph-skip-collect-sys-info-test.patch: Delete files. * gnu/packages/patches/ceph-boost-compat.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/storage.scm (ceph): Update to 14.2.5. [source](patches): Adjust as above. [source](snippet): Remove bundled "fmt", "c-ares" and "googletest". [arguments]: Add "-DCMAKE_INSTALL_DATADIR" and "-DWITH_RADOSGW_AMQP_ENDPOINT" and "-DWITH_TESTS" in #:configure-flags; remove "-DWITH_XIO". Remove obsolete substitutions. Don't install 'ceph-disk' and 'ceph-detect-init', which no longer exists. Remove test-specific substitutions and phases. Adjust for Python 2->3 in inputs. [native-inputs]: Remove INETUTILS, JQ, PERL, XMLSTARLET, PYTHON2-CRAM, PYTHON2-VIRTUALENV, PYTHON2-CONFIGOBJ, PYTHON2-COVERAGE, PYTHON2-DISCOVER, PYTHON2-FLAKE8, PYTHON2-MOCK, PYTHON2-NOSE, PYTHON2-PIP, PYTHON2-PYTEST, PYTHON2-SUBUNIT PYTHON2-TESTREPOSITORY, PYTHON2-TESTTOOLS, and PYTHON2-TOX. [inputs]: Change from BOOST to BOOST-WITH-PYTHON3. Remove GPTFDISK, PARTED, PYTHON-2, PYTHON2-SIX, PYTHON2-PRETTYTABLE, and PYTHON-3. Add PYTHON-SIX, PYTHON-PRETTYTABLE, PYTHON-WRAPPER, LIBCAP-NG, LIBNL, NCURSES, and RDMA-CORE. --- gnu/local.mk | 4 +- gnu/packages/patches/ceph-boost-compat.patch | 81 +++++++++ gnu/packages/patches/ceph-detect-rocksdb.patch | 24 --- .../patches/ceph-skip-collect-sys-info-test.patch | 24 --- .../patches/ceph-skip-unittest_blockdev.patch | 24 --- gnu/packages/storage.scm | 199 ++++----------------- 6 files changed, 120 insertions(+), 236 deletions(-) create mode 100644 gnu/packages/patches/ceph-boost-compat.patch delete mode 100644 gnu/packages/patches/ceph-detect-rocksdb.patch delete mode 100644 gnu/packages/patches/ceph-skip-collect-sys-info-test.patch delete mode 100644 gnu/packages/patches/ceph-skip-unittest_blockdev.patch diff --git a/gnu/local.mk b/gnu/local.mk index b40cb1247b..3e0ab25a95 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -761,10 +761,8 @@ dist_patch_DATA = \ %D%/packages/patches/catdoc-CVE-2017-11110.patch \ %D%/packages/patches/cdparanoia-fpic.patch \ %D%/packages/patches/cdrtools-3.01-mkisofs-isoinfo.patch \ - %D%/packages/patches/ceph-detect-rocksdb.patch \ + %D%/packages/patches/ceph-boost-compat.patch \ %D%/packages/patches/ceph-disable-cpu-optimizations.patch \ - %D%/packages/patches/ceph-skip-collect-sys-info-test.patch \ - %D%/packages/patches/ceph-skip-unittest_blockdev.patch \ %D%/packages/patches/ceph-volume-respect-PATH.patch \ %D%/packages/patches/chmlib-inttypes.patch \ %D%/packages/patches/clamav-config-llvm-libs.patch \ diff --git a/gnu/packages/patches/ceph-boost-compat.patch b/gnu/packages/patches/ceph-boost-compat.patch new file mode 100644 index 0000000000..b3df659d6b --- /dev/null +++ b/gnu/packages/patches/ceph-boost-compat.patch @@ -0,0 +1,81 @@ +Fix compatibility with Boost 1.70. + +Adapted for 14.2.5 from these upstream commits: +https://github.com/ceph/ceph/commit/064f142746ae97f54865069cdacf5aae2b1b14f6 +https://github.com/ceph/ceph/commit/f1651b8c509d60787d10c4115e29fecfd2da237c + +diff --git a/src/rgw/rgw_asio_frontend.cc b/src/rgw/rgw_asio_frontend.cc +--- a/src/rgw/rgw_asio_frontend.cc ++++ b/src/rgw/rgw_asio_frontend.cc +@@ -83,7 +83,8 @@ + using SharedMutex = ceph::async::SharedMutex; + + template +-void handle_connection(RGWProcessEnv& env, Stream& stream, ++void handle_connection(boost::asio::io_context& context, ++ RGWProcessEnv& env, Stream& stream, + parse_buffer& buffer, bool is_ssl, + SharedMutex& pause_mutex, + rgw::dmclock::Scheduler *scheduler, +@@ -160,7 +161,7 @@ + rgw::io::add_conlen_controlling( + &real_client)))); + RGWRestfulIO client(cct, &real_client_io); +- auto y = optional_yield{socket.get_io_context(), yield}; ++ auto y = optional_yield{context, yield}; + process_request(env.store, env.rest, &req, env.uri_prefix, + *env.auth_registry, &client, env.olog, y, scheduler); + } +@@ -604,7 +605,7 @@ + return; + } + buffer->consume(bytes); +- handle_connection(env, stream, *buffer, true, pause_mutex, ++ handle_connection(context, env, stream, *buffer, true, pause_mutex, + scheduler.get(), ec, yield); + if (!ec) { + // ssl shutdown (ignoring errors) +@@ -622,7 +623,7 @@ + auto c = connections.add(conn); + auto buffer = std::make_unique(); + boost::system::error_code ec; +- handle_connection(env, s, *buffer, false, pause_mutex, ++ handle_connection(context, env, s, *buffer, false, pause_mutex, + scheduler.get(), ec, yield); + s.shutdown(tcp::socket::shutdown_both, ec); + }); +diff --git a/src/rgw/rgw_dmclock_async_scheduler.h b/src/rgw/rgw_dmclock_async_scheduler.h +--- a/src/rgw/rgw_dmclock_async_scheduler.h ++++ b/src/rgw/rgw_dmclock_async_scheduler.h +@@ -82,7 +82,12 @@ class AsyncScheduler : public md_config_obs_t, public Scheduler { + using Completion = async::Completion>; + + using Clock = ceph::coarse_real_clock; ++#if BOOST_VERSION < 107000 + using Timer = boost::asio::basic_waitable_timer; ++#else ++ using Timer = boost::asio::basic_waitable_timer, executor_type>; ++#endif + Timer timer; //< timer for the next scheduled request + + CephContext *const cct; +diff --git a/src/rgw/rgw_reshard.h b/src/rgw/rgw_reshard.h +--- a/src/rgw/rgw_reshard.h ++++ b/src/rgw/rgw_reshard.h +@@ -183,7 +183,14 @@ class RGWReshardWait { + ceph::condition_variable cond; + + struct Waiter : boost::intrusive::list_base_hook<> { +- boost::asio::basic_waitable_timer timer; ++#if BOOST_VERSION < 107000 ++ using Timer = boost::asio::basic_waitable_timer; ++#else ++ using Executor = boost::asio::io_context::executor_type; ++ using Timer = boost::asio::basic_waitable_timer, Executor>; ++#endif ++ Timer timer; + explicit Waiter(boost::asio::io_context& ioc) : timer(ioc) {} + }; + boost::intrusive::list waiters; diff --git a/gnu/packages/patches/ceph-detect-rocksdb.patch b/gnu/packages/patches/ceph-detect-rocksdb.patch deleted file mode 100644 index badad6d1b9..0000000000 --- a/gnu/packages/patches/ceph-detect-rocksdb.patch +++ /dev/null @@ -1,24 +0,0 @@ -Help the build system find system RocksDB. - -Taken from this upstream commit: -https://github.com/ceph/ceph/commit/2ac26bd0e01fd6c82bd59936cf25c25173f7775a - -diff --git a/cmake/modules/Findrocksdb.cmake b/cmake/modules/Findrocksdb.cmake -index f8369f73fc..5926647348 100644 ---- a/cmake/modules/Findrocksdb.cmake -+++ b/cmake/modules/Findrocksdb.cmake -@@ -15,11 +15,11 @@ find_library(ROCKSDB_LIBRARIES rocksdb) - - if(ROCKSDB_INCLUDE_DIR AND EXISTS "${ROCKSDB_INCLUDE_DIR}/rocksdb/version.h") - foreach(ver "MAJOR" "MINOR" "PATCH") -- file(STRINGS "${ROCKSDB_INCLUDE_DIR}/version.h" ROCKSDB_VER_${ver}_LINE -+ file(STRINGS "${ROCKSDB_INCLUDE_DIR}/rocksdb/version.h" ROCKSDB_VER_${ver}_LINE - REGEX "^#define[ \t]+ROCKSDB_${ver}[ \t]+[0-9]+$") - string(REGEX REPLACE "^#define[ \t]+ROCKSDB_${ver}[ \t]+([0-9]+)$" -- "\\1" ROCKSDB_VERSION_${ver} "${ROCKDB_VER_${ver}_LINE}") -- unset(${ROCKDB_VER_${ver}_LINE}) -+ "\\1" ROCKSDB_VERSION_${ver} "${ROCKSDB_VER_${ver}_LINE}") -+ unset(${ROCKSDB_VER_${ver}_LINE}) - endforeach() - set(ROCKSDB_VERSION_STRING - "${ROCKSDB_VERSION_MAJOR}.${ROCKSDB_VERSION_MINOR}.${ROCKSDB_VERSION_PATCH}") diff --git a/gnu/packages/patches/ceph-skip-collect-sys-info-test.patch b/gnu/packages/patches/ceph-skip-collect-sys-info-test.patch deleted file mode 100644 index 429087c661..0000000000 --- a/gnu/packages/patches/ceph-skip-collect-sys-info-test.patch +++ /dev/null @@ -1,24 +0,0 @@ -This test fails because /etc/os-release is not available. - -diff --git a/src/test/common/test_util.cc b/src/test/common/test_util.cc -index 64eace923c..6daf4aa514 100644 ---- a/src/test/common/test_util.cc -+++ b/src/test/common/test_util.cc -@@ -32,17 +32,3 @@ TEST(util, unit_to_bytesize) - ASSERT_EQ(65536ll, unit_to_bytesize(" 64K", &cerr)); - } - --#if defined(__linux__) --TEST(util, collect_sys_info) --{ -- map sys_info; -- -- CephContext *cct = (new CephContext(CEPH_ENTITY_TYPE_CLIENT))->get(); -- collect_sys_info(&sys_info, cct); -- -- ASSERT_TRUE(sys_info.find("distro") != sys_info.end()); -- ASSERT_TRUE(sys_info.find("distro_description") != sys_info.end()); -- -- cct->put(); --} --#endif diff --git a/gnu/packages/patches/ceph-skip-unittest_blockdev.patch b/gnu/packages/patches/ceph-skip-unittest_blockdev.patch deleted file mode 100644 index 407bd93278..0000000000 --- a/gnu/packages/patches/ceph-skip-unittest_blockdev.patch +++ /dev/null @@ -1,24 +0,0 @@ -This test tries to walk a sysfs path and hits a null pointer exception. - -/tmp/guix-build-ceph-12.0.0.drv-0/ceph-12.0.0/src/test/common/test_blkdev.cc:32: Failure -Expected: (dir) != (nullptr), actual: NULL vs 8-byte object <00-00 00-00 00-00 00-00> - -diff --git a/src/test/common/CMakeLists.txt b/src/test/common/CMakeLists.txt ---- a/src/test/common/CMakeLists.txt -+++ b/src/test/common/CMakeLists.txt -@@ -12,15 +12,6 @@ - ${CMAKE_DL_LIBS} - ) - --if(HAVE_BLKID) -- # unittest_blkdev -- add_executable(unittest_blkdev -- test_blkdev.cc -- ) -- add_ceph_unittest(unittest_blkdev) -- target_link_libraries(unittest_blkdev ceph-common ${BLKID_LIBRARIES}) --endif() -- - # unittest_bloom_filter - add_executable(unittest_bloom_filter - test_bloom_filter.cc diff --git a/gnu/packages/storage.scm b/gnu/packages/storage.scm index 5c702e3362..73d88f76ee 100644 --- a/gnu/packages/storage.scm +++ b/gnu/packages/storage.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017, 2018, 2019 Marius Bakke +;;; Copyright © 2017, 2018, 2019, 2020 Marius Bakke ;;; Copyright © 2017 Rutger Helling ;;; ;;; This file is part of GNU Guix. @@ -29,21 +29,19 @@ (define-module (gnu packages storage) #:use-module (gnu packages authentication) #:use-module (gnu packages bdw-gc) #:use-module (gnu packages boost) - #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages crypto) #:use-module (gnu packages cryptsetup) #:use-module (gnu packages curl) #:use-module (gnu packages databases) #:use-module (gnu packages disk) - #:use-module (gnu packages gcc) #:use-module (gnu packages gperf) #:use-module (gnu packages jemalloc) #:use-module (gnu packages linux) #:use-module (gnu packages lua) + #:use-module (gnu packages ncurses) #:use-module (gnu packages nss) #:use-module (gnu packages openldap) - #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) @@ -55,18 +53,16 @@ (define-module (gnu packages storage) (define-public ceph (package (name "ceph") - (version "13.2.6") + (version "14.2.5") (source (origin (method url-fetch) (uri (string-append "https://download.ceph.com/tarballs/ceph-" version ".tar.gz")) (sha256 (base32 - "13f5qs7jpxprplk4irwlx90mc9gvm48fvd3q471xcqc3n6z1qywz")) + "0wbkdplxs8higmlj57a7rydmx9rq08h0arjrmxmp0s80bn0v5x2c")) (patches - (search-patches "ceph-skip-unittest_blockdev.patch" - "ceph-skip-collect-sys-info-test.patch" - "ceph-detect-rocksdb.patch" + (search-patches "ceph-boost-compat.patch" "ceph-volume-respect-PATH.patch" "ceph-disable-cpu-optimizations.patch")) (modules '((guix build utils))) @@ -76,11 +72,13 @@ (define-public ceph '(;; TODO: Unbundle these: ;"src/isa-l" ;"src/lua" - ;"src/googletest" ;"src/xxHash" ;"src/zstd" ;"src/civetweb" + "src/seastar/fmt" "src/test/downloads" + "src/c-ares" + "src/googletest" "src/rapidjson" "src/spdk" "src/rocksdb" @@ -100,6 +98,7 @@ (define-public ceph (string-append "-DCMAKE_INSTALL_RPATH=" libdir ";" libdir "/ceph") (string-append "-DCMAKE_INSTALL_SYSCONFDIR=" out "/etc") + (string-append "-DCMAKE_INSTALL_DATADIR=" lib "/share") (string-append "-DCMAKE_INSTALL_MANDIR=" out "/share/man") (string-append "-DCMAKE_INSTALL_DOCDIR=" out "/share/ceph/doc") (string-append "-DCMAKE_INSTALL_LIBEXECDIR=" out "/libexec") @@ -117,9 +116,14 @@ (define-public ceph "-DWITH_BABELTRACE=OFF" "-DWITH_LTTNG=OFF" "-DWITH_SPDK=OFF" - "-DWITH_XIO=OFF" + "-DWITH_RADOSGW_AMQP_ENDPOINT=OFF" + ;; Use jemalloc instead of tcmalloc. - "-DALLOCATOR=jemalloc")) + "-DALLOCATOR=jemalloc" + + ;; Do not bother building the tests; we are not currently running + ;; them, and they do not build with system googletest as of 14.2.5. + "-DWITH_TESTS=OFF")) ;; FIXME: Some of the tests leak Btrfs subvolumes on Btrfs. See ;; for details. Disable tests until ;; resolved. @@ -144,111 +148,19 @@ (define-public ceph indent "extra_link_args=['-Wl,-rpath=" lib "/lib'],\n"))) - (substitute* "src/ceph-disk/tox.ini" - ;; Disable flake8 test since it complains about too long lines. - (("envlist = flake8,py27") "envlist = py27")) - - (substitute* "src/ceph-detect-init/tox.ini" - ;; Disable python3 tests until we at least get py2 working. - (("envlist = pep8,py27,py3") "envlist = pep8,py27")) - - (substitute* "src/key_value_store/kv_flat_btree_async.cc" - (("/usr/include/") "")) - - (substitute* "src/test/test_subprocess.cc" - (("/bin/sh") (which "sh"))) - (substitute* "qa/standalone/special/ceph_objectstore_tool.py" - (("/bin/rm") (which "rm"))) - (substitute* "src/ceph-disk/ceph_disk/main.py" - (("/bin/mount") "mount") - (("/bin/umount") "umount") - (("/sbin/blkid") (which "blkid")) - (("'cryptsetup'") (string-append "'" (which "cryptsetup") "'")) - (("'sgdisk'") (string-append "'" (which "sgdisk") "'")) - (("'parted'") (string-append "'" (which "parted") "'")) - (("'udevadm'") (string-append "'" (which "udevadm") "'"))) + ;; Statically link libcrc32 because it does not get installed, + ;; yet several libraries end up referring to it. + (substitute* "src/common/CMakeLists.txt" + (("add_library\\(crc32") + "add_library(crc32 STATIC")) (substitute* "udev/50-rbd.rules" (("/usr/bin/ceph-rbdnamer") (string-append out "/bin/ceph-rbdnamer"))) - (substitute* "udev/60-ceph-by-parttypeuuid.rules" - (("/sbin/blkid") (which "blkid"))) - (substitute* "udev/95-ceph-osd.rules" - (("/usr/sbin/ceph-disk") - (string-append out "/bin/ceph-disk"))) - - (substitute* "src/test/run-cli-tests" - ;; Use our python-cram instead of the (un)bundled one. - (("CRAM_BIN=.*$") - (string-append "CRAM_BIN=" (which "cram") "\n"))) - - ;; Disable tests that are known to fail. - ;; TODO: The majority of these fail because - ;; 'qa/workunits/ceph-helpers.sh' expects to find - ;; /tmp/ceph-disk-virtualenv/bin/ceph-disk, but somehow - ;; src/ceph-disk/CMakeLists.txt fails to create it. - (substitute* "src/test/CMakeLists.txt" - ;; FIXME: These tests fails because `ceph-disk' - ;; is not available. - (("^add_ceph_test\\(test-ceph-helpers\\.sh.*$") "\n") - (("^add_ceph_test\\(test_pidfile\\.sh.*$") "\n") - ;; XXX Why does this fail. - (("^add_ceph_test\\(cephtool-test-mon\\.sh.*$") "\n") - ;; This fails due to missing '/etc/fstab'. - (("^add_ceph_test\\(cephtool-test-rados\\.sh.*$") "\n") - ;; `Bad messages to stderr: OSD has the store locked' - (("^add_ceph_test\\(ceph_objectstore_tool\\.py.*$") "\n") - ;; The bundled python-cram fork needs patching to work on - ;; guix, and the system version does not support --error-dir. - ;; https://bitbucket.org/brodie/cram/issues/9 - (("^add_ceph_test\\(run-cli-tests.*$") "\n") - ;; FIXME: tox/virtualenv/pip does not discover the - ;; required packages and tries to go online. - (("^add_test\\(NAME run-tox-ceph-disk.*$") "\n") - (("^add_test\\(NAME run-tox-ceph-detect-init.*$") "\n") - ;; Also remove from the set_property block. - (("run-tox-ceph-disk") "") - (("run-tox-ceph-detect-init") "")) - ;; TODO: This also seems to fail because of /etc/os-release. - ;; How to make src/common/util.cc behave without it. - (substitute* "src/test/crush/CMakeLists.txt" - (("^add_ceph_test\\(crush-classes\\.sh.*$") "\n")) - ;; More 'ceph-disk' issues here.. :-( - (substitute* "src/test/erasure-code/CMakeLists.txt" - (("^add_ceph_test\\(test-erasure-code-plugins\\.sh.*$") "\n") - (("^add_ceph_test\\(test-erasure-code\\.sh.*$") "\n") - (("^add_ceph_test\\(test-erasure-eio\\.sh.*$") "\n")) - (substitute* "src/test/libradosstriper/CMakeLists.txt" - (("^add_ceph_test\\(rados-striper\\.sh.*$") "\n")) - (substitute* "src/test/mon/CMakeLists.txt" - (("^add_ceph_test\\(osd-crush\\.sh.*$") "\n") - (("^add_ceph_test\\(test_pool_quota\\.sh.*$") "\n") - (("^add_ceph_test\\(osd-pool-create\\.sh.*$") "\n")) - (substitute* "src/test/osd/CMakeLists.txt" - (("^add_ceph_test\\(osd-bench\\.sh.*$") "\n") - (("^add_ceph_test\\(osd-config\\.sh.*$") "\n") - (("add_ceph_test\\(osd-dup\\.sh.*$") "\n") - (("^add_ceph_test\\(osd-markdown\\.sh.*$") "\n") - (("^add_ceph_test\\(osd-reactivate\\.sh.*$") "\n") - (("^add_ceph_test\\(osd-reuse-id\\.sh.*$") "\n") - (("^add_ceph_test\\(osd-scrub-repair\\.sh.*$") "\n") - (("^add_ceph_test\\(osd-scrub-snaps\\.sh.*$") "\n") - (("^add_ceph_test\\(osd-copy-from\\.sh.*$") "\n") - (("^add_ceph_test\\(osd-fast-mark-down\\.sh.*$") "\n")) #t))) - (add-before 'check 'set-check-environment - (lambda _ - ;; Run tests in parallel. - (setenv "CTEST_PARALLEL_LEVEL" - (number->string (parallel-job-count))) - ;; `pip' requires write access in $HOME. - (setenv "HOME" "/tmp") - #t)) (add-before 'install 'set-install-environment (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (py2sitedir - (string-append out "/lib/python2.7/site-packages")) (py3sitedir (string-append out "/lib/python" ,(version-major+minor @@ -257,20 +169,21 @@ (define-public ceph ;; The Python install scripts refuses to function if ;; the install directory is not on PYTHONPATH. (setenv "PYTHONPATH" - (string-append py2sitedir ":" py3sitedir ":" + (string-append py3sitedir ":" (getenv "PYTHONPATH"))) #t))) (add-after 'install 'wrap-python-scripts (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (scripts '("ceph" "ceph-mgr" "ceph-volume" - "ceph-detect-init" - "ceph-disk")) ;deprecated - (prettytable (assoc-ref inputs "python2-prettytable")) - (six (assoc-ref inputs "python2-six")) + (scripts '("ceph" "ceph-mgr" "ceph-volume")) + (prettytable (assoc-ref inputs "python-prettytable")) + (six (assoc-ref inputs "python-six")) (sitedir (lambda (package) (string-append package - "/lib/python2.7/site-packages"))) + "/lib/python" + ,(version-major+minor + (package-version python)) + "/site-packages"))) (PYTHONPATH (string-append (sitedir out) ":" (sitedir six) ":" @@ -279,17 +192,6 @@ (define-public ceph (wrap-program (string-append out "/bin/" executable) `("PYTHONPATH" ":" prefix (,PYTHONPATH)))) scripts) - #t))) - (add-before 'validate-runpath 'remove-test-executables - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - ;; FIXME: The BUILD_SHARED_LIBS CMake flag causes the test executables - ;; to link the bundled googletest dynamically, which in turn causes - ;; RUNPATH validation failures because 'libgtest.so' and friends do - ;; not get absolute RUNPATH entries. The next version of Ceph can use - ;; an external googletest; for now just remove the test executables. - (for-each delete-file (find-files (string-append out "/bin") - "ceph_(test|perf)")) #t)))))) (outputs '("out" "lib")) @@ -298,58 +200,33 @@ (define-public ceph ("pkg-config" ,pkg-config) ("python-cython" ,python-cython) ("python-sphinx" ,python-sphinx) - ("yasm" ,yasm) - - ;; For tests. - ("inetutils" ,inetutils) - ("jq" ,jq) - ("perl" ,perl) - ("xmlstarlet" ,xmlstarlet) - ("python2-cram" ,python2-cram) - ("python2-virtualenv" ,python2-virtualenv) - - ;; These dependencies are taken from test-requirements.txt - ;; of ceph-disk and ceph-detect-init. The latter can also - ;; test against python3, but let's try to get python2 tests - ;; working first since that is the default. - ("python2-configobj" ,python2-configobj) - ("python2-coverage" ,python2-coverage) - ("python2-discover" ,python2-discover) - ("python2-fixtures" ,python2-fixtures) - ("python2-flake8" ,python2-flake8) - ("python2-mock" ,python2-mock) - ("python2-nose" ,python2-nose) - ("python2-pip" ,python2-pip) - ("python2-pytest" ,python2-pytest) - ("python2-subunit" ,python2-subunit) - ("python2-testrepository" ,python2-testrepository) - ("python2-testtools" ,python2-testtools) - ("python2-tox" ,python2-tox))) + ("yasm" ,yasm))) (inputs - `(("boost" ,boost) + `(("boost" ,boost-with-python3) ("curl" ,curl) ("cryptsetup" ,cryptsetup) ("expat" ,expat) ("fcgi" ,fcgi) ("fuse" ,fuse) - ("gptfdisk" ,gptfdisk) ("jemalloc" ,jemalloc) ("keyutils" ,keyutils) ("leveldb" ,leveldb) ("libaio" ,libaio) ("libatomic-ops" ,libatomic-ops) + ("libcap-ng" ,libcap-ng) + ("libnl" ,libnl) ("lua" ,lua) ("lz4" ,lz4) ("oath-toolkit" ,oath-toolkit) ("openldap" ,openldap) ("openssl" ,openssl) + ("ncurses" ,ncurses) ("nss" ,nss) - ("parted" ,parted) - ("python@2" ,python-2) - ("python2-prettytable" ,python2-prettytable) ;used by ceph_daemon.py - ("python2-six" ,python2-six) ;for ceph-mgr + plugins - ("python@3" ,python-3) + ("python-prettytable" ,python-prettytable) ;used by ceph_daemon.py + ("python-six" ,python-six) ;for ceph-mgr + plugins + ("python" ,python-wrapper) ("rapidjson" ,rapidjson) + ("rdma-core" ,rdma-core) ("rocksdb" ,rocksdb) ("snappy" ,snappy) ("udev" ,eudev) -- cgit v1.2.3 From f8157512a33c032261c903c9b39243a183640f01 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 5 Jan 2020 09:26:42 +0100 Subject: gnu: ungoogled-chromium: Do not set LD_LIBRARY_PATH in wrapper. * gnu/packages/chromium.scm (ungoogled-chromium)[arguments]: Add phase 'add-absolute-references'. Don't wrap with LD_LIBRARY_PATH. --- gnu/packages/chromium.scm | 47 +++++++++++++++++++++++++++++++---------------- 1 file changed, 31 insertions(+), 16 deletions(-) diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index 9d194de0e6..d31e0bcac5 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2019 Marius Bakke +;;; Copyright © 2019, 2020 Marius Bakke ;;; Copyright © 2019 Alex Griffin ;;; ;;; This file is part of GNU Guix. @@ -453,8 +453,7 @@ (define-public ungoogled-chromium (build-system gnu-build-system) (arguments `(#:tests? #f - ;; FIXME: Chromiums RUNPATH lacks entries for some libraries, so - ;; we have to disable validation and add a wrapper below. + ;; FIXME: Chromiums RUNPATH lacks entries for some libraries. #:validate-runpath? #f #:modules ((guix build gnu-build-system) (guix build utils) @@ -555,12 +554,7 @@ (define-public ungoogled-chromium #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-stuff - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "printing/cups_config_helper.py" - (("cups_config =.*") - (string-append "cups_config = '" (assoc-ref inputs "cups") - "/bin/cups-config'\n"))) - + (lambda _ (substitute* '("base/process/launch_posix.cc" "base/third_party/dynamic_annotations/dynamic_annotations.c" @@ -630,6 +624,34 @@ (define-public ungoogled-chromium "chrome/test/chromedriver/extension/manifest.json"))) #t)) + (add-after 'patch-stuff 'add-absolute-references + (lambda* (#:key inputs #:allow-other-keys) + (let ((cups (assoc-ref inputs "cups")) + (nss (assoc-ref inputs "nss")) + (mesa (assoc-ref inputs "mesa")) + (udev (assoc-ref inputs "udev"))) + (substitute* "printing/cups_config_helper.py" + (("cups_config =.*") + (string-append "cups_config = '" cups + "/bin/cups-config'\n"))) + (substitute* "crypto/nss_util.cc" + (("libnssckbi\\.so") + (string-append nss "/lib/nss/libnssckbi.so"))) + (substitute* "device/udev_linux/udev1_loader.cc" + (("libudev\\.so\\.1") + (string-append udev "/lib/libudev.so.1"))) + (substitute* + '("ui/ozone/platform/x11/gl_ozone_glx.cc" + "ui/ozone/common/egl_util.cc" + "ui/gl/init/gl_initializer_x11.cc" + "third_party/angle/src/libANGLE/renderer/gl/glx/FunctionsGLX.cpp") + (("libGL\\.so\\.1") + (string-append mesa "/lib/libGL.so.1")) + (("libEGL\\.so\\.1") + (string-append mesa "/lib/libEGL.so.1")) + (("libGLESv2\\.so\\.2") + (string-append mesa "/lib/libGLESv2.so.2"))) + #t))) (add-before 'configure 'prepare-build-environment (lambda* (#:key inputs #:allow-other-keys) @@ -699,9 +721,6 @@ (define-public ungoogled-chromium (resources (string-append lib "/resources")) (preferences (assoc-ref inputs "master-preferences")) (gtk+ (assoc-ref inputs "gtk+")) - (mesa (assoc-ref inputs "mesa")) - (nss (assoc-ref inputs "nss")) - (udev (assoc-ref inputs "udev")) (sh (which "sh"))) (substitute* '("chrome/app/resources/manpage.1.in" @@ -735,10 +754,6 @@ (define-public ungoogled-chromium (install-file "chromedriver" bin) (wrap-program exe - ;; TODO: Get these in RUNPATH. - `("LD_LIBRARY_PATH" ":" prefix - (,(string-append lib ":" nss "/lib/nss:" mesa "/lib:" - udev "/lib"))) ;; Avoid file manager crash. See . `("XDG_DATA_DIRS" ":" prefix (,(string-append gtk+ "/share"))))) -- cgit v1.2.3 From 07b10725da1a9f69bd2619cfe67c0a455ecd8e3f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 5 Jan 2020 09:30:09 +0100 Subject: gnu: ungoogled-chromium: Lower resource limits. * gnu/packages/chromium.scm (ungoogled-chromium)[arguments]: Decrease maximum number of open files from 4096 to 2048. --- gnu/packages/chromium.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index d31e0bcac5..dc8e041219 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -688,17 +688,17 @@ (define-public ungoogled-chromium ;; accesses. Having a too low ulimit will result in bogus linker ;; errors such as "foo.a: error adding symbols: malformed archive". - ;; Try increasing the soft resource limit of max open files to 4096, + ;; Try increasing the soft resource limit of max open files to 2048, ;; or equal to the hard limit, whichever is lower. (call-with-values (lambda () (getrlimit 'nofile)) (lambda (soft hard) - (when (and soft (< soft 4096)) + (when (and soft (< soft 2048)) (if hard - (setrlimit 'nofile (min hard 4096) hard) - (setrlimit 'nofile 4096 #f)) + (setrlimit 'nofile (min hard 2048) hard) + (setrlimit 'nofile 2048 #f)) (format #t "increased maximum number of open files from ~d to ~d~%" - soft (if hard (min hard 4096) 4096))))) + soft (if hard (min hard 2048) 2048))))) #t)) (replace 'build (lambda* (#:key (parallel-build? #t) #:allow-other-keys) -- cgit v1.2.3 From 2536027cc5b547109953aa31b79f9a507985850d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 5 Jan 2020 11:06:50 +0100 Subject: gnu: colord: Adjust inputs. * gnu/packages/gnome.scm (colord)[native-inputs]: Remove unused LIBTOOL and INTLTOOL. Add previously propagated GETTEXT-MINIMAL. --- gnu/packages/gnome.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index e71cc2fee2..5005f00eb8 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3557,10 +3557,9 @@ (define-public colord #t)))))) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-compile-resources, etc. + ("gettext" ,gettext-minimal) ("gobject-introspection" ,gobject-introspection) ("gtk-doc" ,gtk-doc) - ("intltool" ,intltool) - ("libtool" ,libtool) ("pkg-config" ,pkg-config) ("vala" ,vala))) (propagated-inputs -- cgit v1.2.3 From 517c55381e190b2d6bdba95c45a6c895831b9721 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 7 Jan 2020 14:28:09 +0100 Subject: gnu: libgeotiff: Propagate proj. * gnu/packages/geo.scm (libgeotiff)[inputs]: Move PROJ ... [propagated-inputs]: ... here. New field. --- gnu/packages/geo.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 8e8e6dbe3b..df65c75154 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2019 Efraim Flashner ;;; Copyright © 2019 Wiktor Żelazny ;;; Copyright © 2019 Hartmut Goebel +;;; Copyright © 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -252,8 +253,10 @@ (define-public libgeotiff (inputs `(("libjpeg-turbo" ,libjpeg-turbo) ("libtiff" ,libtiff) - ("proj" ,proj) ("zlib" ,zlib))) + (propagated-inputs + `(;; libgeotiff headers include proj headers, so ensure those are available. + ("proj" ,proj))) (arguments `(#:configure-flags (list (string-append "--with-zlib") -- cgit v1.2.3 From 1ecadbfe601de5d853bfe5be17154a8bc1df6cf8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 7 Jan 2020 14:28:53 +0100 Subject: gnu: libgeotiff: Do not build static library. * gnu/packages/geo.scm (libgeotiff)[arguments]: Add "--disable-static" in #:configure-flags. --- 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 df65c75154..32cdc2b53a 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -259,8 +259,8 @@ (define-public libgeotiff ("proj" ,proj))) (arguments `(#:configure-flags - (list (string-append "--with-zlib") - (string-append "--with-jpeg") + (list "--disable-static" + "--with-zlib" "--with-jpeg" (string-append "--with-libtiff=" (assoc-ref %build-inputs "libtiff"))))) (synopsis "Library for handling GeoTIFF (geographic enabled TIFF)") (description "libgeotiff is a library on top of libtiff for reading and -- cgit v1.2.3 From d2e1b2dac70807640cd8851c67dbf0cbb342bf5c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 7 Jan 2020 15:49:01 +0100 Subject: gnu: appstream-glib: Fix test failure. * gnu/packages/patches/appstream-glib-2020.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/glib.scm (appstream-glib)[source](patches): New field. --- gnu/local.mk | 1 + gnu/packages/glib.scm | 1 + gnu/packages/patches/appstream-glib-2020.patch | 31 ++++++++++++++++++++++++++ 3 files changed, 33 insertions(+) create mode 100644 gnu/packages/patches/appstream-glib-2020.patch diff --git a/gnu/local.mk b/gnu/local.mk index 3e0ab25a95..acbe99d34b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -709,6 +709,7 @@ dist_patch_DATA = \ %D%/packages/patches/antiword-CVE-2014-8123.patch \ %D%/packages/patches/antlr3-3_1-fix-java8-compilation.patch \ %D%/packages/patches/antlr3-3_3-fix-java8-compilation.patch \ + %D%/packages/patches/appstream-glib-2020.patch \ %D%/packages/patches/apr-skip-getservbyname-test.patch \ %D%/packages/patches/arm-trusted-firmware-disable-hdcp.patch \ %D%/packages/patches/arm-trusted-firmware-optional-bin-generation.patch \ diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 528b67e6cf..72d5ea0bdd 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -904,6 +904,7 @@ (define-public appstream-glib (uri (string-append "https://people.freedesktop.org/~hughsient/" "appstream-glib/releases/" "appstream-glib-" version ".tar.xz")) + (patches (search-patches "appstream-glib-2020.patch")) (sha256 (base32 "14jr1psx5kxywdprgbqn79w309yz8lrqlsq7288hfrf87gbr1wh4")))) diff --git a/gnu/packages/patches/appstream-glib-2020.patch b/gnu/packages/patches/appstream-glib-2020.patch new file mode 100644 index 0000000000..ab8a4bbdee --- /dev/null +++ b/gnu/packages/patches/appstream-glib-2020.patch @@ -0,0 +1,31 @@ +2020 is no longer the future. + +Taken from upstream: +https://github.com/hughsie/appstream-glib/commit/953c8e529d7291e60a95e580967ed79ce2c9ccf0 + +diff --git a/data/tests/broken.appdata.xml b/data/tests/broken.appdata.xml +index f7a5386e..cf80f5b4 100644 +--- a/data/tests/broken.appdata.xml ++++ b/data/tests/broken.appdata.xml +@@ -40,7 +40,7 @@ +

This is a duplicate release on the same day!

+ + +- ++ + +

This is a release in the future!

+ +diff --git a/libappstream-glib/as-app-validate.c b/libappstream-glib/as-app-validate.c +index c1103ace..f50e4e41 100644 +--- a/libappstream-glib/as-app-validate.c ++++ b/libappstream-glib/as-app-validate.c +@@ -864,7 +864,7 @@ as_app_validate_release (AsApp *app, + AS_PROBLEM_KIND_ATTRIBUTE_MISSING, + " has no timestamp"); + } +- if (timestamp > 20120101 && timestamp < 20251231) { ++ if (timestamp > 20120101 && timestamp < 20351231) { + ai_app_validate_add (helper, + AS_PROBLEM_KIND_ATTRIBUTE_INVALID, + " timestamp should be a UNIX time"); -- cgit v1.2.3 From 8ace2045432da1973111d60901b70709649f8866 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Tue, 7 Jan 2020 13:01:34 -0600 Subject: gnu: coq-bignums: Update to 8.10.0. * gnu/packages/coq.scm (coq-bignums): Update to 8.10.0. --- gnu/packages/coq.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index 0bb9ce7c4a..7673e54225 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -420,7 +420,7 @@ (define-public coq-coquelicot (define-public coq-bignums (package (name "coq-bignums") - (version "8.9.0") + (version "8.10.0") (source (origin (method git-fetch) (uri (git-reference @@ -429,7 +429,7 @@ (define-public coq-bignums (file-name (git-file-name name version)) (sha256 (base32 - "03qz1w2xb2j5p06liz5yyafl0fl9vprcqm6j0iwi7rxwghl00p01")))) + "0bpb4flckn4nqxbs3wjiznyx1k7r8k93qdigp3qwmikp2lxvcbw5")))) (build-system gnu-build-system) (native-inputs `(("ocaml" ,ocaml) -- cgit v1.2.3 From 14af514bf028db4fb878f4a46e477aba21c34b48 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Tue, 7 Jan 2020 13:01:53 -0600 Subject: gnu: coq-bignums: Fix comment spacing. * gnu/packages/coq.scm (coq-bignums)[arguments]: Fix comment spacing after disabling test phase. --- gnu/packages/coq.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index 7673e54225..6266f22fb6 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -437,7 +437,7 @@ (define-public coq-bignums (inputs `(("camlp5" ,camlp5))) (arguments - `(#:tests? #f; No test target + `(#:tests? #f ; No test target. #:make-flags (list (string-append "COQLIBINSTALL=" (assoc-ref %outputs "out") "/lib/coq/user-contrib")) -- cgit v1.2.3 From d2884b7feff849bc969503dea2a6e8052fc139a6 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Tue, 7 Jan 2020 13:02:36 -0600 Subject: gnu: coq-stdpp: Update to 1.2.1. * gnu/packages/coq.scm (coq-stdpp): Update to 1.2.1. [arguments]: Remove redundant COQLIB variable. --- gnu/packages/coq.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index 6266f22fb6..cadbbdbaa5 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -589,7 +589,7 @@ (define-public coq-equations (define-public coq-stdpp (package (name "coq-stdpp") - (version "1.2.0") + (version "1.2.1") (synopsis "Alternative Coq standard library std++") (source (origin (method git-fetch) @@ -598,7 +598,8 @@ (define-public coq-stdpp (commit (string-append "coq-stdpp-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "11m7kqxsbxygk41v2wsi3npdzwin9fcnzc1gn0gq0rd57wnqk83i")))) + (base32 + "1lczybg1jq9drbi8nzrlb0k199x4n07aawjwfzrl3qqc0w8kmvdz")))) (build-system gnu-build-system) (inputs `(("coq" ,coq))) @@ -609,7 +610,6 @@ (define-public coq-stdpp (delete 'configure) (replace 'install (lambda* (#:key outputs #:allow-other-keys) - (setenv "COQLIB" (string-append (assoc-ref outputs "out") "/lib/coq/")) (invoke "make" (string-append "COQLIB=" (assoc-ref outputs "out") "/lib/coq/") -- cgit v1.2.3 From 3c9e86ae8bf09d993e2e7a4ecb43d80da8fabb99 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Tue, 7 Jan 2020 13:03:07 -0600 Subject: gnu: coq-stdpp: Reword comment. * gnu/packages/coq.scm (coq-stdpp)[arguments]: Reword comment about tests being executed during build phase, to read more fluently. --- gnu/packages/coq.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index cadbbdbaa5..3eba39e5d0 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -604,7 +604,7 @@ (define-public coq-stdpp (inputs `(("coq" ,coq))) (arguments - `(#:tests? #f ;; the tests are being run automaticlly as part of `make all` + `(#:tests? #f ; Tests are executed during build phase. #:phases (modify-phases %standard-phases (delete 'configure) -- cgit v1.2.3 From 4639fa325c212eec7e2d45693d1ddf04287c316a Mon Sep 17 00:00:00 2001 From: Alexandru-Sergiu Marton Date: Mon, 6 Jan 2020 11:47:47 +0200 Subject: gnu: Add ghc-pipes. * gnu/packages/haskell-xyz.scm (ghc-pipes): New variable. Signed-off-by: Brett Gilio --- gnu/packages/haskell-xyz.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 03ae83d50e..d3d4896f82 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -22,6 +22,7 @@ ;;; Copyright © 2019 John Soo ;;; Copyright © 2019 Kyle Meyer ;;; Copyright © 2019 Alex Griffin +;;; Copyright © 2020 Brett Gilio ;;; ;;; This file is part of GNU Guix. ;;; @@ -8615,6 +8616,49 @@ (define-public ghc-persistent-template functions for the ghc-persistent package.") (license license:expat))) +(define-public ghc-pipes + (package + (name "ghc-pipes") + (version "4.3.13") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/pipes/" + "pipes-" version ".tar.gz")) + (sha256 + (base32 + "1ch3xr5f5if0psd3lsyrpkwrgh36synnzqcpimghprys68l4zfkn")))) + (build-system haskell-build-system) + (inputs + `(("ghc-exceptions" ,ghc-exceptions) + ("ghc-mmorph" ,ghc-mmorph) + ("ghc-void" ,ghc-void) + ("ghc-semigroups" ,ghc-semigroups))) + (native-inputs + `(("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-quickcheck2" + ,ghc-test-framework-quickcheck2))) + (home-page + "https://hackage.haskell.org/package/pipes") + (synopsis "Compositional pipelines") + (description + "A clean and powerful stream processing library that lets you build +and connect reusable streaming components. Advantages over traditional streaming +libraries: +@itemize +@item Concise API: Use simple commands like @code{for}, (@code{>->}), @code{await}, +and @code{yield} +@item Blazing fast: Implementation tuned for speed, including shortcut fusion +@item Lightweight Dependency: pipes is small and compiles very rapidly, including +dependencies +@item Elegant semantics: Use practical category theory +@item ListT: Correct implementation of @code{ListT} that interconverts with pipes +@item Bidirectionality: Implement duplex channels +@end itemize") + (license license:bsd-3))) + (define-public ghc-polyparse (package (name "ghc-polyparse") -- cgit v1.2.3 From 451775a5675cdf1dfb9f4503427442b21bb5041a Mon Sep 17 00:00:00 2001 From: Alexandru-Sergiu Marton Date: Tue, 7 Jan 2020 13:33:36 -0600 Subject: gnu: Add ghc-pointedlist. * gnu/packages/haskell-xyz.scm (ghc-pointedlist): New variable. Signed-off-by: Brett Gilio --- gnu/packages/haskell-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index d3d4896f82..3a9880f58c 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -8659,6 +8659,31 @@ (define-public ghc-pipes @end itemize") (license license:bsd-3))) +(define-public ghc-pointedlist + (package + (name "ghc-pointedlist") + (version "0.6.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/pointedlist/" + "pointedlist-" version ".tar.gz")) + (sha256 + (base32 + "16xsrzqql7i4z6a3xy07sqnbyqdmcar1jiacla58y4mvkkwb0g3l")))) + (build-system haskell-build-system) + (home-page + "http://hackage.haskell.org/package/pointedlist") + (synopsis + "Zipper-like comonad which works as a list, tracking a position") + (description + "A PointedList tracks the position in a non-empty list which works +similarly to a zipper. A current item is always required, and therefore +the list may never be empty. A circular PointedList wraps around to the +other end when progressing past the actual edge.") + (license license:bsd-3))) + (define-public ghc-polyparse (package (name "ghc-polyparse") -- cgit v1.2.3 From a23091880d4dc6115acbfa3b7ef09d731fc5abb0 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 30 Dec 2019 11:25:40 +0100 Subject: bootloader: grub: Add gfxmode (resolution) override. * gnu/bootloader/grub.scm (): Add `gfxmode' entry. (eye-candy): Use it. * doc/guix.texi (Bootloader Configuration): Document it. --- doc/guix.texi | 28 ++++++++++++++++++++++++++-- gnu/bootloader/grub.scm | 13 +++++++++---- 2 files changed, 35 insertions(+), 6 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index df1ba428a5..6e3f175488 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -25923,9 +25923,22 @@ must @emph{not} be an OS device name such as @file{/dev/sda1}. @end table @end deftp +@cindex HDPI +@cindex HiDPI +@cindex resolution @c FIXME: Write documentation once it's stable. -For now only GRUB has theme support. GRUB themes are created using -the @code{grub-theme} form, which is not documented yet. +For now only GRUB has theme support. GRUB themes are created using +the @code{grub-theme} form, which is not fully documented yet. + +@deftp {Data Type} grub-theme +Data type representing the configuration of the GRUB theme. + +@table @asis +@item @code{gfxmode} (default: @code{'("auto")}) +The GRUB @code{gfxmode} to set (a list of screen resolution strings, see +@pxref{gfxmode,,, grub, GNU GRUB manual}). +@end table +@end deftp @defvr {Scheme Variable} %default-theme This is the default GRUB theme used by the operating system if no @@ -25936,6 +25949,17 @@ It comes with a fancy background image displaying the GNU and Guix logos. @end defvr +For example, to override the default resolution, you may use something +like + +@lisp +(bootloader + (grub-configuration + ;; @dots{} + (theme (grub-theme + (inherit %default-theme) + (gfxmode '("1024x786x32" "auto")))))) +@end lisp @node Invoking guix system @section Invoking @code{guix system} diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm index f13685ac9d..55e6344285 100644 --- a/gnu/bootloader/grub.scm +++ b/gnu/bootloader/grub.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2016 Chris Marusich ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2017 Mathieu Othacehe +;;; Copyright © 2019 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -88,7 +89,9 @@ (define-record-type* (color-normal grub-theme-color-normal (default '((fg . cyan) (bg . blue)))) (color-highlight grub-theme-color-highlight - (default '((fg . white) (bg . blue))))) + (default '((fg . white) (bg . blue)))) + (gfxmode grub-gfxmode + (default '("auto")))) ;list of string (define %background-image (grub-image @@ -149,8 +152,10 @@ (define setup-gfxterm-body ;; most other modern architectures have no other mode and therefore don't ;; need to be switched. (if (string-match "^(x86_64|i[3-6]86)-" system) - " - # Leave 'gfxmode' to 'auto'. + (string-append " + set gfxmode=" (string-join + (grub-gfxmode (bootloader-configuration-theme config)) + ";") " insmod video_bochs insmod video_cirrus insmod gfxterm @@ -166,7 +171,7 @@ (define setup-gfxterm-body insmod vbe insmod vga fi -" +") "")) (define (setup-gfxterm config font-file) -- cgit v1.2.3 From 8e8d45e6ac02a7f282ce5bd5be9ae9a9a150a01f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 7 Jan 2020 23:31:44 +0100 Subject: Revert "bootloader: grub: Add gfxmode (resolution) override." MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit a23091880d4dc6115acbfa3b7ef09d731fc5abb0. It causes ‘guix pull’ to fail: . --- doc/guix.texi | 28 ++-------------------------- gnu/bootloader/grub.scm | 13 ++++--------- 2 files changed, 6 insertions(+), 35 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 6e3f175488..df1ba428a5 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -25923,22 +25923,9 @@ must @emph{not} be an OS device name such as @file{/dev/sda1}. @end table @end deftp -@cindex HDPI -@cindex HiDPI -@cindex resolution @c FIXME: Write documentation once it's stable. -For now only GRUB has theme support. GRUB themes are created using -the @code{grub-theme} form, which is not fully documented yet. - -@deftp {Data Type} grub-theme -Data type representing the configuration of the GRUB theme. - -@table @asis -@item @code{gfxmode} (default: @code{'("auto")}) -The GRUB @code{gfxmode} to set (a list of screen resolution strings, see -@pxref{gfxmode,,, grub, GNU GRUB manual}). -@end table -@end deftp +For now only GRUB has theme support. GRUB themes are created using +the @code{grub-theme} form, which is not documented yet. @defvr {Scheme Variable} %default-theme This is the default GRUB theme used by the operating system if no @@ -25949,17 +25936,6 @@ It comes with a fancy background image displaying the GNU and Guix logos. @end defvr -For example, to override the default resolution, you may use something -like - -@lisp -(bootloader - (grub-configuration - ;; @dots{} - (theme (grub-theme - (inherit %default-theme) - (gfxmode '("1024x786x32" "auto")))))) -@end lisp @node Invoking guix system @section Invoking @code{guix system} diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm index 55e6344285..f13685ac9d 100644 --- a/gnu/bootloader/grub.scm +++ b/gnu/bootloader/grub.scm @@ -3,7 +3,6 @@ ;;; Copyright © 2016 Chris Marusich ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2017 Mathieu Othacehe -;;; Copyright © 2019 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -89,9 +88,7 @@ (define-record-type* (color-normal grub-theme-color-normal (default '((fg . cyan) (bg . blue)))) (color-highlight grub-theme-color-highlight - (default '((fg . white) (bg . blue)))) - (gfxmode grub-gfxmode - (default '("auto")))) ;list of string + (default '((fg . white) (bg . blue))))) (define %background-image (grub-image @@ -152,10 +149,8 @@ (define setup-gfxterm-body ;; most other modern architectures have no other mode and therefore don't ;; need to be switched. (if (string-match "^(x86_64|i[3-6]86)-" system) - (string-append " - set gfxmode=" (string-join - (grub-gfxmode (bootloader-configuration-theme config)) - ";") " + " + # Leave 'gfxmode' to 'auto'. insmod video_bochs insmod video_cirrus insmod gfxterm @@ -171,7 +166,7 @@ (define setup-gfxterm-body insmod vbe insmod vga fi -") +" "")) (define (setup-gfxterm config font-file) -- cgit v1.2.3 From ba7cd0fd83d495983c19d5c1434a965b0ee839e7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 7 Jan 2020 19:11:16 +0100 Subject: gnu: cloc: Update to 1.84. * gnu/packages/code.scm (cloc): Update to 1.84. --- gnu/packages/code.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index 021181bd8f..2e6b50db69 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2015 Andreas Enge ;;; Copyright © 2015, 2018 Ricardo Wurmus ;;; Copyright © 2016, 2017, 2019 Efraim Flashner -;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2017, 2018 Clément Lassieur ;;; Copyright © 2017 Andy Wingo ;;; Copyright © 2018 Fis Trivial @@ -213,7 +213,7 @@ (define ref (define-public cloc (package (name "cloc") - (version "1.82") + (version "1.84") (source (origin (method git-fetch) @@ -222,7 +222,7 @@ (define-public cloc (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0fsz07z0slfg58512fmnlj8pnxkc360bgf7fclg60v9clvcjbjsw")))) + (base32 "14xikdwcr6pcnkk2i43zrsj88z8b3mrv0svbnbvxvarw1id83pnn")))) (build-system gnu-build-system) (inputs `(("coreutils" ,coreutils) -- cgit v1.2.3 From 256f9b5170847141ba4eb0aef802820dbe86b605 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 7 Jan 2020 19:22:04 +0100 Subject: gnu: gambit-c: Update to 4.9.3. * gnu/packages/scheme.scm (gambit-c): Update to 4.9.3. --- gnu/packages/scheme.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index 16b4e822d2..a320cbf831 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2017 John Darrington ;;; Copyright © 2017 Clément Lassieur -;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Adam Massmann ;;; Copyright © 2018 Gabriel Hondet ;;; @@ -555,7 +555,7 @@ (define-public racket (define-public gambit-c (package (name "gambit-c") - (version "4.9.2") + (version "4.9.3") (source (origin (method url-fetch) @@ -565,7 +565,7 @@ (define-public gambit-c (string-map (lambda (c) (if (char=? c #\.) #\_ c)) version) ".tgz")) (sha256 - (base32 "1cpganh3jgjdw6qsapcbwxdbp1xwgx5gvdl4ymwf8p2c5k018dwy")))) + (base32 "1p6172vhcrlpjgia6hsks1w4fl8rdyjf9xjh14wxfkv7dnx8a5hk")))) (build-system gnu-build-system) (arguments '(#:configure-flags -- cgit v1.2.3 From a56430442e8cf2f68a8cef9383b86a0a4c13959f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 7 Jan 2020 20:03:46 +0100 Subject: gnu: system-config-printer: Use new upstream URI. * gnu/packages/gnome.scm (system-config-printer)[source]: Switch to the OpenPrinting repository. --- gnu/packages/gnome.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 5005f00eb8..8bd055f843 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1264,15 +1264,15 @@ (define-public system-config-printer (package (name "system-config-printer") (version "1.5.11") - (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/zdohnal/system-config-printer/releases/" - "download/" version - "/system-config-printer-" version ".tar.xz")) - (sha256 - (base32 - "1lq0q51bhanirpjjvvh4xiafi8hgpk8r32h0dj6dn3f32z8pib9q")))) + (source + (origin + (method url-fetch) + (uri (string-append + "https://github.com/OpenPrinting/system-config-printer/releases/" + "download/" version + "/system-config-printer-" version ".tar.xz")) + (sha256 + (base32 "1lq0q51bhanirpjjvvh4xiafi8hgpk8r32h0dj6dn3f32z8pib9q")))) (build-system glib-or-gtk-build-system) (arguments `(#:imported-modules ((guix build python-build-system) -- cgit v1.2.3 From cda8250b204c5b59211064e94e068766c2613456 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 7 Jan 2020 18:04:36 +0100 Subject: gnu: exim: Update to 4.93.0.4. * gnu/packages/mail.scm (exim): Update to 4.93.0.4. [source]: Add /fixes/ URI to the list. [inputs]: Use gnutls/dane variant. [native-inputs]: Add pkg-config. [arguments]: Set USE_GNUTLS* variables to use the new inputs.. Add CC=gcc to #:make-flags. --- gnu/packages/mail.scm | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 12885f6f8d..a674837ce8 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -22,7 +22,7 @@ ;;; Copyright © 2016, 2018 Marius Bakke ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2017 Kyle Meyer -;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2017, 2018 Rene Saavedra ;;; Copyright © 2018, 2019 Pierre Langlois ;;; Copyright © 2018 Alex Vong @@ -1260,21 +1260,24 @@ (define-public msmtp (define-public exim (package (name "exim") - (version "4.92.3") + (version "4.93.0.4") (source (origin (method url-fetch) (uri (list (string-append "https://ftp.exim.org/pub/exim/exim4/exim-" version ".tar.bz2") + ;; ‘Fix’ releases (exim-x.y.z.f) are kept separately. + (string-append "https://ftp.exim.org/pub/exim/exim4/fixes/exim-" + version ".tar.bz2") + ;; After a new release the previous one is moved here. (string-append "https://ftp.exim.org/pub/exim/exim4/old/exim-" version ".tar.bz2"))) (sha256 - (base32 - "0d0h0j9pl3yf089sc59ia60m3dqnkb3qh1qaz6vxfg2ja2mnm5i9")))) + (base32 "1ng4flyv2jqjbw66dbdgma7kfnnph9h3s1yyc0q27n7q0sx3cwxn")))) (build-system gnu-build-system) (inputs `(("bdb" ,bdb-5.3) ; ‘#error Version 6 and later BDB API is not supported’ - ("gnutls" ,gnutls) + ("gnutls" ,gnutls/dane) ("gzip" ,gzip) ("bzip2" ,bzip2) ("xz" ,xz) @@ -1284,7 +1287,8 @@ (define-public exim ("libxaw" ,libxaw))) (native-inputs `(("pcre" ,pcre "bin") - ("perl" ,perl))) + ("perl" ,perl) + ("pkg-config" ,pkg-config))) (arguments '(#:phases (modify-phases %standard-phases @@ -1313,9 +1317,11 @@ (define-public exim (("(COMPRESS_COMMAND=).*" all var) (string-append var gzip "/bin/gzip\n")) (("(ZCAT_COMMAND=).*" all var) - (string-append var gzip "/bin/zcat\n"))) - ;; This file has hardcoded names for tools despite the zcat - ;; configuration above. + (string-append var gzip "/bin/zcat\n")) + (("# (USE_GNUTLS(|_PC)=.*)" all line) + (string-append line "\n"))) + ;; This file has hard-coded relative file names for tools despite + ;; the zcat configuration above. (substitute* '("src/exigrep.src") (("'zcat'") (string-append "'" gzip "/bin/zcat'")) (("'bzcat'") (string-append "'" bzip2 "/bin/bzcat'")) @@ -1332,8 +1338,11 @@ (define-public exim (substitute* '("scripts/Configure-eximon") (("#!/bin/sh") (string-append "#!" bash "/bin/sh")))) #t))) - #:make-flags '("INSTALL_ARG=-no_chown") - ;; No 'check' target. + #:make-flags + (list "CC=gcc" + "INSTALL_ARG=-no_chown") + ;; No 'check' target. There is a test suite in test/, which assumes that + ;; certain build options were (not) used and that it can freely ‘sudo’. #:tests? #f)) (home-page "https://www.exim.org/") (synopsis -- cgit v1.2.3 From c9b99e88f510a4211df2be56f2c13d380f7a99b2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 7 Jan 2020 18:56:48 +0100 Subject: gnu: exim: Use XZ-compressed sources. * gnu/packages/mail.scm (exim)[source]: Fetch the .tar.xz archive. --- gnu/packages/mail.scm | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index a674837ce8..30623d786b 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1264,16 +1264,17 @@ (define-public exim (source (origin (method url-fetch) - (uri (list (string-append "https://ftp.exim.org/pub/exim/exim4/exim-" - version ".tar.bz2") - ;; ‘Fix’ releases (exim-x.y.z.f) are kept separately. - (string-append "https://ftp.exim.org/pub/exim/exim4/fixes/exim-" - version ".tar.bz2") - ;; After a new release the previous one is moved here. - (string-append "https://ftp.exim.org/pub/exim/exim4/old/exim-" - version ".tar.bz2"))) + (uri (let ((file-name (string-append "exim-" version ".tar.xz"))) + (list (string-append "https://ftp.exim.org/pub/exim/exim4/" + file-name) + ;; ‘Fix’ releases (exim-x.y.z.f) are kept separately. + (string-append "https://ftp.exim.org/pub/exim/exim4/fixes/" + file-name) + ;; After a new non-fix release, the old one is moved here. + (string-append "https://ftp.exim.org/pub/exim/exim4/old/" + file-name)))) (sha256 - (base32 "1ng4flyv2jqjbw66dbdgma7kfnnph9h3s1yyc0q27n7q0sx3cwxn")))) + (base32 "01g4sfycv13glnmfrapwhjbdw6z1z7w5bwjldxjmglwfw5p3czak")))) (build-system gnu-build-system) (inputs `(("bdb" ,bdb-5.3) ; ‘#error Version 6 and later BDB API is not supported’ -- cgit v1.2.3 From bb335e84ed98055599752740a0f6114fe31f325d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 7 Jan 2020 18:55:40 +0100 Subject: gnu: exim: Build (more) reproducibly. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/mail.scm (exim)[arguments]: Add a ‘build-reproducibly’ phase. --- gnu/packages/mail.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 30623d786b..7d56949ae9 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1338,7 +1338,14 @@ (define-public exim (let ((bash (assoc-ref inputs "bash"))) (substitute* '("scripts/Configure-eximon") (("#!/bin/sh") (string-append "#!" bash "/bin/sh")))) - #t))) + #t)) + (add-before 'build 'build-reproducibly + (lambda _ + ;; The ‘compilation number’ is incremented for every build from the + ;; same source tree. It appears to vary over different (parallel?) + ;; builds. Make it a ‘constant number’ instead. + (substitute* "src/version.c" + (("#include \"cnumber.h\"") "1"))))) #:make-flags (list "CC=gcc" "INSTALL_ARG=-no_chown") -- cgit v1.2.3 From 9f5cb517d09eb6136c21bb8bbe097951a1af85d5 Mon Sep 17 00:00:00 2001 From: Alex ter Weele Date: Tue, 7 Jan 2020 21:02:57 -0600 Subject: gnu: harmonist: Update to 0.3.0. * gnu/packages/games.scm (harmonist): Update to 0.3.0. Signed-off-by: Julien Lepiller --- 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 f4b74abe11..413b6d54d8 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -7470,7 +7470,7 @@ (define-public hedgewars (define-public harmonist (package (name "harmonist") - (version "0.2") + (version "0.3.0") (source (origin (method git-fetch) (uri (git-reference @@ -7479,7 +7479,7 @@ (define-public harmonist (file-name (git-file-name name version)) (sha256 (base32 - "0hqy9kqwgirwkq1v3vj1hp9m93hjvdj4nxcfbjfvvwk2bbzri3s2")))) + "146wiyanag0zqj6fhyll2sw6sydnnll8mgxhhqf9sjqsl2rx4s5r")))) (build-system go-build-system) (arguments '(#:import-path "git.tuxfamily.org/harmonist/harmonist")) -- cgit v1.2.3 From a66ee82a05d8ff1ef7c5ff9ac7723cb32fc4e22a Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sun, 5 Jan 2020 20:11:01 +0300 Subject: services: Add pulseaudio service. * gnu/services/sound.scm (pulseaudio-environment): New procedure. (pulseaudio-service-type): New variable. * doc/guix.texi (Sound Services): Document it. --- doc/guix.texi | 14 ++++++++++++++ gnu/services/sound.scm | 28 ++++++++++++++++++++++++++-- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index df1ba428a5..bb0ef17ddd 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -15951,6 +15951,20 @@ pcm.!default @{ See @uref{https://www.alsa-project.org/main/index.php/Asoundrc} for the details. +@deffn {Scheme Variable} pulseaudio-service-type +This is the type for the @uref{http://www.pulseaudio.org/, PulseAudio +sound server}, which sets the @var{LADSPA_PATH} environment variable to +allow PulseAudio load modules from @code{swh-plugins} package. + +See @uref{http://plugin.org.uk/ladspa-swh/docs/ladspa-swh.html} for the +details. + +The following example will setup the service: + +@lisp +(service pulseaudio-service-type) +@end lisp +@end deffn @node Database Services @subsection Database Services diff --git a/gnu/services/sound.scm b/gnu/services/sound.scm index f2dd24402f..aaca733729 100644 --- a/gnu/services/sound.scm +++ b/gnu/services/sound.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2018 Oleg Pykhalov +;;; Copyright © 2018, 2020 Oleg Pykhalov ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,16 +21,20 @@ (define-module (gnu services sound) #:use-module (gnu services configuration) #:use-module (gnu services shepherd) #:use-module (gnu services) + #:use-module (gnu system pam) #:use-module (gnu system shadow) #:use-module (guix gexp) #:use-module (guix packages) #:use-module (guix records) #:use-module (guix store) + #:use-module (gnu packages audio) #:use-module (gnu packages linux) #:use-module (gnu packages pulseaudio) #:use-module (ice-9 match) #:export (alsa-configuration - alsa-service-type)) + alsa-service-type + + pulseaudio-service-type)) ;;; Commentary: ;;; @@ -97,4 +101,24 @@ (define alsa-service-type (default-value (alsa-configuration)) (description "Configure low-level Linux sound support, ALSA."))) + +;;; +;;; PulseAudio +;;; + +(define (pulseaudio-environment config) + ;; Define this variable in the global environment such that + ;; pulseaudio swh-plugins works. + `(("LADSPA_PATH" + . ,(file-append swh-plugins "/lib/ladspa")))) + +(define pulseaudio-service-type + (service-type + (name 'pulseaudio) + (extensions + (list (service-extension session-environment-service-type + pulseaudio-environment))) + (default-value #f) + (description "Configure PulseAudio sound support."))) + ;;; sound.scm ends here -- cgit v1.2.3 From e75221fd287ba01c0bcf7847efa2d9e35fabc035 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Wed, 8 Jan 2020 05:23:31 +0300 Subject: gnu: tome4: Update to 1.6.6. * gnu/packages/games.scm (tome4): Update to 1.6.6. --- 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 413b6d54d8..dd083259c7 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -5181,7 +5181,7 @@ (define-public open-adventure (define-public tome4 (package (name "tome4") - (version "1.6.5") + (version "1.6.6") (synopsis "Single-player, RPG roguelike game set in the world of Eyal") (source (origin @@ -5190,7 +5190,7 @@ (define-public tome4 version ".tar.bz2")) (sha256 (base32 - "0ifi057idid8xq7af8ybs99b6939hyfif1ml1ihjpx02vinmd419")) + "1amx0y49scy9hq71wjvkdzvgclwa2g54vkv4bf40mxyp4pl0bq7m")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From ce0ca7625e10328061e9d4819592d4084ff92b86 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Wed, 8 Jan 2020 06:48:48 +0300 Subject: gnu: inxi-minimal: Update to 3.0.37-1. * gnu/packages/admin.scm (inxi-minimal): Update to 3.0.37-1. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 2a0ad45e2a..f0581bbea5 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3201,7 +3201,7 @@ (define-public inxi-minimal (let ((real-name "inxi")) (package (name "inxi-minimal") - (version "3.0.34-1") + (version "3.0.37-1") (source (origin (method git-fetch) @@ -3210,7 +3210,7 @@ (define-public inxi-minimal (commit version))) (file-name (git-file-name real-name version)) (sha256 - (base32 "0x2s40lwsan2pk292nspjgyw00f9f5fdfmwfvl50924pxhyxn2fh")))) + (base32 "15wvj9w601ci3bavd1hk5qlm8dfm7a7cjglczk29yir5yw2jww3f")))) (build-system trivial-build-system) (inputs `(("bash" ,bash-minimal) -- cgit v1.2.3 From 73656471a403039b4d28de08e0c0b61326c4dea7 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Wed, 8 Jan 2020 06:57:53 +0300 Subject: gnu: neofetch: Update to 6.1.0-1.501d6b7. Fix Guix ascii not shown. * gnu/packages/admin.scm (neofetch): Update to 6.1.0-1.501d6b7. --- gnu/packages/admin.scm | 50 ++++++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index f0581bbea5..371fcc7ec3 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -30,6 +30,7 @@ ;;; Copyright © 2019 Alex Griffin ;;; Copyright © 2019 Guillaume Le Vaillant ;;; Copyright © 2019 Mathieu Othacehe +;;; Copyright © 2020 Oleg Pykhalov ;;; ;;; This file is part of GNU Guix. ;;; @@ -2904,34 +2905,35 @@ (define-public fabric (license license:bsd-2))) (define-public neofetch - (package - (name "neofetch") - (version "6.1.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/dylanaraps/neofetch") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "022xzn9jk18k2f4b6011d8jk5nbl84i3mw3inlz4q52p2hvk8fch")))) - (build-system gnu-build-system) - (arguments - `(#:tests? #f ; there are no tests - #:make-flags - (list (string-append "PREFIX=" %output)) - #:phases - (modify-phases %standard-phases - (delete 'configure)))) ; no configure script - (home-page "https://github.com/dylanaraps/neofetch") - (synopsis "System information script") - (description "Neofetch is a command-line system information tool written in + (let ((commit "501d6b7594296d9eac8943140f8581daf555873d")) + (package + (name "neofetch") + (version (git-version "6.1.0" "1" commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dylanaraps/neofetch") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1h5md9jimyc6z4d7w66j27hn8qghzyxgpkh5h9dclzxpp5cs8whb")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; there are no tests + #:make-flags + (list (string-append "PREFIX=" %output)) + #:phases + (modify-phases %standard-phases + (delete 'configure)))) ; no configure script + (home-page "https://github.com/dylanaraps/neofetch") + (synopsis "System information script") + (description "Neofetch is a command-line system information tool written in Bash. Neofetch displays information about your system next to an image, your OS logo, or any ASCII file of your choice. The main purpose of Neofetch is to be used in screenshots to show other users what operating system or distribution you are running, what theme or icon set you are using, etc.") - (license license:expat))) + (license license:expat)))) (define-public screenfetch (package -- cgit v1.2.3 From 8daa83266132c12afc41406055e3e133e4399fdd Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Wed, 8 Jan 2020 07:08:27 +0300 Subject: gnu: iperf: Update to 3.7. * gnu/packages/networking.scm (iperf): Update to 3.7. --- gnu/packages/networking.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 5a8019a8fc..28c683ea83 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -24,7 +24,7 @@ ;;; Copyright © 2018 Clément Lassieur ;;; Copyright © 2018 Theodoros Foradis ;;; Copyright © 2018 Marius Bakke -;;; Copyright © 2018 Oleg Pykhalov +;;; Copyright © 2018, 2020 Oleg Pykhalov ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2019 Maxim Cournoyer ;;; Copyright © 2019 Vasile Dumitrascu @@ -1498,14 +1498,14 @@ (define-public sslh (define-public iperf (package (name "iperf") - (version "3.1.7") + (version "3.7") (source (origin (method url-fetch) (uri (string-append "http://downloads.es.net/pub/iperf" "/iperf-" version ".tar.gz")) (sha256 (base32 - "0kvk8d0a3dcxc8fisyprbn01y8akxj4sx8ld5dh508p9dx077vx4")))) + "033is7b5grfbiil98jxlz4ixp9shm44x6hy8flpsyz1i4h108inq")))) (build-system gnu-build-system) (synopsis "TCP, UDP and SCTP bandwidth measurement tool") (description -- cgit v1.2.3 From 7eea3afd02ae613d74e5c17a37d84ed8fbec9c44 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Wed, 8 Jan 2020 07:21:08 +0300 Subject: gnu: irssi: Update to 1.2.2. * gnu/packages/irc.scm (irssi)[version]: Update to 1.2.2. [arguments]: Set HOME environment variable to current working directory before 'check' phase. --- gnu/packages/irc.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index ae3ef8234a..f39da03815 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2016 ng0 ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2020 Oleg Pykhalov ;;; ;;; This file is part of GNU Guix. ;;; @@ -127,7 +128,7 @@ (define-public quassel (define-public irssi (package (name "irssi") - (version "1.1.3") + (version "1.2.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/irssi/irssi/" @@ -135,7 +136,7 @@ (define-public irssi version ".tar.xz")) (sha256 (base32 - "0jq8zjdhdjxkjbfl4g4nfr1ninyfxffa27lm8vcyrihhhkrn65yf")))) + "0y3mhnyr7x8ir8dlj83vbnchpfld28vdfni9yhpvls45j460c9v7")))) (build-system gnu-build-system) (arguments `(#:phases @@ -148,7 +149,10 @@ (define-public irssi (string-append "--prefix=" out) (string-append "--with-proxy") (string-append "--with-socks") - (string-append "--with-bot")))))))) + (string-append "--with-bot"))))) + (add-before 'check 'set-home + (lambda _ + (setenv "HOME" (getcwd))))))) (inputs `(("glib" ,glib) ("ncurses" ,ncurses) -- cgit v1.2.3 From 5e5b884ef62e41a0e2146be79de8e112bf5c7b9d Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Wed, 8 Jan 2020 08:24:02 +0300 Subject: gnu: keepalived: Update to 2.0.19. * gnu/packages/cluster.scm (keepalived): Update to 2.0.19. --- gnu/packages/cluster.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cluster.scm b/gnu/packages/cluster.scm index 03700b0bcb..296fe94856 100644 --- a/gnu/packages/cluster.scm +++ b/gnu/packages/cluster.scm @@ -36,7 +36,7 @@ (define-module (gnu packages cluster) (define-public keepalived (package (name "keepalived") - (version "2.0.18") + (version "2.0.19") (source (origin (method url-fetch) (uri (string-append @@ -44,7 +44,7 @@ (define-public keepalived version ".tar.gz")) (sha256 (base32 - "1l2g0bzzbah9svfpwa0b9dgvwfv85r2y3qdr54822hg5p2qs48ql")))) + "19scrrjsxw5g914d5ka352445blaq77dk2vm4vxabijvfra88bqf")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From a587bb23b79eae5dd3fa3acb06d0b533c93fd562 Mon Sep 17 00:00:00 2001 From: David Wilson Date: Wed, 8 Jan 2020 06:04:49 -0800 Subject: gnu: emacs-undo-tree: Update to 0.7. * gnu/packages/emacs-xyz.scm (emacs-undo-tree): Update to 0.7. --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 067aee230c..675f6031b6 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2293,16 +2293,16 @@ (define-public emacs-olivetti (define-public emacs-undo-tree (package (name "emacs-undo-tree") - (version "0.6.6") + (version "0.7") (source (origin (method git-fetch) (uri (git-reference (url "http://dr-qubit.org/git/undo-tree.git") - (commit (string-append "release/" version)))) + (commit (string-append "release-" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "1hnh2mnmw179gr094r561w6cw1haid0lpvpqvkc24wpj82vphzpa")))) + "1m02v7qhcbqv5gb0vdmf44vhqisf2pv6419dzjfpxcmwlmdm0z7a")))) (build-system emacs-build-system) (home-page "http://www.dr-qubit.org/emacs.php") (synopsis "Treat undo history as a tree") -- cgit v1.2.3 From 3d20fbf7e62cd201f7e0426a1d24a821c5835881 Mon Sep 17 00:00:00 2001 From: David Wilson Date: Wed, 8 Jan 2020 06:06:04 -0800 Subject: gnu: emacs-git-auto-commit-mode: Update to 4.5.0. * gnu/packages/emacs-xyz.scm (emacs-git-auto-commit-mode): Update to 4.5.0. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 675f6031b6..ee0aafc50f 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -14682,7 +14682,7 @@ (define-public emacs-stickyfunc-enhance (define-public emacs-git-auto-commit-mode (package (name "emacs-git-auto-commit-mode") - (version "4.4.0") + (version "4.5.0") (source (origin (method git-fetch) @@ -14691,7 +14691,7 @@ (define-public emacs-git-auto-commit-mode (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0psmr7749nzxln4b500sl3vrf24x3qijp12ir0i5z4x25k72hrlh")))) + (base32 "1w3v9pmlmdxl4pglsb6j0igp13lbzg5bhbr1rv2vll93m6zxmyma")))) (build-system emacs-build-system) (home-page "https://github.com/ryuslash/git-auto-commit-mode") (synopsis "Emacs Minor mode to automatically commit and push") -- cgit v1.2.3 From f98c050c2017be06cff54abf965a8234f6998f76 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 8 Jan 2020 14:54:01 +0100 Subject: build: asdf-build-system: Make sbcl-* Lisp packages reproducible. The '*.fasl' files produced by SBCL contain the mtime of the source file (see commit 72843d7ce32bd615f64a0326cf891658b5724ead of SBCL's code repository). As asdf-build-system makes a copy of the source files before compiling them, we must set the mtime of these copies to the same date as the originals for the build to be reproducible. * guix/build/asdf-build-system.scm (copy-files-to-output): Keep the modification time of the original source files. --- guix/build/asdf-build-system.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/build/asdf-build-system.scm b/guix/build/asdf-build-system.scm index dd6373b33a..1be2b3c5f0 100644 --- a/guix/build/asdf-build-system.scm +++ b/guix/build/asdf-build-system.scm @@ -79,7 +79,7 @@ (define (copy-files-to-output out name) (let ((source (getcwd)) (target (source-directory out name)) (system-path (string-append out %system-install-prefix))) - (copy-recursively source target) + (copy-recursively source target #:keep-mtime? #t) (mkdir-p system-path) (for-each (lambda (file) -- cgit v1.2.3 From e7e315c02ec2165c31b250770b848fe37f358d9d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 8 Jan 2020 19:47:52 +0100 Subject: gnu: psyclpc: Build with OpenSSL 1.0. Fixes . Reported by symphonia@disroot.org. * gnu/packages/messaging.scm (psyclpc)[inputs]: Change from OPENSSL to OPENSSL-1.0. --- gnu/packages/messaging.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index b71e68a90f..b524388853 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1435,7 +1435,7 @@ (define-public psyclpc #:make-flags (list "install-all"))) (inputs `(("zlib" ,zlib) - ("openssl" ,openssl) + ("openssl" ,openssl-1.0) ("pcre" ,pcre))) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 71e0f1e9adbce4a6476a70bddabf13f6d7af2d40 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 8 Jan 2020 19:56:54 +0100 Subject: gnu: util-linux: Add variant with udev support. * gnu/packages/linux.scm (util-linux)[properties]: New field. (util-linux+udev): New public variable. --- gnu/packages/linux.scm | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 501a010b25..3c720f32fc 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2016, 2018, 2019 Ricardo Wurmus ;;; Copyright © 2016 David Craven ;;; Copyright © 2016 John Darrington -;;; Copyright © 2016, 2017, 2018, 2019 Marius Bakke +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Marius Bakke ;;; Copyright © 2016, 2018 Rene Saavedra ;;; Copyright © 2016 Carlos Sánchez de La Lama ;;; Copyright © 2016, 2017 ng0 @@ -1182,12 +1182,26 @@ (define-public util-linux utilities. It provides dmesg and includes tools for working with file systems, block devices, UUIDs, TTYs, and many other tools.") + ;; Hide the package so that end users get the udev-enabled variant below. + (properties '((hidden? . #t))) + ;; Note that util-linux doesn't use the same license for all the ;; code. GPLv2+ is the default license for a code without an ;; explicitly defined license. (license (list license:gpl3+ license:gpl2+ license:gpl2 license:lgpl2.0+ license:bsd-4 license:public-domain)))) +;; util-linux optionally supports udev, which allows lsblk to read file system +;; metadata without special privileges. Add it as a separate package to avoid +;; a circular dependency, and to keep the size small. +(define-public util-linux+udev + (package/inherit + util-linux + (inputs + `(("udev" ,eudev) + ,@(package-inputs util-linux))) + (properties (alist-delete 'hidden? (package-properties util-linux))))) + (define-public ddate (package (name "ddate") -- cgit v1.2.3 From 01bb039e7b408893009d15f56cfcbdc8af70a4af Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 8 Jan 2020 19:57:45 +0100 Subject: system: Use the udev-enabled util-linux variant. Fixes . Reported by Bengt Richter . * gnu/system.scm (%base-packages): Change from UTIL-LINUX to UTIL-LINUX+UDEV. --- gnu/system.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/system.scm b/gnu/system.scm index abdbb081e6..7033671526 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -565,7 +565,7 @@ (define %base-packages ;; required for basic administrator tasks. (cons* procps psmisc which less zile nano pciutils usbutils - util-linux + util-linux+udev inetutils isc-dhcp (@ (gnu packages admin) shadow) ;for 'passwd' -- cgit v1.2.3 From 639e641cdf5e86cd49362f7bafd931633339b21f Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 8 Jan 2020 15:25:07 +0100 Subject: gnu: Add clojure-tools-cli. * gnu/packages/clojure.scm (clojure-tools-cli): New variable. --- gnu/packages/clojure.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/clojure.scm b/gnu/packages/clojure.scm index a9cabfe008..9a1ceed66c 100644 --- a/gnu/packages/clojure.scm +++ b/gnu/packages/clojure.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2018 Alex Vong ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2019 Tobias Geerinckx-Rice +;;; Copyright © 2020 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -296,3 +297,27 @@ (define-public clojure-tools-macro (description "Tools for writing macros.") (home-page "https://github.com/clojure/tools.macro") (license license:epl1.0))) + +(define-public clojure-tools-cli + (package + (name "clojure-tools-cli") + (version "0.4.2") + (home-page "https://github.com/clojure/tools.cli") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "tools.cli-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1yqlm8lwbcjm0dp032z7vzc4bdlmc4jixznvf4adsqhvqw85hvj2")))) + (build-system clojure-build-system) + (arguments + '(#:source-dirs '("src/main/clojure/") + #:test-dirs '("src/test/clojure/") + #:doc-dirs '())) + (synopsis "Clojure library for working with command-line arguments") + (description + "The @code{tools.cli} library provides Clojure programmers with tools to +work with command-line arguments.") + (license license:epl1.0))) -- cgit v1.2.3 From 984efa2b6a561bf0eeb43be63f01e2d83b151aa5 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 8 Jan 2020 19:28:48 +0100 Subject: build-system/clojure: Provide only the right modules in scope. Previously, we used to have a whole bunch of (guix build *-build-system) modules in scope, which, for example, meant that '%standard-phases' was clashing. This change clarifies it. * guix/build-system/clojure.scm (%default-modules): New variable. (clojure-build): Change the default value of #:modules and that of #:phases. --- guix/build-system/clojure.scm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/guix/build-system/clojure.scm b/guix/build-system/clojure.scm index d70535c9e3..607f67aaec 100644 --- a/guix/build-system/clojure.scm +++ b/guix/build-system/clojure.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Alex Vong +;;; Copyright © 2020 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -43,12 +44,18 @@ (define-module (guix build-system clojure) ;; Code: (define-with-docs %clojure-build-system-modules - "Build-side modules imported and used by default." + "Build-side modules imported by default." `((guix build clojure-build-system) (guix build clojure-utils) (guix build guile-build-system) ,@%ant-build-system-modules)) +(define %default-modules + ;; Modules in scope in the build-side environment. + '((guix build clojure-build-system) + (guix build clojure-utils) + (guix build utils))) + (define-with-docs %default-clojure "The default Clojure package." (delay (@* (gnu packages clojure) clojure))) @@ -133,15 +140,14 @@ (define* (clojure-build store name inputs (test-include `',%test-include) (test-exclude `',%test-exclude) - (phases '(@ (guix build clojure-build-system) - %standard-phases)) + (phases '%standard-phases) (outputs '("out")) (search-paths '()) (system (%current-system)) (guile #f) (imported-modules %clojure-build-system-modules) - (modules %clojure-build-system-modules)) + (modules %default-modules)) "Build SOURCE with INPUTS." (let ((builder `(begin (use-modules ,@modules) -- cgit v1.2.3 From 62b9d3d4d5a652e7a4266269de004573fade7bb9 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 8 Jan 2020 23:28:37 +0100 Subject: git-authenticate: Add daviwil to the list of committers. This is a followup to a587bb23b79eae5dd3fa3acb06d0b533c93fd562, first commit signed by daviwil. * build-aux/git-authenticate.scm (%committers): Add "daviwil". --- build-aux/git-authenticate.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build-aux/git-authenticate.scm b/build-aux/git-authenticate.scm index b8cc804094..106c843c25 100644 --- a/build-aux/git-authenticate.scm +++ b/build-aux/git-authenticate.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2019 Ludovic Courtès +;;; Copyright © 2019, 2020 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -89,6 +89,8 @@ (define %committers "B3C0 DB4D AD73 BA5D 285E 19AE 5143 0234 CEFD 87C3") ("davexunit (2nd)" ;FIXME: to be confirmed! "8CCB A7F5 52B9 CBEA E1FB 2915 8328 C747 0FF1 D807") + ("daviwil" + "53C4 1E6E 41AA FE55 335A CA5E 446A 2ED4 D940 BF14") ("dvc" "6909 6DFD D702 8BED ACC5 884B C5E0 51C7 9C0B ECDB") ("dvc (old)" -- cgit v1.2.3 From 981ce38937c21ed1395c0a6ff7e384890234fa62 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 3 Jan 2020 17:45:24 +0100 Subject: services: nfs: Fix name of package variable. * gnu/services/nfs.scm (rpcbind-service-type): Correct name from nfs-utils to rpcbind. --- gnu/services/nfs.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/services/nfs.scm b/gnu/services/nfs.scm index 6ed4c0eabf..834e94a800 100644 --- a/gnu/services/nfs.scm +++ b/gnu/services/nfs.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 John Darrington +;;; Copyright © 2018, 2019, 2020 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -58,11 +59,11 @@ (define rpcbind-service-type (shepherd-service-type 'rpcbind (lambda (config) - (define nfs-utils + (define rpcbind (rpcbind-configuration-rpcbind config)) (define rpcbind-command - #~(list (string-append #$nfs-utils "/bin/rpcbind") "-f" + #~(list (string-append #$rpcbind "/bin/rpcbind") "-f" #$@(if (rpcbind-configuration-warm-start? config) '("-w") '()))) (shepherd-service -- cgit v1.2.3 From ba1808d5e7342ec749b006276bece6499cfaa4ba Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 3 Jan 2020 17:48:49 +0100 Subject: services: nfs: Allow rpcbind-service-type to be extended. * gnu/services/nfs.scm (rpcbind-service-type): Rewrite using SERVICE-TYPE to add ability to extend the service. --- gnu/services/nfs.scm | 47 ++++++++++++++++++++++++++++++----------------- 1 file changed, 30 insertions(+), 17 deletions(-) diff --git a/gnu/services/nfs.scm b/gnu/services/nfs.scm index 834e94a800..0681e764ec 100644 --- a/gnu/services/nfs.scm +++ b/gnu/services/nfs.scm @@ -56,23 +56,36 @@ (define-record-type* (default #t))) (define rpcbind-service-type - (shepherd-service-type - 'rpcbind - (lambda (config) - (define rpcbind - (rpcbind-configuration-rpcbind config)) - - (define rpcbind-command - #~(list (string-append #$rpcbind "/bin/rpcbind") "-f" - #$@(if (rpcbind-configuration-warm-start? config) '("-w") '()))) - - (shepherd-service - (documentation "Start the RPC bind daemon.") - (requirement '(networking)) - (provision '(rpcbind-daemon)) - - (start #~(make-forkexec-constructor #$rpcbind-command)) - (stop #~(make-kill-destructor)))))) + (let ((proc + (lambda (config) + (define rpcbind + (rpcbind-configuration-rpcbind config)) + + (define rpcbind-command + #~(list (string-append #$rpcbind "/bin/rpcbind") "-f" + #$@(if (rpcbind-configuration-warm-start? config) '("-w") '()))) + + (shepherd-service + (documentation "Start the RPC bind daemon.") + (requirement '(networking)) + (provision '(rpcbind-daemon)) + + (start #~(make-forkexec-constructor #$rpcbind-command)) + (stop #~(make-kill-destructor)))))) + (service-type + (name 'rpcbind) + (extensions + (list (service-extension shepherd-root-service-type + (compose list proc)))) + ;; We use the extensions feature to allow other services to automatically + ;; configure and start this service. Only one value can be provided. We + ;; override it with the value returned by the extending service. + (compose identity) + (extend (lambda (config values) + (match values + ((first . rest) first) + (_ config)))) + (default-value (rpcbind-configuration))))) -- cgit v1.2.3 From 25c8c8cd4f384f9da08ea277bc5da16ca26128de Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 3 Jan 2020 17:50:45 +0100 Subject: services: nfs: Allow pipefs-service-type to be extended. * gnu/services/nfs.scm (pipefs-service-type): Rewrite using SERVICE-TYPE to add ability to extend the service. --- gnu/services/nfs.scm | 39 +++++++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/gnu/services/nfs.scm b/gnu/services/nfs.scm index 0681e764ec..1b5dcb0e97 100644 --- a/gnu/services/nfs.scm +++ b/gnu/services/nfs.scm @@ -24,6 +24,7 @@ (define-module (gnu services nfs) #:use-module (gnu packages linux) #:use-module (guix) #:use-module (guix records) + #:use-module (srfi srfi-1) #:use-module (ice-9 match) #:use-module (gnu build file-systems) #:export (rpcbind-service-type @@ -96,23 +97,33 @@ (define-record-type* (default default-pipefs-directory))) (define pipefs-service-type - (shepherd-service-type - 'pipefs - (lambda (config) - (define pipefs-directory (pipefs-configuration-mount-point config)) + (let ((proc + (lambda (config) + (define pipefs-directory (pipefs-configuration-mount-point config)) - (shepherd-service - (documentation "Mount the pipefs pseudo file system.") - (provision '(rpc-pipefs)) + (shepherd-service + (documentation "Mount the pipefs pseudo file system.") + (provision '(rpc-pipefs)) - (start #~(lambda () - (mkdir-p #$pipefs-directory) - (mount "rpc_pipefs" #$pipefs-directory "rpc_pipefs") - (member #$pipefs-directory (mount-points)))) + (start #~(lambda () + (mkdir-p #$pipefs-directory) + (mount "rpc_pipefs" #$pipefs-directory "rpc_pipefs") + (member #$pipefs-directory (mount-points)))) - (stop #~(lambda (pid . args) - (umount #$pipefs-directory MNT_DETACH) - (not (member #$pipefs-directory (mount-points))))))))) + (stop #~(lambda (pid . args) + (umount #$pipefs-directory MNT_DETACH) + (not (member #$pipefs-directory (mount-points))))))))) + (service-type + (name 'pipefs) + (extensions + (list (service-extension shepherd-root-service-type + (compose list proc)))) + ;; We use the extensions feature to allow other services to automatically + ;; configure and start this service. Only one value can be provided. We + ;; override it with the value returned by the extending service. + (compose identity) + (extend (lambda (config values) (first values))) + (default-value (pipefs-configuration))))) -- cgit v1.2.3 From 5d4ba49891996df93b4219c9dc9a438cac8f4a71 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 3 Jan 2020 18:02:02 +0100 Subject: services: nfs: Fix indentation and typo. * gnu/services/nfs.scm (, ): Fix indentation. (): Rename accessor for NFS-UTILS field to IDMAP-CONFIGURATION-NFS-UTILS. (idmap-service-type): Use IDMAP-CONFIGURATION-NFS-UTILS. --- gnu/services/nfs.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/services/nfs.scm b/gnu/services/nfs.scm index 1b5dcb0e97..451020be31 100644 --- a/gnu/services/nfs.scm +++ b/gnu/services/nfs.scm @@ -130,7 +130,7 @@ (define pipefs-directory (pipefs-configuration-mount-point config)) (define-record-type* gss-configuration make-gss-configuration gss-configuration? - (pipefs-directory gss-configuration-pipefs-directory + (pipefs-directory gss-configuration-pipefs-directory (default default-pipefs-directory)) (nfs-utils gss-configuration-gss (default nfs-utils))) @@ -162,11 +162,11 @@ (define gss-command (define-record-type* idmap-configuration make-idmap-configuration idmap-configuration? - (pipefs-directory idmap-configuration-pipefs-directory + (pipefs-directory idmap-configuration-pipefs-directory (default default-pipefs-directory)) (domain idmap-configuration-domain - (default #f)) - (nfs-utils idmap-configuration-idmap + (default #f)) + (nfs-utils idmap-configuration-nfs-utils (default nfs-utils))) (define idmap-service-type @@ -175,7 +175,7 @@ (define idmap-service-type (lambda (config) (define nfs-utils - (idmap-configuration-idmap config)) + (idmap-configuration-nfs-utils config)) (define pipefs-directory (idmap-configuration-pipefs-directory config)) -- cgit v1.2.3 From af32ea35830383deb3b1540ca1b829eb53c6fe0d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 3 Jan 2020 18:13:38 +0100 Subject: services: nfs: Allow idmap-service-type to be extended. * gnu/services/nfs.scm (idmap-service-type): Rewrite using SERVICE-TYPE to add ability to extend the service. --- gnu/services/nfs.scm | 67 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 39 insertions(+), 28 deletions(-) diff --git a/gnu/services/nfs.scm b/gnu/services/nfs.scm index 451020be31..9fb95bde7e 100644 --- a/gnu/services/nfs.scm +++ b/gnu/services/nfs.scm @@ -170,37 +170,48 @@ (define-record-type* (default nfs-utils))) (define idmap-service-type - (shepherd-service-type - 'idmap - (lambda (config) - - (define nfs-utils - (idmap-configuration-nfs-utils config)) + (let ((proc + (lambda (config) - (define pipefs-directory - (idmap-configuration-pipefs-directory config)) + (define nfs-utils + (idmap-configuration-nfs-utils config)) - (define domain (idmap-configuration-domain config)) + (define pipefs-directory + (idmap-configuration-pipefs-directory config)) - (define (idmap-config-file config) - (plain-file "idmapd.conf" - (string-append - "\n[General]\n" - (if domain - (format #f "Domain = ~a\n" domain)) - "\n[Mapping]\n" - "Nobody-User = nobody\n" - "Nobody-Group = nogroup\n"))) + (define domain (idmap-configuration-domain config)) - (define idmap-command - #~(list (string-append #$nfs-utils "/sbin/rpc.idmapd") "-f" - "-p" #$pipefs-directory - "-c" #$(idmap-config-file config))) + (define (idmap-config-file config) + (plain-file "idmapd.conf" + (string-append + "\n[General]\n" + (if domain + (format #f "Domain = ~a\n" domain) + "") + "\n[Mapping]\n" + "Nobody-User = nobody\n" + "Nobody-Group = nogroup\n"))) - (shepherd-service - (documentation "Start the RPC IDMAP daemon.") - (requirement '(rpcbind-daemon rpc-pipefs)) - (provision '(idmap-daemon)) - (start #~(make-forkexec-constructor #$idmap-command)) - (stop #~(make-kill-destructor)))))) + (define idmap-command + #~(list (string-append #$nfs-utils "/sbin/rpc.idmapd") "-f" + "-p" #$pipefs-directory + ;; TODO: this is deprecated + "-c" #$(idmap-config-file config))) + (shepherd-service + (documentation "Start the RPC IDMAP daemon.") + (requirement '(rpcbind-daemon rpc-pipefs)) + (provision '(idmap-daemon)) + (start #~(make-forkexec-constructor #$idmap-command)) + (stop #~(make-kill-destructor)))))) + (service-type + (name 'idmap) + (extensions + (list (service-extension shepherd-root-service-type + (compose list proc)))) + ;; We use the extensions feature to allow other services to automatically + ;; configure and start this service. Only one value can be provided. We + ;; override it with the value returned by the extending service. + (compose identity) + (extend (lambda (config values) (first values))) + (default-value (idmap-configuration))))) -- cgit v1.2.3 From 2a23942e3fbda98a9457304785481dd54302714a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 3 Jan 2020 18:15:00 +0100 Subject: services: nfs: Add verbosity control to idmap-service-type. * gnu/services/nfs.scm ()[verbosity]: New field. (idmap-configuration-verbosity): New procedure. (idmap-service-type): Use it. * doc/guix.texi (Network File System): Document it. --- doc/guix.texi | 3 +++ gnu/services/nfs.scm | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index bb0ef17ddd..0f498a0f95 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -22044,6 +22044,9 @@ The local NFSv4 domain name. This must be a string or @code{#f}. If it is @code{#f} then the daemon will use the host's fully qualified domain name. +@item @code{verbosity} (default: @code{0}) +The verbosity level of the daemon. + @end table @end deftp diff --git a/gnu/services/nfs.scm b/gnu/services/nfs.scm index 9fb95bde7e..054dad08b6 100644 --- a/gnu/services/nfs.scm +++ b/gnu/services/nfs.scm @@ -167,7 +167,9 @@ (define-record-type* (domain idmap-configuration-domain (default #f)) (nfs-utils idmap-configuration-nfs-utils - (default nfs-utils))) + (default nfs-utils)) + (verbosity idmap-configuration-verbosity + (default 0))) (define idmap-service-type (let ((proc @@ -185,6 +187,10 @@ (define (idmap-config-file config) (plain-file "idmapd.conf" (string-append "\n[General]\n" + "Verbosity = " + (number->string + (idmap-configuration-verbosity config)) + "\n" (if domain (format #f "Domain = ~a\n" domain) "") -- cgit v1.2.3 From a6bdca6b9b7a5de8244b46d0e16047f6deb31272 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 3 Jan 2020 18:16:13 +0100 Subject: services: nfs: Allow gss-service-type to be extended. * gnu/services/nfs.scm (gss-service-type): Rewrite using SERVICE-TYPE to add ability to extend the service. --- gnu/services/nfs.scm | 53 ++++++++++++++++++++++++++++++++-------------------- 1 file changed, 33 insertions(+), 20 deletions(-) diff --git a/gnu/services/nfs.scm b/gnu/services/nfs.scm index 054dad08b6..cd7e8fab01 100644 --- a/gnu/services/nfs.scm +++ b/gnu/services/nfs.scm @@ -136,26 +136,39 @@ (define-record-type* (default nfs-utils))) (define gss-service-type - (shepherd-service-type - 'gss - (lambda (config) - (define nfs-utils - (gss-configuration-gss config)) - - (define pipefs-directory - (gss-configuration-pipefs-directory config)) - - (define gss-command - #~(list (string-append #$nfs-utils "/sbin/rpc.gssd") "-f" - "-p" #$pipefs-directory)) - - (shepherd-service - (documentation "Start the RPC GSS daemon.") - (requirement '(rpcbind-daemon rpc-pipefs)) - (provision '(gss-daemon)) - - (start #~(make-forkexec-constructor #$gss-command)) - (stop #~(make-kill-destructor)))))) + (let ((proc + (lambda (config) + (define nfs-utils + (gss-configuration-gss config)) + + (define pipefs-directory + (gss-configuration-pipefs-directory config)) + + (define gss-command + #~(list (string-append #$nfs-utils "/sbin/rpc.gssd") "-f" + "-p" #$pipefs-directory)) + + (shepherd-service + (documentation "Start the RPC GSS daemon.") + (requirement '(rpcbind-daemon rpc-pipefs)) + (provision '(gss-daemon)) + + (start #~(make-forkexec-constructor #$gss-command)) + (stop #~(make-kill-destructor)))))) + (service-type + (name 'gss) + (extensions + (list (service-extension shepherd-root-service-type + (compose list proc)))) + ;; We use the extensions feature to allow other services to automatically + ;; configure and start this service. Only one value can be provided. We + ;; override it with the value returned by the extending service. + (compose identity) + (extend (lambda (config values) + (match values + ((first . rest) first) + (_ config)))) + (default-value (gss-configuration))))) -- cgit v1.2.3 From 907eeac2e7d5d9c10b65038d486876e577c80d85 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 3 Jan 2020 18:19:50 +0100 Subject: services: nfs: Add nfs-service-type. * gnu/services/nfs.scm (): New record. (nfs-configuration, nfs-configuration?, nfs-configuration-nfs-utils, nfs-configuration-nfs-version, nfs-configuration-exports, nfs-configuration-rpcmountd-port, nfs-configuration-rpcstatd-port, nfs-configuration-rpcbind, nfs-configuration-idmap-domain, nfs-configuration-nfsd-port, nfs-configuration-nfsd-threads, nfs-configuration-pipefs-directory, nfs-configuration-debug, nfs-shepherd-services): New procedures. (nfs-service-type): New variable. * doc/guix.texi (Network File System): Document it. * gnu/tests/nfs.scm (%test-nfs-server): New variable. (%base-os): Use default value of rpcbind-service-type. --- doc/guix.texi | 74 ++++++++++++++++++++- gnu/services/nfs.scm | 181 ++++++++++++++++++++++++++++++++++++++++++++++++++- gnu/tests/nfs.scm | 157 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 407 insertions(+), 5 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 0f498a0f95..2b30fc5705 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -29,7 +29,7 @@ Copyright @copyright{} 2015, 2016 Mathieu Lirzin@* Copyright @copyright{} 2014 Pierre-Antoine Rault@* Copyright @copyright{} 2015 Taylan Ulrich Bayırlı/Kammer@* Copyright @copyright{} 2015, 2016, 2017, 2019 Leo Famulari@* -Copyright @copyright{} 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus@* +Copyright @copyright{} 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus@* Copyright @copyright{} 2016 Ben Woodcroft@* Copyright @copyright{} 2016, 2017, 2018 Chris Marusich@* Copyright @copyright{} 2016, 2017, 2018, 2019 Efraim Flashner@* @@ -21940,6 +21940,78 @@ The @code{(gnu services nfs)} module provides the following services, which are most commonly used in relation to mounting or exporting directory trees as @dfn{network file systems} (NFS). +While it is possible to use the individual components that together make +up a Network File System service, we recommended to configure an NFS +server with the @code{nfs-service-type}. + +@subsubheading NFS Service +@cindex NFS, server + +The NFS service takes care of setting up all NFS component services, +kernel configuration file systems, and installs configuration files in +the locations that NFS expects. + +@defvr {Scheme Variable} nfs-service-type +A service type for a complete NFS server. +@end defvr + +@deftp {Data Type} nfs-configuration +This data type represents the configuration of the NFS service and all +of its subsystems. + +It has the following parameters: +@table @asis +@item @code{nfs-utils} (default: @code{nfs-utils}) +The nfs-utils package to use. + +@item @code{nfs-version} (default: @code{#f}) +If a string value is provided, the @command{rpc.nfsd} daemon will be +limited to supporting the given version of the NFS protocol. + +@item @code{exports} (default: @code{'()}) +This is a list of directories the NFS server should export. Each entry +is a list consisting of two elements: a directory name and a string +containing all options. This is an example in which the directory +@file{/export} is served to all NFS clients as a read-only share: + +@lisp +(nfs-configuration + (exports + '(("/export" + "*(ro,insecure,no_subtree_check,crossmnt,fsid=0)")))) +@end lisp + +@item @code{rpcmountd-port} (default: @code{#f}) +The network port that the @command{rpc.mountd} daemon should use. + +@item @code{rpcstatd-port} (default: @code{#f}) +The network port that the @command{rpc.statd} daemon should use. + +@item @code{rpcbind} (default: @code{rpcbind}) +The rpcbind package to use. + +@item @code{idmap-domain} (default: @code{"localdomain"}) +The local NFSv4 domain name. + +@item @code{nfsd-port} (default: @code{2049}) +The network port that the @command{nfsd} daemon should use. + +@item @code{nfsd-threads} (default: @code{8}) +The number of threads used by the @command{nfsd} daemon. + +@item @code{pipefs-directory} (default: @code{"/var/lib/nfs/rpc_pipefs"}) +The directory where the pipefs file system is mounted. + +@item @code{debug} (default: @code{'()"}) +A list of subsystems for which debugging output should be enabled. This +is a list of symbols. Any of these symbols are valid: @code{nfsd}, +@code{nfs}, @code{rpc}, @code{idmap}, @code{statd}, or @code{mountd}. +@end table +@end deftp + +If you don't need a complete NFS service or prefer to build it yourself +you can use the individual component services that are documented below. + @subsubheading RPC Bind Service @cindex rpcbind diff --git a/gnu/services/nfs.scm b/gnu/services/nfs.scm index cd7e8fab01..ddc9e2c47e 100644 --- a/gnu/services/nfs.scm +++ b/gnu/services/nfs.scm @@ -22,6 +22,7 @@ (define-module (gnu services nfs) #:use-module (gnu services shepherd) #:use-module (gnu packages onc-rpc) #:use-module (gnu packages linux) + #:use-module (gnu packages nfs) #:use-module (guix) #:use-module (guix records) #:use-module (srfi srfi-1) @@ -41,7 +42,11 @@ (define-module (gnu services nfs) gss-service-type gss-configuration - gss-configuration?)) + gss-configuration? + + nfs-service-type + nfs-configuration + nfs-configuration?)) (define default-pipefs-directory "/var/lib/nfs/rpc_pipefs") @@ -234,3 +239,177 @@ (define idmap-command (compose identity) (extend (lambda (config values) (first values))) (default-value (idmap-configuration))))) + +(define-record-type* + nfs-configuration make-nfs-configuration + nfs-configuration? + (nfs-utils nfs-configuration-nfs-utils + (default nfs-utils)) + (nfs-version nfs-configuration-nfs-version + (default #f)) ; string + (exports nfs-configuration-exports + (default '())) + (rpcmountd-port nfs-configuration-rpcmountd-port + (default #f)) + (rpcstatd-port nfs-configuration-rpcstatd-port + (default #f)) + (rpcbind nfs-configuration-rpcbind + (default rpcbind)) + (idmap-domain nfs-configuration-idmap-domain + (default "localdomain")) + (nfsd-port nfs-configuration-nfsd-port + (default 2049)) + (nfsd-threads nfs-configuration-nfsd-threads + (default 8)) + (pipefs-directory nfs-configuration-pipefs-directory + (default default-pipefs-directory)) + ;; List of modules to debug; any of nfsd, nfs, rpc, idmap, statd, or mountd. + (debug nfs-configuration-debug + (default '()))) + +(define (nfs-shepherd-services config) + "Return a list of for the NFS daemons with CONFIG." + (match-record config + (nfs-utils nfs-version exports + rpcmountd-port rpcstatd-port nfsd-port nfsd-threads + pipefs-directory debug) + (list (shepherd-service + (documentation "Run the NFS statd daemon.") + (provision '(rpc.statd)) + (requirement '(rpcbind-daemon)) + (start + #~(make-forkexec-constructor + (list #$(file-append nfs-utils "/sbin/rpc.statd") + ;; TODO: notification support may require a little more + ;; configuration work. + "--no-notify" + #$@(if (member 'statd debug) + '("--no-syslog") ; verbose logging to stderr + '()) + "--foreground" + #$@(if rpcstatd-port + '("--port" (number->string rpcstatd-port)) + '())) + #:pid-file "/var/run/rpc.statd.pid")) + (stop #~(make-kill-destructor))) + (shepherd-service + (documentation "Run the NFS mountd daemon.") + (provision '(rpc.mountd)) + (requirement '(rpc.statd)) + (start + #~(make-forkexec-constructor + (list #$(file-append nfs-utils "/sbin/rpc.mountd") + #$@(if (member 'mountd debug) + '("--debug" "all") + '()) + #$@(if rpcmountd-port + '("--port" (number->string rpcmountd-port)) + '())))) + (stop #~(make-kill-destructor))) + (shepherd-service + (documentation "Run the NFS daemon.") + (provision '(rpc.nfsd)) + (requirement '(rpc.statd networking)) + (start + #~(lambda _ + (zero? (system* #$(file-append nfs-utils "/sbin/rpc.nfsd") + #$@(if (member 'nfsd debug) + '("--debug") + '()) + "--port" #$(number->string nfsd-port) + #$@(if nfs-version + '("--nfs-version" nfs-version) + '()) + #$(number->string nfsd-threads))))) + (stop + #~(lambda _ + (zero? + (system* #$(file-append nfs-utils "/sbin/rpc.nfsd") "0"))))) + (shepherd-service + (documentation "Run the NFS mountd daemon and refresh exports.") + (provision '(nfs)) + (requirement '(rpc.nfsd rpc.mountd rpc.statd rpcbind-daemon)) + (start + #~(lambda _ + (let ((rpcdebug #$(file-append nfs-utils "/sbin/rpcdebug"))) + (cond + ((member 'nfsd '#$debug) + (system* rpcdebug "-m" "nfsd" "-s" "all")) + ((member 'nfs '#$debug) + (system* rpcdebug "-m" "nfs" "-s" "all")) + ((member 'rpc '#$debug) + (system* rpcdebug "-m" "rpc" "-s" "all")))) + (zero? (system* + #$(file-append nfs-utils "/sbin/exportfs") + "-r" ; re-export + "-a" ; everthing + "-v" ; be verbose + "-d" "all" ; debug + )))) + (stop + #~(lambda _ + (let ((rpcdebug #$(file-append nfs-utils "/sbin/rpcdebug"))) + (cond + ((member 'nfsd '#$debug) + (system* rpcdebug "-m" "nfsd" "-c" "all")) + ((member 'nfs '#$debug) + (system* rpcdebug "-m" "nfs" "-c" "all")) + ((member 'rpc '#$debug) + (system* rpcdebug "-m" "rpc" "-c" "all")))) + #t)) + (respawn? #f))))) + +(define nfs-service-type + (service-type + (name 'nfs) + (extensions + (list + (service-extension shepherd-root-service-type nfs-shepherd-services) + (service-extension activation-service-type + (const #~(begin + (use-modules (guix build utils)) + (system* "mount" "-t" "nfsd" + "nfsd" "/proc/fs/nfsd") + + (mkdir-p "/var/lib/nfs") + ;; directory containing monitor list + (mkdir-p "/var/lib/nfs/sm") + ;; Needed for client recovery tracking + (mkdir-p "/var/lib/nfs/v4recovery") + (let ((user (getpw "nobody"))) + (chown "/var/lib/nfs" + (passwd:uid user) + (passwd:gid user)) + (chown "/var/lib/nfs/v4recovery" + (passwd:uid user) + (passwd:gid user))) + #t))) + (service-extension etc-service-type + (lambda (config) + `(("exports" + ,(plain-file "exports" + (string-join + (map string-join + (nfs-configuration-exports config)) + "\n")))))) + ;; The NFS service depends on these other services. They are extended so + ;; that users don't need to configure them manually. + (service-extension idmap-service-type + (lambda (config) + (idmap-configuration + (domain (nfs-configuration-idmap-domain config)) + (verbosity + (if (member 'idmap (nfs-configuration-debug config)) + 10 0)) + (pipefs-directory (nfs-configuration-pipefs-directory config)) + (nfs-utils (nfs-configuration-nfs-utils config))))) + (service-extension pipefs-service-type + (lambda (config) + (pipefs-configuration + (mount-point (nfs-configuration-pipefs-directory config))))) + (service-extension rpcbind-service-type + (lambda (config) + (rpcbind-configuration + (rpcbind (nfs-configuration-rpcbind config))))))) + (description + "Run all NFS daemons and refresh the list of exported file systems."))) diff --git a/gnu/tests/nfs.scm b/gnu/tests/nfs.scm index 7ef9f1f7bf..014d049ab5 100644 --- a/gnu/tests/nfs.scm +++ b/gnu/tests/nfs.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; Copyright © 2018 Clément Lassieur +;;; Copyright © 2019, 2020 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -33,10 +34,12 @@ (define-module (gnu tests nfs) #:use-module (gnu services nfs) #:use-module (gnu services networking) #:use-module (gnu packages onc-rpc) + #:use-module (gnu packages nfs) #:use-module (guix gexp) #:use-module (guix store) #:use-module (guix monads) - #:export (%test-nfs)) + #:export (%test-nfs + %test-nfs-server)) (define %base-os (operating-system @@ -53,8 +56,7 @@ (define %base-os rpcbind %base-packages)) (services (cons* - (service rpcbind-service-type - (rpcbind-configuration)) + (service rpcbind-service-type) (service dhcp-client-service-type) %base-services)))) @@ -133,3 +135,152 @@ (define %test-nfs (name "nfs") (description "Test some things related to NFS.") (value (run-nfs-test name "/var/run/rpcbind.sock")))) + + +(define %nfs-os + (let ((os (simple-operating-system + (simple-service 'create-target-directory activation-service-type + #~(begin + (mkdir "/remote") + (chmod "/remote" #o777) + #t)) + (service dhcp-client-service-type) + (service nfs-service-type + (nfs-configuration + (debug '(nfs nfsd mountd)) + (exports '(("/export" + ;; crossmnt = This is the pseudo root. + ;; fsid=0 = root file system of the export + "*(ro,insecure,no_subtree_check,crossmnt,fsid=0)")))))))) + (operating-system + (inherit os) + (host-name "nfs-server") + ;; We need to use a tmpfs here, because the test system's root file + ;; system cannot be re-exported via NFS. + (file-systems (cons + (file-system + (device "none") + (mount-point "/export") + (type "tmpfs") + (create-mount-point? #t)) + %base-file-systems)) + (services + ;; Enable debugging output. + (modify-services (operating-system-user-services os) + (syslog-service-type config + => + (syslog-configuration + (inherit config) + (config-file + (plain-file + "syslog.conf" + "*.* /dev/console\n"))))))))) + +(define (run-nfs-server-test) + "Run a test of an OS running a service of NFS-SERVICE-TYPE." + (define os + (marionette-operating-system + %nfs-os + #:requirements '(nscd) + #:imported-modules '((gnu services herd) + (guix combinators)))) + (define test + (with-imported-modules '((gnu build marionette)) + #~(begin + (use-modules (gnu build marionette) + (srfi srfi-64)) + + (define marionette + (make-marionette (list #$(virtual-machine os)))) + (define (wait-for-file file) + ;; Wait until FILE exists in the guest + (marionette-eval + `(let loop ((i 10)) + (cond ((file-exists? ,file) + #t) + ((> i 0) + (sleep 1) + (loop (- i 1))) + (else + (error "File didn't show up: " ,file)))) + marionette)) + + (mkdir #$output) + (chdir #$output) + + (test-begin "nfs-daemon") + (marionette-eval + '(begin + (current-output-port + (open-file "/dev/console" "w0")) + (chmod "/export" #o777) + (with-output-to-file "/export/hello" + (lambda () (display "hello world"))) + (chmod "/export/hello" #o777)) + marionette) + + (test-assert "nscd PID file is created" + (marionette-eval + '(begin + (use-modules (gnu services herd)) + (start-service 'nscd)) + marionette)) + + (test-assert "nscd is listening on its socket" + (marionette-eval + ;; XXX: Work around a race condition in nscd: nscd creates its + ;; PID file before it is listening on its socket. + '(let ((sock (socket PF_UNIX SOCK_STREAM 0))) + (let try () + (catch 'system-error + (lambda () + (connect sock AF_UNIX "/var/run/nscd/socket") + (close-port sock) + (format #t "nscd is ready~%") + #t) + (lambda args + (format #t "waiting for nscd...~%") + (usleep 500000) + (try))))) + marionette)) + + (test-assert "network is up" + (marionette-eval + '(begin + (use-modules (gnu services herd)) + (start-service 'networking)) + marionette)) + + ;; Wait for the NFS services to be up and running. + (test-assert "nfs services are running" + (and (marionette-eval + '(begin + (use-modules (gnu services herd)) + (start-service 'nfs)) + marionette) + (wait-for-file "/var/run/rpc.statd.pid"))) + + (test-assert "nfs share is advertised" + (marionette-eval + '(zero? (system* (string-append #$nfs-utils "/sbin/showmount") + "-e" "nfs-server")) + marionette)) + + (test-assert "nfs share mounted" + (marionette-eval + '(begin + (and (zero? (system* (string-append #$nfs-utils "/sbin/mount.nfs4") + "nfs-server:/" "/remote" "-v")) + (file-exists? "/remote/hello"))) + marionette)) + (test-end) + (exit (= (test-runner-fail-count (test-runner-current)) 0))))) + + (gexp->derivation "nfs-server-test" test)) + +(define %test-nfs-server + (system-test + (name "nfs-server") + (description "Test that an NFS server can be started and exported +directories can be mounted.") + (value (run-nfs-server-test)))) -- cgit v1.2.3 From 60a366ec7aa777d61cd349fad5f9f32cbdb642dc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 9 Jan 2020 00:13:50 +0100 Subject: gnu: util-linux: Rename udev variant. Some packages propagate util-linux, so make sure that that manifests and similar choose the same version to avoid conflicts. * gnu/packages/linux.scm (util-linux)[properties]: Remove. (util-linux+udev)[name]: Set to "util-linux-with-udev". [properties]: Remove. --- gnu/packages/linux.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 3c720f32fc..ee571f12ad 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1182,9 +1182,6 @@ (define-public util-linux utilities. It provides dmesg and includes tools for working with file systems, block devices, UUIDs, TTYs, and many other tools.") - ;; Hide the package so that end users get the udev-enabled variant below. - (properties '((hidden? . #t))) - ;; Note that util-linux doesn't use the same license for all the ;; code. GPLv2+ is the default license for a code without an ;; explicitly defined license. @@ -1197,10 +1194,10 @@ (define-public util-linux (define-public util-linux+udev (package/inherit util-linux + (name "util-linux-with-udev") (inputs `(("udev" ,eudev) - ,@(package-inputs util-linux))) - (properties (alist-delete 'hidden? (package-properties util-linux))))) + ,@(package-inputs util-linux))))) (define-public ddate (package -- cgit v1.2.3 From 9a1bfd68a95fa91d3c80c2b77e0d69540cd2e8a9 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Thu, 9 Jan 2020 02:27:06 +0300 Subject: gnu: emacs-treemacs: Refactor "install-data" phase. * gnu/packages/emacs-xyz.scm (emacs-treemacs)[arguments]: Refactor "install-data" phase. --- gnu/packages/emacs-xyz.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index ee0aafc50f..6c9d493c62 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -17847,13 +17847,13 @@ (define-public emacs-treemacs #t)) (add-after 'install 'install-data (lambda* (#:key outputs #:allow-other-keys) - (let ((images (string-append (assoc-ref outputs "out") - "/share/" ,name "/images"))) + (let ((out (assoc-ref outputs "out"))) (with-directory-excursion "../.." ;treemacs root - (copy-recursively "icons/default" images) - (copy-recursively "src/scripts" - (string-append (assoc-ref outputs "out") - "/share/" ,name "/scripts")) + (copy-recursively "icons/default" + (string-append out "/share/" ,name "/images")) + (copy-recursively + "src/scripts" + (string-append out "/share/" ,name "/scripts")) #t))))))) (home-page "https://github.com/Alexander-Miller/treemacs") (synopsis "Emacs tree style file explorer") -- cgit v1.2.3 From 64c1e6fe4ab440e2bb3b5fe6ed7a659f1cdd5b98 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Thu, 9 Jan 2020 02:28:07 +0300 Subject: gnu: abiword: Update to 3.0.4. * gnu/packages/abiword.scm (abiword): Update to 3.0.4. [source](patches): Remove "abiword-black-drawing-with-gtk322.patch" patch. Delete merged to upstream patch hunks in "abiword-explictly-cast-bools.patch" patch. * gnu/packages/patches/abiword-black-drawing-with-gtk322.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove this. --- gnu/local.mk | 3 +- gnu/packages/abiword.scm | 8 ++-- .../abiword-black-drawing-with-gtk322.patch | 49 ---------------------- .../patches/abiword-explictly-cast-bools.patch | 18 -------- 4 files changed, 5 insertions(+), 73 deletions(-) delete mode 100644 gnu/packages/patches/abiword-black-drawing-with-gtk322.patch diff --git a/gnu/local.mk b/gnu/local.mk index acbe99d34b..6fab0ddeca 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -17,7 +17,7 @@ # Copyright © 2017 Mathieu Othacehe # Copyright © 2017, 2018, 2019 Gábor Boskovits # Copyright © 2018 Amirouche Boubekki -# Copyright © 2018, 2019 Oleg Pykhalov +# Copyright © 2018, 2019, 2020 Oleg Pykhalov # Copyright © 2018 Stefan Stefanović # Copyright © 2018 Maxim Cournoyer # Copyright © 2019 Guillaume Le Vaillant @@ -694,7 +694,6 @@ dist_patch_DATA = \ %D%/packages/patches/a2ps-CVE-2015-8107.patch \ %D%/packages/patches/abcl-fix-build-xml.patch \ %D%/packages/patches/abiword-explictly-cast-bools.patch \ - %D%/packages/patches/abiword-black-drawing-with-gtk322.patch \ %D%/packages/patches/adb-add-libraries.patch \ %D%/packages/patches/aegis-constness-error.patch \ %D%/packages/patches/aegis-perl-tempdir1.patch \ diff --git a/gnu/packages/abiword.scm b/gnu/packages/abiword.scm index db9f1bb72c..2b65a02242 100644 --- a/gnu/packages/abiword.scm +++ b/gnu/packages/abiword.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2020 Oleg Pykhalov ;;; ;;; This file is part of GNU Guix. ;;; @@ -47,7 +48,7 @@ (define-module (gnu packages abiword) (define-public abiword (package (name "abiword") - (version "3.0.2") + (version "3.0.4") (source (origin (method url-fetch) @@ -55,10 +56,9 @@ (define-public abiword (string-append "https://www.abisource.com/downloads/abiword/" version "/source/abiword-" version ".tar.gz")) (sha256 - (base32 "08imry821g81apdwym3gcs4nss0l9j5blqk31j5rv602zmcd9gxg")) + (base32 "1mx5l716n0z5788i19qmad30cck4v9ggr071cafw2nrf375rcc79")) (patches - (search-patches "abiword-explictly-cast-bools.patch" - "abiword-black-drawing-with-gtk322.patch")))) + (search-patches "abiword-explictly-cast-bools.patch")))) (build-system glib-or-gtk-build-system) (arguments ;; NOTE: rsvg is disabled, since Abiword diff --git a/gnu/packages/patches/abiword-black-drawing-with-gtk322.patch b/gnu/packages/patches/abiword-black-drawing-with-gtk322.patch deleted file mode 100644 index 88a5ca4c38..0000000000 --- a/gnu/packages/patches/abiword-black-drawing-with-gtk322.patch +++ /dev/null @@ -1,49 +0,0 @@ -commit 2ee38d1881aeea27bb49acc450631d813d1f28ba -Author: Hubert Figuière -Date: Wed Dec 7 09:44:01 2016 -0500 - - Bug 13815 - draw event should return TRUE - - This fix the black drawing regression witj Gtk3.22 - -diff --git a/src/af/xap/gtk/xap_UnixFrameImpl.cpp b/src/af/xap/gtk/xap_UnixFrameImpl.cpp -index 780000e..10f8e00 100644 ---- a/src/af/xap/gtk/xap_UnixFrameImpl.cpp -+++ b/src/af/xap/gtk/xap_UnixFrameImpl.cpp -@@ -1208,9 +1208,9 @@ gint XAP_UnixFrameImpl::_fe::delete_event(GtkWidget * w, GdkEvent * /*event*/, g - } - - #if GTK_CHECK_VERSION(3,0,0) --gint XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr) -+gboolean XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr) - #else --gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent) -+gboolean XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent) - #endif - { - XAP_UnixFrameImpl * pUnixFrameImpl = static_cast(g_object_get_data(G_OBJECT(w), "user_data")); -@@ -1243,7 +1243,7 @@ gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent) - pView->draw(&rClip); - #endif - } -- return FALSE; -+ return TRUE; - } - - static bool bScrollWait = false; -diff --git a/src/af/xap/gtk/xap_UnixFrameImpl.h b/src/af/xap/gtk/xap_UnixFrameImpl.h -index 30ee5d8..a0ff57f 100644 ---- a/src/af/xap/gtk/xap_UnixFrameImpl.h -+++ b/src/af/xap/gtk/xap_UnixFrameImpl.h -@@ -152,9 +152,9 @@ protected: - static gint key_release_event(GtkWidget* w, GdkEventKey* e); - static gint delete_event(GtkWidget * w, GdkEvent * /*event*/, gpointer /*data*/); - #if GTK_CHECK_VERSION(3,0,0) -- static gint draw(GtkWidget * w, cairo_t * cr); -+ static gboolean draw(GtkWidget * w, cairo_t * cr); - #else -- static gint expose(GtkWidget * w, GdkEventExpose* pExposeEvent); -+ static gboolean expose(GtkWidget * w, GdkEventExpose* pExposeEvent); - #endif - static gint do_ZoomUpdate( gpointer /* xap_UnixFrame * */ p); - static void vScrollChanged(GtkAdjustment * w, gpointer /*data*/); diff --git a/gnu/packages/patches/abiword-explictly-cast-bools.patch b/gnu/packages/patches/abiword-explictly-cast-bools.patch index 97ae6653c2..1d026a68b0 100644 --- a/gnu/packages/patches/abiword-explictly-cast-bools.patch +++ b/gnu/packages/patches/abiword-explictly-cast-bools.patch @@ -13,24 +13,6 @@ casted. } /* -@@ -161,7 +161,7 @@ bool UT_JPEG_getDimensions(const UT_ByteBuf* pBB, UT_sint32& iImageWidth, - /* set the data source */ - _JPEG_ByteBufSrc (&cinfo, pBB); - -- jpeg_read_header(&cinfo, TRUE); -+ jpeg_read_header(&cinfo, (boolean)TRUE); - jpeg_start_decompress(&cinfo); - iImageWidth = cinfo.output_width; - iImageHeight = cinfo.output_height; -@@ -189,7 +189,7 @@ bool UT_JPEG_getRGBData(const UT_ByteBuf* pBB, UT_Byte* pDest, UT_sint32 iDestRo - /* set the data source */ - _JPEG_ByteBufSrc (&cinfo, pBB); - -- jpeg_read_header(&cinfo, TRUE); -+ jpeg_read_header(&cinfo, (boolean)TRUE); - jpeg_start_decompress(&cinfo); - - int row_stride = cinfo.output_width * cinfo.output_components; In the following file, we also need to reverse header include order: JPEG needs -- cgit v1.2.3 From 20d812fac45fbeeb913ab04d380ee5b5281bbc3d Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Thu, 9 Jan 2020 02:51:16 +0300 Subject: gnu: skalibs: Update to 2.9.1.0. * gnu/packages/skarnet.scm (skalibs): Update to 2.9.1.0. --- gnu/packages/skarnet.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/skarnet.scm b/gnu/packages/skarnet.scm index cee50f627a..4335ca6717 100644 --- a/gnu/packages/skarnet.scm +++ b/gnu/packages/skarnet.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2016 Eric Le Bihan ;;; Copyright © 2017 Z. Ren ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2020 Oleg Pykhalov ;;; ;;; This file is part of GNU Guix. ;;; @@ -29,14 +30,14 @@ (define-module (gnu packages skarnet) (define-public skalibs (package (name "skalibs") - (version "2.8.1.0") + (version "2.9.1.0") (source (origin (method url-fetch) (uri (string-append "http://skarnet.org/software/skalibs/skalibs-" version ".tar.gz")) (sha256 - (base32 "1fk6n402ywn4kpy6ng7sfnnqcg0mp6wq2hrv8sv3kxd0nh3na723")))) + (base32 "19c6s3f7vxi96l2yqzjk9x9i4xkfg4fdzxhn1jg6bfb2qjph9cnk")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; no tests exist -- cgit v1.2.3 From 2266eecfae673cfa333ec1b22ffd1c9789cb71d4 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Thu, 9 Jan 2020 02:51:26 +0300 Subject: gnu: s6-dns: Update to 2.3.1.1. * gnu/packages/skarnet.scm (s6-dns): Update to 2.3.1.1. --- gnu/packages/skarnet.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/skarnet.scm b/gnu/packages/skarnet.scm index 4335ca6717..79d3acb0b6 100644 --- a/gnu/packages/skarnet.scm +++ b/gnu/packages/skarnet.scm @@ -142,14 +142,14 @@ (define-public s6 (define-public s6-dns (package (name "s6-dns") - (version "2.3.0.2") + (version "2.3.1.1") (source (origin (method url-fetch) (uri (string-append "http://skarnet.org/software/s6-dns/s6-dns-" version ".tar.gz")) (sha256 - (base32 "1y9bhvx8bqsb2xq5lmlfnc1hw2b3jyqg11i9r4lj0n6vvaqwh1j8")))) + (base32 "0clib10dk3r9rcxv1yfr6gdvqqrx0arzivjpmhz9p8xaif53wpj1")))) (build-system gnu-build-system) (inputs `(("skalibs" ,skalibs))) (arguments -- cgit v1.2.3 From c1eab4a2a9043004f2cad8f628d3a990c818c7ec Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Thu, 9 Jan 2020 02:59:51 +0300 Subject: gnu: s6-linux-init: Update to 1.0.3.1. * gnu/packages/skarnet.scm (s6-linux-init)[version]: Update to 1.0.3.1. [inputs]: Add execline and s6. [arguments]: Add '--with-lib=' for execline and s6. --- gnu/packages/skarnet.scm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/gnu/packages/skarnet.scm b/gnu/packages/skarnet.scm index 79d3acb0b6..c26058afe7 100644 --- a/gnu/packages/skarnet.scm +++ b/gnu/packages/skarnet.scm @@ -287,7 +287,7 @@ (define-public s6-portable-utils (define-public s6-linux-init (package (name "s6-linux-init") - (version "0.4.0.1") + (version "1.0.3.1") (source (origin (method url-fetch) @@ -295,16 +295,24 @@ (define-public s6-linux-init "http://skarnet.org/software/s6-linux-init/s6-linux-init-" version ".tar.gz")) (sha256 - (base32 "0i79b0r3amhsf1xqr9k9v9bxmm4imlakfpsybviwhlj8dlawldxm")))) + (base32 "1yq2xnp41a1lqpjzvq5jawgy64jwaxalvjdnlvgdpi9bkicgasi1")))) (build-system gnu-build-system) (inputs - `(("skalibs" ,skalibs))) + `(("execline" ,execline) + ("s6", s6) + ("skalibs" ,skalibs))) (arguments '(#:configure-flags (list (string-append "--with-lib=" (assoc-ref %build-inputs "skalibs") "/lib/skalibs") + (string-append "--with-lib=" + (assoc-ref %build-inputs "execline") + "/lib/execline") + (string-append "--with-lib=" + (assoc-ref %build-inputs "s6") + "/lib/s6") (string-append "--with-sysdeps=" (assoc-ref %build-inputs "skalibs") "/lib/skalibs/sysdeps")) -- cgit v1.2.3 From e37a3ac0bd43fe5c4a3988bd2b7941b6d3253bba Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Thu, 9 Jan 2020 03:02:29 +0300 Subject: gnu: s6-linux-utils: Update to 2.5.1.1. * gnu/packages/skarnet.scm (s6-linux-utils): Update to 2.5.1.1. --- gnu/packages/skarnet.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/skarnet.scm b/gnu/packages/skarnet.scm index c26058afe7..3c0ca8d35d 100644 --- a/gnu/packages/skarnet.scm +++ b/gnu/packages/skarnet.scm @@ -332,7 +332,7 @@ (define-public s6-linux-init (define-public s6-linux-utils (package (name "s6-linux-utils") - (version "2.5.0.1") + (version "2.5.1.1") (source (origin (method url-fetch) @@ -340,7 +340,7 @@ (define-public s6-linux-utils "http://skarnet.org/software/s6-linux-utils/s6-linux-utils-" version ".tar.gz")) (sha256 - (base32 "0bpcaah3rbz4i013bkarr7wxmfvisjyxg0z78xg5zfbgajpgjxx1")))) + (base32 "00nw2phd9prgv29hzqzwjnh4y0ivkzhx3srn6n1rlyr4ydhikxi5")))) (build-system gnu-build-system) (inputs `(("skalibs" ,skalibs))) (arguments -- cgit v1.2.3 From e262a5a7e02d6230ea92a195f379dbcb4f68d469 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Thu, 9 Jan 2020 03:03:16 +0300 Subject: gnu: s6-networking: Update to 2.3.1.1. * gnu/packages/skarnet.scm (s6-networking): Update to 2.3.1.1. --- gnu/packages/skarnet.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/skarnet.scm b/gnu/packages/skarnet.scm index 3c0ca8d35d..0012c1ecb4 100644 --- a/gnu/packages/skarnet.scm +++ b/gnu/packages/skarnet.scm @@ -171,14 +171,14 @@ (define-public s6-dns (define-public s6-networking (package (name "s6-networking") - (version "2.3.0.4") + (version "2.3.1.1") (source (origin (method url-fetch) (uri (string-append "http://skarnet.org/software/s6-networking/s6-networking-" version ".tar.gz")) (sha256 - (base32 "00kqp0mcp8c7f0z5s4399rd1haxasxkqgd6ds0j0607hvi56mqqa")))) + (base32 "127i7ig5wdgjbkjf0py0g96llc6cbxij22ns2j7bwa95figinhcx")))) (build-system gnu-build-system) (inputs `(("skalibs" ,skalibs) ("execline" ,execline) -- cgit v1.2.3 From dd0e9335dcbb9fce5a8471726e51d2aab10aa96c Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Thu, 9 Jan 2020 03:04:13 +0300 Subject: gnu: s6-portable-utils: Update to 2.2.2.1. * gnu/packages/skarnet.scm (s6-portable-utils): Update to 2.2.2.1. --- gnu/packages/skarnet.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/skarnet.scm b/gnu/packages/skarnet.scm index 0012c1ecb4..b996d600a6 100644 --- a/gnu/packages/skarnet.scm +++ b/gnu/packages/skarnet.scm @@ -255,7 +255,7 @@ (define-public s6-rc (define-public s6-portable-utils (package (name "s6-portable-utils") - (version "2.2.1.3") + (version "2.2.2.1") (source (origin (method url-fetch) @@ -263,7 +263,7 @@ (define-public s6-portable-utils "http://skarnet.org/software/s6-portable-utils/s6-portable-utils-" version ".tar.gz")) (sha256 - (base32 "1ibjns1slyg1p7jl9irzlrjz8b01f506iw87g3s7db5arhf17vv2")))) + (base32 "074kizkxjwvmxspxg69fr8r0lbiy61l2n5nzgbfvwvhc6lj34iqy")))) (build-system gnu-build-system) (inputs `(("skalibs" ,skalibs))) (arguments -- cgit v1.2.3 From db7040935f2b1e8876dd5d147457e6a821444672 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Thu, 9 Jan 2020 03:05:02 +0300 Subject: gnu: s6-rc: Update to 0.5.1.1. * gnu/packages/skarnet.scm (s6-rc): Update to 0.5.1.1. --- gnu/packages/skarnet.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/skarnet.scm b/gnu/packages/skarnet.scm index b996d600a6..3768695a8f 100644 --- a/gnu/packages/skarnet.scm +++ b/gnu/packages/skarnet.scm @@ -214,14 +214,14 @@ (define-public s6-networking (define-public s6-rc (package (name "s6-rc") - (version "0.5.0.0") + (version "0.5.1.1") (source (origin (method url-fetch) (uri (string-append "http://skarnet.org/software/s6-rc/s6-rc-" version ".tar.gz")) (sha256 - (base32 "0p97p49i8m44lfiffycgn7xi08yzxkrs5dyb03svdhd6clwh6zyb")))) + (base32 "0lmg517l8inn7bi57q35rjd7b4jmqlmkhrbvs5ybbhinhd12qzi5")))) (build-system gnu-build-system) (inputs `(("skalibs" ,skalibs) ("execline" ,execline) -- cgit v1.2.3 From 8f6b6cb822beb2886fcd6ebb700c00c02d9093d8 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Thu, 9 Jan 2020 03:10:13 +0300 Subject: gnu: sdl2-image: Update to 2.0.5. * gnu/packages/sdl.scm (sdl2-image): Update to 2.0.5. --- gnu/packages/sdl.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index df86d677ee..a01cafb34a 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2019 Marius Bakke ;;; Copyright © 2019 Pierre Neidhardt ;;; Copyright © 2020 Timotej Lazar +;;; Copyright © 2020 Oleg Pykhalov ;;; ;;; This file is part of GNU Guix. ;;; @@ -404,7 +405,7 @@ (define-public sdl2-gfx (define-public sdl2-image (package (inherit sdl-image) (name "sdl2-image") - (version "2.0.4") + (version "2.0.5") (source (origin (method url-fetch) @@ -412,7 +413,7 @@ (define-public sdl2-image (string-append "https://www.libsdl.org/projects/SDL_image/release/" "SDL2_image-" version ".tar.gz")) (sha256 - (base32 "1b6f7002bm007y3zpyxb5r6ag0lml51jyvx1pwpj9sq24jfc8kp7")))) + (base32 "1l0864kas9cwpp2d32yxl81g98lx40dhbdp03dz7sbv84vhgdmdx")))) (propagated-inputs (propagated-inputs-with-sdl2 sdl-image)))) -- cgit v1.2.3 From 30bbe72db357e2a8e79020c2d1c1c80d7f4c7e89 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 8 Jan 2020 03:36:01 +0100 Subject: gnu: mate-terminal: Don't use NAME in source URI. * gnu/packages/mate.scm (mate-terminal)[source]: Hard-code NAME. --- gnu/packages/mate.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index d55d1b4461..cb4656de02 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2016 Fabian Harfert ;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2017 ng0 -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019 Ludovic Courtès ;;; Copyright © 2019 Guy Fleury Iteriteka ;;; @@ -306,7 +306,7 @@ (define-public mate-terminal (origin (method url-fetch) (uri (string-append "mirror://mate/" (version-major+minor version) "/" - name "-" version ".tar.xz")) + "mate-terminal-" version ".tar.xz")) (sha256 (base32 "16r492s34la2fs2cj1xr0r93wkjglwy77jyrc66i2ahs9gnivj4g")))) -- cgit v1.2.3 From 789a39a82c10ec0e6e738afa6f99d6ff130c052a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 8 Jan 2020 03:36:05 +0100 Subject: gnu: mate-terminal: Update to 1.23.0. * gnu/packages/mate.scm (mate-terminal): Update to 1.23.0. --- gnu/packages/mate.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index cb4656de02..78d98d4203 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -301,15 +301,14 @@ (define-public libmateweather (define-public mate-terminal (package (name "mate-terminal") - (version "1.22.0") + (version "1.23.0") (source (origin (method url-fetch) (uri (string-append "mirror://mate/" (version-major+minor version) "/" "mate-terminal-" version ".tar.xz")) (sha256 - (base32 - "16r492s34la2fs2cj1xr0r93wkjglwy77jyrc66i2ahs9gnivj4g")))) + (base32 "1jkw8i2j45p80i7wmm0j0gkbd44nr2qj8bf79jrh5z8kn01b1ibd")))) (build-system glib-or-gtk-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 5dc8a3ad39eb8a7d74ebcaf944fb420db71dc86a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 8 Jan 2020 12:47:49 +0100 Subject: gnu: font-lato: Update version number to 2.015. Both the README and the Web site identify this as version 2.015. * gnu/packages/fonts.scm (font-lato)[version]: Correct. --- gnu/packages/fonts.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 83c97444bf..5edf54f2b8 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -14,7 +14,7 @@ ;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2016 Marius Bakke ;;; Copyright © 2016 Toni Reina -;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2017 José Miguel Sánchez García ;;; Copyright © 2017 Alex Griffin ;;; Copyright © 2017 Clément Lassieur @@ -209,7 +209,7 @@ (define-public font-cantarell (define-public font-lato (package (name "font-lato") - (version "2.010") ; also update description + (version "2.015") ; also update description (source (origin (method url-fetch/zipbomb) (uri (string-append "https://www.latofonts.com/download/Lato2OFL.zip")) -- cgit v1.2.3 From 3fd67ec610bbe4a697fe6164e20e54f803ca95e4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 8 Jan 2020 12:55:24 +0100 Subject: gnu: font-terminus: Update to 4.48. * gnu/packages/fonts.scm (font-terminus): Update to 4.48. --- gnu/packages/fonts.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 5edf54f2b8..0edad65e0a 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -352,14 +352,14 @@ (define-public font-linuxlibertine (define-public font-terminus (package (name "font-terminus") - (version "4.47") + (version "4.48") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/terminus-font/terminus-font-" version "/terminus-font-" version ".tar.gz")) (sha256 - (base32 "15qjcpalcxjiwsjgjg5k88vkwp56cs2nnx4ghya6mqp4i1c206qg")))) + (base32 "1bwlkj39rqbyq57v5yssayav6hzv1n11b9ml2s0dpiyfsn6rqy9l")))) (build-system gnu-build-system) (outputs (list "out" "pcf-8bit")) (arguments -- cgit v1.2.3 From 7ac600927b0d8dd4c3b174382f8c274e197aa0c3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 8 Jan 2020 13:01:06 +0100 Subject: gnu: font-gnu-unifont: Update to 12.1.04. * gnu/packages/fonts.scm (font-gnu-unifont): Update to 12.1.04. --- gnu/packages/fonts.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 0edad65e0a..95b4f3eaa1 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -646,7 +646,7 @@ (define-public font-anonymous-pro-minus (define-public font-gnu-unifont (package (name "font-gnu-unifont") - (version "12.1.03") + (version "12.1.04") (source (origin (method url-fetch) @@ -656,7 +656,7 @@ (define-public font-gnu-unifont (string-append "mirror://gnu/unifont/unifont-" version "/unifont-" version ".tar.gz"))) (sha256 - (base32 "10mr3ax19v5pa6a791fk2j3k45fpa8n5r36kq9gs8lk95wfnxmf1")))) + (base32 "1h5dyhg4j8sh4qpbwnsn34igb8mfapz5b3nf4k71hq1c5z3j0mcv")))) (build-system gnu-build-system) (outputs '("out" ; TrueType version "pcf" ; PCF (bitmap) version -- cgit v1.2.3 From 57680360da2bc27ca812651ae077be1d5b82c28b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 8 Jan 2020 13:54:56 +0100 Subject: gnu: font-ibm-plex: Update to 4.0.2. * gnu/packages/fonts.scm (font-ibm-plex): Update to 4.0.2. --- gnu/packages/fonts.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 95b4f3eaa1..6a052c7be4 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -68,7 +68,7 @@ (define-module (gnu packages fonts) (define-public font-ibm-plex (package (name "font-ibm-plex") - (version "2.0.0") + (version "4.0.2") (source (origin (method url-fetch) (uri (string-append @@ -76,7 +76,7 @@ (define-public font-ibm-plex "v" version "/OpenType.zip")) (sha256 (base32 - "1lv65z3qnqgh2w36daf5wyz0ma9rg1qj9s9lzlnva8l7q3h8c9b8")))) + "17bd84ic7z9hkcjy4bwnh4z51bnkh2vrjzwvs9g6lwzmxjswa5b6")))) (build-system font-build-system) (home-page "https://github.com/IBM/plex") (synopsis "IBM Plex typeface") -- cgit v1.2.3 From 901f2607c95d524ddb0ceb86f39a567ea6b8c813 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 8 Jan 2020 14:10:00 +0100 Subject: gnu: font-inconsolata: Update to 3.000. * gnu/packages/fonts.scm (font-inconsolata): Update to 3.000. [source]: Fetch from the author's new repository. --- gnu/packages/fonts.scm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 6a052c7be4..b7c0c3829d 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -89,13 +89,14 @@ (define-public font-ibm-plex (define-public font-inconsolata (package (name "font-inconsolata") - (version "0.80") - (source (origin - (method url-fetch) - (uri "http://www.levien.com/type/myfonts/Inconsolata.otf") - (sha256 - (base32 - "06js6znbcf7swn8y3b8ki416bz96ay7d3yvddqnvi88lqhbfcq8m")))) + (version "3.000") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/googlefonts/Inconsolata/" + "releases/download/v" version "/fonts_otf.zip")) + (sha256 + (base32 "1wavvv86nwsqm5sbmnkv1bprj7l7zdrkxpvjy6w8yag93k6hrlx1")))) (build-system font-build-system) (home-page "http://levien.com/type/myfonts/inconsolata.html") (synopsis "Monospace font") -- cgit v1.2.3 From fb7e50bdb4631459855183ab5dc1e714fb3fddea Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 8 Jan 2020 14:10:54 +0100 Subject: gnu: font-inconsolata: Use HTTPS home page. * gnu/packages/fonts.scm (font-inconsolata)[home-page]: Use HTTPS. --- 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 b7c0c3829d..1ba5af0674 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -98,7 +98,7 @@ (define-public font-inconsolata (sha256 (base32 "1wavvv86nwsqm5sbmnkv1bprj7l7zdrkxpvjy6w8yag93k6hrlx1")))) (build-system font-build-system) - (home-page "http://levien.com/type/myfonts/inconsolata.html") + (home-page "https://levien.com/type/myfonts/inconsolata.html") (synopsis "Monospace font") (description "A monospace font, designed for code listings and the like, in print. With attention to detail for high resolution rendering.") -- cgit v1.2.3 From 7c3c6f3a151af5a97f0c07c1c624f3769bfbd353 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 8 Jan 2020 14:48:24 +0100 Subject: gnu: font-comic-neue: Add a note about versions. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/fonts.scm (font-comic-neue): Add a comment about the ‘v2.4’ tag. --- gnu/packages/fonts.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 1ba5af0674..48cca11d5a 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -1090,6 +1090,8 @@ (define-public font-tamzen (define-public font-comic-neue (package (name "font-comic-neue") + ;; The ‘v2.3’ and ‘v2.4’ releases at https://github.com/crozynski/comicneue + ;; are equivalent. The home page hosts 2.3, not 2.4, so we use that here. (version "2.3") (source (origin (method url-fetch/zipbomb) -- cgit v1.2.3 From d5971d667bdc15bf86bdba80f3a5ad504d96fcf4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 8 Jan 2020 14:59:22 +0100 Subject: gnu: font-iosevka: Update to 2.3.3. * gnu/packages/fonts.scm (font-iosevka): Update to 2.3.3. --- gnu/packages/fonts.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 48cca11d5a..9e5021a364 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -1140,7 +1140,7 @@ (define-public font-comic-neue (define-public font-iosevka (package (name "font-iosevka") - (version "2.2.0") + (version "2.3.3") (source (origin (method url-fetch/zipbomb) @@ -1148,7 +1148,7 @@ (define-public font-iosevka "/releases/download/v" version "/ttc-iosevka-" version ".zip")) (sha256 - (base32 "14jfv6pkh1w44m89z2fn44kgmmqaf0057lk71advwfbm3q313y0x")))) + (base32 "0jkv5rkg5hi0avhwyhcjiqzjslp6zjj77f09vxx2gj9l93byz731")))) (build-system font-build-system) (home-page "https://be5invis.github.io/Iosevka/") (synopsis "Coders' typeface, built from code") -- cgit v1.2.3 From 076fe8462af9354e441886605243d8816be918bc Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Thu, 9 Jan 2020 04:08:30 +0300 Subject: gnu: teeworlds: Fix install phase on i386 architecture. * gnu/packages/games.scm (teeworlds)[arguments]: Fix install phase on i386 architecture. --- gnu/packages/games.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index dd083259c7..1f6064d082 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4580,7 +4580,9 @@ (define (use-latest-json-parser file) (let* ((arch ,(system->linux-architecture (or (%current-target-system) (%current-system)))) - (build (string-append "build/" arch "/release/")) + (build (string-append "build/" (if (string=? arch "i386") + "x86" arch) + "/release/")) (data-built (string-append build "data/")) (out (assoc-ref outputs "out")) (bin (string-append out "/bin/")) -- cgit v1.2.3 From 3d4bf400713169bf4270f110fa983095f24e546d Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Thu, 9 Jan 2020 04:16:19 +0300 Subject: gnu: tigervnc-client: Update to 1.10.1. * gnu/packages/tigervnc.scm (tigervnc-client): Update to 1.10.1. (tigervnc-server): Update to 1.10.1. --- gnu/packages/tigervnc.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/tigervnc.scm b/gnu/packages/tigervnc.scm index 85ac730f3d..903d8ccd02 100644 --- a/gnu/packages/tigervnc.scm +++ b/gnu/packages/tigervnc.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Todor Kondić +;;; Copyright © 2020 Oleg Pykhalov ;;; ;;; This file is part of GNU Guix. ;;; @@ -39,7 +40,7 @@ (define-module (gnu packages tigervnc) (define-public tigervnc-client (package (name "tigervnc-client") - (version "1.9.0") + (version "1.10.1") (source (origin (method git-fetch) @@ -50,7 +51,7 @@ (define-public tigervnc-client (file-name (git-file-name name version)) (sha256 (base32 - "0b47fg3741qs3zdpl2zr0s6jz46dypp2j6gqrappbzm3ywnnmm1x")))) + "001n189d2f3psn7nxgl8188ml6f7jbk26cxn2835y3mnlk5lmhgr")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; Tests that do exists are not automated. @@ -97,7 +98,7 @@ (define-public tigervnc-server (package (inherit xorg-server) (name "tigervnc-server") - (version "1.9.0") + (version "1.10.1") (native-inputs `(("tigervnc-src" ,(origin (method git-fetch) -- cgit v1.2.3 From 67f9f57899e12382cd4cd4724a942975575a6bd4 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Thu, 9 Jan 2020 04:29:42 +0300 Subject: gnu: streamlink: Update to 1.3.0. * gnu/packages/video.scm (streamlink): Update to 1.3.0. [source]: Remove patch. * gnu/local.mk (dist_patch_DATA): Remove this. --- gnu/local.mk | 1 - gnu/packages/video.scm | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/local.mk b/gnu/local.mk index 6fab0ddeca..4416d0991f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1384,7 +1384,6 @@ dist_patch_DATA = \ %D%/packages/patches/sooperlooper-build-with-wx-30.patch \ %D%/packages/patches/soundconverter-remove-gconf-dependency.patch \ %D%/packages/patches/steghide-fixes.patch \ - %D%/packages/patches/streamlink-update-test.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 \ diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 49e47673b9..2b3b9d982d 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -35,6 +35,7 @@ ;;; Copyright © 2019 Timo Eisenmann ;;; Copyright © 2019 Arne Babenhauserheide ;;; Copyright © 2019 Riku Viitanen +;;; Copyright © 2020 Oleg Pykhalov ;;; ;;; This file is part of GNU Guix. ;;; @@ -2168,15 +2169,14 @@ (define-public xvid (define-public streamlink (package (name "streamlink") - (version "0.14.2") + (version "1.3.0") (source (origin (method url-fetch) (uri (pypi-uri "streamlink" version)) (sha256 (base32 - "0l2145fd60i76afjisfxd48cwhwyir07i7s3bnimdq5db2kzkix8")) - (patches (search-patches "streamlink-update-test.patch")))) + "0593ffjpz82jrljnzxfafkcmcqad3r1ijjan0hm04xjcnxc9cr00")))) (build-system python-build-system) (home-page "https://github.com/streamlink/streamlink") (native-inputs -- cgit v1.2.3 From baa195dde4041e9166152c72c1100e9349dab3c7 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Thu, 9 Jan 2020 04:35:39 +0300 Subject: gnu: sysstat: Update to 12.3.1. * gnu/packages/linux.scm (sysstat): Update to 12.3.1. --- gnu/packages/linux.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index ee571f12ad..8f9500e4e4 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -38,6 +38,7 @@ ;;; Copyright © 2019 Pierre Langlois ;;; Copyright © 2019 Brice Waegeneire ;;; Copyright © 2019 Kei Kebreau +;;; Copyright © 2020 Oleg Pykhalov ;;; ;;; This file is part of GNU Guix. ;;; @@ -4993,14 +4994,14 @@ (define-public efibootmgr (define-public sysstat (package (name "sysstat") - (version "12.2.0") + (version "12.3.1") (source (origin (method url-fetch) (uri (string-append "http://pagesperso-orange.fr/sebastien.godard/" "sysstat-" version ".tar.xz")) (sha256 (base32 - "0xc3983ccr0dwab1px2jhbgj86pfmmr29k7ggnwjwm1qigmriak1")))) + "1hf1sy7akribmgavadqccxpy49yv0zfb3m81d2bj6jf8pyzwcrbq")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; No test suite. -- cgit v1.2.3 From fa01e10da2bb6118054e2807d1058369b382c48b Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Thu, 9 Jan 2020 04:37:52 +0300 Subject: gnu: system-config-printer: Update to 1.5.12. * gnu/packages/gnome.scm (system-config-printer): Update to 1.5.12. --- gnu/packages/gnome.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 8bd055f843..195705e765 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -45,6 +45,7 @@ ;;; Copyright © 2019 Raghav Gururajan ;;; Copyright © 2019 Jonathan Brielmaier ;;; Copyright © 2019 Leo Prikler +;;; Copyright © 2020 Oleg Pykhalov ;;; ;;; This file is part of GNU Guix. ;;; @@ -1263,7 +1264,7 @@ (define-public shared-mime-info (define-public system-config-printer (package (name "system-config-printer") - (version "1.5.11") + (version "1.5.12") (source (origin (method url-fetch) @@ -1272,7 +1273,7 @@ (define-public system-config-printer "download/" version "/system-config-printer-" version ".tar.xz")) (sha256 - (base32 "1lq0q51bhanirpjjvvh4xiafi8hgpk8r32h0dj6dn3f32z8pib9q")))) + (base32 "050yrx1vfh9f001qsn06y1jcidxq0ymxr64kxykasr0zzryp25kb")))) (build-system glib-or-gtk-build-system) (arguments `(#:imported-modules ((guix build python-build-system) -- cgit v1.2.3 From a1fd8c5dee3238c8360592904c3b33989cbf88cd Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Tue, 22 Oct 2019 22:45:17 -0700 Subject: gnu: arm-trusted-firmware: Update to 2.2. * gnu/packages/firmware (make-arm-trusted-firmware): Update to 2.2. [source]: Update URL. [homepage]: Update URL. * gnu/packages/patches/arm-trusted-firmware-optional-bin-generation.patch: Remove patch. * gnu/packages/patches/arm-trusted-firmware-rockchip-disable-binary.patch: Remove patch. * gnu/local.mk (dist_patch_DATA): Update accordingly. --- gnu/local.mk | 2 - gnu/packages/firmware.scm | 10 +-- ...-trusted-firmware-optional-bin-generation.patch | 86 ---------------------- ...-trusted-firmware-rockchip-disable-binary.patch | 73 ------------------ 4 files changed, 4 insertions(+), 167 deletions(-) delete mode 100644 gnu/packages/patches/arm-trusted-firmware-optional-bin-generation.patch delete mode 100644 gnu/packages/patches/arm-trusted-firmware-rockchip-disable-binary.patch diff --git a/gnu/local.mk b/gnu/local.mk index 4416d0991f..9228605755 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -711,8 +711,6 @@ dist_patch_DATA = \ %D%/packages/patches/appstream-glib-2020.patch \ %D%/packages/patches/apr-skip-getservbyname-test.patch \ %D%/packages/patches/arm-trusted-firmware-disable-hdcp.patch \ - %D%/packages/patches/arm-trusted-firmware-optional-bin-generation.patch \ - %D%/packages/patches/arm-trusted-firmware-rockchip-disable-binary.patch \ %D%/packages/patches/aspell-default-dict-dir.patch \ %D%/packages/patches/aspell-gcc-compat.patch \ %D%/packages/patches/ath9k-htc-firmware-binutils.patch \ diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 12b40389d0..e96a00bb22 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -380,22 +380,20 @@ (define-public ovmf-arm (define* (make-arm-trusted-firmware platform #:optional (arch "aarch64")) (package (name (string-append "arm-trusted-firmware-" platform)) - (version "2.1") + (version "2.2") (source (origin (method git-fetch) (uri (git-reference ;; There are only GitHub generated release snapshots. - (url "https://github.com/ARM-software/arm-trusted-firmware.git") + (url "https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/") (commit (string-append "v" version)))) (file-name (git-file-name "arm-trusted-firmware" version)) (patches (search-patches - "arm-trusted-firmware-optional-bin-generation.patch" - "arm-trusted-firmware-rockchip-disable-binary.patch" "arm-trusted-firmware-disable-hdcp.patch")) (sha256 (base32 - "1gy5qskrjy8n3kxdcm1dx8b45l5b75n0pm8pq80wl6xic1ycy24r")))) + "03fjl5hy1bqlya6fg553bqz7jrvilzrzpbs87cv6jd04v8qrvry8")))) (build-system gnu-build-system) (arguments `(#:phases @@ -443,7 +441,7 @@ (define* (make-arm-trusted-firmware platform #:optional (arch "aarch64")) ("cross-binutils" ,(cross-binutils "arm-linux-gnueabihf"))) '()) )) - (home-page "https://github.com/ARM-software/arm-trusted-firmware") + (home-page "https://www.trustedfirmware.org/") (synopsis "Implementation of \"secure world software\"") (description "ARM Trusted Firmware provides a reference implementation of secure world diff --git a/gnu/packages/patches/arm-trusted-firmware-optional-bin-generation.patch b/gnu/packages/patches/arm-trusted-firmware-optional-bin-generation.patch deleted file mode 100644 index b2b8a12e1d..0000000000 --- a/gnu/packages/patches/arm-trusted-firmware-optional-bin-generation.patch +++ /dev/null @@ -1,86 +0,0 @@ -From b02de4cb14ee9c2bfff53d36f0b7ec6a2065bc94 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Christoph=20M=C3=BCllner?= -Date: Wed, 24 Apr 2019 09:45:30 +0200 -Subject: [PATCH 1/2] build_macros: Add mechanism to prevent bin generation. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -On certain platforms it does not make sense to generate -TF-A binary images. For example a platform could make use of serveral -memory areas, which are non-continuous and the resulting binary -therefore would suffer from the padding-bytes. -Typically these platforms use the ELF image. - -This patch introduces a variable DISABLE_BIN_GENERATION, which -can be set to '1' in the platform makefile to prevent the binary -generation. - -Signed-off-by: Christoph Müllner -Change-Id: I62948e88bab685bb055fe6167d9660d14e604462 ---- - docs/user-guide.rst | 4 ++++ - make_helpers/build_macros.mk | 9 +++++++++ - make_helpers/defaults.mk | 3 +++ - 3 files changed, 16 insertions(+) - -diff --git a/docs/user-guide.rst b/docs/user-guide.rst -index 0848769b3..19919f112 100644 ---- a/docs/user-guide.rst -+++ b/docs/user-guide.rst -@@ -369,6 +369,10 @@ Common build options - - ``DEBUG``: Chooses between a debug and release build. It can take either 0 - (release) or 1 (debug) as values. 0 is the default. - -+- ``DISABLE_BIN_GENERATION``: Boolean option to disable the generation -+ of the binary image. If set to 1, then only the ELF image is built. -+ 0 is the default. -+ - - ``DYN_DISABLE_AUTH``: Provides the capability to dynamically disable Trusted - Board Boot authentication at runtime. This option is meant to be enabled only - for development platforms. ``TRUSTED_BOARD_BOOT`` flag must be set if this -diff --git a/make_helpers/build_macros.mk b/make_helpers/build_macros.mk -index 5d33954ad..2d41b2db1 100644 ---- a/make_helpers/build_macros.mk -+++ b/make_helpers/build_macros.mk -@@ -438,6 +438,11 @@ else - --script $(LINKERFILE) $(BUILD_DIR)/build_message.o \ - $(OBJS) $(LDPATHS) $(LIBWRAPPER) $(LDLIBS) $(BL_LIBS) - endif -+ifeq ($(DISABLE_BIN_GENERATION),1) -+ @${ECHO_BLANK_LINE} -+ @echo "Built $$@ successfully" -+ @${ECHO_BLANK_LINE} -+endif - - $(DUMP): $(ELF) - $${ECHO} " OD $$@" -@@ -451,7 +456,11 @@ $(BIN): $(ELF) - @${ECHO_BLANK_LINE} - - .PHONY: bl$(1) -+ifeq ($(DISABLE_BIN_GENERATION),1) -+bl$(1): $(ELF) $(DUMP) -+else - bl$(1): $(BIN) $(DUMP) -+endif - - all: bl$(1) - -diff --git a/make_helpers/defaults.mk b/make_helpers/defaults.mk -index be84f7791..dc797ed1f 100644 ---- a/make_helpers/defaults.mk -+++ b/make_helpers/defaults.mk -@@ -62,6 +62,9 @@ DEBUG := 0 - # Build platform - DEFAULT_PLAT := fvp - -+# Disable the generation of the binary image (ELF only). -+DISABLE_BIN_GENERATION := 0 -+ - # Enable capability to disable authentication dynamically. Only meant for - # development platforms. - DYN_DISABLE_AUTH := 0 --- -2.20.1 - diff --git a/gnu/packages/patches/arm-trusted-firmware-rockchip-disable-binary.patch b/gnu/packages/patches/arm-trusted-firmware-rockchip-disable-binary.patch deleted file mode 100644 index 8819a7cfad..0000000000 --- a/gnu/packages/patches/arm-trusted-firmware-rockchip-disable-binary.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 42383dcf7db5debb9e183c7c5631974a4c2f91ea Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Christoph=20M=C3=BCllner?= -Date: Wed, 24 Apr 2019 09:52:54 +0200 -Subject: [PATCH 2/2] rockchip: Disable binary generation for all SoCs. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -All supported Rockchip SoCs (RK3288, RK3328, RK3368 and RK3399) -have non-continuous memory areas in the linker script with a huge -gap between them. This results in extremely padded binary images -with a size of about 4 GiB. - -E.g. on the RK3399 we have the following memory areas (and base addresses): -RAM (0x1000), SRAM (0xFF8C0000), and PMUSRAM (0xFF3B0000). - -Consumers of the TF-A project (e.g. coreboot or U-Boot) therefore -use the ELF image instead, which has a size of a few hundred kBs. - -In order to prevent the generation of a huge and useless file, -this patch disables the binary generation for all affected Rockchip -SoCs. - -Signed-off-by: Christoph Müllner -Change-Id: I4ac65bdf1e598c3e1a59507897d183aee9a36916 ---- - plat/rockchip/rk3328/platform.mk | 2 ++ - plat/rockchip/rk3368/platform.mk | 2 ++ - plat/rockchip/rk3399/platform.mk | 2 ++ - 3 files changed, 6 insertions(+) - -diff --git a/plat/rockchip/rk3328/platform.mk b/plat/rockchip/rk3328/platform.mk -index 18b1b9419..01c5af6a2 100644 ---- a/plat/rockchip/rk3328/platform.mk -+++ b/plat/rockchip/rk3328/platform.mk -@@ -8,6 +8,8 @@ RK_PLAT := plat/rockchip - RK_PLAT_SOC := ${RK_PLAT}/${PLAT} - RK_PLAT_COMMON := ${RK_PLAT}/common - -+DISABLE_BIN_GENERATION := 1 -+ - include lib/libfdt/libfdt.mk - - PLAT_INCLUDES := -Idrivers/arm/gic/common/ \ -diff --git a/plat/rockchip/rk3368/platform.mk b/plat/rockchip/rk3368/platform.mk -index d1315fc58..4ec36ce06 100644 ---- a/plat/rockchip/rk3368/platform.mk -+++ b/plat/rockchip/rk3368/platform.mk -@@ -8,6 +8,8 @@ RK_PLAT := plat/rockchip - RK_PLAT_SOC := ${RK_PLAT}/${PLAT} - RK_PLAT_COMMON := ${RK_PLAT}/common - -+DISABLE_BIN_GENERATION := 1 -+ - include lib/libfdt/libfdt.mk - - PLAT_INCLUDES := -I${RK_PLAT_COMMON}/ \ -diff --git a/plat/rockchip/rk3399/platform.mk b/plat/rockchip/rk3399/platform.mk -index 101359856..25c498da8 100644 ---- a/plat/rockchip/rk3399/platform.mk -+++ b/plat/rockchip/rk3399/platform.mk -@@ -8,6 +8,8 @@ RK_PLAT := plat/rockchip - RK_PLAT_SOC := ${RK_PLAT}/${PLAT} - RK_PLAT_COMMON := ${RK_PLAT}/common - -+DISABLE_BIN_GENERATION := 1 -+ - include lib/libfdt/libfdt.mk - - PLAT_INCLUDES := -I${RK_PLAT_COMMON}/ \ --- -2.20.1 - -- cgit v1.2.3 From 634b0e28de019be2c142f1690e8d67fd00616ff3 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Wed, 8 Jan 2020 17:44:48 -0800 Subject: gnu: u-boot: Update to 2020.01. * gnu/packages/bootloaders (u-boot): Update to 2020.01. [source]: Remove patch u-boot-fix-mkimage-header-verification. [native-inputs]: Update to use python 3 and add perl. (u-boot-tools)[configure]: Use tools-only_defconfig. [arguments]: Update phase updating python-coverage to work with python 3. Drop obsolete substitution for test_ofplatdata. Disable code coverage tests and binman tests. * gnu/packages/patches/u-boot-fix-mkimage-header-verification.patch: Remove file. * gnu/local.mk [dist_patch_DATA]: Update accordingly. --- gnu/local.mk | 1 - gnu/packages/bootloaders.scm | 34 ++++++------- .../u-boot-fix-mkimage-header-verification.patch | 57 ---------------------- 3 files changed, 16 insertions(+), 76 deletions(-) delete mode 100644 gnu/packages/patches/u-boot-fix-mkimage-header-verification.patch diff --git a/gnu/local.mk b/gnu/local.mk index 9228605755..33cf439870 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1422,7 +1422,6 @@ dist_patch_DATA = \ %D%/packages/patches/tomb-fix-errors-on-open.patch \ %D%/packages/patches/tuxpaint-stamps-path.patch \ %D%/packages/patches/txr-shell.patch \ - %D%/packages/patches/u-boot-fix-mkimage-header-verification.patch \ %D%/packages/patches/ucx-tcp-iface-ioctl.patch \ %D%/packages/patches/udiskie-no-appindicator.patch \ %D%/packages/patches/unzip-CVE-2014-8139.patch \ diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 28ba16fb4b..0884791b27 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -402,7 +402,7 @@ (define-public dtc (define u-boot (package (name "u-boot") - (version "2019.04") + (version "2020.01") (source (origin (method url-fetch) (uri (string-append @@ -410,19 +410,17 @@ (define u-boot "u-boot-" version ".tar.bz2")) (sha256 (base32 - "1vwv4bgbl7fjcm073zrphn17hnz5h5h778f88ivdsgbb2lnpgdvn")) - (patches - (search-patches - "u-boot-fix-mkimage-header-verification.patch")))) + "1w9ml4jl15q6ixpdqzspxjnl7d3rgxd7f99ms1xv5c8869h3qida")))) (native-inputs `(("bc" ,bc) ("bison" ,bison) ("dtc" ,dtc) ("flex" ,flex) ("lz4" ,lz4) - ("python-2" ,python-2) - ("python2-coverage" ,python2-coverage) - ("python2-pytest" ,python2-pytest) + ("perl" ,perl) + ("python" ,python) + ("python-coverage" ,python-coverage) + ("python-pytest" ,python-pytest) ("sdl" ,sdl) ("swig" ,swig))) (build-system gnu-build-system) @@ -462,19 +460,22 @@ (define-public u-boot-tools (substitute* "tools/dtoc/fdt_util.py" (("'cc'") "'gcc'")) (substitute* "tools/patman/test_util.py" - ;; python-coverage is simply called coverage in guix. - (("python-coverage") "coverage") + ;; python*-coverage is simply called coverage in guix. + (("%s-coverage") "coverage") ;; XXX Allow for only 99% test coverage. ;; TODO: Find out why that is needed. (("if coverage != '100%':") "if not int(coverage.rstrip('%')) >= 99:")) (substitute* "test/run" ;; Make it easier to find test failures. (("#!/bin/bash") "#!/bin/bash -x") - ;; pytest doesn't find it otherwise. - (("test/py/tests/test_ofplatdata.py") - "tests/test_ofplatdata.py") ;; This test would require git. (("\\./tools/patman/patman") (which "true")) + ;; FIXME: test fails, needs further investiation + (("run_test \"binman\"") ": run_test \"binman\"") + ;; FIXME: code coverage not working + (("run_test \"binman code coverage\"") ": run_test \"binman code coverage\"") + (("run_test \"dtoc code coverage\"") ": run_test \"dtoc code coverage\"") + (("run_test \"fdt code coverage\"") ": run_test \"fdt code coverage\"") ;; This test would require internet access. (("\\./tools/buildman/buildman") (which "true"))) (substitute* "test/py/tests/test_sandbox_exit.py" @@ -494,14 +495,11 @@ (define-public u-boot-tools ;; This test requires a sound system, which is un-used ;; in u-boot-tools. (("CONFIG_SOUND=y") "CONFIG_SOUND=n"))) - (find-files "configs" "sandbox_.*defconfig$")) + (find-files "configs" "sandbox_.*defconfig$|tools-only_defconfig")) #t)) (replace 'configure (lambda* (#:key make-flags #:allow-other-keys) - (call-with-output-file "configs/tools_defconfig" - (lambda (port) - (display "CONFIG_SYS_TEXT_BASE=0\n" port))) - (apply invoke "make" "tools_defconfig" make-flags))) + (apply invoke "make" "tools-only_defconfig" make-flags))) (replace 'build (lambda* (#:key inputs make-flags #:allow-other-keys) (apply invoke "make" "tools-all" make-flags))) diff --git a/gnu/packages/patches/u-boot-fix-mkimage-header-verification.patch b/gnu/packages/patches/u-boot-fix-mkimage-header-verification.patch deleted file mode 100644 index 063677db4a..0000000000 --- a/gnu/packages/patches/u-boot-fix-mkimage-header-verification.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 48b52117235928cfd7ef1ec5c3f2cff5d7b03862 Mon Sep 17 00:00:00 2001 -From: Jordan Hand -Date: Wed, 10 Apr 2019 09:46:32 -0700 -Subject: [PATCH,v2] fdt: Fix mkimage list to try every header type -Origin: https://patchwork.ozlabs.org/patch/1083495/ - -Image type is not supplied to `mkimage -l`. For this reason, we cannot -use imagetool_verify_print_header_by_type. Instead, this patch uses -imagetool_verify_print_header to look through all header types to find -one where image validation succeeds. - -This patch fixes failures in test/image/test-imagetools.sh - -Signed-off-by: Jordan Hand -Tested-by: Alex Kiernan -Tested-by: Vagrant Cascadian ---- - tools/mkimage.c | 23 +++++++++++++++-------- - 1 file changed, 15 insertions(+), 8 deletions(-) - -diff --git a/tools/mkimage.c b/tools/mkimage.c -index 2899adff81..76c3406d37 100644 ---- a/tools/mkimage.c -+++ b/tools/mkimage.c -@@ -403,14 +403,21 @@ int main(int argc, char **argv) - exit (EXIT_FAILURE); - } - -- /* -- * scan through mkimage registry for all supported image types -- * and verify the input image file header for match -- * Print the image information for matched image type -- * Returns the error code if not matched -- */ -- retval = imagetool_verify_print_header_by_type(ptr, &sbuf, -- tparams, ¶ms); -+ if (params.fflag) { -+ /* -+ * Verifies the header format based on the expected header for -+ * image type in tparams -+ */ -+ retval = imagetool_verify_print_header_by_type(ptr, &sbuf, -+ tparams, ¶ms); -+ } else { -+ /** -+ * When listing the image, we are not given the image type. Simply check all -+ * image types to find one that matches our header -+ */ -+ retval = imagetool_verify_print_header(ptr, &sbuf, -+ tparams, ¶ms); -+ } - - (void) munmap((void *)ptr, sbuf.st_size); - (void) close (ifd); --- -2.20.1 - -- cgit v1.2.3 From e39fbd889042ffb31b0f5fee4dc4a3d40858a853 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Wed, 8 Jan 2020 17:47:09 -0800 Subject: gnu: u-boot-2019.10: Remove obsolete version. * gnu/packages/bootloaders (u-boot-2019.10): Remove variable. (u-boot-firefly-rk3399): Use default u-boot version. (u-boot-rockpro64-rk3399): Use default u-boot version. (u-boot-rock64-rk3328): Use default u-boot version. [arguments]: Remove add-u-boot-itb phase. --- gnu/packages/bootloaders.scm | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 0884791b27..c072ff8c8e 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -430,19 +430,6 @@ (define u-boot also initializes the boards (RAM etc).") (license license:gpl2+))) -(define u-boot-2019.10 - (package - (inherit u-boot) - (version "2019.10") - (source (origin - (method url-fetch) - (uri (string-append - "ftp://ftp.denx.de/pub/u-boot/" - "u-boot-" version ".tar.bz2")) - (sha256 - (base32 - "053hcrwwlacqh2niisn0zas95zkbffw5aw5sdhixs8lmfdq60vcd")))))) - (define-public u-boot-tools (package (inherit u-boot) @@ -768,8 +755,6 @@ (define-public u-boot-rock64-rk3328 (let ((base (make-u-boot-package "rock64-rk3328" "aarch64-linux-gnu"))) (package (inherit base) - (version (package-version u-boot-2019.10)) - (source (package-source u-boot-2019.10)) (arguments (substitute-keyword-arguments (package-arguments base) ((#:phases phases) @@ -779,12 +764,6 @@ (define-public u-boot-rock64-rk3328 (let ((bl31 (string-append (assoc-ref inputs "firmware") "/bl31.elf"))) (setenv "BL31" bl31)) - #t)) - (add-after 'unpack 'add-u-boot-itb - (lambda _ - (substitute* "Kconfig" - (("default .u-boot.itb. if SPL_LOAD_FIT && .ROCKCHIP_RK3399") - "default \"u-boot.itb\" if SPL_LOAD_FIT && (ARCH_ROCKCHIP")) #t)))))) (native-inputs `(("firmware" ,arm-trusted-firmware-rk3328) @@ -794,8 +773,6 @@ (define-public u-boot-firefly-rk3399 (let ((base (make-u-boot-package "firefly-rk3399" "aarch64-linux-gnu"))) (package (inherit base) - (version (package-version u-boot-2019.10)) - (source (package-source u-boot-2019.10)) (arguments (substitute-keyword-arguments (package-arguments base) ((#:phases phases) @@ -816,8 +793,6 @@ (define-public u-boot-rockpro64-rk3399 (let ((base (make-u-boot-package "rockpro64-rk3399" "aarch64-linux-gnu"))) (package (inherit base) - (version (package-version u-boot-2019.10)) - (source (package-source u-boot-2019.10)) (arguments (substitute-keyword-arguments (package-arguments base) ((#:phases phases) -- cgit v1.2.3 From a9e70dc5a6fdce9f0bf8ca8fd8459d59786a6d17 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 9 Jan 2020 11:27:25 +0100 Subject: gnu: emacs-helm-org: Update to 20191229. * gnu/packages/emacs-xyz.scm (emacs-helm-org): Update to 20191229. --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 6c9d493c62..5224492844 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -6996,8 +6996,8 @@ (define-public emacs-helm (license license:gpl3+))) (define-public emacs-helm-org - (let ((commit "b9a1167b0716a22a69670f4c35e0ac59d2e0b220") - (revision "2")) + (let ((commit "8457e1e46227bf87726e05c42cec5a4b51c2ef7b") + (revision "3")) (package (name "emacs-helm-org") (version (git-version "1.0" revision commit)) @@ -7009,7 +7009,7 @@ (define-public emacs-helm-org (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "1gc27i4azqpgijva1f4ckfdp4s52mc9pnfcmzhkwhknr6pd6jlcr")))) + (base32 "0kcjhwwi492n9m2w894hvdavfvhj45zygy7bwvx103wvpay5h6h6")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-helm" ,emacs-helm))) -- cgit v1.2.3 From 1e3bbd90e44492916f5e092256580436105c8242 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 9 Jan 2020 12:07:02 +0100 Subject: gnu: emacs-cyberpunk-theme: Update to 1.21. * gnu/packages/emacs-xyz.scm (emacs-cyberpunk-theme): Update to 1.21. --- gnu/packages/emacs-xyz.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 5224492844..75914f3f25 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -8119,7 +8119,7 @@ (define-public emacs-flx (define-public emacs-cyberpunk-theme (package (name "emacs-cyberpunk-theme") - (version "1.19") + (version "1.21") (source (origin (method git-fetch) @@ -8128,13 +8128,13 @@ (define-public emacs-cyberpunk-theme (commit version))) (sha256 (base32 - "1npwrw3pgdmvqhihcqcfi2yrs178iiip5fcj8zhpp6cr9yqsvvgi")) + "05mfgr9aj7knn7niadv9p6z3qrfpq2lbbi2wxxx62xywim9maw2y")) (file-name (git-file-name name version)))) (build-system emacs-build-system) (home-page "https://github.com/n3mo/cyberpunk-theme.el") - (synopsis "Cyberpunk theme for emacs built-in color theme support") + (synopsis "Cyberpunk theme for Emacs built-in color theme support") (description - "Cyberpunk color theme for the emacs 24+ built-in color theme support + "Cyberpunk color theme for the Emacs 24+ built-in color theme support known loosely as deftheme. Many mode-specific customizations are included.") (license license:gpl3+))) -- cgit v1.2.3 From 2673620f2455d89e3b2641d8c479ca00dbad824c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 8 Jan 2020 11:29:09 +0200 Subject: gnu: bwa: Install static library. * gnu/packages/bioinformatics.scm (bwa)[arguments]: Install static library. --- gnu/packages/bioinformatics.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 613015c67e..28c5dd11cf 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2015, 2016 Pjotr Prins ;;; Copyright © 2015 Andreas Enge ;;; Copyright © 2016 Roel Janssen -;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2016 Marius Bakke ;;; Copyright © 2016, 2018 Raoul Bonnal ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice @@ -1682,13 +1682,13 @@ (define-public bwa (modify-phases %standard-phases (replace 'install (lambda* (#:key outputs #:allow-other-keys) - (let ((bin (string-append - (assoc-ref outputs "out") "/bin")) - (doc (string-append - (assoc-ref outputs "out") "/share/doc/bwa")) - (man (string-append - (assoc-ref outputs "out") "/share/man/man1"))) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (lib (string-append out "/lib")) + (doc (string-append out "/share/doc/bwa")) + (man (string-append out "/share/man/man1"))) (install-file "bwa" bin) + (install-file "libbwa.a" lib) (install-file "README.md" doc) (install-file "bwa.1" man)) #t)) -- cgit v1.2.3 From 612d6a8e5b65774cbebf5b26515ffa9fbba57507 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 8 Jan 2020 11:30:36 +0200 Subject: gnu: tabixpp: Update to 1.1.0. * gnu/packages/bioinformatics.scm (tabixpp): Update to 1.1.0. [source]: Add snippet to remove vendored library. [arguments]: Adjust custom 'build phase to fix INCLUDES. --- gnu/packages/bioinformatics.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 28c5dd11cf..f801639472 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -14869,7 +14869,7 @@ (define-public tbsp (define-public tabixpp (package (name "tabixpp") - (version "1.0.0") + (version "1.1.0") (source (origin (method git-fetch) (uri (git-reference @@ -14877,7 +14877,11 @@ (define-public tabixpp (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "08vx6nsipk971cyr8z53rnzwkvlld63kcn1fw0pwddynz91xfny8")))) + (base32 "1k2a3vbq96ic4lw72iwp5s3mwwc4xhdffjj584yn6l9637q9j1yd")) + (modules '((guix build utils))) + (snippet + `(begin + (delete-file-recursively "htslib") #t)))) (build-system gnu-build-system) (inputs `(("htslib" ,htslib) @@ -14893,6 +14897,7 @@ (define-public tabixpp (let ((htslib-ref (assoc-ref inputs "htslib"))) (invoke "make" (string-append "HTS_LIB=" htslib-ref "/lib/libhts.a") + (string-append "INCLUDES= -I" htslib-ref "/include/htslib") "HTS_HEADERS=" ; No need to check for headers here. (string-append "LIBPATH=-L. -L" htslib-ref "/include"))))) (replace 'install -- cgit v1.2.3 From de933b71ee0a15ca4b70c8a51920f1216dbf81f5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 8 Jan 2020 11:55:17 +0200 Subject: gnu: Add intervaltree. * gnu/packages/bioinformatics.scm (intervaltree): New variable. (vcflib, freebayes)[native-inputs]: Use packaged intervaltree's source. --- gnu/packages/bioinformatics.scm | 50 ++++++++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 18 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index f801639472..6dc313199b 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -13384,6 +13384,36 @@ (define-public gffcompare license:expat ;license for gffcompare license:artistic2.0))))) ;license for gclib +(define-public intervaltree + (let ((commit "b90527f9e6d51cd36ecbb50429e4524d3a418ea5")) + (package + (name "intervaltree") + (version (git-version "0.0.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ekg/intervaltree/") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0rgv6q5fl4x5d74n6p5wvdna6zmbdbqpb4jqqh6vq3670gn08xad")))) + (build-system gnu-build-system) + (arguments + '(#:tests? #f ; No tests. + #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) + "DESTDIR=\"\"") + #:phases + (modify-phases %standard-phases + (delete 'configure)))) ; There is no configure phase. + (home-page "https://github.com/ekg/intervaltree") + (synopsis "Minimal C++ interval tree implementation") + (description "An interval tree can be used to efficiently find a set of +numeric intervals overlapping or containing another interval. This library +provides a basic implementation of an interval tree using C++ templates, +allowing the insertion of arbitrary types into the tree.") + (license license:expat)))) + (define-public python-intervaltree (package (name "python-intervaltree") @@ -15086,15 +15116,7 @@ (define-public vcflib ("fsom-src" ,(package-source fsom)) ("filevercmp-src" ,(package-source filevercmp)) ("fastahack-src" ,(package-source fastahack)) - ("intervaltree-src" - ,(origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ekg/intervaltree/") - (commit "dbb4c513d1ad3baac516fc1484c995daf9b42838"))) - (file-name "intervaltree-src-checkout") - (sha256 - (base32 "1fy5qbj4bg8d2bjysvaa9wfnqn2rj2sk5yra2h4l5pzvy53f23fj")))))) + ("intervaltree-src" ,(package-source intervaltree)))) (arguments `(#:tests? #f ; no tests #:phases @@ -15181,15 +15203,7 @@ (define-public freebayes ("fsom-src" ,(package-source fsom)) ("filevercmp-src" ,(package-source filevercmp)) ("fastahack-src" ,(package-source fastahack)) - ("intervaltree-src" - ,(origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ekg/intervaltree/") - (commit "dbb4c513d1ad3baac516fc1484c995daf9b42838"))) - (file-name "intervaltree-src-checkout") - (sha256 - (base32 "1fy5qbj4bg8d2bjysvaa9wfnqn2rj2sk5yra2h4l5pzvy53f23fj")))) + ("intervaltree-src" ,(package-source intervaltree)) ;; These submodules are needed to run the tests. ("bash-tap-src" ,(package-source bash-tap)) ("test-simple-bash-src" -- cgit v1.2.3 From 2e3efa6e558ea7adf6980e6f07c002a59597ad51 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 8 Jan 2020 11:58:45 +0200 Subject: gnu: fastahack: Update to 1.0.0. * gnu/packages/bioinformatics.scm (fastahack): Update to 1.0.0. --- gnu/packages/bioinformatics.scm | 53 ++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 6dc313199b..76026e7065 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -15055,37 +15055,36 @@ (define-public fsom (license license:gpl3)))) (define-public fastahack - (let ((commit "c68cebb4f2e5d5d2b70cf08fbdf1944e9ab2c2dd")) - (package - (name "fastahack") - (version (git-version "0.0.0" "1" commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ekg/fastahack/") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0hfdv67l9g611i2ck4l92pd6ygmsp9g1ph4zx1ni7qkpsikf0l19")))) - (build-system gnu-build-system) - (arguments - `(#:tests? #f ; Unclear how to run tests: https://github.com/ekg/fastahack/issues/15 - #:phases - (modify-phases %standard-phases - (delete 'configure) ; There is no configure phase. - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((bin (string-append (assoc-ref outputs "out") "/bin"))) - (install-file "fastahack" bin)) - #t))))) - (home-page "https://github.com/ekg/fastahack") - (synopsis "Indexing and sequence extraction from FASTA files") - (description "Fastahack is a small application for indexing and + (package + (name "fastahack") + (version "1.0.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ekg/fastahack/") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0rp1blskhzxf7vbh253ibpxbgl9wwgyzf1wbkxndi08d3j4vcss9")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; Unclear how to run tests: https://github.com/ekg/fastahack/issues/15 + #:phases + (modify-phases %standard-phases + (delete 'configure) ; There is no configure phase. + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((bin (string-append (assoc-ref outputs "out") "/bin"))) + (install-file "fastahack" bin)) + #t))))) + (home-page "https://github.com/ekg/fastahack") + (synopsis "Indexing and sequence extraction from FASTA files") + (description "Fastahack is a small application for indexing and extracting sequences and subsequences from FASTA files. The included library provides a FASTA reader and indexer that can be embedded into applications which would benefit from directly reading subsequences from FASTA files. The library automatically handles index file generation and use.") - (license (list license:expat license:gpl2))))) + (license (list license:expat license:gpl2)))) (define-public vcflib (let ((commit "5ac091365fdc716cc47cc5410bb97ee5dc2a2c92") -- cgit v1.2.3 From 0ab7f6c5f4646ca52d6aa54e0adbb4f8b45f9263 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 8 Jan 2020 12:17:58 +0200 Subject: gnu: vcflib: Update to 1.0.1. * gnu/packages/bioinformatics.scm (vcflib): Update to 1.0.1. [source]: Download using url-fetch. [native-inputs]: Sort alphabetically. Move perl, python ... [inputs]: ... to here. [arguments]: Add make-flags. Update custom 'build phase. (tabixpp-freebayes): Remove variable. (freebayes)[native-inputs]: Use tabixpp-source over tabixpp-freebayes. --- gnu/packages/bioinformatics.scm | 185 ++++++++++++++++++++-------------------- 1 file changed, 93 insertions(+), 92 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 76026e7065..bde4aad785 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -14941,24 +14941,6 @@ (define-public tabixpp some of the details of opening and jumping in tabix-indexed files.") (license license:expat))) -(define tabixpp-freebayes - ;; This version works with FreeBayes while the released - ;; version doesn't. The released creates a variable with the name \"vcf\" - ;; somewhere, which is also the name of a namespace in vcflib. - (let ((commit "bbc63a49acc52212199f92e9e3b8fba0a593e3f7")) - (package - (inherit tabixpp) - (name "tabixpp-freebayes") - (version (git-version "0.0.0" "1" commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ekg/tabixpp/") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "017qsmsc2kyiyzqr9nl8cc6pfldxf16dbn8flx5i59mbqr9ydi7g"))))))) - (define-public smithwaterman ;; TODO: Upgrading smithwaterman breaks FreeBayes. (let ((commit "203218b47d45ac56ef234716f1bd4c741b289be1")) @@ -15087,84 +15069,103 @@ (define-public fastahack (license (list license:expat license:gpl2)))) (define-public vcflib - (let ((commit "5ac091365fdc716cc47cc5410bb97ee5dc2a2c92") - (revision "1")) - (package - (name "vcflib") - (version (git-version "0.0.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/vcflib/vcflib/") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1gijvcz1lcdn5kvgzb671l6iby0379qk00nqmcrszgk67hfwx6kq")))) - (build-system gnu-build-system) - (inputs - `(("zlib" ,zlib))) - (native-inputs - `(("perl" ,perl) - ("python" ,python-2) - ;; Submodules. - ;; This package builds against the .o files so we need to extract the source. - ("tabixpp-src" ,(package-source tabixpp-freebayes)) - ("smithwaterman-src" ,(package-source smithwaterman)) - ("multichoose-src" ,(package-source multichoose)) - ("fsom-src" ,(package-source fsom)) - ("filevercmp-src" ,(package-source filevercmp)) - ("fastahack-src" ,(package-source fastahack)) - ("intervaltree-src" ,(package-source intervaltree)))) - (arguments - `(#:tests? #f ; no tests - #:phases - (modify-phases %standard-phases - (delete 'configure) - (delete 'check) - (add-after 'unpack 'unpack-submodule-sources - (lambda* (#:key inputs #:allow-other-keys) - (let ((unpack (lambda (source target) - (with-directory-excursion target - (if (file-is-directory? (assoc-ref inputs source)) - (copy-recursively (assoc-ref inputs source) ".") - (invoke "tar" "xvf" - (assoc-ref inputs source) - "--strip-components=1")))))) - (and - (unpack "intervaltree-src" "intervaltree") - (unpack "fastahack-src" "fastahack") - (unpack "filevercmp-src" "filevercmp") - (unpack "fsom-src" "fsom") - (unpack "multichoose-src" "multichoose") - (unpack "smithwaterman-src" "smithwaterman") - (unpack "tabixpp-src" "tabixpp"))))) - (replace 'build - (lambda* (#:key inputs make-flags #:allow-other-keys) + (package + (name "vcflib") + (version "1.0.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/vcflib/vcflib/releases/" + "download/v" version + "/vcflib-" version "-src.tar.gz")) + (sha256 + (base32 "14zzrg8hg8cq9cvq2wdvp21j7nmxxkjrbagw2apd2yqv2kyx42lm")) + (modules '((guix build utils))) + (snippet + `(begin + (for-each delete-file-recursively + '("fastahack" "filevercmp" "fsom" "googletest" "intervaltree" + "libVCFH" "multichoose" "smithwaterman" "tabixpp")) + #t)))) + (build-system gnu-build-system) + (inputs + `(("htslib" ,htslib) + ("perl" ,perl) + ("python" ,python) + ("zlib" ,zlib))) + (native-inputs + `(;; Submodules. + ;; This package builds against the .o files so we need to extract the source. + ("fastahack-src" ,(package-source fastahack)) + ("filevercmp-src" ,(package-source filevercmp)) + ("fsom-src" ,(package-source fsom)) + ("intervaltree-src" ,(package-source intervaltree)) + ("multichoose-src" ,(package-source multichoose)) + ("smithwaterman-src" ,(package-source smithwaterman)) + ("tabixpp-src" ,(package-source tabixpp)))) + (arguments + `(#:tests? #f ; no tests + #:make-flags (list (string-append "HTS_LIB=" + (assoc-ref %build-inputs "htslib") + "/lib/libhts.a") + (string-append "HTS_INCLUDES= -I" + (assoc-ref %build-inputs "htslib") + "/include/htslib") + (string-append "HTS_LDFLAGS= -L" + (assoc-ref %build-inputs "htslib") + "/include/htslib" " -lhts")) + #:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'check) + (add-after 'unpack 'unpack-submodule-sources + (lambda* (#:key inputs #:allow-other-keys) + (let ((unpack (lambda (source target) + (mkdir target) + (with-directory-excursion target + (if (file-is-directory? (assoc-ref inputs source)) + (copy-recursively (assoc-ref inputs source) ".") + (invoke "tar" "xvf" + (assoc-ref inputs source) + "--strip-components=1")))))) + (and + (unpack "fastahack-src" "fastahack") + (unpack "filevercmp-src" "filevercmp") + (unpack "fsom-src" "fsom") + (unpack "intervaltree-src" "intervaltree") + (unpack "multichoose-src" "multichoose") + (unpack "smithwaterman-src" "smithwaterman") + (unpack "tabixpp-src" "tabixpp"))))) + (replace 'build + (lambda* (#:key inputs make-flags #:allow-other-keys) + (let ((htslib (assoc-ref inputs "htslib"))) (with-directory-excursion "tabixpp" - (invoke "make")) - (invoke "make" "CC=gcc" - (string-append "CFLAGS=\"" "-Itabixpp " "\"") - "all"))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((bin (string-append (assoc-ref outputs "out") "/bin")) - (lib (string-append (assoc-ref outputs "out") "/lib"))) - (for-each (lambda (file) - (install-file file bin)) - (find-files "bin" ".*")) - ;; The header files in src/ do not interface libvcflib, - ;; therefore they are left out. - (install-file "libvcflib.a" lib)) - #t))))) - (home-page "https://github.com/vcflib/vcflib/") - (synopsis "Library for parsing and manipulating VCF files") - (description "Vcflib provides methods to manipulate and interpret + (substitute* "Makefile" + (("-Ihtslib") (string-append "-I" htslib "/include/htslib")) + (("-Lhtslib") (string-append "-L" htslib "/lib/htslib")) + (("htslib/htslib") (string-append htslib "/include/htslib"))) + (invoke "make" + (string-append "HTS_LIB=" htslib "/lib/libhts.a"))) + (apply invoke "make" "CC=gcc" "CFLAGS=-Itabixpp" make-flags)))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((bin (string-append (assoc-ref outputs "out") "/bin")) + (lib (string-append (assoc-ref outputs "out") "/lib"))) + (for-each (lambda (file) + (install-file file bin)) + (find-files "bin" ".*")) + ;; The header files in src/ do not interface libvcflib, + ;; therefore they are left out. + (install-file "libvcflib.a" lib)) + #t))))) + (home-page "https://github.com/vcflib/vcflib/") + (synopsis "Library for parsing and manipulating VCF files") + (description "Vcflib provides methods to manipulate and interpret sequence variation as it can be described by VCF. It is both an API for parsing and operating on records of genomic variation as it can be described by the VCF format, and a collection of command-line utilities for executing complex manipulations on VCF files.") - (license license:expat)))) + (license license:expat))) (define-public freebayes (let ((commit "3ce827d8ebf89bb3bdc097ee0fe7f46f9f30d5fb") @@ -15196,7 +15197,7 @@ (define-public freebayes ("vcflib-src" ,(package-source vcflib)) ;; These are submodules for the vcflib version used in freebayes. ;; This package builds against the .o files so we need to extract the source. - ("tabixpp-src" ,(package-source tabixpp-freebayes)) + ("tabixpp-src" ,(package-source tabixpp)) ("smithwaterman-src" ,(package-source smithwaterman)) ("multichoose-src" ,(package-source multichoose)) ("fsom-src" ,(package-source fsom)) -- cgit v1.2.3 From 2604ecb3a9fc00c98359ecb6059eacfa6573e515 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 8 Jan 2020 12:49:17 +0200 Subject: gnu: smithwaterman: Update to 0.0.0-2.2610e25. * gnu/packages/bioinformatics.scm (smithwaterman): Update to 0.0.0-2.2610e25. [arguments]: Add make-flags to build static library. Adjust custom 'install phase to install static library. --- gnu/packages/bioinformatics.scm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index bde4aad785..0e4cb5b1db 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -14942,11 +14942,10 @@ (define-public tabixpp (license license:expat))) (define-public smithwaterman - ;; TODO: Upgrading smithwaterman breaks FreeBayes. - (let ((commit "203218b47d45ac56ef234716f1bd4c741b289be1")) + (let ((commit "2610e259611ae4cde8f03c72499d28f03f6d38a7")) (package (name "smithwaterman") - (version (string-append "0-1." (string-take commit 7))) + (version (git-version "0.0.0" "2" commit)) (source (origin (method git-fetch) (uri (git-reference @@ -14954,17 +14953,21 @@ (define-public smithwaterman (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "0z9xsmsv452kgdfbbwydyc6nymg3fwyv8zswls8qjin3r4ia4415")))) + (base32 "0i9d8zrxpiracw3mxzd9siybpy62p06rqz9mc2w93arajgbk45bs")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; There are no tests to run. + #:make-flags '("libsw.a" "all") #:phases (modify-phases %standard-phases (delete 'configure) ; There is no configure phase. (replace 'install (lambda* (#:key outputs #:allow-other-keys) - (let ((bin (string-append (assoc-ref outputs "out") "/bin"))) - (install-file "smithwaterman" bin)) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (lib (string-append out "/lib"))) + (install-file "smithwaterman" bin) + (install-file "libsw.a" lib)) #t))))) (home-page "https://github.com/ekg/smithwaterman") (synopsis "Implementation of the Smith-Waterman algorithm") -- cgit v1.2.3 From 1a7d58dc628a2ebf1ab1db693a4946aa2b98bd2f Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Thu, 9 Jan 2020 13:09:19 +0000 Subject: gnu: Add emacs-ebib. * gnu/packages/emacs-xyz.scm (emacs-ebib): New variable. --- gnu/packages/emacs-xyz.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 75914f3f25..4b5008cf0d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -57,6 +57,7 @@ ;;; Copyright © 2019 Stephen Webber ;;; Copyright © 2019 Leo Prikler ;;; Copyright © 2019 David Wilson +;;; Copyright © 2020 Paul Garlick ;;; ;;; This file is part of GNU Guix. ;;; @@ -12524,6 +12525,38 @@ (define-public emacs-parsebib "This package provides an Emacs library for parsing bib files.") (license license:gpl3+))) +(define-public emacs-ebib + (let ((commit "99bd909f47f71e024ce324981109b73a50e82fba")) + (package + (name "emacs-ebib") + (version "2.21") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/joostkremers/ebib.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "131vgl4d1j9s4055x88409w19q52x2m0x08b961hylp7yb5ljzgh")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-parsebib" ,emacs-parsebib))) + (home-page "http://joostkremers.github.io/ebib/") + (synopsis "BibTeX database manager for Emacs") + (description + "Ebib is a BibTeX database manager that runs in GNU Emacs. +With Ebib you can create, sort and manage your .bib database files, +all within Emacs. It supports searching, multi-line field values and +@@String and @@Preamble definitions. Ebib integrates with (La)TeX +mode, Org mode and other Emacs editing modes.") + ;; The Ebib source files are released under a BSD license with + ;; the exception of org-ebib.el, which is released under the GNU + ;; GPL. + (license (list license:bsd-3 + license:gpl3+))))) + (define-public emacs-biblio (package (name "emacs-biblio") -- cgit v1.2.3 From e05471a1a9a8d147e11a8e729bccca4b30b9bfbc Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 9 Jan 2020 09:14:31 -0500 Subject: gnu: Add gnome-online-miners. * gnu/packages/gnome.scm (gnome-online-miners): New variable. Signed-off-by: Danny Milosavljevic --- gnu/packages/gnome.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 195705e765..e034fc0c86 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -247,6 +247,41 @@ (define-public brasero features to enable users to create their discs easily and quickly.") (license license:gpl2+))) +(define-public gnome-online-miners + (package + (name "gnome-online-miners") + (version "3.30.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0pjamwwzn5wqgihyss357dyl2q70r0bngnqmwsqawchx5f9aja9c")))) + (build-system glib-or-gtk-build-system) + (native-inputs + `(("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") + ("gtk+:bin" ,gtk+ "bin") + ("pkg-config" ,pkg-config))) + (inputs + `(("gnome-online-accounts" ,gnome-online-accounts) + ("gnome-online-accounts:lib" ,gnome-online-accounts "lib") + ("gobject-introspection" ,gobject-introspection) + ("grilo" ,grilo) + ("libgdata" ,libgdata) + ("libgfbgraph" ,gfbgraph) + ("libzapojit" ,libzapojit) + ("rest" ,rest) + ("tracker" ,tracker))) + (synopsis "Web Crawlers for GNOME") + (description "GNOME Online Miners provides a set of crawlers that +go through your online content and index them locally in Tracker. +It has miners for Facebook, Flickr, Google, ownCloud and SkyDrive.") + (home-page "https://wiki.gnome.org/Projects/GnomeOnlineMiners") + (license license:gpl2))) + (define-public gnome-menus (package (name "gnome-menus") -- cgit v1.2.3 From 3e10b2418dc0952c16053ccced4baba405facb6b Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Sun, 5 Jan 2020 19:27:17 +0100 Subject: gnu: qtxmlpatterns: Build QML plugin for XmlListModel. * gnu/packages/qt.scm (qtdeclarative)[native-inputs]: Remove qtxmlpatterns. (qtxmlpatterns)[native-inputs]: Add qtdeclarative. --- gnu/packages/qt.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 795b5e9d2b..daa35c77cb 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -723,6 +723,7 @@ (define-public qtxmlpatterns "1l44476ibb8rv4rf80vbjdc3712lmrl1xcxswa513ip66k47p5vn")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) + ((#:tests? _ #f) #f) ; TODO: Enable the tests ((#:phases phases) `(modify-phases ,phases (add-after 'unpack 'disable-network-tests @@ -730,7 +731,8 @@ (define-public qtxmlpatterns (("qxmlquery") "# qxmlquery") (("xmlpatterns ") "# xmlpatterns")) #t)))))) - (native-inputs `(("perl" ,perl))) + (native-inputs `(("perl" ,perl) + ("qtdeclarative" ,qtdeclarative))) (inputs `(("qtbase" ,qtbase))) (synopsis "Qt XML patterns module") (description "The QtXmlPatterns module is a XQuery and XPath engine for @@ -758,8 +760,7 @@ (define-public qtdeclarative ("pkg-config" ,pkg-config) ("python" ,python) ("python-wrapper" ,python-wrapper) - ("qtsvg" ,qtsvg) - ("qtxmlpatterns" ,qtxmlpatterns))) + ("qtsvg" ,qtsvg))) (inputs `(("mesa" ,mesa) ("qtbase" ,qtbase))) -- cgit v1.2.3 From 29ae18db0578bbdbc0119703f7412fe91927e80e Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 9 Jan 2020 15:55:25 +0100 Subject: gnu: Add gnome-color-manager. * gnu/packages/gnome.scm (gnome-color-manager): New variable. --- gnu/packages/gnome.scm | 55 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 54 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index e034fc0c86..0e18c2ec06 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -247,6 +247,59 @@ (define-public brasero features to enable users to create their discs easily and quickly.") (license license:gpl2+))) +(define-public gnome-color-manager + (package + (name "gnome-color-manager") + (version "3.32.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1vpxa2zjz3lkq9ldjg0fl65db9s6b4kcs8nyaqfz3jygma7ifg3w")))) + (build-system meson-build-system) + (arguments + `(#:glib-or-gtk? #t + #:phases + (modify-phases %standard-phases + (add-before + 'check 'pre-check + (lambda _ + ;; Tests require a running X server. + (system "Xvfb :1 &") + (setenv "DISPLAY" ":1") + #t))))) + (native-inputs + `(("desktop-file-utils" ,desktop-file-utils) + ("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") + ("gtk+:bin" ,gtk+ "bin") + ("itstool" ,itstool) + ("pkg-config" ,pkg-config) + ("xorg-server" ,xorg-server-for-tests))) + (inputs + `(("adwaita-icon-theme" ,adwaita-icon-theme) + ("appstream-glib" ,appstream-glib) + ("colord-gtk" ,colord-gtk) + ("exiv2" ,exiv2) + ("gnome-desktop" ,gnome-desktop) + ("libcanberra" ,libcanberra) + ("libexif" ,libexif) + ("libtiff" ,libtiff) + ("libxrandr" ,libxrandr) + ("libxtst" ,libxtst) + ("libxxf86vm" ,libxxf86vm) + ("vte" ,vte) + ("xorgproto" ,xorgproto))) + (synopsis "Color profile manager for the GNOME desktop") + (description "GNOME Color Manager is a session framework that makes +it easy to manage, install and generate color profiles +in the GNOME desktop.") + (home-page "https://gitlab.gnome.org/GNOME/gnome-color-manager") + (license license:gpl2))) + (define-public gnome-online-miners (package (name "gnome-online-miners") @@ -263,12 +316,12 @@ (define-public gnome-online-miners (native-inputs `(("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) ("gtk+:bin" ,gtk+ "bin") ("pkg-config" ,pkg-config))) (inputs `(("gnome-online-accounts" ,gnome-online-accounts) ("gnome-online-accounts:lib" ,gnome-online-accounts "lib") - ("gobject-introspection" ,gobject-introspection) ("grilo" ,grilo) ("libgdata" ,libgdata) ("libgfbgraph" ,gfbgraph) -- cgit v1.2.3 From 2c50e52ab8228634ce1626dc174970f4a4321d61 Mon Sep 17 00:00:00 2001 From: Brant Gardner Date: Wed, 25 Dec 2019 10:11:41 -0600 Subject: gnu: emacs-ledger-mode: Fix autoload failure. * gnu/packages/finance.scm (emacs-ledger-mode)[arguments]: Replace the 'relocate-elisp' phase by a 'patch-site-dir' phase to put the files in the right directory and a 'generate-autoload' phase to make the autoload file. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/finance.scm | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index ce3033c054..b24a9bfbf1 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -288,6 +288,12 @@ (define-public emacs-ledger-mode #:tests? #f ; there are none #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-site-dir + (lambda _ + (substitute* "CMakeLists.txt" + (("DESTINATION share/emacs/site-lisp/ledger-mode") + "DESTINATION share/emacs/site-lisp")) + #t)) (add-before 'build 'patch-path (lambda* (#:key inputs #:allow-other-keys) (let ((ledger (assoc-ref inputs "ledger"))) @@ -303,17 +309,12 @@ (define-public emacs-ledger-mode (invoke "makeinfo" "-o" target "../source/doc/ledger-mode.texi")) #t)) - (add-after 'install 'relocate-elisp + (add-after 'install 'generate-autoload (lambda* (#:key outputs #:allow-other-keys) (let* ((site-dir (string-append (assoc-ref outputs "out") - "/share/emacs/site-lisp")) - (guix-dir (string-append site-dir "/guix.d")) - (orig-dir (string-append site-dir "/ledger-mode")) - (dest-dir (string-append guix-dir "/ledger-mode"))) - (mkdir-p guix-dir) - (rename-file orig-dir dest-dir) - (emacs-generate-autoloads ,name dest-dir) - #t)))))) + "/share/emacs/site-lisp"))) + (emacs-generate-autoloads ,name site-dir)) + #t))))) (inputs `(("ledger" ,ledger))) (native-inputs -- cgit v1.2.3 From 5d3db373bafe159bb3e04dc21e76edbfc0ecb9ac Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 8 Jan 2020 23:04:13 -0500 Subject: gnu: dillo: Fix SSL support. * gnu/packages/web-browsers.scm (dillo)[inputs]: Use openssl-1.0 in place of openssl. --- gnu/packages/web-browsers.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index e5df56493e..137dccab81 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 John Darrington -;;; Copyright © 2014 Mark H Weaver +;;; Copyright © 2014, 2019 Mark H Weaver ;;; Copyright © 2015, 2016, 2019 Efraim Flashner ;;; Copyright © 2016 Kei Kebreau ;;; Copyright © 2017 Eric Bavier @@ -84,7 +84,7 @@ (define-public dillo ("libxft" ,libxft) ("libxi" ,libxi) ("libxinerama" ,libxinerama) - ("openssl" ,openssl) + ("openssl" ,openssl-1.0) ;XXX try latest openssl for dillo > 3.0.5 ("perl" ,perl) ("zlib" ,zlib))) (synopsis "Very small and fast graphical web browser") -- cgit v1.2.3 From a2be2c68812faa8bf8cbc3ea8a7d98233e64ae9d Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 9 Jan 2020 13:55:25 -0500 Subject: gnu: icecat: Update to 68.4.1-guix0-preview1 [fixes CVE-2019-17026]. * gnu/packages/gnuzilla.scm (%icecat-version, %icecat-build-id): Update. (icecat-source): Update hash of upstream firefox source tarball, 'upstream-icecat-base-version', and commit and hash of gnuzilla checkout. * gnu/packages/patches/icecat-makeicecat.patch: Adapt to upstream changes. --- gnu/packages/gnuzilla.scm | 12 ++++++------ gnu/packages/patches/icecat-makeicecat.patch | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index df93c2e509..62b4390eab 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -550,8 +550,8 @@ (define* (computed-origin-method gexp-promise hash-algo hash #:system system #:guile-for-build guile))) -(define %icecat-version "68.4.0-guix0-preview1") -(define %icecat-build-id "20200107000000") ;must be of the form YYYYMMDDhhmmss +(define %icecat-version "68.4.1-guix0-preview1") +(define %icecat-build-id "20200108000000") ;must be of the form YYYYMMDDhhmmss ;; 'icecat-source' is a "computed" origin that generates an IceCat tarball ;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat' @@ -573,11 +573,11 @@ (define icecat-source "firefox-" upstream-firefox-version ".source.tar.xz")) (sha256 (base32 - "077r2v7q94g8pszkl537lry0dcg9086287m9bmc0g0b98b9nzasq")))) + "0q7kv70w1d33m12hkzyay6nkgvz9qczrl6hqx0n1c6grs097f2m0")))) - (upstream-icecat-base-version "68.4.0") ; maybe older than base-version + (upstream-icecat-base-version "68.4.1") ; maybe older than base-version ;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version)) - (gnuzilla-commit "235b4d1181a32b71c61f6464504de8d0dae9f566") + (gnuzilla-commit "2d1b1bc45fdae5a99c4e8ea25593ebb9c8d7bfdf") (gnuzilla-source (origin (method git-fetch) @@ -589,7 +589,7 @@ (define icecat-source (string-take gnuzilla-commit 8))) (sha256 (base32 - "0fy9my1p8d60ibya7mc0310bglk2lrgl4bzy943k6jn9xxh8877f")))) + "0hc9sx3yb71xvr9s1p0z5fx8jfqpssb8wz0h2nzhy2nyp9bb2jzl")))) (makeicecat-patch (local-file (search-patch "icecat-makeicecat.patch")))) diff --git a/gnu/packages/patches/icecat-makeicecat.patch b/gnu/packages/patches/icecat-makeicecat.patch index fde209e8e3..172b1dcadd 100644 --- a/gnu/packages/patches/icecat-makeicecat.patch +++ b/gnu/packages/patches/icecat-makeicecat.patch @@ -25,7 +25,7 @@ index 8be2362..48716f2 100755 -wget -N https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${FFVERSION}esr/source/firefox-${FFVERSION}esr.source.tar.xz.asc -gpg --recv-keys --keyserver keyserver.ubuntu.com 14F26682D0916CDD81E37B6D61B7B526D98F0353 -gpg --verify firefox-${FFVERSION}esr.source.tar.xz.asc --echo -n 58ab6fd342698107585da91e240c02e9b1067ca667143abfbee89184cf16f91c firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - +-echo -n a00a7712d0f919162ce8181a9a3fc3e9ef37adf1caff0945a863b4c0c1d9f360 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - - -echo Extracting Firefox tarball -tar -xf firefox-${FFVERSION}esr.source.tar.xz @@ -37,7 +37,7 @@ index 8be2362..48716f2 100755 +# wget -N https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${FFVERSION}esr/source/firefox-${FFVERSION}esr.source.tar.xz.asc +# gpg --recv-keys --keyserver keyserver.ubuntu.com 14F26682D0916CDD81E37B6D61B7B526D98F0353 +# gpg --verify firefox-${FFVERSION}esr.source.tar.xz.asc -+# echo -n 58ab6fd342698107585da91e240c02e9b1067ca667143abfbee89184cf16f91c firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - ++# echo -n a00a7712d0f919162ce8181a9a3fc3e9ef37adf1caff0945a863b4c0c1d9f360 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - +# +# echo Extracting Firefox tarball +# tar -xf firefox-${FFVERSION}esr.source.tar.xz -- cgit v1.2.3 From 91d4298d3aaab6d7dffaa6b1c6452ded1973298b Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 9 Jan 2020 15:37:32 -0500 Subject: gnu: linux-libre@4.14: Update to 4.14.163. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.163. (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 8f9500e4e4..76ecad706f 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.162") +(define-public linux-libre-4.14-version "4.14.163") (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "0jwbr7q17khv0174hl0kp78bsyhjv0mljfvrnbl9qdfl9hi70lgn"))) + (hash (base32 "0jdh54rqdsb3b908v2q4xjn8y45b7rdnwgab0s4qf5alznfcqagb"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit v1.2.3 From 5a3b9463ed473546d965e7829f2a3f5eb282fc0a Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 9 Jan 2020 15:38:29 -0500 Subject: gnu: linux-libre@4.19: Update to 4.19.94. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.94. (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 76ecad706f..8f7b80aa16 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.93") +(define-public linux-libre-4.19-version "4.19.94") (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "0d2qgwnmvnwbsijc8k85sgmywyrv55wpah6qwjk6kgx8h8zx5x9a"))) + (hash (base32 "0rvlz94mjl7ygpmhz0yn2whx9dq9fmy0w1472bj16hkwbaki0an6"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From 7edbaa7f658c4661a33516e988c58f8cc1baf4f9 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 9 Jan 2020 15:39:08 -0500 Subject: gnu: linux-libre: Update to 5.4.10. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.10. (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 8f7b80aa16..fb439f747d 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.8") +(define-public linux-libre-5.4-version "5.4.10") (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "0llss8hbzkwqxx92y419vj2jvq0d8k52iivh3f59wgqr0b4i9i22"))) + (hash (base32 "1p9f0h9fl1xy13dag1x7j2ic8kdv0zsp42c8baxn7cz3llc04g7j"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit v1.2.3 From bbd9063afcb204b3f81c59d09f5c54d3b67f1e91 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Thu, 9 Jan 2020 16:32:16 +0100 Subject: lint: Check for more packages which should be native. * guix/lint.scm (check-inputs-should-be-native): Add autoconf, automake, bison, dejagnu, desktop-file-utils, doxygen, flex, gettext, gobject-introspection, googletest-source, groff, help2man, libtool, swig, qmake, qttools, texinfo, xorg-server-for-tests, yelp-tools. --- guix/lint.scm | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/guix/lint.scm b/guix/lint.scm index e3544bd963..ed2f06bc64 100644 --- a/guix/lint.scm +++ b/guix/lint.scm @@ -286,11 +286,24 @@ (define (check-inputs-should-be-native package) (let ((inputs (package-inputs package)) (input-names '("pkg-config" + "autoconf" + "automake" + "bison" "cmake" + "dejagnu" + "desktop-file-utils" + "doxygen" "extra-cmake-modules" + "flex" + "gettext" "glib:bin" + "gobject-introspection" + "googletest-source" + "groff" + "help2man" "intltool" "itstool" + "libtool" "qttools" "yasm" "nasm" "fasm" "python-coverage" "python2-coverage" @@ -302,7 +315,13 @@ (define (check-inputs-should-be-native package) "python-pytest" "python2-pytest" "python-pytest-cov" "python2-pytest-cov" "python-setuptools-scm" "python2-setuptools-scm" - "python-sphinx" "python2-sphinx"))) + "python-sphinx" "python2-sphinx" + "swig" + "qmake" + "qttools" + "texinfo" + "xorg-server-for-tests" + "yelp-tools"))) (map (lambda (input) (make-warning package -- cgit v1.2.3 From f75243e17e3ff88582314bcb8450e654bb0b556b Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 9 Jan 2020 11:21:31 +0100 Subject: channels: Provide a hint when the 'guix' channel is lacking. Fixes . Reported by Jesse Gibbons . * guix/channels.scm (channel-instance-derivations): Raise '&fix-hint' condition in addition to the '&message' condition. --- guix/channels.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/guix/channels.scm b/guix/channels.scm index 826ee729ad..f0261dc2da 100644 --- a/guix/channels.scm +++ b/guix/channels.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 © 2018 Ricardo Wurmus ;;; Copyright © 2019 Jan (janneke) Nieuwenhuizen ;;; @@ -36,7 +36,8 @@ (define-module (guix channels) #:use-module (guix i18n) #:use-module ((guix utils) #:select (source-properties->location - &error-location)) + &error-location + &fix-hint)) #:use-module (srfi srfi-1) #:use-module (srfi srfi-2) #:use-module (srfi srfi-9) @@ -457,6 +458,9 @@ (define (instance->derivation instance) (raise (apply make-compound-condition (condition (&message (message "'guix' channel is lacking"))) + (condition + (&fix-hint (hint (G_ "Make sure your list of channels +contains one channel named @code{guix} providing the core of Guix.")))) (if loc (list (condition (&error-location (location loc)))) '()))))) -- cgit v1.2.3 From a7bde77d247ed0765f5378779d67b4668c5d7648 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 1 Jan 2020 16:05:11 +0100 Subject: doc: Add "Tracking Bugs and Patches" section. * doc/contributing.texi (Tracking Bugs and Patches): New section. (Submitting Patches): Refer to it. * doc/guix.texi: Update copyright line. * HACKING (Using emacs-debbugs): Remove. --- HACKING | 9 -------- doc/contributing.texi | 62 ++++++++++++++++++++++++++++++++++++++++++++++----- doc/guix.texi | 2 +- 3 files changed, 57 insertions(+), 16 deletions(-) diff --git a/HACKING b/HACKING index 2f0f93f896..deb41a9cef 100644 --- a/HACKING +++ b/HACKING @@ -63,12 +63,3 @@ after two weeks, and if you’re confident, it’s OK to commit. That last part is subject to being adjusted, allowing individuals to commit directly on non-controversial changes on parts they’re familiar with. - -* Using emacs-debbugs - -Bug reports and patches are tracked using debbugs. If you are on emacs, you -can use emacs-debbugs. - -List all open bug reports on guix-patches with - -C-u M-x debbugs-gnu guix-patches n y diff --git a/doc/contributing.texi b/doc/contributing.texi index e656676c0f..fd27f037e9 100644 --- a/doc/contributing.texi +++ b/doc/contributing.texi @@ -26,6 +26,7 @@ choice. * Packaging Guidelines:: Growing the distribution. * Coding Style:: Hygiene of the contributor. * Submitting Patches:: Share your work. +* Tracking Bugs and Patches:: Using Debbugs. @end menu @node Building from Git @@ -827,12 +828,12 @@ Thus, access to the repository is not strictly necessary. We welcome contributions in the form of patches as produced by @code{git format-patch} sent to the @email{guix-patches@@gnu.org} mailing list. -This mailing list is backed by a Debbugs instance accessible at -@uref{https://bugs.gnu.org/guix-patches}, which allows us to keep track -of submissions. Each message sent to that mailing list gets a new -tracking number assigned; people can then follow up on the submission by -sending email to @code{@var{NNN}@@debbugs.gnu.org}, where @var{NNN} is -the tracking number (@pxref{Sending a Patch Series}). +This mailing list is backed by a Debbugs instance, which allows us to +keep track of submissions (@pxref{Tracking Bugs and Patches}). Each +message sent to that mailing list gets a new tracking number assigned; +people can then follow up on the submission by sending email to +@code{@var{NNN}@@debbugs.gnu.org}, where @var{NNN} is the tracking +number (@pxref{Sending a Patch Series}). Please write commit logs in the ChangeLog format (@pxref{Change Logs,,, standards, GNU Coding Standards}); you can check the commit history for @@ -1040,3 +1041,52 @@ they are kept together. See for more information. You can install @command{git send-email} with @command{guix install git:send-email}. @c Debbugs bug: https://debbugs.gnu.org/db/15/15361.html + +@node Tracking Bugs and Patches +@section Tracking Bugs and Patches + +@cindex bug reports, tracking +@cindex patch submissions, tracking +@cindex issue tracking +@cindex Debbugs, issue tracking system +Bug reports and patch submissions are currently tracked using the +Debbugs instance at @uref{https://bugs.gnu.org}. Bug reports are filed +against the @code{guix} ``package'' (in Debbugs parlance), by sending +email to @email{bug-guix@@gnu.org}, while patch submissions are filed +against the @code{guix-patches} package by sending email to +@email{guix-patches@@gnu.org} (@pxref{Submitting Patches}). + +A web interface (actually @emph{two} web interfaces!) are available to +browse issues: + +@itemize +@item +@url{https://bugs.gnu.org/guix} lists bug reports; +@item +@url{https://bugs.gnu.org/guix-patches} lists patch submissions. +@end itemize + +You can also access both of these @i{via} the (nicer) +@url{https://issues.guix.gnu.org} interface@footnote{The web interface +at @url{https://issues.guix.gnu.org} is powered by Mumi, a nice piece of +software written in Guile, and you can help! See +@url{https://git.elephly.net/gitweb.cgi?p=software/mumi.git}.}. To view +discussions related to issue number @var{n}, go to +@indicateurl{https://issues.guix.gnu.org/issue/@var{n}} or +@indicateurl{https://bugs.gnu.org/@var{n}}. + +If you use Emacs, you may find it more convenient to interact with +issues using @file{debbugs.el}, which you can install with: + +@example +guix install emacs-debbugs +@end example + +For example, to list all open issues on @code{guix-patches}, hit: + +@example +@kbd{C-u} @kbd{M-x} debbugs-gnu @kbd{RET} @kbd{RET} guix-patches @kbd{RET} n y +@end example + +@xref{Top,,, debbugs-ug, Debbugs User Guide}, for more information on +this nifty tool! diff --git a/doc/guix.texi b/doc/guix.texi index 2b30fc5705..60491af4d4 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -21,7 +21,7 @@ @set SUBSTITUTE-URL https://@value{SUBSTITUTE-SERVER} @copying -Copyright @copyright{} 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès@* +Copyright @copyright{} 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès@* Copyright @copyright{} 2013, 2014, 2016 Andreas Enge@* Copyright @copyright{} 2013 Nikita Karetnikov@* Copyright @copyright{} 2014, 2015, 2016 Alex Kost@* -- cgit v1.2.3 From 2d315cd428484537e763d7f7c676dc5fff7995f6 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 1 Jan 2020 16:14:08 +0100 Subject: doc: Move "Commit Access" section from 'HACKING' to the manual. * HACKING (Commit Access): Remove. (Contributing): Update URL of the manual. * doc/contributing.texi (Commit Access): New section. (Submitting Patches): Add cross reference. --- HACKING | 47 +--------------------------------------- doc/contributing.texi | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 46 deletions(-) diff --git a/HACKING b/HACKING index deb41a9cef..aaa673fc93 100644 --- a/HACKING +++ b/HACKING @@ -17,49 +17,4 @@ See the manual for useful hacking informations, either by running info -f doc/guix.info "Contributing" -or by checking the [[http://www.gnu.org/software/guix/manual/guix.html#Contributing][web copy of the manual]]. - -* Commit Access - -For frequent contributors, having write access to the repository is -convenient. When you deem it necessary, feel free to ask for it on the -mailing list. When you get commit access, please make sure to follow the -policy below (discussions of the policy can take place on guix-devel@gnu.org.) - -Non-trivial patches should always be posted to guix-patches@gnu.org (trivial -patches include fixing typos, etc.). This mailing list fills the -patch-tracking database at [[https://bugs.gnu.org/guix-patches]]; see -"Contributing" in the manual for details. - -For patches that just add a new package, and a simple one, it’s OK to commit, -if you’re confident (which means you successfully built it in a chroot setup, -and have done a reasonable copyright and license auditing.) Likewise for -package upgrades, except upgrades that trigger a lot of rebuilds (for example, -upgrading GnuTLS or GLib.) We have a mailing list for commit notifications -(guix-commits@gnu.org), so people can notice. Before pushing your changes, -make sure to run ‘git pull --rebase’. - -All commits that are pushed to the central repository on Savannah must be -signed with an OpenPGP key, and the public key should be uploaded to your user -account on Savannah and to public key servers, such as -‘keys.openpgp.org’. To configure Git to automatically sign commits, -run: - - git config commit.gpgsign true - git config user.signingkey CABBA6EA1DC0FF33 - -You can prevent yourself from accidentally pushing unsigned commits to -Savannah by using the pre-push Git hook called located at ‘etc/git/pre-push’: - - cp etc/git/pre-push .git/hooks/pre-push - -When pushing a commit on behalf of somebody else, please add a Signed-off-by -line at the end of the commit log message (e.g. with ‘git am --signoff’). -This improves tracking of who did what. - -For anything else, please post to guix-patches@gnu.org and leave time for a -review, without committing anything. If you didn’t receive any reply -after two weeks, and if you’re confident, it’s OK to commit. - -That last part is subject to being adjusted, allowing individuals to commit -directly on non-controversial changes on parts they’re familiar with. +or by checking the [[https://guix.gnu.org/manual/devel/en/html_node/Contributing.html][web copy of the manual]]. diff --git a/doc/contributing.texi b/doc/contributing.texi index fd27f037e9..e6e6ab36c2 100644 --- a/doc/contributing.texi +++ b/doc/contributing.texi @@ -27,6 +27,7 @@ choice. * Coding Style:: Hygiene of the contributor. * Submitting Patches:: Share your work. * Tracking Bugs and Patches:: Using Debbugs. +* Commit Access:: Pushing to the official repository. @end menu @node Building from Git @@ -827,6 +828,8 @@ Development is done using the Git distributed version control system. Thus, access to the repository is not strictly necessary. We welcome contributions in the form of patches as produced by @code{git format-patch} sent to the @email{guix-patches@@gnu.org} mailing list. +Seasoned Guix developers may also want to look at the section on commit +access (@pxref{Commit Access}). This mailing list is backed by a Debbugs instance, which allows us to keep track of submissions (@pxref{Tracking Bugs and Patches}). Each @@ -1090,3 +1093,59 @@ For example, to list all open issues on @code{guix-patches}, hit: @xref{Top,,, debbugs-ug, Debbugs User Guide}, for more information on this nifty tool! + +@node Commit Access +@section Commit Access + +@cindex commit access, for developers +For frequent contributors, having write access to the repository is +convenient. When you deem it necessary, feel free to ask for it on the +mailing list. When you get commit access, please make sure to follow +the policy below (discussions of the policy can take place on +@email{guix-devel@@gnu.org}). + +Non-trivial patches should always be posted to +@email{guix-patches@@gnu.org} (trivial patches include fixing typos, +etc.). This mailing list fills the patch-tracking database +(@pxref{Tracking Bugs and Patches}). + +For patches that just add a new package, and a simple one, it's OK to +commit, if you're confident (which means you successfully built it in a +chroot setup, and have done a reasonable copyright and license +auditing). Likewise for package upgrades, except upgrades that trigger +a lot of rebuilds (for example, upgrading GnuTLS or GLib). We have a +mailing list for commit notifications (@email{guix-commits@@gnu.org}), +so people can notice. Before pushing your changes, make sure to run +@code{git pull --rebase}. + +All commits that are pushed to the central repository on Savannah must +be signed with an OpenPGP key, and the public key should be uploaded to +your user account on Savannah and to public key servers, such as +@code{keys.openpgp.org}. To configure Git to automatically sign +commits, run: + +@example +git config commit.gpgsign true +git config user.signingkey CABBA6EA1DC0FF33 +@end example + +You can prevent yourself from accidentally pushing unsigned commits to +Savannah by using the pre-push Git hook called located at +@file{etc/git/pre-push}: + +@example +cp etc/git/pre-push .git/hooks/pre-push +@end example + +When pushing a commit on behalf of somebody else, please add a +@code{Signed-off-by} line at the end of the commit log message---e.g., +with @command{git am --signoff}. This improves tracking of who did +what. + +For anything else, please post to @email{guix-patches@@gnu.org} and +leave time for a review, without committing anything (@pxref{Submitting +Patches}). If you didn’t receive any reply after two weeks, and if +you're confident, it's OK to commit. + +That last part is subject to being adjusted, allowing individuals to commit +directly on non-controversial changes on parts they’re familiar with. -- cgit v1.2.3 From 98ebcf1c1b5de87a4e09eaa20ee3eb9ffdfcefa7 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 1 Jan 2020 17:11:42 +0100 Subject: doc: Encourage patch review. * doc/contributing.texi (Commit Access): Add note about patch review. --- doc/contributing.texi | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/contributing.texi b/doc/contributing.texi index e6e6ab36c2..74b4718eb3 100644 --- a/doc/contributing.texi +++ b/doc/contributing.texi @@ -1149,3 +1149,9 @@ you're confident, it's OK to commit. That last part is subject to being adjusted, allowing individuals to commit directly on non-controversial changes on parts they’re familiar with. + +One last thing: the project keeps moving forward because committers not +only push their own awesome changes, but also offer some of their time +@emph{reviewing} and pushing other people's changes. As a committer, +you're welcome to use your expertise and commit rights to help other +contributors, too! -- cgit v1.2.3 From ef09cb866c379abae54432e8d91f0d14cbd1309b Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 1 Jan 2020 16:32:42 +0100 Subject: doc: Add a cooptation policy for commit access. * doc/contributing.texi (Commit Access): Draft a cooptation policy. --- doc/contributing.texi | 55 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 53 insertions(+), 2 deletions(-) diff --git a/doc/contributing.texi b/doc/contributing.texi index 74b4718eb3..5d5d50c3c0 100644 --- a/doc/contributing.texi +++ b/doc/contributing.texi @@ -1099,8 +1099,59 @@ this nifty tool! @cindex commit access, for developers For frequent contributors, having write access to the repository is -convenient. When you deem it necessary, feel free to ask for it on the -mailing list. When you get commit access, please make sure to follow +convenient. When you deem it necessary, consider applying for commit +access by following these steps: + +@enumerate +@item +Find three committers who would vouch for you. You can view the list of +committers at +@url{https://savannah.gnu.org/project/memberlist.php?group=guix}. Each +of them should email a statement to @email{guix-maintainers@@gnu.org} (a +private alias for the collective of maintainers), signed with their +OpenPGP key. + +Committers are expected to have had some interactions with you as a +contributor and to be able to judge whether you are sufficiently +familiar with the project's practices. It is @emph{not} a judgment on +the value of your work, so a refusal should rather be interpreted as +``let's try again later''. + +@item +Send @email{guix-maintainers@@gnu.org} a message stating your intent, +listing the three committers who support your application, signed with +the OpenPGP key you will use to sign commits, and giving its fingerprint +(see below). See @uref{https://emailselfdefense.fsf.org/en/}, for an +introduction to public-key cryptography with GnuPG. + +@item +Maintainers ultimately decide whether to grant you commit access, +usually following your referrals' recommendation. + +@item +If and once you've been given access, please send a message to +@email{guix-devel@@gnu.org} to say so, again signed with the OpenPGP key +you will use to sign commits (do that before pushing your first commit). +That way, everyone can notice and ensure you control that OpenPGP key. + +@c TODO: Add note about adding the fingerprint to the list of authorized +@c keys once that has stabilized. + +@item +Make sure to read the rest of this section and... profit! +@end enumerate + +@quotation Note +Maintainers are happy to give commit access to people who have been +contributing for some time and have a track record---don't be shy and +don't underestimate your work! + +However, note that the project is working towards a more automated patch +review and merging system, which, as a consequence, may lead us to have +fewer people with commit access to the main repository. Stay tuned! +@end quotation + +If you get commit access, please make sure to follow the policy below (discussions of the policy can take place on @email{guix-devel@@gnu.org}). -- cgit v1.2.3 From 3da1e6e9edbef14cdd8a989ad68fa5d445a5c83e Mon Sep 17 00:00:00 2001 From: Joseph LaFreniere Date: Thu, 2 Jan 2020 01:43:21 -0600 Subject: gnu: Add emacs-monky. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs-xyz.scm (emacs-monky): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/emacs-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 4b5008cf0d..558f315d45 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7938,6 +7938,32 @@ (define-public emacs-evil-visualstar to search.") (license license:gpl3+)))) +(define-public emacs-monky + (package + (name "emacs-monky") + (version "0.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ananthakumaran/monky.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1fgn7al4zwz2k5wb5dy3byqg9lsrjk9fra341mxh5ma2pfwxjgps")))) + (build-system emacs-build-system) + (home-page "https://ananthakumaran.in/monky/index.html") + (arguments + `(#:tests? #t + #:test-command '("emacs" "--batch" + "-l" "test/monky-unit-test.el" + "-f" "ert-run-tests-batch-and-exit"))) + (synopsis "Interactive interface for the Mercurial version control system") + (description + "Monky provides an Emacs interface for Mercurial (Hg). Using Monky, you +can selectively commit files, view the diffs, and other things.") + (license license:gpl3+))) + (define-public emacs-monroe (package (name "emacs-monroe") -- cgit v1.2.3 From 02ebbca82f1be09f2f7f5e70de792d9fae0ca30c Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 2 Jan 2020 14:53:01 -0500 Subject: gnu: Add libmediaart. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome.scm (libmediaart): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/gnome.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 0e18c2ec06..6d0c971c8b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -335,6 +335,35 @@ (define-public gnome-online-miners (home-page "https://wiki.gnome.org/Projects/GnomeOnlineMiners") (license license:gpl2))) +(define-public libmediaart + (package + (name "libmediaart") + (version "1.9.4") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0gc10imyabk57ar54m0qzms0x9dnmkymhkzyk8w1aj3y4lby0yx5")))) + (build-system gnu-build-system) + (native-inputs + `(("glib:bin" ,glib "bin") + ("pkg-config" ,pkg-config))) + (inputs + `(("gdk-pixbuf" ,gdk-pixbuf) + ("gettext" ,gettext-minimal) + ("gobject-introspection" ,gobject-introspection) + ("gtk+:doc", gtk+ "doc") + ("vala" ,vala))) + (synopsis "Media art library for the GNOME desktop") + (description + "The libmediaart library is the foundation for media art caching, +extraction, and lookup for applications on the desktop.") + (home-page "https://gitlab.gnome.org/GNOME/libmediaart") + (license license:lgpl2.1+))) + (define-public gnome-menus (package (name "gnome-menus") -- cgit v1.2.3 From afc7882f2d7765954c255922a39e20400c540376 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Fri, 10 Jan 2020 00:25:50 +0100 Subject: gnu: hplip: Fix scanner model detection. * gnu/packages/cups.scm (hplip)[arguments]<#:phases>[install-models-dat]: New phase. --- gnu/packages/cups.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 8f3cdf6211..0adca9addb 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -537,6 +537,13 @@ (define-public hplip "/lib/systemd/system")) (("/etc/sane.d") (string-append out "/etc/sane.d")))))) + (add-after 'install 'install-models-dat + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (models-dir (string-append out + "/share/hplip/data/models"))) + (install-file "data/models/models.dat" models-dir)) + #t)) (add-after 'install 'wrap-binaries ;; Scripts in /bin are all symlinks to .py files in /share/hplip. ;; Symlinks are immune to the Python build system's 'WRAP phase, -- cgit v1.2.3 From 783d1d4024c640e10e74ef90489b89f21945c39e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 10 Jan 2020 01:34:24 +0100 Subject: gnu: python-lxml: Update to 4.4.2. * gnu/packages/python-xyz.scm (python-lxml): Update to 4.4.2. --- gnu/packages/python-xyz.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 194d8b8b0c..d60c813b94 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -32,7 +32,7 @@ ;;; Copyright © 2016, 2017, 2019 Alex Vong ;;; Copyright © 2016, 2017, 2018 Arun Isaac ;;; Copyright © 2016, 2017, 2018 Julien Lepiller -;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2016, 2017 Thomas Danckaert ;;; Copyright © 2017 Carlo Zancanaro ;;; Copyright © 2017 Frederick M. Muriithi @@ -5757,14 +5757,13 @@ (define-public python2-notify2 (define-public python-lxml (package (name "python-lxml") - (version "4.4.1") + (version "4.4.2") (source (origin (method url-fetch) (uri (pypi-uri "lxml" version)) (sha256 - (base32 - "14jnpfcpgqr9sx8ppd286jzcbk0b36hbqsvd8jkvffipzw5v8768")))) + (base32 "01nvb5j8vs9nk4z5s3250b1m22b4d08kffa36if3g1mdygdrvxpg")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases @@ -5775,8 +5774,7 @@ (define-public python-lxml `(("libxml2" ,libxml2) ("libxslt" ,libxslt))) (home-page "http://lxml.de/") - (synopsis - "Python XML processing library") + (synopsis "Python XML processing library") (description "The lxml XML toolkit is a Pythonic binding for the C libraries libxml2 and libxslt.") -- cgit v1.2.3 From 90d5f4963fb1eed17f5df84062ad0b9d595fee98 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 10 Jan 2020 01:35:37 +0100 Subject: gnu: python-lxml: Use HTTPS home page. * gnu/packages/python-xyz.scm (python-lxml)[home-page]: Use HTTPS. --- 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 d60c813b94..8d9b265225 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5773,7 +5773,7 @@ (define-public python-lxml (inputs `(("libxml2" ,libxml2) ("libxslt" ,libxslt))) - (home-page "http://lxml.de/") + (home-page "https://lxml.de/") (synopsis "Python XML processing library") (description "The lxml XML toolkit is a Pythonic binding for the C libraries -- cgit v1.2.3 From a4893b382a43ab2b26f4aa879b13a372c42f083d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 10 Jan 2020 04:22:45 +0100 Subject: gnu: font-iosevka-slab: Update source hash. * gnu/packages/fonts.scm (font-iosevka-slab)[source]: Update sha256. --- gnu/packages/fonts.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 9e5021a364..4bcba89e38 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -1140,6 +1140,7 @@ (define-public font-comic-neue (define-public font-iosevka (package (name "font-iosevka") + ;; When updating, also update the hash of the Iosevka variant(s) below. (version "2.3.3") (source (origin @@ -1171,7 +1172,7 @@ (define-public font-iosevka-slab "/releases/download/v" version "/ttc-iosevka-slab-" version ".zip")) (sha256 - (base32 "186d0pl13znysll3hvzm1ixn7ad616g6dhla55sbh6ki2j04b8ml")))))) + (base32 "1rkmgi08kknc1fg54zpa6w92m3b3v7pc8cpwygz22kgd2h0mdrr8")))))) (define-public font-go (let ((commit "f03a046406d4d7fbfd4ed29f554da8f6114049fc") -- cgit v1.2.3 From b256ab505d44c8bff9e9eaf88683b1926f54ee33 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 10 Jan 2020 04:28:07 +0100 Subject: gnu: pcsc-lite: Don't use NAME in source URI. * gnu/packages/security-token.scm (pcsc-lite)[source]: Hard-code NAME. --- gnu/packages/security-token.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index d8383ccc0d..548cbc0160 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -173,9 +173,8 @@ (define-public pcsc-lite (version "1.8.25") (source (origin (method url-fetch) - (uri (string-append - "https://pcsclite.apdu.fr/files/" - name "-" version ".tar.bz2")) + (uri (string-append "https://pcsclite.apdu.fr/files/" + "pcsc-lite-" version ".tar.bz2")) (sha256 (base32 "14l7irs1nsh8b036ag4cfy8wryyysch78scz5dw6xxqwqgnpjvfp")))) -- cgit v1.2.3 From a0e63ce426e3ab8b0dbc1992d3ad934035acb439 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 10 Jan 2020 04:28:23 +0100 Subject: gnu: pcsc-lite: Update to 1.8.26. * gnu/packages/security-token.scm (pcsc-lite): Update to 1.8.26. --- gnu/packages/security-token.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index 548cbc0160..0f126d7347 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2016 Mike Gerwitz ;;; Copyright © 2016 Marius Bakke ;;; Copyright © 2017 Thomas Danckaert -;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2017, 2019 Ricardo Wurmus ;;; Copyright © 2018, 2019 Chris Marusich ;;; Copyright © 2018 Arun Isaac @@ -170,14 +170,14 @@ (define-public libyubikey (define-public pcsc-lite (package (name "pcsc-lite") - (version "1.8.25") + (version "1.8.26") (source (origin (method url-fetch) (uri (string-append "https://pcsclite.apdu.fr/files/" "pcsc-lite-" version ".tar.bz2")) (sha256 (base32 - "14l7irs1nsh8b036ag4cfy8wryyysch78scz5dw6xxqwqgnpjvfp")))) + "1ndvvz0fgqwz70pijymsxmx25mzryb0zav1i8jjc067ndryvxdry")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--enable-usbdropdir=/var/lib/pcsc/drivers" -- cgit v1.2.3 From 8a6c5b5d99f8e962d0eb719bbd0e0273b5ff499a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 10 Jan 2020 04:43:38 +0100 Subject: gnu: rrdtool: Update to 1.7.2. * gnu/packages/rrdtool.scm (rrdtool): Update to 1.7.2. --- gnu/packages/rrdtool.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/rrdtool.scm b/gnu/packages/rrdtool.scm index fb2afe616f..13419e4d37 100644 --- a/gnu/packages/rrdtool.scm +++ b/gnu/packages/rrdtool.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 Mark H Weaver -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -37,14 +37,14 @@ (define-module (gnu packages rrdtool) (define-public rrdtool (package (name "rrdtool") - (version "1.7.1") + (version "1.7.2") (source (origin (method url-fetch) (uri (string-append "http://oss.oetiker.ch/rrdtool/pub/rrdtool-" version ".tar.gz")) (sha256 (base32 - "1bhsg119j94xwykp2sbp01hhxcg78gzblfn7j98slrv9va77g6wq")))) + "1nsqra0g2nja19akmf9x5y9hhgc35ml3w9dcdz2ayz7zgvmzm6d1")))) (build-system gnu-build-system) (inputs `(("cairo" ,cairo) -- cgit v1.2.3 From 230e5db71ef53e03aa623940225cc6f0b0f23440 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 10 Jan 2020 09:52:20 +0100 Subject: gnu: monero-gui: Update to 0.15.0.3. * gnu/packages/finance.scm (monero-gui): Update to 0.15.0.3. [build-system]: Use qt-build-system. [inputs]: Remove qtwebchannel and qtx11extras. [arguments]: Merge fix-library-paths, fix-monerod-path, fix-qt-paths and fix-install-path phases into a fix-paths phase. Remove custom build, change-dir and wrap-program phases. Add configure and build-zxcvbn-c phases. --- gnu/packages/finance.scm | 95 ++++++++++++++++++++---------------------------- 1 file changed, 39 insertions(+), 56 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index b24a9bfbf1..19f990848c 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2018 Adriano Peluso ;;; Copyright © 2018, 2019 Nicolas Goaziou ;;; Copyright © 2018 Arun Isaac -;;; Copyright © 2019 Guillaume Le Vaillant +;;; Copyright © 2019, 2020 Guillaume Le Vaillant ;;; Copyright © 2019 Tanguy Le Carrour ;;; Copyright © 2019 Martin Becze ;;; Copyright © 2019 Sebastian Schott @@ -41,6 +41,7 @@ (define-module (gnu packages finance) #:use-module (guix build-system python) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system go) + #:use-module (guix build-system qt) #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages aidc) @@ -603,7 +604,7 @@ (define-public monero (define-public monero-gui (package (name "monero-gui") - (version "0.15.0.1") + (version "0.15.0.3") (source (origin (method git-fetch) @@ -613,8 +614,8 @@ (define-public monero-gui (file-name (git-file-name name version)) (sha256 (base32 - "08j8kkncdn57xql0bhmlzjpjkdfhqbpda1p07r797q8qi0nl4w8n")))) - (build-system gnu-build-system) + "1v2mk6qp7dfdj4j4cilxp0s0phfwwnmjvpvjrz6jzzlpvbnavkr0")))) + (build-system qt-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("qttools" ,qttools))) @@ -634,53 +635,45 @@ (define-public monero-gui ("qtquickcontrols" ,qtquickcontrols) ("qtquickcontrols2",qtquickcontrols2) ("qtsvg" ,qtsvg) - ("qtwebchannel" ,qtwebchannel) - ("qtx11extras" ,qtx11extras) ("qtxmlpatterns" ,qtxmlpatterns) ("unbound" ,unbound))) (propagated-inputs `(("monero" ,monero))) (arguments - `(#:modules ((guix build gnu-build-system) - (guix build qt-utils) - (guix build utils)) - #:imported-modules (,@%gnu-build-system-modules - (guix build qt-utils)) + `(#:tests? #f ; No tests #:phases (modify-phases %standard-phases - (delete 'configure) - (delete 'check) - (add-before 'build 'fix-makefile-vars + (add-after 'unpack 'fix-makefile-vars (lambda _ (substitute* "src/zxcvbn-c/makefile" (("\\?=") "=")) #t)) - (add-after 'fix-makefile-vars 'fix-library-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "monero-wallet-gui.pro" - (("-L/usr/local/lib") - "") - (("-L/usr/local/opt/openssl/lib") - (string-append "-L" (assoc-ref inputs "openssl") "/lib")) - (("-L/usr/local/opt/boost/lib") - (string-append "-L" (assoc-ref inputs "boost") "/lib"))) - #t)) - (add-after 'fix-library-paths 'fix-monerod-path - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "src/daemon/DaemonManager.cpp" - (("QApplication::applicationDirPath\\(\\) \\+ \"/monerod") - (string-append "\"" (assoc-ref inputs "monero") - "/bin/monerod"))) - #t)) - (add-after 'fix-monerod-path 'fix-qt-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "monero-wallet-gui.pro" - (("\\$\\$\\[QT_INSTALL_BINS\\]/lrelease") - (string-append (assoc-ref inputs "qttools") "/bin/lrelease")) - (("\\$\\$\\[QT_INSTALL_BINS\\]/lupdate") - (string-append (assoc-ref inputs "qttools") "/bin/lupdate"))) - #t)) - (add-after 'fix-qt-paths 'make-qt-deterministic + (add-after 'fix-makefile-vars 'fix-paths + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((boost (assoc-ref inputs "boost")) + (monero (assoc-ref inputs "monero")) + (openssl (assoc-ref inputs "openssl")) + (qttools (assoc-ref inputs "qttools")) + (out (assoc-ref outputs "out"))) + (substitute* "monero-wallet-gui.pro" + (("-L/usr/local/lib") + "") + (("-L/usr/local/opt/openssl/lib") + (string-append "-L" openssl "/lib")) + (("-L/usr/local/opt/boost/lib") + (string-append "-L" boost "/lib")) + (("\\$\\$\\[QT_INSTALL_BINS\\]/lrelease") + (string-append qttools "/bin/lrelease")) + (("\\$\\$\\[QT_INSTALL_BINS\\]/lupdate") + (string-append qttools "/bin/lupdate"))) + (substitute* "deployment.pri" + (("/opt/\\$\\$\\{TARGET\\}/bin") + (string-append out "/bin"))) + (substitute* "src/daemon/DaemonManager.cpp" + (("QApplication::applicationDirPath\\(\\) \\+ \"/monerod") + (string-append "\"" monero "/bin/monerod"))) + #t))) + (add-after 'fix-paths 'make-qt-deterministic (lambda _ (setenv "QT_RCC_SOURCE_DATE_OVERRIDE" "1") #t)) @@ -697,24 +690,14 @@ (define-public monero-gui ,version ,(package-version monero)))) #t)) - (replace 'build - (lambda _ - (invoke "./build.sh"))) - (add-after 'build 'fix-install-path - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "build/Makefile" - (("/opt/monero-wallet-gui") - (assoc-ref outputs "out"))) - #t)) - (add-before 'install 'change-dir + (replace 'configure (lambda _ + (mkdir-p "build") (chdir "build") - #t)) - (add-after 'install 'wrap-program - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (wrap-qt-program out "monero-wallet-gui")) - #t))))) + (invoke "qmake" "../monero-wallet-gui.pro" "CONFIG+=release"))) + (add-before 'build 'build-zxcvbn-c + (lambda _ + (invoke "make" "-C" "../src/zxcvbn-c")))))) (home-page "https://web.getmonero.org/") (synopsis "Graphical user interface for the Monero currency") (description -- cgit v1.2.3 From 53904f7422a19f9b5bd2adad6af2cdb688d79893 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 10 Jan 2020 22:17:10 +0100 Subject: gnu: nfs-utils: Build rpc.svcgssd. * gnu/packages/nfs.scm (nfs-utils)[arguments]: Enable building of rpc.svcgssd. --- gnu/packages/nfs.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/nfs.scm b/gnu/packages/nfs.scm index a3d5383c4d..b81623fd07 100644 --- a/gnu/packages/nfs.scm +++ b/gnu/packages/nfs.scm @@ -62,7 +62,8 @@ (define-public nfs-utils ,(string-append "--with-krb5=" (assoc-ref %build-inputs "mit-krb5")) ,(string-append "--with-pluginpath=" (assoc-ref %outputs "out") - "/lib/libnfsidmap")) + "/lib/libnfsidmap") + "--enable-svcgss") #:phases (modify-phases %standard-phases (add-before 'configure 'adjust-command-file-names -- cgit v1.2.3 From afb54fd1e77f36f09cf370253b9195b3b33d6795 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 10 Jan 2020 22:43:45 +0100 Subject: gnu: lepton-eda: Fix build. This is a follow-up to commit 1101c73c7fb2e0dbba00b45c05bf36ae08bdb6f2. * gnu/packages/engineering.scm (lepton-eda)[arguments]: Ignore inherited phases. --- gnu/packages/engineering.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index b63715d8c2..3f4cdbd172 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus ;;; Copyright © 2015 Federico Beffa ;;; Copyright © 2016, 2018, 2020 Efraim Flashner ;;; Copyright © 2016 David Thompson @@ -289,7 +289,7 @@ (define-public lepton-eda ;; never runs. See . `(cons "ac_cv_path_MSGMERGE=true" ,flags)) ((#:phases phases '%standard-phases) - `(modify-phases ,phases + `(modify-phases %standard-phases (add-before 'bootstrap 'prepare (lambda _ ;; Some of the scripts there are invoked by autogen.sh. -- cgit v1.2.3 From c82eab7f42e9ce5fa64ba66f4e62fbbfedf13373 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Tue, 24 Dec 2019 13:05:50 +0100 Subject: gnu: gwenhywfar: Update to 4.99.25rc9. * gnu/packages/gnucash.scm (gwenhywfar): Update to 4.99.25rc9. --- gnu/packages/gnucash.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnucash.scm b/gnu/packages/gnucash.scm index af017e108d..dc9831328a 100644 --- a/gnu/packages/gnucash.scm +++ b/gnu/packages/gnucash.scm @@ -231,14 +231,14 @@ (define gnucash-docs (define-public gwenhywfar (package (name "gwenhywfar") - (version "4.20.2") + (version "4.99.25rc9") (source (origin (method url-fetch) (uri (string-append "https://www.aquamaniac.de/rdm/attachments/" - "download/108/gwenhywfar-" version ".tar.gz")) + "download/223/gwenhywfar-" version ".tar.gz")) (sha256 - (base32 "0w1j7ppr1247kr3bpn4dqwyxp6cl8mfgr0m4782iz8f8a4ixjkqg")))) + (base32 "14ws780zfyv9qg41z42hlk8sh31w80w3v8n5riaslqhvvxqbfgkq")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 219fe54c8a4d1eebea175dd600108f7130aa40a6 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Tue, 24 Dec 2019 13:08:54 +0100 Subject: gnu: aqbanking: Update to 5.99.44beta. * gnu/packages/gnucash.scm (aqbanking): Update to 5.99.44beta. [argmuents]: Remove. [native-inputs]. Add gettext-minimal. --- gnu/packages/gnucash.scm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/gnu/packages/gnucash.scm b/gnu/packages/gnucash.scm index dc9831328a..e1dc5512a1 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 gettext) #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) #:use-module (gnu packages glib) @@ -268,22 +269,19 @@ (define-public gwenhywfar (define-public aqbanking (package (name "aqbanking") - (version "5.8.1") + (version "5.99.44beta") (source (origin (method url-fetch) (uri (string-append "https://www.aquamaniac.de/rdm/attachments/" - "download/105/aqbanking-" version ".tar.gz")) + "download/224/aqbanking-" version ".tar.gz")) (sha256 - (base32 "0m44n2hyxprxzq7ijkrd7rmhhl0r033s1k21ix9y67a0p9skl1mg")))) + (base32 "1cgj8g3wy53galp9pk50a85w0kmwfx3dwl93cbvq6sqb9izxmwdb")))) (build-system gnu-build-system) (arguments `(;; Parallel building fails because aqhbci is required before it's ;; built. - #:parallel-build? #f - #:configure-flags - (list (string-append "--with-gwen-dir=" - (assoc-ref %build-inputs "gwenhywfar"))))) + #:parallel-build? #f)) (propagated-inputs `(("gwenhywfar" ,gwenhywfar))) (inputs @@ -292,6 +290,7 @@ (define-public aqbanking ("gnutls" ,gnutls))) (native-inputs `(("pkg-config" ,pkg-config) + ("gettext-minimal", gettext-minimal) ("libltdl" ,libltdl))) (home-page "https://www.aquamaniac.de/sites/aqbanking/index.php") (synopsis "Interface for online banking tasks") -- cgit v1.2.3 From bc818a57caf0a523227b4653aa2720e49d2877ee Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Tue, 31 Dec 2019 16:06:32 +0100 Subject: gnu: gnucash: Update to 3.8. * gnu/packages/gnucash.scm (gnucash, gnucash-doc): Update to 3.8. --- gnu/packages/gnucash.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gnucash.scm b/gnu/packages/gnucash.scm index e1dc5512a1..8050fee43e 100644 --- a/gnu/packages/gnucash.scm +++ b/gnu/packages/gnucash.scm @@ -57,15 +57,15 @@ (define-public gnucash ;; directory. (package (name "gnucash") - (version "3.7") + (version "3.8") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/gnucash/gnucash%20%28stable%29/" - version "/gnucash-" version ".tar.bz2")) + version "/gnucash-" version "b" ".tar.bz2")) (sha256 (base32 - "1d2qi3ny0bxa16ifh3465z1jgn1l0fmqk9dkph4ialw076gv13kb")))) + "0dvzm3bib7jcj685sklpzyy9mrak9mxyvih2k9fk4sl3v21wlphg")))) (build-system cmake-build-system) (inputs `(("guile" ,guile-2.2) @@ -208,7 +208,7 @@ (define gnucash-docs version "/gnucash-docs-" version revision ".tar.gz")) (sha256 (base32 - "1h4hm58ikffbhplx4gm8pzm9blfwqa1sz8yc2fqi21vs5v0ijf9r")))) + "19v6kchda724xkkgwlw5rg21jcpirhch12j9sr6ibnv61sd4ql52")))) (build-system gnu-build-system) ;; These are native-inputs because they are only required for building the ;; documentation. -- cgit v1.2.3 From e0dde179ba5a2c9d47148c69b6d4d451b94a175f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 10 Jan 2020 05:01:14 +0100 Subject: gnu: rng-tools: Update to 6.9. * gnu/packages/linux.scm (rng-tools): Update to 6.9. --- 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 fb439f747d..5235d6cedc 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer ;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2016 Christopher Allan Webber -;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2016, 2017 Alex Kost ;;; Copyright © 2016 Raymond Nicholson ;;; Copyright © 2016 Mathieu Lirzin @@ -4483,7 +4483,7 @@ (define-public rng-tools (package (name "rng-tools") (home-page "https://github.com/nhorman/rng-tools") - (version "6.8") + (version "6.9") (source (origin (method git-fetch) (uri (git-reference (url home-page) @@ -4491,7 +4491,7 @@ (define-public rng-tools (file-name (git-file-name name version)) (sha256 (base32 - "1clm9i9xg3j79q0d6vinn6dx0nwh1fvzcmkqpcbay7mwsgkknvw2")))) + "065jf26s8zkicb95zc9ilksjdq9gqrh5vcx3mhi6mypbnamn6w98")))) (build-system gnu-build-system) (arguments `(;; Avoid using OpenSSL, curl, and libxml2, reducing the closure by 166 MiB. -- cgit v1.2.3 From bfd995729bac11466a3bb8b6a1414701935520d3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 10 Jan 2020 13:26:06 +0100 Subject: gnu: opensc: Eliminate obsolete test disablement. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This follows up on commit 508d5c5fa883a3cee53f8da358d853d4b245496c, I guess. * gnu/packages/security-token.scm (opensc)[arguments]: Remove the ‘disable-broken-test’ phase. --- gnu/packages/security-token.scm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index 0f126d7347..800aa0505e 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -254,13 +254,7 @@ (define-public opensc (("DEFAULT_PCSC_PROVIDER=\"libpcsclite\\.so\\.1\"") (string-append "DEFAULT_PCSC_PROVIDER=\"" libpcsclite "\""))) - #t))) - (add-before 'check 'disable-broken-test - (lambda _ - ;; XXX: This test is fixed in git, remove this phase for >= 0.19. - (substitute* "doc/tools/Makefile" - (("TESTS = test-manpage.sh") "TESTS = ")) - #t))))) + #t)))))) (inputs `(("readline" ,readline) ("openssl" ,openssl) -- cgit v1.2.3 From fc11e35619d7e21dbd4824d2dbf688ae06831532 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 10 Jan 2020 13:29:41 +0100 Subject: gnu: reuse: Update to 0.7.0. * gnu/packages/license.scm (reuse): Update to 0.7.0. --- gnu/packages/license.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/license.scm b/gnu/packages/license.scm index b7519f91ae..c39cd4302c 100644 --- a/gnu/packages/license.scm +++ b/gnu/packages/license.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Oleg Pykhalov -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -168,7 +168,7 @@ (define-public licensecheck (define-public reuse (package (name "reuse") - (version "0.5.0") + (version "0.7.0") (source (origin (method git-fetch) @@ -177,7 +177,7 @@ (define-public reuse (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1w17g6jvs715rjc93nnnqnfdphijq4ymj9jjkr3ccc286ywvn3ih")))) + (base32 "04i8zd66cs152h28k9085nqg937wp31pz2yqywaldx1gywijyd8h")))) (build-system python-build-system) (native-inputs `(("python-pytest" ,python-pytest))) -- cgit v1.2.3 From 56b27a158f241de3683ff1838fe9cf05e7e59408 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 10 Jan 2020 13:35:37 +0100 Subject: gnu: reuse: Download from PyPI. * gnu/packages/license.scm (reuse)[source]: Use PYPI-URI. --- gnu/packages/license.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/gnu/packages/license.scm b/gnu/packages/license.scm index c39cd4302c..36bcb75f8d 100644 --- a/gnu/packages/license.scm +++ b/gnu/packages/license.scm @@ -171,13 +171,10 @@ (define-public reuse (version "0.7.0") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://git.fsfe.org/reuse/tool.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) + (method url-fetch) + (uri (pypi-uri "reuse" version)) (sha256 - (base32 "04i8zd66cs152h28k9085nqg937wp31pz2yqywaldx1gywijyd8h")))) + (base32 "16wn28xxjcm5qlb7bs6jmdkfrkr5v97s59nmi9cn85qcg4gmj7lk")))) (build-system python-build-system) (native-inputs `(("python-pytest" ,python-pytest))) -- cgit v1.2.3 From cb169aae81886b7d92684b126616857527794224 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 10 Jan 2020 13:36:12 +0100 Subject: gnu: hdf5@1.10: Update to 1.10.6. * gnu/packages/maths.scm (hdf5-1.10): Update to 1.10.6. --- 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 be6e5b21e4..ee6e4fdac8 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -917,7 +917,7 @@ (define-public hdf5 (define-public hdf5-1.10 (package (inherit hdf5) - (version "1.10.5") + (version "1.10.6") (source (origin (method url-fetch) @@ -931,7 +931,7 @@ (define-public hdf5-1.10 (take (string-split version #\.) 2)) "/src/hdf5-" version ".tar.bz2"))) (sha256 - (base32 "0i3g6v521vigzbx8wpd32ibsiiw92r65ca3qdbn0d8fj8f4fmmk8")) + (base32 "1gf38x51128hn00744358w27xgzjk0ff4wra4yxh2lk804ck1mh9")) (patches (search-patches "hdf5-config-date.patch")))))) (define-public hdf-java -- cgit v1.2.3 From f22b35711323a1e101ed666ec5ce776bf1908a74 Mon Sep 17 00:00:00 2001 From: Florian Pelz Date: Thu, 9 Jan 2020 07:51:41 +0100 Subject: doc: Clarify description of the PageKite service. * doc/guix.texi (Networking Services): Make clear PageKite is not necessary with port forwarding. --- doc/guix.texi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 60491af4d4..3693bb54b6 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -14154,8 +14154,8 @@ Package object of the Open vSwitch. @defvr {Scheme Variable} pagekite-service-type This is the service type for the @uref{https://pagekite.net, PageKite} service, a tunneling solution for making localhost servers publicly visible, even from -behind NAT or restrictive firewalls. The value for this service type is a -@code{pagekite-configuration} record. +behind restrictive firewalls or NAT without forwarded ports. The value for +this service type is a @code{pagekite-configuration} record. Here's an example exposing the local HTTP and SSH daemons: -- cgit v1.2.3 From 10576acbbf496a051d488c2832f1e474ef6074f3 Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Tue, 7 Jan 2020 22:00:30 +0100 Subject: gnu: mercurial: Update to 5.2.1. * gnu/packages/version-control.scm (mercurial): Update to 5.2.1. [arguments]: Remove hard dependency on Python 2. Replace check phase to work around known failing tests. [native-inputs]: Add python-nose, and unzip. Signed-off-by: Brett Gilio --- gnu/packages/version-control.scm | 38 ++++++++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index d354a807a3..ca8af00752 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -25,6 +25,7 @@ ;;; Copyright © 2019 Jovany Leandro G.C ;;; Copyright © 2019 Kei Kebreau ;;; Copyright © 2019 Alex Griffin +;;; Copyright © 2020 Roel Janssen ;;; ;;; This file is part of GNU Guix. ;;; @@ -1230,22 +1231,43 @@ (define-public gitolite (define-public mercurial (package (name "mercurial") - (version "5.0.2") + (version "5.2.1") (source (origin (method url-fetch) (uri (string-append "https://www.mercurial-scm.org/" "release/mercurial-" version ".tar.gz")) (sha256 (base32 - "1y60hfc8gh4ha9sw650qs7hndqmvbn0qxpmqwpn4q18z5xwm1f19")))) + "1pxkd37b0a1mi2zakk1hi122lgz1ffy2fxdnbs8acwlqpw55bc8q")))) (build-system python-build-system) (arguments - `(;; Restrict to Python 2, as Python 3 would require - ;; the argument --c2to3. - #:python ,python-2 - ;; FIXME: Disabled tests because they require the nose unit - ;; testing framework: https://nose.readthedocs.org/en/latest/ . - #:tests? #f)) + `(#: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")))))) + ;; The following inputs are only needed to run the tests. + (native-inputs + `(("python-nose" ,python-nose) + ("unzip" ,unzip))) (home-page "https://www.mercurial-scm.org/") (synopsis "Decentralized version control system") (description -- cgit v1.2.3 From bde974c55e310ed14be84b83a0535630d8a4acef Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 11 Jan 2020 02:08:34 +0100 Subject: gnu: libwacom: Update to 1.2. * gnu/packages/xdisorg.scm (libwacom): Update to 1.2. --- 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 a85e88a544..75c230c9d2 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -18,7 +18,7 @@ ;;; Copyright © 2016 Petter ;;; Copyright © 2017 Mekeor Melire ;;; Copyright © 2017 ng0 -;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2017 Marek Benc ;;; Copyright © 2017 Mike Gerwitz ;;; Copyright © 2018 Thomas Sigurdsen @@ -1049,7 +1049,7 @@ (define-public xcape (define-public libwacom (package (name "libwacom") - (version "1.1") + (version "1.2") (source (origin (method url-fetch) (uri (string-append @@ -1057,7 +1057,7 @@ (define-public libwacom "libwacom-" version "/libwacom-" version ".tar.bz2")) (sha256 (base32 - "00lyv419ijyng6ak5vpw0swnn4qg6lbfh7zysf92wcvn6rcq7d4c")))) + "1hv3z2qkvycqcyv99zfpbbgrlbyppdq8kk2y9x51578mwbgcy162")))) (build-system glib-or-gtk-build-system) (arguments `(#:configure-flags '("--disable-static"))) -- cgit v1.2.3 From f01d8e9c2fbffa577ebfc62e90936af833606df9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 11 Jan 2020 02:08:53 +0100 Subject: gnu: xf86-input-wacom: Update to 0.39.0. * gnu/packages/xdisorg.scm (xf86-input-wacom): Update to 0.39.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 75c230c9d2..c1f6876c7e 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -1084,7 +1084,7 @@ (define-public libwacom (define-public xf86-input-wacom (package (name "xf86-input-wacom") - (version "0.38.0") + (version "0.39.0") (source (origin (method url-fetch) @@ -1093,7 +1093,7 @@ (define-public xf86-input-wacom "xf86-input-wacom-" version "/" "xf86-input-wacom-" version ".tar.bz2")) (sha256 - (base32 "0w53hv3g7d5vv328x04wb57sa1lyv2h631c37csp1drfp7ghikd1")))) + (base32 "11qk58az6qwii774ga45h5yqzipwn56f0d74kdbajqdv45p85gqj")))) (arguments `(#:configure-flags (list (string-append "--with-sdkdir=" -- cgit v1.2.3 From ad07f6747a199e07c0015349e04c6aa0a6731501 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 11 Jan 2020 02:09:14 +0100 Subject: gnu: thunar: Update to 1.8.11. * gnu/packages/xfce.scm (thunar): Update to 1.8.11. --- gnu/packages/xfce.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index ccf8c83103..7489624646 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2017, 2019 Ricardo Wurmus ;;; Copyright © 2017 Petter ;;; Copyright © 2017 ng0 -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019 Pkill -9 ;;; Copyright © 2019 L p R n d n ;;; Copyright © 2019 Ingo Ruhnke @@ -645,7 +645,7 @@ (define-public xfce4-settings (define-public thunar (package (name "thunar") - (version "1.8.10") + (version "1.8.11") (source (origin (method url-fetch) (uri (string-append "http://archive.xfce.org/src/xfce/" @@ -653,7 +653,7 @@ (define-public thunar "thunar-" version ".tar.bz2")) (sha256 (base32 - "02g72bpbb8dkwspay9qii8bi99l87jn39gz6bamgp7p4q20qsi1x")))) + "0f5jw61z1dbvyyf1nks5dagnbs6sxxw7spybgwvpb3hfljrlvphq")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From cd199a45b54a816b3bf5207215875ae4fd56db2c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 10 Jan 2020 16:59:23 +0100 Subject: gnu: python-smmap2: Update to 2.0.5. * gnu/packages/python-xyz.scm (python-smmap2): Update to 2.0.5. --- gnu/packages/python-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 8d9b265225..6314b9e141 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13671,14 +13671,13 @@ (define-public python2-apache-libcloud (define-public python-smmap2 (package (name "python-smmap2") - (version "2.0.3") + (version "2.0.5") (source (origin (method url-fetch) (uri (pypi-uri "smmap2" version)) (sha256 - (base32 - "1hvn28p3zvxa98sbi9lrqvv2ps4q284j4jq9a619zw0m7yv0sly7")))) + (base32 "16k03pcnxd3lgzwgbd7nl4jwzm1wmahirvd09kljnzvy96hgza99")))) (build-system python-build-system) (native-inputs `(("python-nosexcover" ,python-nosexcover))) -- cgit v1.2.3 From 21724ed951a14ace849effc44a32d551e62fdbc9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 10 Jan 2020 21:52:44 +0100 Subject: gnu: ddcutil: Update to 0.9.8. * gnu/packages/hardware.scm (ddcutil): Update to 0.9.8. --- gnu/packages/hardware.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index eb7471b681..dab49c7cc0 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -38,14 +38,14 @@ (define-module (gnu packages hardware) (define-public ddcutil (package (name "ddcutil") - (version "0.9.7") + (version "0.9.8") (source (origin (method url-fetch) (uri (string-append "https://www.ddcutil.com/tarballs/" "ddcutil-" version ".tar.gz")) (sha256 - (base32 "0lqc3fn5h7acfmbmyi8hpv2p6b4csfbx3lkhzy073s9x2zblrq3g")))) + (base32 "13ccxbqgyz4ah9jwbcylnfkgl8j3ida8xd00xkcq4xnfyyv5mg6v")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From a4ac25df71a5b397d0a8e758e53ea3ba8981ecda Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 10 Jan 2020 18:18:09 +0100 Subject: gnu: python-glances: Update to 3.1.2. * gnu/packages/python-xyz.scm (python-glances): Update to 3.1.2. --- gnu/packages/python-xyz.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 6314b9e141..d6b9477b43 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11353,14 +11353,13 @@ (define-public python2-natsort (define-public python-glances (package (name "python-glances") - (version "3.1.1") + (version "3.1.2") (source (origin (method url-fetch) (uri (pypi-uri "Glances" version)) (sha256 - (base32 - "07j1ggzsqiskyz1i4mrnyr9i95v0dqi0i0hibnv1l188km8shmi8")) + (base32 "15384pbvw9wj4sb8zgvd9v1812vrypbyjg0acicjf1hdb3p30fkk")) (modules '((guix build utils))) (snippet '(begin @@ -11376,8 +11375,7 @@ (define-public python-glances (propagated-inputs `(("python-future" ,python-future) ("python-psutil" ,python-psutil))) - (home-page - "https://github.com/nicolargo/glances") + (home-page "https://github.com/nicolargo/glances") (synopsis "Cross-platform curses-based monitoring tool") (description "Glances is a curses-based monitoring tool for a wide variety of platforms. -- cgit v1.2.3 From df45af90413906b18710d8c51c44afd5b92d6db6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 10 Jan 2020 21:30:31 +0100 Subject: gnu: upower: Update to 0.99.11. * gnu/packages/gnome.scm (upower): Update to 0.99.11. [source]: Follow home page download URI. --- gnu/packages/gnome.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 6d0c971c8b..efc6113a03 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3797,15 +3797,14 @@ (define-public geocode-glib (define-public upower (package (name "upower") - (version "0.99.10") + (version "0.99.11") (source (origin (method url-fetch) - (uri (string-append "https://gitlab.freedesktop.org/upower/upower/" - "uploads/c438511024b9bc5a904f8775cfc8e4c4/" + (uri (string-append "https://upower.freedesktop.org/releases/" "upower-" version ".tar.xz")) (sha256 (base32 - "17d2bclv5fgma2y3g8bsn9pdvspn1zrzismzdnzfivc0f2wm28k4")) + "1vxxvmz2cxb1qy6ibszaz5bskqdy9nd9fxspj9fv3gfmrjzzzdb4")) (patches (search-patches "upower-builddir.patch")))) (build-system glib-or-gtk-build-system) (arguments -- cgit v1.2.3 From fc87c7ce464eb76d28d425ec482e901d31b09725 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 10 Jan 2020 21:38:19 +0100 Subject: gnu: kdevelop: Update to 5.4.6. * gnu/packages/kde.scm (kdevelop): Update to 5.4.6. --- gnu/packages/kde.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 44f8df387f..1620cb1b2e 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2016 David Craven ;;; Copyright © 2016, 2017 Thomas Danckaert ;;; Copyright © 2017, 2018 Mark Meyer -;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Gábor Boskovits ;;; Copyright © 2019 Nicolas Goaziou ;;; Copyright © 2018, 2019 Hartmut Goebel @@ -183,7 +183,7 @@ (define-public kdenlive (define-public kdevelop (package (name "kdevelop") - (version "5.4.5") + (version "5.4.6") (source (origin (method url-fetch) @@ -191,8 +191,7 @@ (define-public kdevelop "/" version "/src/kdevelop-" version ".tar.xz")) (sha256 - (base32 - "08vhbg9ql0402bw3y3xw1kdxhig9sv3ss8g0h4477vy3z17m1h4j")))) + (base32 "01jmrmwbc1hrvq7jdfcc7mxl03q2l6kz57yca2j26xwyvfcfv5sz")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) -- cgit v1.2.3 From 7f0bccb559bb287b5330454bead634f85b5d5417 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 10 Jan 2020 21:44:47 +0100 Subject: gnu: impressive: Update to 0.12.1. * gnu/packages/pdf.scm (impressive): Update to 0.12.1. --- gnu/packages/pdf.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 3b6829c4bc..368b2ce69e 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2017, 2018 Leo Famulari ;;; Copyright © 2017 Alex Vong ;;; Copyright © 2017, 2018 Rene Saavedra -;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019 Alex Griffin ;;; Copyright © 2019 Ben Sturmfels ;;; Copyright © 2019 Hartmut Goebel @@ -784,7 +784,7 @@ (define-public python2-reportlab (define-public impressive (package (name "impressive") - (version "0.12.0") + (version "0.12.1") (source (origin (method url-fetch) (uri (string-append @@ -792,7 +792,7 @@ (define-public impressive version "/Impressive-" version ".tar.gz")) (sha256 (base32 - "0zaqq3yvd296mfr5bxpj2hqlk7vrb0rsbgd4dc1l5ag46giqvivx")))) + "1r7ihv41awnlnlry1kymb8fka053wdhzibfwcarn78rr3vs338vl")))) (build-system python-build-system) ;; TODO: Add dependency on pdftk. -- cgit v1.2.3 From 2d639e0fceac1e73fe3fc1a716468358ab176ea7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 11 Jan 2020 03:47:58 +0100 Subject: gnu: libmirage: Update to 3.2.4. * gnu/packages/cdrom.scm (libmirage): Update to 3.2.4. --- gnu/packages/cdrom.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index b13b4b3a66..352f8af30b 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2016 Marius Bakke ;;; Copyright © 2017 John Darrington ;;; Copyright © 2017 Thomas Danckaert -;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2017 ng0 ;;; Copyright © 2018 Oleg Pykhalov ;;; Copyright © 2018, 2019 Ricardo Wurmus @@ -881,7 +881,7 @@ (define-public cdrkit-libre (define-public libmirage (package (name "libmirage") - (version "3.2.3") + (version "3.2.4") (source (origin (method url-fetch) (uri (string-append @@ -889,7 +889,7 @@ (define-public libmirage version ".tar.bz2")) (sha256 (base32 - "08mfvqyk3833ksfd47i4j3ppmrw5ry219km6h7lywdh9hm9x14yf")))) + "0md3f71x2dbgyw5s254vx1s80slh3f25r9pvjihkrmj0rn53nnzw")))) (build-system cmake-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 46ffcd5fe12a60def48cd10c77b6fe183832128a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 11 Jan 2020 03:48:00 +0100 Subject: gnu: cdemu-daemon: Update to 3.2.4. * gnu/packages/cdrom.scm (cdemu-daemon): Update to 3.2.4. --- gnu/packages/cdrom.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index 352f8af30b..b632615beb 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -910,7 +910,7 @@ (define-public libmirage (define-public cdemu-daemon (package (name "cdemu-daemon") - (version "3.2.3") + (version "3.2.4") (source (origin (method url-fetch) (uri (string-append @@ -918,7 +918,7 @@ (define-public cdemu-daemon version ".tar.bz2")) (sha256 (base32 - "022xzgwmncswb9md71w3ly3mjkdfc93lbij2llp2jamq8grxjjxr")))) + "02yyj8sr7d5briamhzrqh8zdsiiggxmx5y05kx25y7k3g15jvcx6")))) (build-system cmake-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 8bd904450ba3241ac3a3c98c0645f6c5ae25c3f7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 11 Jan 2020 03:48:01 +0100 Subject: gnu: cdemu-client: Update to 3.2.4. * gnu/packages/cdrom.scm (cdemu-client): Update to 3.2.4. --- gnu/packages/cdrom.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index b632615beb..b7e8b1cb87 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -939,7 +939,7 @@ (define-public cdemu-daemon (define-public cdemu-client (package (name "cdemu-client") - (version "3.2.3") + (version "3.2.4") (source (origin (method url-fetch) (uri (string-append @@ -947,7 +947,7 @@ (define-public cdemu-client version ".tar.bz2")) (sha256 (base32 - "1bvc2m63fx03rbp3ihgl2n7k24lwg5ydwkmr84gsjfcxp46q10zq")))) + "1swylaja1p1jfjf3s58c9hsk1cyy20i7mrq32kcg6kzp88grs8my")))) (build-system cmake-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 41d3e086e044bc5902b4ee3380153cdd89a07d68 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 11 Jan 2020 03:49:49 +0100 Subject: gnu: cdemu-daemon: Split excessively long line. * gnu/packages/cdrom.scm (cdemu-daemon)[source]: Wrap at 80 characters. --- gnu/packages/cdrom.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index b7e8b1cb87..b6bdf33eef 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -914,8 +914,8 @@ (define-public cdemu-daemon (source (origin (method url-fetch) (uri (string-append - "https://downloads.sourceforge.net/cdemu/cdemu-daemon/cdemu-daemon-" - version ".tar.bz2")) + "https://downloads.sourceforge.net/cdemu/cdemu-daemon/" + "cdemu-daemon-" version ".tar.bz2")) (sha256 (base32 "02yyj8sr7d5briamhzrqh8zdsiiggxmx5y05kx25y7k3g15jvcx6")))) -- cgit v1.2.3 From e4c9ba4da2a6faf80209488d5c086ea0d5c39214 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Sat, 11 Jan 2020 01:23:50 +0100 Subject: gnu: Add picolisp. * gnu/packages/lisp.scm (picolisp32, picolisp): New variables. --- gnu/packages/lisp.scm | 161 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 160 insertions(+), 1 deletion(-) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index f05ced583a..f2f483e0d4 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -14,7 +14,7 @@ ;;; Copyright © 2018, 2019 Pierre Langlois ;;; Copyright © 2019 Katherine Cox-Buday ;;; Copyright © 2019 Jesse Gildersleve -;;; Copyright © 2019 Guillaume Le Vaillant +;;; Copyright © 2019, 2020 Guillaume Le Vaillant ;;; ;;; This file is part of GNU Guix. ;;; @@ -71,6 +71,7 @@ (define-module (gnu packages lisp) #:use-module (gnu packages readline) #:use-module (gnu packages sdl) #:use-module (gnu packages tex) + #:use-module (gnu packages tls) #:use-module (gnu packages texinfo) #:use-module (gnu packages version-control) #:use-module (gnu packages xorg) @@ -783,3 +784,161 @@ (define-public txr development in a wide-range of areas.") (home-page "https://nongnu.org/txr/") (license license:bsd-2))) + +(define picolisp32 + (package + (name "picolisp32") + (version "19.12") + (source + (origin + (method url-fetch) + (uri (string-append "https://software-lab.de/picoLisp-" version ".tgz")) + (sha256 + (base32 "10np0mhihr47r3201617zccrvzpkhdl1jwvz7zimk8kxpriydq2j")) + (modules '((guix build utils))) + (snippet '(begin + ;; Delete the pre-compiled jar file. + (delete-file "ersatz/picolisp.jar") + #t)))) + (build-system gnu-build-system) + (inputs + `(("openssl" ,openssl))) + (arguments + `(#:system ,(match (%current-system) + ((or "armhf-linux" "aarch64-linux") + "armhf-linux") + (_ + "i686-linux")) + #:phases + (modify-phases %standard-phases + (delete 'configure) + (add-after 'unpack 'fix-paths + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (shebang-line (string-append + "#!" out "/bin/picolisp " + out "/lib/picolisp/lib.l"))) + (substitute* '("bin/pil" + "bin/pilIndent" + "bin/pilPretty" + "bin/psh" + "bin/replica" + "bin/vip" + "bin/watchdog" + "games/xchess" + "misc/bigtest" + "misc/calc" + "misc/chat" + "misc/mailing" + "src/mkVers") + (("#\\!bin/picolisp lib.l") + shebang-line) + (("#\\!\\.\\./bin/picolisp \\.\\./lib.l") + shebang-line) + (("#\\!/usr/bin/picolisp /usr/lib/picolisp/lib.l") + shebang-line))) + #t)) + (add-after 'fix-paths 'make-build-reproducible + (lambda _ + (substitute* "src64/lib/asm.l" + (("\\(prinl \"/\\* \" \\(datSym \\(date\\)\\) \" \\*/\\)") + "")) + #t)) + (add-after 'make-build-reproducible 'fix-permissions + (lambda _ + (for-each make-file-writable + '("doc/family.tgz" + "doc/family64.tgz" + "lib/map" + "src64/tags")) + #t)) + (replace 'build + (lambda _ + (invoke "make" "-C" "src" "picolisp" "tools" "gate"))) + (add-before 'check 'set-home-for-tests + (lambda _ + (setenv "HOME" "/tmp") + #t)) + (replace 'check + (lambda _ + (invoke "./pil" "test/lib.l" "-bye" "+"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (man (string-append out "/share/man")) + (picolisp (string-append out "/lib/picolisp"))) + (copy-recursively "man" man) + (copy-recursively "." picolisp) + (for-each (lambda (name) + (let ((path (string-append picolisp "/" name))) + (delete-file-recursively path))) + '("CHANGES" "COPYING" "CREDITS" "cygwin" + "INSTALL" "man" "pil" "README" "src" "src64" + "test")) + (mkdir-p bin) + (symlink (string-append picolisp "/bin/picolisp") + (string-append bin "/picolisp")) + (symlink (string-append picolisp "/bin/pil") + (string-append bin "/pil"))) + #t))))) + (synopsis "Interpreter for the PicoLisp programming language") + (description + "PicoLisp is a programming language, or really a programming system, +including a built-in database engine and a GUI system.") + (home-page "https://picolisp.com/wiki/?home") + (license license:expat))) + +(define-public picolisp + (match (%current-system) + ((or "aarch64-linux" "x86_64-linux") + (package + ;; Use the 32-bit picolisp to generate the assembly files required by + ;; the 64-bit picolisp. + (inherit picolisp32) + (name "picolisp") + (native-inputs + `(("picolisp32" ,picolisp32) + ("which" ,which))) + (arguments + (substitute-keyword-arguments (package-arguments picolisp32) + ((#:system _ "") (%current-system)) + ((#:phases phases) + `(modify-phases ,phases + (delete 'fix-paths) + (add-before 'build 'fix-paths + ;; This must run after the other shebang-patching phases, + ;; or they will override our changes. + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((picolisp32 (assoc-ref inputs "picolisp32")) + (out (assoc-ref outputs "out")) + (shebang-line (string-append + "#!" out "/bin/picolisp " + out "/lib/picolisp/lib.l"))) + (substitute* '("bin/pil" + "bin/pilIndent" + "bin/pilPretty" + "bin/psh" + "bin/replica" + "bin/vip" + "bin/watchdog" + "games/xchess" + "misc/bigtest" + "misc/calc" + "misc/chat" + "misc/mailing" + "src/mkVers") + (("#\\!.*picolisp32.*/bin/picolisp .*lib\\.l") + shebang-line)) + (substitute* "src64/mkAsm" + (("/usr/bin/") + (string-append picolisp32 "/bin/")))) + #t)) + (replace 'build + (lambda _ + (invoke "make" "-C" "src" "tools" "gate") + (invoke "make" "-C" "src64" "CC=gcc" "picolisp"))))))))) + (_ + (package + (inherit picolisp32) + (name "picolisp"))))) -- cgit v1.2.3 From efc32ed8904ca1bbf2123ff1c64782329d7c9941 Mon Sep 17 00:00:00 2001 From: nixo Date: Sat, 11 Jan 2020 14:19:39 +0100 Subject: gnu: emacs-undo-tree: Update to 0.7.1. * gnu/packages/emacs-xyz.scm (emacs-undo-tree): Update to 0.7.1. Signed-off-by: David Wilson --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 558f315d45..8b38a28cb2 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2294,16 +2294,16 @@ (define-public emacs-olivetti (define-public emacs-undo-tree (package (name "emacs-undo-tree") - (version "0.7") + (version "0.7.1") (source (origin (method git-fetch) (uri (git-reference (url "http://dr-qubit.org/git/undo-tree.git") - (commit (string-append "release-" version)))) + (commit (string-append "release/" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "1m02v7qhcbqv5gb0vdmf44vhqisf2pv6419dzjfpxcmwlmdm0z7a")))) + "1nr0149y2nvrxj56gc12jqnfl01g6z9ypfsgl6pfg85cw73hnggk")))) (build-system emacs-build-system) (home-page "http://www.dr-qubit.org/emacs.php") (synopsis "Treat undo history as a tree") -- cgit v1.2.3 From db481636a53d250f025f7f96685c97ef783437a3 Mon Sep 17 00:00:00 2001 From: Mike Rosset Date: Wed, 1 Jan 2020 08:03:52 -0800 Subject: gnu: Add qtwebengine. * gnu/packages/qt.scm (qtwebengine): New variable. Signed-off-by: Marius Bakke --- gnu/packages/qt.scm | 145 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 145 insertions(+) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index daa35c77cb..1f815f74f5 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2018 Eric Bavier ;;; Copyright © 2019 Marius Bakke ;;; Copyright © 2018 John Soo +;;; Copyright © 2020 Mike Rosset ;;; ;;; This file is part of GNU Guix. ;;; @@ -52,30 +53,40 @@ (define-module (gnu packages qt) #:use-module (gnu packages flex) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gcc) + #:use-module (gnu packages ghostscript) #:use-module (gnu packages gl) #:use-module (gnu packages glib) + #:use-module (gnu packages gnupg) #:use-module (gnu packages gperf) #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages icu4c) #:use-module (gnu packages image) + #:use-module (gnu packages libevent) #:use-module (gnu packages linux) #:use-module (gnu packages llvm) #:use-module (gnu packages maths) + #:use-module (gnu packages ninja) #:use-module (gnu packages nss) #:use-module (gnu packages pciutils) #:use-module (gnu packages pcre) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages pulseaudio) + #:use-module (gnu packages protobuf) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages regex) #:use-module (gnu packages ruby) #:use-module (gnu packages sdl) + #:use-module (gnu packages serialization) #:use-module (gnu packages sqlite) + #:use-module (gnu packages telephony) #:use-module (gnu packages tls) + #:use-module (gnu packages video) #:use-module (gnu packages vulkan) #:use-module (gnu packages xdisorg) + #:use-module (gnu packages xiph) #:use-module (gnu packages xorg) #:use-module (gnu packages xml) #:use-module (srfi srfi-1)) @@ -1521,6 +1532,140 @@ (define-public qtspeech In such a scenario, the messaging application can read out the incoming message."))) +(define-public qtwebengine + (package + (inherit qtsvg) + (name "qtwebengine") + (version (package-version qtbase)) + (source (origin + (method url-fetch) + (uri (string-append "https://download.qt.io/official_releases/qt/" + (version-major+minor version) "/" version + "/submodules/" name "-everywhere-src-" + version ".tar.xz")) + (sha256 + (base32 + "08c60nh95m98mcqk444axs76xi6m9x0wvdxrzk9c2cxwqdbz59fa")))) + (build-system gnu-build-system) + (native-inputs + `(("bison" ,bison) + ("flex" ,flex) + ("gperf" ,gperf) + ("ninja" ,ninja) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("python-2" ,python-2) + ("ruby" ,ruby))) + (inputs + `(("alsa-lib" ,alsa-lib) + ("atk" ,atk) + ("cups-minimal" ,cups-minimal) + ("dbus" ,dbus) + ("ffmpeg" ,ffmpeg) + ("fontconfig" ,fontconfig) + ("harbuzz" ,harfbuzz) + ("icu4c" ,icu4c) + ("jsoncpp" ,jsoncpp) + ("lcms" ,lcms) + ("libcap" ,libcap) + ("libevent" ,libevent) + ("libgcrypt" ,libgcrypt) + ("libjpeg" ,libjpeg-turbo) + ("libvpx" ,libvpx) + ;; FIXME: configure does not find system lcms + ;; ("lcms" ,lcms) + ("libwebp" ,libwebp) + ("libx11" ,libx11) + ("libxcb" ,libxcb) + ("libxcomposite" ,libxcomposite) + ("libxcursor" ,libxcursor) + ("libxi" ,libxi) + ("libxkbcommon" ,libxkbcommon) + ;; FIXME: libxml2 needs to built with icu support though it links to + ;; libxml2 configure summary still states "Checking for compatible + ;; system libxml2... no" + ("libxml2" ,libxml2) + ("libxrandr" ,libxrandr) + ("libxrender" ,libxrender) + ("libxslt" ,libxslt) + ("libxtst" ,libxtst) + ("mesa" ,mesa) + ("minizip" ,minizip) + ("nss" ,nss) + ("opus" ,opus) + ("pciutils" ,pciutils) + ("protobuf" ,protobuf) + ("pulseaudio" ,pulseaudio) + ("qtbase" ,qtbase) + ("qtdeclarative" ,qtdeclarative) + ("qtmultimedia" ,qtmultimedia) + ("qtwebchannel" ,qtwebchannel) + ("re2" ,re2) + ("snappy" ,snappy) + ("udev" ,eudev) + ("xcb-util" ,xcb-util))) + (arguments + (substitute-keyword-arguments (package-arguments qtsvg) + ((#:phases phases) + `(modify-phases ,phases + (add-before 'configure 'substitute-source + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (nss (assoc-ref inputs "nss")) + (udev (assoc-ref inputs "udev"))) + ;; Qtwebengine is not installed into the same prefix as + ;; qtbase. Some qtbase QTLibraryInfo constants will not + ;; work. Replace with the full path to the qtwebengine + ;; translations and locales in the store. + (substitute* "src/core/web_engine_library_info.cpp" + (("QLibraryInfo::location\\(QLibraryInfo::TranslationsPath\\)") + (string-append "QLatin1String(\"" out "/share/qt5/translations\")")) + (("QLibraryInfo::location\\(QLibraryInfo::DataPath\\)") + (string-append "QLatin1String(\"" out "/share/qt5\")"))) + ;; Substitute full dynamic library path for nss. + (substitute* "src/3rdparty/chromium/crypto/nss_util.cc" + (("libnssckbi.so") + (string-append nss "/lib/nss/libnssckbi.so"))) + ;; Substitute full dynamic library path for udev. + (substitute* "src/3rdparty/chromium/device/udev_linux/udev1_loader.cc" + (("libudev.so.1") + (string-append udev "/lib/libudev.so.1"))) + #t))) + (add-before 'configure 'set-env + (lambda _ + ;; Avoids potential race conditions. + (setenv "PYTHONDONTWRITEBYTECODE" "1") + (setenv "NINJAFLAGS" + (string-append "-k1" ;less verbose build output + ;; Respect the '--cores' option of 'guix build'. + " -j" (number->string (parallel-job-count)))) + #t)) + (replace 'configure + (lambda _ + ;; Valid QT_BUILD_PARTS variables are: + ;; libs tools tests examples demos docs translations + (invoke "qmake" "QT_BUILD_PARTS = libs tools" "--" + "--webengine-printing-and-pdf=no" + "--webengine-ffmpeg=system" + "--webengine-icu=system" + "--webengine-pepper-plugins=no"))))) + ;; Tests are disabled due to "Could not find QtWebEngineProcess error" + ;; It's possible this can be fixed by setting QTWEBENGINEPROCESS_PATH + ;; before running tests. + ((#:tests? _ #f) #f))) + (native-search-paths + (list (search-path-specification + (file-type 'regular) + (separator #f) + (variable "QTWEBENGINEPROCESS_PATH") + (files '("lib/qt5/libexec/QtWebEngineProcess"))))) + (home-page "https://wiki.qt.io/QtWebEngine") + (synopsis "Qt WebEngine module") + (description "The Qt5WebEngine module provides support for web applications +using the Chromium browser project. The Chromium source code has Google services +and binaries removed, and adds modular support for using system libraries.") + (license license:lgpl2.1+))) + (define-public python-sip (package (name "python-sip") -- cgit v1.2.3 From 2c7511fb66ef32c0cfd5286719568068d5b226a7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 3 Jan 2020 19:32:52 +0100 Subject: gnu: qtwebengine: Purge unnecessary bundled software from the source. * gnu/packages/qt.scm (qtwebengine)[source](modules, snippet): New fields. [inputs]: Add CURL and VALGRIND. --- gnu/packages/qt.scm | 198 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 188 insertions(+), 10 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 1f815f74f5..7c2cb0af21 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2018 Nicolas Goaziou ;;; Copyright © 2018 Hartmut Goebel ;;; Copyright © 2018 Eric Bavier -;;; Copyright © 2019 Marius Bakke +;;; Copyright © 2019, 2020 Marius Bakke ;;; Copyright © 2018 John Soo ;;; Copyright © 2020 Mike Rosset ;;; @@ -47,6 +47,7 @@ (define-module (gnu packages qt) #:use-module (gnu packages cmake) #:use-module (gnu packages compression) #:use-module (gnu packages cups) + #:use-module (gnu packages curl) #:use-module (gnu packages databases) #:use-module (gnu packages documentation) #:use-module (gnu packages fontutils) @@ -83,6 +84,7 @@ (define-module (gnu packages qt) #:use-module (gnu packages sqlite) #:use-module (gnu packages telephony) #:use-module (gnu packages tls) + #:use-module (gnu packages valgrind) #:use-module (gnu packages video) #:use-module (gnu packages vulkan) #:use-module (gnu packages xdisorg) @@ -1513,6 +1515,7 @@ (define-public qtspeech (sha256 (base32 "12l7rycjfa6d9gnnjd6i097pf1qqzjnz9c1jgxhpldvkf0n7pbi7")))) + (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1537,15 +1540,188 @@ (define-public qtwebengine (inherit qtsvg) (name "qtwebengine") (version (package-version qtbase)) - (source (origin - (method url-fetch) - (uri (string-append "https://download.qt.io/official_releases/qt/" - (version-major+minor version) "/" version - "/submodules/" name "-everywhere-src-" - version ".tar.xz")) - (sha256 - (base32 - "08c60nh95m98mcqk444axs76xi6m9x0wvdxrzk9c2cxwqdbz59fa")))) + (source + (origin + (method url-fetch) + (uri (string-append "https://download.qt.io/official_releases/qt/" + (version-major+minor version) "/" version + "/submodules/" name "-everywhere-src-" + version ".tar.xz")) + (sha256 + (base32 "08c60nh95m98mcqk444axs76xi6m9x0wvdxrzk9c2cxwqdbz59fa")) + (modules '((ice-9 ftw) + (ice-9 match) + (srfi srfi-1) + (srfi srfi-26) + (guix build utils))) + (snippet + '(begin + (let ((preserved-third-party-files + '("base/third_party/dmg_fp" + "base/third_party/dynamic_annotations" + "base/third_party/icu" + "base/third_party/libevent" + "base/third_party/nspr" + "base/third_party/superfasthash" + "base/third_party/symbolize" + "base/third_party/xdg_mime" + "base/third_party/xdg_user_dirs" + "net/third_party/http2" + "net/third_party/mozilla_security_manager" + "net/third_party/nss" + "net/third_party/spdy" + "net/third_party/quic" + "third_party/abseil-cpp" + "third_party/angle" + "third_party/angle/src/common/third_party/base" + "third_party/angle/src/common/third_party/smhasher" + "third_party/angle/src/third_party/compiler" + "third_party/blink" + "third_party/boringssl" + "third_party/boringssl/src/third_party/fiat" + "third_party/breakpad" + "third_party/brotli" + "third_party/ced" + "third_party/crc32c" + "third_party/ffmpeg" + "third_party/googletest" + "third_party/hunspell" + "third_party/iccjpeg" + "third_party/icu" + "third_party/inspector_protocol" + "third_party/jinja2" + "third_party/jstemplate" + "third_party/khronos" + "third_party/leveldatabase" + "third_party/libaddressinput" + "third_party/libjingle_xmpp" + "third_party/libpng" + "third_party/libsrtp" + "third_party/libsync" + "third_party/libudev" + "third_party/libvpx" + "third_party/libwebm" + "third_party/libwebp" + "third_party/libxml" + "third_party/libxslt" + "third_party/libyuv" + "third_party/lss" + "third_party/markupsafe" + "third_party/mesa" + "third_party/metrics_proto" + "third_party/modp_b64" + "third_party/opus" + "third_party/ots" + "third_party/ply" + "third_party/polymer" + "third_party/protobuf" + "third_party/pyjson5" + "third_party/re2" + "third_party/rnnoise" + "third_party/skia" + "third_party/skia/third_party/gif" + "third_party/skia/third_party/skcms" + "third_party/smhasher" + "third_party/snappy" + "third_party/sqlite" + "third_party/usrsctp" + "third_party/web-animations-js" + "third_party/webrtc" + "third_party/webrtc_overrides" + "third_party/widevine/cdm/widevine_cdm_common.h" + "third_party/widevine/cdm/widevine_cdm_version.h" + "third_party/woff2" + "third_party/yasm" + "third_party/zlib" + "url/third_party/mozilla" + "v8/src/third_party/utf8-decoder" + "v8/src/third_party/valgrind" + "v8/third_party/antlr4" + "v8/third_party/inspector_protocol")) + (protected (make-regexp "\\.(gn|gyp)i?$"))) + (define preserved-club + (map (lambda (member) + (string-append "./" member)) + preserved-third-party-files)) + (define (empty? dir) + (equal? (scandir dir) '("." ".."))) + (define (third-party? file) + (string-contains file "third_party/")) + (define (useless? file) + (any (cute string-suffix? <> file) + '(".zip" ".so" ".dll" ".exe" ".jar"))) + (define (parents child) + ;; Return all parent directories of CHILD up to and including + ;; the closest "third_party". + (let* ((dirs (match (string-split child #\/) + ((dirs ... last) dirs))) + (closest (list-index (lambda (dir) + (string=? "third_party" dir)) + (reverse dirs))) + (delim (- (length dirs) closest))) + (fold (lambda (dir prev) + (cons (string-append (car prev) "/" dir) + prev)) + (list (string-join (list-head dirs delim) "/")) + (list-tail dirs delim)))) + (define (remove-loudly file) + (format #t "deleting ~a...~%" file) + (force-output) + (delete-file file)) + (define (delete-unwanted-files child stat flag base level) + (match flag + ((or 'regular 'symlink 'stale-symlink) + (when (third-party? child) + (unless (or (member child preserved-club) + (any (cute member <> preserved-club) + (parents child)) + (regexp-exec protected child)) + (remove-loudly child))) + (when (and (useless? child) (file-exists? child)) + (remove-loudly child)) + #t) + ('directory-processed + (when (empty? child) + (rmdir child)) + #t) + (_ #t))) + + (with-directory-excursion "src/3rdparty" + ;; TODO: Try removing "gn" too for future versions of qtwebengine. + (delete-file-recursively "ninja") + + (with-directory-excursion "chromium" + ;; Delete bundled software and binaries that were not explicitly + ;; preserved above. + (nftw "." delete-unwanted-files 'depth 'physical) + + ;; Assert that each preserved item is present to catch removals. + (for-each (lambda (third-party) + (unless (file-exists? third-party) + (error (format #f "~s does not exist!~%" third-party)))) + preserved-club) + + ;; Use relative header locations instead of hard coded ones. + (substitute* + "base/third_party/dynamic_annotations/dynamic_annotations.c" + (("base/third_party/valgrind") "valgrind")) + (substitute* + "third_party/breakpad/breakpad/src/common/linux/libcurl_wrapper.h" + (("third_party/curl") "curl")) + + ;; Replace Google Analytics bundle with an empty file and hope + ;; no one notices. + (mkdir-p "third_party/analytics") + (call-with-output-file + "third_party/analytics/google-analytics-bundle.js" + (lambda (port) + (const #t))))) + + ;; Do not enable support for loading the Widevine DRM plugin. + (substitute* "src/core/config/common.pri" + (("enable_widevine=true") + "enable_widevine=false")) + #t))))) (build-system gnu-build-system) (native-inputs `(("bison" ,bison) @@ -1560,6 +1736,7 @@ (define-public qtwebengine `(("alsa-lib" ,alsa-lib) ("atk" ,atk) ("cups-minimal" ,cups-minimal) + ("curl" ,curl) ("dbus" ,dbus) ("ffmpeg" ,ffmpeg) ("fontconfig" ,fontconfig) @@ -1603,6 +1780,7 @@ (define-public qtwebengine ("re2" ,re2) ("snappy" ,snappy) ("udev" ,eudev) + ("valgrind" ,valgrind) ("xcb-util" ,xcb-util))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) -- cgit v1.2.3 From f547426200d5547268d4a4a8f51c913072fa622f Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Fri, 10 Jan 2020 02:48:19 +0100 Subject: services: Add pulseaudio-configuration. * gnu/services/sound (): New record. (pulseaudio-etc): New procedure. (pulseaudio-environment): Add PULSE_CONFIG and PULSE_CLIENTCONFIG. (pulseaudio-service-type): Update accordingly. Signed-off-by: Marius Bakke --- gnu/services/sound.scm | 50 ++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 46 insertions(+), 4 deletions(-) diff --git a/gnu/services/sound.scm b/gnu/services/sound.scm index aaca733729..0ac96a02ad 100644 --- a/gnu/services/sound.scm +++ b/gnu/services/sound.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018, 2020 Oleg Pykhalov +;;; Copyright © 2020 Leo Prikler ;;; ;;; This file is part of GNU Guix. ;;; @@ -34,6 +35,7 @@ (define-module (gnu services sound) #:export (alsa-configuration alsa-service-type + pulseaudio-configuration pulseaudio-service-type)) ;;; Commentary: @@ -106,19 +108,59 @@ (define alsa-service-type ;;; PulseAudio ;;; +(define-record-type* + pulseaudio-configuration make-pulseaudio-configuration + pulseaudio-configuration? + (client-conf pulseaudio-client-conf + (default '())) + (daemon-conf pulseaudio-daemon-conf + (default '())) + (script-file pulseaudio-script-file + (default (file-append pulseaudio "/etc/pulse/default.pa"))) + (system-script-file pulseaudio-system-script-file + (default + (file-append pulseaudio "/etc/pulse/system.pa")))) + (define (pulseaudio-environment config) ;; Define this variable in the global environment such that ;; pulseaudio swh-plugins works. - `(("LADSPA_PATH" - . ,(file-append swh-plugins "/lib/ladspa")))) + `(("LADSPA_PATH" . ,(file-append swh-plugins "/lib/ladspa")) + ;; Define these variables, so that pulseaudio honors /etc. + ("PULSE_CONFIG" . "/etc/pulse/daemon.conf") + ("PULSE_CLIENTCONFIG" . "/etc/pulse/client.conf"))) + +(define (pulseaudio-conf-entry arg) + (match arg + ((key . value) + (format #f "~a = ~s~%" key value)) + ((? string? _) + (string-append arg "\n")))) + +(define pulseaudio-etc + (match-lambda + (($ client-conf daemon-conf + default-script-file system-script-file) + `(("pulse" + ,(file-union + "pulse" + `(("client.conf" + ,(apply mixed-text-file "client.conf" + (map pulseaudio-conf-entry client-conf))) + ("daemon.conf" + ,(apply mixed-text-file "daemon.conf" + "default-script-file = " default-script-file "\n" + (map pulseaudio-conf-entry daemon-conf))) + ("default.pa" ,default-script-file) + ("system.pa" ,system-script-file)))))))) (define pulseaudio-service-type (service-type (name 'pulseaudio) (extensions (list (service-extension session-environment-service-type - pulseaudio-environment))) - (default-value #f) + pulseaudio-environment) + (service-extension etc-service-type pulseaudio-etc))) + (default-value (pulseaudio-configuration)) (description "Configure PulseAudio sound support."))) ;;; sound.scm ends here -- cgit v1.2.3 From f6f918113052fe781fa7a1c4c6b666b5aa57c834 Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Fri, 10 Jan 2020 02:48:21 +0100 Subject: services: pulseaudio-configuration: Set flat-volumes to no. * gnu/services/sound (pulseaudio-configuration) [daemon-conf]: Disable flat-volumes, which causes unpleasant experiences to users when applications inadvertently max out the system volume (e.g. as in #38172). Signed-off-by: Marius Bakke --- gnu/services/sound.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/services/sound.scm b/gnu/services/sound.scm index 0ac96a02ad..4ec6120ac7 100644 --- a/gnu/services/sound.scm +++ b/gnu/services/sound.scm @@ -114,7 +114,10 @@ (define-record-type* (client-conf pulseaudio-client-conf (default '())) (daemon-conf pulseaudio-daemon-conf - (default '())) + ;; Flat volumes may cause unpleasant experiences to users + ;; when applications inadvertently max out the system volume + ;; (see e.g. ). + (default '((flat-volumes . no)))) (script-file pulseaudio-script-file (default (file-append pulseaudio "/etc/pulse/default.pa"))) (system-script-file pulseaudio-system-script-file -- cgit v1.2.3 From f1022fbf2f16b0c9ae9fa0f8af4e61e035fec4cf Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Fri, 10 Jan 2020 02:48:22 +0100 Subject: services: Split ladspa-service-type from pulseaudio-service-type. * gnu/services/sound.scm (ladspa-configuration): New record. (ladspa-environment): New procedure. (ladspa-service-type): New service type. (pulseaudio-environment): Remove LADSPA_PATH. * doc/guix.texi: Adjust documentation. Signed-off-by: Marius Bakke --- doc/guix.texi | 20 +++++++++++--------- gnu/services/sound.scm | 38 +++++++++++++++++++++++++++++++++----- 2 files changed, 44 insertions(+), 14 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 3693bb54b6..af6ffbbb7a 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -15951,19 +15951,21 @@ pcm.!default @{ See @uref{https://www.alsa-project.org/main/index.php/Asoundrc} for the details. -@deffn {Scheme Variable} pulseaudio-service-type -This is the type for the @uref{http://www.pulseaudio.org/, PulseAudio -sound server}, which sets the @var{LADSPA_PATH} environment variable to -allow PulseAudio load modules from @code{swh-plugins} package. +@deffn {Scheme Variable} ladspa-service-type +This service sets the @var{LADSPA_PATH} variable, so that programs, which +respect it, e.g. PulseAudio, can load LADSPA plugins. -See @uref{http://plugin.org.uk/ladspa-swh/docs/ladspa-swh.html} for the -details. - -The following example will setup the service: +The following example will setup the service to enable modules from the +@code{swh-plugins} package: @lisp -(service pulseaudio-service-type) +(service ladspa-service-type + (ladspa-configuration (plugins (list swh-plugins)))) @end lisp + +See @uref{http://plugin.org.uk/ladspa-swh/docs/ladspa-swh.html} for the +details. + @end deffn @node Database Services diff --git a/gnu/services/sound.scm b/gnu/services/sound.scm index 4ec6120ac7..a1c928222a 100644 --- a/gnu/services/sound.scm +++ b/gnu/services/sound.scm @@ -36,7 +36,10 @@ (define-module (gnu services sound) alsa-service-type pulseaudio-configuration - pulseaudio-service-type)) + pulseaudio-service-type + + ladspa-configuration + ladspa-service-type)) ;;; Commentary: ;;; @@ -125,10 +128,7 @@ (define-record-type* (file-append pulseaudio "/etc/pulse/system.pa")))) (define (pulseaudio-environment config) - ;; Define this variable in the global environment such that - ;; pulseaudio swh-plugins works. - `(("LADSPA_PATH" . ,(file-append swh-plugins "/lib/ladspa")) - ;; Define these variables, so that pulseaudio honors /etc. + `(;; Define these variables, so that pulseaudio honors /etc. ("PULSE_CONFIG" . "/etc/pulse/daemon.conf") ("PULSE_CLIENTCONFIG" . "/etc/pulse/client.conf"))) @@ -166,4 +166,32 @@ (define pulseaudio-service-type (default-value (pulseaudio-configuration)) (description "Configure PulseAudio sound support."))) + +;;; +;;; LADSPA +;;; + +(define-record-type* + ladspa-configuration make-ladspa-configuration + ladspa-configuration? + (plugins ladspa-plugins (default '()))) + +(define (ladspa-environment config) + ;; Define this variable in the global environment such that + ;; pulseaudio swh-plugins (and similar LADSPA plugins) work. + `(("LADSPA_PATH" . + (string-join + ',(map (lambda (package) (file-append package "/lib/ladspa")) + (ladspa-plugins config)) + ":")))) + +(define ladspa-service-type + (service-type + (name 'ladspa) + (extensions + (list (service-extension session-environment-service-type + ladspa-environment))) + (default-value (ladspa-configuration)) + (description "Configure LADSPA plugins."))) + ;;; sound.scm ends here -- cgit v1.2.3 From fc29f3bf4f0642f1634af8b6f73aee83ca6711f6 Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Fri, 10 Jan 2020 02:48:23 +0100 Subject: doc: Add pulseaudio documentation. * doc/guile.texi: Add documentation for pulseaudio-service-type and pulseaudio-configuration. Signed-off-by: Marius Bakke --- doc/guix.texi | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/doc/guix.texi b/doc/guix.texi index af6ffbbb7a..d2038d18e1 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -69,6 +69,7 @@ Copyright @copyright{} 2019 Jakob L. Kreuze@* Copyright @copyright{} 2019 Kyle Andrews@* Copyright @copyright{} 2019 Alex Griffin@* Copyright @copyright{} 2019 Guillaume Le Vaillant@* +Copyright @copyright{} 2020 Leo Prikler@* Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or @@ -15951,6 +15952,42 @@ pcm.!default @{ See @uref{https://www.alsa-project.org/main/index.php/Asoundrc} for the details. +@deffn {Scheme Variable} pulseaudio-service-type +This is the type for the @uref{http://www.pulseaudio.org/, PulseAudio} +sound server. It exists to allow system overrides of the default settings +via @code{pulseaudio-configuration}, see below. + +@quotation Warning +This service on its own does not ensure, that the @code{pulseaudio} package +exists on your machine. It merely adds configuration files for it, as +detailed below. In the (admittedly unlikely) case, that you find yourself +without a @code{pulseaudio} package, consider enabling it through the +@code{alsa-service-type} above. +@end quotation +@end deffn + +@deftp {Data Type} pulseaudio-configuration +Data type representing the configuration for @code{pulseaudio-service}. + +@table @asis +@item @var{client-conf} (default: @code{'()}) +List of settings to set in @file{client.conf}. +Accepts a list of strings or a symbol-value pairs. A string will be +inserted as-is with a newline added. A pair will be formatted as +``key = value'', again with a newline added. + +@item @var{daemon-conf} (default: @code{'((flat-volumes . no))}) +List of settings to set in @file{daemon.conf}, formatted just like +@var{client-conf}. + +@item @var{script-file} (default: @code{(file-append pulseaudio "/etc/pulse/default.pa")}) +Script file to use as as @file{default.pa}. + +@item @var{system-script-file} (default: @code{(file-append pulseaudio "/etc/pulse/system.pa")}) +Script file to use as as @file{system.pa}. +@end table +@end deftp + @deffn {Scheme Variable} ladspa-service-type This service sets the @var{LADSPA_PATH} variable, so that programs, which respect it, e.g. PulseAudio, can load LADSPA plugins. -- cgit v1.2.3 From 71e33e32fcedbd0aaafda4fd548fb8443064253c Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Fri, 10 Jan 2020 02:48:24 +0100 Subject: services: Add pulseaudio to %desktop-services. Fixes . Reported by raingloom . * gnu/services/desktop.scm (%desktop-services): Add pulseaudio service. Signed-off-by: Marius Bakke --- gnu/services/desktop.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index b40622a637..1be05fda4e 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -1183,6 +1183,7 @@ (define %desktop-services x11-socket-directory-service + (service pulseaudio-service-type) (service alsa-service-type) %base-services)) -- cgit v1.2.3 From 8273188ccaaecdb27b3e9174fd01a3ca56168e85 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Sat, 11 Jan 2020 14:01:24 +0100 Subject: gnu: Add wla-dx. * gnu/packages/assembly.scm (wla-dx): New variable. Signed-off-by: Julien Lepiller --- gnu/packages/assembly.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm index 4217b8fdad..a96b169d15 100644 --- a/gnu/packages/assembly.scm +++ b/gnu/packages/assembly.scm @@ -24,6 +24,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages assembly) + #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix download) #:use-module (guix git-download) @@ -44,6 +45,7 @@ (define-module (gnu packages assembly) #:use-module (gnu packages pkg-config) #:use-module (gnu packages texinfo) #:use-module (gnu packages python) + #:use-module (gnu packages sphinx) #:use-module (gnu packages xml) #:use-module ((guix utils) #:select (%current-system))) @@ -299,3 +301,44 @@ (define-public rgbds @item rgbgfx (PNG-to-Game Boy graphics converter) @end itemize") (license license:expat))) + +(define-public wla-dx + (package + (name "wla-dx") + (version "9.10") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/vhelin/wla-dx.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "022isf7s9q5i0j4xj69zpp0lgw8p9n37sn7ii25v68r15zaahk2w")))) + (build-system cmake-build-system) + (native-inputs + `(("sphinx" ,python-sphinx))) ; to generate man pages + (arguments + `(#:tests? #f)) ; no tests + (home-page "https://github.com/vhelin/wla-dx") + (synopsis "Assemblers for various processors") + (description "WLA DX is a set of tools to assemble assembly files to +object or library files (@code{wla-ARCH}) and link them together (@code{wlalink}). +Supported architectures are: + +@itemize @bullet +@item z80 +@item gb (z80-gb) +@item 6502 +@item 65c02 +@item 6510 +@item 65816 +@item 6800 +@item 6801 +@item 6809 +@item 8008 +@item 8080 +@item huc6280 +@item spc700 +@end itemize") + (license license:gpl2))) -- cgit v1.2.3 From 34e8f0afef7cb6dbe7891707326a625a8f02657d Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Tue, 7 Jan 2020 17:48:13 +0100 Subject: gnu: make-gcc-toolchain: Fix typo in description. * gnu/packages/commencement.scm (make-gcc-toolchain)[description]: Fix typo and triple spacing. Signed-off-by: Marius Bakke --- gnu/packages/commencement.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 14ecf246d4..729b0466ac 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2562,8 +2562,8 @@ (define* (make-gcc-toolchain gcc (synopsis "Complete GCC tool chain for C/C++ development") (description "This package provides a complete GCC tool chain for C/C++ development to -be installed in user profiles. This includes GCC, as well as libc (headers -an d binaries, plus debugging symbols in the @code{debug} output), and Binutils.") +be installed in user profiles. This includes GCC, as well as libc (headers and +binaries, plus debugging symbols in the @code{debug} output), and Binutils.") (home-page "https://gcc.gnu.org/") (outputs '("out" "debug" "static")) -- cgit v1.2.3 From 13efb24850bc40fab2448771c87c77c9a69fc231 Mon Sep 17 00:00:00 2001 From: Reza Alizadeh Majd Date: Tue, 7 Jan 2020 11:24:05 +0330 Subject: gnu: pcmanfm-qt: Fix opening files by double-click. Fixes . * gnu/packages/lxqt.scm (pcmanfm-qt)[arguments]: Add phase to wrap the executable with the GIO_LAUNCH_DESKTOP environment variable. [inputs]: Add GLIB:BIN. Signed-off-by: Marius Bakke --- gnu/packages/lxqt.scm | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 5a3708e30a..b23d2e17dc 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2019 Meiyo Peng ;;; Copyright © 2018 Ricardo Wurmus -;;; Copyright © 2019 Reza Alizadeh Majd +;;; Copyright © 2019, 2020 Reza Alizadeh Majd ;;; ;;; This file is part of GNU Guix. ;;; @@ -984,7 +984,8 @@ (define-public pcmanfm-qt (base32 "0x3c25inlxll965xszx37mnl5gp3smm2h7x04f67z0qlh3vsbrjq")))) (build-system cmake-build-system) (inputs - `(("libfm-qt" ,libfm-qt) + `(("glib:bin" ,glib "bin") + ("libfm-qt" ,libfm-qt) ("qtbase" ,qtbase) ("qtx11extras" ,qtx11extras))) (native-inputs @@ -1000,7 +1001,17 @@ (define-public pcmanfm-qt (substitute* '("autostart/CMakeLists.txt") (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}") "DESTINATION \"etc/xdg")) - #t))))) + #t)) + (add-after 'install 'wrap-glib + (lambda* (#:key outputs inputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (glib (assoc-ref inputs "glib:bin")) + (gio-exe-path (string-append glib "/bin/gio-launch-desktop"))) + (if (file-exists? gio-exe-path) + (wrap-program (string-append out "/bin/pcmanfm-qt") + `("GIO_LAUNCH_DESKTOP" = (,gio-exe-path))) + (error "could not find gio-launch-desktop")) + #t)))))) (home-page "https://lxqt.org/") (synopsis "File manager and desktop icon manager") (description "PCManFM-Qt is the Qt port of PCManFM, the file manager of -- cgit v1.2.3