From a436a4919b9b04b36e5bbed6ff814d01596670d2 Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Wed, 13 Mar 2019 23:37:12 +0800 Subject: [PATCH 001/694] gnu: menu-cache: Update to 1.1.0. * gnu/packages/lxde.scm (menu-cache): Update to 1.1.0. Signed-off-by: Danny Milosavljevic --- gnu/packages/lxde.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index a5720ce979..b4ad9b9a8b 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2018 Ison111 ;;; Copyright © 2018, 2019 Ludovic Courtès ;;; Copyright © 2018 Ricardo Wurmus +;;; Copyright © 2019 Meiyo Peng ;;; ;;; This file is part of GNU Guix. ;;; @@ -190,7 +191,7 @@ (define-public lxterminal (define-public menu-cache (package (name "menu-cache") - (version "1.0.2") + (version "1.1.0") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/lxde/" name "/" @@ -198,7 +199,7 @@ (define-public menu-cache name "-" version ".tar.xz")) (sha256 (base32 - "1m8j40npykfcfqs43kc0fmksal2jfmfi8lnb3mq3xy1lvvrfv0vg")))) + "1iry4zlpppww8qai2cw4zid4081hh7fz8nzsp5lqyffbkm2yn0pd")))) (build-system gnu-build-system) (inputs `(("glib" ,glib) ("libfm" ,libfm-extra))) From d1d8235e453023e73ac0263c1e89d5e14249f0a0 Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Wed, 13 Mar 2019 23:37:13 +0800 Subject: [PATCH 002/694] gnu: libfm: Update to 1.3.1. * gnu/packages/lxde.scm (libfm): Update to 1.3.1. Signed-off-by: Danny Milosavljevic --- gnu/packages/lxde.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index b4ad9b9a8b..ea099b0f3b 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -56,7 +56,7 @@ (define-module (gnu packages lxde) (define-public libfm (package (name "libfm") - (version "1.3.0.2") + (version "1.3.1") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/pcmanfm/" @@ -64,7 +64,7 @@ (define-public libfm "%29/LibFM/" name "-" version ".tar.xz")) (sha256 (base32 - "0wkwbi1nyvqza3r1dhrq846axiiq0fy0dqgngnagh76fjrwnzl0q")))) + "1r6gl49xrykldwz8y4h2s7gjarxigg3bbkrj0gphxjj1vr5j9ccn")))) (build-system gnu-build-system) (inputs `(("glib" ,glib) ("gtk+" ,gtk+-2))) From 5b7a354d72a2ffe8162e4768530b86632eb32fe9 Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Wed, 13 Mar 2019 23:37:14 +0800 Subject: [PATCH 003/694] gnu: lxqt-build-tools: Update to 0.6.0. * gnu/packages/lxqt.scm (lxqt-build-tools): Update to 0.6.0. Signed-off-by: Danny Milosavljevic --- gnu/packages/lxqt.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 9813005a34..6926d071d7 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2017 Nils Gillmann ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice -;;; Copyright © 2018 Meiyo Peng +;;; Copyright © 2018, 2019 Meiyo Peng ;;; Copyright © 2018 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. @@ -124,7 +124,7 @@ (define-public libstatgrab (define-public lxqt-build-tools (package (name "lxqt-build-tools") - (version "0.5.0") + (version "0.6.0") (source (origin (method url-fetch) @@ -132,7 +132,7 @@ (define-public lxqt-build-tools "/download/" version "/lxqt-build-tools-" version ".tar.xz")) (sha256 - (base32 "13b5x26p6ycnwzlgg1cgvlc88wjrjmlb3snrrmzh0xgh9h6hhvd6")))) + (base32 "0n0p0mf12n9f7zm2592779rpqrbcamfdz87nnjb8j058bc8g3214")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; no tests From c1105c4bcf60dcc297d47268c96ad5f52971ac25 Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Wed, 13 Mar 2019 23:37:15 +0800 Subject: [PATCH 004/694] gnu: libqtxdg: Update to 3.3.1. * gnu/packages/lxqt.scm (libqtxdg): Update to 3.3.1. [native-inputs]: Add lxqt-build-tools. Signed-off-by: Danny Milosavljevic --- gnu/packages/lxqt.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 6926d071d7..ebb1ff3096 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -157,7 +157,7 @@ (define-public lxqt-build-tools (define-public libqtxdg (package (name "libqtxdg") - (version "3.2.0") + (version "3.3.1") (source (origin (method url-fetch) @@ -165,7 +165,7 @@ (define-public libqtxdg "https://github.com/lxqt/libqtxdg/releases/download/" version "/libqtxdg-" version ".tar.xz")) (sha256 - (base32 "0lq548pa69hfvnbj2ypba5ygm8n6v6g7bqqm8p5g538l1l3394cl")))) + (base32 "1mnnq8vbf5xjlrzajzfkay0yzzxri0zz0xi8x8rmxpw38xmglq8h")))) (build-system cmake-build-system) (arguments '(#:configure-flags @@ -182,6 +182,8 @@ (define-public libqtxdg ;; required by Qt5XdgIconLoader.pc `(("qtbase" ,qtbase) ("qtsvg" ,qtsvg))) + (native-inputs + `(("lxqt-build-tools" ,lxqt-build-tools))) (home-page "https://github.com/lxqt/libqtxdg") (synopsis "Qt implementation of freedesktop.org xdg specifications") (description "Libqtxdg implements the freedesktop.org xdg specifications From 9f87e52fbb806f9ee7fd13dccb54ffe27bdf53aa Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Wed, 13 Mar 2019 23:37:16 +0800 Subject: [PATCH 005/694] gnu: liblxqt: Update to 0.14.1. * gnu/packages/lxqt.scm (liblxqt): Update to 0.14.1. [arguments]: Remove #:configure-flags. Add 'patch-translations-dir' phase. Signed-off-by: Danny Milosavljevic --- gnu/packages/lxqt.scm | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index ebb1ff3096..2ac72972a2 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -193,7 +193,7 @@ (define-public libqtxdg (define-public liblxqt (package (name "liblxqt") - (version "0.13.0") + (version "0.14.1") (source (origin (method url-fetch) @@ -201,13 +201,10 @@ (define-public liblxqt "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "0fba0nq5b9fvvmklcikcd4nwhzlp5d6k1q1f80r34kncdzfvj7dl")))) + (base32 "1gb922npf6nw4w3nkvh4czk8xmdzzqkzq3zgl1h303fjaib359qs")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; no tests - #:configure-flags - ;; TODO: prefetch translations files from 'lxqt-l10n'. - '("-DPULL_TRANSLATIONS=NO") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-source @@ -215,6 +212,13 @@ (define-public liblxqt (substitute* "CMakeLists.txt" (("DESTINATION \"\\$\\{POLKITQT-1_POLICY_FILES_INSTALL_DIR\\}") "DESTINATION \"share/polkit-1/actions")) + #t)) + (add-after 'unpack 'patch-translations-dir + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "CMakeLists.txt" + (("\\$\\{LXQT_TRANSLATIONS_DIR\\}") + (string-append (assoc-ref outputs "out") + "/share/lxqt/translations"))) #t))))) (inputs `(("kwindowsystem" ,kwindowsystem) From 4c3553ab4139dbdbb3998319e8a1f20bbfbe6413 Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Wed, 13 Mar 2019 23:37:17 +0800 Subject: [PATCH 006/694] gnu: libsysstat: Update to 0.4.2. * gnu/packages/lxqt.scm (libsysstat): Update to 0.4.2. Signed-off-by: Danny Milosavljevic --- gnu/packages/lxqt.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 2ac72972a2..2dcaa5dd8d 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -239,14 +239,14 @@ (define-public liblxqt (define-public libsysstat (package (name "libsysstat") - (version "0.4.1") + (version "0.4.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "0ngz8v3bixsdg96d5ipcyxd6nsrg52974xdxy9rnimahlv1yaxn3")))) + (base32 "0rz9w49khra9kl91kfnd3wxkldy1fqf6755mvlgbsqxb1yv8597w")))) (build-system cmake-build-system) (arguments '(#:tests? #f)) ; no tests (inputs From f42b4080c3fca7b0fe9cfc397280bb9b3b1676d7 Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Wed, 13 Mar 2019 23:37:18 +0800 Subject: [PATCH 007/694] gnu: lxqt-about: Update to 0.14.1. * gnu/packages/lxqt.scm (lxqt-about): Update to 0.14.1. [arguments]: Remove #:configure-flags. <#:phases>[patch-translations-dir]: New phase. Signed-off-by: Danny Milosavljevic --- gnu/packages/lxqt.scm | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 2dcaa5dd8d..f09b162412 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -265,14 +265,14 @@ (define-public libsysstat (define-public lxqt-about (package (name "lxqt-about") - (version "0.13.0") + (version "0.14.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "08imj7p77ifzfxnn8c482mhrvfx9gi0rb43ab5rw1rkmfvax2n5w")))) + (base32 "01xp5ddcxc9wvl7jm4179hjrirj07mpzm9z50936d1fqx34wfbis")))) (build-system cmake-build-system) (inputs `(("kwindowsystem" ,kwindowsystem) @@ -286,9 +286,15 @@ (define-public lxqt-about ("qttools" ,qttools))) (arguments '(#:tests? #f ; no tests - #:configure-flags - ;; TODO: prefetch translations files from 'lxqt-l10n'. - '("-DPULL_TRANSLATIONS=NO"))) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-translations-dir + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "CMakeLists.txt" + (("\\$\\{LXQT_TRANSLATIONS_DIR\\}") + (string-append (assoc-ref outputs "out") + "/share/lxqt/translations"))) + #t))))) (home-page "https://lxqt.org") (synopsis "Provides information about LXQt and the system") (description "lxqt-about is a dialogue window providing information about From 6a75a1a56114ca8f01b65648176441e470143eff Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Wed, 13 Mar 2019 23:37:19 +0800 Subject: [PATCH 008/694] gnu: lxqt-admin: Update to 0.14.1. * gnu/packages/lxqt.scm (lxqt-admin): Update to 0.14.1. [arguments]: Remove #:configure-flags <#:phases>[patch-translations-dir]: New phase. Signed-off-by: Danny Milosavljevic --- gnu/packages/lxqt.scm | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index f09b162412..0daa12ba06 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -304,14 +304,14 @@ (define-public lxqt-about (define-public lxqt-admin (package (name "lxqt-admin") - (version "0.13.0") + (version "0.14.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "0qvpv668ja83ydbdrlal1596xhag3xlkbd6qlh9xwdpb7nysvns1")))) + (base32 "0f0skkxqyhpidpd5phliax869v4n2whvglg8rahzia2zhw4ylzry")))) (build-system cmake-build-system) (inputs `(("kwindowsystem" ,kwindowsystem) @@ -325,9 +325,6 @@ (define-public lxqt-admin ("qttools" ,qttools))) (arguments '(#:tests? #f ; no tests - #:configure-flags - ;; TODO: prefetch translations files from 'lxqt-l10n'. - '("-DPULL_TRANSLATIONS=NO") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-source @@ -335,6 +332,14 @@ (define-public lxqt-admin (substitute* "lxqt-admin-user/CMakeLists.txt" (("DESTINATION \"\\$\\{POLKITQT-1_POLICY_FILES_INSTALL_DIR\\}") "DESTINATION \"share/polkit-1/actions")) + #t)) + (add-after 'unpack 'patch-translations-dir + (lambda* (#:key outputs #:allow-other-keys) + (substitute* '("lxqt-admin-time/CMakeLists.txt" + "lxqt-admin-user/CMakeLists.txt") + (("\\$\\{LXQT_TRANSLATIONS_DIR\\}") + (string-append (assoc-ref outputs "out") + "/share/lxqt/translations"))) #t))))) (home-page "https://lxqt.org") (synopsis "LXQt system administration tool") From 2493df44042d2d0a3a71d69aefa746bcab679e4b Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Wed, 13 Mar 2019 23:37:20 +0800 Subject: [PATCH 009/694] gnu: lxqt-config: Update to 0.14.1. * gnu/packages/lxqt.scm (lxqt-config): Update to 0.14.1. [inputs]: Add eudev, libxi, xf86-input-libinput. [arguments]: Remove #:configure-flags. <#:phases>[patch-translations-dir]: New phase. Signed-off-by: Danny Milosavljevic --- gnu/packages/lxqt.scm | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 0daa12ba06..2d042be9fe 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -350,25 +350,28 @@ (define-public lxqt-admin (define-public lxqt-config (package (name "lxqt-config") - (version "0.13.0") + (version "0.14.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "0rizhl2v41kpgp57a61r6nmwcdw8nh9hprrrf33nfrdw8hpwxb95")))) + (base32 "16k36knv6d72gg8hp7423l3ic43y3l3zbaf3spqn2a354y30myrg")))) (build-system cmake-build-system) (inputs - `(("kwindowsystem" ,kwindowsystem) + `(("eudev" ,eudev) + ("kwindowsystem" ,kwindowsystem) ("libkscreen" ,libkscreen) ("liblxqt" ,liblxqt) ("libqtxdg" ,libqtxdg) ("libxcursor" ,libxcursor) + ("libxi" ,libxi) ("qtbase" ,qtbase) ("qtsvg" ,qtsvg) ("qtx11extras" ,qtx11extras) ("solid" ,solid) + ("xf86-input-libinput" ,xf86-input-libinput) ("zlib" ,zlib))) (native-inputs `(("pkg-config" ,pkg-config) @@ -376,9 +379,6 @@ (define-public lxqt-config ("qttools" ,qttools))) (arguments '(#:tests? #f ; no tests - #:configure-flags - ;; TODO: prefetch translations files from 'lxqt-l10n'. - '("-DPULL_TRANSLATIONS=NO") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-source @@ -386,6 +386,20 @@ (define-public lxqt-config (substitute* '("src/CMakeLists.txt") (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}") "DESTINATION \"etc/xdg")) + #t)) + (add-after 'unpack 'patch-translations-dir + (lambda* (#:key outputs #:allow-other-keys) + (substitute* '("lxqt-config-file-associations/CMakeLists.txt" + "lxqt-config-brightness/CMakeLists.txt" + "lxqt-config-appearance/CMakeLists.txt" + "lxqt-config-locale/CMakeLists.txt" + "lxqt-config-monitor/CMakeLists.txt" + "lxqt-config-input/CMakeLists.txt" + "liblxqt-config-cursor/CMakeLists.txt" + "src/CMakeLists.txt") + (("\\$\\{LXQT_TRANSLATIONS_DIR\\}") + (string-append (assoc-ref outputs "out") + "/share/lxqt/translations"))) #t))))) (home-page "https://lxqt.org") (synopsis "Tools to configure LXQt and the underlying operating system") From 39387425fd872d7e58014315ceb9d25b0f612df5 Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Wed, 13 Mar 2019 23:37:21 +0800 Subject: [PATCH 010/694] gnu: lxqt-globalkeys: Update to 0.14.1. * gnu/packages/lxqt.scm (lxqt-globalkeys): Update to 0.14.1. [arguments]: Remove #:configure-flags. <#:phases>[patch-translations-dir]: New phase. Signed-off-by: Danny Milosavljevic --- gnu/packages/lxqt.scm | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 2d042be9fe..06c0907872 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -410,14 +410,14 @@ (define-public lxqt-config (define-public lxqt-globalkeys (package (name "lxqt-globalkeys") - (version "0.13.0") + (version "0.14.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "1gyvcjbhi7zpvgz1sf773dv9gc35hx5fz023njp9r4vl0dpcavgd")))) + (base32 "0m6svwy20bfy9d21g5l0qzjndph3rd8zqagmqgdjzjhh3lxwrsrk")))) (build-system cmake-build-system) (inputs `(("kwindowsystem" ,kwindowsystem) @@ -432,9 +432,6 @@ (define-public lxqt-globalkeys ("lxqt-build-tools" ,lxqt-build-tools))) (arguments '(#:tests? #f ; no tests - #:configure-flags - ;; TODO: prefetch translations files from 'lxqt-l10n'. - '("-DPULL_TRANSLATIONS=NO") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-source @@ -443,6 +440,13 @@ (define-public lxqt-globalkeys "xdg/CMakeLists.txt") (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}") "DESTINATION \"etc/xdg")) + #t)) + (add-after 'unpack 'patch-translations-dir + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "config/CMakeLists.txt" + (("\\$\\{LXQT_TRANSLATIONS_DIR\\}") + (string-append (assoc-ref outputs "out") + "/share/lxqt/translations"))) #t))))) (home-page "https://lxqt.org/") (synopsis "Daemon used to register global keyboard shortcuts") From 4625cc66bf4cbd13b7a933ef8e6ae6d2db66fe01 Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Wed, 13 Mar 2019 23:37:22 +0800 Subject: [PATCH 011/694] gnu: lxqt-notificationd: Update to 0.14.1. * gnu/packages/lxqt.scm (lxqt-notificationd): Update to 0.14.1. [arguments]: Remove #:configure-flags. <#:phases>[patch-translations-dir]: New phase. Signed-off-by: Danny Milosavljevic --- gnu/packages/lxqt.scm | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 06c0907872..31686aa2da 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -458,14 +458,14 @@ (define-public lxqt-globalkeys (define-public lxqt-notificationd (package (name "lxqt-notificationd") - (version "0.13.0") + (version "0.14.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "1l0hdbvghyhqgvy4pih7rvz26bc6yc8a3l1bdj11hnkw62h1i7d6")))) + (base32 "1kiag3fcx12qmslln6x6lwvm4f1spymwf71389kdya3vwx7hkmcy")))) (build-system cmake-build-system) (inputs `(("kwindowsystem" ,kwindowsystem) @@ -479,9 +479,6 @@ (define-public lxqt-notificationd ("qttools" ,qttools))) (arguments '(#:tests? #f ; no test target - #:configure-flags - ;; TODO: prefetch translations files from 'lxqt-l10n'. - '("-DPULL_TRANSLATIONS=NO") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-source @@ -489,6 +486,14 @@ (define-public lxqt-notificationd (substitute* '("autostart/CMakeLists.txt") (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}") "DESTINATION \"etc/xdg")) + #t)) + (add-after 'unpack 'patch-translations-dir + (lambda* (#:key outputs #:allow-other-keys) + (substitute* '("config/CMakeLists.txt" + "src/CMakeLists.txt") + (("\\$\\{LXQT_TRANSLATIONS_DIR\\}") + (string-append (assoc-ref outputs "out") + "/share/lxqt/translations"))) #t))))) (home-page "https://lxqt.org/") (synopsis "The LXQt notification daemon") From a728afb63b93a690f415c73235acbf85698b13b7 Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Wed, 13 Mar 2019 23:37:23 +0800 Subject: [PATCH 012/694] gnu: lxqt-openssh-askpass: Update to 0.14.1. * gnu/packages/lxqt.scm (lxqt-openssh-askpass): Update to 0.14.1. [arguments]: Remove #:configure-flags. <#:phases>[patch-translations-dir]: New phase. Signed-off-by: Danny Milosavljevic --- gnu/packages/lxqt.scm | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 31686aa2da..43eaf23634 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -504,14 +504,14 @@ (define-public lxqt-notificationd (define-public lxqt-openssh-askpass (package (name "lxqt-openssh-askpass") - (version "0.13.0") + (version "0.14.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "0l2272gya8jgv71bvg2hz37lnhiznv4ng3j0p6j79f99hwb5ygpk")))) + (base32 "1fvbgjidpifn420avh8n1gym49vcz6zgayz7xygg1x93s4awy1cs")))) (build-system cmake-build-system) (inputs `(("kwindowsystem" ,kwindowsystem) @@ -525,9 +525,15 @@ (define-public lxqt-openssh-askpass ("qttools" ,qttools))) (arguments '(#:tests? #f ; no tests - #:configure-flags - ;; TODO: prefetch translations files from 'lxqt-l10n'. - '("-DPULL_TRANSLATIONS=NO"))) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-translations-dir + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "CMakeLists.txt" + (("\\$\\{LXQT_TRANSLATIONS_DIR\\}") + (string-append (assoc-ref outputs "out") + "/share/lxqt/translations"))) + #t))))) (home-page "https://lxqt.org/") (synopsis "GUI to query passwords on behalf of SSH agents") (description "lxqt-openssh-askpass is a GUI to query credentials on behalf From c4a17525b9faf8993134c89966e3365c21e9fc50 Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Wed, 13 Mar 2019 23:37:24 +0800 Subject: [PATCH 013/694] gnu: lxqt-panel: Update to 0.14.1. * gnu/packages/lxqt.scm (lxqt-panel): Update to 0.14.1. [arguments]: Remove #:configure-flags. <#:phases>[patch-translations-dir]: New phase. Signed-off-by: Danny Milosavljevic --- gnu/packages/lxqt.scm | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 43eaf23634..3802a6f212 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -543,14 +543,14 @@ (define-public lxqt-openssh-askpass (define-public lxqt-panel (package (name "lxqt-panel") - (version "0.13.0") + (version "0.14.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "1qraigzq7nc5a2q6f5ybxwx07gxffa3m3bg7fiv6ppwss51xqfd1")))) + (base32 "1r3wx0v3jm7j41h7gxr49izc9xa1afvrzq4wcdm0qbj98qa1rgpq")))) (build-system cmake-build-system) (inputs `(("alsa-lib" ,alsa-lib) @@ -580,9 +580,6 @@ (define-public lxqt-panel ("qttools" ,qttools))) (arguments '(#:tests? #f ; no tests - #:configure-flags - ;; TODO: prefetch translations files from 'lxqt-l10n'. - '("-DPULL_TRANSLATIONS=NO") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-source @@ -591,6 +588,14 @@ (define-public lxqt-panel "menu/CMakeLists.txt") (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}") "DESTINATION \"etc/xdg")) + #t)) + (add-after 'unpack 'patch-translations-dir + (lambda* (#:key outputs #:allow-other-keys) + (substitute* '("cmake/BuildPlugin.cmake" + "panel/CMakeLists.txt") + (("\\$\\{LXQT_TRANSLATIONS_DIR\\}") + (string-append (assoc-ref outputs "out") + "/share/lxqt/translations"))) #t))))) (home-page "https://lxqt.org/") (synopsis "The LXQt desktop panel") From 45ef5374a70ec5458207623efd93400c66d2271c Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Wed, 13 Mar 2019 23:37:25 +0800 Subject: [PATCH 014/694] gnu: lxqt-policykit: Update to 0.14.1. * gnu/packages/lxqt.scm (lxqt-policykit): Update to 0.14.1. [arguments]: Remove #:configure-flags. <#:phases>[patch-translations-dir]: New phase. Signed-off-by: Danny Milosavljevic --- gnu/packages/lxqt.scm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 3802a6f212..b606cfe556 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -605,14 +605,14 @@ (define-public lxqt-panel (define-public lxqt-policykit (package (name "lxqt-policykit") - (version "0.13.0") + (version "0.14.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "1d97fys6625nk4q6irp0jhsbk30xi7idnii1f3vrrrdcl2cahagp")))) + (base32 "127rqb0nprybkc41lk0yq0r0dk5pbbw22gvrm4pwag71qh8wpk5i")))) (build-system cmake-build-system) (inputs `(("kwindowsystem" ,kwindowsystem) @@ -630,8 +630,6 @@ (define-public lxqt-policykit ("qttools" ,qttools))) (arguments '(#:tests? #f ; no test target - #:configure-flags - '("-DPULL_TRANSLATIONS=NO") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-source @@ -639,6 +637,13 @@ (define-public lxqt-policykit (substitute* '("autostart/CMakeLists.txt") (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}") "DESTINATION \"etc/xdg")) + #t)) + (add-after 'unpack 'patch-translations-dir + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "CMakeLists.txt" + (("\\$\\{LXQT_TRANSLATIONS_DIR\\}") + (string-append (assoc-ref outputs "out") + "/share/lxqt/translations"))) #t))))) (home-page "https://lxqt.org/") (synopsis "The LXQt PolicyKit agent") From 84dea9bb71bc42203d9a29214a4607cf72be2c31 Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Wed, 13 Mar 2019 23:37:26 +0800 Subject: [PATCH 015/694] gnu: lxqt-powermanagement: Update to 0.14.1. * gnu/packages/lxqt.scm (lxqt-powermanagement): Update to 0.14.1. [arguments]: Remove #:configure-flags. <#:phases>[patch-translations-dir]: New phase. Signed-off-by: Danny Milosavljevic --- gnu/packages/lxqt.scm | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index b606cfe556..667be24fc9 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -654,14 +654,14 @@ (define-public lxqt-policykit (define-public lxqt-powermanagement (package (name "lxqt-powermanagement") - (version "0.13.0") + (version "0.14.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "15nvdypyjwnp7k3d2pkhdbmaqb3ccacmh95rbdbc5mr7yrjy9613")))) + (base32 "06bvgbkbl9p9n8ba5cfsynqgmpb5c8yfnsvp7zqhflj8k9p9msip")))) (build-system cmake-build-system) (inputs `(("kidletime" ,kidletime) @@ -677,9 +677,6 @@ (define-public lxqt-powermanagement ("qttools" ,qttools))) (arguments '(#:tests? #f ; no tests - #:configure-flags - ;; TODO: prefetch translations files from 'lxqt-l10n'. - '("-DPULL_TRANSLATIONS=NO") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-source @@ -687,6 +684,14 @@ (define-public lxqt-powermanagement (substitute* '("autostart/CMakeLists.txt") (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}") "DESTINATION \"etc/xdg")) + #t)) + (add-after 'unpack 'patch-translations-dir + (lambda* (#:key outputs #:allow-other-keys) + (substitute* '("config/CMakeLists.txt" + "src/CMakeLists.txt") + (("\\$\\{LXQT_TRANSLATIONS_DIR\\}") + (string-append (assoc-ref outputs "out") + "/share/lxqt/translations"))) #t))))) (home-page "https://lxqt.org/") (synopsis "Power management module for LXQt") From 63c80bd7a94137c803510a7868a687c3f689917e Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Wed, 13 Mar 2019 23:37:27 +0800 Subject: [PATCH 016/694] gnu: lxqt-qtplugin: Update to 0.14.0. * gnu/packages/lxqt.scm (lxqt-qtplugin): Update to 0.14.0. Signed-off-by: Danny Milosavljevic --- gnu/packages/lxqt.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 667be24fc9..bc5cd72c0c 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -703,14 +703,14 @@ (define-public lxqt-powermanagement (define-public lxqt-qtplugin (package (name "lxqt-qtplugin") - (version "0.13.0") + (version "0.14.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "0nnwbc99njpsyqb0cy3x0srcgwa7qrnq0qwcyx7fbvwsq1l8cz56")))) + (base32 "18y7xfxwyismcycg70q6r8zrcygz1pdcvg6lqc6ba7azqb9806ds")))) (build-system cmake-build-system) (inputs `(("libdbusmenu-qt" ,libdbusmenu-qt) From 1b8daca27b60d5d311cc72d16519662046f679e7 Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Wed, 13 Mar 2019 23:37:28 +0800 Subject: [PATCH 017/694] gnu: lxqt-runner: Update to 0.14.1. * gnu/packages/lxqt.scm (lxqt-runner): Update to 0.14.1. [arguments]: Remove #:configure-flags. <#:phases>[patch-translations-dir]: New phase. Signed-off-by: Danny Milosavljevic --- gnu/packages/lxqt.scm | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index bc5cd72c0c..606bddaf7e 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -741,14 +741,14 @@ (define-public lxqt-qtplugin (define-public lxqt-runner (package (name "lxqt-runner") - (version "0.13.0") + (version "0.14.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "0dsg6fdcqbl7gza0sg1pb49zn5x31q7zx77jp7mkf6wc2lv8lali")))) + (base32 "1c687shypivkhjrpzs1jcy5l2i8d7xzm31c4is1xx6x9nbkgm4bm")))) (build-system cmake-build-system) (inputs `(("kwindowsystem" ,kwindowsystem) @@ -766,9 +766,6 @@ (define-public lxqt-runner ("lxqt-build-tools" ,lxqt-build-tools))) (arguments '(#:tests? #f ; no tests - #:configure-flags - ;; TODO: prefetch translations files from 'lxqt-l10n'. - '("-DPULL_TRANSLATIONS=NO") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-source @@ -776,6 +773,13 @@ (define-public lxqt-runner (substitute* '("autostart/CMakeLists.txt") (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}") "DESTINATION \"etc/xdg")) + #t)) + (add-after 'unpack 'patch-translations-dir + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "CMakeLists.txt" + (("\\$\\{LXQT_TRANSLATIONS_DIR\\}") + (string-append (assoc-ref outputs "out") + "/share/lxqt/translations"))) #t))))) (home-page "https://lxqt.org/") (synopsis "Tool used to launch programs quickly by typing their names") From 536afd9bf27a3b45096cb7c442d4e9bfcf23e8b3 Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Wed, 13 Mar 2019 23:37:29 +0800 Subject: [PATCH 018/694] gnu: lxqt-session: Update to 0.14.1. * gnu/packages/lxqt.scm (lxqt-session): Update to 0.14.1. [arguments]: Remove #:configure-flags. <#:phases>[patch-translations-dir]: New phase. Signed-off-by: Danny Milosavljevic --- gnu/packages/lxqt.scm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 606bddaf7e..005096716b 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -790,14 +790,14 @@ (define-public lxqt-runner (define-public lxqt-session (package (name "lxqt-session") - (version "0.13.0") + (version "0.14.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "1aibppppmg46ybbajx2qc395l0yp9rqlp2am01fqjxadsf8vci5z")))) + (base32 "11i2vimv3336dvvxb6y5csdybwjncr7cq3kwlj52vkpisnxslvgy")))) (build-system cmake-build-system) (inputs `(("eudev" ,eudev) @@ -814,8 +814,6 @@ (define-public lxqt-session ("qttools" ,qttools))) (arguments `(#:tests? #f - #:configure-flags - `("-DPULL_TRANSLATIONS=NO") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-source @@ -824,6 +822,15 @@ (define-public lxqt-session "config/CMakeLists.txt") (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}") "DESTINATION \"etc/xdg")) + #t)) + (add-after 'unpack 'patch-translations-dir + (lambda* (#:key outputs #:allow-other-keys) + (substitute* '("lxqt-config-session/CMakeLists.txt" + "lxqt-leave/CMakeLists.txt" + "lxqt-session/CMakeLists.txt") + (("\\$\\{LXQT_TRANSLATIONS_DIR\\}") + (string-append (assoc-ref outputs "out") + "/share/lxqt/translations"))) #t))))) (home-page "https://lxqt.org/") (synopsis "Session manager for LXQt") From 3b7348c4dc17df8198956225082162cc49b72899 Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Wed, 13 Mar 2019 23:37:30 +0800 Subject: [PATCH 019/694] gnu: lxqt-sudo: Update to 0.14.1. * gnu/packages/lxqt.scm (lxqt-sudo): Update to 0.14.1. [arguments]: Remove #:configure-flags. <#:phases>[patch-translations-dir]: New phase. Signed-off-by: Danny Milosavljevic --- gnu/packages/lxqt.scm | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 005096716b..f8814f4b7b 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -841,14 +841,14 @@ (define-public lxqt-session (define-public lxqt-sudo (package (name "lxqt-sudo") - (version "0.13.0") + (version "0.14.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "1j28wlw4rkzvr85yl78fqkvz7sv7dykm9ghm63xdkskfjbsas1cf")))) + (base32 "0mbygp2kkppwk7sxvpnwavdwrx88mh7ldcg6xm3zw1ndp29danay")))) (build-system cmake-build-system) (inputs `(("kwindowsystem" ,kwindowsystem) @@ -864,9 +864,15 @@ (define-public lxqt-sudo ("lxqt-build-tools" ,lxqt-build-tools))) (arguments '(#:tests? #f ; no tests - #:configure-flags - ;; TODO: prefetch translations files from 'lxqt-l10n'. - '("-DPULL_TRANSLATIONS=NO"))) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-translations-dir + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "CMakeLists.txt" + (("\\$\\{LXQT_TRANSLATIONS_DIR\\}") + (string-append (assoc-ref outputs "out") + "/share/lxqt/translations"))) + #t))))) (home-page "https://lxqt.org/") (synopsis "GUI frontend for sudo/su") (description "lxqt-sudo is a graphical front-end of commands sudo and su From 3cc904ab7c380e95f46c0433712d94eed64ec317 Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Wed, 13 Mar 2019 23:37:31 +0800 Subject: [PATCH 020/694] gnu: lxqt-themes: Update to 0.14.0. * gnu/packages/lxqt.scm (lxqt-themes): Update to 0.14.0. Signed-off-by: Danny Milosavljevic --- gnu/packages/lxqt.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index f8814f4b7b..8e0187017d 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -883,14 +883,14 @@ (define-public lxqt-sudo (define-public lxqt-themes (package (name "lxqt-themes") - (version "0.13.0") + (version "0.14.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "13kkkzjx8bgnwckz79j273azvm4za66i4cp2qhxwdpxh0fwziklf")))) + (base32 "0p7svdpp0z44hvgrp2aip6hym0gdhbanyxsz6iz8sjnn28c995ia")))) (build-system cmake-build-system) (native-inputs `(("lxqt-build-tools" ,lxqt-build-tools))) From b3f562921ea4fd116f82cd35f71a6609dd6b1e44 Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Wed, 13 Mar 2019 23:37:32 +0800 Subject: [PATCH 021/694] gnu: libfm-qt: Update to 0.14.1. * gnu/packages/lxqt.scm (libfm-qt): Update to 0.14.1. [arguments]: Remove #:configure-flags. Signed-off-by: Danny Milosavljevic --- gnu/packages/lxqt.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 8e0187017d..43cd43773b 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -921,20 +921,17 @@ (define-public lxqt-themes (define-public libfm-qt (package (name "libfm-qt") - (version "0.13.1") + (version "0.14.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "0p0lbz7dh5c38zq3yp1v1mm99ymg7mqr3h7yzniif2hipmgvxsv9")))) + (base32 "06p3wqpc574v9f94wkq9hqmbbvb9q8phfpq301z55c5r939f4hrp")))) (build-system cmake-build-system) (arguments - '(#:tests? #f ; no tests - #:configure-flags - ;; TODO : prefetch translations files from 'lxqt-l10n'. - '("-DPULL_TRANSLATIONS=NO"))) + '(#:tests? #f)) ; no tests (inputs `(("glib" ,glib) ("libexif" ,libexif) From cd7248bb4269258b93c3c4f465336e389faf949a Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Wed, 13 Mar 2019 23:37:33 +0800 Subject: [PATCH 022/694] gnu: pcmanfm-qt: Update to 0.14.1. * gnu/packages/lxqt.scm (pcmanfm-qt): Update to 0.14.1. [arguments]: Remove #:configure-flags. Signed-off-by: Danny Milosavljevic --- gnu/packages/lxqt.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 43cd43773b..d21fe67e3e 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -954,14 +954,14 @@ (define-public libfm-qt (define-public pcmanfm-qt (package (name "pcmanfm-qt") - (version "0.13.0") + (version "0.14.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "08jprkkk62pk34q9lxa207bh27xi86fj8jxfd5z3w2m5j5nim5mz")))) + (base32 "0x3c25inlxll965xszx37mnl5gp3smm2h7x04f67z0qlh3vsbrjq")))) (build-system cmake-build-system) (inputs `(("libfm-qt" ,libfm-qt) @@ -973,9 +973,6 @@ (define-public pcmanfm-qt ("lxqt-build-tools" ,lxqt-build-tools))) (arguments '(#:tests? #f ; no tests - #:configure-flags - ;; TODO: prefetch translations files from 'lxqt-l10n'. - '("-DPULL_TRANSLATIONS=NO") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-source From 3f0294c196bac65b5615404dbcf4dfa180f4e06c Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Wed, 13 Mar 2019 23:37:34 +0800 Subject: [PATCH 023/694] gnu: compton-conf: Update to 0.14.1. * gnu/packages/lxqt.scm (compton-conf): Update to 0.14.1. [arguments]: Remove #:configure-flags. Signed-off-by: Danny Milosavljevic --- gnu/packages/lxqt.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index d21fe67e3e..96cda8cc22 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -993,14 +993,14 @@ (define-public pcmanfm-qt (define-public compton-conf (package (name "compton-conf") - (version "0.4.0") + (version "0.14.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "0q3yx2a6wf8yahrwgvhmv9sd7gmrhid528vrqy04dg8m5cx1bjci")))) + (base32 "11n8k59jd0q2x66cispc9dpk139mp6j99hq1yjccxvh21vhc7mbc")))) (build-system cmake-build-system) (inputs `(("libconfig" ,libconfig) @@ -1011,9 +1011,6 @@ (define-public compton-conf ("qttools" ,qttools))) (arguments '(#:tests? #f ; no tests - #:configure-flags - ;; TODO: prefetch translations files from 'lxqt-l10n'. - '("-DPULL_TRANSLATIONS=NO") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-source From f2a8c02c9a7bd0907bd634b4467b18bd538ca70e Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Wed, 13 Mar 2019 23:37:35 +0800 Subject: [PATCH 024/694] gnu: lximage-qt: Update to 0.14.1. * gnu/packages/lxqt.scm (lximage-qt): Update to 0.14.1. [arguments]: Remove #:configure-flags. Signed-off-by: Danny Milosavljevic --- gnu/packages/lxqt.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 96cda8cc22..59117acb83 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -1028,14 +1028,14 @@ (define-public compton-conf (define-public lximage-qt (package (name "lximage-qt") - (version "0.7.0") + (version "0.14.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "1mwjh6lrjayr9snsmabkl5qs4xm6d27mfz8k3jxfm5dk3pjj1b0w")))) + (base32 "0iiq55rm4z2jp19q1pbd2whifwvxg052q324vrwp4p7nz0wh04za")))) (build-system cmake-build-system) (inputs `(("libexif" ,libexif) @@ -1048,10 +1048,7 @@ (define-public lximage-qt ("lxqt-build-tools" ,lxqt-build-tools) ("qttools" ,qttools))) (arguments - '(#:tests? #f ; no tests - #:configure-flags - ;; TODO: prefetch translations files from 'lxqt-l10n'. - '("-DPULL_TRANSLATIONS=NO"))) + '(#:tests? #f)) ; no tests (home-page "https://lxqt.org/") (synopsis "The image viewer and screenshot tool for lxqt") (description "LXImage-Qt is the Qt port of LXImage, a simple and fast From b42bd22ebd4a12dedee42b70667efe670403a5a1 Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Wed, 13 Mar 2019 23:37:36 +0800 Subject: [PATCH 025/694] gnu: obconf-qt: Update to 0.14.1. * gnu/packages/lxqt.scm (obconf-qt): Update to 0.14.1. [arguments]: Remove #:configure-flags. Signed-off-by: Danny Milosavljevic --- gnu/packages/lxqt.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 59117acb83..4c4431eccc 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -1058,14 +1058,14 @@ (define-public lximage-qt (define-public obconf-qt (package (name "obconf-qt") - (version "0.13.0") + (version "0.14.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "1fbzn1p2mdvn8dcbavmd1imrvkph2jfssrlw8l26qz6qk8qlmhnf")))) + (base32 "1kzb7364150b60qd3wcgnw78b9ia5k3b16kq8w3p1y7pg6pddy8m")))) (build-system cmake-build-system) (inputs `(("imlib2" ,imlib2) @@ -1083,10 +1083,7 @@ (define-public obconf-qt ("pkg-config" ,pkg-config) ("qttools" ,qttools))) (arguments - '(#:tests? #f ; no tests - #:configure-flags - ;; TODO: prefetch translations files from 'lxqt-l10n'. - '("-DPULL_TRANSLATIONS=NO"))) + '(#:tests? #f)) ; no tests (home-page "https://lxqt.org/") (synopsis "Openbox configuration tool") (description "ObConf-Qt is a Qt port of ObConf, a configuration editor for From f376b3254cdcb27f9af07660002d09ff8196c48d Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Wed, 13 Mar 2019 23:37:37 +0800 Subject: [PATCH 026/694] gnu: pavucontrol-qt: Update to 0.14.1. * gnu/packages/lxqt.scm (pavucontrol-qt): Update to 0.14.1. [arguments]: Remove #:configure-flags. Signed-off-by: Danny Milosavljevic --- gnu/packages/lxqt.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 4c4431eccc..62bedecc8c 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -1093,14 +1093,14 @@ (define-public obconf-qt (define-public pavucontrol-qt (package (name "pavucontrol-qt") - (version "0.4.0") + (version "0.14.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "0pqvhhgw7d00wqw5v3ghm4l8250zy7bqpvhff6l7y1lw0z2fvcp6")))) + (base32 "18mw5r8grfrf95vxjbqrr790kl5l59qdqcmlxmwa6rwbfgywj1fq")))) (build-system cmake-build-system) (inputs `(("glib" ,glib) @@ -1113,10 +1113,7 @@ (define-public pavucontrol-qt ("lxqt-build-tools" ,lxqt-build-tools) ("qttools" ,qttools))) (arguments - '(#:tests? #f ; no tests - #:configure-flags - ;; TODO: prefetch translations files from 'lxqt-l10n'. - '("-DPULL_TRANSLATIONS=NO"))) + '(#:tests? #f)) ; no tests (home-page "https://lxqt.org/") (synopsis "Pulseaudio mixer in Qt") (description "@code{pavucontrol-qt} is the Qt port of volume control From 6d3a2dbef1b4df329dfdd2c2fa066f88c631c64a Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Wed, 13 Mar 2019 23:37:38 +0800 Subject: [PATCH 027/694] gnu: qps: Update to 1.10.20. * gnu/packages/lxqt.scm (qps): Update to 1.10.20. [native-inputs]: Add lxqt-build-tools. Signed-off-by: Danny Milosavljevic --- gnu/packages/lxqt.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 62bedecc8c..0ce9062d25 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -1123,21 +1123,22 @@ (define-public pavucontrol-qt (define-public qps (package (name "qps") - (version "1.10.18") + (version "1.10.20") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "0pzk83p7a9ax0893s9hp2qkmiilzrf8iqry5a0x1g73hdwm5hm44")))) + (base32 "0dz7ricxg2rrmdyca6mc2d4lyy5bpksjk751hvn95wssr76y2w0m")))) (build-system cmake-build-system) (inputs `(("libxrender" ,libxrender) ("qtbase" ,qtbase) ("qtx11extras" ,qtx11extras))) (native-inputs - `(("qttools" ,qttools))) + `(("lxqt-build-tools" ,lxqt-build-tools) + ("qttools" ,qttools))) (arguments '(#:tests? #f)) ; no tests (home-page "https://lxqt.org/") From 238e42a3e5bfc3d039f207a4992832479b351ee1 Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Wed, 13 Mar 2019 23:37:39 +0800 Subject: [PATCH 028/694] gnu: qtermwidget: Update to 0.14.1. * gnu/packages/lxqt.scm (qtermwidget): Update to 0.14.1. [arguments]: Remove #:configure-flags. Signed-off-by: Danny Milosavljevic --- gnu/packages/lxqt.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 0ce9062d25..a9b1b04203 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -1150,14 +1150,14 @@ (define-public qps (define-public qtermwidget (package (name "qtermwidget") - (version "0.9.0") + (version "0.14.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "1c1qzbysxjbikp4bpgphphw4dgpl10gz8m06ccs2c48qxhpyd773")))) + (base32 "0v1vvi8vf9y8nv8y0gzffaqji53s75ab5jypksih0ndcws8ryww4")))) (build-system cmake-build-system) (inputs `(("qtbase" ,qtbase))) @@ -1165,10 +1165,7 @@ (define-public qtermwidget `(("lxqt-build-tools" ,lxqt-build-tools) ("qttools" ,qttools))) (arguments - '(#:tests? #f ; no tests - #:configure-flags - ;; TODO: prefetch translations files from 'lxqt-l10n'. - '("-DPULL_TRANSLATIONS=NO"))) + '(#:tests? #f)) ; no tests (home-page "https://lxqt.org/") (synopsis "The terminal widget for QTerminal") (description "QTermWidget is a terminal emulator widget for Qt 5.") From d30cd1a5523428086217da98164c6473c62e7392 Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Wed, 13 Mar 2019 23:37:40 +0800 Subject: [PATCH 029/694] gnu: qterminal: Update to 0.14.1. * gnu/packages/lxqt.scm (qterminal): Update to 0.14.1. [arguments]: Remove #:configure-flags. Signed-off-by: Danny Milosavljevic --- gnu/packages/lxqt.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index a9b1b04203..bb7558faee 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -1174,14 +1174,14 @@ (define-public qtermwidget (define-public qterminal (package (name "qterminal") - (version "0.9.0") + (version "0.14.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "1vlza75br1ys62lgkdz26md729bfpbnasfzswp7hakmgaq1rhms1")))) + (base32 "0cgyaskyqginmm85d11inbi0mmxrsrnvgyx6g4l4l4iqpphfq670")))) (build-system cmake-build-system) (inputs `(("qtbase" ,qtbase) @@ -1191,10 +1191,7 @@ (define-public qterminal `(("lxqt-build-tools" ,lxqt-build-tools) ("qttools" ,qttools))) (arguments - '(#:tests? #f ; no tests - #:configure-flags - ;; TODO: prefetch translations files from 'lxqt-l10n'. - '("-DPULL_TRANSLATIONS=NO"))) + '(#:tests? #f)) ; no tests (home-page "https://lxqt.org/") (synopsis "Lightweight Qt-based terminal emulator") (description "QTerminal is a lightweight Qt terminal emulator based on From 50bc1d0125641f29fb15da3b264353b5df0dff8b Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Wed, 13 Mar 2019 23:37:41 +0800 Subject: [PATCH 030/694] gnu: screengrab: Update to 1.101. * gnu/packages/lxqt.scm (screengrab): Update to 1.101. Signed-off-by: Danny Milosavljevic --- gnu/packages/lxqt.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index bb7558faee..c8e3a104f0 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -1201,14 +1201,14 @@ (define-public qterminal (define-public screengrab (package (name "screengrab") - (version "1.99") + (version "1.101") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/screengrab/releases/download/" version "/screengrab-" version ".tar.xz")) (sha256 - (base32 "17y8rsx9fixvxv2byq8d6c01vry10nv07f8jy85vz7zp4f0rgzz3")))) + (base32 "05f81xjlmiykd7iwx5xns5vnynjq4js4x1bk8wd648frrksp44fa")))) (build-system cmake-build-system) (inputs `(("kwindowsystem" ,kwindowsystem) From 625697ea609385b596903f34997dee56d1f7997f Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Thu, 14 Mar 2019 11:50:06 +0100 Subject: [PATCH 031/694] gnu: lxqt-about: Make it more reproducible. * gnu/packages/lxqt.scm (lxqt-about)[arguments]<#:phases>[setenv]: New phase. --- gnu/packages/lxqt.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index c8e3a104f0..4c00b2a611 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -288,6 +288,10 @@ (define-public lxqt-about '(#:tests? #f ; no tests #:phases (modify-phases %standard-phases + (add-before 'build 'setenv + (lambda _ + (setenv "QT_RCC_SOURCE_DATE_OVERRIDE" "1") + #t)) (add-after 'unpack 'patch-translations-dir (lambda* (#:key outputs #:allow-other-keys) (substitute* "CMakeLists.txt" From 5f07df1743b159da6310b46074a031a294106dcb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 14 Mar 2019 19:36:26 +0100 Subject: [PATCH 032/694] gnu: atk: Update to 2.32.0. * gnu/packages/gtk.scm (atk): Update to 2.32.0. [build-system]: Change to MESON-BUILD-SYSTEM. [outputs]: Remove (due to dependency cycle on gtk-doc). [arguments]: Remove. [native-inputs]: Add GETTEXT-MINIMAL. --- gnu/packages/gtk.scm | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index f93bd819e5..a18dd005eb 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -85,7 +85,7 @@ (define-module (gnu packages gtk) (define-public atk (package (name "atk") - (version "2.28.1") + (version "2.32.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -93,17 +93,12 @@ (define-public atk name "-" version ".tar.xz")) (sha256 (base32 - "1z7laf6qwv5zsqcnj222dm5f43c6f3liil0cgx4s4s62xjk1wfnd")))) - (build-system gnu-build-system) - (outputs '("out" "doc")) - (arguments - `(#:configure-flags - (list (string-append "--with-html-dir=" - (assoc-ref %outputs "doc") - "/share/gtk-doc/html")))) + "1k4i817bd2w5b9z394f2yyx95591l2746wa40am0vvz4gzdgwhfb")))) + (build-system meson-build-system) (propagated-inputs `(("glib" ,glib))) ; required by atk.pc (native-inputs `(("pkg-config" ,pkg-config) + ("gettext" ,gettext-minimal) ("glib" ,glib "bin") ; glib-mkenums, etc. ("gobject-introspection" ,gobject-introspection))) ; g-ir-compiler, etc. (synopsis "GNOME accessibility toolkit") From 5254f17eebeef1690617ea0c17fc454ca91242bc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 14 Mar 2019 19:37:46 +0100 Subject: [PATCH 033/694] gnu: at-spi2-core: Update to 2.32.0. * gnu/packages/gtk.scm (at-spi2-core): Update to 2.32.0. [arguments]: Adjust for renamed configure flag. [inputs]: Move LIBXI and LIBXTST ... [propagated-inputs]: ... here. --- gnu/packages/gtk.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index a18dd005eb..b62a4aaa27 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -555,7 +555,7 @@ (define-public gdk-pixbuf+svg (define-public at-spi2-core (package (name "at-spi2-core") - (version "2.28.0") + (version "2.32.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -563,12 +563,12 @@ (define-public at-spi2-core name "-" version ".tar.xz")) (sha256 (base32 - "11qwdxxx4jm0zj04xydlwah41axiz276dckkiql3rr0wn5x4i8j2")))) + "083j1v7kdjrpjsv1b9dl3d8xqj39jyp4cfn8i9gbbm7q2g93b923")))) (build-system meson-build-system) (outputs '("out" "doc")) (arguments '(#:configure-flags - (list "-Denable_docs=true") + (list "-Ddocs=true") #:phases (modify-phases %standard-phases (add-after 'unpack 'set-documentation-path @@ -605,9 +605,8 @@ (define-public at-spi2-core (propagated-inputs ;; atspi-2.pc refers to all these. `(("dbus" ,dbus) - ("glib" ,glib))) - (inputs - `(("libxi" ,libxi) + ("glib" ,glib) + ("libxi" ,libxi) ("libxtst" ,libxtst))) (native-inputs `(("gobject-introspection" ,gobject-introspection) From 3ea5a8ee4789c08b4ecdcff94b7bd30fee475601 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 14 Mar 2019 19:39:09 +0100 Subject: [PATCH 034/694] gnu: at-spi2-atk: Update to 2.32.0. * gnu/packages/gtk.scm (at-spi2-atk): Update to 2.32.0. [build-system]: Change to MESON-BUILD-SYSTEM. [arguments]: Adjust test invokation. [native-inputs]: Add LIBXML2. --- gnu/packages/gtk.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index b62a4aaa27..c790bd8e40 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -624,7 +624,7 @@ (define-public at-spi2-core (define-public at-spi2-atk (package (name "at-spi2-atk") - (version "2.26.2") + (version "2.32.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -632,8 +632,8 @@ (define-public at-spi2-atk name "-" version ".tar.xz")) (sha256 (base32 - "0vkan52ab9vrkknnv8y4f1cspk8x7xd10qx92xk9ys71p851z2b1")))) - (build-system gnu-build-system) + "0p54wx6f6q7s8w0b1j0sgw87pikllp79q5g3lfiwqazs779ycl8b")))) + (build-system meson-build-system) (arguments '(#:phases (modify-phases %standard-phases @@ -641,14 +641,16 @@ (define-public at-spi2-atk ;; Run test-suite under a dbus session. (lambda _ (setenv "DBUS_FATAL_WARNINGS" "0") - (invoke "dbus-launch" "make" "check")))))) + (invoke "dbus-launch" "meson" "test")))))) (propagated-inputs `(("at-spi2-core" ,at-spi2-core))) ; required by atk-bridge-2.0.pc (inputs `(("atk" ,atk))) (native-inputs - `(("dbus" ,dbus) ; for testing - ("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config) + ;; For tests. + ("dbus" ,dbus) + ("libxml2" ,libxml2))) (synopsis "Assistive Technology Service Provider Interface, ATK bindings") (description "The Assistive Technology Service Provider Interface From 1e33331cce9914e6ef4a3629bfaf0116feb7b9bf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 14 Mar 2019 19:40:10 +0100 Subject: [PATCH 035/694] gnu: dconf: Update to 0.32.0. * gnu/packages/gnome.scm (dconf): Update to 0.32.0. [native-inputs]: Add BASH-COMPLETION. --- gnu/packages/gnome.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ea042612e1..28048f8da2 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -58,6 +58,7 @@ (define-module (gnu packages gnome) #:use-module (gnu packages avahi) #:use-module (gnu packages backup) #:use-module (gnu packages base) + #:use-module (gnu packages bash) #:use-module (gnu packages bison) #:use-module (gnu packages build-tools) #:use-module (gnu packages calendar) @@ -2382,7 +2383,7 @@ (define-public vinagre (define-public dconf (package (name "dconf") - (version "0.28.0") + (version "0.32.0") (source (origin (method url-fetch) (uri (string-append @@ -2391,7 +2392,7 @@ (define-public dconf name "-" version ".tar.xz")) (sha256 (base32 - "0hn7v6769xabqz7kvyb2hfm19h46z1whkair7ff752zmbs3b7lv1")))) + "1azz4hb9z76yxn34yrrsiib3iqz5z4vpwn5q7cncp55w365ygg38")))) (build-system meson-build-system) (propagated-inputs ;; In Requires of dconf.pc. @@ -2400,7 +2401,8 @@ (define-public dconf `(("gtk+" ,gtk+) ("dbus" ,dbus))) (native-inputs - `(("libxslt" ,libxslt) ;for xsltproc + `(("bash-completion" ,bash-completion) + ("libxslt" ,libxslt) ;for xsltproc ("libxml2" ,libxml2) ;for XML_CATALOG_FILES ("docbook-xml" ,docbook-xml-4.2) ("docbook-xsl" ,docbook-xsl) From 925926bab11782ab0f36dcb7f5c00cf95138866f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 14 Mar 2019 13:12:37 +0100 Subject: [PATCH 036/694] gnu: sslh: Don't use unstable tarball. * gnu/packages/networking.scm (sslh)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/networking.scm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index ce775a3a0f..6c8f946b0c 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1227,14 +1227,15 @@ (define-public sslh (package (name "sslh") (version "1.19c") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/yrutschle/sslh/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0pd8hifa9h0rm7vms3k6ic1k29xigrlv2idc5wgcafmb1v1243di")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/yrutschle/sslh.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "14x3n25n9md0sw8cda9m5bd8r96xpw1vdkapklw4mxgfcz1k2kxq")))) (build-system gnu-build-system) (native-inputs `(;; Test dependencies. From 98580bd93a38b23f0584922f35f611ed7b1d33e8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 14 Mar 2019 15:43:19 +0100 Subject: [PATCH 037/694] gnu: Add perl-conf-libconfig. * gnu/packages/perl.scm (perl-conf-libconfig): New public variable. --- gnu/packages/perl.scm | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 978062d262..ef337446dd 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -52,7 +52,8 @@ (define-module (gnu packages perl) #:use-module (gnu packages perl-check) #:use-module (gnu packages perl-compression) #:use-module (gnu packages perl-web) - #:use-module (gnu packages pkg-config)) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages textutils)) ;;; ;;; Please: Try to add new module packages in alphabetic order. @@ -1348,6 +1349,35 @@ (define-public perl-common-sense as defined by two typical specimens of Perl coders.") (license (package-license perl)))) +(define-public perl-conf-libconfig + (package + (name "perl-conf-libconfig") + (version "0.100") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://cpan/authors/id/C/CN/CNANGEL/" + "Conf-Libconfig-" version ".tar.gz")) + (sha256 + (base32 "0qdypqd7mx96bwdjlv13fn6p96bs4w0yv94yv94xa7z5lqkdj4rg")))) + (build-system perl-build-system) + (native-inputs + `(("perl-extutils-pkgconfig" ,perl-extutils-pkgconfig) + ("perl-test-deep" ,perl-test-deep) + ("perl-test-exception" ,perl-test-exception) + ("perl-test-warn" ,perl-test-warn))) + (inputs + `(("libconfig" ,libconfig))) + (home-page "https://metacpan.org/release/Conf-Libconfig") + (synopsis "Perl extension for libconfig") + (description + "Conf::Libconfig is a Perl interface to the libconfig configuration file +library. It support scalar, array, and hash data structures just like its C/C++ +counterpart. It reduces the effort required to implement a configuration file +parser in your Perl programme and allows sharing configuration files between +languages.") + (license bsd-3))) + (define-public perl-config-any (package (name "perl-config-any") From 2fe29c8490ec2fec6c87f68df657d57998cc59c2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 14 Mar 2019 16:26:10 +0100 Subject: [PATCH 038/694] gnu: sslh: Update to 1.20. * gnu/packages/networking.scm (sslh): Update to 1.20. [native-inputs]: Add perl-conf-libconfig. Remove valgrind. [arguments]: Re-indent. --- gnu/packages/networking.scm | 40 ++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 6c8f946b0c..7d7fce7563 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1226,7 +1226,7 @@ (define-public enet (define-public sslh (package (name "sslh") - (version "1.19c") + (version "1.20") (source (origin (method git-fetch) @@ -1235,16 +1235,16 @@ (define-public sslh (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "14x3n25n9md0sw8cda9m5bd8r96xpw1vdkapklw4mxgfcz1k2kxq")))) + (base32 "18zhkqlwfh6f5dg1a41a4p7p9g94dgb9nwls1ksy9r5yz174i2fx")))) (build-system gnu-build-system) (native-inputs `(;; Test dependencies. ("lcov" ,lcov) ("perl" ,perl) + ("perl-conf-libconfig" ,perl-conf-libconfig) ("perl-io-socket-inet6" ,perl-io-socket-inet6) ("perl-socket6" ,perl-socket6) - ("psmisc" ,psmisc) - ("valgrind" ,valgrind))) + ("psmisc" ,psmisc))) ; for ‘killall’ (inputs `(("libcap" ,libcap) ("libconfig" ,libconfig) @@ -1255,24 +1255,24 @@ (define-public sslh (modify-phases %standard-phases (delete 'configure) ; no configure script (add-before 'check 'fix-tests - (lambda _ - (substitute* "./t" - (("\"/tmp") "$ENV{\"TMPDIR\"} . \"") - ;; The Guix build environment lacks ‘ip6-localhost’. - (("ip6-localhost") "localhost")) - #t)) + (lambda _ + (substitute* "./t" + (("\"/tmp") "$ENV{\"TMPDIR\"} . \"") + ;; The Guix build environment lacks ‘ip6-localhost’. + (("ip6-localhost") "localhost")) + #t)) ;; Many of these files are mentioned in the man page. Install them. (add-after 'install 'install-documentation - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (doc (string-append out "/share/doc/sslh"))) - (install-file "README.md" doc) - (for-each - (lambda (file) - (install-file file (string-append doc "/examples"))) - (append (find-files "." "\\.cfg") - (find-files "scripts")))) - #t))) + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (string-append out "/share/doc/sslh"))) + (install-file "README.md" doc) + (for-each + (lambda (file) + (install-file file (string-append doc "/examples"))) + (append (find-files "." "\\.cfg") + (find-files "scripts")))) + #t))) #:make-flags (list "CC=gcc" "USELIBCAP=1" "USELIBWRAP=1" From 205df739400ee08da4ad72c91b082516ecbfa394 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 14 Mar 2019 16:28:11 +0100 Subject: [PATCH 039/694] gnu: Move libconfuse to (gnu packages textutils). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/wm.scm (libconfuse): Move… * gnu/packages/textutils.scm (libconfuse): …to here. Adjust all imports. --- gnu/packages/genimage.scm | 4 ++-- gnu/packages/networking.scm | 1 - gnu/packages/terminals.scm | 1 - gnu/packages/textutils.scm | 22 ++++++++++++++++++++++ gnu/packages/wm.scm | 23 +---------------------- 5 files changed, 25 insertions(+), 26 deletions(-) diff --git a/gnu/packages/genimage.scm b/gnu/packages/genimage.scm index 792bddf5a5..fdf686f9d7 100644 --- a/gnu/packages/genimage.scm +++ b/gnu/packages/genimage.scm @@ -35,8 +35,8 @@ (define-module (gnu packages genimage) #:use-module (gnu packages linux) #:use-module (gnu packages mtools) #:use-module (gnu packages pkg-config) - #:use-module (gnu packages virtualization) - #:use-module (gnu packages wm)) + #:use-module (gnu packages textutils) + #:use-module (gnu packages virtualization)) (define-public genimage (package diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 7d7fce7563..eeabc3d93d 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -99,7 +99,6 @@ (define-module (gnu packages networking) #:use-module (gnu packages tls) #:use-module (gnu packages valgrind) #:use-module (gnu packages web) - #:use-module (gnu packages wm) #:use-module (gnu packages wxwidgets) #:use-module (gnu packages xml) #:use-module (ice-9 match)) diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 536a48986f..3839aa1b52 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -70,7 +70,6 @@ (define-module (gnu packages terminals) #:use-module (gnu packages serialization) #:use-module (gnu packages ssh) #:use-module (gnu packages textutils) - #:use-module (gnu packages wm) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index d55f27fd6b..78050f3925 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -188,6 +188,28 @@ (define-public utf8proc encoding, supporting Unicode version 9.0.0.") (license license:expat))) +(define-public libconfuse + (package + (name "libconfuse") + (version "3.2.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/martinh/libconfuse/" + "releases/download/v" version + "/confuse-" version ".tar.xz")) + (sha256 + (base32 "02r1mmzik2m0iigbc2da3y754vj24i18r3ml5p2wzs027mjhn959")))) + (build-system gnu-build-system) + (home-page "https://github.com/martinh/libconfuse") + (synopsis "Configuration file parser library") + (description "libconfuse is a configuration file parser library. It +supports sections and (lists of) values (strings, integers, floats, booleans +or other sections), as well as some other features (such as +single/double-quoted strings, environment variable expansion, functions and +nested include statements).") + (license license:isc))) + (define-public libgtextutils (package (name "libgtextutils") diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 4a6fc62069..abd51f6589 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -83,31 +83,10 @@ (define-module (gnu packages wm) #:use-module (gnu packages video) #:use-module (gnu packages version-control) #:use-module (gnu packages man) + #:use-module (gnu packages textutils) #:use-module (guix download) #:use-module (guix git-download)) -(define-public libconfuse - (package - (name "libconfuse") - (version "3.2.2") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/martinh/libconfuse/" - "releases/download/v" version - "/confuse-" version ".tar.xz")) - (sha256 - (base32 - "02r1mmzik2m0iigbc2da3y754vj24i18r3ml5p2wzs027mjhn959")))) - (build-system gnu-build-system) - (home-page "https://github.com/martinh/libconfuse") - (synopsis "Configuration file parser library") - (description "libconfuse is a configuration file parser library. It -supports sections and (lists of) values (strings, integers, floats, booleans -or other sections), as well as some other features (such as -single/double-quoted strings, environment variable expansion, functions and -nested include statements).") - (license license:isc))) - (define-public bspwm (package (name "bspwm") From 9d4e42dcfb6b5d92911fac50f49fdcf48cf0b748 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 12 Mar 2019 22:44:14 +0100 Subject: [PATCH 040/694] gnu: qsynth: Update to 0.5.5. * gnu/packages/audio.scm (qsynth): Update to 0.5.5. --- gnu/packages/audio.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 8bcd3c4b85..444629e5d7 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2865,15 +2865,14 @@ (define-public portaudio (define-public qsynth (package (name "qsynth") - (version "0.5.4") + (version "0.5.5") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/qsynth/qsynth/" version "/qsynth-" version ".tar.gz")) (sha256 - (base32 - "0kpq5fxr96wnii18ax780w1ivq8ksk892ac0bprn92iz0asfysrd")))) + (base32 "08x7znvbwi9miavcarymi7dsv8njmxzwzma20dbmz8j2aswm53w5")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no "check" phase From 0b75db34d4998a63e2ff1b928f5030ad729fbde1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 12 Mar 2019 22:47:53 +0100 Subject: [PATCH 041/694] gnu: qjackctl: Update to 0.5.6. * gnu/packages/audio.scm (qjackctl): Update to 0.5.6. --- 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 444629e5d7..5f38ce4b86 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2120,17 +2120,17 @@ (define-public pcaudiolib (define-public qjackctl (package (name "qjackctl") - (version "0.5.5") + (version "0.5.6") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/qjackctl/qjackctl/" version "/qjackctl-" version ".tar.gz")) (sha256 (base32 - "1rzzqa39a6llr52vjkjr0a86nc776kmr5xs52qqga8ms9697psz5")))) + "0wlmbb9m7cf3wr7c2h2hji18592x2b119m7mx85wksjs6rjaq2mj")))) (build-system gnu-build-system) (arguments - '(#:tests? #f ;; no check target + '(#:tests? #f ; no check target ;; Disable xunique to prevent X hanging when starting qjackctl in ;; tiling window managers such as StumpWM or i3 ;; (see https://github.com/rncbc/qjackctl/issues/13). From 4a17211ad0020a5cc2585518f94f9a110e330a88 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 12 Mar 2019 22:50:55 +0100 Subject: [PATCH 042/694] gnu: aubio: Update to 0.4.9. * gnu/packages/audio.scm (aubio): Update to 0.4.9. --- 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 5f38ce4b86..03d41770c2 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -156,17 +156,17 @@ (define-public alsa-modular-synth (define-public aubio (package (name "aubio") - (version "0.4.6") + (version "0.4.9") (source (origin (method url-fetch) (uri (string-append "https://aubio.org/pub/aubio-" version ".tar.bz2")) (sha256 (base32 - "1yvwskahx1bf3x2fvi6cwah1ay11iarh79fjlqz8s887y3hkpixx")))) + "1npks71ljc48w6858l9bq30kaf5nph8z0v61jkfb70xb9np850nl")))) (build-system waf-build-system) (arguments - `(#:tests? #f ; no check target + `(#:tests? #f ; no check target #:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath=" (assoc-ref %outputs "out") "/lib") From bca0b66424d1372a78d7e44a33db1a3b0749e32b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 13 Mar 2019 13:47:14 +0100 Subject: [PATCH 043/694] gnu: python-nose-timer: Update to 0.7.4. * gnu/packages/check.scm (python-nose-timer): Update to 0.7.4. --- gnu/packages/check.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 43f3892cde..b57be36b3a 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1995,14 +1995,13 @@ (define-public python2-nose-randomly (define-public python-nose-timer (package (name "python-nose-timer") - (version "0.7.3") + (version "0.7.4") (source (origin (method url-fetch) (uri (pypi-uri "nose-timer" version)) (sha256 - (base32 - "0hfz5aqnhf493i9kyb6prm4zm8vx7wmfsyg3nvsnh24lzh2kwx44")))) + (base32 "04inck7l1sgkjbiinhifxk45wk2b3czbwh1x2a390hi183fq1q12")))) (build-system python-build-system) (propagated-inputs `(("python-nose" ,python-nose) From fbec363e5530d898f470be2961b1fe23167fc327 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 13 Mar 2019 20:17:22 +0100 Subject: [PATCH 044/694] gnu: python-freezegun: Update to 0.3.11. * gnu/packages/check.scm (python-freezegun): Update to 0.3.11. --- gnu/packages/check.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index b57be36b3a..554e3872f6 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2017,14 +2017,13 @@ (define-public python2-nose-timer (define-public python-freezegun (package (name "python-freezegun") - (version "0.3.10") + (version "0.3.11") (source (origin (method url-fetch) (uri (pypi-uri "freezegun" version)) (sha256 - (base32 - "08m6b42yxb9hk5lv747v9n2qsxyadmkb0k6yg0gxdanwap0slg3h")))) + (base32 "1nh0fzqjwg88n57k3qa8mxnmiwrr7lqyd5xvc96qn5g8zcxv8fg8")))) (build-system python-build-system) (native-inputs `(("python-mock" ,python-mock) From a503071797fb48d4e94c6b3d19d29b9538bb6930 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 13 Mar 2019 20:17:33 +0100 Subject: [PATCH 045/694] gnu: python-flexmock: Update to 0.10.3. * gnu/packages/check.scm (python-flexmock): Update to 0.10.3. --- 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 554e3872f6..1abe738162 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2053,13 +2053,13 @@ (define-public python2-freezegun (define-public python-flexmock (package (name "python-flexmock") - (version "0.10.2") + (version "0.10.3") (source (origin (method url-fetch) (uri (pypi-uri "flexmock" version)) (sha256 (base32 - "0arc6njvs6i9v9hgvzk5m50296g7zy5m9d7pyb43vdsdgxrci5gy")))) + "031c624pdqm7cc0xh4yz5k69gqxn2bbrjz13s17684q5shn0ik21")))) (build-system python-build-system) (home-page "https://flexmock.readthedocs.org") (synopsis "Testing library for Python") From 5a14b913ad8513202077471539d41c51d9f271ee Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 1 Feb 2019 17:39:17 +0100 Subject: [PATCH 046/694] gnu: Remove Go 1.9. * gnu/packages/golang.scm (go-1.9): Remove variable. (go-1.11): Inherit from go-1.4 and consolidate the inherited build phases from go-1.9. Go 1.11 should be essentially unchanged with this commit, although the derivation is different. --- gnu/packages/golang.scm | 256 +++++++++------------------------------- 1 file changed, 59 insertions(+), 197 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index cfdf6932bb..da8ad3d7fe 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -223,192 +223,9 @@ (define-public go-1.4 (supported-systems '("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux")) (license license:bsd-3))) -(define-public go-1.9 - (package - (inherit go-1.4) - (name "go") - (version "1.9.7") - (source - (origin - (method url-fetch) - (uri (string-append "https://storage.googleapis.com/golang/" - name version ".src.tar.gz")) - (sha256 - (base32 - "08kpy874x0rx43zpyv5kwd8xj2ma91xm33i0ka2v1v788px18a2q")))) - (arguments - (substitute-keyword-arguments (package-arguments go-1.4) - ((#:phases phases) - `(modify-phases ,phases - (replace 'prebuild - ;; TODO: Most of this could be factorized with Go 1.4. - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((gcclib (string-append (assoc-ref inputs "gcc:lib") "/lib")) - (ld (string-append (assoc-ref inputs "libc") "/lib")) - (loader (car (find-files ld "^ld-linux.+"))) - (net-base (assoc-ref inputs "net-base")) - (tzdata-path - (string-append (assoc-ref inputs "tzdata") "/share/zoneinfo")) - (output (assoc-ref outputs "out"))) - - ;; Removing net/ tests, which fail when attempting to access - ;; network resources not present in the build container. - (for-each delete-file - '("net/listen_test.go" - "net/parse_test.go" - "net/cgo_unix_test.go")) - - (substitute* "os/os_test.go" - (("/usr/bin") (getcwd)) - (("/bin/pwd") (which "pwd")) - (("/bin/sh") (which "sh"))) - - ;; Add libgcc to runpath - (substitute* "cmd/link/internal/ld/lib.go" - (("!rpath.set") "true")) - (substitute* "cmd/go/internal/work/build.go" - (("cgoldflags := \\[\\]string\\{\\}") - (string-append "cgoldflags := []string{" - "\"-rpath=" gcclib "\"" - "}")) - (("ldflags = setextld\\(ldflags, compiler\\)") - (string-append - "ldflags = setextld(ldflags, compiler)\n" - "ldflags = append(ldflags, \"-r\")\n" - "ldflags = append(ldflags, \"" gcclib "\")\n")) - (("\"-lgcc_s\", ") - (string-append - "\"-Wl,-rpath=" gcclib "\", \"-lgcc_s\", "))) - - ;; XXX Commit 65fa2b615b72c1fa61a7 in the Go repo. We do this - ;; without a patch because ((guix packages) patch-and-repack) - ;; resets file mtimes, and parts of Go's test suite rely on - ;; those timestamps. - ;; - (substitute* "cmd/internal/objfile/elf.go" - (("PT_LOAD") - "PT_LOAD && p.Flags&elf.PF_X != 0")) - - ;; Disable failing tests: these tests attempt to access - ;; commands or network resources which are neither available - ;; nor necessary for the build to succeed. - (for-each - (match-lambda - ((file regex) - (substitute* file - ((regex all before test_name) - (string-append before "Disabled" test_name))))) - '(("net/net_test.go" "(.+)(TestShutdownUnix.+)") - ("net/dial_test.go" "(.+)(TestDialTimeout.+)") - ("os/os_test.go" "(.+)(TestHostname.+)") - ("time/format_test.go" "(.+)(TestParseInSydney.+)") - ("time/format_test.go" "(.+)(TestParseInLocation.+)") - ("os/exec/exec_test.go" "(.+)(TestEcho.+)") - ("os/exec/exec_test.go" "(.+)(TestCommandRelativeName.+)") - ("os/exec/exec_test.go" "(.+)(TestCatStdin.+)") - ("os/exec/exec_test.go" "(.+)(TestCatGoodAndBadFile.+)") - ("os/exec/exec_test.go" "(.+)(TestExitStatus.+)") - ("os/exec/exec_test.go" "(.+)(TestPipes.+)") - ("os/exec/exec_test.go" "(.+)(TestStdinClose.+)") - ("os/exec/exec_test.go" "(.+)(TestIgnorePipeErrorOnSuccess.+)") - ("syscall/syscall_unix_test.go" "(.+)(TestPassFD\\(.+)") - ("os/exec/exec_test.go" "(.+)(TestExtraFiles/areturn.+)") - ("cmd/go/go_test.go" "(.+)(TestCoverageWithCgo.+)") - ("cmd/go/go_test.go" "(.+)(TestTwoPkgConfigs.+)") - ("os/exec/exec_test.go" "(.+)(TestOutputStderrCapture.+)") - ("os/exec/exec_test.go" "(.+)(TestExtraFiles.+)") - ("os/exec/exec_test.go" "(.+)(TestExtraFilesRace.+)") - ("net/lookup_test.go" "(.+)(TestLookupPort.+)") - ("syscall/exec_linux_test.go" - "(.+)(TestCloneNEWUSERAndRemapNoRootDisableSetgroups.+)"))) - - (substitute* "../misc/cgo/testsanitizers/test.bash" - (("(CC=)cc" all var) (string-append var "gcc"))) - - ;; fix shebang for testar script - ;; note the target script is generated at build time. - (substitute* "../misc/cgo/testcarchive/carchive_test.go" - (("#!/usr/bin/env") (string-append "#!" (which "env")))) - - (substitute* "net/lookup_unix.go" - (("/etc/protocols") (string-append net-base "/etc/protocols"))) - (substitute* "net/port_unix.go" - (("/etc/services") (string-append net-base "/etc/services"))) - (substitute* "time/zoneinfo_unix.go" - (("/usr/share/zoneinfo/") tzdata-path)) - (substitute* (find-files "cmd" "\\.go") - (("/lib(64)?/ld-linux.*\\.so\\.[0-9]") loader)) - #t))) - (add-before 'build 'set-bootstrap-variables - (lambda* (#:key outputs inputs #:allow-other-keys) - ;; Tell the build system where to find the bootstrap Go. - (let ((go (assoc-ref inputs "go")) - (out (assoc-ref outputs "out"))) - (setenv "GOROOT_BOOTSTRAP" go) - (setenv "PATH" - (string-append out "/bin:" - (dirname (getcwd)) "/bin:" - (getenv "PATH"))) - - ;; XXX: The following variables seem unrelated. - (setenv "GOGC" "400") - (setenv "GO_TEST_TIMEOUT_SCALE" "9999") - #t))) - - (replace 'build - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; FIXME: Some of the .a files are not bit-reproducible. - (let* ((output (assoc-ref outputs "out"))) - (setenv "CC" (which "gcc")) - (setenv "GOOS" "linux") - (setenv "GOROOT" (dirname (getcwd))) - (setenv "GOROOT_FINAL" output) - (setenv "CGO_ENABLED" "1") - (invoke "sh" "all.bash")))) - - (replace 'install - ;; TODO: Most of this could be factorized with Go 1.4. - (lambda* (#:key outputs #:allow-other-keys) - (let* ((output (assoc-ref outputs "out")) - (doc_out (assoc-ref outputs "doc")) - (docs (string-append doc_out "/share/doc/" ,name "-" ,version)) - (src (string-append - (assoc-ref outputs "tests") "/share/" ,name "-" ,version))) - (delete-file-recursively "../pkg/bootstrap") - - (mkdir-p src) - (copy-recursively "../test" (string-append src "/test")) - (delete-file-recursively "../test") - (mkdir-p docs) - (copy-recursively "../api" (string-append docs "/api")) - (delete-file-recursively "../api") - (copy-recursively "../doc" (string-append docs "/doc")) - (delete-file-recursively "../doc") - - (for-each - (lambda (file) - (let* ((filein (string-append "../" file)) - (fileout (string-append docs "/" file))) - (copy-file filein fileout) - (delete-file filein))) - ;; Note the slightly different file names compared to 1.4. - '("README.md" "CONTRIBUTORS" "AUTHORS" "PATENTS" - "LICENSE" "VERSION" "CONTRIBUTING.md" "robots.txt")) - - (copy-recursively "../" output) - #t))))))) - (native-inputs - `(("go" ,go-1.4) - ,@(match (%current-system) - ((or "armhf-linux" "aarch64-linux") - `(("gold" ,binutils-gold))) - (_ `())) - ,@(package-native-inputs go-1.4))) - (supported-systems %supported-systems))) - (define-public go-1.11 (package - (inherit go-1.9) + (inherit go-1.4) (name "go") (version "1.11.5") (source @@ -420,7 +237,7 @@ (define-public go-1.11 (base32 "0gllmbjvp12iszwils8id78mvjxwviwf98lh2gdkb236n4mz07mw")))) (arguments - (substitute-keyword-arguments (package-arguments go-1.9) + (substitute-keyword-arguments (package-arguments go-1.4) ((#:phases phases) `(modify-phases ,phases ;; XXX Work around the Go 1.11.5 tarbomb. @@ -535,23 +352,68 @@ (define-public go-1.11 (substitute* (find-files "cmd" "\\.go") (("/lib(64)?/ld-linux.*\\.so\\.[0-9]") loader)) #t))) - ;; Prevent installation of the build cache, which contains store - ;; references to most of the tools used to build Go and would - ;; unnecessarily increase the size of Go's closure if it was - ;; installed. - ;; TODO This should be moved into the 'install' phase when Go 1.9 is - ;; removed. - (add-before 'install 'delete-extraneous-files - (lambda _ - (delete-file-recursively "../pkg/obj") - #t)) - (replace 'set-bootstrap-variables + (add-before 'build 'set-bootstrap-variables (lambda* (#:key outputs inputs #:allow-other-keys) ;; Tell the build system where to find the bootstrap Go. (let ((go (assoc-ref inputs "go"))) (setenv "GOROOT_BOOTSTRAP" go) (setenv "GOGC" "400") - #t))))))))) + #t))) + (replace 'build + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; FIXME: Some of the .a files are not bit-reproducible. + (let* ((output (assoc-ref outputs "out"))) + (setenv "CC" (which "gcc")) + (setenv "GOOS" "linux") + (setenv "GOROOT" (dirname (getcwd))) + (setenv "GOROOT_FINAL" output) + (setenv "CGO_ENABLED" "1") + (invoke "sh" "all.bash")))) + + (replace 'install + ;; TODO: Most of this could be factorized with Go 1.4. + (lambda* (#:key outputs #:allow-other-keys) + (let* ((output (assoc-ref outputs "out")) + (doc_out (assoc-ref outputs "doc")) + (docs (string-append doc_out "/share/doc/" ,name "-" ,version)) + (src (string-append + (assoc-ref outputs "tests") "/share/" ,name "-" ,version))) + (delete-file-recursively "../pkg/bootstrap") + ;; Prevent installation of the build cache, which contains + ;; store references to most of the tools used to build Go and + ;; would unnecessarily increase the size of Go's closure if it + ;; was installed. + (delete-file-recursively "../pkg/obj") + + (mkdir-p src) + (copy-recursively "../test" (string-append src "/test")) + (delete-file-recursively "../test") + (mkdir-p docs) + (copy-recursively "../api" (string-append docs "/api")) + (delete-file-recursively "../api") + (copy-recursively "../doc" (string-append docs "/doc")) + (delete-file-recursively "../doc") + + (for-each + (lambda (file) + (let* ((filein (string-append "../" file)) + (fileout (string-append docs "/" file))) + (copy-file filein fileout) + (delete-file filein))) + ;; Note the slightly different file names compared to 1.4. + '("README.md" "CONTRIBUTORS" "AUTHORS" "PATENTS" + "LICENSE" "VERSION" "CONTRIBUTING.md" "robots.txt")) + + (copy-recursively "../" output) + #t))))))) + (native-inputs + `(("go" ,go-1.4) + ,@(match (%current-system) + ((or "armhf-linux" "aarch64-linux") + `(("gold" ,binutils-gold))) + (_ `())) + ,@(package-native-inputs go-1.4))) + (supported-systems %supported-systems))) (define-public go go-1.11) From e3900a4d64e4bf6f426809d6bff058e5a2ae9bc8 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 6 Jan 2018 15:47:47 -0500 Subject: [PATCH 047/694] build-system/go: Build with a filesystem union of Go dependencies. This basically changes (guix build-system go) so that instead of looking up its dependencies in a list of directories in $GOPATH, all the Go dependencies are symlinked into a single directory. Fixes . * guix/build/go-build-system.scm (setup-go-environment): New variable. (setup-environment, install-source): Remove variables. (unpack): Unpack the source relative to $GOPATH. (install): Do not install the compiled objects in the 'pkg' directory. Install the source code in this phase, and only install the source of the package named by IMPORT-PATH. * doc/guix.texi (Build Systems): Adjust accordingly. * gnu/packages/docker.scm (docker): Import (guix build union) on the build side and adjust to build phase name changes in (guix build-system go). * gnu/packages/shellutils.scm (direnv): Likewise. * gnu/packages/databases.scm (mongo-tools)[arguments]: Set '#:install-source #f'. * gnu/packages/music.scm (demlo)[arguments]: Move the 'install-scripts' phase after the 'install' phase. --- doc/guix.texi | 4 +- gnu/packages/databases.scm | 3 +- gnu/packages/docker.scm | 6 +- gnu/packages/music.scm | 2 +- gnu/packages/shellutils.scm | 6 +- guix/build-system/go.scm | 2 + guix/build/go-build-system.scm | 139 ++++++++++++++++++--------------- 7 files changed, 90 insertions(+), 72 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 043aad1b65..a720f3f3bb 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -5791,8 +5791,8 @@ some cases, you will need to unpack the package's source code to a different directory structure than the one indicated by the import path, and @code{#:unpack-path} should be used in such cases. -Packages that provide Go libraries should be installed along with their -source code. The key @code{#:install-source?}, which defaults to +Packages that provide Go libraries should install their source code into +the built output. The key @code{#:install-source?}, which defaults to @code{#t}, controls whether or not the source code is installed. It can be set to @code{#f} for packages that only provide executable files. @end defvr diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index be02b79efa..921304ef2a 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2610,6 +2610,7 @@ (define-public mongo-tools #:modules ((srfi srfi-1) (guix build go-build-system) (guix build utils)) + #:install-source? #f #:phases (let ((all-tools '("bsondump" "mongodump" "mongoexport" "mongofiles" @@ -2629,8 +2630,6 @@ (define-public mongo-tools (("skipping restore of system.profile collection\", db)") "skipping restore of system.profile collection\")")) #t)) - ;; We don't need to install the source code for end-user applications - (delete 'install-source) (replace 'build (lambda _ (for-each (lambda (tool) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 7cb8f96258..4b6d04fe91 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -249,9 +249,11 @@ (define-public docker `(#:modules ((guix build gnu-build-system) ((guix build go-build-system) #:prefix go:) + (guix build union) (guix build utils)) #:imported-modules (,@%gnu-build-system-modules + (guix build union) (guix build go-build-system)) #:phases (modify-phases %standard-phases @@ -412,8 +414,8 @@ (define-public docker ;; Make build faster (setenv "GOCACHE" "/tmp") #t)) - (add-before 'build 'setup-environment - (assoc-ref go:%standard-phases 'setup-environment)) + (add-before 'build 'setup-go-environment + (assoc-ref go:%standard-phases 'setup-go-environment)) (replace 'build (lambda _ ;; Our LD doesn't like the statically linked relocatable things diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 05fdc1428f..54c7798472 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -4361,7 +4361,7 @@ (define-public demlo dir "/sbin")) (list ffmpeg chromaprint)))) #t))) - (add-after 'install-source 'install-scripts + (add-after 'install 'install-scripts (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (root (string-append out "/src/gitlab.com/ambrevar/demlo")) diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm index a672aa041a..88c0f32e99 100644 --- a/gnu/packages/shellutils.scm +++ b/gnu/packages/shellutils.scm @@ -118,15 +118,17 @@ (define-public direnv #:make-flags (list (string-append "DESTDIR=" (assoc-ref %outputs "out"))) #:modules ((guix build gnu-build-system) ((guix build go-build-system) #:prefix go:) + (guix build union) (guix build utils)) #:imported-modules (,@%gnu-build-system-modules + (guix build union) (guix build go-build-system)) #:phases (modify-phases %standard-phases (delete 'configure) ;; Help the build scripts find the Go language dependencies. - (add-after 'unpack 'setup-go-environment - (assoc-ref go:%standard-phases 'setup-environment))))) + (add-before 'unpack 'setup-go-environment + (assoc-ref go:%standard-phases 'setup-go-environment))))) (inputs `(("go" ,go) ("go-github-com-burntsushi-toml" ,go-github-com-burntsushi-toml) diff --git a/guix/build-system/go.scm b/guix/build-system/go.scm index cf91163275..1b916af8f9 100644 --- a/guix/build-system/go.scm +++ b/guix/build-system/go.scm @@ -39,6 +39,7 @@ (define-module (guix build-system go) (define %go-build-system-modules ;; Build-side modules imported and used by default. `((guix build go-build-system) + (guix build union) ,@%gnu-build-system-modules)) (define (default-go) @@ -87,6 +88,7 @@ (define* (go-build store name inputs (guile #f) (imported-modules %go-build-system-modules) (modules '((guix build go-build-system) + (guix build union) (guix build utils)))) (define builder `(begin diff --git a/guix/build/go-build-system.scm b/guix/build/go-build-system.scm index 022d4fe16b..1a716cea77 100644 --- a/guix/build/go-build-system.scm +++ b/guix/build/go-build-system.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Petter -;;; Copyright © 2017 Leo Famulari +;;; Copyright © 2017, 2019 Leo Famulari ;;; ;;; This file is part of GNU Guix. ;;; @@ -19,6 +19,7 @@ (define-module (guix build go-build-system) #:use-module ((guix build gnu-build-system) #:prefix gnu:) + #:use-module (guix build union) #:use-module (guix build utils) #:use-module (ice-9 match) #:use-module (srfi srfi-1) @@ -38,24 +39,26 @@ (define-module (guix build go-build-system) ;; results. [0] ;; Go software is developed and built within a particular file system hierarchy -;; structure called a 'workspace' [1]. This workspace is found by Go -;; via the GOPATH environment variable. Typically, all Go source code -;; and compiled objects are kept in a single workspace, but it is -;; possible for GOPATH to contain a list of directories, and that is -;; what we do in this go-build-system. [2] +;; structure called a 'workspace' [1]. This workspace can be found by Go via +;; the GOPATH environment variable. Typically, all Go source code and compiled +;; objects are kept in a single workspace, but GOPATH may be a list of +;; directories [2]. In this go-build-system we create a filesystem union of +;; the Go-language dependencies. Previously, we made GOPATH a list of store +;; directories, but stopped because Go programs started keeping references to +;; these directories in Go 1.11: +;; . ;; -;; Go software, whether a package or a command, is uniquely named using -;; an 'import path'. The import path is based on the URL of the -;; software's source. Since most source code is provided over the -;; internet, the import path is typically a combination of the remote -;; URL and the source repository's file system structure. For example, -;; the Go port of the common `du` command is hosted on github.com, at -;; . Thus, the import path is -;; . [3] +;; Go software, whether a package or a command, is uniquely named using an +;; 'import path'. The import path is based on the URL of the software's source. +;; Because most source code is provided over the internet, the import path is +;; typically a combination of the remote URL and the source repository's file +;; system structure. For example, the Go port of the common `du` command is +;; hosted on github.com, at . Thus, the import +;; path is . [3] ;; -;; It may be possible to programatically guess a package's import path -;; based on the source URL, but we don't try that in this revision of -;; the go-build-system. +;; It may be possible to automatically guess a package's import path based on +;; the source URL, but we don't try that in this revision of the +;; go-build-system. ;; ;; Modules of modular Go libraries are named uniquely with their ;; file system paths. For example, the supplemental but "standardized" @@ -75,6 +78,17 @@ (define-module (guix build go-build-system) ;; file system union of the required modules of such libraries. I think ;; this could be improved in future revisions of the go-build-system. ;; +;; TODO: +;; * Avoid copying dependencies into the build environment and / or avoid using +;; a tmpdir when creating the inputs union. +;; * Use Go modules [4] +;; * Re-use compiled packages [5] +;; * Avoid the go-inputs hack +;; * Stop needing remove-go-references (-trimpath ? ) +;; * Remove module packages, only offering the full Git repos? This is +;; more idiomatic, I think, because Go downloads Git repos, not modules. +;; What are the trade-offs? +;; ;; [0] `go build`: ;; https://golang.org/cmd/go/#hdr-Compile_packages_and_dependencies ;; `go install`: @@ -107,18 +121,44 @@ (define-module (guix build go-build-system) ;; ;; [2] https://golang.org/doc/code.html#GOPATH ;; [3] https://golang.org/doc/code.html#ImportPaths +;; [4] https://golang.org/cmd/go/#hdr-Modules__module_versions__and_more +;; [5] https://bugs.gnu.org/32919 ;; ;; Code: +(define* (setup-go-environment #:key inputs outputs #:allow-other-keys) + "Prepare a Go build environment for INPUTS and OUTPUTS. Build a filesystem +union of INPUTS. Export GOPATH, which helps the compiler find the source code +of the package being built and its dependencies, and GOBIN, which determines +where executables (\"commands\") are installed to. This phase is sometimes used +by packages that use (guix build-system gnu) but have a handful of Go +dependencies, so it should be self-contained." + ;; Using the current working directory as GOPATH makes it easier for packagers + ;; who need to manipulate the unpacked source code. + (setenv "GOPATH" (getcwd)) + (setenv "GOBIN" (string-append (assoc-ref outputs "out") "/bin")) + (let ((tmpdir (tmpnam))) + (match (go-inputs inputs) + (((names . directories) ...) + (union-build tmpdir (filter directory-exists? directories) + #:create-all-directories? #t + #:log-port (%make-void-port "w")))) + ;; XXX A little dance because (guix build union) doesn't use mkdir-p. + (copy-recursively tmpdir + (string-append (getenv "GOPATH")) + #:keep-mtime? #t) + (delete-file-recursively tmpdir)) + #t) + (define* (unpack #:key source import-path unpack-path #:allow-other-keys) - "Unpack SOURCE in the UNPACK-PATH, or the IMPORT-PATH is the UNPACK-PATH is -unset. When SOURCE is a directory, copy it instead of unpacking." + "Relative to $GOPATH, unpack SOURCE in the UNPACK-PATH, or the IMPORT-PATH is +the UNPACK-PATH is unset. When SOURCE is a directory, copy it instead of +unpacking." (if (string-null? import-path) ((display "WARNING: The Go import path is unset.\n"))) (if (string-null? unpack-path) (set! unpack-path import-path)) - (mkdir "src") - (let ((dest (string-append "src/" unpack-path))) + (let ((dest (string-append (getenv "GOPATH") "/src/" unpack-path))) (mkdir-p dest) (if (file-is-directory? source) (begin @@ -128,15 +168,6 @@ (define* (unpack #:key source import-path unpack-path #:allow-other-keys) (invoke "unzip" "-d" dest source) (invoke "tar" "-C" dest "-xvf" source))))) -(define* (install-source #:key install-source? outputs #:allow-other-keys) - "Install the source code to the output directory." - (let* ((out (assoc-ref outputs "out")) - (source "src") - (dest (string-append out "/" source))) - (when install-source? - (copy-recursively source dest #:keep-mtime? #t)) - #t)) - (define (go-package? name) (string-prefix? "go-" name)) @@ -155,27 +186,6 @@ (define (go-inputs inputs) (_ #f)) inputs)))) -(define* (setup-environment #:key inputs outputs #:allow-other-keys) - "Export the variables GOPATH and GOBIN, which are based on INPUTS and OUTPUTS, -respectively." - (let ((out (assoc-ref outputs "out"))) - ;; GOPATH is where Go looks for the source code of the build's dependencies. - (set-path-environment-variable "GOPATH" - ;; XXX Matching "." hints that we could do - ;; something simpler here... - (list ".") - (match (go-inputs inputs) - (((_ . dir) ...) - dir))) - - ;; Add the source code of the package being built to GOPATH. - (if (getenv "GOPATH") - (setenv "GOPATH" (string-append (getcwd) ":" (getenv "GOPATH"))) - (setenv "GOPATH" (getcwd))) - ;; Where to install compiled executable files ('commands' in Go parlance'). - (setenv "GOBIN" (string-append out "/bin")) - #t)) - (define* (build #:key import-path #:allow-other-keys) "Build the package named by IMPORT-PATH." (with-throw-handler @@ -193,22 +203,26 @@ (define* (build #:key import-path #:allow-other-keys) "Here are the results of `go env`:\n")) (invoke "go" "env")))) +;; Can this also install commands??? (define* (check #:key tests? import-path #:allow-other-keys) "Run the tests for the package named by IMPORT-PATH." (when tests? (invoke "go" "test" import-path)) #t) -(define* (install #:key outputs #:allow-other-keys) - "Install the compiled libraries. `go install` installs these files to -$GOPATH/pkg, so we have to copy them into the output directory manually. -Compiled executable files should have already been installed to the store based -on $GOBIN in the build phase." - ;; TODO: From go-1.10 onward, the pkg folder should not be needed (see - ;; https://lists.gnu.org/archive/html/guix-devel/2018-11/msg00208.html). - ;; Remove it? - (when (file-exists? "pkg") - (copy-recursively "pkg" (string-append (assoc-ref outputs "out") "/pkg"))) +(define* (install #:key install-source? outputs import-path unpack-path #:allow-other-keys) + "Install the source code of IMPORT-PATH to the primary output directory. +Compiled executable files (Go \"commands\") should have already been installed +to the store based on $GOBIN in the build phase. +XXX We can't make us of compiled libraries (Go \"packages\")." + (when install-source? + (if (string-null? import-path) + ((display "WARNING: The Go import path is unset.\n"))) + (let* ((out (assoc-ref outputs "out")) + (source (string-append (getenv "GOPATH") "/src/" import-path)) + (dest (string-append out "/src/" import-path))) + (mkdir-p dest) + (copy-recursively source dest #:keep-mtime? #t))) #t) (define* (remove-store-reference file file-name @@ -269,9 +283,8 @@ (define %standard-phases (delete 'bootstrap) (delete 'configure) (delete 'patch-generated-file-shebangs) + (add-before 'unpack 'setup-go-environment setup-go-environment) (replace 'unpack unpack) - (add-after 'unpack 'install-source install-source) - (add-before 'build 'setup-environment setup-environment) (replace 'build build) (replace 'check check) (replace 'install install) From 9c359ff4455703536788d536e4e7cfb4ee285002 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 12 Mar 2019 15:09:14 -0400 Subject: [PATCH 048/694] gnu: Remove the various Go union meta-packages. * gnu/packages/golang.scm (go-github-com-gogo-protobuf-union, go-golang-org-x-crypto-union): Remove variables. (go-golang-org-x-crypto-bcrypt, go-golang-org-x-crypto-blowfish, go-golang-org-x-crypto-pbkdf2, go-golang-org-x-crypto-tea, go-golang-org-x-crypto-xtea, go-golang-org-x-crypto-salsa20, go-golang-org-x-crypto-twofish,)[arguments]: Remove obsolete 'make-gzip-archive-writable' phase. (go-golang-org-x-crypto-ed25519)[arguments]: The phase 'make-gzip-archive-writable' belongs here now. (go-github-com-multiformats-go-multihash)[native-inputs]: Remove go-golang-org-x-crypto-union. Add go-golang-org-x-crypto-blake2s and go-golang-org-x-crypto-sha3. (go-github-com-libp2p-go-libp2p-peer)[native-inputs]: Remove go-golang-org-x-crypto-union. Add go-golang-org-x-crypto-blake2s, go-golang-org-x-crypto-ed25519, and go-golang-org-x-crypto-sha3. (go-github-com-libp2p-go-libp2p-metrics)[native-inputs]: Remove go-golang-org-x-crypto-union. Add go-golang-org-x-crypto-sha3, go-golang-org-x-crypto-ed25519, and go-golang-org-x-crypto-blake2s. (go-github-com-multiformats-go-multiaddr)[native-inputs]: Remove go-golang-org-x-crypto-union. Add go-golang-org-x-crypto-sha3 and go-golang-org-x-crypto-blake2s. (go-github-com-multiformats-go-multiaddr-net)[native-inputs]: Remove go-golang-org-x-crypto-union. Add go-golang-org-x-crypto-sha3 and go-golang-org-x-crypto-blake2s. * gnu/packages/ipfs.scm (go-github-com-ipfs-go-ipfs-api)[native-inputs]: Remove go-golang-org-x-crypto-union. Add go-golang-org-x-crypto-blake2s, go-golang-org-x-crypto-ed25519, and go-golang-org-x-crypto-sha3. (gx)[native-inputs]: Remove go-golang-org-x-crypto-union. Add go-golang-org-x-crypto-blake2s, go-golang-org-x-crypto-ed25519, and go-golang-org-x-crypto-sha3. (gx-go)[native-inputs]: Remove go-golang-org-x-crypto-union. Add go-golang-org-x-crypto-blake2s, go-golang-org-x-crypto-ed25519, and go-golang-org-x-crypto-sha3. * gnu/packages/syncthing.scm: Remove go-golang-org-x-text-union, go-golang-org-x-net-union, and go-github-com-vitrun-qart-union. --- gnu/packages/golang.scm | 222 ++++++------------------------------- gnu/packages/ipfs.scm | 16 ++- gnu/packages/syncthing.scm | 82 -------------- 3 files changed, 46 insertions(+), 274 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index da8ad3d7fe..cf469f3fdd 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -47,9 +47,7 @@ (define-module (gnu packages golang) #:use-module (gnu packages lua) #:use-module (gnu packages mp3) #:use-module (ice-9 match) - #:use-module (srfi srfi-1) - #:export (go-github-com-gogo-protobuf-union) - #:export (go-golang-org-x-crypto-union)) + #:use-module (srfi srfi-1)) ;; According to https://golang.org/doc/install/gccgo, gccgo-4.8.2 includes a ;; complete go-1.1.2 implementation, gccgo-4.9 includes a complete go-1.2 @@ -620,18 +618,7 @@ (define-public go-golang-org-x-crypto-bcrypt (build-system go-build-system) (arguments `(#:import-path "golang.org/x/crypto/bcrypt" - #:unpack-path "golang.org/x/crypto" - #:phases - (modify-phases %standard-phases - (add-before 'reset-gzip-timestamps 'make-gzip-archive-writable - (lambda* (#:key outputs #:allow-other-keys) - (map (lambda (file) - (make-file-writable file)) - (find-files - (string-append (assoc-ref outputs "out") - "/src/golang.org/x/crypto/ed25519/testdata") - ".*\\.gz$")) - #t))))) + #:unpack-path "golang.org/x/crypto")) (synopsis "Bcrypt in Go") (description "This package provides a Go implementation of the bcrypt password hashing function.") @@ -657,18 +644,7 @@ (define-public go-golang-org-x-crypto-blowfish (build-system go-build-system) (arguments `(#:import-path "golang.org/x/crypto/blowfish" - #:unpack-path "golang.org/x/crypto" - #:phases - (modify-phases %standard-phases - (add-before 'reset-gzip-timestamps 'make-gzip-archive-writable - (lambda* (#:key outputs #:allow-other-keys) - (map (lambda (file) - (make-file-writable file)) - (find-files - (string-append (assoc-ref outputs "out") - "/src/golang.org/x/crypto/ed25519/testdata") - ".*\\.gz$")) - #t))))) + #:unpack-path "golang.org/x/crypto")) (synopsis "Blowfish in Go") (description "This package provides a Go implementation of the Blowfish symmetric-key block cipher.") @@ -694,18 +670,7 @@ (define-public go-golang-org-x-crypto-pbkdf2 (build-system go-build-system) (arguments `(#:import-path "golang.org/x/crypto/pbkdf2" - #:unpack-path "golang.org/x/crypto" - #:phases - (modify-phases %standard-phases - (add-before 'reset-gzip-timestamps 'make-gzip-archive-writable - (lambda* (#:key outputs #:allow-other-keys) - (map (lambda (file) - (make-file-writable file)) - (find-files - (string-append (assoc-ref outputs "out") - "/src/golang.org/x/crypto/ed25519/testdata") - ".*\\.gz$")) - #t))))) + #:unpack-path "golang.org/x/crypto")) (synopsis "PBKDF2 in Go") (description "This package provides a Go implementation of the PBKDF2 key derivation function.") @@ -731,18 +696,7 @@ (define-public go-golang-org-x-crypto-tea (build-system go-build-system) (arguments `(#:import-path "golang.org/x/crypto/tea" - #:unpack-path "golang.org/x/crypto" - #:phases - (modify-phases %standard-phases - (add-before 'reset-gzip-timestamps 'make-gzip-archive-writable - (lambda* (#:key outputs #:allow-other-keys) - (map (lambda (file) - (make-file-writable file)) - (find-files - (string-append (assoc-ref outputs "out") - "/src/golang.org/x/crypto/ed25519/testdata") - ".*\\.gz$")) - #t))))) + #:unpack-path "golang.org/x/crypto")) (synopsis "Tiny Encryption Algorithm (TEA) in Go") (description "This packages a Go implementation of the Tiny Encryption Algorithm (TEA) block cipher.") @@ -768,18 +722,7 @@ (define-public go-golang-org-x-crypto-salsa20 (build-system go-build-system) (arguments `(#:import-path "golang.org/x/crypto/salsa20" - #:unpack-path "golang.org/x/crypto" - #:phases - (modify-phases %standard-phases - (add-before 'reset-gzip-timestamps 'make-gzip-archive-writable - (lambda* (#:key outputs #:allow-other-keys) - (map (lambda (file) - (make-file-writable file)) - (find-files - (string-append (assoc-ref outputs "out") - "/src/golang.org/x/crypto/ed25519/testdata") - ".*\\.gz$")) - #t))))) + #:unpack-path "golang.org/x/crypto")) (synopsis "Salsa20 in Go") (description "This packages provides a Go implementation of the Salsa20 stream cipher.") @@ -805,18 +748,7 @@ (define-public go-golang-org-x-crypto-cast5 (build-system go-build-system) (arguments `(#:import-path "golang.org/x/crypto/cast5" - #:unpack-path "golang.org/x/crypto" - #:phases - (modify-phases %standard-phases - (add-before 'reset-gzip-timestamps 'make-gzip-archive-writable - (lambda* (#:key outputs #:allow-other-keys) - (map (lambda (file) - (make-file-writable file)) - (find-files - (string-append (assoc-ref outputs "out") - "/src/golang.org/x/crypto/ed25519/testdata") - ".*\\.gz$")) - #t))))) + #:unpack-path "golang.org/x/crypto")) (synopsis "Cast5 in Go") (description "This packages provides a Go implementation of the Cast5 symmetric-key block cipher.") @@ -842,18 +774,7 @@ (define-public go-golang-org-x-crypto-twofish (build-system go-build-system) (arguments `(#:import-path "golang.org/x/crypto/twofish" - #:unpack-path "golang.org/x/crypto" - #:phases - (modify-phases %standard-phases - (add-before 'reset-gzip-timestamps 'make-gzip-archive-writable - (lambda* (#:key outputs #:allow-other-keys) - (map (lambda (file) - (make-file-writable file)) - (find-files - (string-append (assoc-ref outputs "out") - "/src/golang.org/x/crypto/ed25519/testdata") - ".*\\.gz$")) - #t))))) + #:unpack-path "golang.org/x/crypto")) (synopsis "Twofish in Go") (description "This packages provides a Go implementation of the Twofish symmetric-key block cipher.") @@ -879,18 +800,7 @@ (define-public go-golang-org-x-crypto-xtea (build-system go-build-system) (arguments `(#:import-path "golang.org/x/crypto/xtea" - #:unpack-path "golang.org/x/crypto" - #:phases - (modify-phases %standard-phases - (add-before 'reset-gzip-timestamps 'make-gzip-archive-writable - (lambda* (#:key outputs #:allow-other-keys) - (map (lambda (file) - (make-file-writable file)) - (find-files - (string-append (assoc-ref outputs "out") - "/src/golang.org/x/crypto/ed25519/testdata") - ".*\\.gz$")) - #t))))) + #:unpack-path "golang.org/x/crypto")) (synopsis "eXtended Tiny Encryption Algorithm (XTEA) in Go") (description "This package provides a Go implementation of the eXtended Tiny Encryption Algorithm (XTEA) block cipher.") @@ -902,9 +812,19 @@ (define-public go-golang-org-x-crypto-ed25519 (inherit go-golang-org-x-crypto-bcrypt) (name "go-golang-org-x-crypto-ed25519") (arguments - (substitute-keyword-arguments (package-arguments go-golang-org-x-crypto-bcrypt) - ((#:import-path _) - "golang.org/x/crypto/ed25519"))) + `(#:import-path "golang.org/x/crypto/ed25519" + #:unpack-path "golang.org/x/crypto" + #:phases + (modify-phases %standard-phases + (add-before 'reset-gzip-timestamps 'make-gzip-archive-writable + (lambda* (#:key outputs #:allow-other-keys) + (map (lambda (file) + (make-file-writable file)) + (find-files + (string-append (assoc-ref outputs "out") + "/src/golang.org/x/crypto/ed25519/testdata") + ".*\\.gz$")) + #t))))) (synopsis "ED25519 in Go") (description "This package provides a Go implementation of the ED25519 signature algorithm."))) @@ -946,48 +866,6 @@ (define-public go-golang-org-x-crypto-sha3 fixed-output-length hash functions and the SHAKE variable-output-length hash functions defined by FIPS-202."))) -;; Go searches for library modules by looking in the GOPATH environment -;; variable. This variable is a list of paths. However, Go does not -;; keep searching on GOPATH if it tries and fails to import a module. -;; So, we use a union for packages sharing a namespace. -(define* (go-golang-org-x-crypto-union #:optional - (packages (list go-golang-org-x-crypto-blowfish - go-golang-org-x-crypto-bcrypt - go-golang-org-x-crypto-tea - go-golang-org-x-crypto-xtea - go-golang-org-x-crypto-pbkdf2 - go-golang-org-x-crypto-twofish - go-golang-org-x-crypto-cast5 - go-golang-org-x-crypto-salsa20 - go-golang-org-x-crypto-ed25519 - go-golang-org-x-crypto-ripemd160 - go-golang-org-x-crypto-blake2s - go-golang-org-x-crypto-sha3))) - (package - (name "go-golang-org-x-crypto") - (version (package-version go-golang-org-x-crypto-bcrypt)) - (source #f) - (build-system trivial-build-system) - (arguments - '(#:modules ((guix build union)) - #:builder (begin - (use-modules (ice-9 match) - (guix build union)) - (match %build-inputs - (((names . directories) ...) - (union-build (assoc-ref %outputs "out") - directories) - #t))))) - (inputs (map (lambda (package) - (list (package-name package) package)) - packages)) - (synopsis "Union of the Go x crypto libraries") - (description "A union of the Golang cryptographic libraries. A -union is required because `go build` assumes that all of the headers and -libraries are in the same directory.") - (home-page (package-home-page go-golang-org-x-crypto-bcrypt)) - (license (package-license go-golang-org-x-crypto-bcrypt)))) - (define-public go-golang-org-x-net-ipv4 (let ((commit "d866cfc389cec985d6fda2859936a575a55a3ab6") (revision "1")) @@ -1279,18 +1157,7 @@ (define-public go-golang-org-x-crypto-ssh-terminal `(("go-golang-org-x-sys-unix" ,go-golang-org-x-sys-unix))) (arguments `(#:import-path "golang.org/x/crypto/ssh/terminal" - #:unpack-path "golang.org/x/crypto" - #:phases - (modify-phases %standard-phases - (add-before 'reset-gzip-timestamps 'make-gzip-archive-writable - (lambda* (#:key outputs #:allow-other-keys) - (map (lambda (file) - (make-file-writable file)) - (find-files - (string-append (assoc-ref outputs "out") - "/src/golang.org/x/crypto/ed25519/testdata") - ".*\\.gz$")) - #t))))) + #:unpack-path "golang.org/x/crypto")) (synopsis "Terminal functions for Go") (description "This package provides @{terminal}, which implements support functions for dealing with terminals, as commonly found on UNIX @@ -2340,32 +2207,6 @@ (define-public go-github-com-wtolson-go-taglib (description "Go wrapper for taglib") (license license:unlicense)))) -(define* (go-github-com-gogo-protobuf-union - #:optional (packages (list go-github-com-gogo-protobuf - go-github-com-gogo-protobuf-protoc-gen-gogo))) - (package - (name "go-github-com-gogo-protobuf-union") - (version (package-version go-github-com-gogo-protobuf)) - (source #f) - (build-system trivial-build-system) - (arguments - '(#:modules ((guix build union)) - #:builder (begin - (use-modules (ice-9 match) - (guix build union)) - (match %build-inputs - (((names . directories) ...) - (union-build (assoc-ref %outputs "out") - directories) - #t))))) - (inputs (map (lambda (package) - (list (package-name package) package)) - packages)) - (synopsis "Union of Go protobuf libraries") - (description "This is a union of Go protobuf libraries") - (home-page (package-home-page go-github-com-gogo-protobuf)) - (license (package-license go-github-com-gogo-protobuf)))) - (define-public go-github-com-gogo-protobuf (let ((commit "160de10b2537169b5ae3e7e221d28269ef40d311") (revision "2")) @@ -2798,7 +2639,8 @@ (define-public go-github-com-multiformats-go-multihash ("go-github-com-minio-blake2b-simd" ,go-github-com-minio-blake2b-simd) ("go-github-com-minio-sha256-simd" ,go-github-com-minio-sha256-simd) ("go-github-com-spaolacci-murmur3" ,go-github-com-spaolacci-murmur3) - ("go-golang-org-x-crypto-union" ,(go-golang-org-x-crypto-union)))) + ("go-golang-org-x-crypto-blake2s" ,go-golang-org-x-crypto-blake2s) + ("go-golang-org-x-crypto-sha3" ,go-golang-org-x-crypto-sha3))) (home-page "https://github.com/multiformats/go-multihash") (synopsis "Multihash implementation in Go") (description "Multihash implementation in Go.") @@ -2833,7 +2675,9 @@ (define-public go-github-com-libp2p-go-libp2p-peer ("go-github-com-multiformats-go-multihash" ,go-github-com-multiformats-go-multihash) ("go-github-com-gxed-hashland-keccakpg" ,go-github-com-gxed-hashland-keccakpg) ("go-github-com-spaolacci-murmur3" ,go-github-com-spaolacci-murmur3) - ("go-golang-org-x-crypto-union" ,(go-golang-org-x-crypto-union)))) + ("go-golang-org-x-crypto-blake2s" ,go-golang-org-x-crypto-blake2s) + ("go-golang-org-x-crypto-ed25519" ,go-golang-org-x-crypto-ed25519) + ("go-golang-org-x-crypto-sha3" ,go-golang-org-x-crypto-sha3))) (home-page "https://github.com/libp2p/go-libp2p-peer") (synopsis "PKI based identities for use in go-libp2p") (description "PKI based identities for use in @command{go-libp2p}.") @@ -2896,7 +2740,9 @@ (define-public go-github-com-libp2p-go-libp2p-metrics ("go-github-com-minio-blake2b-simd" ,go-github-com-minio-blake2b-simd) ("go-github-com-minio-sha256-simd" ,go-github-com-minio-sha256-simd) ("go-github-com-spaolacci-murmur3" ,go-github-com-spaolacci-murmur3) - ("go-golang-org-x-crypto-union" ,(go-golang-org-x-crypto-union)))) + ("go-golang-org-x-crypto-sha3" ,go-golang-org-x-crypto-sha3) + ("go-golang-org-x-crypto-ed25519" ,go-golang-org-x-crypto-ed25519) + ("go-golang-org-x-crypto-blake2s" ,go-golang-org-x-crypto-blake2s))) (home-page "https://github.com/libp2p/go-libp2p-metrics") (synopsis "Connection wrapper for go-libp2p that provides bandwidth metrics") (description "A connection wrapper for @command{go-libp2p} that provides bandwidth @@ -2969,7 +2815,8 @@ (define-public go-github-com-multiformats-go-multiaddr ("go-github-com-minio-sha256-simd" ,go-github-com-minio-sha256-simd) ("go-github-com-mr-tron-base58" ,go-github-com-mr-tron-base58) ("go-github-com-spaolacci-murmur3" ,go-github-com-spaolacci-murmur3) - ("go-golang-org-x-crypto-union" ,(go-golang-org-x-crypto-union)))) + ("go-golang-org-x-crypto-sha3" ,go-golang-org-x-crypto-sha3) + ("go-golang-org-x-crypto-blake2s" ,go-golang-org-x-crypto-blake2s))) (home-page "https://github.com/multiformats/go-multiaddr") (synopsis "Composable and future-proof network addresses") (description "Multiaddr is a standard way to represent addresses that @@ -3013,7 +2860,8 @@ (define-public go-github-com-multiformats-go-multiaddr-net ("go-github-com-minio-sha256-simd" ,go-github-com-minio-sha256-simd) ("go-github-com-mr-tron-base58" ,go-github-com-mr-tron-base58) ("go-github-com-spaolacci-murmur3" ,go-github-com-spaolacci-murmur3) - ("go-golang-org-x-crypto-union" ,(go-golang-org-x-crypto-union)))) + ("go-golang-org-x-crypto-sha3" ,go-golang-org-x-crypto-sha3) + ("go-golang-org-x-crypto-blake2s" ,go-golang-org-x-crypto-blake2s))) (home-page "https://github.com/multiformats/go-multiaddr-net") (synopsis "Multiaddress net tools") (description "This package provides Multiaddr specific versions of diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm index 9d00c9c981..014272352f 100644 --- a/gnu/packages/ipfs.scm +++ b/gnu/packages/ipfs.scm @@ -91,7 +91,9 @@ (define-public go-github-com-ipfs-go-ipfs-api ("go-github-com-minio-sha256-simd" ,go-github-com-minio-sha256-simd) ("go-github-com-mr-tron-base58" ,go-github-com-mr-tron-base58) ("go-github-com-multiformats-go-multihash" ,go-github-com-multiformats-go-multihash) - ("go-golang-org-x-crypto-union" ,(go-golang-org-x-crypto-union)) + ("go-golang-org-x-crypto-blake2s" ,go-golang-org-x-crypto-blake2s) + ("go-golang-org-x-crypto-ed25519" ,go-golang-org-x-crypto-ed25519) + ("go-golang-org-x-crypto-sha3" ,go-golang-org-x-crypto-sha3) ("go-github-com-spaolacci-murmur3" ,go-github-com-spaolacci-murmur3) ("go-github-com-gxed-hashland-keccakpg" ,go-github-com-gxed-hashland-keccakpg) ("go-github-com-whyrusleeping-tar-utils" ,go-github-com-whyrusleeping-tar-utils) @@ -137,14 +139,16 @@ (define-public gx ("go-github-com-multiformats-go-multihash" ,go-github-com-multiformats-go-multihash) ("go-github-com-spaolacci-murmur3" ,go-github-com-spaolacci-murmur3) ("go-github-com-whyrusleeping-tar-utils" ,go-github-com-whyrusleeping-tar-utils) - ("go-golang-org-x-crypto-union" ,(go-golang-org-x-crypto-union)) ("go-github-com-btcsuite-btcd-btcec" ,go-github-com-btcsuite-btcd-btcec) ("go-github-com-gogo-protobuf-proto" ,go-github-com-gogo-protobuf-proto) ("go-github-com-sabhiram-go-gitignore" ,go-github-com-sabhiram-go-gitignore) ("go-github-com-urfave-cli" ,go-github-com-urfave-cli) ("go-github-com-whyrusleeping-json-filter" ,go-github-com-whyrusleeping-json-filter) ("go-github-com-whyrusleeping-progmeter" ,go-github-com-whyrusleeping-progmeter) - ("go-github-com-whyrusleeping-stump" ,go-github-com-whyrusleeping-stump))) + ("go-github-com-whyrusleeping-stump" ,go-github-com-whyrusleeping-stump) + ("go-golang-org-x-crypto-blake2s" ,go-golang-org-x-crypto-blake2s) + ("go-golang-org-x-crypto-ed25519" ,go-golang-org-x-crypto-ed25519) + ("go-golang-org-x-crypto-sha3" ,go-golang-org-x-crypto-sha3))) (home-page "https://github.com/whyrusleeping/gx") (synopsis "Package management tool using IPFS") (description "@command{gx} is a packaging tool built around the @@ -197,13 +201,15 @@ (define-public gx-go ("go-github-com-multiformats-go-multihash" ,go-github-com-multiformats-go-multihash) ("go-github-com-spaolacci-murmur3" ,go-github-com-spaolacci-murmur3) ("go-github-com-whyrusleeping-tar-utils" ,go-github-com-whyrusleeping-tar-utils) - ("go-golang-org-x-crypto-union" ,(go-golang-org-x-crypto-union)) ("go-github-com-btcsuite-btcd-btcec" ,go-github-com-btcsuite-btcd-btcec) ("go-github-com-gogo-protobuf-proto" ,go-github-com-gogo-protobuf-proto) ("go-github-com-sabhiram-go-gitignore" ,go-github-com-sabhiram-go-gitignore) ("go-github-com-urfave-cli" ,go-github-com-urfave-cli) ("go-github-com-whyrusleeping-progmeter" ,go-github-com-whyrusleeping-progmeter) - ("go-github-com-whyrusleeping-stump" ,go-github-com-whyrusleeping-stump))) + ("go-github-com-whyrusleeping-stump" ,go-github-com-whyrusleeping-stump) + ("go-golang-org-x-crypto-blake2s" ,go-golang-org-x-crypto-blake2s) + ("go-golang-org-x-crypto-ed25519" ,go-golang-org-x-crypto-ed25519) + ("go-golang-org-x-crypto-sha3" ,go-golang-org-x-crypto-sha3))) (home-page "https://github.com/whyrusleeping/gx-go") (synopsis "Golang subtool for the @command{gx} package manager") (description "A subtool for the @command{gx} package manager for packages diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 5bb11b0400..90228e558a 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -555,33 +555,6 @@ (define-public go-github-com-thejerf-suture (home-page "https://github.com/thejerf/suture") (license expat)))) -(define* (go-github-com-vitrun-qart-union - #:optional (packages (list go-github-com-vitrun-qart-coding - go-github-com-vitrun-qart-gf256 - go-github-com-vitrun-qart-qr))) - (package - (name "go-github-com-vitrun-qart") - (version (package-version go-github-com-vitrun-qart-qr)) - (source #f) - (build-system trivial-build-system) - (arguments - '(#:modules ((guix build union)) - #:builder (begin - (use-modules (ice-9 match) - (guix build union)) - (match %build-inputs - (((names . directories) ...) - (union-build (assoc-ref %outputs "out") - directories) - #t))))) - (inputs (map (lambda (package) - (list (package-name package) package)) - packages)) - (synopsis "Union of qart libraries") - (description "This is a union of qart libraries.") - (home-page (package-home-page go-github-com-vitrun-qart-qr)) - (license (package-license go-github-com-vitrun-qart-qr)))) - (define-public go-github-com-vitrun-qart-coding (let ((commit "bf64b92db6b05651d6c25a3dabf2d543b360c0aa") (revision "0")) @@ -668,61 +641,6 @@ (define-public go-github-com-vitrun-qart-qr (home-page "https://github.com/vitrun/qart") (license bsd-3)))) -(define* (go-golang-org-x-net-union #:optional - (packages (list go-golang-org-x-net-ipv4 - go-golang-org-x-net-bpf - go-golang-org-x-net-ipv6 - go-golang-org-x-net-proxy - go-golang-org-x-net-internal-iana))) - (package - (name "go-golang-org-x-net") - (version (package-version go-golang-org-x-net-ipv4)) - (source #f) - (build-system trivial-build-system) - (arguments - '(#:modules ((guix build union)) - #:builder (begin - (use-modules (ice-9 match) - (guix build union)) - (match %build-inputs - (((names . directories) ...) - (union-build (assoc-ref %outputs "out") - directories) - #t))))) - (inputs (map (lambda (package) - (list (package-name package) package)) - packages)) - (synopsis "Union of the Go net libraries") - (description "A union of the Golang net libraries.") - (home-page (package-home-page go-golang-org-x-net-ipv4)) - (license (package-license go-golang-org-x-net-ipv4)))) - -(define* (go-golang-org-x-text-union #:optional - (packages (list go-golang-org-x-text-transform - go-golang-org-x-text-unicode-norm))) - (package - (name "go-golang-org-x-text") - (version (package-version go-golang-org-x-text-transform)) - (source #f) - (build-system trivial-build-system) - (arguments - '(#:modules ((guix build union)) - #:builder (begin - (use-modules (ice-9 match) - (guix build union)) - (match %build-inputs - (((names . directories) ...) - (union-build (assoc-ref %outputs "out") - directories) - #t))))) - (inputs (map (lambda (package) - (list (package-name package) package)) - packages)) - (synopsis "Union of the Go text libraries") - (description "A union of the Golang text libraries.") - (home-page (package-home-page go-golang-org-x-text-transform)) - (license (package-license go-golang-org-x-text-transform)))) - (define-public go-github-com-audriusbutkevicius-pfilter (let ((commit "9dca34a5b530bfc9843fa8aa2ff08ff9821032cb") (revision "2")) From 2fcd1c84af5750af9aa3f0cfb112d356195df3b7 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 6 Mar 2019 15:29:10 -0500 Subject: [PATCH 049/694] gnu: go-github-com-chmduquesne-rollinghash-adler32: Update to 4.0.0-0.a60f8e7. * gnu/packages/syncthing.scm (go-github-com-chmduquesne-rollinghash-adler32): Update to 4.0.0-0.a60f8e7. --- gnu/packages/syncthing.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 90228e558a..c35740e5cb 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -667,11 +667,11 @@ (define-public go-github-com-audriusbutkevicius-pfilter (license expat)))) (define-public go-github-com-chmduquesne-rollinghash-adler32 - (let ((commit "abb8cbaf9915e48ee20cae94bcd94221b61707a2") - (revision "2")) + (let ((commit "a60f8e7142b536ea61bb5d84014171189eeaaa81") + (revision "0")) (package (name "go-github-com-chmduquesne-rollinghash-adler32") - (version (git-version "0.0.0" revision commit)) + (version (git-version "4.0.0" revision commit)) (source (origin (method git-fetch) @@ -681,7 +681,7 @@ (define-public go-github-com-chmduquesne-rollinghash-adler32 (file-name (git-file-name name version)) (sha256 (base32 - "0ylqb9r60q77qw0d6g9cg4yzadxzwcw74lfd25cw9yglyq0wgd3l")))) + "0fpaqq4zb0wikgbhn7vwqqj1h865f5xy195vkhivsp922p7qwsjr")))) (build-system go-build-system) (arguments '(#:import-path "github.com/chmduquesne/rollinghash/adler32" From edda279fda5d528e09407fc44f2be7ad4a0ce1d9 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 6 Mar 2019 15:32:17 -0500 Subject: [PATCH 050/694] gnu: go-github-com-d4l3k-messagediff: Update to 1.2.1. * gnu/packages/syncthing.scm (go-github-com-d4l3k-messagediff): Update to 1.2.1. --- gnu/packages/syncthing.scm | 40 ++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index c35740e5cb..7f01008ad5 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -217,28 +217,26 @@ (define-public go-github-com-calmh-xdr (license expat)))) (define-public go-github-com-d4l3k-messagediff - (let ((commit "29f32d820d112dbd66e58492a6ffb7cc3106312b") - (revision "0")) - (package - (name "go-github-com-d4l3k-messagediff") - (version (git-version "1.1.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/d4l3k/messagediff") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "104hl8x57ciaz7mzafg1vp9qggxcyfm8hsv9bmlihbz9ml3nyr8v")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/d4l3k/messagediff")) - (synopsis "Diff arbitrary Go structs") - (description "Messagediff is a library for calculating diffs of arbitrary + (package + (name "go-github-com-d4l3k-messagediff") + (version "1.2.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/d4l3k/messagediff") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "104hl8x57ciaz7mzafg1vp9qggxcyfm8hsv9bmlihbz9ml3nyr8v")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/d4l3k/messagediff")) + (synopsis "Diff arbitrary Go structs") + (description "Messagediff is a library for calculating diffs of arbitrary structs in the Go programming language.") - (home-page "https://github.com/d4l3k/messagediff") - (license expat)))) + (home-page "https://github.com/d4l3k/messagediff") + (license expat))) (define-public go-github-com-gobwas-glob (let ((commit "51eb1ee00b6d931c66d229ceeb7c31b985563420") From 061387ea322b16ee28ef192c1f9e0b413097db8b Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 6 Mar 2019 15:34:04 -0500 Subject: [PATCH 051/694] gnu: go-github-com-syncthing-notify: Update to 0.0.0-4.4e389ea. * gnu/packages/syncthing.scm (go-github-com-syncthing-notify): Update to 0.0.0-4.4e389ea. --- gnu/packages/syncthing.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 7f01008ad5..b5ee59db71 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -797,8 +797,8 @@ (define-public go-github-com-kballard-go-shellquote (license expat)))) (define-public go-github-com-syncthing-notify - (let ((commit "116c45bb5ad48777321e4984d1320d56889b6097") - (revision "3")) + (let ((commit "4e389ea6c0d84e6195eb585ffaf62c8c143306ae") + (revision "4")) (package (name "go-github-com-syncthing-notify") (version (git-version "0.0.0" revision commit)) @@ -810,7 +810,7 @@ (define-public go-github-com-syncthing-notify (file-name (git-file-name name version)) (sha256 (base32 - "14bh95pkhwmnc65bnv08p3y4flj1j7f6xxr2cgmlwrphnlp9yhl9")))) + "19gvl14s1l9m82f8c2xsjcr8lmbqrvw1mxkayvfcpimvxfz0j61i")))) (build-system go-build-system) (arguments '(#:import-path "github.com/syncthing/notify")) From c36177c69873c32b617e12a44e8f084f0dea3a2a Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 6 Mar 2019 15:40:48 -0500 Subject: [PATCH 052/694] gnu: go-github-com-pkg-errors: Update to 0.8.1. * gnu/packages/syncthing.scm (go-github-com-pkg-errors): Update to 0.8.1. --- gnu/packages/syncthing.scm | 40 ++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index b5ee59db71..7e61d5ee89 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -691,28 +691,26 @@ (define-public go-github-com-chmduquesne-rollinghash-adler32 (license expat)))) (define-public go-github-com-pkg-errors - (let ((commit "e881fd58d78e04cf6d0de1217f8707c8cc2249bc") - (revision "1")) - (package - (name "go-github-com-pkg-errors") - (version (git-version "0.0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/pkg/errors.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0vfhj598jp6dzy4pbyjdrqxzb5kppw8ggvfh78g80nz11r34xnzs")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/pkg/errors")) - (synopsis "Go error handling primitives") - (description "This packages provides @code{error}, which offers simple + (package + (name "go-github-com-pkg-errors") + (version "0.8.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pkg/errors.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/pkg/errors")) + (synopsis "Go error handling primitives") + (description "This packages provides @code{error}, which offers simple error handling primitives in Go.") - (home-page "https://github.com/pkg/errors") - (license bsd-2)))) + (home-page "https://github.com/pkg/errors") + (license bsd-2))) (define-public go-github-com-petermattis-goid (let ((commit "3db12ebb2a599ba4a96bea1c17b61c2f78a40e02") From 767579d18bb35b5e25de173182f145b62b6c5536 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 6 Mar 2019 15:44:03 -0500 Subject: [PATCH 053/694] gnu: go-github-com-sasha-s-go-deadlock: Update to 0.2.0. * gnu/packages/syncthing.scm (go-github-com-sasha-s-go-deadlock): Update to 0.2.0. --- gnu/packages/syncthing.scm | 44 ++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 7e61d5ee89..41b6082182 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -469,30 +469,28 @@ (define-public go-github-com-rcrowley-go-metrics (license bsd-2)))) (define-public go-github-com-sasha-s-go-deadlock - (let ((commit "03d40e5dbd5488667a13b3c2600b2f7c2886f02f") - (revision "1")) - (package - (name "go-github-com-sasha-s-go-deadlock") - (version (git-version "0.1.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/sasha-s/go-deadlock") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "13p7b7pakd9k1c2k0fs1hfim3c8mivz679977ai6zb01s4aw7gyg")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/sasha-s/go-deadlock")) - (propagated-inputs - `(("go-github-com-petermattis-goid" ,go-github-com-petermattis-goid))) - (synopsis "Deadlock detection in go") - (description "This package provides tools for detecting deadlocks at + (package + (name "go-github-com-sasha-s-go-deadlock") + (version "0.2.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sasha-s/go-deadlock") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "13p7b7pakd9k1c2k0fs1hfim3c8mivz679977ai6zb01s4aw7gyg")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/sasha-s/go-deadlock")) + (propagated-inputs + `(("go-github-com-petermattis-goid" ,go-github-com-petermattis-goid))) + (synopsis "Deadlock detection in go") + (description "This package provides tools for detecting deadlocks at run-time in Go.") - (home-page "https://github.com/sasha-s/go-deadlock") - (license asl2.0)))) + (home-page "https://github.com/sasha-s/go-deadlock") + (license asl2.0))) (define-public go-github-com-syndtr-goleveldb (let ((commit "34011bf325bce385408353a30b101fe5e923eb6e") From ac51900dfdef2e6d293d81a55c80426f27e04705 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 6 Mar 2019 15:47:17 -0500 Subject: [PATCH 054/694] gnu: go-github-com-thejerf-suture: Update to 3.0.2. * gnu/packages/syncthing.scm (go-github-com-thejerf-suture): Update to 3.0.2. --- gnu/packages/syncthing.scm | 40 ++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 41b6082182..3dfb50ee94 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -521,25 +521,23 @@ (define-public go-github-com-syndtr-goleveldb (license bsd-2)))) (define-public go-github-com-thejerf-suture - (let ((commit "bf6ee6a0b047ebbe9ae07d847f750dd18c6a9276") - (revision "0")) - (package - (name "go-github-com-thejerf-suture") - (version (git-version "3.0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/thejerf/suture") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0rzx9k408vaglwnnpgpcs6y7ff7p65915nbg33rvbaz13hxwkz3y")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/thejerf/suture")) - (synopsis "Supervisor trees for Go") - (description "Suture provides Erlang-ish supervisor trees for Go. + (package + (name "go-github-com-thejerf-suture") + (version "3.0.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/thejerf/suture") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "03bdrl78jfwk0kw40lj63ga9cxhgccgss8yi9lp5j0m0ml7921gh")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/thejerf/suture")) + (synopsis "Supervisor trees for Go") + (description "Suture provides Erlang-ish supervisor trees for Go. \"Supervisor trees\" -> \"sutree\" -> \"suture\" -> holds your code together when it's trying to die. @@ -548,8 +546,8 @@ (define-public go-github-com-thejerf-suture dead services), while also making no unnecessary demands on the \"service\" code, and providing hooks to perform adequate logging with in a production environment") - (home-page "https://github.com/thejerf/suture") - (license expat)))) + (home-page "https://github.com/thejerf/suture") + (license expat))) (define-public go-github-com-vitrun-qart-coding (let ((commit "bf64b92db6b05651d6c25a3dabf2d543b360c0aa") From d73cbbda3e74ff6dc23ce5882130d126d24ecd13 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 6 Mar 2019 15:50:44 -0500 Subject: [PATCH 055/694] gnu: go-github-com-lib-pq: Update to 1.0.0. * gnu/packages/syncthing.scm (go-github-com-lib-pq): Update to 1.0.0. --- gnu/packages/syncthing.scm | 46 ++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 3dfb50ee94..74479e7a08 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -338,31 +338,29 @@ (define-public go-github-com-jackpal-gateway (license bsd-3)))) (define-public go-github-com-lib-pq - (let ((commit "83612a56d3dd153a94a629cd64925371c9adad78") - (revision "1")) - (package - (name "go-github-com-lib-pq") - (version (git-version "0.0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/lib/pq") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "12334yigh284k5cdvb9pgxaq6n78205jcbp75ajz44vvfd4wi6qc")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/lib/pq" - ;; The tests seem to fail without access to the network or a running - ;; Postgres instance. - #:tests? #f)) - (synopsis "Golang Postgres driver for Go's database/sql") - (description "This packages provides a pure Go Postgres driver for Go's + (package + (name "go-github-com-lib-pq") + (version "1.0.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/lib/pq") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1zqnnyczaf00xi6xh53vq758v5bdlf0iz7kf22l02cal4i6px47i")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/lib/pq" + ;; The tests seem to fail without access to the network or a running + ;; Postgres instance. + #:tests? #f)) + (synopsis "Golang Postgres driver for Go's database/sql") + (description "This packages provides a pure Go Postgres driver for Go's database/sql package.") - (home-page "https://github.com/lib/pq") - (license expat)))) + (home-page "https://github.com/lib/pq") + (license expat))) (define-public go-github-com-oschwald-geoip2-golang (package From 0c28ee8cc1e24fd9f5657e9f2b70a25b4342e1b5 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 6 Mar 2019 15:54:07 -0500 Subject: [PATCH 056/694] gnu: go-github-com-minio-sha256-simd: Update to 0.0.0-3.cc1980c. * gnu/packages/golang.scm (go-github-com-minio-sha256-simd): Update to 0.0.0-3.cc1980c. --- gnu/packages/golang.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index cf469f3fdd..5e21d87946 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -2436,8 +2436,8 @@ (define-public go-github-com-btcsuite-btcd-btcec (license license:isc)))) (define-public go-github-com-minio-sha256-simd - (let ((commit "51976451ce1942acbb55707a983ed232fa027110") - (revision "2")) + (let ((commit "cc1980cb03383b1d46f518232672584432d7532d") + (revision "3")) (package (name "go-github-com-minio-sha256-simd") (version (git-version "0.0.0" revision commit)) @@ -2450,7 +2450,7 @@ (define-public go-github-com-minio-sha256-simd (file-name (git-file-name name version)) (sha256 (base32 - "0kaxvpidf6ygkkb06vi95pirll31jnmywhyalfjvf7djhim2wr8f")))) + "04fp98nal0wsb26zwhw82spn5camxslc68g3xp8g4af9w6k9g31j")))) (build-system go-build-system) (arguments '(#:import-path "github.com/minio/sha256-simd")) From 4e9e74be074f6c270e30b4fa8a7f54e5f989358c Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 13 Mar 2019 12:43:27 -0400 Subject: [PATCH 057/694] gnu: Add go-github-com-audriusbutkevicius-recli. * gnu/packages/syncthing.scm (go-github-com-audriusbutkevicius-recli): New variable. --- gnu/packages/syncthing.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 74479e7a08..cc7ebe2fe8 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -145,6 +145,33 @@ (define-public go-github-com-audriusbutkevicius-go-nat-pmp (home-page "https://github.com/AudriusButkevicius/go-nat-pmp") (license asl2.0)))) +(define-public go-github-com-audriusbutkevicius-recli + (package + (name "go-github-com-audriusbutkevicius-recli") + (version "0.0.5") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/AudriusButkevicius/recli") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1m1xna1kb78pkmr1lfmvvnpk9j7c4x71j3a7c6vj7zpzc4srpsmf")))) + (build-system go-build-system) + (inputs + `(("go-github-com-pkg-errors" ,go-github-com-pkg-errors) + ("go-github-com-urfave-cli" ,go-github-com-urfave-cli))) + (arguments + `(#:import-path "github.com/AudriusButkevicius/recli")) + (synopsis "Reflection-based CLI generator") + (description "For a given struct, @code{recli} builds a set of +@code{urfave/cli} commands which allows you to modify it from the command line. +It is useful for generating command line clients for your application +configuration that is stored in a Go struct.") + (home-page "https://github.com/AudriusButkevicius/recli") + (license mpl2.0))) + (define-public go-github-com-bkaradzic-go-lz4 (let ((commit "7224d8d8f27ef618c0a95f1ae69dbb0488abc33a") (revision "0")) From 56f610f5c753d56f8c773252bd3c1f07a5c91442 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 13 Mar 2019 16:16:53 -0400 Subject: [PATCH 058/694] gnu: Add go-github-com-kr-text. * gnu/packages/golang.scm (go-github-com-kr-text): New variable. --- gnu/packages/golang.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 5e21d87946..cf162de854 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3104,3 +3104,24 @@ (define-public go-github-com-direnv-go-dotenv (description "This package provides a library for parsing the dotenv format in Go.") (license license:expat)))) + +(define-public go-github-com-kr-text + (package + (name "go-github-com-kr-text") + (version "0.1.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/kr/text.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/kr/text")) + (synopsis "Text formatting in Go") + (description "This package provides a text formatting functions in Go.") + (home-page "https://github.com/kr/text") + (license license:expat))) From aa413ff8f7b872ffffb94c152a46abc557d4b842 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 13 Mar 2019 16:17:17 -0400 Subject: [PATCH 059/694] gnu: Add go-github-com-kr-pretty. * gnu/packages/golang.scm (go-github-com-kr-pretty): New variable. --- gnu/packages/golang.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index cf162de854..5778fb8a89 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3105,6 +3105,29 @@ (define-public go-github-com-direnv-go-dotenv format in Go.") (license license:expat)))) +(define-public go-github-com-kr-pretty + (package + (name "go-github-com-kr-pretty") + (version "0.1.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/kr/pretty.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp")))) + (build-system go-build-system) + (propagated-inputs + `(("go-github-com-kr-text" ,go-github-com-kr-text))) + (arguments + '(#:import-path "github.com/kr/pretty")) + (synopsis "A pretty printer for Go values") + (description "This package provides a pretty printer for Go values.") + (home-page "https://github.com/kr/pretty") + (license license:expat))) + (define-public go-github-com-kr-text (package (name "go-github-com-kr-text") From 19ef857caa07762f8a3c3037f1265e2d194fe401 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 13 Mar 2019 16:04:58 -0400 Subject: [PATCH 060/694] gnu: go-gopkg.in-check.v1: Update to 0.0.0-1.788fd78. * gnu/packages/check.scm (go-gopkg.in-check.v1): Update to 0.0.0-1.788fd78. [propagated-inputs]: Add go-github-com-kr-pretty. --- gnu/packages/check.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 1abe738162..649d6d2f13 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -370,8 +370,8 @@ (define-public cxxtest (license license:lgpl3+))) (define-public go-gopkg.in-check.v1 - (let ((commit "20d25e2804050c1cd24a7eea1e7a6447dd0e74ec") - (revision "0")) + (let ((commit "788fd78401277ebd861206a03c884797c6ec5541") + (revision "1")) (package (name "go-gopkg.in-check.v1") (version (git-version "0.0.0" revision commit)) @@ -383,10 +383,12 @@ (define-public go-gopkg.in-check.v1 (file-name (git-file-name name version)) (sha256 (base32 - "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np")))) + "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a")))) (build-system go-build-system) (arguments '(#:import-path "gopkg.in/check.v1")) + (propagated-inputs + `(("go-github-com-kr-pretty" ,go-github-com-kr-pretty))) (synopsis "Rich testing extension for Go's testing package") (description "@code{check} is a rich testing extension for Go's testing package.") From 782dd442b58017391bb1c6f98d8eaa27c05074f3 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 13 Mar 2019 16:07:18 -0400 Subject: [PATCH 061/694] gnu: Go crypto libraries: Update to 0.0.0-2.0fcca48. * gnu/packages/golang.scm (go-golang-org-x-crypto-bcrypt, go-golang-org-x-crypto-blowfish, go-golang-org-x-crypto-pbkdf2, go-golang-org-x-crypto-tea, go-golang-org-x-crypto-salsa20, go-golang-org-x-crypto-cast5, go-golang-org-x-crypto-twofish, go-golang-org-x-crypto-xtea): Update to 0.0.0-2.0fcca48. --- gnu/packages/golang.scm | 48 ++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 5778fb8a89..b0b7626615 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -600,8 +600,8 @@ (define-public go-github-com-hashicorp-hcl (license license:mpl2.0)))) (define-public go-golang-org-x-crypto-bcrypt - (let ((commit "95a4943f35d008beabde8c11e5075a1b714e6419") - (revision "1")) + (let ((commit "0fcca4842a8d74bfddc2c96a073bd2a4d2a7a2e8") + (revision "2")) (package (name "go-golang-org-x-crypto-bcrypt") (version (git-version "0.0.0" revision commit)) @@ -614,7 +614,7 @@ (define-public go-golang-org-x-crypto-bcrypt version "-checkout")) (sha256 (base32 - "0bkm0jx9mxmi1liabb9c04kf765n7d0062zdp3zmvzyamsq00lcx")))) + "033ghifvrxmqr54nm8gmgxz7qxlqgw9z7z976kp88yf1rmxm2kjr")))) (build-system go-build-system) (arguments `(#:import-path "golang.org/x/crypto/bcrypt" @@ -626,8 +626,8 @@ (define-public go-golang-org-x-crypto-bcrypt (license license:bsd-3)))) (define-public go-golang-org-x-crypto-blowfish - (let ((commit "95a4943f35d008beabde8c11e5075a1b714e6419") - (revision "1")) + (let ((commit "0fcca4842a8d74bfddc2c96a073bd2a4d2a7a2e8") + (revision "2")) (package (name "go-golang-org-x-crypto-blowfish") (version (git-version "0.0.0" revision commit)) @@ -640,7 +640,7 @@ (define-public go-golang-org-x-crypto-blowfish version "-checkout")) (sha256 (base32 - "0bkm0jx9mxmi1liabb9c04kf765n7d0062zdp3zmvzyamsq00lcx")))) + "033ghifvrxmqr54nm8gmgxz7qxlqgw9z7z976kp88yf1rmxm2kjr")))) (build-system go-build-system) (arguments `(#:import-path "golang.org/x/crypto/blowfish" @@ -652,8 +652,8 @@ (define-public go-golang-org-x-crypto-blowfish (license license:bsd-3)))) (define-public go-golang-org-x-crypto-pbkdf2 - (let ((commit "95a4943f35d008beabde8c11e5075a1b714e6419") - (revision "1")) + (let ((commit "0fcca4842a8d74bfddc2c96a073bd2a4d2a7a2e8") + (revision "2")) (package (name "go-golang-org-x-crypto-pbkdf2") (version (git-version "0.0.0" revision commit)) @@ -666,7 +666,7 @@ (define-public go-golang-org-x-crypto-pbkdf2 version "-checkout")) (sha256 (base32 - "0bkm0jx9mxmi1liabb9c04kf765n7d0062zdp3zmvzyamsq00lcx")))) + "033ghifvrxmqr54nm8gmgxz7qxlqgw9z7z976kp88yf1rmxm2kjr")))) (build-system go-build-system) (arguments `(#:import-path "golang.org/x/crypto/pbkdf2" @@ -678,8 +678,8 @@ (define-public go-golang-org-x-crypto-pbkdf2 (license license:bsd-3)))) (define-public go-golang-org-x-crypto-tea - (let ((commit "95a4943f35d008beabde8c11e5075a1b714e6419") - (revision "1")) + (let ((commit "0fcca4842a8d74bfddc2c96a073bd2a4d2a7a2e8") + (revision "2")) (package (name "go-golang-org-x-crypto-tea") (version (git-version "0.0.0" revision commit)) @@ -692,7 +692,7 @@ (define-public go-golang-org-x-crypto-tea version "-checkout")) (sha256 (base32 - "0bkm0jx9mxmi1liabb9c04kf765n7d0062zdp3zmvzyamsq00lcx")))) + "033ghifvrxmqr54nm8gmgxz7qxlqgw9z7z976kp88yf1rmxm2kjr")))) (build-system go-build-system) (arguments `(#:import-path "golang.org/x/crypto/tea" @@ -704,8 +704,8 @@ (define-public go-golang-org-x-crypto-tea (license license:bsd-3)))) (define-public go-golang-org-x-crypto-salsa20 - (let ((commit "95a4943f35d008beabde8c11e5075a1b714e6419") - (revision "1")) + (let ((commit "0fcca4842a8d74bfddc2c96a073bd2a4d2a7a2e8") + (revision "2")) (package (name "go-golang-org-x-crypto-salsa20") (version (git-version "0.0.0" revision commit)) @@ -718,7 +718,7 @@ (define-public go-golang-org-x-crypto-salsa20 version "-checkout")) (sha256 (base32 - "0bkm0jx9mxmi1liabb9c04kf765n7d0062zdp3zmvzyamsq00lcx")))) + "033ghifvrxmqr54nm8gmgxz7qxlqgw9z7z976kp88yf1rmxm2kjr")))) (build-system go-build-system) (arguments `(#:import-path "golang.org/x/crypto/salsa20" @@ -730,8 +730,8 @@ (define-public go-golang-org-x-crypto-salsa20 (license license:bsd-3)))) (define-public go-golang-org-x-crypto-cast5 - (let ((commit "95a4943f35d008beabde8c11e5075a1b714e6419") - (revision "1")) + (let ((commit "0fcca4842a8d74bfddc2c96a073bd2a4d2a7a2e8") + (revision "2")) (package (name "go-golang-org-x-crypto-cast5") (version (git-version "0.0.0" revision commit)) @@ -744,7 +744,7 @@ (define-public go-golang-org-x-crypto-cast5 version "-checkout")) (sha256 (base32 - "0bkm0jx9mxmi1liabb9c04kf765n7d0062zdp3zmvzyamsq00lcx")))) + "033ghifvrxmqr54nm8gmgxz7qxlqgw9z7z976kp88yf1rmxm2kjr")))) (build-system go-build-system) (arguments `(#:import-path "golang.org/x/crypto/cast5" @@ -756,8 +756,8 @@ (define-public go-golang-org-x-crypto-cast5 (license license:bsd-3)))) (define-public go-golang-org-x-crypto-twofish - (let ((commit "95a4943f35d008beabde8c11e5075a1b714e6419") - (revision "1")) + (let ((commit "0fcca4842a8d74bfddc2c96a073bd2a4d2a7a2e8") + (revision "2")) (package (name "go-golang-org-x-crypto-twofish") (version (git-version "0.0.0" revision commit)) @@ -770,7 +770,7 @@ (define-public go-golang-org-x-crypto-twofish version "-checkout")) (sha256 (base32 - "0bkm0jx9mxmi1liabb9c04kf765n7d0062zdp3zmvzyamsq00lcx")))) + "033ghifvrxmqr54nm8gmgxz7qxlqgw9z7z976kp88yf1rmxm2kjr")))) (build-system go-build-system) (arguments `(#:import-path "golang.org/x/crypto/twofish" @@ -782,8 +782,8 @@ (define-public go-golang-org-x-crypto-twofish (license license:bsd-3)))) (define-public go-golang-org-x-crypto-xtea - (let ((commit "95a4943f35d008beabde8c11e5075a1b714e6419") - (revision "1")) + (let ((commit "0fcca4842a8d74bfddc2c96a073bd2a4d2a7a2e8") + (revision "2")) (package (name "go-golang-org-x-crypto-xtea") (version (git-version "0.0.0" revision commit)) @@ -796,7 +796,7 @@ (define-public go-golang-org-x-crypto-xtea version "-checkout")) (sha256 (base32 - "0bkm0jx9mxmi1liabb9c04kf765n7d0062zdp3zmvzyamsq00lcx")))) + "033ghifvrxmqr54nm8gmgxz7qxlqgw9z7z976kp88yf1rmxm2kjr")))) (build-system go-build-system) (arguments `(#:import-path "golang.org/x/crypto/xtea" From 3034d1a1930de4197bda3055991da6fcf823048e Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 13 Mar 2019 16:11:10 -0400 Subject: [PATCH 062/694] gnu: Go networking libraries: Update to 0.0.0-2.351d144. * gnu/packages/golang.scm (go-golang-org-x-net-internal-socks, go-golang-org-x-net-internal-socket): New variables. (go-golang-org-x-net-ipv4, go-golang-org-x-net-bpf, go-golang-org-x-net-context, go-golang-org-x-net-internal-iana, go-golang-org-x-net-ipv6, go-golang-org-x-net-proxy): Update to 0.0.0-2.351d144. --- gnu/packages/golang.scm | 86 ++++++++++++++++++++++++++++++++--------- 1 file changed, 68 insertions(+), 18 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index b0b7626615..d5abaa089d 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -867,8 +867,8 @@ (define-public go-golang-org-x-crypto-sha3 functions defined by FIPS-202."))) (define-public go-golang-org-x-net-ipv4 - (let ((commit "d866cfc389cec985d6fda2859936a575a55a3ab6") - (revision "1")) + (let ((commit "351d144fa1fc0bd934e2408202be0c29f25e35a0") + (revision "2")) (package (name "go-golang-org-x-net-ipv4") (version (git-version "0.0.0" revision commit)) @@ -880,7 +880,7 @@ (define-public go-golang-org-x-net-ipv4 (file-name (git-file-name name version)) (sha256 (base32 - "10iahqcsiih5hgmqw8yfgv5b3fimfwl1skxg5062avcjjks59f03")))) + "1c5x25qjyz83y92bq0lll5kmznyi3m02wd4c54scgf0866gy938k")))) (build-system go-build-system) (arguments `(#:import-path "golang.org/x/net/ipv4" @@ -892,8 +892,8 @@ (define-public go-golang-org-x-net-ipv4 (license license:bsd-3)))) (define-public go-golang-org-x-net-bpf - (let ((commit "d866cfc389cec985d6fda2859936a575a55a3ab6") - (revision "1")) + (let ((commit "351d144fa1fc0bd934e2408202be0c29f25e35a0") + (revision "2")) (package (name "go-golang-org-x-net-bpf") (version (git-version "0.0.0" revision commit)) @@ -906,7 +906,7 @@ (define-public go-golang-org-x-net-bpf version "-checkout")) (sha256 (base32 - "10iahqcsiih5hgmqw8yfgv5b3fimfwl1skxg5062avcjjks59f03")))) + "1c5x25qjyz83y92bq0lll5kmznyi3m02wd4c54scgf0866gy938k")))) (build-system go-build-system) (arguments `(#:import-path "golang.org/x/net/bpf" @@ -918,8 +918,8 @@ (define-public go-golang-org-x-net-bpf (license license:bsd-3)))) (define-public go-golang-org-x-net-context - (let ((commit "d866cfc389cec985d6fda2859936a575a55a3ab6") - (revision "1")) + (let ((commit "351d144fa1fc0bd934e2408202be0c29f25e35a0") + (revision "2")) (package (name "go-golang-org-x-net-context") (version (git-version "0.0.0" revision commit)) @@ -932,7 +932,7 @@ (define-public go-golang-org-x-net-context version "-checkout")) (sha256 (base32 - "10iahqcsiih5hgmqw8yfgv5b3fimfwl1skxg5062avcjjks59f03")))) + "1c5x25qjyz83y92bq0lll5kmznyi3m02wd4c54scgf0866gy938k")))) (build-system go-build-system) (arguments `(#:import-path "golang.org/x/net/context" @@ -944,9 +944,59 @@ (define-public go-golang-org-x-net-context (home-page "https://go.googlesource.com/net/") (license license:bsd-3)))) +(define-public go-golang-org-x-net-internal-socks + (let ((commit "351d144fa1fc0bd934e2408202be0c29f25e35a0") + (revision "2")) + (package + (name "go-golang-org-x-net-internal-socks") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/net") + (commit commit))) + (file-name (string-append "go.googlesource.com-net-" + version "-checkout")) + (sha256 + (base32 + "1c5x25qjyz83y92bq0lll5kmznyi3m02wd4c54scgf0866gy938k")))) + (build-system go-build-system) + (arguments + `(#:import-path "golang.org/x/net/internal/socks" + #:unpack-path "golang.org/x/net")) + (synopsis "") + (description "") + (home-page "https://go.googlesource.com/net/") + (license license:bsd-3)))) + +(define-public go-golang-org-x-net-internal-socket + (let ((commit "351d144fa1fc0bd934e2408202be0c29f25e35a0") + (revision "2")) + (package + (name "go-golang-org-x-net-internal-socket") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/net") + (commit commit))) + (file-name (string-append "go.googlesource.com-net-" + version "-checkout")) + (sha256 + (base32 + "1c5x25qjyz83y92bq0lll5kmznyi3m02wd4c54scgf0866gy938k")))) + (build-system go-build-system) + (arguments + `(#:import-path "golang.org/x/net/internal/socket" + #:unpack-path "golang.org/x/net")) + (synopsis "") + (description "") + (home-page "https://go.googlesource.com/net/") + (license license:bsd-3)))) + (define-public go-golang-org-x-net-internal-iana - (let ((commit "d866cfc389cec985d6fda2859936a575a55a3ab6") - (revision "1")) + (let ((commit "351d144fa1fc0bd934e2408202be0c29f25e35a0") + (revision "2")) (package (name "go-golang-org-x-net-internal-iana") (version (git-version "0.0.0" revision commit)) @@ -959,7 +1009,7 @@ (define-public go-golang-org-x-net-internal-iana version "-checkout")) (sha256 (base32 - "10iahqcsiih5hgmqw8yfgv5b3fimfwl1skxg5062avcjjks59f03")))) + "1c5x25qjyz83y92bq0lll5kmznyi3m02wd4c54scgf0866gy938k")))) (build-system go-build-system) (arguments `(#:import-path "golang.org/x/net/internal/iana" @@ -971,8 +1021,8 @@ (define-public go-golang-org-x-net-internal-iana (license license:bsd-3)))) (define-public go-golang-org-x-net-ipv6 - (let ((commit "d866cfc389cec985d6fda2859936a575a55a3ab6") - (revision "1")) + (let ((commit "351d144fa1fc0bd934e2408202be0c29f25e35a0") + (revision "2")) (package (name "go-golang-org-x-net-ipv6") (version (git-version "0.0.0" revision commit)) @@ -985,7 +1035,7 @@ (define-public go-golang-org-x-net-ipv6 version "-checkout")) (sha256 (base32 - "10iahqcsiih5hgmqw8yfgv5b3fimfwl1skxg5062avcjjks59f03")))) + "1c5x25qjyz83y92bq0lll5kmznyi3m02wd4c54scgf0866gy938k")))) (build-system go-build-system) (arguments `(#:import-path "golang.org/x/net/ipv6" @@ -997,8 +1047,8 @@ (define-public go-golang-org-x-net-ipv6 (license license:bsd-3)))) (define-public go-golang-org-x-net-proxy - (let ((commit "d866cfc389cec985d6fda2859936a575a55a3ab6") - (revision "1")) + (let ((commit "351d144fa1fc0bd934e2408202be0c29f25e35a0") + (revision "2")) (package (name "go-golang-org-x-net-proxy") (version (git-version "0.0.0" revision commit)) @@ -1011,7 +1061,7 @@ (define-public go-golang-org-x-net-proxy version "-checkout")) (sha256 (base32 - "10iahqcsiih5hgmqw8yfgv5b3fimfwl1skxg5062avcjjks59f03")))) + "1c5x25qjyz83y92bq0lll5kmznyi3m02wd4c54scgf0866gy938k")))) (build-system go-build-system) (arguments `(#:import-path "golang.org/x/net/proxy" From b3f0f8a62e7f7f34c85badee7f8dc158017382f0 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 13 Mar 2019 16:12:37 -0400 Subject: [PATCH 063/694] gnu: go-golang-org-x-sys-unix: Update to 0.0.0-2.4d1cda0. * gnu/packages/golang.scm (go-golang-org-x-sys-unix): Update to 0.0.0-2.4d1cda0. [arguments]: Remove the 'patch-tests' phase. --- gnu/packages/golang.scm | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index d5abaa089d..348527f893 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -1073,8 +1073,8 @@ (define-public go-golang-org-x-net-proxy (license license:bsd-3)))) (define-public go-golang-org-x-sys-unix - (let ((commit "83801418e1b59fb1880e363299581ee543af32ca") - (revision "1")) + (let ((commit "4d1cda033e0619309c606fc686de3adcf599539e") + (revision "2")) (package (name "go-golang-org-x-sys-unix") (version (git-version "0.0.0" revision commit)) @@ -1086,19 +1086,11 @@ (define-public go-golang-org-x-sys-unix (file-name (git-file-name name version)) (sha256 (base32 - "0ilykaanvnzb27d42kmbr4i37hcn7hgqbx98z945gy63aa8dskji")))) + "1wgaldbnkmh568v8kkgvnmkskaj96fqrbzhx23yji2kh1432q6gh")))) (build-system go-build-system) (arguments `(#:import-path "golang.org/x/sys/unix" - #:unpack-path "golang.org/x/sys" - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-tests - (lambda _ - (pk (getcwd)) - (substitute* "src/golang.org/x/sys/unix/syscall_unix_test.go" - (("/usr/bin") "/tmp")) - #t))))) + #:unpack-path "golang.org/x/sys")) (synopsis "Go support for low-level system interaction") (description "This package provides @code{unix}, which offers Go support for low-level interaction with the operating system.") From 24e3520dd0260eb81a90bc6bd007cbf17c381bb0 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 13 Mar 2019 16:15:46 -0400 Subject: [PATCH 064/694] gnu: go-github-com-mattn-go-isatty: Use upstream version string. * gnu/packages/golang.scm (go-github-com-mattn-go-isatty): Use upstream version. --- gnu/packages/golang.scm | 42 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 348527f893..190d4c802f 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -1855,30 +1855,28 @@ (define-public go-gopkg-in-yaml-v2 (license license:asl2.0)))) (define-public go-github-com-mattn-go-isatty - (let ((commit "6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c") - (revision "0")) - (package - (name "go-github-com-mattn-go-isatty") - (version (git-version "0.0.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/mattn/go-isatty") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/mattn/go-isatty")) - (home-page "https://github.com/mattn/go-isatty") - (synopsis "Provide @code{isatty} for Golang") - (description "This package provides @code{isatty}, a Go module that can + (package + (name "go-github-com-mattn-go-isatty") + (version "0.0.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mattn/go-isatty") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/mattn/go-isatty")) + (home-page "https://github.com/mattn/go-isatty") + (synopsis "Provide @code{isatty} for Golang") + (description "This package provides @code{isatty}, a Go module that can tell you whether a file descriptor points to a terminal and the type of the terminal.") - (license license:expat)))) + (license license:expat))) (define-public go-github-com-mattn-go-colorable (let ((commit "efa589957cd060542a26d2dd7832fd6a6c6c3ade") From c83f9f661dab95e1387afaece7b8b7c6189aebba Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 13 Mar 2019 16:18:41 -0400 Subject: [PATCH 065/694] gnu: go-github-com-urfave-cli: Update to 1.20.0-0.693af58. * gnu/packages/golang.scm (go-github-com-urfave-cli): Update to 1.20.0-0.693af58. --- gnu/packages/golang.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 190d4c802f..cffe6227cc 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -2995,11 +2995,11 @@ (define-public go-github-com-sabhiram-go-gitignore (license license:expat)))) (define-public go-github-com-urfave-cli - (let ((commit "934abfb2f102315b5794e15ebc7949e4ca253920") + (let ((commit "693af58b4d51b8fcc7f9d89576da170765980581") (revision "0")) (package (name "go-github-com-urfave-cli") - (version (git-version "1.19.1" revision commit)) + (version (git-version "1.20.0" revision commit)) (source (origin (method git-fetch) @@ -3009,7 +3009,7 @@ (define-public go-github-com-urfave-cli (file-name (git-file-name name version)) (sha256 (base32 - "0c5r8pgj3k48dfcwj8lw3cxkwkl8vh0fhvz5snfdwd0bcxdqx1yq")))) + "1krq752xgy658an1696vf4dc2zmp541clwjinhn11394sx2qksh6")))) (build-system go-build-system) (arguments '(#:import-path "github.com/urfave/cli")) From e3f14f47ffcbefa3c37910403f73e556524265ca Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 13 Mar 2019 16:57:55 -0400 Subject: [PATCH 066/694] gnu: Add go-github-com-gogo-protobuf-gogoproto. * gnu/packages/golang.scm (go-github-com-gogo-protobuf-gogoproto): 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 cffe6227cc..1211827dc3 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -2316,6 +2316,30 @@ (define-public go-github-com-gogo-protobuf-protoc-gen-gogo (home-page "https://github.com/gogo/protobuf") (license license:bsd-3)))) +(define-public go-github-com-gogo-protobuf-gogoproto + (package + (name "go-github-com-gogo-protobuf-gogoproto") + (version "1.2.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gogo/protobuf.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "06yqa6h0kw3gr5pc3qmas7f7435a96zf7iw7p0l00r2hqf6fqq6m")))) + (build-system go-build-system) + (arguments + '(#:unpack-path "github.com/gogo/protobuf" + #:import-path "github.com/gogo/protobuf/gogoproto")) + (home-page "https://github.com/gogo/protobuf") + (synopsis "Extensions to protocol buffers") + (description "This package provides extensions to the Gogo protocol buffers +implementation.") + (license license:bsd-3))) + (define-public go-github-com-gogo-protobuf-proto (let ((commit "fd322a3c49630fe6d05737e2b7d9426e6680e28d") From 2f9bbd8e6c49a4c204d05a87710e83d69ad80d1f Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 13 Mar 2019 17:08:29 -0400 Subject: [PATCH 067/694] gnu: Gogo protocol buffers: Update to 1.2.1. * gnu/packages/golang.scm (go-github-com-gogo-protobuf, go-github-com-gogo-protobuf-protoc-gen-gogo, go-github-com-gogo-protobuf-gogoproto, go-github-com-gogo-protobuf-proto): Update to 1.2.1. (go-github-com-gogo-protobuf-proto)[license] Fix license. [synopsis, description]: Complete. (go-github-com-gogo-protobuf-protoc-gen-gogo)[arguments]: Skip the tests. --- gnu/packages/golang.scm | 135 +++++++++++++++++++--------------------- 1 file changed, 63 insertions(+), 72 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 1211827dc3..1a67822f07 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -2248,29 +2248,24 @@ (define-public go-github-com-wtolson-go-taglib (license license:unlicense)))) (define-public go-github-com-gogo-protobuf - (let ((commit "160de10b2537169b5ae3e7e221d28269ef40d311") - (revision "2")) - (package - (name "go-github-com-gogo-protobuf") - (version (git-version "0.5" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/gogo/protobuf") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0hxq28sgxym04rv0q40gpwkh4ni359q21hq3g78wwxwx4qfd4zwm")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/gogo/protobuf/proto" - #:unpack-path "github.com/gogo/protobuf")) - (propagated-inputs - `(("go-github-com-gogo-protobuf-protoc-gen-gogo" - ,go-github-com-gogo-protobuf-protoc-gen-gogo))) - (synopsis "Protocol Buffers for Go with Gadgets") - (description "Gogoprotobuf is a fork of golang/protobuf with extra code + (package + (name "go-github-com-gogo-protobuf") + (version "1.2.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gogo/protobuf") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "06yqa6h0kw3gr5pc3qmas7f7435a96zf7iw7p0l00r2hqf6fqq6m")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/gogo/protobuf/proto" + #:unpack-path "github.com/gogo/protobuf")) + (synopsis "Protocol Buffers for Go with Gadgets") + (description "Gogoprotobuf is a fork of golang/protobuf with extra code generation features. This code generation is used to achieve: @itemize @item fast marshalling and unmarshalling @@ -2280,30 +2275,29 @@ (define-public go-github-com-gogo-protobuf @item peace of mind by optionally generating test and benchmark code @item other serialization formats @end itemize") - (home-page "https://github.com/gogo/protobuf") - (license license:bsd-3)))) + (home-page "https://github.com/gogo/protobuf") + (license license:bsd-3))) (define-public go-github-com-gogo-protobuf-protoc-gen-gogo - (let ((commit "efccd33a0c20aa078705571d5ddbfa14c8395a63") - (revision "0")) - (package - (name "go-github-com-gogo-protobuf-protoc-gen-gogo") - (version (git-version "0.2" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/gogo/protobuf") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "09kfa3aqmhh7p0rc6wd4fw5cjccidsk9vgcy13albv0g8vnbmmgw")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/gogo/protobuf/protoc-gen-gogo" - #:unpack-path "github.com/gogo/protobuf")) - (synopsis "Protocol Buffers for Go with Gadgets") - (description "Gogoprotobuf is a fork of golang/protobuf with extra code + (package + (name "go-github-com-gogo-protobuf-protoc-gen-gogo") + (version "1.2.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gogo/protobuf") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "06yqa6h0kw3gr5pc3qmas7f7435a96zf7iw7p0l00r2hqf6fqq6m")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/gogo/protobuf/protoc-gen-gogo" + #:unpack-path "github.com/gogo/protobuf" + #:tests? #f)) ; Requires the unpackaged 'protoc-min-version' + (synopsis "Protocol Buffers for Go with Gadgets") + (description "Gogoprotobuf is a fork of golang/protobuf with extra code generation features. This code generation is used to achieve: @itemize @item fast marshalling and unmarshalling @@ -2313,8 +2307,8 @@ (define-public go-github-com-gogo-protobuf-protoc-gen-gogo @item peace of mind by optionally generating test and benchmark code @item other serialization formats @end itemize") - (home-page "https://github.com/gogo/protobuf") - (license license:bsd-3)))) + (home-page "https://github.com/gogo/protobuf") + (license license:bsd-3))) (define-public go-github-com-gogo-protobuf-gogoproto (package @@ -2341,31 +2335,28 @@ (define-public go-github-com-gogo-protobuf-gogoproto (license license:bsd-3))) (define-public go-github-com-gogo-protobuf-proto - (let ((commit - "fd322a3c49630fe6d05737e2b7d9426e6680e28d") - (revision "0")) - (package - (name "go-github-com-gogo-protobuf-proto") - (version (git-version "0.0.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/gogo/protobuf.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1zi85584dy91hyrwpanygz1pppi0chn3hzzv128i83i6j45a5fp9")))) - (build-system go-build-system) - (arguments - '(#:unpack-path "github.com/gogo/protobuf" - #:import-path "github.com/gogo/protobuf/proto")) - (native-inputs `()) - (home-page "https://github.com/gogo/protobuf") - (synopsis "XXX") - (description "XXX") - (license license:expat)))) + (package + (name "go-github-com-gogo-protobuf-proto") + (version "1.2.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gogo/protobuf.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "06yqa6h0kw3gr5pc3qmas7f7435a96zf7iw7p0l00r2hqf6fqq6m")))) + (build-system go-build-system) + (arguments + '(#:unpack-path "github.com/gogo/protobuf" + #:import-path "github.com/gogo/protobuf/proto")) + (home-page "https://github.com/gogo/protobuf") + (synopsis "Protocol buffers component") + (description "This is a component of the Gogo protocol buffers +implementation.") + (license license:bsd-3))) (define-public go-github-com-libp2p-go-flow-metrics (let ((commit "7e5a55af485341567f98d6847a373eb5ddcdcd43") From 7dc89dc6a1e1a66e8306aef218004677382d63fe Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 13 Mar 2019 17:21:40 -0400 Subject: [PATCH 068/694] gnu: Add go-github-com-flynn-archive-go-shlex. * gnu/packages/syncthing.scm (go-github-com-flynn-archive-go-shlex): New variable. --- gnu/packages/syncthing.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index cc7ebe2fe8..c6b986c9c7 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -1183,3 +1183,27 @@ (define-public go-gopkg.in-ldap.v2 language.") (home-page "https://gopkg.in/ldap.v2") (license expat))) + +(define-public go-github-com-flynn-archive-go-shlex + (let ((commit "3f9db97f856818214da2e1057f8ad84803971cff") + (revision "0")) + (package + (name "go-github-com-flynn-archive-go-shlex") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/flynn-archive/go-shlex.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1j743lysygkpa2s2gii2xr32j7bxgc15zv4113b0q9jhn676ysia")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/flynn-archive/go-shlex")) + (synopsis "Go lexer") + (description "Shlex is a simple lexer for go that supports shell-style +quoting, commenting, and escaping.") + (home-page "https://github.com/flynn-archive/go-shlex") + (license asl2.0)))) From fef131b4604ca4a9d9b395c16d1c87f1ff32a1c0 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 13 Mar 2019 17:26:19 -0400 Subject: [PATCH 069/694] gnu: go-github-com-calmh-xdr: Update to 1.1.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The diff shows this package being downgraded from 2.0.1 to 1.1.0. However, '2.0.1' was a typo — it should have read 1.0.1. * gnu/packages/syncthing.scm (go-github-com-calmh-xdr): Update to 1.1.0. --- gnu/packages/syncthing.scm | 40 ++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index c6b986c9c7..20933b3b8c 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -219,29 +219,27 @@ (define-public go-github-com-calmh-du (license public-domain))) (define-public go-github-com-calmh-xdr - (let ((commit "08e072f9cb164f943a92eb59f90f3abc64ac6e8f") - (revision "0")) - (package - (name "go-github-com-calmh-xdr") - (version (git-version "2.0.1" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/calmh/xdr") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "072wqdncz3nd4a3zkhvzzx1y3in1lm29wfvl0d8wrnqs5pyqh0mh")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/calmh/xdr")) - (synopsis "XDR marshalling and unmarshalling") - (description "XDR is an External Data Representation (XDR) + (package + (name "go-github-com-calmh-xdr") + (version "1.1.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/calmh/xdr") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "072wqdncz3nd4a3zkhvzzx1y3in1lm29wfvl0d8wrnqs5pyqh0mh")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/calmh/xdr")) + (synopsis "XDR marshalling and unmarshalling") + (description "XDR is an External Data Representation (XDR) marshalling and unmarshalling library in Go. It uses code generation and not reflection.") - (home-page "https://github.com/calmh/xdr") - (license expat)))) + (home-page "https://github.com/calmh/xdr") + (license expat))) (define-public go-github-com-d4l3k-messagediff (package From bafdb0fa0994006c4974b4762031af91b233beda Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 13 Mar 2019 17:31:24 -0400 Subject: [PATCH 070/694] gnu: Add go-github-com-prometheus-common-model. * gnu/packages/syncthing.scm (go-github-com-prometheus-common-model): New variable. --- gnu/packages/syncthing.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 20933b3b8c..708eae9850 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -1000,6 +1000,31 @@ (define-public go-github-com-prometheus-common-expfmt (home-page "https://github.com/prometheus/common") (license asl2.0)))) +(define-public go-github-com-prometheus-common-model + (let ((commit "2e54d0b93cba2fd133edc32211dcc32c06ef72ca") + (revision "0")) + (package + (name "go-github-com-prometheus-common-model") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/prometheus/common.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "14kn5w7imcxxlfdqxl21fsnlf1ms7200g3ldy29hwamldv8qlm7j")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/prometheus/common/model" + #:unpack-path "github.com/prometheus/common")) + (synopsis "Prometheus component") + (description "This package provides a component of the Go Prometheus +implementation.") + (home-page "https://github.com/prometheus/common") + (license asl2.0)))) + (define-public go-github-com-prometheus-procfs (let ((commit "b15cd069a83443be3154b719d0cc9fe8117f09fb") (revision "0")) From 9d81bab8e1c0735b4c1c3b18cc347d5138a63510 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 13 Mar 2019 17:34:45 -0400 Subject: [PATCH 071/694] gnu: Add go-github-com-prometheus-common-internal-bitbucket-org-ww-goautoneg. * gnu/packages/syncthing.scm (go-github-com-prometheus-common-internal-bitbucket-org-ww-goautoneg): New variable. --- gnu/packages/syncthing.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 708eae9850..902ad1c795 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -1230,3 +1230,25 @@ (define-public go-github-com-flynn-archive-go-shlex quoting, commenting, and escaping.") (home-page "https://github.com/flynn-archive/go-shlex") (license asl2.0)))) + +(define-public go-github-com-prometheus-common-internal-bitbucket-org-ww-goautoneg + (package + (name "go-github-com-prometheus-common-internal-bitbucket-org-ww-goautoneg") + (version "0.2.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/prometheus/common.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "02kym6lcfnlq23qbv277jr0q1n7jj0r14gqg93c7wn7gc44jv3vp")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg" + #:unpack-path "github.com/prometheus/common")) + (synopsis "Internal Prometheus component") + (description "This package is an internal component of Prometheus.") + (home-page "https://github.com/prometheus/common") + (license asl2.0))) From 94b1e5e037a4f3199b08a963825dea7793f30337 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 13 Mar 2019 17:35:49 -0400 Subject: [PATCH 072/694] gnu: Prometheus client: Update to 0.9.2. * gnu/packages/syncthing.scm (go-github-com-client-golang-prometheus-promhttp, go-github-com-client-golang-prometheus): Update to 0.9.2. (go-github-com-client-golang-prometheus-promhttp) [propagated-inputs]: Add go-github-com-prometheus-common-model and go-github-com-prometheus-common-internal-bitbucket-org-ww-goautoneg. (go-github-com-client-golang-prometheus)[propagated-inputs]: Remove go-github-com-golang-protobuf-proto and go-github-com-client-golang-prometheus-promhttp. Add go-github-com-prometheus-common-model and go-github-com-prometheus-common-internal-bitbucket-org-ww-goautoneg. (go-github-com-prometheus-union): Delete variable. --- gnu/packages/syncthing.scm | 59 +++++++++++--------------------------- 1 file changed, 16 insertions(+), 43 deletions(-) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 902ad1c795..aaa4b8ad6a 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -1050,20 +1050,18 @@ (define-public go-github-com-prometheus-procfs (license asl2.0)))) (define-public go-github-com-client-golang-prometheus-promhttp - (let ((commit "180b8fdc22b4ea7750bcb43c925277654a1ea2f3") - (revision "0")) (package (name "go-github-com-client-golang-prometheus-promhttp") - (version (git-version "0.0.0" revision commit)) + (version "0.9.2") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/prometheus/client_golang.git") - (commit commit))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "1kkfx1j9ka18ydsmdi2cdy3hs39c22b39mbc4laykmj2x93lmbdp")))) + "02b4yg6rfag0m3j0i39sillcm5xczwv8h133vn12yr8qw04cnigs")))) (build-system go-build-system) (arguments '(#:tests? #f ; The tests require internet access @@ -1074,8 +1072,12 @@ (define-public go-github-com-client-golang-prometheus-promhttp ,go-github-com-beorn7-perks-quantile) ("go-github-com-golang-protobuf-proto" ,go-github-com-golang-protobuf-proto) + ("go-github-com-prometheus-common-model" + ,go-github-com-prometheus-common-model) ("go-github-com-prometheus-client-model-go" ,go-github-com-prometheus-client-model-go) + ("go-github-com-prometheus-common-internal-bitbucket-org-ww-goautoneg" + ,go-github-com-prometheus-common-internal-bitbucket-org-ww-goautoneg) ("go-github-com-prometheus-common-expfmt" ,go-github-com-prometheus-common-expfmt) ("go-github-com-prometheus-procfs" ,go-github-com-prometheus-procfs))) @@ -1083,23 +1085,21 @@ (define-public go-github-com-client-golang-prometheus-promhttp (description "This package @code{promhttp} provides HTTP client and server tools for Prometheus metrics.") (home-page "https://github.com/prometheus/client_golang") - (license asl2.0)))) + (license asl2.0))) -(define-public go-github-com-client-golang-prometheus - (let ((commit "7e9098b20fb8e103a7a5691878272d7e3d703663") - (revision "0")) +(define-public go-github-com-prometheus-client-golang-prometheus (package (name "go-github-com-prometheus-client-golang-prometheus") - (version (git-version "0.9.1" revision commit)) + (version "0.9.2") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/prometheus/client_golang.git") - (commit commit))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "09q8hlvgyn58hn8fmmj535hrwhqc1215czwzf7fhaqpa9zamj4w1")))) + "02b4yg6rfag0m3j0i39sillcm5xczwv8h133vn12yr8qw04cnigs")))) (build-system go-build-system) (arguments '(#:import-path "github.com/prometheus/client_golang/prometheus" @@ -1108,48 +1108,21 @@ (define-public go-github-com-client-golang-prometheus (propagated-inputs `(("go-github-com-beorn7-perks-quantile" ,go-github-com-beorn7-perks-quantile) - ("go-github-com-golang-protobuf-proto" - ,go-github-com-golang-protobuf-proto) + ("go-github-com-prometheus-common-model" ,go-github-com-prometheus-common-model) ("go-github-com-prometheus-client-model-go" ,go-github-com-prometheus-client-model-go) ("go-github-com-prometheus-common-expfmt" ,go-github-com-prometheus-common-expfmt) ("go-github-com-prometheus-procfs" ,go-github-com-prometheus-procfs) - ("go-github-com-client-golang-prometheus-promhttp" - ,go-github-com-client-golang-prometheus-promhttp))) + ("go-github-com-prometheus-common-internal-bitbucket-org-ww-goautoneg" + ,go-github-com-prometheus-common-internal-bitbucket-org-ww-goautoneg))) (synopsis "Prometheus instrumentation library for Go applications") (description "This package provides the Go client library for the Prometheus monitoring and alerting system. It has two separate parts, one for instrumenting application code, and one for creating clients that talk to the Prometheus HTTP API.") (home-page "https://github.com/prometheus/client_golang") - (license asl2.0)))) - -(define* (go-github-com-prometheus-union - #:optional (packages (list go-github-com-client-golang-prometheus - go-github-com-client-golang-prometheus-promhttp))) - (package - (name "go-github-com-prometheus-union") - (version (package-version go-github-com-client-golang-prometheus)) - (source #f) - (build-system trivial-build-system) - (arguments - '(#:modules ((guix build union)) - #:builder (begin - (use-modules (ice-9 match) - (guix build union)) - (match %build-inputs - (((names . directories) ...) - (union-build (assoc-ref %outputs "out") - directories) - #t))))) - (inputs (map (lambda (package) - (list (package-name package) package)) - packages)) - (synopsis "Union of Go Prometheus libraries") - (description "This is a union of Go Prometheus libraries") - (home-page (package-home-page go-github-com-client-golang-prometheus)) - (license (package-license go-github-com-client-golang-prometheus)))) + (license asl2.0))) (define-public go-gopkg.in-asn1-ber.v1 (package From d8742c0af3d30afbb285ed490c91c9e7a434d5ed Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 13 Mar 2019 17:40:44 -0400 Subject: [PATCH 073/694] gnu: Remove go-github-com-audriusbutkevicius-pfilter. * gnu/packages/syncthing.scm (go-github-com-audriusbutkevicius-pfilter): Remove variable. --- gnu/packages/syncthing.scm | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index aaa4b8ad6a..dcf8ea8999 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -658,31 +658,6 @@ (define-public go-github-com-vitrun-qart-qr (home-page "https://github.com/vitrun/qart") (license bsd-3)))) -(define-public go-github-com-audriusbutkevicius-pfilter - (let ((commit "9dca34a5b530bfc9843fa8aa2ff08ff9821032cb") - (revision "2")) - (package - (name "go-github-com-audriusbutkevicius-pfilter") - (version (git-version "0.0.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/AudriusButkevicius/pfilter.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0i4qbnwba49db27fb1y792gcvhb0m744i9q4zgwjbypqmy3bj2a5")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/AudriusButkevicius/pfilter")) - (synopsis "Filter packets into mulitple virtual connections") - (description "Pfilter is a Go package for filtering packets into multiple -virtual connections from a single physical connection.") - (home-page "https://github.com/AudriusButkevicius/pfilter") - (license expat)))) - (define-public go-github-com-chmduquesne-rollinghash-adler32 (let ((commit "a60f8e7142b536ea61bb5d84014171189eeaaa81") (revision "0")) From 78d1b85a54331266f1f8ff5708f99eaa3ed37462 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 13 Mar 2019 17:41:13 -0400 Subject: [PATCH 074/694] gnu: Provide the full 'rollinghash' Go library. * gnu/packages/syncthing.scm (go-github-com-chmduquesne-rollinghash-adler32): Replace with ... (go-github-com-chmduquesne-rollinghash): ... new variable. --- gnu/packages/syncthing.scm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index dcf8ea8999..ba85b5ba07 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -658,11 +658,14 @@ (define-public go-github-com-vitrun-qart-qr (home-page "https://github.com/vitrun/qart") (license bsd-3)))) -(define-public go-github-com-chmduquesne-rollinghash-adler32 +;; XXX Syncthing actually imports 'github.com/chmduquesne/rollinghash/adler32'. +;; Normally we'd package this module indpendenctly but the adler32 module itself +;; imports 'github.com/chmduquesne/rollinghash/', so this is the easy way out. +(define-public go-github-com-chmduquesne-rollinghash (let ((commit "a60f8e7142b536ea61bb5d84014171189eeaaa81") (revision "0")) (package - (name "go-github-com-chmduquesne-rollinghash-adler32") + (name "go-github-com-chmduquesne-rollinghash") (version (git-version "4.0.0" revision commit)) (source (origin @@ -676,11 +679,10 @@ (define-public go-github-com-chmduquesne-rollinghash-adler32 "0fpaqq4zb0wikgbhn7vwqqj1h865f5xy195vkhivsp922p7qwsjr")))) (build-system go-build-system) (arguments - '(#:import-path "github.com/chmduquesne/rollinghash/adler32" - #:unpack-path "github.com/chmduquesne/rollinghash")) - (synopsis "Adler-32 rolling hash in Go") - (description "This package provides a Go implementation of the Adler-32 -rolling hash.") + '(#:import-path "github.com/chmduquesne/rollinghash/")) + (synopsis "Rolling hashes in Go") + (description "This package provides a Go implementation of several rolling +hashes.") (home-page "https://github.com/chmduquesne/rollinghash") (license expat)))) From d69f9f4a308772ab0eb5e9d72e6fd89bb6803d7e Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 13 Mar 2019 17:42:34 -0400 Subject: [PATCH 075/694] gnu: Remove go-github-com-audriusbutkevicius-cli. * gnu/packages/syncthing.scm (go-github-com-audriusbutkevicius-cli): Remove variable. --- gnu/packages/syncthing.scm | 33 --------------------------------- 1 file changed, 33 deletions(-) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index ba85b5ba07..b1f0004b53 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -733,39 +733,6 @@ (define-public go-github-com-petermattis-goid (home-page "https://github.com/petermattis/goid") (license asl2.0)))) -(define-public go-github-com-audriusbutkevicius-cli - (let ((commit "7f561c78b5a4aad858d9fd550c92b5da6d55efbb") - (revision "0")) - (package - (name "go-github-com-audriusbutkevicius-cli") - (version (git-version "0.0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/AudriusButkevicius/cli.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0bg26pfg25vr16jmczig2m493mja2nxjxyswz3hha7avxw20rpi5")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/AudriusButkevicius/cli" - ;; Tests don't pass "vet" on go-1.11. See - ;; https://github.com/AudriusButkevicius/cli/pull/1. - #:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key import-path #:allow-other-keys) - (invoke "go" "test" - "-vet=off" - import-path)))))) - (synopsis "Library for building command-line interfaces in Go") - (description "This package provides a library for building command-line -interfaces in Go.") - (home-page "https://github.com/AudriusButkevicius/cli") - (license expat)))) - (define-public go-github-com-kballard-go-shellquote (let ((commit "cd60e84ee657ff3dc51de0b4f55dd299a3e136f2") (revision "0")) From 21d06acd916f17b275b2026f33e20bd52632dc1c Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 13 Mar 2019 12:54:28 -0400 Subject: [PATCH 076/694] gnu: Syncthing: Stop using bundled dependencies. * gnu/packages/syncthing.scm (syncthing)[snippet]: Remove. [inputs]: New field. --- gnu/packages/syncthing.scm | 78 ++++++++++++++++++++++++++++++++------ 1 file changed, 66 insertions(+), 12 deletions(-) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index b1f0004b53..500f9a8528 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -39,23 +39,77 @@ (define-public syncthing (sha256 (base32 "1iks1a3149gj89yqmqa5iry2ik2sj9sjhlhc6nfh7xq4swqgsrb5")) - ;; Since the update to Go 1.11, Go programs have been keeping - ;; spurious references to all their dependencies: - ;; . - ;; For Syncthing, this increases the size of the 'out' closure - ;; from 87.6 MiB to 253.5 MiB. So, we use the bundled - ;; dependencies until the bug is resolved. -; (modules '((guix build utils))) -; ;; Delete bundled ("vendored") free software source code. -; (snippet '(begin -; (delete-file-recursively "vendor") -; #t)) - )) + (modules '((guix build utils))) + ;; Delete bundled ("vendored") free software source code. + (snippet '(begin + (delete-file-recursively "vendor") + #t)))) (build-system go-build-system) ;; The primary Syncthing executable goes to "out", while the auxiliary ;; server programs and utility tools go to "utils". This reduces the size ;; of "out" by ~80 MiB. (outputs '("out" "utils")) + ;; When updating Syncthing, check 'go.mod' in the source distribution to + ;; ensure we are using the correct versions of these dependencies. + (inputs + `(("go-github-com-audriusbutkevicius-go-nat-pmp" + ,go-github-com-audriusbutkevicius-go-nat-pmp) + ("go-github-com-bkaradzic-go-lz4" ,go-github-com-bkaradzic-go-lz4) + ("go-github-com-calmh-du" ,go-github-com-calmh-du) + ("go-github-com-calmh-xdr" ,go-github-com-calmh-xdr) + ("go-github-com-chmduquesne-rollinghash" + ,go-github-com-chmduquesne-rollinghash) + ("go-github-com-gobwas-glob" ,go-github-com-gobwas-glob) + ("go-github-com-golang-groupcache-lru" + ,go-github-com-golang-groupcache-lru) + ("go-github-com-jackpal-gateway" ,go-github-com-jackpal-gateway) + ("go-github-com-kballard-go-shellquote" + ,go-github-com-kballard-go-shellquote) + ("go-github-com-lib-pq" ,go-github-com-lib-pq) + ("go-github-com-minio-sha256-simd" ,go-github-com-minio-sha256-simd) + ("go-github-com-oschwald-geoip2-golang" + ,go-github-com-oschwald-geoip2-golang) + ("go-github-com-pkg-errors" ,go-github-com-pkg-errors) + ("go-github-com-rcrowley-go-metrics" ,go-github-com-rcrowley-go-metrics) + ("go-github-com-sasha-s-go-deadlock" ,go-github-com-sasha-s-go-deadlock) + ("go-github-com-syncthing-notify" ,go-github-com-syncthing-notify) + ("go-github-com-syndtr-goleveldb" ,go-github-com-syndtr-goleveldb) + ("go-github-com-thejerf-suture" ,go-github-com-thejerf-suture) + ("go-golang-org-x-time-rate" ,go-golang-org-x-time-rate) + ("go-gopkg.in-ldap.v2" ,go-gopkg.in-ldap.v2) + ("go-github-com-gogo-protobuf" ,go-github-com-gogo-protobuf) + ("go-github-com-gogo-protobuf-gogoproto" + ,go-github-com-gogo-protobuf-gogoproto) + ("go-github-com-gogo-protobuf-protoc-gen-gogo" + ,go-github-com-gogo-protobuf-protoc-gen-gogo) + ("go-github-com-prometheus-client-golang-prometheus" + ,go-github-com-prometheus-client-golang-prometheus) + ("go-golang-org-x-net-bpf" ,go-golang-org-x-net-bpf) + ("go-golang-org-x-net-internal-iana" ,go-golang-org-x-net-internal-iana) + ("go-golang-org-x-net-internal-socket" + ,go-golang-org-x-net-internal-socket) + ("go-golang-org-x-net-internal-socks" + ,go-golang-org-x-net-internal-socks) + ("go-golang-org-x-net-ipv4" ,go-golang-org-x-net-ipv4) + ("go-golang-org-x-net-ipv6" ,go-golang-org-x-net-ipv6) + ("go-golang-org-x-net-proxy" ,go-golang-org-x-net-proxy) + ("go-golang-org-x-text-unicode-norm" ,go-golang-org-x-text-unicode-norm) + ("go-golang-org-x-text-transform" ,go-golang-org-x-text-transform) + ("go-github-com-audriusbutkevicius-recli" + ,go-github-com-audriusbutkevicius-recli) + ("go-github-com-urfave-cli" ,go-github-com-urfave-cli) + ("go-github-com-vitrun-qart-qr" ,go-github-com-vitrun-qart-qr) + ("go-github-com-vitrun-qart-coding" ,go-github-com-vitrun-qart-coding) + ("go-github-com-vitrun-qart-gf256" ,go-github-com-vitrun-qart-gf256) + ("go-github-com-mattn-go-isatty" ,go-github-com-mattn-go-isatty) + ("go-golang-org-x-crypto-bcrypt" ,go-golang-org-x-crypto-bcrypt) + ("go-golang-org-x-crypto-blowfish" ,go-golang-org-x-crypto-blowfish) + ("go-github-com-flynn-archive-go-shlex" + ,go-github-com-flynn-archive-go-shlex) + + ;; For tests + ("go-github-com-d4l3k-messagediff" ,go-github-com-d4l3k-messagediff))) + (arguments `(#:import-path "github.com/syncthing/syncthing" #:unpack-path "github.com/syncthing" From ea282711105ef926860e84cf1e6da21141bc5f2a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 14 Mar 2019 20:56:55 +0100 Subject: [PATCH 077/694] gnu: python-django-appconf: Update to 1.0.3. * gnu/packages/django.scm (python-django-appconf): Update to 1.0.3. --- gnu/packages/django.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index 9bb81621d9..734755c609 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2016 Hartmut Goebel ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2017 Nils Gillmann -;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2018 Vijayalakshmi Vedantham ;;; @@ -740,16 +740,17 @@ (define-public python2-django-sortedm2m (define-public python-django-appconf (package (name "python-django-appconf") - (version "1.0.2") + (version "1.0.3") (source (origin (method url-fetch) (uri (pypi-uri "django-appconf" version)) (sha256 (base32 - "0qdjdx35g66xjsc50v0c5h3kg6njs8df33mbjx6j4k1vd3m9lkba")))) + "1qw0p9qh78bvkgi38ba58djwn0rd5j1lrkg2c2wk5wb7snj3rw9m")))) (build-system python-build-system) (propagated-inputs - `(("python-django" ,python-django))) + `(("python-django" ,python-django) + ("python-six" ,python-six))) (home-page "https://github.com/django-compressor/django-appconf") (synopsis "Handle configuration defaults of packaged Django apps") (description From 0bc38ce28614a32f1cccd993db5602d5a5f04ab9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 14 Mar 2019 20:57:19 +0100 Subject: [PATCH 078/694] gnu: inxi-minimal: Update to 3.0.32-1. * gnu/packages/admin.scm (inxi-minimal): Update to 3.0.32-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 f3052953cf..d5a0f65abb 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2699,7 +2699,7 @@ (define-public inxi-minimal (let ((real-name "inxi")) (package (name "inxi-minimal") - (version "3.0.22-1") + (version "3.0.32-1") (source (origin (method git-fetch) @@ -2708,7 +2708,7 @@ (define-public inxi-minimal (commit version))) (file-name (git-file-name real-name version)) (sha256 - (base32 "1br392s3xc2nwqmfx4nwb3i97wjwasvkq8ayr8jq72mi5qzsgizn")))) + (base32 "171xdip2alkp3g0k0sanaavvdcz6d0wlldj9lgj11xsdbhaaknnv")))) (build-system trivial-build-system) (inputs `(("bash" ,bash-minimal) From 223055dd3f09d1742cc706edfd7bb283100f1793 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 14 Mar 2019 21:11:59 +0100 Subject: [PATCH 079/694] gnu: unbound: Update to 1.9.1. * gnu/packages/dns.scm (unbound): Update to 1.9.1. --- gnu/packages/dns.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 656c1f9d70..f1bcbc1b4d 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -364,14 +364,14 @@ (define-public nsd (define-public unbound (package (name "unbound") - (version "1.9.0") + (version "1.9.1") (source (origin (method url-fetch) (uri (string-append "https://www.unbound.net/downloads/unbound-" version ".tar.gz")) (sha256 - (base32 "05xrb8havr2vgjsdy7n85kgnvk1mg7qwhjp4a8n6pg4jhd5zjnj1")))) + (base32 "1iarvk0i92asvrkpla9z55aan20k6pklzpck9yk4rfnchsdvzh63")))) (build-system gnu-build-system) (outputs '("out" "python")) (native-inputs From a431e213835cc47fcddc55d1e2f4b7201404fde5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 14 Mar 2019 21:59:44 +0100 Subject: [PATCH 080/694] gnu: font-terminus: Install X11 8-bit code pages. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/fonts.scm (font-terminus)[outputs]: Add ‘pcf-8bit’ output. [arguments]: Add new phases to build and install these 8-bit PCF fonts. --- gnu/packages/fonts.scm | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index bb8548c1eb..e6867996ca 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -353,14 +353,28 @@ (define-public font-terminus (sha256 (base32 "15qjcpalcxjiwsjgjg5k88vkwp56cs2nnx4ghya6mqp4i1c206qg")))) (build-system gnu-build-system) + (outputs (list "out" "pcf-8bit")) + (arguments + `(#:tests? #f ; no test target in tarball + #:phases + (modify-phases %standard-phases + (add-after 'build 'build-more-bits + ;; X11 8-bit code pages aren't installed by default (they were + ;; until version 4.46). Build and install them separately. + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "pcf-8bit" make-flags))) + (add-after 'install 'install-more-bits + (lambda* (#:key make-flags outputs #:allow-other-keys) + (let ((pcf-8bit (assoc-ref outputs "pcf-8bit"))) + (apply invoke "make" "install-pcf-8bit" (string-append "prefix=" + pcf-8bit) + make-flags))))))) (native-inputs `(("bdftopcf" ,bdftopcf) ("font-util" ,font-util) ("mkfontdir" ,mkfontdir) ("pkg-config" ,pkg-config) ("python" ,python))) - (arguments - `(#:tests? #f)) ; no test target in tarball (home-page "http://terminus-font.sourceforge.net/") (synopsis "Simple bitmap programming font") (description "Terminus Font is a clean, fixed-width bitmap font, designed From 1e91d2ef3c4f87ae90b8c862d2a037694a6d698d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 14 Mar 2019 21:42:48 +0100 Subject: [PATCH 081/694] gnu: sigrok-firmware-fx2lafw: Update to 0.1.6. * gnu/packages/electronics.scm (sigrok-firmware-fx2lafw): Update to 0.1.6. --- 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 bc30e619ec..2261cb9fda 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 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -102,7 +102,7 @@ (define-public libsigrokdecode (define-public sigrok-firmware-fx2lafw (package (name "sigrok-firmware-fx2lafw") - (version "0.1.5") + (version "0.1.6") (source (origin (method url-fetch) (uri (string-append @@ -110,7 +110,7 @@ (define-public sigrok-firmware-fx2lafw "sigrok-firmware-fx2lafw-" version ".tar.gz")) (sha256 (base32 - "0bbdgy4rpc00jl0l0744m2ibjlqi26bhrkjr7vplivdsjdmhjx6a")))) + "18x5zj3xbcylvb651dia6n4zxbdnv0j62r5af60d0l2g68knkjg4")))) (native-inputs `(("sdcc" ,sdcc))) (build-system gnu-build-system) From 947849010dcfc337b3c9e8ccef346ffaacf0f33d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 14 Mar 2019 23:15:56 +0100 Subject: [PATCH 082/694] gnu: docker, docker-cli: Update to 18.09.3. * gnu/packages/docker.scm (%docker-version): Update to 18.09.3. --- gnu/packages/docker.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 4b6d04fe91..f83da12a96 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -43,7 +43,7 @@ (define-module (gnu packages docker) #:use-module (gnu packages version-control) #:use-module (gnu packages virtualization)) -(define %docker-version "18.09.2") +(define %docker-version "18.09.3") (define-public python-docker-py (package @@ -239,8 +239,7 @@ (define-public docker (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "1zfpk2n8j6gnwbrxrh6d6pj24y60dhbanpf55shrm2yxz54ka36c")) + (base32 "06yr5xwr181lalh8z1lk07nxlp7hn38aq8cyqjk617dfy4lz0ixx")) (patches (search-patches "docker-engine-test-noinstall.patch" "docker-fix-tests.patch")))) @@ -485,8 +484,7 @@ (define-public docker-cli (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "0jzcqh1kqbfyj6ax7z67gihaqgjiz6ddz6rq6k458l68v7zn77r8")))) + (base32 "09j1i668p330gjz5vw5pss8ghxh1mz7rl2q9ykp02q9p112zhy4j")))) (build-system go-build-system) (arguments `(#:import-path "github.com/docker/cli" From a333cbf19490c3c9bea3250a074d72b7d5cab97a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 14 Mar 2019 23:16:37 +0100 Subject: [PATCH 083/694] gnu: containerd: Update to 1.2.5. * gnu/packages/docker.scm (containerd): Update to 1.2.5. --- gnu/packages/docker.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index f83da12a96..88fc7fc6ec 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -162,7 +162,7 @@ (define-public python-docker-pycreds (define-public containerd (package (name "containerd") - (version "1.2.4") + (version "1.2.5") (source (origin (method git-fetch) @@ -171,7 +171,7 @@ (define-public containerd (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1rw7f0y3iv0mapxid1rgpns80dcy8nhgmxmw27x8qzrzic5viivy")))) + (base32 "0npbzixf3c0jvzm159vygvkydrr8h36c9sq50yv0mdinrys2bvg0")))) (build-system go-build-system) (arguments `(#:import-path "github.com/containerd/containerd" From 1fdd20c7d7ac53ccd898ab684e6c2b4d1f4cf907 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 14 Mar 2019 23:28:51 +0100 Subject: [PATCH 084/694] gnu: kaldi: Install headers and fix installation of libraries. * gnu/packages/machine-learning.scm (kaldi)[arguments]: Fix installation of libraries and install headers in "install" phase. --- gnu/packages/machine-learning.scm | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 4067b4b1ea..b36186ea31 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -1002,9 +1002,23 @@ (define-public kaldi (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) + (inc (string-append out "/include")) (lib (string-append out "/lib"))) (mkdir-p lib) - (install-file "gst-plugin/libgstonlinegmmdecodefaster.so" lib) + ;; The build phase installed symlinks to the actual + ;; libraries. Install the actual targets. + (for-each (lambda (file) + (let ((target (readlink file))) + (delete-file file) + (install-file target lib))) + (find-files lib "\\.so")) + ;; Install headers + (for-each (lambda (file) + (let ((target-dir (string-append inc "/" (dirname file)))) + (install-file file target-dir))) + (find-files "." "\\.h")) + (install-file "gst-plugin/libgstonlinegmmdecodefaster.so" + (string-append lib "/gstreamer-1.0")) #t)))))) (inputs `(("alsa-lib" ,alsa-lib) From 992600141a9a703339d86b22a4c2eaa877d32207 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 14 Mar 2019 23:30:37 +0100 Subject: [PATCH 085/694] gnu: Add gst-kaldi-nnet2-online. * gnu/packages/machine-learning.scm (gst-kaldi-nnet2-online): New variable. --- gnu/packages/machine-learning.scm | 73 +++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index b36186ea31..f07a905097 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -43,6 +43,7 @@ (define-module (gnu packages machine-learning) #:use-module (gnu packages audio) #:use-module (gnu packages autotools) #:use-module (gnu packages base) + #:use-module (gnu packages bash) #:use-module (gnu packages boost) #:use-module (gnu packages check) #:use-module (gnu packages compression) @@ -63,6 +64,7 @@ (define-module (gnu packages machine-learning) #:use-module (gnu packages python-xyz) #:use-module (gnu packages statistics) #:use-module (gnu packages swig) + #:use-module (gnu packages web) #:use-module (gnu packages xml) #:use-module (gnu packages xorg)) @@ -1041,3 +1043,74 @@ (define-public kaldi (description "Kaldi is an extensible toolkit for speech recognition written in C++.") (license license:asl2.0)))) + +(define-public gst-kaldi-nnet2-online + (let ((commit "617e43e73c7cc45eb9119028c02bd4178f738c4a") + (revision "1")) + (package + (name "gst-kaldi-nnet2-online") + (version (git-version "0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/alumae/gst-kaldi-nnet2-online.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0xh3w67b69818s6ib02ara4lw7wamjdmh4jznvkpzrs4skbs9jx9")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; there are none + #:make-flags + (list (string-append "SHELL=" + (assoc-ref %build-inputs "bash") "/bin/bash") + (string-append "KALDI_ROOT=" + (assoc-ref %build-inputs "kaldi-src")) + (string-append "KALDILIBDIR=" + (assoc-ref %build-inputs "kaldi") "/lib") + "KALDI_FLAVOR=dynamic") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ (chdir "src") #t)) + (replace 'configure + (lambda* (#:key inputs #:allow-other-keys) + (let ((glib (assoc-ref inputs "glib"))) + (setenv "CXXFLAGS" "-std=c++11 -fPIC") + (setenv "CPLUS_INCLUDE_PATH" + (string-append glib "/include/glib-2.0:" + glib "/lib/glib-2.0/include:" + (assoc-ref inputs "gstreamer") + "/include/gstreamer-1.0:" + (getenv "CPLUS_INCLUDE_PATH")))) + (substitute* "Makefile" + (("include \\$\\(KALDI_ROOT\\)/src/kaldi.mk") "") + (("\\$\\(error Cannot find") "#")))) + (add-before 'build 'build-depend + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "depend" make-flags))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (lib (string-append out "/lib/gstreamer-1.0"))) + (install-file "libgstkaldinnet2onlinedecoder.so" lib) + #t)))))) + (inputs + `(("glib" ,glib) + ("gstreamer" ,gstreamer) + ("jansson" ,jansson) + ("openfst" ,openfst) + ("kaldi" ,kaldi))) + (native-inputs + `(("bash" ,bash) + ("glib:bin" ,glib "bin") ; glib-genmarshal + ("kaldi-src" ,(package-source kaldi)) + ("pkg-config" ,pkg-config))) + (home-page "https://kaldi-asr.org/") + (synopsis "Gstreamer plugin for decoding speech") + (description "This package provides a GStreamer plugin that wraps +Kaldi's @code{SingleUtteranceNnet2Decoder}. It requires iVector-adapted DNN +acoustic models. The iVectors are adapted to the current audio stream +automatically.") + (license license:asl2.0)))) From 766bfda19db16224389db7ffb63ac335a0a8e233 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 14 Mar 2019 23:30:03 +0100 Subject: [PATCH 086/694] gnu: emacs-org, emacs-org-contrib: Update to 9.2.2. * gnu/packages/emacs-xyz.scm (emacs-org): Update to 9.2.2. (emacs-org-contrib): Update to matching 20190311. --- gnu/packages/emacs-xyz.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index e998ded897..ead4c19319 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -29,7 +29,7 @@ ;;; Copyright © 2017, 2018, 2019 Oleg Pykhalov ;;; Copyright © 2017 Mekeor Melire ;;; Copyright © 2017 Peter Mikkelsen -;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2017 Mike Gerwitz ;;; Copyright © 2017, 2018, 2019 Maxim Cournoyer ;;; Copyright © 2018 Sohom Bhattacharjee @@ -5355,14 +5355,14 @@ (define-public emacs-org (name "emacs-org") ;; emacs-org-contrib inherits from this package. Please update its sha256 ;; checksum as well. - (version "9.2.1") + (version "9.2.2") (source (origin (method url-fetch) (uri (string-append "http://elpa.gnu.org/packages/org-" version ".tar")) (sha256 (base32 - "0ggca29pyksvfblyd2ciqhgi392wlqx0nmph7ck4m5wbzmk2qnry")))) + "02fq3x4haady2vagg9b363ynsrxzpijfp420qhciy7x8y7m89abw")))) (build-system emacs-build-system) (home-page "https://orgmode.org/") (synopsis "Outline-based notes management and organizer") @@ -5376,14 +5376,14 @@ (define-public emacs-org-contrib (package (inherit emacs-org) (name "emacs-org-contrib") - (version "20190203") + (version "20190311") (source (origin (method url-fetch) (uri (string-append "https://orgmode.org/elpa/org-plus-contrib-" version ".tar")) (sha256 (base32 - "060rm62p1660n9f6i5w8l932w7gn5ign93q92gva4jy4bkmvczyb")))) + "189p0f70j7z3hh72ay8cxa9n8xkcj06dlw765fwnqd2mm72vx0nb")))) (arguments `(#:modules ((guix build emacs-build-system) (guix build utils) From 06900d90e7177f98d325e3e34491986b441e5980 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 14 Mar 2019 23:41:32 +0100 Subject: [PATCH 087/694] gnu: perl-gd: Update to 2.71. * gnu/packages/gd.scm (perl-gd): Update to 2.71. --- gnu/packages/gd.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gd.scm b/gnu/packages/gd.scm index c08c1f6758..e76545a13b 100644 --- a/gnu/packages/gd.scm +++ b/gnu/packages/gd.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2016, 2017 Leo Famulari ;;; Copyright © 2017 Efraim Flashner ;;; Copyright © 2017 Marius Bakke -;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -108,15 +108,14 @@ (define-public gd/fixed (define-public perl-gd (package (name "perl-gd") - (version "2.69") + (version "2.71") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/R/RU/RURBAN/" "GD-" version ".tar.gz")) (sha256 - (base32 - "0palmq7l42fibqxhrabnjm7di4q8kciq9323902d717x3i4jvc6x")))) + (base32 "1ivskdb4nwy7ky37369hwkfxp11fkp6ri5k7qlf2dmra7f3y86s5")))) (build-system perl-build-system) (inputs `(("fontconfig" ,fontconfig) From 832e7be42d4c9ae4abada36a6d61473da8574ec1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 14 Mar 2019 23:41:42 +0100 Subject: [PATCH 088/694] gnu: perl-gd-securityimage: Update to 1.75. * gnu/packages/gd.scm (perl-gd-securityimage): Update to 1.75. --- gnu/packages/gd.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gd.scm b/gnu/packages/gd.scm index e76545a13b..a1593827a0 100644 --- a/gnu/packages/gd.scm +++ b/gnu/packages/gd.scm @@ -138,15 +138,14 @@ (define-public perl-gd (define-public perl-gd-securityimage (package (name "perl-gd-securityimage") - (version "1.73") + (version "1.75") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/B/BU/BURAK/" "GD-SecurityImage-" version ".tar.gz")) (sha256 - (base32 - "1kaxs67rfd4w46lxgcg3pa05a596l0h1k8n4zk2gwrrar4022wpx")))) + (base32 "19lf1kzdavrkkx3f900jnpynr55d5kjd2sdmwpfir5dsmkcj9pix")))) (build-system perl-build-system) (arguments '(#:phases From 93394133e1ef60cd220951834ca43fbd55c8d5b4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 14 Mar 2019 23:51:04 +0100 Subject: [PATCH 089/694] gnu: perl-glib: Update to 1.329. * gnu/packages/glib.scm (perl-glib): Update to 1.329. --- gnu/packages/glib.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 5877c5f2dc..7755c590ad 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2016 Lukas Gradl ;;; Copyright © 2017, 2018 Ricardo Wurmus ;;; Copyright © 2017 Petter -;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Alex Vong ;;; ;;; This file is part of GNU Guix. @@ -658,7 +658,7 @@ (define-public python2-pygobject (define-public perl-glib (package (name "perl-glib") - (version "1.327") + (version "1.329") (source (origin (method url-fetch) (uri (string-append @@ -666,7 +666,7 @@ (define-public perl-glib version ".tar.gz")) (sha256 (base32 - "0n7hjhbh5xhagvb0qjwzg21j22ks0csah0chgk98g4wnfllxjl0k")))) + "0d9ak0zknz81lv3cqkzr2mxdic6g5rrbb87skqc4jj48rz4f2k3v")))) (build-system perl-build-system) (native-inputs `(("perl-extutils-depends" ,perl-extutils-depends) From a3783aca66cfd256fa361f99ebaa6b67d87a7429 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 14 Mar 2019 23:44:29 +0100 Subject: [PATCH 090/694] gnu: libgeotiff: Update to 1.4.3. * gnu/packages/geo.scm (libgeotiff): Update to 1.4.3. --- gnu/packages/geo.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index cf4fcee8dd..a311f3b904 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -201,15 +201,14 @@ (define-public libgaiagraphics (define-public libgeotiff (package (name "libgeotiff") - (version "1.4.2") + (version "1.4.3") (source (origin (method url-fetch) (uri (string-append "http://download.osgeo.org/geotiff/libgeotiff/libgeotiff-" version ".tar.gz")) (sha256 - (base32 - "0vjy3bwfhljjx66p9w999i4mdhsf7vjshx29yc3pn5livf5091xd")) + (base32 "0rbjqixi4c8yz19larlzq6jda0px2gpmpp9c52cyhplbjsdhsldq")) (modules '((guix build utils))) (snippet '(begin From 31960f6fd28a3a8883fd68d5bcbce5d2d339019a Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 14 Mar 2019 20:32:16 +0100 Subject: [PATCH 091/694] gnu: Add emacs-helm-notmuch. * gnu/packages/emacs-xyz.scm (emacs-helm-notmuch): New variable. --- 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 ead4c19319..9fdb00efb9 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -13506,3 +13506,29 @@ (define-public emacs-lsp-ui @code{lsp-mode}, such as visual flychecking, displaying references in-line, and code peeking.") (license license:gpl3+))) + +(define-public emacs-helm-notmuch + (let ((commit "9988eb0f787c82c779f2417b5613b9142a5b1c9b")) + (package + (name "emacs-helm-notmuch") + (version (git-version "1.1" "1" commit)) + (home-page "https://github.com/xuchunyang/helm-notmuch/") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1jwhmlqlgzxj2zfz0za33vn8m2zrsmkmnq2vx5i1nry70p9h43b4")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-helm" ,emacs-helm) + ("notmuch" ,notmuch))) + (synopsis "Search emails with Emacs Notmuch and Helm") + (description + "This package can be used to search emails in Emacs, searching result +displays as you type thanks to Helm, though @command{notmuch-search} does the +real search.") + (license license:gpl3+)))) From 10b30b97735ba9037f4ce58867f47678d78f4970 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 14 Mar 2019 19:08:58 -0400 Subject: [PATCH 092/694] gnu: Remove duplicate go-github-com-kr-text. This effectively reverts 56f610f5c753d56f8c773252bd3c1f07a5c91442. But I removed the preexisting package since the new one is simpler. * gnu/packages/golang.scm (go-github-com-kr-text): Remove variable. --- gnu/packages/golang.scm | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 1a67822f07..4bcd5cfcfe 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -2117,32 +2117,6 @@ (define-public go-github-com-stevedonovan-luar be performed.") (license license:expat)))) -(define-public go-github-com-kr-text - (let ((commit "e2ffdb16a802fe2bb95e2e35ff34f0e53aeef34f") - (revision "0")) - (package - (name "go-github-com-kr-text") - (version (git-version "0.0.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url - "https://github.com/kr/text") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/kr/text")) - (home-page "https://github.com/kr/text") - (synopsis "Go package for manipulating paragraphs of text") - (description "Package @code{text} provides manipulation Go functions for -paragraphs of text.") - (license license:expat)))) - (define-public go-github-com-michiwend-golang-pretty (let ((commit "8ac61812ea3fa540f3f141a444fcb0dd713cdca4") (revision "0")) From 60fddfae130c1034c03f026a1820114436be7caa Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Mar 2019 00:37:03 +0100 Subject: [PATCH 093/694] gnu: protozero: Update to 1.6.7. * gnu/packages/geo.scm (protozero): Update to 1.6.7. --- 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 a311f3b904..58eb11231f 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -743,7 +743,7 @@ (define-public imposm3 (define-public protozero (package (name "protozero") - (version "1.6.5") + (version "1.6.7") (source (origin (method git-fetch) @@ -752,7 +752,7 @@ (define-public protozero (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "10ldzni46cplmkgx1f73yn95qcb71xh9nxpcfdmi107y3kvicv3c")))) + (base32 "1ryvn3iwxiaih3mvyy45nbwxnhzfc8vby0xh9m6d6fpakhcpf6s3")))) (build-system cmake-build-system) (home-page "https://github.com/mapbox/protozero") (synopsis "Minimalistic protocol buffer decoder and encoder in C++") From 4ca23a3d223c7b73dfb6915f8ae9734690f65319 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 14 Mar 2019 20:03:34 +0100 Subject: [PATCH 094/694] gnu: libseccomp: Update to 2.4.0. * gnu/packages/linux.scm (libseccomp): Update to 2.4.0. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 1cdffb8c79..cbbfe05e6a 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4054,7 +4054,7 @@ (define-public mtd-utils (define-public libseccomp (package (name "libseccomp") - (version "2.3.3") + (version "2.4.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/seccomp/libseccomp/" @@ -4062,7 +4062,7 @@ (define-public libseccomp "/libseccomp-" version ".tar.gz")) (sha256 (base32 - "0mdiyfljrkfl50q1m3ws8yfcyfjwf1zgkvcva8ffcwncji18zhkz")))) + "0paj1szszpf8plykrd66jqg1x3kmqs395rbjskahld2bnplcfx1f")))) (build-system gnu-build-system) (native-inputs `(("which" ,which))) From ebebee94f349173ba82f76f125b0e2d7f9d05d15 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 15 Mar 2019 00:33:14 +0100 Subject: [PATCH 095/694] gnu: gjs: Use the test-only Xorg variant for tests. * gnu/packages/gnome.scm (gjs)[native-inputs]: Change XORG-SERVER to XORG-SERVER-FOR-TESTS. --- gnu/packages/gnome.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ea6d255c88..fb4fb4d6bb 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4721,7 +4721,7 @@ (define-public gjs ;; For testing ("dbus-launch" ,dbus) ("uuidgen" ,util-linux) - ("xvfb" ,xorg-server))) + ("xvfb" ,xorg-server-for-tests))) (propagated-inputs ;; These are all in the Requires.private field of gjs-1.0.pc. `(("cairo" ,cairo) From 1618c6fe3b3284654d64da3fa54d94b74705ff4b Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Wed, 27 Feb 2019 18:01:48 +0100 Subject: [PATCH 096/694] gnu: harminv: Build shared library. The shared library is required by meep. * gnu/packages/engineering.scm (harminv)[arguments]: Enable building of shared library. Signed-off-by: Leo Famulari --- gnu/packages/engineering.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 8bed5795a0..e552433460 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2017 Julien Lepiller ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Clément Lassieur -;;; Copyright © 2018 Jonathan Brielmaier +;;; Copyright © 2018, 2019 Jonathan Brielmaier ;;; Copyright © 2018 Arun Isaac ;;; Copyright © 2019 Tim Stahel ;;; @@ -1003,7 +1003,8 @@ (define-public harminv "0w1n4d249vlpda0hi6z1v13qp21vlbp3ykn0m8qg4rd5132j7fg1")))) (build-system gnu-build-system) (arguments - `(#:phases + `(#:configure-flags '("--enable-shared") + #:phases (modify-phases %standard-phases (add-before 'configure 'fix-tests (lambda _ From a7de5a5006db682e7e418e9148e1ac31e7ff997b Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Wed, 27 Feb 2019 18:01:49 +0100 Subject: [PATCH 097/694] gnu: guile-libctl: Update to 4.2.0. * gnu/packages/engineering.scm (guile-libctl): Update to 4.2.0. [source]: Update source link to GitHub. [arguments]: Build shared library as required by meep. Signed-off-by: Leo Famulari --- gnu/packages/engineering.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index e552433460..76e4b4dd88 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1028,17 +1028,19 @@ (define-public harminv (define-public guile-libctl (package (name "guile-libctl") - (version "3.2.2") + (version "4.2.0") (source (origin (method url-fetch) (uri (string-append - "http://ab-initio.mit.edu/libctl/libctl-" - version ".tar.gz")) + "https://github.com/NanoComp/libctl/releases/download/v" + version "/libctl-" version ".tar.gz")) (sha256 (base32 - "1g7gqybq20jhdnw5vg18bgbj9jz0408gfmjvs8b4xs30pic8pgca")))) + "0x8r56lpfq83kfbq28vr25icl19xpfd6fjrxzcpdmv30l9pash83")))) (build-system gnu-build-system) + (arguments + `(#:configure-flags '("--enable-shared"))) (native-inputs `(("fortran" ,gfortran))) (inputs From e719562d590eb525b02d00b4e15064d0667f692c Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Wed, 27 Feb 2019 18:01:50 +0100 Subject: [PATCH 098/694] gnu: mpb: Update to 1.8.0. * gnu/packages/engineering.scm (mpb): Update to 1.8.0. [source]: Fetch source from GitHub, as it's only there. [arguments]: Build shared library, as required by meep. Signed-off-by: Leo Famulari --- gnu/packages/engineering.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 76e4b4dd88..8d58e459b2 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1055,22 +1055,23 @@ (define-public guile-libctl (define-public mpb (package (name "mpb") - (version "1.5") + (version "1.8.0") (source (origin (method url-fetch) (uri (string-append - "http://ab-initio.mit.edu/mpb/mpb-" - version ".tar.gz")) + "https://github.com/NanoComp/mpb/releases/download/v" + version "/mpb-" version ".tar.gz")) (sha256 (base32 - "1mqb2d8jq957nksayjygq58iy8i42vjryzg9iy5fpfay31wzxsix")))) + "1jgrb7dd6qs6j6y1gnxmdgrh79l2bvqa6nk60a4pw1annsks4brd")))) (build-system gnu-build-system) (arguments `(#:configure-flags (list (string-append "--with-libctl=" (assoc-ref %build-inputs "libctl") - "/share/libctl")))) + "/share/libctl") + "--enable-shared"))) (native-inputs `(("fortran" ,gfortran) ("pkg-config" ,pkg-config) From 138950a88b96a42d09e4d4a490444a0918a2842b Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Wed, 27 Feb 2019 18:01:51 +0100 Subject: [PATCH 099/694] gnu: meep: Update to 1.8.0. * gnu/packages/engineering.scm (meep): Update to 1.8.0. [source]: Fetch source from GitHub, as it's only there. [inputs]: Use Guile 2.2, as meep supports it. Signed-off-by: Leo Famulari --- gnu/packages/engineering.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 8d58e459b2..4ac76e35b0 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1097,16 +1097,16 @@ (define-public mpb (define-public meep (package (name "meep") - (version "1.3") + (version "1.8.0") (source (origin (method url-fetch) (uri (string-append - "http://ab-initio.mit.edu/meep/meep-" - version ".tar.gz")) + "https://github.com/NanoComp/meep/releases/download/v" + version "/meep-" version ".tar.gz")) (sha256 (base32 - "0f6lbw2hrksg7xscwdqs78jc9nmzx9fs8j0hz1y4i8qknkqiyk2n")))) + "14zyxmm3p80j5fz5b89sl7hgkgcisqjny5hjh4pi274ziqjqz8bm")))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -1120,7 +1120,7 @@ (define-public meep (inputs `(("fftw" ,fftw) ("gsl" ,gsl) - ("guile" ,guile-2.0) ; doesn't build with guile-2.2 + ("guile" ,guile-2.2) ("harminv" ,harminv) ("hdf5" ,hdf5) ("lapack" ,lapack) From fe4a4bd23aa55bc6e8f5639db0dbfb358df99861 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Thu, 14 Mar 2019 18:34:42 -0500 Subject: [PATCH 100/694] gnu: python-language-server: Update to 0.25.0. * gnu/packages/python-xyz.scm (python-language-server): Update to 0.25.0. [propagated-inputs]: Add python-pylint. Signed-off-by: Leo Famulari --- gnu/packages/python-xyz.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ab8e543295..706524bbb6 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2634,14 +2634,14 @@ (define-public python-pydocstyle (define-public python-language-server (package (name "python-language-server") - (version "0.24.0") + (version "0.25.0") (source (origin (method url-fetch) (uri (pypi-uri "python-language-server" version)) (sha256 (base32 - "05zmv6jr7qbgnkz0lqh5pr7kr4lm12i8ljm2k5h5kz3q9m8d4mm0")))) + "1xabnaqd4n72myrc3mxl2y33vr2p7c9c5a87n77p9k327ckvdx01")))) (build-system python-build-system) (propagated-inputs `(("python-pluggy" ,python-pluggy) @@ -2653,7 +2653,8 @@ (define-public python-language-server ("python-pycodestyle" ,python-pycodestyle) ("python-mccabe" ,python-mccabe) ("python-rope" ,python-rope) - ("python-autopep8" ,python-autopep8))) + ("python-autopep8" ,python-autopep8) + ("python-pylint" ,python-pylint))) (home-page "https://github.com/palantir/python-language-server") (synopsis "Python implementation of the Language Server Protocol") (description From 99d5e5df2714a4ee36788b189f34e882b47b932a Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 15 Mar 2019 09:19:00 +0100 Subject: [PATCH 101/694] gnu: mkvtoolnix: Install GUI to separate output. * gnu/packages/video.scm (mkvtoolnix)[arguments]: Do it. --- gnu/packages/video.scm | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index c97dbbe204..ee49d35cec 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -377,6 +377,7 @@ (define-public mkvtoolnix "lib/utf8-cpp")) #t)))) (build-system gnu-build-system) + (outputs '("out" "gui")) ; "mkvtoolnix-gui" brings the closure size from ~300 MB to 1.5+ GB. (inputs `(("boost" ,boost) ("bzip2" ,bzip2) @@ -432,7 +433,20 @@ (define-public mkvtoolnix (invoke "rake" "tests/unit"))) (replace 'install (lambda _ - (invoke "rake" "install")))))) + (invoke "rake" "install"))) + (add-after 'install 'post-install + (lambda* (#:key outputs #:allow-other-keys) + ;; Move the Qt interface to "gui". + (let ((out (assoc-ref outputs "out")) + (gui (assoc-ref outputs "gui"))) + (for-each + (lambda (file) + (mkdir-p (string-append gui (dirname file))) + (rename-file (string-append out file) + (string-append gui file))) + '("/bin/mkvtoolnix-gui" + "/share/applications/org.bunkus.mkvtoolnix-gui.desktop"))) + #t))))) (home-page "https://mkvtoolnix.download") (synopsis "Tools to create, alter and inspect Matroska files") (description From 4d0f20d91c1dd433bb383c4a0667b093b1d28c90 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 15 Mar 2019 10:01:42 +0100 Subject: [PATCH 102/694] gnu: Add emacs-elmacro. * gnu/packages/emacs-xyz.scm (emacs-elmacro): New variable. --- gnu/packages/emacs-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 9fdb00efb9..c917cca4d7 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -13532,3 +13532,28 @@ (define-public emacs-helm-notmuch displays as you type thanks to Helm, though @command{notmuch-search} does the real search.") (license license:gpl3+)))) + +(define-public emacs-elmacro + (let ((commit "89b9b0feabafd01fee48111d67131c4c9b5fed9a")) + (package + (name "emacs-elmacro") + (version (git-version "1.1.0" "1" commit)) + (home-page "https://github.com/Silex/elmacro") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "06wkzafh6vbcjf0m3sl253mgcq32p8cdv7vsfmyx51baa36938ha")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-s" ,emacs-s) + ("emacs-dash" ,emacs-dash))) + (synopsis "Convert keyboard macros to Emacs Lisp") + (description + "This package displays keyboard macros or latest interactive commands +as Emacs Lisp.") + (license license:gpl3+)))) From 98a1ca7eb291a3887b5f69c63b6f518685618c88 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 15 Mar 2019 10:14:19 +0100 Subject: [PATCH 103/694] gnu: emacs-helm-eww: Update to 1.2. * gnu/packages/emacs-xyz.scm (emacs-helm-eww): Update to 1.2. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index c917cca4d7..7d2b7ade06 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -10698,7 +10698,7 @@ (define-public emacs-parinfer-mode (define-public emacs-helm-eww (package (name "emacs-helm-eww") - (version "1.1") + (version "1.2") (source (origin (method git-fetch) (uri (git-reference @@ -10707,7 +10707,7 @@ (define-public emacs-helm-eww (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0dvlp7y6kqc4azg5b7jx5lz2rwd0ia7y0y3hcj9y23zd88r73lg7")))) + "0hpq1h0p69c9k6hkd2mjpprx213sc5475q7pr2zpmwrjdzgcv70z")))) (propagated-inputs `(("emacs-helm" ,emacs-helm))) (build-system emacs-build-system) From 43a0db3cd439c119a209290d09613875f3df89eb Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 15 Mar 2019 10:14:25 +0100 Subject: [PATCH 104/694] gnu: emacs-helm-slime: Update to 0.3.0. * gnu/packages/emacs-xyz.scm (emacs-helm-slime): 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 7d2b7ade06..2d6b631f61 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12606,7 +12606,7 @@ (define-public emacs-slime-repl-ansi-color (define-public emacs-helm-slime (package (name "emacs-helm-slime") - (version "0.2.0") + (version "0.3.0") (source (origin (method git-fetch) (uri (git-reference @@ -12615,7 +12615,7 @@ (define-public emacs-helm-slime (file-name (git-file-name name version)) (sha256 (base32 - "0vn93vv2wclnwq6f480z14jn9wfp0ylhp5dd48ycc9jicfsnxqfj")))) + "1qhb9446rpj17pm0hi3miy5gs5k3ld43bq29kzy0y26bf7ivfcjv")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-helm" ,emacs-helm) From e4a17532f9f99542e83ffdb79d205d6955f6e98e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 15 Mar 2019 10:57:44 +0100 Subject: [PATCH 105/694] gnu: Add r-ioniser. * gnu/packages/bioconductor.scm (r-ioniser): New variable. --- gnu/packages/bioconductor.scm | 38 +++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 251ad1e1ac..a1fc1ac7e3 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -2483,3 +2483,41 @@ (define-public r-linnorm @code{RnaXSim} function is included for simulating RNA-seq data for the evaluation of DEG analysis methods.") (license license:expat))) + +(define-public r-ioniser + (package + (name "r-ioniser") + (version "2.6.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "IONiseR" version)) + (sha256 + (base32 + "01lqisdlsvym8nhgpzn7lpcddk9lv9253dy9v65r2dicb5xqhj00")))) + (properties `((upstream-name . "IONiseR"))) + (build-system r-build-system) + (propagated-inputs + `(("r-biocgenerics" ,r-biocgenerics) + ("r-biocparallel" ,r-biocparallel) + ("r-biostrings" ,r-biostrings) + ("r-bit64" ,r-bit64) + ("r-dplyr" ,r-dplyr) + ("r-ggplot2" ,r-ggplot2) + ("r-magrittr" ,r-magrittr) + ("r-rhdf5" ,r-rhdf5) + ("r-shortread" ,r-shortread) + ("r-stringr" ,r-stringr) + ("r-tibble" ,r-tibble) + ("r-tidyr" ,r-tidyr) + ("r-xvector" ,r-xvector))) + (home-page "https://bioconductor.org/packages/IONiseR/") + (synopsis "Quality assessment tools for Oxford Nanopore MinION data") + (description + "IONiseR provides tools for the quality assessment of Oxford Nanopore +MinION data. It extracts summary statistics from a set of fast5 files and can +be used either before or after base calling. In addition to standard +summaries of the read-types produced, it provides a number of plots for +visualising metrics relative to experiment run time or spatially over the +surface of a flowcell.") + (license license:expat))) From 963dfd3a06a1a9906706ea6bad34f89cc617d905 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 15 Mar 2019 11:36:38 +0100 Subject: [PATCH 106/694] gnu: Add python-toolshed. * gnu/packages/python-xyz.scm (python-toolshed): New variable. --- gnu/packages/python-xyz.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 706524bbb6..fa2701bc1c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15125,3 +15125,23 @@ (define-public python-txaio (description "Txaio provides a compatibility layer between the Python @code{asyncio} module and @code{Twisted}.") (license license:expat))) + +(define-public python-toolshed + (package + (name "python-toolshed") + (version "0.4.6") + (source + (origin + (method url-fetch) + (uri (pypi-uri "toolshed" version)) + (sha256 + (base32 + "14zvz51gzf9i1i3d1sj363ba4rksl6lcf4lz1arl8hpqgcbir8r3")))) + (build-system python-build-system) + (native-inputs + `(("python-nose" ,python-nose))) + (home-page "https://github.com/brentp/toolshed/") + (synopsis "Collection of modules and functions for working with data") + (description "This is a collection of well-tested, simple modules and +functions that aim to reduce boilerplate when working with data.") + (license license:bsd-2))) From 07c8b558e32f3fca27d20152f6b8f5569f11c960 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 15 Mar 2019 11:36:56 +0100 Subject: [PATCH 107/694] gnu: Add bwa-meth. * gnu/packages/bioinformatics.scm (bwa-meth): New variable. --- gnu/packages/bioinformatics.scm | 41 +++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 9b0a4314b9..3364a357fb 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -1570,6 +1570,47 @@ (define-public bwa-pssm well as many of the command line options.") (license license:gpl3+))) +(define-public bwa-meth + (package + (name "bwa-meth") + (version "0.2.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/brentp/bwa-meth.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "17j31i7zws5j7mhsq9x3qgkxly6mlmrgwhfq0qbflgxrmx04yaiz")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'keep-references-to-bwa + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "bwameth.py" + (("bwa mem") + (string-append (which "bwa") " mem")) + ;; There's an ill-advised check for "samtools" on PATH. + (("^checkX.*") "")) + #t))))) + (inputs + `(("bwa" ,bwa))) + (native-inputs + `(("python-toolshed" ,python-toolshed))) + (home-page "https://github.com/brentp/bwa-meth") + (synopsis "Fast and accurante alignment of BS-Seq reads") + (description + "BWA-Meth works for single-end reads and for paired-end reads from the +directional protocol (most common). It uses the method employed by +methylcoder and Bismark of in silico conversion of all C's to T's in both +reference and reads. It recovers the original read (needed to tabulate +methylation) by attaching it as a comment which BWA appends as a tag to the +read. It performs favorably to existing aligners gauged by number of on and +off-target reads for a capture method that targets CpG-rich region.") + (license license:expat))) + (define-public python-bx-python (package (name "python-bx-python") From 526b1efbba440eb9fa2403b45ac7542c9e54bad9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 15 Mar 2019 11:37:26 +0100 Subject: [PATCH 108/694] gnu: Add python-ws4py. * gnu/packages/python-web.scm (python-ws4py): New variable. --- gnu/packages/python-web.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index e25b68153d..b1a17898ff 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -3031,3 +3031,40 @@ (define-public python-autobahn Calls (rRPC). It is ideal for distributed, multi-client and server applications such as IoT applications or multi-user database-driven business applications.") (license license:expat))) + +(define-public python-ws4py + (package + (name "python-ws4py") + (version "0.5.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "ws4py" version)) + (sha256 + (base32 + "10slbbf2jm4hpr92jx7kh7mhf48sjl01v2w4d8z3f1p0ybbp7l19")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'python3.7-compatibility + (lambda _ + (substitute* '("ws4py/server/tulipserver.py" + "ws4py/async_websocket.py") + (("asyncio.async") + "asyncio.ensure_future")) + #t)) + ;; We don't have a package for cherrypy. + (add-after 'unpack 'remove-cherrypy-support + (lambda _ + (delete-file "ws4py/server/cherrypyserver.py") + #t))))) + (propagated-inputs + `(("python-gevent" ,python-gevent) + ("python-tornado" ,python-tornado))) + (home-page "https://github.com/Lawouach/WebSocket-for-Python") + (synopsis "WebSocket client and server library") + (description + "This package provides a WebSocket client and server library for +Python.") + (license license:bsd-3))) From 034b8fd4759ddb4f57855ec40793e682ea705298 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 15 Mar 2019 14:42:32 +0100 Subject: [PATCH 109/694] gnu: emacs-helm-pass: Update to 0.3. * gnu/packages/emacs-xyz.scm (emacs-helm-pass): Update to 0.3. --- gnu/packages/emacs-xyz.scm | 45 ++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 2d6b631f61..4c08254092 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -11776,29 +11776,26 @@ (define-public emacs-helm-mu (license license:gpl3+)))) (define-public emacs-helm-pass - (let ((commit "ebcbef1a962795a36e3491ae926e2a4b8a8b0ebb")) - (package - (name "emacs-helm-pass") - (version (git-version "20180416" "1" commit)) - (source - (origin - (method url-fetch) - (uri (string-append - "https://github.com/jabranham/helm-pass/archive/" - commit - ".tar.gz")) - (sha256 - (base32 - "1pgq4hj9wvz7z2fyxwsvbh6rmc1akya84v382nx26rr76iavz6wi")))) - (build-system emacs-build-system) - (propagated-inputs - `(("emacs-helm" ,emacs-helm) - ("emacs-password-store" ,emacs-password-store))) - (home-page - "https://github.com/jabranham/helm-pass") - (synopsis "Helm interface to pass, the standard Unix password manager") - (description - "Users of @code{helm-pass} may also be interested in functionality + (package + (name "emacs-helm-pass") + (version "0.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emacs-helm/helm-pass") + (commit version))) + (sha256 + (base32 + "0vglaknmir3yv4iwibwn8r40ran8d04gcyp99hx73ldmf3zqpnxv")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-helm" ,emacs-helm) + ("emacs-password-store" ,emacs-password-store))) + (home-page "https://github.com/emacs-helm/helm-pass") + (synopsis "Helm interface to pass, the standard Unix password manager") + (description + "Users of @code{helm-pass} may also be interested in functionality provided by other Emacs packages dealing with pass: @itemize @item @code{emacs-password-store}, which @code{helm-pass} relies on. @@ -11806,7 +11803,7 @@ (define-public emacs-helm-pass @item @code{auth-source-pass.el}: integration of Emacs' auth-source with @code{pass}, included in Emacs 26+). @end itemize\n") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-image+ (let ((commit "6834d0c09bb4df9ecc0d7a559bd7827fed48fffc")) From ca497b43118fc13adb0d244ea0a183491a0d0265 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 15 Mar 2019 12:34:02 +0100 Subject: [PATCH 110/694] gnu: Update libimobiledevice.org home pages. * gnu/packages/libusb.scm (libplist, libusbmuxd, libimobiledevice, ifuse)[source, home-page]: Use HTTPS. --- gnu/packages/libusb.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm index f0725d77e8..bf44e90ee8 100644 --- a/gnu/packages/libusb.scm +++ b/gnu/packages/libusb.scm @@ -308,7 +308,7 @@ (define-public libplist (version "2.0.0") (source (origin (method url-fetch) - (uri (string-append "http://www.libimobiledevice.org/downloads/" + (uri (string-append "https://www.libimobiledevice.org/downloads/" "libplist-" version ".tar.bz2")) (sha256 (base32 @@ -319,7 +319,7 @@ (define-public libplist (native-inputs `(("pkg-config" ,pkg-config) ("python-cython" ,python-cython))) - (home-page "http://www.libimobiledevice.org/") + (home-page "https://www.libimobiledevice.org/") (synopsis "C library to handle Apple Property List files") (description "This package provides a small portable C library to handle Apple Property List files in binary or XML.") @@ -331,7 +331,7 @@ (define-public libusbmuxd (version "1.0.10") (source (origin (method url-fetch) - (uri (string-append "http://www.libimobiledevice.org/downloads/" + (uri (string-append "https://www.libimobiledevice.org/downloads/" "libusbmuxd-" version ".tar.bz2")) (sha256 (base32 @@ -340,7 +340,7 @@ (define-public libusbmuxd (native-inputs `(("pkg-config" ,pkg-config) ("libplist" ,libplist))) - (home-page "http://www.libimobiledevice.org/") + (home-page "https://www.libimobiledevice.org/") (synopsis "Library to multiplex connections from and to iOS devices") (description "This package provides a client library to multiplex connections from and to iOS devices by connecting to a socket provided by a @@ -353,7 +353,7 @@ (define-public libimobiledevice (version "1.2.0") (source (origin (method url-fetch) - (uri (string-append "http://www.libimobiledevice.org/downloads/" + (uri (string-append "https://www.libimobiledevice.org/downloads/" "libimobiledevice-" version ".tar.bz2")) (sha256 (base32 @@ -376,7 +376,7 @@ (define-public libimobiledevice `(("pkg-config" ,pkg-config) ("python-cython" ,python-cython) ("libtool" ,libtool))) - (home-page "http://www.libimobiledevice.org/") + (home-page "https://www.libimobiledevice.org/") (synopsis "Protocol library and tools to communicate with Apple devices") (description "libimobiledevice is a software library that talks the protocols to support Apple devices. It allows other software to easily access @@ -392,7 +392,7 @@ (define-public ifuse (version "1.1.3") (source (origin (method url-fetch) - (uri (string-append "http://www.libimobiledevice.org/downloads/" + (uri (string-append "https://www.libimobiledevice.org/downloads/" "ifuse-" version ".tar.bz2")) (sha256 (base32 @@ -403,7 +403,7 @@ (define-public ifuse (native-inputs `(("pkg-config" ,pkg-config))) (build-system gnu-build-system) - (home-page "http://www.libimobiledevice.org/") + (home-page "https://www.libimobiledevice.org/") (synopsis "Mount iOS devices") (description "This package provides @command{ifuse}, a command to mount iOS devices and access their contents.") @@ -415,7 +415,7 @@ (define-public usbmuxd (version "1.1.0") (source (origin (method url-fetch) - (uri (string-append "http://www.libimobiledevice.org/downloads/" + (uri (string-append "https://www.libimobiledevice.org/downloads/" "usbmuxd-" version ".tar.bz2")) (sha256 (base32 @@ -427,7 +427,7 @@ (define-public usbmuxd (native-inputs `(("pkg-config" ,pkg-config))) (build-system gnu-build-system) - (home-page "http://www.libimobiledevice.org/") + (home-page "https://www.libimobiledevice.org/") (synopsis "Multiplex connections over USB to an iOS device") (description "This package provides the @code{usbmuxd} daemon which multiplexes connections over USB to an iOS device. To From df9f515ebca9bb3670a3d44c726c56744d85c099 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 15 Mar 2019 12:38:43 +0100 Subject: [PATCH 111/694] gnu: rapidjson: Adjust indentation. * gnu/packages/web.scm (rapidjson): Reindent. Remove unnecessary splicing in arguments while at it. --- gnu/packages/web.scm | 50 ++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 3c126bb941..bfc21c07a9 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -749,33 +749,33 @@ (define-public rapidjson (name "rapidjson") (version "1.1.0") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/Tencent/rapidjson.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1jixgb8w97l9gdh3inihz7avz7i770gy2j2irvvlyrq3wi41f5ab")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Remove code using the problematic JSON license (see - ;; ). - (delete-file-recursively "bin/jsonchecker") - #t)))) + (method git-fetch) + (uri (git-reference + (url "https://github.com/Tencent/rapidjson.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1jixgb8w97l9gdh3inihz7avz7i770gy2j2irvvlyrq3wi41f5ab")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Remove code using the problematic JSON license (see + ;; ). + (delete-file-recursively "bin/jsonchecker") + #t)))) (build-system cmake-build-system) (arguments - `(,@(if (string-prefix? "aarch64" (or (%current-target-system) - (%current-system))) - '(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-aarch-march-detection - (lambda _ - (substitute* (find-files "." "^CMakeLists\\.txt$") - (("native") "armv8-a")) - #t)))) - '()))) + (if (string-prefix? "aarch64" (or (%current-target-system) + (%current-system))) + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-aarch-march-detection + (lambda _ + (substitute* (find-files "." "^CMakeLists\\.txt$") + (("native") "armv8-a")) + #t)))) + '())) (home-page "https://github.com/Tencent/rapidjson") (synopsis "JSON parser/generator for C++ with both SAX/DOM style API") (description From 82924965d74cda9f23297b28f15feeda75867560 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 15 Mar 2019 12:42:41 +0100 Subject: [PATCH 112/694] gnu: rapidjson: Disable CPU optimization. * gnu/packages/web.scm (rapidjson)[arguments]: Add #:configure-flags. --- gnu/packages/web.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index bfc21c07a9..577be916bf 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -775,7 +775,8 @@ (define-public rapidjson (substitute* (find-files "." "^CMakeLists\\.txt$") (("native") "armv8-a")) #t)))) - '())) + ;; Disable CPU optimization for reproducibility. + '(#:configure-flags '("-DRAPIDJSON_ENABLE_INSTRUMENTATION_OPT=OFF")))) (home-page "https://github.com/Tencent/rapidjson") (synopsis "JSON parser/generator for C++ with both SAX/DOM style API") (description From 81382e3f6d4eb0261bf513a16be58d8d0b7373f2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 15 Mar 2019 16:03:59 +0100 Subject: [PATCH 113/694] gnu: meson: Update to 0.50.0. * gnu/packages/build-tools.scm (meson): Update to 0.50.0. * gnu/packages/patches/at-spi2-core-meson-compat.patch, gnu/packages/patches/totem-meson-compat.patch: New files. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/gnome.scm (totem)[source](patches): Add totem-meson.compat.patch. * gnu/packages/gtk.scm (at-spi2-core)[source](patches): New field. --- gnu/local.mk | 2 ++ gnu/packages/build-tools.scm | 4 ++-- gnu/packages/gnome.scm | 3 ++- gnu/packages/gtk.scm | 1 + .../patches/at-spi2-core-meson-compat.patch | 18 ++++++++++++++++++ gnu/packages/patches/totem-meson-compat.patch | 14 ++++++++++++++ 6 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/at-spi2-core-meson-compat.patch create mode 100644 gnu/packages/patches/totem-meson-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index eb1b5d223d..1d73189b17 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -652,6 +652,7 @@ dist_patch_DATA = \ %D%/packages/patches/apr-skip-getservbyname-test.patch \ %D%/packages/patches/aria2-CVE-2019-3500.patch \ %D%/packages/patches/aspell-default-dict-dir.patch \ + %D%/packages/patches/at-spi2-core-meson-compat.patch \ %D%/packages/patches/ath9k-htc-firmware-binutils.patch \ %D%/packages/patches/ath9k-htc-firmware-gcc.patch \ %D%/packages/patches/ath9k-htc-firmware-objcopy.patch \ @@ -1287,6 +1288,7 @@ dist_patch_DATA = \ %D%/packages/patches/tk-find-library.patch \ %D%/packages/patches/ttf2eot-cstddef.patch \ %D%/packages/patches/ttfautohint-source-date-epoch.patch \ + %D%/packages/patches/totem-meson-compat.patch \ %D%/packages/patches/totem-meson-easy-codec.patch \ %D%/packages/patches/tuxpaint-stamps-path.patch \ %D%/packages/patches/twinkle-include-qregexpvalidator.patch \ diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 7031ed8ea3..71b1756d3b 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -160,7 +160,7 @@ (define-public gn (define-public meson (package (name "meson") - (version "0.49.2") + (version "0.50.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/mesonbuild/meson/" @@ -168,7 +168,7 @@ (define-public meson version ".tar.gz")) (sha256 (base32 - "1z89f71r29laywx75bamjakybv9653wz0vd2l4xhvqy1dqr197zg")))) + "07q2wz23wjfk8z66mli1cc9as0ycjp5f39fd4awny82qv8nw86ra")))) (build-system python-build-system) (arguments `(;; FIXME: Tests require many additional inputs, a fix for the RUNPATH diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 28048f8da2..c4521cebb9 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3766,7 +3766,8 @@ (define-public totem (sha256 (base32 "1llyisls3pzf5bwkpxyfyxc2d3gpa09n5pjy7qsjdqrp3ya4k36g")) - (patches (search-patches "totem-meson-easy-codec.patch")))) + (patches (search-patches "totem-meson-easy-codec.patch" + "totem-meson-compat.patch")))) (build-system meson-build-system) (native-inputs `(("pkg-config" ,pkg-config) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index c790bd8e40..83ed8407da 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -561,6 +561,7 @@ (define-public at-spi2-core (uri (string-append "mirror://gnome/sources/" name "/" (version-major+minor version) "/" name "-" version ".tar.xz")) + (patches (search-patches "at-spi2-core-meson-compat.patch")) (sha256 (base32 "083j1v7kdjrpjsv1b9dl3d8xqj39jyp4cfn8i9gbbm7q2g93b923")))) diff --git a/gnu/packages/patches/at-spi2-core-meson-compat.patch b/gnu/packages/patches/at-spi2-core-meson-compat.patch new file mode 100644 index 0000000000..168a31b4ed --- /dev/null +++ b/gnu/packages/patches/at-spi2-core-meson-compat.patch @@ -0,0 +1,18 @@ +Fix build with Meson 0.50.0 and above. + +Taken from upstream repository: +https://gitlab.gnome.org/GNOME/at-spi2-core/commit/44a812ea51223d82f21a098a2d45fcc5c329ce7a + +diff --git a/atspi/meson.build b/atspi/meson.build +index b7a9357df1c4857dffa2ec123cd3073e67a07fea..2a6915d76202dabf923b50e6a8b85cbb83cb43d0 100644 +--- a/atspi/meson.build ++++ b/atspi/meson.build +@@ -57,7 +57,7 @@ atspi_headers = [ + + atspi_includedir = join_paths(get_option('prefix'), get_option('includedir'), 'at-spi-2.0', 'atspi') + +-install_headers(atspi_headers, subdir: atspi_includedir) ++install_headers(atspi_headers, install_dir: atspi_includedir) + + atspi_enums = gnome.mkenums('atspi-enum-types', + sources: [ 'atspi-constants.h', 'atspi-types.h' ], diff --git a/gnu/packages/patches/totem-meson-compat.patch b/gnu/packages/patches/totem-meson-compat.patch new file mode 100644 index 0000000000..8557908dd0 --- /dev/null +++ b/gnu/packages/patches/totem-meson-compat.patch @@ -0,0 +1,14 @@ +Fix an error that occurs with Meson 0.50.0 and later: +"ERROR: Subdir keyword must not be an absolute path". + +--- a/src/meson.build 2019-03-15 00:10:26.882293850 +0100 ++++ b/src/meson.build 2019-03-15 00:10:54.312197229 +0100 +@@ -82,7 +82,7 @@ + + install_headers( + headers, +- subdir: join_paths(totem_includedir, totem_api_path) ++ install_dir: join_paths(totem_includedir, totem_api_path) + ) + + libtotem_player_sources = files( From 18e627beac6b3673e52fdcfb78b19fb979ee9dd7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 15 Mar 2019 16:08:24 +0100 Subject: [PATCH 114/694] gnu: libssh2: Update home page. * gnu/packages/ssh.scm (libssh2)[home-page]: Use HTTPS. --- gnu/packages/ssh.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index fc7a711395..91b89242f8 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -141,7 +141,7 @@ (define-public libssh2 into an application to perform many different tasks when communicating with a server that supports the SSH-2 protocol.") (license license:bsd-3) - (home-page "http://www.libssh2.org/"))) + (home-page "https://www.libssh2.org/"))) (define-public openssh (package From b12af3fd1ed0eeb0bba89f20370673e7bbf52fa7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 15 Mar 2019 16:16:42 +0100 Subject: [PATCH 115/694] gnu: ceph: Update to 13.2.5. * gnu/packages/storage.scm (ceph): Update to 13.2.5. --- gnu/packages/storage.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/storage.scm b/gnu/packages/storage.scm index 063825f429..ee74f94eaf 100644 --- a/gnu/packages/storage.scm +++ b/gnu/packages/storage.scm @@ -54,14 +54,14 @@ (define-module (gnu packages storage) (define-public ceph (package (name "ceph") - (version "13.2.2") + (version "13.2.5") (source (origin (method url-fetch) (uri (string-append "https://download.ceph.com/tarballs/ceph-" version ".tar.gz")) (sha256 (base32 - "0h483n9iy0fkbqrhf7k0dzspwdpcaswkjwmc5n5c600fr6s1v9pk")) + "0jbs6l763clbqnq2s5jksn44yf71rhcnk85cw64fqvmv0r4ch71n")) (patches (search-patches "ceph-skip-unittest_blockdev.patch" "ceph-skip-collect-sys-info-test.patch" From ce32ce70475254bd5686f8ca77048127037bc87d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 15 Mar 2019 16:20:29 +0100 Subject: [PATCH 116/694] gnu: fio: Update to 3.13. * gnu/packages/benchmark.scm (fio): Update to 3.13. --- gnu/packages/benchmark.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm index f4bad73dc7..805cf3256c 100644 --- a/gnu/packages/benchmark.scm +++ b/gnu/packages/benchmark.scm @@ -38,14 +38,14 @@ (define-module (gnu packages benchmark) (define-public fio (package (name "fio") - (version "3.11") + (version "3.13") (source (origin (method url-fetch) (uri (string-append "http://brick.kernel.dk/snaps/" "fio-" version ".tar.bz2")) (sha256 (base32 - "0s8m0wcz5j6sa1hblj80wk3syy5b4shg7y3gabvm9xa3wj0lzasa")))) + "0ddj7zm04jqlna3w61qyp4qvwnv0r2lc1hzpwrgbvv4fq581w7d2")))) (build-system gnu-build-system) (arguments '(#:test-target "test" From a6e4af53f905bbc84d0cdcc949f463a1bde7091d Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 15 Mar 2019 16:40:23 +0100 Subject: [PATCH 117/694] gnu: Add emacs-transient. * gnu/packages/emacs-xyz.scm (emacs-transient): New variable. --- gnu/packages/emacs-xyz.scm | 56 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 4c08254092..1454a78d97 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -13554,3 +13554,59 @@ (define-public emacs-elmacro "This package displays keyboard macros or latest interactive commands as Emacs Lisp.") (license license:gpl3+)))) + +(define-public emacs-transient + ;; 0.1.0 depends on lv.el but not later versions. + (let ((commit "7e45a57ec81185631fe763733f64c99021df2a06")) + (package + (name "emacs-transient") + (version (git-version "0.1.0" "1" commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/magit/transient") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0r6d4c1lga3bk0s7q7y4v4hbpxnd9h40cjxybqvax2z902931fz1")))) + (build-system gnu-build-system) + (native-inputs `(("texinfo" ,texinfo) + ("emacs" ,emacs-minimal))) + (propagated-inputs + `(("dash" ,emacs-dash))) + (arguments + `(#:modules ((guix build gnu-build-system) + (guix build utils) + (srfi srfi-26) + (guix build emacs-utils)) + #:imported-modules (,@%gnu-build-system-modules + (guix build emacs-utils)) + #:tests? #f ; tests are not included in the release + #:make-flags (list "lisp" "info" + (string-append "LOAD_PATH=-L . -L " + (assoc-ref %build-inputs "dash") + "/share/emacs/site-lisp/guix.d/dash-" + ,(package-version emacs-dash))) + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (lisp (string-append out "/share/emacs/site-lisp/guix.d/" + "transient" "-" ,version)) + (info (string-append out "/share/info"))) + (for-each (cut install-file <> lisp) + (find-files "." "\\.elc*$")) + (install-file "docs/transient.info" (string-append info))) + #t))))) + (home-page "https://magit.vc/manual/transient") + (synopsis "Transient commands in Emacs") + (description + "Taking inspiration from prefix keys and prefix arguments in Emacs, +Transient implements a similar abstraction involving a prefix command, infix +arguments and suffix commands. We could call this abstraction a \"transient +command\", but because it always involves at least two commands (a prefix and +a suffix) we prefer to call it just a \"transient\".") + (license license:gpl3+)))) From 3a7ca60adcf22fb21f35b7393d3fe2a26e328c37 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 15 Mar 2019 16:51:42 +0100 Subject: [PATCH 118/694] gnu: emacs-magit: Update to 20190311. * gnu/packages/emacs-xyz.scm (emacs-magit): Update to 20190311. --- gnu/packages/emacs-xyz.scm | 142 +++++++++++++++++-------------------- 1 file changed, 65 insertions(+), 77 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 1454a78d97..68eb91447d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -252,89 +252,77 @@ (define-public emacs-with-editor (license license:gpl3+))) (define-public emacs-magit - (package - (name "emacs-magit") - (version "2.90.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/magit/magit") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1kw94sdczswsyzn1zlk5s5aplpdv4qd7qcqc5zfxsmsfwm3jacl4")))) - (build-system gnu-build-system) - (native-inputs `(("texinfo" ,texinfo) - ("emacs" ,emacs-minimal))) - (inputs - `(("git" ,git) - ("perl" ,perl))) - (propagated-inputs - `(("dash" ,emacs-dash) - ("ghub" ,emacs-ghub) - ("graphql" ,emacs-graphql) - ("treepy" ,emacs-treepy) - ("magit-popup" ,emacs-magit-popup) - ("with-editor" ,emacs-with-editor))) - (arguments - `(#:modules ((guix build gnu-build-system) - (guix build utils) - (guix build emacs-utils)) - #:imported-modules (,@%gnu-build-system-modules - (guix build emacs-utils)) - #:test-target "test" - #:tests? #f ; tests are not included in the release + ;; Version 2.90.1 has trouble loading the transient library, + ;; so we use a more recent commit that fixes it. + (let ((commit "b4aec016b5577afa8d889f258b499814d1bb1d94")) + (package + (name "emacs-magit") + (version (git-version "2.90.1" "1" commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/magit/magit") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0zl7v6z0y50pcgqsf2r8c1k3r5nwjad9ba7r6sgrnf4rc62br7jv")))) + (build-system gnu-build-system) + (native-inputs `(("texinfo" ,texinfo) + ("emacs" ,emacs-minimal))) + (inputs + `(("git" ,git) + ("perl" ,perl))) + (propagated-inputs + `(("dash" ,emacs-dash) + ("with-editor" ,emacs-with-editor) + ("transient" ,emacs-transient))) + (arguments + `(#:modules ((guix build gnu-build-system) + (guix build utils) + (guix build emacs-utils)) + #:imported-modules (,@%gnu-build-system-modules + (guix build emacs-utils)) + #:test-target "test" + #:tests? #f ; tests are not included in the release - #:make-flags - (list (string-append "PREFIX=" %output) - ;; Don't put .el files in a sub-directory. - (string-append "lispdir=" %output "/share/emacs/site-lisp") - (string-append "DASH_DIR=" - (assoc-ref %build-inputs "dash") - "/share/emacs/site-lisp/guix.d/dash-" - ,(package-version emacs-dash)) - (string-append "GHUB_DIR=" - (assoc-ref %build-inputs "ghub") - "/share/emacs/site-lisp/guix.d/ghub-" - ,(package-version emacs-ghub)) - (string-append "GRAPHQL_DIR=" - (assoc-ref %build-inputs "graphql") - "/share/emacs/site-lisp/guix.d/graphql-" - ,(package-version emacs-graphql)) - (string-append "TREEPY_DIR=" - (assoc-ref %build-inputs "treepy") - "/share/emacs/site-lisp/guix.d/treepy-" - ,(package-version emacs-treepy)) - (string-append "MAGIT_POPUP_DIR=" - (assoc-ref %build-inputs "magit-popup") - "/share/emacs/site-lisp/guix.d/magit-popup-" - ,(package-version emacs-magit-popup)) - (string-append "WITH_EDITOR_DIR=" - (assoc-ref %build-inputs "with-editor") - "/share/emacs/site-lisp/guix.d/with-editor-" - ,(package-version emacs-with-editor))) + #:make-flags + (list (string-append "PREFIX=" %output) + ;; Don't put .el files in a sub-directory. + (string-append "lispdir=" %output "/share/emacs/site-lisp") + (string-append "DASH_DIR=" + (assoc-ref %build-inputs "dash") + "/share/emacs/site-lisp/guix.d/dash-" + ,(package-version emacs-dash)) + (string-append "WITH_EDITOR_DIR=" + (assoc-ref %build-inputs "with-editor") + "/share/emacs/site-lisp/guix.d/with-editor-" + ,(package-version emacs-with-editor)) + (string-append "TRANSIENT_DIR=" + (assoc-ref %build-inputs "transient") + "/share/emacs/site-lisp/guix.d/transient-" + ,(package-version emacs-transient))) - #:phases - (modify-phases %standard-phases - (delete 'configure) - (add-before - 'build 'patch-exec-paths - (lambda* (#:key inputs #:allow-other-keys) - (let ((perl (assoc-ref inputs "perl"))) - (make-file-writable "lisp/magit-sequence.el") - (emacs-substitute-variables "lisp/magit-sequence.el" - ("magit-perl-executable" (string-append perl "/bin/perl"))) - #t)))))) - (home-page "https://magit.vc/") - (synopsis "Emacs interface for the Git version control system") - (description - "With Magit, you can inspect and modify your Git repositories with Emacs. + #:phases + (modify-phases %standard-phases + (delete 'configure) + (add-before + 'build 'patch-exec-paths + (lambda* (#:key inputs #:allow-other-keys) + (let ((perl (assoc-ref inputs "perl"))) + (make-file-writable "lisp/magit-sequence.el") + (emacs-substitute-variables "lisp/magit-sequence.el" + ("magit-perl-executable" (string-append perl "/bin/perl"))) + #t)))))) + (home-page "https://magit.vc/") + (synopsis "Emacs interface for the Git version control system") + (description + "With Magit, you can inspect and modify your Git repositories with Emacs. You can review and commit the changes you have made to the tracked files, for example, and you can browse the history of past changes. There is support for cherry picking, reverting, merging, rebasing, and other common Git operations.") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public magit (deprecated-package "magit" emacs-magit)) From 65fc1932b3d7ab210b3b4707808dee268d02428f Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 15 Mar 2019 16:53:55 +0100 Subject: [PATCH 119/694] gnu: emacs-magit-svn: Update to 20190216. * gnu/packages/emacs-xyz.scm (emacs-magit-svn): Update to 20190216. --- gnu/packages/emacs-xyz.scm | 123 +++++++++++++++++-------------------- 1 file changed, 56 insertions(+), 67 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 68eb91447d..f5936a2d23 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -328,78 +328,67 @@ (define-public magit (deprecated-package "magit" emacs-magit)) (define-public emacs-magit-svn - (package - (name "emacs-magit-svn") - (version "2.2.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/magit/magit-svn") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "01kcsc53q3mbhgjssjpby7ypnhqsr48rkl1xz3ahaypmlp929gl9")))) - (build-system trivial-build-system) - (native-inputs `(("emacs" ,emacs-minimal))) - (propagated-inputs `(("dash" ,emacs-dash) - ("ghub" ,emacs-ghub) - ("graphql" ,emacs-graphql) - ("treepy" ,emacs-treepy) - ("with-editor" ,emacs-with-editor) - ("magit" ,emacs-magit) - ("magit-popup" ,emacs-magit-popup))) - (arguments - `(#:modules ((guix build utils) - (guix build emacs-utils)) + (let ((commit "9e33ceee32f665db59909e1c00a667ccdd04178f")) + (package + (name "emacs-magit-svn") + (version (git-version "2.2.1" "1" commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/magit/magit-svn") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1mlqz8dh6jy5rv72lgkxv253dgh73fmbaidskicypapvbl3lr6xy")))) + (build-system trivial-build-system) + (native-inputs `(("emacs" ,emacs-minimal))) + (propagated-inputs `(("dash" ,emacs-dash) + ("with-editor" ,emacs-with-editor) + ("magit" ,emacs-magit) + ("transient" ,emacs-transient))) + (arguments + `(#:modules ((guix build utils) + (guix build emacs-utils)) - #:builder - (begin - (use-modules (guix build utils) - (guix build emacs-utils)) + #:builder + (begin + (use-modules (guix build utils) + (guix build emacs-utils)) - (let ((emacs (string-append (assoc-ref %build-inputs "emacs") - "/bin/emacs")) - (magit (string-append (assoc-ref %build-inputs "magit") - "/share/emacs/site-lisp")) - (magit-popup (string-append (assoc-ref %build-inputs "magit-popup") - "/share/emacs/site-lisp/guix.d/magit-popup-" - ,(package-version emacs-magit-popup))) - (ghub (string-append (assoc-ref %build-inputs "ghub") - "/share/emacs/site-lisp/guix.d/ghub-" - ,(package-version emacs-ghub))) - (graphql (string-append (assoc-ref %build-inputs "graphql") - "/share/emacs/site-lisp/guix.d/graphql-" - ,(package-version emacs-graphql))) - (treepy (string-append (assoc-ref %build-inputs "treepy") - "/share/emacs/site-lisp/guix.d/treepy-" - ,(package-version emacs-treepy))) - (dash (string-append (assoc-ref %build-inputs "dash") - "/share/emacs/site-lisp/guix.d/dash-" - ,(package-version emacs-dash))) - (with-editor (string-append (assoc-ref %build-inputs "with-editor") - "/share/emacs/site-lisp/guix.d/with-editor-" - ,(package-version emacs-with-editor))) - (source (assoc-ref %build-inputs "source")) - (lisp-dir (string-append %output "/share/emacs/site-lisp"))) + (let ((emacs (string-append (assoc-ref %build-inputs "emacs") + "/bin/emacs")) + (magit (string-append (assoc-ref %build-inputs "magit") + "/share/emacs/site-lisp")) + (transient (string-append (assoc-ref %build-inputs "transient") + "/share/emacs/site-lisp/guix.d/transient-" + ,(package-version emacs-transient))) + (dash (string-append (assoc-ref %build-inputs "dash") + "/share/emacs/site-lisp/guix.d/dash-" + ,(package-version emacs-dash))) + (with-editor (string-append (assoc-ref %build-inputs "with-editor") + "/share/emacs/site-lisp/guix.d/with-editor-" + ,(package-version emacs-with-editor))) + (source (assoc-ref %build-inputs "source")) + (lisp-dir (string-append %output "/share/emacs/site-lisp"))) - (install-file (string-append source "/magit-svn.el") - lisp-dir) + (install-file (string-append source "/magit-svn.el") + lisp-dir) - (with-directory-excursion lisp-dir - (parameterize ((%emacs emacs)) - (emacs-generate-autoloads ,name lisp-dir) - (setenv "EMACSLOADPATH" - (string-append ":" magit ":" magit-popup ":" ghub ":" - ":" graphql ":" treepy ":" dash ":" with-editor)) - (emacs-batch-eval '(byte-compile-file "magit-svn.el")))) - #t)))) - (home-page "https://github.com/magit/magit-svn") - (synopsis "Git-SVN extension to Magit") - (description - "This package is an extension to Magit, the Git Emacs mode, providing + (with-directory-excursion lisp-dir + (parameterize ((%emacs emacs)) + (emacs-generate-autoloads ,name lisp-dir) + (setenv "EMACSLOADPATH" + (string-append ":" magit ":" transient + ":" dash ":" with-editor)) + (emacs-batch-eval '(byte-compile-file "magit-svn.el")))) + #t)))) + (home-page "https://github.com/magit/magit-svn") + (synopsis "Git-SVN extension to Magit") + (description + "This package is an extension to Magit, the Git Emacs mode, providing support for Git-SVN.") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public magit-svn (deprecated-package "magit-svn" emacs-magit-svn)) From bc4cea6f0ef20a620d8bbda8ea14f9adf209c78d Mon Sep 17 00:00:00 2001 From: Guy Fleury Iteriteka Date: Fri, 15 Mar 2019 13:02:51 -0400 Subject: [PATCH 120/694] download: Add MATE mirrors. * guix/download.scm (%mirrors): Add mirrors for the MATE Desktop. --- guix/download.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/guix/download.scm b/guix/download.scm index 25eaefcffa..8865777818 100644 --- a/guix/download.scm +++ b/guix/download.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2016 Alex Griffin ;;; Copyright © 2016 David Craven ;;; Copyright © 2017 Tobias Geerinckx-Rice +;;; Copyright © 2019 Guy Fleury Iteriteka ;;; ;;; This file is part of GNU Guix. ;;; @@ -360,7 +361,10 @@ (define %mirrors "https://openbsd.mirror.constant.com/pub/OpenBSD/" "https://ftp4.usa.openbsd.org/pub/OpenBSD/" "https://ftp5.usa.openbsd.org/pub/OpenBSD/" - "https://mirror.esc7.net/pub/OpenBSD/")))) + "https://mirror.esc7.net/pub/OpenBSD/") + (mate + "https://pub.mate-desktop.org/releases/" + "http://pub.mate-desktop.org/releases/")))) (define %mirror-file ;; Copy of the list of mirrors to a file. This allows us to keep a single From 88c2cb5e122c6b95065b2f0b736f7b20738aa8f1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Mar 2019 11:52:03 +0100 Subject: [PATCH 121/694] gnu: perl-test-cleannamespaces: Update to 0.24. * gnu/packages/perl-check.scm (perl-test-cleannamespaces): Update to 0.24. --- gnu/packages/perl-check.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/perl-check.scm b/gnu/packages/perl-check.scm index c1edf48f06..023769a8d4 100644 --- a/gnu/packages/perl-check.scm +++ b/gnu/packages/perl-check.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2017 Christopher Baines ;;; Copyright © 2017 Petter -;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Oleg Pykhalov ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2018 Kei Kebreau @@ -204,15 +204,14 @@ (define-public perl-test-class-most (define-public perl-test-cleannamespaces (package (name "perl-test-cleannamespaces") - (version "0.22") + (version "0.24") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/E/ET/ETHER/" "Test-CleanNamespaces-" version ".tar.gz")) (sha256 - (base32 - "1jma95agqqy7iwdcl6jbg1waqz7mjqng4l046lpknhfxjhcj4al6")))) + (base32 "0yijspncqgmbkkxrh66xx1pliajar05yqhzq6m4nb6p8x1lmb39k")))) (build-system perl-build-system) (native-inputs `(("perl-file-pushd" ,perl-file-pushd) From 2ad839f373cc3a1c272ad3430d6ac3bfe9db470a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Mar 2019 11:52:13 +0100 Subject: [PATCH 122/694] gnu: perl-test-differences: Update to 0.67. * gnu/packages/perl-check.scm (perl-test-differences): Update to 0.67. --- gnu/packages/perl-check.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl-check.scm b/gnu/packages/perl-check.scm index 023769a8d4..94712b6548 100644 --- a/gnu/packages/perl-check.scm +++ b/gnu/packages/perl-check.scm @@ -338,15 +338,14 @@ (define-public perl-test-deep (define-public perl-test-differences (package (name "perl-test-differences") - (version "0.64") + (version "0.67") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/D/DC/DCANTRELL/" "Test-Differences-" version ".tar.gz")) (sha256 - (base32 - "0xmj5vgklq4yqvi7l63ky1k6g7fhww68llpmw9rhlaihqbcrsicz")))) + (base32 "1nkqr3m4lbzw7fkkzah42aiqlhxapamk6kw7hj90cjwkifsbp3f8")))) (build-system perl-build-system) (native-inputs `(("perl-module-build" ,perl-module-build))) From 39199eb440d4649bc1c669cdef7f15fd34c27a32 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Mar 2019 11:52:24 +0100 Subject: [PATCH 123/694] gnu: perl-test-harness: Update to 3.42. * gnu/packages/perl-check.scm (perl-test-harness): Update to 3.42. --- gnu/packages/perl-check.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl-check.scm b/gnu/packages/perl-check.scm index 94712b6548..62c1b5e4c5 100644 --- a/gnu/packages/perl-check.scm +++ b/gnu/packages/perl-check.scm @@ -575,15 +575,14 @@ (define-public perl-test-files (define-public perl-test-harness (package (name "perl-test-harness") - (version "3.41") + (version "3.42") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/L/LE/LEONT/" "Test-Harness-" version ".tar.gz")) (sha256 - (base32 - "0cgdgzywvscbvb9i0dmd2ls5jwqlnf2z6hx4f4lljpvdjd59v3m8")))) + (base32 "0lwfaamhpqia0ks4pcci83xbqz6jhng7acv95qk6wbd8zr70vn8g")))) (build-system perl-build-system) (arguments `(#:phases From e1abfc76797256e2ddf952a9d812ef1214e2639d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Mar 2019 11:52:34 +0100 Subject: [PATCH 124/694] gnu: perl-test-manifest: Update to 2.021. * gnu/packages/perl-check.scm (perl-test-manifest): Update to 2.021. --- gnu/packages/perl-check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl-check.scm b/gnu/packages/perl-check.scm index 62c1b5e4c5..226afc3112 100644 --- a/gnu/packages/perl-check.scm +++ b/gnu/packages/perl-check.scm @@ -645,14 +645,14 @@ (define-public perl-test-longstring (define-public perl-test-manifest (package (name "perl-test-manifest") - (version "2.02") + (version "2.021") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/B/BD/BDFOY/" "Test-Manifest-" version ".tar.gz")) (sha256 (base32 - "15ik52l9macrrfizf4y6wj71d4lx7w590h2dfajnkmbxmz786iq6")))) + "1n9jscnni24sbp4v5gjlcy3iknfwvmy0731xwvk1c3jq3kbslym4")))) (build-system perl-build-system) (native-inputs `(("perl-test-pod" ,perl-test-pod) From cb5c64c6f59b4415c190d237e0bbe927bc92ccda Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Mar 2019 11:52:48 +0100 Subject: [PATCH 125/694] gnu: perl-test-mockobject: Update to 1.20180705. * gnu/packages/perl-check.scm (perl-test-mockobject): Update to 1.20180705. --- gnu/packages/perl-check.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl-check.scm b/gnu/packages/perl-check.scm index 226afc3112..b9d3d1d61c 100644 --- a/gnu/packages/perl-check.scm +++ b/gnu/packages/perl-check.scm @@ -735,15 +735,14 @@ (define-public perl-test-mockmodule (define-public perl-test-mockobject (package (name "perl-test-mockobject") - (version "1.20150527") + (version "1.20180705") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/C/CH/CHROMATIC/" "Test-MockObject-" version ".tar.gz")) (sha256 - (base32 - "160xvhbpwqjaff4fgckvldknldzcbn1z3jvyzybs7cqlj1x3bwdd")))) + (base32 "06250ayzzd90vbvkpxwr9d3nlbbngl1b9nk2qk0ma4aibn6ha5j5")))) (build-system perl-build-system) (native-inputs `(("perl-test-exception" ,perl-test-exception) From 5c360e48dbca6b1d53266172b4b9c8680a3a2ff8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Mar 2019 11:53:58 +0100 Subject: [PATCH 126/694] gnu: perl-test-mockobject: Run tests. * gnu/packages/perl-check.scm (perl-test-mockobject)[arguments]: Re-enable tests. [native-inputs]: Add perl-cgi. --- gnu/packages/perl-check.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl-check.scm b/gnu/packages/perl-check.scm index b9d3d1d61c..fe1129a475 100644 --- a/gnu/packages/perl-check.scm +++ b/gnu/packages/perl-check.scm @@ -34,6 +34,7 @@ (define-module (gnu packages perl-check) #:use-module (guix licenses) #:use-module (gnu packages) #:use-module (gnu packages valgrind) + #:use-module (gnu packages web) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system perl) @@ -745,14 +746,14 @@ (define-public perl-test-mockobject (base32 "06250ayzzd90vbvkpxwr9d3nlbbngl1b9nk2qk0ma4aibn6ha5j5")))) (build-system perl-build-system) (native-inputs - `(("perl-test-exception" ,perl-test-exception) + `(("perl-cgi" ,perl-cgi) + ("perl-test-exception" ,perl-test-exception) ("perl-test-warn" ,perl-test-warn))) (propagated-inputs `(("perl-test-exception" ,perl-test-exception) ("perl-test-warn" ,perl-test-warn) ("perl-universal-can" ,perl-universal-can) ("perl-universal-isa" ,perl-universal-isa))) - (arguments `(#:tests? #f)) ;TODO: tests require perl-cgi (home-page "https://metacpan.org/release/Test-MockObject") (synopsis "Emulate troublesome interfaces in Perl") (description "Test::MockObject allows you to create objects that conform From 17ed9595a5dfec9c5799f50d4fd74d93242c518d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Mar 2019 12:16:05 +0100 Subject: [PATCH 127/694] gnu: perl-test-mocktime: Update to 0.17. * gnu/packages/perl-check.scm (perl-test-mocktime): Update to 0.17. --- gnu/packages/perl-check.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl-check.scm b/gnu/packages/perl-check.scm index fe1129a475..d3d2ae3d43 100644 --- a/gnu/packages/perl-check.scm +++ b/gnu/packages/perl-check.scm @@ -764,15 +764,14 @@ (define-public perl-test-mockobject (define-public perl-test-mocktime (package (name "perl-test-mocktime") - (version "0.15") + (version "0.17") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/D/DD/DDICK/" "Test-MockTime-" version ".tar.gz")) (sha256 - (base32 - "0j6cxmkj52i5xkwg8dg6klm0dh386fzc5v80n5nbdalpvq0h48c8")))) + (base32 "1y820qsq7yf7r6smy5c6f0mpf2cis2q24vwmpim1svv0n8cf2qrk")))) (propagated-inputs `(("perl-time-piece" ,perl-time-piece))) (build-system perl-build-system) From a48d560f40a57d0f127a4dc7b6e9acec44ccf53b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Mar 2019 12:39:06 +0100 Subject: [PATCH 128/694] gnu: perl-test-sharedfork: Update to 0.35. * gnu/packages/perl-check.scm (perl-test-sharedfork): Update to 0.35. --- gnu/packages/perl-check.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl-check.scm b/gnu/packages/perl-check.scm index d3d2ae3d43..40bc4029de 100644 --- a/gnu/packages/perl-check.scm +++ b/gnu/packages/perl-check.scm @@ -1119,15 +1119,14 @@ (define-public perl-test-script (define-public perl-test-sharedfork (package (name "perl-test-sharedfork") - (version "0.29") + (version "0.35") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/E/EX/EXODIST/" "Test-SharedFork-" version ".tar.gz")) (sha256 - (base32 - "0vlak10q4gcf0ch0rfcb9lvddav6r8h15iipzbkbgf9mrj47gbv3")))) + (base32 "17y52j20k1bs9dgf4n6rhh9dn4cfxxbnfn2cfs7pb00fc5jyhci9")))) (build-system perl-build-system) (native-inputs `(("perl-test-requires" ,perl-test-requires))) From 960f2ade7e35f1c60f7aa90ed0f7369b90c3a97a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Mar 2019 12:39:17 +0100 Subject: [PATCH 129/694] gnu: perl-test-simple: Update to 1.302162. * gnu/packages/perl-check.scm (perl-test-simple): Update to 1.302162. --- gnu/packages/perl-check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl-check.scm b/gnu/packages/perl-check.scm index 40bc4029de..d947b231fe 100644 --- a/gnu/packages/perl-check.scm +++ b/gnu/packages/perl-check.scm @@ -1139,14 +1139,14 @@ (define-public perl-test-sharedfork (define-public perl-test-simple (package (name "perl-test-simple") - (version "1.302141") + (version "1.302162") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/E/EX/EXODIST/" "Test-Simple-" version ".tar.gz")) (sha256 (base32 - "1dwmsf7jzhw8xppzrw2raq3q6nzd1kcl8b53hik4586b2k45n16p")))) + "1i0zsgp5ypygsfbl5gdsgnzlqv57bx69yl6sh440cpkk7my1k83k")))) (build-system perl-build-system) (synopsis "Basic utilities for writing tests") (description From e750f1fcdc48f523f26686113fce3c10920a872f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Mar 2019 12:39:27 +0100 Subject: [PATCH 130/694] gnu: perl-test-trap: Update to 0.3.4. * gnu/packages/perl-check.scm (perl-test-trap): Update to 0.3.4. --- gnu/packages/perl-check.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl-check.scm b/gnu/packages/perl-check.scm index d947b231fe..1b5a606fbe 100644 --- a/gnu/packages/perl-check.scm +++ b/gnu/packages/perl-check.scm @@ -1228,15 +1228,14 @@ (define-public perl-test-perltidy (define-public perl-test-trap (package (name "perl-test-trap") - (version "0.3.3") + (version "0.3.4") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/E/EB/EBHANSSEN/" "Test-Trap-v" version ".tar.gz")) (sha256 - (base32 - "1676gqjyk0zig3yyqv053y5j1pajp2af08ffmgx94n414whbhm5c")))) + (base32 "1qjs2080kcc66s4d7499br5lw2qmhr9gxky4xsl6vjdn6dpna10b")))) (build-system perl-build-system) (native-inputs `(("perl-module-build" ,perl-module-build) From 677aca12b7c89aea159d8e319bd3de7524e59516 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Mar 2019 12:39:50 +0100 Subject: [PATCH 131/694] gnu: perl-test-yaml: Update to 1.07. * gnu/packages/perl-check.scm (perl-test-yaml): Update to 1.07. --- gnu/packages/perl-check.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gnu/packages/perl-check.scm b/gnu/packages/perl-check.scm index 1b5a606fbe..fbe7b836cf 100644 --- a/gnu/packages/perl-check.scm +++ b/gnu/packages/perl-check.scm @@ -1362,20 +1362,19 @@ (define-public perl-test-writevariants (synopsis "Dynamic generation of tests") (description "The Test::WriteVariants module provides for the dynamic generation of tests in nested combinations of contexts.") - (license perl-license))) ;See LICENSE + (license perl-license))) ; see LICENSE (define-public perl-test-yaml (package (name "perl-test-yaml") - (version "1.06") + (version "1.07") (source (origin (method url-fetch) - (uri (string-append "mirror://cpan/authors/id/I/IN/INGY/" + (uri (string-append "mirror://cpan/authors/id/T/TI/TINITA/" "Test-YAML-" version ".tar.gz")) (sha256 - (base32 - "0hxrfs7p9hqkhvv5nhk2hd3kh32smwng4nz47b8xf4iw2q1n2dr7")))) + (base32 "0pwrrnwi1qaiy3c5522vy0kzncxc9g02r4b056wqqaa69w1hsc0z")))) (build-system perl-build-system) (propagated-inputs `(("perl-test-base" ,perl-test-base))) From 6dc75e18fe499af79d05ad99ea70eaab39c3b52b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Mar 2019 12:39:38 +0100 Subject: [PATCH 132/694] gnu: perl-test-writevariants: Update to 0.014. * gnu/packages/perl-check.scm (perl-test-writevariants): Update to 0.014. [propagated-inputs]: Add perl-module-runtime. --- gnu/packages/perl-check.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/perl-check.scm b/gnu/packages/perl-check.scm index fbe7b836cf..3b9640583a 100644 --- a/gnu/packages/perl-check.scm +++ b/gnu/packages/perl-check.scm @@ -1341,15 +1341,14 @@ (define-public perl-test-without-module (define-public perl-test-writevariants (package (name "perl-test-writevariants") - (version "0.010") + (version "0.014") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/R/RE/REHSACK/" "Test-WriteVariants-" version ".tar.gz")) (sha256 - (base32 - "0kklp05fj98yiq8znyfx9lx1vmjay2ypfb868qdwv3kf93m5zjwr")))) + (base32 "11v4j3607bydxsqy2ylx9w6qr3qxcalfx3mdc4q4ccqmxsyw4jb3")))) (build-system perl-build-system) (native-inputs `(("perl-test-most" ,perl-test-most) @@ -1357,7 +1356,8 @@ (define-public perl-test-writevariants (propagated-inputs `(("perl-data-tumbler" ,perl-data-tumbler) ("perl-file-homedir" ,perl-file-homedir) - ("perl-module-pluggable" ,perl-module-pluggable))) + ("perl-module-pluggable" ,perl-module-pluggable) + ("perl-module-runtime" ,perl-module-runtime))) (home-page "https://metacpan.org/release/Test-WriteVariants") (synopsis "Dynamic generation of tests") (description "The Test::WriteVariants module provides for the dynamic From 497b8df89a5f2c45cc286ce8f7b4453d755a7ca9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Mar 2019 14:58:15 +0100 Subject: [PATCH 133/694] gnu: perl-async-interrupt: Update to 1.24. * gnu/packages/perl.scm (perl-async-interrupt): Update to 1.24. [native-inputs]: Add perl-canary-stability. --- gnu/packages/perl.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index ef337446dd..5b05b772dc 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -296,15 +296,17 @@ (define-public perl-array-utils (define-public perl-async-interrupt (package (name "perl-async-interrupt") - (version "1.21") + (version "1.24") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/M/ML/MLEHMANN/" "Async-Interrupt-" version ".tar.gz")) (sha256 (base32 - "092zs7b72f8q109c3z829nqfgwqghp3nhw44c0gcyhacbb4wgpk3")))) + "1lx4am3cqb9vvng9fhlwgfd7mk3afbrg8rps6xgpas6ij67dw8m0")))) (build-system perl-build-system) + (native-inputs + `(("perl-canary-stability" ,perl-canary-stability))) (propagated-inputs `(("perl-common-sense" ,perl-common-sense))) (home-page "https://metacpan.org/release/Async-Interrupt") From 8dfdd746e11c426dd37366bce6211e1e4accaccb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Mar 2019 17:22:31 +0100 Subject: [PATCH 134/694] gnu: perl-xml-feed: Update to 0.59. * gnu/packages/xml.scm (perl-xml-feed): Update to 0.59. --- gnu/packages/xml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 0ba23bcba4..ff3cf8d356 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -792,14 +792,14 @@ (define-public perl-xml-compile-wsdl11 (define-public perl-xml-feed (package (name "perl-xml-feed") - (version "0.55") + (version "0.59") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/D/DA/DAVECROSS/" "XML-Feed-" version ".tar.gz")) (sha256 (base32 - "0am345qzy5rxxnzh13l6p18a7drgkzmmlkgrgl4cv3b2j1pwls3i")))) + "1z1a88bpy64j42bbyl8acbfl3dn9iaz47gx6clkgy5sbn4kr0kgk")))) (build-system perl-build-system) (arguments `(#:tests? #f)) ; tests require internet connection From dc8621a2c1f010bf5d8b3365e26b66603a8f2fd4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Mar 2019 12:48:54 +0100 Subject: [PATCH 135/694] gnu: Move protozero to (gnu packages protobuf). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/geo.scm (protozero): Move from here… * gnu/packages/protobuf.scm (protozero): …to here. --- gnu/packages/geo.scm | 24 +----------------------- gnu/packages/protobuf.scm | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 23 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 58eb11231f..c7026c4e96 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -52,6 +52,7 @@ (define-module (gnu packages geo) #:use-module (gnu packages pcre) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages protobuf) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) #:use-module (gnu packages sqlite) @@ -740,29 +741,6 @@ (define-public imposm3 license:bsd-2 license:bsd-3)))) -(define-public protozero - (package - (name "protozero") - (version "1.6.7") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/mapbox/protozero.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1ryvn3iwxiaih3mvyy45nbwxnhzfc8vby0xh9m6d6fpakhcpf6s3")))) - (build-system cmake-build-system) - (home-page "https://github.com/mapbox/protozero") - (synopsis "Minimalistic protocol buffer decoder and encoder in C++") - (description "Protozero is a minimalistic protocol buffer decoder and -encoder in C++. The developer using protozero has to manually translate the -@file{.proto} description into code.") - (license (list - license:asl2.0 ; for folly - license:bsd-2)))) - (define-public libosmium (package (name "libosmium") diff --git a/gnu/packages/protobuf.scm b/gnu/packages/protobuf.scm index 028b2f21e1..73169216b4 100644 --- a/gnu/packages/protobuf.scm +++ b/gnu/packages/protobuf.scm @@ -23,6 +23,8 @@ (define-module (gnu packages protobuf) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) + #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module ((guix licenses) #:prefix license:) @@ -160,6 +162,29 @@ (define-public protobuf-c code.") (license license:bsd-2))) +(define-public protozero + (package + (name "protozero") + (version "1.6.7") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mapbox/protozero.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1ryvn3iwxiaih3mvyy45nbwxnhzfc8vby0xh9m6d6fpakhcpf6s3")))) + (build-system cmake-build-system) + (home-page "https://github.com/mapbox/protozero") + (synopsis "Minimalistic protocol buffer decoder and encoder in C++") + (description "Protozero is a minimalistic protocol buffer decoder and +encoder in C++. The developer using protozero has to manually translate the +@file{.proto} description into code.") + (license (list + license:asl2.0 ; for folly + license:bsd-2)))) + (define-public python-protobuf (package (name "python-protobuf") From 15ceaa910a05f4e231240ea340238331999a4b1e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Mar 2019 13:47:23 +0100 Subject: [PATCH 136/694] gnu: highlight: Update to 3.49. * gnu/packages/pretty-print.scm (highlight): Update to 3.49. [arguments]: Adjust SUBSTITUTE* regular expression. --- gnu/packages/pretty-print.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/pretty-print.scm b/gnu/packages/pretty-print.scm index bdb5dbbdad..34793db58b 100644 --- a/gnu/packages/pretty-print.scm +++ b/gnu/packages/pretty-print.scm @@ -244,15 +244,14 @@ (define-public source-highlight (define-public highlight (package (name "highlight") - (version "3.47") + (version "3.49") (source (origin (method url-fetch) (uri (string-append "http://www.andre-simon.de/zip/highlight-" version ".tar.bz2")) (sha256 - (base32 - "0xidf8755lnx55x6p4ajgg4l145akjqswny41483fvg5lpa41i6f")))) + (base32 "1zlhmlq5fnsxxmm04qfchhl4w2iw5fa6sn81c34q6k2m1m77g6aj")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests @@ -267,9 +266,10 @@ (define-public highlight (add-after 'unpack 'fix-search-for-lua (lambda _ (substitute* "src/makefile" - (("(pkg-config.*)lua" _ prefix) - (string-append prefix "lua-" ,(version-major+minor - (package-version lua))))) + (("(LUA_PKG_NAME=).*" _ assignment) + (string-append assignment "lua-" ,(version-major+minor + (package-version lua)) + "\n"))) #t))))) (inputs `(("lua" ,lua) From 77ad8a65b1bb736c88cb7bece68e346abc80b12c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Mar 2019 17:17:18 +0100 Subject: [PATCH 137/694] gnu: libfs: Update to 1.0.8. * gnu/packages/xorg.scm (libfs): Update to 1.0.8. --- gnu/packages/xorg.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index a029d23953..28af5b12b3 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1110,7 +1110,7 @@ (define-public libfontenc (define-public libfs (package (name "libfs") - (version "1.0.7") + (version "1.0.8") (source (origin (method url-fetch) @@ -1119,8 +1119,7 @@ (define-public libfs version ".tar.bz2")) (sha256 - (base32 - "1wy4km3qwwajbyl8y9pka0zwizn7d9pfiyjgzba02x3a083lr79f")))) + (base32 "03xxyvpfa3rhqcld4p2chkil482jn9cp80hj17jdybcv2hkkgqf8")))) (build-system gnu-build-system) (inputs `(("xtrans" ,xtrans) From 62321a55de1240d77ad3ccb526fe87ecae7c30ba Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Mar 2019 17:58:11 +0100 Subject: [PATCH 138/694] gnu: sxhkd: Update to 0.6.0. * gnu/packages/xdisorg.scm (sxhkd): Update to 0.6.0. --- gnu/packages/xdisorg.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index e18d7e9719..6bfae74f18 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -807,7 +807,7 @@ (define-public xbindkeys (define-public sxhkd (package (name "sxhkd") - (version "0.5.9") + (version "0.6.0") (source (origin (method git-fetch) @@ -815,8 +815,7 @@ (define-public sxhkd (url "https://github.com/baskerville/sxhkd") (commit version))) (sha256 - (base32 - "0cw547x7vky55k3ksrmzmrra4zhslqcwq9xw0y4cmbvy4s1qf64v")))) + (base32 "1cz4vkm7fqd51ly9qjkf5q76kdqdzfhaajgvrs4anz5dyzrdpw68")))) (build-system gnu-build-system) (inputs `(("asciidoc" ,asciidoc) From 079321fac1ad41d93f20f2f16fde13198ab84fcc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Mar 2019 17:58:31 +0100 Subject: [PATCH 139/694] gnu: libebml: Don't use NAME in source URI. * gnu/packages/xml.scm (libebml)[source]: Hard-code NAME. --- gnu/packages/xml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index ff3cf8d356..698680f075 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -92,8 +92,8 @@ (define-public libebml (source (origin (method url-fetch) - (uri (string-append "https://dl.matroska.org/downloads/" - name "/" name "-" version ".tar.xz")) + (uri (string-append "https://dl.matroska.org/downloads/libebml/" + "libebml-" version ".tar.xz")) (sha256 (base32 "17iynkj22rbszaymxiaq6k02qy9w4fs1appkn1iam4y441w7lnhy")) From 2f111f92beb194a554f7ba8a6473f6574705e4af Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Mar 2019 18:37:59 +0100 Subject: [PATCH 140/694] gnu: libebml: Update to 1.3.7. * gnu/packages/xml.scm (libebml): Update to 1.3.7. [source]: Removed merged patch. --- gnu/packages/xml.scm | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 698680f075..d4ff1643e5 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -88,26 +88,14 @@ (define-public expat (define-public libebml (package (name "libebml") - (version "1.3.6") + (version "1.3.7") (source (origin (method url-fetch) (uri (string-append "https://dl.matroska.org/downloads/libebml/" "libebml-" version ".tar.xz")) (sha256 - (base32 - "17iynkj22rbszaymxiaq6k02qy9w4fs1appkn1iam4y441w7lnhy")) - (patches - (list - (origin - (method url-fetch) - (uri - (string-append "https://github.com/Matroska-Org/libebml/commit/" - "e46906b80e7662fb78d305f576412f9fa4a22218.patch")) - (file-name "libebml-use-limits-not-climits.patch") - (sha256 - (base32 - "1803rcj4kzg385xij8j3fcz8h86z43ivciv512zr7jp9jwrafs58"))))))) + (base32 "1x79b35dj5d2x7xf7ql83w2cr0v5n2vsd08q6y6grmw4yn3lq973")))) (build-system cmake-build-system) (arguments `(#:configure-flags From 0754f29afc797de88f68736db751c53a5cc64f4b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Mar 2019 18:37:10 +0100 Subject: [PATCH 141/694] gnu: font-liberation: Update to 2.00.5. * gnu/packages/fonts.scm (font-liberation): Update to 2.00.5. [source, home-page]: Update project home. --- gnu/packages/fonts.scm | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index e6867996ca..62f076a772 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -267,19 +267,17 @@ (define-public font-gnu-freefont-ttf (define-public font-liberation (package (name "font-liberation") - (version "2.00.1") - (source (origin - (method url-fetch) - (uri (string-append "https://releases.pagure.org/" - "liberation-fonts/liberation-fonts-ttf-" - version ".tar.gz")) - (sha256 - (base32 - "010m4zfqan4w04b6bs9pm3gapn9hsb18bmwwgp2p6y6idj52g43q")))) + (version "2.00.5") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/liberationfonts/liberation-fonts/" + "files/2926169/liberation-fonts-ttf-" version ".tar.gz")) + (sha256 + (base32 "0kdjsbf0y716k1kv0i0ixdpvg7b9b8xkcsg6favaxdc7pshg0kzi")))) (build-system font-build-system) - (home-page "https://pagure.io/liberation-fonts/") - (synopsis - "Fonts compatible with Arial, Times New Roman, and Courier New") + (home-page "https://github.com/liberationfonts") + (synopsis "Fonts compatible with Arial, Times New Roman, and Courier New") (description "The Liberation font family aims at metric compatibility with Arial, Times New Roman, and Courier New. From b55db49481394214adc30be623078c723d32c707 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 15 Mar 2019 20:32:36 +0100 Subject: [PATCH 142/694] gnu: mkvtoolnix: Move all GUI files to the "gui" output. * gnu/packages/video.scm (mkvtoolnix)[arguments]: Do it. --- gnu/packages/video.scm | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index ee49d35cec..5b40a7d4a5 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -437,15 +437,29 @@ (define-public mkvtoolnix (add-after 'install 'post-install (lambda* (#:key outputs #:allow-other-keys) ;; Move the Qt interface to "gui". - (let ((out (assoc-ref outputs "out")) - (gui (assoc-ref outputs "gui"))) + (let* ((out (assoc-ref outputs "out")) + (gui (assoc-ref outputs "gui")) + (strip-store-dir (lambda (path) + (substring path (string-prefix-length out path))))) (for-each (lambda (file) (mkdir-p (string-append gui (dirname file))) (rename-file (string-append out file) (string-append gui file))) - '("/bin/mkvtoolnix-gui" - "/share/applications/org.bunkus.mkvtoolnix-gui.desktop"))) + (append '("/bin/mkvtoolnix-gui" + "/share/applications/org.bunkus.mkvtoolnix-gui.desktop" + "/share/metainfo/org.bunkus.mkvtoolnix-gui.appdata.xml" + "/share/mime/packages/org.bunkus.mkvtoolnix-gui.xml") + (map strip-store-dir (find-files out "\\.ogg$")) + (map strip-store-dir (find-files out "mkvtoolnix-gui\\.png$")) + (map strip-store-dir (find-files out "mkvtoolnix-gui\\.1")))) + (for-each + (lambda (file) + (delete-file-recursively (string-append out file))) + '("/share/applications" + "/share/metainfo" + "/share/mime" + "/share/mkvtoolnix"))) #t))))) (home-page "https://mkvtoolnix.download") (synopsis "Tools to create, alter and inspect Matroska files") From e409879a3f2f7f480b78f7996f9551a4263c00ca Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 15 Mar 2019 15:22:31 -0400 Subject: [PATCH 143/694] gnu: skopeo: Skip the test phase. * gnu/packages/virtualization.scm (skopeo)[arguments]: Set #:tests? #f. --- gnu/packages/virtualization.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 5b5d5a518a..4bdbbb39b6 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -984,6 +984,7 @@ (define-public skopeo (arguments '(#:import-path "github.com/projectatomic/skopeo" #:install-source? #f + #:tests? #f ; The tests require Docker #:phases (modify-phases %standard-phases (replace 'build From 75f66e4a391dde51300376b98e676f555591c244 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Mar 2019 20:40:39 +0100 Subject: [PATCH 144/694] gnu: eureka: Update to 1.24. * gnu/packages/game-development.scm (eureka): Update to 1.24. --- gnu/packages/game-development.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 7f00f7080b..08b84f07fa 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1237,7 +1237,7 @@ (define-public godot (define-public eureka (package (name "eureka") - (version "1.21") + (version "1.24") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/eureka-editor/Eureka/" @@ -1247,7 +1247,7 @@ (define-public eureka "-source.tar.gz")) (sha256 (base32 - "1a7pf7xi56fcz7jc8layih5gq5m66g2ss4x5j61kzgip07j6rkir")))) + "1x4idjniz9sma3j9ss6ni7fafmz22zs2jnpsqw4my9rsnmra5d9v")))) (build-system gnu-build-system) (arguments '(#:tests? #f From a9db93c10f38b6cecfebb068726666ea2ce8d614 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Mar 2019 20:57:17 +0100 Subject: [PATCH 145/694] gnu: python-pygame: Update to 1.9.4. * gnu/packages/game-development.scm (python-pygame): Update to 1.9.4. [arguments]: Re-indent. --- gnu/packages/game-development.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 08b84f07fa..25935aafcc 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -857,16 +857,16 @@ (define-public quesoglc (define-public python-pygame (package (name "python-pygame") - (version "1.9.3") + (version "1.9.4") (source (origin (method url-fetch) (uri (pypi-uri "pygame" version)) (sha256 (base32 - "1hlydiyygl444bq5m5g8n3jsxsgrdyxlm42ipmfbw36wkf0j243m")))) + "1dn0nb86jl7yr8709cncxdr0yrmviqakw7zx3g8jbbwrr60if3bh")))) (build-system python-build-system) (arguments - `(#:tests? #f ; Tests require pygame to be installed first. + `(#:tests? #f ; tests require pygame to be installed first #:phases (modify-phases %standard-phases ;; Set the paths to the dependencies manually because @@ -891,23 +891,23 @@ (define-public python-pygame (substitute* "Setup.in" (("FONT = -lSDL_ttf") (string-append "FONT = -I" font-ref "/include/SDL -L" - font-ref "/lib -lSDL_ttf"))) + font-ref "/lib -lSDL_ttf"))) (substitute* "Setup.in" (("IMAGE = -lSDL_image") (string-append "IMAGE = -I" image-ref "/include/SDL -L" - image-ref "/lib -lSDL_image"))) + image-ref "/lib -lSDL_image"))) (substitute* "Setup.in" (("MIXER = -lSDL_mixer") (string-append "MIXER = -I" mixer-ref "/include/SDL -L" - mixer-ref "/lib -lSDL_mixer"))) + mixer-ref "/lib -lSDL_mixer"))) (substitute* "Setup.in" (("SMPEG = -lsmpeg") (string-append "SMPEG = -I" smpeg-ref "/include/smpeg -L" - smpeg-ref "/lib -lsmpeg"))) + smpeg-ref "/lib -lsmpeg"))) (substitute* "Setup.in" (("PNG = -lpng") (string-append "PNG = -I" png-ref "/include -L" - png-ref "/lib -lpng"))) + png-ref "/lib -lpng"))) (substitute* "Setup.in" (("JPEG = -ljpeg") (string-append "JPEG = -I" jpeg-ref "/include -L" From 924e6993aa5df0ca9002ccdf2e4f5589e3d721bc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Mar 2019 21:16:58 +0100 Subject: [PATCH 146/694] gnu: openrct2-objects: Update to 1.0.9. * gnu/packages/games.scm (openrct2-objects): Update to 1.0.9. --- gnu/packages/games.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 46b58e352c..1b6c8940e5 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2556,7 +2556,7 @@ (define openrct2-title-sequences (define openrct2-objects (package (name "openrct2-objects") - (version "1.0.6") + (version "1.0.9") (source (origin (method url-fetch) @@ -2564,8 +2564,7 @@ (define openrct2-objects version "/objects.zip")) (file-name (string-append name "-" version ".zip")) (sha256 - (base32 - "00kfy95zx6g4ldr6br5p7bwkwfx6pw9v78fd3rvghjnwyvf5fhki")))) + (base32 "02apb8h553m7d6jvysgb1zahvxc1yzyygfca2iclb21b3fhpsas4")))) (build-system trivial-build-system) (native-inputs `(("bash" ,bash) From 6457509c73800797c8aeca290950e9cdedc3036d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Mar 2019 21:32:24 +0100 Subject: [PATCH 147/694] gnu: openrct2: Update to 0.2.2. * gnu/packages/games.scm (openrct2): Update to 0.2.2. [arguments]: Re-indent. --- gnu/packages/games.scm | 55 +++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 1b6c8940e5..d28dbaac9e 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2596,45 +2596,46 @@ (define openrct2-objects (define-public openrct2 (package (name "openrct2") - (version "0.2.1") + (version "0.2.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/OpenRCT2/OpenRCT2/archive/v" version ".tar.gz")) (sha256 - (base32 - "1fxzk037xphpyk7vv5jfrcz739zrj86p43pnf5gjjv9rjxwv7m8f")) + (base32 "0yxaphgfq85piaacnnfy6lrvmnqmfj1891rxlkl5ndngq0zh0ysb")) (file-name (string-append name "-" version ".tar.gz")))) (build-system cmake-build-system) (arguments `(#:configure-flags (list "-DDOWNLOAD_OBJECTS=OFF" "-DDOWNLOAD_TITLE_SEQUENCES=OFF") - #:tests? #f ; Tests require network. + #:tests? #f ; tests require network access #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-usr-share-paths&add-data - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((titles (assoc-ref inputs "openrct2-title-sequences")) - (objects (assoc-ref inputs "openrct2-objects"))) - ;; Fix some references to /usr/share. - (substitute* "src/openrct2/platform/Platform.Linux.cpp" - (("/usr/share") - (string-append (assoc-ref %outputs "out") "/share"))) - (copy-recursively (string-append titles - "/share/openrct2/title-sequences") "data/title") - (copy-recursively (string-append objects - "/share/openrct2/objects") "data/object")))) - (add-before 'configure 'fixgcc7 - (lambda _ - (unsetenv "C_INCLUDE_PATH") - (unsetenv "CPLUS_INCLUDE_PATH") - #t)) - (add-after 'fixgcc7 'get-rid-of-errors - (lambda _ - ;; Don't treat warnings as errors. - (substitute* "CMakeLists.txt" - (("-Werror") ""))))))) + (modify-phases %standard-phases + (add-after 'unpack 'fix-usr-share-paths&add-data + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((titles (assoc-ref inputs "openrct2-title-sequences")) + (objects (assoc-ref inputs "openrct2-objects"))) + ;; Fix some references to /usr/share. + (substitute* "src/openrct2/platform/Platform.Linux.cpp" + (("/usr/share") + (string-append (assoc-ref %outputs "out") "/share"))) + (copy-recursively + (string-append titles "/share/openrct2/title-sequences") + "data/title") + (copy-recursively + (string-append objects "/share/openrct2/objects") + "data/object")))) + (add-before 'configure 'fixgcc7 + (lambda _ + (unsetenv "C_INCLUDE_PATH") + (unsetenv "CPLUS_INCLUDE_PATH") + #t)) + (add-after 'fixgcc7 'get-rid-of-errors + (lambda _ + ;; Don't treat warnings as errors. + (substitute* "CMakeLists.txt" + (("-Werror") ""))))))) (inputs `(("curl" ,curl) ("fontconfig" ,fontconfig) ("freetype" ,freetype) From e43f622a9631eab18d695482439abf077a510788 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Mar 2019 22:38:34 +0100 Subject: [PATCH 148/694] gnu: aisleriot: Don't use NAME in source URI. * gnu/packages/gnome.scm (aisleriot)[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 fb4fb4d6bb..7a5a35c0b9 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3223,9 +3223,9 @@ (define-public aisleriot (version "3.22.5") (source (origin (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" + (uri (string-append "mirror://gnome/sources/aisleriot/" (version-major+minor version) "/" - name "-" version ".tar.xz")) + "aisleriot-" version ".tar.xz")) (sha256 (base32 "0rl39psr5xi584310pyrgw36ini4wn7yr2m1q5118w3a3v1dkhzh")))) From 39c0a3fdb7dacfd48c2f378f6201c6ac01530a57 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Mar 2019 22:39:04 +0100 Subject: [PATCH 149/694] gnu: aisleriot: Update to 3.22.8. * gnu/packages/gnome.scm (aisleriot): Update to 3.22.8. --- 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 7a5a35c0b9..8b473c231e 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3220,7 +3220,7 @@ (define-public totem-pl-parser (define-public aisleriot (package (name "aisleriot") - (version "3.22.5") + (version "3.22.8") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/aisleriot/" @@ -3228,7 +3228,7 @@ (define-public aisleriot "aisleriot-" version ".tar.xz")) (sha256 (base32 - "0rl39psr5xi584310pyrgw36ini4wn7yr2m1q5118w3a3v1dkhzh")))) + "15pm39679ymxki07sb5nvhycz4z53zwbvascyp5wm4864bn98815")))) (build-system glib-or-gtk-build-system) (arguments '(#:configure-flags From ee71d44e60a128e107436e1e0405b45280cb49c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 15 Mar 2019 17:43:45 +0100 Subject: [PATCH 150/694] build-system/glib-or-gtk: Support #:disallowed-references. * guix/build-system/glib-or-gtk.scm (glib-or-gtk-build): Add #:disallowed-references and honor it. --- guix/build-system/glib-or-gtk.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/guix/build-system/glib-or-gtk.scm b/guix/build-system/glib-or-gtk.scm index fcd92f2334..8de7dfbfc2 100644 --- a/guix/build-system/glib-or-gtk.scm +++ b/guix/build-system/glib-or-gtk.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2019 Ludovic Courtès ;;; Copyright © 2013 Cyril Roelandt ;;; Copyright © 2014 Federico Beffa ;;; @@ -129,7 +129,8 @@ (define* (glib-or-gtk-build store name inputs (system (%current-system)) (imported-modules %glib-or-gtk-build-system-modules) (modules %default-modules) - allowed-references) + allowed-references + disallowed-references) "Build SOURCE with INPUTS. See GNU-BUILD for more details." (define canonicalize-reference (match-lambda @@ -190,6 +191,10 @@ (define guile-for-build (and allowed-references (map canonicalize-reference allowed-references)) + #:disallowed-references + (and disallowed-references + (map canonicalize-reference + disallowed-references)) #:guile-for-build guile-for-build)) (define glib-or-gtk-build-system From 11e1df56e29e8e9f9dbe1beaf6afb902c33c9198 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 15 Mar 2019 17:44:22 +0100 Subject: [PATCH 151/694] gnu: gnome-shell: Remove references to Inkscape and more. The reference to Inkscape was introduced in commit 45fef894eb5b39029633cd0cd907e8ce8c5ab379. * gnu/packages/gnome.scm (gnome-shell)[arguments]: Add #:disallowed-references and #:modules. Replace the 'glib-or-gtk-wrap' phase. --- gnu/packages/gnome.scm | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 8b473c231e..e3f470fcee 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5690,7 +5690,15 @@ (define-public gnome-shell #t)))) (build-system glib-or-gtk-build-system) (arguments - '(#:phases + `(#:disallowed-references ((,glib "bin") + ,inkscape ,libxslt + ,ruby-sass) + + #:modules ((guix build glib-or-gtk-build-system) + (guix build utils) + (srfi srfi-1)) + + #:phases (modify-phases %standard-phases (add-before 'build 'rebuild-css (lambda _ @@ -5726,7 +5734,16 @@ (define-public gnome-shell `("PYTHONPATH" ":" prefix (,python-path)) `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)))) '("gnome-shell-extension-tool" "gnome-shell-perf-tool")) - #t)))))) + #t))) + (replace 'glib-or-gtk-wrap + (let ((wrap (assoc-ref %standard-phases 'glib-or-gtk-wrap))) + (lambda* (#:key inputs outputs #:allow-other-keys #:rest rest) + ;; By default Inkscape et al. would end up in the XDG_DATA_DIRS + ;; settings of the wrappers created by the 'glib-or-gtk-wrap' + ;; phase. Fix that since we don't need these. + (wrap #:inputs (fold alist-delete inputs + '("inkscape" "intltool" "glib:bin")) + #:outputs outputs))))))) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc. ("gobject-introspection" ,gobject-introspection) From 7a7d5f66412fb74eb94439f3a566230a30ea2f7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 15 Mar 2019 22:12:07 +0100 Subject: [PATCH 152/694] gnu: hplip: Remove pre-built executable from the source. * gnu/packages/cups.scm (hplip)[source](snippet): Remove all the files matching 'elf-file?', not just ".so" files. This includes the 'locatedriver' executable found in the upstream tarball. --- gnu/packages/cups.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 9f23b8e9ae..fa6e3ae2b6 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Ricardo Wurmus -;;; Copyright © 2015, 2016, 2017 Ludovic Courtès +;;; Copyright © 2015, 2016, 2017, 2019 Ludovic Courtès ;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2016 Danny Milosavljevic ;;; Copyright © 2017 Leo Famulari @@ -423,8 +423,12 @@ (define-public hplip (patches (search-patches "hplip-remove-imageprocessor.patch")) (snippet '(begin - ;; Delete non-free blobs - (for-each delete-file (find-files "." "\\.so$")) + ;; Delete non-free blobs: .so files, pre-compiled + ;; 'locatedriver' executable, etc. + (for-each delete-file + (find-files "." + (lambda (file stat) + (elf-file? file)))) (delete-file "prnt/hpcups/ImageProcessor.h") ;; Fix type mismatch. (substitute* "prnt/hpcups/genPCLm.cpp" From ea843715b56c935cfb73c6fed23c31c32ec13712 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 15 Mar 2019 22:14:01 +0100 Subject: [PATCH 153/694] gnu: hplip: Do not keep reference to GCC. Previously the 'dat2drv' and 'locatedriver' programs would be installed to share/hplip, and thus they would not get stripped during the 'strip' phase. Consequently, they retained references to GCC. * gnu/packages/cups.scm (hplip)[source](snippet): Change "data2drvdir" and "locatedriverdir" in Makefile.in. --- gnu/packages/cups.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index fa6e3ae2b6..b943444a14 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -430,9 +430,19 @@ (define-public hplip (lambda (file stat) (elf-file? file)))) (delete-file "prnt/hpcups/ImageProcessor.h") + ;; Fix type mismatch. (substitute* "prnt/hpcups/genPCLm.cpp" (("boolean") "bool")) + + ;; Install binaries under libexec/hplip instead of + ;; share/hplip; that'll at least ensure they get stripped. + ;; It's not even clear that they're of any use though... + (substitute* "Makefile.in" + (("^dat2drvdir =.*") + "dat2drvdir = $(pkglibexecdir)\n") + (("^locatedriverdir =.*") + "locatedriverdir = $(pkglibexecdir)\n")) #t)))) (build-system gnu-build-system) (home-page "https://developers.hp.com/hp-linux-imaging-and-printing") From c9b3a72b6792c8195b0cdd8e5d7809db29419c7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 15 Mar 2019 22:36:46 +0100 Subject: [PATCH 154/694] gnu: hplip-minimal: Remove dependency on Python & co. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reduces the closure from 432 MiB to 160 MiB. * gnu/packages/cups.scm (hplip-minimal)[arguments]: Pass "--enable-lite-build" and remove 'wrap-binaries' phase. [inputs]: Remove all things Python. --- gnu/packages/cups.scm | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index b943444a14..b77fb20781 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -51,7 +51,8 @@ (define-module (gnu packages cups) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix utils) - #:use-module (srfi srfi-1)) + #:use-module (srfi srfi-1) + #:use-module (ice-9 match)) (define-public cups-filters (package @@ -564,10 +565,19 @@ (define-public hplip-minimal (arguments (substitute-keyword-arguments (package-arguments hplip) ((#:configure-flags cf) - `(delete "--enable-qt5" ,cf)))) - (inputs - (fold alist-delete (package-inputs hplip) - '("python-pygobject" "python-pyqt"))) + ;; Produce a "light build", meaning that only the printer (CUPS) and + ;; scanner (SANE) support gets built, without all the 'hp-*' + ;; command-line tools. + `(cons "--enable-lite-build" + (delete "--enable-qt5" ,cf))) + ((#:phases phases) + ;; The 'wrap-binaries' is not needed here since the 'hp-*' programs + ;; are not installed. + `(alist-delete 'wrap-binaries ,phases)))) + (inputs (remove (match-lambda + ((label . _) + (string-prefix? "python" label))) + (package-inputs hplip))) (synopsis "GUI-less version of hplip"))) (define-public foomatic-filters From 99aec37a78e7be6a591d0e5b7439896d669a75d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 14 Mar 2019 17:02:53 +0100 Subject: [PATCH 155/694] pack: "-RR" produces PRoot-enabled relocatable binaries. * gnu/packages/aux-files/run-in-namespace.c (exec_with_proot): New function. (main): When 'clone' fails, call 'rm_rf'. [PROOT_PROGRAM]: When 'clone' fails, call 'exec_with_proot'. * guix/scripts/pack.scm (wrapped-package): Add #:proot?. [proot]: New procedure. [build]: Compile with -DPROOT_PROGRAM when PROOT? is true. * guix/scripts/pack.scm (%options): Set the 'relocatable?' value to 'proot when "-R" is passed several times. (guix-pack): Pass #:proot? to 'wrapped-package'. * tests/guix-pack-relocatable.sh: Use "-RR" on Intel systems that lack user namespace support. * doc/guix.texi (Invoking guix pack): Document -RR. --- doc/guix.texi | 39 ++++++++++++++----- gnu/packages/aux-files/run-in-namespace.c | 47 ++++++++++++++++++++++- guix/scripts/pack.scm | 33 +++++++++++++--- tests/guix-pack-relocatable.sh | 21 +++++++--- 4 files changed, 119 insertions(+), 21 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index a720f3f3bb..8d51bdf7f4 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -4760,14 +4760,24 @@ symlinks, as well as empty mount points for virtual file systems like procfs. @end table +@cindex relocatable binaries @item --relocatable @itemx -R Produce @dfn{relocatable binaries}---i.e., binaries that can be placed -anywhere in the file system hierarchy and run from there. For example, -if you create a pack containing Bash with: +anywhere in the file system hierarchy and run from there. + +When this option is passed once, the resulting binaries require support for +@dfn{user namespaces} in the kernel Linux; when passed +@emph{twice}@footnote{Here's a trick to memorize it: @code{-RR}, which adds +PRoot support, can be thought of as the abbreviation of ``Really +Relocatable''. Neat, isn't it?}, relocatable binaries fall to back to PRoot +if user namespaces are unavailable, and essentially work anywhere---see below +for the implications. + +For example, if you create a pack containing Bash with: @example -guix pack -R -S /mybin=bin bash +guix pack -RR -S /mybin=bin bash @end example @noindent @@ -4786,12 +4796,23 @@ In that shell, if you type @code{ls /gnu/store}, you'll notice that altogether! That is probably the simplest way to deploy Guix-built software on a non-Guix machine. -There's a gotcha though: this technique relies on the @dfn{user -namespace} feature of the kernel Linux, which allows unprivileged users -to mount or change root. Old versions of Linux did not support it, and -some GNU/Linux distributions turn it off; on these systems, programs -from the pack @emph{will fail to run}, unless they are unpacked in the -root file system. +@quotation Note +By default, relocatable binaries rely on the @dfn{user namespace} feature of +the kernel Linux, which allows unprivileged users to mount or change root. +Old versions of Linux did not support it, and some GNU/Linux distributions +turn it off. + +To produce relocatable binaries that work even in the absence of user +namespaces, pass @option{--relocatable} or @option{-R} @emph{twice}. In that +case, binaries will try user namespace support and fall back to PRoot if user +namespaces are not supported. + +The @uref{https://proot-me.github.io/, PRoot} program provides the necessary +support for file system virtualization. It achieves that by using the +@code{ptrace} system call on the running program. This approach has the +advantage to work without requiring special kernel support, but it incurs +run-time overhead every time a system call is made. +@end quotation @item --expression=@var{expr} @itemx -e @var{expr} diff --git a/gnu/packages/aux-files/run-in-namespace.c b/gnu/packages/aux-files/run-in-namespace.c index f0cff88552..551f4db88a 100644 --- a/gnu/packages/aux-files/run-in-namespace.c +++ b/gnu/packages/aux-files/run-in-namespace.c @@ -1,5 +1,5 @@ /* GNU Guix --- Functional package management for GNU - Copyright (C) 2018 Ludovic Courtès + Copyright (C) 2018, 2019 Ludovic Courtès This file is part of GNU Guix. @@ -211,6 +211,46 @@ disallow_setgroups (pid_t pid) close (fd); } + +#ifdef PROOT_PROGRAM + +/* Execute the wrapped program with PRoot, passing it ARGC and ARGV, and + "bind-mounting" STORE in the right place. */ +static void +exec_with_proot (const char *store, int argc, char *argv[]) +{ + int proot_specific_argc = 4; + int proot_argc = argc + proot_specific_argc; + char *proot_argv[proot_argc], *proot; + char bind_spec[strlen (store) + 1 + sizeof "@STORE_DIRECTORY@"]; + + strcpy (bind_spec, store); + strcat (bind_spec, ":"); + strcat (bind_spec, "@STORE_DIRECTORY@"); + + proot = concat (store, PROOT_PROGRAM); + + proot_argv[0] = proot; + proot_argv[1] = "-b"; + proot_argv[2] = bind_spec; + proot_argv[3] = "@WRAPPED_PROGRAM@"; + + for (int i = 0; i < argc; i++) + proot_argv[i + proot_specific_argc] = argv[i + 1]; + + proot_argv[proot_argc] = NULL; + + /* Seccomp support seems to invariably lead to segfaults; disable it by + default. */ + setenv ("PROOT_NO_SECCOMP", "1", 0); + + int err = execv (proot, proot_argv); + if (err < 0) + assert_perror (errno); +} + +#endif + int main (int argc, char *argv[]) @@ -274,6 +314,10 @@ main (int argc, char *argv[]) break; case -1: + rm_rf (new_root); +#ifdef PROOT_PROGRAM + exec_with_proot (store, argc, argv); +#else fprintf (stderr, "%s: error: 'clone' failed: %m\n", argv[0]); fprintf (stderr, "\ This may be because \"user namespaces\" are not supported on this system.\n\ @@ -281,6 +325,7 @@ Consequently, we cannot run '@WRAPPED_PROGRAM@',\n\ unless you move it to the '@STORE_DIRECTORY@' directory.\n\ \n\ Please refer to the 'guix pack' documentation for more information.\n"); +#endif return EXIT_FAILURE; default: diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm index e2ecddfbfc..bfb8b85356 100644 --- a/guix/scripts/pack.scm +++ b/guix/scripts/pack.scm @@ -517,10 +517,14 @@ (define (output-file args) ;;; (define* (wrapped-package package - #:optional (compiler (c-compiler))) + #:optional (compiler (c-compiler)) + #:key proot?) (define runner (local-file (search-auxiliary-file "run-in-namespace.c"))) + (define (proot) + (specification->package "proot-static")) + (define build (with-imported-modules (source-module-closure '((guix build utils) @@ -550,10 +554,19 @@ (define (build-wrapper program) (("@STORE_DIRECTORY@") (%store-directory))) (let* ((base (strip-store-prefix program)) - (result (string-append #$output "/" base))) + (result (string-append #$output "/" base)) + (proot #$(and proot? + #~(string-drop + #$(file-append (proot) "/bin/proot") + (+ (string-length (%store-directory)) + 1))))) (mkdir-p (dirname result)) - (invoke #$compiler "-std=gnu99" "-static" "-Os" "-g0" "-Wall" - "run.c" "-o" result) + (apply invoke #$compiler "-std=gnu99" "-static" "-Os" "-g0" "-Wall" + "run.c" "-o" result + (if proot + (list (string-append "-DPROOT_PROGRAM=\"" + proot "\"")) + '())) (delete-file "run.c"))) (setvbuf (current-output-port) 'line) @@ -646,7 +659,12 @@ (define %options (exit 0))) (option '(#\R "relocatable") #f #f (lambda (opt name arg result) - (alist-cons 'relocatable? #t result))) + (match (assq-ref result 'relocatable?) + (#f + (alist-cons 'relocatable? #t result)) + (_ + (alist-cons 'relocatable? 'proot + (alist-delete 'relocatable? result)))))) (option '(#\e "expression") #t #f (lambda (opt name arg result) (alist-cons 'expression arg result))) @@ -821,11 +839,14 @@ (define properties #:graft? (assoc-ref opts 'graft?)))) (let* ((dry-run? (assoc-ref opts 'dry-run?)) (relocatable? (assoc-ref opts 'relocatable?)) + (proot? (eq? relocatable? 'proot)) (manifest (let ((manifest (manifest-from-args store opts))) ;; Note: We cannot honor '--bootstrap' here because ;; 'glibc-bootstrap' lacks 'libc.a'. (if relocatable? - (map-manifest-entries wrapped-package manifest) + (map-manifest-entries + (cut wrapped-package <> #:proot? proot?) + manifest) manifest))) (pack-format (assoc-ref opts 'format)) (name (string-append (symbol->string pack-format) diff --git a/tests/guix-pack-relocatable.sh b/tests/guix-pack-relocatable.sh index 554416627b..38dcf1e485 100644 --- a/tests/guix-pack-relocatable.sh +++ b/tests/guix-pack-relocatable.sh @@ -1,5 +1,5 @@ # GNU Guix --- Functional package management for GNU -# Copyright © 2018 Ludovic Courtès +# Copyright © 2018, 2019 Ludovic Courtès # # This file is part of GNU Guix. # @@ -41,17 +41,28 @@ STORE_PARENT="`dirname $NIX_STORE_DIR`" export STORE_PARENT if test "$STORE_PARENT" = "/"; then exit 77; fi -# This test requires user namespaces and associated command-line tools. -if ! unshare -mrf sh -c 'mount -t tmpfs none "$STORE_PARENT"' +if unshare -mrf sh -c 'mount -t tmpfs none "$STORE_PARENT"' then - exit 77 + # Test the wrapper that relies on user namespaces. + relocatable_option="-R" +else + case "`uname -m`" in + x86_64|i?86) + # Test the wrapper that falls back to PRoot. + relocatable_option="-RR";; + *) + # XXX: Our 'proot' package currently fails tests on non-Intel + # architectures, so skip this by default. + exit 77;; + esac fi test_directory="`mktemp -d`" export test_directory trap 'chmod -Rf +w "$test_directory"; rm -rf "$test_directory"' EXIT -tarball="`guix pack -R -S /Bin=bin sed`" +export relocatable_option +tarball="`guix pack $relocatable_option -S /Bin=bin sed`" (cd "$test_directory"; tar xvf "$tarball") # Run that relocatable 'sed' in a user namespace where we "erase" the store by From c71b7b5b3740177f0df6d3565dcc356ceda1acba Mon Sep 17 00:00:00 2001 From: nixo Date: Fri, 8 Mar 2019 14:29:17 +0100 Subject: [PATCH 156/694] services: mpd: add more configuration options MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/services/audio.scm (): Add 'db-file', 'state-file' and 'sticker-file' fields. * doc/guix.texi (Music Player Daemon): Document it. Signed-off-by: Ludovic Courtès --- doc/guix.texi | 9 +++++++++ gnu/services/audio.scm | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/doc/guix.texi b/doc/guix.texi index 8d51bdf7f4..5bbd0ee7f0 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -20324,6 +20324,15 @@ The directory to scan for music files. @item @code{playlist-dir} (default: @code{"~/.mpd/playlists"}) The directory to store playlists. +@item @code{db-file} (default: @code{"~/.mpd/tag_cache"}) +The location of the music database. + +@item @code{state-file} (default: @code{"~/.mpd/state"}) +The location of the file that stores current MPD's state. + +@item @code{sticker-file} (default: @code{"~/.mpd/sticker.sql"}) +The location of the sticker database. + @item @code{port} (default: @code{"6600"}) The port to run mpd on. diff --git a/gnu/services/audio.scm b/gnu/services/audio.scm index 6629433780..ebfe05abd0 100644 --- a/gnu/services/audio.scm +++ b/gnu/services/audio.scm @@ -42,6 +42,12 @@ (define-record-type* (default "~/Music")) (playlist-dir mpd-configuration-playlist-dir (default "~/.mpd/playlists")) + (db-file mpd-configuration-db-file + (default "~/.mpd/tag_cache")) + (state-file mpd-configuration-state-file + (default "~/.mpd/state")) + (sticker-file mpd-configuration-sticker-file + (default "~/.mpd/sticker.sql")) (port mpd-configuration-port (default "6600")) (address mpd-configuration-address @@ -61,6 +67,9 @@ (define (mpd-config->file config) `(("user" ,mpd-configuration-user) ("music_directory" ,mpd-configuration-music-dir) ("playlist_directory" ,mpd-configuration-playlist-dir) + ("db_file" ,mpd-configuration-db-file) + ("state_file" ,mpd-configuration-state-file) + ("sticker_file" ,mpd-configuration-sticker-file) ("port" ,mpd-configuration-port) ("bind_to_address" ,mpd-configuration-address))))) From 41dfe40f5dbd162558c3954ae8eb991a56a65682 Mon Sep 17 00:00:00 2001 From: "P.C. Shyamshankar" Date: Fri, 22 Feb 2019 22:38:47 -0500 Subject: [PATCH 157/694] pack: Construct inferior package names correctly. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * guix/scripts/pack.scm (wrapped-package): now correctly constructs full names of inferior packages. Co-authored-by: Ludovic Courtès --- guix/scripts/pack.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm index bfb8b85356..17a166d9d7 100644 --- a/guix/scripts/pack.scm +++ b/guix/scripts/pack.scm @@ -28,6 +28,7 @@ (define-module (guix scripts pack) #:use-module (guix store) #:use-module ((guix status) #:select (with-status-verbosity)) #:use-module (guix grafts) + #:autoload (guix inferior) (inferior-package?) #:use-module (guix monads) #:use-module (guix modules) #:use-module (guix packages) @@ -586,7 +587,15 @@ (define (build-wrapper program) (find-files #$(file-append package "/sbin")) (find-files #$(file-append package "/libexec"))))))) - (computed-file (string-append (package-full-name package "-") "R") + (computed-file (string-append + (cond ((package? package) + (package-full-name package "-")) + ((inferior-package? package) + (string-append (inferior-package-name package) + "-" + (inferior-package-version package))) + (else "wrapper")) + "R") build)) (define (map-manifest-entries proc manifest) From 3b2cf5c8262067501e88c2ffe5d7f96e04b17d17 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 28 Feb 2019 18:18:57 +0100 Subject: [PATCH 158/694] gnu: Add toutenclic. * gnu/packages/education.scm (toutenclic): New variable. --- gnu/packages/education.scm | 69 +++++++++++++++++++++++++++++++++++++- 1 file changed, 68 insertions(+), 1 deletion(-) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index c54005ccf9..454ac30fc4 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2016 Hartmut Goebel ;;; Copyright © 2017, 2018 Efraim Flashner ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice -;;; Copyright © 2018 Nicolas Goaziou +;;; Copyright © 2018, 2019 Nicolas Goaziou ;;; ;;; This file is part of GNU Guix. ;;; @@ -52,6 +52,7 @@ (define-module (gnu packages education) #:use-module (guix utils) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) + #:use-module (guix build-system python) #:use-module (guix build-system trivial) #:use-module (srfi srfi-1)) @@ -304,3 +305,69 @@ (define-public snap This package provides a @command{snap} executable calling @command{xdg-open} to open the application in a web browser, for offline usage.") (license license:agpl3+))) + +(define-public toutenclic + (package + (name "toutenclic") + (version "6.12") + (source + (origin + (method url-fetch) + (uri (string-append "http://www.bipede.fr/downloads/logiciels/" + "ToutEnClic-" version ".tar.xz")) + (sha256 + (base32 + "1369m76fxmi2hgc2bbsq2jchcbh8q0qzml7600pqn8xiqrybvg9g")))) + (build-system python-build-system) + (arguments + `(#:tests? #f ;no test + #:phases + (modify-phases %standard-phases + (delete 'build) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (share (string-append out "/share/toutenclic")) + (pixmaps (string-append out "/share/pixmaps")) + (bin (string-append out "/bin")) + (executable "toutenclic.py")) + ;; Install icon. + (install-file "toutenclic.png" pixmaps) + ;; Move files into "share/" directory. + (mkdir-p share) + (copy-recursively "." share) + ;; Create executable in "bin/". + (mkdir-p bin) + (with-directory-excursion bin + (symlink (string-append share "/" executable) + executable))) + #t)) + (add-after 'install 'create-desktop-file + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (applications (string-append out "/share/applications"))) + (mkdir-p applications) + (call-with-output-file + (string-append applications "/toutenclic.desktop") + (lambda (file) + (format file + "[Desktop Entry]~@ + Name=ToutEnClic~@ + Comment=For schooling without difference~@ + Exec=~a/bin/toutenclic.py~@ + TryExec=~@*~a/bin/toutenclic.py~@ + Terminal=false~@ + Icon=toutenclic~@ + Type=Application~%" + out))) + #t)))))) + (inputs `(("python-pyqt" ,python-pyqt))) + (synopsis "School tools for physically disabled children") + (description "ToutEnClic is intended to facilitate the schooling +of physically disabled children in ordinary schools. It is both +a multi-page virtual exercise book and a kit including pencil, +scissors, glue, ruler, compass, protractor and square. A virtual +keyboard is also available if the child does not have any other +specialized device.") + (home-page "https://bipede.fr/contrib/") + (license license:gpl3))) From eba7d5e9c901d0054dc28bf711ee6539fb41bf7a Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 15 Mar 2019 22:33:55 -0400 Subject: [PATCH 159/694] gnu: linux-libre@4.9: Update to 4.9.163. * gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.163. --- 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 cbbfe05e6a..4cab9c9f7f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -452,8 +452,8 @@ (define-public linux-libre-4.14 #:configuration-file kernel-config)) (define-public linux-libre-4.9 - (make-linux-libre "4.9.162" - "07swv6xvjsl5nv5y3sc2nfdnmqdz9gjy8hgrjvi0bljwzf1fbxmy" + (make-linux-libre "4.9.163" + "1r0wzg3h18mkcs2lvwjdssqx7f2rcwv852zihrl38f8smk23mpzy" '("x86_64-linux" "i686-linux") #:configuration-file kernel-config)) From 9914234ca52d0315a5a8f7a6f75581f8f074ccfe Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 15 Mar 2019 22:34:43 -0400 Subject: [PATCH 160/694] gnu: linux-libre@4.14: Update to 4.14.106. * gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.106. (%linux-libre-4.14-hash): 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 4cab9c9f7f..928e6567e0 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -442,8 +442,8 @@ (define-public linux-libre-4.19 #:patches %linux-libre-4.19-patches #:configuration-file kernel-config)) -(define %linux-libre-4.14-version "4.14.105") -(define %linux-libre-4.14-hash "06pp13d2g0j2v8jy8fh20b4ismzg9wn3i7bnx2hpyvslz256rrgg") +(define %linux-libre-4.14-version "4.14.106") +(define %linux-libre-4.14-hash "18m8yvdg12k01a7nmy8rv44vavmjmlaqc11xh2cczpib1m6sfk1k") (define-public linux-libre-4.14 (make-linux-libre %linux-libre-4.14-version From ada3d06dcef67ab590d30addb4bc928cd8014de3 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 15 Mar 2019 22:35:33 -0400 Subject: [PATCH 161/694] gnu: linux-libre@4.19: Update to 4.19.29. * gnu/packages/linux.scm (%linux-libre-4.19-version): Update to 4.19.29. (%linux-libre-4.19-hash): 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 928e6567e0..a3f844513e 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -428,8 +428,8 @@ (define-public linux-libre #:patches %linux-libre-5.0-patches #:configuration-file kernel-config)) -(define %linux-libre-4.19-version "4.19.28") -(define %linux-libre-4.19-hash "0j65gp9z3qrygx67mkhm4ri3pj1pz0gdwcdlds2ypg53rh12jc0a") +(define %linux-libre-4.19-version "4.19.29") +(define %linux-libre-4.19-hash "0nan1l01310jzg8lr1zznwwmjkvnvqdssk0zg3s459ryjmisj7z0") (define %linux-libre-4.19-patches (list %boot-logo-patch From 4161deb4549c39b7d4801cc8aa63c365d19fc649 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 15 Mar 2019 22:36:26 -0400 Subject: [PATCH 162/694] gnu: linux-libre: Update to 5.0.2. * gnu/packages/linux.scm (%linux-libre-version): Update to 5.0.2. (%linux-libre-hash): 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 a3f844513e..ffb88f0004 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -414,8 +414,8 @@ (define* (make-linux-libre version hash supported-systems It has been modified to remove all non-free binary blobs.") (license license:gpl2))) -(define %linux-libre-version "5.0.1") -(define %linux-libre-hash "0izbdpml170g5jg87ccnf2q1hc01gsyiy1gqxnqzzi3pri00dfyz") +(define %linux-libre-version "5.0.2") +(define %linux-libre-hash "0lvjqs5fmar6bh5077wzh215v6ffi7f5yx1qkkkw35wqhv0xgn0c") (define %linux-libre-5.0-patches (list %boot-logo-patch From d82bd2034884c5037065c48d5eefe0acd2768e30 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Wed, 13 Mar 2019 00:23:25 +0100 Subject: [PATCH 163/694] gnu: Add emacs-eshell-z. Signed-off-by: Oleg Pykhalov --- 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 f5936a2d23..28f86fd709 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -11176,6 +11176,29 @@ (define-public emacs-eshell-bookmark appropriate directory if no @code{eshell} session is active.") (license license:gpl3+))) +(define-public emacs-eshell-z + (package + (name "emacs-eshell-z") + (version "0.3.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/xuchunyang/eshell-z") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1aac4m814jgxwpz7lbyx5r4z5dmawp4sk7pwbx0zqpnbcsaq5wwc")))) + (build-system emacs-build-system) + (home-page "https://github.com/xuchunyang/eshell-z") + (synopsis "Quick navigation to frequently visited directories") + (description + "This package is a port of @code{z}, and keeps track of visited directories +and commands invoked within them in order to enable navigation via input of +matching regexps.") + (license license:gpl3+))) + (define-public emacs-esh-autosuggest (package (name "emacs-esh-autosuggest") From a6718145265787e39bd0c703d22eb8846464fbec Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Fri, 15 Mar 2019 03:38:34 +0100 Subject: [PATCH 164/694] gnu: Add emacs-editorconfig. * gnu/packages/emacs-xyz.scm (emacs-editorconfig): New variable. Signed-off-by: Oleg Pykhalov --- 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 28f86fd709..e10a6627a6 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12466,6 +12466,30 @@ (define-public emacs-synosaurus backends, including the @command{wordnet} offline backend.") (license license:gpl3+)))) +(define-public emacs-editorconfig + (package + (name "emacs-editorconfig") + (version "0.7.14") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/editorconfig/editorconfig-emacs") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "19j2428ij7sqvrqs7rqg1mcnv9109y6drqba40dkv3vrkk5d2yia")))) + (build-system emacs-build-system) + (home-page "https://github.com/editorconfig/editorconfig-emacs") + (synopsis "Define and maintain consistent coding styles between different +editors and IDEs") + (description "The EditorConfig project consists of a file format for +defining coding styles and a collection of text editor plugins that enable +editors to read the file format and adhere to defined styles. EditorConfig +files are easily readable and they work nicely with version control systems.") + (license license:gpl3+))) + (define-public emacs-all-the-icons (package (name "emacs-all-the-icons") From 54f51df6811ffd6456196350581cf6ef6637c2b9 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Sat, 16 Mar 2019 08:43:34 +0100 Subject: [PATCH 165/694] gnu: Add emacs-unpackaged-el. * gnu/packages/emacs-xyz.scm (emacs-unpackaged-el): New variable. Signed-off-by: Oleg Pykhalov --- 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 e10a6627a6..cef6c7245c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -540,6 +540,35 @@ (define-public emacs-scribble-mode for editing Racket's Scribble documentation syntax in Emacs.") (license license:gpl3+)))) +(define-public emacs-unpackaged-el + (let ((commit "f4df7f8dfea715e893b2223adda32545803f5cce") + (revision "1")) + (package + (name "emacs-unpackaged-el") + (version (git-version "0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/alphapapa/unpackaged.el") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1yf3zrgqfhnr0az8gn1kqqwnhfi3nc0vbjkcagwcqwk3sp1jda86")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-dash" ,emacs-dash) + ("emacs-org" ,emacs-org) + ("emacs-s" ,emacs-s) + ("emacs-use-package" ,emacs-use-package))) + (home-page "https://github.com/alphapapa/unpackaged.el") + (synopsis "Useful snippets of Emacs Lisp code") + (description "This package provides Emacs Lisp utilities for a variety +of tasks, including version control, task management, and regex-based +replacement.") + (license license:gpl3+)))) + (define-public emacs-haskell-mode (package (name "emacs-haskell-mode") From 703a095e7ec3c8247deb527f027615e5e34fe753 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sat, 16 Mar 2019 12:27:11 +0100 Subject: [PATCH 166/694] gnu: emacs-helm-system-packages: Update to 20190316. * gnu/packages/emacs-xyz.scm (emacs-helm-system-packages): Update to 20190316. --- gnu/packages/emacs-xyz.scm | 66 ++++++++++++++++++++------------------ 1 file changed, 35 insertions(+), 31 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index cef6c7245c..e2508509c9 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -5869,42 +5869,46 @@ (define-public emacs-helm-c-yasnippet (license license:gpl2+)))) (define-public emacs-helm-system-packages - (package - (name "emacs-helm-system-packages") - (version "1.10.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/emacs-helm/helm-system-packages") - (commit (string-append "v" version)))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "01by0c4lqi2cw8xmbxkjw7m9x78zssm31sx4hdpw5j35s2951j0f")))) - (build-system emacs-build-system) - (inputs - `(("recutils" ,recutils))) - (propagated-inputs - `(("emacs-helm" ,emacs-helm))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'configure - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((recutils (assoc-ref inputs "recutils"))) - ;; Specify the absolute file names of the various - ;; programs so that everything works out-of-the-box. - (substitute* "helm-system-packages-guix.el" - (("recsel") (string-append recutils "/bin/recsel"))))))))) - (home-page "https://github.com/emacs-helm/helm-system-packages") - (synopsis "Helm System Packages is an interface to your package manager") - (description "List all available packages in Helm (with installed + ;; There won't be a new release after 1.10.1 until + ;; https://github.com/emacs-helm/helm-system-packages/issues/25 is fixed, + ;; and latest commits fix import issues with Guix. + (let ((commit "6572340f41611ef1991e9612d34d59130957ee4a")) + (package + (name "emacs-helm-system-packages") + (version (git-version "1.10.1" "1" commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emacs-helm/helm-system-packages") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0mcz6vkpk12vsyd37xv1rbg4v442sxc3lj8yxskqg294xbdaclz4")))) + (build-system emacs-build-system) + (inputs + `(("recutils" ,recutils))) + (propagated-inputs + `(("emacs-helm" ,emacs-helm))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((recutils (assoc-ref inputs "recutils"))) + ;; Specify the absolute file names of the various + ;; programs so that everything works out-of-the-box. + (substitute* "helm-system-packages-guix.el" + (("recsel") (string-append recutils "/bin/recsel"))))))))) + (home-page "https://github.com/emacs-helm/helm-system-packages") + (synopsis "Helm System Packages is an interface to your package manager") + (description "List all available packages in Helm (with installed packages displayed in their own respective face). Fuzzy-search, mark and execute the desired action over any selections of packages: Install, uninstall, display packages details (in Org Mode) or insert details at point, find files owned by packages... And much more, including performing all the above over the network.") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public emacs-memoize (package From 2d164c9e96e9177f46976d93d5d457254e587eca Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Sat, 16 Mar 2019 00:37:34 +0100 Subject: [PATCH 167/694] gnu: Add emacs-erc-image. * gnu/packages/emacs-xyz.scm (emacs-erc-image): New variable. Signed-off-by: Oleg Pykhalov --- 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 e2508509c9..e23945bf3d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -9058,6 +9058,29 @@ (define-public emacs-ewmctrl @code{wmctrl} command-line window-management program.") (license license:gpl3+)))) +(define-public emacs-erc-image + (let ((commit "82fb3871f02e24b1e880770b9a3d187aab43d0f0") + (revision "1")) + (package + (name "emacs-erc-image") + (version (git-version "0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/kidd/erc-image.el") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1q8mkf612fb4fjp8h4kbr107wn083iqfdgv8f80pcmil8y33dw9i")))) + (build-system emacs-build-system) + (home-page "https://github.com/kidd/erc-image.el") + (synopsis "Show inlined images (png/jpg/gif/svg) in ERC buffers") + (description "This plugin subscribes to hooks @code{erc-insert-modify-hook} +and @code{erc-send-modify-hook} to download and show images.") + (license license:gpl3+)))) + (define-public emacs-helm-gtags (package (name "emacs-helm-gtags") From b3aba78b7d8b27d3480990b8f58d953844f1f756 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sat, 16 Mar 2019 16:04:02 +0100 Subject: [PATCH 168/694] gnu: gst-plugins-good: Include gstgtk extension. * gnu/packages/gstreamer.scm (gst-plugins-good)[inputs]: Add gtk+. --- gnu/packages/gstreamer.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 48a4dffa46..9e9f119770 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -227,6 +227,7 @@ (define-public gst-plugins-good ("flac" ,flac) ("gdk-pixbuf" ,gdk-pixbuf) ("gst-plugins-base" ,gst-plugins-base) + ("gtk+" ,gtk+) ("jack" ,jack-1) ("lame" ,lame) ("libavc1394" ,libavc1394) From 0848615300ec0693b2849e80103a13063fa4b190 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sat, 16 Mar 2019 16:11:24 +0100 Subject: [PATCH 169/694] gnu: Add gaupol. * gnu/packages/video.scm (gaupol): New variable. --- gnu/packages/video.scm | 69 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 5b40a7d4a5..c661c4ce87 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3461,3 +3461,72 @@ (define-public wlstream (description "Wlstream is a screen capture tool for recording audio and video from a Wayland session.") (license license:lgpl2.1+)))) + +(define-public gaupol + (package + (name "gaupol") + (version "1.5") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/otsaloma/gaupol/") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0dk44fmcs86ymfxfbpdbrr4x5nn5hnv57wkqjyw61g779xjhlrd2")))) + (build-system python-build-system) + (native-inputs + `(("gettext" ,gettext-minimal) + ("pkg-config" ,pkg-config))) + (inputs + `(("python-pygobject" ,python-pygobject) + ("gtk+" ,gtk+) + ("python-pycairo" ,python-pycairo) ; Required or else clicking on a subtitle line fails. + ("python-chardet" ,python-chardet) ; Optional: Character encoding detection. + ("gtkspell3" ,gtkspell3) ; Optional: Inline spell-checking. + ("iso-codes" ,iso-codes) ; Optional: Translations. + ("gstreamer" ,gstreamer) + ("gst-libav" ,gst-libav) + ("gst-plugins-base" ,gst-plugins-base) + ("gst-plugins-good" ,gst-plugins-good) + ("gst-plugins-bad" ,gst-plugins-bad) + ("gst-plugins-ugly" ,gst-plugins-ugly))) + (arguments + `(#:tests? #f ; Tests seem to require networking. + #:phases + (modify-phases %standard-phases + ;; gaupol's setup.py script does not support one of the Python build + ;; system's default flags, "--single-version-externally-managed". + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (invoke "python" "setup.py" "install" + (string-append "--prefix=" (assoc-ref outputs "out")) + "--root=/"))) + (add-after 'install 'wrap-gaupol + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH")) + (gi-typelib-path (getenv "GI_TYPELIB_PATH"))) + (wrap-program (string-append out "/bin/gaupol") + `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path)) + `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)))) + #t)) + (add-after 'unpack 'patch-data-dir + ;; Fix some path variables that setup.py seems to garble. + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* "setup.py" + (("DATA_DIR = \\{!r\\}\"\\.format\\(data_dir\\)") + (string-append "DATA_DIR = '" out "/share/gaupol'\"")) + (("LOCALE_DIR = \\{!r\\}\"\\.format\\(locale_dir\\)") + (string-append "LOCALE_DIR = '" out "/share/locale'\""))) + #t)))))) + (synopsis "Editor for text-based subtitles") + (description + "Gaupol supports multiple subtitle file formats and provides means of +creating subtitles, editing texts and timing subtitles to match video. The +user interface features a builtin video player and is designed with attention +to convenience of translating and batch processing of multiple documents.") + (home-page "https://otsaloma.io/gaupol/") + (license license:gpl3+))) From 22f95e028f038cee342f455dfc55bd32b804907c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 16 Mar 2019 15:11:29 +0100 Subject: [PATCH 170/694] tests: Add 'with-environment-variable'. * tests/scripts.scm (with-environment-variable): Move to... * guix/tests.scm (with-environment-variable): ... here. * tests/build-utils.scm ("wrap-program, one input, multiple calls"): Use it instead of 'setenv'. --- guix/tests.scm | 15 +++++++++++++++ tests/build-utils.scm | 26 ++++++++++++++------------ tests/scripts.scm | 15 +-------------- 3 files changed, 30 insertions(+), 26 deletions(-) diff --git a/guix/tests.scm b/guix/tests.scm index 749a4edd7a..35ebf8464d 100644 --- a/guix/tests.scm +++ b/guix/tests.scm @@ -39,6 +39,8 @@ (define-module (guix tests) canonical-file? network-reachable? shebang-too-long? + with-environment-variable + mock %test-substitute-urls test-assertm @@ -195,6 +197,19 @@ (define-syntax-rule (test-equalm name value exp) (run-with-store store exp #:guile-for-build (%guile-for-build))))) +(define-syntax-rule (with-environment-variable variable value body ...) + "Run BODY with VARIABLE set to VALUE." + (let ((orig (getenv variable))) + (dynamic-wind + (lambda () + (setenv variable value)) + (lambda () + body ...) + (lambda () + (if orig + (setenv variable orig) + (unsetenv variable)))))) + ;;; ;;; Narinfo files, as used by the substituter. diff --git a/tests/build-utils.scm b/tests/build-utils.scm index 7d49446f66..03216f9a35 100644 --- a/tests/build-utils.scm +++ b/tests/build-utils.scm @@ -107,19 +107,21 @@ (define-module (test-build-utils) ;; it can't know about the bootstrap bash in the store, since it's not ;; named "bash". Help it out a bit by providing a symlink it this ;; package's output. - (setenv "PATH" (dirname bash)) - (wrap-program foo `("GUIX_FOO" prefix ("hello"))) - (wrap-program foo `("GUIX_BAR" prefix ("world"))) + (with-environment-variable "PATH" (dirname bash) + (wrap-program foo `("GUIX_FOO" prefix ("hello"))) + (wrap-program foo `("GUIX_BAR" prefix ("world"))) - ;; The bootstrap Bash is linked against an old libc and would abort with - ;; an assertion failure when trying to load incompatible locale data. - (unsetenv "LOCPATH") + ;; The bootstrap Bash is linked against an old libc and would abort + ;; with an assertion failure when trying to load incompatible locale + ;; data. + (unsetenv "LOCPATH") + + (let* ((pipe (open-input-pipe foo)) + (str (get-string-all pipe))) + (with-directory-excursion directory + (for-each delete-file '("foo" ".foo-real"))) + (and (zero? (close-pipe pipe)) + str))))))) - (let* ((pipe (open-input-pipe foo)) - (str (get-string-all pipe))) - (with-directory-excursion directory - (for-each delete-file '("foo" ".foo-real"))) - (and (zero? (close-pipe pipe)) - str)))))) (test-end) diff --git a/tests/scripts.scm b/tests/scripts.scm index 3901710953..efee271197 100644 --- a/tests/scripts.scm +++ b/tests/scripts.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015 Ludovic Courtès +;;; Copyright © 2015, 2019 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -25,19 +25,6 @@ (define-module (test-scripts) ;; Test the (guix scripts) module. -(define-syntax-rule (with-environment-variable variable value body ...) - "Run BODY with VARIABLE set to VALUE." - (let ((orig (getenv variable))) - (dynamic-wind - (lambda () - (setenv variable value)) - (lambda () - body ...) - (lambda () - (if orig - (setenv variable orig) - (unsetenv variable)))))) - (test-begin "scripts") From f0cc5e7e1e4c03af29c5d4855dc5962502c49147 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 16 Mar 2019 17:07:57 +0100 Subject: [PATCH 171/694] booloader: Add 'invoke/quiet'. * gnu/build/bootloader.scm (G_): New macro. (open-pipe-with-stderr, invoke/quiet): New procedures. * tests/build-utils.scm ("invoke/quiet, success") ("invoke/quiet, failure") ("invoke/quiet, failure, message on stderr"): New tests. * po/guix/POTFILES.in: Add bootloader.scm. --- gnu/build/bootloader.scm | 63 +++++++++++++++++++++++++++++++++++++++- po/guix/POTFILES.in | 2 ++ tests/build-utils.scm | 22 +++++++++++++- 3 files changed, 85 insertions(+), 2 deletions(-) diff --git a/gnu/build/bootloader.scm b/gnu/build/bootloader.scm index d00674dd40..c5febcde1e 100644 --- a/gnu/build/bootloader.scm +++ b/gnu/build/bootloader.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Mathieu Othacehe +;;; Copyright © 2019 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -17,8 +18,15 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu build bootloader) + #:use-module (srfi srfi-34) + #:use-module (srfi srfi-35) #:use-module (ice-9 binary-ports) - #:export (write-file-on-device)) + #:use-module (ice-9 popen) + #:use-module (ice-9 match) + #:use-module (ice-9 rdelim) + #:use-module (ice-9 format) + #:export (write-file-on-device + invoke/quiet)) ;;; @@ -35,3 +43,56 @@ (define (write-file-on-device file size device offset) (seek output offset SEEK_SET) (put-bytevector output bv)) #:binary #t))))) + +(define-syntax-rule (G_ str) str) ;for xgettext + +(define (open-pipe-with-stderr program . args) + "Run PROGRAM with ARGS in an input pipe, but, unlike 'open-pipe*', redirect +both its standard output and standard error to the pipe. Return two value: +the pipe to read PROGRAM's data from, and the PID of the child process running +PROGRAM." + ;; 'open-pipe*' doesn't attempt to capture stderr in any way, which is why + ;; we need to roll our own. + (match (pipe) + ((input . output) + (match (primitive-fork) + (0 + (dynamic-wind + (const #t) + (lambda () + (close-port input) + (dup2 (fileno output) 1) + (dup2 (fileno output) 2) + (apply execlp program program args)) + (lambda () + (primitive-exit 127)))) + (pid + (close-port output) + (values input pid)))))) + +;; TODO: Move to (guix build utils) on the next rebuild cycle. +(define (invoke/quiet program . args) + "Invoke PROGRAM with ARGS and capture PROGRAM's standard output and standard +error. If PROGRAM succeeds, print nothing and return the unspecified value; +otherwise, raise a '&message' error condition that includes the status code +and the output of PROGRAM." + (define-values (pipe pid) + (apply open-pipe-with-stderr program args)) + + (let loop ((lines '())) + (match (read-line pipe) + ((? eof-object?) + (close-port pipe) + (match (waitpid pid) + ((_ . status) + (unless (zero? status) + (raise (condition + (&message + (message (format #f (G_ "'~a~{ ~a~}' exited with status ~a; \ +output follows:~%~%~{ ~a~%~}") + program args + (or (status:exit-val status) + status) + (reverse lines)))))))))) + (line + (loop (cons line lines)))))) diff --git a/po/guix/POTFILES.in b/po/guix/POTFILES.in index 07b73a770a..debff5ae8e 100644 --- a/po/guix/POTFILES.in +++ b/po/guix/POTFILES.in @@ -72,4 +72,6 @@ guix/channels.scm guix/profiles.scm guix/git.scm guix/deprecation.scm +gnu/build/bootloader.scm nix/nix-daemon/guix-daemon.cc + diff --git a/tests/build-utils.scm b/tests/build-utils.scm index 03216f9a35..46fe8ea2c0 100644 --- a/tests/build-utils.scm +++ b/tests/build-utils.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2015, 2016 Ludovic Courtès +;;; Copyright © 2012, 2015, 2016, 2019 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -20,11 +20,14 @@ (define-module (test-build-utils) #:use-module (guix tests) #:use-module (guix build utils) + #:use-module ((gnu build bootloader) + #:select (invoke/quiet)) #:use-module ((guix utils) #:select (%current-system call-with-temporary-directory)) #:use-module (gnu packages) #:use-module (gnu packages bootstrap) #:use-module (srfi srfi-34) + #:use-module (srfi srfi-35) #:use-module (srfi srfi-64) #:use-module (rnrs io ports) #:use-module (ice-9 popen)) @@ -123,5 +126,22 @@ (define-module (test-build-utils) (and (zero? (close-pipe pipe)) str))))))) +(test-assert "invoke/quiet, success" + (begin + (invoke/quiet "true") + #t)) + +(test-assert "invoke/quiet, failure" + (guard (c ((message-condition? c) + (string-contains (condition-message c) "This is an error."))) + (invoke/quiet "sh" "-c" "echo This is an error. ; false") + #f)) + +(test-assert "invoke/quiet, failure, message on stderr" + (guard (c ((message-condition? c) + (string-contains (condition-message c) + "This is another error."))) + (invoke/quiet "sh" "-c" "echo This is another error. >&2 ; false") + #f)) (test-end) From 21fcfe1ee969cc477dc41486ae4074e655d44274 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 16 Mar 2019 17:09:19 +0100 Subject: [PATCH 172/694] bootloader: Use 'invoke/quiet' when running 'grub-install' and co. This hides potentially confusing GRUB messages from the user, such as "Installing for i386-pc platform." * gnu/bootloader/extlinux.scm (install-extlinux): Use 'invoke/quiet' instead of 'system*' and 'error'. * gnu/bootloader/grub.scm (install-grub, install-grub-efi): Likewise. * guix/scripts/system.scm (bootloader-installer-script): Guard against 'message-condition?' and handle them properly. --- gnu/bootloader/extlinux.scm | 8 +++----- gnu/bootloader/grub.scm | 16 ++++++++-------- guix/scripts/system.scm | 13 +++++++++++-- 3 files changed, 22 insertions(+), 15 deletions(-) diff --git a/gnu/bootloader/extlinux.scm b/gnu/bootloader/extlinux.scm index 2bb711eed1..40108584a8 100644 --- a/gnu/bootloader/extlinux.scm +++ b/gnu/bootloader/extlinux.scm @@ -91,11 +91,9 @@ (define (install-extlinux mbr) (for-each (lambda (file) (install-file file install-dir)) (find-files syslinux-dir "\\.c32$")) - (unless - (and (zero? (system* extlinux "--install" install-dir)) - (write-file-on-device - (string-append syslinux-dir "/" #$mbr) 440 device 0)) - (error "failed to install SYSLINUX"))))) + (invoke/quiet extlinux "--install" install-dir) + (write-file-on-device (string-append syslinux-dir "/" #$mbr) + 440 device 0)))) (define install-extlinux-mbr (install-extlinux "mbr.bin")) diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm index 51d5787364..14aede72c5 100644 --- a/gnu/bootloader/grub.scm +++ b/gnu/bootloader/grub.scm @@ -369,10 +369,11 @@ (define install-grub ;; root partition. (setenv "GRUB_ENABLE_CRYPTODISK" "y") - (unless (zero? (system* grub "--no-floppy" "--target=i386-pc" - "--boot-directory" install-dir - device)) - (error "failed to install GRUB (BIOS)"))))) + ;; Hide potentially confusing messages from the user, such as + ;; "Installing for i386-pc platform." + (invoke/quiet grub "--no-floppy" "--target=i386-pc" + "--boot-directory" install-dir + device)))) (define install-grub-efi #~(lambda (bootloader efi-dir mount-point) @@ -388,10 +389,9 @@ (define install-grub-efi ;; Tell 'grub-install' that there might be a LUKS-encrypted /boot or ;; root partition. (setenv "GRUB_ENABLE_CRYPTODISK" "y") - (unless (zero? (system* grub-install "--boot-directory" install-dir - "--bootloader-id=Guix" - "--efi-directory" target-esp)) - (error "failed to install GRUB (EFI)"))))) + (invoke/quiet grub-install "--boot-directory" install-dir + "--bootloader-id=Guix" + "--efi-directory" target-esp)))) diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index d67b9f8185..b4bf66819f 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -808,8 +808,17 @@ (define (bootloader-installer-script installer #~(begin (use-modules (gnu build bootloader) (guix build utils) - (ice-9 binary-ports)) - (#$installer #$bootloader #$device #$target))))) + (ice-9 binary-ports) + (srfi srfi-34) + (srfi srfi-35)) + + (guard (c ((message-condition? c) ;XXX: i18n + (format (current-error-port) "error: ~a~%" + (condition-message c)) + (exit 1))) + (#$installer #$bootloader #$device #$target) + (format #t "bootloader successfully installed on '~a'~%" + device)))))) (define* (perform-action action os #:key skip-safety-checks? From 8044e58473a401e5ab978f067ebe3f252b9655b2 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sat, 16 Mar 2019 20:19:13 +0100 Subject: [PATCH 173/694] gnu: Add arx-libertatis. * gnu/packages/games.scm (arx-libertatis): New variable. --- gnu/packages/games.scm | 81 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index d28dbaac9e..2d335a64f9 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -143,6 +143,7 @@ (define-module (gnu packages games) #:use-module (gnu packages video) #:use-module (gnu packages vulkan) #:use-module (gnu packages web) + #:use-module (gnu packages wget) #:use-module (gnu packages wxwidgets) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xorg) @@ -6276,3 +6277,83 @@ (define-public 4dtris 4D hyper cubes.") (license license:gpl3))) +(define-public arx-libertatis + (package + (name "arx-libertatis") + (version "1.1.2") + (source + (origin + (method url-fetch) + (uri (string-append "http://arx-libertatis.org/files/arx-libertatis-" + version ".tar.xz")) + (sha256 + (base32 + "0hjfxlsmp8wwqr06snv2dlly2s79ra0d9aw49gkp6rn8m50b9bc2")))) + (build-system cmake-build-system) + (outputs '("out" "installer")) + (arguments + '(#:tests? #f ; No tests. + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-install-helper-paths + (lambda* (#:key inputs #:allow-other-keys) + (let ((p7zip (assoc-ref inputs "p7zip")) + (innoextract (assoc-ref inputs "innoextract")) + (wget (assoc-ref inputs "wget")) + (zenity (assoc-ref inputs "zenity"))) + (substitute* "scripts/arx-install-data" + (("have innoextract") + (string-append "have " innoextract "/bin/innoextract")) + (("then innoextract") + (string-append "then " innoextract "/bin/innoextract")) + (("else innoextract") + (string-append "else " innoextract "/bin/innoextract")) + (("for _extract_zip_sz in 7za 7z") + (string-append "for _extract_zip_sz in " p7zip "/bin/7za")) + (("else if have 7z") + (string-append "else if have " p7zip "/bin/7za")) + (("7z x -tiso") + (string-append p7zip "/bin/7z x -tiso")) + (("if have wget") + (string-append "if have " wget "/bin/wget")) + (("wget -O") + (string-append wget "/bin/wget -O")) + (("for backend in \\$preferred zenity") + (string-append "for backend in $preferred " zenity "/bin/zenity")) + (("zenity +--title") + (string-append zenity "/bin/zenity --title")) + (("^zenity\\)") + (string-append zenity "/bin/zenity)")))) + #t)) + (add-after 'install 'move-installer + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (installer (assoc-ref outputs "installer"))) + (mkdir-p (string-append installer "/bin")) + (rename-file (string-append out "/bin/arx-install-data") + (string-append installer "/bin/arx-install-data")))))))) + (inputs + `(("sdl" ,sdl) ; Switch to sdl2 in >1.1.2. + ("mesa" ,mesa) ; Switch to libepoxy in >1.1.2. + ("glew" ,glew) + ("openal" ,openal) + ("zlib" ,zlib) + ("boost" ,boost) + ("glm" ,glm) + ("freetype" ,freetype) + ;; The following are only needed by the arx-install-data script. + ("p7zip" ,p7zip) ; Install-helper uses it to extract ISO and .cab archives. + ("zenity" ,zenity) ; GUI for install-helper. + ("wget" ,wget) ; Used by the install-helper to download the patch. + ;; The install-helper needs it to extract the patch. + ("innoextract" ,innoextract))) + (home-page "https://arx-libertatis.org/") + (synopsis "Port of Arx Fatalis, a first-person role-playing game") + (description "Arx Libertatis is a cross-platform, open source port of Arx +Fatalis, a 2002 first-person role-playing game / dungeon crawler developed by +Arkane Studios. This port however does not include the game data, so you need +to obtain a copy of the original Arx Fatalis or its demo to play Arx +Libertatis. Arx Fatalis features crafting, melee and ranged combat, as well +as a unique casting system where the player draws runes in real time to effect +the desired spell.") + (license license:gpl3+))) From a953423a8c3e10f94885a63c57489703edca49ee Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sat, 16 Mar 2019 20:27:15 +0100 Subject: [PATCH 174/694] gnu: Add missing copyright. * gnu/packages/games.scm: Do it. --- gnu/packages/games.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 2d335a64f9..360cbe8c1d 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -36,6 +36,7 @@ ;;; Copyright © 2018 Madalin Ionel-Patrascu ;;; Copyright © 2018 Benjamin Slade ;;; Copyright © 2018 Alex Vong +;;; Copyright © 2019 Pierre Neidhardt ;;; ;;; This file is part of GNU Guix. ;;; From da33a9e42ee6ca7f7045430fb7f945fbb1930584 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sat, 16 Mar 2019 20:41:15 +0100 Subject: [PATCH 175/694] gnu: Add emacs-nhexl-mode. * gnu/packages/emacs-xyz.scm (emacs-nhexl-mode): New variable. --- gnu/packages/emacs-xyz.scm | 39 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index e23945bf3d..8d5ee6c5fb 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -13690,3 +13690,42 @@ (define-public emacs-transient command\", but because it always involves at least two commands (a prefix and a suffix) we prefer to call it just a \"transient\".") (license license:gpl3+)))) + +(define-public emacs-nhexl-mode + (package + (name "emacs-nhexl-mode") + (version "1.2") + (source + (origin + (method url-fetch) + (uri (string-append + "https://elpa.gnu.org/packages/nhexl-mode-" + version ".el")) + (sha256 + (base32 + "031h22p564qdvr9khs05qcba06pmsk68cr7zyc7c04hfr3y3ziaf")))) + (build-system emacs-build-system) + (home-page "http://elpa.gnu.org/packages/nhexl-mode.html") + (synopsis "Minor mode to edit files via hex-dump format") + (description + "This package implements NHexl mode, a minor mode for editing files +in hex dump format. The mode command is called @command{nhexl-mode}. + +This minor mode implements similar functionality to @command{hexl-mode}, +but using a different implementation technique, which makes it +usable as a \"plain\" minor mode. It works on any buffer, and does +not mess with the undo log or with the major mode. + +It also comes with: + +@itemize +@item @command{nhexl-nibble-edit-mode}: a \"nibble editor\" minor mode, where +the cursor pretends to advance by nibbles (4-bit) and the self-insertion keys +(which only work for hex-digits) will only modify the nibble under point. +@item @command{nhexl-overwrite-only-mode}: a minor mode to try and avoid +moving text. In this minor mode, not only self-inserting keys overwrite +existing text, but commands like `yank' and @command{kill-region} as well. +@item It overrides @code{C-u} to use hexadecimal, so you can do @code{C-u a 4 +C-f} to advance by #xa4 characters. +@end itemize\n") + (license license:gpl3+))) From e1c58440bda033ec7ebe11b038043a0926b4a25e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 16 Mar 2019 11:33:36 +0100 Subject: [PATCH 176/694] gnu: Add ytnef. * gnu/packages/mail.scm (ytnef): New variable. --- gnu/packages/mail.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 29ba1a92ef..89c183dbd7 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2842,3 +2842,27 @@ (define-public mumi (synopsis "Debbugs web interface") (description "Mumi is a Debbugs web interface.") (license agpl3+)))) + +(define-public ytnef + (package + (name "ytnef") + (version "1.9.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Yeraze/ytnef.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "07h48s5qf08503pp9kafqbwipdqghiif22ghki7z8j67gyp04l6l")))) + (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool))) + (home-page "https://github.com/Yeraze/ytnef/") + (synopsis "TNEF stream reader for winmail.dat files") + (description "This package provides a TNEF stream reader library and +related tools to process winmail.dat files.") + (license gpl2+))) From 7d3bb433705fd2330719a6971e00ffb5b4b7d29d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 16 Mar 2019 23:14:17 +0100 Subject: [PATCH 177/694] gnu: Add evolution. * gnu/packages/gnome.scm (evolution): New variable. --- gnu/packages/gnome.scm | 52 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index e3f470fcee..bdd8293b78 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2015 Mathieu Lirzin ;;; Copyright © 2015, 2017 Andy Wingo ;;; Copyright © 2015 David Hashe -;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus +;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus ;;; Copyright © 2015, 2016, 2017, 2018 Mark H Weaver ;;; Copyright © 2015 David Thompson ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner @@ -119,6 +119,7 @@ (define-module (gnu packages gnome) #:use-module (gnu packages pkg-config) #:use-module (gnu packages polkit) #:use-module (gnu packages popt) + #:use-module (gnu packages pretty-print) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) #:use-module (gnu packages python-crypto) @@ -7557,3 +7558,52 @@ (define-public libdazzle wildly out of scope for those libraries. In other cases, they are not quite generic enough to work for everyone.") (license license:gpl3+))) + +(define-public evolution + (package + (name "evolution") + (version "3.28.1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/evolution/" + (version-major+minor version) "/" + "evolution-" version ".tar.xz")) + (sha256 + (base32 + "0sdv5lg2vlz5f4raymz9d8a5jq4j18vbqyigaip6508p3bjnfj8l")))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags + (list "-DENABLE_PST_IMPORT=OFF" ; libpst is not packaged + "-DENABLE_LIBCRYPTUI=OFF"))) ; libcryptui hasn't seen a release + ; in four years and cannot be built. + (native-inputs + `(("glib" ,glib "bin") ; glib-mkenums + ("pkg-config" ,pkg-config) + ("intltool" ,intltool) + ("itstool" ,itstool))) + (inputs + `(("enchant" ,enchant) + ("evolution-data-server" ,evolution-data-server) ; must be the same version + ("gcr" ,gcr) + ("gnome-autoar" ,gnome-autoar) + ("gnome-desktop" ,gnome-desktop) + ("gtkspell3" ,gtkspell3) + ("highlight" ,highlight) + ("libcanberra" ,libcanberra) + ("libgweather" ,libgweather) + ("libnotify" ,libnotify) + ("libsoup" ,libsoup) + ("nss" ,nss) + ("openldap" ,openldap) + ("webkitgtk" ,webkitgtk) + ("ytnef" ,ytnef))) + (home-page "https://gitlab.gnome.org/GNOME/evolution") + (synopsis "Manage your email, contacts and schedule") + (description "Evolution is a personal information management application +that provides integrated mail, calendaring and address book +functionality.") + ;; See COPYING for details. + (license (list license:lgpl2 license:lgpl3 ; either one of these + license:openldap2.8 ; addressbook/gui/component/openldap-extract.h + license:lgpl2+)))) ; smime/lib/* From 92cfe6600444a3cb5d28a1c858d747cebc9ca6a8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 16 Mar 2019 23:16:37 +0100 Subject: [PATCH 178/694] gnu: evolution: Fix typo. * gnu/packages/gnome.scm (evolution)[license]: Fix typo. --- gnu/packages/gnome.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index bdd8293b78..5e74745329 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7604,6 +7604,6 @@ (define-public evolution that provides integrated mail, calendaring and address book functionality.") ;; See COPYING for details. - (license (list license:lgpl2 license:lgpl3 ; either one of these + (license (list license:lgpl2.0 license:lgpl3 ; either one of these license:openldap2.8 ; addressbook/gui/component/openldap-extract.h license:lgpl2+)))) ; smime/lib/* From 23dbe6215899661f141a069097f2ac26bf96fa8b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 16 Mar 2019 23:18:06 +0100 Subject: [PATCH 179/694] gnu: evolution: Actually fix licenses. * gnu/packages/gnome.scm (evolution)[license]: Use LPGL2.1. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 5e74745329..f407f567b9 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7604,6 +7604,6 @@ (define-public evolution that provides integrated mail, calendaring and address book functionality.") ;; See COPYING for details. - (license (list license:lgpl2.0 license:lgpl3 ; either one of these + (license (list license:lgpl2.1 license:lgpl3 ; either one of these license:openldap2.8 ; addressbook/gui/component/openldap-extract.h - license:lgpl2+)))) ; smime/lib/* + license:lgpl2.1+)))) ; smime/lib/* From b56d160944ace6e06fcfe5a36310c98e6a213b87 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 16 Mar 2019 07:01:26 +0100 Subject: [PATCH 180/694] guix: Match package names case-insensitively. * guix/scripts/package.scm (options->upgrade-predicate, process-query): Use REGEXP/ICASE when matching package names. --- guix/scripts/package.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm index efff511299..b0c6a7ced7 100644 --- a/guix/scripts/package.scm +++ b/guix/scripts/package.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2016 Roel Janssen ;;; Copyright © 2016 Benz Schenk ;;; Copyright © 2016 Chris Marusich +;;; Copyright © 2019 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -526,14 +527,14 @@ (define (options->upgrade-predicate opts) (define upgrade-regexps (filter-map (match-lambda (('upgrade . regexp) - (make-regexp* (or regexp ""))) + (make-regexp* (or regexp "") regexp/icase)) (_ #f)) opts)) (define do-not-upgrade-regexps (filter-map (match-lambda (('do-not-upgrade . regexp) - (make-regexp* regexp)) + (make-regexp* regexp regexp/icase)) (_ #f)) opts)) @@ -686,7 +687,7 @@ (define (diff-profiles profile numbers) #t) (('list-installed regexp) - (let* ((regexp (and regexp (make-regexp* regexp))) + (let* ((regexp (and regexp (make-regexp* regexp regexp/icase))) (manifest (profile-manifest profile)) (installed (manifest-entries manifest))) (leave-on-EPIPE @@ -702,7 +703,7 @@ (define (diff-profiles profile numbers) #t)) (('list-available regexp) - (let* ((regexp (and regexp (make-regexp* regexp))) + (let* ((regexp (and regexp (make-regexp* regexp regexp/icase))) (available (fold-available-packages (lambda* (name version result #:key outputs location From a7874ac60d8300f8bfcb459e8a9604ec7298d6ee Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 16 Mar 2019 16:28:53 +0100 Subject: [PATCH 181/694] gnu: burp: Update to 2.3.2. * gnu/packages/backup.scm (burp): Update to 2.3.2. --- gnu/packages/backup.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index b54ac0b3ef..682cfe57bc 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -996,14 +996,14 @@ (define-public restic (define-public burp (package (name "burp") - (version "2.3.0") + (version "2.3.2") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/burp/burp-" version "/burp-" version ".tar.bz2")) (sha256 (base32 - "0in49c0ir7lb7jli0fcphdq1nh5rclhans4ngm7z7hzyxa4jrgri")))) + "1nkkn0nfydn39cl5rxd1wbmzizird6z05j9h2xr7xczdlhhjnaai")))) (build-system gnu-build-system) (inputs `(("librsync" ,librsync) From da2a145bf6c4cd34dc39338f2dc92e6d45fef8b7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 16 Mar 2019 17:20:25 +0100 Subject: [PATCH 182/694] gnu: liblcf: Update to 0.6.0. * gnu/packages/easyrpg.scm (liblcf): Update to 0.6.0. --- gnu/packages/easyrpg.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/easyrpg.scm b/gnu/packages/easyrpg.scm index 05fd2b11a0..7f6b7f3aef 100644 --- a/gnu/packages/easyrpg.scm +++ b/gnu/packages/easyrpg.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Sou Bunnbu +;;; Copyright © 2019 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -38,7 +39,7 @@ (define-module (gnu packages easyrpg) (define-public liblcf (package (name "liblcf") - (version "0.5.4") + (version "0.6.0") (source (origin (method url-fetch) (uri (string-append @@ -46,7 +47,7 @@ (define-public liblcf "/liblcf-" version ".tar.gz")) (sha256 (base32 - "1k99bcw5c23801jk3mbz5sj5h18x46w1qxrkknhwhfgqzpvxhwrs")))) + "0dcw9l800314f5c29mqrcg64rkcb6cwqjfnpvwsmvc2l2q5hwlag")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) From f54de09b78358df3ae0092de66243500622bacab Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 16 Mar 2019 17:20:31 +0100 Subject: [PATCH 183/694] gnu: easyrpg-player: Update to 0.6.0. * gnu/packages/easyrpg.scm (easyrpg-player): Update to 0.6.0. --- gnu/packages/easyrpg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/easyrpg.scm b/gnu/packages/easyrpg.scm index 7f6b7f3aef..046b9dfb92 100644 --- a/gnu/packages/easyrpg.scm +++ b/gnu/packages/easyrpg.scm @@ -75,7 +75,7 @@ (define-public liblcf (define-public easyrpg-player (package (name "easyrpg-player") - (version "0.5.4") + (version "0.6.0") (source (origin (method url-fetch) (uri (string-append @@ -83,7 +83,7 @@ (define-public easyrpg-player "/easyrpg-player-" version ".tar.gz")) (sha256 (base32 - "0w0idr61slg5828j1q31c1kh1h0ryp8psc006y06jph5pp3qgm48")))) + "0zdzp64sshjdl943jklsvzwzzja1fnapslvbd7xss51ym9ra4r6k")))) (build-system gnu-build-system) (arguments '(#:configure-flags From 56d2007ea9c9c3a5921d2c14d0eee91aae8a02a5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 16 Mar 2019 17:47:24 +0100 Subject: [PATCH 184/694] gnu: sxiv: Update to 25. * gnu/packages/image-viewers.scm (sxiv): Update to 25. [arguments]: Change renamed DEF_CPPFLAGS to CPPFLAGS. --- gnu/packages/image-viewers.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 7da0b0dab9..0982a3f37b 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -188,7 +188,7 @@ (define-public gpicview (define-public sxiv (package (name "sxiv") - (version "24") + (version "25") (source (origin (method git-fetch) (uri (git-reference @@ -197,7 +197,7 @@ (define-public sxiv (file-name (git-file-name name version)) (sha256 (base32 - "020n1bdxbzqncprh8a4rnjzc4frp335yxbqh5w6dr970f7n5qm8d")))) + "13s1lfar142hq1j7xld0ri616p4bqs57b17yr4d0b9a9w7liz4hp")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no check target @@ -206,7 +206,7 @@ (define-public sxiv "CC=gcc" ;; Xft.h #includes (without ‘freetype2/’). The sxiv ;; Makefile works around this by hard-coding /usr/include instead. - (string-append "DEF_CPPFLAGS=-I" + (string-append "CPPFLAGS=-I" (assoc-ref %build-inputs "freetype") "/include/freetype2") "V=1") From cdee738e499d2cc0eff20e97dbc4e6796ac97f96 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 16 Mar 2019 18:20:19 +0100 Subject: [PATCH 185/694] gnu: catimg: Update to 2.5.0. * gnu/packages/image-viewers.scm (catimg): Update to 2.5.0. --- gnu/packages/image-viewers.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 0982a3f37b..d388562924 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -285,17 +285,16 @@ (define-public viewnior (define-public catimg (package (name "catimg") - (version "2.4.0") + (version "2.5.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/posva/catimg.git") - (commit (string-append "v" version)))) + (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 - "1sk74nfc1aklg784pzknr37dyz4k7h9fck3mifpn43rav5qy2zpy")))) + (base32 "0n74iczzgxrcq3zpa7ndycb9rinm829yvf81c747q4ngv5q6pzcm")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; no tests From 3d0574c4f3f03a866ca9196daf800c03dae31068 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 16 Mar 2019 18:29:24 +0100 Subject: [PATCH 186/694] gnu: go-ipfs: Update to 0.4.19. * gnu/packages/ipfs.scm (go-ipfs): Update to 0.4.19. --- gnu/packages/ipfs.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm index 014272352f..6b8afd5f53 100644 --- a/gnu/packages/ipfs.scm +++ b/gnu/packages/ipfs.scm @@ -219,7 +219,7 @@ (define-public gx-go (define-public go-ipfs (package (name "go-ipfs") - (version "0.4.18") + (version "0.4.19") (source (origin (method url-fetch/tarbomb) @@ -227,8 +227,7 @@ (define-public go-ipfs "https://dist.ipfs.io/go-ipfs/v" version "/go-ipfs-source.tar.gz")) (sha256 - (base32 - "19hfgbyn5sr1bw0cwm3gsjz0w3b3vh3mmkax1906raah30lavj1x")) + (base32 "0s04ap14p6hnipjm27nm5k8s28zv9k5g9mziyh3ibgwn7dzb1kpx")) (file-name (string-append name "-" version "-source")))) (build-system go-build-system) (arguments From 8e9a84d957d7a6180e0866777e6d6f85a3b66058 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 16 Mar 2019 18:46:42 +0100 Subject: [PATCH 187/694] gnu: libnumbertext: Update to 1.0.5. * gnu/packages/libreoffice.scm (libnumbertext): Update to 1.0.5. [source]: Use a release tarball. [native-inputs]: Remove autoconf, automake, libtool, and pkg-config. --- gnu/packages/libreoffice.scm | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index cb18ded5c6..dab819d9b2 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2016, 2018, 2019 Efraim Flashner ;;; Copyright © 2017 Alex Griffin ;;; Copyright © 2017 Thomas Danckaert -;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2017 Andy Wingo ;;; Copyright © 2017, 2018 Ludovic Courtès ;;; Copyright © 2017, 2018, 2019 Marius Bakke @@ -527,24 +527,18 @@ (define-public libmspub (define-public libnumbertext (package (name "libnumbertext") - (version "1.0") + (version "1.0.5") (source (origin (method url-fetch) - (uri (string-append "https://github.com/numbertext/" name - "/archive/" version ".tar.gz")) + (uri (string-append "https://github.com/Numbertext/libnumbertext/" + "releases/download/" version + "/libnumbertext-" version ".tar.xz")) (sha256 - (base32 - "0wnsn4911fdd2na8jxkcvmk04a6xw6qlviic9w4qwg9fcym6866v")) - (file-name (string-append name "-" version ".tar.gz")))) + (base32 "1xzlwhwwhvr76kfdsw5gvfjfdayz803z65h331gv5dpc9imhijg1")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--disable-static"))) - (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool) - ("pkg-config" ,pkg-config))) (home-page "https://github.com/Numbertext/libnumbertext") (synopsis "Language-neutral @code{NUMBERTEXT} and @code{MONEYTEXT} functions") (description From 4290b2655eae0b2ebaa878f0fb65d57458d2b801 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 16 Mar 2019 19:00:32 +0100 Subject: [PATCH 188/694] gnu: libqxp: Update to 0.0.2. * gnu/packages/libreoffice.scm (libqxp): Update to 0.0.2. --- gnu/packages/libreoffice.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index dab819d9b2..77a80a8d06 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -897,14 +897,14 @@ (define-public mythes (define-public libqxp (package (name "libqxp") - (version "0.0.1") + (version "0.0.2") (source (origin (method url-fetch) (uri (string-append "https://dev-www.libreoffice.org/src/libqxp/" "libqxp-" version ".tar.xz")) (sha256 (base32 - "0wswz49y0lqwqw2nj9j7jaj5ag88hapcz8czgkxax57zhihpy9cc")))) + "0p4lb84m05wqd8qr8ni9sp80ivlm83ffn0nxiv4m42hj22qvcdz1")))) (build-system gnu-build-system) (inputs `(("boost" ,boost) From fbed28004d598c6433cab5882a7cc9aea602ba46 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 16 Mar 2019 19:01:23 +0100 Subject: [PATCH 189/694] gnu: libwpg: Don't use NAME in source URI. * gnu/packages/libreoffice.scm (libwpg)[source]: Hard-code NAME. --- gnu/packages/libreoffice.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 77a80a8d06..1b9c49feb3 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -267,8 +267,8 @@ (define-public libwpg (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/" name "/" name "/" - name "-" version "/" name "-" version ".tar.xz")) + (uri (string-append "mirror://sourceforge/libwpg/libwpg/" + "libwpg-" version "/libwpg-" version ".tar.xz")) (sha256 (base32 "0cwc5zkp210c661l0bvk6q21jg9ak5g8gmy578w5fgfnjymz3yjp")))) (build-system gnu-build-system) From 20fbb897da6c10d7b7ff7eaad755e50ec17d4a10 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 16 Mar 2019 19:08:04 +0100 Subject: [PATCH 190/694] gnu: libwpg: Update to 0.3.3. * gnu/packages/libreoffice.scm (libwpg): Update to 0.3.3. --- gnu/packages/libreoffice.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 1b9c49feb3..43153814d7 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -263,14 +263,14 @@ (define-public libepubgen (define-public libwpg (package (name "libwpg") - (version "0.3.2") + (version "0.3.3") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/libwpg/libwpg/" "libwpg-" version "/libwpg-" version ".tar.xz")) (sha256 (base32 - "0cwc5zkp210c661l0bvk6q21jg9ak5g8gmy578w5fgfnjymz3yjp")))) + "074x159immf139szkswv2zapnq75p7xk10dbha2p9193hgwggcwr")))) (build-system gnu-build-system) (native-inputs `(("doxygen" ,doxygen) From b0aefabefc82eb27905b00402adc239aea8f59c6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 16 Mar 2019 19:08:44 +0100 Subject: [PATCH 191/694] gnu: libwpd: Don't use NAME in source URI. * gnu/packages/libreoffice.scm (libwpd)[source]: Hard-code NAME. --- gnu/packages/libreoffice.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 43153814d7..588b2f15c7 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -176,8 +176,8 @@ (define-public libwpd (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/" name "/" name "/" - name "-" version "/" name "-" version ".tar.xz")) + (uri (string-append "mirror://sourceforge/libwpd/libwpd/" + "libwpd-" version "/libwpd-" version ".tar.xz")) (sha256 (base32 "0436gnidx45a9vx114hhh216jrh57mqb9zyssyjfadagmyz6hgrj")))) (build-system gnu-build-system) From 2c257dbfa53a26ec69ae1d5bbeaf85f54e349765 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 16 Mar 2019 20:04:48 +0100 Subject: [PATCH 192/694] gnu: perl-ev: Update to 4.25. * gnu/packages/libevent.scm (perl-ev): Update to 4.25. --- gnu/packages/libevent.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index b5d67cd581..01e1e3b00a 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -204,14 +204,14 @@ (define-public perl-anyevent (define-public perl-ev (package (name "perl-ev") - (version "4.22") + (version "4.25") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/M/ML/MLEHMANN/EV-" version ".tar.gz")) (sha256 (base32 - "14d9115q8f2ca2q3vbcalm55zqsbx8xjq5aj098laj9f9rrzirra")) + "0slw68zxrkfribf6lhggdhpay3mdng0nqxlglkwrk19myblchr9f")) (modules '((guix build utils))) (snippet '(begin From e3545ffcf95bffbbd967efd852715f4f0a9be290 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 16 Mar 2019 20:24:59 +0100 Subject: [PATCH 193/694] gnu: lua-lpeg: Update to 1.0.2. * gnu/packages/lua.scm (make-lua-lpeg): Update to 1.0.2. --- 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 6982733579..a647cf22e7 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -410,13 +410,13 @@ (define-public lua-lgi (define (make-lua-lpeg name lua) (package (name name) - (version "1.0.1") + (version "1.0.2") (source (origin (method url-fetch) (uri (string-append "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-" version ".tar.gz")) (sha256 - (base32 "0sq25z3r324a324ky73izgq9mbf66j2xvjp0fxf227rwxalzgnb2")))) + (base32 "1zjzl7acvcdavmcg5l7wi12jd4rh95q9pl5aiww7hv0v0mv6bmj8")))) (build-system gnu-build-system) (arguments `(#:phases From 57e4592f6387942a214bbae4d53f3df0f3e36504 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 17 Mar 2019 10:05:16 +0100 Subject: [PATCH 194/694] gnu: Add python2-ws4py-for-kaldi-gstreamer-server. * gnu/packages/python-web.scm (python2-ws4py-for-kaldi-gstreamer-server): New variable. --- gnu/packages/python-web.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index b1a17898ff..32d769c3ed 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -3068,3 +3068,29 @@ (define-public python-ws4py "This package provides a WebSocket client and server library for Python.") (license license:bsd-3))) + +;; kaldi-gstreamer-server does not yet work with python-ws4py > 0.3.2 +(define-public python2-ws4py-for-kaldi-gstreamer-server + (package (inherit python-ws4py) + (name "python2-ws4py") + (version "0.3.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "ws4py" version)) + (sha256 + (base32 + "12ys3dv98awhrxd570vla3hqgzq3avjhq4yafhghhq3a942y1928")))) + (build-system python-build-system) + (arguments + `(#:python ,python-2 + #:phases + (modify-phases %standard-phases + ;; We don't have a package for cherrypy. + (add-after 'unpack 'remove-cherrypy-support + (lambda _ + (delete-file "ws4py/server/cherrypyserver.py") + #t))))) + (propagated-inputs + `(("python-gevent" ,python2-gevent) + ("python-tornado" ,python2-tornado))))) From 10451f6bac89460733e3defea0dca9448abeb066 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 17 Mar 2019 10:09:56 +0100 Subject: [PATCH 195/694] gnu: Add kaldi-gstreamer-server. * gnu/packages/machine-learning.scm (kaldi-gstreamer-server): New variable. --- gnu/packages/machine-learning.scm | 94 +++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index f07a905097..281a95c0ab 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -61,6 +61,7 @@ (define-module (gnu packages machine-learning) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages statistics) #:use-module (gnu packages swig) @@ -1114,3 +1115,96 @@ (define-public gst-kaldi-nnet2-online acoustic models. The iVectors are adapted to the current audio stream automatically.") (license license:asl2.0)))) + +(define-public kaldi-gstreamer-server + (let ((commit "1735ba49c5dc0ebfc184e45105fc600cd9f1f508") + (revision "1")) + (package + (name "kaldi-gstreamer-server") + (version (git-version "0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/alumae/kaldi-gstreamer-server.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0j701m7lbwmzqxsfanj882v7881hrbmpqybbczbxqpcbg8q34w0k")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; there are no tests that can be run automatically + #:modules ((guix build utils) + (guix build gnu-build-system) + (srfi srfi-26)) + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda* (#:key outputs #:allow-other-keys) + ;; Disable hash randomization to ensure the generated .pycs + ;; are reproducible. + (setenv "PYTHONHASHSEED" "0") + (with-directory-excursion "kaldigstserver" + (for-each (lambda (file) + (apply invoke + `("python" + "-m" "compileall" + "-f" ; force rebuild + ,file))) + (find-files "." "\\.py$"))) + #t)) + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (share (string-append out "/share/kaldi-gstreamer-server/"))) + ;; Install Python files + (with-directory-excursion "kaldigstserver" + (for-each (cut install-file <> share) + (find-files "." ".*"))) + + ;; Install sample configuration files + (for-each (cut install-file <> share) + (find-files "." "\\.yaml")) + + ;; Install executables + (mkdir-p bin) + (let* ((server (string-append bin "/kaldi-gst-server")) + (client (string-append bin "/kaldi-gst-client")) + (worker (string-append bin "/kaldi-gst-worker")) + (PYTHONPATH (getenv "PYTHONPATH")) + (GST_PLUGIN_PATH (string-append + (assoc-ref inputs "gst-kaldi-nnet2-online") + "/lib/gstreamer-1.0:${GST_PLUGIN_PATH}")) + (wrap (lambda (wrapper what) + (with-output-to-file wrapper + (lambda _ + (format #t + "#!~a +export PYTHONPATH=~a +export GST_PLUGIN_PATH=~a +exec ~a ~a/~a \"$@\"~%" + (which "bash") PYTHONPATH GST_PLUGIN_PATH + (which "python") share what))) + (chmod wrapper #o555)))) + (for-each wrap + (list server client worker) + (list "master_server.py" + "client.py" + "worker.py"))) + #t)))))) + (inputs + `(("gst-kaldi-nnet2-online" ,gst-kaldi-nnet2-online) + ("python2" ,python-2) + ("python2-futures" ,python2-futures) + ("python2-pygobject" ,python2-pygobject) + ("python2-pyyaml" ,python2-pyyaml) + ("python2-tornado" ,python2-tornado) + ("python2-ws4py" ,python2-ws4py-for-kaldi-gstreamer-server))) + (home-page "https://github.com/alumae/kaldi-gstreamer-server") + (synopsis "Real-time full-duplex speech recognition server") + (description "This is a real-time full-duplex speech recognition server, +based on the Kaldi toolkit and the GStreamer framework and implemented in +Python.") + (license license:bsd-2)))) From 3bce3834fa0d0a5e5fbaa50a173c8ce02b5fee77 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Sun, 17 Mar 2019 10:49:05 +0100 Subject: [PATCH 196/694] gnu: gajim-omemo: Update to 2.6.28. * gnu/packages/messaging.scm (gajim-omemo): Update to 2.6.28. --- 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 ae22218675..73519d7702 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -683,7 +683,7 @@ (define-public gajim (define-public gajim-omemo (package (name "gajim-omemo") - (version "2.6.27") + (version "2.6.28") (source (origin (method url-fetch/zipbomb) (uri (string-append @@ -691,7 +691,7 @@ (define-public gajim-omemo version ".zip")) (sha256 (base32 - "1zy8a6pp8q9qjjxwsa4s2r9h20vs077xk59ycwy9lrfd8x79zw69")))) + "1xy9yyd4416my151kj41nc62xwgmnwpagrmw49bniv09y78cqysg")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) From 707c761f1bf0b727650a1492bf02e99af00579f7 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Sun, 17 Mar 2019 11:01:40 +0100 Subject: [PATCH 197/694] gnu: wine-staging: Update to 4.4. * gnu/packages/wine.scm (wine-staging-patchset-data): Update to 4.4. * gnu/packages/wine.scm (wine-staging): Update to 4.4. --- gnu/packages/wine.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 6d2d9ea09b..c7a57f5ec4 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -310,7 +310,7 @@ (define-public wine-minimal (define-public wine-staging-patchset-data (package (name "wine-staging-patchset-data") - (version "4.3") + (version "4.4") (source (origin (method git-fetch) @@ -320,7 +320,7 @@ (define-public wine-staging-patchset-data (file-name (git-file-name name version)) (sha256 (base32 - "14plsw52s4w0wpm0rici8b7amb51krdrby03652isvzxqr4ndip6")))) + "1pk0p37p2pbdsikj6987pg70f9a5n2ki8vnhcj4ngh1rhg6iqgyw")))) (build-system trivial-build-system) (native-inputs `(("bash" ,bash) @@ -366,7 +366,7 @@ (define-public wine-staging (file-name (string-append name "-" version ".tar.xz")) (sha256 (base32 - "1d0gbwc8ll4mfxilw9j4vdzqlnracr6y8iss27nfg1qh0q7vbf9x")))) + "1c072a2d56x43alv9pvahasfrdb8k0y0f540xpzjjhqb9g7hjfnv")))) (inputs `(("autoconf" ,autoconf) ; for autoreconf ("faudio" ,faudio) ("ffmpeg" ,ffmpeg) From 7311ed3f869a6b18dd183acdd135d033b2f2cdb0 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sun, 17 Mar 2019 10:59:56 +0100 Subject: [PATCH 198/694] gnu: rust: Work around Hydra bug. * gnu/packages/rust.scm (rust-1.20)[properties]: Work around Hydra bug. --- gnu/packages/rust.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index be916743fb..048a91052d 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -430,7 +430,13 @@ (define-public rust-1.20 (package (inherit base-rust) (outputs '("out" "doc" "cargo")) - (properties '()) + ;; Since rust-1.19 is local, it's quite probable that Hydra + ;; will build rust-1.19 only as a dependency of rust-1.20. + ;; But then Hydra will use the wrong properties, the ones here, + ;; for rust-1.19. Therefore, we copied the properties of + ;; rust-1.19 here. + (properties '((timeout . 72000) ;20 hours + (max-silent-time . 18000))) ;5 hours (for armel) (arguments (substitute-keyword-arguments (package-arguments rust-1.19) ((#:phases phases) From c8510c3108c8b229cf7ff87e64905790ae67e77b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 Mar 2019 14:53:42 +0100 Subject: [PATCH 199/694] gnu: ansible: Update to 2.7.9. * gnu/packages/admin.scm (ansible): Update to 2.7.9. --- 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 d5a0f65abb..f433d3f40d 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1598,13 +1598,13 @@ (define-public graphios (define-public ansible (package (name "ansible") - (version "2.7.8") + (version "2.7.9") (source (origin (method url-fetch) (uri (pypi-uri "ansible" version)) (sha256 - (base32 "11yx7vd0mp5gkq428af141dwnrwf8f9cp3f65243qbs9icjxnrrx")))) + (base32 "19vyf60zfmnv7frwm96bzqzvia69dysy9apk8bl84vr03ib9vrbf")))) (build-system python-build-system) (native-inputs `(("python-bcrypt" ,python-bcrypt) From 4a07463e5d437b230dca6d0de3a9d98e2f531ca3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 Mar 2019 14:58:38 +0100 Subject: [PATCH 200/694] gnu: imake: Update to 1.0.8. * gnu/packages/xorg.scm (imake): Update to 1.0.8. --- gnu/packages/xorg.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 28af5b12b3..b5c19567a8 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -112,15 +112,14 @@ (define xorg-cf-files (define-public imake (package (name "imake") - (version "1.0.7") + (version "1.0.8") (source (origin (method url-fetch) (uri (string-append "mirror://xorg/individual/util/imake-" version ".tar.bz2")) (sha256 - (base32 - "0zpk8p044jh14bis838shbf4100bjg7mccd7bq54glpsq552q339")))) + (base32 "00m7l90ws72k1qm101sd2rx92ckd50cszyng5d4dd77jncbf9lmq")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) From e9543cf7bd2df44b4c1873a4462092fe01c7b930 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 Mar 2019 14:59:06 +0100 Subject: [PATCH 201/694] gnu: xorg-cf-files: Update to 1.0.6. * gnu/packages/xorg.scm (xorg-cf-files): Update to 1.0.6. --- gnu/packages/xorg.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index b5c19567a8..7a852574d2 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -104,10 +104,9 @@ (define xorg-cf-files ;; License: x11, see COPYING (origin (method url-fetch) - (uri "mirror://xorg/individual/util/xorg-cf-files-1.0.5.tar.bz2") + (uri "mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2") (sha256 - (base32 - "1m3ypq0xcy46ghxc0svl1rbhpy3zvgmy0aa2mn7w7v7d8d8bh8zd")))) + (base32 "0kckng0zs1viz0nr84rdl6dswgip7ndn4pnh5nfwnviwpsfmmksd")))) (define-public imake (package From 65f91295fbe8ba1665f169a669014e27cb12c0df Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 Mar 2019 15:10:14 +0100 Subject: [PATCH 202/694] gnu: libxxf86dga: Update to 1.1.5. * gnu/packages/xorg.scm (libxxf86dga): Update to 1.1.5. Re-indent. --- gnu/packages/xorg.scm | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 7a852574d2..89a3172a4a 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1497,25 +1497,22 @@ (define-public libxscrnsaver (define-public libxxf86dga (package (name "libxxf86dga") - (version "1.1.4") + (version "1.1.5") (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/individual/lib/libXxf86dga-" - version - ".tar.bz2")) - (sha256 - (base32 - "0zn7aqj8x0951d8zb2h2andldvwkzbsc4cs7q023g6nzq6vd9v4f")))) + (origin + (method url-fetch) + (uri (string-append "mirror://xorg/individual/lib/" + "libXxf86dga-" version ".tar.bz2")) + (sha256 + (base32 "00vjvcdlc1sga251jkxn6gkxmx9h5n290ffxxpa40qbca1gvr61b")))) (build-system gnu-build-system) (propagated-inputs - `(("xorgproto" ,xorgproto))) + `(("xorgproto" ,xorgproto))) (inputs - `(("libx11" ,libx11) - ("libxext" ,libxext))) + `(("libx11" ,libx11) + ("libxext" ,libxext))) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config))) (home-page "https://www.x.org/wiki/") (synopsis "Xorg XFree86-DGA library") (description "Client library for the XFree86-DGA extension.") From ec9299d09024290a8b9b3092b7ed272dad53576c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 Mar 2019 15:13:41 +0100 Subject: [PATCH 203/694] gnu: xmonad: Don't use NAME in source URI. * gnu/packages/wm.scm (xmonad)[source]: Hard-code NAME. --- gnu/packages/wm.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index abd51f6589..7d83f4754b 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -488,7 +488,7 @@ (define-public xmonad (source (origin (method url-fetch) (uri (string-append "mirror://hackage/package/xmonad/" - name "-" version ".tar.gz")) + "xmonad-" version ".tar.gz")) (sha256 (base32 "0gqyivpw8z1x73p1l1fpyq1wc013a1c07r6xn1a82liijs91b949")))) From de98b91581b1b8c15e6473883a44694821d6c62a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 Mar 2019 15:17:29 +0100 Subject: [PATCH 204/694] gnu: xmonad: Update to 0.15. * gnu/packages/wm.scm (xmonad): Update to 0.15. --- gnu/packages/wm.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 7d83f4754b..e3f6930d8b 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -483,7 +483,7 @@ (define-public i3lock-fancy (define-public xmonad (package (name "xmonad") - (version "0.14.2") + (version "0.15") (synopsis "Tiling window manager") (source (origin (method url-fetch) @@ -491,7 +491,7 @@ (define-public xmonad "xmonad-" version ".tar.gz")) (sha256 (base32 - "0gqyivpw8z1x73p1l1fpyq1wc013a1c07r6xn1a82liijs91b949")))) + "0a7rh21k9y6g8fwkggxdxjns2grvvsd5hi2ls4klmqz5xvk4hyaa")))) (build-system haskell-build-system) (inputs `(("ghc-extensible-exceptions" ,ghc-extensible-exceptions) From 7e148c20d275fc78d98f8ee3954490a0369039cf Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 Mar 2019 15:17:39 +0100 Subject: [PATCH 205/694] gnu: ghc-xmonad-contrib: Update to 0.15. * gnu/packages/wm.scm (ghc-xmonad-contrib): Update to 0.15. --- gnu/packages/wm.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index e3f6930d8b..539d6564c7 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -576,15 +576,14 @@ (define-public xmobar (define-public ghc-xmonad-contrib (package (name "ghc-xmonad-contrib") - (version "0.14") + (version "0.15") (source (origin (method url-fetch) (uri (string-append "mirror://hackage/package/xmonad-contrib/" "xmonad-contrib-" version ".tar.gz")) (sha256 - (base32 - "1660w3xhbfrlq8b8s1rviq2mcn1vyqpypli4023gqxwry52brk6y")))) + (base32 "0r9yzgy67j4mi3dyxx714f0ssk5qzca5kh4zw0fhiz1pf008cxms")))) (build-system haskell-build-system) (propagated-inputs `(("ghc-old-time" ,ghc-old-time) From 02a4efb23815d0ed2d600f6e0af0735c0388c696 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 15 Mar 2019 17:48:35 +0100 Subject: [PATCH 206/694] gnu: ceph: Install headers to the "lib" output. The previous provision for this has been defunct since version 12. * gnu/packages/storage.scm (ceph)[arguments]: Remove obsolete substitution in favor of a configure flag. --- gnu/packages/storage.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/gnu/packages/storage.scm b/gnu/packages/storage.scm index ee74f94eaf..f394c218b5 100644 --- a/gnu/packages/storage.scm +++ b/gnu/packages/storage.scm @@ -93,6 +93,8 @@ (define-public ceph (libdir (string-append lib "/lib"))) (list (string-append "-DCMAKE_INSTALL_PREFIX=" out) (string-append "-DCMAKE_INSTALL_LIBDIR=" libdir) + (string-append "-DCMAKE_INSTALL_INCLUDEDIR=" + lib "/include") ;; We need both libdir and libdir/ceph in RUNPATH. (string-append "-DCMAKE_INSTALL_RPATH=" libdir ";" libdir "/ceph") @@ -127,11 +129,6 @@ (define-public ceph (let ((out (assoc-ref outputs "out")) (lib (assoc-ref outputs "lib"))) - ;; Make header files follow the dynamic libraries. - (substitute* "src/include/CMakeLists.txt" - (("DESTINATION include") - (string-append "DESTINATION " lib "/include"))) - (substitute* "cmake/modules/Distutils.cmake" ;; Prevent creation of Python eggs. (("setup.py install") From 2f2ef9d9b97e2c0fb5230afabc5e869d59a38b70 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 15 Mar 2019 17:57:43 +0100 Subject: [PATCH 207/694] gnu: xfsprogs: Install the headers. * gnu/packages/linux.scm (xfsprogs)[arguments]: Add #:phases. --- gnu/packages/linux.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index ffb88f0004..999caf9ab6 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5066,7 +5066,11 @@ (define-public xfsprogs "0ss0r6jlxxinf9fhpc0fgf7b89n9mzirpa85xxjmi1ix9l6cls6x")))) (build-system gnu-build-system) (arguments - `(#:tests? #f)) ; kernel/user integration tests are in package "xfstests" + `(#:tests? #f ;kernel/user integration tests are in package "xfstests" + #:phases (modify-phases %standard-phases + (add-after 'install 'install-headers + (lambda _ + (invoke "make" "install-dev")))))) (native-inputs `(("gettext" ,gettext-minimal) ("util-linux" ,util-linux))) From 67b1d9a145efa7156990cae2f9a1d91cc9df64ad Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 15 Mar 2019 18:03:00 +0100 Subject: [PATCH 208/694] gnu: ceph: Add XFS support. * gnu/packages/storage.scm (ceph)[arguments]: Adjust #:configure-flags. [inputs]: Add XFSPROGS. --- gnu/packages/storage.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/storage.scm b/gnu/packages/storage.scm index f394c218b5..bd15fcc26c 100644 --- a/gnu/packages/storage.scm +++ b/gnu/packages/storage.scm @@ -104,6 +104,8 @@ (define-public ceph (string-append "-DCMAKE_INSTALL_LIBEXECDIR=" out "/libexec") (string-append "-DKEYUTILS_INCLUDE_DIR=" (assoc-ref %build-inputs "keyutils") "/include") + (string-append "-DXFS_INCLUDE_DIR=" + (assoc-ref %build-inputs "xfsprogs") "/include") "-DCMAKE_INSTALL_LOCALSTATEDIR=/var" "-DENABLE_SHARED=ON" "-DWITH_SYSTEM_ROCKSDB=ON" @@ -114,7 +116,6 @@ (define-public ceph "-DWITH_BABELTRACE=OFF" "-DWITH_LTTNG=OFF" "-DWITH_SPDK=OFF" - "-DWITH_XFS=OFF" "-DWITH_XIO=OFF" ;; Use jemalloc instead of tcmalloc. "-DALLOCATOR=jemalloc")) @@ -347,6 +348,7 @@ (define-public ceph ("snappy" ,snappy) ("udev" ,eudev) ("util-linux" ,util-linux) + ("xfsprogs" ,xfsprogs) ("zlib" ,zlib))) (home-page "https://ceph.com/") (synopsis "Distributed object store and file system") From a5c6a752fde2bc97f8df8d906146964816409470 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 Mar 2019 15:16:40 +0100 Subject: [PATCH 209/694] gnu: x11perf: Update to 1.6.1. * gnu/packages/xorg.scm (x11perf): Update to 1.6.1. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 89a3172a4a..b553d4534a 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1964,7 +1964,7 @@ (define-public windowswmproto (define-public x11perf (package (name "x11perf") - (version "1.6.0") + (version "1.6.1") (source (origin (method url-fetch) @@ -1974,7 +1974,7 @@ (define-public x11perf ".tar.bz2")) (sha256 (base32 - "0lb716yfdb8f11h4cz93d1bapqdxf1xplsb21kbp4xclq7g9hw78")))) + "0d3wh6z6znwhfdiv0zaggfj0xgish98xa10yy76b9517zj7hnzhw")))) (build-system gnu-build-system) (inputs `(("libx11" ,libx11) From e6c46ec42ea6e986b1030a145cb391235b689735 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 17 Mar 2019 14:39:23 +0100 Subject: [PATCH 210/694] vm: 'expression->derivation-in-linux-vm' leads to a kernel panic upon failure. Partially fixes . Reported by Tobias Geerinckx-Rice . * gnu/system/vm.scm (expression->derivation-in-linux-vm)[loader]: Call 'exit' when USER-BUILDER exits with a non-zero code. --- gnu/system/vm.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index e561285964..b671c74ab8 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -187,8 +187,9 @@ (define loader ;; When USER-BUILDER succeeds, reboot (indicating a ;; success), otherwise die, which causes a kernel panic ;; ("Attempted to kill init!"). - #~(when (zero? (system* #$user-builder)) - (reboot)))) + #~(if (zero? (system* #$user-builder)) + (reboot) + (exit 1)))) (let ((initrd (or initrd (base-initrd file-systems From 3822003082478fb3d24af1b411ffe17406a83e93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 17 Mar 2019 16:21:38 +0100 Subject: [PATCH 211/694] gnu: console-setup: Set absolute file name of 'cat' in 'ckbcomp'. * gnu/packages/xorg.scm (console-setup)[arguments]: Add 'patch-file-names' phase. --- gnu/packages/xorg.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index b553d4534a..3463ac85a7 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6378,6 +6378,15 @@ (define-public console-setup #:phases (modify-phases %standard-phases (delete 'configure) + (add-after 'unpack 'patch-file-names + (lambda _ + ;; 'ckbcomp' calls out to 'cat' (!). Give it the right file + ;; name. + (substitute* '("Keyboard/ckbcomp") + (("\"cat ") + (string-append "\"" (which "cat") + " "))) + #t)) (add-before 'build 'make-doubled-bdfs (lambda* (#:key inputs #:allow-other-keys) (invoke "make" "-C" "Fonts" From 8ffab257ddb6c5df1ac43b9baeb5f0373bffb482 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 17 Mar 2019 16:22:43 +0100 Subject: [PATCH 212/694] guix system: Fix success report of the bootloader installation. Fixes . Reported by Jack Hill . Regression introduced in 21fcfe1ee969cc477dc41486ae4074e655d44274. * guix/scripts/system.scm (bootloader-installer-script): Ungexp DEVICE. --- guix/scripts/system.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index b4bf66819f..97508f4bd6 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -818,7 +818,7 @@ (define (bootloader-installer-script installer (exit 1))) (#$installer #$bootloader #$device #$target) (format #t "bootloader successfully installed on '~a'~%" - device)))))) + #$device)))))) (define* (perform-action action os #:key skip-safety-checks? From 2e6508d853ed19669e66527f20a0a33b5034a08c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 Mar 2019 14:07:27 +0100 Subject: [PATCH 213/694] gnu: libxkbfile: Update to 1.1.0. * gnu/packages/xorg.scm (libxkbfile): Update to 1.1.0. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 2fbacb04bd..3f0a8fb5ee 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1360,7 +1360,7 @@ (define-public libxft (define-public libxkbfile (package (name "libxkbfile") - (version "1.0.9") + (version "1.1.0") (source (origin (method url-fetch) @@ -1370,7 +1370,7 @@ (define-public libxkbfile ".tar.bz2")) (sha256 (base32 - "0smimr14zvail7ar68n7spvpblpdnih3jxrva7cpa6cn602px0ai")))) + "1irq9crvscd3yb8sr802dhvvfr35jdy1n2yz094xplmd42mbv3bm")))) (build-system gnu-build-system) (inputs `(("libx11" ,libx11))) From 5f1d8721a350dd8efe040cc3adba236056711f4b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 Mar 2019 14:07:46 +0100 Subject: [PATCH 214/694] gnu: libxvmc: Update to 1.0.11. * gnu/packages/xorg.scm (libxvmc): Update to 1.0.11. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 3f0a8fb5ee..36cf8edac5 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4977,7 +4977,7 @@ (define-public libxrandr (define-public libxvmc (package (name "libxvmc") - (version "1.0.10") + (version "1.0.11") (source (origin (method url-fetch) @@ -4987,7 +4987,7 @@ (define-public libxvmc ".tar.bz2")) (sha256 (base32 - "0bpffxr5dal90a8miv2w0rif61byqxq2f5angj4z1bnznmws00g5")))) + "0bb2c996p0smp2lwckffcfh4701bzv7266xh230ag0x68ka38bja")))) (build-system gnu-build-system) (propagated-inputs `(("libxv" ,libxv))) From d0649b4730a36039b331887c6ea42dc747f7433b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 Mar 2019 14:14:49 +0100 Subject: [PATCH 215/694] gnu: makedepend: Update to 1.0.6. * gnu/packages/xorg.scm (makedepend): Update to 1.0.6. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 36cf8edac5..f3ae2cd03d 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1560,7 +1560,7 @@ (define-public luit (define-public makedepend (package (name "makedepend") - (version "1.0.5") + (version "1.0.6") (source (origin (method url-fetch) @@ -1570,7 +1570,7 @@ (define-public makedepend ".tar.bz2")) (sha256 (base32 - "09alw99r6y2bbd1dc786n3jfgv4j520apblyn7cw6jkjydshba7p")))) + "072h9nzh8s5vqfz35dli4fba36fnr219asjrb7p89n8ph0paan6m")))) (build-system gnu-build-system) (inputs `(("xorgproto" ,xorgproto))) From 27b23cf2dfdee6bd2bada7a3544abd9bf443c3ac Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 Mar 2019 14:52:52 +0100 Subject: [PATCH 216/694] gnu: cups-filters: Update to 1.22.2. * gnu/packages/cups.scm (cups-filters): Update to 1.22.2. --- gnu/packages/cups.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 047f9033ad..bae9a40e3a 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -56,7 +56,7 @@ (define-module (gnu packages cups) (define-public cups-filters (package (name "cups-filters") - (version "1.22.1") + (version "1.22.2") (source(origin (method url-fetch) (uri @@ -64,7 +64,7 @@ (define-public cups-filters "cups-filters-" version ".tar.xz")) (sha256 (base32 - "08szgpmac7xlf6vqkvg3pbphnrk2mal3gy382q2y3cm7k4plys3y")) + "06gy3wv6p7kswz3mjn17f17mqpadvqj2riwc42kksnvp8x0h08cw")) (modules '((guix build utils))) (snippet ;; install backends, banners and filters to cups-filters output From 5dd7bd121896e2062578349e7447f736c128e305 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 Mar 2019 14:56:30 +0100 Subject: [PATCH 217/694] gnu: fontforge: Update to 20190317. * gnu/packages/fontutils.scm (fontforge): Update to 20190317. [source](uri): Adjust for new tarball name. [arguments]: Remove #:make-flags. --- gnu/packages/fontutils.scm | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 180ec89690..25ec9663c3 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -560,14 +560,14 @@ (define-public libuninameslist (define-public fontforge (package (name "fontforge") - (version "20170731") + (version "20190317") (source (origin (method url-fetch) (uri (string-append "https://github.com/fontforge/fontforge/releases/download/" - version "/fontforge-dist-" version ".tar.xz")) + version "/fontforge-" version ".tar.gz")) (sha256 (base32 - "08l8h3yvk4v7652jvmd3ls7nf5miybkx2fmkf1mpwwfixpxxw2l4")))) + "1ddqbpc32cgbccdnv0lfw0qhj59hcqzb7616ph5lkvm91pnas4dp")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) @@ -614,11 +614,7 @@ (define-public fontforge "pango" "cairo" "fontconfig"))) ;; Checks for potrace program at runtime `("PATH" ":" prefix (,potrace))) - #t)))) - - ;; Skip test 40 "FontForge .sfd file open check" to work around - ;; . - #:make-flags '("TESTSUITEFLAGS=-k '!\\.sfd'"))) + #t)))))) (synopsis "Outline font editor") (description "FontForge allows you to create and modify postscript, truetype and From 22d1cb7ffaaa513f5f2e522844256f871dcd1ec8 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 17 Mar 2019 18:09:43 +0100 Subject: [PATCH 218/694] gnu: opam: Update to 2.0.3. * gnu/packages/ocaml.scm (opam): Update to 2.0.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 9a807a4cb6..ec1c080607 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -305,7 +305,7 @@ (define-public ocamlbuild (define-public opam (package (name "opam") - (version "2.0.1") + (version "2.0.3") (source (origin (method url-fetch) ;; Use the '-full' version, which includes all the dependencies. @@ -317,7 +317,7 @@ (define-public opam ) (sha256 (base32 - "0z6r9qr4awcdn7wyrl5y5jm34jsjlnzd00py893f1hd0c6vg3xw1")))) + "1qphm1grxx5j8li7f9qfpih4ylrnjl08b4ym8ma4ln44l56xm285")))) (build-system gnu-build-system) (arguments '(;; Sometimes, 'make -jX' would fail right after ./configure with From 50ab554bd5b8f81c1d3a52901bdfbdac143b86f4 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 17 Mar 2019 18:36:02 +0100 Subject: [PATCH 219/694] gnu: unison: Fix manual generation. * gnu/packages/ocaml.scm (unison)[arguments]: Fix documentation generation. --- gnu/packages/ocaml.scm | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index ec1c080607..801611beb1 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -816,14 +816,10 @@ (define-public unison (let ((doc (string-append (assoc-ref outputs "doc") "/share/doc/unison"))) (mkdir-p doc) - ;; This is a workaround to prevent a build failure. Running - ;; make docs somehow allows it to pass, but the generated - ;; documentation is not pretty. - (catch #t - (lambda _ - (invoke "make" "docs" - "TEXDIRECTIVES=\\\\draftfalse")) - (lambda _ #t)) + ;; Remove an '\n' that prevents the doc to be generated + ;; correctly with newer hevea. + (substitute* "doc/local.tex" + (("----SNIP----.*") "----SNIP----")) ;; This file needs write-permissions, because it's ;; overwritten by 'docs' during documentation generation. (chmod "src/strings.ml" #o600) From 2238211a471d4526925e12a171f2e8d0184d2d2a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 4 Mar 2019 21:08:52 +0200 Subject: [PATCH 220/694] gnu: Add editorconfig-core-c. * gnu/packages/text-editors.scm (editorconfig-core-c): New variable. --- gnu/packages/text-editors.scm | 47 +++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 0c60d202a3..b1afd63b32 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2017 Nils Gillmann ;;; Copyright © 2014 Taylan Ulrich Bayırlı/Kammer ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2019 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,6 +29,7 @@ (define-module (gnu packages text-editors) #:use-module (guix git-download) #:use-module (guix utils) #:use-module (guix build-system gnu) + #:use-module (guix build-system cmake) #:use-module (guix build-system glib-or-gtk) #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages) @@ -41,6 +43,7 @@ (define-module (gnu packages text-editors) #:use-module (gnu packages libreoffice) #:use-module (gnu packages lua) #:use-module (gnu packages ncurses) + #:use-module (gnu packages pcre) #:use-module (gnu packages pkg-config) #:use-module (gnu packages qt) #:use-module (gnu packages regex) @@ -343,3 +346,47 @@ (define-public ghostwriter "@code{ghostwriter} provides a relaxing, distraction-free writing environment with Markdown markup.") (license license:gpl3+))) ;icons/* under CC-BY-SA3 + +(define-public editorconfig-core-c + (package + (name "editorconfig-core-c") + (version "0.12.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/editorconfig/editorconfig-core-c.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0jkc69r4jwn4rih6h6cqvgljjc3ff49cxj8286mi515aczr48cm1")))) + (build-system cmake-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'insert-tests + (lambda* (#:key inputs #:allow-other-keys) + (let ((tests (assoc-ref inputs "tests"))) + (copy-recursively tests "tests")) + #t))))) + (native-inputs + `(("tests" ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/editorconfig/editorconfig-core-test") + (commit "6ea1d8ece62cac9cf72c79dce4879b046abe1fe7"))) ; matches version + (file-name (git-file-name "editorconfig-core-test" version)) + (sha256 + (base32 + "1sf6910idnd4bgzbj8w8f9ldsbkaqa0lh6syymwy3hfqda63acj7")))))) + (inputs + `(("pcre2" ,pcre2))) + (home-page "https://editorconfig.org/") + (synopsis "EditorConfig core library written in C") + (description "EditorConfig makes it easy to maintain the correct coding +style when switching between different text editors and between different +projects. The EditorConfig project maintains a file format and plugins for +various text editors which allow this file format to be read and used by those +editors.") + (license license:bsd-2))) From de3ed0b4d4e15409fcd5c1679488f34fba44912f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 4 Mar 2019 21:10:58 +0200 Subject: [PATCH 221/694] gnu: Add editorconfig-vim. * gnu/packages/vim.scm (editorconfig-vim): New variable. --- gnu/packages/vim.scm | 54 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 6a98f0a5a4..70e358656d 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -55,6 +55,7 @@ (define-module (gnu packages vim) #:use-module (gnu packages serialization) #:use-module (gnu packages shells) #:use-module (gnu packages tcl) + #:use-module (gnu packages text-editors) #:use-module (gnu packages terminals) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xorg)) @@ -642,6 +643,59 @@ (define-public vim-syntastic (home-page "https://github.com/vim-syntastic/syntastic") (license license:wtfpl2))) +(define-public editorconfig-vim + (package + (name "editorconfig-vim") + (version "0.3.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/editorconfig/editorconfig-vim.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0vssfl1wjq0mv0p30c3dszwrh4yy90vwxmmdgqaxf5rykik7bdfd")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "plugin/editorconfig-core-py") #t)))) + (build-system gnu-build-system) + (arguments + '(#:tests? #f ; tests require ruby and plugin-test repository + #:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (add-after 'unpack 'patch-editorconfig-path + (lambda* (#:key inputs #:allow-other-keys) + (let ((editorconfig (assoc-ref inputs "editorconfig-core"))) + (substitute* "plugin/editorconfig.vim" + (("/opt") editorconfig)) + #t))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (vimfiles (string-append out "/share/vim/vimfiles")) + (doc (string-append vimfiles "/doc")) + (plugin (string-append vimfiles "/plugin")) + (autoload (string-append vimfiles "/autoload"))) + (copy-recursively "doc" doc) + (copy-recursively "autoload" autoload) + (copy-recursively "plugin" plugin) + #t)))))) + (inputs + `(("editorconfig-core" ,editorconfig-core-c))) + (home-page "https://editorconfig.org/") + (synopsis "EditorConfig plugin for Vim") + (description "EditorConfig makes it easy to maintain the correct coding +style when switching between different text editors and between different +projects. The EditorConfig project maintains a file format and plugins for +various text editors which allow this file format to be read and used by those +editors.") + (license license:bsd-2))) + (define-public neovim-syntastic (package (inherit vim-syntastic) From 19c0cdb9e6271956015232421ef7f63a1ad001ae Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sun, 17 Mar 2019 21:52:51 +0300 Subject: [PATCH 222/694] gnu: tome4: Fix build. * gnu/packages/games.scm (tome4)[source]: Patch 'src/tgl.h' in snippet. --- gnu/packages/games.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 360cbe8c1d..74fc452e32 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -37,6 +37,7 @@ ;;; Copyright © 2018 Benjamin Slade ;;; Copyright © 2018 Alex Vong ;;; Copyright © 2019 Pierre Neidhardt +;;; Copyright © 2019 Oleg Pykhalov ;;; ;;; This file is part of GNU Guix. ;;; @@ -4828,6 +4829,8 @@ (define-public tome4 (("#elif defined(__FreeBSD__)" line) (string-append line " || defined(__GNUC__)"))) + (substitute* '("src/tgl.h") + (("#include ") "")) #t)))) (build-system gnu-build-system) (native-inputs From cd2e4b2a8dbded85f7183d86be0747707e55d49e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 17 Mar 2019 17:01:56 +0100 Subject: [PATCH 223/694] describe: Add 'current-profile-date'. * guix/describe.scm (current-profile-date): New procedure. --- guix/describe.scm | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/guix/describe.scm b/guix/describe.scm index 00372bbed7..893dca2640 100644 --- a/guix/describe.scm +++ b/guix/describe.scm @@ -21,10 +21,12 @@ (define-module (guix describe) #:use-module (guix profiles) #:use-module (guix packages) #:use-module ((guix utils) #:select (location-file)) - #:use-module ((guix store) #:select (%store-prefix)) + #:use-module ((guix store) #:select (%store-prefix store-path?)) + #:use-module ((guix config) #:select (%state-directory)) #:use-module (srfi srfi-1) #:use-module (ice-9 match) #:export (current-profile + current-profile-date current-profile-entries package-path-entries @@ -55,6 +57,27 @@ (define current-profile (and (file-exists? (string-append candidate "/manifest")) candidate))))))) +(define (current-profile-date) + "Return the creation date of the current profile (produced by 'guix pull'), +as a number of seconds since the Epoch, or #f if it could not be determined." + ;; Normally 'current-profile' will return ~/.config/guix/current. We need + ;; to 'readlink' once to get '/var/guix/…/guix-profile', whose mtime is the + ;; piece of information we're looking for. + (let loop ((profile (current-profile))) + (match profile + (#f #f) + ((? store-path?) #f) + (file + (if (string-prefix? %state-directory file) + (and=> (lstat file) stat:mtime) + (catch 'system-error + (lambda () + (let ((target (readlink file))) + (loop (if (string-prefix? "/" target) + target + (string-append (dirname file) "/" target))))) + (const #f))))))) + (define current-profile-entries (mlambda () "Return the list of entries in the 'guix pull' profile the calling process From 55da450a1fc9969d9e791d7d94da90df3aa284db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 17 Mar 2019 17:02:15 +0100 Subject: [PATCH 224/694] scripts: 'warn-about-old-distro' looks at the age of the running Guix. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes a discrepancy that could be seen when running: sudo guix system … where 'guix' would warn about the age of root's Guix, even though the running Guix is the user's, not root's. * guix/scripts.scm (warn-about-old-distro)[false-if-not-found]: Remove. Obtain the profile date by calling 'current-profile-date' instead of stat'ing "current-guix". --- guix/scripts.scm | 46 ++++++++++++++++++---------------------------- 1 file changed, 18 insertions(+), 28 deletions(-) diff --git a/guix/scripts.scm b/guix/scripts.scm index 5e20ecd92c..75d801a466 100644 --- a/guix/scripts.scm +++ b/guix/scripts.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2017, 2018 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2014 Deck Pickard ;;; Copyright © 2015, 2016 Alex Kost ;;; @@ -27,6 +27,7 @@ (define-module (guix scripts) #:use-module (guix packages) #:use-module (guix derivations) #:use-module ((guix profiles) #:select (%profile-directory)) + #:autoload (guix describe) (current-profile-date) #:use-module (guix build syscalls) #:use-module (srfi srfi-1) #:use-module (srfi srfi-19) @@ -158,36 +159,25 @@ (define* (warn-about-old-distro #:optional (old (%distro-age-warning)) #:key (suggested-command "guix package -u")) "Emit a warning if Guix is older than OLD seconds." - (let-syntax ((false-if-not-found - (syntax-rules () - ((_ exp) - (catch 'system-error - (lambda () - exp) - (lambda args - (if (= ENOENT (system-error-errno args)) - #f - (apply throw args)))))))) - (define (seconds->days seconds) - (round (/ seconds (* 3600 24)))) + (define (seconds->days seconds) + (round (/ seconds (* 3600 24)))) - (define age - (match (false-if-not-found - (lstat (string-append %profile-directory "/current-guix"))) - (#f #f) - (stat (- (time-second (current-time time-utc)) - (stat:mtime stat))))) + (define age + (match (current-profile-date) + (#f #f) + (date (- (time-second (current-time time-utc)) + date)))) - (when (and age (>= age old)) - (warning (N_ "Your Guix installation is ~a day old.\n" - "Your Guix installation is ~a days old.\n" - (seconds->days age)) - (seconds->days age))) - (when (or (not age) (>= age old)) - (warning (G_ "Consider running 'guix pull' followed by + (when (and age (>= age old)) + (warning (N_ "Your Guix installation is ~a day old.\n" + "Your Guix installation is ~a days old.\n" + (seconds->days age)) + (seconds->days age))) + (when (or (not age) (>= age old)) + (warning (G_ "Consider running 'guix pull' followed by '~a' to get up-to-date packages and security updates.\n") - suggested-command) - (newline (guix-warning-port))))) + suggested-command) + (newline (guix-warning-port)))) (define %disk-space-warning ;; The fraction (between 0 and 1) of free disk space below which a warning From 880916ac5228b9cfd6e65ac243d17f6bd12edaf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 12 Mar 2019 15:50:13 +0100 Subject: [PATCH 225/694] guix build: Add '--with-git-url'. * guix/scripts/build.scm (%not-equal): New variable. (evaluate-git-replacement-specs): Use it instead of local variable 'not-equal'. (transform-package-source-git-url): New procedure. (%transformations): Add 'with-git-url'. (%transformation-options, show-transformation-options-help): Add '--with-git-url'. * tests/scripts-build.scm ("options->transformation, with-git-url"): New test. --- doc/guix.texi | 36 ++++++++++++++++++++----------- guix/scripts/build.scm | 47 +++++++++++++++++++++++++++++++++++------ tests/scripts-build.scm | 24 ++++++++++++++++++++- 3 files changed, 87 insertions(+), 20 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 5bbd0ee7f0..139a09d1bc 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -7780,9 +7780,32 @@ must be compatible. If @var{replacement} is somehow incompatible with @var{package}, then the resulting package may be unusable. Use with care! -@item --with-branch=@var{package}=@var{branch} +@item --with-git-url=@var{package}=@var{url} @cindex Git, using the latest commit @cindex latest commit, building +Build @var{package} from the latest commit of the @code{master} branch of the +Git repository at @var{url}. + +For example, the following commands builds the GNU C Library (glibc) straight +from its Git repository instead of building the currently-packaged release: + +@example +guix build glibc \ + --with-git-url=glibc=git://sourceware.org/git/glibc.git +@end example + +@cindex continuous integration +Obviously, since it uses the latest commit of the given branch, the result of +such a command varies over time. Nevertheless it is a convenient way to +rebuild entire software stacks against the latest commit of one or more +packages. This is particularly useful in the context of continuous +integration (CI). + +Checkouts are kept in a cache under @file{~/.cache/guix/checkouts} to speed up +consecutive accesses to the same repository. You may want to clean it up once +in a while to save disk space. + +@item --with-branch=@var{package}=@var{branch} Build @var{package} from the latest commit of @var{branch}. The @code{source} field of @var{package} must be an origin with the @code{git-fetch} method (@pxref{origin Reference}) or a @code{git-checkout} object; the repository URL @@ -7798,17 +7821,6 @@ specific @code{guile-sqlite3} build: guix build --with-branch=guile-sqlite3=master cuirass @end example -@cindex continuous integration -Obviously, since it uses the latest commit of the given branch, the result of -such a command varies over time. Nevertheless it is a convenient way to -rebuild entire software stacks against the latest commit of one or more -packages. This is particularly useful in the context of continuous -integration (CI). - -Checkouts are kept in a cache under @file{~/.cache/guix/checkouts} to speed up -consecutive accesses to the same repository. You may want to clean it up once -in a while to save disk space. - @item --with-commit=@var{package}=@var{commit} This is similar to @code{--with-branch}, except that it builds from @var{commit} rather than the tip of a branch. @var{commit} must be a valid diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm index 6b29c470fb..5883dbfb44 100644 --- a/guix/scripts/build.scm +++ b/guix/scripts/build.scm @@ -272,16 +272,16 @@ (define (replacement-pair old new) (rewrite obj) obj)))) +(define %not-equal + (char-set-complement (char-set #\=))) + (define (evaluate-git-replacement-specs specs proc) "Parse SPECS, a list of strings like \"guile=stable-2.2\", and return a list of package pairs, where (PROC PACKAGE URL BRANCH-OR-COMMIT) returns the replacement package. Raise an error if an element of SPECS uses invalid syntax, or if a package it refers to could not be found." - (define not-equal - (char-set-complement (char-set #\=))) - (map (lambda (spec) - (match (string-tokenize spec not-equal) + (match (string-tokenize spec %not-equal) ((name branch-or-commit) (let* ((old (specification->package name)) (source (package-source old)) @@ -341,6 +341,33 @@ (define (replace old url commit) (rewrite obj) obj)))) +(define (transform-package-source-git-url replacement-specs) + "Return a procedure that, when passed a package, replaces its dependencies +according to REPLACEMENT-SPECS. REPLACEMENT-SPECS is a list of strings like +\"guile-json=https://gitthing.com/…\" meaning that packages are built using +a checkout of the Git repository at the given URL." + ;; FIXME: Currently this cannot be combined with '--with-branch' or + ;; '--with-commit' because they all transform "from scratch". + (define replacements + (map (lambda (spec) + (match (string-tokenize spec %not-equal) + ((name url) + (let* ((old (specification->package name)) + (new (package + (inherit old) + (source (git-checkout (url url) + (recursive? #t)))))) + (cons old new))))) + replacement-specs)) + + (define rewrite + (package-input-rewriting replacements)) + + (lambda (store obj) + (if (package? obj) + (rewrite obj) + obj))) + (define %transformations ;; Transformations that can be applied to things to build. The car is the ;; key used in the option alist, and the cdr is the transformation @@ -350,7 +377,8 @@ (define %transformations (with-input . ,transform-package-inputs) (with-graft . ,transform-package-inputs/graft) (with-branch . ,transform-package-source-branch) - (with-commit . ,transform-package-source-commit))) + (with-commit . ,transform-package-source-commit) + (with-git-url . ,transform-package-source-git-url))) (define %transformation-options ;; The command-line interface to the above transformations. @@ -368,7 +396,9 @@ (define %transformation-options (option '("with-branch") #t #f (parser 'with-branch)) (option '("with-commit") #t #f - (parser 'with-commit))))) + (parser 'with-commit)) + (option '("with-git-url") #t #f + (parser 'with-git-url))))) (define (show-transformation-options-help) (display (G_ " @@ -385,7 +415,10 @@ (define (show-transformation-options-help) build PACKAGE from the latest commit of BRANCH")) (display (G_ " --with-commit=PACKAGE=COMMIT - build PACKAGE from COMMIT"))) + build PACKAGE from COMMIT")) + (display (G_ " + --with-git-url=PACKAGE=URL + build PACKAGE from the repository at URL"))) (define (options->transformation opts) diff --git a/tests/scripts-build.scm b/tests/scripts-build.scm index 190426ed06..54681274b9 100644 --- a/tests/scripts-build.scm +++ b/tests/scripts-build.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016, 2017 Ludovic Courtès +;;; Copyright © 2016, 2017, 2019 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -23,6 +23,7 @@ (define-module (test-scripts-build) #:use-module (guix scripts build) #:use-module (guix ui) #:use-module (guix utils) + #:use-module (guix git) #:use-module (gnu packages) #:use-module (gnu packages base) #:use-module (gnu packages busybox) @@ -164,4 +165,25 @@ (define-module (test-scripts-build) ((("x" dep)) (eq? (package-replacement dep) findutils))))))))))) +(test-equal "options->transformation, with-git-url" + (let ((source (git-checkout (url "https://example.org") + (recursive? #t)))) + (list source source)) + (let* ((p (dummy-package "guix.scm" + (inputs `(("foo" ,grep) + ("bar" ,(dummy-package "chbouib" + (native-inputs `(("x" ,grep))))))))) + (t (options->transformation '((with-git-url . "grep=https://example.org"))))) + (with-store store + (let ((new (t store p))) + (and (not (eq? new p)) + (match (package-inputs new) + ((("foo" dep1) ("bar" dep2)) + (and (string=? (package-full-name dep1) + (package-full-name grep)) + (string=? (package-name dep2) "chbouib") + (match (package-native-inputs dep2) + ((("x" dep3)) + (map package-source (list dep1 dep3)))))))))))) + (test-end) From f258d8862852db9779945658b3a3f2b8a2a4c217 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 12 Mar 2019 21:39:48 +0100 Subject: [PATCH 226/694] packages: Add 'package-input-rewriting/spec'. * guix/packages.scm (package-input-rewriting/spec): New procedure. * tests/packages.scm ("package-input-rewriting/spec") ("package-input-rewriting/spec, partial match"): New tests. * doc/guix.texi (Defining Packages): Document it. --- doc/guix.texi | 23 +++++++++++++++++++++ guix/packages.scm | 38 ++++++++++++++++++++++++++++++++++ tests/packages.scm | 51 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 112 insertions(+) diff --git a/doc/guix.texi b/doc/guix.texi index 139a09d1bc..6124c9c24c 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -5241,6 +5241,29 @@ with @var{libressl}. Then we use it to define a @dfn{variant} of the This is exactly what the @option{--with-input} command-line option does (@pxref{Package Transformation Options, @option{--with-input}}). +The following variant of @code{package-input-rewriting} can match packages to +be replaced by name rather than by identity. + +@deffn {Scheme Procedure} package-input-rewriting/spec @var{replacements} +Return a procedure that, given a package, applies the given @var{replacements} to +all the package graph (excluding implicit inputs). @var{replacements} is a list of +spec/procedures pair; each spec is a package specification such as @code{"gcc"} or +@code{"guile@@2"}, and each procedure takes a matching package and returns a +replacement for that package. +@end deffn + +The example above could be rewritten this way: + +@example +(define libressl-instead-of-openssl + ;; Replace all the packages called "openssl" with LibreSSL. + (package-input-rewriting/spec `(("openssl" . ,(const libressl))))) +@end example + +The key difference here is that, this time, packages are matched by spec and +not by identity. In other words, any package in the graph that is called +@code{openssl} will be replaced. + A more generic procedure to rewrite a package dependency graph is @code{package-mapping}: it supports arbitrary changes to nodes in the graph. diff --git a/guix/packages.scm b/guix/packages.scm index f191327718..d20a2562c3 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -102,6 +102,7 @@ (define-module (guix packages) package-transitive-supported-systems package-mapping package-input-rewriting + package-input-rewriting/spec package-source-derivation package-derivation package-cross-derivation @@ -869,6 +870,43 @@ (define (rewrite p) (package-mapping rewrite (cut assq <> replacements))) +(define (package-input-rewriting/spec replacements) + "Return a procedure that, given a package, applies the given REPLACEMENTS to +all the package graph (excluding implicit inputs). REPLACEMENTS is a list of +spec/procedures pair; each spec is a package specification such as \"gcc\" or +\"guile@2\", and each procedure takes a matching package and returns a +replacement for that package." + (define table + (fold (lambda (replacement table) + (match replacement + ((spec . proc) + (let-values (((name version) + (package-name->name+version spec))) + (vhash-cons name (list version proc) table))))) + vlist-null + replacements)) + + (define (find-replacement package) + (vhash-fold* (lambda (item proc) + (or proc + (match item + ((#f proc) + proc) + ((version proc) + (and (version-prefix? version + (package-version package)) + proc))))) + #f + (package-name package) + table)) + + (define (rewrite package) + (match (find-replacement package) + (#f package) + (proc (proc package)))) + + (package-mapping rewrite find-replacement)) + (define-syntax-rule (package/inherit p overrides ...) "Like (package (inherit P) OVERRIDES ...), except that the same transformation is done to the package replacement, if any. P must be a bare diff --git a/tests/packages.scm b/tests/packages.scm index 4e4bffc48c..613b2f1221 100644 --- a/tests/packages.scm +++ b/tests/packages.scm @@ -981,6 +981,57 @@ (define read-at ((("x" dep)) (eq? dep findutils))))))))) +(test-assert "package-input-rewriting/spec" + (let* ((dep (dummy-package "chbouib" + (native-inputs `(("x" ,grep))))) + (p0 (dummy-package "example" + (inputs `(("foo" ,coreutils) + ("bar" ,grep) + ("baz" ,dep))))) + (rewrite (package-input-rewriting/spec + `(("coreutils" . ,(const sed)) + ("grep" . ,(const findutils))))) + (p1 (rewrite p0)) + (p2 (rewrite p0))) + (and (not (eq? p1 p0)) + (eq? p1 p2) ;memoization + (string=? "example" (package-name p1)) + (match (package-inputs p1) + ((("foo" dep1) ("bar" dep2) ("baz" dep3)) + (and (string=? (package-full-name dep1) + (package-full-name sed)) + (string=? (package-full-name dep2) + (package-full-name findutils)) + (string=? (package-name dep3) "chbouib") + (eq? dep3 (rewrite dep)) ;memoization + (match (package-native-inputs dep3) + ((("x" dep)) + (string=? (package-full-name dep) + (package-full-name findutils)))))))))) + +(test-assert "package-input-rewriting/spec, partial match" + (let* ((dep (dummy-package "chbouib" + (version "1") + (native-inputs `(("x" ,grep))))) + (p0 (dummy-package "example" + (inputs `(("foo" ,coreutils) + ("bar" ,dep))))) + (rewrite (package-input-rewriting/spec + `(("chbouib@123" . ,(const sed)) ;not matched + ("grep" . ,(const findutils))))) + (p1 (rewrite p0))) + (and (not (eq? p1 p0)) + (string=? "example" (package-name p1)) + (match (package-inputs p1) + ((("foo" dep1) ("bar" dep2)) + (and (string=? (package-full-name dep1) + (package-full-name coreutils)) + (eq? dep2 (rewrite dep)) ;memoization + (match (package-native-inputs dep2) + ((("x" dep)) + (string=? (package-full-name dep) + (package-full-name findutils)))))))))) + (test-equal "package-patched-vulnerabilities" '(("CVE-2015-1234") ("CVE-2016-1234" "CVE-2018-4567") From 0c0ff42a243b2da4f1deb52fe3961801008341da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 12 Mar 2019 22:12:18 +0100 Subject: [PATCH 227/694] guix build: Factorize 'package-git-url'. * guix/scripts/build.scm (package-git-url): New procedure. (evaluate-git-replacement-specs): Use it. --- guix/scripts/build.scm | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm index 5883dbfb44..7b24cc8eb1 100644 --- a/guix/scripts/build.scm +++ b/guix/scripts/build.scm @@ -275,6 +275,19 @@ (define (replacement-pair old new) (define %not-equal (char-set-complement (char-set #\=))) +(define (package-git-url package) + "Return the URL of the Git repository for package, or raise an error if +the source of PACKAGE is not fetched from a Git repository." + (let ((source (package-source package))) + (cond ((and (origin? source) + (git-reference? (origin-uri source))) + (git-reference-url (origin-uri source))) + ((git-checkout? source) + (git-checkout-url source)) + (else + (leave (G_ "the source of ~a is not a Git reference~%") + (package-full-name package)))))) + (define (evaluate-git-replacement-specs specs proc) "Parse SPECS, a list of strings like \"guile=stable-2.2\", and return a list of package pairs, where (PROC PACKAGE URL BRANCH-OR-COMMIT) returns the @@ -285,15 +298,7 @@ (define (evaluate-git-replacement-specs specs proc) ((name branch-or-commit) (let* ((old (specification->package name)) (source (package-source old)) - (url (cond ((and (origin? source) - (git-reference? (origin-uri source))) - (git-reference-url (origin-uri source))) - ((git-checkout? source) - (git-checkout-url source)) - (else - (leave (G_ "the source of ~a is not a Git \ -reference~%") - (package-full-name old)))))) + (url (package-git-url old))) (cons old (proc old url branch-or-commit)))) (x (leave (G_ "invalid replacement specification: ~s~%") spec)))) From 14328b81a224b726f39dd030886ba8d332027427 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 13 Mar 2019 10:11:54 +0100 Subject: [PATCH 228/694] guix build: Transformation options match packages by spec. This allows us to combine several transformations on a given package, in particular '--with-git-url' and '--with-branch'. Previously transformations would ignore each other since they would all take (specification->package SOURCE) as their replacement source, compare it by identity, which doesn't work if a previous transformation has already changed SOURCE. * guix/scripts/build.scm (evaluate-replacement-specs): Adjust to produce an alist as expected by 'package-input-rewriting/spec', with a package spec as the first element of each pair. (evaluate-git-replacement-specs): Likewise. (transform-package-inputs): Adjust accordingly and use 'package-input-rewriting/spec'. (transform-package-inputs/graft): Likewise. (transform-package-source-branch, transform-package-source-commit): Use 'package-input-rewriting/spec'. (transform-package-source-git-url): Likewise, and adjust the REPLACEMENTS alist accordingly. (options->transformation): Iterate over OPTS instead of over %TRANSFORMATIONS. Invoke transformations one by one. * tests/scripts-build.scm ("options->transformation, with-input"): Adjust test to compare packages by name rather than by identity. ("options->transformation, with-git-url + with-branch"): New test. --- doc/guix.texi | 24 ++++++----- guix/scripts/build.scm | 90 +++++++++++++++++++++++------------------ tests/scripts-build.scm | 36 +++++++++++++++-- 3 files changed, 97 insertions(+), 53 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 6124c9c24c..a3dd344a70 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -7807,16 +7807,20 @@ care! @cindex Git, using the latest commit @cindex latest commit, building Build @var{package} from the latest commit of the @code{master} branch of the -Git repository at @var{url}. +Git repository at @var{url}. Git sub-modules of the repository are fetched, +recursively. -For example, the following commands builds the GNU C Library (glibc) straight -from its Git repository instead of building the currently-packaged release: +For example, the following command builds the NumPy Python library against the +latest commit of the master branch of Python itself: @example -guix build glibc \ - --with-git-url=glibc=git://sourceware.org/git/glibc.git +guix build python-numpy \ + --with-git-url=python=https://github.com/python/cpython @end example +This option can also be combined with @code{--with-branch} or +@code{--with-commit} (see below). + @cindex continuous integration Obviously, since it uses the latest commit of the given branch, the result of such a command varies over time. Nevertheless it is a convenient way to @@ -7829,11 +7833,11 @@ consecutive accesses to the same repository. You may want to clean it up once in a while to save disk space. @item --with-branch=@var{package}=@var{branch} -Build @var{package} from the latest commit of @var{branch}. The @code{source} -field of @var{package} must be an origin with the @code{git-fetch} method -(@pxref{origin Reference}) or a @code{git-checkout} object; the repository URL -is taken from that @code{source}. Git sub-modules of the repository are -fetched, recursively. +Build @var{package} from the latest commit of @var{branch}. If the +@code{source} field of @var{package} is an origin with the @code{git-fetch} +method (@pxref{origin Reference}) or a @code{git-checkout} object, the +repository URL is taken from that @code{source}. Otherwise you have to use +@code{--with-git-url} to specify the URL of the Git repository. For instance, the following command builds @code{guile-sqlite3} from the latest commit of its @code{master} branch, and then builds @code{guix} (which diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm index 7b24cc8eb1..8ebcf79243 100644 --- a/guix/scripts/build.scm +++ b/guix/scripts/build.scm @@ -226,18 +226,21 @@ (define new-sources obj))))) (define (evaluate-replacement-specs specs proc) - "Parse SPECS, a list of strings like \"guile=guile@2.1\", and invoke PROC on -each package pair specified by SPECS. Return the resulting list. Raise an -error if an element of SPECS uses invalid syntax, or if a package it refers to -could not be found." + "Parse SPECS, a list of strings like \"guile=guile@2.1\" and return a list +of package spec/procedure pairs as expected by 'package-input-rewriting/spec'. +PROC is called with the package to be replaced and its replacement according +to SPECS. Raise an error if an element of SPECS uses invalid syntax, or if a +package it refers to could not be found." (define not-equal (char-set-complement (char-set #\=))) (map (lambda (spec) (match (string-tokenize spec not-equal) - ((old new) - (proc (specification->package old) - (specification->package new))) + ((spec new) + (cons spec + (let ((new (specification->package new))) + (lambda (old) + (proc old new))))) (x (leave (G_ "invalid replacement specification: ~s~%") spec)))) specs)) @@ -248,8 +251,10 @@ (define (transform-package-inputs replacement-specs) strings like \"guile=guile@2.1\" meaning that, any dependency on a package called \"guile\" must be replaced with a dependency on a version 2.1 of \"guile\"." - (let* ((replacements (evaluate-replacement-specs replacement-specs cons)) - (rewrite (package-input-rewriting replacements))) + (let* ((replacements (evaluate-replacement-specs replacement-specs + (lambda (old new) + new))) + (rewrite (package-input-rewriting/spec replacements))) (lambda (store obj) (if (package? obj) (rewrite obj) @@ -260,13 +265,12 @@ (define (transform-package-inputs/graft replacement-specs) dependencies according to REPLACEMENT-SPECS. REPLACEMENT-SPECS is a list of strings like \"gnutls=gnutls@3.5.4\" meaning that packages are built using the current 'gnutls' package, after which version 3.5.4 is grafted onto them." - (define (replacement-pair old new) - (cons old - (package (inherit old) (replacement new)))) + (define (set-replacement old new) + (package (inherit old) (replacement new))) (let* ((replacements (evaluate-replacement-specs replacement-specs - replacement-pair)) - (rewrite (package-input-rewriting replacements))) + set-replacement)) + (rewrite (package-input-rewriting/spec replacements))) (lambda (store obj) (if (package? obj) (rewrite obj) @@ -295,11 +299,13 @@ (define (evaluate-git-replacement-specs specs proc) syntax, or if a package it refers to could not be found." (map (lambda (spec) (match (string-tokenize spec %not-equal) - ((name branch-or-commit) - (let* ((old (specification->package name)) - (source (package-source old)) - (url (package-git-url old))) - (cons old (proc old url branch-or-commit)))) + ((spec branch-or-commit) + (define (replace old) + (let* ((source (package-source old)) + (url (package-git-url old))) + (proc old url branch-or-commit))) + + (cons spec replace)) (x (leave (G_ "invalid replacement specification: ~s~%") spec)))) specs)) @@ -318,7 +324,7 @@ (define (replace old url branch) (let* ((replacements (evaluate-git-replacement-specs replacement-specs replace)) - (rewrite (package-input-rewriting replacements))) + (rewrite (package-input-rewriting/spec replacements))) (lambda (store obj) (if (package? obj) (rewrite obj) @@ -340,7 +346,7 @@ (define (replace old url commit) (let* ((replacements (evaluate-git-replacement-specs replacement-specs replace)) - (rewrite (package-input-rewriting replacements))) + (rewrite (package-input-rewriting/spec replacements))) (lambda (store obj) (if (package? obj) (rewrite obj) @@ -351,22 +357,20 @@ (define (transform-package-source-git-url replacement-specs) according to REPLACEMENT-SPECS. REPLACEMENT-SPECS is a list of strings like \"guile-json=https://gitthing.com/…\" meaning that packages are built using a checkout of the Git repository at the given URL." - ;; FIXME: Currently this cannot be combined with '--with-branch' or - ;; '--with-commit' because they all transform "from scratch". (define replacements (map (lambda (spec) (match (string-tokenize spec %not-equal) - ((name url) - (let* ((old (specification->package name)) - (new (package - (inherit old) - (source (git-checkout (url url) - (recursive? #t)))))) - (cons old new))))) + ((spec url) + (cons spec + (lambda (old) + (package + (inherit old) + (source (git-checkout (url url) + (recursive? #t))))))))) replacement-specs)) (define rewrite - (package-input-rewriting replacements)) + (package-input-rewriting/spec replacements)) (lambda (store obj) (if (package? obj) @@ -430,16 +434,22 @@ (define (options->transformation opts) "Return a procedure that, when passed an object to build (package, derivation, etc.), applies the transformations specified by OPTS." (define applicable - ;; List of applicable transformations as symbol/procedure pairs. + ;; List of applicable transformations as symbol/procedure pairs in the + ;; order in which they appear on the command line. (filter-map (match-lambda - ((key . transform) - (match (filter-map (match-lambda - ((k . arg) - (and (eq? k key) arg))) - opts) - (() #f) - (args (cons key (transform args)))))) - %transformations)) + ((key . value) + (match (any (match-lambda + ((k . proc) + (and (eq? k key) proc))) + %transformations) + (#f + #f) + (transform + ;; XXX: We used to pass TRANSFORM a list of several + ;; arguments, but we now pass only one, assuming that + ;; transform composes well. + (cons key (transform (list value))))))) + (reverse opts))) (lambda (store obj) (fold (match-lambda* diff --git a/tests/scripts-build.scm b/tests/scripts-build.scm index 54681274b9..4bf1e1a719 100644 --- a/tests/scripts-build.scm +++ b/tests/scripts-build.scm @@ -139,12 +139,15 @@ (define-module (test-scripts-build) (and (not (eq? new p)) (match (package-inputs new) ((("foo" dep1) ("bar" dep2) ("baz" dep3)) - (and (eq? dep1 busybox) - (eq? dep2 findutils) + (and (string=? (package-full-name dep1) + (package-full-name busybox)) + (string=? (package-full-name dep2) + (package-full-name findutils)) (string=? (package-name dep3) "chbouib") (match (package-native-inputs dep3) ((("x" dep)) - (eq? dep findutils))))))))))) + (string=? (package-full-name dep) + (package-full-name findutils)))))))))))) (test-assert "options->transformation, with-graft" (let* ((p (dummy-package "guix.scm" @@ -186,4 +189,31 @@ (define-module (test-scripts-build) ((("x" dep3)) (map package-source (list dep1 dep3)))))))))))) +(test-equal "options->transformation, with-git-url + with-branch" + ;; Combine the two options and make sure the 'with-branch' transformation + ;; comes after the 'with-git-url' transformation. + (let ((source (git-checkout (url "https://example.org") + (branch "BRANCH") + (recursive? #t)))) + (list source source)) + (let* ((p (dummy-package "guix.scm" + (inputs `(("foo" ,grep) + ("bar" ,(dummy-package "chbouib" + (native-inputs `(("x" ,grep))))))))) + (t (options->transformation + (reverse '((with-git-url + . "grep=https://example.org") + (with-branch . "grep=BRANCH")))))) + (with-store store + (let ((new (t store p))) + (and (not (eq? new p)) + (match (package-inputs new) + ((("foo" dep1) ("bar" dep2)) + (and (string=? (package-name dep1) "grep") + (string=? (package-name dep2) "chbouib") + (match (package-native-inputs dep2) + ((("x" dep3)) + (map package-source (list dep1 dep3)))))))))))) + + (test-end) From 845c44012c2a05436dc0a5316ff3c2a9e5bd725f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 13 Mar 2019 10:26:31 +0100 Subject: [PATCH 229/694] guix build: '--with-commit' makes recursive checkouts. This was an omission from commit 024a6bfba906742c136a47b4099f06880f1d3f15. * guix/scripts/build.scm (transform-package-source-commit): Add 'recursive?' field to SOURCE. * tests/scripts-build.scm ("options->transformation, with-branch") ("options->transformation, with-commit"): New tests. --- guix/scripts/build.scm | 3 ++- tests/scripts-build.scm | 49 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 1 deletion(-) diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm index 8ebcf79243..20929d6110 100644 --- a/guix/scripts/build.scm +++ b/guix/scripts/build.scm @@ -342,7 +342,8 @@ (define (replace old url commit) (if (< (string-length commit) 7) commit (string-take commit 7)))) - (source (git-checkout (url url) (commit commit))))) + (source (git-checkout (url url) (commit commit) + (recursive? #t))))) (let* ((replacements (evaluate-git-replacement-specs replacement-specs replace)) diff --git a/tests/scripts-build.scm b/tests/scripts-build.scm index 4bf1e1a719..32876e956a 100644 --- a/tests/scripts-build.scm +++ b/tests/scripts-build.scm @@ -20,6 +20,7 @@ (define-module (test-scripts-build) #:use-module (guix tests) #:use-module (guix store) #:use-module (guix packages) + #:use-module (guix git-download) #:use-module (guix scripts build) #:use-module (guix ui) #:use-module (guix utils) @@ -168,6 +169,54 @@ (define-module (test-scripts-build) ((("x" dep)) (eq? (package-replacement dep) findutils))))))))))) +(test-equal "options->transformation, with-branch" + (git-checkout (url "https://example.org") + (branch "devel") + (recursive? #t)) + (let* ((p (dummy-package "guix.scm" + (inputs `(("foo" ,grep) + ("bar" ,(dummy-package "chbouib" + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://example.org") + (commit "cabba9e"))) + (sha256 #f))))))))) + (t (options->transformation '((with-branch . "chbouib=devel"))))) + (with-store store + (let ((new (t store p))) + (and (not (eq? new p)) + (match (package-inputs new) + ((("foo" dep1) ("bar" dep2)) + (and (string=? (package-full-name dep1) + (package-full-name grep)) + (string=? (package-name dep2) "chbouib") + (package-source dep2))))))))) + +(test-equal "options->transformation, with-commit" + (git-checkout (url "https://example.org") + (commit "abcdef") + (recursive? #t)) + (let* ((p (dummy-package "guix.scm" + (inputs `(("foo" ,grep) + ("bar" ,(dummy-package "chbouib" + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://example.org") + (commit "cabba9e"))) + (sha256 #f))))))))) + (t (options->transformation '((with-commit . "chbouib=abcdef"))))) + (with-store store + (let ((new (t store p))) + (and (not (eq? new p)) + (match (package-inputs new) + ((("foo" dep1) ("bar" dep2)) + (and (string=? (package-full-name dep1) + (package-full-name grep)) + (string=? (package-name dep2) "chbouib") + (package-source dep2))))))))) + (test-equal "options->transformation, with-git-url" (let ((source (git-checkout (url "https://example.org") (recursive? #t)))) From d831b1907900ea39c93cef7671acdbf9e04fafc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 13 Mar 2019 10:33:17 +0100 Subject: [PATCH 230/694] guix build: '--with-branch' strips slashes from the version string. This fixes things like: guix build glibc \ --with-git-url=glibc=git://sourceware.org/git/glibc.git \ --with-branch=glibc=release/2.25/master whereby slashes would before go straight to the 'version' field, leading to an invalid store file name. * guix/scripts/build.scm (transform-package-source-branch)[replace]: Replace slashes with hyphens in BRANCH when building the version string. --- guix/scripts/build.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm index 20929d6110..28864435df 100644 --- a/guix/scripts/build.scm +++ b/guix/scripts/build.scm @@ -318,7 +318,10 @@ (define (transform-package-source-branch replacement-specs) (define (replace old url branch) (package (inherit old) - (version (string-append "git." branch)) + (version (string-append "git." (string-map (match-lambda + (#\/ #\-) + (chr chr)) + branch))) (source (git-checkout (url url) (branch branch) (recursive? #t))))) From 8c72f13fd45fc04ee64c9b2865a293ad8d47d1f1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Mar 2019 01:36:58 +0100 Subject: [PATCH 231/694] gnu: libcxx: Correct sha256 hash. * gnu/packages/llvm.scm (libcxx)[source]: Fix it. --- gnu/packages/llvm.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 8ae646d87e..3d46b02338 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -270,7 +270,7 @@ (define-public libcxx version "/libcxx-" version ".src.tar.xz")) (sha256 (base32 - "0rzw4qvxp6qx4l4h9amrq02gp7hbg8lw4m0sy3k60f50234gnm3n")))) + "1wdrxg365ig0kngx52pd0n820sncp24blb0zpalc579iidhh4002")))) (build-system cmake-build-system) (native-inputs `(("clang" ,clang) From 4caf37b0a7d3a3969795cd1364dda7229ea8ab04 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 11 Jan 2019 11:25:54 -0500 Subject: [PATCH 232/694] gnu: Add python-et-xmlfile. * gnu/packages/python.scm (python-et-xmlfile): New variable. --- gnu/packages/python-xyz.scm | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index fa2701bc1c..687e9cbd7e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -54,7 +54,7 @@ ;;; Copyright © 2018 Nicolas Goaziou ;;; Copyright © 2018 Oleg Pykhalov ;;; Copyright © 2018 Clément Lassieur -;;; Copyright © 2018 Maxim Cournoyer +;;; Copyright © 2018, 2019 Maxim Cournoyer ;;; Copyright © 2018 Luther Thompson ;;; Copyright © 2018 Vagrant Cascadian ;;; Copyright © 2019 Brett Gilio @@ -832,6 +832,36 @@ (define-public python-coloredlogs (define-public python2-coloredlogs (package-with-python2 python-coloredlogs)) +(define-public python-et-xmlfile + (package + (name "python-et-xmlfile") + (version "1.0.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "et_xmlfile" version)) + (sha256 + (base32 + "0nrkhcb6jdrlb6pwkvd4rycw34y3s931hjf409ij9xkjsli9fkb1")))) + (build-system python-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "pytest")))))) + (native-inputs + `(("python-pytest" ,python-pytest) + ("python-lxml" ,python-lxml))) ;used for the tests + (home-page "https://bitbucket.org/openpyxl/et_xmlfile") + (synopsis "Low memory implementation of @code{lxml.xmlfile}") + (description "This Python library is based upon the @code{xmlfile} module +from @code{lxml}. It aims to provide a low memory, compatible implementation +of @code{xmlfile}.") + (license license:expat))) + +(define-public python2-et-xmlfile + (package-with-python2 python-et-xmlfile)) + (define-public python-eventlet (package (name "python-eventlet") From 5591fc4f384069010f084886e14a6680e2d34df9 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 11 Jan 2019 11:26:28 -0500 Subject: [PATCH 233/694] gnu: Add python-jdcal. * gnu/packages/python.scm (python-jdcal): New variable. --- gnu/packages/python-xyz.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 687e9cbd7e..47ac53e2a1 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1788,6 +1788,34 @@ (define-public python-vcversioner (define-public python2-vcversioner (package-with-python2 python-vcversioner)) +(define-public python-jdcal + (package + (name "python-jdcal") + (version "1.4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "jdcal" version)) + (sha256 + (base32 + "1ja6j2xq97bsl6rv09mhdx7n0xnrsfx0mj5xqza0mxghqmkm02pa")))) + (build-system python-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "pytest")))))) + (native-inputs + `(("python-pytest" ,python-pytest))) + (home-page "https://github.com/phn/jdcal") + (synopsis "Functions to convert between Julian dates Gregorian dates") + (description "This Python library provides functions for converting +between Julian dates and Gregorian dates.") + (license license:bsd-2))) + +(define-public python2-jdcal + (package-with-python2 python-jdcal)) + (define-public python-jsonschema (package (name "python-jsonschema") From a042d348c255d8d1a0af41b55cb66755f09bcf10 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 11 Jan 2019 11:27:10 -0500 Subject: [PATCH 234/694] gnu: Add python-openpyxl. * gnu/packages/python.scm (python-openpyxl): New variable. --- gnu/packages/python-xyz.scm | 38 +++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 47ac53e2a1..bc8375dc57 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -142,6 +142,7 @@ (define-module (gnu packages python-xyz) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix hg-download) #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) @@ -862,6 +863,43 @@ (define-public python-et-xmlfile (define-public python2-et-xmlfile (package-with-python2 python-et-xmlfile)) +(define-public python-openpyxl + (package + (name "python-openpyxl") + (version "2.6.0") + (source + (origin + ;; We use the upstream repository, as the tests are not included in the + ;; PyPI releases. + (method hg-fetch) + (uri (hg-reference + (url "https://bitbucket.org/openpyxl/openpyxl") + (changeset version))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "1x47ngn7ybaqdbvg90c8h2x0j6yfdfj25gjfinp2w5rf62gsany7")))) + (build-system python-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "pytest")))))) + (native-inputs + ;; For the test suite. + `(("python-lxml" ,python-lxml) + ("python-pillow" ,python-pillow) + ("python-pytest" ,python-pytest))) + (propagated-inputs + `(("python-et-xmlfile" ,python-et-xmlfile) + ("python-jdcal" ,python-jdcal))) + (home-page "https://openpyxl.readthedocs.io") + (synopsis "Python library to read/write Excel 2010 XLSX/XLSM files") + (description "This Python library allows reading and writing to the Excel XLSX, XLSM, +XLTX and XLTM file formats that are defined by the Office Open XML (OOXML) +standard.") + (license license:expat))) + (define-public python-eventlet (package (name "python-eventlet") From 667c6ef51606ab39a8e8d849d3dcd09f8ee36e00 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 11 Jan 2019 13:24:43 -0500 Subject: [PATCH 235/694] gnu: python-pandas: Enable Excel file format support. * gnu/packages/python.scm (python-pandas)[phases]{check}: Re-instate the tests from the test_excel.py module. * gnu/packages/python.scm (python-pandas)[propagated-inputs]: Add python-openpyxl and python-xlrd. --- gnu/packages/python-xyz.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index bc8375dc57..a1e7bc8831 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1043,7 +1043,6 @@ (define-public python-pandas '("pandas/tests/io/conftest.py" "pandas/tests/io/json/test_compression.py" "pandas/tests/io/parser/test_network.py" - "pandas/tests/io/test_excel.py" "pandas/tests/io/test_parquet.py")) (invoke "pytest" "-vv" "pandas" "--skip-slow" "--skip-network" "-k" @@ -1051,8 +1050,10 @@ (define-public python-pandas "not test_read_s3_jsonl")))))))) (propagated-inputs `(("python-numpy" ,python-numpy) + ("python-openpyxl" ,python-openpyxl) ("python-pytz" ,python-pytz) - ("python-dateutil" ,python-dateutil))) + ("python-dateutil" ,python-dateutil) + ("python-xlrd" ,python-xlrd))) (native-inputs `(("python-cython" ,python-cython) ("python-beautifulsoup4" ,python-beautifulsoup4) From c0d43f62232507b441edf28c3f051921dfb04c2a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 9 Feb 2019 00:25:51 -0500 Subject: [PATCH 236/694] gnu: python-pandas: Update to 0.24.2. * gnu/packages/python-xyz.scm (python-pandas): Update to 0.24.2. [phases]{patch-which}: Add phase. [inputs]: Add WHICH. --- gnu/packages/python-xyz.scm | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a1e7bc8831..ed54f54593 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1011,13 +1011,13 @@ (define-public python2-schedule (define-public python-pandas (package (name "python-pandas") - (version "0.23.4") + (version "0.24.2") (source (origin (method url-fetch) (uri (pypi-uri "pandas" version)) (sha256 - (base32 "1x54pd7hr3y7qahx6b5bf2wzj54xvl8r3s1h4pl254pnmi3wl92v")))) + (base32 "18imlm8xbhcbwy4wa957a1fkamrcb0z988z006jpfda3ki09z4ag")))) (build-system python-build-system) (arguments `(#:modules ((guix build utils) @@ -1025,6 +1025,13 @@ (define-public python-pandas (ice-9 ftw) (srfi srfi-26)) #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-which + (lambda* (#:key inputs #:allow-other-keys) + (let ((which (assoc-ref inputs "which"))) + (substitute* "pandas/io/clipboard/__init__.py" + (("^CHECK_CMD = .*") + (string-append "CHECK_CMD = \"" which "\"\n")))) + #t)) (replace 'check (lambda _ (let ((build-directory @@ -1033,12 +1040,13 @@ (define-public python-pandas (car (scandir "build" (cut string-prefix? "lib." <>)))))) ;; Disable the "strict data files" option which causes - ;; the build to error out if required data files are not - ;; available (as is the case with PyPI archives). + ;; the build to error out if required data files are + ;; not available (as is the case with PyPI archives). (substitute* "setup.cfg" (("addopts = --strict-data-files") "addopts = ")) (with-directory-excursion build-directory - ;; Delete tests that require "moto" which is not yet in Guix. + ;; Delete tests that require "moto" which is not yet + ;; in Guix. (for-each delete-file '("pandas/tests/io/conftest.py" "pandas/tests/io/json/test_compression.py" @@ -1054,13 +1062,16 @@ (define-public python-pandas ("python-pytz" ,python-pytz) ("python-dateutil" ,python-dateutil) ("python-xlrd" ,python-xlrd))) + (inputs + `(("which" ,which))) (native-inputs `(("python-cython" ,python-cython) ("python-beautifulsoup4" ,python-beautifulsoup4) ("python-lxml" ,python-lxml) ("python-html5lib" ,python-html5lib) ("python-nose" ,python-nose) - ("python-pytest" ,python-pytest))) + ("python-pytest" ,python-pytest) + ("python-pytest-mock" ,python-pytest-mock))) (home-page "https://pandas.pydata.org") (synopsis "Data structures for data analysis, time series, and statistics") (description From b6fd086a61b3004f9f5392f630155b9ad01752e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 18 Mar 2019 09:50:10 +0100 Subject: [PATCH 237/694] describe: Warn about 'GUIX_PACKAGE_PATH' in json and recutils format. Fixes . Reported by Pierre Neidhardt . * guix/scripts/describe.scm (display-package-search-path): Add catch-all case for FMT. --- guix/scripts/describe.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/guix/scripts/describe.scm b/guix/scripts/describe.scm index 7d0ecb0a4d..b6287d3a4c 100644 --- a/guix/scripts/describe.scm +++ b/guix/scripts/describe.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2018 Ludovic Courtès +;;; Copyright © 2018, 2019 Ludovic Courtès ;;; Copyright © 2018 Oleg Pykhalov ;;; ;;; This file is part of GNU Guix. @@ -85,7 +85,9 @@ (define (display-package-search-path fmt) (format #t "~%GUIX_PACKAGE_PATH=\"~a\"~%" string)) ('channels (format #t (G_ "~%;; warning: GUIX_PACKAGE_PATH=\"~a\"~%") - string)))))) + string)) + (_ + (warning (G_ "'GUIX_PACKAGE_PATH' is set but it is not captured~%"))))))) (define (channel->sexp channel) `(channel From bf2a9969a26886a4c57df1a6011f18edd2f013d0 Mon Sep 17 00:00:00 2001 From: Tim Gesthuizen Date: Sat, 5 Jan 2019 20:55:14 +0100 Subject: [PATCH 238/694] gnu: Add inputattach MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/linux.scm (inputattach): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/linux.scm | 43 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 999caf9ab6..d08784b3f6 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -32,6 +32,7 @@ ;;; Copyright © 2018 Manuel Graf ;;; Copyright © 2018 Pierre Langlois ;;; Copyright © 2018 Vasile Dumitrascu +;;; Copyright © 2019 Tim Gesthuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -5188,3 +5189,45 @@ (define-public fakeroot have to construct the archives directly, without using the archiver.") (home-page "http://freshmeat.sourceforge.net/projects/fakeroot") (license license:gpl3+))) + +(define-public inputattach + (package + (name "inputattach") + (version "0.42.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/linuxwacom/input-wacom.git") + (commit (string-append "input-wacom-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "04lnn7v0rm4ppbya140im5d4igcl6c1nrqpgbsr0i8wkral0nv7j")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (delete 'bootstrap) + (delete 'configure) + (replace 'build + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "inputattach" + (invoke (string-append (assoc-ref inputs "gcc") + "/bin/gcc") + "-o" "inputattach" "inputattach.c")) + #t)) + (delete 'check) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((target-dir (string-append + (assoc-ref outputs "out") + "/bin/"))) + (mkdir-p target-dir) + (copy-file "inputattach/inputattach" + (string-append target-dir + "inputattach")) + #t)))))) + (home-page "https://linuxwacom.github.io/") + (synopsis "Dispatch input peripherals events to a device file") + (description "inputattach dispatches input events from several device +types and interfaces and translates so that the X server can use them.") + (license license:gpl2+))) From 97ab799afeff032b422642d945c2bcc764f6d8ed Mon Sep 17 00:00:00 2001 From: Tim Gesthuizen Date: Sat, 5 Jan 2019 23:28:18 +0100 Subject: [PATCH 239/694] gnu: Add inputattach service. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add a service that runs inputattach as a daemon to translate events from serial ports. * gnu/services/desktop.scm (): New record type. * gnu/services/desktop.scm (inputattach-service-type): New service type. * doc/guix.texi (Miscellaneous Services): Add inputattach Service subsubheading. Signed-off-by: Ludovic Courtès --- doc/guix.texi | 16 ++++++++++++++ gnu/services/desktop.scm | 46 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+) diff --git a/doc/guix.texi b/doc/guix.texi index a3dd344a70..601afeda06 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -22503,6 +22503,22 @@ that enables sharing the clipboard with a vm and setting the guest display resolution when the graphical console window resizes. @end deffn +@cindex inputattach +@subsubheading inputattach Service + +@deftp {Data Type} inputattach-configuration +@table @asis +@item @code{device-type} The type of device to connect to. +@item @code{device} The device file to connect to the device. +@item @code{log-file} The file to log messages to. +@end table +@end deftp + +@deffn {Scheme Procedure} inputattach-service-type +Return a service that runs inputattach on a device and +dispatches events from it. +@end deffn + @subsection Dictionary Services @cindex dictionary The @code{(gnu services dict)} module provides the following service: diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index 0dee57e3bc..8f8e177ca9 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2018 Efraim Flashner ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2017, 2019 Christopher Baines +;;; Copyright © 2019 Tim Gesthuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -123,6 +124,10 @@ (define-module (gnu services desktop) enlightenment-desktop-configuration? enlightenment-desktop-service-type + inputattach-configuration + inputattach-configuration? + inputattach-service-type + %desktop-services)) ;;; Commentary: @@ -1019,6 +1024,47 @@ (define enlightenment-desktop-service-type thumbnails and makes setuid the programs which enlightenment needs to function as expected."))) + +;;; +;;; inputattach-service-type +;;; + +(define-record-type* + inputattach-configuration + make-inputattach-configuration + inputattach-configuration? + (device-type inputattach-configuration-device-type + (default "wacom")) + (device inputattach-configuration-device + (default "/dev/ttyS0")) + (log-file inputattach-configuration-log-file + (default #f))) + +(define inputattach-shepherd-service + (match-lambda + (($ type device log-file) + (list (shepherd-service + (provision '(inputattach)) + (requirement '(udev)) + (documentation "inputattach daemon") + (start #~(make-forkexec-constructor + (list (string-append #$inputattach + "/bin/inputattach") + (string-append "--" #$type) + #$device) + #:log-file #$log-file)) + (stop #~(make-kill-destructor))))))) + +(define inputattach-service-type + (service-type + (name 'inputattach) + (extensions + (list (service-extension shepherd-root-service-type + inputattach-shepherd-service))) + (default-value (inputattach-configuration)) + (description "Return a service that runs inputattach on a device and +dispatches events from it."))) + ;;; ;;; The default set of desktop services. From 5ddf98dadd757403a14bb2bc93e21801eb5fe3f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 18 Mar 2019 10:21:50 +0100 Subject: [PATCH 240/694] gnu: inputattach: Build with -O2. * gnu/packages/linux.scm (inputattach)[arguments]: Pass "-O2" to GCC. --- gnu/packages/linux.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index d08784b3f6..e9d8ea45c1 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5213,7 +5213,7 @@ (define-public inputattach (with-directory-excursion "inputattach" (invoke (string-append (assoc-ref inputs "gcc") "/bin/gcc") - "-o" "inputattach" "inputattach.c")) + "-O2" "-o" "inputattach" "inputattach.c")) #t)) (delete 'check) (replace 'install From 62b86d66fdfd045956a8fd15ba6733ebef054ebc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 18 Mar 2019 10:22:57 +0100 Subject: [PATCH 241/694] doc: Expound on inputattach service. * doc/guix.texi (Miscellaneous Services): Expound documentation of inputattach service. --- doc/guix.texi | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 601afeda06..63581bbe41 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -22506,19 +22506,31 @@ resolution when the graphical console window resizes. @cindex inputattach @subsubheading inputattach Service -@deftp {Data Type} inputattach-configuration -@table @asis -@item @code{device-type} The type of device to connect to. -@item @code{device} The device file to connect to the device. -@item @code{log-file} The file to log messages to. -@end table -@end deftp +@cindex tablet input, for Xorg +@cindex touchscreen input, for Xorg +The @uref{https://linuxwacom.github.io/, inputattach} service allows you to +use input devices such as Wacom tablets, touchscreens, or joysticks with the +Xorg display server. -@deffn {Scheme Procedure} inputattach-service-type -Return a service that runs inputattach on a device and +@deffn {Scheme Variable} inputattach-service-type +Type of a service that runs @command{inputattach} on a device and dispatches events from it. @end deffn +@deftp {Data Type} inputattach-configuration +@table @asis +@item @code{device-type} (default: @code{"wacom"}) +The type of device to connect to. Run @command{inputattach --help}, from the +@code{inputattach} package, to see the list of supported device types. + +@item @code{device} (default: @code{"/dev/ttyS0"}) +The device file to connect to the device. + +@item @code{log-file} (default: @code{#f}) +If true, this must be the name of a file to log messages to. +@end table +@end deftp + @subsection Dictionary Services @cindex dictionary The @code{(gnu services dict)} module provides the following service: From 38ffa53e2729cd74995a495c3cd4ea4c2f363d2c Mon Sep 17 00:00:00 2001 From: Lprndn Date: Thu, 24 Jan 2019 13:39:06 +0100 Subject: [PATCH 242/694] gnu: Add xarcan. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/arcan.scm (xarcan): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/arcan.scm | 71 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/gnu/packages/arcan.scm b/gnu/packages/arcan.scm index 0dfbf33901..0ea5191395 100644 --- a/gnu/packages/arcan.scm +++ b/gnu/packages/arcan.scm @@ -18,12 +18,14 @@ (define-module (gnu packages arcan) #:use-module (guix build-system cmake) + #:use-module (guix build-system gnu) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix utils) #:use-module (gnu packages apr) #:use-module (gnu packages audio) + #:use-module (gnu packages autotools) #:use-module (gnu packages compression) #:use-module (gnu packages databases) #:use-module (gnu packages fontutils) @@ -39,8 +41,10 @@ (define-module (gnu packages arcan) #:use-module (gnu packages ruby) #:use-module (gnu packages sdl) #:use-module (gnu packages sqlite) + #:use-module (gnu packages tls) #:use-module (gnu packages video) #:use-module (gnu packages xdisorg) + #:use-module (gnu packages xorg) #:use-module (srfi srfi-1)) (define-public arcan @@ -177,3 +181,70 @@ (define-public arcan-sdl "-DENABLE_LWA=on" "-DSTATIC_SQLITE3=off" "-DSTATIC_FREETYPE=off" "-DSHMIF_TUI_ACCEL=on"))))) (synopsis "Combined display server, multimedia framework and game engine (SDL)"))) + +(define-public xarcan + (let ((commit "8e6ee029388326cfe5cddeffe482eb3702e9b7f3") + (revision "1" )) + (package + (name "xarcan") + (version (git-version "0.5.4" revision commit)) + (source + (origin + (method git-fetch) + (file-name (git-file-name name version)) + (uri (git-reference + (url "https://github.com/letoram/xarcan.git") + (commit commit))) + (sha256 + (base32 "0zng7cs6733mnf0p6g5wv02981f2sf567n56csax6cmzb8fpamym")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + `("--enable-kdrive" "--enable-xarcan" + "--disable-xorg" "--disable-xwayland" + "--disable-xnest" "--disable-xvfb" + "--enable-glamor" "--enable-glx" + "--disable-int10-module" "--enable-ipv6" + "--enable-record" "--without-systemd-daemon" + "--enable-xcsecurity" "--disable-static" + ,(string-append "--with-xkb-path=" + (assoc-ref %build-inputs "xkeyboard-config") + "/share/X11/xkb") + ,(string-append "--with-xkb-bin-directory=" + (assoc-ref %build-inputs "xkbcomp") + "/bin") + ,(string-append "--with-xkb-output=" + "/tmp")) ; FIXME: Copied from xorg + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'noconfigure + (lambda _ + (setenv "NOCONFIGURE" "true") + #t))))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("util-macros" ,util-macros))) + (inputs + `(("arcan" ,arcan) + ("font-util" ,font-util) + ("libdrm" ,libdrm) + ("libepoxy" ,libepoxy) + ("libkbfile" ,libxkbfile) + ("libressl" ,libressl) + ("libx11" ,libx11) + ("libxfont2" ,libxfont2) + ("mesa" ,mesa) + ("pixman" ,pixman) + ("xkeyboard-config" ,xkeyboard-config) + ("xkbcomp" ,xkbcomp) + ("xorgproto" ,xorgproto) + ("xtrans" ,xtrans))) + (home-page "https://arcan-fe.com") + (synopsis "Patched Xserver that bridges connections to Arcan") + (description "Patched Xserver with a KDrive backend that uses the arcan-shmif + to map Xlib/Xcb/X clients to a running arcan instance. It allows running an X session +as a window under Arcan.") + (license license:expat)))) From b9c88c2292086e6cdb2fe96ea42099b2c9bc4835 Mon Sep 17 00:00:00 2001 From: Lprndn Date: Thu, 24 Jan 2019 13:41:30 +0100 Subject: [PATCH 243/694] gnu: Add arcan-wayland. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/arcan.scm (arcan-wayland): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/arcan.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/arcan.scm b/gnu/packages/arcan.scm index 0ea5191395..db472efec5 100644 --- a/gnu/packages/arcan.scm +++ b/gnu/packages/arcan.scm @@ -29,11 +29,13 @@ (define-module (gnu packages arcan) #:use-module (gnu packages compression) #:use-module (gnu packages databases) #:use-module (gnu packages fontutils) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages image) #:use-module (gnu packages libusb) + #:use-module (gnu packages linux) #:use-module (gnu packages lua) #:use-module (gnu packages ocr) #:use-module (gnu packages pcre) @@ -248,3 +250,35 @@ (define-public xarcan to map Xlib/Xcb/X clients to a running arcan instance. It allows running an X session as a window under Arcan.") (license license:expat)))) + +(define-public arcan-wayland + (package + (inherit arcan) + (name "arcan-wayland") + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("arcan" ,arcan) + ("libseccomp" ,libseccomp) + ("libxkbcommon" ,libxkbcommon) + ("mesa" ,mesa) + ("wayland" ,wayland) + ("wayland-protocols" ,wayland-protocols))) + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (add-before 'configure 'chdir + (lambda _ + (chdir "src/tools/waybridge") + #t)) + (add-after 'unpack 'fix-cmake-find-shmif + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/platform/cmake/modules/Findarcan_shmif.cmake" + (("/usr/local") (assoc-ref inputs "arcan"))) + #t))))) + (synopsis "Wayland protocol service for Arcan") + (description "Arcan-wayland (waybridge) bridges Wayland connections +with an Arcan connection point. It allows Wayland compatible clients +to connect and render using Arcan.") + (license license:bsd-3))) From 55154c5f40d0b2782f98f5e2431f3c845ed798cd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 13 Mar 2019 18:14:24 +0100 Subject: [PATCH 244/694] gnu: Add pbbam. * gnu/packages/bioinformatics.scm (pbbam): New variable. --- gnu/packages/bioinformatics.scm | 57 +++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 3364a357fb..43835cfb88 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -40,6 +40,7 @@ (define-module (gnu packages bioinformatics) #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) #:use-module (guix build-system haskell) + #:use-module (guix build-system meson) #:use-module (guix build-system ocaml) #:use-module (guix build-system perl) #:use-module (guix build-system python) @@ -477,6 +478,62 @@ (define-public bedtools-2.26 (base32 "0jhavwifnf7lmkb11h9y7dynr8d699h0rd2l52j1pfgircr2zwv5")))))) +(define-public pbbam + (package + (name "pbbam") + (version "0.23.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/PacificBiosciences/pbbam.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0h9gkrpf2lrxklxp72xfl5bi3h5zcm5hprrya9gf0hr3xwlbpp0x")))) + (build-system meson-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'find-googletest + (lambda* (#:key inputs #:allow-other-keys) + ;; It doesn't find gtest_main because there's no pkg-config file + ;; for it. Find it another way. + (substitute* "tests/meson.build" + (("pbbam_gtest_dep = dependency\\('gtest_main'.*") + (format #f "cpp = meson.get_compiler('cpp') +pbbam_gtest_dep = cpp.find_library('gtest_main', dirs : '~a')\n" + (assoc-ref inputs "googletest")))) + #t))) + ;; TODO: tests/pbbam_test cannot be linked + ;; ld: tests/59830eb@@pbbam_test@exe/src_test_Accuracy.cpp.o: + ;; undefined reference to symbol '_ZTIN7testing4TestE' + ;; ld: /gnu/store/...-googletest-1.8.0/lib/libgtest.so: + ;; error adding symbols: DSO missing from command line + #:tests? #f + #:configure-flags '("-Dtests=false"))) + ;; These libraries are listed as "Required" in the pkg-config file. + (propagated-inputs + `(("htslib" ,htslib) + ("zlib" ,zlib))) + (inputs + `(("boost" ,boost) + ("samtools" ,samtools))) + (native-inputs + `(("googletest" ,googletest) + ("pkg-config" ,pkg-config) + ("python" ,python-wrapper))) ; for tests + (home-page "https://github.com/PacificBiosciences/pbbam") + (synopsis "Work with PacBio BAM files") + (description + "The pbbam software package provides components to create, query, and +edit PacBio BAM files and associated indices. These components include a core +C++ library, bindings for additional languages, and command-line utilities. +This library is not intended to be used as a general-purpose BAM utility - all +input and output BAMs must adhere to the PacBio BAM format specification. +Non-PacBio BAMs will cause exceptions to be thrown.") + (license license:bsd-3))) + (define-public ribotaper (package (name "ribotaper") From 6a6cd48cf0784c46c5bb05668c2e423fdff5dca5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 18 Mar 2019 14:38:10 +0100 Subject: [PATCH 245/694] gnu: Add blasr-libcpp. * gnu/packages/bioinformatics.scm (blasr-libcpp): New variable. --- gnu/packages/bioinformatics.scm | 62 +++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 43835cfb88..da12a145c5 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -534,6 +534,68 @@ (define-public pbbam Non-PacBio BAMs will cause exceptions to be thrown.") (license license:bsd-3))) +(define-public blasr-libcpp + (package + (name "blasr-libcpp") + (version "5.3.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/PacificBiosciences/blasr_libcpp.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0cn5l42zyq67sj0g2imqkhayz2iqvv0a1pgpbmlq0qynjmsrbfd2")))) + (build-system meson-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'link-with-hdf5 + (lambda* (#:key inputs #:allow-other-keys) + (let ((hdf5 (assoc-ref inputs "hdf5"))) + (substitute* "meson.build" + (("libblasr_deps = \\[" m) + (string-append + m + (format #f "cpp.find_library('hdf5', dirs : '~a'), \ +cpp.find_library('hdf5_cpp', dirs : '~a'), " + hdf5 hdf5))))) + #t)) + (add-after 'unpack 'find-googletest + (lambda* (#:key inputs #:allow-other-keys) + ;; It doesn't find gtest_main because there's no pkg-config file + ;; for it. Find it another way. + (substitute* "unittest/meson.build" + (("libblasr_gtest_dep = dependency\\('gtest_main'.*") + (format #f "cpp = meson.get_compiler('cpp') +libblasr_gtest_dep = cpp.find_library('gtest_main', dirs : '~a')\n" + (assoc-ref inputs "googletest")))) + #t))) + ;; TODO: unittest/libblasr_unittest cannot be linked + ;; ld: ;; unittest/df08227@@libblasr_unittest@exe/alignment_utils_FileUtils_gtest.cpp.o: + ;; undefined reference to symbol + ;; '_ZN7testing8internal9DeathTest6CreateEPKcPKNS0_2REES3_iPPS1_' + ;; ld: /gnu/store/...-googletest-1.8.0/lib/libgtest.so: + ;; error adding symbols: DSO missing from command line + #:tests? #f + #:configure-flags '("-Dtests=false"))) + (inputs + `(("boost" ,boost) + ("hdf5" ,hdf5) + ("pbbam" ,pbbam) + ("zlib" ,zlib))) + (native-inputs + `(("googletest" ,googletest) + ("pkg-config" ,pkg-config))) + (home-page "https://github.com/PacificBiosciences/blasr_libcpp") + (synopsis "Library for analyzing PacBio genomic sequences") + (description + "This package provides three libraries used by applications for analyzing +PacBio genomic sequences. This library contains three sub-libraries: pbdata, +hdf and alignment.") + (license license:bsd-3))) + (define-public ribotaper (package (name "ribotaper") From f88bdc5ff91583f587d3b8a110e73f949bedb58e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 18 Mar 2019 14:38:19 +0100 Subject: [PATCH 246/694] gnu: Add blasr. * gnu/packages/bioinformatics.scm (blasr): New variable. --- gnu/packages/bioinformatics.scm | 45 +++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index da12a145c5..498ebc38b6 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -596,6 +596,51 @@ (define-public blasr-libcpp hdf and alignment.") (license license:bsd-3))) +(define-public blasr + (package + (name "blasr") + (version "5.3.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/PacificBiosciences/blasr.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1skgy2mvz8gsgfh1gc2nfgwvpyzb1hpmp2cf2773h5wsj8nw22kl")))) + (build-system meson-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'link-with-hdf5 + (lambda* (#:key inputs #:allow-other-keys) + (let ((hdf5 (assoc-ref inputs "hdf5"))) + (substitute* "meson.build" + (("blasr_deps = \\[" m) + (string-append + m + (format #f "cpp.find_library('hdf5', dirs : '~a'), \ +cpp.find_library('hdf5_cpp', dirs : '~a'), " + hdf5 hdf5))))) + #t))) + ;; Tests require "cram" executable, which is not packaged. + #:tests? #f + #:configure-flags '("-Dtests=false"))) + (inputs + `(("boost" ,boost) + ("blasr-libcpp" ,blasr-libcpp) + ("hdf5" ,hdf5) + ("pbbam" ,pbbam) + ("zlib" ,zlib))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (home-page "") + (synopsis "PacBio long read aligner") + (description + "Blasr is a genomic sequence aligner for processing PacBio long reads.") + (license license:bsd-3))) + (define-public ribotaper (package (name "ribotaper") From a8a60101aae017c76281dd8279d37fdff1b0bbcf Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Mar 2019 14:16:22 +0100 Subject: [PATCH 247/694] gnu: ghc-entropy: Update to 0.4.1.4. * gnu/packages/haskell-crypto.scm (ghc-entropy): Update to 0.4.1.4. --- gnu/packages/haskell-crypto.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/haskell-crypto.scm b/gnu/packages/haskell-crypto.scm index 88a3ea467b..f32842dee3 100644 --- a/gnu/packages/haskell-crypto.scm +++ b/gnu/packages/haskell-crypto.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2015, 2017, 2018, 2019 Ricardo Wurmus ;;; Copyright © 2016 Nils Gillmann ;;; Copyright © 2017 rsiddharth -;;; Copyright © 2017 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -357,7 +357,7 @@ (define-public ghc-digest (define-public ghc-entropy (package (name "ghc-entropy") - (version "0.4.1.1") + (version "0.4.1.4") (source (origin (method url-fetch) @@ -365,8 +365,7 @@ (define-public ghc-entropy "entropy-" version "/" "entropy-" version ".tar.gz")) (sha256 - (base32 - "1ahz5g148l6sax3dy505na2513i99c7bxix68jja5kbx4f271zcf")))) + (base32 "1fgf47l9klwn1xssbcbq6by651vikd8hlfxhiwd5bqzxr1jnlgrf")))) (build-system haskell-build-system) (home-page "https://github.com/TomMD/entropy") (synopsis "Provides platform independent entropy source for Haskell") From 1f795ab00e99635b252df2ae77e17e55fbcb5fc6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Mar 2019 14:22:45 +0100 Subject: [PATCH 248/694] gnu: ghc-x509: Update to 1.7.5. * gnu/packages/haskell-crypto.scm (ghc-x509): Update to 1.7.5. --- gnu/packages/haskell-crypto.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/haskell-crypto.scm b/gnu/packages/haskell-crypto.scm index f32842dee3..b9148baa5d 100644 --- a/gnu/packages/haskell-crypto.scm +++ b/gnu/packages/haskell-crypto.scm @@ -461,14 +461,14 @@ (define-public ghc-sha (define-public ghc-x509 (package (name "ghc-x509") - (version "1.7.3") + (version "1.7.5") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "x509/x509-" version ".tar.gz")) (sha256 (base32 - "0mkk29g32fs70bqkikg83v45h9jig9c8aail3mrdqwxpkfa0yx21")))) + "1j67c35g8334jx7x32hh6awhr43dplp0qwal5gnlkmx09axzrc5i")))) (build-system haskell-build-system) (inputs `(("ghc-memory" ,ghc-memory) From 25ed60054b8f2c458978914701315b4a17df355a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Mar 2019 14:25:55 +0100 Subject: [PATCH 249/694] gnu: ghc-x509-store: Update to 1.6.7. * gnu/packages/haskell-crypto.scm (ghc-x509-store): Update to 1.6.7. --- gnu/packages/haskell-crypto.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/haskell-crypto.scm b/gnu/packages/haskell-crypto.scm index b9148baa5d..5755c912a8 100644 --- a/gnu/packages/haskell-crypto.scm +++ b/gnu/packages/haskell-crypto.scm @@ -490,7 +490,7 @@ (define-public ghc-x509 (define-public ghc-x509-store (package (name "ghc-x509-store") - (version "1.6.6") + (version "1.6.7") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" @@ -498,7 +498,7 @@ (define-public ghc-x509-store version ".tar.gz")) (sha256 (base32 - "0dbndqmnmyixxc7308nyq3zlkhz9dff4rbcw2a49c77rbicny9va")))) + "1y8yyr1i95jkllg8k0z54k5v4vachp848clc07m33xpxidn3b1lp")))) (build-system haskell-build-system) (inputs `(("ghc-pem" ,ghc-pem) From 693bcfe2220c6bf87a9d179b1acce058ed7cde59 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Mar 2019 14:28:27 +0100 Subject: [PATCH 250/694] gnu: ghc-x509-validation: Update to 1.6.11. * gnu/packages/haskell-crypto.scm (ghc-x509-validation): Update to 1.6.11. --- gnu/packages/haskell-crypto.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/haskell-crypto.scm b/gnu/packages/haskell-crypto.scm index 5755c912a8..b5bbd147cf 100644 --- a/gnu/packages/haskell-crypto.scm +++ b/gnu/packages/haskell-crypto.scm @@ -519,7 +519,7 @@ (define-public ghc-x509-store (define-public ghc-x509-validation (package (name "ghc-x509-validation") - (version "1.6.10") + (version "1.6.11") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" @@ -527,7 +527,7 @@ (define-public ghc-x509-validation version ".tar.gz")) (sha256 (base32 - "1ms51scawldgyfcim5a2qlgyn3rnrclyh205d6djaa1569vrs73n")))) + "16yihzljql3z8w5rgdl95fv3hgk7yd86kbl9b3glllsark5j2hzr")))) (build-system haskell-build-system) (inputs `(("ghc-memory" ,ghc-memory) From ecad6abf264ceb92269ac1a2d19f96c182e6d18b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Mar 2019 14:30:25 +0100 Subject: [PATCH 251/694] gnu: ghc-base64-bytestring: Update to 1.0.0.2. * gnu/packages/haskell.scm (ghc-base64-bytestring): Update to 1.0.0.2. --- gnu/packages/haskell.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index cd0fdd22fc..2b8525d923 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -3974,7 +3974,7 @@ (define-public ghc-uniplate (define-public ghc-base64-bytestring (package (name "ghc-base64-bytestring") - (version "1.0.0.1") + (version "1.0.0.2") (source (origin (method url-fetch) @@ -3983,8 +3983,7 @@ (define-public ghc-base64-bytestring version ".tar.gz")) (sha256 - (base32 - "0l1v4ddjdsgi9nqzyzcxxj76rwar3lzx8gmwf2r54bqan3san9db")))) + (base32 "13305brzlac24pifiqd5a2z10c6k6amhpdy9cc0z5ryrkgnm8dhr")))) (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: testing libraries are missing. (home-page "https://github.com/bos/base64-bytestring") From 47956fa0c24efcdcba3493f0231c30e9a39ec7df Mon Sep 17 00:00:00 2001 From: ng0 Date: Thu, 14 Mar 2019 09:33:38 +0000 Subject: [PATCH 252/694] Correct name and email address for ng0. * .mailmap, Makefile.am, doc/guix.de.texi, doc/guix.fr.texi, doc/guix.texi, etc/completion/fish/guix.fish, gnu/packages/accessibility.scm, gnu/packages/admin.scm, gnu/packages/audio.scm, gnu/packages/autotools.scm, gnu/packages/cdrom.scm, gnu/packages/check.scm, gnu/packages/cinnamon.scm, gnu/packages/compression.scm, gnu/packages/crypto.scm, gnu/packages/databases.scm, gnu/packages/django.scm, gnu/packages/dns.scm, gnu/packages/elixir.scm, gnu/packages/emacs-xyz.scm, gnu/packages/emacs.scm, gnu/packages/enlightenment.scm, gnu/packages/erlang.scm, gnu/packages/fonts.scm, gnu/packages/fontutils.scm, gnu/packages/forth.scm, gnu/packages/fvwm.scm, gnu/packages/games.scm, gnu/packages/gl.scm, gnu/packages/gnome.scm, gnu/packages/gnunet.scm, gnu/packages/gnupg.scm, gnu/packages/gnuzilla.scm, gnu/packages/gtk.scm, gnu/packages/guile-wm.scm,gnu/packages/guile-xyz.scm, gnu/packages/haskell-check.scm, gnu/packages/haskell-crypto.scm, gnu/packages/haskell.scm, gnu/packages/image-viewers.scm, gnu/packages/image.scm, gnu/packages/irc.scm, gnu/packages/language.scm, gnu/packages/libcanberra.scm, gnu/packages/linux.scm, gnu/packages/lisp.scm, gnu/packages/lolcode.scm, gnu/packages/lxde.scm, gnu/packages/lxqt.scm, gnu/packages/mail.scm, gnu/packages/markup.scm, gnu/packages/mate.scm, gnu/packages/maths.scm, gnu/packages/mc.scm, gnu/packages/messaging.scm, gnu/packages/music.scm, gnu/packages/ncurses.scm, gnu/packages/networking.scm, gnu/packages/nickle.scm, gnu/packages/openbox.scm, gnu/packages/pdf.scm, gnu/packages/perl-check.scm, gnu/packages/perl.scm, gnu/packages/python-compression.scm, gnu/packages/python-crypto.scm, gnu/packages/python-web.scm, gnu/packages/python-xyz.scm, gnu/packages/python.scm, gnu/packages/qt.scm, gnu/packages/ruby.scm, gnu/packages/rust.scm, gnu/packages/scheme.scm, gnu/packages/serialization.scm, gnu/packages/shells.scm, gnu/packages/ssh.scm, gnu/packages/suckless.scm, gnu/packages/tbb.scm, gnu/packages/telephony.scm, gnu/packages/text-editors.scm, gnu/packages/textutils.scm, gnu/packages/time.scm, gnu/packages/tls.scm, gnu/packages/tor.scm, gnu/packages/version-control.scm, gnu/packages/video.scm, gnu/packages/vim.scm, gnu/packages/web.scm, gnu/packages/wm.scm, gnu/packages/xdisorg.scm, gnu/packages/xfce.scm, gnu/packages/xml.scm, gnu/packages/xorg.scm, gnu/services/certbot.scm, gnu/services/desktop.scm, gnu/services/version-control.scm, gnu/services/web.scm, guix/import/hackage.scm, guix/licenses.scm: Correct name and email address for ng0. Signed-off-by: Tobias Geerinckx-Rice --- .mailmap | 28 ++++++++++++++-------------- Makefile.am | 2 +- doc/guix.de.texi | 2 +- doc/guix.fr.texi | 2 +- doc/guix.texi | 2 +- etc/completion/fish/guix.fish | 2 +- gnu/packages/accessibility.scm | 2 +- gnu/packages/admin.scm | 2 +- gnu/packages/audio.scm | 2 +- gnu/packages/autotools.scm | 2 +- gnu/packages/cdrom.scm | 2 +- gnu/packages/check.scm | 2 +- gnu/packages/cinnamon.scm | 2 +- gnu/packages/compression.scm | 2 +- gnu/packages/crypto.scm | 2 +- gnu/packages/databases.scm | 2 +- gnu/packages/django.scm | 2 +- gnu/packages/dns.scm | 2 +- gnu/packages/elixir.scm | 2 +- gnu/packages/emacs-xyz.scm | 2 +- gnu/packages/emacs.scm | 2 +- gnu/packages/enlightenment.scm | 2 +- gnu/packages/erlang.scm | 2 +- gnu/packages/fonts.scm | 2 +- gnu/packages/fontutils.scm | 2 +- gnu/packages/forth.scm | 2 +- gnu/packages/fvwm.scm | 2 +- gnu/packages/games.scm | 2 +- gnu/packages/gl.scm | 2 +- gnu/packages/gnome.scm | 2 +- gnu/packages/gnunet.scm | 2 +- gnu/packages/gnupg.scm | 2 +- gnu/packages/gnuzilla.scm | 2 +- gnu/packages/gtk.scm | 2 +- gnu/packages/guile-wm.scm | 2 +- gnu/packages/guile-xyz.scm | 2 +- gnu/packages/haskell-check.scm | 2 +- gnu/packages/haskell-crypto.scm | 2 +- gnu/packages/haskell.scm | 2 +- gnu/packages/image-viewers.scm | 2 +- gnu/packages/image.scm | 2 +- gnu/packages/irc.scm | 2 +- gnu/packages/language.scm | 2 +- gnu/packages/libcanberra.scm | 2 +- gnu/packages/linux.scm | 2 +- gnu/packages/lisp.scm | 2 +- gnu/packages/lolcode.scm | 2 +- gnu/packages/lxde.scm | 2 +- gnu/packages/lxqt.scm | 2 +- gnu/packages/mail.scm | 2 +- gnu/packages/markup.scm | 2 +- gnu/packages/mate.scm | 2 +- gnu/packages/maths.scm | 2 +- gnu/packages/mc.scm | 2 +- gnu/packages/messaging.scm | 2 +- gnu/packages/music.scm | 2 +- gnu/packages/ncurses.scm | 2 +- gnu/packages/networking.scm | 2 +- gnu/packages/nickle.scm | 2 +- gnu/packages/openbox.scm | 2 +- gnu/packages/pdf.scm | 2 +- gnu/packages/perl-check.scm | 2 +- gnu/packages/perl.scm | 2 +- gnu/packages/python-compression.scm | 2 +- gnu/packages/python-crypto.scm | 2 +- gnu/packages/python-web.scm | 2 +- gnu/packages/python-xyz.scm | 2 +- gnu/packages/python.scm | 2 +- gnu/packages/qt.scm | 2 +- gnu/packages/ruby.scm | 2 +- gnu/packages/rust.scm | 2 +- gnu/packages/scheme.scm | 2 +- gnu/packages/serialization.scm | 2 +- gnu/packages/shells.scm | 2 +- gnu/packages/ssh.scm | 2 +- gnu/packages/suckless.scm | 2 +- gnu/packages/tbb.scm | 2 +- gnu/packages/telephony.scm | 2 +- gnu/packages/text-editors.scm | 2 +- gnu/packages/textutils.scm | 2 +- gnu/packages/time.scm | 2 +- gnu/packages/tls.scm | 2 +- gnu/packages/tor.scm | 2 +- gnu/packages/version-control.scm | 2 +- gnu/packages/video.scm | 2 +- gnu/packages/vim.scm | 2 +- gnu/packages/web.scm | 2 +- gnu/packages/wm.scm | 2 +- gnu/packages/xdisorg.scm | 2 +- gnu/packages/xfce.scm | 2 +- gnu/packages/xml.scm | 2 +- gnu/packages/xorg.scm | 2 +- gnu/services/certbot.scm | 2 +- gnu/services/desktop.scm | 2 +- gnu/services/version-control.scm | 2 +- gnu/services/web.scm | 2 +- guix/import/hackage.scm | 2 +- guix/licenses.scm | 2 +- 98 files changed, 111 insertions(+), 111 deletions(-) diff --git a/.mailmap b/.mailmap index 981decdeef..7de5313923 100644 --- a/.mailmap +++ b/.mailmap @@ -43,20 +43,20 @@ Mathieu Lirzin Mathieu Othacehe Mathieu Othacehe Nikita Karetnikov -Nils Gillmann ng0 -Nils Gillmann Nils Gillmann -Nils Gillmann ng0 -Nils Gillmann ng0 -Nils Gillmann -Nils Gillmann -Nils Gillmann -Nils Gillmann -Nils Gillmann -Nils Gillmann -Nils Gillmann -Nils Gillmann -Nils Gillmann -Nils Gillmann +ng0 Nils Gillmann +ng0 Nils Gillmann +ng0 ng0 +ng0 ng0 +ng0 +ng0 +ng0 +ng0 +ng0 +ng0 +ng0 +ng0 +ng0 +ng0 Pierre Neidhardt Pierre-Antoine Rouby Pjotr Prins diff --git a/Makefile.am b/Makefile.am index e7109ec69c..50839fcb27 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,7 +9,7 @@ # Copyright © 2017 Ricardo Wurmus # Copyright © 2017 Jan Nieuwenhuizen # Copyright © 2017 Arun Isaac -# Copyright © 2018 Nils Gillmann +# Copyright © 2018 ng0 # Copyright © 2018 Julien Lepiller # Copyright © 2018 Oleg Pykhalov # Copyright © 2018 Alex Vong diff --git a/doc/guix.de.texi b/doc/guix.de.texi index 3f02c850e7..83dae0d3ec 100644 --- a/doc/guix.de.texi +++ b/doc/guix.de.texi @@ -34,7 +34,7 @@ Leo Famulari@* Copyright @copyright{} 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus@* Copyright @copyright{} 2016 Ben Woodcroft@* Copyright @copyright{} 2016, 2017, 2018 Chris Marusich@* Copyright @copyright{} 2016, 2017, 2018 Efraim Flashner@* Copyright @copyright{} 2016 John Darrington@* Copyright -@copyright{} 2016, 2017 Nils Gillmann@* Copyright @copyright{} 2016, 2017, +@copyright{} 2016, 2017 ng0@* Copyright @copyright{} 2016, 2017, 2018, 2019 Jan Nieuwenhuizen@* Copyright @copyright{} 2016 Julien Lepiller@* Copyright @copyright{} 2016 Alex ter Weele@* Copyright @copyright{} 2016, 2017, 2018, 2019 Christopher Baines@* Copyright @copyright{} 2017, 2018 diff --git a/doc/guix.fr.texi b/doc/guix.fr.texi index 4ef3c1a0ff..541fd6f0d0 100644 --- a/doc/guix.fr.texi +++ b/doc/guix.fr.texi @@ -34,7 +34,7 @@ Leo Famulari@* Copyright @copyright{} 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus@* Copyright @copyright{} 2016 Ben Woodcroft@* Copyright @copyright{} 2016, 2017, 2018 Chris Marusich@* Copyright @copyright{} 2016, 2017, 2018 Efraim Flashner@* Copyright @copyright{} 2016 John Darrington@* Copyright -@copyright{} 2016, 2017 Nils Gillmann@* Copyright @copyright{} 2016, 2017, +@copyright{} 2016, 2017 ng0@* Copyright @copyright{} 2016, 2017, 2018, 2019 Jan Nieuwenhuizen@* Copyright @copyright{} 2016 Julien Lepiller@* Copyright @copyright{} 2016 Alex ter Weele@* Copyright @copyright{} 2016, 2017, 2018, 2019 Christopher Baines@* Copyright @copyright{} 2017, 2018 diff --git a/doc/guix.texi b/doc/guix.texi index 63581bbe41..326607e7e9 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -30,7 +30,7 @@ Copyright @copyright{} 2016 Ben Woodcroft@* Copyright @copyright{} 2016, 2017, 2018 Chris Marusich@* Copyright @copyright{} 2016, 2017, 2018 Efraim Flashner@* Copyright @copyright{} 2016 John Darrington@* -Copyright @copyright{} 2016, 2017 Nils Gillmann@* +Copyright @copyright{} 2016, 2017 ng0@* Copyright @copyright{} 2016, 2017, 2018, 2019 Jan Nieuwenhuizen@* Copyright @copyright{} 2016 Julien Lepiller@* Copyright @copyright{} 2016 Alex ter Weele@* diff --git a/etc/completion/fish/guix.fish b/etc/completion/fish/guix.fish index d5b28cdc2b..525d39679d 100644 --- a/etc/completion/fish/guix.fish +++ b/etc/completion/fish/guix.fish @@ -1,6 +1,6 @@ # # GNU Guix --- Functional package management for GNU -# Copyright © 2017, 2018 Nils Gillmann +# Copyright © 2017, 2018 ng0 # # This file is part of GNU Guix. # diff --git a/gnu/packages/accessibility.scm b/gnu/packages/accessibility.scm index 35c8c8f19b..431e5924c9 100644 --- a/gnu/packages/accessibility.scm +++ b/gnu/packages/accessibility.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017 Nils Gillmann +;;; Copyright © 2017 ng0 ;;; Copyright © 2017 Stefan Reichör ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2019 Andrew Miloradovsky diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index f433d3f40d..9ed2e32324 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2016 Peter Feigl ;;; Copyright © 2016 John J. Foerch -;;; Copyright © 2016, 2017 Nils Gillmann +;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2016 John Darrington ;;; Copyright © 2017 Ben Sturmfels diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 03d41770c2..a38e77c996 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2015, 2016 Mark H Weaver ;;; Copyright © 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2016, 2017 Alex Griffin -;;; Copyright © 2016 Nils Gillmann +;;; Copyright © 2016 ng0 ;;; Copyright © 2016 Lukas Gradl ;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Oleg Pykhalov diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm index 4edfb5725e..ceb70dfee7 100644 --- a/gnu/packages/autotools.scm +++ b/gnu/packages/autotools.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2014 Manolis Fragkiskos Ragkousis ;;; Copyright © 2015, 2017, 2018 Mark H Weaver ;;; Copyright © 2016 David Thompson -;;; Copyright © 2017 Nils Gillmann +;;; Copyright © 2017 ng0 ;;; Copyright © 2017, 2019 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Ricardo Wurmus diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index cdbe25fe44..50bf3abcb9 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2017 John Darrington ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice -;;; Copyright © 2017 Nils Gillmann +;;; Copyright © 2017 ng0 ;;; Copyright © 2018 Oleg Pykhalov ;;; Copyright © 2018, 2019 Ricardo Wurmus ;;; Copyright © 2019 Eric Bavier diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 649d6d2f13..4229578f86 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -23,7 +23,7 @@ ;;; Copyright © 2017 Frederick M. Muriithi ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2017, 2019 Kei Kebreau -;;; Copyright © 2017 Nils Gillmann +;;; Copyright © 2017 ng0 ;;; Copyright © 2015, 2017, 2018 Ricardo Wurmus ;;; Copyright © 2016, 2017, 2018 Marius Bakke ;;; Copyright © 2017, 2018 Ludovic Courtès diff --git a/gnu/packages/cinnamon.scm b/gnu/packages/cinnamon.scm index 7cac863f92..72403e1b11 100644 --- a/gnu/packages/cinnamon.scm +++ b/gnu/packages/cinnamon.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017 Nils Gillmann +;;; Copyright © 2017 ng0 ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 23a8f997f0..e3c23126b0 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -14,7 +14,7 @@ ;;; Copyright © 2016 David Craven ;;; Copyright © 2016, 2019 Kei Kebreau ;;; Copyright © 2016, 2018 Marius Bakke -;;; Copyright © 2017 Nils Gillmann +;;; Copyright © 2017 ng0 ;;; Copyright © 2017 Manolis Fragkiskos Ragkousis ;;; Copyright © 2017 Theodoros Foradis ;;; Copyright © 2017 Stefan Reichör diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index e0d4f27874..d6f8e22eab 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2016, 2017, 2018, 2019 Leo Famulari ;;; Copyright © 2016 Lukas Gradl ;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice -;;; Copyright © 2016, 2017 Nils Gillmann +;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2016, 2017, 2019 Eric Bavier ;;; Copyright © 2017 Pierre Langlois ;;; Copyright © 2018 Efraim Flashner diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 921304ef2a..912b8d77c5 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2016 Hartmut Goebel ;;; Copyright © 2016 Christopher Allan Webber ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner -;;; Copyright © 2016, 2017 Nils Gillmann +;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2016, 2017, 2018 Roel Janssen ;;; Copyright © 2016 David Craven ;;; Copyright © 2016 Jan Nieuwenhuizen diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index 734755c609..8fd29d533a 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Hartmut Goebel ;;; Copyright © 2016 Efraim Flashner -;;; Copyright © 2017 Nils Gillmann +;;; Copyright © 2017 ng0 ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2018 Vijayalakshmi Vedantham diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index f1bcbc1b4d..f8b60e34c5 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2016 Ricardo Wurmus ;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2016 John Darrington -;;; Copyright © 2016 Nils Gillmann +;;; Copyright © 2016 ng0 ;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2016 Marius Bakke ;;; Copyright © 2017 Vasile Dumitrascu diff --git a/gnu/packages/elixir.scm b/gnu/packages/elixir.scm index e154a2b2c1..29c7ee966f 100644 --- a/gnu/packages/elixir.scm +++ b/gnu/packages/elixir.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2016 Ricardo Wurmus ;;; Copyright © 2017 nee ;;; Copyright © 2018 Tobias Geerinckx-Rice -;;; Copyright © 2018 Nils Gillmann +;;; Copyright © 2018 ng0 ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 8d5ee6c5fb..28b24d467d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2016 David Thompson ;;; Copyright © 2016 Matthew Jordan ;;; Copyright © 2016, 2017 Roel Janssen -;;; Copyright © 2016, 2017 Nils Gillmann +;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2016 Alex Griffin ;;; Copyright © 2016, 2017, 2018, 2019 Nicolas Goaziou ;;; Copyright © 2016, 2017, 2018 Alex Vong diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 74005972db..e00931c504 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2016, 2018 Arun Isaac ;;; Copyright © 2016 Federico Beffa ;;; Copyright © 2016 David Thompson -;;; Copyright © 2016 Nils Gillmann +;;; Copyright © 2016 ng0 ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2017 Maxim Cournoyer ;;; Copyright © 2017 Alex Vong diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index c3aa469776..d2853e62d6 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2015 Tomáš Čech ;;; Copyright © 2015 Daniel Pimentel ;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner -;;; Copyright © 2017 Nils Gillmann +;;; Copyright © 2017 ng0 ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Timo Eisenmann ;;; diff --git a/gnu/packages/erlang.scm b/gnu/packages/erlang.scm index 45206f71a0..9c38b53581 100644 --- a/gnu/packages/erlang.scm +++ b/gnu/packages/erlang.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2016, 2017 Leo Famulari ;;; Copyright © 2016, 2017 Pjotr Prins ;;; Copyright © 2018 Tobias Geerinckx-Rice -;;; Copyright © 2018 Nils Gillmann +;;; Copyright © 2018 ng0 ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 62f076a772..6988443e94 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2015 Eric Dvorsak ;;; Copyright © 2015, 2017 Ricardo Wurmus ;;; Copyright © 2015, 2016 Leo Famulari -;;; Copyright © 2016, 2017, 2018 Nils Gillmann +;;; Copyright © 2016, 2017, 2018 ng0 ;;; Copyright © 2016 Jookia <166291@gmail.com> ;;; Copyright © 2016 Eric Bavier ;;; Copyright © 2016 Dmitry Nikolaev diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 274efe5fd8..8f8a300644 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2017 Rene Saavedra ;;; Copyright © 2017 Leo Famulari -;;; Copyright © 2017 Nils Gillmann +;;; Copyright © 2017 ng0 ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2018 Ludovic Courtès diff --git a/gnu/packages/forth.scm b/gnu/packages/forth.scm index 5efc668b78..6902a4a4a3 100644 --- a/gnu/packages/forth.scm +++ b/gnu/packages/forth.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016 Nils Gillmann +;;; Copyright © 2016 ng0 ;;; Copyright © 2016 Sou Bunnbu ;;; ;;; This file is part of GNU Guix. diff --git a/gnu/packages/fvwm.scm b/gnu/packages/fvwm.scm index 386edba591..ad0720a60c 100644 --- a/gnu/packages/fvwm.scm +++ b/gnu/packages/fvwm.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Sou Bunnbu ;;; Copyright © 2016 Efraim Flashner -;;; Copyright © 2017 Nils Gillmann +;;; Copyright © 2017 ng0 ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 74fc452e32..b9deda7bf9 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2015, 2016, 2017 Alex Kost ;;; Copyright © 2015 Paul van der Walt ;;; Copyright © 2016, 2017 Rodger Fox -;;; Copyright © 2016, 2017, 2018 Nils Gillmann +;;; Copyright © 2016, 2017, 2018 ng0 ;;; Copyright © 2016 Albin Söderqvist ;;; Copyright © 2016, 2017, 2018 Kei Kebreau ;;; Copyright © 2016 Alex Griffin diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 08ba3c8b8c..743932fd07 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2013 Joshua Grant ;;; Copyright © 2014, 2016 David Thompson ;;; Copyright © 2014, 2015, 2016, 2017 Mark H Weaver -;;; Copyright © 2016 Nils Gillmann +;;; Copyright © 2016 ng0 ;;; Copyright © 2016, 2017, 2018 Ricardo Wurmus ;;; Copyright © 2016 David Thompson ;;; Copyright © 2017, 2018 Efraim Flashner diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f407f567b9..060379aba9 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -19,7 +19,7 @@ ;;; Copyright © 2016 Roel Janssen ;;; Copyright © 2016, 2018 Leo Famulari ;;; Copyright © 2016 Alex Griffin -;;; Copyright © 2016, 2017 Nils Gillmann +;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2016 David Craven ;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2017 Thomas Danckaert diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index 461180161e..93c905406f 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2015, 2017, 2019 Efraim Flashner ;;; Copyright © 2016 Ricardo Wurmus ;;; Copyright © 2016 Mark H Weaver -;;; Copyright © 2016, 2017, 2018 Nils Gillmann +;;; Copyright © 2016, 2017, 2018 ng0 ;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Alex Vong ;;; diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index c5c99bfeb6..fcec2f065d 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2015, 2016, 2017, 2019 Ricardo Wurmus ;;; Copyright © 2016 Christopher Allan Webber -;;; Copyright © 2016, 2017 Nils Gillmann +;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2016 Christopher Baines ;;; Copyright © 2016 Mike Gerwitz ;;; Copyright © 2016 Troy Sankey diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index e11c0eb576..785d5c1342 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2016 Alex Griffin ;;; Copyright © 2017 Clément Lassieur -;;; Copyright © 2017 Nils Gillmann +;;; Copyright © 2017 ng0 ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2019 Ivan Petkov diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index fb5c178d53..1ac90216ef 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2016 Fabian Harfert ;;; Copyright © 2016 Kei Kebreau ;;; Copyright © 2016 Patrick Hetu -;;; Copyright © 2016 Nils Gillmann +;;; Copyright © 2016 ng0 ;;; Copyright © 2017 Roel Janssen ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2017 Marius Bakke diff --git a/gnu/packages/guile-wm.scm b/gnu/packages/guile-wm.scm index 3755282403..7b1731171a 100644 --- a/gnu/packages/guile-wm.scm +++ b/gnu/packages/guile-wm.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2013, 2014 Ludovic Courtès ;;; Copyright © 2016 Alex ter Weele ;;; Copyright © 2017 Ricardo Wurmus -;;; Copyright © 2017 Nils Gillmann +;;; Copyright © 2017 ng0 ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index a64a54323a..d4f019c814 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -14,7 +14,7 @@ ;;; Copyright © 2017 David Thompson ;;; Copyright © 2017, 2018 Mathieu Othacehe ;;; Copyright © 2017 Theodoros Foradis -;;; Copyright © 2017 Nils Gillmann +;;; Copyright © 2017 ng0 ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Maxim Cournoyer ;;; Copyright © 2018 Arun Isaac diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index 0d4501df86..19eb40eaa4 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2015 Eric Bavier ;;; Copyright © 2015 Federico Beffa ;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus -;;; Copyright © 2016 Nils Gillmann +;;; Copyright © 2016 ng0 ;;; Copyright © 2016 David Craven ;;; Copyright © 2017 Danny Milosavljevic ;;; Copyright © 2017 rsiddharth diff --git a/gnu/packages/haskell-crypto.scm b/gnu/packages/haskell-crypto.scm index b5bbd147cf..8f216a379d 100644 --- a/gnu/packages/haskell-crypto.scm +++ b/gnu/packages/haskell-crypto.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Paul van der Walt ;;; Copyright © 2015, 2017, 2018, 2019 Ricardo Wurmus -;;; Copyright © 2016 Nils Gillmann +;;; Copyright © 2016 ng0 ;;; Copyright © 2017 rsiddharth ;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice ;;; diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 2b8525d923..2a5ba2a706 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2015 Paul van der Walt ;;; Copyright © 2015 Eric Bavier ;;; Copyright © 2016, 2018, 2019 Ludovic Courtès -;;; Copyright © 2016, 2017 Nils Gillmann +;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus ;;; Copyright © 2016, 2017 David Craven diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index d388562924..82b44a4900 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2015, 2016 Alex Kost ;;; Copyright © 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2017 Alex Griffin -;;; Copyright © 2017 Nils Gillmann +;;; Copyright © 2017 ng0 ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2017 nee ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 941b991695..b52b6025ae 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2016 Eric Bavier ;;; Copyright © 2016, 2017 Arun Isaac ;;; Copyright © 2016, 2017 Kei Kebreau -;;; Copyright © 2017 Nils Gillmann +;;; Copyright © 2017 ng0 ;;; Copyright © 2017 Hartmut Goebel ;;; Copyright © 2017 Julien Lepiller ;;; Copyright © 2018 Joshua Sierles, Nextjournal diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index e6f23d14d7..d3b3a51294 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2014 Kevin Lemonnier ;;; Copyright © 2015, 2017 Ludovic Courtès ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner -;;; Copyright © 2016 Nils Gillmann +;;; Copyright © 2016 ng0 ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index 110f07a476..46b60b7055 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015, 2016 Eric Bavier ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice -;;; Copyright © 2018 Nils Gillmann +;;; Copyright © 2018 ng0 ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/packages/libcanberra.scm b/gnu/packages/libcanberra.scm index 0032d9a85f..121ba11f89 100644 --- a/gnu/packages/libcanberra.scm +++ b/gnu/packages/libcanberra.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2013 Andreas Enge ;;; Copyright © 2014, 2015, 2019 Ludovic Courtès ;;; Copyright © 2016 Fabian Harfert -;;; Copyright © 2017, 2018 Nils Gillmann +;;; Copyright © 2017, 2018 ng0 ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e9d8ea45c1..34af81b469 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -18,7 +18,7 @@ ;;; Copyright © 2016, 2017, 2018 Marius Bakke ;;; Copyright © 2016, 2018 Rene Saavedra ;;; Copyright © 2016 Carlos Sánchez de La Lama -;;; Copyright © 2016, 2017 Nils Gillmann +;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2017, 2018 Leo Famulari ;;; Copyright © 2017 José Miguel Sánchez García ;;; Copyright © 2017 Gábor Boskovits diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 3d43b7c509..87dcf36372 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2016 Federico Beffa -;;; Copyright © 2016, 2017 Nils Gillmann +;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2016, 2017 Andy Patterson ;;; Copyright © 2017, 2019 Ricardo Wurmus ;;; Copyright © 2017, 2018 Efraim Flashner diff --git a/gnu/packages/lolcode.scm b/gnu/packages/lolcode.scm index f7e2da380c..e55a36c509 100644 --- a/gnu/packages/lolcode.scm +++ b/gnu/packages/lolcode.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016 Nils Gillmann +;;; Copyright © 2016 ng0 ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index ea099b0f3b..d91e62359b 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Mathieu Lirzin ;;; Copyright © 2016 Efraim Flashner -;;; Copyright © 2017 Nils Gillmann +;;; Copyright © 2017 ng0 ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2017 Brendan Tildesley ;;; Copyright © 2018 Tobias Geerinckx-Rice diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 4c00b2a611..d91efe715d 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2015 Sou Bunnbu ;;; Copyright © 2016 Mark H Weaver ;;; Copyright © 2016 Efraim Flashner -;;; Copyright © 2017 Nils Gillmann +;;; Copyright © 2017 ng0 ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2019 Meiyo Peng ;;; Copyright © 2018 Ricardo Wurmus diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 89c183dbd7..bb44ea1a53 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2016 Lukas Gradl ;;; Copyright © 2016 Alex Kost ;;; Copyright © 2016, 2017 Troy Sankey -;;; Copyright © 2016, 2017, 2018 Nils Gillmann +;;; Copyright © 2016, 2017, 2018 ng0 ;;; Copyright © 2016 Clément Lassieur ;;; Copyright © 2016, 2017, 2018, 2019 Arun Isaac ;;; Copyright © 2016 John Darrington diff --git a/gnu/packages/markup.scm b/gnu/packages/markup.scm index 67f2bf2881..2b1e2ef63c 100644 --- a/gnu/packages/markup.scm +++ b/gnu/packages/markup.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2015 Mathieu Lirzin ;;; Copyright © 2015 David Thompson ;;; Copyright © 2016 Efraim Flashner -;;; Copyright © 2017 Nils Gillmann +;;; Copyright © 2017 ng0 ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index ef94491622..16e9148506 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Fabian Harfert ;;; Copyright © 2016, 2017 Efraim Flashner -;;; Copyright © 2017 Nils Gillmann +;;; Copyright © 2017 ng0 ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 33c1416c75..af2c141ee5 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -16,7 +16,7 @@ ;;; Copyright © 2016 Leo Famulari ;;; Copyright © 2016, 2017 Thomas Danckaert ;;; Copyright © 2017, 2018 Paul Garlick -;;; Copyright © 2017 Nils Gillmann +;;; Copyright © 2017 ng0 ;;; Copyright © 2017 Ben Woodcroft ;;; Copyright © 2017 Theodoros Foradis ;;; Copyright © 2017, 2019 Arun Isaac diff --git a/gnu/packages/mc.scm b/gnu/packages/mc.scm index ecac5412e4..3d6185ca78 100644 --- a/gnu/packages/mc.scm +++ b/gnu/packages/mc.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 Eric Bavier ;;; Copyright © 2016 Efraim Flashner -;;; Copyright © 2016, 2017 Nils Gillmann +;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 73519d7702..c27c465957 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2015 Andreas Enge ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus ;;; Copyright © 2015, 2018 Efraim Flashner -;;; Copyright © 2016, 2017 Nils Gillmann +;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2016 Andy Patterson ;;; Copyright © 2016, 2017, 2018, 2019 Clément Lassieur ;;; Copyright © 2017 Mekeor Melire diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 54c7798472..c98f050caf 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2016, 2017 Kei Kebreau ;;; Copyright © 2016 John J. Foerch ;;; Copyright © 2016 Alex Griffin -;;; Copyright © 2017 Nils Gillmann +;;; Copyright © 2017 ng0 ;;; Copyright © 2017 Rodger Fox ;;; Copyright © 2017, 2018, 2019 Nicolas Goaziou ;;; Copyright © 2017, 2018 Pierre Langlois diff --git a/gnu/packages/ncurses.scm b/gnu/packages/ncurses.scm index ae3fb887e8..9b5498688b 100644 --- a/gnu/packages/ncurses.scm +++ b/gnu/packages/ncurses.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2012, 2013, 2014, 2015, 2017, 2018 Ludovic Courtès ;;; Copyright © 2014, 2016 Mark H Weaver ;;; Copyright © 2015, 2017 Leo Famulari -;;; Copyright © 2016 Nils Gillmann +;;; Copyright © 2016 ng0 ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2017 Marius Bakke diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index eeabc3d93d..ecfd373365 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2016 John Darrington ;;; Copyright © 2016, 2017, 2018, 2019 Nicolas Goaziou ;;; Copyright © 2016 Eric Bavier -;;; Copyright © 2016, 2017 Nils Gillmann +;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2016, 2017, 2018 Arun Isaac ;;; Copyright © 2016 Benz Schenk ;;; Copyright © 2016, 2017 Pjotr Prins diff --git a/gnu/packages/nickle.scm b/gnu/packages/nickle.scm index c8179419bb..9cc38867b6 100644 --- a/gnu/packages/nickle.scm +++ b/gnu/packages/nickle.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016 Nils Gillmann +;;; Copyright © 2016 ng0 ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. diff --git a/gnu/packages/openbox.scm b/gnu/packages/openbox.scm index 1643b7502b..ceca6e53e0 100644 --- a/gnu/packages/openbox.scm +++ b/gnu/packages/openbox.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 Julien Lepiller ;;; Copyright © 2016 Efraim Flashner -;;; Copyright © 2017 Nils Gillmann +;;; Copyright © 2017 ng0 ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 29f2381e6d..ff26bed64f 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2014, 2015, 2016, 2018, 2019 Ricardo Wurmus ;;; Copyright © 2015 Paul van der Walt ;;; Copyright © 2016 Roel Janssen -;;; Copyright © 2016 Nils Gillmann +;;; Copyright © 2016 ng0 ;;; Copyright © 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2016, 2017 Marius Bakke ;;; Copyright © 2016, 2017 Ludovic Courtès diff --git a/gnu/packages/perl-check.scm b/gnu/packages/perl-check.scm index 3b9640583a..aae83e5771 100644 --- a/gnu/packages/perl-check.scm +++ b/gnu/packages/perl-check.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2016 Danny Milosavljevic ;;; Copyright © 2016 Ben Woodcroft ;;; Copyright © 2016 Ricardo Wurmus -;;; Copyright © 2016 Nils Gillmann +;;; Copyright © 2016 ng0 ;;; Copyright © 2016, 2017, 2019 Efraim Flashner ;;; Copyright © 2016, 2017 Alex Sassmannshausen ;;; Copyright © 2016, 2017 Marius Bakke diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 5b05b772dc..0075bbdf2e 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2016, 2018 Mark H Weaver ;;; Copyright © 2016 Jochem Raat ;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner -;;; Copyright © 2016 Nils Gillmann +;;; Copyright © 2016 ng0 ;;; Copyright © 2016 Alex Sassmannshausen ;;; Copyright © 2016, 2018 Roel Janssen ;;; Copyright © 2016 Ben Woodcroft diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm index e13227b616..88f62d1934 100644 --- a/gnu/packages/python-compression.scm +++ b/gnu/packages/python-compression.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2017 Ricardo Wurmus -;;; Copyright © 2017 Nils Gillmann +;;; Copyright © 2017 ng0 ;;; Copyright © 2017 Julien Lepiller ;;; Copyright © 2018, 2019 Efraim Flashner ;;; diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 688c8c4378..08f1e4d399 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2014, 2017 Eric Bavier ;;; Copyright © 2015, 2016 David Thompson ;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice -;;; Copyright © 2016, 2017 Nils Gillmann +;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2014, 2015 Mark H Weaver ;;; Copyright © 2015, 2016, 2017, 2019 Ricardo Wurmus ;;; Copyright © 2016 Danny Milosavljevic diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 32d769c3ed..ec068bdf0b 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus ;;; Copyright © 2017 Roel Janssen ;;; Copyright © 2016, 2017 Julien Lepiller -;;; Copyright © 2016, 2017 Nils Gillmann +;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2014, 2017 Eric Bavier ;;; Copyright © 2014, 2015 Mark H Weaver ;;; Copyright © 2015 Cyril Roelandt diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ed54f54593..f9e87fb9c7 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -23,7 +23,7 @@ ;;; Copyright © 2016 Daniel Pimentel ;;; Copyright © 2016 Sou Bunnbu ;;; Copyright © 2016, 2017 Troy Sankey -;;; Copyright © 2016, 2017 Nils Gillmann +;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2016 Dylan Jeffers ;;; Copyright © 2016 David Craven ;;; Copyright © 2016, 2017, 2018 Marius Bakke diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 25f2ffa73c..57ced499cb 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -23,7 +23,7 @@ ;;; Copyright © 2016 Daniel Pimentel ;;; Copyright © 2016 Sou Bunnbu ;;; Copyright © 2016, 2017 Troy Sankey -;;; Copyright © 2016, 2017 Nils Gillmann +;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2016 Dylan Jeffers ;;; Copyright © 2016 David Craven ;;; Copyright © 2016, 2017, 2018 Marius Bakke diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 8179911539..6e567792f8 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2015 Sou Bunnbu ;;; Copyright © 2015, 2018, 2019 Ludovic Courtès ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner -;;; Copyright © 2016, 2017 Nils Gillmann +;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2016 Thomas Danckaert ;;; Copyright © 2017, 2018, 2019 Ricardo Wurmus ;;; Copyright © 2017 Quiliro diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 818553848d..7a2b191063 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2014, 2015 David Thompson ;;; Copyright © 2015, 2019 Ricardo Wurmus ;;; Copyright © 2015, 2016, 2017 Ben Woodcroft -;;; Copyright © 2017 Nils Gillmann +;;; Copyright © 2017 ng0 ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2017, 2018 Efraim Flashner ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 048a91052d..074d9b0655 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 David Craven ;;; Copyright © 2016 Eric Le Bihan -;;; Copyright © 2016 Nils Gillmann +;;; Copyright © 2016 ng0 ;;; Copyright © 2017 Ben Woodcroft ;;; Copyright © 2017, 2018 Nikolai Merinov ;;; Copyright © 2017 Efraim Flashner diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index 93a1a3e152..9dbb3713ee 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2016 Ricardo Wurmus ;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2016 Jan Nieuwenhuizen -;;; Copyright © 2016, 2017 Nils Gillmann +;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2017 John Darrington ;;; Copyright © 2017 Clément Lassieur ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index 876318869c..05e0d1d833 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2017 Corentin Bocquillon ;;; Copyright © 2017 Gregor Giesen ;;; Copyright © 2017 Frederick M. Muriithi -;;; Copyright © 2017 Nils Gillmann +;;; Copyright © 2017 ng0 ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Joshua Sierles, Nextjournal ;;; diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 4c832c0702..2c6642f727 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2016 Stefan Reichör ;;; Copyright © 2017, 2018 Ricardo Wurmus -;;; Copyright © 2017, 2018 Nils Gillmann +;;; Copyright © 2017, 2018 ng0 ;;; Copyright © 2017, 2018 Leo Famulari ;;; Copyright © 2017 Arun Isaac ;;; Copyright © 2019 Meiyo Peng diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 91b89242f8..dc81736f06 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2017 Stefan Reichör ;;; Copyright © 2017 Ricardo Wurmus -;;; Copyright © 2017 Nils Gillmann +;;; Copyright © 2017 ng0 ;;; Copyright © 2018 Manuel Graf ;;; Copyright © 2019 Gábor Boskovits ;;; diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm index d15fdbaddd..c1357bd282 100644 --- a/gnu/packages/suckless.scm +++ b/gnu/packages/suckless.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2013 Cyril Roelandt ;;; Copyright © 2015 Amirouche Boubekki ;;; Copyright © 2016 Al McElrath -;;; Copyright © 2016, 2017 Nils Gillmann +;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2015 Dmitry Bogatov ;;; Copyright © 2015 Leo Famulari ;;; Copyright © 2016 Eric Bavier diff --git a/gnu/packages/tbb.scm b/gnu/packages/tbb.scm index ee21a61895..788eabfdfa 100644 --- a/gnu/packages/tbb.scm +++ b/gnu/packages/tbb.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015, 2016 Ricardo Wurmus -;;; Copyright © 2016 Nils Gillmann +;;; Copyright © 2016 ng0 ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 63709935c3..559fb3d63f 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2015, 2016 Efraim Flashner ;;; Copyright © 2016 Lukas Gradl ;;; Copyright © 2016 Francesco Frassinelli -;;; Copyright © 2016, 2017 Nils Gillmann +;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2017, 2018 Ricardo Wurmus ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Jovany Leandro G.C diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index b1afd63b32..b96f8235d4 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2016 Carlo Zancanaro ;;; Copyright © 2017, 2018 Eric Bavier ;;; Copyright © 2017 Feng Shu -;;; Copyright © 2017 Nils Gillmann +;;; Copyright © 2017 ng0 ;;; Copyright © 2014 Taylan Ulrich Bayırlı/Kammer ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2019 Efraim Flashner diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 78050f3925..7436fdeb97 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016 Jelle Licht ;;; Copyright © 2016 Alex Griffin ;;; Copyright © 2016, 2018 Efraim Flashner -;;; Copyright © 2016 Nils Gillmann +;;; Copyright © 2016 ng0 ;;; Copyright © 2016 Marius Bakke ;;; Copyright © 2017 Eric Bavier ;;; Copyright © 2017 Rene Saavedra diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm index 948d2b995c..747e4cf080 100644 --- a/gnu/packages/time.scm +++ b/gnu/packages/time.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2016 Marius Bakke ;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2017 Ben Woodcroft -;;; Copyright © 2017 Nils Gillmann +;;; Copyright © 2017 ng0 ;;; Copyright © 2017 Julien Lepiller ;;; Copyright © 2018 Alex Vong ;;; Copyright © 2019 Kyle Meyer diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index bdfbc003d3..6ecb5673e6 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2015 David Thompson ;;; Copyright © 2015, 2016, 2017, 2018 Leo Famulari ;;; Copyright © 2016, 2017, 2019 Efraim Flashner -;;; Copyright © 2016, 2017, 2018 Nils Gillmann +;;; Copyright © 2016, 2017, 2018 ng0 ;;; Copyright © 2016 Hartmut Goebel ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2017, 2018 Marius Bakke diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index a0b16db3a7..a24923c045 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2013, 2014, 2015 Ludovic Courtès ;;; Copyright © 2014, 2015 Mark H Weaver ;;; Copyright © 2016, 2017, 2018 Efraim Flashner -;;; Copyright © 2016, 2017 Nils Gillmann +;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2017, 2018 Eric Bavier ;;; Copyright © 2017 Rutger Helling diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 674850e0ac..d750863f30 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2015, 2018 Kyle Meyer ;;; Copyright © 2015, 2017, 2018 Ricardo Wurmus ;;; Copyright © 2016, 2017 Leo Famulari -;;; Copyright © 2016, 2017, 2018 Nils Gillmann +;;; Copyright © 2016, 2017, 2018 ng0 ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2017 Vasile Dumitrascu ;;; Copyright © 2017 Clément Lassieur diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index c661c4ce87..f00be7092b 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2016 Kei Kebreau ;;; Copyright © 2016 Dmitry Nikolaev ;;; Copyright © 2016 Andy Patterson -;;; Copyright © 2016, 2017 Nils Gillmann +;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2016, 2018, 2019 Eric Bavier ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2017 Feng Shu diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 70e358656d..56deb12c3d 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Cyril Roelandt ;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner -;;; Copyright © 2016, 2017 Nils Gillmann +;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2018 Tobias Geerinckx-Rice diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 577be916bf..dfabb3aa65 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -14,7 +14,7 @@ ;;; Copyright © 2016 Rene Saavedra ;;; Copyright © 2016 Ben Woodcroft ;;; Copyright © 2016 Clément Lassieur -;;; Copyright © 2016, 2017 Nils Gillmann +;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2016, 2017, 2018, 2019 Arun Isaac ;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2016 Bake Timmons diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 539d6564c7..0a05ff4ae4 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2016 Al McElrath ;;; Copyright © 2016 Carlo Zancanaro ;;; Copyright © 2016, 2017, 2018 Ludovic Courtès -;;; Copyright © 2016, 2017, 2018 Nils Gillmann +;;; Copyright © 2016, 2017, 2018 ng0 ;;; Copyright © 2016 doncatnip ;;; Copyright © 2016 Ivan Vilata i Balaguer ;;; Copyright © 2017 Mekeor Melire diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 6bfae74f18..cd3428a1fb 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -17,7 +17,7 @@ ;;; Copyright © 2016, 2017, 2019 Marius Bakke ;;; Copyright © 2016 Petter ;;; Copyright © 2017 Mekeor Melire -;;; Copyright © 2017 Nils Gillmann +;;; Copyright © 2017 ng0 ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2017 Marek Benc ;;; Copyright © 2017 Mike Gerwitz diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index b47fe5d301..f5618932ca 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016 Kei Kebreau ;;; Copyright © 2017, 2019 Ricardo Wurmus ;;; Copyright © 2017 Petter -;;; Copyright © 2017 Nils Gillmann +;;; Copyright © 2017 ng0 ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index d4ff1643e5..9f0959d78f 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2016, 2017 Leo Famulari ;;; Copyright © 2016 Ben Woodcroft ;;; Copyright © 2016 Jan Nieuwenhuizen -;;; Copyright © 2016, 2017 Nils Gillmann +;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2016, 2017, 2018 Marius Bakke ;;; Copyright © 2017 Adriano Peluso diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 3463ac85a7..f168b51f4c 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2016 Mathieu Lirzin ;;; Copyright © 2015 Cyrill Schenkel ;;; Copyright © 2016, 2017 Efraim Flashner -;;; Copyright © 2016 Nils Gillmann +;;; Copyright © 2016 ng0 ;;; Copyright © 2016 Alex Kost ;;; Copyright © 2016 David Craven ;;; Copyright © 2016, 2017 John Darrington diff --git a/gnu/services/certbot.scm b/gnu/services/certbot.scm index 7548145c98..7565bc97ca 100644 --- a/gnu/services/certbot.scm +++ b/gnu/services/certbot.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016 Nils Gillmann +;;; Copyright © 2016 ng0 ;;; Copyright © 2016 Sou Bunnbu ;;; Copyright © 2017, 2018 Clément Lassieur ;;; diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index 8f8e177ca9..b912c208cc 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2016 Sou Bunnbu ;;; Copyright © 2017 Maxim Cournoyer -;;; Copyright © 2017 Nils Gillmann +;;; Copyright © 2017 ng0 ;;; Copyright © 2018 Efraim Flashner ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2017, 2019 Christopher Baines diff --git a/gnu/services/version-control.scm b/gnu/services/version-control.scm index 13669925ab..e332b93096 100644 --- a/gnu/services/version-control.scm +++ b/gnu/services/version-control.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016 Nils Gillmann +;;; Copyright © 2016 ng0 ;;; Copyright © 2016 Sou Bunnbu ;;; Copyright © 2017 Oleg Pykhalov ;;; Copyright © 2017 Clément Lassieur diff --git a/gnu/services/web.scm b/gnu/services/web.scm index d71fed20ed..b6ebe90774 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 David Thompson ;;; Copyright © 2015, 2016, 2017, 2018 Ludovic Courtès -;;; Copyright © 2016 Nils Gillmann +;;; Copyright © 2016 ng0 ;;; Copyright © 2016, 2017, 2018 Julien Lepiller ;;; Copyright © 2017 Christopher Baines ;;; Copyright © 2017 nee diff --git a/guix/import/hackage.scm b/guix/import/hackage.scm index 48db764b3c..2a51420d14 100644 --- a/guix/import/hackage.scm +++ b/guix/import/hackage.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Federico Beffa ;;; Copyright © 2016 Eric Bavier -;;; Copyright © 2016 Nils Gillmann +;;; Copyright © 2016 ng0 ;;; Copyright © 2018 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. diff --git a/guix/licenses.scm b/guix/licenses.scm index d22c3fa36e..676e71acdb 100644 --- a/guix/licenses.scm +++ b/guix/licenses.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2016 Leo Famulari ;;; Copyright © 2016 Fabian Harfert ;;; Copyright © 2016 Rene Saavedra -;;; Copyright © 2016, 2017 Nils Gillmann +;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2017 Clément Lassieur ;;; Copyright © 2017 Petter ;;; Copyright © 2017 Marius Bakke From a3f2c295e7f8719dc47d5757b89188e0ed68faf2 Mon Sep 17 00:00:00 2001 From: ng0 Date: Thu, 14 Mar 2019 10:43:47 +0000 Subject: [PATCH 253/694] gnu: libextractor: Update to 1.9. * gnu/packages/gnunet (libextractor): Update to 1.9. [source]: Remove patches. * gnu/packages/patches/libextractor-CVE-2018-20430.patch gnu/packages/patches/libextractor-CVE-2018-20431.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Remove them. Signed-off-by: Tobias Geerinckx-Rice --- gnu/local.mk | 2 - gnu/packages/gnunet.scm | 8 +-- .../patches/libextractor-CVE-2018-20430.patch | 60 ------------------- .../patches/libextractor-CVE-2018-20431.patch | 53 ---------------- 4 files changed, 3 insertions(+), 120 deletions(-) delete mode 100644 gnu/packages/patches/libextractor-CVE-2018-20430.patch delete mode 100644 gnu/packages/patches/libextractor-CVE-2018-20431.patch diff --git a/gnu/local.mk b/gnu/local.mk index af2bf87273..49537e19f8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -968,8 +968,6 @@ dist_patch_DATA = \ %D%/packages/patches/libevent-2.1-skip-failing-test.patch \ %D%/packages/patches/libexif-CVE-2016-6328.patch \ %D%/packages/patches/libexif-CVE-2017-7544.patch \ - %D%/packages/patches/libextractor-CVE-2018-20430.patch \ - %D%/packages/patches/libextractor-CVE-2018-20431.patch \ %D%/packages/patches/libgcrypt-make-yat2m-reproducible.patch \ %D%/packages/patches/libgit2-mtime-0.patch \ %D%/packages/patches/libgit2-oom-test.patch \ diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index 93c905406f..19e99644dd 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2015, 2017, 2019 Efraim Flashner ;;; Copyright © 2016 Ricardo Wurmus ;;; Copyright © 2016 Mark H Weaver -;;; Copyright © 2016, 2017, 2018 ng0 +;;; Copyright © 2016, 2017, 2018, 2019 ng0 ;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Alex Vong ;;; @@ -68,16 +68,14 @@ (define-module (gnu packages gnunet) (define-public libextractor (package (name "libextractor") - (version "1.8") + (version "1.9") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/libextractor/libextractor-" version ".tar.gz")) - (patches (search-patches "libextractor-CVE-2018-20430.patch" - "libextractor-CVE-2018-20431.patch")) (sha256 (base32 - "1z1cb35griqzvshqdv5ck98dy0sgpsswn7fgiy7lbzi34sma8dg2")))) + "1zz2zvikvfibxnk1va3kgzs7djsmiqy7bmk8y01vbsf54ryjb3zh")))) (build-system gnu-build-system) ;; WARNING: Checks require /dev/shm to be in the build chroot, especially ;; not to be a symbolic link to /run/shm. diff --git a/gnu/packages/patches/libextractor-CVE-2018-20430.patch b/gnu/packages/patches/libextractor-CVE-2018-20430.patch deleted file mode 100644 index 570cd7c006..0000000000 --- a/gnu/packages/patches/libextractor-CVE-2018-20430.patch +++ /dev/null @@ -1,60 +0,0 @@ -Fix CVE-2018-20430: - -https://gnunet.org/bugs/view.php?id=5493 -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-20430 -https://security-tracker.debian.org/tracker/CVE-2018-20430 - -Patch copied from upstream source repository: - -https://gnunet.org/git/libextractor.git/commit/?id=b405d707b36e0654900cba78e89f49779efea110 - -From b405d707b36e0654900cba78e89f49779efea110 Mon Sep 17 00:00:00 2001 -From: Christian Grothoff -Date: Thu, 20 Dec 2018 22:47:53 +0100 -Subject: [PATCH] fix #5493 (out of bounds read) - ---- - src/common/convert.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/common/convert.c b/src/common/convert.c -index c0edf21..2be2108 100644 ---- a/src/common/convert.c -+++ b/src/common/convert.c -@@ -36,8 +36,8 @@ - * string is returned. - */ - char * --EXTRACTOR_common_convert_to_utf8 (const char *input, -- size_t len, -+EXTRACTOR_common_convert_to_utf8 (const char *input, -+ size_t len, - const char *charset) - { - #if HAVE_ICONV -@@ -52,7 +52,7 @@ EXTRACTOR_common_convert_to_utf8 (const char *input, - i = input; - cd = iconv_open ("UTF-8", charset); - if (cd == (iconv_t) - 1) -- return strdup (i); -+ return strndup (i, len); - if (len > 1024 * 1024) - { - iconv_close (cd); -@@ -67,11 +67,11 @@ EXTRACTOR_common_convert_to_utf8 (const char *input, - } - itmp = tmp; - finSize = tmpSize; -- if (iconv (cd, (char **) &input, &len, &itmp, &finSize) == SIZE_MAX) -+ if (iconv (cd, (char **) &input, &len, &itmp, &finSize) == ((size_t) -1)) - { - iconv_close (cd); - free (tmp); -- return strdup (i); -+ return strndup (i, len); - } - ret = malloc (tmpSize - finSize + 1); - if (ret == NULL) --- -2.20.1 - diff --git a/gnu/packages/patches/libextractor-CVE-2018-20431.patch b/gnu/packages/patches/libextractor-CVE-2018-20431.patch deleted file mode 100644 index 855c5ba64b..0000000000 --- a/gnu/packages/patches/libextractor-CVE-2018-20431.patch +++ /dev/null @@ -1,53 +0,0 @@ -Fix CVE-2018-20431: - -https://gnunet.org/bugs/view.php?id=5494 -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-20431 -https://security-tracker.debian.org/tracker/CVE-2018-20431 - -Patch copied from upstream source repository: - -https://gnunet.org/git/libextractor.git/commit/?id=489c4a540bb2c4744471441425b8932b97a153e7 - -To apply the patch to libextractor 1.8 release tarball, -hunk #1 which patches ChangeLog is removed. - -From 489c4a540bb2c4744471441425b8932b97a153e7 Mon Sep 17 00:00:00 2001 -From: Christian Grothoff -Date: Thu, 20 Dec 2018 23:02:28 +0100 -Subject: [PATCH] fix #5494 - ---- - ChangeLog | 3 ++- - src/plugins/ole2_extractor.c | 9 +++++++-- - 2 files changed, 9 insertions(+), 3 deletions(-) - -diff --git a/src/plugins/ole2_extractor.c b/src/plugins/ole2_extractor.c -index 53fa1b9..a48b726 100644 ---- a/src/plugins/ole2_extractor.c -+++ b/src/plugins/ole2_extractor.c -@@ -173,7 +173,7 @@ struct ProcContext - EXTRACTOR_MetaDataProcessor proc; - - /** -- * Closure for 'proc'. -+ * Closure for @e proc. - */ - void *proc_cls; - -@@ -213,7 +213,12 @@ process_metadata (gpointer key, - - if (G_VALUE_TYPE(gval) == G_TYPE_STRING) - { -- contents = strdup (g_value_get_string (gval)); -+ const char *gvals; -+ -+ gvals = g_value_get_string (gval); -+ if (NULL == gvals) -+ return; -+ contents = strdup (gvals); - } - else - { --- -2.20.1 - From f7e4dd5da05a67b08525c8686535a27365a83ebb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Mar 2019 14:32:39 +0100 Subject: [PATCH 254/694] gnu: gtksourceview: Don't use NAME in source URI. * gnu/packages/gtk.scm (gtksourceview)[source]: Hard-code NAME. --- 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 1ac90216ef..2470960b9b 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -402,9 +402,9 @@ (define-public gtksourceview (version "3.24.8") (source (origin (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" + (uri (string-append "mirror://gnome/sources/gtksourceview/" (version-major+minor version) "/" - name "-" version ".tar.xz")) + "gtksourceview-" version ".tar.xz")) (sha256 (base32 "1zinqid62zjcsq7vy1y4mq1qh3hzd3zj7p8np7g0bdqd37zvi6qy")))) From 310dbe9ea56edcbd8244e480ae6e153b9a8672db Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Mar 2019 14:32:42 +0100 Subject: [PATCH 255/694] gnu: gtksourceview: Update to 3.24.10. * gnu/packages/gtk.scm (gtksourceview): Update to 3.24.10. --- 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 2470960b9b..aab392758f 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -399,7 +399,7 @@ (define-public gtksourceview-2 (define-public gtksourceview (package (name "gtksourceview") - (version "3.24.8") + (version "3.24.10") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/gtksourceview/" @@ -407,7 +407,7 @@ (define-public gtksourceview "gtksourceview-" version ".tar.xz")) (sha256 (base32 - "1zinqid62zjcsq7vy1y4mq1qh3hzd3zj7p8np7g0bdqd37zvi6qy")))) + "16ym7jwiki4s1pilwr4incx0yg7ll94f1cajrnpndkxxs36hcm5b")))) (build-system gnu-build-system) (arguments '(#:phases From 632c508cdc4080f36f907b801a76cb4ecbe372e5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Mar 2019 02:21:03 +0100 Subject: [PATCH 256/694] gnu: toutenclic: Update to 6.13. * gnu/packages/education.scm (toutenclic): Update to 6.13. --- gnu/packages/education.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 454ac30fc4..4b93cd1023 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -309,18 +309,17 @@ (define-public snap (define-public toutenclic (package (name "toutenclic") - (version "6.12") + (version "6.13") (source (origin (method url-fetch) (uri (string-append "http://www.bipede.fr/downloads/logiciels/" "ToutEnClic-" version ".tar.xz")) (sha256 - (base32 - "1369m76fxmi2hgc2bbsq2jchcbh8q0qzml7600pqn8xiqrybvg9g")))) + (base32 "1pjprdzc4bn7ckbg4469691ph6yjjr8f022hb4gi4lacs4h71wnd")))) (build-system python-build-system) (arguments - `(#:tests? #f ;no test + `(#:tests? #f ; no tests #:phases (modify-phases %standard-phases (delete 'build) From 21b9c6fade382a11a058d7632a7f4a1094766631 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Feb 2019 03:23:00 +0100 Subject: [PATCH 257/694] Order (gnu packages scanner) module imports alphabetically. * gnu/packages/scanner.scm (define-module): Order module imports alphabetically. --- gnu/packages/scanner.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/scanner.scm b/gnu/packages/scanner.scm index 6539756a6e..d23da9e502 100644 --- a/gnu/packages/scanner.scm +++ b/gnu/packages/scanner.scm @@ -21,15 +21,15 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages scanner) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix utils) - #:use-module (guix build-system gnu) - #:use-module (gnu packages pkg-config) #:use-module (gnu packages image) #:use-module (gnu packages libusb) + #:use-module (gnu packages pkg-config) + #:use-module (guix build-system gnu) + #:use-module (guix download) #:use-module ((guix licenses) - #:prefix licence:)) + #:prefix licence:) + #:use-module (guix packages) + #:use-module (guix utils)) (define-public sane-backends-minimal (package From 7e52321f878161f4c2a1d45129eb9f868d18d496 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Mar 2019 14:44:11 +0100 Subject: [PATCH 258/694] gnu: vips: Update to 8.7.4. * gnu/packages/image-processing.scm (vips): Update to 8.7.4. --- gnu/packages/image-processing.scm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index a8968acba2..296265c769 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -414,14 +414,15 @@ (define-public opencv (define-public vips (package (name "vips") - (version "8.7.1") - (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/libvips/libvips/releases/download/v" - version "/vips-" version ".tar.gz")) - (sha256 - (base32 "1w3b90pdw7nj2p0gb4f96h6zhmga513f968ldfhz1rkhg7y81c0s")))) + (version "8.7.4") + (source + (origin + (method url-fetch) + (uri (string-append + "https://github.com/libvips/libvips/releases/download/v" + version "/vips-" version ".tar.gz")) + (sha256 + (base32 "01gjhcrl6zj7mcj1al717v5jsniahplqhz1xkfh2j78vyfl1hxff")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) From 85e2f212a8ac206c3ecc15f647a19c0157ea6bcc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Mar 2019 14:50:49 +0100 Subject: [PATCH 259/694] gnu: vips: Improve description. * gnu/packages/image-processing.scm (vips)[synopsis, description]: Expand. --- gnu/packages/image-processing.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 296265c769..14e8b15b69 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -450,9 +450,15 @@ (define-public vips ("expat" ,expat) ("hdf5" ,hdf5))) (home-page "https://libvips.github.io/libvips/") - (synopsis "Image processing system") + (synopsis "Multithreaded image processing system with low memory needs") (description - "vips is a demand-driven, horizontally threaded image processing library.") + "VIPS is a demand-driven, horizontally threaded image processing library. +It's particularly good at processing large images, working with colour, +scientific analysis, and general research & development. + +Compared to most image processing libraries VIPS needs little RAM and runs +quickly, especially on machines with more than one CPU core. This is primarily +due to its architecture which automatically parallelises the image workflows.") (license license:lgpl2.1+))) (define-public nip2 From 822c8501a4bf5239883174bd89f8f33f6f242e2e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Mar 2019 14:55:57 +0100 Subject: [PATCH 260/694] gnu: mpop: Don't use NAME in source URI. * gnu/packages/mail.scm (mpop)[source]: Hard-code NAME. --- gnu/packages/mail.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index bb44ea1a53..8d36701e08 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1935,7 +1935,7 @@ (define-public mpop (origin (method url-fetch) (uri (string-append "https://marlam.de/mpop/releases/" - name "-" version ".tar.xz")) + "mpop-" version ".tar.xz")) (sha256 (base32 "1rx5mhgqkm7swbynrhbsz32v85h0rydb4kqfgfs9jrznd9d14m2d")))) From dfc79ae78e78e40ccef1a3ac9dbd36d3098201ef Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Mar 2019 14:56:04 +0100 Subject: [PATCH 261/694] gnu: mpop: Update to 1.4.3. * gnu/packages/mail.scm (mpop): Update to 1.4.3. --- gnu/packages/mail.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 8d36701e08..9bfce1de45 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 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2017, 2018 Rene Saavedra ;;; Copyright © 2018 Pierre Langlois ;;; Copyright © 2018 Alex Vong @@ -1930,15 +1930,14 @@ (define-public mb2md (define-public mpop (package (name "mpop") - (version "1.4.2") + (version "1.4.3") (source (origin (method url-fetch) (uri (string-append "https://marlam.de/mpop/releases/" "mpop-" version ".tar.xz")) (sha256 - (base32 - "1rx5mhgqkm7swbynrhbsz32v85h0rydb4kqfgfs9jrznd9d14m2d")))) + (base32 "1di86frxv4gj8fasni409m87qmv0j0vmj13lawkz1pwv9hbynhjb")))) (build-system gnu-build-system) (inputs `(("gnutls" ,gnutls) From b07d5932492cf8ef1d898c167152bd5d55a262f5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Mar 2019 15:02:02 +0100 Subject: [PATCH 262/694] gnu: pcmanfm: Don't use NAME in source URI. * gnu/packages/lxde.scm (pcmanfm)[source]: Hard-code NAME. --- gnu/packages/lxde.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index d91e62359b..f4602843c5 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -216,9 +216,9 @@ (define-public pcmanfm (version "1.3.0") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/" name "/" + (uri (string-append "mirror://sourceforge/pcmanfm/" "PCManFM%20%2B%20Libfm%20%28tarball%20release" - "%29/PCManFM/" name "-" version ".tar.xz")) + "%29/PCManFM/pcmanfm-" version ".tar.xz")) (sha256 (base32 "1ywgfyklms5hqkapsbjps4kyx20ac0d1qk16ww74yagkyfdkwsas")))) From 70a8ccb79db8dc55855830e7941eb830ad2240af Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Mar 2019 15:02:10 +0100 Subject: [PATCH 263/694] gnu: pcmanfm: Update to 1.3.1. * gnu/packages/lxde.scm (pcmanfm): Update to 1.3.1. --- gnu/packages/lxde.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index f4602843c5..ccd79dada6 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2017 ng0 ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2017 Brendan Tildesley -;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Ison111 ;;; Copyright © 2018, 2019 Ludovic Courtès ;;; Copyright © 2018 Ricardo Wurmus @@ -213,7 +213,7 @@ (define-public menu-cache (define-public pcmanfm (package (name "pcmanfm") - (version "1.3.0") + (version "1.3.1") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/pcmanfm/" @@ -221,7 +221,7 @@ (define-public pcmanfm "%29/PCManFM/pcmanfm-" version ".tar.xz")) (sha256 (base32 - "1ywgfyklms5hqkapsbjps4kyx20ac0d1qk16ww74yagkyfdkwsas")))) + "0mb8hg76x1z0szdyl0w7jpz0bdblc6a29is1vvnh79z37qxh8138")))) (build-system gnu-build-system) (inputs `(("gtk+" ,gtk+-2) ("gvfs" ,gvfs) ; for trash and mount support From 611a6980dc59c8f6f407a893b9c44eaf53156d70 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Mar 2019 15:04:36 +0100 Subject: [PATCH 264/694] gnu: emacs-mew: Update to 6.8. * gnu/packages/mail.scm (emacs-mew): Update to 6.8. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 9bfce1de45..eabcdc40ca 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -619,14 +619,14 @@ (define-public offlineimap (define-public emacs-mew (package (name "emacs-mew") - (version "6.7") + (version "6.8") (source (origin (method url-fetch) (uri (string-append "https://mew.org/Release/mew-" version ".tar.gz")) (sha256 (base32 - "03fzky2kz73vgx4cbps2psbbnrgqgkk5q7jwfldisymkzr9iz03y")))) + "0ixzyq33l6j34410kqav3lwn2wx171zvqd3irvns2jvhrbww8i6g")))) (native-inputs `(("emacs" ,emacs))) (propagated-inputs From 912a81ff16fdd7376b2271f22384a35985ec9488 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 16 Mar 2019 17:06:31 -0400 Subject: [PATCH 265/694] gnu: xfconf: Update to 4.12.1. * gnu/packages/xfce.scm (xfconf): Update to 4.12.1. [source]: Update URL. --- gnu/packages/xfce.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index f5618932ca..97d6709c36 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -104,15 +104,15 @@ (define-public libxfce4util (define-public xfconf (package (name "xfconf") - (version "4.12.0") + (version "4.12.1") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/xfce/" - (version-major+minor version) - "/src/" name "-" version ".tar.bz2")) + (uri (string-append "https://archive.xfce.org/src/xfce/" + name "/" (version-major+minor version) "/" + name "-" version ".tar.bz2")) (sha256 (base32 - "0mmi0g30aln3x98y5p507g17pipq0dj0bwypshan8cq5hkmfl44r")))) + "0dns190bwb615wy9ma2654sw4vz1d0rcv061zmaalkv9wmj8bx1m")))) (build-system gnu-build-system) (arguments '(#:phases From f96cd7cea45ef751b47f6c8dd77a39647726f9ea Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 16 Mar 2019 17:13:25 -0400 Subject: [PATCH 266/694] gnu: libxfce4ui: Update to 4.12.1. * gnu/packages/xfce.scm (libxfce4ui): Update to 4.12.1. [source]: Update URL. --- gnu/packages/xfce.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 97d6709c36..fbc5e401ca 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -148,15 +148,15 @@ (define-public xfconf (define-public libxfce4ui (package (name "libxfce4ui") - (version "4.12.0") + (version "4.12.1") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/xfce/" - (version-major+minor version) - "/src/" name "-" version ".tar.bz2")) + (uri (string-append "https://archive.xfce.org/src/xfce/" + name "/" (version-major+minor version) "/" + name "-" version ".tar.bz2")) (sha256 (base32 - "11rrhqxnfwx5jls3nlg9s2x8saag9f2zqk9cdm6hr3bs6cr9a781")))) + "0hzzhiiwmqsrbv17nninhs2x1b8ck0ym85jck2xphx5ypw8rhq9x")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) From 33e6ad83753d45a7e1bcc79171251ec472d5eb1b Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 16 Mar 2019 16:22:08 -0400 Subject: [PATCH 267/694] gnu: exo: Update to 0.12.4. * gnu/packages/xfce.scm (exo): Update to 0.12.4. [source]: Update URL. --- gnu/packages/xfce.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index fbc5e401ca..b3f814e933 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -182,14 +182,15 @@ (define-public libxfce4ui (define-public exo (package (name "exo") - (version "0.10.3") + (version "0.12.4") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/xfce/4.12/src/" + (uri (string-append "https://archive.xfce.org/src/xfce/" + name "/" (version-major+minor version) "/" name "-" version ".tar.bz2")) (sha256 (base32 - "1g9651ra395v2fmzb943l68b9pg0rfxc19x97a62crchxwa4nw4m")))) + "1bsh43m6dh83vj9qi1vs0425m2d5yfqjyihr7zjjqmyvdf0n1bxh")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) From a281a0837d919c9e834357728b90809cde5ce361 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 16 Mar 2019 17:19:32 -0400 Subject: [PATCH 268/694] gnu: garcon: Update to 0.6.2. * gnu/packages/xfce.scm (garcon): Update to 0.6.2. [source]: Update URL. --- gnu/packages/xfce.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index b3f814e933..2ee4dad180 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -214,14 +214,15 @@ (define-public exo (define-public garcon (package (name "garcon") - (version "0.4.0") + (version "0.6.2") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/xfce/4.12/src/" + (uri (string-append "https://archive.xfce.org/src/xfce/" + name "/" (version-major+minor version) "/" name "-" version ".tar.bz2")) (sha256 (base32 - "0wm9pjbwq53s3n3nwvsyf0q8lbmhiy2ln3bn5ncihr9vf5cwhzbq")))) + "0z64g6f2vwfjzqsrsn05nbcbs8l6y4cfdgxk4k2la3giixj0jzx8")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) From c3ad3d924c0f9b6a08b5ad443fd44ef0cbb1df9a Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 16 Mar 2019 17:33:18 -0400 Subject: [PATCH 269/694] gnu: tumbler: Update to 0.2.3. * gnu/packages/xfce.scm (tumbler): Update to 0.2.3. [source]: Update URL. --- gnu/packages/xfce.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 2ee4dad180..89fe37587e 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -244,14 +244,15 @@ (define-public garcon (define-public tumbler (package (name "tumbler") - (version "0.1.31") + (version "0.2.3") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/xfce/tumbler/0.1/" + (uri (string-append "https://archive.xfce.org/src/xfce/" + name "/" (version-major+minor version) "/" name "-" version ".tar.bz2")) (sha256 (base32 - "0wvip28gm2w061hn84zp2q4dv947ihylrppahn4cjspzff935zfh")))) + "0h3x325dbz0lnb7b3zzbfrva3v0rn99v03zj9cza7ysr2nyy28nh")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) From b0f44c67d3de19a7cd39f55dd116df5eb996aa0d Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 16 Mar 2019 17:47:10 -0400 Subject: [PATCH 270/694] gnu: xfce4-panel: Update to 4.12.2. * gnu/packages/xfce.scm (xfce4-panel): Update to 4.12.2. [source]: Update URL. --- gnu/packages/xfce.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 89fe37587e..c36f978a44 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -280,15 +280,15 @@ (define-public tumbler (define-public xfce4-panel (package (name "xfce4-panel") - (version "4.12.0") + (version "4.12.2") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/xfce/" - (version-major+minor version) - "/src/" name "-" version ".tar.bz2")) + (uri (string-append "https://archive.xfce.org/src/xfce/" + name "/" (version-major+minor version) "/" + name "-" version ".tar.bz2")) (sha256 (base32 - "1c4p3ckghvsad1sj5v8wmar5mh9cbhail9mmhad2f9pwwb10z4ih")) + "1s8cvsrgmkmmm84g6mghpj2k4777gm22g5lrsf8pdy5qh6xql1a2")) (patches (search-patches "xfce4-panel-plugins.patch")))) (build-system gnu-build-system) (arguments From 40136e2490fae39f3103dcb4c58bb9cab568e6f7 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 16 Mar 2019 17:51:51 -0400 Subject: [PATCH 271/694] gnu: xfce4-battery-plugin: Update to 1.1.2. * gnu/packages/xfce.scm (xfce4-battery-plugin): Update to 1.1.2. --- 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 c36f978a44..fd02ef943a 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -318,15 +318,15 @@ (define-public xfce4-panel (define-public xfce4-battery-plugin (package (name "xfce4-battery-plugin") - (version "1.0.5") + (version "1.1.2") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/panel-plugins/" + (uri (string-append "https://archive.xfce.org/src/panel-plugins/" name "/" (version-major+minor version) "/" name "-" version ".tar.bz2")) (sha256 (base32 - "04gbplcj8z4vg5xbks8cc2jjf62mmf9sdymg90scjwmb82pv2ngn")))) + "1nypi0zazrcrbbm5vb221yw64zxrk56v4fffkblxlyd9m6gk80fn")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("intltool" ,intltool))) From ff2c81b0e50cf2df6d1045ede9a083b8b8c4ccc5 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 16 Mar 2019 18:01:32 -0400 Subject: [PATCH 272/694] gnu: xfce4-clipman-plugin: Update to 1.4.3. * gnu/packages/xfce.scm (xfce4-clipman-plugin): Update to 1.4.3. --- 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 fd02ef943a..fa35c5bb57 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -347,15 +347,15 @@ (define-public xfce4-battery-plugin (define-public xfce4-clipman-plugin (package (name "xfce4-clipman-plugin") - (version "1.2.6") + (version "1.4.3") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/panel-plugins/" + (uri (string-append "https://archive.xfce.org/src/panel-plugins/" name "/" (version-major+minor version) "/" name "-" version ".tar.bz2")) (sha256 (base32 - "19a8gwcqc0r5qqi8w28dc8arqip34m8yxdb87lgps9g5qfcky113")))) + "1liacff4wl5mpyf9dzdrfbwxzmhl95y5nsfc0jf5rgalzdgbik99")))) (build-system gnu-build-system) (native-inputs `(("intltool" ,intltool) From c8b0f0ab8b5831f758b52d9a5d8d4baa934860e5 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 16 Mar 2019 18:05:37 -0400 Subject: [PATCH 273/694] gnu: xfce4-pulseaudio-plugin: Update to 0.4.1. * gnu/packages/xfce.scm (xfce4-pulseaudio-plugin): Update to 0.4.1. --- 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 fa35c5bb57..eeb1da3eb2 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -378,15 +378,15 @@ (define-public xfce4-clipman-plugin (define-public xfce4-pulseaudio-plugin (package (name "xfce4-pulseaudio-plugin") - (version "0.2.3") + (version "0.4.1") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/panel-plugins/" + (uri (string-append "https://archive.xfce.org/src/panel-plugins/" name "/" (version-major+minor version) "/" name "-" version ".tar.bz2")) (sha256 (base32 - "0crvb2gyxbnlf46712arg3m2vqx81dixqhqdwss0bngpijy3ca78")))) + "1w29y0a066y8as12xrkbfqcn7dpdsvx97idzw7028gmcvca87a3c")))) (build-system gnu-build-system) (native-inputs `(("intltool" ,intltool) From d4986c902a78fdc72c4a8f917b4c5d056643f486 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 16 Mar 2019 18:32:27 -0400 Subject: [PATCH 274/694] gnu: xfce4-session: Update to 4.12.1. * gnu/packages/xfce.scm (xfce4-session): Update to 4.12.1. [source]: Update URL. --- gnu/packages/xfce.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index eeb1da3eb2..e1997c832d 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -474,15 +474,15 @@ (define-public xfce4-appfinder (define-public xfce4-session (package (name "xfce4-session") - (version "4.12.0") + (version "4.12.1") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/xfce/" - (version-major+minor version) - "/src/" name "-" version ".tar.bz2")) + (uri (string-append "https://archive.xfce.org/src/xfce/" + name "/" (version-major+minor version) "/" + name "-" version ".tar.bz2")) (sha256 (base32 - "01kvbd09c06j20n155hracsgrq06rlmfgdywffjsvlwpn19m9j38")) + "1z88klls3j161n5snpamz4l3p4823q4h87wdnqikczxgs2ig5mwp")) (patches ;; See: https://bugzilla.xfce.org/show_bug.cgi?id=12282 (search-patches "xfce4-session-fix-xflock4.patch")) From 1683dcdccd2f1b5121d99bf6c8727dc64f8f6ed7 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 16 Mar 2019 19:02:48 -0400 Subject: [PATCH 275/694] gnu: xfce4-settings: Update to 4.12.4. * gnu/packages/xfce.scm (xfce4-settings): Update to 4.12.4. [source]: Update URL. --- gnu/packages/xfce.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index e1997c832d..bda2008bcc 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -522,15 +522,15 @@ (define-public xfce4-session (define-public xfce4-settings (package (name "xfce4-settings") - (version "4.12.0") + (version "4.12.4") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/xfce/" - (version-major+minor version) - "/src/" name "-" version ".tar.bz2")) + (uri (string-append "http://archive.xfce.org/src/xfce/" + name "/" (version-major+minor version) "/" + name "-" version ".tar.bz2")) (sha256 (base32 - "108za1cmjslwzkdl76x9kwxkq8z734kg9nz8rxk057f10pqwxgh4")) + "16vgidhhc19dz0p0i6fp5iiwxd53ky143j6h14a9b7mz92nlr872")) (patches (search-patches "xfce4-settings-defaults.patch")))) (build-system gnu-build-system) (native-inputs From e2120220d46afb1bbe3b3ad3033bd120a87dc415 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 16 Mar 2019 19:05:19 -0400 Subject: [PATCH 276/694] gnu: thunar: Update to 1.8.4. * gnu/packages/xfce.scm (thunar): Update to 1.8.4. [source]: Update URL. --- gnu/packages/xfce.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index bda2008bcc..41e9b6ab7c 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -557,14 +557,15 @@ (define-public xfce4-settings (define-public thunar (package (name "thunar") - (version "1.6.6") + (version "1.8.4") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/xfce/4.12/src/" + (uri (string-append "http://archive.xfce.org/src/xfce/" + name "/" (version-major+minor version) "/" "Thunar-" version ".tar.bz2")) (sha256 (base32 - "1cl9v3rdzipyyxml3pyrzspxfmmssz5h5snpj18irq4an42539dr")))) + "1c4kg8w77nwi75b4ashy2m1y39icv951h63qsr1gdj6yipd53gy2")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) From 199af142718567b3005b4ce84be709e9476bf8e2 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 16 Mar 2019 19:17:41 -0400 Subject: [PATCH 277/694] gnu: xfwm4: Update to 4.12.5. * gnu/packages/xfce.scm (xfwm4): Update to 4.12.5. [source]: Update URL. --- gnu/packages/xfce.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 41e9b6ab7c..a1fbd634b3 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -619,15 +619,15 @@ (define-public thunar-volman (define-public xfwm4 (package (name "xfwm4") - (version "4.12.0") + (version "4.12.5") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/xfce/" - (version-major+minor version) - "/src/" name "-" version ".tar.bz2")) + (uri (string-append "https://archive.xfce.org/src/xfce/" + name "/" (version-major+minor version) "/" + name "-" version ".tar.bz2")) (sha256 (base32 - "0fnc2ps4k733n9qfpxrz047h1myyqjzxczl7fmkjmqwshvicpx19")))) + "1jnav0wcqlswl2v7nh61big9czg5hmnyvrvm6812sv362qic0xbp")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) From 7cc102f970b2435917da477aeb11566ee7f360b7 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 16 Mar 2019 19:26:28 -0400 Subject: [PATCH 278/694] gnu: xfdesktop: Update to 4.12.4. * gnu/packages/xfce.scm (xfdesktop): Update to 4.12.4. [source]: Update URL. --- gnu/packages/xfce.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index a1fbd634b3..639bb63766 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -649,15 +649,15 @@ (define-public xfwm4 (define-public xfdesktop (package (name "xfdesktop") - (version "4.12.0") + (version "4.12.4") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/xfce/" - (version-major+minor version) - "/src/" name "-" version ".tar.bz2")) + (uri (string-append "https://archive.xfce.org/src/xfce/" + name "/" (version-major+minor version) "/" + name "-" version ".tar.bz2")) (sha256 (base32 - "1ivzgg4792nid6wcgd1nq5vc3z0y5ip6ymq7ci5j2qkp663qnykf")))) + "1jzi851arljq5lza9inyq4ss513l62lbzbfm64a7x4320m8kb2h9")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) From 2494cd23388760c12b6a960fac79675941205791 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 16 Mar 2019 19:27:58 -0400 Subject: [PATCH 279/694] gnu: xfce4-terminal: Update to 0.8.7.4. * gnu/packages/xfce.scm (xfce4-terminal): Update to 0.8.7.4. [source]: Use HTTPS. --- 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 639bb63766..e26fe80df2 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -680,15 +680,15 @@ (define-public xfdesktop (define-public xfce4-terminal (package (name "xfce4-terminal") - (version "0.8.6") + (version "0.8.7.4") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/apps/" name "/" + (uri (string-append "https://archive.xfce.org/src/apps/" name "/" (version-major+minor version) "/" name "-" version ".tar.bz2")) (sha256 (base32 - "1mw1v20a9r8figl5m93jfp16x64bfj8yjmy5s5kbdw501425camw")))) + "1as2dh5ccmv3hdvsbxm4b0xhmv2ky2q18zxxrzr988x79npri3x8")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) From 43f2ff1914fc2bbf3192035c43a9afb13017405d Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 16 Mar 2019 19:34:06 -0400 Subject: [PATCH 280/694] gnu: xfce4-power-manager: Update to 1.6.1. * gnu/packages/xfce.scm (xfce4-power-manager): Update to 1.6.1. [source]: Update URL. --- gnu/packages/xfce.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index e26fe80df2..9a626723a5 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -762,14 +762,15 @@ (define-public xfce (define-public xfce4-power-manager (package (name "xfce4-power-manager") - (version "1.4.3") + (version "1.6.1") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/xfce/4.12" - "/src/" name "-" version ".tar.bz2")) + (uri (string-append "https://archive.xfce.org/src/xfce/" + name "/" (version-major+minor version) "/" + name "-" version ".tar.bz2")) (sha256 (base32 - "04909sfc2nrj2wg9cw6y9y2r9yrp3l3vc201sy1gaiap67fi33h1")))) + "0sv5927q8jxvdfx7b06f8s7qyq3qa1nqn0b8c1b9bf234d2jba0y")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--enable-gtk3"))) From be1e05df5c8f63688ca422cfbc041a96afefe94f Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 16 Mar 2019 19:38:14 -0400 Subject: [PATCH 281/694] gnu: xfce4-taskmanager: Update to 1.2.2. * gnu/packages/xfce.scm (xfce4-taskmanager): Update to 1.2.2. [source]: Use HTTPS. [inputs]: Add libxmu, libxext and libxt. --- gnu/packages/xfce.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 9a626723a5..f597666ea0 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -830,22 +830,26 @@ (define-public ristretto (define-public xfce4-taskmanager (package (name "xfce4-taskmanager") - (version "1.1.0") + (version "1.2.2") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/apps/" + (uri (string-append "https://archive.xfce.org/src/apps/" name "/" (version-major+minor version) "/" name "-" version ".tar.bz2")) (sha256 (base32 - "1jwywmkkkmz7406m1jq40w6apiav25cznafhigbgpjv6z5hv27if")))) + "04qflazmdrj4ys4r54yg4s5pqcjgk02idrjsls395zd4374636p4")))) (build-system gnu-build-system) (native-inputs `(("intltool" ,intltool) ("pkg-config" ,pkg-config))) (inputs `(("libwnck" ,libwnck-2) - ("gtk+" ,gtk+-2))) + ("libxmu" ,libxmu) + ("gtk+" ,gtk+) + ;; FIXME: Remove libxext and libxt when libxmu propagates them. + ("libxext" ,libxext) + ("libxt" ,libxt))) (home-page "https://goodies.xfce.org/projects/applications/xfce4-taskmanager") (synopsis "Easy to use task manager") (description From e727cb11efcaaf4fbf75ffe3224a9976191d8185 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 16 Mar 2019 21:03:31 -0400 Subject: [PATCH 282/694] gnu: xfce4-notifyd: Update to 0.4.3. * gnu/packages/xfce.scm (xfce4-notifyd): Update to 0.4.3. [source]: Use HTTPS. [inputs]: Add xfce4-panel. --- gnu/packages/xfce.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index f597666ea0..6c253849f6 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -892,22 +892,23 @@ (define-public orage (define-public xfce4-notifyd (package (name "xfce4-notifyd") - (version "0.3.6") + (version "0.4.3") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/apps/" + (uri (string-append "https://archive.xfce.org/src/apps/" name "/" (version-major+minor version) "/" name "-" version ".tar.bz2")) (sha256 (base32 - "1ybcfqfynr33g5hp2lgq17s8qyx7rq6fd2iwrpwcvm6kml6prjpl")))) + "1h7avj149cafj9dabiza22y14i66vxgp5qj0wxx8i97w9h4dlg99")))) (build-system glib-or-gtk-build-system) (native-inputs `(("intltool" ,intltool) ("pkg-config" ,pkg-config))) (inputs `(("libxfce4ui" ,libxfce4ui) - ("libnotify" ,libnotify))) + ("libnotify" ,libnotify) + ("xfce4-panel" ,xfce4-panel))) (home-page "https://goodies.xfce.org/projects/applications/xfce4-notifyd") (synopsis "Show notification bubbles on Xfce") (description From 0dfeb285234ef9b9ac6a01486b0edfa93310ee6d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 26 Nov 2018 16:42:40 +0100 Subject: [PATCH 283/694] gnu: Add grpc. * gnu/packages/machine-learning.scm (grpc): New variable. --- gnu/packages/machine-learning.scm | 41 +++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 281a95c0ab..28bb44a3ca 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -39,6 +39,7 @@ (define-module (gnu packages machine-learning) #:use-module (guix build-system r) #:use-module (guix git-download) #:use-module (gnu packages) + #:use-module (gnu packages adns) #:use-module (gnu packages algebra) #:use-module (gnu packages audio) #:use-module (gnu packages autotools) @@ -60,11 +61,13 @@ (define-module (gnu packages machine-learning) #:use-module (gnu packages onc-rpc) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages protobuf) #:use-module (gnu packages python) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages statistics) #:use-module (gnu packages swig) + #:use-module (gnu packages tls) #:use-module (gnu packages web) #:use-module (gnu packages xml) #:use-module (gnu packages xorg)) @@ -1208,3 +1211,41 @@ (define-public kaldi-gstreamer-server based on the Kaldi toolkit and the GStreamer framework and implemented in Python.") (license license:bsd-2)))) + +(define-public grpc + (package + (name "grpc") + (version "1.16.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/grpc/grpc.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1jimqz3115f9pli5w6ik9wi7mjc7ix6y7yrq4a1ab9fc3dalj7p2")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ; no test target + #:configure-flags + (list "-DgRPC_ZLIB_PROVIDER=package" + "-DgRPC_CARES_PROVIDER=package" + "-DgRPC_SSL_PROVIDER=package" + "-DgRPC_PROTOBUF_PROVIDER=package"))) + (inputs + `(("c-ares" ,c-ares-next) + ("openssl" ,openssl) + ("zlib" ,zlib))) + (native-inputs + `(("protobuf" ,protobuf-next) + ("python" ,python-wrapper))) + (home-page "https://grpc.io") + (synopsis "High performance universal RPC framework") + (description "gRPC is a modern open source high performance @dfn{Remote +Procedure Call} (RPC) framework that can run in any environment. It can +efficiently connect services in and across data centers with pluggable support +for load balancing, tracing, health checking and authentication. It is also +applicable in last mile of distributed computing to connect devices, mobile +applications and browsers to backend services.") + (license license:asl2.0))) From 19bd7f2e79737911ee03ca73521fede01fef18bd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 18 Mar 2019 15:59:45 +0100 Subject: [PATCH 284/694] gnu: Add arriba. * gnu/packages/bioinformatics.scm (arriba): New variable. --- gnu/packages/bioinformatics.scm | 66 +++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 498ebc38b6..b2d7277c23 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -14445,3 +14445,69 @@ (define-public python-velocyto "Velocyto is a library for the analysis of RNA velocity. Velocyto includes a command line tool and an analysis pipeline.") (license license:bsd-2))) + +(define-public arriba + (package + (name "arriba") + (version "1.0.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/suhrig/arriba/releases/" + "download/v" version "/arriba_v" version ".tar.gz")) + (sha256 + (base32 + "0jx9656ry766vb8z08m1c3im87b0c82qpnjby9wz4kcz8vn87dx2")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; there are none + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key inputs #:allow-other-keys) + (let ((htslib (assoc-ref inputs "htslib"))) + (substitute* "Makefile" + (("-I\\$\\(HTSLIB\\)/htslib") + (string-append "-I" htslib "/include/htslib")) + ((" \\$\\(HTSLIB\\)/libhts.a") + (string-append " " htslib "/lib/libhts.so")))) + (substitute* "run_arriba.sh" + (("^STAR ") (string-append (which "STAR") " ")) + (("samtools --version-only") + (string-append (which "samtools") " --version-only")) + (("samtools index") + (string-append (which "samtools") " index")) + (("samtools sort") + (string-append (which "samtools") " sort"))) + #t)) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((bin (string-append (assoc-ref outputs "out") "/bin"))) + (install-file "arriba" bin) + (install-file "run_arriba.sh" bin) + (install-file "draw_fusions.R" bin) + (wrap-program (string-append bin "/draw_fusions.R") + `("R_LIBS_SITE" ":" prefix (,(getenv "R_LIBS_SITE"))))) + #t))))) + (inputs + `(("htslib" ,htslib) + ("r-minimal" ,r-minimal) + ("r-circlize" ,r-circlize) + ("r-genomicalignments" ,r-genomicalignments) + ("r-genomicranges" ,r-genomicranges) + ("samtools" ,samtools) + ("star" ,star) + ("zlib" ,zlib))) + (home-page "https://github.com/suhrig/arriba") + (synopsis "Gene fusion detection from RNA-Seq data ") + (description + "Arriba is a command-line tool for the detection of gene fusions from +RNA-Seq data. It was developed for the use in a clinical research setting. +Therefore, short runtimes and high sensitivity were important design criteria. +It is based on the fast STAR aligner and the post-alignment runtime is +typically just around two minutes. In contrast to many other fusion detection +tools which build on STAR, Arriba does not require to reduce the +@code{alignIntronMax} parameter of STAR to detect small deletions.") + ;; All code is under the Expat license with the exception of + ;; "draw_fusions.R", which is under GPLv3. + (license (list license:expat license:gpl3)))) From ee4ca57809ca51619e61f0a509b2c9f70979d139 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 18 Mar 2019 16:02:30 +0100 Subject: [PATCH 285/694] gnu: blasr: Add home page. Reported by Efraim Flashner on IRC. * gnu/packages/bioinformatics.scm (blasr)[home-page]: Add it. --- gnu/packages/bioinformatics.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index b2d7277c23..00a74a6837 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -635,7 +635,7 @@ (define-public blasr ("zlib" ,zlib))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "") + (home-page "https://github.com/PacificBiosciences/blasr") (synopsis "PacBio long read aligner") (description "Blasr is a genomic sequence aligner for processing PacBio long reads.") From 4bccdb0ff1842d0631191e088539bcf3c9380647 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Mar 2019 15:19:12 +0100 Subject: [PATCH 286/694] gnu: libetpan: Update to 1.9.3. * gnu/packages/mail.scm (libetpan): Update to 1.9.3. --- 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 eabcdc40ca..bd2950bfbf 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1023,7 +1023,7 @@ (define-public getmail (define-public libetpan (package (name "libetpan") - (version "1.9.2") + (version "1.9.3") (source (origin (method git-fetch) (uri (git-reference @@ -1031,7 +1031,7 @@ (define-public libetpan (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "13jiy2ddxbp9f2mk1mip9sk8h97bva5m0pnq2mlvh5xhifs6gza4")))) + (base32 "19g4qskg71jv7sxfxsdkjmrxk9mk5kf9b6fhw06g6wvm3205n95f")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf-wrapper) ("automake" ,automake) From b6c7df92ca20387d3587fc27e53f50ea27102ec7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Mar 2019 15:25:30 +0100 Subject: [PATCH 287/694] gnu: perl-email-address: Update to 1.912. * gnu/packages/mail.scm (perl-email-address): Update to 1.912. --- gnu/packages/mail.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index bd2950bfbf..07d5ee1da3 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1482,15 +1482,14 @@ (define-public perl-email-abstract (define-public perl-email-address (package (name "perl-email-address") - (version "1.909") + (version "1.912") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/R/RJ/RJBS/" "Email-Address-" version ".tar.gz")) (sha256 - (base32 - "0l7x6sl06j9ffgfz5f9vgms2b5axd4cgp5fj03ivb3kia4km6b3g")))) + (base32 "1vzr0vx4zsw4zbc9xdffc31wnkc1raqmyfiyws06fbyck197i8qg")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/Email-Address") (synopsis "Email address parsing and creation") From 27f172a946c41b3c47218d7cbbab773634cfd31b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Mar 2019 16:00:06 +0100 Subject: [PATCH 288/694] gnu: perl-mail-spf: Clean up. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/mail.scm (perl-mail-spf): Re-indent. [version]: Drop leading ‘v’. --- gnu/packages/mail.scm | 68 +++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 35 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 07d5ee1da3..480b1416be 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1841,45 +1841,43 @@ (define-public khard (license gpl3+))) (define-public perl-mail-spf - (package - (name "perl-mail-spf") - (version "v2.9.0") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://cpan/authors/id/J/JM/JMEHNLE/mail-spf/Mail-SPF-" + (package + (name "perl-mail-spf") + (version "2.9.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/J/JM/JMEHNLE/mail-spf/Mail-SPF-v" version ".tar.gz")) - (sha256 - (base32 - "0qk1rfgfm5drj4iyniiabrasrpqv570vzhgz66lwgb67y4amkjv1")))) - (build-system perl-build-system) - (native-inputs - `(("perl-module-build" ,perl-module-build) - ("perl-net-dns-resolver-programmable" - ,perl-net-dns-resolver-programmable))) - (arguments - `(#:phases (modify-phases %standard-phases - (add-before 'configure 'modify-Build.PL - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "Build.PL" - (("'/usr/sbin'") (string-append "'" - (assoc-ref outputs "out") - "/sbin'"))) + (sha256 + (base32 "0qk1rfgfm5drj4iyniiabrasrpqv570vzhgz66lwgb67y4amkjv1")))) + (build-system perl-build-system) + (native-inputs + `(("perl-module-build" ,perl-module-build) + ("perl-net-dns-resolver-programmable" + ,perl-net-dns-resolver-programmable))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'modify-Build.PL + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "Build.PL" + (("'/usr/sbin'") (string-append "'" + (assoc-ref outputs "out") + "/sbin'"))) #t))))) - (inputs - `(("perl-error" ,perl-error) - ("perl-net-dns" ,perl-net-dns) - ("perl-netaddr-ip" ,perl-netaddr-ip) - ("perl-uri" ,perl-uri))) - (home-page - "https://metacpan.org/release/Mail-SPF") - (synopsis - "Perl implementation of Sender Policy Framework") - (description "Mail::SPF is the Sender Policy Framework implemented + (inputs + `(("perl-error" ,perl-error) + ("perl-net-dns" ,perl-net-dns) + ("perl-netaddr-ip" ,perl-netaddr-ip) + ("perl-uri" ,perl-uri))) + (home-page "https://metacpan.org/release/Mail-SPF") + (synopsis "Perl implementation of Sender Policy Framework") + (description "Mail::SPF is the Sender Policy Framework implemented in Perl.") - (license bsd-3))) + (license bsd-3))) (define-public mb2md (package From 15871b520f01369cdf351462feea7ce0a341df1b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Mar 2019 16:13:44 +0100 Subject: [PATCH 289/694] gnu: exim: Update to 4.92 [fixes CVE-2018-6789]. * gnu/packages/mail.scm (exim): Update to 4.92. [inputs]: Use bdb-5.3. --- gnu/packages/mail.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 480b1416be..d62d5b62d9 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1193,7 +1193,7 @@ (define-public msmtp (define-public exim (package (name "exim") - (version "4.90.1") + (version "4.92") (source (origin (method url-fetch) @@ -1202,11 +1202,10 @@ (define-public exim (string-append "https://ftp.exim.org/pub/exim/exim4/old/exim-" version ".tar.bz2"))) (sha256 - (base32 - "1w6blvvrd87c649j8xpag034md2w1ib0db9c4ijqbzc5dh2i1xfq")))) + (base32 "127spqn009wa6irp6r1k7a24r8vdwb6mf0raamxn8lbxsnrwy7sl")))) (build-system gnu-build-system) (inputs - `(("bdb" ,bdb) + `(("bdb" ,bdb-5.3) ; ‘#error Version 6 and later BDB API is not supported’ ("gnutls" ,gnutls) ("gzip" ,gzip) ("bzip2" ,bzip2) @@ -1242,7 +1241,7 @@ (define-public exim (("(EXIM_USER=).*" all var) (string-append var "nobody\n")) (("(FIXED_NEVER_USERS=).*" all var) - (string-append var "\n")) ;XXX no root in build environment + (string-append var "\n")) ; XXX no root in build environment (("(COMPRESS_COMMAND=).*" all var) (string-append var gzip "/bin/gzip\n")) (("(ZCAT_COMMAND=).*" all var) From ae031d453cc43f87481dcfb06051cb6a928f4c5c Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Wed, 13 Mar 2019 16:18:02 +0530 Subject: [PATCH 290/694] import: Add Launchpad updater. * guix/import/launchpad.scm: New file. * Makefile.am (MODULES): Register it. * doc/guix.texi (Invoking guix refresh): Mention the Launchpad updater. --- Makefile.am | 1 + doc/guix.texi | 4 +- guix/import/launchpad.scm | 124 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 128 insertions(+), 1 deletion(-) create mode 100644 guix/import/launchpad.scm diff --git a/Makefile.am b/Makefile.am index 50839fcb27..9e49b079bf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -202,6 +202,7 @@ MODULES = \ guix/import/gnu.scm \ guix/import/hackage.scm \ guix/import/json.scm \ + guix/import/launchpad.scm \ guix/import/opam.scm \ guix/import/print.scm \ guix/import/pypi.scm \ diff --git a/doc/guix.texi b/doc/guix.texi index 326607e7e9..bb344e1625 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -48,7 +48,7 @@ Copyright @copyright{} 2017 Maxim Cournoyer@* Copyright @copyright{} 2017, 2018 Tobias Geerinckx-Rice@* Copyright @copyright{} 2017 George Clemmer@* Copyright @copyright{} 2017 Andy Wingo@* -Copyright @copyright{} 2017, 2018 Arun Isaac@* +Copyright @copyright{} 2017, 2018, 2019 Arun Isaac@* Copyright @copyright{} 2017 nee@* Copyright @copyright{} 2018 Rutger Helling@* Copyright @copyright{} 2018 Oleg Pykhalov@* @@ -8841,6 +8841,8 @@ the updater for @uref{https://hackage.haskell.org, Hackage} packages. the updater for @uref{https://www.stackage.org, Stackage} packages. @item crate the updater for @uref{https://crates.io, Crates} packages. +@item launchpad +the updater for @uref{https://launchpad.net, Launchpad} packages. @end table For instance, the following command only checks for updates of Emacs diff --git a/guix/import/launchpad.scm b/guix/import/launchpad.scm new file mode 100644 index 0000000000..ffd5e9221e --- /dev/null +++ b/guix/import/launchpad.scm @@ -0,0 +1,124 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2019 Arun Isaac +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (guix import launchpad) + #:use-module (ice-9 match) + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-26) + #:use-module (web uri) + #:use-module ((guix download) #:prefix download:) + #:use-module (guix import json) + #:use-module (guix packages) + #:use-module (guix upstream) + #:use-module (guix utils) + #:export (%launchpad-updater)) + +(define (find-extension url) + "Return the extension of the archive e.g. '.tar.gz' given a URL, or +false if none is recognized" + (find (lambda (x) (string-suffix? x url)) + (list ".tar.gz" ".tar.bz2" ".tar.xz" + ".zip" ".tar" ".tgz" ".tbz" ".love"))) + +(define (updated-launchpad-url old-package new-version) + ;; Return a url for the OLD-PACKAGE with NEW-VERSION. If no source url in + ;; the OLD-PACKAGE is a Launchpad url, then return false. + + (define (updated-url url) + (and (string-prefix? "https://launchpad.net/" url) + (let ((ext (or (find-extension url) "")) + (name (package-name old-package)) + (version (package-version old-package)) + (repo (launchpad-repository url))) + (cond + ((and + (>= (length (string-split version #\.)) 2) + (string=? (string-append "https://launchpad.net/" + repo "/" (version-major+minor version) + "/" version "/+download/" repo "-" version ext) + url)) + (string-append "https://launchpad.net/" + repo "/" (version-major+minor new-version) + "/" new-version "/+download/" repo "-" new-version ext)) + (#t #f))))) ; Some URLs are not recognised. + + (let ((source-uri (and=> (package-source old-package) origin-uri)) + (fetch-method (and=> (package-source old-package) origin-method))) + (cond + ((eq? fetch-method download:url-fetch) + (match source-uri + ((? string?) + (updated-url source-uri)) + ((source-uri ...) + (find updated-url source-uri)))) + (else #f)))) + +(define (launchpad-package? package) + "Return true if PACKAGE is a package from Launchpad, else false." + (->bool (updated-launchpad-url package "1.0.0"))) + +(define (launchpad-repository url) + "Return a string e.g. linuxdcpp of the name of the repository, from a string +URL of the form +'https://launchpad.net/linuxdcpp/1.1/1.1.0/+download/linuxdcpp-1.1.0.tar.bz2'" + (match (string-split (uri-path (string->uri url)) #\/) + ((_ repo . rest) repo))) + +(define (latest-released-version package-name) + "Return a string of the newest released version name given the PACKAGE-NAME, +for example, 'linuxdcpp'. Return #f if there is no releases." + (define (pre-release? x) + ;; Versions containing anything other than digit characters and "." (for + ;; example, "5.1.0-rc1") are assumed to be pre-releases. + (not (string-every (char-set-union (char-set #\.) + char-set:digit) + (hash-ref x "version")))) + + (hash-ref + (last (remove + pre-release? + (hash-ref (json-fetch + (string-append "https://api.launchpad.net/1.0/" + package-name "/releases")) + "entries"))) + "version")) + +(define (latest-release pkg) + "Return an for the latest release of PKG." + (define (origin-github-uri origin) + (match (origin-uri origin) + ((? string? url) url) ; surely a Launchpad URL + ((urls ...) + (find (cut string-contains <> "launchpad.net") urls)))) + + (let* ((source-uri (origin-github-uri (package-source pkg))) + (name (package-name pkg)) + (newest-version (latest-released-version name))) + (if newest-version + (upstream-source + (package name) + (version newest-version) + (urls (list (updated-launchpad-url pkg newest-version)))) + #f))) ; On Launchpad but no proper releases + +(define %launchpad-updater + (upstream-updater + (name 'launchpad) + (description "Updater for Launchpad packages") + (pred launchpad-package?) + (latest latest-release))) From 4cb0b5bfd784a314a97172e93c19b8c4493caf98 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 17 Mar 2019 14:08:02 -0400 Subject: [PATCH 291/694] gnu: OpenTTD: Mention 'game' in synopsis. Suggested by swedebugia . * gnu/packages/games.scm (openttd-engine)[synopsis]: Mention 'game'. --- gnu/packages/games.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index b9deda7bf9..ed8aef8bf9 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2338,7 +2338,7 @@ (define openttd-engine ("sdl" ,sdl) ("xz" ,xz) ("zlib" ,zlib))) - (synopsis "Transportation economics simulator") + (synopsis "Transportation economics simulator game") (description "OpenTTD is a game in which you transport goods and passengers by land, water and air. It is a re-implementation of Transport Tycoon Deluxe with many enhancements including multiplayer mode, From a91f4eba2c923405ccdce5bdb390b12a40a856c2 Mon Sep 17 00:00:00 2001 From: Sam Date: Sun, 17 Mar 2019 18:08:29 +0000 Subject: [PATCH 292/694] gnu: Add python-shortuuid. * gnu/packages/python-xyz.scm (python-shortuuid): New variable. Signed-off-by: Leo Famulari --- gnu/packages/python-xyz.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f9e87fb9c7..f9617b1603 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -58,6 +58,7 @@ ;;; Copyright © 2018 Luther Thompson ;;; Copyright © 2018 Vagrant Cascadian ;;; Copyright © 2019 Brett Gilio +;;; Copyright © 2019 Sam ;;; ;;; This file is part of GNU Guix. ;;; @@ -230,6 +231,28 @@ (define-public python-shapely planar geometric objects. It is based on the @code{GEOS} library.") (license license:bsd-3))) +(define-public python-shortuuid + (package + (name "python-shortuuid") + (version "0.5.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "shortuuid" version)) + (sha256 + (base32 + "1f8i4zwj5vmpzbz6b17bljy4399gx5aq7vsyw63sz2qgyjcd73yh")))) + (build-system python-build-system) + (native-inputs + `(("python-pep8" ,python-pep8))) + (home-page "https://github.com/skorokithakis/shortuuid") + (synopsis "Generator library for concise, unambiguous and URL-safe UUIDs") + (description + "@code{shortuuid} is a Python library for generating concise, unambiguous +and URL-safe UUIDs. UUIDs are generated using the built-in Python @code{uuid} +module and then similar looking characters are removed.") + (license license:bsd-3))) + (define-public python-logwrap (package (name "python-logwrap") From 4ddf067f214b83c2ab03ed52a7e9ddf6f4f6de66 Mon Sep 17 00:00:00 2001 From: Giovanni Biscuolo Date: Mon, 18 Mar 2019 17:46:05 +0100 Subject: [PATCH 293/694] gnu: Add go-github-com-burntsushi-locker * gnu/packages/golang.scm (go-github-com-burntsushi-locker): New variable. Signed-off-by: Leo Famulari --- gnu/packages/golang.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 4bcd5cfcfe..6b5b9a4cb9 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright @ 2018 Katherine Cox-Buday +;;; Copyright @ 2019 Giovanni Biscuolo ;;; ;;; This file is part of GNU Guix. ;;; @@ -3177,3 +3178,37 @@ (define-public go-github-com-kr-text (description "This package provides a text formatting functions in Go.") (home-page "https://github.com/kr/text") (license license:expat))) + +(define-public go-github-com-burntsushi-locker + (let ((commit "a6e239ea1c69bff1cfdb20c4b73dadf52f784b6a") + (revision "0")) + (package + (name "go-github-com-burntsushi-locker") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/BurntSushi/locker") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1xak4aync4klswq5217qvw191asgla51jr42y94vp109lirm5dzg")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/BurntSushi/locker")) + (home-page "https://github.com/BurntSushi/locker") + (synopsis "Manage named ReadWrite mutexes in Go") + (description "Golang package for conveniently using named read/write +locks. These appear to be especially useful for synchronizing access to +session based information in web applications. + +The common use case is to use the package level functions, which use a package +level set of locks (safe to use from multiple goroutines +simultaneously). However, you may also create a new separate set of locks +test. + +All locks are implemented with read-write mutexes. To use them like a regular +mutex, simply ignore the RLock/RUnlock functions.") + (license license:unlicense)))) From fa5a25386620cec4b2543aae24fc9a0776aa3dca Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 7 Mar 2019 11:46:16 +0100 Subject: [PATCH 294/694] gnu: Add java-openmpi. * gnu/packages/mpi.scm (java-openmpi): New variable. --- gnu/packages/mpi.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index 10de6dee5b..952edca66e 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -35,6 +35,7 @@ (define-module (gnu packages mpi) #:use-module (gnu packages) #:use-module (gnu packages fabric-management) #:use-module (gnu packages gcc) + #:use-module (gnu packages java) #:use-module (gnu packages libevent) #:use-module (gnu packages linux) #:use-module (gnu packages pciutils) @@ -265,6 +266,51 @@ (define-public openmpi ;; See file://LICENSE (license bsd-2))) +;; TODO: javadoc files contain timestamps. +(define-public java-openmpi + (package (inherit openmpi) + (name "java-openmpi") + (inputs + `(("openmpi" ,openmpi) + ,@(package-inputs openmpi))) + (native-inputs + `(("jdk" ,openjdk11 "jdk") + ("zip" ,(@ (gnu packages compression) zip)) + ,@(package-native-inputs openmpi))) + (outputs '("out")) + (arguments + `(#:modules ((guix build gnu-build-system) + ((guix build ant-build-system) #:prefix ant:) + (guix build utils)) + #:imported-modules ((guix build ant-build-system) + (guix build syscalls) + ,@%gnu-build-system-modules) + ,@(substitute-keyword-arguments (package-arguments openmpi) + ((#:configure-flags flags) + `(cons "--enable-mpi-java" ,flags)) + ((#:make-flags flags ''()) + `(append '("-C" "ompi/mpi/java") + ,flags)) + ((#:phases phases) + `(modify-phases ,phases + ;; We could provide the location of the JDK in the configure + ;; flags, but since the configure flags are embedded in the + ;; info binaries that would leave a reference to the JDK in + ;; the "out" output. To avoid this we set JAVA_HOME. + (add-after 'unpack 'set-JAVA_HOME + (lambda* (#:key inputs #:allow-other-keys) + (setenv "JAVA_HOME" (assoc-ref inputs "jdk")) + #t)) + (add-after 'unpack 'link-with-existing-mpi-libraries + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "ompi/mpi/java/c/Makefile.in" + (("\\$\\(top_builddir\\)/ompi/lib@OMPI_LIBMPI_NAME@.la") + (string-append (assoc-ref inputs "openmpi") "/lib/libmpi.la"))) + #t)) + (add-after 'install 'strip-jar-timestamps + (assoc-ref ant:%standard-phases 'strip-jar-timestamps))))))) + (synopsis "Java bindings for MPI"))) + (define-public openmpi-thread-multiple (package (inherit openmpi) From dc8871efbeca3bb2774b2f61b5ad3027d2771581 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Mar 2019 16:27:26 +0100 Subject: [PATCH 295/694] gnu: mutt: Update to 1.11.4. * gnu/packages/mail.scm (mutt): Update to 1.11.4. --- 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 d62d5b62d9..0467aec0dc 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -343,14 +343,14 @@ (define-public fetchmail (define-public mutt (package (name "mutt") - (version "1.11.3") + (version "1.11.4") (source (origin (method url-fetch) (uri (string-append "https://bitbucket.org/mutt/mutt/downloads/" "mutt-" version ".tar.gz")) (sha256 (base32 - "0h8rmcc62n1pagm7mjjccd5fxyhhi4vbvp8m88digkdf5z0g8hm5")) + "0098pr4anmq2a0id8wfi2vci3cgcfwf9k4q411w22xn8lrz3aldn")) (patches (search-patches "mutt-store-references.patch")))) (build-system gnu-build-system) (inputs From 9a0681d1492eb4095f1ca5a8934e1d50af510aac Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Mar 2019 16:51:49 +0100 Subject: [PATCH 296/694] gnu: fdm: Update to 2.0. * gnu/packages/mail.scm (fdm): Update to 2.0. [source]: Remove redundant FILE-NAME. --- gnu/packages/mail.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 0467aec0dc..0fb60d40c2 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1728,15 +1728,13 @@ (define-public esmtp (define-public fdm (package (name "fdm") - (version "1.9") + (version "2.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/nicm/fdm/releases/download/" - version "/fdm-" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + version "/fdm-" version ".tar.gz")) (sha256 - (base32 "054rscijahiza5f9qha79rg3siji3bk5mk10f8c2vqx7m4w6qh8n")))) + (base32 "196fs1z8y7p12wmqn1bylzz94szl58yv2aby3p30nmwjnyv8rch6")))) (build-system gnu-build-system) (inputs `(("tdb" ,tdb) From 330aa6c2fad9bc7769768de8fe1869e85d6d9253 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Mar 2019 17:32:42 +0100 Subject: [PATCH 297/694] gnu: mailutils: Update to 3.6. * gnu/packages/mail.scm (mailutils): Update to 3.6. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 0fb60d40c2..c779052de2 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -134,14 +134,14 @@ (define-module (gnu packages mail) (define-public mailutils (package (name "mailutils") - (version "3.5") + (version "3.6") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/mailutils/mailutils-" version ".tar.xz")) (sha256 (base32 - "1wx275w38fwni2abc8g7g3irbk332vr34byxd72zqfdiznsqgims")))) + "07phzpwrnkdclx6jvirljk9zcavl8wh02kpx3mfba9msr99kpqj6")))) (build-system gnu-build-system) (arguments '(#:phases From aef4c482a31eb6df64d0a5227365eaa2d4c46beb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Mar 2019 17:33:23 +0100 Subject: [PATCH 298/694] gnu: mailutils: Add SEARCH CHARSET support. * gnu/packages/mail.scm (mailutils)[inputs]: Add libiconv and libunistring. --- gnu/packages/mail.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index c779052de2..278ad1f7ef 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -84,6 +84,7 @@ (define-module (gnu packages mail) #:use-module (gnu packages libcanberra) #:use-module (gnu packages libevent) #:use-module (gnu packages libidn) + #:use-module (gnu packages libunistring) #:use-module (gnu packages linux) #:use-module (gnu packages lua) #:use-module (gnu packages m4) @@ -213,7 +214,11 @@ (define-public mailutils ("readline" ,readline) ("linux-pam" ,linux-pam) ("libltdl" ,libltdl) - ("gdbm" ,gdbm))) + ("gdbm" ,gdbm) + + ;; Required for SEARCH CHARSET. + ("libiconv" ,libiconv) + ("libunistring" ,libunistring))) (home-page "https://mailutils.org") (synopsis "Utilities and library for reading and serving mail") (description From 18199da4b79ce79d5002c3290cc1fa95454d92ce Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Sat, 16 Mar 2019 17:24:06 -0500 Subject: [PATCH 299/694] gnu: Add Go 1.12. * gnu/packages/golang.scm (go-1.12): New variable. Signed-off-by: Leo Famulari --- gnu/packages/golang.scm | 188 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 187 insertions(+), 1 deletion(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 6b5b9a4cb9..dd9f55352a 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2018 Tomáš Čech ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2018 Pierre Neidhardt -;;; Copyright @ 2018 Katherine Cox-Buday +;;; Copyright @ 2018, 2019 Katherine Cox-Buday ;;; Copyright @ 2019 Giovanni Biscuolo ;;; ;;; This file is part of GNU Guix. @@ -414,6 +414,192 @@ (define-public go-1.11 ,@(package-native-inputs go-1.4))) (supported-systems %supported-systems))) + +(define-public go-1.12 + (package + (inherit go-1.4) + (name "go") + (version "1.12.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://storage.googleapis.com/golang/" + name version ".src.tar.gz")) + (sha256 + (base32 + "12l12mmgqvy3nbscy7sz83qj4m6iz5a322aq9sk45f7l9ml2gq8b")))) + (arguments + (substitute-keyword-arguments (package-arguments go-1.4) + ((#:phases phases) + `(modify-phases ,phases + (replace 'prebuild + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((gcclib (string-append (assoc-ref inputs "gcc:lib") "/lib")) + (ld (string-append (assoc-ref inputs "libc") "/lib")) + (loader (car (find-files ld "^ld-linux.+"))) + (net-base (assoc-ref inputs "net-base")) + (tzdata-path + (string-append (assoc-ref inputs "tzdata") "/share/zoneinfo")) + (output (assoc-ref outputs "out"))) + + ;; A side effect of these test scripts is testing + ;; cgo. Attempts at using cgo flags and directives with these + ;; scripts as specified here (https://golang.org/cmd/cgo/) + ;; have not worked. The tests continue to state that they can + ;; not find object files/headers despite being present. + (for-each + delete-file + '("cmd/go/testdata/script/mod_case_cgo.txt" + "cmd/go/testdata/script/list_find.txt" + "cmd/go/testdata/script/list_compiled_imports.txt" + "cmd/go/testdata/script/cgo_syso_issue29253.txt")) + + (substitute* "os/os_test.go" + (("/usr/bin") (getcwd)) + (("/bin/pwd") (which "pwd")) + (("/bin/sh") (which "sh"))) + + (substitute* "cmd/vendor/golang.org/x/sys/unix/syscall_unix_test.go" + (("/usr/bin") "/tmp")) + + ;; Add libgcc to runpath + (substitute* "cmd/link/internal/ld/lib.go" + (("!rpath.set") "true")) + (substitute* "cmd/go/internal/work/gccgo.go" + (("cgoldflags := \\[\\]string\\{\\}") + (string-append "cgoldflags := []string{" + "\"-rpath=" gcclib "\"" + "}")) + (("\"-lgcc_s\", ") + (string-append + "\"-Wl,-rpath=" gcclib "\", \"-lgcc_s\", "))) + (substitute* "cmd/go/internal/work/gc.go" + (("ldflags = setextld\\(ldflags, compiler\\)") + (string-append + "ldflags = setextld(ldflags, compiler)\n" + "ldflags = append(ldflags, \"-r\")\n" + "ldflags = append(ldflags, \"" gcclib "\")\n"))) + + ;; Disable failing tests: these tests attempt to access + ;; commands or network resources which are neither available + ;; nor necessary for the build to succeed. + (for-each + (match-lambda + ((file regex) + (substitute* file + ((regex all before test_name) + (string-append before "Disabled" test_name))))) + '(("net/net_test.go" "(.+)(TestShutdownUnix.+)") + ("net/dial_test.go" "(.+)(TestDialTimeout.+)") + ("net/cgo_unix_test.go" "(.+)(TestCgoLookupPort.+)") + ("net/cgo_unix_test.go" "(.+)(TestCgoLookupPortWithCancel.+)") + ;; 127.0.0.1 doesn't exist + ("net/cgo_unix_test.go" "(.+)(TestCgoLookupPTR.+)") + ;; 127.0.0.1 doesn't exist + ("net/cgo_unix_test.go" "(.+)(TestCgoLookupPTRWithCancel.+)") + ;; /etc/services doesn't exist + ("net/parse_test.go" "(.+)(TestReadLine.+)") + ("os/os_test.go" "(.+)(TestHostname.+)") + ;; The user's directory doesn't exist + ("os/os_test.go" "(.+)(TestUserHomeDir.+)") + ("time/format_test.go" "(.+)(TestParseInSydney.+)") + ("time/format_test.go" "(.+)(TestParseInLocation.+)") + ("os/exec/exec_test.go" "(.+)(TestEcho.+)") + ("os/exec/exec_test.go" "(.+)(TestCommandRelativeName.+)") + ("os/exec/exec_test.go" "(.+)(TestCatStdin.+)") + ("os/exec/exec_test.go" "(.+)(TestCatGoodAndBadFile.+)") + ("os/exec/exec_test.go" "(.+)(TestExitStatus.+)") + ("os/exec/exec_test.go" "(.+)(TestPipes.+)") + ("os/exec/exec_test.go" "(.+)(TestStdinClose.+)") + ("os/exec/exec_test.go" "(.+)(TestIgnorePipeErrorOnSuccess.+)") + ("syscall/syscall_unix_test.go" "(.+)(TestPassFD\\(.+)") + ("os/exec/exec_test.go" "(.+)(TestExtraFiles/areturn.+)") + ("cmd/go/go_test.go" "(.+)(TestCoverageWithCgo.+)") + ("cmd/go/go_test.go" "(.+)(TestTwoPkgConfigs.+)") + ("os/exec/exec_test.go" "(.+)(TestOutputStderrCapture.+)") + ("os/exec/exec_test.go" "(.+)(TestExtraFiles.+)") + ("os/exec/exec_test.go" "(.+)(TestExtraFilesRace.+)") + ("net/lookup_test.go" "(.+)(TestLookupPort.+)") + ("syscall/exec_linux_test.go" + "(.+)(TestCloneNEWUSERAndRemapNoRootDisableSetgroups.+)"))) + + ;; fix shebang for testar script + ;; note the target script is generated at build time. + (substitute* "../misc/cgo/testcarchive/carchive_test.go" + (("#!/usr/bin/env") (string-append "#!" (which "env")))) + + (substitute* "net/lookup_unix.go" + (("/etc/protocols") (string-append net-base "/etc/protocols"))) + (substitute* "net/port_unix.go" + (("/etc/services") (string-append net-base "/etc/services"))) + (substitute* "time/zoneinfo_unix.go" + (("/usr/share/zoneinfo/") tzdata-path)) + (substitute* (find-files "cmd" "\\.go") + (("/lib(64)?/ld-linux.*\\.so\\.[0-9]") loader)) + #t))) + (add-before 'build 'set-bootstrap-variables + (lambda* (#:key outputs inputs #:allow-other-keys) + ;; Tell the build system where to find the bootstrap Go. + (let ((go (assoc-ref inputs "go"))) + (setenv "GOROOT_BOOTSTRAP" go) + (setenv "GOGC" "400") + #t))) + (replace 'build + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; FIXME: Some of the .a files are not bit-reproducible. + (let* ((output (assoc-ref outputs "out"))) + (setenv "CC" (which "gcc")) + (setenv "GOOS" "linux") + (setenv "GOROOT" (dirname (getcwd))) + (setenv "GOROOT_FINAL" output) + (setenv "CGO_ENABLED" "1") + (invoke "sh" "all.bash")))) + + (replace 'install + ;; TODO: Most of this could be factorized with Go 1.4. + (lambda* (#:key outputs #:allow-other-keys) + (let* ((output (assoc-ref outputs "out")) + (doc_out (assoc-ref outputs "doc")) + (docs (string-append doc_out "/share/doc/" ,name "-" ,version)) + (src (string-append + (assoc-ref outputs "tests") "/share/" ,name "-" ,version))) + (delete-file-recursively "../pkg/bootstrap") + ;; Prevent installation of the build cache, which contains + ;; store references to most of the tools used to build Go and + ;; would unnecessarily increase the size of Go's closure if it + ;; was installed. + (delete-file-recursively "../pkg/obj") + + (mkdir-p src) + (copy-recursively "../test" (string-append src "/test")) + (delete-file-recursively "../test") + (mkdir-p docs) + (copy-recursively "../api" (string-append docs "/api")) + (delete-file-recursively "../api") + (copy-recursively "../doc" (string-append docs "/doc")) + (delete-file-recursively "../doc") + + (for-each + (lambda (file) + (let* ((filein (string-append "../" file)) + (fileout (string-append docs "/" file))) + (copy-file filein fileout) + (delete-file filein))) + ;; Note the slightly different file names compared to 1.4. + '("README.md" "CONTRIBUTORS" "AUTHORS" "PATENTS" + "LICENSE" "VERSION" "CONTRIBUTING.md" "robots.txt")) + + (copy-recursively "../" output) + #t))))))) + (native-inputs + `(("go" ,go-1.4) + ,@(match (%current-system) + ((or "armhf-linux" "aarch64-linux") + `(("gold" ,binutils-gold))) + (_ `())) + ,@(package-native-inputs go-1.4))) + (supported-systems %supported-systems))) + (define-public go go-1.11) (define-public go-github-com-alsm-ioprogress From bf197dcda060376e8af5b6c2886c9df023194548 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 18 Mar 2019 13:02:57 -0400 Subject: [PATCH 300/694] gnu: Go 1.11: Update to 1.11.6. * gnu/packages/golang.scm (go-1.11): Update to 1.11.6. [arguments]: Remove the 'tarbomb-workaround' phase and inherit the 'chdir' phase. --- gnu/packages/golang.scm | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index dd9f55352a..cc896405cb 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -226,7 +226,7 @@ (define-public go-1.11 (package (inherit go-1.4) (name "go") - (version "1.11.5") + (version "1.11.6") (source (origin (method url-fetch) @@ -234,23 +234,11 @@ (define-public go-1.11 name version ".src.tar.gz")) (sha256 (base32 - "0gllmbjvp12iszwils8id78mvjxwviwf98lh2gdkb236n4mz07mw")))) + "0cz1sdhxf9283p1p4jxb020pym0ncd0qlfh36r3hkv6bbm1a2vd9")))) (arguments (substitute-keyword-arguments (package-arguments go-1.4) ((#:phases phases) `(modify-phases ,phases - ;; XXX Work around the Go 1.11.5 tarbomb. - ;; - (add-after 'unpack 'tarbomb-workaround - (lambda _ - (chdir "..") - (delete-file-recursively "gocache") - (delete-file-recursively "tmp") - #t)) - (replace 'chdir - (lambda _ - (chdir "go/src") - #t)) (replace 'prebuild (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((gcclib (string-append (assoc-ref inputs "gcc:lib") "/lib")) From b520a00d32615e9a8d7d71ff16b194fb4498b328 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Mar 2019 17:39:31 +0100 Subject: [PATCH 301/694] gnu: lua-sec: Update to 0.7. * gnu/packages/lua.scm (lua-sec, lua5.1-sec, lua5.2-sec): Update to 0.7. --- 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 a647cf22e7..ff62d3b362 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -290,14 +290,14 @@ (define-public lua5.2-filesystem (define (make-lua-sec name lua) (package (name name) - (version "0.6") + (version "0.7") (source (origin (method url-fetch) (uri (string-append "https://github.com/brunoos/luasec/archive/" "luasec-" version ".tar.gz")) (sha256 (base32 - "0pgd1anzznl4s0h16wg8dlw9mgdb9h52drlcki6sbf5y31fa7wyf")))) + "0c9sdz3gvrsbvvdqzpnsappgwl40hfljlpfybqis6wia3mdyjxi1")))) (build-system gnu-build-system) (arguments `(#:make-flags From 98a5cd51b3a432e77e50456ed51d048beba7be17 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Mar 2019 17:49:51 +0100 Subject: [PATCH 302/694] gnu: ipopt: Update to 3.12.12. * gnu/packages/maths.scm (ipopt): Update to 3.12.12. --- gnu/packages/maths.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index af2c141ee5..ee7ebf2ec2 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -20,7 +20,7 @@ ;;; Copyright © 2017 Ben Woodcroft ;;; Copyright © 2017 Theodoros Foradis ;;; Copyright © 2017, 2019 Arun Isaac -;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2017 Dave Love ;;; Copyright © 2018 Jan Nieuwenhuizen ;;; Copyright © 2018 Joshua Sierles, Nextjournal @@ -1298,7 +1298,7 @@ (define-public nlopt (define-public ipopt (package (name "ipopt") - (version "3.12.5") + (version "3.12.12") (source (origin (method url-fetch) (uri (string-append @@ -1306,7 +1306,7 @@ (define-public ipopt version".tgz")) (sha256 (base32 - "09bk2hqy2vgi4yi76xng9zxakddwqy3wij9nx7wf2vfbxxpazrsk")) + "07yn9rzdswjk8n246qq6ci9ssf2bcplkifcpsfz9j6cdxw9vgbkv")) (modules '((guix build utils))) (snippet ;; Make sure we don't use the bundled software. From 31f6c6123b434a9704d22b5545424e12e55d93a9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Mar 2019 20:59:35 +0100 Subject: [PATCH 303/694] gnu: ngircd: Update to 25. * gnu/packages/messaging.scm (ngircd): Update to 25. --- 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 c27c465957..3142919ddb 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -306,14 +306,14 @@ (define-public hexchat (define-public ngircd (package (name "ngircd") - (version "24") + (version "25") (source (origin (method url-fetch) (uri (string-append "https://arthur.barton.de/pub/ngircd/ngircd-" version ".tar.xz")) (sha256 (base32 - "020h9d1awyxqr0l42x1fhs47q7cmm17fdxzjish8p2kq23ma0gqp")) + "0kpf5qi98m9f833r4rx9n6h9p31biwk798jwc1mgzmix7sp7r6f4")) (patches (search-patches "ngircd-handle-zombies.patch")))) (build-system gnu-build-system) ;; Needed for the test suite. From 1b80ed7d5ba6eb0becde4de43dd840f235fb51b5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 18 Mar 2019 21:21:02 +0100 Subject: [PATCH 304/694] gnu: synthv1: Update to 0.9.6. * gnu/packages/music.scm (synthv1): Update to 0.9.6. --- 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 c98f050caf..c9cbb95e1d 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1306,7 +1306,7 @@ (define-public jalv-select (define-public synthv1 (package (name "synthv1") - (version "0.9.5") + (version "0.9.6") (source (origin (method url-fetch) (uri @@ -1314,7 +1314,7 @@ (define-public synthv1 "/synthv1-" version ".tar.gz")) (sha256 (base32 - "1b9w4cml3cmcg09kh852cahas6l9ks8wl3gzp1az8rzxz4229yg1")))) + "1hcngk7mxfrqf8v3r759x3wd0p02nc3q83j8m3k58p408y3mx7nr")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; there are no tests From c0541ba822eb31a0bdd0eebb8decd716e3083d35 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 18 Mar 2019 21:23:17 +0100 Subject: [PATCH 305/694] gnu: drumkv1: Update to 0.9.6. * gnu/packages/music.scm (drumkv1): Update to 0.9.6. --- 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 c9cbb95e1d..dcb7a32199 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1340,7 +1340,7 @@ (define-public synthv1 (define-public drumkv1 (package (name "drumkv1") - (version "0.9.5") + (version "0.9.6") (source (origin (method url-fetch) (uri @@ -1348,7 +1348,7 @@ (define-public drumkv1 "/drumkv1-" version ".tar.gz")) (sha256 (base32 - "1azzwqgrrr4zr509sib2jvigfvz5bkwnx82chdadxdwfarai8586")))) + "0d0kskr9pzdckw7sz4djjkkkgz1fa83zrq5my6qlxn68wqdj6800")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; there are no tests From 1540d80d9f40da9114753b0823c85d2dff7af470 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 18 Mar 2019 21:26:10 +0100 Subject: [PATCH 306/694] gnu: samplv1: Update to 0.9.6. * gnu/packages/music.scm (samplv1): Update to 0.9.6. --- 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 dcb7a32199..c051e8e047 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1375,7 +1375,7 @@ (define-public drumkv1 (define-public samplv1 (package (name "samplv1") - (version "0.9.5") + (version "0.9.6") (source (origin (method url-fetch) (uri @@ -1383,7 +1383,7 @@ (define-public samplv1 "/samplv1-" version ".tar.gz")) (sha256 (base32 - "0402rdr46za21w34m7ajzbwiiqcd1h0da3b0ldsr2z5g2mrkzxv8")))) + "16a5xix9pn0gl3fr6bv6zl1l9vrzgvy1q7xd8yxzfr3vi5s8x4z9")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; there are no tests From 43ec3b68e544aeea70af22ad5bfe8c766431740c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 18 Mar 2019 21:27:20 +0100 Subject: [PATCH 307/694] gnu: padthv1: Update to 0.9.6. * gnu/packages/music.scm (padthv1): Update to 0.9.6. --- 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 c051e8e047..3a1130c673 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1410,7 +1410,7 @@ (define-public samplv1 (define-public padthv1 (package (name "padthv1") - (version "0.9.5") + (version "0.9.6") (source (origin (method url-fetch) (uri @@ -1418,7 +1418,7 @@ (define-public padthv1 "/padthv1-" version ".tar.gz")) (sha256 (base32 - "0cd1jfb3ynfrsbz8jwfsbvs5liyddxg4zghrvz931qkkqi117hbh")))) + "0ddvlpjlg6zr9ckanqhisw0sgm8rxibvj1aj5dxzs9xb2wlwd8rr")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; there are no tests From 6e42cef0abdce00629294794ba06fe75e161ffb4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 18 Mar 2019 21:34:42 +0100 Subject: [PATCH 308/694] gnu: Add bbmap. * gnu/packages/bioinformatics.scm (bbmap): New variable. --- gnu/packages/bioinformatics.scm | 76 +++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 00a74a6837..9eaf40adbd 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -14357,6 +14357,82 @@ (define-public python-pyfit-sne is a Cython wrapper for FIt-SNE.") (license license:bsd-4))) +(define-public bbmap + (package + (name "bbmap") + (version "35.82") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://sourceforge/bbmap/BBMap_" version ".tar.gz")) + (sha256 + (base32 + "1q4rfhxcb6z3gm8zg2davjz98w22lkf4hm9ikxz9kdl93pil3wkd")))) + (build-system ant-build-system) + (arguments + `(#:build-target "dist" + #:tests? #f ; there are none + #:make-flags + (list (string-append "-Dmpijar=" + (assoc-ref %build-inputs "java-openmpi") + "/lib/mpi.jar")) + #:modules ((guix build ant-build-system) + (guix build utils) + (guix build java-utils)) + #:phases + (modify-phases %standard-phases + (add-after 'build 'build-jni-library + (lambda _ + (with-directory-excursion "jni" + (invoke "make" "-f" "makefile.linux")))) + ;; There is no install target + (replace 'install (install-jars "dist")) + (add-after 'install 'install-scripts-and-documentation + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "calcmem.sh" + (("\\| awk ") (string-append "| " (which "awk") " "))) + (let* ((scripts (find-files "." "\\.sh$")) + (out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (doc (string-append out "/share/doc/bbmap")) + (jni (string-append out "/lib/jni"))) + (substitute* scripts + (("\\$DIR\"\"docs") doc) + (("^CP=.*") + (string-append "CP=" out "/share/java/BBTools.jar\n")) + (("^NATIVELIBDIR.*") + (string-append "NATIVELIBDIR=" jni "\n")) + (("CMD=\"java") + (string-append "CMD=\"" (which "java")))) + (for-each (lambda (script) (install-file script bin)) scripts) + + ;; Install JNI library + (install-file "jni/libbbtoolsjni.so" jni) + + ;; Install documentation + (install-file "docs/readme.txt" doc) + (copy-recursively "docs/guides" doc)) + #t))) + #:jdk ,openjdk11)) + (inputs + `(("gawk" ,gawk) + ("java-eclipse-jdt-core" ,java-eclipse-jdt-core) + ("java-eclipse-jdt-compiler-apt" ,java-eclipse-jdt-compiler-apt) + ("java-openmpi" ,java-openmpi))) + (home-page "http://sourceforge.net/projects/bbmap/") + (synopsis "Aligner and other tools for short sequencing reads") + (description + "This package provides bioinformatic tools to align, deduplicate, +reformat, filter and normalize DNA and RNA-seq data. It includes the +following tools: BBMap, a short read aligner for DNA and RNA-seq data; BBNorm, +a kmer-based error-correction and normalization tool; Dedupe, a tool to +simplify assemblies by removing duplicate or contained subsequences that share +a target percent identity; Reformat, to convert reads between +fasta/fastq/scarf/fasta+qual/sam, interleaved/paired, and ASCII-33/64, at over +500 MB/s; and BBDuk, a tool to filter, trim, or mask reads with kmer matches +to an artifact/contaminant file.") + (license license:bsd-3))) + (define-public velvet (package (name "velvet") From 0e36b2b7d03b7901e33cfcca6e65bdb9b344aa73 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Mar 2019 21:42:00 +0100 Subject: [PATCH 309/694] gnu: gnuplot: Update to 5.2.6. * gnu/packages/maths.scm (gnuplot): Update to 5.2.6. --- gnu/packages/maths.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index ee7ebf2ec2..ef55a948c3 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -611,15 +611,14 @@ (define-public scalapack (define-public gnuplot (package (name "gnuplot") - (version "5.2.4") + (version "5.2.6") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/gnuplot/gnuplot/" version "/gnuplot-" version ".tar.gz")) (sha256 - (base32 - "1jvh8xmd2cvrhlsg88kxwh55wkwx31sg50v1n59slfippl0g058m")))) + (base32 "1vllgap08nhvdmc03idmkdnk9cfl2bp81hps50q1pqrr640qzp9m")))) (build-system gnu-build-system) (inputs `(("readline" ,readline) ("cairo" ,cairo) From d1ef0e024fb95207d4e0589074c4334799ea246f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Mar 2019 21:45:03 +0100 Subject: [PATCH 310/694] gnu: bitlbee-discord: Don't use unstable tarball. * gnu/packages/messaging.scm (bitlbee-discord)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/messaging.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 3142919ddb..6cee5d2877 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -212,15 +212,15 @@ (define-public bitlbee-discord (package (name "bitlbee-discord") (version "0.4.1") - (source (origin - (method url-fetch) - (uri - (string-append "https://github.com/sm00th/bitlbee-discord/" - "archive/" version ".tar.gz")) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1bwqxlg6fwj3749y7w69n9jwsdzf5nl9xqiszbpv9k8x1422i1y1")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sm00th/bitlbee-discord.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1n3xw5mcmg7224r09gbm39bd6h2158dwl6jx21290636b4345f4c")))) (build-system gnu-build-system) (arguments `(#:phases From 886e97725df6668d7ffac9738f87b8196cd8e725 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Mar 2019 21:48:02 +0100 Subject: [PATCH 311/694] gnu: bitlbee-discord: Update to 0.4.2. * gnu/packages/messaging.scm (bitlbee-discord): Update to 0.4.2. --- gnu/packages/messaging.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 6cee5d2877..2a910c4bc6 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -211,7 +211,7 @@ (define-public bitlbee (define-public bitlbee-discord (package (name "bitlbee-discord") - (version "0.4.1") + (version "0.4.2") (source (origin (method git-fetch) @@ -220,7 +220,7 @@ (define-public bitlbee-discord (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1n3xw5mcmg7224r09gbm39bd6h2158dwl6jx21290636b4345f4c")))) + (base32 "02pigk2vbz0jdz11f96sygdvp1j762yjn62h124fkcsc070g7a2f")))) (build-system gnu-build-system) (arguments `(#:phases @@ -243,7 +243,7 @@ (define-public bitlbee-discord ("automake" ,automake) ("texinfo" ,texinfo) ("libtool" ,libtool) - ("bitlbee" ,bitlbee) ;needs bitlbee headers + ("bitlbee" ,bitlbee) ; needs bitlbee headers ("bash" ,bash))) (synopsis "Discord plugin for Bitlbee") (description "Bitlbee-discord is a plugin for Bitlbee witch provides From b2c52fc9ffeb0a7488290878bf3fc77a8f1225c5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Mar 2019 21:58:22 +0100 Subject: [PATCH 312/694] gnu: petsc: Update to 3.10.4. * gnu/packages/maths.scm (petsc): Update to 3.10.4. --- gnu/packages/maths.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index ef55a948c3..a58049b96c 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1637,7 +1637,7 @@ (define-public maxflow (define-public petsc (package (name "petsc") - (version "3.10.3") + (version "3.10.4") (source (origin (method url-fetch) @@ -1645,9 +1645,9 @@ (define-public petsc (uri (string-append "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/" "petsc-lite-" version ".tar.gz")) (sha256 - (base32 "10p9ap1rp6k8k2g8zdc505kdlsc3976fjymyp393sccjapm50dph")))) - (outputs '("out" ;libraries and headers - "examples")) ;~30MiB of examples + (base32 "0fk16944zh3473ra198kdkxdn08rq7b6ap838hxy1mh1i0hb488r")))) + (outputs '("out" ; libraries and headers + "examples")) ; ~30MiB of examples (build-system gnu-build-system) (native-inputs `(("python" ,python-2))) @@ -1660,7 +1660,7 @@ (define-public petsc )) (arguments `(#:test-target "test" - #:parallel-build? #f ;build is parallel by default + #:parallel-build? #f ; build is parallel by default #:configure-flags `("--with-mpi=0" "--with-openmp=1" From 110387f894d25803f8d1cf799df4b6ca4667adbe Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Mar 2019 22:01:10 +0100 Subject: [PATCH 313/694] gnu: proxychains-ng: Don't use NAME in source URI. * gnu/packages/networking.scm (proxychains-ng)[source]: Hard-code NAME. --- gnu/packages/networking.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index ecfd373365..52fd5f0c26 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1168,7 +1168,7 @@ (define-public proxychains-ng (origin (method url-fetch) (uri (string-append "http://ftp.barfooze.de/pub/sabotage/tarballs/" - name "-" version ".tar.xz")) + "proxychains-ng-" version ".tar.xz")) (sha256 (base32 "0418fv8hgf43rzrxxlybg49jz2h6w8inndhb6v1184k4cwzjnl3p")))) From 223ef546df8e1c4cd110c508075dd7be655aadbb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Mar 2019 22:01:14 +0100 Subject: [PATCH 314/694] gnu: proxychains-ng: Update to 4.14. * gnu/packages/networking.scm (proxychains-ng): Update to 4.14. --- 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 52fd5f0c26..73205605ea 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1163,18 +1163,17 @@ (define-public libproxy (define-public proxychains-ng (package (name "proxychains-ng") - (version "4.13") + (version "4.14") (source (origin (method url-fetch) (uri (string-append "http://ftp.barfooze.de/pub/sabotage/tarballs/" "proxychains-ng-" version ".tar.xz")) (sha256 - (base32 - "0418fv8hgf43rzrxxlybg49jz2h6w8inndhb6v1184k4cwzjnl3p")))) + (base32 "1bmhfbl1bzc87vl0xwr1wh5xvslfyc41nl2hqzhbj258p0sy004x")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; there are no tests + `(#:tests? #f ; there are no tests #:phases (modify-phases %standard-phases (add-after 'unpack 'fix-configure-script From 01d7cafeef674f0e0603bdb3988271cf2c119fb2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Mar 2019 22:15:22 +0100 Subject: [PATCH 315/694] gnu: bwm-ng: Update to 0.6.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/networking.scm (bwm-ng): Update to 0.6.2. [source]: Use GIT-FETCH and GIT-FILE-NAME. [arguments]: Add ‘disable-premature-./configure’ phase. [native-inputs]: Add autoconf and automake. --- gnu/packages/networking.scm | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 73205605ea..1ea152a1fe 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -800,17 +800,31 @@ (define-public httpstat (define-public bwm-ng (package (name "bwm-ng") - (version "0.6.1") + (version "0.6.2") (source (origin - (method url-fetch) - (uri (string-append "https://www.gropp.org/bwm-ng/bwm-ng-" - version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/vgropp/bwm-ng.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 - "1w0dwpjjm9pqi613i8glxrgca3rdyqyp3xydzagzr5ndc34z6z02")))) + (base32 "0k906wb4pw3dcqpcwnni78lahzi3bva483f8c17sjykic7as4y5n")))) (build-system gnu-build-system) - (inputs `(("ncurses" ,ncurses))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'disable-premature-./configure + (lambda _ + (substitute* "autogen.sh" + (("\\$srcdir/configure") + "true")) + #t))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake))) + (inputs + `(("ncurses" ,ncurses))) (synopsis "Console based live network and disk I/O bandwidth monitor") (description "Bandwidth Monitor NG is a small and simple console based live network and disk I/O bandwidth monitor.") From 402db5113f89afc27a1112e26bd92a8194f43cc9 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Mon, 18 Mar 2019 23:22:33 +0100 Subject: [PATCH 316/694] gnu: arb: Update to 2.16.0. * gnu/packages/algebra.scm (arb): Update to 2.16.0. --- 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 67385d1875..2849a565c3 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -380,7 +380,7 @@ (define-public flint (define-public arb (package (name "arb") - (version "2.14.0") + (version "2.16.0") (source (origin (method git-fetch) (uri (git-reference @@ -389,7 +389,7 @@ (define-public arb (file-name (git-file-name name version)) (sha256 (base32 - "1ndxg7h4xvccjgp5l9z2f8b66dsff6fhf86bn5n7f75a1ksd7554")))) + "0478671wfwy3gl26sbxh1jq1ih36z4k72waa8y2y2lvn649gb7cd")))) (build-system gnu-build-system) (propagated-inputs `(("flint" ,flint))) ; flint.h is included by arf.h From 5dfbf5620cb5d6ab4153f7ea24922beab0beddf5 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 6 Mar 2019 10:48:32 +0100 Subject: [PATCH 317/694] gnu: Add emacs-xr. * gnu/packages/emacs-xyz.scm (emacs-xr): 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 28b24d467d..bf637d7102 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -746,6 +746,36 @@ (define-public emacs-anaphora in certain cases. It also enables recursion for anonymous functions.") (license license:public-domain))) +(define-public emacs-xr + (package + (name "emacs-xr") + (version "1.7") + (source + (origin + (method url-fetch) + (uri (string-append + "https://elpa.gnu.org/packages/xr-" version ".tar")) + (sha256 + (base32 + "099r88s2giv95nkwiim1cx8fy7cvv1pg1701733p4ami82ldsdw0")))) + (build-system emacs-build-system) + (home-page "http://elpa.gnu.org/packages/xr.html") + (synopsis "Convert string regexp to rx notation") + (description + "This is an inverse companion to the @code{rx} package for translating +regexps in string form to the @code{rx} notation. Its chief uses are: + +@itemize +@item Migrating existing code to @code{rx} form, for better readability and +maintainability +@item Understanding complex regexp strings and finding errors in them +@end itemize + +In addition to Emacs regexps, this package can also parse and troubleshoot +skip set strings, which are arguments to @code{skip-chars-forward} and +@code{skip-chars-backward}.") + (license license:gpl3+))) + ;;; ;;; Web browsing. From d7caf8b8cdf413d6d8f32688540a6438996c051f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Mar 2019 22:34:58 +0100 Subject: [PATCH 318/694] gnu: setbfree: Update to 0.8.8. * gnu/packages/music.scm (setbfree): Update to 0.8.8. --- gnu/packages/music.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 3a1130c673..2b533e6d26 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1491,7 +1491,7 @@ (define-public amsynth (define-public setbfree (package (name "setbfree") - (version "0.8.7") + (version "0.8.8") (source (origin (method git-fetch) (uri (git-reference @@ -1500,10 +1500,10 @@ (define-public setbfree (file-name (git-file-name name version)) (sha256 (base32 - "0r2i8cp0gfzqp6scrxwwf7pn7lk2j9kmf8cx7bqjvgfyn251dw3j")))) + "15dr1nyj69wc9jnjq5z8ril90a3c0mcrii4zjyz0z3h7dhia3382")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; no "check" target + `(#:tests? #f ; no "check" target #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) (string-append "FONTFILE=" @@ -1519,7 +1519,7 @@ (define-public setbfree #:phases (modify-phases %standard-phases (add-before 'build 'set-CC-variable - (lambda _ (setenv "CC" "gcc") #t)) + (lambda _ (setenv "CC" "gcc") #t)) (delete 'configure)))) (inputs `(("jack" ,jack-1) From 0a8c2c98fb0b0727044f85b35f3350ea60e5a6bb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Mar 2019 22:42:21 +0100 Subject: [PATCH 319/694] gnu: ntp: Update to 4.2.8p13. * gnu/packages/ntp.scm (ntp): Update to 4.2.8p13. --- gnu/packages/ntp.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/ntp.scm b/gnu/packages/ntp.scm index 6227bca29b..419b6d7321 100644 --- a/gnu/packages/ntp.scm +++ b/gnu/packages/ntp.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer ;;; Copyright © 2015, 2018 Ludovic Courtès ;;; Copyright © 2016, 2017, 2018 Efraim Flashner -;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -40,7 +40,7 @@ (define-module (gnu packages ntp) (define-public ntp (package (name "ntp") - (version "4.2.8p12") + (version "4.2.8p13") (source (origin (method url-fetch) @@ -53,8 +53,7 @@ (define-public ntp (version-major+minor version) "/ntp-" version ".tar.gz"))) (sha256 - (base32 - "0m04ndn0674kcf9x0aggjya07a3hlig2nlzzpwk7vmqka0mj56vh")) + (base32 "0f1a4fya7v5s0426nim8ydvvlcashb8hicgs9xlm76ndrz7751r8")) (modules '((guix build utils))) (snippet '(begin From ef501bb10542817bfb05189ba808c9b727e3ffbc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Mar 2019 22:47:18 +0100 Subject: [PATCH 320/694] gnu: speedtest-cli: Update to 2.1.1. * gnu/packages/networking.scm (speedtest-cli): Update to 2.1.1. --- gnu/packages/networking.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 1ea152a1fe..f504dbf20b 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1491,7 +1491,7 @@ (define-public python2-ipy (define-public speedtest-cli (package (name "speedtest-cli") - (version "2.0.2") + (version "2.1.1") (source (origin (method git-fetch) @@ -1500,8 +1500,7 @@ (define-public speedtest-cli (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "0vv2z37g2kgm2dzkfa4bhri92hs0d1acxi8z66gznsl5148q7sdi")))) + (base32 "0swm7nbk99w2xf1cb0l3c8y1vm4rqw6785p5j04alyb0g98vqa4b")))) (build-system python-build-system) (home-page "https://github.com/sivel/speedtest-cli") (synopsis "Internet bandwidth tester") From 9081333bcd3ff0d6d7cc2f357f56cc2a39bfef50 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Mar 2019 23:04:31 +0100 Subject: [PATCH 321/694] gnu: cracklib: Update to 2.9.7. * gnu/packages/password-utils.scm (cracklib): Update to 2.9.7. [source]: Remove patches. * gnu/packages/patches/cracklib-CVE-2016-6318.patch, gnu/packages/patches/cracklib-fix-buffer-overflow.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove them. --- gnu/local.mk | 2 - gnu/packages/password-utils.scm | 22 ++--- .../patches/cracklib-CVE-2016-6318.patch | 95 ------------------- .../cracklib-fix-buffer-overflow.patch | 39 -------- 4 files changed, 10 insertions(+), 148 deletions(-) delete mode 100644 gnu/packages/patches/cracklib-CVE-2016-6318.patch delete mode 100644 gnu/packages/patches/cracklib-fix-buffer-overflow.patch diff --git a/gnu/local.mk b/gnu/local.mk index 49537e19f8..0a7e9bbc67 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -706,8 +706,6 @@ dist_patch_DATA = \ %D%/packages/patches/combinatorial-blas-io-fix.patch \ %D%/packages/patches/cpio-CVE-2016-2037.patch \ %D%/packages/patches/cpufrequtils-fix-aclocal.patch \ - %D%/packages/patches/cracklib-CVE-2016-6318.patch \ - %D%/packages/patches/cracklib-fix-buffer-overflow.patch \ %D%/packages/patches/crawl-upgrade-saves.patch \ %D%/packages/patches/crda-optional-gcrypt.patch \ %D%/packages/patches/clucene-contribs-lib.patch \ diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 9fd5a6ff0d..ad89cee5a8 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2016 Alex Griffin ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2017, 2018 Clément Lassieur -;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2017 Jelle Licht ;;; Copyright © 2017 Eric Bavier ;;; Copyright © 2017 Nicolas Goaziou @@ -295,17 +295,15 @@ (define-public yapet (define-public cracklib (package (name "cracklib") - (version "2.9.6") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/cracklib/cracklib/" - "releases/download/" name "-" version "/" - name "-" version ".tar.gz")) - (patches (search-patches "cracklib-CVE-2016-6318.patch" - "cracklib-fix-buffer-overflow.patch")) - (sha256 - (base32 - "0hrkb0prf7n92w6rxgq0ilzkk6rkhpys2cfqkrbzswp27na7dkqp")))) + (version "2.9.7") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/cracklib/cracklib/" + "releases/download/v" version "/" + "cracklib-" version ".tar.bz2")) + (sha256 + (base32 "1rimpjsdnmw8f5b7k558cic41p2qy2n2yrlqp5vh7mp4162hk0py")))) (build-system gnu-build-system) (synopsis "Password checking library") (home-page "https://github.com/cracklib/cracklib") diff --git a/gnu/packages/patches/cracklib-CVE-2016-6318.patch b/gnu/packages/patches/cracklib-CVE-2016-6318.patch deleted file mode 100644 index 4806ecaae9..0000000000 --- a/gnu/packages/patches/cracklib-CVE-2016-6318.patch +++ /dev/null @@ -1,95 +0,0 @@ -Fix CVE-2016-6318. - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-6318 - -Patch copied from Red Hat: - -https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2016-6318 -https://bugzilla.redhat.com/attachment.cgi?id=1188599&action=diff - -It is not safe to pass words longer than STRINGSIZE further to cracklib -so the longbuffer cannot be longer than STRINGSIZE. -diff -up cracklib-2.9.0/lib/fascist.c.longgecos cracklib-2.9.0/lib/fascist.c ---- cracklib-2.9.0/lib/fascist.c.longgecos 2014-02-06 16:03:59.000000000 +0100 -+++ cracklib-2.9.0/lib/fascist.c 2016-08-08 12:05:40.279235815 +0200 -@@ -515,7 +515,7 @@ FascistGecosUser(char *password, const c - char gbuffer[STRINGSIZE]; - char tbuffer[STRINGSIZE]; - char *uwords[STRINGSIZE]; -- char longbuffer[STRINGSIZE * 2]; -+ char longbuffer[STRINGSIZE]; - - if (gecos == NULL) - gecos = ""; -@@ -596,38 +596,47 @@ FascistGecosUser(char *password, const c - { - for (i = 0; i < j; i++) - { -- strcpy(longbuffer, uwords[i]); -- strcat(longbuffer, uwords[j]); -- -- if (GTry(longbuffer, password)) -+ if (strlen(uwords[i]) + strlen(uwords[j]) < STRINGSIZE) - { -- return _("it is derived from your password entry"); -- } -- -- strcpy(longbuffer, uwords[j]); -- strcat(longbuffer, uwords[i]); -+ strcpy(longbuffer, uwords[i]); -+ strcat(longbuffer, uwords[j]); - -- if (GTry(longbuffer, password)) -- { -- return _("it's derived from your password entry"); -+ if (GTry(longbuffer, password)) -+ { -+ return _("it is derived from your password entry"); -+ } -+ -+ strcpy(longbuffer, uwords[j]); -+ strcat(longbuffer, uwords[i]); -+ -+ if (GTry(longbuffer, password)) -+ { -+ return _("it's derived from your password entry"); -+ } - } - -- longbuffer[0] = uwords[i][0]; -- longbuffer[1] = '\0'; -- strcat(longbuffer, uwords[j]); -- -- if (GTry(longbuffer, password)) -+ if (strlen(uwords[j]) < STRINGSIZE - 1) - { -- return _("it is derivable from your password entry"); -+ longbuffer[0] = uwords[i][0]; -+ longbuffer[1] = '\0'; -+ strcat(longbuffer, uwords[j]); -+ -+ if (GTry(longbuffer, password)) -+ { -+ return _("it is derivable from your password entry"); -+ } - } - -- longbuffer[0] = uwords[j][0]; -- longbuffer[1] = '\0'; -- strcat(longbuffer, uwords[i]); -- -- if (GTry(longbuffer, password)) -+ if (strlen(uwords[i]) < STRINGSIZE - 1) - { -- return _("it's derivable from your password entry"); -+ longbuffer[0] = uwords[j][0]; -+ longbuffer[1] = '\0'; -+ strcat(longbuffer, uwords[i]); -+ -+ if (GTry(longbuffer, password)) -+ { -+ return _("it's derivable from your password entry"); -+ } - } - } - } diff --git a/gnu/packages/patches/cracklib-fix-buffer-overflow.patch b/gnu/packages/patches/cracklib-fix-buffer-overflow.patch deleted file mode 100644 index b1c990f282..0000000000 --- a/gnu/packages/patches/cracklib-fix-buffer-overflow.patch +++ /dev/null @@ -1,39 +0,0 @@ -Fix buffer overflow processing long words in Mangle(). - -Patch adpated from upstream commit, omitting changes to 'NEWS': - -https://github.com/cracklib/cracklib/commit/33d7fa4585247cd2247a1ffa032ad245836c6edb - -From 33d7fa4585247cd2247a1ffa032ad245836c6edb Mon Sep 17 00:00:00 2001 -From: Jan Dittberner -Date: Thu, 25 Aug 2016 17:17:53 +0200 -Subject: [PATCH] Fix a buffer overflow processing long words - -A buffer overflow processing long words has been discovered. This commit -applies the patch from -https://build.opensuse.org/package/view_file/Base:System/cracklib/0004-overflow-processing-long-words.patch -by Howard Guo. - -See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=835386 and -http://www.openwall.com/lists/oss-security/2016/08/23/8 ---- - src/NEWS | 1 + - src/lib/rules.c | 5 ++--- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/lib/rules.c b/src/lib/rules.c -index d193cc0..3a2aa46 100644 ---- a/lib/rules.c -+++ b/lib/rules.c -@@ -434,9 +434,8 @@ Mangle(input, control) /* returns a pointer to a controlled Mangle */ - { - int limit; - register char *ptr; -- static char area[STRINGSIZE]; -- char area2[STRINGSIZE]; -- area[0] = '\0'; -+ static char area[STRINGSIZE * 2] = {0}; -+ char area2[STRINGSIZE * 2] = {0}; - strcpy(area, input); - - for (ptr = control; *ptr; ptr++) From 4b886fb00c02fc3f3f5bf8d2e0ba119e4146abbc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Mar 2019 23:17:49 +0100 Subject: [PATCH 322/694] gnu: darktable: Update to 2.6.1. * gnu/packages/photo.scm (darktable): Update to 2.6.1. --- gnu/packages/photo.scm | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index ec693d72b3..f2cabec39a 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -357,19 +357,18 @@ (define-public lensfun (define-public darktable (package (name "darktable") - (version "2.6.0") - (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/darktable-org/darktable/releases/" - "download/release-" - version "/darktable-" version ".tar.xz")) - (sha256 - (base32 - "0y04cx0a0rwdclmn16f5y0z2vnm7yxly291gzjgdhcn59a77sga8")))) + (version "2.6.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://github.com/darktable-org/darktable/releases/" + "download/release-" version "/darktable-" version ".tar.xz")) + (sha256 + (base32 "09ihbj0602spgc5lfbskf9am38n03gam2r8v3kj4dyfgxqr37ib3")))) (build-system cmake-build-system) (arguments - `(#:tests? #f ; There are no tests. + `(#:tests? #f ; there are no tests #:configure-flags '("-DBINARY_PACKAGE_BUILD=On") #:make-flags (list @@ -420,7 +419,7 @@ (define-public darktable developer. It manages your digital negatives in a database, lets you view them through a zoomable lighttable and enables you to develop raw images and enhance them.") - ;; see src/is_supported_platform.h for supported platforms + ;; See src/is_supported_platform.h for supported platforms. (supported-systems '("i686-linux" "x86_64-linux" "aarch64-linux")) (license license:gpl3+))) From 362f5306e4c7cf163f7169e51f1c82caeb5693d2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Mar 2019 23:38:56 +0100 Subject: [PATCH 323/694] gnu: st: Update to 0.8.2. * gnu/packages/suckless.scm (st): Update to 0.8.2. [arguments]: Re-indent. --- gnu/packages/suckless.scm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm index c1357bd282..92d5358c5e 100644 --- a/gnu/packages/suckless.scm +++ b/gnu/packages/suckless.scm @@ -226,28 +226,27 @@ (define-public slock (define-public st (package (name "st") - (version "0.8.1") + (version "0.8.2") (source (origin (method url-fetch) (uri (string-append "https://dl.suckless.org/st/st-" version ".tar.gz")) (sha256 - (base32 - "09k94v3n20gg32xy7y68p96x9dq5msl80gknf9gbvlyjp3i0zyy4")))) + (base32 "0ddz2mdp1c7q67rd5vrvws9r0493ln0mlqyc3d73dv8im884xdxf")))) (build-system gnu-build-system) (arguments - '(#:tests? #f ; no tests + '(#:tests? #f ; no tests #:make-flags (list "CC=gcc" (string-append "PREFIX=" %output)) #:phases (modify-phases %standard-phases (delete 'configure) (add-after 'unpack 'inhibit-terminfo-install - (lambda _ - (substitute* "Makefile" - (("\ttic .*") "")) - #t))))) + (lambda _ + (substitute* "Makefile" + (("\ttic .*") "")) + #t))))) (inputs `(("libx11" ,libx11) ("libxft" ,libxft) From cdfea208b89f7c8a01fe0ebf1cb574d02e0822ec Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Mar 2019 23:39:18 +0100 Subject: [PATCH 324/694] gnu: dav1d: Update to 0.2.1. * gnu/packages/video.scm (dav1d): Update to 0.2.1. --- gnu/packages/video.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index f00be7092b..220d729d03 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3411,7 +3411,7 @@ (define-public openshot (define-public dav1d (package (name "dav1d") - (version "0.2.0") + (version "0.2.1") (source (origin (method url-fetch) @@ -3423,8 +3423,7 @@ (define-public dav1d (string-append "https://code.videolan.org/videolan/dav1d/-/" "archive/" version "/dav1d-" version ".tar.bz2"))) (sha256 - (base32 - "0q0dbbl91syjnkygz268gh4b7mdcgl6hldj300a4cbqidsadpl5p")))) + (base32 "0cp7harg2gf61v35hyki2ddk9yr0xli9bkk3smxblabmq9rv5cs3")))) (build-system meson-build-system) (native-inputs `(("nasm" ,nasm))) (home-page "https://code.videolan.org/videolan/dav1d") From e58d3a59261a028781eceaf190715c768ec134fb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 18 Mar 2019 23:37:15 +0100 Subject: [PATCH 325/694] gnu: apache-arrow: Update to 0.10.0. * gnu/packages/databases.scm (apache-arrow): Update to 0.10.0. [inputs]: Replace jemalloc-4.5.0 with jemalloc. --- gnu/packages/databases.scm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 912b8d77c5..f5ed20c4a0 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -28,7 +28,7 @@ ;;; Copyright © 2017, 2018 Ben Woodcroft ;;; Copyright © 2017 Rutger Helling ;;; Copyright © 2017, 2018 Pierre Langlois -;;; Copyright © 2015, 2017, 2018 Ricardo Wurmus +;;; Copyright © 2015, 2017, 2018, 2019 Ricardo Wurmus ;;; Copyright © 2017 Kristofer Buffington ;;; Copyright © 2018 Amirouche Boubekki ;;; Copyright © 2018 Joshua Sierles, Nextjournal @@ -2709,7 +2709,7 @@ (define-public mongo-tools (define-public apache-arrow (package (name "apache-arrow") - (version "0.7.0") + (version "0.10.0") (source (origin (method git-fetch) @@ -2718,8 +2718,8 @@ (define-public apache-arrow (commit (string-append "apache-arrow-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "1x7sdd8lbs3nfqjql1pcgbkjc19bls56zmgjayshkmablvlc4dy3")))) + (base32 + "04xkp922b8qrrnpvv9ixxnvk7151n1plzx6aqdff6frn9651zvxs")))) (build-system cmake-build-system) (arguments `(#:tests? #f @@ -2763,9 +2763,7 @@ (define-public apache-arrow ("rapidjson" ,rapidjson) ("brotli" ,google-brotli) ("flatbuffers" ,flatbuffers) - ;; Arrow is not yet compatible with jemalloc >= 5: - ;; https://issues.apache.org/jira/browse/ARROW-1141 - ("jemalloc" ,jemalloc-4.5.0) + ("jemalloc" ,jemalloc) ("python-3" ,python) ("python-numpy" ,python-numpy))) (home-page "https://arrow.apache.org/") From 0fa926c2e595e2e121a5e65b70fda63e8e37904c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 18 Mar 2019 23:43:33 +0100 Subject: [PATCH 326/694] gnu: python-pyarrow: Update to 0.10.0. * gnu/packages/databases.scm (python-pyarrow): Update to 0.10.0. [arguments]: Delete "build" phase. [native-inputs]: Add python-pytest-runner. --- 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 f5ed20c4a0..301c4986c5 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2778,7 +2778,7 @@ (define-public apache-arrow (define-public python-pyarrow (package (name "python-pyarrow") - (version "0.7.0") + (version "0.10.0") (source (origin (method git-fetch) @@ -2787,14 +2787,14 @@ (define-public python-pyarrow (commit (string-append "apache-arrow-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "1x7sdd8lbs3nfqjql1pcgbkjc19bls56zmgjayshkmablvlc4dy3")))) + (base32 + "04xkp922b8qrrnpvv9ixxnvk7151n1plzx6aqdff6frn9651zvxs")))) (build-system python-build-system) (arguments - '(#:tests? #f ; XXX Test failures related to missing libhdfs, libhdfs3, - ; and "Unsupported numpy type 22". + '(#:tests? #f ; XXX There are no tests in the "python" directory #:phases (modify-phases %standard-phases + (delete 'build) ; XXX the build is performed again during the install phase (add-after 'unpack 'enter-source-directory (lambda _ (chdir "python") #t)) (add-after 'unpack 'set-env @@ -2810,6 +2810,7 @@ (define-public python-pyarrow `(("cmake" ,cmake) ("python-cython" ,python-cython) ("python-pytest" ,python-pytest) + ("python-pytest-runner" ,python-pytest-runner) ("python-setuptools-scm" ,python-setuptools-scm))) (home-page "https://arrow.apache.org/docs/python/") (synopsis "Python bindings for Apache Arrow") From 9e1d9a0a46c502f1e2dcc03351c4a46e4b97006a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 18 Mar 2019 23:45:15 +0100 Subject: [PATCH 327/694] gnu: python-biom-format: Fix build. * gnu/packages/bioinformatics.scm (python-biom-format)[source]: Remove generated C files. [arguments]: Disable second broken test. --- gnu/packages/bioinformatics.scm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 9eaf40adbd..371c13e121 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -896,20 +896,30 @@ (define-public python-biom-format (file-name (git-file-name name version)) (sha256 (base32 - "1rna16lyk5aqhnv0dp77wwaplias93f1vw28ad3jmyw6hwkai05v")))) + "1rna16lyk5aqhnv0dp77wwaplias93f1vw28ad3jmyw6hwkai05v")) + (modules '((guix build utils))) + (snippet '(begin + ;; Delete generated C files. + (for-each delete-file (find-files "." "\\.c")) + #t)))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases (add-after 'unpack 'use-cython (lambda _ (setenv "USE_CYTHON" "1") #t)) - (add-after 'unpack 'disable-broken-test + (add-after 'unpack 'disable-broken-tests (lambda _ (substitute* "biom/tests/test_cli/test_validate_table.py" (("^(.+)def test_invalid_hdf5" m indent) (string-append indent "@npt.dec.skipif(True, msg='Guix')\n" m))) + (substitute* "biom/tests/test_table.py" + (("^(.+)def test_from_hdf5_issue_731" m indent) + (string-append indent + "@npt.dec.skipif(True, msg='Guix')\n" + m))) #t)) (add-before 'reset-gzip-timestamps 'make-files-writable (lambda* (#:key outputs #:allow-other-keys) From 8f350d83a40a9829719d466765279db4402521c8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Mar 2019 23:50:53 +0100 Subject: [PATCH 328/694] gnu: autorandr: Fix typo in synopsis. * gnu/packages/xdisorg.scm (autorandr)[synopsis]: Fix typo. --- gnu/packages/xdisorg.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index cd3428a1fb..415a1fc003 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -179,7 +179,7 @@ (define-public autorandr "install_manpage" "install_bash_completion" "install_launcher")))))) - (synopsis "Auto-detect connected displays and load appropiate setup") + (synopsis "Auto-detect connected displays and load appropriate setup") (description "Autorandr wraps around xrandr to help with X11 multi-screen configuration management. It allows the user to create profiles for various multi-screen setups. Autorandr automatically detects the profiles From 5cfe7ad8704b104cc06ef715f7ff7e4c79b8c185 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 18 Mar 2019 20:28:08 -0400 Subject: [PATCH 329/694] gnu: MPD: Update to 0.21.6. * gnu/packages/mpd.scm (mpd): Update to 0.21.6. --- gnu/packages/mpd.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index bb386f59d1..41148027bc 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -91,7 +91,7 @@ (define-public libmpdclient (define-public mpd (package (name "mpd") - (version "0.21.5") + (version "0.21.6") (source (origin (method url-fetch) (uri @@ -100,7 +100,7 @@ (define-public mpd "/mpd-" version ".tar.xz")) (sha256 (base32 - "1y8fbch4xp96i4mz6czivnwvaf7g8pnfix5d0pbybnkv7bmz1a9f")))) + "17z580gqwsr4xp3x124aapw96pl8hk91c43ld2x75606rim12kcd")))) (build-system meson-build-system) (arguments `(#:configure-flags '("-Ddocumentation=true") ; The default is 'false'... From 9569db373c5139dab577cc88eeb47f734edda5c0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 4 Mar 2019 20:54:21 +0200 Subject: [PATCH 330/694] gnu: Add python-vcrpy. * gnu/packages/python-check.scm (python-vcrpy): New variable. --- gnu/packages/python-check.scm | 48 +++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index 2686425b51..58a1022bc2 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Ricardo Wurmus ;;; Copyright © 2019 Tobias Geerinckx-Rice +;;; Copyright © 2019 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -22,6 +23,7 @@ (define-module (gnu packages python-check) #:use-module (gnu packages check) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages web) #:use-module (guix utils) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) @@ -57,3 +59,49 @@ (define-public python-coveralls This package provides seamless integration with coverage.py (and thus pytest, nosetests, etc...) in Python projects.") (license license:expat))) + +(define-public python-vcrpy + (package + (name "python-vcrpy") + (version "2.0.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "vcrpy" version)) + (sha256 + (base32 + "0kws7l3hci1dvjv01nxw3805q9v2mwldw58bgl8s90wqism69gjp")))) + (build-system python-build-system) + (arguments `(#:tests? #f)) ; tests require more packages for python-pytest-httpbin + (propagated-inputs + `(("python-pyyaml" ,python-pyyaml) + ("python-six" ,python-six) + ("python-wrapt" ,python-wrapt) + ("python-yarl" ,python-yarl))) + (native-inputs + `(("python-mock" ,python-mock) + ("python-pytest" ,python-pytest) + ("python-pytest-httpbin" ,python-pytest-httpbin))) + (home-page "https://github.com/kevin1024/vcrpy") + (synopsis "Automatically mock your HTTP interactions") + (description + "VCR.py simplifies and speeds up tests that make HTTP requests. The first +time you run code that is inside a VCR.py context manager or decorated function, +VCR.py records all HTTP interactions that take place through the libraries it +supports and serializes and writes them to a flat file (in yaml format by +default). This flat file is called a cassette. When the relevant piece of code +is executed again, VCR.py will read the serialized requests and responses from +the aforementioned cassette file, and intercept any HTTP requests that it +recognizes from the original test run and return the responses that corresponded +to those requests. This means that the requests will not actually result in +HTTP traffic, which confers several benefits including: +@enumerate +@item The ability to work offline +@item Completely deterministic tests +@item Increased test execution speed +@end enumerate +If the server you are testing against ever changes its API, all you need to do +is delete your existing cassette files, and run your tests again. VCR.py will +detect the absence of a cassette file and once again record all HTTP +interactions, which will update them to correspond to the new API.") + (license license:expat))) From 835dada6e4e4a99c79498eef002934a4b4ee456d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 4 Mar 2019 20:58:34 +0200 Subject: [PATCH 331/694] gnu: Add rtv. * gnu/packages/syndication.scm (rtv): New variable. --- gnu/packages/syndication.scm | 51 +++++++++++++++++++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-) diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index a9ccfcd274..bfcefb7270 100644 --- a/gnu/packages/syndication.scm +++ b/gnu/packages/syndication.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016, 2017 Efraim Flashner +;;; Copyright © 2016, 2017, 2019 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. @@ -22,12 +22,17 @@ (define-module (gnu packages syndication) #:use-module (guix download) #:use-module (guix packages) #:use-module (guix build-system gnu) + #:use-module (guix build-system python) #:use-module (gnu packages) + #:use-module (gnu packages check) #:use-module (gnu packages curl) #:use-module (gnu packages documentation) #:use-module (gnu packages gettext) #:use-module (gnu packages ncurses) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages python-check) + #:use-module (gnu packages python-xyz) + #:use-module (gnu packages python-web) #:use-module (gnu packages sqlite) #:use-module (gnu packages web) #:use-module (gnu packages xml)) @@ -88,3 +93,47 @@ (define-public newsboat (define-public newsbeuter ;; Newsbeuter is unmaintained with multiple CVEs, and was forked as Newsboat. (deprecated-package "newsbeuter" newsboat)) + +(define-public rtv + (package + (name "rtv") + (version "1.26.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "rtv" version)) + (sha256 + (base32 + "1aamkli1mlq2vxixlva790y0l0cbvbkz07lknajin0841sdq0411")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-before 'check 'set-environment-variables + (lambda* (#:key inputs #:allow-other-keys) + (setenv "HOME" (getcwd)) + (setenv "TERM" "linux") + (setenv "TERMINFO" (string-append (assoc-ref inputs "ncurses") + "/share/terminfo")) + #t))) + #:tests? #f)) ; tests fail: _curses.error: nocbreak() returned ERR + (propagated-inputs + `(("python-beautifulsoup4" ,python-beautifulsoup4) + ("python-decorator" ,python-decorator) + ("python-kitchen" ,python-kitchen) + ("python-requests" ,python-requests) + ("python-six" ,python-six))) + (native-inputs + `(("ncurses" ,ncurses) + ("python-coveralls" ,python-coveralls) + ("python-coverage" ,python-coverage) + ("python-mock" ,python-mock) + ("python-pylint" ,python-pylint) + ("python-pytest" ,python-pytest) + ("python-vcrpy" ,python-vcrpy))) + (home-page "https://github.com/michael-lazar/rtv") + (synopsis "Terminal viewer for Reddit (Reddit Terminal Viewer)") + (description + "RTV provides a text-based interface to view and interact with Reddit.") + (license (list license:expat + license:gpl3+)))) ; rtv/packages/praw From 1d6589db81c7c390e04795805e684b01f5a0c45f Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Tue, 19 Mar 2019 10:44:15 +0100 Subject: [PATCH 332/694] gnu: Add python-flint. * gnu/packages/algebra.scm (python-flint): New variable. * gnu/packages/patches/python-flint-includes.patch: New file. * gnu/local.mk (dist_patch_DATA): Register the patch. --- gnu/local.mk | 1 + gnu/packages/algebra.scm | 34 +++++ .../patches/python-flint-includes.patch | 131 ++++++++++++++++++ 3 files changed, 166 insertions(+) create mode 100644 gnu/packages/patches/python-flint-includes.patch diff --git a/gnu/local.mk b/gnu/local.mk index 0a7e9bbc67..87bed6e827 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1176,6 +1176,7 @@ dist_patch_DATA = \ %D%/packages/patches/python2-larch-coverage-4.0a6-compatibility.patch \ %D%/packages/patches/python-configobj-setuptools.patch \ %D%/packages/patches/python-faker-fix-build-32bit.patch \ + %D%/packages/patches/python-flint-includes.patch \ %D%/packages/patches/python-mox3-python3.6-compat.patch \ %D%/packages/patches/python-testtools.patch \ %D%/packages/patches/python-paste-remove-timing-test.patch \ diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 2849a565c3..e272cd990b 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -43,6 +43,7 @@ (define-module (gnu packages algebra) #:use-module (gnu packages multiprecision) #:use-module (gnu packages perl) #:use-module (gnu packages python) + #:use-module (gnu packages python-xyz) #:use-module (gnu packages readline) #:use-module (gnu packages shells) #:use-module (gnu packages tex) @@ -52,6 +53,7 @@ (define-module (gnu packages algebra) #:use-module (guix build-system ant) #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) + #:use-module (guix build-system python) #:use-module (guix download) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) @@ -421,6 +423,38 @@ (define-public arb (license license:lgpl2.1+) (home-page "http://fredrikj.net/arb/"))) +(define-public python-flint + (package + (name "python-flint") + (version "0.3.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fredrik-johansson/python-flint.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1v0anazbj1cfi68nl2j6dbd31kgkc1563xmr0zk5xk3xj78569pw")) + (patches (search-patches "python-flint-includes.patch")))) + (build-system python-build-system) + (native-inputs + `(("python-cython" ,python-cython))) + (propagated-inputs + `(("python-numpy" ,python-numpy))) + (inputs + `(("arb" ,arb) + ("flint" ,flint))) + (synopsis "Python module wrapping ARB and FLINT") + (description + "Python-flint is a Python extension module wrapping FLINT +(Fast Library for Number Theory) and Arb (arbitrary-precision ball +arithmetic). It supports integers, rationals, modular integers, +real and complex ball arithmetic, polynomials and matrices over all +these types and other mathematical functions.") + (license license:expat) + (home-page "http://fredrikj.net/python-flint/"))) + (define-public ntl (package (name "ntl") diff --git a/gnu/packages/patches/python-flint-includes.patch b/gnu/packages/patches/python-flint-includes.patch new file mode 100644 index 0000000000..c0cfe94a04 --- /dev/null +++ b/gnu/packages/patches/python-flint-includes.patch @@ -0,0 +1,131 @@ +The following patch, authored by Andreas Enge, looks for the flint include +files in the correct subdirectory. + +diff -u -r python-flint-old/src/flint.pxd python-flint-new/src/flint.pxd +--- python-flint-old/src/flint.pxd 2019-03-19 10:26:11.055748626 +0100 ++++ python-flint-new/src/flint.pxd 2019-03-19 10:35:23.269341203 +0100 +@@ -27,7 +27,7 @@ + + ctypedef long fmpz_struct + +-cdef extern from "flint.h": ++cdef extern from "flint/flint.h": + ctypedef void * flint_rand_t + void flint_randinit(flint_rand_t state) + void flint_randclear(flint_rand_t state) +@@ -35,7 +35,7 @@ + long flint_get_num_threads() + void flint_cleanup() + +-cdef extern from "nmod_vec.h": ++cdef extern from "flint/nmod_vec.h": + ctypedef struct nmod_t: + mp_limb_t n + mp_limb_t ninv +@@ -47,7 +47,7 @@ + mp_limb_t nmod_mul(mp_limb_t a, mp_limb_t b, nmod_t mod) + mp_limb_t nmod_div(mp_limb_t a, mp_limb_t b, nmod_t mod) + +-cdef extern from "nmod_poly.h": ++cdef extern from "flint/nmod_poly.h": + ctypedef struct nmod_poly_struct: + mp_ptr coeffs + long alloc +@@ -129,7 +129,7 @@ + void nmod_poly_factor_init(nmod_poly_factor_t fac) + void nmod_poly_factor_clear(nmod_poly_factor_t fac) + +-cdef extern from "nmod_mat.h": ++cdef extern from "flint/nmod_mat.h": + ctypedef struct nmod_mat_struct: + mp_limb_t * entries + long r +@@ -178,7 +178,7 @@ + long nmod_mat_rref(nmod_mat_t A) + long nmod_mat_nullspace(nmod_mat_t X, nmod_mat_t A) + +-cdef extern from "fmpz.h": ++cdef extern from "flint/fmpz.h": + ctypedef fmpz_struct fmpz_t[1] + int COEFF_IS_MPZ(fmpz_struct v) + void fmpz_init(fmpz_t op) +@@ -268,7 +268,7 @@ + void fmpz_rfac_uiui(fmpz_t r, ulong x, ulong n) + void fmpz_primorial(fmpz_t res, ulong n) + +-cdef extern from "fmpz_factor.h": ++cdef extern from "flint/fmpz_factor.h": + ctypedef struct fmpz_factor_struct: + int sign + fmpz_struct * p +@@ -280,7 +280,7 @@ + void fmpz_factor_clear(fmpz_factor_t factor) + void fmpz_factor(fmpz_factor_t factor, fmpz_t n) + +-cdef extern from "fmpz_poly.h": ++cdef extern from "flint/fmpz_poly.h": + ctypedef struct fmpz_poly_struct: + fmpz_struct * coeffs + long alloc +@@ -390,14 +390,14 @@ + void fmpz_poly_cos_minpoly(fmpz_poly_t, ulong) + void fmpz_poly_swinnerton_dyer(fmpz_poly_t, ulong) + +-cdef extern from "fmpz_poly_factor.h": ++cdef extern from "flint/fmpz_poly_factor.h": + void fmpz_poly_factor_init(fmpz_poly_factor_t fac) + void fmpz_poly_factor_clear(fmpz_poly_factor_t fac) + void fmpz_poly_factor_zassenhaus(fmpz_poly_factor_t fac, fmpz_poly_t G) + void fmpz_poly_factor(fmpz_poly_factor_t fac, fmpz_poly_t G) + void fmpz_poly_factor_squarefree(fmpz_poly_factor_t fac, fmpz_poly_t G) + +-cdef extern from "fmpz_mat.h": ++cdef extern from "flint/fmpz_mat.h": + ctypedef struct fmpz_mat_struct: + fmpz_struct * entries + long r +@@ -448,7 +448,7 @@ + void fmpz_mat_snf(fmpz_mat_t S, const fmpz_mat_t A) + int fmpz_mat_is_in_snf(const fmpz_mat_t A) + +-cdef extern from "fmpz_lll.h": ++cdef extern from "flint/fmpz_lll.h": + ctypedef struct fmpz_lll_struct: + double delta + double eta +@@ -461,7 +461,7 @@ + void fmpz_lll(fmpz_mat_t B, fmpz_mat_t U, const fmpz_lll_t fl) + + +-cdef extern from "fmpq.h": ++cdef extern from "flint/fmpq.h": + ctypedef struct fmpq_struct: + fmpz_struct num + fmpz_struct den +@@ -506,7 +506,7 @@ + void fmpq_next_signed_minimal(fmpq_t res, fmpq_t x) + void fmpq_harmonic_ui(fmpq_t res, ulong n) + +-cdef extern from "fmpq_poly.h": ++cdef extern from "flint/fmpq_poly.h": + ctypedef struct fmpq_poly_struct: + fmpz_struct * coeffs + fmpz_t den +@@ -620,7 +620,7 @@ + void fmpq_poly_compose_series(fmpq_poly_t res, fmpq_poly_t poly1, fmpq_poly_t poly2, long n) + void fmpq_poly_revert_series(fmpq_poly_t res, fmpq_poly_t poly1, long n) + +-cdef extern from "fmpq_mat.h": ++cdef extern from "flint/fmpq_mat.h": + ctypedef struct fmpq_mat_struct: + fmpq_struct * entries + long r +@@ -672,7 +672,7 @@ + long fmpq_mat_rref(fmpq_mat_t B, fmpq_mat_t A) + void fmpq_mat_transpose(fmpq_mat_t B, fmpq_mat_t A) + +-cdef extern from "arith.h": ++cdef extern from "flint/arith.h": + void arith_number_of_partitions(fmpz_t res, ulong n) + int arith_moebius_mu(fmpz_t n) + void arith_divisor_sigma(fmpz_t v, fmpz_t n, ulong k) From 34b81a9cddcfd4b5b2aa041d644833e2211da8c9 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Tue, 12 Mar 2019 12:16:38 +0100 Subject: [PATCH 333/694] gnu: libdrm: Switch to meson-build-system. * gnu/packages/xdisorg.scm (libdrm)[build-system]: Switch to meson-build-system. [arguments]: Adjust arguments to Meson. --- gnu/packages/xdisorg.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index ed801d6236..2cb8f3b13f 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -391,20 +391,20 @@ (define-public libdrm (base32 "08yimlp6jir1rs5ajgdx74xa5qdzcqahpdzdk0rmkmhh7vdcrl3p")) (patches (search-patches "libdrm-symbol-check.patch")))) - (build-system gnu-build-system) + (build-system meson-build-system) (arguments `(#:configure-flags '(,@(match (%current-system) ("armhf-linux" - '("--enable-exynos-experimental-api" - "--enable-omap-experimental-api" - "--enable-etnaviv-experimental-api" - "--enable-tegra-experimental-api" - "--enable-freedreno-kgsl")) - ("aarch64-linux" - '("--enable-tegra-experimental-api" - "--enable-etnaviv-experimental-api" - "--enable-freedreno-kgsl")) + '("-Dexynos-experimental-api=true" + "-Domap-experimental-api=true" + "-Detnaviv-experimental-api=true" + "-Dtegra-experimental-api=true" + "-Dfreedreno-kgsl=true")) + ("aarch64-linux=true" + '("-Dtegra-experimental-api=true" + "-Detnaviv-experimental-api=true" + "-Dfreedreno-kgsl=true")) (_ '()))))) (inputs `(("libpciaccess" ,libpciaccess))) From f6dadee4263bcc5cd97447c92b766ef7cca661ec Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Tue, 19 Mar 2019 10:45:16 +0100 Subject: [PATCH 334/694] gnu: mesa: Update to 18.3.5. * gnu/packages/gl.scm (mesa): Update to 18.3.5. [build-system]: Switch to meson-build-system. [native-inputs]: Add "bison", "flex" and "gettext-minimal". [arguments]: Adjust arguments to Meson. * gnu/packages/sdl.scm (sdl)[propogated-inputs]: Add mesa. [inputs]: Remove mesa. --- gnu/packages/gl.scm | 50 ++++++++++++++++++++++++-------------------- gnu/packages/sdl.scm | 7 +++++-- 2 files changed, 32 insertions(+), 25 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index c3cb9cab23..b715c1ad8d 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -221,7 +221,7 @@ (define libva-without-mesa (define-public mesa (package (name "mesa") - (version "18.3.4") + (version "18.3.5") (source (origin (method url-fetch) @@ -233,10 +233,10 @@ (define-public mesa version "/mesa-" version ".tar.xz"))) (sha256 (base32 - "01xv03ah4l5lcfx015n3fg1620dh4nbbv6gmhh6zhdsx6sj4sc9j")) + "0lvrfjaic7dhay9v52f9k3q5aac8xagfq3pnzjrl0cn65jlaw9s0")) (patches (search-patches "mesa-skip-disk-cache-test.patch")))) - (build-system gnu-build-system) + (build-system meson-build-system) (propagated-inputs `(;; The following are in the Requires.private field of gl.pc. ("libdrm" ,libdrm) @@ -264,7 +264,10 @@ (define-public mesa ("wayland" ,wayland) ("wayland-protocols" ,wayland-protocols))) (native-inputs - `(("pkg-config" ,pkg-config) + `(("bison" ,bison) + ("flex" ,flex) + ("gettext" ,gettext-minimal) + ("pkg-config" ,pkg-config) ("python" ,python) ("python-mako" ,python-mako) ("which" ,(@ (gnu packages base) which)))) @@ -273,47 +276,48 @@ (define-public mesa '(,@(match (%current-system) ((or "armhf-linux" "aarch64-linux") ;; TODO: Fix svga driver for aarch64 and armhf. - '("--with-gallium-drivers=etnaviv,freedreno,imx,nouveau,pl111,r300,r600,swrast,tegra,v3d,vc4,virgl")) + '("-Dgallium-drivers=etnaviv,freedreno,imx,nouveau,pl111,r300,r600,swrast,tegra,v3d,vc4,virgl")) (_ - '("--with-gallium-drivers=i915,nouveau,r300,r600,radeonsi,svga,swrast,virgl"))) + '("-Dgallium-drivers=nouveau,r300,r600,radeonsi,svga,swrast,virgl"))) ;; Enable various optional features. TODO: opencl requires libclc, ;; omx requires libomxil-bellagio - "--with-platforms=x11,drm,surfaceless,wayland" - "--enable-glx-tls" ;Thread Local Storage, improves performance - ;; "--enable-opencl" - ;; "--enable-omx" - "--enable-osmesa" - "--enable-xa" + "-Dplatforms=x11,drm,surfaceless,wayland" + "-Dglx=dri" ;Thread Local Storage, improves performance + ;; "-Dopencl=true" + ;; "-Domx=true" + "-Dosmesa=gallium" + "-Dgallium-xa=true" + ;; features required by wayland - "--enable-gles2" - "--enable-gbm" - "--enable-shared-glapi" + "-Dgles2=true" + "-Dgbm=true" + "-Dshared-glapi=true" ;; Enable Vulkan on i686-linux and x86-64-linux. ,@(match (%current-system) ("x86_64-linux" - '("--with-vulkan-drivers=intel,radeon")) + '("-Dvulkan-drivers=intel,amd")) ;; TODO: Fix intel driver on i686-linux. ("i686-linux" - '("--with-vulkan-drivers=radeon")) + '("-Dvulkan-drivers=amd")) (_ '(""))) ;; Also enable the tests. - "--enable-gallium-tests" + "-Dbuild-tests=true" ;; on non-intel systems, drop i915 and i965 ;; from the default dri drivers ,@(match (%current-system) ((or "x86_64-linux" "i686-linux") - '("--with-dri-drivers=i915,i965,nouveau,r200,radeon,swrast" - "--enable-llvm")) ; default is x86/x86_64 only + '("-Ddri-drivers=i915,i965,nouveau,r200,r100" + "-Dllvm=true")) ; default is x86/x86_64 only (_ - '("--with-dri-drivers=nouveau,r200,radeon,swrast")))) + '("-Ddri-drivers=nouveau,r200,r100")))) #:modules ((ice-9 match) (srfi srfi-1) (guix build utils) - (guix build gnu-build-system)) + (guix build meson-build-system)) #:phases (modify-phases %standard-phases (add-after @@ -323,7 +327,7 @@ (define-public mesa (("/usr/bin/env python2") (which "python"))) #t)) (add-before - 'build 'fix-dlopen-libnames + 'configure 'fix-dlopen-libnames (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) ;; Remain agnostic to .so.X.Y.Z versions while doing diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 8d2a024378..fe01086a86 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -87,10 +87,13 @@ (define-public sdl (propagated-inputs ;; SDL headers include X11 headers. `(("libx11" ,libx11) - ("libcap" ,libcap))) ; 'libSDL.la' contain `-lcap'. + ("libcap" ,libcap) ; 'libSDL.la' contain `-lcap'. + ;; TODO: Since building Mesa with Meson it is now necessary that Mesa is + ;; a propogated input. We still need to figure out why, possibly due to a + ;; change in pkg-config. + ("mesa" ,mesa))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("libxrandr" ,libxrandr) - ("mesa" ,mesa) ("glu" ,glu) ("alsa-lib" ,alsa-lib) ("pulseaudio" ,pulseaudio))) From 427c87d0bdc06cc3ee7fc220fd3ad36084412533 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 19 Mar 2019 11:03:35 +0100 Subject: [PATCH 335/694] pack: Produce relative symlinks when using '-f squashfs'. Fixes . * guix/scripts/pack.scm (squashfs-image)[build]: Use 'relative-file-name' when creating SYMLINKS. * guix/scripts/pack.scm (guix-pack): Pass #:relative-symlinks? #t when PACK-FORMAT is 'squashfs. --- guix/scripts/pack.scm | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm index 17a166d9d7..8685ba1d0a 100644 --- a/guix/scripts/pack.scm +++ b/guix/scripts/pack.scm @@ -306,11 +306,13 @@ (define build (with-imported-modules (source-module-closure '((guix build utils) (guix build store-copy) + (guix build union) (gnu build install)) #:select? not-config?) #~(begin (use-modules (guix build utils) (guix build store-copy) + ((guix build union) #:select (relative-file-name)) (gnu build install) (srfi srfi-1) (srfi srfi-26) @@ -359,12 +361,18 @@ (define database #+database) ,@(append-map (match-lambda ((source '-> target) - (list "-p" - (string-join - ;; name s mode uid gid symlink - (list source - "s" "777" "0" "0" - (string-append #$profile "/" target)))))) + ;; Create relative symlinks to work around a bug in + ;; Singularity 2.x: + ;; https://bugs.gnu.org/34913 + ;; https://github.com/sylabs/singularity/issues/1487 + (let ((target (string-append #$profile "/" target))) + (list "-p" + (string-join + ;; name s mode uid gid symlink + (list source + "s" "777" "0" "0" + (relative-file-name (dirname source) + target))))))) '#$symlinks) ;; Create empty mount points. @@ -881,7 +889,14 @@ (define properties (run-with-store store (mlet* %store-monad ((profile (profile-derivation manifest - #:relative-symlinks? relocatable? + + ;; Always produce relative + ;; symlinks for Singularity (see + ;; ). + #:relative-symlinks? + (or relocatable? + (eq? 'squashfs pack-format)) + #:hooks (if bootstrap? '() %default-profile-hooks) From 6c5e618ca004d3714d9de7676f2a984735bfe17b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 19 Mar 2019 11:14:39 +0100 Subject: [PATCH 336/694] pack: Create an empty /home directory for '-f squashfs'. Fixes . * guix/scripts/pack.scm (squashfs-image)[build]: Pass "-p /home d 555 0 0". --- guix/scripts/pack.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm index 8685ba1d0a..e5502ef9ca 100644 --- a/guix/scripts/pack.scm +++ b/guix/scripts/pack.scm @@ -378,7 +378,8 @@ (define database #+database) ;; Create empty mount points. "-p" "/proc d 555 0 0" "-p" "/sys d 555 0 0" - "-p" "/dev d 555 0 0")) + "-p" "/dev d 555 0 0" + "-p" "/home d 555 0 0")) (when database ;; Initialize /var/guix. From 718d358a7297c6f101ca320818ce2206a3ad893f Mon Sep 17 00:00:00 2001 From: Dan Frumin Date: Fri, 15 Mar 2019 13:16:24 +0100 Subject: [PATCH 337/694] gnu: coq-flocq: remove unnecessary return values MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/coq.scm (coq-flocq)[arguments]: Add unnecessary return values after 'invoke' calls. Signed-off-by: Ludovic Courtès --- gnu/packages/coq.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index 83f5cd29af..bdf1576400 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -211,18 +211,15 @@ (define-public coq-flocq #t)) (replace 'build (lambda _ - (invoke "./remake") - #t)) + (invoke "./remake"))) (replace 'check (lambda _ - (invoke "./remake" "check") - #t)) + (invoke "./remake" "check"))) ;; TODO: requires coq-gappa and coq-interval. ;(invoke "./remake" "check-more") (replace 'install (lambda _ - (invoke "./remake" "install") - #t))))) + (invoke "./remake" "install")))))) (home-page "http://flocq.gforge.inria.fr/") (synopsis "Floating-point formalization for the Coq system") (description "Flocq (Floats for Coq) is a floating-point formalization for From 47903653081f35b58722b624040a8de118d7f3c8 Mon Sep 17 00:00:00 2001 From: nee Date: Fri, 15 Mar 2019 23:04:15 +0100 Subject: [PATCH 338/694] gnu: Add edgar. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/games.scm (edgar): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/games.scm | 49 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index ed8aef8bf9..56dc96de8f 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -25,7 +25,7 @@ ;;; Copyright © 2017 Adonay "adfeno" Felipe Nogueira ;;; Copyright © 2017, 2018 Arun Isaac ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice -;;; Copyright © 2017 nee +;;; Copyright © 2017, 2019 nee ;;; Copyright © 2017 Clément Lassieur ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2017, 2018 Rutger Helling @@ -6361,3 +6361,50 @@ (define-public arx-libertatis as a unique casting system where the player draws runes in real time to effect the desired spell.") (license license:gpl3+))) + +(define-public edgar + (package + (name "edgar") + (version "1.30") + (source + (origin + (method url-fetch) + (uri + (string-append "https://github.com/riksweeney/edgar/releases/download/" + version "/edgar-" version "-1.tar.gz")) + (sha256 + (base32 + "0bhbs33dg0nb8wqlh6px1jj41j05f89ngdqwdkffabmjk7wq5isx")))) + (build-system gnu-build-system) + (arguments '(#:tests? #f ; there are no tests + #:make-flags + (list "CC=gcc" + (string-append "PREFIX=" (assoc-ref %outputs "out")) + (string-append "BIN_DIR=" (assoc-ref %outputs "out") "/bin/")) + #:phases + (modify-phases %standard-phases + (delete 'configure) + (add-before 'build 'fix-env + (lambda* (#:key inputs #:allow-other-keys) + (setenv "CPATH" (string-append (assoc-ref inputs "sdl") + "/include/SDL/")) + #t))))) + (inputs `(("sdl" ,sdl) + ("sdl-img" ,sdl-image) + ("sdl-mixer" ,sdl-mixer) + ("sdl-ttf" ,sdl-ttf) + ("zlib" ,zlib))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("autoconf" ,autoconf) + ("automake" ,automake) + ("gnu-gettext" ,gnu-gettext) + ("libtool" ,libtool) + ("which" ,which))) + (synopsis "2d action platformer game") + (description "The Legend of Edgar is a 2D platform game with a persistent world. +When Edgar's father fails to return home after venturing out one dark and stormy night, +Edgar fears the worst: he has been captured by the evil sorcerer who lives in +a fortress beyond the forbidden swamp.") + (home-page "https://www.parallelrealities.co.uk/games/edgar/") + (license license:gpl2+))) From 6e4a5b9e37d47dcdf8f63ab96bec22c47f8570bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Lassieur?= Date: Tue, 19 Mar 2019 10:40:57 +0100 Subject: [PATCH 339/694] gnu: emacs-org-reveal: Use git-version and git-file-name. * gnu/packages/emacs-xyz.scm (emacs-org-reveal)[version]: Use git-version. [source]: Use git-file-name. --- gnu/packages/emacs-xyz.scm | 39 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index bf637d7102..0a81bf74df 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -10010,27 +10010,26 @@ (define-public emacs-org-ref (license license:gpl3+)))) (define-public emacs-org-reveal - (package - (name "emacs-org-reveal") - ;; There are no proper tag, so we use the latest commit of the stable - ;; branch, as does MELPA. - (version "20161027.926") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/yjwen/org-reveal.git") - (commit "001567cc12d50ba07612edd1718b86a12e8c2547"))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "18rma8smjrskbjyna076zhvx79zs5r5vinb537h8mw13pfxd6cm8")))) - (build-system emacs-build-system) - (home-page "https://github.com/yjwen/org-reveal") - (synopsis "Org and Reveal.js powered HTML presentation tool") - (description "Org-Reveal is a command@{org-mode} extension that allows to -create beautiful presentations (slides) with 3D effects from simple but + (let ((commit "001567cc12d50ba07612edd1718b86a12e8c2547")) + (package + (name "emacs-org-reveal") + (version (git-version "0.1" "1" commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/yjwen/org-reveal.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "18rma8smjrskbjyna076zhvx79zs5r5vinb537h8mw13pfxd6cm8")))) + (build-system emacs-build-system) + (home-page "https://github.com/yjwen/org-reveal") + (synopsis "Org and Reveal.js powered HTML presentation tool") + (description "Org-Reveal is a command@{org-mode} extension that allows +to create beautiful presentations (slides) with 3D effects from simple but powerful Org contents.") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public emacs-add-hooks (package From dfb49d7820cfd5834242f4f38718141e192ecc12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Lassieur?= Date: Tue, 19 Mar 2019 10:50:10 +0100 Subject: [PATCH 340/694] gnu: emacs-org-reveal: Update to 1cdd088. * gnu/packages/emacs-xyz.scm (emacs-org-reveal): Update to 1cdd088. --- 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 0a81bf74df..eb4dbc098d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -10010,10 +10010,10 @@ (define-public emacs-org-ref (license license:gpl3+)))) (define-public emacs-org-reveal - (let ((commit "001567cc12d50ba07612edd1718b86a12e8c2547")) + (let ((commit "1cdd088ec5fab631c564dca7f9f74fd3e9b7d4d4")) (package (name "emacs-org-reveal") - (version (git-version "0.1" "1" commit)) + (version (git-version "0.1" "2" commit)) (source (origin (method git-fetch) (uri (git-reference @@ -10022,7 +10022,7 @@ (define-public emacs-org-reveal (file-name (git-file-name name version)) (sha256 (base32 - "18rma8smjrskbjyna076zhvx79zs5r5vinb537h8mw13pfxd6cm8")))) + "1vjxjadq2i74p96y9jxnqj1yb86fsgxzmn7bjgnb88ay6nvc1l72")))) (build-system emacs-build-system) (home-page "https://github.com/yjwen/org-reveal") (synopsis "Org and Reveal.js powered HTML presentation tool") From 3e0df6cd4ad7b4eba6564976c98a94d131d44494 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Lassieur?= Date: Tue, 19 Mar 2019 11:28:53 +0100 Subject: [PATCH 341/694] gnu: Add emacs-org-re-reveal. * gnu/packages/emacs-xyz.scm (emacs-org-re-reveal): New variable. --- gnu/packages/emacs-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index eb4dbc098d..76b739b6f6 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -10009,6 +10009,7 @@ (define-public emacs-org-ref You should really read org-ref.org in this package for details.") (license license:gpl3+)))) +;; This project is unmaintained. Please use emacs-org-re-reveal instead. (define-public emacs-org-reveal (let ((commit "1cdd088ec5fab631c564dca7f9f74fd3e9b7d4d4")) (package @@ -10031,6 +10032,30 @@ (define-public emacs-org-reveal powerful Org contents.") (license license:gpl3+)))) +(define-public emacs-org-re-reveal + (package + (name "emacs-org-re-reveal") + (version "1.0.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/oer/org-re-reveal.git") + (commit "50cc6574c77f12d423f6cd096d8f76feb3673abc"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1v3z30gpimg4spf6zzqwp9b597zxk89h0vpq6xp58js4rjg4ixk8")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-htmlize" ,emacs-htmlize) + ("emacs-org" ,emacs-org))) + (home-page "https://gitlab.com/oer/org-re-reveal") + (synopsis "Build HTML presentations with reveal.js from Org source files") + (description "This project started as fork of org-reveal. It provides an +export back-end for HTML presentations with reveal.js from Org mode source +files.") + (license license:gpl3+))) + (define-public emacs-add-hooks (package (name "emacs-add-hooks") From cf31179062c99bc0ea4e2dab43d734036f117295 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 Mar 2019 12:15:46 +0100 Subject: [PATCH 342/694] gnu: hyperledger-fabric: Use git tag. * gnu/packages/hyperledger.scm (hyperledger-fabric)[source]: Check out the (supposedly immutable) tag instead of the (maintenance) branch. --- gnu/packages/hyperledger.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/hyperledger.scm b/gnu/packages/hyperledger.scm index b25a3c48e7..158a66e898 100644 --- a/gnu/packages/hyperledger.scm +++ b/gnu/packages/hyperledger.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Pierre Neidhardt +;;; Copyright © 2019 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -34,7 +35,7 @@ (define-module (gnu packages hyperledger) (define-public hyperledger-fabric (package (name "hyperledger-fabric") - (version "1.4") + (version "1.4.0") ;; While the GitHub repository is supposed to be "just a mirror," the Go ;; imports refer to it explicitly. (home-page "https://github.com/hyperledger/fabric") @@ -42,10 +43,11 @@ (define-public hyperledger-fabric (method git-fetch) (uri (git-reference (url home-page) - (commit (string-append "release-" version)))) + ;; ‘release-…’ are branches, and move. ‘v…’ are the tags. + (commit (string-append "v" version)))) (sha256 (base32 - "1g003wf6439f2c9i2vphf4sh463yyasq1vpqmkpw9lj170a6kl8k")) + "0nmg24ishwddxm1i2vh5ah5ylmmcg0apnjbgv1hljvhl48k4pzxq")) (file-name (git-file-name name version)))) (build-system go-build-system) (native-inputs From 7c1685e9d8a0b73c005ac35b1ddc2428b6a182d9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 19 Mar 2019 13:29:27 +0100 Subject: [PATCH 343/694] gnu: nanopolish: Remove bundled library sources. * gnu/packages/bioinformatics.scm (nanopolish)[source]: Add snippet to remove bundled htslib sources. --- gnu/packages/bioinformatics.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 371c13e121..9dcc9c8a38 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -14246,7 +14246,12 @@ (define-public nanopolish (recursive? #t))) (file-name (git-file-name name version)) (sha256 - (base32 "09j5gz57yr9i34a27vbl72i4g8syv2zzgmsfyjq02yshmnrvkjs6")))) + (base32 "09j5gz57yr9i34a27vbl72i4g8syv2zzgmsfyjq02yshmnrvkjs6")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "htslib") + #t)))) (build-system gnu-build-system) (arguments `(#:make-flags From c5542196d533739c95ba61d7cf28003195e1a6ee Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 19 Mar 2019 13:29:57 +0100 Subject: [PATCH 344/694] gnu: nanopolish: Use python-wrapper. * gnu/packages/bioinformatics.scm (nanopolish)[inputs]: Replace "python" with "python-wrapper" as scripts require "python" executable. --- gnu/packages/bioinformatics.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 9dcc9c8a38..edfc651026 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -14290,7 +14290,7 @@ (define-public nanopolish ("hdf5" ,hdf5) ("htslib" ,htslib) ("perl" ,perl) - ("python" ,python) + ("python" ,python-wrapper) ("python-biopython" ,python-biopython) ("python-numpy" ,python-numpy) ("python-pysam" ,python-pysam) From f20c64ed0b6d68f37f68f69807e6eace306586d5 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Mon, 18 Mar 2019 21:04:07 +0100 Subject: [PATCH 345/694] gnu: scanmem: Enable GUI frontend. * gnu/packages/debug.scm (scanmem): Enable GUI frontend. [arguments]: Add "--enable-gui" configure flag and 'hardcode-python, 'wrap-gameconqueror phases. [native-inputs]: Add python-wrapper, gobject-introspection, gtk+. [propogated-inputs]: Add python-pygobject. --- gnu/packages/debug.scm | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm index ef4ddc9cbb..49e40ee9cd 100644 --- a/gnu/packages/debug.scm +++ b/gnu/packages/debug.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2014, 2015, 2016, 2017 Eric Bavier ;;; Copyright © 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice -;;; Copyright © 2018 Rutger Helling +;;; Copyright © 2018, 2019 Rutger Helling ;;; Copyright © 2019 Pkill -9 ;;; ;;; This file is part of GNU Guix. @@ -32,11 +32,13 @@ (define-module (gnu packages debug) #:use-module (gnu packages bash) #:use-module (gnu packages flex) #:use-module (gnu packages glib) + #:use-module (gnu packages gtk) #:use-module (gnu packages golang) #:use-module (gnu packages code) #:use-module (gnu packages llvm) #:use-module (gnu packages perl) #:use-module (gnu packages pretty-print) + #:use-module (gnu packages python) #:use-module (gnu packages readline) #:use-module (gnu packages virtualization) #:use-module (ice-9 match) @@ -355,13 +357,38 @@ (define-public scanmem (base32 "17p8sh0rj8yqz36ria5bp48c8523zzw3y9g8sbm2jwq7sc27i7s9")))) (build-system gnu-build-system) + (arguments + `(#:configure-flags '("--enable-gui") + #:phases + (modify-phases %standard-phases + (add-before 'configure 'hardcode-python + (lambda* (#:key inputs outputs #:allow-other-keys) + (substitute* "gui/GameConqueror.py" + (("/usr/bin/env python") + (string-append (assoc-ref %build-inputs + "python-wrapper") "/bin/python"))) + #t)) + (add-after 'install 'wrap-gameconqueror + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (gi-typelib-path (getenv "GI_TYPELIB_PATH")) + (python-path (getenv "PYTHONPATH"))) + (wrap-program (string-append out "/share/gameconqueror/GameConqueror.py") + `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)) + `("PYTHONPATH" ":" prefix (,python-path)))) + #t))))) (native-inputs `(("libtool" ,libtool) + ("python-wrapper" ,python-wrapper) + ("gobject-introspection" ,gobject-introspection) + ("gtk+" ,gtk+) ("intltool" ,intltool) ("automake" ,automake) ("autoconf" ,autoconf))) (inputs `(("readline" ,readline))) + (propagated-inputs + `(("python-pygobject" ,python-pygobject))) (home-page "https://github.com/scanmem/scanmem") (synopsis "Memory scanner") (description "Scanmem is a debugging utility designed to isolate the From 2390e0d4d622bb822616a9cff8c8b99be07b263b Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 19 Mar 2019 14:55:06 +0100 Subject: [PATCH 346/694] gnu: emacs-evil-collection: Update to 20190319. * gnu/packages/emacs-xyz.scm (emacs-evil-collection): Update to 20190319. --- 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 76b739b6f6..dd99aaedab 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -5253,8 +5253,8 @@ (define-public emacs-evil (license license:gpl3+))) (define-public emacs-evil-collection - (let ((commit "e7b57aae0131634d0da5e599717a86c4b3ca6092") - (revision "7")) + (let ((commit "baa9c6880779d416a91bf5bde3589673a7403612") + (revision "8")) (package (name "emacs-evil-collection") (version (git-version "0.0.1" revision commit)) @@ -5266,7 +5266,7 @@ (define-public emacs-evil-collection (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1g7bxvgnsikpxxdimy0lymn3xz53fari048l827sjyw5kxi59d20")))) + "09v97nk7qawphfijzqxzi2y63ydmfq7hsgpljjxwkykrc5h0kdlj")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-evil" ,emacs-evil))) From c022edf6f48b02df45616c0adb35238f1dc13dac Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 19 Mar 2019 14:17:59 +0200 Subject: [PATCH 347/694] gnu: libdrm: Fix configure-flags. * gnu/packages/xdisorg.scm (libdrm)[arguments]: Update configure-flags for new build system. Join aarch64 and armhf selections. --- gnu/packages/xdisorg.scm | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 2cb8f3b13f..8cf0365fc2 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -395,15 +395,11 @@ (define-public libdrm (arguments `(#:configure-flags '(,@(match (%current-system) - ("armhf-linux" - '("-Dexynos-experimental-api=true" - "-Domap-experimental-api=true" - "-Detnaviv-experimental-api=true" - "-Dtegra-experimental-api=true" - "-Dfreedreno-kgsl=true")) - ("aarch64-linux=true" - '("-Dtegra-experimental-api=true" - "-Detnaviv-experimental-api=true" + ((or "armhf-linux" "aarch64-linux") + '("-Dexynos=true" + "-Domap=true" + "-Detnaviv=true" + "-Dtegra=true" "-Dfreedreno-kgsl=true")) (_ '()))))) (inputs From fe7c6f91dda727aa87e283e4303d6b93addee955 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 19 Mar 2019 14:31:54 +0200 Subject: [PATCH 348/694] gnu: libdrm: Extend test timeout on armhf-linux. * gnu/packages/xdisorg.scm (libdrm)[arguments]: Replace the 'check phase on armhf-linux. --- gnu/packages/xdisorg.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 8cf0365fc2..377c5d1a30 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -401,7 +401,14 @@ (define-public libdrm "-Detnaviv=true" "-Dtegra=true" "-Dfreedreno-kgsl=true")) - (_ '()))))) + (_ '()))) + ,@(if (string=? (%current-system) "armhf-linux") + '(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "meson" "test" "--timeout-multiplier" "5"))))) + '()))) (inputs `(("libpciaccess" ,libpciaccess))) (native-inputs From 7d1494d979f9b9c417484499a5655062c75b326a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 19 Mar 2019 14:59:50 +0200 Subject: [PATCH 349/694] gnu: mesa: Fix building on non-Intel architectures. * gnu/packages/gl.scm (mesa)[arguments]: Add explicit vulkan-driver support in match statement. --- gnu/packages/gl.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index b715c1ad8d..4d969dfe74 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -301,7 +301,7 @@ (define-public mesa ("i686-linux" '("-Dvulkan-drivers=amd")) (_ - '(""))) + '("-Dvulkan-drivers=auto"))) ;; Also enable the tests. "-Dbuild-tests=true" From c0aaca02c7d00bf2a41523f4c78fb0a484206536 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 19 Mar 2019 15:55:08 +0100 Subject: [PATCH 350/694] gnu: Add emacs-helm-wikipedia. * gnu/packages/emacs-xyz.scm (emacs-helm-wikipedia): New variable. --- gnu/packages/emacs-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index dd99aaedab..6afd048d36 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -13783,3 +13783,28 @@ (define-public emacs-nhexl-mode C-f} to advance by #xa4 characters. @end itemize\n") (license license:gpl3+))) + +(define-public emacs-helm-wikipedia + (let ((commit "126f044e0a0e1432e0791c33ce2a41875d704a9b")) + (package + (name "emacs-helm-wikipedia") + (version (git-version "0.0.0" "1" commit)) + (home-page "https://github.com/emacs-helm/helm-wikipedia/") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "148a5xsnbsiddhf9cl7yxdk41lrv38h0pip91kcflw9d7l0dp7pr")))) + (build-system emacs-build-system) + (inputs + `(("helm" ,emacs-helm))) + (synopsis "Search suggestions and article extracts from Wikipedia for Emacs") + (description + "This package provides an Emacs Helm interface for search suggestions +and article extracts for Wikipedia.") + (license license:gpl3+)))) From d2ad4f2e00da3bcf1a87be16c0b456255e7a5f79 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Mar 2019 13:11:56 +0100 Subject: [PATCH 351/694] gnu: dcmtk: Use HTTPS home page. * gnu/packages/image-processing.scm (dcmtk)[home-page]: Use HTTPS. --- gnu/packages/image-processing.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 14e8b15b69..54ff39fb81 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -88,7 +88,7 @@ (define-public dcmtk ("zlib" ,zlib))) (native-inputs `(("perl" ,perl))) - (home-page "http://dcmtk.org") + (home-page "https://dcmtk.org") (synopsis "Libraries and programs implementing parts of the DICOM standard") (description "DCMTK is a collection of libraries and applications implementing large parts the DICOM standard. It includes software for From 882d579d3fc3ffefe2e5f50b7d5dac22a24a4421 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Mar 2019 13:14:12 +0100 Subject: [PATCH 352/694] gnu: dcmtk: Update to 3.6.4. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/image-processing.scm (dcmtk): Update to 3.6.4. [inputs]: Add libjpeg. Order alphabetically. Move doxygen… [native-inputs]: …here. Remove perl. Order alphabetically. --- gnu/packages/image-processing.scm | 32 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 54ff39fb81..a5e9969bfe 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2014 Ludovic Courtès ;;; Copyright © 2014 Mark H Weaver ;;; Copyright © 2016 Eric Bavier -;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Björn Höfling ;;; Copyright © 2018 Lprndn ;;; Copyright © 2019 Efraim Flashner @@ -65,29 +65,27 @@ (define-module (gnu packages image-processing) #:use-module (gnu packages xorg) #:use-module (ice-9 match)) -;; We use the latest snapshot of this package because the latest release is -;; from 2011 and has known vulnerabilities that cannot easily be fixed by -;; applying patches. (define-public dcmtk (package (name "dcmtk") - (version "3.6.1_20170228") - (source (origin - (method url-fetch) - (uri (string-append "ftp://dicom.offis.de/pub/dicom/offis/" - "software/dcmtk/snapshot/dcmtk-" - version ".tar.gz")) - (sha256 - (base32 - "04cwfx8yrscqcd59mxk2fh6314ckayi9cp68iql5a57pf2pg5qld")))) - (build-system gnu-build-system) + (version "3.6.4") + (source + (origin + (method url-fetch) + (uri + (string-append "ftp://dicom.offis.de/pub/dicom/offis/software/dcmtk/" + "dcmtk" (string-join (string-split version #\.) "") + "/dcmtk-" version ".tar.gz")) + (sha256 + (base32 "1h22z8g0kmvhg8lgkbikyzyphhvxvq6018a00yd6i4g0z9ag6gx9")))) + (build-system cmake-build-system) (inputs - `(("libtiff" ,libtiff) + `(("libjpeg" ,libjpeg) ("libpng" ,libpng) - ("doxygen" ,doxygen) + ("libtiff" ,libtiff) ("zlib" ,zlib))) (native-inputs - `(("perl" ,perl))) + `(("doxygen" ,doxygen))) ; for HTML documentation (home-page "https://dcmtk.org") (synopsis "Libraries and programs implementing parts of the DICOM standard") (description "DCMTK is a collection of libraries and applications From 8486a80d6a4f9006352344c344e298a54f1c20ae Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Mar 2019 13:16:30 +0100 Subject: [PATCH 353/694] gnu: dcmtk: Support more. * gnu/packages/image-processing.scm (dcmtk)[inputs]: Add libxml2, and openssl. --- gnu/packages/image-processing.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index a5e9969bfe..e708e1366c 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -59,6 +59,7 @@ (define-module (gnu packages image-processing) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) #:use-module (gnu packages serialization) + #:use-module (gnu packages tls) #:use-module (gnu packages video) #:use-module (gnu packages xiph) #:use-module (gnu packages xml) @@ -80,9 +81,13 @@ (define-public dcmtk (base32 "1h22z8g0kmvhg8lgkbikyzyphhvxvq6018a00yd6i4g0z9ag6gx9")))) (build-system cmake-build-system) (inputs - `(("libjpeg" ,libjpeg) + `(;; Our ICU is too recent: “error: ‘UChar’ does not name a type“. + ;; ("icu4c" ,icu4c) + ("libjpeg" ,libjpeg) ("libpng" ,libpng) ("libtiff" ,libtiff) + ("libxml2" ,libxml2) + ("openssl" ,openssl) ("zlib" ,zlib))) (native-inputs `(("doxygen" ,doxygen))) ; for HTML documentation From ab3423d2ff96b4789b066267f0624e5a035984a7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 Mar 2019 14:58:17 +0100 Subject: [PATCH 354/694] gnu: youtube-dl: Update to 2019.03.18. * gnu/packages/video.scm (youtube-dl): Update to 2019.03.18. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 220d729d03..24b4a2c22d 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1440,7 +1440,7 @@ (define-public libvpx-1.7 (define-public youtube-dl (package (name "youtube-dl") - (version "2019.03.09") + (version "2019.03.18") (source (origin (method url-fetch) (uri (string-append "https://github.com/rg3/youtube-dl/releases/" @@ -1448,7 +1448,7 @@ (define-public youtube-dl version ".tar.gz")) (sha256 (base32 - "1g46mrmzr31b2r6x0g6wmg3j00qc8l6cbzmdik0l5vwjfcrdvghf")))) + "0r31q7j3gg2zfw3b45jancxl7mmr2gin8dyfx5dgyyp92ss8hih7")))) (build-system python-build-system) (arguments ;; The problem here is that the directory for the man page and completion From 429947ef626337cf67775b74ac312fd1ee057167 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 Mar 2019 15:06:52 +0100 Subject: [PATCH 355/694] gnu: geomyidae: Don't use unstable tarball. * gnu/packages/web.scm (geomyidae)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/web.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index dfabb3aa65..12f3b57bac 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -6204,18 +6204,19 @@ (define-public geomyidae (version "0.31") (source (origin - (method url-fetch) - (uri (string-append "http://git.r-36.net/geomyidae/snapshot/" - "geomyidae-" version ".tar.bz2")) + (method git-fetch) + (uri (git-reference + (url "git://r-36.net/geomyidae") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 - "1ih7220c6mgq4r7blm4kx3pxbl53sph58lqgwci6cmi3c0sq5c3x")))) + (base32 "1ldv4bca2x9kq2fwmzg3l6qahvzg9kki3j9j5njl74k23zc2acik")))) (build-system gnu-build-system) (arguments `(#:make-flags (list "CC=gcc" (string-append "PREFIX=" (assoc-ref %outputs "out"))) - #:tests? #f ;no tests + #:tests? #f ; no tests #:phases (modify-phases %standard-phases (delete 'configure)))) (home-page "http://git.r-36.net/geomyidae") From e0d6d1d56cacaa0403bb719cdc257bdf74b6e977 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 Mar 2019 15:07:58 +0100 Subject: [PATCH 356/694] gnu: geomyidae: Update home page. * gnu/packages/web.scm (geomyidae)[home-page]: Point to relevant Web content. --- gnu/packages/web.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 12f3b57bac..d4eefbb46b 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -6219,7 +6219,7 @@ (define-public geomyidae #:tests? #f ; no tests #:phases (modify-phases %standard-phases (delete 'configure)))) - (home-page "http://git.r-36.net/geomyidae") + (home-page "http://r-36.net/scm/geomyidae/file/README.html") (synopsis "Small Gopher server") (description "Geomyidae is a server for distributed hypertext protocol Gopher. Its From c10c9b6765322ec874890e51fa8cb112a24c1584 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 Mar 2019 15:09:39 +0100 Subject: [PATCH 357/694] gnu: geomyidae: Update to 0.34. * gnu/packages/web.scm (geomyidae): Update to 0.34. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index d4eefbb46b..09b7310ecf 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -6201,7 +6201,7 @@ (define-public perl-html-tidy (define-public geomyidae (package (name "geomyidae") - (version "0.31") + (version "0.34") (source (origin (method git-fetch) @@ -6210,7 +6210,7 @@ (define-public geomyidae (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1ldv4bca2x9kq2fwmzg3l6qahvzg9kki3j9j5njl74k23zc2acik")))) + (base32 "02afgrk36wkdkflyqr2xgh49v9zq6ma454jshk7igvhpxfb5l3ks")))) (build-system gnu-build-system) (arguments `(#:make-flags (list "CC=gcc" From 96473656adf07f980162ba6769e6bca93f49db9d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 Mar 2019 15:29:41 +0100 Subject: [PATCH 358/694] gnu: perl-apache-logformat-compiler: Update to 0.35. * gnu/packages/web.scm (perl-apache-logformat-compiler): Update to 0.35. [native-inputs]: Replace perl-module-build with perl-module-build-tiny. --- gnu/packages/web.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 09b7310ecf..6fafe1c49c 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1338,25 +1338,24 @@ (define-public sassc (define-public perl-apache-logformat-compiler (package (name "perl-apache-logformat-compiler") - (version "0.33") + (version "0.35") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/K/KA/KAZEBURO/" "Apache-LogFormat-Compiler-" version ".tar.gz")) (sha256 - (base32 - "17blk3zhp05azgypn25ydxf3d7fyfgr9bxyiv7xkchhqma96vwqv")))) + (base32 "06i70ydxk2wa2rcqn16842kra2qz3jwk0vk1abq8lah4180c0m0n")))) (build-system perl-build-system) (native-inputs `(("perl-http-message" ,perl-http-message) - ("perl-module-build" ,perl-module-build) + ("perl-module-build-tiny" ,perl-module-build-tiny) ("perl-test-mocktime" ,perl-test-mocktime) ("perl-try-tiny" ,perl-try-tiny) ("perl-uri" ,perl-uri))) (propagated-inputs `(("perl-posix-strftime-compiler" ,perl-posix-strftime-compiler))) - (arguments `(#:tests? #f)) ;TODO: Timezone test failures + (arguments `(#:tests? #f)) ; TODO: Timezone test failures (home-page "https://metacpan.org/release/Apache-LogFormat-Compiler") (synopsis "Compile a log format string to perl-code") (description "This module provides methods to compile a log format string From 2f67ac377a6be3f05af87a30a92126df0cf43385 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 Mar 2019 15:34:18 +0100 Subject: [PATCH 359/694] gnu: perl-catalyst-action-rest: Update to 1.21. * gnu/packages/web.scm (perl-catalyst-action-rest): Update to 1.21. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 6fafe1c49c..5a02066dbf 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1420,14 +1420,14 @@ (define-public perl-catalyst-action-renderview (define-public perl-catalyst-action-rest (package (name "perl-catalyst-action-rest") - (version "1.20") + (version "1.21") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/J/JJ/JJNAPIORK/" "Catalyst-Action-REST-" version ".tar.gz")) (sha256 (base32 - "1mpa64p61f3dp24xnhdraswch4sqj5vyv1iivcvvh5h0xi0haiy0")))) + "086bykggzalbjfk0islac4b48g9s2ypj7y81d6ns1lq0aax1py6c")))) (build-system perl-build-system) (native-inputs `(("perl-test-requires" ,perl-test-requires) From 7f5a010b9a9363fb24fe9f0cb1e2470f5b96db1c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 Mar 2019 15:42:18 +0100 Subject: [PATCH 360/694] gnu: perl-catalyst-plugin-session: Update to 0.41. * gnu/packages/web.scm (perl-catalyst-plugin-session): Update to 0.41. --- gnu/packages/web.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 5a02066dbf..cf26a1aaa9 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1780,15 +1780,14 @@ (define-public perl-catalyst-plugin-configloader (define-public perl-catalyst-plugin-session (package (name "perl-catalyst-plugin-session") - (version "0.40") + (version "0.41") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/J/JJ/JJNAPIORK/" "Catalyst-Plugin-Session-" version ".tar.gz")) (sha256 - (base32 - "171vi9xcl775scjaw4fcfdmqvz0rb1nr0xxg2gb3ng6bjzpslhgv")))) + (base32 "0a451997zc2vjx7rvndgx1ldbrpic8sfbddyvncynh0zr8bhlqc5")))) (build-system perl-build-system) (native-inputs `(("perl-module-install" ,perl-module-install) From fc82c1752e5694daf498d351610235bfab7e890c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 Mar 2019 16:22:14 +0100 Subject: [PATCH 361/694] gnu: google-brotli: Don't use unstable tarball. * gnu/packages/compression.scm (google-brotli)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/compression.scm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index e3c23126b0..2f32fb05ed 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1759,13 +1759,15 @@ (define-public google-brotli (package (name "google-brotli") (version "1.0.4") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/google/brotli/archive/v" - version ".tar.gz")) - (sha256 - (base32 - "1hrpmz162k4x3xm6vmbpm443jlfr1kp536p8962y2dncy7gs6s12")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/google/brotli.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0n5snycxgwqj2v8sgxiqxq4zqh5ydx70dr7qa4ygizs02ms69n1i")))) (build-system cmake-build-system) (arguments `(#:phases From 598c2bbc5312f5d25c52015714343d4da8e3e7b0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 Mar 2019 16:34:22 +0100 Subject: [PATCH 362/694] gnu: google-brotli: Update to 1.0.7. * gnu/packages/compression.scm (google-brotli): Update to 1.0.7. --- gnu/packages/compression.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 2f32fb05ed..fee657c3f8 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1758,7 +1758,7 @@ (define-public innoextract (define-public google-brotli (package (name "google-brotli") - (version "1.0.4") + (version "1.0.7") (source (origin (method git-fetch) @@ -1767,7 +1767,7 @@ (define-public google-brotli (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0n5snycxgwqj2v8sgxiqxq4zqh5ydx70dr7qa4ygizs02ms69n1i")))) + (base32 "1811b55wdfg4kbsjcgh1kc938g118jpvif97ilgrmbls25dfpvvw")))) (build-system cmake-build-system) (arguments `(#:phases From 47982ca9b0f05d5e3c3b984f86a67ce1f2c37215 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 Mar 2019 18:07:37 +0100 Subject: [PATCH 363/694] gnu: python-ipy: Update to 1.00. * gnu/packages/networking.scm (python-ipy): Update to 1.00. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index f504dbf20b..29a478058e 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1470,13 +1470,13 @@ (define-public openvswitch (define-public python-ipy (package (name "python-ipy") - (version "0.83") + (version "1.00") (source (origin (method url-fetch) (uri (pypi-uri "IPy" version)) (sha256 (base32 - "1f6sdrxclifky4gvkf4gvyv5hx3fjh8vzspnfrqki6qm5d9mmnk1")))) + "08d6kcacj67mvh0b6y765ipccy6gi4w2ndd4v1l3im2qm1cgcarg")))) (build-system python-build-system) (home-page "https://github.com/autocracy/python-ipy/") (synopsis "Python class and tools for handling IP addresses and networks") From c1d6865166270a236ad15a1d4704e062d3f38a98 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 Mar 2019 18:20:20 +0100 Subject: [PATCH 364/694] gnu: gandi.cli: Update to 1.4. * gnu/packages/networking.scm (gandi.cli): Update to 1.4. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 29a478058e..d3deb78516 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -684,13 +684,13 @@ (define-public fping (define-public gandi.cli (package (name "gandi.cli") - (version "1.3") + (version "1.4") (source (origin (method url-fetch) (uri (pypi-uri name version)) (sha256 - (base32 "0vfzkw1avybjkf6fwqpf5m4kjz4c0qkkmj62f3jd0zx00vh5ly1d")))) + (base32 "1lfvb5npk99nz1lwhr5m67ia1kj35nqd6a2xp9mii28xgzsd5awk")))) (build-system python-build-system) (arguments `(#:phases From 1c4d4196c2b21d4880c4bd97ea3ec28d2b05e2b3 Mon Sep 17 00:00:00 2001 From: nee Date: Fri, 15 Mar 2019 22:13:12 +0100 Subject: [PATCH 365/694] gnu: cataclysm-dda: Update to 0.D. * gnu/packages/games.scm (cataclysm-dda): Update to 0.D. --- gnu/packages/games.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 56dc96de8f..e750d0657e 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -259,13 +259,10 @@ (define-public bastet (license license:gpl3+))) (define-public cataclysm-dda - (let ((commit "0b2c194e5c6a06f4fbf14a0ec1260e0f3cf2567c") - (revision "2")) + (let ((commit "9c732a5de48928691ab863d3ab275ca7b0e522fc")) (package (name "cataclysm-dda") - ;; This denotes the version released after the 0.C release. - ;; Revert to a normal version number if updating to stable version 0.D. - (version (git-version "0.C" revision commit)) + (version "0.D") (source (origin (method git-fetch) (uri (git-reference @@ -273,7 +270,7 @@ (define-public cataclysm-dda (commit commit))) (sha256 (base32 - "1yzsn0y2g27bvbxjvivjyjhkmf2w5na1qqw5qfkswcfqqwym2y33")) + "00zzhx1mh1qjq668cga5nbrxp2qk6b82j5ak65skhgnlr6ii4ysc")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments From d17b1c0891c2e1b2b1bfc92a120e91c1f8909c39 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 Mar 2019 00:13:57 +0100 Subject: [PATCH 366/694] gnu: knot: Update to 2.8.0. * gnu/packages/dns.scm (knot): Update to 2.8.0. [source]: Add patch. * gnu/packages/patches/knot-include-system-lmdb-header.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/dns.scm | 6 ++-- .../knot-include-system-lmdb-header.patch | 34 +++++++++++++++++++ 3 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/knot-include-system-lmdb-header.patch diff --git a/gnu/local.mk b/gnu/local.mk index 87bed6e827..c32876cdcf 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -929,6 +929,7 @@ dist_patch_DATA = \ %D%/packages/patches/kio-search-smbd-on-PATH.patch \ %D%/packages/patches/kmod-module-directory.patch \ %D%/packages/patches/kmscon-runtime-keymap-switch.patch \ + %D%/packages/patches/knot-include-system-lmdb-header.patch \ %D%/packages/patches/kpackage-allow-external-paths.patch \ %D%/packages/patches/kobodeluxe-paths.patch \ %D%/packages/patches/kobodeluxe-enemies-pipe-decl.patch \ diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index f8b60e34c5..034fe6916a 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -569,14 +569,16 @@ (define-public yadifa (define-public knot (package (name "knot") - (version "2.7.6") + (version "2.8.0") (source (origin (method url-fetch) (uri (string-append "https://secure.nic.cz/files/knot-dns/" "knot-" version ".tar.xz")) (sha256 (base32 - "18lpyq3vgr2ainmfiy14x7hcf1zxza66bhkpr54jaz2gy1viijx1")) + "1vw7xx7bm440jwrpvdd04vrp6ccz2b11swcn9msvs62hf0kdjjj9")) + (patches + (search-patches "knot-include-system-lmdb-header.patch")) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/patches/knot-include-system-lmdb-header.patch b/gnu/packages/patches/knot-include-system-lmdb-header.patch new file mode 100644 index 0000000000..5c5c0beabc --- /dev/null +++ b/gnu/packages/patches/knot-include-system-lmdb-header.patch @@ -0,0 +1,34 @@ +From: Tobias Geerinckx-Rice +Date: Wed, 20 Mar 2019 00:08:00 +0100 +Subject: [PATCH] gnu: knot: Include system . + +Copied verbatim from Knot master[0]. + +[0]: https://gitlab.labs.nic.cz/knot/knot-dns/commit/b557430cffbb1c6b30617a394b02acc514e7e536 + +From b557430cffbb1c6b30617a394b02acc514e7e536 Mon Sep 17 00:00:00 2001 +From: Daniel Salzman +Date: Wed, 6 Mar 2019 17:35:44 +0100 +Subject: [PATCH] journal: include proper header + +fixes #638 +--- + src/knot/journal/knot_lmdb.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/knot/journal/knot_lmdb.h b/src/knot/journal/knot_lmdb.h +index 35a88845c..b1d09cbb4 100644 +--- a/src/knot/journal/knot_lmdb.h ++++ b/src/knot/journal/knot_lmdb.h +@@ -16,7 +16,7 @@ + + #pragma once + +-#include "contrib/lmdb/lmdb.h" ++#include + + #include + #include +-- +2.18.1 + From 8cf160e12253d65e9122d56cb602e0907e8c71bc Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 19 Mar 2019 19:01:48 -0400 Subject: [PATCH 367/694] gnu: icecat: Improve computed 'icecat-source' tarball. * gnu/packages/gnuzilla.scm (icecat-source): When packing the new IceCat tarball, set the mtime of archived files to early 1980. Remove useless 'string-append' applied to one argument. --- gnu/packages/gnuzilla.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 785d5c1342..6992a7b1ca 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -722,11 +722,15 @@ (define icecat-source (string-append old-icecat-dir "/l10n") (string-append old-icecat-dir "/debian")) - (format #t (string-append "Packing new IceCat tarball...~%")) + (format #t "Packing new IceCat tarball...~%") (force-output) (invoke "tar" "cfa" #$output - ;; avoid non-determinism in the archive - "--mtime=@0" + ;; Avoid non-determinism in the archive. We set the + ;; mtime of files in the archive to early 1980 because + ;; the build process fails if the mtime of source + ;; files is pre-1980, due to the creation of zip + ;; archives. + "--mtime=@315619200" ; 1980-01-02 UTC "--owner=root:0" "--group=root:0" "--sort=name" From 6d96a4f769ea9d3692c2a58d6538f9e6512edcf0 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 27 Feb 2019 13:48:13 -0500 Subject: [PATCH 368/694] gnu: icecat: Update to 60.6.0-guix1 [security-fixes]. Includes fixes for CVE-2018-18506, CVE-2019-9788, CVE-2019-9790, CVE-2019-9791, CVE-2019-9792, CVE-2019-9793, CVE-2019-9794, CVE-2019-9795, CVE-2019-9796, and CVE-2019-9801. * gnu/packages/gnuzilla.scm (%icecat-version): Update to 60.6.0-guix1. (icecat-source)[upstream-firefox-source]: Update hash. --- gnu/packages/gnuzilla.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 6992a7b1ca..33e6b933f3 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -578,7 +578,7 @@ (define* (computed-origin-method gexp-promise hash-algo hash #:system system #:guile-for-build guile))) -(define %icecat-version "60.5.1-guix1") +(define %icecat-version "60.6.0-guix1") ;; 'icecat-source' is a "computed" origin that generates an IceCat tarball ;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat' @@ -600,7 +600,7 @@ (define icecat-source "firefox-" upstream-firefox-version ".source.tar.xz")) (sha256 (base32 - "1xbi1gvrrvqby04vx6klxff7h5r87dqgi1fx6i4mbg3ll59gy09z")))) + "1mc57dhwyjr6qjm3q617wvj306wi72548wjx7lz1dxkz6hndi03w")))) (upstream-icecat-base-version "60.3.0") ; maybe older than base-version (upstream-icecat-gnu-version "1") From 7c45593b449852540cd0397ce650558059c8a12a Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Wed, 20 Mar 2019 15:40:43 +0530 Subject: [PATCH 369/694] gnu: libinfinity: Update to 0.7.1. * gnu/packages/gobby.scm (libinfinity): Update to 0.7.1. [inputs]: Remove gtk+-2. Add gtk+. --- gnu/packages/gobby.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gobby.scm b/gnu/packages/gobby.scm index 45ebed7c43..a7eb1ea0cd 100644 --- a/gnu/packages/gobby.scm +++ b/gnu/packages/gobby.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016, 2017 Andy Wingo -;;; Copyright © 2017 Arun Isaac +;;; Copyright © 2017, 2019 Arun Isaac ;;; ;;; This file is part of GNU Guix. ;;; @@ -182,7 +182,7 @@ (define-public gobby (define-public libinfinity (package (name "libinfinity") - (version "0.6.8") + (version "0.7.1") (source (origin (method url-fetch) @@ -190,12 +190,12 @@ (define-public libinfinity version ".tar.gz")) (sha256 (base32 - "0nylsb6qz9pjw3agjp27c4za205i6zg6i5g1vgs5vbdnbh77wkhc")))) + "1jw2fhrcbpyz99bij07iyhy9ffyqdn87vl8cb1qz897y3f2f0vk2")))) (build-system gnu-build-system) (inputs `(("glib" ,glib) ("gsasl" ,gsasl) - ("gtk+" ,gtk+-2) + ("gtk+" ,gtk+) ("libxml2" ,libxml2))) (native-inputs `(("pkg-config" ,pkg-config))) From 3d7a7b1dd63aa6de5b499eb6d3e28bc4b4543a0f Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 20 Mar 2019 11:58:37 +0100 Subject: [PATCH 370/694] gnu: emacs-helm-notmuch: Update to 1.2. * gnu/packages/emacs-xyz.scm (emacs-helm-notmuch): Update to 1.2. --- gnu/packages/emacs-xyz.scm | 43 +++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 6afd048d36..9969c7968c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -13639,30 +13639,29 @@ (define-public emacs-lsp-ui (license license:gpl3+))) (define-public emacs-helm-notmuch - (let ((commit "9988eb0f787c82c779f2417b5613b9142a5b1c9b")) - (package - (name "emacs-helm-notmuch") - (version (git-version "1.1" "1" commit)) - (home-page "https://github.com/xuchunyang/helm-notmuch/") - (source (origin - (method git-fetch) - (uri (git-reference - (url home-page) - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1jwhmlqlgzxj2zfz0za33vn8m2zrsmkmnq2vx5i1nry70p9h43b4")))) - (build-system emacs-build-system) - (propagated-inputs - `(("emacs-helm" ,emacs-helm) - ("notmuch" ,notmuch))) - (synopsis "Search emails with Emacs Notmuch and Helm") - (description - "This package can be used to search emails in Emacs, searching result + (package + (name "emacs-helm-notmuch") + (version "1.2") + (home-page "https://github.com/emacs-helm/helm-notmuch/") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1k038dbdpaa411gl4071x19fklhnizhr346plxw23lsnxir9dhqc")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-helm" ,emacs-helm) + ("notmuch" ,notmuch))) + (synopsis "Search emails with Emacs Notmuch and Helm") + (description + "This package can be used to search emails in Emacs, searching result displays as you type thanks to Helm, though @command{notmuch-search} does the real search.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-elmacro (let ((commit "89b9b0feabafd01fee48111d67131c4c9b5fed9a")) From cbc6a28b6781494f458966498517092fba395f94 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 19 Mar 2019 20:01:08 +0100 Subject: [PATCH 371/694] gnu: 389-ds-base: Update to 1.4.0.21. * gnu/packages/openldap.scm (389-ds-base): Update to 1.4.0.21. [arguments]: Add phase "fix-includes". [inputs]: Add cracklib. --- gnu/packages/openldap.scm | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/gnu/packages/openldap.scm b/gnu/packages/openldap.scm index 368a953cb5..c3075b4d59 100644 --- a/gnu/packages/openldap.scm +++ b/gnu/packages/openldap.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2013, 2014, 2015 Ludovic Courtès ;;; Copyright © 2013 Andreas Enge ;;; Copyright © 2016 Leo Famulari -;;; Copyright © 2017, 2018 Ricardo Wurmus +;;; Copyright © 2017, 2018, 2019 Ricardo Wurmus ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. @@ -36,6 +36,7 @@ (define-module (gnu packages openldap) #:use-module (gnu packages libevent) #:use-module (gnu packages linux) #:use-module (gnu packages networking) + #:use-module (gnu packages password-utils) #:use-module (gnu packages pcre) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) @@ -198,14 +199,14 @@ (define-public python-ldap (define-public 389-ds-base (package (name "389-ds-base") - (version "1.4.0.13") + (version "1.4.0.21") (source (origin (method url-fetch) (uri (string-append "https://releases.pagure.org/389-ds-base/" "389-ds-base-" version ".tar.bz2")) (sha256 (base32 - "01dm3zq3w5ami9pwcjbjz8wfbx9krjxybjrgc4wyhrxlzd90ylzj")))) + "1qd1ap5d5nxyiq0d19czfwc3h7iwl9lmr5sy7d7xmpr2by59aysr")))) (build-system gnu-build-system) (arguments `(#:modules ((srfi srfi-1) @@ -228,6 +229,11 @@ (define-public 389-ds-base "--disable-perl") #:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-includes + (lambda _ + (substitute* "include/ldaputil/certmap.h" + (("nss3/cert.h") "nss/cert.h")) + #t)) (add-after 'unpack 'fix-install-location-of-python-tools (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -286,6 +292,7 @@ (define-public 389-ds-base #t))))) (inputs `(("bdb" ,bdb) + ("cracklib" ,cracklib) ("cyrus-sasl" ,cyrus-sasl) ("gnutls" ,gnutls) ("httpd" ,httpd) From 7627bad6a7869b3f12b6659c326924f35a6fb28f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 19 Mar 2019 20:01:43 +0100 Subject: [PATCH 372/694] gnu: 389-ds-base: Set localstatedir to /var. * gnu/packages/openldap.scm (389-ds-base)[arguments]: Set localstatedir to /var. --- gnu/packages/openldap.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/openldap.scm b/gnu/packages/openldap.scm index c3075b4d59..878dc0b4b1 100644 --- a/gnu/packages/openldap.scm +++ b/gnu/packages/openldap.scm @@ -223,6 +223,7 @@ (define-public 389-ds-base (assoc-ref %build-inputs "pcre")) (string-append "--with-selinux=" (assoc-ref %build-inputs "libselinux")) + "--localstatedir=/var" ;; The Perl scripts are being removed in the 1.4.0 release. ;; Building them would require packaging of the outdated Mozilla ;; LDAP SDK (instead of OpenLDAP) and PerLDAP. From 35f9c6628fd52adca03d08e503d65fa68c573a8e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Mar 2019 11:58:35 +0100 Subject: [PATCH 373/694] gnu: Add adapterremoval. * gnu/packages/bioinformatics.scm (adapterremoval): New variable. --- gnu/packages/bioinformatics.scm | 37 +++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index edfc651026..840ddfad17 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -14602,3 +14602,40 @@ (define-public arriba ;; All code is under the Expat license with the exception of ;; "draw_fusions.R", which is under GPLv3. (license (list license:expat license:gpl3)))) + +(define-public adapterremoval + (package + (name "adapterremoval") + (version "2.3.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/MikkelSchubert/adapterremoval.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1nf3ki5pfzalhrx2fr1y6pfqfi133yj2m7q4fj9irf5fb94bapwr")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags (list "COLOR_BUILD=no" + (string-append "PREFIX=" + (assoc-ref %outputs "out"))) + #:test-target "test" + #:phases + (modify-phases %standard-phases + (delete 'configure)))) + (inputs + `(("zlib" ,zlib))) + (home-page "https://adapterremoval.readthedocs.io/") + (synopsis "Rapid sequence adapter trimming, identification, and read merging") + (description + "This program searches for and removes remnant adapter sequences from +@dfn{High-Throughput Sequencing} (HTS) data and (optionally) trims low quality +bases from the 3' end of reads following adapter removal. AdapterRemoval can +analyze both single end and paired end data, and can be used to merge +overlapping paired-ended reads into (longer) consensus sequences. +Additionally, the AdapterRemoval may be used to recover a consensus adapter +sequence for paired-ended data, for which this information is not available.") + (license license:gpl3+))) From 19a0a060d2d9540d0f151821227ba8b2fbbd2ef1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Mar 2019 11:59:17 +0100 Subject: [PATCH 374/694] gnu: 389-ds-base: Fix tool references. * gnu/packages/openldap.scm (389-ds-base)[arguments]: Rename phase "fix-includes" to "fix-references" and fix references to certutil and c_rehash. [inputs]: Add nss:bin. --- gnu/packages/openldap.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/openldap.scm b/gnu/packages/openldap.scm index 878dc0b4b1..6426c3067e 100644 --- a/gnu/packages/openldap.scm +++ b/gnu/packages/openldap.scm @@ -230,10 +230,15 @@ (define-public 389-ds-base "--disable-perl") #:phases (modify-phases %standard-phases - (add-after 'unpack 'fix-includes + (add-after 'unpack 'fix-references (lambda _ (substitute* "include/ldaputil/certmap.h" (("nss3/cert.h") "nss/cert.h")) + (substitute* "src/lib389/lib389/nss_ssl.py" + (("'/usr/bin/certutil'") + (string-append "'" (which "certutil") "'")) + (("'/usr/bin/c_rehash'") + (string-append "'" (which "perl") "', '" (which "c_rehash") "'"))) #t)) (add-after 'unpack 'fix-install-location-of-python-tools (lambda* (#:key inputs outputs #:allow-other-keys) @@ -305,6 +310,7 @@ (define-public 389-ds-base ("net-snmp" ,net-snmp) ("nspr" ,nspr) ("nss" ,nss) + ("nss:bin" ,nss "bin") ; for certutil ("openldap" ,openldap) ("openssl" ,openssl) ; #included by net-snmp ("pcre" ,pcre) From af184b68e78aa51b6ff50b7327dfbbdb1d6e6843 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Mar 2019 12:17:27 +0100 Subject: [PATCH 375/694] gnu: 389-ds-base: Use more global directories. * gnu/packages/openldap.scm (389-ds-base)[arguments]: Pass "with-instconfigdir"; add phase "overwrite-default-locations" to overwrite defaults for "initconfig_dir", the certificate location, and the location of the defaults file. --- gnu/packages/openldap.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/openldap.scm b/gnu/packages/openldap.scm index 6426c3067e..e0190d2c0e 100644 --- a/gnu/packages/openldap.scm +++ b/gnu/packages/openldap.scm @@ -224,6 +224,7 @@ (define-public 389-ds-base (string-append "--with-selinux=" (assoc-ref %build-inputs "libselinux")) "--localstatedir=/var" + "--with-instconfigdir=/etc/dirsrv" ;; The Perl scripts are being removed in the 1.4.0 release. ;; Building them would require packaging of the outdated Mozilla ;; LDAP SDK (instead of OpenLDAP) and PerLDAP. @@ -240,6 +241,25 @@ (define-public 389-ds-base (("'/usr/bin/c_rehash'") (string-append "'" (which "perl") "', '" (which "c_rehash") "'"))) #t)) + (add-after 'unpack 'overwrite-default-locations + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* "src/lib389/lib389/paths.py" + (("/usr/share/dirsrv/inf/defaults.inf") + (string-append out "/share/dirsrv/inf/defaults.inf"))) + ;; This directory can only be specified relative to sysconfdir. This + ;; is used to determine where to look for installed directory + ;; servers, so in the absence of a search path it needs to be global. + (substitute* "ldap/admin/src/defaults.inf.in" + (("^initconfig_dir =.*") + "initconfig_dir = /etc/dirsrv/registry\n")) + ;; This is used to determine where to write certificate files + ;; when installing new directory server instances. + (substitute* '("src/lib389/lib389/instance/setup.py" + "src/lib389/lib389/instance/remove.py") + (("etc_dirsrv_path = .*") + "etc_dirsrv_path = '/etc/dirsrv/'\n")) + #t))) (add-after 'unpack 'fix-install-location-of-python-tools (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) From 549332027428d2ecffce33bf3af228026573546a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 Mar 2019 16:15:12 +0100 Subject: [PATCH 376/694] gnu: iproute2: Update to 5.0.0. * gnu/packages/linux.scm (iproute): Update to 5.0.0. [inputs, native-inputs]: Order alphabetically. --- gnu/packages/linux.scm | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 34af81b469..311bc6fa5f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1254,7 +1254,7 @@ (define-public ebtables (define-public iproute (package (name "iproute2") - (version "4.20.0") + (version "5.0.0") (source (origin (method url-fetch) (uri (string-append @@ -1262,10 +1262,11 @@ (define-public iproute version ".tar.xz")) (sha256 (base32 - "1a7xyvqjxfnm7rk21amm0xgxa38clg7q7cmc4dmlg27q81mambf8")))) + "1fi03lb8dqr8hq633gcqsf6228vsvysxms075j1yyl4nlc17616z")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; no test suite + `( ;; There is a test suite, but it wants network namespaces and sudo. + #:tests? #f #:make-flags (let ((out (assoc-ref %outputs "out"))) (list "DESTDIR=" (string-append "BASH_COMPDIR=" out @@ -1285,12 +1286,15 @@ (define-public iproute (("^.*ARPDDIR.*$") "")) #t))))) (inputs - `(("iptables" ,iptables) - ("db4" ,bdb))) + `(("db4" ,bdb) + ("iptables" ,iptables))) (native-inputs - `(("pkg-config" ,pkg-config) + `(("bison" ,bison) ("flex" ,flex) - ("bison" ,bison))) + ("pkg-config" ,pkg-config))) + ;; For tests. + ;; ("libmnl" ,libmnl) + ;; ("util-linux" ,util-linux) (home-page "https://wiki.linuxfoundation.org/networking/iproute2") (synopsis From 14e6b6a0ae7c7fd648a11f9d00cc81f49241269e Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Wed, 20 Mar 2019 19:58:49 +0100 Subject: [PATCH 377/694] gnu: xpra: Update to 2.5. * gnu/packages/xorg.scm (xpra): Update to 2.5. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index f168b51f4c..8dc5838713 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6012,7 +6012,7 @@ (define-public xcompmgr (define-public xpra (package (name "xpra") - (version "2.4.3") + (version "2.5") (source (origin (method url-fetch) @@ -6020,7 +6020,7 @@ (define-public xpra version ".tar.xz")) (sha256 (base32 - "0pq2pzmv5fsafp50rzl9nb6ns08rl88fhgdqc2hh27dx7b8ka8n6")))) + "0q6c7ijgpp2wk6jlh0pzqki1w60i36wyl2zfwkg0gpdh40ypab3x")))) (build-system python-build-system) (inputs `(("ffmpeg" ,ffmpeg) ("flac" ,flac) From bcf66fc2e75151b248265ed12ec8453fe9b0ce47 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Wed, 20 Mar 2019 20:23:34 +0100 Subject: [PATCH 378/694] gnu: samba: Update to 4.10.0. * gnu/packages/samba.scm (samba): Update to 4.10.0. [native-inputs]: Replace python-2 with python. --- gnu/packages/samba.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index d10c6ebc9c..c8b1dbe266 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2017, 2018 Marius Bakke ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Ricardo Wurmus +;;; Copyright © 2019 Rutger Helling ;;; ;;; This file is part of GNU Guix. ;;; @@ -151,14 +152,14 @@ (define (install dir) (define-public samba (package (name "samba") - (version "4.9.5") + (version "4.10.0") (source (origin (method url-fetch) (uri (string-append "https://download.samba.org/pub/samba/stable/" "samba-" version ".tar.gz")) (sha256 (base32 - "001p896z609vb0qs196bgl362j7y3qibgm5gcl9028lfv795d287")))) + "0n1ld77y8sydkpx6l8i2hqa1k7hpkr8df91pg849glc4b85407wz")))) (build-system gnu-build-system) (arguments `(#:phases @@ -225,7 +226,7 @@ (define-public samba ("xsltproc" ,libxslt) ;ditto ("perl" ,perl) ("pkg-config" ,pkg-config) - ("python" ,python-2))) ; incompatible with Python 3 + ("python" ,python))) (home-page "https://www.samba.org/") (synopsis "The standard Windows interoperability suite of programs for GNU and Unix") From c16423f143919916a5273761d7ed29bd49f14519 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Mar 2019 19:43:07 +0100 Subject: [PATCH 379/694] services: Add nslcd-service-type. * gnu/services/authentication.scm (nslcd-service-type, nslcd-configuration, %nslcd-accounts): New variables. (uglify-field-name, value->string, serialize-field, serialize-list, ssl-option?, tls-reqcert-option?, deref-option?, comma-separated-list-of-strings?, serialize-ignore-users-option, log-option?, serialize-log-option, valid-map?, scope-option?, serialize-scope-option, map-entry?, list-of-map-entries?, filter-entry?, list-of-filter-entries?, serialize-filter-entry, serialize-list-of-filter-entries, serialize-map-entry, serialize-list-of-map-entries, nslcd-config-file, nslcd-etc-service, nslcd-shepherd-service, pam-ldap-pam-services, pam-ldap-pam-service, generate-nslcd-documentation): New procedures. * gnu/tests/ldap.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. * doc/guix.texi (LDAP Services): Document it. --- doc/guix.texi | 479 ++++++++++++++++++++++++++++++ gnu/local.mk | 1 + gnu/services/authentication.scm | 511 +++++++++++++++++++++++++++++++- gnu/tests/ldap.scm | 160 ++++++++++ 4 files changed, 1150 insertions(+), 1 deletion(-) create mode 100644 gnu/tests/ldap.scm diff --git a/doc/guix.texi b/doc/guix.texi index bb344e1625..94d7a29bdf 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -11139,6 +11139,7 @@ declaration. * Telephony Services:: Telephony services. * Monitoring Services:: Monitoring services. * Kerberos Services:: Kerberos services. +* LDAP Services:: LDAP services. * Web Services:: Web servers. * Certificate Services:: TLS certificates via Let's Encrypt. * DNS Services:: DNS daemons. @@ -17685,6 +17686,484 @@ Local accounts with lower values will silently fail to authenticate. @end deftp +@node LDAP Services +@subsection LDAP Services +@cindex LDAP +@cindex nslcd, LDAP service + +The @code{(gnu services authentication)} module provides the +@code{nslcd-service-type}, which can be used to authenticate against an LDAP +server. In addition to configuring the service itself, you may want to add +@code{ldap} as a name service to the Name Service Switch. @xref{Name Service +Switch} for detailed information. + +Here is a simple operating system declaration with a default configuration of +the @code{nslcd-service-type} and a Name Service Switch configuration that +consults the @code{ldap} name service last: + +@example +(use-service-modules authentication) +(use-modules (gnu system nss)) +... +(operating-system + ... + (services + (cons* + (service nslcd-service-type) + (service dhcp-client-service-type) + %base-services)) + (name-service-switch + (let ((services (list (name-service (name "db")) + (name-service (name "files")) + (name-service (name "ldap"))))) + (name-service-switch + (inherit %mdns-host-lookup-nss) + (password services) + (shadow services) + (group services) + (netgroup services) + (gshadow services))))) +@end example + +@c %start of generated documentation for nslcd-configuration + +Available @code{nslcd-configuration} fields are: + +@deftypevr {@code{nslcd-configuration} parameter} package nss-pam-ldapd +The @code{nss-pam-ldapd} package to use. + +@end deftypevr + +@deftypevr {@code{nslcd-configuration} parameter} maybe-number threads +The number of threads to start that can handle requests and perform LDAP +queries. Each thread opens a separate connection to the LDAP server. +The default is to start 5 threads. + +Defaults to @samp{disabled}. + +@end deftypevr + +@deftypevr {@code{nslcd-configuration} parameter} string uid +This specifies the user id with which the daemon should be run. + +Defaults to @samp{"nslcd"}. + +@end deftypevr + +@deftypevr {@code{nslcd-configuration} parameter} string gid +This specifies the group id with which the daemon should be run. + +Defaults to @samp{"nslcd"}. + +@end deftypevr + +@deftypevr {@code{nslcd-configuration} parameter} log-option log +This option controls the way logging is done via a list containing +SCHEME and LEVEL. The SCHEME argument may either be the symbols "none" +or "syslog", or an absolute file name. The LEVEL argument is optional +and specifies the log level. The log level may be one of the following +symbols: "crit", "error", "warning", "notice", "info" or "debug". All +messages with the specified log level or higher are logged. + +Defaults to @samp{("/var/log/nslcd" info)}. + +@end deftypevr + +@deftypevr {@code{nslcd-configuration} parameter} list uri +The list of LDAP server URIs. Normally, only the first server will be +used with the following servers as fall-back. + +Defaults to @samp{("ldap://localhost:389/")}. + +@end deftypevr + +@deftypevr {@code{nslcd-configuration} parameter} maybe-string ldap-version +The version of the LDAP protocol to use. The default is to use the +maximum version supported by the LDAP library. + +Defaults to @samp{disabled}. + +@end deftypevr + +@deftypevr {@code{nslcd-configuration} parameter} maybe-string binddn +Specifies the distinguished name with which to bind to the directory +server for lookups. The default is to bind anonymously. + +Defaults to @samp{disabled}. + +@end deftypevr + +@deftypevr {@code{nslcd-configuration} parameter} maybe-string bindpw +Specifies the credentials with which to bind. This option is only +applicable when used with binddn. + +Defaults to @samp{disabled}. + +@end deftypevr + +@deftypevr {@code{nslcd-configuration} parameter} maybe-string rootpwmoddn +Specifies the distinguished name to use when the root user tries to +modify a user's password using the PAM module. + +Defaults to @samp{disabled}. + +@end deftypevr + +@deftypevr {@code{nslcd-configuration} parameter} maybe-string rootpwmodpw +Specifies the credentials with which to bind if the root user tries to +change a user's password. This option is only applicable when used with +rootpwmoddn + +Defaults to @samp{disabled}. + +@end deftypevr + +@deftypevr {@code{nslcd-configuration} parameter} maybe-string sasl-mech +Specifies the SASL mechanism to be used when performing SASL +authentication. + +Defaults to @samp{disabled}. + +@end deftypevr + +@deftypevr {@code{nslcd-configuration} parameter} maybe-string sasl-realm +Specifies the SASL realm to be used when performing SASL authentication. + +Defaults to @samp{disabled}. + +@end deftypevr + +@deftypevr {@code{nslcd-configuration} parameter} maybe-string sasl-authcid +Specifies the authentication identity to be used when performing SASL +authentication. + +Defaults to @samp{disabled}. + +@end deftypevr + +@deftypevr {@code{nslcd-configuration} parameter} maybe-string sasl-authzid +Specifies the authorization identity to be used when performing SASL +authentication. + +Defaults to @samp{disabled}. + +@end deftypevr + +@deftypevr {@code{nslcd-configuration} parameter} maybe-boolean sasl-canonicalize? +Determines whether the LDAP server host name should be canonicalised. If +this is enabled the LDAP library will do a reverse host name lookup. By +default, it is left up to the LDAP library whether this check is +performed or not. + +Defaults to @samp{disabled}. + +@end deftypevr + +@deftypevr {@code{nslcd-configuration} parameter} maybe-string krb5-ccname +Set the name for the GSS-API Kerberos credentials cache. + +Defaults to @samp{disabled}. + +@end deftypevr + +@deftypevr {@code{nslcd-configuration} parameter} string base +The directory search base. + +Defaults to @samp{"dc=example,dc=com"}. + +@end deftypevr + +@deftypevr {@code{nslcd-configuration} parameter} scope-option scope +Specifies the search scope (subtree, onelevel, base or children). The +default scope is subtree; base scope is almost never useful for name +service lookups; children scope is not supported on all servers. + +Defaults to @samp{(subtree)}. + +@end deftypevr + +@deftypevr {@code{nslcd-configuration} parameter} maybe-deref-option deref +Specifies the policy for dereferencing aliases. The default policy is +to never dereference aliases. + +Defaults to @samp{disabled}. + +@end deftypevr + +@deftypevr {@code{nslcd-configuration} parameter} maybe-boolean referrals +Specifies whether automatic referral chasing should be enabled. The +default behaviour is to chase referrals. + +Defaults to @samp{disabled}. + +@end deftypevr + +@deftypevr {@code{nslcd-configuration} parameter} list-of-map-entries maps +This option allows for custom attributes to be looked up instead of the +default RFC 2307 attributes. It is a list of maps, each consisting of +the name of a map, the RFC 2307 attribute to match and the query +expression for the attribute as it is available in the directory. + +Defaults to @samp{()}. + +@end deftypevr + +@deftypevr {@code{nslcd-configuration} parameter} list-of-filter-entries filters +A list of filters consisting of the name of a map to which the filter +applies and an LDAP search filter expression. + +Defaults to @samp{()}. + +@end deftypevr + +@deftypevr {@code{nslcd-configuration} parameter} maybe-number bind-timelimit +Specifies the time limit in seconds to use when connecting to the +directory server. The default value is 10 seconds. + +Defaults to @samp{disabled}. + +@end deftypevr + +@deftypevr {@code{nslcd-configuration} parameter} maybe-number timelimit +Specifies the time limit (in seconds) to wait for a response from the +LDAP server. A value of zero, which is the default, is to wait +indefinitely for searches to be completed. + +Defaults to @samp{disabled}. + +@end deftypevr + +@deftypevr {@code{nslcd-configuration} parameter} maybe-number idle-timelimit +Specifies the period if inactivity (in seconds) after which the con‐ +nection to the LDAP server will be closed. The default is not to time +out connections. + +Defaults to @samp{disabled}. + +@end deftypevr + +@deftypevr {@code{nslcd-configuration} parameter} maybe-number reconnect-sleeptime +Specifies the number of seconds to sleep when connecting to all LDAP +servers fails. By default one second is waited between the first +failure and the first retry. + +Defaults to @samp{disabled}. + +@end deftypevr + +@deftypevr {@code{nslcd-configuration} parameter} maybe-number reconnect-retrytime +Specifies the time after which the LDAP server is considered to be +permanently unavailable. Once this time is reached retries will be done +only once per this time period. The default value is 10 seconds. + +Defaults to @samp{disabled}. + +@end deftypevr + +@deftypevr {@code{nslcd-configuration} parameter} maybe-ssl-option ssl +Specifies whether to use SSL/TLS or not (the default is not to). If +'start-tls is specified then StartTLS is used rather than raw LDAP over +SSL. + +Defaults to @samp{disabled}. + +@end deftypevr + +@deftypevr {@code{nslcd-configuration} parameter} maybe-tls-reqcert-option tls-reqcert +Specifies what checks to perform on a server-supplied certificate. The +meaning of the values is described in the ldap.conf(5) manual page. + +Defaults to @samp{disabled}. + +@end deftypevr + +@deftypevr {@code{nslcd-configuration} parameter} maybe-string tls-cacertdir +Specifies the directory containing X.509 certificates for peer authen‐ +tication. This parameter is ignored when using GnuTLS. + +Defaults to @samp{disabled}. + +@end deftypevr + +@deftypevr {@code{nslcd-configuration} parameter} maybe-string tls-cacertfile +Specifies the path to the X.509 certificate for peer authentication. + +Defaults to @samp{disabled}. + +@end deftypevr + +@deftypevr {@code{nslcd-configuration} parameter} maybe-string tls-randfile +Specifies the path to an entropy source. This parameter is ignored when +using GnuTLS. + +Defaults to @samp{disabled}. + +@end deftypevr + +@deftypevr {@code{nslcd-configuration} parameter} maybe-string tls-ciphers +Specifies the ciphers to use for TLS as a string. + +Defaults to @samp{disabled}. + +@end deftypevr + +@deftypevr {@code{nslcd-configuration} parameter} maybe-string tls-cert +Specifies the path to the file containing the local certificate for +client TLS authentication. + +Defaults to @samp{disabled}. + +@end deftypevr + +@deftypevr {@code{nslcd-configuration} parameter} maybe-string tls-key +Specifies the path to the file containing the private key for client TLS +authentication. + +Defaults to @samp{disabled}. + +@end deftypevr + +@deftypevr {@code{nslcd-configuration} parameter} maybe-number pagesize +Set this to a number greater than 0 to request paged results from the +LDAP server in accordance with RFC2696. The default (0) is to not +request paged results. + +Defaults to @samp{disabled}. + +@end deftypevr + +@deftypevr {@code{nslcd-configuration} parameter} maybe-ignore-users-option nss-initgroups-ignoreusers +This option prevents group membership lookups through LDAP for the +specified users. Alternatively, the value 'all-local may be used. With +that value nslcd builds a full list of non-LDAP users on startup. + +Defaults to @samp{disabled}. + +@end deftypevr + +@deftypevr {@code{nslcd-configuration} parameter} maybe-number nss-min-uid +This option ensures that LDAP users with a numeric user id lower than +the specified value are ignored. + +Defaults to @samp{disabled}. + +@end deftypevr + +@deftypevr {@code{nslcd-configuration} parameter} maybe-number nss-uid-offset +This option specifies an offset that is added to all LDAP numeric user +ids. This can be used to avoid user id collisions with local users. + +Defaults to @samp{disabled}. + +@end deftypevr + +@deftypevr {@code{nslcd-configuration} parameter} maybe-number nss-gid-offset +This option specifies an offset that is added to all LDAP numeric group +ids. This can be used to avoid user id collisions with local groups. + +Defaults to @samp{disabled}. + +@end deftypevr + +@deftypevr {@code{nslcd-configuration} parameter} maybe-boolean nss-nested-groups +If this option is set, the member attribute of a group may point to +another group. Members of nested groups are also returned in the higher +level group and parent groups are returned when finding groups for a +specific user. The default is not to perform extra searches for nested +groups. + +Defaults to @samp{disabled}. + +@end deftypevr + +@deftypevr {@code{nslcd-configuration} parameter} maybe-boolean nss-getgrent-skipmembers +If this option is set, the group member list is not retrieved when +looking up groups. Lookups for finding which groups a user belongs to +will remain functional so the user will likely still get the correct +groups assigned on login. + +Defaults to @samp{disabled}. + +@end deftypevr + +@deftypevr {@code{nslcd-configuration} parameter} maybe-boolean nss-disable-enumeration +If this option is set, functions which cause all user/group entries to +be loaded from the directory will not succeed in doing so. This can +dramatically reduce LDAP server load in situations where there are a +great number of users and/or groups. This option is not recommended for +most configurations. + +Defaults to @samp{disabled}. + +@end deftypevr + +@deftypevr {@code{nslcd-configuration} parameter} maybe-string validnames +This option can be used to specify how user and group names are verified +within the system. This pattern is used to check all user and group +names that are requested and returned from LDAP. + +Defaults to @samp{disabled}. + +@end deftypevr + +@deftypevr {@code{nslcd-configuration} parameter} maybe-boolean ignorecase +This specifies whether or not to perform searches using case-insensitive +matching. Enabling this could open up the system to authorization +bypass vulnerabilities and introduce nscd cache poisoning +vulnerabilities which allow denial of service. + +Defaults to @samp{disabled}. + +@end deftypevr + +@deftypevr {@code{nslcd-configuration} parameter} maybe-boolean pam-authc-ppolicy +This option specifies whether password policy controls are requested and +handled from the LDAP server when performing user authentication. + +Defaults to @samp{disabled}. + +@end deftypevr + +@deftypevr {@code{nslcd-configuration} parameter} maybe-string pam-authc-search +By default nslcd performs an LDAP search with the user's credentials +after BIND (authentication) to ensure that the BIND operation was +successful. The default search is a simple check to see if the user's +DN exists. A search filter can be specified that will be used instead. +It should return at least one entry. + +Defaults to @samp{disabled}. + +@end deftypevr + +@deftypevr {@code{nslcd-configuration} parameter} maybe-string pam-authz-search +This option allows flexible fine tuning of the authorisation check that +should be performed. The search filter specified is executed and if any +entries match, access is granted, otherwise access is denied. + +Defaults to @samp{disabled}. + +@end deftypevr + +@deftypevr {@code{nslcd-configuration} parameter} maybe-string pam-password-prohibit-message +If this option is set password modification using pam_ldap will be +denied and the specified message will be presented to the user instead. +The message can be used to direct the user to an alternative means of +changing their password. + +Defaults to @samp{disabled}. + +@end deftypevr + +@deftypevr {@code{nslcd-configuration} parameter} list pam-services +List of pam service names for which LDAP authentication should suffice. + +Defaults to @samp{()}. + +@end deftypevr + +@c %end of generated documentation for nslcd-configuration + + @node Web Services @subsection Web Services diff --git a/gnu/local.mk b/gnu/local.mk index c32876cdcf..a5a2f11538 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -569,6 +569,7 @@ GNU_SYSTEM_MODULES = \ %D%/tests/monitoring.scm \ %D%/tests/nfs.scm \ %D%/tests/install.scm \ + %D%/tests/ldap.scm \ %D%/tests/mail.scm \ %D%/tests/messaging.scm \ %D%/tests/networking.scm \ diff --git a/gnu/services/authentication.scm b/gnu/services/authentication.scm index 1a2629d475..ab54aaf698 100644 --- a/gnu/services/authentication.scm +++ b/gnu/services/authentication.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Danny Milosavljevic +;;; Copyright © 2018, 2019 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -18,13 +19,28 @@ (define-module (gnu services authentication) #:use-module (gnu services) + #:use-module (gnu services base) + #:use-module (gnu services configuration) #:use-module (gnu services dbus) + #:use-module (gnu services shepherd) + #:use-module (gnu system pam) + #:use-module (gnu system shadow) + #:use-module (gnu packages admin) #:use-module (gnu packages freedesktop) + #:use-module (gnu packages openldap) #:use-module (guix gexp) #:use-module (guix records) + #:use-module (guix packages) + #:use-module (ice-9 match) + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-26) #:export (fprintd-configuration fprintd-configuration? - fprintd-service-type)) + fprintd-service-type + + nslcd-configuration + nslcd-configuration? + nslcd-service-type)) (define-record-type* fprintd-configuration make-fprintd-configuration @@ -39,3 +55,496 @@ (define fprintd-service-type list))) (description "Run fprintd, a fingerprint management daemon."))) + + +;;; +;;; NSS Pam LDAP service (nslcd) +;;; + +(define (uglify-field-name name) + (match name + ('filters "filter") + ('maps "map") + (_ (string-map (match-lambda + (#\- #\_) + (chr chr)) + (symbol->string name))))) + +(define (value->string val) + (cond + ((boolean? val) + (if val "on" "off")) + ((number? val) + (number->string val)) + ((symbol? val) + (string-map (match-lambda + (#\- #\_) + (chr chr)) + (symbol->string val))) + (else val))) + +(define (serialize-field field-name val) + (if (eq? field-name 'pam-services) + #t + (format #t "~a ~a\n" + (uglify-field-name field-name) + (value->string val)))) + +(define serialize-string serialize-field) +(define serialize-boolean serialize-field) +(define serialize-number serialize-field) +(define (serialize-list field-name val) + (map (cut serialize-field field-name <>) val)) +(define-maybe string) +(define-maybe boolean) +(define-maybe number) + +(define (ssl-option? val) + (or (boolean? val) + (eq? val 'start-tls))) +(define serialize-ssl-option serialize-field) +(define-maybe ssl-option) + +(define (tls-reqcert-option? val) + (member val '(never allow try demand hard))) +(define serialize-tls-reqcert-option serialize-field) +(define-maybe tls-reqcert-option) + +(define (deref-option? val) + (member val '(never searching finding always))) +(define serialize-deref-option serialize-field) +(define-maybe deref-option) + +(define (comma-separated-list-of-strings? val) + (and (list? val) + (every string? val))) +(define (ignore-users-option? val) + (or (comma-separated-list-of-strings? val) + (eq? 'all-local val))) +(define (serialize-ignore-users-option field-name val) + (serialize-field field-name (if (eq? 'all-local val) + val + (string-join val ",")))) +(define-maybe ignore-users-option) + +(define (log-option? val) + (let ((valid-scheme? (lambda (scheme) + (or (string? scheme) + (member scheme '(none syslog)))))) + (match val + ((scheme level) + (and (valid-scheme? scheme) + (member level '(crit error warning notice info debug)))) + ((scheme) + (valid-scheme? scheme))))) +(define (serialize-log-option field-name val) + (serialize-field field-name + (string-join (map (cut format #f "~a" <>) val)))) + +(define (valid-map? val) + "Is VAL a supported map name?" + (member val + '(alias aliases ether ethers group host hosts netgroup network networks + passwd protocol protocols rpc service services shadow))) + +(define (scope-option? val) + (let ((valid-scopes '(subtree onelevel base children))) + (match val + ((map-name scope) + (and (valid-map? map-name) + (member scope valid-scopes))) + ((scope) + (member scope valid-scopes))))) +(define (serialize-scope-option field-name val) + (serialize-field field-name + (string-join (map (cut format #f "~a" <>) val)))) + +(define (map-entry? val) + (match val + (((? valid-map? map-name) + (? string? attribute) + (? string? new-attribute)) #t) + (_ #f))) + +(define (list-of-map-entries? val) + (and (list? val) + (every map-entry? val))) + +(define (filter-entry? val) + (match val + (((? valid-map? map-name) + (? string? filter-expression)) #t) + (_ #f))) + +(define (list-of-filter-entries? val) + (and (list? val) + (every filter-entry? val))) + +(define (serialize-filter-entry field-name val) + (serialize-field 'filter + (match val + (((? valid-map? map-name) + (? string? filter-expression)) + (string-append (symbol->string map-name) + " " filter-expression))))) + +(define (serialize-list-of-filter-entries field-name val) + (for-each (cut serialize-filter-entry field-name <>) val)) + +(define (serialize-map-entry field-name val) + (serialize-field 'map + (match val + (((? valid-map? map-name) + (? string? attribute) + (? string? new-attribute)) + (string-append (symbol->string map-name) + " " attribute + " " new-attribute))))) + +(define (serialize-list-of-map-entries field-name val) + (for-each (cut serialize-map-entry field-name <>) val)) + + +(define-configuration nslcd-configuration + (nss-pam-ldapd + (package nss-pam-ldapd) + "The NSS-PAM-LDAPD package to use.") + + ;; Runtime options + (threads + (maybe-number 'disabled) + "The number of threads to start that can handle requests and perform LDAP +queries. Each thread opens a separate connection to the LDAP server. The +default is to start 5 threads.") + (uid + (string "nslcd") + "This specifies the user id with which the daemon should be run.") + (gid + (string "nslcd") + "This specifies the group id with which the daemon should be run.") + (log + (log-option '("/var/log/nslcd" info)) + "This option controls the way logging is done via a list containing SCHEME +and LEVEL. The SCHEME argument may either be the symbols \"none\" or +\"syslog\", or an absolute file name. The LEVEL argument is optional and +specifies the log level. The log level may be one of the following symbols: +\"crit\", \"error\", \"warning\", \"notice\", \"info\" or \"debug\". All +messages with the specified log level or higher are logged.") + + ;; LDAP connection settings + (uri + (list '("ldap://localhost:389/")) + "The list of LDAP server URIs. Normally, only the first server will be +used with the following servers as fall-back.") + (ldap-version + (maybe-string 'disabled) + "The version of the LDAP protocol to use. The default is to use the +maximum version supported by the LDAP library.") + (binddn + (maybe-string 'disabled) + "Specifies the distinguished name with which to bind to the directory +server for lookups. The default is to bind anonymously.") + (bindpw + (maybe-string 'disabled) + "Specifies the credentials with which to bind. This option is only +applicable when used with binddn.") + (rootpwmoddn + (maybe-string 'disabled) + "Specifies the distinguished name to use when the root user tries to modify +a user's password using the PAM module.") + (rootpwmodpw + (maybe-string 'disabled) + "Specifies the credentials with which to bind if the root user tries to +change a user's password. This option is only applicable when used with +rootpwmoddn") + + ;; SASL authentication options + (sasl-mech + (maybe-string 'disabled) + "Specifies the SASL mechanism to be used when performing SASL +authentication.") + (sasl-realm + (maybe-string 'disabled) + "Specifies the SASL realm to be used when performing SASL authentication.") + (sasl-authcid + (maybe-string 'disabled) + "Specifies the authentication identity to be used when performing SASL +authentication.") + (sasl-authzid + (maybe-string 'disabled) + "Specifies the authorization identity to be used when performing SASL +authentication.") + (sasl-canonicalize? + (maybe-boolean 'disabled) + "Determines whether the LDAP server host name should be canonicalised. If +this is enabled the LDAP library will do a reverse host name lookup. By +default, it is left up to the LDAP library whether this check is performed or +not.") + + ;; Kerberos authentication options + (krb5-ccname + (maybe-string 'disabled) + "Set the name for the GSS-API Kerberos credentials cache.") + + ;; Search / mapping options + (base + (string "dc=example,dc=com") + "The directory search base.") + (scope + (scope-option '(subtree)) + "Specifies the search scope (subtree, onelevel, base or children). The +default scope is subtree; base scope is almost never useful for name service +lookups; children scope is not supported on all servers.") + (deref + (maybe-deref-option 'disabled) + "Specifies the policy for dereferencing aliases. The default policy is to +never dereference aliases.") + (referrals + (maybe-boolean 'disabled) + "Specifies whether automatic referral chasing should be enabled. The +default behaviour is to chase referrals.") + (maps + (list-of-map-entries '()) + "This option allows for custom attributes to be looked up instead of the +default RFC 2307 attributes. It is a list of maps, each consisting of the +name of a map, the RFC 2307 attribute to match and the query expression for +the attribute as it is available in the directory.") + (filters + (list-of-filter-entries '()) + "A list of filters consisting of the name of a map to which the filter +applies and an LDAP search filter expression.") + + ;; Timing / reconnect options + (bind-timelimit + (maybe-number 'disabled) + "Specifies the time limit in seconds to use when connecting to the +directory server. The default value is 10 seconds.") + (timelimit + (maybe-number 'disabled) + "Specifies the time limit (in seconds) to wait for a response from the LDAP +server. A value of zero, which is the default, is to wait indefinitely for +searches to be completed.") + (idle-timelimit + (maybe-number 'disabled) + "Specifies the period if inactivity (in seconds) after which the con‐ +nection to the LDAP server will be closed. The default is not to time out +connections.") + (reconnect-sleeptime + (maybe-number 'disabled) + "Specifies the number of seconds to sleep when connecting to all LDAP +servers fails. By default one second is waited between the first failure and +the first retry.") + (reconnect-retrytime + (maybe-number 'disabled) + "Specifies the time after which the LDAP server is considered to be +permanently unavailable. Once this time is reached retries will be done only +once per this time period. The default value is 10 seconds.") + + ;; TLS options + (ssl + (maybe-ssl-option 'disabled) + "Specifies whether to use SSL/TLS or not (the default is not to). If +'start-tls is specified then StartTLS is used rather than raw LDAP over SSL.") + (tls-reqcert + (maybe-tls-reqcert-option 'disabled) + "Specifies what checks to perform on a server-supplied certificate. +The meaning of the values is described in the ldap.conf(5) manual page.") + (tls-cacertdir + (maybe-string 'disabled) + "Specifies the directory containing X.509 certificates for peer authen‐ +tication. This parameter is ignored when using GnuTLS.") + (tls-cacertfile + (maybe-string 'disabled) + "Specifies the path to the X.509 certificate for peer authentication.") + (tls-randfile + (maybe-string 'disabled) + "Specifies the path to an entropy source. This parameter is ignored when +using GnuTLS.") + (tls-ciphers + (maybe-string 'disabled) + "Specifies the ciphers to use for TLS as a string.") + (tls-cert + (maybe-string 'disabled) + "Specifies the path to the file containing the local certificate for client +TLS authentication.") + (tls-key + (maybe-string 'disabled) + "Specifies the path to the file containing the private key for client TLS +authentication.") + + ;; Other options + (pagesize + (maybe-number 'disabled) + "Set this to a number greater than 0 to request paged results from the LDAP +server in accordance with RFC2696. The default (0) is to not request paged +results.") + (nss-initgroups-ignoreusers + (maybe-ignore-users-option 'disabled) + "This option prevents group membership lookups through LDAP for the +specified users. Alternatively, the value 'all-local may be used. With that +value nslcd builds a full list of non-LDAP users on startup.") + (nss-min-uid + (maybe-number 'disabled) + "This option ensures that LDAP users with a numeric user id lower than the +specified value are ignored.") + (nss-uid-offset + (maybe-number 'disabled) + "This option specifies an offset that is added to all LDAP numeric user +ids. This can be used to avoid user id collisions with local users.") + (nss-gid-offset + (maybe-number 'disabled) + "This option specifies an offset that is added to all LDAP numeric group +ids. This can be used to avoid user id collisions with local groups.") + (nss-nested-groups + (maybe-boolean 'disabled) + "If this option is set, the member attribute of a group may point to +another group. Members of nested groups are also returned in the higher level +group and parent groups are returned when finding groups for a specific user. +The default is not to perform extra searches for nested groups.") + (nss-getgrent-skipmembers + (maybe-boolean 'disabled) + "If this option is set, the group member list is not retrieved when looking +up groups. Lookups for finding which groups a user belongs to will remain +functional so the user will likely still get the correct groups assigned on +login.") + (nss-disable-enumeration + (maybe-boolean 'disabled) + "If this option is set, functions which cause all user/group entries to be +loaded from the directory will not succeed in doing so. This can dramatically +reduce LDAP server load in situations where there are a great number of users +and/or groups. This option is not recommended for most configurations.") + (validnames + (maybe-string 'disabled) + "This option can be used to specify how user and group names are verified +within the system. This pattern is used to check all user and group names +that are requested and returned from LDAP.") + (ignorecase + (maybe-boolean 'disabled) + "This specifies whether or not to perform searches using case-insensitive +matching. Enabling this could open up the system to authorization bypass +vulnerabilities and introduce nscd cache poisoning vulnerabilities which allow +denial of service.") + (pam-authc-ppolicy + (maybe-boolean 'disabled) + "This option specifies whether password policy controls are requested and +handled from the LDAP server when performing user authentication.") + (pam-authc-search + (maybe-string 'disabled) + "By default nslcd performs an LDAP search with the user's credentials after +BIND (authentication) to ensure that the BIND operation was successful. The +default search is a simple check to see if the user's DN exists. A search +filter can be specified that will be used instead. It should return at least +one entry.") + (pam-authz-search + (maybe-string 'disabled) + "This option allows flexible fine tuning of the authorisation check that +should be performed. The search filter specified is executed and if any +entries match, access is granted, otherwise access is denied.") + (pam-password-prohibit-message + (maybe-string 'disabled) + "If this option is set password modification using pam_ldap will be denied +and the specified message will be presented to the user instead. The message +can be used to direct the user to an alternative means of changing their +password.") + + ;; Options for extension of pam-root-service-type. + (pam-services + (list '()) + "List of pam service names for which LDAP authentication should suffice.")) + +(define %nslcd-accounts + (list (user-group + (name "nslcd") + (system? #t)) + (user-account + (name "nslcd") + (group "nslcd") + (comment "NSLCD service account") + (home-directory "/var/empty") + (shell (file-append shadow "/sbin/nologin")) + (system? #t)))) + +(define (nslcd-config-file config) + "Return an NSLCD configuration file." + (plain-file "nslcd.conf" + (with-output-to-string + (lambda () + (serialize-configuration config nslcd-configuration-fields) + ;; The file must end with a newline character. + (format #t "\n"))))) + +;; XXX: The file should only be readable by root if it contains a "bindpw" +;; declaration. Unfortunately, this etc-service-type extension does not +;; support setting file modes, so we do this in the activation service. +(define (nslcd-etc-service config) + `(("nslcd.conf" ,(nslcd-config-file config)))) + +(define (nslcd-shepherd-service config) + (list (shepherd-service + (documentation "Run the nslcd service for resolving names from LDAP.") + (provision '(nslcd)) + (requirement '(networking user-processes)) + (start #~(make-forkexec-constructor + (list (string-append #$(nslcd-configuration-nss-pam-ldapd config) + "/sbin/nslcd") + "--nofork") + #:pid-file "/var/run/nslcd/nslcd.pid" + #:environment-variables + (list (string-append "LD_LIBRARY_PATH=" + #$(nslcd-configuration-nss-pam-ldapd config) + "/lib")))) + (stop #~(make-kill-destructor))))) + +(define (pam-ldap-pam-service config) + "Return a PAM service for LDAP authentication." + (define pam-ldap-module + #~(string-append #$(nslcd-configuration-nss-pam-ldapd config) + "/lib/security/pam_ldap.so")) + (lambda (pam) + (if (member (pam-service-name pam) + (nslcd-configuration-pam-services config)) + (let ((sufficient + (pam-entry + (control "sufficient") + (module pam-ldap-module)))) + (pam-service + (inherit pam) + (auth (cons sufficient (pam-service-auth pam))) + (session (cons sufficient (pam-service-session pam))) + (account (cons sufficient (pam-service-account pam))))) + pam))) + +(define (pam-ldap-pam-services config) + (list (pam-ldap-pam-service config))) + +(define nslcd-service-type + (service-type + (name 'nslcd) + (description "Run the NSLCD service for looking up names from LDAP.") + (extensions + (list (service-extension account-service-type + (const %nslcd-accounts)) + (service-extension etc-service-type + nslcd-etc-service) + (service-extension activation-service-type + (const #~(begin + (use-modules (guix build utils)) + (let ((rundir "/var/run/nslcd") + (user (getpwnam "nslcd"))) + (mkdir-p rundir) + (chown rundir (passwd:uid user) (passwd:gid user)) + (chmod rundir #o755) + (when (file-exists? "/etc/nslcd.conf") + (chmod "/etc/nslcd.conf" #o400)))))) + (service-extension pam-root-service-type + pam-ldap-pam-services) + (service-extension nscd-service-type + (const (list nss-pam-ldapd))) + (service-extension shepherd-root-service-type + nslcd-shepherd-service))) + (default-value (nslcd-configuration)))) + +(define (generate-nslcd-documentation) + (generate-documentation + `((nslcd-configuration ,nslcd-configuration-fields)) + 'nslcd-configuration)) diff --git a/gnu/tests/ldap.scm b/gnu/tests/ldap.scm new file mode 100644 index 0000000000..2d4f15fb3c --- /dev/null +++ b/gnu/tests/ldap.scm @@ -0,0 +1,160 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2019 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 tests ldap) + #:use-module (gnu tests) + #:use-module (gnu system) + #:use-module (gnu system nss) + #:use-module (gnu system vm) + #:use-module (gnu services) + #:use-module (gnu services authentication) + #:use-module (gnu services networking) + #:use-module (gnu packages base) + #:use-module (gnu packages openldap) + #:use-module (guix gexp) + #:use-module (guix store) + #:export (%test-ldap)) + +(define %ldap-os + (let ((simple + (simple-operating-system + (service dhcp-client-service-type) + (service nslcd-service-type)))) + (operating-system + (inherit simple) + (name-service-switch + (let ((services (list (name-service (name "db")) + (name-service (name "files")) + (name-service (name "ldap"))))) + (name-service-switch + (inherit %mdns-host-lookup-nss) + (password services) + (shadow services) + (group services) + (netgroup services) + (gshadow services))))))) + +(define (run-ldap-test) + "Run tests in %LDAP-OS." + (define os + (marionette-operating-system + %ldap-os + #:imported-modules '((gnu services herd) + (guix combinators)))) + + (define vm + (virtual-machine os)) + + (define test + (with-imported-modules '((gnu build marionette)) + #~(begin + (use-modules (srfi srfi-11) (srfi srfi-64) + (gnu build marionette)) + + (define marionette + (make-marionette (list #$vm))) + + (mkdir #$output) + (chdir #$output) + + (test-begin "ldap") + + ;; Set up LDAP directory server + (test-assert "LDAP server instance running" + (marionette-eval + '(begin + (with-output-to-file "instance.inf" + (lambda () + (display "[general] +config_version = 2 + +\n[slapd] +root_password = SECRET +user = root +group = root + +\n[backend-userroot] +sample_entries = yes +suffix = dc=example,dc=com"))) + (and + ;; Create instance + (zero? (system* #$(file-append 389-ds-base "/sbin/dscreate") + "-v" "from-file" "instance.inf")) + ;; Start instance + (zero? (system* #$(file-append 389-ds-base "/sbin/dsctl") + "localhost" "start")) + ;; Create user account + (zero? (system* #$(file-append 389-ds-base "/sbin/dsidm") + "-b" "dc=example,dc=com" + "localhost" "user" "create" + "--uid" "eva" "--cn" "Eva Lu Ator" + "--displayName" "Eva Lu Ator" + "--uidNumber" "1234" "--gidNumber" "2345" + "--homeDirectory" "/home/eva")))) + marionette)) + + (test-assert "Manager can bind to LDAP server instance" + (marionette-eval + '(zero? (system* #$(file-append openldap "/bin/ldapwhoami") + "-H" "ldap://localhost" "-D" + "cn=Directory Manager" "-w" "SECRET")) + marionette)) + + ;; Wait for nslcd to be up and running. + (test-assert "nslcd service running" + (marionette-eval + '(begin + (use-modules (gnu services herd)) + (match (start-service 'nslcd) + (#f #f) + (('service response-parts ...) + (match (assq-ref response-parts 'running) + ((pid) (number? pid)))))) + marionette)) + + (test-assert "nslcd produces a log file" + (marionette-eval + '(file-exists? "/var/log/nslcd") + marionette)) + + (test-assert "Can query LDAP user accounts" + (marionette-eval + '(begin + ;; TODO: This shouldn't be necessary, but unfortunately it + ;; really is needed to discover LDAP accounts with "id". + (setenv "LD_LIBRARY_PATH" + #$(file-append nss-pam-ldapd "/lib")) + (zero? (system* #$(file-append coreutils "/bin/id") "eva"))) + marionette)) + + (test-assert "Can become LDAP user" + (marionette-eval + '(zero? (system* "/run/setuid-programs/su" "eva" "-c" + #$(file-append coreutils "/bin/true"))) + marionette)) + + (test-end) + (exit (= (test-runner-fail-count (test-runner-current)) 0))))) + + (gexp->derivation "ldap-test" test)) + +(define %test-ldap + (system-test + (name "ldap") + (description "Run an LDAP directory server and authenticate against it.") + (value (run-ldap-test)))) From c62d0e678f6bd4e13ec87f4376c18b9f3db308ee Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 20 Mar 2019 15:29:31 -0400 Subject: [PATCH 380/694] gnu: linux-libre@4.9: Update to 4.9.164. * gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.164. --- 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 311bc6fa5f..86f85f62ac 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -453,8 +453,8 @@ (define-public linux-libre-4.14 #:configuration-file kernel-config)) (define-public linux-libre-4.9 - (make-linux-libre "4.9.163" - "1r0wzg3h18mkcs2lvwjdssqx7f2rcwv852zihrl38f8smk23mpzy" + (make-linux-libre "4.9.164" + "06bbynvijqlk92bpppmnjijyfwr0sk01krqdw4hpgbrvlg3wdlbk" '("x86_64-linux" "i686-linux") #:configuration-file kernel-config)) From 7cbbee4a852dec058e2f103a6b612dd0bed450e5 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 20 Mar 2019 15:30:44 -0400 Subject: [PATCH 381/694] gnu: linux-libre@4.14: Update to 4.14.107. * gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.107. (%linux-libre-4.14-hash): 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 86f85f62ac..6bfa7c782a 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -443,8 +443,8 @@ (define-public linux-libre-4.19 #:patches %linux-libre-4.19-patches #:configuration-file kernel-config)) -(define %linux-libre-4.14-version "4.14.106") -(define %linux-libre-4.14-hash "18m8yvdg12k01a7nmy8rv44vavmjmlaqc11xh2cczpib1m6sfk1k") +(define %linux-libre-4.14-version "4.14.107") +(define %linux-libre-4.14-hash "19i17b8sjjvi99vya1vncjalysdy027hp35rrla68gjs28dyas7r") (define-public linux-libre-4.14 (make-linux-libre %linux-libre-4.14-version From c65cce08b43535037101b140f07cfdf238d66d96 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 20 Mar 2019 15:31:39 -0400 Subject: [PATCH 382/694] gnu: linux-libre@4.19: Update to 4.19.30. * gnu/packages/linux.scm (%linux-libre-4.19-version): Update to 4.19.30. (%linux-libre-4.19-hash): 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 6bfa7c782a..939a2b3480 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -429,8 +429,8 @@ (define-public linux-libre #:patches %linux-libre-5.0-patches #:configuration-file kernel-config)) -(define %linux-libre-4.19-version "4.19.29") -(define %linux-libre-4.19-hash "0nan1l01310jzg8lr1zznwwmjkvnvqdssk0zg3s459ryjmisj7z0") +(define %linux-libre-4.19-version "4.19.30") +(define %linux-libre-4.19-hash "1i15cs7zb53hagllgga8jaz0j1p9b22j93iczwc2w587zzhzlvng") (define %linux-libre-4.19-patches (list %boot-logo-patch From c74da2b6c4ffeeff0c28eec74e4b27a8ad4bc420 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 20 Mar 2019 15:32:26 -0400 Subject: [PATCH 383/694] gnu: linux-libre: Update to 5.0.3. * gnu/packages/linux.scm (%linux-libre-version): Update to 5.0.3. (%linux-libre-hash): 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 939a2b3480..3ea97ec499 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -415,8 +415,8 @@ (define* (make-linux-libre version hash supported-systems It has been modified to remove all non-free binary blobs.") (license license:gpl2))) -(define %linux-libre-version "5.0.2") -(define %linux-libre-hash "0lvjqs5fmar6bh5077wzh215v6ffi7f5yx1qkkkw35wqhv0xgn0c") +(define %linux-libre-version "5.0.3") +(define %linux-libre-hash "1ivdqr3y8r2hmv3a1g0a641cr2ckl3x4arapw0j6nwd0sbcyncam") (define %linux-libre-5.0-patches (list %boot-logo-patch From dee92e65a239b2b0b3606a11d0fb3e0a5139ce79 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 Mar 2019 04:57:38 +0100 Subject: [PATCH 384/694] gnu: python-colorspacious: Don't use unstable tarball. * gnu/packages/python-xyz.scm (python-colorspacious)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/python-xyz.scm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f9617b1603..3ffe57aa15 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3521,13 +3521,14 @@ (define-public python-colorspacious (name "python-colorspacious") (version "1.1.0") (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/njsmith/colorspacious/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version)) - (sha256 - (base32 "1vflh5jm32qb0skza2i8pjacv09w6gq84fqpp2nj77s0rbmzgr4k")))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/njsmith/colorspacious.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0g0lxqiscy5g5rq9421vv7abg0c90jzy0zmas2z3hya6k2dr5aid")))) (build-system python-build-system) (propagated-inputs `(("python-numpy" ,python-numpy))) From c21242d920acf5023f674849a30a45c4e84fbc6e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 Mar 2019 19:56:26 +0100 Subject: [PATCH 385/694] gnu: pencil2d: Update to 0.6.3. * gnu/packages/animation.scm (pencil2d): Update to 0.6.3. --- gnu/packages/animation.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm index 965fff6d46..74a80ab046 100644 --- a/gnu/packages/animation.scm +++ b/gnu/packages/animation.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015, 2017 Ricardo Wurmus -;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2019 Pkill -9 ;;; ;;; This file is part of GNU Guix. @@ -263,7 +263,7 @@ (define-public papagayo (define-public pencil2d (package (name "pencil2d") - (version "0.6.2") + (version "0.6.3") (source (origin (method git-fetch) (uri (git-reference @@ -272,7 +272,7 @@ (define-public pencil2d (file-name (git-file-name name version)) (sha256 (base32 - "1iv7drwxs32mqs3hybjx2lxyqn8cv2b4rw9ny7gzdacsbhi65knr")))) + "097xwvhw7vl9pgknhb40zs6adf7mb1xxfc73h4kiqgp6z59prjl3")))) (build-system gnu-build-system) (inputs `(("qtbase" ,qtbase) From cbea33132a2d0d4c7a27e4dc760aba486d9e0ee6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 Mar 2019 19:56:56 +0100 Subject: [PATCH 386/694] gnu: xf86-video-amdgpu: Update to 19.0.1. * gnu/packages/xorg.scm (xf86-video-amdgpu): Update to 19.0.1. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 8dc5838713..a5cf56d3e6 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2618,14 +2618,14 @@ (define-public xf86-input-void (define-public xf86-video-amdgpu (package (name "xf86-video-amdgpu") - (version "19.0.0") + (version "19.0.1") (source (origin (method url-fetch) (uri (string-append "mirror://xorg/individual/driver/" "xf86-video-amdgpu-" version ".tar.bz2")) (sha256 - (base32 "0lag9jxd752ja7m7ngz3dmqffb5wbx4crdwjw74qx42m8xyi8dl8")))) + (base32 "1mf6s7i423b2xyl469kwnakrpp5fr41sm8hh7vli5jxdd8crg8da")))) (build-system gnu-build-system) (inputs `(("xorg-server" ,xorg-server))) (native-inputs `(("pkg-config" ,pkg-config))) From bcc27a6533066e1ee981a2c9b26635c3a5e8a5c6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 Mar 2019 19:58:08 +0100 Subject: [PATCH 387/694] gnu: xf86-video-ati: Update to 19.0.1. * gnu/packages/xorg.scm (xf86-video-ati): Update to 19.0.1. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index a5cf56d3e6..c4e08d27f9 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2685,14 +2685,14 @@ (define-public xf86-video-ast (define-public xf86-video-ati (package (name "xf86-video-ati") - (version "19.0.0") + (version "19.0.1") (source (origin (method url-fetch) (uri (string-append "mirror://xorg/individual/driver/" "xf86-video-ati-" version ".tar.bz2")) (sha256 - (base32 "0mzl7yp3qkvankh22758sgpaw9mg6jxsfbg6wy0nxfw4i0qpv46x")))) + (base32 "1c31g5q5p3nk9nscwikh1vvfnhdwsxiw7j8v678nlm34hrfh3djw")))) (build-system gnu-build-system) (inputs `(("mesa" ,mesa) ("xorgproto" ,xorgproto) From 0341fb9b68fc7ef3746c72ccbb7e4d43ff313284 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 Mar 2019 20:05:07 +0100 Subject: [PATCH 388/694] gnu: mkfontscale: Update to 1.2.0. * gnu/packages/xorg.scm (mkfontscale): Update to 1.2.0. --- gnu/packages/xorg.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index c4e08d27f9..fe65cfab88 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1579,7 +1579,7 @@ (define-public makedepend (define-public mkfontscale (package (name "mkfontscale") - (version "1.1.3") + (version "1.2.0") (source (origin (method url-fetch) @@ -1588,8 +1588,7 @@ (define-public mkfontscale version ".tar.bz2")) (sha256 - (base32 - "0siag28jpm8hj62bgjvw81sjfgrc7vcy2h7127bl4iazxrlxz60y")))) + (base32 "1gn423m0v1w98df7ni74zrj2rkhsapnqfzr8139l638kkyz7far8")))) (build-system gnu-build-system) (inputs `(("zlib" ,zlib) From 84cd5bd7f87c2724d51a474de11f55eda80f1792 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 Mar 2019 20:07:22 +0100 Subject: [PATCH 389/694] gnu: perl-uri-template: Update to 0.24. * gnu/packages/web.scm (perl-uri-template): Update to 0.24. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index cf26a1aaa9..4326822a72 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -3705,14 +3705,14 @@ (define-public perl-uri-ws (define-public perl-uri-template (package (name "perl-uri-template") - (version "0.23") + (version "0.24") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/B/BR/BRICAS/URI-Template-" version ".tar.gz")) (sha256 (base32 - "0nnijyv4n5qfg7l94j7fmvqy9cbq3gl9sz9anmgsiprmkmpk419j")))) + "1phibcmam2hklrddzj79l43va1gcqpyszbw21ynxq53ynmhjvbk8")))) (build-system perl-build-system) (inputs `(("perl-uri" ,perl-uri))) From 6b455f8c55fb448553f08f9a8f1e3c25793aed7b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 Mar 2019 20:17:47 +0100 Subject: [PATCH 390/694] gnu: perl-plack-middleware-methodoverride: Update to 0.20. * gnu/packages/web.scm (perl-plack-middleware-methodoverride): Update to 0.20. --- gnu/packages/web.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 4326822a72..06e53aab4c 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -3405,16 +3405,15 @@ (define-public perl-plack-middleware-fixmissingbodyinredirect (define-public perl-plack-middleware-methodoverride (package (name "perl-plack-middleware-methodoverride") - (version "0.11") + (version "0.20") (source (origin (method url-fetch) - (uri (string-append "mirror://cpan/authors/id/D/DW/DWHEELER/" + (uri (string-append "mirror://cpan/authors/id/M/MI/MIYAGAWA/" "Plack-Middleware-MethodOverride-" version ".tar.gz")) (sha256 - (base32 - "1hb8dx7i4vs74n0p737wrvpdnnw6argxrjpr6kj6432zabp8325z")))) + (base32 "1wdmmav3rbhv49zpw311zrxxqmg1fz3f3q9src0ypgs8zcp5myyv")))) (build-system perl-build-system) (native-inputs `(("perl-module-build" ,perl-module-build))) From 6854a5d5f7a4ca41b786fadfafe97978a5b45f14 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 Mar 2019 20:25:18 +0100 Subject: [PATCH 391/694] gnu: obs: Update to 23.0.2. * gnu/packages/video.scm (obs): Update to 23.0.2. --- 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 24b4a2c22d..51c030aa44 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2221,7 +2221,7 @@ (define-public v4l-utils (define-public obs (package (name "obs") - (version "22.0.3") + (version "23.0.2") (source (origin (method git-fetch) (uri (git-reference @@ -2230,10 +2230,10 @@ (define-public obs (file-name (git-file-name name version)) (sha256 (base32 - "0ri9qkqk3h71b1a5bwpjzqdr21bbmfqbykg48l779d20zln23n1i")))) + "1c0a5vy4h3qwz69qw3bydyk7r651ib5a9jna4yj6c25p3p9isdvp")))) (build-system cmake-build-system) (arguments - `(#:tests? #f)) ; no tests + `(#:tests? #f)) ; no tests (native-inputs `(("pkg-config" ,pkg-config))) (inputs From ceab33feee33ce7d680717604bb8336299423924 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Mar 2019 21:01:42 +0100 Subject: [PATCH 392/694] gnu: guile-wm: Compile and use canonical directories. Fixes . * gnu/packages/guile-wm.scm (guile-wm)[arguments]: Rename "set-go-directory" phase to "set-module-directory"; change "set-load-path" phase to wrap executable in the correct environment variables; add phase "install-go-files". --- gnu/packages/guile-wm.scm | 69 +++++++++++++++++++++++++++++---------- 1 file changed, 52 insertions(+), 17 deletions(-) diff --git a/gnu/packages/guile-wm.scm b/gnu/packages/guile-wm.scm index 7b1731171a..2955c06a0d 100644 --- a/gnu/packages/guile-wm.scm +++ b/gnu/packages/guile-wm.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014 Ludovic Courtès ;;; Copyright © 2016 Alex ter Weele -;;; Copyright © 2017 Ricardo Wurmus +;;; Copyright © 2017, 2019 Ricardo Wurmus ;;; Copyright © 2017 ng0 ;;; ;;; This file is part of GNU Guix. @@ -87,39 +87,74 @@ (define-public guile-wm "086dijnpl5dpglf70d6f9sizyakr313y7blpdjrmbi687j1x3qcl")))) (build-system gnu-build-system) (arguments - `( ;; The '.scm' files go to $(datadir), so set that to the + `(#:modules ((guix build gnu-build-system) + (guix build utils) + (ice-9 rdelim) + (ice-9 popen)) + ;; The '.scm' files go to $(datadir), so set that to the ;; standard value. #:configure-flags (list (string-append "--datadir=" (assoc-ref %outputs "out") "/share/guile/site/2.2")) #:phases (modify-phases %standard-phases - (add-before 'configure 'set-go-directory + (add-before 'configure 'set-module-directory (lambda* (#:key outputs #:allow-other-keys) - ;; Install .go files to $out/share/guile/site/2.2. - (let ((out (assoc-ref outputs "out"))) + ;; Install .scm files to $out/share/guile/site/2.2. + (let ((out (assoc-ref outputs "out")) + (effective (read-line + (open-pipe* OPEN_READ + "guile" "-c" + "(display (effective-version))")))) (substitute* "module/Makefile.in" (("^wmdir = .*$") (string-append "wmdir = " out - "/share/guile/site/2.2\n")))) + "/share/guile/site/" + effective "\n")))) #t)) (add-after 'install 'set-load-path (lambda* (#:key inputs outputs #:allow-other-keys) ;; Put Guile-XCB's and Guile-WM's modules in the ;; search path of PROG. - (let* ((out (assoc-ref outputs "out")) - (prog (string-append out "/bin/guile-wm")) - (mods (string-append - out "/share/guile/site/2.2")) - (xcb (string-append - (assoc-ref inputs "guile-xcb") - "/share/guile/site/2.2"))) - (wrap-program - prog - `("GUILE_LOAD_PATH" ":" prefix (,mods ,xcb)) + (let* ((out (assoc-ref outputs "out")) + (effective (read-line + (open-pipe* OPEN_READ + "guile" "-c" + "(display (effective-version))"))) + (prog (string-append out "/bin/guile-wm")) + (mods (string-append out "/share/guile/site/" effective)) + (gos (string-append out "/lib/guile/" effective "/site-ccache")) + (xcb (assoc-ref inputs "guile-xcb"))) + (wrap-program prog + `("GUILE_AUTO_COMPILE" ":" = ("0")) + `("GUILE_LOAD_PATH" ":" prefix + (,mods ,(string-append xcb "/share/guile/site/" effective))) `("GUILE_LOAD_COMPILED_PATH" ":" prefix - (,mods ,xcb)))) + (,gos ,(string-append xcb "/lib/guile/" + effective "/site-ccache"))))) #t)) + (add-after 'install 'install-go-files + (lambda* (#:key outputs inputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (effective (read-line + (open-pipe* OPEN_READ + "guile" "-c" + "(display (effective-version))"))) + (module-dir (string-append out "/share/guile/site/" + effective)) + (object-dir (string-append out "/lib/guile/" effective + "/site-ccache")) + (prefix (string-length module-dir))) + (setenv "GUILE_AUTO_COMPILE" "0") + ;; compile to the destination + (for-each (lambda (file) + (let* ((base (string-drop (string-drop-right file 4) + prefix)) + (go (string-append object-dir base ".go"))) + (invoke "guild" "compile" "-L" module-dir + file "-o" go))) + (find-files module-dir "\\.scm$")) + #t))) (add-after 'install 'install-xsession (lambda* (#:key outputs #:allow-other-keys) ;; add a .desktop file to xsessions From 877fd189c4722a8fb41e4530ccd719e3a49d2e63 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Mar 2019 22:31:59 +0100 Subject: [PATCH 393/694] gnu: r-annotate: Update to 1.60.1. * gnu/packages/bioconductor.scm (r-annotate): Update to 1.60.1. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index a1fc1ac7e3..710b9fd07a 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -770,14 +770,14 @@ (define-public r-biocgenerics (define-public r-annotate (package (name "r-annotate") - (version "1.60.0") + (version "1.60.1") (source (origin (method url-fetch) (uri (bioconductor-uri "annotate" version)) (sha256 (base32 - "0p6c96lay23a67dyirgnwzm2yw22m592z780vy6p4nqwla8ha18n")))) + "0pk6ayr3vyqxk850ljkbyil4i382ngfqcbxlv0qrp62yfqgzcjwp")))) (build-system r-build-system) (propagated-inputs `(("r-annotationdbi" ,r-annotationdbi) From e014dc78f08e5ab69c1e2e403822cb74f8cfb4aa Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Mar 2019 22:32:11 +0100 Subject: [PATCH 394/694] gnu: r-dexseq: Update to 1.28.3. * gnu/packages/bioinformatics.scm (r-dexseq): Update to 1.28.3. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 840ddfad17..009b7ec99b 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6697,14 +6697,14 @@ (define-public r-deseq2 (define-public r-dexseq (package (name "r-dexseq") - (version "1.28.2") + (version "1.28.3") (source (origin (method url-fetch) (uri (bioconductor-uri "DEXSeq" version)) (sha256 (base32 - "134znafy7hn38rp4nia4pglz56fz6nbkxrf7z2k1sajfsgxa1hs6")))) + "1wsj1kqfrakmjnlplxmrv17r2spzcdkmwdkhggyjbf8mdhqs3w16")))) (properties `((upstream-name . "DEXSeq"))) (build-system r-build-system) (propagated-inputs From 0adb6f207b3f2f7bd4252f82b69f06bc5b14d01e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Mar 2019 22:32:17 +0100 Subject: [PATCH 395/694] gnu: r-category: Update to 2.48.1. * gnu/packages/bioinformatics.scm (r-category): Update to 2.48.1. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 009b7ec99b..ae6052a392 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6818,14 +6818,14 @@ (define-public r-gseabase (define-public r-category (package (name "r-category") - (version "2.48.0") + (version "2.48.1") (source (origin (method url-fetch) (uri (bioconductor-uri "Category" version)) (sha256 (base32 - "1jdm83bwdfhpfm1y6hwgvxzj6l83h1bdkqv23799kzywnwm016kv")))) + "18rsxlwa1l06i635cnznb9b2zssqcgb71pihky29gl2gwp7a654b")))) (properties `((upstream-name . "Category"))) (build-system r-build-system) (propagated-inputs From 2b83d218d8a4232c4809b21a940118e764474001 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Mar 2019 22:32:25 +0100 Subject: [PATCH 396/694] gnu: r-variantannotation: Update to 1.28.13. * gnu/packages/bioinformatics.scm (r-variantannotation): Update to 1.28.13. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index ae6052a392..7e76711097 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7576,13 +7576,13 @@ (define-public r-edger (define-public r-variantannotation (package (name "r-variantannotation") - (version "1.28.11") + (version "1.28.13") (source (origin (method url-fetch) (uri (bioconductor-uri "VariantAnnotation" version)) (sha256 (base32 - "19bxi5b9fzqdjadb8bfm8xsgi6nvrwbgn1xcpk59bnmv9vzjkwrh")))) + "1a7b0bg579ynpbfh5dk87fdgl62r9cwk4zmrl61m6zil7881p3gh")))) (properties `((upstream-name . "VariantAnnotation"))) (inputs From e49d5d34ede498a5badb8015f3af2f26118abfee Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Mar 2019 22:32:32 +0100 Subject: [PATCH 397/694] gnu: r-genomicfeatures: Update to 1.34.6. * gnu/packages/bioinformatics.scm (r-genomicfeatures): Update to 1.34.6. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 7e76711097..79d42a95b4 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8017,13 +8017,13 @@ (define-public r-rtracklayer (define-public r-genomicfeatures (package (name "r-genomicfeatures") - (version "1.34.4") + (version "1.34.6") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomicFeatures" version)) (sha256 (base32 - "09gc1vbqszrr3ixv4hsfan2l18fcf3gg58783mrfwjv6ci9c4w0d")))) + "1cz7qx324dmsrkzyhm956cfgr08gpily5rpym7hc8zz5kbl6i3ra")))) (properties `((upstream-name . "GenomicFeatures"))) (build-system r-build-system) From 933cc19684327a1cbe7cc45d1bf7bf7b327bf288 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Mar 2019 22:32:37 +0100 Subject: [PATCH 398/694] gnu: r-annotationhub: Update to 2.14.5. * gnu/packages/bioinformatics.scm (r-annotationhub): Update to 2.14.5. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 79d42a95b4..b9167a0c42 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9794,14 +9794,14 @@ (define-public r-interactivedisplaybase (define-public r-annotationhub (package (name "r-annotationhub") - (version "2.14.4") + (version "2.14.5") (source (origin (method url-fetch) (uri (bioconductor-uri "AnnotationHub" version)) (sha256 (base32 - "18v2mk395svq3c19wzi6bjwjfnmrvjqkzmj7cmaji7rx4xdgz6ck")))) + "0iyrxaijl4614iz5c1j53227xy2g756p3bx7hcwglcybh0k30nki")))) (properties `((upstream-name . "AnnotationHub"))) (build-system r-build-system) (propagated-inputs From 8b672b2c48164c78731ae142ae4761d91666bdec Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 18 Mar 2019 21:39:12 -0400 Subject: [PATCH 399/694] gnu: blender: Restore version 2.79b for systems without OpenGL 3. Fixes . * gnu/packages/graphics.scm (blender-2.79): New variable. (blender)[description]: Remove obsolete claim that the stable release no longer works in Guix. * gnu/packages/patches/blender-2.79-newer-ffmpeg.patch, gnu/packages/patches/blender-2.79-python-3.7-fix.patch: New files. * gnu/local.mk (dist_patch_DATA): Add them. --- gnu/local.mk | 2 + gnu/packages/graphics.scm | 93 ++++++++++++++++++- .../patches/blender-2.79-newer-ffmpeg.patch | 80 ++++++++++++++++ .../patches/blender-2.79-python-3.7-fix.patch | 43 +++++++++ 4 files changed, 216 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/blender-2.79-newer-ffmpeg.patch create mode 100644 gnu/packages/patches/blender-2.79-python-3.7-fix.patch diff --git a/gnu/local.mk b/gnu/local.mk index a5a2f11538..c9c7378f02 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -672,6 +672,8 @@ dist_patch_DATA = \ %D%/packages/patches/beignet-correct-file-names.patch \ %D%/packages/patches/biber-fix-encoding-write.patch \ %D%/packages/patches/binutils-loongson-workaround.patch \ + %D%/packages/patches/blender-2.79-newer-ffmpeg.patch \ + %D%/packages/patches/blender-2.79-python-3.7-fix.patch \ %D%/packages/patches/boost-fix-icu-build.patch \ %D%/packages/patches/byobu-writable-status.patch \ %D%/packages/patches/calibre-no-updates-dialog.patch \ diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index bf4cc89b08..11158bdfd1 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2018 Mathieu Othacehe ;;; Copyright © 2018 Alex Kost ;;; Copyright © 2018 Kei Kebreau +;;; Copyright © 2019 Mark H Weaver ;;; ;;; This file is part of GNU Guix. ;;; @@ -165,10 +166,98 @@ (define-public blender compositing and motion tracking, even video editing and game creation. The application can be customized via its API for Python scripting. -WARNING: This package offers a beta build of Blender, because the stable release -no longer works in Guix. See @uref{https://issues.guix.info/issue/33882}.") +WARNING: This is a beta build of Blender.") (license license:gpl2+)))) +(define-public blender-2.79 + (package + (name "blender") + (version "2.79b") + (source (origin + (method url-fetch) + (uri (string-append "https://download.blender.org/source/" + "blender-" version ".tar.gz")) + (sha256 + (base32 + "1g4kcdqmf67srzhi3hkdnr4z1ph4h9sza1pahz38mrj998q4r52c")) + (patches (search-patches "blender-2.79-newer-ffmpeg.patch" + "blender-2.79-python-3.7-fix.patch")))) + (build-system cmake-build-system) + (arguments + (let ((python-version (version-major+minor (package-version python)))) + `(;; Test files are very large and not included in the release tarball. + #:tests? #f + #:configure-flags + (list "-DWITH_CODEC_FFMPEG=ON" + "-DWITH_CODEC_SNDFILE=ON" + "-DWITH_CYCLES=ON" + "-DWITH_DOC_MANPAGE=ON" + "-DWITH_FFTW3=ON" + "-DWITH_GAMEENGINE=ON" + "-DWITH_IMAGE_OPENJPEG=ON" + "-DWITH_INPUT_NDOF=ON" + "-DWITH_INSTALL_PORTABLE=OFF" + "-DWITH_JACK=ON" + "-DWITH_MOD_OCEANSIM=ON" + "-DWITH_PLAYER=ON" + "-DWITH_PYTHON_INSTALL=OFF" + "-DWITH_PYTHON_INSTALL=OFF" + "-DWITH_SYSTEM_OPENJPEG=ON" + (string-append "-DPYTHON_LIBRARY=python" ,python-version "m") + (string-append "-DPYTHON_LIBPATH=" (assoc-ref %build-inputs "python") + "/lib") + (string-append "-DPYTHON_INCLUDE_DIR=" (assoc-ref %build-inputs "python") + "/include/python" ,python-version "m") + (string-append "-DPYTHON_VERSION=" ,python-version)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-broken-import + (lambda _ + (substitute* "release/scripts/addons/io_scene_fbx/json2fbx.py" + (("import encode_bin") "from . import encode_bin")) + #t)) + (add-after 'set-paths 'add-ilmbase-include-path + (lambda* (#:key inputs #:allow-other-keys) + ;; OpenEXR propagates ilmbase, but its include files do not appear + ;; in the CPATH, so we need to add "$ilmbase/include/OpenEXR/" to + ;; the CPATH to satisfy the dependency on "half.h". + (setenv "CPATH" + (string-append (assoc-ref inputs "ilmbase") + "/include/OpenEXR" + ":" (or (getenv "CPATH") ""))) + #t)))))) + (inputs + `(("boost" ,boost) + ("jemalloc" ,jemalloc) + ("libx11" ,libx11) + ("openimageio" ,openimageio) + ("openexr" ,openexr) + ("ilmbase" ,ilmbase) + ("openjpeg" ,openjpeg-1) + ("libjpeg" ,libjpeg) + ("libpng" ,libpng) + ("libtiff" ,libtiff) + ("ffmpeg" ,ffmpeg) + ("fftw" ,fftw) + ("jack" ,jack-1) + ("libsndfile" ,libsndfile) + ("freetype" ,freetype) + ("glew" ,glew) + ("openal" ,openal) + ("python" ,python) + ("zlib" ,zlib))) + (home-page "https://blender.org/") + (synopsis "3D graphics creation suite") + (description + "Blender is a 3D graphics creation suite. It supports the entirety of +the 3D pipeline—modeling, rigging, animation, simulation, rendering, +compositing and motion tracking, even video editing and game creation. The +application can be customized via its API for Python scripting. + +NOTE: This older version of Blender is the last release that does not require +OpenGL 3. It is retained for use with older computers.") + (license license:gpl2+))) + (define-public assimp (package (name "assimp") diff --git a/gnu/packages/patches/blender-2.79-newer-ffmpeg.patch b/gnu/packages/patches/blender-2.79-newer-ffmpeg.patch new file mode 100644 index 0000000000..363489bc70 --- /dev/null +++ b/gnu/packages/patches/blender-2.79-newer-ffmpeg.patch @@ -0,0 +1,80 @@ +https://sources.debian.org/data/main/b/blender/2.79.b+dfsg0-4/debian/patches/0008-fix_building_with_latest_versions_of_FFmpeg.patch + +From: Bastien Montagne +Date: Tue, 8 May 2018 16:00:52 +0200 +Subject: fix_building_with_latest_versions_of_FFmpeg + +Some years-old deprecated stuff has now been removed. + +Correct solution is probably to use valid defines etc. in own code, but +this is more FFMEPG maintainer task (since it also may change how old +FFMPEG we do support...). +--- + intern/ffmpeg/ffmpeg_compat.h | 39 ++++++++++++++++++++++++++ + source/blender/blenkernel/intern/writeffmpeg.c | 3 +- + 2 files changed, 41 insertions(+), 1 deletion(-) + +diff --git a/intern/ffmpeg/ffmpeg_compat.h b/intern/ffmpeg/ffmpeg_compat.h +index 9c06c8a..f7f437c 100644 +--- a/intern/ffmpeg/ffmpeg_compat.h ++++ b/intern/ffmpeg/ffmpeg_compat.h +@@ -109,6 +109,45 @@ int av_sample_fmt_is_planar(enum AVSampleFormat sample_fmt) + + #endif + ++/* XXX TODO Probably fix to correct modern flags in code? Not sure how old FFMPEG we want to support though, ++ * so for now this will do. */ ++ ++#ifndef FF_MIN_BUFFER_SIZE ++# ifdef AV_INPUT_BUFFER_MIN_SIZE ++# define FF_MIN_BUFFER_SIZE AV_INPUT_BUFFER_MIN_SIZE ++# endif ++#endif ++ ++#ifndef FF_INPUT_BUFFER_PADDING_SIZE ++# ifdef AV_INPUT_BUFFER_PADDING_SIZE ++# define FF_INPUT_BUFFER_PADDING_SIZE AV_INPUT_BUFFER_PADDING_SIZE ++# endif ++#endif ++ ++#ifndef CODEC_FLAG_GLOBAL_HEADER ++# ifdef AV_CODEC_FLAG_GLOBAL_HEADER ++# define CODEC_FLAG_GLOBAL_HEADER AV_CODEC_FLAG_GLOBAL_HEADER ++# endif ++#endif ++ ++#ifndef CODEC_FLAG_GLOBAL_HEADER ++# ifdef AV_CODEC_FLAG_GLOBAL_HEADER ++# define CODEC_FLAG_GLOBAL_HEADER AV_CODEC_FLAG_GLOBAL_HEADER ++# endif ++#endif ++ ++#ifndef CODEC_FLAG_INTERLACED_DCT ++# ifdef AV_CODEC_FLAG_INTERLACED_DCT ++# define CODEC_FLAG_INTERLACED_DCT AV_CODEC_FLAG_INTERLACED_DCT ++# endif ++#endif ++ ++#ifndef CODEC_FLAG_INTERLACED_ME ++# ifdef AV_CODEC_FLAG_INTERLACED_ME ++# define CODEC_FLAG_INTERLACED_ME AV_CODEC_FLAG_INTERLACED_ME ++# endif ++#endif ++ + /* FFmpeg upstream 1.0 is the first who added AV_ prefix. */ + #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 59, 100) + # define AV_CODEC_ID_NONE CODEC_ID_NONE +diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c +index a19e414..04d508a 100644 +--- a/source/blender/blenkernel/intern/writeffmpeg.c ++++ b/source/blender/blenkernel/intern/writeffmpeg.c +@@ -605,7 +605,8 @@ static AVStream *alloc_video_stream(FFMpegContext *context, RenderData *rd, int + c->rc_buffer_aggressivity = 1.0; + #endif + +- c->me_method = ME_EPZS; ++ /* Deprecated and not doing anything since July 2015, deleted in recent ffmpeg */ ++ //c->me_method = ME_EPZS; + + codec = avcodec_find_encoder(c->codec_id); + if (!codec) diff --git a/gnu/packages/patches/blender-2.79-python-3.7-fix.patch b/gnu/packages/patches/blender-2.79-python-3.7-fix.patch new file mode 100644 index 0000000000..fd1d8ba437 --- /dev/null +++ b/gnu/packages/patches/blender-2.79-python-3.7-fix.patch @@ -0,0 +1,43 @@ +Copied from https://git.blender.org/gitweb/gitweb.cgi/blender.git/patch/1db47a2ccd1e68994bf8140eba6cc2a26a2bc91f +Fixes . + +From 1db47a2ccd1e68994bf8140eba6cc2a26a2bc91f Mon Sep 17 00:00:00 2001 +From: Campbell Barton +Date: Thu, 12 Jul 2018 08:28:06 +0200 +Subject: [PATCH] Fix PyRNA class registration w/ Python 3.7 + +In Python3.7 this now raises an error. +--- + source/blender/python/intern/bpy_rna.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c +index 9052b6f580a..80b0aa7a51b 100644 +--- a/source/blender/python/intern/bpy_rna.c ++++ b/source/blender/python/intern/bpy_rna.c +@@ -7577,10 +7577,12 @@ static int bpy_class_validate_recursive(PointerRNA *dummyptr, StructRNA *srna, v + if (!(flag & PROP_REGISTER)) + continue; + ++ /* TODO(campbell): Use Python3.7x _PyObject_LookupAttr(), also in the macro below. */ + identifier = RNA_property_identifier(prop); + item = PyObject_GetAttrString(py_class, identifier); + + if (item == NULL) { ++ PyErr_Clear(); + /* Sneaky workaround to use the class name as the bl_idname */ + + #define BPY_REPLACEMENT_STRING(rna_attr, py_attr) \ +@@ -7596,6 +7598,9 @@ static int bpy_class_validate_recursive(PointerRNA *dummyptr, StructRNA *srna, v + } \ + Py_DECREF(item); \ + } \ ++ else { \ ++ PyErr_Clear(); \ ++ } \ + } /* intentionally allow else here */ + + if (false) {} /* needed for macro */ +-- +2.20.1 + From d14c770d55225ea485d79466cd01fe3912fea3d6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Mar 2019 23:22:00 +0100 Subject: [PATCH 400/694] gnu: Add r-insight. * gnu/packages/cran.scm (r-insight): 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 eac6293fc9..fd99e5cf39 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5811,6 +5811,32 @@ (define-public r-prediction other add-on packages.") (license license:expat))) +(define-public r-insight + (package + (name "r-insight") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (cran-uri "insight" version)) + (sha256 + (base32 + "0cy00j4m9r690hrjdmv8wzwn8mbnkjd3g527nvsmid64h9jgks5f")))) + (build-system r-build-system) + (home-page "https://easystats.github.io/insight/") + (synopsis "Easy access to model information for various model objects") + (description + "This package provides a tool to provide an easy, intuitive and +consistent access to information contained in various R models, like model +formulas, model terms, information about random effects, data that was used to +fit the model or data from response variables. The package mainly revolves +around two types of functions: Functions that find (the names of) information, +starting with @code{find_}, and functions that get the underlying data, +starting with @code{get_}. The package has a consistent syntax and works with +many different model objects, where otherwise functions to access these +information are missing.") + (license license:gpl3))) + (define-public r-sjlabelled (package (name "r-sjlabelled") From 28d0eb256578e85cc2bba805fb165b98bf96825a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Mar 2019 23:22:24 +0100 Subject: [PATCH 401/694] gnu: r-diversitree: Fix typo. * gnu/packages/bioinformatics.scm (r-diversitree)[propagated-inputs]: Fix typo in package labels. --- gnu/packages/bioinformatics.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index b9167a0c42..3cde8805b2 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -13130,7 +13130,7 @@ (define-public r-diversitree `(("r-ape" ,r-ape) ("r-desolve" ,r-desolve) ("r-rcpp" ,r-rcpp) - ("r-suplex" ,r-subplex))) + ("r-subplex" ,r-subplex))) (home-page "https://www.zoology.ubc.ca/prog/diversitree") (synopsis "Comparative 'phylogenetic' analyses of diversification") (description "This package contains a number of comparative \"phylogenetic\" From ffd6e2fd8fe1c8141d32bd79cfad33ff8b6a66f1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Mar 2019 23:29:02 +0100 Subject: [PATCH 402/694] gnu: r-sys: Update to 3.1. * gnu/packages/cran.scm (r-sys): Update to 3.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index fd99e5cf39..1c7a99ee4f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -113,14 +113,14 @@ (define-public r-ellipsis (define-public r-sys (package (name "r-sys") - (version "3.0") + (version "3.1") (source (origin (method url-fetch) (uri (cran-uri "sys" version)) (sha256 (base32 - "1g0q1f56qmp3x5gja19qrmgk3j4d89yp16z1ziv1jn5p4dlmfpxh")))) + "0aj3wcyah3r7c9s3rbs0c8nifd4vqmkzg9fqkrb7f838ww0qw24q")))) (build-system r-build-system) (home-page "https://github.com/jeroen/sys") (synopsis "Powerful and reliable tools for running system commands in R") From df045099324aba095ab6dbaf94bb2bbac59657a6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Mar 2019 23:29:32 +0100 Subject: [PATCH 403/694] gnu: r-dendextend: Update to 1.10.0. * gnu/packages/cran.scm (r-dendextend): Update to 1.10.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 1c7a99ee4f..a1f381d448 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1556,14 +1556,14 @@ (define-public r-compare (define-public r-dendextend (package (name "r-dendextend") - (version "1.9.0") + (version "1.10.0") (source (origin (method url-fetch) (uri (cran-uri "dendextend" version)) (sha256 (base32 - "1jiani6zwfajky2vafvay2hq158nh99rdrk3j00lycspds9v35fd")))) + "091jznl549d44w1h8kk1vwddzhijkyh0wpgkykd494fnc8rzpw48")))) (build-system r-build-system) (propagated-inputs `(("r-fpc" ,r-fpc) From d1021421d96a520bb375e00707eb2d0dd0ac93c9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Mar 2019 23:29:45 +0100 Subject: [PATCH 404/694] gnu: r-callr: Update to 3.2.0. * gnu/packages/cran.scm (r-callr): Update to 3.2.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a1f381d448..4042c966e1 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -317,14 +317,14 @@ (define-public r-reprex (define-public r-callr (package (name "r-callr") - (version "3.1.1") + (version "3.2.0") (source (origin (method url-fetch) (uri (cran-uri "callr" version)) (sha256 (base32 - "15l1qfa3aigba2ghgr2gwcjjy7anagrwg8khsd36fymwkmqj5g69")))) + "1s5h2k7c1vgbry90xczin66q89cbkc6mvh4679l5rsz83087pd2b")))) (build-system r-build-system) (propagated-inputs `(("r-r6" ,r-r6) From 42f344faf7b06babf57315131d206202b3562555 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Mar 2019 23:30:17 +0100 Subject: [PATCH 405/694] gnu: Add r-libcoin. * gnu/packages/cran.scm (r-libcoin): New variable. --- gnu/packages/cran.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 4042c966e1..07c73dc66d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7633,6 +7633,26 @@ (define-public r-pwr Cohen (1988).") (license license:gpl3+))) +(define-public r-libcoin + (package + (name "r-libcoin") + (version "1.0-4") + (source + (origin + (method url-fetch) + (uri (cran-uri "libcoin" version)) + (sha256 + (base32 + "1i893ij9vkmc4y721npw1s3prmmcs2da5vf3ajm0j8ccmfhbmp4i")))) + (build-system r-build-system) + (propagated-inputs `(("r-mvtnorm" ,r-mvtnorm))) + (home-page "https://cran.r-project.org/web/packages/libcoin") + (synopsis "Linear test statistics for permutation inference") + (description + "This package provides basic infrastructure for linear test statistics +and permutation inference in the framework of Strasser and Weber (1999).") + (license license:gpl2))) + (define-public r-coin (package (name "r-coin") From db39269c898719af7fa5f9a3f33795cb6b5b99b6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Mar 2019 23:30:40 +0100 Subject: [PATCH 406/694] gnu: r-maldiquant: Update to 1.19.2. * gnu/packages/bioinformatics.scm (r-maldiquant): Update to 1.19.2. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 3cde8805b2..eacdc7cb4a 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9283,14 +9283,14 @@ (define-public r-raremetals2 (define-public r-maldiquant (package (name "r-maldiquant") - (version "1.18") + (version "1.19.2") (source (origin (method url-fetch) (uri (cran-uri "MALDIquant" version)) (sha256 (base32 - "18nl214xjsxkcpbg79jkmw0yznwm5szyh2qb84n7ip46mm779ha6")))) + "11zbvm1vw8zn2vmymvydgdczvwj961s2knvrn1q4gbziwi5gqvlc")))) (properties `((upstream-name . "MALDIquant"))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/MALDIquant") From 8e91ad0b5cc11921457ae3053e8df9933d0d68b0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Mar 2019 23:31:17 +0100 Subject: [PATCH 407/694] gnu: r-ape: Update to 5.3. * gnu/packages/cran.scm (r-ape): Update to 5.3. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 07c73dc66d..7ca6c99a36 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1082,14 +1082,14 @@ (define-public r-amap (define-public r-ape (package (name "r-ape") - (version "5.2") + (version "5.3") (source (origin (method url-fetch) (uri (cran-uri "ape" version)) (sha256 (base32 - "05b4yka5cirdgxd4d7iiaqvr428pk3j6n9q6dvg5j38kdj2h5sr7")))) + "08wbk1kxhs32bmmvqlqanbdg1w235amd35k8m00fngsj9h9xzc08")))) (build-system r-build-system) (propagated-inputs `(("r-lattice" ,r-lattice) From 95bf4508e59ac7bfd53b4e86023586f7514ce11a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Mar 2019 23:32:20 +0100 Subject: [PATCH 408/694] gnu: qtractor: Update to 0.9.6. * gnu/packages/music.scm (qtractor): Update to 0.9.6. --- 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 2b533e6d26..750e3e93ce 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2249,14 +2249,14 @@ (define-public aj-snapshot (define-public qtractor (package (name "qtractor") - (version "0.9.5") + (version "0.9.6") (source (origin (method url-fetch) (uri (string-append "http://downloads.sourceforge.net/qtractor/" "qtractor-" version ".tar.gz")) (sha256 (base32 - "1zsikhqj5xzhw2x3b6pqlmcwz3hxx07lbbif8v3m3j41snzjic22")))) + "06sa4wl8zr0k8dnjiil0gjwnhrkq95h50xv56ih1y8jgyzxchaxp")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ; no "check" target From 35663627fbbb2c3f611147906871cbd0d8e2b56a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Mar 2019 23:32:32 +0100 Subject: [PATCH 409/694] gnu: r-matrix: Update to 1.2-16. * gnu/packages/statistics.scm (r-matrix): Update to 1.2-16. --- 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 e017d60767..fa2a637d7e 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -548,14 +548,14 @@ (define-public r-lattice (define-public r-matrix (package (name "r-matrix") - (version "1.2-15") + (version "1.2-16") (source (origin (method url-fetch) (uri (cran-uri "Matrix" version)) (sha256 (base32 - "1mshhyia6imh939p8labxi0wv21lal7csmccxi42klpgdh1j89kv")))) + "10fh0y1wd0bvnqbzlyck08pn1vxcd58bskx2lrf9m42v5792ba9p")))) (properties `((upstream-name . "Matrix"))) (build-system r-build-system) (propagated-inputs From 2bf224d0ca2b69d6198b960ba2ca0b2654883153 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Mar 2019 23:32:51 +0100 Subject: [PATCH 410/694] gnu: r-permute: Update to 0.9-5. * gnu/packages/statistics.scm (r-permute): Update to 0.9-5. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index fa2a637d7e..8e50d8e6b7 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -916,14 +916,14 @@ (define-public r-munsell (define-public r-permute (package (name "r-permute") - (version "0.9-4") + (version "0.9-5") (source (origin (method url-fetch) (uri (cran-uri "permute" version)) (sha256 (base32 - "1w8wzk1fg9q7wvisnfp2js70dg0m9wi12gkdhpyngpbdcgssahd5")))) + "0ra8p5mf2590azrkas8z2ry7mif77xqxd29n4zgyi5vll225726j")))) (build-system r-build-system) ;; Tests do not run correctly, but running them properly would entail a ;; circular dependency with vegan. From a9c8127290c49444c37242283017ff6a72611b72 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Mar 2019 23:33:11 +0100 Subject: [PATCH 411/694] gnu: r-stringi: Update to 1.4.3. * gnu/packages/statistics.scm (r-stringi): Update to 1.4.3. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 8e50d8e6b7..cface45565 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1021,14 +1021,14 @@ (define-public r-sendmailr (define-public r-stringi (package (name "r-stringi") - (version "1.3.1") + (version "1.4.3") (source (origin (method url-fetch) (uri (cran-uri "stringi" version)) (sha256 (base32 - "0qn3xy6vnz11vv2prbm55vkbgxr6dl8w5vk5q8d7wlp9nqxndprj")))) + "1vbr6g9p1iyzdj7wfw6afyizvnd1a2srfvkl72pq23vhdcwwpkhk")))) (build-system r-build-system) (inputs `(("icu4c" ,icu4c))) (native-inputs `(("pkg-config" ,pkg-config))) From 1f2862b1bec0d740a79ad370dc312e9f6f2359a9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Mar 2019 23:33:33 +0100 Subject: [PATCH 412/694] gnu: r-lazyeval: Update to 0.2.2. * gnu/packages/statistics.scm (r-lazyeval): Update to 0.2.2. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index cface45565..ebbbf72833 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1254,13 +1254,13 @@ (define-public r-assertthat (define-public r-lazyeval (package (name "r-lazyeval") - (version "0.2.1") + (version "0.2.2") (source (origin (method url-fetch) (uri (cran-uri "lazyeval" version)) (sha256 (base32 - "0q9zx78ncy2ffzrf9sh053069kd3w1xn1ss3gsbyf3y4jhza9cw3")))) + "1m10i059csrcqkcn59a8wspn784alxsq3symzhn24mhhl894346n")))) (build-system r-build-system) (home-page "https://github.com/hadley/lazyeval") (synopsis "Lazy (non-standard) evaluation in R") From b6c5b0aca27790896e813af7fc85c59a8c3ec613 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Mar 2019 23:33:50 +0100 Subject: [PATCH 413/694] gnu: r-highr: Update to 0.8. * gnu/packages/statistics.scm (r-highr): Update to 0.8. --- 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 ebbbf72833..2adae4cb03 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1350,13 +1350,13 @@ (define-public r-formatr (define-public r-highr (package (name "r-highr") - (version "0.7") + (version "0.8") (source (origin (method url-fetch) (uri (cran-uri "highr" version)) (sha256 (base32 - "1dzknqk4x7iiiq1jkh9bqm5qcvs7mbqxbkn5955050payavabfya")))) + "0my6idnhmmgs4q1vs40y2lh56yij2p59mpwvm53wjs2zk6x1zl2b")))) (build-system r-build-system) (home-page "https://github.com/yihui/highr") (synopsis "Syntax highlighting for R source code") From 86c8b2f5f5fc6b3af0894bdf833071a2952e152f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Mar 2019 23:34:06 +0100 Subject: [PATCH 414/694] gnu: r-knitr: Update to 1.22. * gnu/packages/statistics.scm (r-knitr): Update to 1.22. --- 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 2adae4cb03..020a948ebe 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1431,13 +1431,13 @@ (define-public r-yaml (define-public r-knitr (package (name "r-knitr") - (version "1.21") + (version "1.22") (source (origin (method url-fetch) (uri (cran-uri "knitr" version)) (sha256 (base32 - "0xzymi4gkilqaa5b2ay9zk1advavzkwxf7mb064bqfb09y8rak0j")))) + "1iks80g1cj25rvgyf0y2jc2pmfvsq4sbgdp788w9016bk71wzdcs")))) (build-system r-build-system) (propagated-inputs `(("r-evaluate" ,r-evaluate) From 75904419764fb422f13017417a9dd549c5700480 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Mar 2019 23:34:18 +0100 Subject: [PATCH 415/694] gnu: r-tibble: Update to 2.1.1. * gnu/packages/statistics.scm (r-tibble): Update to 2.1.1. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 020a948ebe..2d22649ccf 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1653,14 +1653,14 @@ (define-public r-rlang (define-public r-tibble (package (name "r-tibble") - (version "2.0.1") + (version "2.1.1") (source (origin (method url-fetch) (uri (cran-uri "tibble" version)) (sha256 (base32 - "04rxf5x9awwa9c00v9p7d3a2lqnn7j2rjg4r219hmw7cbqlwrcks")))) + "111jl0hdjhh7hkydxvsr5l19gb0ylxq7xrkc28awnc9pzglpgis5")))) (build-system r-build-system) (propagated-inputs `(("r-cli" ,r-cli) From 086ca4deaeb323ad2f8dced2ef858da16d3f66a0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Mar 2019 23:35:43 +0100 Subject: [PATCH 416/694] gnu: r-git2r: Update to 0.25.2. * gnu/packages/statistics.scm (r-git2r): Update to 0.25.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 2d22649ccf..c2881e81fd 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2375,13 +2375,13 @@ (define-public r-httr (define-public r-git2r (package (name "r-git2r") - (version "0.24.0") + (version "0.25.2") (source (origin (method url-fetch) (uri (cran-uri "git2r" version)) (sha256 (base32 - "0vfc25z4j53pc49cnp3zjwzjb72kvc0aq96wgyg10xpgvhl3z0gg")))) + "15kpvz6ry2r8ii5hzinjwkggc5kgmkbcpsdwzahsf8gha52w80p0")))) (build-system r-build-system) ;; This R package contains modified sources of libgit2. This modified ;; version of libgit2 is built as the package is built. Hence libgit2 is From 1081e8266f4982dfa79795165b0aba466e47867c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Mar 2019 23:36:00 +0100 Subject: [PATCH 417/694] gnu: r-rstudioapi: Update to 0.10. * gnu/packages/statistics.scm (r-rstudioapi): Update to 0.10. --- 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 c2881e81fd..41468b8a8f 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2403,13 +2403,13 @@ (define-public r-git2r (define-public r-rstudioapi (package (name "r-rstudioapi") - (version "0.9.0") + (version "0.10") (source (origin (method url-fetch) (uri (cran-uri "rstudioapi" version)) (sha256 (base32 - "0gn1pvaxfh2gh2ikvxcr8f6k97ygcfr68iz6dhwlq4z71a1s4jai")))) + "15mbw607ncdf53mgga76n3va5zzdcjqz14nb0jcn9axwccqamic0")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/rstudioapi") (synopsis "Safely access the RStudio API") From c2b45ac578a923a13a0855916f3c78154b382cfd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Mar 2019 23:39:22 +0100 Subject: [PATCH 418/694] gnu: r-diversitree: Update to 0.9-11. * gnu/packages/bioinformatics.scm (r-diversitree): Update to 0.9-11. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index eacdc7cb4a..ccb49cac9e 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -13114,14 +13114,14 @@ (define-public mantis (define-public r-diversitree (package (name "r-diversitree") - (version "0.9-10") + (version "0.9-11") (source (origin (method url-fetch) (uri (cran-uri "diversitree" version)) (sha256 (base32 - "0gh4rcrp0an3jh8915i1fsxlgyfk7njywgbd5ln5r2jhr085kpz7")))) + "1jqfjmmaigq581l4zxysmkhld0xv6izlbr1hihf9zplkix36majc")))) (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran))) From 2391e97c4d093c389784b2d6418ccc93e28003cc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Mar 2019 23:39:45 +0100 Subject: [PATCH 419/694] gnu: r-httpuv: Update to 1.5.0. * gnu/packages/cran.scm (r-httpuv): Update to 1.5.0. [native-inputs]: Remove pkg-config; move r-rcpp from here... [propagated-inputs]: ...to here; add r-r6. --- gnu/packages/cran.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 7ca6c99a36..7da2ab77b1 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -394,21 +394,20 @@ (define-public r-modelr (define-public r-httpuv (package (name "r-httpuv") - (version "1.4.5.1") + (version "1.5.0") (source (origin (method url-fetch) (uri (cran-uri "httpuv" version)) (sha256 (base32 - "0mqd40jckdpkjw1jjd860cdwkb03l6dkh931maijfdaqr1w9hwvn")))) + "19m9514yj5sg0rz1zvi8w1z98srnrql4iirgr794fkaap6bs7i2f")))) (build-system r-build-system) - (native-inputs - `(("r-rcpp" ,r-rcpp) - ("pkg-config" ,pkg-config))) (propagated-inputs `(("r-bh" ,r-bh) ("r-later" ,r-later) - ("r-promises" ,r-promises))) + ("r-promises" ,r-promises) + ("r-r6" ,r-r6) + ("r-rcpp" ,r-rcpp))) (home-page "https://github.com/rstudio/httpuv") (synopsis "HTTP and WebSocket server library for R") (description From 33fba4cea89b914ba34b76a828dac3b0125cbb24 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Mar 2019 23:40:50 +0100 Subject: [PATCH 420/694] gnu: r-rcpparmadillo: Update to 0.9.200.7.1. * gnu/packages/statistics.scm (r-rcpparmadillo): Update to 0.9.200.7.1. [native-inputs]: Add ghc-pandoc, ghc-pandoc-citeproc, and r-rmarkdown. --- gnu/packages/statistics.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 41468b8a8f..8af787b2dd 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2580,17 +2580,21 @@ (define-public r-latticeextra (define-public r-rcpparmadillo (package (name "r-rcpparmadillo") - (version "0.9.200.7.0") + (version "0.9.200.7.1") (source (origin (method url-fetch) (uri (cran-uri "RcppArmadillo" version)) (sha256 (base32 - "11m04yvdh6086567dzzxchbf68fl5hxf2y32acf3f43bjqgwbv2p")))) + "1gy3ywzw1cx344a8xihnmflgxphy2fhci7ng85msqd1iv9gzxyk4")))) (properties `((upstream-name . "RcppArmadillo"))) (build-system r-build-system) + ;; All needed for vignettes (native-inputs - `(("r-knitr" ,r-knitr))) ; needed for vignettes + `(("r-knitr" ,r-knitr) + ("r-rmarkdown" ,r-rmarkdown) + ("ghc-pandoc" ,ghc-pandoc) + ("ghc-pandoc-citeproc" ,ghc-pandoc-citeproc))) (propagated-inputs `(("r-rcpp" ,r-rcpp))) (home-page "https://github.com/RcppCore/RcppArmadillo") From 1d7049335f58e57b83027623ca68560b6c33a10a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Mar 2019 23:41:15 +0100 Subject: [PATCH 421/694] gnu: r-rmarkdown: Update to 1.12. * gnu/packages/statistics.scm (r-rmarkdown): Update to 1.12. --- 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 8af787b2dd..a750fccb3e 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2678,14 +2678,14 @@ (define-public r-rprojroot (define-public r-rmarkdown (package (name "r-rmarkdown") - (version "1.11") + (version "1.12") (source (origin (method url-fetch) (uri (cran-uri "rmarkdown" version)) (sha256 (base32 - "0yyjbh891mdqzpjkblz8510ng71i7mxmyiqr69x3rwlwk2vakk79")))) + "0milpdaf4nd36kq6sci9wc5dhwswl4w9c9fychfbppgjsgfp6kfv")))) (properties `((upstream-name . "rmarkdown"))) (build-system r-build-system) (propagated-inputs From 50d063b5116a64a4e1643138cbd375320920f89c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Mar 2019 23:41:27 +0100 Subject: [PATCH 422/694] gnu: r-readxl: Update to 1.3.1. * gnu/packages/cran.scm (r-readxl): Update to 1.3.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 7da2ab77b1..6a7ee255ec 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -340,14 +340,14 @@ (define-public r-callr (define-public r-readxl (package (name "r-readxl") - (version "1.3.0") + (version "1.3.1") (source (origin (method url-fetch) (uri (cran-uri "readxl" version)) (sha256 (base32 - "1p7snd8lznyinp0nyg6bsqwn9alh3pnnj77bfg865ingdl1d2yc3")))) + "15mambxr8c7k2ikdfsl1w3vxvm54dsnk0cl1qvks6iig7rql3d14")))) (build-system r-build-system) (propagated-inputs `(("r-cellranger" ,r-cellranger) From f9bc918b81257431aefc044734236ade668adec0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Mar 2019 23:41:48 +0100 Subject: [PATCH 423/694] gnu: r-colorspace: Update to 1.4-1. * gnu/packages/cran.scm (r-colorspace): Update to 1.4-1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 6a7ee255ec..f7f3e91534 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1137,13 +1137,13 @@ (define-public r-abbyyr (define-public r-colorspace (package (name "r-colorspace") - (version "1.4-0") + (version "1.4-1") (source (origin (method url-fetch) (uri (cran-uri "colorspace" version)) (sha256 - (base32 "0mpmvz2sycjp4c9y3v3qin7mdjy812hwi7cyjnblcw6xb1ckq06f")))) + (base32 "0wyny3ah2d74hqv80s6imrarpna09gq3j9rjnz6zx2qg0lx72gb9")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/colorspace") (synopsis "Color space manipulation") From b21eb34776085aecca8c6304fe98b973b24eca46 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Mar 2019 23:42:05 +0100 Subject: [PATCH 424/694] gnu: r-glue: Update to 1.3.1. * gnu/packages/cran.scm (r-glue): Update to 1.3.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index f7f3e91534..c083af3a31 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1157,14 +1157,14 @@ (define-public r-colorspace (define-public r-glue (package (name "r-glue") - (version "1.3.0") + (version "1.3.1") (source (origin (method url-fetch) (uri (cran-uri "glue" version)) (sha256 (base32 - "1vhw5497lpfr4m8lcx9bs0fgdp4ax0sycrk6n8yksp33qd25m7kq")))) + "1a1ycg9r3gd91visp49q49rsrdgyf8kr9dxdy3hk99kikn4z5hag")))) (build-system r-build-system) (home-page "https://github.com/tidyverse/glue") (synopsis "Interpreted string literals") From 06070c03971baa98e0291f8dde61749a52c7fa7d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Mar 2019 23:42:17 +0100 Subject: [PATCH 425/694] gnu: r-rcpp: Update to 1.0.1. * gnu/packages/cran.scm (r-rcpp): Update to 1.0.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c083af3a31..7091900acf 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1327,13 +1327,13 @@ (define-public r-pkgload (define-public r-rcpp (package (name "r-rcpp") - (version "1.0.0") + (version "1.0.1") (source (origin (method url-fetch) (uri (cran-uri "Rcpp" version)) (sha256 - (base32 "1hlbw4k79q9ich4w27b01gsvwrsnrflii8zjlcmgfzm1vpq8ndxp")))) + (base32 "015rmxns8mhmnd9wnz9bmma4iwx2sf4bcwkkp9hcgvdmblzf0vg7")))) (build-system r-build-system) (native-inputs `(("r-knitr" ,r-knitr))) ; for vignettes From 739135b2be994bc464353c91252708afe63cb130 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Mar 2019 23:42:34 +0100 Subject: [PATCH 426/694] gnu: r-lmoments: Update to 1.3-1. * gnu/packages/cran.scm (r-lmoments): Update to 1.3-1. [propagated-inputs]: Add r-rcpp and r-rcpparmadillo. --- gnu/packages/cran.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 7091900acf..f048a7f6e3 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1874,16 +1874,19 @@ (define-public r-rmpi (define-public r-lmoments (package (name "r-lmoments") - (version "1.2-3") + (version "1.3-1") (source (origin (method url-fetch) (uri (cran-uri "Lmoments" version)) (sha256 (base32 - "13p0r4w16jvjnyjmkhkp3dwdfr1gap2l0k4k5jy41m8nc5fvcx79")))) + "0pc63bj9a8hzr5m3yssrc4kin39fffwkl8rggs3sagzr12d4i7bw")))) (properties `((upstream-name . "Lmoments"))) (build-system r-build-system) + (propagated-inputs + `(("r-rcpp" ,r-rcpp) + ("r-rcpparmadillo" ,r-rcpparmadillo))) (home-page "http://www.tilastotiede.fi/juha_karvanen.html") (synopsis "L-moments and quantile mixtures") (description From 5275f9d7f9307911c8228c199e232dcccfb89c18 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Mar 2019 23:43:02 +0100 Subject: [PATCH 427/694] gnu: r-ordinal: Update to 2019.3-9. * gnu/packages/cran.scm (r-ordinal): Update to 2019.3-9. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index f048a7f6e3..d03ced9b17 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2863,14 +2863,14 @@ (define-public r-ucminf (define-public r-ordinal (package (name "r-ordinal") - (version "2018.8-25") + (version "2019.3-9") (source (origin (method url-fetch) (uri (cran-uri "ordinal" version)) (sha256 (base32 - "03cv9hcrw8j3lhamzhz8sk2p3ns4cw9z41x49h301k2b3pajv43h")))) + "0xsr2715ghh1q5hjnx7d8lyavzfvpi370blm1xdljn3p4kar8ldi")))) (build-system r-build-system) (propagated-inputs `(("r-mass" ,r-mass) From 78e29738273f0e4edde4e32f63f5279a3b1851b7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Mar 2019 23:43:26 +0100 Subject: [PATCH 428/694] gnu: r-cli: Update to 1.1.0. * gnu/packages/cran.scm (r-cli): Update to 1.1.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index d03ced9b17..2c058f41c0 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3402,14 +3402,14 @@ (define-public r-ggjoy (define-public r-cli (package (name "r-cli") - (version "1.0.1") + (version "1.1.0") (source (origin (method url-fetch) (uri (cran-uri "cli" version)) (sha256 (base32 - "1r2yih4c0bdmbx0qrarlf0m1p5z30sri755zmdazsq2pw76zp07g")))) + "02hdwvdq5nic6dhxj88jbgsc9m8yrz3yibigg6szkggxyk6hzh2g")))) (build-system r-build-system) (propagated-inputs `(("r-assertthat" ,r-assertthat) From 76cbfb5ad5c13cde8f0defc46c275066ce44961f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Mar 2019 23:43:42 +0100 Subject: [PATCH 429/694] gnu: r-processx: Update to 3.3.0. * gnu/packages/cran.scm (r-processx): Update to 3.3.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 2c058f41c0..65b4caab43 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3465,14 +3465,14 @@ (define-public r-debugme (define-public r-processx (package (name "r-processx") - (version "3.2.1") + (version "3.3.0") (source (origin (method url-fetch) (uri (cran-uri "processx" version)) (sha256 (base32 - "1skjyi767avc3safajlj3ikk9lf11zzyjybdcmx8m9y59rf319ql")))) + "0ipdcl4080z92jdnd1w4hm4w484spxcrp6j5x9p76ksb401qdca1")))) (build-system r-build-system) (propagated-inputs `(("r-ps" ,r-ps) From 35fe7882a8b994acba6bfb3d1b2df9b498e35cff Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Mar 2019 23:43:56 +0100 Subject: [PATCH 430/694] gnu: r-tinytex: Update to 0.11. * gnu/packages/cran.scm (r-tinytex): Update to 0.11. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 65b4caab43..f2625df478 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3697,14 +3697,14 @@ (define-public r-uuid (define-public r-tinytex (package (name "r-tinytex") - (version "0.10") + (version "0.11") (source (origin (method url-fetch) (uri (cran-uri "tinytex" version)) (sha256 (base32 - "02bz8zaka5j51zin976n5nmk19a0390d0gwgj4zrbh48hl313rqm")))) + "017g0niwmx8qafsn9b01gp60j5fgwxch0dnkmjgpxxr1k4h1r64x")))) (build-system r-build-system) (propagated-inputs `(("r-xfun" ,r-xfun))) From e469e10e20c0d5356645a607489df98219827816 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Mar 2019 23:44:11 +0100 Subject: [PATCH 431/694] gnu: r-zip: Update to 2.0.1. * gnu/packages/cran.scm (r-zip): Update to 2.0.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index f2625df478..d619f69d7a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4886,14 +4886,14 @@ (define-public r-abc (define-public r-zip (package (name "r-zip") - (version "2.0.0") + (version "2.0.1") (source (origin (method url-fetch) (uri (cran-uri "zip" version)) (sha256 (base32 - "0a86x6a2cy0lkx98yljk9acb6q3ksz9y5acfaqnmbvnn77pibg86")))) + "0cchbzp2s2qz7r4n9qdwgfgik5xzr0dzxmj25r8435i85k86ysi1")))) (build-system r-build-system) (home-page "https://github.com/gaborcsardi/zip") (synopsis "Cross-platform Zip compression") From c17ee12cf718cb28ce8f8d987cdb0022af21564d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Mar 2019 23:44:57 +0100 Subject: [PATCH 432/694] gnu: r-robustbase: Update to 0.93-4. * gnu/packages/statistics.scm (r-robustbase): Update to 0.93-4. [inputs]: Move gfortran from here... [native-inputs]: ...to here. --- gnu/packages/statistics.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index a750fccb3e..546fbc1f2a 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4800,16 +4800,16 @@ (define-public r-deoptimr (define-public r-robustbase (package (name "r-robustbase") - (version "0.93-3") + (version "0.93-4") (source (origin (method url-fetch) (uri (cran-uri "robustbase" version)) (sha256 (base32 - "1nqh1qg1qd1qrxl1w585dqx7ql55qzjny1r4f9hqxpwd7lml07cc")))) + "1q56y0iqp7qhavm4xnpzhs64q7l893y7yiq3b20fllpghka077pa")))) (build-system r-build-system) - (inputs + (native-inputs `(("gfortran" ,gfortran))) (propagated-inputs `(("r-deoptimr" ,r-deoptimr))) From 08859c8d27dd2487131a192073183dec4b814b31 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Mar 2019 23:45:22 +0100 Subject: [PATCH 433/694] gnu: r-mclust: Update to 5.4.3. * gnu/packages/statistics.scm (r-mclust): Update to 5.4.3. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 546fbc1f2a..58accb6dd6 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4730,14 +4730,14 @@ (define-public r-flexmix (define-public r-mclust (package (name "r-mclust") - (version "5.4.2") + (version "5.4.3") (source (origin (method url-fetch) (uri (cran-uri "mclust" version)) (sha256 (base32 - "09152swfpa3fzhmrq5cwb5kxgvrxvigv1m4v6rhcibrdhfd1x8x4")))) + "18x5ych9zi3y87rxi4pf6f23sl2918dp9xxpw1pqa7p7drw817p6")))) (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran))) From 6720b378106a99a32eda5a9dfd376050cf47d35c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Mar 2019 23:45:36 +0100 Subject: [PATCH 434/694] gnu: r-purrr: Update to 0.3.2. * gnu/packages/statistics.scm (r-purrr): Update to 0.3.2. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 58accb6dd6..ccff2da1b6 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3782,14 +3782,14 @@ (define-public r-hexbin (define-public r-purrr (package (name "r-purrr") - (version "0.3.1") + (version "0.3.2") (source (origin (method url-fetch) (uri (cran-uri "purrr" version)) (sha256 (base32 - "0fw8nyrwf009fpj3457binw5s02si226yrvn96hdivwj268ck8y2")))) + "0ccs78a2ylr60f3z0f7iywi8h1pwr8mz4ga78bs4pwgnwkclvir7")))) (build-system r-build-system) (propagated-inputs `(("r-magrittr" ,r-magrittr) From fc82a8f577f986a8cc65818f6cb4de0a0feb71cc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Mar 2019 23:45:52 +0100 Subject: [PATCH 435/694] gnu: r-e1071: Update to 1.7-1. * gnu/packages/statistics.scm (r-e1071): Update to 1.7-1. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index ccff2da1b6..dc47ea1e45 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3347,14 +3347,14 @@ (define-public r-rtsne (define-public r-e1071 (package (name "r-e1071") - (version "1.7-0.1") + (version "1.7-1") (source (origin (method url-fetch) (uri (cran-uri "e1071" version)) (sha256 (base32 - "11fqm4shmksalkazcwvzfknp3amigw7fr8wdwanqa5v5kx7ihyq9")))) + "1zlxz3da216q6v6r4ff60il121xwz7g7m639vzdwglhw3jjh8psw")))) (build-system r-build-system) (propagated-inputs `(("r-class" ,r-class))) From 5ccf16c746091c141e3c96daaf27336dfba8adff Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Mar 2019 23:46:22 +0100 Subject: [PATCH 436/694] gnu: r-msir: Update to 1.3.2. * gnu/packages/cran.scm (r-msir): Update to 1.3.2. [propagated-inputs]: Remove r-rgl. --- gnu/packages/cran.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index d619f69d7a..6c81ba6b28 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -11386,18 +11386,17 @@ (define-public r-moments (define-public r-msir (package (name "r-msir") - (version "1.3.1") + (version "1.3.2") (source (origin (method url-fetch) (uri (cran-uri "msir" version)) (sha256 (base32 - "1ipzgdffsqly3dp91pw7yp3h5cwn08l9qsj7cdmrykd42jc98950")))) + "0pvc3q162vqq3k39nni732x05zzfz4y9y2zf56d83185ypszv9kb")))) (build-system r-build-system) (propagated-inputs - `(("r-mclust" ,r-mclust) - ("r-rgl" ,r-rgl))) + `(("r-mclust" ,r-mclust))) (home-page "https://cran.r-project.org/web/packages/msir") (synopsis "Model-based sliced inverse regression") (description From 1a38c31456940825e5f104b1a2ae3e4d37945138 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Mar 2019 23:46:45 +0100 Subject: [PATCH 437/694] gnu: r-future: Update to 1.12.0. * gnu/packages/cran.scm (r-future): Update to 1.12.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 6c81ba6b28..41be921a9c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -10755,14 +10755,14 @@ (define-public r-globals (define-public r-future (package (name "r-future") - (version "1.11.1.1") + (version "1.12.0") (source (origin (method url-fetch) (uri (cran-uri "future" version)) (sha256 (base32 - "1s4lyqg4mm1drzc6czaalmhmxfjgp4nznb14ql5xzny9rprgz43i")))) + "12hq7hsfydlscwrb37ns9a8561bzpsp82nn7jrcyj0ydk610nipm")))) (build-system r-build-system) (propagated-inputs `(("r-digest" ,r-digest) From 7e6c5ebbead7efb4fb4e1b1200fdfaabadec3c03 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Mar 2019 23:48:50 +0100 Subject: [PATCH 438/694] gnu: r-gamlss-dist: Update to 5.1-3. * gnu/packages/cran.scm (r-gamlss-dist): Update to 5.1-3. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 41be921a9c..1182c0e99d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -11177,14 +11177,14 @@ (define-public r-drimpute (define-public r-gamlss-dist (package (name "r-gamlss-dist") - (version "5.1-1") + (version "5.1-3") (source (origin (method url-fetch) (uri (cran-uri "gamlss.dist" version)) (sha256 (base32 - "1cd0vl9klcb849i8xwyjm8ihb1da92631j1rxdbnflgffkzrkya4")))) + "0154pm1f3g77krj0gxh9icz207pshdrxihb6gjv1k5aph8y69zc7")))) (properties `((upstream-name . "gamlss.dist"))) (build-system r-build-system) (propagated-inputs `(("r-mass" ,r-mass))) From ae7e6f06207e084cfb747c47c60aa589467cad2b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Mar 2019 23:49:20 +0100 Subject: [PATCH 439/694] gnu: r-mcmc: Update to 0.9-6. * gnu/packages/cran.scm (r-mcmc): Update to 0.9-6. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 1182c0e99d..ff8c6c934b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -10684,14 +10684,14 @@ (define-public r-parcor (define-public r-mcmc (package (name "r-mcmc") - (version "0.9-5") + (version "0.9-6") (source (origin (method url-fetch) (uri (cran-uri "mcmc" version)) (sha256 (base32 - "1i3rahph8pbhi5dsyjnkazqklg4lhh3azlyvx4kvabx50q0awxn6")))) + "1fc6a6asn53lx7x7pnlb5mb716nv4pcmbp99f1i30y4hzygihfj4")))) (build-system r-build-system) (home-page "http://www.stat.umn.edu/geyer/mcmc/") (synopsis "Markov chain Monte Carlo") From 83bfddd1b0f4dd2ebcb9511ef98441aee32b5f60 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Mar 2019 23:50:46 +0100 Subject: [PATCH 440/694] gnu: r-gmp: Update to 0.5-13.5. * gnu/packages/cran.scm (r-gmp): Update to 0.5-13.5. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index ff8c6c934b..940f510148 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -9755,14 +9755,14 @@ (define-public r-bigrquery (define-public r-gmp (package (name "r-gmp") - (version "0.5-13.4") + (version "0.5-13.5") (source (origin (method url-fetch) (uri (cran-uri "gmp" version)) (sha256 (base32 - "15jifzwbzqcnq2apzvsylkx4k9lillkgblm4wf4wb7y31ys0amph")))) + "042mzsl6z6s61fy5m21yf9q83l08vnyqljn4iax7kqyiycpsp0gn")))) (build-system r-build-system) (arguments '(#:phases From 5e16dff99c346e03e77f0ea9560f7499e85040ee Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Mar 2019 23:51:42 +0100 Subject: [PATCH 441/694] gnu: r-sjlabelled: Update to 1.0.17. * gnu/packages/cran.scm (r-sjlabelled): Update to 1.0.17. [propagated-inputs]: Remove r-broom, r-prediction, and r-snakecase; add r-insight. --- gnu/packages/cran.scm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 940f510148..72d8749919 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5842,24 +5842,22 @@ (define-public r-insight (define-public r-sjlabelled (package (name "r-sjlabelled") - (version "1.0.16") + (version "1.0.17") (source (origin (method url-fetch) (uri (cran-uri "sjlabelled" version)) (sha256 (base32 - "1zi1ncna16zl9hcy7mzara4kjxqkgwcw9ncp388ss353wwc9y2nc")))) + "00c0c22ynpihgf2bvmcfnkvqwqvxax2zzb7wldsmg2f7z5a32aa6")))) (build-system r-build-system) (propagated-inputs - `(("r-broom" ,r-broom) - ("r-dplyr" ,r-dplyr) + `(("r-dplyr" ,r-dplyr) ("r-haven" ,r-haven) + ("r-insight" ,r-insight) ("r-magrittr" ,r-magrittr) - ("r-prediction" ,r-prediction) ("r-purrr" ,r-purrr) - ("r-rlang" ,r-rlang) - ("r-snakecase" ,r-snakecase))) + ("r-rlang" ,r-rlang))) (home-page "https://github.com/strengejacke/sjlabelled") (synopsis "Labelled data utility functions") (description From 1adcbeda5fe05c0aed1990e0313af1e21e56ebc8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Mar 2019 23:52:29 +0100 Subject: [PATCH 442/694] gnu: r-ncdf4: Update to 1.16.1. * gnu/packages/cran.scm (r-ncdf4): Update to 1.16.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 72d8749919..fbdb992ca4 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8491,14 +8491,14 @@ (define-public r-rcppannoy (define-public r-ncdf4 (package (name "r-ncdf4") - (version "1.16") + (version "1.16.1") (source (origin (method url-fetch) (uri (cran-uri "ncdf4" version)) (sha256 (base32 - "0lwjjis0b83c4l3xvqai4ckzrskd6mychck1iwxcxgjvh0d77mgd")))) + "083sb24anyd4sw0il3x07pqn9rbx5y5ayqass6mz8x443rnjvphd")))) (build-system r-build-system) (inputs `(("netcdf" ,netcdf) From 31af2e7f92acf0e2b992d1784103a08a2debf69e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Mar 2019 23:52:47 +0100 Subject: [PATCH 443/694] gnu: r-sjmisc: Update to 2.7.9. * gnu/packages/cran.scm (r-sjmisc): Update to 2.7.9. [propagated-inputs]: Remove r-broom, r-crayon, r-stringdist, r-stringr, and r-tidyr. --- gnu/packages/cran.scm | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index fbdb992ca4..ccb0d74cab 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5871,27 +5871,22 @@ (define-public r-sjlabelled (define-public r-sjmisc (package (name "r-sjmisc") - (version "2.7.7") + (version "2.7.9") (source (origin (method url-fetch) (uri (cran-uri "sjmisc" version)) (sha256 (base32 - "0xm9pmq17maivmjsygwx3bdjd71hf829qbx735hyxa69z9dhp24q")))) + "11iiap0w5v0dszgwx4pi3j1zf9vnlw1ml1wjvq1hg9iz1plgbfnc")))) (build-system r-build-system) (propagated-inputs - `(("r-broom" ,r-broom) - ("r-crayon" ,r-crayon) - ("r-dplyr" ,r-dplyr) + `(("r-dplyr" ,r-dplyr) ("r-haven" ,r-haven) ("r-magrittr" ,r-magrittr) ("r-purrr" ,r-purrr) ("r-rlang" ,r-rlang) - ("r-sjlabelled" ,r-sjlabelled) - ("r-stringdist" ,r-stringdist) - ("r-stringr" ,r-stringr) - ("r-tidyr" ,r-tidyr))) + ("r-sjlabelled" ,r-sjlabelled))) (home-page "https://github.com/strengejacke/sjmisc") (synopsis "Data and variable transformation functions") (description From fcb8456577e5ff438885f8775a03ba841e28eef6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Mar 2019 23:53:37 +0100 Subject: [PATCH 444/694] gnu: r-findpython: Update to 1.0.5. * gnu/packages/cran.scm (r-findpython): Update to 1.0.5. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index ccb0d74cab..78ddd611a2 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6077,14 +6077,14 @@ (define-public r-getopt (define-public r-findpython (package (name "r-findpython") - (version "1.0.4") + (version "1.0.5") (source (origin (method url-fetch) (uri (cran-uri "findpython" version)) (sha256 (base32 - "1zfcdcp4d48d2pzf5n59kqrfk2z9nnyzkx5j00gfmgfkadnv93x5")))) + "0icifm4z6hhpmcjrg75a875iph0ci890ss02kdv3725pijc236iy")))) (build-system r-build-system) (home-page "https://github.com/trevorld/findpython") (synopsis "Functions to find an acceptable Python binary") From 37317189a7de4db181d22be8925bb501cd5b10c7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Mar 2019 23:53:59 +0100 Subject: [PATCH 445/694] gnu: r-argparse: Update to 2.0.1. * gnu/packages/cran.scm (r-argparse): Update to 2.0.1. [propagated-inputs]: Remove r-getopt. --- gnu/packages/cran.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 78ddd611a2..9364a515f9 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6097,19 +6097,18 @@ (define-public r-findpython (define-public r-argparse (package (name "r-argparse") - (version "2.0.0") + (version "2.0.1") (source (origin (method url-fetch) (uri (cran-uri "argparse" version)) (sha256 (base32 - "1qrp7hc8sm6ryw0zws76al865ansig1xbx8ljxz4wabh60msrz3i")))) + "1as7h6z7kzgv0fqzpnp76qbm96b4jcd37azd58b7rz0l1n94764l")))) (build-system r-build-system) (inputs `(("python" ,python))) (propagated-inputs `(("r-findpython" ,r-findpython) - ("r-getopt" ,r-getopt) ("r-jsonlite" ,r-jsonlite) ("r-r6" ,r-r6))) (home-page "https://github.com/trevorld/argparse") From 8aef1ea6fd8689fa94b6a6debb66a94a2fbaf3af Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Mar 2019 23:54:34 +0100 Subject: [PATCH 446/694] gnu: r-rgl: Update to 0.100.19. * gnu/packages/cran.scm (r-rgl): Update to 0.100.19. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 9364a515f9..8f44593e4a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8532,14 +8532,14 @@ (define-public r-biocmanager (define-public r-rgl (package (name "r-rgl") - (version "0.99.16") + (version "0.100.19") (source (origin (method url-fetch) (uri (cran-uri "rgl" version)) (sha256 (base32 - "0q8sg8fr0140ilssqhscaxkjc29w1rpp6f4k50amw3zzs9g58ak9")))) + "09bhvx8aq104yzysfgd7wlnq4vrvmnd4jzgj0c32whjfal10fqsh")))) (build-system r-build-system) (native-inputs `(("pkg-config" ,pkg-config))) From 20b375ecd84f2867b28470c987aa3dd65edbf456 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Mar 2019 23:54:46 +0100 Subject: [PATCH 447/694] gnu: r-huge: Update to 1.3.1. * gnu/packages/cran.scm (r-huge): Update to 1.3.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 8f44593e4a..8b83bc4a0a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -10623,14 +10623,14 @@ (define-public r-ppls (define-public r-huge (package (name "r-huge") - (version "1.3.0") + (version "1.3.1") (source (origin (method url-fetch) (uri (cran-uri "huge" version)) (sha256 (base32 - "18psr7arynax38hcc5y9dxskhsg4a5zjw3hjbgf96zy59wdib5ch")))) + "06s22i2cdn6g2r8kq5csyspinayh8dxxg9gkwcf4sa1lmrgb0bf9")))) (build-system r-build-system) (propagated-inputs `(("r-igraph" ,r-igraph) From a3daf011cca786cf4b9cc9048af83ac81d8a8ea7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Mar 2019 23:55:11 +0100 Subject: [PATCH 448/694] gnu: r-proc: Update to 1.14.0. * gnu/packages/cran.scm (r-proc): Update to 1.14.0. [propagated-inputs]: Remove r-ggplot2. --- gnu/packages/cran.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 8b83bc4a0a..a178c8f33b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6273,19 +6273,18 @@ (define-public r-blockfest (define-public r-proc (package (name "r-proc") - (version "1.13.0") + (version "1.14.0") (source (origin (method url-fetch) (uri (cran-uri "pROC" version)) (sha256 (base32 - "0ain17clympkx09ym7gydylcd93096dxzqx1qzci310yq2l7fknm")))) + "0ki1pvj5iaki81crapvwqllg5avn5qlvv62axnsdkdcmv9xc3wg0")))) (properties `((upstream-name . "pROC"))) (build-system r-build-system) (propagated-inputs - `(("r-ggplot2" ,r-ggplot2) - ("r-plyr" ,r-plyr) + `(("r-plyr" ,r-plyr) ("r-rcpp" ,r-rcpp))) (home-page "http://expasy.org/tools/pROC/") (synopsis "Display and analyze ROC curves") From fef93da89d1bea017b6ea8d3388bf29c3271b9fc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Mar 2019 23:59:07 +0100 Subject: [PATCH 449/694] gnu: r-ggeffects: Update to 0.9.0. * gnu/packages/cran.scm (r-ggeffects): Update to 0.9.0. [propagated-inputs]: Remove r-crayon, r-ggplot2, r-lme4, r-prediction, r-sjstats, r-tidyr; add r-insight. --- gnu/packages/cran.scm | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a178c8f33b..e8f55900e7 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7811,30 +7811,25 @@ (define-public r-glmmtmb (define-public r-ggeffects (package (name "r-ggeffects") - (version "0.8.0") + (version "0.9.0") (source (origin (method url-fetch) (uri (cran-uri "ggeffects" version)) (sha256 (base32 - "152xyadj5m171z7dlzzy40y1fp2l9v46525dlw2al3qr0b7zpm61")))) + "1bbr44yk1j8pz4kcbw1cqrzcnbih9n6rsgf96a6py5094qcal2qd")))) (build-system r-build-system) (propagated-inputs - `(("r-crayon" ,r-crayon) - ("r-dplyr" ,r-dplyr) - ("r-ggplot2" ,r-ggplot2) - ("r-lme4" ,r-lme4) + `(("r-dplyr" ,r-dplyr) + ("r-insight" ,r-insight) ("r-magrittr" ,r-magrittr) ("r-mass" ,r-mass) - ("r-prediction" ,r-prediction) ("r-purrr" ,r-purrr) ("r-rlang" ,r-rlang) ("r-scales" ,r-scales) ("r-sjlabelled" ,r-sjlabelled) - ("r-sjmisc" ,r-sjmisc) - ("r-sjstats" ,r-sjstats) - ("r-tidyr" ,r-tidyr))) + ("r-sjmisc" ,r-sjmisc))) (home-page "https://github.com/strengejacke/ggeffects") (synopsis "Create tidy data frames of marginal effects for ggplot") (description From c9ba1155a2ea8bf5010ef37475a2717e5c5f0ad1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 21 Mar 2019 00:00:09 +0100 Subject: [PATCH 450/694] gnu: r-fs: Update to 1.2.7. * gnu/packages/cran.scm (r-fs): Update to 1.2.7. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index e8f55900e7..a9545e4f09 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7935,14 +7935,14 @@ (define-public r-gh (define-public r-fs (package (name "r-fs") - (version "1.2.6") + (version "1.2.7") (source (origin (method url-fetch) (uri (cran-uri "fs" version)) (sha256 (base32 - "0kqqaqqml8x3r1mdld40iwns0ylj2f52qsdh1vcn39f7w7c2ka8j")))) + "03aq2ill03ladsa4438nrz213ks2mqhxsrb9fjsp62bhk36v8k1a")))) (build-system r-build-system) (propagated-inputs `(("r-rcpp" ,r-rcpp))) From f69ba00f09baf3e60574419d8b995141ad5cbaf1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 21 Mar 2019 00:00:29 +0100 Subject: [PATCH 451/694] gnu: r-coin: Update to 1.3-0. * gnu/packages/cran.scm (r-coin): Update to 1.3-0. [propagated-inputs]: Add r-libcoin and r-matrixstats. --- gnu/packages/cran.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a9545e4f09..fddcdff170 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7649,17 +7649,19 @@ (define-public r-libcoin (define-public r-coin (package (name "r-coin") - (version "1.2-2") + (version "1.3-0") (source (origin (method url-fetch) (uri (cran-uri "coin" version)) (sha256 (base32 - "1fq58793bymzig1syjg2lvn6hsxfwkhh00jfrchh3c0y7rfhc66m")))) + "1y0yl4mjaxca0jqz53sv1gcpdg89m099rq61iszxvpx7w0vvpkmd")))) (build-system r-build-system) (propagated-inputs - `(("r-modeltools" ,r-modeltools) + `(("r-libcoin" ,r-libcoin) + ("r-matrixstats" ,r-matrixstats) + ("r-modeltools" ,r-modeltools) ("r-multcomp" ,r-multcomp) ("r-mvtnorm" ,r-mvtnorm) ("r-survival" ,r-survival))) From 9d047572c896f3dd50f7fc30ecd259608977eb2c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 21 Mar 2019 00:00:51 +0100 Subject: [PATCH 452/694] gnu: r-gsl: Update to 2.1-5. * gnu/packages/cran.scm (r-gsl): Update to 2.1-5. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index fddcdff170..f469c9cc3f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8806,14 +8806,14 @@ (define-public r-stabledist (define-public r-gsl (package (name "r-gsl") - (version "1.9-10.3") + (version "2.1-5") (source (origin (method url-fetch) (uri (cran-uri "gsl" version)) (sha256 (base32 - "00isw2iha5af4s7rr8svqka9mkl9l26l8h2rnk4r7fkhh7fc97sg")))) + "18kzgwmyfqg570gn2b33fm6mj87fiaa4a3bx954yrj8iq28im71v")))) (build-system r-build-system) (inputs `(("gsl" ,gsl))) From a7524f70006d24ce5a4400bf1ee13d6747c5b102 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 21 Mar 2019 00:01:05 +0100 Subject: [PATCH 453/694] gnu: r-sjstats: Update to 0.17.4. * gnu/packages/cran.scm (r-sjstats): Update to 0.17.4. [propagated-inputs]: Remove r-bayesplot, r-coin, r-crayon, r-glmmtmb, r-nlme, and r-pwr; add r-insight. --- gnu/packages/cran.scm | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index f469c9cc3f..09050b7a77 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7735,31 +7735,26 @@ (define-public r-tmb (define-public r-sjstats (package (name "r-sjstats") - (version "0.17.3") + (version "0.17.4") (source (origin (method url-fetch) (uri (cran-uri "sjstats" version)) (sha256 (base32 - "02na2pzxp88yp52h7vs959fgydiddmns39m9x4i0vz8fp016bdf8")))) + "012hp9m17xzjnsfvjjz2wdfgxm3irsrfx0zmahfnfmgdrwxd5vk5")))) (build-system r-build-system) (propagated-inputs - `(("r-bayesplot" ,r-bayesplot) - ("r-broom" ,r-broom) - ("r-coin" ,r-coin) - ("r-crayon" ,r-crayon) + `(("r-broom" ,r-broom) ("r-dplyr" ,r-dplyr) ("r-emmeans" ,r-emmeans) - ("r-glmmtmb" ,r-glmmtmb) + ("r-insight" ,r-insight) ("r-lme4" ,r-lme4) ("r-magrittr" ,r-magrittr) ("r-mass" ,r-mass) ("r-matrix" ,r-matrix) ("r-modelr" ,r-modelr) - ("r-nlme" ,r-nlme) ("r-purrr" ,r-purrr) - ("r-pwr" ,r-pwr) ("r-rlang" ,r-rlang) ("r-sjlabelled" ,r-sjlabelled) ("r-sjmisc" ,r-sjmisc) From 6cea61ebb580dee651a73371d20011009ff8905e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 21 Mar 2019 00:02:10 +0100 Subject: [PATCH 454/694] gnu: r-spam: Update to 2.2-2. * gnu/packages/cran.scm (r-spam): Update to 2.2-2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 09050b7a77..c6afcddeba 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -10229,14 +10229,14 @@ (define-public r-dotcall64 (define-public r-spam (package (name "r-spam") - (version "2.2-1") + (version "2.2-2") (source (origin (method url-fetch) (uri (cran-uri "spam" version)) (sha256 (base32 - "04bfwwna013hrbl4k6w1cdiz5bkc83jlasivriyn5l9gkj2qskr2")))) + "024dgfnjfxvsiymbzrhadinamj6qy509f4sbd1zxql8ymkyxn7vi")))) (build-system r-build-system) (propagated-inputs `(("r-dotcall64" ,r-dotcall64))) From f86d56a7af048029268ce1004eeedeba543855f5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 Mar 2019 00:20:48 +0100 Subject: [PATCH 455/694] gnu: terraform-docs: Update to 0.6.0. * gnu/packages/terraform.scm (terraform-docs): Update to 0.6.0. --- gnu/packages/terraform.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/terraform.scm b/gnu/packages/terraform.scm index f14b152fdb..b9313bbd4a 100644 --- a/gnu/packages/terraform.scm +++ b/gnu/packages/terraform.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Christopher Baines -;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,7 +27,7 @@ (define-module (gnu packages terraform) (define-public terraform-docs (package (name "terraform-docs") - (version "0.5.0") + (version "0.6.0") (source (origin (method git-fetch) (uri (git-reference @@ -36,7 +36,7 @@ (define-public terraform-docs (file-name (git-file-name name version)) (sha256 (base32 - "12w2yr669hk5kxdb9rrzsn8hwvx8rzrc1rmn8hs9l8z1bkfhr4gg")))) + "1p6prhjf82qnhf1zwl9h92j4ds5g383a6g9pwwnqbc3wdwy5zx7d")))) (build-system go-build-system) (arguments '(#:import-path "github.com/segmentio/terraform-docs")) From a1cb69280c7a786d505279f7a3632cae31d0f417 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 Mar 2019 00:26:05 +0100 Subject: [PATCH 456/694] gnu: kakoune: Don't use NAME in source URI. * gnu/packages/text-editors.scm (kakoune)[source]: Hard-code NAME. --- gnu/packages/text-editors.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index b96f8235d4..15a1b117af 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -111,7 +111,7 @@ (define-public kakoune (method url-fetch) (uri (string-append "https://github.com/mawww/kakoune/" "releases/download/v" version "/" - name "-" version ".tar.bz2")) + "kakoune-" version ".tar.bz2")) (sha256 (base32 "1qbj2hmcfs6pr5lc78z9ni5zxdyp3mr64dvms4l52716ikqcjcbs")))) From 98e7307dd3c47a836383880d30a6d8c8ae1b84ee Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 Mar 2019 00:26:14 +0100 Subject: [PATCH 457/694] gnu: kakoune: Update to 2019.01.20. * gnu/packages/text-editors.scm (kakoune): Update to 2019.01.20. --- gnu/packages/text-editors.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 15a1b117af..473c259f20 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 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2019 Efraim Flashner ;;; ;;; This file is part of GNU Guix. @@ -105,7 +105,7 @@ (define-public vis (define-public kakoune (package (name "kakoune") - (version "2018.09.04") + (version "2019.01.20") (source (origin (method url-fetch) @@ -113,8 +113,7 @@ (define-public kakoune "releases/download/v" version "/" "kakoune-" version ".tar.bz2")) (sha256 - (base32 - "1qbj2hmcfs6pr5lc78z9ni5zxdyp3mr64dvms4l52716ikqcjcbs")))) + (base32 "15drk7i17qdiqxqkjxhrxfclryj9qzb5ymxd20dwl05y4yi064cr")))) (build-system gnu-build-system) (arguments `(#:make-flags From 58ab7f29615315ff09adc0fc347d1af141775811 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 Mar 2019 01:11:30 +0100 Subject: [PATCH 458/694] gnu: ghostwriter: Update to 1.7.4. * gnu/packages/text-editors.scm (ghostwriter): Update to 1.7.4. --- gnu/packages/text-editors.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 473c259f20..534934dfd1 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -297,7 +297,7 @@ (define-public mg (define-public ghostwriter (package (name "ghostwriter") - (version "1.6.2") + (version "1.7.4") (source (origin (method git-fetch) (uri (git-reference @@ -306,11 +306,11 @@ (define-public ghostwriter (file-name (git-file-name name version)) (sha256 (base32 - "0251563zy0q69fzfacvalpx43y15cshb0bhshyd4w37061gh1c12")))) + "1pqlr08z5syqcq5p282asxwzrrm7c1w94baxyb467swh8yp3fj5m")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) - ("qttools" ,qttools))) ;for lrelease + ("qttools" ,qttools))) ; for lrelease (inputs `(("hunspell" ,hunspell) ("qtbase" ,qtbase) @@ -344,7 +344,7 @@ (define-public ghostwriter (description "@code{ghostwriter} provides a relaxing, distraction-free writing environment with Markdown markup.") - (license license:gpl3+))) ;icons/* under CC-BY-SA3 + (license license:gpl3+))) ; icons/* under CC-BY-SA3 (define-public editorconfig-core-c (package From e6b244a588ee69ca27dd54236728e0656f1326b6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 Mar 2019 02:24:51 +0100 Subject: [PATCH 459/694] gnu: plantuml: Update to 1.2019.3. * gnu/packages/uml.scm (plantuml): Update to 1.2019.3. --- gnu/packages/uml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/uml.scm b/gnu/packages/uml.scm index b4c9629769..4e8a580757 100644 --- a/gnu/packages/uml.scm +++ b/gnu/packages/uml.scm @@ -30,14 +30,14 @@ (define-module (gnu packages uml) (define-public plantuml (package (name "plantuml") - (version "1.2019.2") + (version "1.2019.3") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/plantuml/" version "/plantuml-" version ".tar.gz")) (sha256 (base32 - "0hqj2crf6yg40naiwlnnym4c6r0wbz5vr8729z0daggnyg8vqniz")))) + "0p2mqav0qfc6kmkhb2n1vjysffnvpsx4yal68nl0yrh5vd3bnmza")))) (build-system ant-build-system) (arguments `(#:tests? #f ; no tests From ad1acb81117456fe74915fcbbccdb83a3086fb17 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 Mar 2019 02:54:03 +0100 Subject: [PATCH 460/694] gnu: python-pyro4: Update to 4.75. * gnu/packages/python-xyz.scm (python-pyro4): Update to 4.75. --- 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 3ffe57aa15..10ce94a237 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13374,14 +13374,13 @@ (define-public python2-semver (define-public python-pyro4 (package (name "python-pyro4") - (version "4.74") + (version "4.75") (source (origin (method url-fetch) (uri (pypi-uri "Pyro4" version)) (sha256 - (base32 - "0pzp7c6q3vvkxq0wy9lr6wd5wky40sajz69g697i5rb2q497pvc9")))) + (base32 "1dfpp36imddx19yv0kd28gk1l71ckhpqy6jd590wpm2680jw15rq")))) (build-system python-build-system) (propagated-inputs `(("python-serpent" ,python-serpent))) From 91b61f0291c67bab70335288315944d4040c2a20 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 Mar 2019 02:54:54 +0100 Subject: [PATCH 461/694] gnu: python-latexcodec: Update to 1.0.6. * gnu/packages/python-xyz.scm (python-latexcodec): Update to 1.0.6. --- 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 10ce94a237..238a5e9176 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14044,14 +14044,13 @@ (define-public python2-more-itertools (define-public python-latexcodec (package (name "python-latexcodec") - (version "1.0.5") + (version "1.0.6") (source (origin (method url-fetch) (uri (pypi-uri "latexcodec" version)) (sha256 - (base32 - "0zdd1gf24i83ykadx0y30n3001j43scqr2saql3vckk5c39dj1wn")))) + (base32 "0s4wdbg0w2l8pj3i0y4510i0s04p8nhxcsa2z41bjsv0k66npb81")))) (build-system python-build-system) (inputs `(("python-six" ,python-six))) From bd300261af3c2e3932a12f833ec4c5ef5804125a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 Mar 2019 02:55:04 +0100 Subject: [PATCH 462/694] gnu: python-python-gast: Update to 0.2.2. * gnu/packages/python-xyz.scm (python-python-gast): Update to 0.2.2. --- 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 238a5e9176..78453b2974 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15104,14 +15104,13 @@ (define-public python-astunparse (define-public python-gast (package (name "python-gast") - (version "0.2.0") + (version "0.2.2") (source (origin (method url-fetch) (uri (pypi-uri "gast" version)) (sha256 - (base32 - "0c296xm1vz9x4w4inmdl0k8mnc0i9arw94si2i7pglpc461r0s3h")))) + (base32 "1w5dzdb3gpcfmd2s0b93d8gff40a1s41rv31458z14inb3s9v4zy")))) (build-system python-build-system) (propagated-inputs `(("python-astunparse" ,python-astunparse))) From 309f340879122f8081e9a099b98b0fc1758a077b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 Mar 2019 03:42:22 +0100 Subject: [PATCH 463/694] gnu: libmatroska: Don't use NAME in source URI. * gnu/packages/video.scm (libmatroska)[source]: Hard-code NAME. --- gnu/packages/video.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 51c030aa44..7b59a68c13 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -675,7 +675,7 @@ (define-public libmatroska (origin (method url-fetch) (uri (string-append "https://dl.matroska.org/downloads/" - name "/" name "-" version ".tar.xz")) + "libmatroska/libmatroska-" version ".tar.xz")) (sha256 (base32 "1j4mjzx6mjzfjf9hz8g4w84krf5jccmr5cyynll0j1vwv3aiv9iq")))) From 04ef07fecb03f213a09d365aac2b793e62a90943 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 Mar 2019 03:42:28 +0100 Subject: [PATCH 464/694] gnu: libmatroska: Update to 1.5.0. * gnu/packages/video.scm (libmatroska): Update to 1.5.0. --- gnu/packages/video.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 7b59a68c13..dc277de518 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -670,15 +670,14 @@ (define-public libdv (define-public libmatroska (package (name "libmatroska") - (version "1.4.9") + (version "1.5.0") (source (origin (method url-fetch) (uri (string-append "https://dl.matroska.org/downloads/" "libmatroska/libmatroska-" version ".tar.xz")) (sha256 - (base32 - "1j4mjzx6mjzfjf9hz8g4w84krf5jccmr5cyynll0j1vwv3aiv9iq")))) + (base32 "07md2gvy3x92ym2k449740mdji6mhknlajkndnhi507s4wcdrvzh")))) (build-system cmake-build-system) (inputs `(("libebml" ,libebml))) From 22468de49420d94b3956385d083051799eae60fc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 Mar 2019 03:42:49 +0100 Subject: [PATCH 465/694] gnu: ruby-activemodel: Update to 5.2.2.1. * gnu/packages/rails.scm (ruby-activemodel): Update to 5.2.2.1. --- gnu/packages/rails.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/rails.scm b/gnu/packages/rails.scm index 754539f546..0a1c998c72 100644 --- a/gnu/packages/rails.scm +++ b/gnu/packages/rails.scm @@ -98,14 +98,14 @@ (define-public ruby-debug-inspector (define-public ruby-activemodel (package (name "ruby-activemodel") - (version "5.2.2") + (version "5.2.2.1") (source (origin (method url-fetch) (uri (rubygems-uri "activemodel" version)) (sha256 (base32 - "1xmwi3mw8g4shbjvkhk72ra3r5jccbdsd4piphqka2y1h8s7sxvi")))) + "1idmvqvpgri34k31s44pjb88rc3jad3yxra7fd1kpidpnv5f3v65")))) (build-system ruby-build-system) (arguments '(;; No included tests From 0fb8ed1734d6104a0adfd7f6f7c4fe3f385e311d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 Mar 2019 03:42:58 +0100 Subject: [PATCH 466/694] gnu: ruby-activerecord: Update to 5.2.2.1. * gnu/packages/rails.scm (ruby-activerecord): Update to 5.2.2.1. --- gnu/packages/rails.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/rails.scm b/gnu/packages/rails.scm index 0a1c998c72..caef2d8053 100644 --- a/gnu/packages/rails.scm +++ b/gnu/packages/rails.scm @@ -123,14 +123,14 @@ (define-public ruby-activemodel (define-public ruby-activerecord (package (name "ruby-activerecord") - (version "5.2.2") + (version "5.2.2.1") (source (origin (method url-fetch) (uri (rubygems-uri "activerecord" version)) (sha256 (base32 - "19a0sns6a5wz2wym25lb1dv4lbrrl5sd1n15s5ky2636znmhz30y")))) + "1c5cz9v7ggpqjxf0fqs1xhy1pb9m34cp31pxarhs9aqb71qjl98v")))) (build-system ruby-build-system) (arguments '(;; No included tests From e8df5a50c90cb1c89c125c7bcea51547818a0a3c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 Mar 2019 03:43:15 +0100 Subject: [PATCH 467/694] gnu: ruby-actionview: Update to 5.2.2.1. * gnu/packages/rails.scm (ruby-actionview): Update to 5.2.2.1. --- gnu/packages/rails.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/rails.scm b/gnu/packages/rails.scm index caef2d8053..c788c69d6a 100644 --- a/gnu/packages/rails.scm +++ b/gnu/packages/rails.scm @@ -201,14 +201,14 @@ (define-public ruby-rails-dom-testing (define-public ruby-actionview (package (name "ruby-actionview") - (version "5.2.2") + (version "5.2.2.1") (source (origin (method url-fetch) (uri (rubygems-uri "actionview" version)) (sha256 (base32 - "1lz04drbi1z0xhvb8jnr14pbf505lilr02arahxq7y3mxiz0rs8z")))) + "0832vlx37rly8ryfgi01b20mld8b3bv9cg62n5wax4zpzgn6jdxb")))) (build-system ruby-build-system) (arguments '(;; No included tests From 24c704af8c6997503ca4717a16d38724b288f0c1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 Mar 2019 03:43:24 +0100 Subject: [PATCH 468/694] gnu: ruby-actionpack: Update to 5.2.2.1. * gnu/packages/rails.scm (ruby-actionpack): Update to 5.2.2.1. --- gnu/packages/rails.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/rails.scm b/gnu/packages/rails.scm index c788c69d6a..bd5ba46b76 100644 --- a/gnu/packages/rails.scm +++ b/gnu/packages/rails.scm @@ -229,14 +229,14 @@ (define-public ruby-actionview (define-public ruby-actionpack (package (name "ruby-actionpack") - (version "5.2.2") + (version "5.2.2.1") (source (origin (method url-fetch) (uri (rubygems-uri "actionpack" version)) (sha256 (base32 - "0iwhbqqn0cm39dq040iwq8cfyclqk3kyzwlp5k3j5cz8k2668wws")))) + "1lxqzxa728dqg42yw0q4hqkaawqagiw1k0392an2ghjfgb16pafx")))) (build-system ruby-build-system) (arguments '(;; No included tests From 2a737e80ce2b1b5dcf0d5143e267dbfa3cce57dc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 Mar 2019 03:47:41 +0100 Subject: [PATCH 469/694] gnu: ruby-actioncable: Update to 5.2.2.1. * gnu/packages/rails.scm (ruby-actioncable): Update to 5.2.2.1. --- gnu/packages/rails.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/rails.scm b/gnu/packages/rails.scm index bd5ba46b76..7b8dbc0066 100644 --- a/gnu/packages/rails.scm +++ b/gnu/packages/rails.scm @@ -258,14 +258,14 @@ (define-public ruby-actionpack (define-public ruby-actioncable (package (name "ruby-actioncable") - (version "5.2.2") + (version "5.2.2.1") (source (origin (method url-fetch) (uri (rubygems-uri "actioncable" version)) (sha256 (base32 - "0826k5ch0l03f9yrkxy69aiv039z4qi00lnahw2rzywd2iz6r68x")))) + "1x5fxhsr2mxq5r6258s48xsn7ld081d3qaavppvj7yp7w9vqn871")))) (build-system ruby-build-system) (arguments '(;; No included tests From fbc2309f6dd732ce9858faa558a5f981eddb7f0e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 Mar 2019 03:47:50 +0100 Subject: [PATCH 470/694] gnu: ruby-activejob: Update to 5.2.2.1. * gnu/packages/rails.scm (ruby-activejob): Update to 5.2.2.1. --- gnu/packages/rails.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/rails.scm b/gnu/packages/rails.scm index 7b8dbc0066..c0fc8a416b 100644 --- a/gnu/packages/rails.scm +++ b/gnu/packages/rails.scm @@ -284,14 +284,14 @@ (define-public ruby-actioncable (define-public ruby-activejob (package (name "ruby-activejob") - (version "5.2.2") + (version "5.2.2.1") (source (origin (method url-fetch) (uri (rubygems-uri "activejob" version)) (sha256 (base32 - "1jjkl62x2aprg55x9rpm0h2c82vr2qr989hg3l9r21l01q4822ir")))) + "1zma452lc3qp4a7r10zbdmsci0kv9a3gnk4da2apbdrc8fib5mr3")))) (build-system ruby-build-system) (arguments '(;; No included tests From e16dd18981b4f8b4dd17bc1389f9df786c8df689 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 Mar 2019 03:48:03 +0100 Subject: [PATCH 471/694] gnu: ruby-activestorage: Update to 5.2.2.1. * gnu/packages/rails.scm (ruby-activestorage): Update to 5.2.2.1. --- gnu/packages/rails.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/rails.scm b/gnu/packages/rails.scm index c0fc8a416b..1230a45e7d 100644 --- a/gnu/packages/rails.scm +++ b/gnu/packages/rails.scm @@ -309,14 +309,14 @@ (define-public ruby-activejob (define-public ruby-activestorage (package (name "ruby-activestorage") - (version "5.2.2") + (version "5.2.2.1") (source (origin (method url-fetch) (uri (rubygems-uri "activestorage" version)) (sha256 (base32 - "0c72837098sw384vk6dmrb2p7q3wx4swnibk6sw9dp4hn1vc4p31")))) + "155xpbzrz0kr0argx0vsh5prvadd2h1g1m61kdiabvfy2iygc02n")))) (build-system ruby-build-system) (arguments '(;; No included tests From 5be0aedf762744bc2287fc906c101cd781dfcf5f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 Mar 2019 03:48:15 +0100 Subject: [PATCH 472/694] gnu: ruby-actionmailer: Update to 5.2.2.1. * gnu/packages/rails.scm (ruby-actionmailer): Update to 5.2.2.1. --- gnu/packages/rails.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/rails.scm b/gnu/packages/rails.scm index 1230a45e7d..224037f779 100644 --- a/gnu/packages/rails.scm +++ b/gnu/packages/rails.scm @@ -335,14 +335,14 @@ (define-public ruby-activestorage (define-public ruby-actionmailer (package (name "ruby-actionmailer") - (version "5.2.2") + (version "5.2.2.1") (source (origin (method url-fetch) (uri (rubygems-uri "actionmailer" version)) (sha256 (base32 - "0sfpb8s95cmkpp9ybyp2c88r55r5llscmmnkfwcwgasz9ncjiq5n")))) + "10n2v2al68rsq5ghrdp7cpycsc1q0m19fcd8cd5i528n30nl23iw")))) (build-system ruby-build-system) (arguments '(;; No included tests From 1835fc26b580939016d1216e7ba9d6e6f4530166 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 Mar 2019 03:48:26 +0100 Subject: [PATCH 473/694] gnu: ruby-railties: Update to 5.2.2.1. * gnu/packages/rails.scm (ruby-railties): Update to 5.2.2.1. --- gnu/packages/rails.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/rails.scm b/gnu/packages/rails.scm index 224037f779..47a87d4ca5 100644 --- a/gnu/packages/rails.scm +++ b/gnu/packages/rails.scm @@ -363,14 +363,14 @@ (define-public ruby-actionmailer (define-public ruby-railties (package (name "ruby-railties") - (version "5.2.2") + (version "5.2.2.1") (source (origin (method url-fetch) (uri (rubygems-uri "railties" version)) (sha256 (base32 - "00pnylmbz4c46mxw5lhxi8h39lndfg6fs1hpd0qd6swnjhkqsr1l")))) + "0al6mvh2jvr3n7cxkx0yvhgiiarby6gxc93vl5xg1yxkvx27qzd6")))) (build-system ruby-build-system) (arguments '(;; No included tests From e2fbc27210a1fb73bc7ff6282bc0a50978cc170f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 Mar 2019 03:48:32 +0100 Subject: [PATCH 474/694] gnu: ruby-rails: Update to 5.2.2.1. * gnu/packages/rails.scm (ruby-rails): Update to 5.2.2.1. --- gnu/packages/rails.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/rails.scm b/gnu/packages/rails.scm index 47a87d4ca5..15dd375521 100644 --- a/gnu/packages/rails.scm +++ b/gnu/packages/rails.scm @@ -444,14 +444,14 @@ (define-public ruby-with-advisory-lock (define-public ruby-rails (package (name "ruby-rails") - (version "5.2.2") + (version "5.2.2.1") (source (origin (method url-fetch) (uri (rubygems-uri "rails" version)) (sha256 (base32 - "1m9cszds68dsiycciiayd3c9g90s2yzn1izkr3gpgqkfw6dmvzyr")))) + "1jxmwrykwgbn116hhmi7h75hcsdifhj89wk12m7ch2f3mn1lrmp9")))) (build-system ruby-build-system) (arguments '(#:phases From bcf1fe5bbc40f54ae7c5690359139a63c840735d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 Mar 2019 03:48:46 +0100 Subject: [PATCH 475/694] gnu: ruby-activesupport: Update to 5.2.2.1. * gnu/packages/ruby.scm (ruby-activesupport): Update to 5.2.2.1. --- gnu/packages/ruby.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 7a2b191063..f65b980770 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -4530,14 +4530,14 @@ (define-public ruby-loofah (define-public ruby-activesupport (package (name "ruby-activesupport") - (version "5.2.2") + (version "5.2.2.1") (source (origin (method url-fetch) (uri (rubygems-uri "activesupport" version)) (sha256 (base32 - "1iya7vxqwxysr74s7b4z1x19gmnx5advimzip3cbmsd5bd43wfgz")))) + "161bp4p01v1a1lvszrhd1a02zf9x1p1l1yhw79a3rix1kvzkkdqb")))) (build-system ruby-build-system) (arguments `(#:phases From c664ebcc31d3bc99da5f88cff7126a5b8c4c6ed3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 Mar 2019 03:48:57 +0100 Subject: [PATCH 476/694] gnu: ruby-fivemat: Update to 1.3.7. * gnu/packages/ruby.scm (ruby-fivemat): Update to 1.3.7. --- gnu/packages/ruby.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index f65b980770..55adff65fc 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5915,14 +5915,14 @@ (define-public ruby-mime-types (define-public ruby-fivemat (package (name "ruby-fivemat") - (version "1.3.6") + (version "1.3.7") (source (origin (method url-fetch) (uri (rubygems-uri "fivemat" version)) (sha256 (base32 - "006n7b09vviv5bs5hv2ccmjxw9iw3brcsm3xh3dhzfncsknz4jp7")))) + "0pzlycasvwmg4bbx7plllpqnhd9zlmmff8l2w3yii86nrm2nvf9n")))) (build-system ruby-build-system) (arguments `(#:tests? #f)) ; no tests From 5cf3e6fcd5216e1a98e32e7d7a1da50554354a4b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 Mar 2019 03:49:08 +0100 Subject: [PATCH 477/694] gnu: jekyll: Update to 3.8.5. * gnu/packages/ruby.scm (jekyll): Update to 3.8.5. --- gnu/packages/ruby.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 55adff65fc..2ef00ce356 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -8266,13 +8266,13 @@ (define-public ruby-pathutil (define-public jekyll (package (name "jekyll") - (version "3.8.3") + (version "3.8.5") (source (origin (method url-fetch) (uri (rubygems-uri "jekyll" version)) (sha256 (base32 - "1iw90wihk9dscgmppf5v6lysg3kjmnx50mjyl4gghkdb4spw97xk")))) + "1nn2sc308l2mz0yiall4r90l6vy67qp4sy9zapi73a948nd4a5k3")))) (build-system ruby-build-system) (arguments ;; No rakefile, but a test subdirectory From f1aa44ada932b7841531fef95c3174c841b2e014 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 Mar 2019 03:51:21 +0100 Subject: [PATCH 478/694] gnu: qwt: Update to 6.1.4. * gnu/packages/qt.scm (qwt): Update to 6.1.4. --- gnu/packages/qt.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 6e567792f8..87d92765f4 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2067,7 +2067,7 @@ (define-public qtkeychain (define-public qwt (package (name "qwt") - (version "6.1.3") + (version "6.1.4") (source (origin (method url-fetch) @@ -2075,7 +2075,7 @@ (define-public qwt (string-append "mirror://sourceforge/qwt/qwt/" version "/qwt-" version ".tar.bz2")) (sha256 - (base32 "0cwp63s03dw351xavb3pzbjlqvx7kj88wv7v4a2b18m9f97d7v7k")))) + (base32 "1navkcnmn0qz8kzsyqmk32d929zl72l0b580w1ica7z5559j2a8m")))) (build-system gnu-build-system) (inputs `(("qtbase" ,qtbase) From 1e70d72b18207292a60cdf153d4e7efb9ee767ff Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Wed, 20 Mar 2019 21:22:50 -0500 Subject: [PATCH 479/694] gnu: emacs-hackernews: Update to 0.5.0-1-916c3da. * gnu/packages/emacs-xyz.scm (emacs-hackernews): Update to 0.5.0-1-916c3da. Signed-off-by: Ricardo Wurmus --- 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 9969c7968c..fdda71ac77 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12407,10 +12407,10 @@ (define-public emacs-git-annex (license license:gpl2+)))) (define-public emacs-hackernews - (let ((commit "d8c450bbc76d6bb65ec5cdb6c3b888a23f3769e9")) + (let ((commit "916c3da8da45c757f5ec2faeed57fa370513d4ac")) (package (name "emacs-hackernews") - (version (git-version "0.4.0" "1" commit)) + (version (git-version "0.5.0" "1" commit)) (source (origin (method git-fetch) @@ -12420,7 +12420,7 @@ (define-public emacs-hackernews (file-name (git-file-name name version)) (sha256 (base32 - "06mp4n6c300jv5lhwf50ircfjckzr2p1zd38s4mqnxxjlf1maim7")))) + "09bxaaczana1cfvxyk9aagjvdszkj0j1yldl5r4xa60b59lxihsg")))) (build-system emacs-build-system) (home-page "https://github.com/clarete/hackernews.el") (synopsis "Hacker News client for Emacs") From ebfe592fd433ce4850fb62b5390ca5d920d935d5 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Thu, 21 Mar 2019 10:53:24 +0100 Subject: [PATCH 480/694] gnu: vulkan-loader: Remove unnecessary inputs. * gnu/packages/vulkan.scm (vulkan-loader)[arguments]: Remove -DBUILD_LAYERS=OFF. [inputs]: Remove all. [native-inputs]: Add libxrandr, vulkan-headers, wayland. --- gnu/packages/vulkan.scm | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 7517d24b69..67f10eb641 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -209,20 +209,14 @@ (define-public vulkan-loader (substitute* "CMakeLists.txt" ((".*spirv_tools_commit_id.h.*") "")) #t))) #:configure-flags (list - "-DBUILD_LAYERS=OFF" ; FIXME: Fails to build. "-DBUILD_TESTS=OFF" ; FIXME: Needs 'googletest' submodule. (string-append "-DCMAKE_INSTALL_LIBDIR=" (assoc-ref %outputs "out") "/lib")))) - (inputs `(("glslang" ,glslang) - ("libxcb" ,libxcb) - ("libx11" ,libx11) - ("libxrandr" ,libxrandr) - ("mesa" ,mesa) - ("spirv-tools" ,spirv-tools) - ("vulkan-headers" ,vulkan-headers) - ("wayland" ,wayland))) - (native-inputs `(("pkg-config" ,pkg-config) - ("python" ,python))) + (native-inputs `(("libxrandr" ,libxrandr) + ("pkg-config" ,pkg-config) + ("python" ,python) + ("vulkan-headers" ,vulkan-headers) + ("wayland" ,wayland))) (home-page "https://github.com/KhronosGroup/Vulkan-Loader") (synopsis "Khronos official ICD loader and validation layers for Vulkan") From 1661f09a10f2032438af6497b64457d6278edf65 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Thu, 21 Mar 2019 11:09:52 +0100 Subject: [PATCH 481/694] gnu: vulkan-tools: Remove unnecessary inputs. * gnu/packages/vulkan.scm (vulkan-tools)[inputs]: Remove mesa, vulkan-headers. [native-inputs]: Add vulkan-headers. --- gnu/packages/vulkan.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 67f10eb641..0c7e22bb5e 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -253,13 +253,12 @@ (define-public vulkan-tools (inputs `(("glslang" ,glslang) ("libxrandr" ,libxrandr) - ("mesa" ,mesa) - ("vulkan-headers" ,vulkan-headers) ("vulkan-loader" ,vulkan-loader) ("wayland" ,wayland))) (native-inputs `(("pkg-config" ,pkg-config) - ("python" ,python))) + ("python" ,python) + ("vulkan-headers" ,vulkan-headers))) (arguments `(#:tests? #f ; No tests. #:configure-flags (list (string-append "-DGLSLANG_INSTALL_DIR=" From af8f7eb4f2a664c2d0fb3faabaf2e80c72993ef6 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 21 Mar 2019 13:34:24 -0400 Subject: [PATCH 482/694] gnu: libssh2: Update to 1.8.1 [security fixes]. Fixes CVE-2019-{3855,3856,3857,3858,3859,3860,3861,3862,3863}. * gnu/packages/ssh.scm (libssh2): Update to 1.8.1. (libssh2-1.8.0): New variable. * gnu/packages/curl.scm (curl)[inputs]: Use libssh2-1.8.0. --- gnu/packages/curl.scm | 10 +++++++--- gnu/packages/ssh.scm | 24 +++++++++++++++++++++--- 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 456a18012d..a36a1ee4a6 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2015 Tomáš Čech ;;; Copyright © 2015 Ludovic Courtès -;;; Copyright © 2016, 2017 Leo Famulari +;;; Copyright © 2016, 2017, 2019 Leo Famulari ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2017 Efraim Flashner ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice @@ -66,10 +66,14 @@ (define-public curl (inputs `(("gnutls" ,gnutls) ("gss" ,gss) ("libidn" ,libidn) - ("libssh2" ,libssh2) ("openldap" ,openldap) ("nghttp2" ,nghttp2 "lib") - ("zlib" ,zlib))) + ("zlib" ,zlib) + ;; TODO XXX + ;; Curl doesn't actually use or refer to libssh2 because the build + ;; is not configured with '--with-libssh2'. Remove this input when + ;; a mass rebuild is appropriate (e.g. core-updates). + ("libssh2" ,libssh2-1.8.0))) (native-inputs `(("perl" ,perl) ;; to enable the --manual option and make test 1026 pass diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index dc81736f06..5b5890aae6 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2013, 2014 Andreas Enge ;;; Copyright © 2014, 2015, 2016 Mark H Weaver ;;; Copyright © 2015, 2016, 2018 Efraim Flashner -;;; Copyright © 2016 Leo Famulari +;;; Copyright © 2016, 2019 Leo Famulari ;;; Copyright © 2016 Nicolas Goaziou ;;; Copyright © 2016 Christopher Allan Webber ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice @@ -111,7 +111,7 @@ (define-public libssh (define-public libssh2 (package (name "libssh2") - (version "1.8.0") + (version "1.8.1") (source (origin (method url-fetch) (uri (string-append @@ -119,7 +119,7 @@ (define-public libssh2 version ".tar.gz")) (sha256 (base32 - "1m3n8spv79qhjq4yi0wgly5s5rc8783jb1pyra9bkx1md0plxwrr")) + "0ngif3ynk6xqzy5nlfjs7bsmfm81g9f145av0z86kf0vbgrigda0")) (patches (search-patches "libssh2-fix-build-failure-with-gcrypt.patch")))) (build-system gnu-build-system) @@ -143,6 +143,24 @@ (define-public libssh2 (license license:bsd-3) (home-page "https://www.libssh2.org/"))) +;; XXX A hidden special obsolete libssh2 for temporary use in the curl package. +;; +(define-public libssh2-1.8.0 + (hidden-package + (package + (inherit libssh2) + (version "1.8.0") + (source (origin + (method url-fetch) + (uri (string-append + "https://www.libssh2.org/download/libssh2-" + version ".tar.gz")) + (sha256 + (base32 + "1m3n8spv79qhjq4yi0wgly5s5rc8783jb1pyra9bkx1md0plxwrr")) + (patches + (search-patches "libssh2-fix-build-failure-with-gcrypt.patch"))))))) + (define-public openssh (package (name "openssh") From c1f4e6491cecc5d121ef371a8fb2aa0a07030d36 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 21 Mar 2019 19:14:18 +0100 Subject: [PATCH 483/694] gnu: curl: Restore derivation. Commit af8f7eb4f2a664c2d0fb3faabaf2e80c72993ef6 accidentally changed the cURL derivation. Remove use of HIDDEN-PACKAGE and restore input order to prevent a large number of rebuilds. * gnu/packages/ssh.scm (libssh2-1.8.0): Move from here ... * gnu/packages/curl.scm (libssh2-1.8.0): ... to here. Don't use HIDDEN-PACKAGE and make it non-public. (curl)[inputs]: Move LIBSSH2-1.8.0 where it was before af8f7eb4f2a66. --- gnu/packages/curl.scm | 25 +++++++++++++++++++++---- gnu/packages/ssh.scm | 18 ------------------ 2 files changed, 21 insertions(+), 22 deletions(-) diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index a36a1ee4a6..041853c6f3 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -48,6 +48,23 @@ (define-module (gnu packages curl) #:use-module (gnu packages tls) #:use-module (gnu packages web)) +;; XXX A hidden special obsolete libssh2 for temporary use in the curl package. +;; +(define libssh2-1.8.0 + (package + (inherit libssh2) + (version "1.8.0") + (source (origin + (method url-fetch) + (uri (string-append + "https://www.libssh2.org/download/libssh2-" + version ".tar.gz")) + (sha256 + (base32 + "1m3n8spv79qhjq4yi0wgly5s5rc8783jb1pyra9bkx1md0plxwrr")) + (patches + (search-patches "libssh2-fix-build-failure-with-gcrypt.patch")))))) + (define-public curl (package (name "curl") @@ -66,14 +83,14 @@ (define-public curl (inputs `(("gnutls" ,gnutls) ("gss" ,gss) ("libidn" ,libidn) - ("openldap" ,openldap) - ("nghttp2" ,nghttp2 "lib") - ("zlib" ,zlib) ;; TODO XXX ;; Curl doesn't actually use or refer to libssh2 because the build ;; is not configured with '--with-libssh2'. Remove this input when ;; a mass rebuild is appropriate (e.g. core-updates). - ("libssh2" ,libssh2-1.8.0))) + ("libssh2" ,libssh2-1.8.0) + ("openldap" ,openldap) + ("nghttp2" ,nghttp2 "lib") + ("zlib" ,zlib))) (native-inputs `(("perl" ,perl) ;; to enable the --manual option and make test 1026 pass diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 5b5890aae6..a75096b779 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -143,24 +143,6 @@ (define-public libssh2 (license license:bsd-3) (home-page "https://www.libssh2.org/"))) -;; XXX A hidden special obsolete libssh2 for temporary use in the curl package. -;; -(define-public libssh2-1.8.0 - (hidden-package - (package - (inherit libssh2) - (version "1.8.0") - (source (origin - (method url-fetch) - (uri (string-append - "https://www.libssh2.org/download/libssh2-" - version ".tar.gz")) - (sha256 - (base32 - "1m3n8spv79qhjq4yi0wgly5s5rc8783jb1pyra9bkx1md0plxwrr")) - (patches - (search-patches "libssh2-fix-build-failure-with-gcrypt.patch"))))))) - (define-public openssh (package (name "openssh") From ad4910eec06047124d29cb9a8d4b40dafdb71630 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 Mar 2019 16:32:24 +0100 Subject: [PATCH 484/694] build-system/meson: Add #:allowed-references and #:disallowed-references. * guix/build-system/meson.scm (meson-build): Add support for #:allowed-references and #:disallowed-references. --- guix/build-system/meson.scm | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/guix/build-system/meson.scm b/guix/build-system/meson.scm index 8d49020454..370d185545 100644 --- a/guix/build-system/meson.scm +++ b/guix/build-system/meson.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Peter Mikkelsen -;;; Copyright © 2018 Marius Bakke +;;; Copyright © 2018, 2019 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -109,9 +109,25 @@ (define* (meson-build store name inputs (system (%current-system)) (imported-modules %meson-build-system-modules) (modules '((guix build meson-build-system) - (guix build utils)))) + (guix build utils))) + allowed-references + disallowed-references) "Build SOURCE using MESON, and with INPUTS, assuming that SOURCE has a 'meson.build' file." + + ;; TODO: Copied from build-system/gnu, factorize this! + (define canonicalize-reference + (match-lambda + ((? package? p) + (derivation->output-path (package-derivation store p system + #:graft? #f))) + (((? package? p) output) + (derivation->output-path (package-derivation store p system + #:graft? #f) + output)) + ((? string? output) + output))) + (define builder `(let ((build-phases (if ,glib-or-gtk? ,phases @@ -159,7 +175,15 @@ (define guile-for-build #:inputs inputs #:modules imported-modules #:outputs outputs - #:guile-for-build guile-for-build)) + #:guile-for-build guile-for-build + #:allowed-references + (and allowed-references + (map canonicalize-reference + allowed-references)) + #:disallowed-references + (and disallowed-references + (map canonicalize-reference + disallowed-references)))) (define meson-build-system (build-system From 7c1693df42500aab31f884dde25402e559db3ad1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 Mar 2019 18:23:22 +0100 Subject: [PATCH 485/694] gnu: elogind: Update to 241.1. * gnu/packages/freedesktop.scm (elogind): Update to 241.1. --- 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 4750450f68..bc91696dbc 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -230,7 +230,7 @@ (define-public libxdg-basedir (define-public elogind (package (name "elogind") - (version "239.4") + (version "241.1") (source (origin (method git-fetch) (uri (git-reference @@ -239,7 +239,7 @@ (define-public elogind (file-name (git-file-name name version)) (sha256 (base32 - "106hld2fa89iz0d17gkmwvbkxc2yspn1klq73nvkj4878wx3vcr9")))) + "0a4irq4ycps3xcizjjr0gz3j46dyqvcwa4ncinpqpqlasi8l18nk")))) (build-system meson-build-system) (arguments `(#:configure-flags From c11f86ff164b750151645caae9cdecca3570d876 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 18 Mar 2019 13:49:44 +0100 Subject: [PATCH 486/694] gnu: libgit2: Update to 0.28.1. * gnu/packages/patches/libgit2-oom-test.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/version-control.scm (libgit2): Update to 0.28.1. [source](patches): Remove 'libgit2-oom-test.patch'. --- gnu/local.mk | 1 - gnu/packages/patches/libgit2-oom-test.patch | 62 --------------------- gnu/packages/version-control.scm | 7 +-- 3 files changed, 3 insertions(+), 67 deletions(-) delete mode 100644 gnu/packages/patches/libgit2-oom-test.patch diff --git a/gnu/local.mk b/gnu/local.mk index c9c7378f02..c0b7478635 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -972,7 +972,6 @@ dist_patch_DATA = \ %D%/packages/patches/libexif-CVE-2017-7544.patch \ %D%/packages/patches/libgcrypt-make-yat2m-reproducible.patch \ %D%/packages/patches/libgit2-mtime-0.patch \ - %D%/packages/patches/libgit2-oom-test.patch \ %D%/packages/patches/libgdata-fix-tests.patch \ %D%/packages/patches/libgdata-glib-duplicate-tests.patch \ %D%/packages/patches/libgnome-encoding.patch \ diff --git a/gnu/packages/patches/libgit2-oom-test.patch b/gnu/packages/patches/libgit2-oom-test.patch deleted file mode 100644 index 9667d1c0da..0000000000 --- a/gnu/packages/patches/libgit2-oom-test.patch +++ /dev/null @@ -1,62 +0,0 @@ -Fix a test failure on 32-bit platforms as reported -at . - -From 415a8ae9c9b6ac18f0524b6af8e58408b426457d Mon Sep 17 00:00:00 2001 -From: Edward Thomson -Date: Thu, 13 Sep 2018 13:27:07 +0100 -Subject: [PATCH] tests: don't run buf::oom on 32-bit systems - -On a 32-bit Linux systems, the value large enough to make malloc -guarantee a failure is also large enough that valgrind considers it -"fishy". Skip this test on those systems entirely. ---- - tests/buf/oom.c | 14 +++++++++----- - 1 file changed, 9 insertions(+), 5 deletions(-) - -diff --git a/tests/buf/oom.c b/tests/buf/oom.c -index 2741a8ddf2..ec3bad9979 100644 ---- a/tests/buf/oom.c -+++ b/tests/buf/oom.c -@@ -11,12 +11,8 @@ - */ - #if defined(GIT_ARCH_64) && defined(__linux__) - # define TOOBIG 0x0fffffffffffffff --#elif defined(__linux__) --# define TOOBIG 0x0fffffff - #elif defined(GIT_ARCH_64) - # define TOOBIG 0xffffffffffffff00 --#else --# define TOOBIG 0xffffff00 - #endif - - /** -@@ -25,13 +21,18 @@ - * will fail. And because the git_buf_grow() wrapper always - * sets mark_oom, the code in git_buf_try_grow() will free - * the internal buffer and set it to git_buf__oom. -- * -+ * - * We initialized the internal buffer to (the static variable) - * git_buf__initbuf. The purpose of this test is to make sure - * that we don't try to free the static buffer. -+ * -+ * Skip this test entirely on 32-bit platforms; a buffer large enough -+ * to guarantee malloc failures is so large that valgrind considers -+ * it likely to be an error. - */ - void test_buf_oom__grow(void) - { -+#ifdef GIT_ARCH_64 - git_buf buf = GIT_BUF_INIT; - - git_buf_clear(&buf); -@@ -40,6 +41,9 @@ void test_buf_oom__grow(void) - cl_assert(git_buf_oom(&buf)); - - git_buf_free(&buf); -+#else -+ cl_skip(); -+#endif - } - - void test_buf_oom__grow_by(void) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index d750863f30..385ebeadc9 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -526,7 +526,7 @@ (define-public git-minimal (define-public libgit2 (package (name "libgit2") - (version "0.27.7") + (version "0.28.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/libgit2/libgit2/" @@ -534,9 +534,8 @@ (define-public libgit2 (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0c95pbv7hwclwmn51nqnh1lb0cajpcdb24pbdzcir6vmhfj3am0s")) - (patches (search-patches "libgit2-mtime-0.patch" - "libgit2-oom-test.patch")) + "0swk2dyq5a4p1jn5wvbcsrxckhh808vifxz5y8w663avg541188c")) + (patches (search-patches "libgit2-mtime-0.patch")) ;; Remove bundled software. (snippet '(begin From 05109e8ef82f932077eba9d3a7be7e80cff478c1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 18 Mar 2019 17:05:40 +0100 Subject: [PATCH 487/694] gnu: varnish: Update to 6.2.0. * gnu/packages/web.scm (varnish): Update to 6.2.0. [arguments]: Remove obsolete configure flag. Add substitution for /bin/rm. --- gnu/packages/web.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 06e53aab4c..944459d4fd 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4810,13 +4810,13 @@ (define-public varnish (package (name "varnish") (home-page "https://varnish-cache.org/") - (version "6.1.1") + (version "6.2.0") (source (origin (method url-fetch) (uri (string-append home-page "_downloads/varnish-" version ".tgz")) (sha256 (base32 - "0gf9hzzrr1lndbbqi8cwlfasi7l517cy3nbgna88i78lm247rvp0")))) + "0lwfk2gq99c653h5f51fs3j37r0gh2pf0p4w5z986nm2mi9z6yn3")))) (build-system gnu-build-system) (arguments `(#:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib") @@ -4824,10 +4824,6 @@ (define-public varnish (string-append "PTHREAD_CC=" (assoc-ref %build-inputs "gcc") "/bin/gcc") - ;; XXX: Disable PCRE-JIT to work around a segmentation - ;; fault when using jemalloc 5.x: - ;; - "--disable-pcre-jit" "--localstatedir=/var") #:phases (modify-phases %standard-phases @@ -4839,6 +4835,8 @@ (define-public varnish (("/bin/sh") (which "sh"))) (substitute* "bin/varnishd/mgt/mgt_shmem.c" (("rm -rf") (string-append (which "rm") " -rf"))) + (substitute* "bin/varnishtest/vtc_main.c" + (("/bin/rm") (which "rm"))) #t)) (add-before 'install 'patch-Makefile (lambda _ From 941699b34337c7a6287cfaf0cf07f522afdb8422 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 21 Mar 2019 18:36:27 +0100 Subject: [PATCH 488/694] gnu: tbb: Update to 2019_U5. * gnu/packages/tbb.scm (tbb): Update to 2019_U5. [source]: Use GIT-FETCH because releases are no longer available. --- gnu/packages/tbb.scm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/gnu/packages/tbb.scm b/gnu/packages/tbb.scm index 788eabfdfa..370c0f425e 100644 --- a/gnu/packages/tbb.scm +++ b/gnu/packages/tbb.scm @@ -20,7 +20,7 @@ (define-module (gnu packages tbb) #:use-module (guix packages) #:use-module (guix licenses) - #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (gnu packages)) @@ -28,16 +28,15 @@ (define-module (gnu packages tbb) (define-public tbb (package (name "tbb") - (version "2017_20160916") + (version "2019_U5") (source (origin - (method url-fetch) - (uri (string-append - "https://www.threadingbuildingblocks.org/sites/default" - "/files/software_releases/source/" - "tbb" version "oss_src.tgz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/01org/tbb") + (commit version))) (sha256 (base32 - "1i3zy87gyzw22fvajm039w6g822qzqn7jbmznc8y8c57qpqnf330")) + "0390da1iya2mvn3ribjb1f8yvzsqsf5b16wn6dqbjxcz0crmwlzk")) (modules '((guix build utils))) (snippet '(begin From 915618f2ffe087970c31dc1d8e9bf63e1050c291 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 21 Mar 2019 18:39:10 +0100 Subject: [PATCH 489/694] gnu: glm: Update to 0.9.9.4. * gnu/packages/maths.scm (glm): Update to 0.9.9.4. --- 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 a58049b96c..ddb4672ff9 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -3355,7 +3355,7 @@ (define-public atlas (define-public glm (package (name "glm") - (version "0.9.9.3") + (version "0.9.9.4") (source (origin (method url-fetch) @@ -3363,7 +3363,7 @@ (define-public glm version "/glm-" version ".zip")) (sha256 (base32 - "0yqk5r3qh60d4r2iab5q7wq0fryn8p3pz6s28y1i7amqj1aqavj9")))) + "17vxbqzy4pxciq5i39bgpxz54f7ifqqmcqwwq7m6xfgikwqqqawp")))) (build-system cmake-build-system) (native-inputs `(("unzip" ,unzip))) From b4d77cfa702cee0be1db73810d20ff6fef054eec Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 21 Mar 2019 18:42:21 +0100 Subject: [PATCH 490/694] gnu: strace: Update to 5.0. * gnu/packages/linux.scm (strace): Update to 5.0. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 3ea97ec499..0a7a5d8028 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -973,7 +973,7 @@ (define-public zerofree (define-public strace (package (name "strace") - (version "4.26") + (version "5.0") (home-page "https://strace.io") (source (origin (method url-fetch) @@ -981,7 +981,7 @@ (define-public strace "/strace-" version ".tar.xz")) (sha256 (base32 - "070yz8xii8gnb4psiz628zwm5srh266sfb06f7f1qzagxzz2ykbw")))) + "1nj7wvsdmhpp53yffj1pnrkjn96mxrbcraa6h03wc7dqn9zdfyiv")))) (build-system gnu-build-system) (arguments '(#:phases From 7ac8d96d77c297db1f86c1534d1771e991c5f46a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 21 Mar 2019 18:44:38 +0100 Subject: [PATCH 491/694] gnu: gnupg: Update to 2.2.14. * gnu/packages/gnupg.scm (gnupg): Update to 2.2.14. --- gnu/packages/gnupg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index fcec2f065d..22ae435a83 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -224,14 +224,14 @@ (define-public npth (define-public gnupg (package (name "gnupg") - (version "2.2.13") + (version "2.2.14") (source (origin (method url-fetch) (uri (string-append "mirror://gnupg/gnupg/gnupg-" version ".tar.bz2")) (sha256 (base32 - "1n0igfn9nwdajzkcgdx7apwm9m5rpw0fg6vwskmf1rpranlqgivn")))) + "0yzqrg24j9fc4f8ss5pclyvg70a9z53sv89vl77xii8yvi3fvy8v")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) From 2f87048dbe14097b9fe19ec470e2628cfca7fdbf Mon Sep 17 00:00:00 2001 From: Robert Smith Date: Mon, 18 Mar 2019 15:05:18 +0100 Subject: [PATCH 492/694] gnu: elixir: Update to 1.8.1. * gnu/packages/elixir.scm (elixir): Update to 1.8.1. [source](patches): New field. [home-page]: Use HTTPS. * gnu/packages/patches/elixir-path-length.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. Signed-off-by: Marius Bakke --- gnu/local.mk | 1 + gnu/packages/elixir.scm | 7 ++++--- gnu/packages/patches/elixir-path-length.patch | 15 +++++++++++++++ 3 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/elixir-path-length.patch diff --git a/gnu/local.mk b/gnu/local.mk index c0b7478635..b3c54a752a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -732,6 +732,7 @@ dist_patch_DATA = \ %D%/packages/patches/dvd+rw-tools-add-include.patch \ %D%/packages/patches/efl-mesa-compat.patch \ %D%/packages/patches/elfutils-tests-ptrace.patch \ + %D%/packages/patches/elixir-path-length.patch \ %D%/packages/patches/einstein-build.patch \ %D%/packages/patches/emacs-exec-path.patch \ %D%/packages/patches/emacs-fix-scheme-indent-function.patch \ diff --git a/gnu/packages/elixir.scm b/gnu/packages/elixir.scm index 29c7ee966f..9763c7a22b 100644 --- a/gnu/packages/elixir.scm +++ b/gnu/packages/elixir.scm @@ -33,7 +33,7 @@ (define-module (gnu packages elixir) (define-public elixir (package (name "elixir") - (version "1.6.6") + (version "1.8.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/elixir-lang/elixir" @@ -41,7 +41,8 @@ (define-public elixir (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0c9qz5hasa59a9x1iwpcqpqj6wdbzpijfxqfmzimwj5z8q37nl3l")))) + "08lq5p82pnicd49gsj6r2zsbg35wrk6098nrrjb28fcrm5p6736y")) + (patches (search-patches "elixir-path-length.patch")))) (build-system gnu-build-system) (arguments `(#:test-target "test" @@ -84,7 +85,7 @@ (define-public elixir (inputs `(("erlang" ,erlang) ("git" ,git))) - (home-page "http://elixir-lang.org/") + (home-page "https://elixir-lang.org/") (synopsis "Elixir programming language") (description "Elixir is a dynamic, functional language used to build scalable and maintainable applications. Elixir leverages the Erlang VM, known diff --git a/gnu/packages/patches/elixir-path-length.patch b/gnu/packages/patches/elixir-path-length.patch new file mode 100644 index 0000000000..aa8bf38829 --- /dev/null +++ b/gnu/packages/patches/elixir-path-length.patch @@ -0,0 +1,15 @@ +In the package definition the call to the command 'git' is substituted with +the full path to the git executable. This change causes the mix formatting tool +to complain that the line is too long. This workaround reformats the file +after the substitution is made. + +--- a/Makefile ++++ b/Makefile +@@ -213,6 +213,7 @@ + TEST_ERLS = $(addprefix $(TEST_EBIN)/, $(addsuffix .beam, $(basename $(notdir $(wildcard $(TEST_ERL)/*.erl))))) + + test_formatted: compile ++ bin/elixir bin/mix format lib/mix/lib/mix/scm/git.ex + bin/elixir bin/mix format --check-formatted + + test_erlang: compile $(TEST_ERLS) From ea4a1e5d0b13b5c548804ac854e6eb30c5149ce4 Mon Sep 17 00:00:00 2001 From: Jack Hill Date: Sun, 17 Mar 2019 22:01:17 -0400 Subject: [PATCH 493/694] gnu: Add emacs-semantic-refactor. * gnu/packages/emacs-xyz.scm (emacs-semantic-refactor): New variable. Signed-off-by: Marius Bakke --- gnu/packages/emacs-xyz.scm | 43 +++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index fdda71ac77..8463a91b8c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -36,7 +36,7 @@ ;;; Copyright © 2018 Mathieu Lirzin ;;; Copyright © 2018, 2019 Pierre Neidhardt ;;; Copyright © 2018, 2019 Tim Gesthuizen -;;; Copyright © 2018 Jack Hill +;;; Copyright © 2018, 2019 Jack Hill ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2018 Alex Branham ;;; Copyright © 2018 Thorsten Wilms @@ -13744,6 +13744,47 @@ (define-public emacs-transient a suffix) we prefer to call it just a \"transient\".") (license license:gpl3+)))) +(define-public emacs-semantic-refactor + ;; The last release, 0.5, was made on 2015-07-26 and there have been 47 + ;; commits since then. + (let ((commit "6f2c97d17fb70f4ca2112f5a2b99a8ec162004f5")) + (package + (name "emacs-semantic-refactor") + (version (git-version "0.5" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tuhdo/semantic-refactor") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1lyz3zjkx2csh0xdy1zpx8s32qp1p3sig57mwi9xhgpqjyf0axmb")))) + (build-system emacs-build-system) + (home-page "https://github.com/tuhdo/semantic-refactor") + (synopsis "Refactoring tool for C/C++ and Lisp dialects") + (description "This package provides a refactoring tool based on the +Emacs Semantic parser framework. For C and C++ it supports operations such as: + +@enumerate +@item Generating class implementations +@item Generating function prototypes +@item Converting functions to function pointers +@item Moving semantic units +@item etc... +@end enumerate + +For Lisp dialects like Clojure, ELisp, and Scheme, it supports operations such +as: + +@enumerate +@item Formatting the whole buffer +@item Converting sexpressions to one or multiple lines +@item etc... +@end enumerate\n") + (license license:gpl3+)))) + (define-public emacs-nhexl-mode (package (name "emacs-nhexl-mode") From b7489004a4aa7829f2cdf095133412dd1cdc7789 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 21 Mar 2019 18:29:23 +0100 Subject: [PATCH 494/694] gnu: emacs-emms: Add dependency on Mutagen. * gnu/packages/emacs-xyz.scm (emacs-emms)[arguments]: In 'configure' phase, for "emms-tag-editor.el", replace "mid3v2" but not "mp3info". [inputs]: Add PYTHON-MUTAGEN. --- gnu/packages/emacs-xyz.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 8463a91b8c..2ffca732ba 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -97,6 +97,7 @@ (define-module (gnu packages emacs-xyz) #:use-module (gnu packages image) #:use-module (gnu packages linux) #:use-module (gnu packages libevent) + #:use-module (gnu packages music) #:use-module (gnu packages version-control) #:use-module (gnu packages imagemagick) #:use-module (gnu packages w3m) @@ -968,6 +969,7 @@ (define-public emacs-emms (alsa (assoc-ref inputs "alsa-utils")) (mpg321 (assoc-ref inputs "mpg321")) (mp3info (assoc-ref inputs "mp3info")) + (mutagen (assoc-ref inputs "mutagen")) (opus (assoc-ref inputs "opus-tools"))) ;; Specify the installation directory. (substitute* "Makefile" @@ -1011,8 +1013,9 @@ (define-public emacs-emms (("\"amixer\"") (string-append "\"" alsa "/bin/amixer\""))) (substitute* "emms-tag-editor.el" - (("\"mp3info\"") - (string-append "\"" mp3info "/bin/mp3info\""))))))) + (("\"mid3v2\"") + (string-append "\"" mutagen "/bin/mid3v2\""))) + #t)))) (add-before 'install 'pre-install (lambda* (#:key outputs #:allow-other-keys) ;; The 'install' rule expects the target directories to exist. @@ -1045,6 +1048,7 @@ (define-public emacs-emms ("mpg321" ,mpg321) ("taglib" ,taglib) ("mp3info" ,mp3info) + ("mutagen" ,python-mutagen) ("opus-tools" ,opus-tools))) (properties '((upstream-name . "emms"))) (synopsis "Emacs Multimedia System") From 4c871a553714553381e4b822c63d8fd877be9674 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 21 Mar 2019 21:03:50 +0100 Subject: [PATCH 495/694] gnu: r-pkgbuild: Update to 1.0.3. * gnu/packages/cran.scm (r-pkgbuild): Update to 1.0.3. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c6afcddeba..b40701c265 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1271,14 +1271,14 @@ (define-public r-ps (define-public r-pkgbuild (package (name "r-pkgbuild") - (version "1.0.2") + (version "1.0.3") (source (origin (method url-fetch) (uri (cran-uri "pkgbuild" version)) (sha256 (base32 - "1i1rrax7x7r2bplig5cfc50lx85jc4n9a3qmvbdviaj22wr2lghs")))) + "0k8zwa66rm1ncx19ld5mbaxcjxkswiczpdqyssy44vl8k6scwfn9")))) (build-system r-build-system) (propagated-inputs `(("r-callr" ,r-callr) From a11d29b4e9e26d1c5f06ee5af27bd8127b1ff38a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 21 Mar 2019 21:04:16 +0100 Subject: [PATCH 496/694] gnu: r-expm: Update to 0.999-4. * gnu/packages/cran.scm (r-expm): Update to 0.999-4. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index b40701c265..b405772aba 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4169,14 +4169,14 @@ (define-public r-trend (define-public r-expm (package (name "r-expm") - (version "0.999-3") + (version "0.999-4") (source (origin (method url-fetch) (uri (cran-uri "expm" version)) (sha256 (base32 - "04k4a6g071jkjc0d30ncmf713dj16brcs9m6pj43hnycc1caq6si")))) + "15k0acg2aqb2ajhwal6l7vhhp03m4lg579805d34554cl0kn9l2q")))) (build-system r-build-system) (propagated-inputs `(("r-matrix" ,r-matrix))) (native-inputs `(("gfortran" ,gfortran))) From c646d19ff77e681b979ad9b8f35fbd0b5af148fe Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 21 Mar 2019 21:04:33 +0100 Subject: [PATCH 497/694] gnu: r-mgcv: Update to 1.8-28. * gnu/packages/statistics.scm (r-mgcv): Update to 1.8-28. --- 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 dc47ea1e45..3689b04e23 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -593,14 +593,14 @@ (define-public r-nlme (define-public r-mgcv (package (name "r-mgcv") - (version "1.8-27") + (version "1.8-28") (source (origin (method url-fetch) (uri (cran-uri "mgcv" version)) (sha256 (base32 - "06vx1z52gcdmji0phmphfa0sg62gwxkw590prplxgv4da7xrk2y8")))) + "1snkpnkkigwrj9zm31j1nlivv9ls56imz263cv167hnmghiahpmm")))) (build-system r-build-system) (propagated-inputs `(("r-matrix" ,r-matrix) From 854f0603b6bda93ae1f2c530e178800b347b0490 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 21 Mar 2019 21:04:39 +0100 Subject: [PATCH 498/694] gnu: r-zoo: Update to 1.8-5. * gnu/packages/statistics.scm (r-zoo): Update to 1.8-5. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 3689b04e23..c23e136523 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4296,13 +4296,13 @@ (define-public r-rocr (define-public r-zoo (package (name "r-zoo") - (version "1.8-4") + (version "1.8-5") (source (origin (method url-fetch) (uri (cran-uri "zoo" version)) (sha256 (base32 - "1pywcp86kqijdrvl42qwdy75szrag9pzj0p88zbrj2r1klb8rn5i")))) + "09p8gmd5ifz80ahnhiianarsr5xx3nz76jzp90d7v3fjffcrcww7")))) (build-system r-build-system) (propagated-inputs `(("r-lattice" ,r-lattice))) From decea6eef0c9a83c90bdbb07e1640bc7e0a80d59 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 21 Mar 2019 21:04:47 +0100 Subject: [PATCH 499/694] gnu: r-recipes: Update to 0.1.5. * gnu/packages/cran.scm (r-recipes): Update to 0.1.5. [propagated-inputs]: Remove r-broom, r-ddalpha, r-dimred, and r-pls; add r-generics, r-glue, and r-tidyr. --- gnu/packages/cran.scm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index b405772aba..1a5e4a3573 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2704,30 +2704,29 @@ (define-public r-broom (define-public r-recipes (package (name "r-recipes") - (version "0.1.4") + (version "0.1.5") (source (origin (method url-fetch) (uri (cran-uri "recipes" version)) (sha256 (base32 - "0bwijw4427v2k5z3qci2kyr5dyzql8b3lvf88rwy16p741jckjsn")))) + "056zv4vhayyy8q9izcdknbb9hff2gxivg21g5mkssia78vw8g3mg")))) (build-system r-build-system) (propagated-inputs - `(("r-broom" ,r-broom) - ("r-ddalpha" ,r-ddalpha) - ("r-dimred" ,r-dimred) - ("r-dplyr" ,r-dplyr) + `(("r-dplyr" ,r-dplyr) + ("r-generics" ,r-generics) + ("r-glue" ,r-glue) ("r-gower" ,r-gower) ("r-ipred" ,r-ipred) ("r-lubridate" ,r-lubridate) ("r-magrittr" ,r-magrittr) ("r-matrix" ,r-matrix) - ("r-pls" ,r-pls) ("r-purrr" ,r-purrr) ("r-rcpproll" ,r-rcpproll) ("r-rlang" ,r-rlang) ("r-tibble" ,r-tibble) + ("r-tidyr" ,r-tidyr) ("r-tidyselect" ,r-tidyselect) ("r-timedate" ,r-timedate) ("r-withr" ,r-withr))) From b47e5a6cc3f7730efffb510846d023200583f9f0 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 21 Mar 2019 16:31:33 -0400 Subject: [PATCH 500/694] gnu: curl: Use hidden-package for curl's libssh2. This is a followup to commits c1f4e6491cecc5d121ef371a8fb2aa0a07030d36 and af8f7eb4f2a664c2d0fb3faabaf2e80c72993ef6. * gnu/packages/curl.scm (libssh2-1.8.0): Use hidden-package. --- gnu/packages/curl.scm | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 041853c6f3..9f2c27d623 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -50,20 +50,21 @@ (define-module (gnu packages curl) ;; XXX A hidden special obsolete libssh2 for temporary use in the curl package. ;; -(define libssh2-1.8.0 - (package - (inherit libssh2) - (version "1.8.0") - (source (origin - (method url-fetch) - (uri (string-append - "https://www.libssh2.org/download/libssh2-" - version ".tar.gz")) - (sha256 - (base32 - "1m3n8spv79qhjq4yi0wgly5s5rc8783jb1pyra9bkx1md0plxwrr")) - (patches - (search-patches "libssh2-fix-build-failure-with-gcrypt.patch")))))) +(define-public libssh2-1.8.0 + (hidden-package + (package + (inherit libssh2) + (version "1.8.0") + (source (origin + (method url-fetch) + (uri (string-append + "https://www.libssh2.org/download/libssh2-" + version ".tar.gz")) + (sha256 + (base32 + "1m3n8spv79qhjq4yi0wgly5s5rc8783jb1pyra9bkx1md0plxwrr")) + (patches + (search-patches "libssh2-fix-build-failure-with-gcrypt.patch"))))))) (define-public curl (package From d7e213163b6713b653b2cf626c1e12226316ced2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 21 Mar 2019 22:38:14 +0100 Subject: [PATCH 501/694] gnu: teckit: Use release tarball. * gnu/packages/fontutils.scm (teckit)[source]: Use URL-FETCH. [native-inputs]: Remove AUTOCONF, AUTOMAKE and LIBTOOL. --- gnu/packages/fontutils.scm | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 25ec9663c3..3e06ad982b 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -389,25 +389,20 @@ (define-public t1lib (define-public teckit (package (name "teckit") - (version "2.5.8") + (version "2.5.8") ;signed by key 0xC9183BEA0288CDEE (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/silnrsi/teckit") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) + (method url-fetch) + (uri (string-append "https://github.com/silnrsi/teckit/releases/" + "download/v" version "/teckit-" version ".tar.gz")) (sha256 - (base32 "1jmsdmfz7bgq1n5qsqgpq1b1n77f1hll0czfw5wkxz4knzb14ndn")))) + (base32 "00dy4hpxlf36xn9ngwy8p8hcvqjdmfzlfadihjl92dq8y5l1zprm")))) (build-system gnu-build-system) (inputs `(("zlib" ,zlib) ("expat" ,expat))) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool) - ("perl" ,perl))) ; for the tests + `(("perl" ,perl))) ;for the tests (synopsis "Toolkit for encoding conversions") (description "TECkit is a low-level toolkit intended to be used by other applications From 93a55838bf51e274ddf55222bf09c6208e5c069b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 21 Mar 2019 22:38:24 +0100 Subject: [PATCH 502/694] gnu: teckit: Adjust indentation. * gnu/packages/fontutils.scm (teckit): Re-indent. --- gnu/packages/fontutils.scm | 40 +++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 3e06ad982b..822ac3a4b4 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -388,24 +388,24 @@ (define-public t1lib (define-public teckit (package - (name "teckit") - (version "2.5.8") ;signed by key 0xC9183BEA0288CDEE - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/silnrsi/teckit/releases/" - "download/v" version "/teckit-" version ".tar.gz")) - (sha256 - (base32 "00dy4hpxlf36xn9ngwy8p8hcvqjdmfzlfadihjl92dq8y5l1zprm")))) - (build-system gnu-build-system) - (inputs - `(("zlib" ,zlib) - ("expat" ,expat))) - (native-inputs - `(("perl" ,perl))) ;for the tests - (synopsis "Toolkit for encoding conversions") - (description - "TECkit is a low-level toolkit intended to be used by other applications + (name "teckit") + (version "2.5.8") ;signed by key 0xC9183BEA0288CDEE + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/silnrsi/teckit/releases/" + "download/v" version "/teckit-" version ".tar.gz")) + (sha256 + (base32 "00dy4hpxlf36xn9ngwy8p8hcvqjdmfzlfadihjl92dq8y5l1zprm")))) + (build-system gnu-build-system) + (inputs + `(("zlib" ,zlib) + ("expat" ,expat))) + (native-inputs + `(("perl" ,perl))) ;for the tests + (synopsis "Toolkit for encoding conversions") + (description + "TECkit is a low-level toolkit intended to be used by other applications that need to perform encoding conversions (e.g., when importing legacy data into a Unicode-based application). The primary component of the TECkit package is therefore a library that performs conversions; this is the @@ -422,8 +422,8 @@ (define-public teckit primary means by which end users perform conversions, and they have not been designed, tested, and debugged to the extent that general-purpose applications should be.") - (license license:lgpl2.1+) - (home-page "http://scripts.sil.org/cms/scripts/page.php?cat_id=teckit"))) + (license license:lgpl2.1+) + (home-page "http://scripts.sil.org/cms/scripts/page.php?cat_id=teckit"))) (define-public graphite2 (package From 792d526a256773d1abe00b73c2a2131037148139 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 21 Mar 2019 22:39:02 +0100 Subject: [PATCH 503/694] gnu: teckit: Update to 2.5.9. * gnu/packages/fontutils.scm (teckit): Update to 2.5.9. --- gnu/packages/fontutils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 822ac3a4b4..6f8a8f90c8 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -389,14 +389,14 @@ (define-public t1lib (define-public teckit (package (name "teckit") - (version "2.5.8") ;signed by key 0xC9183BEA0288CDEE + (version "2.5.9") ;signed by key 0xC9183BEA0288CDEE (source (origin (method url-fetch) (uri (string-append "https://github.com/silnrsi/teckit/releases/" "download/v" version "/teckit-" version ".tar.gz")) (sha256 - (base32 "00dy4hpxlf36xn9ngwy8p8hcvqjdmfzlfadihjl92dq8y5l1zprm")))) + (base32 "0gbxyip4wdibirdg2pvzayzyy927vxyd6dfyfiflx8zg88qzn8v8")))) (build-system gnu-build-system) (inputs `(("zlib" ,zlib) From 340cae5631de37a8061c0529cec7e27988495754 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 21 Mar 2019 22:46:51 +0100 Subject: [PATCH 504/694] gnu: r-rlang: Update to 0.3.2. * gnu/packages/statistics.scm (r-rlang): Update to 0.3.2. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index c23e136523..35d483796c 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1635,13 +1635,13 @@ (define-public r-r6 (define-public r-rlang (package (name "r-rlang") - (version "0.3.1") + (version "0.3.2") (source (origin (method url-fetch) (uri (cran-uri "rlang" version)) (sha256 (base32 - "0lbi66bavca866k26dnpkxj3l106xr4a6khcsfn8i3i8w8mpnhih")))) + "13s8dh7nryjacp9jpi092icxf5ffkp16qxv59m923g5nkf8f03hi")))) (build-system r-build-system) (home-page "http://rlang.tidyverse.org") (synopsis "Functions for base types, core R and Tidyverse features") From 0a3ba39633cb52abdb37cadb91ab55b9e88fcfee Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 21 Mar 2019 22:47:01 +0100 Subject: [PATCH 505/694] gnu: r-assertthat: Update to 0.2.1. * gnu/packages/statistics.scm (r-assertthat): Update to 0.2.1. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 35d483796c..6face9910a 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1234,13 +1234,13 @@ (define-public r-svglite (define-public r-assertthat (package (name "r-assertthat") - (version "0.2.0") + (version "0.2.1") (source (origin (method url-fetch) (uri (cran-uri "assertthat" version)) (sha256 (base32 - "1wp5znk3xy338x6hknppk702jn596yr735d9i7c3wabm3sdzfgnp")))) + "17wy5bdfzg73sg2clisg1k3zyn1adkj59x56m5nwia2k8z67zkw5")))) (build-system r-build-system) (home-page "https://github.com/hadley/assertthat") (synopsis "Easy pre and post assertions") From 0c02f94f15fed0aa31e66caea0cb868820ce9ad1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 21 Mar 2019 22:47:21 +0100 Subject: [PATCH 506/694] gnu: Add r-picante. * gnu/packages/cran.scm (r-picante): New variable. --- gnu/packages/cran.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 1a5e4a3573..5bd164db30 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -11768,3 +11768,32 @@ (define-public r-rematch2 "This package provides wrappers on @code{regexpr} and @code{gregexpr} to return the match results in tidy data frames.") (license license:expat))) + +(define-public r-picante + (package + (name "r-picante") + (version "1.8") + (source + (origin + (method url-fetch) + (uri (cran-uri "picante" version)) + (sha256 + (base32 + "1bcq2j7fs89c2jib68qq6la67rxyg9raryf162mwvjakpf6k19l1")))) + (build-system r-build-system) + (propagated-inputs + `(("r-ape" ,r-ape) + ("r-nlme" ,r-nlme) + ("r-vegan" ,r-vegan))) + (home-page "https://cran.r-project.org/web/packages/picante/") + (synopsis "Integrating phylogenies and ecology") + (description + "This package provides functions for phylocom integration, community +analyses, null-models, traits and evolution. It implements numerous +ecophylogenetic approaches including measures of community phylogenetic and +trait diversity, phylogenetic signal, estimation of trait values for +unobserved taxa, null models for community and phylogeny randomizations, and +utility functions for data input/output and phylogeny plotting. A full +description of package functionality and methods are provided by Kembel et +al. (2010).") + (license license:gpl2))) From 93f178b5a84a8cc5a0c552290191efd2310588b5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 21 Mar 2019 22:48:54 +0100 Subject: [PATCH 507/694] gnu: Add r-reinforcelearn. * gnu/packages/cran.scm (r-reinforcelearn): 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 5bd164db30..5a3762fd7a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -11797,3 +11797,29 @@ (define-public r-picante description of package functionality and methods are provided by Kembel et al. (2010).") (license license:gpl2))) + +(define-public r-reinforcelearn + (package + (name "r-reinforcelearn") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "reinforcelearn" version)) + (sha256 + (base32 + "0naakmyb14d2cf7cy5ir52qh3bp51gvs6hyhfi3f72yl2jfnnpzg")))) + (build-system r-build-system) + (propagated-inputs + `(("r-checkmate" ,r-checkmate) + ("r-nnet" ,r-nnet) + ("r-purrr" ,r-purrr) + ("r-r6" ,r-r6))) + (home-page "https://markusdumke.github.io/reinforcelearn") + (synopsis "Reinforcement learning") + (description + "This package implements reinforcement learning environments and +algorithms as described in Sutton & Barto (1998). The Q-Learning algorithm +can be used with function approximation, eligibility traces (Singh & Sutton, +1996) and experience replay (Mnih et al., 2013).") + (license license:expat))) From 03fb5ff6ae01a680c786d9ee148839543c519411 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Thu, 21 Mar 2019 23:29:10 +0100 Subject: [PATCH 508/694] gnu: libgit2: Avoid Python. * gnu/packages/patches/libgit2-avoid-python.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/version-control.scm (libgit2)[source]: Use it. [inputs]: Remove python. [native-inputs]: Add guile-2.2. --- gnu/local.mk | 1 + .../patches/libgit2-avoid-python.patch | 304 ++++++++++++++++++ gnu/packages/version-control.scm | 10 +- 3 files changed, 311 insertions(+), 4 deletions(-) create mode 100644 gnu/packages/patches/libgit2-avoid-python.patch diff --git a/gnu/local.mk b/gnu/local.mk index b3c54a752a..d85679b2a8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -972,6 +972,7 @@ dist_patch_DATA = \ %D%/packages/patches/libexif-CVE-2016-6328.patch \ %D%/packages/patches/libexif-CVE-2017-7544.patch \ %D%/packages/patches/libgcrypt-make-yat2m-reproducible.patch \ + %D%/packages/patches/libgit2-avoid-python.patch \ %D%/packages/patches/libgit2-mtime-0.patch \ %D%/packages/patches/libgdata-fix-tests.patch \ %D%/packages/patches/libgdata-glib-duplicate-tests.patch \ diff --git a/gnu/packages/patches/libgit2-avoid-python.patch b/gnu/packages/patches/libgit2-avoid-python.patch new file mode 100644 index 0000000000..c850974404 --- /dev/null +++ b/gnu/packages/patches/libgit2-avoid-python.patch @@ -0,0 +1,304 @@ +diff -ruN orig/libgit2-0.27.7/tests/CMakeLists.txt libgit2-0.27.7/tests/CMakeLists.txt +--- orig/libgit2-0.27.7/tests/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 ++++ libgit2-0.27.7/tests/CMakeLists.txt 2019-03-04 11:13:06.640118979 +0100 +@@ -1,10 +1,3 @@ +-FIND_PACKAGE(PythonInterp) +- +-IF(NOT PYTHONINTERP_FOUND) +- MESSAGE(FATAL_ERROR "Could not find a python interpeter, which is needed to build the tests. " +- "Make sure python is available, or pass -DBUILD_CLAR=OFF to skip building the tests") +-ENDIF() +- + SET(CLAR_FIXTURES "${CMAKE_CURRENT_SOURCE_DIR}/resources/") + SET(CLAR_PATH "${CMAKE_CURRENT_SOURCE_DIR}") + ADD_DEFINITIONS(-DCLAR_FIXTURE_PATH=\"${CLAR_FIXTURES}\") +@@ -21,7 +14,7 @@ + + ADD_CUSTOM_COMMAND( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/clar.suite +- COMMAND ${PYTHON_EXECUTABLE} generate.py -o "${CMAKE_CURRENT_BINARY_DIR}" -f -xonline -xstress -xperf . ++ COMMAND guile generate.scm -o "${CMAKE_CURRENT_BINARY_DIR}" -f -x online -x stress -x perf . + DEPENDS ${SRC_TEST} + WORKING_DIRECTORY ${CLAR_PATH} + ) +diff -ruN orig/libgit2-0.27.7/tests/generate.scm libgit2-0.27.7/tests/generate.scm +--- orig/libgit2-0.27.7/tests/generate.scm 1970-01-01 01:00:00.000000000 +0100 ++++ libgit2-0.27.7/tests/generate.scm 2019-03-04 12:18:00.688040975 +0100 +@@ -0,0 +1,277 @@ ++;; -*- geiser-scheme-implementation: guile -*- ++ ++;;; Implementation: Danny Milosavljevic ++;;; Based on: Implementation in Python by Vicent Marti. ++;;; License: ISC, like the original generate.py in clar. ++ ++(use-modules (ice-9 ftw)) ++(use-modules (ice-9 regex)) ++(use-modules (ice-9 getopt-long)) ++(use-modules (ice-9 rdelim)) ++(use-modules (ice-9 match)) ++(use-modules (ice-9 textual-ports)) ++(use-modules (srfi srfi-1)) ++ ++(define (render-callback cb) ++ (if cb ++ (string-append " { \"" (assoc-ref cb "short-name") "\", &" ++ (assoc-ref cb "symbol") " }") ++ " { NULL, NULL }")) ++ ++(define (replace needle replacement haystack) ++ "Replace all occurences of NEEDLE in HAYSTACK by REPLACEMENT. ++NEEDLE is a regular expression." ++ (regexp-substitute/global #f needle haystack 'pre replacement 'post)) ++ ++(define (skip-comments* text) ++ (call-with-input-string ++ text ++ (lambda (port) ++ (let loop ((result '()) ++ (section #f)) ++ (define (consume-char) ++ (cons (read-char port) result)) ++ (define (skip-char) ++ (read-char port) ++ result) ++ (match section ++ (#f ++ (match (peek-char port) ++ (#\/ (loop (consume-char) 'almost-in-block-comment)) ++ (#\" (loop (consume-char) 'in-string-literal)) ++ (#\' (loop (consume-char) 'in-character-literal)) ++ ((? eof-object?) result) ++ (_ (loop (consume-char) section)))) ++ ('almost-in-block-comment ++ (match (peek-char port) ++ (#\* (loop (consume-char) 'in-block-comment)) ++ (#\/ (loop (consume-char) 'in-line-comment)) ++ ((? eof-object?) result) ++ (_ (loop (consume-char) #f)))) ++ ('in-line-comment ++ (match (peek-char port) ++ (#\newline (loop (consume-char) #f)) ++ ((? eof-object?) result) ++ (_ (loop (skip-char) section)))) ++ ('in-block-comment ++ (match (peek-char port) ++ (#\* (loop (skip-char) 'almost-out-of-block-comment)) ++ ((? eof-object?) result) ++ (_ (loop (skip-char) section)))) ++ ('almost-out-of-block-comment ++ (match (peek-char port) ++ (#\/ (loop (cons (read-char port) (cons #\* result)) #f)) ++ (#\* (loop (skip-char) 'almost-out-of-block-comment)) ++ ((? eof-object?) result) ++ (_ (loop (skip-char) 'in-block-comment)))) ++ ('in-string-literal ++ (match (peek-char port) ++ (#\\ (loop (consume-char) 'in-string-literal-escape)) ++ (#\" (loop (consume-char) #f)) ++ ((? eof-object?) result) ++ (_ (loop (consume-char) section)))) ++ ('in-string-literal-escape ++ (match (peek-char port) ++ ((? eof-object?) result) ++ (_ (loop (consume-char) 'in-string-literal)))) ++ ('in-character-literal ++ (match (peek-char port) ++ (#\\ (loop (consume-char) 'in-character-literal-escape)) ++ (#\' (loop (consume-char) #f)) ++ ((? eof-object?) result) ++ (_ (loop (consume-char) section)))) ++ ('in-character-literal-escape ++ (match (peek-char port) ++ ((? eof-object?) result) ++ (_ (loop (consume-char) 'in-character-literal))))))))) ++ ++(define (skip-comments text) ++ (list->string (reverse (skip-comments* text)))) ++ ++(define (maybe-only items) ++ (match items ++ ((a) a) ++ (_ #f))) ++ ++(define (Module name path excludes) ++ (let* ((clean-name (replace "_" "::" name)) ++ (enabled (not (any (lambda (exclude) ++ (string-prefix? exclude clean-name)) ++ excludes)))) ++ (define (parse contents) ++ (define (cons-match match prev) ++ (cons ++ `(("declaration" . ,(match:substring match 1)) ++ ("symbol" . ,(match:substring match 2)) ++ ("short-name" . ,(match:substring match 3))) ++ prev)) ++ (let* ((contents (skip-comments contents)) ++ (entries (fold-matches (make-regexp ++ (string-append "^(void\\s+(test_" ++ name ++ "__(\\w+))\\s*\\(\\s*void\\s*\\))\\s*\\{") ++ regexp/newline) ++ contents ++ '() ++ cons-match)) ++ (entries (reverse entries)) ++ (callbacks (filter (lambda (entry) ++ (match (assoc-ref entry "short-name") ++ ("initialize" #f) ++ ("cleanup" #f) ++ (_ #t))) ++ entries))) ++ (if (> (length callbacks) 0) ++ `(("name" . ,name) ++ ("enabled" . ,(if enabled "1" "0")) ++ ("clean-name" . ,clean-name) ++ ("initialize" . ,(maybe-only (filter-map (lambda (entry) ++ (match (assoc-ref entry "short-name") ++ ("initialize" entry) ++ (_ #f))) ++ entries))) ++ ("cleanup" . ,(maybe-only (filter-map (lambda (entry) ++ (match (assoc-ref entry "short-name") ++ ("cleanup" entry) ++ (_ #f))) ++ entries))) ++ ("callbacks" . ,callbacks)) ++ #f))) ++ ++ (define (refresh path) ++ (and (file-exists? path) ++ (parse (call-with-input-file path get-string-all)))) ++ (refresh path))) ++ ++(define (generate-TestSuite path output excludes) ++ (define (load) ++ (define enter? (const #t)) ++ (define (leaf file stat result) ++ (let* ((module-root (string-drop (dirname file) ++ (string-length path))) ++ (module-root (filter-map (match-lambda ++ ("" #f) ++ (a a)) ++ (string-split module-root #\/)))) ++ (define (make-module path) ++ (let* ((name (string-join (append module-root (list (string-drop-right (basename path) (string-length ".c")))) "_")) ++ (name (replace "-" "_" name))) ++ (Module name path excludes))) ++ (if (string-suffix? ".c" file) ++ (let ((module (make-module file))) ++ (if module ++ (cons module result) ++ result)) ++ result))) ++ (define (down dir stat result) ++ result) ++ (define (up file state result) ++ result) ++ (define skip (const #f)) ++ (file-system-fold enter? leaf down up skip error '() path)) ++ ++ (define (CallbacksTemplate module) ++ (string-append "static const struct clar_func _clar_cb_" ++ (assoc-ref module "name") "[] = {\n" ++ (string-join (map render-callback ++ (assoc-ref module "callbacks")) ++ ",\n") ++ "\n};\n")) ++ ++ (define (DeclarationTemplate module) ++ (string-append (string-join (map (lambda (cb) ++ (string-append "extern " ++ (assoc-ref cb "declaration") ++ ";")) ++ (assoc-ref module "callbacks")) ++ "\n") ++ "\n" ++ (if (assoc-ref module "initialize") ++ (string-append "extern " (assoc-ref (assoc-ref module "initialize") "declaration") ";\n") ++ "") ++ (if (assoc-ref module "cleanup") ++ (string-append "extern " (assoc-ref (assoc-ref module "cleanup") "declaration") ";\n") ++ ""))) ++ ++ (define (InfoTemplate module) ++ (string-append " ++ { ++ \"" (assoc-ref module "clean-name") "\", ++ " (render-callback (assoc-ref module "initialize")) ", ++ " (render-callback (assoc-ref module "cleanup")) ", ++ _clar_cb_" (assoc-ref module "name") ", " ++ (number->string (length (assoc-ref module "callbacks"))) ++ ", " (assoc-ref module "enabled") " ++ }")) ++ ++ (define (Write data) ++ (define (name< module-a module-b) ++ (stringstring (suite-count))) ++ (callback-count-str (number->string (callback-count)))) ++ (display-x "static const size_t _clar_suite_count = ") ++ (display-x suite-count-str) ++ (display-x ";\n") ++ ++ (display-x "static const size_t _clar_callback_count = ") ++ (display-x callback-count-str) ++ (display-x ";\n") ++ ++ (display (string-append "Written `clar.suite` (" ++ callback-count-str ++ " tests in " ++ suite-count-str ++ " suites)")) ++ (newline)) ++ #t) ++ ++ (call-with-output-file (string-append output "/clar.suite") Write)) ++ ++;;; main ++ ++(define (main) ++ (define option-spec ++ '((force (single-char #\f) (value #f)) ++ (exclude (single-char #\x) (value #t)) ++ (output (single-char #\o) (value #t)) ++ (help (single-char #\h) (value #f)))) ++ ++ (define options (getopt-long (command-line) option-spec #:stop-at-first-non-option #t)) ++ (define args (reverse (option-ref options '() '()))) ++ (when (> (length args) 1) ++ (display "More than one path given\n") ++ (exit 1)) ++ ++ (if (< (length args) 1) ++ (set! args '("."))) ++ ++ (let* ((path (car args)) ++ (output (option-ref options 'output path)) ++ (excluded (filter-map (match-lambda ++ (('exclude . value) value) ++ (_ #f)) ++ options))) ++ (generate-TestSuite path output excluded))) ++ ++(main) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 385ebeadc9..9a6f96ce14 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -68,6 +68,7 @@ (define-module (gnu packages version-control) #:use-module (gnu packages gettext) #:use-module (gnu packages gl) #:use-module (gnu packages groff) + #:use-module (gnu packages guile) #:use-module (gnu packages haskell) #:use-module (gnu packages haskell-check) #:use-module (gnu packages haskell-crypto) @@ -535,7 +536,8 @@ (define-public libgit2 (sha256 (base32 "0swk2dyq5a4p1jn5wvbcsrxckhh808vifxz5y8w663avg541188c")) - (patches (search-patches "libgit2-mtime-0.patch")) + (patches (search-patches "libgit2-avoid-python.patch" + "libgit2-mtime-0.patch")) ;; Remove bundled software. (snippet '(begin @@ -561,10 +563,10 @@ (define-public libgit2 (lambda _ (invoke "./libgit2_clar" "-v" "-Q")))))) (inputs `(("libssh2" ,libssh2) - ("http-parser" ,http-parser) - ("python" ,python-wrapper))) + ("http-parser" ,http-parser))) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("guile" ,guile-2.2) + ("pkg-config" ,pkg-config))) (propagated-inputs ;; These two libraries are in 'Requires.private' in libgit2.pc. `(("openssl" ,openssl) From 8c1d3395b33e4974e02b1d9a72223140d1c23253 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 21 Mar 2019 19:30:37 +0100 Subject: [PATCH 509/694] gnu: nspr: Update to 4.21. * gnu/packages/gnuzilla.scm (nspr): Update to 4.21. --- gnu/packages/gnuzilla.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index dcfae85c1a..268d7618f1 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -407,7 +407,7 @@ (define-public mozjs-60 (define-public nspr (package (name "nspr") - (version "4.20") + (version "4.21") (source (origin (method url-fetch) (uri (string-append @@ -415,7 +415,7 @@ (define-public nspr version "/src/nspr-" version ".tar.gz")) (sha256 (base32 - "0vjms4j75zvv5b2siyafg7hh924ysx2cwjad8spzp7x87n8n929c")))) + "0nkbgk0x31nfm4xl8la0a3vrnpa8gzkh7g4k65p7n880n73k5shm")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl))) From 6f99fb5be05730cbdcb9139075a8aee5e6696462 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 21 Mar 2019 19:31:34 +0100 Subject: [PATCH 510/694] gnu: nss, nss-certs: Update to 3.43. * gnu/packages/gnuzilla.scm (nss): Update to 3.43. * gnu/packages/certs.scm (nss-certs): Ditto. --- gnu/packages/certs.scm | 4 ++-- gnu/packages/gnuzilla.scm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/certs.scm b/gnu/packages/certs.scm index 89f2ff2884..ae3db7b10b 100644 --- a/gnu/packages/certs.scm +++ b/gnu/packages/certs.scm @@ -76,7 +76,7 @@ (define certdata2pem (define-public nss-certs (package (name "nss-certs") - (version "3.42.1") + (version "3.43") (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -87,7 +87,7 @@ (define-public nss-certs "nss-" version ".tar.gz"))) (sha256 (base32 - "1ihzqspvqjmysp1c15xxr7kqvj3zm9dqnanxhkaxyjgx71yv6z88")))) + "1jp27w4w9nj5pkzrbc1zqj6pa09h2yy7vhzyx5fvg1q86fvw22zk")))) (build-system gnu-build-system) (outputs '("out")) (native-inputs diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 268d7618f1..4260dfc15d 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -443,7 +443,7 @@ (define-public nspr (define-public nss (package (name "nss") - (version "3.42.1") + (version "3.43") (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -454,7 +454,7 @@ (define-public nss "nss-" version ".tar.gz"))) (sha256 (base32 - "1ihzqspvqjmysp1c15xxr7kqvj3zm9dqnanxhkaxyjgx71yv6z88")) + "1jp27w4w9nj5pkzrbc1zqj6pa09h2yy7vhzyx5fvg1q86fvw22zk")) ;; Create nss.pc and nss-config. (patches (search-patches "nss-pkgconfig.patch" "nss-increase-test-timeout.patch")))) From 6a715a00d306fe2fe6bca3be31b209bf7ea9bf01 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Fri, 22 Mar 2019 11:55:39 +0100 Subject: [PATCH 511/694] gnu: libgit2: Add comments. * gnu/packages/patches/libgit2-avoid-python.patch: Add comments. --- .../patches/libgit2-avoid-python.patch | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gnu/packages/patches/libgit2-avoid-python.patch b/gnu/packages/patches/libgit2-avoid-python.patch index c850974404..b2e5141563 100644 --- a/gnu/packages/patches/libgit2-avoid-python.patch +++ b/gnu/packages/patches/libgit2-avoid-python.patch @@ -1,3 +1,21 @@ +This provides a Guile reimplementation of clar's "generate.py". +It makes it possible for us to remove Python from libgit2's build-time +dependencies. +libgit2 is used in order to fetch a lot of sources for guix packages. +Both Python2 and Python3 builds acted up in the past. +Hence this patch which makes the number of libgit2 dependencies very +small. +The reimplementation tries to keep as close as possible to the original +in both structure and runtime effect. Some things are thus overly +convoluted just to make them the same as in the original. + +Both implementations basically do: + +grep -r 'test_.*__.*' . > clar.suite + +It is important that the directory traversal order of the original and +the reimplementation stay the same. + diff -ruN orig/libgit2-0.27.7/tests/CMakeLists.txt libgit2-0.27.7/tests/CMakeLists.txt --- orig/libgit2-0.27.7/tests/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ libgit2-0.27.7/tests/CMakeLists.txt 2019-03-04 11:13:06.640118979 +0100 From 304ed82c5365da11ba331d362a03d87e44f2d9b8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 Mar 2019 04:13:18 +0100 Subject: [PATCH 512/694] gnu: graphicsmagick: Don't use NAME in source URI. * gnu/packages/imagemagick.scm (graphicsmagick)[source]: Hard-code NAME. --- gnu/packages/imagemagick.scm | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm index dafe8c76ed..e42c0736cd 100644 --- a/gnu/packages/imagemagick.scm +++ b/gnu/packages/imagemagick.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2016 Leo Famulari ;;; Copyright © 2016 Mark H Weaver ;;; Copyright © 2017 Efraim Flashner -;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Alex Vong ;;; ;;; This file is part of GNU Guix. @@ -171,18 +171,18 @@ (define-public graphicsmagick (package (name "graphicsmagick") (version "1.3.30") - (source (origin - (method url-fetch) - (uri - (list - (string-append "mirror://sourceforge/" name "/" name - "/" version "/GraphicsMagick-" version ".tar.xz") - (string-append "ftp://ftp.graphicsmagick.org/pub/" - "GraphicsMagick/" (version-major+minor version) - "/GraphicsMagick-" version ".tar.xz"))) - (sha256 - (base32 - "1warar0731xf94r4bn5x1km85rjabl4iq8r0dk3ywmczap3farfr")))) + (source + (origin + (method url-fetch) + (uri + (list + (string-append "mirror://sourceforge/graphicsmagick/graphicsmagick" + "/" version "/GraphicsMagick-" version ".tar.xz") + (string-append "ftp://ftp.graphicsmagick.org/pub/" + "GraphicsMagick/" (version-major+minor version) + "/GraphicsMagick-" version ".tar.xz"))) + (sha256 + (base32 "1warar0731xf94r4bn5x1km85rjabl4iq8r0dk3ywmczap3farfr")))) (build-system gnu-build-system) (arguments `(#:configure-flags From b97df9e5709664357bd14259de35cb723decc7b1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 Mar 2019 14:41:41 +0100 Subject: [PATCH 513/694] gnu: graphicsmagick: Update to 1.3.31. * gnu/packages/imagemagick.scm (graphicsmagick): Update to 1.3.31. --- 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 e42c0736cd..308f32e5a6 100644 --- a/gnu/packages/imagemagick.scm +++ b/gnu/packages/imagemagick.scm @@ -170,7 +170,7 @@ (define-public perl-image-magick (define-public graphicsmagick (package (name "graphicsmagick") - (version "1.3.30") + (version "1.3.31") (source (origin (method url-fetch) @@ -182,7 +182,7 @@ (define-public graphicsmagick "GraphicsMagick/" (version-major+minor version) "/GraphicsMagick-" version ".tar.xz"))) (sha256 - (base32 "1warar0731xf94r4bn5x1km85rjabl4iq8r0dk3ywmczap3farfr")))) + (base32 "0y22740f25qxsqqqg26xqlfp920dm57b7hrgaqmx7azksrcvnsq9")))) (build-system gnu-build-system) (arguments `(#:configure-flags From 9716f6211944ff134530a08c9b61ab2663662a4d Mon Sep 17 00:00:00 2001 From: Marco van Hulten Date: Fri, 22 Mar 2019 11:04:37 +0100 Subject: [PATCH 514/694] gnu: claws-mail: Enable LDAP support. * gnu/packages/mail.scm (claws-mail)[arguments]: Add "--enable-ldap" to configure flags. Signed-off-by: Ricardo Wurmus --- gnu/packages/mail.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 278ad1f7ef..9d09cade29 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1127,7 +1127,8 @@ (define-public claws-mail ("mime-info" ,shared-mime-info))) (arguments '(#:configure-flags - '("--enable-gnutls" "--enable-pgpmime-plugin" "--enable-enchant") + '("--enable-gnutls" "--enable-pgpmime-plugin" "--enable-enchant" + "--enable-ldap") #:make-flags ;; Disable updating icon cache since it's done by the profile hook. ;; Conflict with other packages in the profile would be inevitable From 70d6a614243cb8222f33a583be632d62f58817d2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Mar 2019 16:01:26 +0100 Subject: [PATCH 515/694] gnu: parallel: Update to 20190322. * gnu/packages/parallel.scm (parallel): Update to 20190322. --- gnu/packages/parallel.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index ad9ce23718..167d03b954 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -48,15 +48,14 @@ (define-module (gnu packages parallel) (define-public parallel (package (name "parallel") - (version "20190222") + (version "20190322") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/parallel/parallel-" version ".tar.bz2")) (sha256 - (base32 - "073bj0ji9liq07j6a7y9i4kxfkv06kvavhh7654f2bgfavfbmcc6")))) + (base32 "12q0ys0dp019wykx7jcqbrilz8798hgb66k97aj2s2m7xdpw41ym")))) (build-system gnu-build-system) (arguments `(#:phases From fdfaba90320b93af9014eb35261486d3311febd1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 22 Mar 2019 16:15:16 +0100 Subject: [PATCH 516/694] gnu: Add starlong. * gnu/packages/bioinformatics.scm (starlong): New variable. --- gnu/packages/bioinformatics.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index ccb49cac9e..1836939970 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6347,6 +6347,28 @@ (define-public star ;; STAR is licensed under GPLv3 or later; htslib is MIT-licensed. (license license:gpl3+))) +(define-public starlong + (package (inherit star) + (name "starlong") + (arguments + (substitute-keyword-arguments (package-arguments star) + ((#:make-flags flags) + `(list "STARlong")) + ((#:phases phases) + `(modify-phases ,phases + ;; Allow extra long sequence reads. + (add-after 'unpack 'make-extra-long + (lambda _ + (substitute* "source/IncludeDefine.h" + (("(#define DEF_readNameLengthMax ).*" _ match) + (string-append match "900000\n"))) + #t)) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((bin (string-append (assoc-ref outputs "out") "/bin/"))) + (install-file "STARlong" bin)) + #t)))))))) + (define-public subread (package (name "subread") From 813f866a90cf42bc8707712c07b30ed762ce5409 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 22 Mar 2019 18:42:26 +0100 Subject: [PATCH 517/694] gnu: emacs-xr: Update to 1.9. * gnu/packages/emacs-xyz.scm (emacs-xr): Update to 1.9. --- 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 2ffca732ba..0f040b2b07 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -750,7 +750,7 @@ (define-public emacs-anaphora (define-public emacs-xr (package (name "emacs-xr") - (version "1.7") + (version "1.9") (source (origin (method url-fetch) @@ -758,7 +758,7 @@ (define-public emacs-xr "https://elpa.gnu.org/packages/xr-" version ".tar")) (sha256 (base32 - "099r88s2giv95nkwiim1cx8fy7cvv1pg1701733p4ami82ldsdw0")))) + "1mcild3034f4c1x8x05w9q0ps70i1nihvih22cmh3wj4cgllg5w0")))) (build-system emacs-build-system) (home-page "http://elpa.gnu.org/packages/xr.html") (synopsis "Convert string regexp to rx notation") From c6e775a875fc71172b793dd039ed32666315f764 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 22 Mar 2019 19:12:34 +0100 Subject: [PATCH 518/694] gnu: tlp: Update to 1.2.1. * gnu/packages/linux.scm (tlp): Update to 1.2.1. --- gnu/packages/linux.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 0a7a5d8028..bc2219b1fa 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2016, 2017 Alex Kost ;;; Copyright © 2016 Raymond Nicholson ;;; Copyright © 2016 Mathieu Lirzin -;;; Copyright © 2016, 2018 Nicolas Goaziou +;;; Copyright © 2016, 2018, 2019 Nicolas Goaziou ;;; Copyright © 2016, 2018, 2019 Ricardo Wurmus ;;; Copyright © 2016 David Craven ;;; Copyright © 2016 John Darrington @@ -4270,7 +4270,7 @@ (define-public light (define-public tlp (package (name "tlp") - (version "1.1") + (version "1.2.1") (source (origin (method url-fetch) (uri (string-append @@ -4280,7 +4280,7 @@ (define-public tlp (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "068hzmh90x600saynbl7iwg1pm0ywldn4jazyxx5y1fixs8s1qbn")))) + "0rcp9i0fisdm4h6799ffr696l1vl661fnwb2dij268nlwwmkr90g")))) (inputs `(("bash" ,bash) ("dbus" ,dbus) ("ethtool" ,ethtool) @@ -4310,7 +4310,8 @@ (define-public tlp (setenv "TLP_NO_PMUTILS" "1") (setenv "TLP_SBIN" (string-append out "/bin")) (setenv "TLP_BIN" (string-append out "/bin")) - (setenv "TLP_TLIB" (string-append out "/share/tlp-pm")) + (setenv "TLP_TLIB" (string-append out "/share/tlp")) + (setenv "TLP_FLIB" (string-append out "/share/tlp/func.d")) (setenv "TLP_ULIB" (string-append out "/lib/udev")) (setenv "TLP_CONF" "/etc/tlp") (setenv "TLP_SHCPL" @@ -4364,7 +4365,6 @@ (define (sbin-directory input-name) a default configuration already optimized for battery life. Nevertheless, TLP is customizable to fulfil system requirements. TLP settings are applied every time the power supply source is changed.") - ;; 'COPYING' is a custom version that says that one file is GPLv3+ and the ;; rest is GPLv2+. (license (list license:gpl2+ license:gpl3+)))) From ac3c14fb0712b0672a4a237dc9d267ee148597fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 22 Mar 2019 13:53:47 +0100 Subject: [PATCH 519/694] system: Fix misleading comments. * gnu/system.scm ()[skeletons, services]: Fix misleading type comments. --- gnu/system.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/system.scm b/gnu/system.scm index e6c86cb9ba..6bccdaa8c2 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -181,7 +181,7 @@ (define-record-type* operating-system (groups operating-system-groups ; list of user groups (default %base-groups)) - (skeletons operating-system-skeletons ; list of name/monadic value + (skeletons operating-system-skeletons ; list of name/file-like value (default (default-skeletons))) (issue operating-system-issue ; string (default %default-issue)) @@ -199,7 +199,7 @@ (define-record-type* operating-system (name-service-switch operating-system-name-service-switch ; (default %default-nss)) - (services operating-system-user-services ; list of monadic services + (services operating-system-user-services ; list of services (default %base-services)) (pam-services operating-system-pam-services ; list of PAM services From 0dc7d298a33f83d5f02a962b5f1bd24ee0e8ef07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 22 Mar 2019 22:03:38 +0100 Subject: [PATCH 520/694] vm: 'system-docker-image' calls 'sync' before rebooting. Previously we could end up silently building truncated tarballs. * gnu/system/vm.scm (system-docker-image)[build]: Add call to 'sync'. --- gnu/system/vm.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index b671c74ab8..55cddb1a4b 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -526,7 +526,10 @@ (define build #$os-drv #:compressor '(#+(file-append gzip "/bin/gzip") "-9n") #:creation-time (make-time time-utc 0 1) - #:transformations `((,root-directory -> "")))))))) + #:transformations `((,root-directory -> ""))) + + ;; Make sure the tarball is fully written before rebooting. + (sync)))))) (expression->derivation-in-linux-vm name build #:make-disk-image? #f From 1b17c23ebcabba7264ed2447971fb6409b5cd41a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20=C4=8Cech?= Date: Tue, 19 Mar 2019 08:34:10 +0100 Subject: [PATCH 521/694] gnu: Add xl2tpd. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/vpn.scm (xl2tpd): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/vpn.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 6475a738d4..e164d9aa4c 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -35,6 +35,7 @@ (define-module (gnu packages vpn) #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (gnu packages) + #:use-module (gnu packages admin) #:use-module (gnu packages base) #:use-module (gnu packages check) #:use-module (gnu packages autotools) @@ -517,3 +518,31 @@ (define-public wireguard that can be applied to a Linux kernel source tree in order to build it with WireGuard support.") (license license:gpl2))) + +(define-public xl2tpd + (package + (name "xl2tpd") + (version "1.3.13") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/xelerance/xl2tpd") + (commit (string-append "v" version)))) + (sha256 + (base32 + "1nzkmhi9arwd4smhr07l0sssx46w48z0cblv7xcz25wg4hw86mcd")) + (file-name (string-append "xl2tpd-" version "-checkout")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags (list (string-append "DESTDIR=" %output) + "CC=gcc") + #:phases (modify-phases %standard-phases + (delete 'configure)) + #:tests? #f)) ;; no tests provided + (inputs `(("libpcap" ,libpcap))) + (home-page "https://www.xelerance.com/software/xl2tpd/") + (synopsis "Layer 2 Tunnelling Protocol Daemon (RFC 2661)") + (description + "xl2tpd is an implementation of the Layer 2 Tunnelling Protocol (RFC 2661). +L2TP allows you to tunnel PPP over UDP.") + (license license:gpl2))) From 10384f880a9810baafc970d3bbef693d43480c4c Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 22 Mar 2019 17:00:20 -0400 Subject: [PATCH 522/694] gnu: VLC: Fix build with libssh2 > 1.8.0. * gnu/packages/video.scm (vlc)[arguments]: Adjust the faulty libssh2 feature detection macro. --- gnu/packages/video.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index dc277de518..838bb036eb 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1139,6 +1139,12 @@ (define-public vlc (substitute* "modules/gui/qt/components/simple_preferences.cpp" (("#include ") "#include #include ")) + + ;; Fix build with libssh2 > 1.8.0: + ;; + ;; + (substitute* "modules/access/sftp.c" + (("010801") "010900")) #t))) (add-after 'strip 'regenerate-plugin-cache (lambda* (#:key outputs #:allow-other-keys) From d349e6d9a8602ebb21433fb4db0f5a2f03afe78e Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 22 Mar 2019 17:28:47 -0400 Subject: [PATCH 523/694] gnu: vlc: Remove obsolete patches. * gnu/packages/video.scm (vlc)[arguments]: Remove obsolete Qt 5.11 changes in 'patch-source' phase. --- gnu/packages/video.scm | 8 -------- 1 file changed, 8 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 838bb036eb..fe60d11d26 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1132,14 +1132,6 @@ (define-public vlc (substitute* "modules/text_renderer/freetype/text_layout.c" (("# define FRIBIDI_NO_DEPRECATED 1") "")) - ;; Fix build against Qt 5.11. - (substitute* "modules/gui/qt/actions_manager.cpp" - (("#include ") "#include -#include ")) - (substitute* "modules/gui/qt/components/simple_preferences.cpp" - (("#include ") "#include -#include ")) - ;; Fix build with libssh2 > 1.8.0: ;; ;; From 6023ecab579f75384abe8a5772de24b5e1e85ae1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Mar 2019 13:59:21 +0100 Subject: [PATCH 524/694] gnu: bind: Return #T from all phases. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/dns.scm (isc-bind)[arguments]: Move #T from ‘check’ to ‘move-to-utils’ phase. --- gnu/packages/dns.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 034fe6916a..461d9f8c0c 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -146,7 +146,8 @@ (define-public isc-bind "/share/man/man1/dig.1" "/share/man/man1/host.1" "/share/man/man1/nslookup.1" - "/share/man/man1/nsupdate.1")))) + "/share/man/man1/nsupdate.1")) + #t)) ;; When and if guix provides user namespaces for the build process, ;; then the following can be uncommented and the subsequent "force-test" ;; will not be necessary. @@ -156,8 +157,7 @@ (define-public isc-bind ;; (system "bin/tests/system/ifconfig.sh up"))) (replace 'check (lambda _ - (invoke "make" "force-test") - #t))))) + (invoke "make" "force-test")))))) (synopsis "An implementation of the Domain Name System") (description "BIND is an implementation of the @dfn{Domain Name System} (DNS) protocols for the Internet. It is a reference implementation of those From 35e4e3597f492ddc70a8e68305269e5cdbb9d04d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Mar 2019 15:22:18 +0100 Subject: [PATCH 525/694] gnu: perl-lingua-en-tagger: Update to 0.30. * gnu/packages/language.scm (perl-lingua-en-tagger): Update to 0.30. --- gnu/packages/language.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index 46b60b7055..73376feecb 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -149,7 +149,7 @@ (define-public perl-lingua-en-number-isordinal (define-public perl-lingua-en-tagger (package (name "perl-lingua-en-tagger") - (version "0.29") + (version "0.30") (source (origin (method url-fetch) @@ -157,7 +157,7 @@ (define-public perl-lingua-en-tagger "Lingua-EN-Tagger-" version ".tar.gz")) (sha256 (base32 - "0dssn101kmpkh2ik1430mj2ikk04849vbpgi60382kvh9xn795na")))) + "0nrnkvsf9f0a7lp82sanmy89ms2nqq1lvjqicvsagsvzp513bl5b")))) (build-system perl-build-system) (propagated-inputs `(("perl-memoize-expirelru" ,perl-memoize-expirelru) From 48c5e0cb84808451f184987dbfe102ee4116de5b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Mar 2019 15:23:12 +0100 Subject: [PATCH 526/694] gnu: perl-software-license: Update to 0.103014. * gnu/packages/license.scm (perl-software-license): Update to 0.103014. --- gnu/packages/license.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/license.scm b/gnu/packages/license.scm index e50ce831b1..4003c18aca 100644 --- a/gnu/packages/license.scm +++ b/gnu/packages/license.scm @@ -85,7 +85,7 @@ (define-public perl-string-copyright (define-public perl-software-license (package (name "perl-software-license") - (version "0.103013") + (version "0.103014") (source (origin (method url-fetch) @@ -94,7 +94,7 @@ (define-public perl-software-license version ".tar.gz")) (sha256 (base32 - "1wqgh7vdlc966amlrq0b2szz18lnrl9rfh8wlf7v0hqg74vxjh96")))) + "128pbm9pf5drakm9bpkifc1zg8f005xabfwzg21nc03m5mhfligb")))) (build-system perl-build-system) (native-inputs `(("perl-try-tiny" ,perl-try-tiny))) From b0842a8e0872d508ed607541c5dd7b5b2158fd81 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Mar 2019 15:23:54 +0100 Subject: [PATCH 527/694] gnu: perl-webservice-musicbrainz: Update to 1.0.5. * gnu/packages/music.scm (perl-webservice-musicbrainz): Update to 1.0.5. --- 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 750e3e93ce..b93bcacfcd 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -4227,7 +4227,7 @@ (define-public perl-musicbrainz-discid (define-public perl-webservice-musicbrainz (package (name "perl-webservice-musicbrainz") - (version "1.0.4") + (version "1.0.5") (source (origin (method url-fetch) (uri (string-append @@ -4235,7 +4235,7 @@ (define-public perl-webservice-musicbrainz version ".tar.gz")) (sha256 (base32 - "182z3xjajk6s7k5xm3kssjy3hqx2qbnq4f8864hma098ryy2ph3a")))) + "16chs1l58cf000d5kalkyph3p31ci73p1rlyx98mfv10d2cq6fsj")))) (build-system perl-build-system) (arguments ;; Tests try to connect to http://musicbrainz.org. From d5b5d5826c6bbc6c25b7a7d39cce771e8e96832b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Mar 2019 15:40:24 +0100 Subject: [PATCH 528/694] gnu: perl-uri-escape: Update to 1.76. * gnu/packages/perl-web.scm (perl-uri-escape): Update to 1.76. --- gnu/packages/perl-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl-web.scm b/gnu/packages/perl-web.scm index 3c462aed03..c1af1d2caf 100644 --- a/gnu/packages/perl-web.scm +++ b/gnu/packages/perl-web.scm @@ -51,7 +51,7 @@ (define-public perl-mojolicious (define-public perl-uri-escape (package (name "perl-uri-escape") - (version "1.74") + (version "1.76") (source (origin (method url-fetch) @@ -59,7 +59,7 @@ (define-public perl-uri-escape version ".tar.gz")) (sha256 (base32 - "0gfmrpyy075pn2mbshs5599h8m096gjdz2dn8vcivjw9bzs59hm9")))) + "0gj1aj18k43kmzc3y1zhj5giinf8rksacf757r475xfna0fqxjdj")))) (build-system perl-build-system) (native-inputs `(("perl-test-needs" ,perl-test-needs))) From 1a3f4684a533340c52f8c31f633a8302652e8874 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Mar 2019 15:41:06 +0100 Subject: [PATCH 529/694] gnu: perl-yaml: Update to 1.27. * gnu/packages/perl.scm (perl-yaml): Update to 1.27. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 0075bbdf2e..c7534e120e 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -9213,7 +9213,7 @@ (define-public perl-xs-object-magic (define-public perl-yaml (package (name "perl-yaml") - (version "1.24") + (version "1.27") (source (origin (method url-fetch) @@ -9221,7 +9221,7 @@ (define-public perl-yaml "YAML-" version ".tar.gz")) (sha256 (base32 - "1dpzgnjbd8yvf94vf45cmyj5bc6vrm6bchhx9xqwxqd5f9d093dm")))) + "1yc2yqjyrcdlhp209f3a63f9xx6v5klisli25fv221yy43la34n9")))) (build-system perl-build-system) (native-inputs `(("perl-test-yaml" ,perl-test-yaml))) From c3064aa1ba9400c725ed5495087c9e4ad0484f5b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Mar 2019 15:42:40 +0100 Subject: [PATCH 530/694] gnu: perl-pegex: Update to 0.70. * gnu/packages/perl.scm (perl-pegex): Update to 0.70. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index c7534e120e..8f30eff485 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -6985,7 +6985,7 @@ (define-public perl-perlio-utf8_strict (define-public perl-pegex (package (name "perl-pegex") - (version "0.67") + (version "0.70") (source (origin (method url-fetch) @@ -6994,7 +6994,7 @@ (define-public perl-pegex version ".tar.gz")) (sha256 (base32 - "149015ra2figalxrnj72fz02qc5cm96xg6x8d6kmyanfmrrxzf9w")))) + "1zd0zm6vxapw6bds3ipymkbzam70p3j3rm48794qy11620r22dgx")))) (build-system perl-build-system) (native-inputs `(("perl-file-sharedir-install" ,perl-file-sharedir-install) From 695da62896fcb1d9b00ed1f7e6006e5d49dda8a4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Mar 2019 15:45:07 +0100 Subject: [PATCH 531/694] gnu: perl-unicode-normalize: Update to 1.26. * gnu/packages/perl.scm (perl-unicode-normalize): Update to 1.26. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 8f30eff485..c12e2eb366 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -8969,7 +8969,7 @@ (define-public perl-types-serialiser (define-public perl-unicode-normalize (package (name "perl-unicode-normalize") - (version "1.25") + (version "1.26") (source (origin (method url-fetch) @@ -8977,7 +8977,7 @@ (define-public perl-unicode-normalize "Unicode-Normalize-" version ".tar.gz")) (sha256 (base32 - "0v04bcyjfcfap4kfpc8q3ikq3j7s68nym4ckw3iasmmksdskmcq0")))) + "0gvpmrfrvb3sxqq4pnqfmbpf9q0q2an6a2ba4ara95cvx1s6zpms")))) (build-system perl-build-system) (arguments '(#:phases (modify-phases %standard-phases From b94a35326b228df7ad530300accbc705b52d2aeb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Mar 2019 15:47:48 +0100 Subject: [PATCH 532/694] gnu: perl-datetime-format-builder: Update to 0.82. * gnu/packages/perl.scm (perl-datetime-format-builder): Update to 0.82. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index c12e2eb366..07dbc87c68 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -2324,7 +2324,7 @@ (define-public perl-datetime-event-recurrence (define-public perl-datetime-format-builder (package (name "perl-datetime-format-builder") - (version "0.81") + (version "0.82") (source (origin (method url-fetch) @@ -2332,7 +2332,7 @@ (define-public perl-datetime-format-builder "DateTime-Format-Builder-" version ".tar.gz")) (sha256 (base32 - "1vrkzw7kmxnyy403ykxgbg2kvgs99nggi4n9gi09ixivnn68mmbw")))) + "18qw5rn1qbji3iha8gmpgldbjv9gvn97j9d5cp57fb4r5frawgrq")))) (build-system perl-build-system) (propagated-inputs `(("perl-class-factory-util" ,perl-class-factory-util) From 612f11bbc55c0b78d188be47eb7c1d6b41c58c37 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Mar 2019 16:07:09 +0100 Subject: [PATCH 533/694] gnu: perl-devel-checkbin: Update to 0.04. * gnu/packages/perl.scm (perl-devel-checkbin): Update to 0.04. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 07dbc87c68..8e0c266142 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -2626,7 +2626,7 @@ (define-public perl-devel-caller (define-public perl-devel-checkbin (package (name "perl-devel-checkbin") - (version "0.02") + (version "0.04") (source (origin (method url-fetch) @@ -2634,7 +2634,7 @@ (define-public perl-devel-checkbin "Devel-CheckBin-" version ".tar.gz")) (sha256 (base32 - "0g71sma9jy0fjm619hcrcsb9spg2y03vjxx36y8k1xpa2553sr7m")))) + "1r735yzgvsxkj4m6ks34xva5m21cfzp9qiis2d4ivv99kjskszqm")))) (build-system perl-build-system) (native-inputs `(("perl-module-build" ,perl-module-build))) (home-page "https://metacpan.org/release/Devel-CheckBin") From 836aec998425ed39c6c54a95d4295979103d5897 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Mar 2019 16:21:46 +0100 Subject: [PATCH 534/694] gnu: perl-carp-clan: Update to 6.07. * gnu/packages/perl.scm (perl-carp-clan): Update to 6.07. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 8e0c266142..c66c8860a8 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -823,7 +823,7 @@ (define-public perl-carp-assert-more (define-public perl-carp-clan (package (name "perl-carp-clan") - (version "6.06") + (version "6.07") (source (origin (method url-fetch) @@ -831,7 +831,7 @@ (define-public perl-carp-clan "Carp-Clan-" version ".tar.gz")) (sha256 (base32 - "1m6902n6s627nsvyn2vyrk29q7lh6808hsdk7ka5cirm27vchjpa")))) + "0gaa4ygd9q8lp2fn5d9s7miiwxz92a2lqs7j6smwmifq6w3mc20a")))) (build-system perl-build-system) (native-inputs `(("perl-test-exception" ,perl-test-exception))) From 6a9cecd5538c0457f1f0ae8875fa54dae774914e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Mar 2019 16:31:59 +0100 Subject: [PATCH 535/694] gnu: perl-template-toolkit: Update to 2.28. * gnu/packages/perl.scm (perl-template-toolkit): Update to 2.28. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index c66c8860a8..0bdd99e061 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -7978,7 +7978,7 @@ (define-public perl-task-weaken (define-public perl-template-toolkit (package (name "perl-template-toolkit") - (version "2.26") + (version "2.28") (source (origin (method url-fetch) @@ -7986,7 +7986,7 @@ (define-public perl-template-toolkit "Template-Toolkit-" version ".tar.gz")) (sha256 (base32 - "1gknrm8hdci5ryg67p4y23lsy7lynczqmq9kh9nzj7kg08vczqg7")))) + "1msxg3j1hx5wsc7vr81x5gs9gdbn4y0x6cvyj3pq4dgi1603dbvi")))) (build-system perl-build-system) (propagated-inputs `(("perl-appconfig" ,perl-appconfig) From 218decd7176aee0e3775287e5a07169d79190fd4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Mar 2019 16:33:37 +0100 Subject: [PATCH 536/694] gnu: perl-carp-assert-more: Update to 1.16. * gnu/packages/perl.scm (perl-carp-assert-more): Update to 1.16. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 0bdd99e061..681e84a957 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -800,7 +800,7 @@ (define-public perl-carp-assert (define-public perl-carp-assert-more (package (name "perl-carp-assert-more") - (version "1.14") + (version "1.16") (source (origin (method url-fetch) @@ -808,7 +808,7 @@ (define-public perl-carp-assert-more "Carp-Assert-More-" version ".tar.gz")) (sha256 (base32 - "0cq7qk4qbhqppm4raby5k24b5mx5qjgy1884nrddhxillnzlq01z")))) + "1x9jd6s3lq97na6gz7g0zaq62l8z297xsfpdj2v42p3ijpfirl4f")))) (build-system perl-build-system) (native-inputs `(("perl-test-exception" ,perl-test-exception))) From 0d344f3007090588709730bd19e0ad3895641280 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Mar 2019 16:36:55 +0100 Subject: [PATCH 537/694] gnu: perl-moosex-role-withoverloading: Update to 0.17. * gnu/packages/perl.scm (perl-moosex-role-withoverloading): Update to 0.17. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 681e84a957..7011d3a5e1 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -5768,7 +5768,7 @@ (define-public perl-moosex-role-parameterized (define-public perl-moosex-role-withoverloading (package (name "perl-moosex-role-withoverloading") - (version "0.16") + (version "0.17") (source (origin (method url-fetch) @@ -5776,7 +5776,7 @@ (define-public perl-moosex-role-withoverloading "MooseX-Role-WithOverloading-" version ".tar.gz")) (sha256 (base32 - "0kfs203ip44vsxh282kshia8wqkwklz4i7fs2ngsbj6frv00nqdv")))) + "0rb8k0dp1a55bm2pr6r0vsi5msvjl1dslfidxp1gj80j7zbrbc4j")))) (build-system perl-build-system) (propagated-inputs `(("perl-aliased" ,perl-aliased) From d098f40ae21508eceb021a8e68a2c77641b13d19 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Mar 2019 16:55:35 +0100 Subject: [PATCH 538/694] gnu: perl-text-template: Update to 1.55. * gnu/packages/perl.scm (perl-text-template): Update to 1.55. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 7011d3a5e1..fa1c7c46a8 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -8441,7 +8441,7 @@ (define-public perl-text-table (define-public perl-text-template (package (name "perl-text-template") - (version "1.54") + (version "1.55") (source (origin (method url-fetch) @@ -8451,7 +8451,7 @@ (define-public perl-text-template ".tar.gz")) (sha256 (base32 - "0s56jgak9ccbbbybf5v8hvvhyplbfhzl6p6v1751inly80rlj1kv")))) + "12zi08mwmlbfbnsialmppk75s6dkg765dvmay3wif3158plqp554")))) (build-system perl-build-system) (native-inputs `(("perl-test-more-utf8" ,perl-test-more-utf8) From a6e5970efc2c1e83e8d4c7c4ba9ac41fc90fdaec Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Mar 2019 16:57:15 +0100 Subject: [PATCH 539/694] gnu: perl-time-duration: Update to 1.20. * gnu/packages/perl.scm (perl-time-duration): Update to 1.20. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index fa1c7c46a8..ab7f6c8572 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -8619,7 +8619,7 @@ (define-public perl-tie-toobject (define-public perl-time-duration (package (name "perl-time-duration") - (version "1.1") + (version "1.20") (source (origin (method url-fetch) @@ -8627,7 +8627,7 @@ (define-public perl-time-duration "Time-Duration-" version ".tar.gz")) (sha256 (base32 - "0klg33yzb7pr9ra76s6gj5k7nravqnw2lbh022x1xwlj92f43756")))) + "1f5vkid4pl5iq3hal01hk1zjbbzrqpx4m1djawbp93l152shb0j5")))) (build-system perl-build-system) (native-inputs `(("perl-module-install" ,perl-module-install) From 9682821a3281d8d1cbf8eb3db9170c2c8e160407 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Mar 2019 17:02:01 +0100 Subject: [PATCH 540/694] gnu: perl-business-issn: Update to 1.003. * gnu/packages/perl.scm (perl-business-issn): Update to 1.003. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index ab7f6c8572..6009783edf 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -604,7 +604,7 @@ (define-public perl-business-isbn (define-public perl-business-issn (package (name "perl-business-issn") - (version "0.91") + (version "1.003") (source (origin (method url-fetch) @@ -612,7 +612,7 @@ (define-public perl-business-issn "Business-ISSN-" version ".tar.gz")) (sha256 (base32 - "1dfnm7h7lbqj356700ldlmgbr51v6hyjn1qig2bb4ysl1wn1jnzi")))) + "1lcr9dabwqssjpff97ki6w8mjhvh8kfbj3csbyy28ylk35n4awhj")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/Business-ISSN") (synopsis "Work with International Standard Serial Numbers") From ce5b81f72bc4d746c95eec09205c42e31b8882fd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Mar 2019 17:05:39 +0100 Subject: [PATCH 541/694] gnu: perl-time-hires: Update to 1.9760. * gnu/packages/perl.scm (perl-time-hires): Update to 1.9760. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 6009783edf..3fe664f704 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -8665,7 +8665,7 @@ (define-public perl-time-duration-parse (define-public perl-time-hires (package (name "perl-time-hires") - (version "1.9758") + (version "1.9760") (source (origin (method url-fetch) (uri (string-append @@ -8673,7 +8673,7 @@ (define-public perl-time-hires version ".tar.gz")) (sha256 (base32 - "07jbydcdzpjm6i4nidci0rlklx4kla210fsl6zishw0yq5di9yjv")))) + "0avh25m5ffsqc2xnfczvlnlbfbisw5wjq9d3w0j01h9byjzrif1c")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/Time-HiRes") (synopsis "High resolution alarm, sleep, gettimeofday, interval timers") From 8de0e90bc08c43bb93290bc03eb778118d735f45 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Mar 2019 18:06:24 +0100 Subject: [PATCH 542/694] gnu: perl-json: Update to 4.02. * gnu/packages/perl.scm (perl-json): Update to 4.02. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 3fe664f704..88e48d3e5a 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -4416,7 +4416,7 @@ (define-public perl-ipc-system-simple (define-public perl-json (package (name "perl-json") - (version "4.01") + (version "4.02") (source (origin (method url-fetch) @@ -4424,7 +4424,7 @@ (define-public perl-json "JSON-" version ".tar.gz")) (sha256 (base32 - "1vdiw095g5rf51q8d0ipf8020jx371pma0k4sxp0wlfl76lr65b3")))) + "0z32x2lijij28c9fhmzgxc41i9nw24fyvd2a8ajs5zw9b9sqhjj4")))) (build-system perl-build-system) (propagated-inputs `(("perl-json-xs" ,perl-json-xs))) ;recommended From 0b50a6dbedd4b3d48624b5f653b197d71b6915da Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Mar 2019 18:16:44 +0100 Subject: [PATCH 543/694] gnu: perl-universal-isa: Update to 1.20171012. * gnu/packages/perl.scm (perl-universal-isa): Update to 1.20171012. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 88e48d3e5a..805400297c 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -9097,7 +9097,7 @@ (define-public perl-universal-can (define-public perl-universal-isa (package (name "perl-universal-isa") - (version "1.20140927") + (version "1.20171012") (source (origin (method url-fetch) @@ -9105,7 +9105,7 @@ (define-public perl-universal-isa "UNIVERSAL-isa-" version ".tar.gz")) (sha256 (base32 - "0ryqk58nkzhdq26si7mh49h8wand1wlmyf4m78qgiyn8ib6989bb")))) + "0avzv9j32aab6l0rd63n92v0pgliz1p4yabxxjfq275hdh1mcsfi")))) (build-system perl-build-system) (native-inputs `(("perl-module-build-tiny" ,perl-module-build-tiny))) From fed4cab8880066e874255679ead7fd27f3f72677 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Mar 2019 18:25:37 +0100 Subject: [PATCH 544/694] gnu: perl-datetime-timezone: Update to 2.23. * gnu/packages/perl.scm (perl-datetime-timezone): Update to 2.23. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 805400297c..562311c90d 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -2498,7 +2498,7 @@ (define-public perl-datetime-locale (define-public perl-datetime-timezone (package (name "perl-datetime-timezone") - (version "2.19") + (version "2.23") (source (origin (method url-fetch) @@ -2506,7 +2506,7 @@ (define-public perl-datetime-timezone "DateTime-TimeZone-" version ".tar.gz")) (sha256 (base32 - "1y54bsgq886sg35fgmxgj8wwmgs4l83qhwa0g3zv8w9d43z2w6dr")))) + "0kz5kz47awf2bhb85xx5rbajkr093ipm2d2vkhqs8lqq0f305r3a")))) (build-system perl-build-system) (native-inputs `(("perl-test-fatal" ,perl-test-fatal) From 42e00f63e244f0354c53759240fa96ea565fb297 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Mar 2019 16:55:08 +0100 Subject: [PATCH 545/694] gnu: mkfontscale: Update to 1.2.1. * gnu/packages/xorg.scm (mkfontscale): Update to 1.2.1. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index fe65cfab88..a396586638 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1579,7 +1579,7 @@ (define-public makedepend (define-public mkfontscale (package (name "mkfontscale") - (version "1.2.0") + (version "1.2.1") (source (origin (method url-fetch) @@ -1588,7 +1588,7 @@ (define-public mkfontscale version ".tar.bz2")) (sha256 - (base32 "1gn423m0v1w98df7ni74zrj2rkhsapnqfzr8139l638kkyz7far8")))) + (base32 "1ixsnsm2mn0zy9ksdid0lj6irnhvasfik9mz8bbrs5sajzmra16a")))) (build-system gnu-build-system) (inputs `(("zlib" ,zlib) From e3eaac98d1cdcbf45cfa0395eaf790e88a57f4d0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Mar 2019 17:14:52 +0100 Subject: [PATCH 546/694] gnu: vpnc-scripts: Update to 20190116.1000e0f. * gnu/packages/vpn.scm (vpnc-scripts): Update to 20190116.1000e0f. --- gnu/packages/vpn.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index e164d9aa4c..6155c008fa 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -119,10 +119,10 @@ (define-public vpnc (home-page "http://www.unix-ag.uni-kl.de/~massar/vpnc/"))) (define-public vpnc-scripts - (let ((commit "07c3518dd6b8dc424e9c3650a62bed994a4dcbe1")) + (let ((commit "1000e0f6dd7d6bff163169a46359211c1fc3a6d2")) (package (name "vpnc-scripts") - (version (string-append "20180226." (string-take commit 7))) + (version (string-append "20190116." (string-take commit 7))) (source (origin (method git-fetch) (uri @@ -132,7 +132,7 @@ (define-public vpnc-scripts (file-name (git-file-name name version)) (sha256 (base32 - "02d29nrmnj6kfa889cavqn1pkn9ssb5gyp4lz1v47spwx7abpdi7")))) + "1g41yarz2bl0f73kbjqnywr485ghanbp7nmspklfb0n07yp0z6ak")))) (build-system gnu-build-system) (inputs `(("coreutils" ,coreutils) ("grep" ,grep) From f2096f4aa8c6dd3894f91bd409ce282eb26c6111 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 22 Mar 2019 19:54:09 -0400 Subject: [PATCH 547/694] gnu: libb2: Update to 0.98.1. * gnu/packages/crypto.scm (libb2): Update to 0.98.1. --- gnu/packages/crypto.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index d6f8e22eab..038db8f488 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -647,7 +647,7 @@ (define-public crypto++ (define-public libb2 (package (name "libb2") - (version "0.98") + (version "0.98.1") (source (origin (method url-fetch) (uri (string-append @@ -655,7 +655,7 @@ (define-public libb2 version "/libb2-" version ".tar.gz")) (sha256 (base32 - "0vq39cvwy05754l565xl11rqr2jvjb6ykjzca886vi9vm71y0sg8")))) + "0bn7yrzdixdvzm46shbhpkqbr6zyqyxiqn7a7x54ag3mrvfnyqjk")))) (build-system gnu-build-system) (arguments `(#:configure-flags From a774946596abd164093e26de0fe8b597ec9d8d90 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 17 Feb 2019 17:21:05 +0000 Subject: [PATCH 548/694] gnu: Add ruby-sass-rails. * gnu/packages/rails.scm (ruby-sass-rails): New variable. --- gnu/packages/rails.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/rails.scm b/gnu/packages/rails.scm index 15dd375521..65b166bf2b 100644 --- a/gnu/packages/rails.scm +++ b/gnu/packages/rails.scm @@ -65,6 +65,33 @@ (define-public ruby-spring (home-page "https://github.com/rails/spring") (license license:expat))) +(define-public ruby-sass-rails + (package + (name "ruby-sass-rails") + (version "5.0.7") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "sass-rails" version)) + (sha256 + (base32 + "1wa63sbsimrsf7nfm8h0m1wbsllkfxvd7naph5d1j6pbc555ma7s")))) + (build-system ruby-build-system) + (arguments + '(#:tests? #f)) ; No included tests + (propagated-inputs + `(("ruby-railties" ,ruby-railties) + ("ruby-sass" ,ruby-sass) + ("ruby-sprockets" ,ruby-sprockets) + ("ruby-sprockets-rails" ,ruby-sprockets-rails) + ("ruby-tilt" ,ruby-tilt))) + (synopsis "Sass adapter for the Rails asset pipeline") + (description + "This library integrates the SASS stylesheet language into Ruby on +Rails.") + (home-page "https://github.com/rails/sass-rails") + (license license:expat))) + (define-public ruby-debug-inspector (package (name "ruby-debug-inspector") From 95f85d4484d45bf68aa3dbe98d8c3b7d46ee1162 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 17 Feb 2019 17:21:22 +0000 Subject: [PATCH 549/694] gnu: Add ruby-dep. * gnu/packages/ruby.scm (ruby-dep): New variable. --- gnu/packages/ruby.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 2ef00ce356..08952822c7 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3788,6 +3788,27 @@ (define-public ruby-progress_bar (home-page "https://github.com/paul/progress_bar") (license license:wtfpl2))) +(define-public ruby-dep + (package + (name "ruby-dep") + (version "1.5.0") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "ruby_dep" version)) + (sha256 + (base32 + "1c1bkl97i9mkcvkn1jks346ksnvnnp84cs22gwl0vd7radybrgy5")))) + (build-system ruby-build-system) + (arguments + '(#:tests? #f)) ; No included tests + (synopsis "Creates a version constraint of supported Rubies") + (description + "This package helps create a version constraint of supported Rubies, +suitable for a gemspec file.") + (home-page "https://github.com/e2/ruby_dep") + (license license:expat))) + (define-public ruby-progressbar (package (name "ruby-progressbar") From 6cbba8a38026755dd00812b5f0f3cdc96f1fa50b Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 17 Feb 2019 17:21:33 +0000 Subject: [PATCH 550/694] gnu: ruby-jekyll-watch: Update to 2.1.2. * gnu/packages/ruby.scm (ruby-jekyll-watch): Update to 2.1.2. [propagated-inputs]: Change to use ruby-listen, rather than ruby-listen-3.0. --- gnu/packages/ruby.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 08952822c7..49e8d83be8 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -7731,16 +7731,16 @@ (define-public ruby-jekyll-sass-converter (define-public ruby-jekyll-watch (package (name "ruby-jekyll-watch") - (version "2.0.0") + (version "2.1.2") (source (origin (method url-fetch) (uri (rubygems-uri "jekyll-watch" version)) (sha256 (base32 - "0m7scvj3ki8bmyx5v8pzibpg6my10nycnc28lip98dskf8iakprp")))) + "1s9ly83sp8albvgdff12xy2h4xd8lm6z2fah4lzmk2yvp85jzdzv")))) (build-system ruby-build-system) (propagated-inputs - `(("ruby-listen-3.0" ,ruby-listen-3.0))) + `(("ruby-listen" ,ruby-listen))) (arguments ;; No rakefile `(#:tests? #f)) From c47e141deb607714e52c9f7646878f371c17d004 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 17 Feb 2019 17:21:45 +0000 Subject: [PATCH 551/694] gnu: Remove ruby-listen-3.0. This was used by ruby-jekyll-watch, but that's now been upgraded and now uses the ruby-listen package. * gnu/packages/ruby.scm (ruby-listen-3.0): Remove this variable. --- gnu/packages/ruby.scm | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 49e8d83be8..6812275457 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -4499,17 +4499,6 @@ (define-public ruby-listen (home-page "https://github.com/guard/listen") (license license:expat))) -(define-public ruby-listen-3.0 - (package - (inherit ruby-listen) - (version "3.0.8") - (source (origin - (method url-fetch) - (uri (rubygems-uri "listen" version)) - (sha256 - (base32 - "1l0y7hbyfiwpvk172r28hsdqsifq1ls39hsfmzi1vy4ll0smd14i")))))) - (define-public ruby-loofah (package (name "ruby-loofah") From 35602819afac38182a3f0b1028f588803d94e7f6 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 17 Feb 2019 17:21:56 +0000 Subject: [PATCH 552/694] gnu: ruby-listen: Enable running the tests. * gnu/packages/ruby.scm (ruby-listen)[source]: Switch to the Git repository, as this includes the tests. [arguments]: Set #:test-target and tweak the Rakefile to avoid requiring Rubocop unnecessarily. [native-inputs]: Add bundler and ruby-rspec for running the test suite. [inputs]: Add ruby-thor, as this is used for bin/listen. [propagated-inputs]: Add ruby-dep, as this is listed as a runtime dependency in the gemspec. --- gnu/packages/ruby.scm | 40 ++++++++++++++++++++++++++++++++++------ 1 file changed, 34 insertions(+), 6 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 6812275457..3e656e2cb3 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -4483,16 +4483,44 @@ (define-public ruby-listen (version "3.1.5") (source (origin - (method url-fetch) - (uri (rubygems-uri "listen" version)) + ;; The gem does not include a Rakefile, so fetch from the Git + ;; repository. + (method git-fetch) + (uri (git-reference + (url "https://github.com/guard/listen.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "01v5mrnfqm6sgm8xn2v5swxsn1wlmq7rzh2i48d4jzjsc7qvb6mx")))) + "1hqmkfa9f2xb5jlvqbafdxjd5ax75jm8gqj5nh3k22xq0kacsvgg")))) (build-system ruby-build-system) - (arguments '(#:tests? #f)) ; no tests + (arguments + `(#:test-target "spec" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-files-in-gemspec + (lambda _ + (substitute* "listen.gemspec" + (("`git ls-files -z`") "`find . -type f -printf '%P\\\\0' |sort -z`")) + #t)) + (add-before 'check 'remove-unnecessary-dependencies' + (lambda _ + (substitute* "Rakefile" + ;; Rubocop is for code linting, and is unnecessary for running + ;; the tests. + ((".*rubocop.*") "")) + #t))))) + (native-inputs + `(("bundler" ,bundler) + ("ruby-rspec" ,ruby-rspec))) + (inputs + `(;; ruby-thor is used for the command line interface, and is referenced + ;; in the wrapper, and therefore just needs to be an input. + ("ruby-thor" ,ruby-thor))) (propagated-inputs - `(("ruby-rb-inotify" ,ruby-rb-inotify) - ("ruby-rb-fsevent" ,ruby-rb-fsevent))) + `(("ruby-rb-fsevent" ,ruby-rb-fsevent) + ("ruby-rb-inotify" ,ruby-rb-inotify) + ("ruby-dep" ,ruby-dep))) (synopsis "Listen to file modifications") (description "The Listen gem listens to file modifications and notifies you about the changes.") From 73a5aff7afb5b7c82b4d7ec9e5715ec4e4f163d2 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 17 Feb 2019 17:22:16 +0000 Subject: [PATCH 553/694] gnu: Add ruby-bindex. * gnu/packages/ruby.scm (ruby-bindex): New variable. --- gnu/packages/ruby.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 3e656e2cb3..d9b9ec38b1 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5588,6 +5588,31 @@ (define-public ruby-cucumber-tag-expressions (home-page "https://github.com/cucumber/tag-expressions-ruby") (license license:expat))) +(define-public ruby-bindex + (package + (name "ruby-bindex") + (version "0.5.0") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "bindex" version)) + (sha256 + (base32 + "1wvhf4v8sk5x8li03pcc0v0wglmyv7ikvvg05bnms83dfy7s4k8i")))) + (build-system ruby-build-system) + (arguments + '(#:test-target "default")) + (native-inputs + `(("bundler" ,bundler) + ("ruby-rake-compiler" ,ruby-rake-compiler))) + (synopsis "Provides access for bindings relating to Ruby exceptions") + (description + "@code{bindex} provides a way to access the bindings that relate to +exceptions in Ruby, providing more information about the context in which the +exception occurred.") + (home-page "https://github.com/gsamokovarov/bindex") + (license license:expat))) + (define-public ruby-bio-logger (package (name "ruby-bio-logger") From ae9d1ab4d027dc22c45474e961804d7e5e7b5753 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 17 Feb 2019 17:24:32 +0000 Subject: [PATCH 554/694] gnu: Add ruby-web-console. * gnu/packages/rails.scm (ruby-web-console): New variable. --- gnu/packages/rails.scm | 56 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/gnu/packages/rails.scm b/gnu/packages/rails.scm index 65b166bf2b..9fc8c5dfa4 100644 --- a/gnu/packages/rails.scm +++ b/gnu/packages/rails.scm @@ -440,6 +440,62 @@ (define-public ruby-sprockets-rails "https://github.com/rails/sprockets-rails") (license license:expat))) +(define-public ruby-web-console + (package + (name "ruby-web-console") + (version "3.7.0") + (source + (origin + ;; Download from GitHub as test files are not provided in the gem. + (method git-fetch) + (uri (git-reference + (url "https://github.com/rails/web-console.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0ir999p8cnm3l3zwbgpwxxcq1vwkj8d0d3r24362cyaf4v1rglq2")))) + (build-system ruby-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-Gemfile + (lambda _ + (substitute* "Gemfile" + ;; Remove the github bit from the Gemfile, so that the Guix + ;; packages are used. + ((", github: .*") "\n") + ;; The usual methods of not loading this group don't work, so + ;; patch the Gemfile. + (("group :development") "[].each") + ;; tzinfo-data is propagated by ruby-activesupport, but it + ;; needs to be in the Gemfile to become available. + (("group :test do") "group :test do\n gem 'tzinfo-data'")) + #t)) + (add-after 'unpack 'fix-mocha-minitest-require + (lambda _ + (substitute* "test/test_helper.rb" + ;; This chanegd in recent versions of Mocha + (("mocha/minitest") "mocha/mini_test")) + #t))))) + (propagated-inputs + `(("ruby-actionview" ,ruby-actionview) + ("ruby-activemodel" ,ruby-activemodel) + ("ruby-bindex" ,ruby-bindex) + ("ruby-railties" ,ruby-railties))) + (native-inputs + `(("bundler" ,bundler) + ("ruby-rails" ,ruby-rails) + ("ruby-mocha" ,ruby-mocha) + ("ruby-simplecov" ,ruby-simplecov))) + (synopsis "Debugging tool for your Ruby on Rails applications") + (description + "This package allows you to create an interactive Ruby session in your +browser. Those sessions are launched automatically in case of an error and +can also be launched manually in any page.") + (home-page "https://github.com/rails/web-console") + (license license:expat))) + (define-public ruby-with-advisory-lock (package (name "ruby-with-advisory-lock") From 3ca435240078888c032f84e005c8a6ceaf745549 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 17 Feb 2019 17:22:41 +0000 Subject: [PATCH 555/694] gnu: Add ruby-execjs. * gnu/packages/ruby.scm (ruby-execjs): New variable. --- gnu/packages/ruby.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index d9b9ec38b1..a5ae7fa801 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -51,6 +51,7 @@ (define-module (gnu packages ruby) #:use-module (gnu packages maths) #:use-module (gnu packages ncurses) #:use-module (gnu packages networking) + #:use-module (gnu packages node) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) #:use-module (gnu packages ragel) @@ -1434,6 +1435,39 @@ (define-public ruby-erubis (home-page "http://www.kuwata-lab.com/erubis/") (license license:expat))) +(define-public ruby-execjs + (package + (name "ruby-execjs") + (version "2.7.0") + (source + (origin + ;; fetch from github as the gem does not contain testing code + (method git-fetch) + (uri (git-reference + (url "https://github.com/rails/execjs.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0c0vd2mmqq3ar4plbwi2wsbr31vn4h45i19r5km66skydnnbp1y6")))) + (build-system ruby-build-system) + (native-inputs + `(("bundler" ,bundler) + ;; The test suite tests all the available backends. Currenly, this just + ;; means the node backend. + ;; + ;; PASSED: test:node + ;; SKIPPED: test:duktape, ;; test:javascriptcore, test:jscript, + ;; test:miniracer, test:rubyracer, ;; test:rubyrhino, test:v8 + ("node" ,node))) + (synopsis "Run JavaScript code from Ruby") + (description + "ExecJS lets you run JavaScript code from Ruby. It automatically picks a +runtime to evaluate your JavaScript program, then returns the result to you as +a Ruby object.") + (home-page "https://github.com/rails/execjs") + (license license:expat))) + (define-public ruby-orderedhash (package (name "ruby-orderedhash") From bee67d18312eaf2b31016ce4bc75a39a2dc4b453 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 17 Feb 2019 17:23:05 +0000 Subject: [PATCH 556/694] gnu: ruby: Update some RSpec packages. * gnu/packages/ruby.scm (ruby-rspec-support): Update to 3.8.0. (ruby-rspec-core): Update to 3.8.0. (ruby-rspec-expectations): Update to 3.8.2. (ruby-rspec-mocks): Update to 3.8.0. (ruby-rspec): Update to 3.8.0. --- gnu/packages/ruby.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index a5ae7fa801..5920599806 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -450,13 +450,13 @@ (define-public ruby-iruby (define ruby-rspec-support (package (name "ruby-rspec-support") - (version "3.5.0") + (version "3.8.0") (source (origin (method url-fetch) (uri (rubygems-uri "rspec-support" version)) (sha256 (base32 - "10vf3k3d472y573mag2kzfsfrf6rv355s13kadnpryk8d36yq5r0")))) + "0p3m7drixrlhvj2zpc38b11x145bvm311x6f33jjcxmvcm0wq609")))) (build-system ruby-build-system) (arguments '(#:tests? #f)) ; avoid dependency cycles @@ -468,13 +468,13 @@ (define ruby-rspec-support (define-public ruby-rspec-core (package (name "ruby-rspec-core") - (version "3.5.4") + (version "3.8.0") (source (origin (method url-fetch) (uri (rubygems-uri "rspec-core" version)) (sha256 (base32 - "1nacs062qbr98fx6czf1vwppn1js956nv2c8vfwj6i65axdfs46i")))) + "1p1s5bnbqp3sxk67y0fh0x884jjym527r0vgmhbm81w7aq6b7l4p")))) (build-system ruby-build-system) (arguments '(#:tests? #f)) ; avoid dependency cycles @@ -521,13 +521,13 @@ (define-public ruby-diff-lcs (define-public ruby-rspec-expectations (package (name "ruby-rspec-expectations") - (version "3.5.0") + (version "3.8.2") (source (origin (method url-fetch) (uri (rubygems-uri "rspec-expectations" version)) (sha256 (base32 - "0bbqfrb1x8gmwf8x2xhhwvvlhwbbafq4isbvlibxi6jk602f09gs")))) + "18l21hy1zdc2pgc2yb17k3n2al1khpfr0z6pijlm852iz6vj0dkm")))) (build-system ruby-build-system) (arguments '(#:tests? #f)) ; avoid dependency cycles @@ -613,13 +613,13 @@ (define-public ruby-rspec-its (define-public ruby-rspec-mocks (package (name "ruby-rspec-mocks") - (version "3.5.0") + (version "3.8.0") (source (origin (method url-fetch) (uri (rubygems-uri "rspec-mocks" version)) (sha256 (base32 - "0nl3ksivh9wwrjjd47z5dggrwx40v6gpb3a0gzbp1gs06a5dmk24")))) + "06y508cjqycb4yfhxmb3nxn0v9xqf17qbd46l1dh4xhncinr4fyp")))) (build-system ruby-build-system) (arguments '(#:tests? #f)) ; avoid dependency cycles @@ -670,13 +670,13 @@ (define-public ruby-rspec-rerun (define-public ruby-rspec (package (name "ruby-rspec") - (version "3.5.0") + (version "3.8.0") (source (origin (method url-fetch) (uri (rubygems-uri "rspec" version)) (sha256 (base32 - "16g3mmih999f0b6vcz2c3qsc7ks5zy4lj1rzjh8hf6wk531nvc6s")))) + "15ppasvb9qrscwlyjz67ppw1lnxiqnkzx5vkx1bd8x5n3dhikxc3")))) (build-system ruby-build-system) (arguments '(#:tests? #f)) ; avoid dependency cycles From 87688ff3749219a1ea928300f5797e5cf56712c1 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 17 Feb 2019 17:23:20 +0000 Subject: [PATCH 557/694] gnu: Add ruby-rspec-rails. * gnu/packages/ruby.scm (ruby-rspec-support): Export this variable, so that it's accessible from the (gnu packages rails) module. * gnu/packages/rails.scm (ruby-rspec-rails): New variable. --- gnu/packages/rails.scm | 29 +++++++++++++++++++++++++++++ gnu/packages/ruby.scm | 2 +- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/gnu/packages/rails.scm b/gnu/packages/rails.scm index 9fc8c5dfa4..e359b24991 100644 --- a/gnu/packages/rails.scm +++ b/gnu/packages/rails.scm @@ -173,6 +173,35 @@ (define-public ruby-activerecord (home-page "https://rubyonrails.org") (license license:expat))) +(define-public ruby-rspec-rails + (package + (name "ruby-rspec-rails") + (version "3.8.2") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "rspec-rails" version)) + (sha256 + (base32 + "1pf6n9l4sw1arlax1bdbm1znsvl8cgna2n6k6yk1bi8vz2n73ls1")))) + (build-system ruby-build-system) + (arguments + '(#:tests? #f)) ; No included tests + (propagated-inputs + `(("ruby-actionpack" ,ruby-actionpack) + ("ruby-activesupport" ,ruby-activesupport) + ("ruby-railties" ,ruby-railties) + ("ruby-rspec-core" ,ruby-rspec-core) + ("ruby-rspec-expectations" ,ruby-rspec-expectations) + ("ruby-rspec-mocks" ,ruby-rspec-mocks) + ("ruby-rspec-support" ,ruby-rspec-support))) + (synopsis "Use RSpec to test Ruby on Rails applications") + (description + "This package provides support for using RSpec to test Ruby on Rails +applications, in pace of the default Minitest testing library.") + (home-page "https://github.com/rspec/rspec-rails") + (license license:expat))) + (define-public ruby-rails-html-sanitizer (package (name "ruby-rails-html-sanitizer") diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 5920599806..9567f48877 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -447,7 +447,7 @@ (define-public ruby-iruby ;; RSpec is the dominant testing library for Ruby projects. Even RSpec's ;; dependencies use RSpec for their test suites! To avoid these circular ;; dependencies, we disable tests for all of the RSpec-related packages. -(define ruby-rspec-support +(define-public ruby-rspec-support (package (name "ruby-rspec-support") (version "3.8.0") From 1d672a6a7518d8a5d904429145ce182946076068 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 17 Feb 2019 17:23:57 +0000 Subject: [PATCH 558/694] gnu: Add ruby-autoprefixer-rails. * gnu/packages/rails.scm (ruby-autoprefixer-rails): New variable. --- gnu/packages/rails.scm | 54 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/gnu/packages/rails.scm b/gnu/packages/rails.scm index e359b24991..e623f9b8c4 100644 --- a/gnu/packages/rails.scm +++ b/gnu/packages/rails.scm @@ -22,6 +22,7 @@ (define-module (gnu packages rails) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix packages) + #:use-module (gnu packages node) #:use-module (gnu packages ruby) #:use-module (guix build-system ruby)) @@ -122,6 +123,59 @@ (define-public ruby-debug-inspector "https://github.com/banister/debug_inspector") (license license:expat))) +(define-public ruby-autoprefixer-rails + (package + (name "ruby-autoprefixer-rails") + (version "9.4.7") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "autoprefixer-rails" version)) + (sha256 + (base32 + "0fxbfl3xrrjj84n98x24yzxbz4nvm6c492dxj41kkrl9z97ga13i")))) + (build-system ruby-build-system) + (arguments + '(#:test-target "spec" + #:phases + (modify-phases %standard-phases + (add-after 'extract-gemspec 'remove-unnecessary-dependencies + (lambda _ + ;; Remove the testing of compass, as it's use is deprecated, and + ;; it's unpackaged for Guix + (substitute* "autoprefixer-rails.gemspec" + ((".*%q.*") "\n") + (("\"spec/compass_spec\\.rb\"\\.freeze, ") "")) + (delete-file "spec/compass_spec.rb") + + (substitute* "Gemfile" + ;; Remove overly strict requirement on sprockets + ((", '>= 4\\.0\\.0\\.beta1'") "") + ;; The mini_racer gem isn't packaged yet, and it's not directly + ;; required, as other backends for ruby-execjs can be used. + (("gem 'mini_racer'") "") + ;; For some reason, this is required for the gems to be picked + ;; up + (("gemspec") "gemspec\ngem 'tzinfo-data'\ngem 'sass'")) + #t))))) + (native-inputs + `(("bundler" ,bundler) + ("ruby-rails" ,ruby-rails) + ("ruby-rspec-rails" ,ruby-rspec-rails) + ;; This is needed for a test, but I'm unsure why + ("ruby-sass" ,ruby-sass) + ;; This is used as the ruby-execjs runtime + ("node" ,node))) + (propagated-inputs + `(("ruby-execjs" ,ruby-execjs))) + (synopsis "Parse CSS and add vendor prefixes to CSS rules") + (description + "This gem provides Ruby and Ruby on Rails integration with Autoprefixer, +which can parse CSS and add vendor prefixes to CSS rules using values from the +Can I Use website.") + (home-page "https://github.com/ai/autoprefixer-rails") + (license license:expat))) + (define-public ruby-activemodel (package (name "ruby-activemodel") From 09924294333881315f5a21280c07f01c0313425f Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 17 Feb 2019 17:24:05 +0000 Subject: [PATCH 559/694] gnu: Add ruby-rerun. * gnu/packages/ruby.scm (ruby-rerun): New variable. --- gnu/packages/ruby.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 9567f48877..9a899b6bb4 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2852,6 +2852,30 @@ (define-public ruby-redcarpet (home-page "https://github.com/vmg/redcarpet") (license license:expat))) +(define-public ruby-rerun + (package + (name "ruby-rerun") + (version "0.13.0") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "rerun" version)) + (sha256 + (base32 + "1cskvxk8z8vmfail8na7hj91hs0qnvds9nydj04zi3dbddgnbmvz")))) + (build-system ruby-build-system) + (arguments + '(#:tests? #f)) ; No included tests + (propagated-inputs + `(("ruby-listen" ,ruby-listen))) + (synopsis "Run a process, and restart when some monitored files change") + (description + "Rerun is a tool to launch programs, then monitor the filesystem, and +restart the program when any of the monitored files change. It's written in +Ruby, but can be used for all programs.") + (home-page "https://github.com/alexch/rerun/") + (license license:expat))) + (define-public ruby-mocha (package (name "ruby-mocha") From a60370727a77d1658307698276239c153d8279e8 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Sat, 23 Mar 2019 13:36:22 +0100 Subject: [PATCH 560/694] gnu: wayland: Update to 1.17.0. * gnu/packages/freedesktop.scm (wayland): Update to 1.17.0. --- gnu/packages/freedesktop.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 09098ee658..0c27cd69a4 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2016 Kei Kebreau ;;; Copyright © 2017, 2018 Mark H Weaver ;;; Copyright © 2017, 2018, 2019 Marius Bakke -;;; Copyright © 2017, 2018 Rutger Helling +;;; Copyright © 2017, 2018, 2019 Rutger Helling ;;; Copyright © 2017 Brendan Tildesley ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Pierre Neidhardt @@ -398,14 +398,14 @@ (define-public python2-pyxdg (define-public wayland (package (name "wayland") - (version "1.16.0") + (version "1.17.0") (source (origin (method url-fetch) (uri (string-append "https://wayland.freedesktop.org/releases/" name "-" version ".tar.xz")) (sha256 (base32 - "1xajhxad43izq9f7sbww1hlg42nayijy8xnp21kgpk09c6sw4wjf")))) + "194ibzwpdcn6fvk4xngr4bf5axpciwg2bj82fdvz88kfmjw13akj")))) (build-system gnu-build-system) (arguments `(#:parallel-tests? #f)) From 7fde8092f435899712693865b715b78017905c86 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Mar 2019 18:38:39 +0100 Subject: [PATCH 561/694] gnu: perl-type-tie: Update to 0.014. * gnu/packages/perl.scm (perl-type-tie): Update to 0.014. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 562311c90d..7061e56c30 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -8839,15 +8839,14 @@ (define-public perl-try-tiny (define-public perl-type-tie (package (name "perl-type-tie") - (version "0.009") + (version "0.014") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/T/TO/TOBYINK/" "Type-Tie-" version ".tar.gz")) (sha256 - (base32 - "1wv32kd7gx4kfyvzs13y029f49qbbji991wawvarac7rlz09wpan")))) + (base32 "1ri23xb3rdb59lk984hnjqi4pb97zqnv4ppn0zpd70pfp0a9addm")))) (build-system perl-build-system) (native-inputs `(("perl-test-fatal" ,perl-test-fatal) From c7b7a2eaf826fb52a2ad2c8869da9b1e9e1ed8e2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Mar 2019 18:40:44 +0100 Subject: [PATCH 562/694] gnu: perl-regexp-pattern: Update to 0.2.8. * gnu/packages/perl.scm (perl-regexp-pattern): Update to 0.2.8. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 7061e56c30..87044685df 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -9757,7 +9757,7 @@ (define-public perl-pod-constants (define-public perl-regexp-pattern (package (name "perl-regexp-pattern") - (version "0.1.4") + (version "0.2.8") (source (origin (method url-fetch) @@ -9765,8 +9765,7 @@ (define-public perl-regexp-pattern "mirror://cpan/authors/id/P/PE/PERLANCAR/Regexp-Pattern-" version ".tar.gz")) (sha256 - (base32 - "0rwpl6dxd1yl2ng3d4jdy68jz3mggmdl35rphrw1x619sm1aa876")))) + (base32 "064igp2wxgsz4yb33v1r90i8clwjzs2xnpvw9niqlqrbzzrd4q1l")))) (build-system perl-build-system) (native-inputs `(("perl-test-exception" ,perl-test-exception))) From 8c42929b65cbe82408c3bdbc60f8c7dfdba1fe53 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Mar 2019 18:47:36 +0100 Subject: [PATCH 563/694] gnu: perl-base: Update to 2.23. * gnu/packages/perl.scm (perl-base): Update to 2.23. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 87044685df..2983faf3c1 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -383,15 +383,14 @@ (define-public perl-bareword-filehandles (define-public perl-base (package (name "perl-base") - (version "2.18") + (version "2.23") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/R/RG/RGARCIA/" "base-" version ".tar.gz")) (sha256 - (base32 - "01n3l5ifmn2wd0aadpnzya27b75imibj9zdivkfzcpnviqgx5c2m")))) + (base32 "1pjxcbbcpwlgzm0fzsbqd58zn8cj9vwril1wn3xfd7ws550mixa0")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/base") (synopsis "Establish an ISA relationship with base classes at compile time") From 2ce89a771a565040304b76f3d779cd6522f444f0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Mar 2019 18:56:36 +0100 Subject: [PATCH 564/694] gnu: perl-file-sharedir-dist: Update to 0.07. * gnu/packages/perl.scm (perl-file-sharedir-dist): Update to 0.07. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 2983faf3c1..2625e30387 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -3661,15 +3661,14 @@ (define-public perl-file-sharedir (define-public perl-file-sharedir-dist (package (name "perl-file-sharedir-dist") - (version "0.05") + (version "0.07") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/P/PL/PLICEASE/" "File-ShareDir-Dist-" version ".tar.gz")) (sha256 - (base32 - "1xkmrckp1qfi9ik098n2vz0r8g7wfwp2y05zjd100w6wcqwfzcpn")))) + (base32 "0vg8kxzgz4hf6221jb4v5bx1zhsnplnw5bcmxx0iyd92xv8fazwd")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/File-ShareDir-Dist") (synopsis "Locate per-dist shared files") From 9c5329103704c4787bd7a802b25197bf97d4e4bc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Mar 2019 18:57:13 +0100 Subject: [PATCH 565/694] gnu: perl-moosex-types-datetime-morecoercions: Update to 0.15. * gnu/packages/perl.scm (perl-moosex-types-datetime-morecoercions): Update to 0.15. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 2625e30387..c517704751 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -5927,7 +5927,7 @@ (define-public perl-moosex-types-datetime (define-public perl-moosex-types-datetime-morecoercions (package (name "perl-moosex-types-datetime-morecoercions") - (version "0.14") + (version "0.15") (source (origin (method url-fetch) @@ -5936,7 +5936,7 @@ (define-public perl-moosex-types-datetime-morecoercions version ".tar.gz")) (sha256 (base32 - "0888ns6fmvpcj5vh86n8mra9anq8jak7gf0b1z5hvww4birki6dn")))) + "15ip1rgaana2p4vww355jb5jxyawim0k58gadkdqx20rfxckmfr1")))) (build-system perl-build-system) (native-inputs `(("perl-module-build-tiny" ,perl-module-build-tiny) From c459160dd5705bc39ef9a7ba693b717cb49f184b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Mar 2019 19:04:23 +0100 Subject: [PATCH 566/694] gnu: perl-params-validationcompiler: Update to 0.30. * gnu/packages/perl.scm (perl-params-validationcompiler): Update to 0.30. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index c517704751..dcde43f636 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -6814,15 +6814,14 @@ (define-public perl-params-validate (define-public perl-params-validationcompiler (package (name "perl-params-validationcompiler") - (version "0.27") + (version "0.30") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/D/DR/DROLSKY/" "Params-ValidationCompiler-" version ".tar.gz")) (sha256 - (base32 - "1cpr188c2xm0kkmdir6slcsgv7v6ibqff4lax8s0whwx6ml9kaah")))) + (base32 "1jqn1l4m4i341g14kmjsf3a1kn7vv6z89cix0xjjgr1v70iywnyw")))) (build-system perl-build-system) (native-inputs ;; For tests. From 695f839e14ba8abb98b2aaf7167102692e6d29f5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Mar 2019 19:09:41 +0100 Subject: [PATCH 567/694] gnu: perl-moox-types-mooselike: Update to 0.29. * gnu/packages/perl.scm (perl-moox-types-mooselike): Update to 0.29. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index dcde43f636..834f02b736 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -6233,15 +6233,14 @@ (define-public perl-moox-options (define-public perl-moox-types-mooselike (package (name "perl-moox-types-mooselike") - (version "0.28") + (version "0.29") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/M/MA/MATEU/" "MooX-Types-MooseLike-" version ".tar.gz")) (sha256 - (base32 - "15af2xmpari4vwjwxn1m9yzjfffkr2aiisqqfij31gxcdk15fpk3")))) + (base32 "1d6jg9x3p7gm2r0xmbcag374a44gf5pcga2swvxhlhzakfm80dqx")))) (build-system perl-build-system) (native-inputs `(("perl-moo" ,perl-moo) From 59a5a1df3393f7ea1f9deaa6e4aaa0b8163bc93b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Mar 2019 19:17:06 +0100 Subject: [PATCH 568/694] gnu: perl-text-csv: Update to 1.99. * gnu/packages/perl.scm (perl-text-csv): Update to 1.99. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 834f02b736..26365833fa 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -8239,15 +8239,14 @@ (define-public perl-text-balanced (define-public perl-text-csv (package (name "perl-text-csv") - (version "1.33") + (version "1.99") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/M/MA/MAKAMAKA/" "Text-CSV-" version ".tar.gz")) (sha256 - (base32 - "05a1nayxv04n0hx7y3m8327ijm34k9nhngrbxl18zmgzpawqynww")))) + (base32 "1llccsl6sr11g9affh43m6q5r85qgnpi9n7idcs1vi9cn4ww0kp7")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/Text-CSV") (synopsis "Manipulate comma-separated values") From 4a5758084ebf9409ba2b2bc226cab1d683a375e7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Mar 2019 19:17:29 +0100 Subject: [PATCH 569/694] gnu: perl-b-keywords: Update to 1.20. * gnu/packages/perl.scm (perl-b-keywords): Update to 1.20. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 26365833fa..64f6f31dac 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -469,15 +469,14 @@ (define-public perl-b-hooks-op-check (define-public perl-b-keywords (package (name "perl-b-keywords") - (version "1.15") + (version "1.20") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/R/RU/RURBAN/B-Keywords-" version ".tar.gz")) (sha256 - (base32 - "1nhdplmd0y69lnwyajg3anhk6pm13nm6qzm05nzpz8zl7j7fzlk5")))) + (base32 "12jvx5gnypqxal4valkf9lidba9nz7kjk2wvm07q3hkmdqxw1zk0")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/B-Keywords") (synopsis "Lists of reserved barewords and symbol names") From 687a8b0857dc3afdd53002e7113402307400657f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Mar 2019 19:32:57 +0100 Subject: [PATCH 570/694] gnu: perl-padwalker: Update to 2.3. * gnu/packages/perl.scm (perl-padwalker): Update to 2.3. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 64f6f31dac..8593241aa9 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -6721,15 +6721,14 @@ (define-public perl-package-stash-xs (define-public perl-padwalker (package (name "perl-padwalker") - (version "2.0") + (version "2.3") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/R/RO/ROBIN/" "PadWalker-" version ".tar.gz")) (sha256 - (base32 - "058l78rkr6px3rqcv2sdf9sqimdq1nc6py5yb9rrg3wmva7crw84")))) + (base32 "1kw8cnfyh6jbngm9q1kn003g08gis6l82h77d12yaq88c3xl8v1a")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/PadWalker") (synopsis "Play with other peoples' lexical variables") From 7066764e9f5f3893c79c9d2a49a6c7232b5213a4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Mar 2019 20:22:10 +0100 Subject: [PATCH 571/694] gnu: perl-clone: Update to 0.41. * gnu/packages/perl.scm (perl-clone): Update to 0.41. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 8593241aa9..a6431e3fbb 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -1292,14 +1292,14 @@ (define-public perl-class-xsaccessor (define-public perl-clone (package (name "perl-clone") - (version "0.39") + (version "0.41") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/G/GA/GARU/" "Clone-" version ".tar.gz")) (sha256 (base32 - "0bgsidb96gxzf3zhy6v1ksj1c200vxbwykk32fqm1mj97rl4dc5c")))) + "060mlm31lacirpnp5fl9jqk4m9cl07vjlh89k83qk25wykf5dh78")))) (build-system perl-build-system) (synopsis "Recursively copy Perl datatypes") (description From 8bf22214fa31b76538670feae47c411e4cc5a405 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Mar 2019 20:25:19 +0100 Subject: [PATCH 572/694] gnu: perl-error: Update to 0.17027. * gnu/packages/perl.scm (perl-error): Update to 0.17027. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index a6431e3fbb..ff2eaf7410 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -3091,14 +3091,14 @@ (define-public perl-env-path (define-public perl-error (package (name "perl-error") - (version "0.17025") + (version "0.17027") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/S/SH/SHLOMIF/" "Error-" version ".tar.gz")) (sha256 (base32 - "1bzgzmf1v4md02vadm46b4j4ilqxrcrfasvbzymhrznlsd54g7vc")))) + "1gnkxf12dq2w1jmjpllp5f30ya4nll01jv2sfi24386zfn1arch7")))) (build-system perl-build-system) (native-inputs `(("perl-module-build" ,perl-module-build))) (home-page "https://metacpan.org/release/Error") From c422d5d6d2b56147a3992dddc4924355bf6452cc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Mar 2019 20:30:11 +0100 Subject: [PATCH 573/694] gnu: perl-perlio-utf8-strict: Update to 0.007. * gnu/packages/perl.scm (perl-perlio-utf8-strict): Update to 0.007. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index ff2eaf7410..a3425e4f69 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -6956,7 +6956,7 @@ (define-public perl-path-tiny (define-public perl-perlio-utf8_strict (package (name "perl-perlio-utf8-strict") - (version "0.006") + (version "0.007") (source (origin (method url-fetch) (uri (string-append @@ -6964,7 +6964,7 @@ (define-public perl-perlio-utf8_strict version ".tar.gz")) (sha256 (base32 - "0qnmiflirfq10jkmrxyy81ch6hzyndfzxqf8maif0fy44kk1004q")))) + "1jw1ri8nkm4ck73arbsld1y2qgj2b9ir01y8mzb3mjs6w0pkz8w3")))) (build-system perl-build-system) (native-inputs `(("perl-test-exception" ,perl-test-exception))) From 434cd2de8ca4180a9dc5b0e6073ceeb92940f6ba Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Mar 2019 20:35:21 +0100 Subject: [PATCH 574/694] gnu: perl-path-iterator-rule: Update to 1.014. * gnu/packages/perl.scm (perl-path-iterator-rule): Update to 1.014. --- gnu/packages/perl.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index a3425e4f69..56b9a9908e 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -5934,8 +5934,7 @@ (define-public perl-moosex-types-datetime-morecoercions "MooseX-Types-DateTime-MoreCoercions-" version ".tar.gz")) (sha256 - (base32 - "15ip1rgaana2p4vww355jb5jxyawim0k58gadkdqx20rfxckmfr1")))) + (base32 "15ip1rgaana2p4vww355jb5jxyawim0k58gadkdqx20rfxckmfr1")))) (build-system perl-build-system) (native-inputs `(("perl-module-build-tiny" ,perl-module-build-tiny) @@ -9674,7 +9673,7 @@ (define-public perl-libtime-period (define-public perl-path-iterator-rule (package (name "perl-path-iterator-rule") - (version "1.012") + (version "1.014") (source (origin (method url-fetch) @@ -9682,8 +9681,7 @@ (define-public perl-path-iterator-rule "mirror://cpan/authors/id/D/DA/DAGOLDEN/Path-Iterator-Rule-" version ".tar.gz")) (sha256 - (base32 - "1z76avwvwgv4bw28kzx79mmb4449s5l345sn0wljq3dbf4wqigd1")))) + (base32 "19mik0r5v1cmxfxm0h4lwqyj0nmq6jgnvvq96hqcjgylpvc02x1z")))) (build-system perl-build-system) (native-inputs `(("perl-file-pushd" ,perl-file-pushd) From 8134340db614ee529dbaa3cc99e3b2cd4f488264 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Mar 2019 20:36:07 +0100 Subject: [PATCH 575/694] gnu: perl-file-find-object-rule: Update to 0.0309. * gnu/packages/perl.scm (perl-file-find-object-rule): Update to 0.0309. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 56b9a9908e..0e0525c163 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -9517,7 +9517,7 @@ (define-public perl-file-find-object (define-public perl-file-find-object-rule (package (name "perl-file-find-object-rule") - (version "0.0305") + (version "0.0309") (source (origin (method url-fetch) @@ -9526,8 +9526,7 @@ (define-public perl-file-find-object-rule version ".tar.gz")) (sha256 - (base32 - "0hs4n3w99q4ylkhg3qhzcwkxqn7zblfj1zjdgl06ca30afkk4cv6")))) + (base32 "1qr1rrp9gn0bpsixsrkan710sxc7bnhirh0anjsw2ihn4wdy3151")))) (build-system perl-build-system) (native-inputs `(("perl-module-build" ,perl-module-build))) From bfe5936e023a210fb3d9905d62ce99ddeddec2af Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Mar 2019 20:37:15 +0100 Subject: [PATCH 576/694] gnu: perl-modern-perl: Update to 1.20181021. * gnu/packages/perl.scm (perl-modern-perl): Update to 1.20181021. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 0e0525c163..6d6d6a584f 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -5070,7 +5070,7 @@ (define-public perl-mixin-linewise (define-public perl-modern-perl (package (name "perl-modern-perl") - (version "1.20170117") + (version "1.20181021") (source (origin (method url-fetch) @@ -5078,8 +5078,7 @@ (define-public perl-modern-perl "mirror://cpan/authors/id/C/CH/CHROMATIC/Modern-Perl-" version ".tar.gz")) (sha256 - (base32 - "0a1n9c04zhs1a1km1zi0d1hj78d10qv3bhxr4bdi4chnc4saiwjx")))) + (base32 "1if9jbh66z2vm4wwnky41ljnhdlwrh7vzl6pd3w60v3wix92nj0x")))) (build-system perl-build-system) (native-inputs `(("perl-module-build" ,perl-module-build))) From c51f31940d6650d8ebac5ff0835561d7f841d511 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Mar 2019 20:56:31 +0100 Subject: [PATCH 577/694] gnu: perl-package-stash-xs: Update to 0.29. * gnu/packages/perl.scm (perl-package-stash-xs): Update to 0.29. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 6d6d6a584f..74cbe52a59 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -6694,15 +6694,14 @@ (define-public perl-package-stash (define-public perl-package-stash-xs (package (name "perl-package-stash-xs") - (version "0.28") + (version "0.29") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/D/DO/DOY/" "Package-Stash-XS-" version ".tar.gz")) (sha256 - (base32 - "11nl69n8i56p91pd0ia44ip0vpv2cxwpbfakrv01vvv8az1cbn13")))) + (base32 "1akqk10qxwk798qppajqbczwmhy4cs9g0lg961m3vq218slnnryk")))) (build-system perl-build-system) (native-inputs `(("perl-test-fatal" ,perl-test-fatal) From c2eba9b206cf750f4d0b6682784519b7d7cd0693 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Mar 2019 20:58:05 +0100 Subject: [PATCH 578/694] gnu: perl-date-manip: Update to 6.76. * gnu/packages/perl.scm (perl-date-manip): Update to 6.76. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 74cbe52a59..5ecf9a0edd 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -2146,15 +2146,14 @@ (define-public perl-date-calc-xs (define-public perl-date-manip (package (name "perl-date-manip") - (version "6.70") + (version "6.76") (source (origin (method url-fetch) (uri (string-append "https://cpan.metacpan.org/authors/id/S/SB/SBECK/" "Date-Manip-" version ".tar.gz")) (sha256 - (base32 - "0r4k4ypb09xwhvq6das0vpx2c0xbhhhx83knq6jfpf8m55h8qi9r")))) + (base32 "1a33mpkx7qqb9nqxyh2kkb596d8xq6jw0ljrd4xrwiz30f6cg1qw")))) (build-system perl-build-system) (native-inputs `(("perl-module-build" ,perl-module-build))) (arguments From 5befbe2df956d1e5002af46ed98095f1485c979a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Mar 2019 20:59:55 +0100 Subject: [PATCH 579/694] gnu: perl-datetime-calendar-julian: Update to 0.100. * gnu/packages/perl.scm (perl-datetime-calendar-julian): Update to 0.100. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 5ecf9a0edd..6a514ed514 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -2224,15 +2224,14 @@ (define-public perl-datetime (define-public perl-datetime-calendar-julian (package (name "perl-datetime-calendar-julian") - (version "0.04") + (version "0.100") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/P/PI/PIJLL/" "DateTime-Calendar-Julian-" version ".tar.gz")) (sha256 - (base32 - "03h0llkwsiw2d2ci1ah5x9sp8xrvnbgd471i5hnpgl5w32nnhndv")))) + (base32 "0gbw7rh706qk5jlmmz3yzsm0ilzp39kyar28g4j6d57my8cwaipx")))) (build-system perl-build-system) ;; Only needed for tests (native-inputs From b59d5885addd0c1b084f9078912a0d83b74ec331 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Mar 2019 21:11:43 +0100 Subject: [PATCH 580/694] gnu: perl-class-c3: Update to 0.34. * gnu/packages/perl.scm (perl-class-c3): Update to 0.34. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 6a514ed514..5b057bca2c 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -937,15 +937,14 @@ (define-public perl-class-accessor-grouped (define-public perl-class-c3 (package (name "perl-class-c3") - (version "0.27") + (version "0.34") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/H/HA/HAARG/" "Class-C3-" version ".tar.gz")) (sha256 - (base32 - "185jdpr4applrkvh71ks9ildx5kdymhqr4hilsqxwqny1wr56qss")))) + (base32 "1dcibc31v5jwmi6hsdzi7c5ag1sb4wp3kxkibc889qrdj7jm12sd")))) (build-system perl-build-system) (propagated-inputs `(("perl-algorithm-c3" ,perl-algorithm-c3))) From 883a100de43e50a1bc79b6cbb58f2021577bd437 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Mar 2019 21:18:02 +0100 Subject: [PATCH 581/694] gnu: perl-yaml-libyaml: Update to 0.76. * gnu/packages/perl.scm (perl-yaml-libyaml): Update to 0.76. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 5b057bca2c..2f6f94b608 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -9220,7 +9220,7 @@ (define-public perl-yaml (define-public perl-yaml-libyaml (package (name "perl-yaml-libyaml") - (version "0.69") + (version "0.76") (source (origin (method url-fetch) @@ -9229,8 +9229,7 @@ (define-public perl-yaml-libyaml version ".tar.gz")) (sha256 - (base32 - "06msvj3vmjszl5zj1k7g47ll0kkds9gdb5sky0q27lh4zw1vlj33")))) + (base32 "1m94g36sl9rasjlvlsf65xcal5hvkc3gbzd7l68h17az75269kyy")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/YAML-LibYAML") From e7a58cab646cb7d268697de4b309662cf7fd4aa2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Mar 2019 21:19:05 +0100 Subject: [PATCH 582/694] gnu: perl-time-duration-parse: Update to 0.14. * gnu/packages/perl.scm (perl-time-duration-parse): Update to 0.14. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 2f6f94b608..d76b3c590f 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -8629,15 +8629,14 @@ (define-public perl-time-duration (define-public perl-time-duration-parse (package (name "perl-time-duration-parse") - (version "0.13") + (version "0.14") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/N/NE/NEILB/" "Time-Duration-Parse-" version ".tar.gz")) (sha256 - (base32 - "0affdzhsiy7dr6dzj2p6m9lynmjh53k31bprfsfa21pz8551hjj1")))) + (base32 "17nh73r50mqqpgxdf3zpgdiqrizmjy0vdk0zd6xi9zcsdijrdhnc")))) (build-system perl-build-system) (native-inputs `(("perl-time-duration" ,perl-time-duration))) From 075edbb8c263c25d83fb039173bd20a6d242eac1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Mar 2019 21:21:22 +0100 Subject: [PATCH 583/694] gnu: perl-text-aligner: Update to 0.13. * gnu/packages/perl.scm (perl-text-aligner): Update to 0.13. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index d76b3c590f..f0e2be4dfb 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -8192,15 +8192,14 @@ (define-public perl-term-table (define-public perl-text-aligner (package (name "perl-text-aligner") - (version "0.12") + (version "0.13") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/S/SH/SHLOMIF/" "Text-Aligner-" version ".tar.gz")) (sha256 - (base32 - "0a6zkchc0apvzkch6z18cx6h97xfiv50r7n4xhg90x8dvk75qzcs")))) + (base32 "1vry21jrh91l2pkajnrps83bnr1fn6zshbzi80mcrnggrn9iq776")))) (build-system perl-build-system) (native-inputs `(("perl-module-build" ,perl-module-build))) (home-page "https://metacpan.org/release/Text-Aligner") From a822a3fd048b856376d59a6b1c83acd078898af0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Mar 2019 21:22:05 +0100 Subject: [PATCH 584/694] gnu: perl-log-any: Update to 1.707. * gnu/packages/perl.scm (perl-log-any): Update to 1.707. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index f0e2be4dfb..67a7334f45 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -4532,15 +4532,14 @@ (define-public perl-lexical-sealrequirehints (define-public perl-log-any (package (name "perl-log-any") - (version "1.040") + (version "1.707") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/D/DA/DAGOLDEN/Log-Any-" version ".tar.gz")) (sha256 - (base32 - "0r1q7cclgwl24gzdnjzvd8y0r7j17dngjk492x35w198zhdj2ncp")))) + (base32 "1wb55ib4gvk8h5pjb6hliqg7li1xjk420q3w5r33f9p1ps60ylbl")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/Log-Any") (synopsis "Bringing loggers and listeners together") From 5648fbf7b293de501f3d058816de3ea2992e5901 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Mar 2019 21:22:38 +0100 Subject: [PATCH 585/694] gnu: perl-unicode-collate: Update to 1.27. * gnu/packages/perl.scm (perl-unicode-collate): Update to 1.27. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 67a7334f45..408d7b4e3d 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -8979,15 +8979,14 @@ (define-public perl-unicode-normalize (define-public perl-unicode-collate (package (name "perl-unicode-collate") - (version "1.18") + (version "1.27") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/S/SA/SADAHIRO/" "Unicode-Collate-" version ".tar.gz")) (sha256 - (base32 - "1lq4p3mqqljhhy8wyiyahris33j4m5qfzpi6iacmcqjzw5g4afbm")))) + (base32 "12df4n46yri6via4x9jb918v1hk6yrlzqk9srq6fnz5kviylnxbf")))) (build-system perl-build-system) (arguments `(#:phases From 9061b727cfbd70e30870525b5fcd1eb8793ee99a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Mar 2019 21:40:11 +0100 Subject: [PATCH 586/694] gnu: perl-package-stash: Update to 0.38. * gnu/packages/perl.scm (perl-package-stash): Update to 0.38. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 408d7b4e3d..ac9d9d6fb7 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -6661,15 +6661,14 @@ (define-public perl-package-deprecationmanager (define-public perl-package-stash (package (name "perl-package-stash") - (version "0.37") + (version "0.38") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/D/DO/DOY/" "Package-Stash-" version ".tar.gz")) (sha256 - (base32 - "0b3vg2nbzmz1m5qla4123rmfzmpfmwxkw78fghvwsc4iiww0baq6")))) + (base32 "0zrs4byhlpq5ybnl0fd3y6pfzair6i2dyvzn7f7a7pgj9n2fi3n5")))) (build-system perl-build-system) (native-inputs `(("perl-dist-checkconflicts" ,perl-dist-checkconflicts) From 00ffc98fb3c4de78be09cd470b2c92f7f1a5fd64 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 09:29:46 +0100 Subject: [PATCH 587/694] gnu: perl-mouse: Update to 2.5.6. * gnu/packages/perl.scm (perl-mouse): Update to 2.5.6. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index ac9d9d6fb7..c8d2b52137 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -6251,7 +6251,7 @@ (define-public perl-moox-types-mooselike (define-public perl-mouse (package (name "perl-mouse") - (version "2.4.9") + (version "2.5.6") (source (origin (method url-fetch) (uri (string-append @@ -6260,7 +6260,7 @@ (define-public perl-mouse ".tar.gz")) (sha256 (base32 - "1y20sl97x1h4y1iid47hj0w1hb2887dchh4nfffgmqpyggkslh4n")))) + "1j3048ip691j91rdig6wrlg6i4jdzhszxmz5pi2g7n355rl2w00l")))) (build-system perl-build-system) (native-inputs `(("perl-module-build" ,perl-module-build) From 732dd18a9d7574ecc7d4eddfc7406825e6f7ec0f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 09:34:44 +0100 Subject: [PATCH 588/694] gnu: perl-log-report-optional: Update to 1.06. * gnu/packages/perl.scm (perl-log-report-optional): Update to 1.06. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index c8d2b52137..919cc49d2a 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -4610,14 +4610,14 @@ (define-public perl-log-log4perl (define-public perl-log-report-optional (package (name "perl-log-report-optional") - (version "1.01") + (version "1.06") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/M/MA/MARKOV/" "Log-Report-Optional-" version ".tar.gz")) (sha256 (base32 - "1f4yi4dgzqjc79vrh4f2phdj57xxgk8hd2psx77214i4m5av408f")))) + "11ciiaq8vy186m7mzj8pcncwi8p9qp13wblvk427g1pnqjzlda0g")))) (build-system perl-build-system) (propagated-inputs `(("perl-string-print" ,perl-string-print))) From 2a4bb24e6f8796c4f1bde59852f02deae7304708 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 09:42:05 +0100 Subject: [PATCH 589/694] gnu: perl-file-sharedir: Update to 1.116. * gnu/packages/perl.scm (perl-file-sharedir): Update to 1.116. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 919cc49d2a..084d0b0f9e 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -3630,15 +3630,14 @@ (define-public perl-file-remove (define-public perl-file-sharedir (package (name "perl-file-sharedir") - (version "1.104") + (version "1.116") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/R/RE/REHSACK/" "File-ShareDir-" version ".tar.gz")) (sha256 - (base32 - "1bqwhk3qfg60bkpi5b83bh93sng8jx20i3ka5sixc0prrppjidh7")))) + (base32 "0a43rfb0a1fpxh4d2dayarkdxw4cx9a2krkk87zmcilcz7yhpnar")))) (build-system perl-build-system) (native-inputs `(("perl-file-sharedir-install" ,perl-file-sharedir-install))) From ff6c9dbf63176324c614500fbbcf15ad064ab664 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 09:51:36 +0100 Subject: [PATCH 590/694] gnu: perl-tree-simple-visitorfactory: Update to 0.15. * gnu/packages/perl.scm (perl-tree-simple-visitorfactory): Update to 0.15. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 084d0b0f9e..308bc1336b 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -8776,15 +8776,14 @@ (define-public perl-tree-simple (define-public perl-tree-simple-visitorfactory (package (name "perl-tree-simple-visitorfactory") - (version "0.12") + (version "0.15") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/R/RS/RSAVAGE/" "Tree-Simple-VisitorFactory-" version ".tgz")) (sha256 - (base32 - "1g27xl48q1vr7aikhxg4vvcsj1si8allxz59vmnks61wsw4by7vg")))) + (base32 "06y2vazkl307k59hnkp9h5bp3p7711kgmp1qdhb2lgnfwzn84zin")))) (build-system perl-build-system) (native-inputs `(("perl-module-build" ,perl-module-build) From c36909ca1dd70dc1988b7b27e90e9ed7a1ca55a1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 09:58:51 +0100 Subject: [PATCH 591/694] gnu: perl-ipc-run: Update to 20180523.0. * gnu/packages/perl.scm (perl-ipc-run): Update to 20180523.0. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 308bc1336b..aec354595d 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -4311,15 +4311,14 @@ (define-public perl-ipc-cmd (define-public perl-ipc-run (package (name "perl-ipc-run") - (version "0.94") + (version "20180523.0") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/T/TO/TODDR/" "IPC-Run-" version ".tar.gz")) (sha256 - (base32 - "0nv0lpw31zaz6vi42q7ihjj3j382j4njicp5k0gsczib3b4kdcrf")))) + (base32 "0bvckcs1629ifqfb68xkapd4a74fd5qbg6z9qs8i6rx4z3nxfl1q")))) (build-system perl-build-system) (propagated-inputs `(("perl-io-tty" ,perl-io-tty))) From ba1eadaff65b01f49a3f8eb8ee544a0782f28d27 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 09:59:42 +0100 Subject: [PATCH 592/694] gnu: perl-boolean: Update to 0.46. * gnu/packages/perl.scm (perl-boolean): Update to 0.46. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index aec354595d..1d37e57c29 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -541,15 +541,14 @@ (define-public perl-bit-vector (define-public perl-boolean (package (name "perl-boolean") - (version "0.45") + (version "0.46") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/I/IN/INGY/" "boolean-" version ".tar.gz")) (sha256 - (base32 - "18hrgldzwnhs0c0r8hxx6r05qvk9p7gwinjwcybixfs2h0n43ypj")))) + (base32 "0shmiw8pmshnwj01cz8g94867hjf4vc1dkp61xlbz0rybh48ih4m")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/boolean") (synopsis "Boolean support for Perl") From 4830328044e83dee9f08cab98b0c0c46f436dca2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 10:00:06 +0100 Subject: [PATCH 593/694] gnu: perl-svg: Update to 2.84. * gnu/packages/perl.scm (perl-svg): Update to 2.84. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 1d37e57c29..0e6f738d67 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -7818,15 +7818,14 @@ (define-public perl-super (define-public perl-svg (package (name "perl-svg") - (version "2.63") + (version "2.84") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/S/SZ/SZABGAB/SVG-" version ".tar.gz")) (sha256 - (base32 - "12cbncsfxbwg1w3p1qmymfbqdb22kmyajxzdnxnxbq5xjl6yncha")))) + (base32 "1br8dwh2363s6r0qgy7vv30gv5kj456vj5m6x83savx4wzfnsggc")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/SVG") (synopsis "Perl extension for generating SVG documents") From 54773b0804315d735a5c1232ef7445bcc4e53666 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 10:02:11 +0100 Subject: [PATCH 594/694] gnu: perl-moosex-emulate-class-accessor-fast: Update to 0.009032. * gnu/packages/perl.scm (perl-moosex-emulate-class-accessor-fast): Update to 0.009032. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 0e6f738d67..84ec934573 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -5532,7 +5532,7 @@ (define-public perl-moose (define-public perl-moosex-emulate-class-accessor-fast (package (name "perl-moosex-emulate-class-accessor-fast") - (version "0.00903") + (version "0.009032") (source (origin (method url-fetch) @@ -5540,8 +5540,7 @@ (define-public perl-moosex-emulate-class-accessor-fast "MooseX-Emulate-Class-Accessor-Fast-" version ".tar.gz")) (sha256 - (base32 - "1lkn1h4sxr1483jicsgsgzclbfw63g2i2c3m4v4j9ar75yrb0kh8")))) + (base32 "153r30nggcyyx7ai15dbnba2h5145f8jdsh6wj54298d3zpvgvl2")))) (build-system perl-build-system) (native-inputs `(("perl-module-install" ,perl-module-install) From 1001fb558a32215090dca412d00724f18cfec75d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 10:02:35 +0100 Subject: [PATCH 595/694] gnu: perl-net-dns-native: Update to 0.20. * gnu/packages/perl.scm (perl-net-dns-native): Update to 0.20. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 84ec934573..c6ee1d8760 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -6426,7 +6426,7 @@ (define-public perl-namespace-clean (define-public perl-net-dns-native (package (name "perl-net-dns-native") - (version "0.15") + (version "0.20") (source (origin (method url-fetch) @@ -6434,7 +6434,7 @@ (define-public perl-net-dns-native "mirror://cpan/authors/id/O/OL/OLEG/Net-DNS-Native-" version ".tar.gz")) (sha256 - (base32 "12bsv5jkic3q4arpzk6dda35didkn445v658j87rmi540dpnac85")))) + (base32 "0whm9l30frgzcfmlzqrsx3q5rdi8y6dhz33r4msgxrch8h97i8cb")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/Net-DNS-Native") (synopsis "Non-blocking system DNS resolver") From 9a9bdff6061122daee51f78151d42a0c96283cb8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 10:11:18 +0100 Subject: [PATCH 596/694] gnu: perl-object-signature: Update to 1.08. * gnu/packages/perl.scm (perl-object-signature): Update to 1.08. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index c6ee1d8760..ea371c5831 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -6561,15 +6561,14 @@ (define-public perl-number-range (define-public perl-object-signature (package (name "perl-object-signature") - (version "1.07") + (version "1.08") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/A/AD/ADAMK/" "Object-Signature-" version ".tar.gz")) (sha256 - (base32 - "0c8l7195bjvx0v6zmkgdnxvwg7yj2zq8hi7xd25a3iikd12dc4f6")))) + (base32 "12k90c19ly93ib1p6sm3k7sbnr2h5dbywkdmnff2ngm99p4m68c4")))) (build-system perl-build-system) (native-inputs `(("perl-module-install" ,perl-module-install))) From 3ef55d1b4fcb4d553b79042a9f86cb38d47788b6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 10:11:41 +0100 Subject: [PATCH 597/694] gnu: perl-carp-always: Update to 0.16. * gnu/packages/perl.scm (perl-carp-always): Update to 0.16. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index ea371c5831..725a0b1d53 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -756,15 +756,14 @@ (define-public perl-carp (define-public perl-carp-always (package (name "perl-carp-always") - (version "0.13") + (version "0.16") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/F/FE/FERREIRA/Carp-Always-" version ".tar.gz")) (sha256 - (base32 - "0i2rifkr7ybfcdsqana52487z7vxp2l5qdra0f6ik0ddhn6rzii1")))) + (base32 "1wb6b0qjga7kvn4p8df6k4g1pl2yzaqiln1713xidh3i454i3alq")))) (build-system perl-build-system) (native-inputs `(("perl-test-base" ,perl-test-base))) From 531a6e42163cda1e0a4276cec9a2acb4b2e23d37 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 10:14:15 +0100 Subject: [PATCH 598/694] gnu: perl-moosex-types-loadableclass: Update to 0.015. * gnu/packages/perl.scm (perl-moosex-types-loadableclass): Update to 0.015. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 725a0b1d53..d458160f24 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -5949,15 +5949,14 @@ (define-public perl-moosex-types-datetime-morecoercions (define-public perl-moosex-types-loadableclass (package (name "perl-moosex-types-loadableclass") - (version "0.013") + (version "0.015") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/E/ET/ETHER/" "MooseX-Types-LoadableClass-" version ".tar.gz")) (sha256 - (base32 - "13v2hn3xr6adx15qik8b6966fbbw77ik1v4sxx24f766la10w2mq")))) + (base32 "1x1vb96hcrd96bzs73w0lb04jr0fvax1ams38qlzkp2kh9vx6dz0")))) (build-system perl-build-system) (native-inputs `(("perl-module-build-tiny" ,perl-module-build-tiny) From 2f9b601846189c4d1471e4b46e0878e190e1487c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 10:16:01 +0100 Subject: [PATCH 599/694] gnu: perl-business-ismn: Update to 1.201. * gnu/packages/perl.scm (perl-business-ismn): Update to 1.201. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index d458160f24..0d9789cc66 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -620,15 +620,14 @@ (define-public perl-business-issn (define-public perl-business-ismn (package (name "perl-business-ismn") - (version "1.131") + (version "1.201") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/B/BD/BDFOY/" "Business-ISMN-" version ".tar.gz")) (sha256 - (base32 - "1xyc7x4c4xl930rz7grs1l52f1vg4rbiv0c6xlxdsim8qsh7k94g")))) + (base32 "1cpcfyaz1fl6fnm076jx2jsphw147wj6aszj2yzqrgsncjhk2cja")))) (build-system perl-build-system) (native-inputs `(("perl-tie-cycle" ,perl-tie-cycle))) From 1dc19afbd07a9399d5a5a766464feee2f2531500 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 10:17:26 +0100 Subject: [PATCH 600/694] gnu: perl-tree-simple: Update to 1.33. * gnu/packages/perl.scm (perl-tree-simple): Update to 1.33. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 0d9789cc66..775a2df1f5 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -8744,15 +8744,14 @@ (define-public perl-time-mock (define-public perl-tree-simple (package (name "perl-tree-simple") - (version "1.25") + (version "1.33") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/R/RS/RSAVAGE/" "Tree-Simple-" version ".tgz")) (sha256 - (base32 - "1xj1n70v4qbx7m9k01bj9aixk77yssliavgvfds3xj755hcan0nr")))) + (base32 "1alnwb6c7n4al91m9cyknvcyvdz521lh22dz1hyk4v7c50adffnv")))) (build-system perl-build-system) (native-inputs `(("perl-module-build" ,perl-module-build) From d8c715436b362399ba6f261a295c8ea85079509d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 10:19:02 +0100 Subject: [PATCH 601/694] gnu: perl-strictures: Update to 2.000006. * gnu/packages/perl.scm (perl-strictures-2): Update to 2.000006. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 775a2df1f5..1a920ff475 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -7504,15 +7504,14 @@ (define-public perl-strictures (define-public perl-strictures-2 (package (inherit perl-strictures) - (version "2.000004") + (version "2.000006") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/H/HA/HAARG/" "strictures-" version ".tar.gz")) (sha256 - (base32 - "0lzp0q6kwk6vgf7zdlvy9zz28fj6n1b776irm556c7gylcq29113")))))) + (base32 "0mwd9xqz4n8qfpi5h5581lbm33qhf7agww18h063icnilrs7km89")))))) (define-public perl-string-camelcase (package From 74607ea6204ba9a198f2ab7d63f975b89388d355 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 10:28:26 +0100 Subject: [PATCH 602/694] gnu: perl-term-size-perl: Update to 0.031. * gnu/packages/perl.scm (perl-term-size-perl): Update to 0.031. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 1a920ff475..9f2ab15708 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -8140,15 +8140,14 @@ (define-public perl-term-size-any (define-public perl-term-size-perl (package (name "perl-term-size-perl") - (version "0.029") + (version "0.031") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/F/FE/FERREIRA/" "Term-Size-Perl-" version ".tar.gz")) (sha256 - (base32 - "1rvm91bhdlxfwx5zka023p7szf2s7gm16wl27qiivvj66svsl6lc")))) + (base32 "17i05y186l977bhp32b24c8rqasmg1la934dizf5sc0vrd36g6mf")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/Term-Size-Perl") (synopsis "Perl extension for retrieving terminal size (Perl version)") From cdffdca4c01af4b38657b006ed246d0e6cd5c629 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 10:29:30 +0100 Subject: [PATCH 603/694] gnu: perl-datetime-format-natural: Update to 1.06. * gnu/packages/perl.scm (perl-datetime-format-natural): Update to 1.06. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 9f2ab15708..ab0dfce558 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -2396,15 +2396,14 @@ (define-public perl-datetime-format-ical (define-public perl-datetime-format-natural (package (name "perl-datetime-format-natural") - (version "1.05") + (version "1.06") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/S/SC/SCHUBIGER/" "DateTime-Format-Natural-" version ".tar.gz")) (sha256 - (base32 - "10ldrhz5rnpsd8qmqn1a4s0w5hhfbjrr13a93yx7kpp89g85pxqv")))) + (base32 "1n68b5hnw4n55q554v7y4ffwiypz6rk40mh0r550fxwv69bvyky0")))) (build-system perl-build-system) (native-inputs `(("perl-module-build" ,perl-module-build) From 3b71996556c38d6d0716735285913d88676facf3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 10:29:53 +0100 Subject: [PATCH 604/694] gnu: perl-type-tiny-xs: Update to 0.014. * gnu/packages/perl.scm (perl-type-tiny-xs): Update to 0.014. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index ab0dfce558..18a83e479e 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -8869,15 +8869,14 @@ (define-public perl-type-tiny (define-public perl-type-tiny-xs (package (name "perl-type-tiny-xs") - (version "0.012") + (version "0.014") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/T/TO/TOBYINK/Type-Tiny-XS-" version ".tar.gz")) (sha256 - (base32 - "05nbr898cvjjh1wsy55l84zasx65gijdxc6dnn558ihns8zx6gm9")))) + (base32 "1bbvghd2wmm9z1jx9qs9yz4l3r4izs8sz87z87sis7n3ydjdx2w2")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/Type-Tiny-XS") (synopsis "Provides an XS boost for some of Type::Tiny's built-in type constraints") From 5115d9ea6586e0c1719b46997c7922b579a74bc0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 10:33:39 +0100 Subject: [PATCH 605/694] gnu: perl-ipc-cmd: Update to 1.02. * gnu/packages/perl.scm (perl-ipc-cmd): Update to 1.02. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 18a83e479e..b75ed229d5 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -4287,15 +4287,14 @@ (define-public perl-io-tty (define-public perl-ipc-cmd (package (name "perl-ipc-cmd") - (version "0.96") + (version "1.02") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/B/BI/BINGOS/IPC-Cmd-" version ".tar.gz")) (sha256 - (base32 - "0a2v44x70gj9fd5wa8i08f9z6n14qppj1j49m1hc333wh72mzk6i")))) + (base32 "0qvh0qpvc22r4kysfy8srxnhni677lvc8hr18kjrdkmb58jjj8ah")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/IPC-Cmd") (synopsis "Run interactive command-line programs") From 4630d632d532a3df30e1a44caa0308b1cd9253cf Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 10:35:23 +0100 Subject: [PATCH 606/694] gnu: perl-set-object: Update to 1.39. * gnu/packages/perl.scm (perl-set-object): Update to 1.39. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index b75ed229d5..786c77a50f 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -7302,15 +7302,14 @@ (define-public perl-set-intspan (define-public perl-set-object (package (name "perl-set-object") - (version "1.35") + (version "1.39") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/R/RU/RURBAN/" "Set-Object-" version ".tar.gz")) (sha256 - (base32 - "1rqf11274s3h17jgbimmg47k4fmayifajqwaa6lgm0z5qdy4v6hq")))) + (base32 "040q819l9x55j0hjhfvc153451syvjffw3d22gs398sd23mwzzsy")))) (build-system perl-build-system) (propagated-inputs `(("perl-moose" ,perl-moose) From 03b82dfc24ff569874d8a228f4e9f81aec082f28 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 11:21:51 +0100 Subject: [PATCH 607/694] gnu: perl-cpanel-json-xs: Update to 4.10. * gnu/packages/perl.scm (perl-cpanel-json-xs): Update to 4.10. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 786c77a50f..aac693a64f 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -1560,15 +1560,14 @@ (define-public perl-cpan-meta-check (define-public perl-cpanel-json-xs (package (name "perl-cpanel-json-xs") - (version "4.08") + (version "4.10") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/R/RU/RURBAN/" "Cpanel-JSON-XS-" version ".tar.gz")) (sha256 - (base32 - "0bbw9sk3kgfwkg9lw3vf59g4jjvr69vv09sinndl2nlbd5dlgh9b")))) + (base32 "1r92b03hkmqr0brp00cj67b1iklfd4yas481d6a5nx2941c03h3p")))) (build-system perl-build-system) (propagated-inputs `(("perl-common-sense" ,perl-common-sense))) From d952d49fd8b2b221f8269b5bac193ebf2e7dc340 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 11:43:30 +0100 Subject: [PATCH 608/694] gnu: perl-class-load: Update to 0.25. * gnu/packages/perl.scm (perl-class-load): Update to 0.25. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index aac693a64f..04aa473b70 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -1105,15 +1105,14 @@ (define-public perl-class-inspector (define-public perl-class-load (package (name "perl-class-load") - (version "0.24") + (version "0.25") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/E/ET/ETHER/" "Class-Load-" version ".tar.gz")) (sha256 - (base32 - "0dnacm959vi5819h6cdl5qpi89fr81p6smbsqx7m6in18vd87f8b")))) + (base32 "13sz4w8kwljhfcy7yjjgrgg5hv3wccr8n3iqarhyb5sjkdvzlj1a")))) (build-system perl-build-system) (native-inputs `(("perl-module-build-tiny" ,perl-module-build-tiny) From 3dbe4f709fb6d6992121e51b4f19d4a5b6116783 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 11:54:17 +0100 Subject: [PATCH 609/694] gnu: perl-moosex-role-parameterized: Update to 1.10. * gnu/packages/perl.scm (perl-moosex-role-parameterized): Update to 1.10. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 04aa473b70..af0e20b492 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -5718,15 +5718,14 @@ (define-public perl-moosex-relatedclassroles (define-public perl-moosex-role-parameterized (package (name "perl-moosex-role-parameterized") - (version "1.08") + (version "1.10") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/E/ET/ETHER/" "MooseX-Role-Parameterized-" version ".tar.gz")) (sha256 - (base32 - "12s2nmq13ri126yv02bx9h30j760zpal27i470z85ayw9s7il4jq")))) + (base32 "0plx25n80mv9qwhix52z79md0qil616nbcryk2f4216kghpw2ij8")))) (build-system perl-build-system) (native-inputs `(("perl-cpan-meta-check" ,perl-cpan-meta-check) From fa079bea323b757db97a95e30e9c60683c83d23d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 12:14:34 +0100 Subject: [PATCH 610/694] gnu: perl-parent: Update to 0.237. * gnu/packages/perl.scm (perl-parent): Update to 0.237. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index af0e20b492..1e76e9d864 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -6840,15 +6840,14 @@ (define-public perl-par-dist (define-public perl-parent (package (name "perl-parent") - (version "0.228") + (version "0.237") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/C/CO/CORION/" "parent-" version ".tar.gz")) (sha256 - (base32 - "0w0i02y4z8465z050kml57mvhv7c5gl8w8ivplhr3cms0zbaq87b")))) + (base32 "1bnaadzf51g6zrpq6pvvgds2cc9d4w1vck7sapkd3hb5hmjdk28h")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/parent") (synopsis "Establish an ISA relationship with base classes at compile time") From 9f5edca6da00d968782d0eb82c78999b0f715344 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 12:28:04 +0100 Subject: [PATCH 611/694] gnu: perl-config-general: Update to 2.63. * gnu/packages/perl.scm (perl-config-general): Update to 2.63. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 1e76e9d864..0685a84665 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -1419,15 +1419,14 @@ (define-public perl-config-autoconf (define-public perl-config-general (package (name "perl-config-general") - (version "2.56") + (version "2.63") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/T/TL/TLINDEN/" "Config-General-" version ".tar.gz")) (sha256 - (base32 - "0szxxaihz71pr0r2jp9wvbrfc3hrsxi9xrd9vnyrxlrax8sci5h9")))) + (base32 "1bbg3wp0xcpj04cmm86j1x0j5968jqi5s2c87qs7dgmap1vzk6qa")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/Config-General") (synopsis "Generic Config Module") From 5bdfba8d496abe1c126059aa6f15604e0c24f605 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 12:29:54 +0100 Subject: [PATCH 612/694] gnu: perl-moosex-params-validate: Update to 0.21. * gnu/packages/perl.scm (perl-moosex-params-validate): Update to 0.21. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 0685a84665..df7a71b72c 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -5668,15 +5668,14 @@ (define-public perl-moosex-nonmoose (define-public perl-moosex-params-validate (package (name "perl-moosex-params-validate") - (version "0.19") + (version "0.21") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/D/DR/DROLSKY/" "MooseX-Params-Validate-" version ".tar.gz")) (sha256 - (base32 - "16isvyfsnzp63qr9cwsn094hasb6m7rzldmzav6spk7rih4mxdwk")))) + (base32 "1n9ry6gnskkp9ir6s7d5jirn3mh14ydgpmwqz6wcp6d9md358ac8")))) (build-system perl-build-system) (native-inputs `(("perl-moose" ,perl-moose) From f08ac77229674911d42855749176d7d7b708e3d9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 12:33:27 +0100 Subject: [PATCH 613/694] gnu: perl-moox-cmd: Update to 0.017. * gnu/packages/perl.scm (perl-moox-cmd): Update to 0.017. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index df7a71b72c..d9e51d3c0d 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -5995,15 +5995,14 @@ (define-public perl-moox (define-public perl-moox-cmd (package (name "perl-moox-cmd") - (version "0.015") + (version "0.017") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/R/RE/REHSACK/MooX-Cmd-" version ".tar.gz")) (sha256 - (base32 - "0145ha8vnc6sbg82ps96wj716bznq2qamm657bia9ji2yxhbnsam")))) + (base32 "1xbhmq07v9z371ygkyghva9aryhc22kwbzn5qwkp72c0ma6z4gwl")))) (build-system perl-build-system) (native-inputs `(("perl-capture-tiny" ,perl-capture-tiny) From 853a4985b674bc2f5979018db106e82a027fbe4f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 12:33:59 +0100 Subject: [PATCH 614/694] gnu: perl-class-date: Update to 1.1.17. * gnu/packages/perl.scm (perl-class-date): Update to 1.1.17. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index d9e51d3c0d..a6aea62caa 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -1026,15 +1026,14 @@ (define-public perl-class-data-inheritable (define-public perl-class-date (package (name "perl-class-date") - (version "1.1.15") + (version "1.1.17") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/S/SZ/SZABGAB/" "Class-Date-" version ".tar.gz")) (sha256 - (base32 - "0dd707sq8ix2dqbnp7ga77ba69r3vsn0cd6scnkn13s0gm2g4b00")))) + (base32 "1h7dfjxkpqbfymrf1bn7699i4fx6pbv5wvvi5zszfr8sqqkax1yf")))) (build-system perl-build-system) (arguments `(#:tests? #f)) ;timezone tests in chroot (home-page "https://metacpan.org/release/Class-Date") From 9d468f50c9e623c770d8d8cd7a2430003be6fdb4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 12:56:26 +0100 Subject: [PATCH 615/694] gnu: perl-exporter-tiny: Update to 1.002001. * gnu/packages/perl.scm (perl-exporter-tiny): Update to 1.002001. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index a6aea62caa..debf35440d 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -3175,15 +3175,14 @@ (define-public perl-exporter-lite (define-public perl-exporter-tiny (package (name "perl-exporter-tiny") - (version "0.042") + (version "1.002001") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/T/TO/TOBYINK/" "Exporter-Tiny-" version ".tar.gz")) (sha256 - (base32 - "0gq2ia8c6n84gdrlc73vab61djs8gs8zf7fqx8cxbg5zxg2j45lg")))) + (base32 "13f4sd9n9iyi15r5rbjbmawajxlgfdvvyrvwlyg0yjyf09636b58")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/Exporter-Tiny") (synopsis "Exporter with the features of Sub::Exporter but only core dependencies") From f92fda896bee409149e80003986ccef40ed1d1a2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 13:07:32 +0100 Subject: [PATCH 616/694] gnu: perl-io-interactive: Update to 1.022. * gnu/packages/perl.scm (perl-io-interactive): Update to 1.022. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index debf35440d..da35db54b0 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -4204,15 +4204,14 @@ (define-public perl-io-captureoutput (define-public perl-io-interactive (package (name "perl-io-interactive") - (version "0.0.6") + (version "1.022") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/B/BD/BDFOY/" "IO-Interactive-" version ".tar.gz")) (sha256 - (base32 - "1303q6rbcf2cag5z08pq3d1y91wls5q51jrpw4kh0l2bv75idh4w")))) + (base32 "1p7b3z877am99qn9b3n2whgcv77256sbg28divlpgs1sx653pm8f")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/IO-Interactive") (synopsis "Utilities for interactive I/O") From b782de02281ddb5c0532ffee7b5df1554f2f9303 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 13:08:59 +0100 Subject: [PATCH 617/694] gnu: perl-string-camelcase: Update to 0.04. * gnu/packages/perl.scm (perl-string-camelcase): Update to 0.04. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index da35db54b0..a3db5a4997 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -7503,15 +7503,14 @@ (define-public perl-strictures-2 (define-public perl-string-camelcase (package (name "perl-string-camelcase") - (version "0.02") + (version "0.04") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/H/HI/HIO/" "String-CamelCase-" version ".tar.gz")) (sha256 - (base32 - "17kh8nap2z5g5rqcvw0m7mvbai7wr7h0al39w8l827zhqad8ss42")))) + (base32 "1a8i4yzv586svd0pbxls7642vvmyiwzh4x2xyij8gbnfxsydxhw9")))) (build-system perl-build-system) (arguments `(#:phases From 546e2731e4a8beef80751e17420691638a56d279 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 13:09:48 +0100 Subject: [PATCH 618/694] gnu: perl-types-path-tiny: Update to 0.006. * gnu/packages/perl.scm (perl-types-path-tiny): Update to 0.006. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index a3db5a4997..502350a6c1 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -8876,15 +8876,14 @@ (define-public perl-type-tiny-xs (define-public perl-types-path-tiny (package (name "perl-types-path-tiny") - (version "0.005") + (version "0.006") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/D/DA/DAGOLDEN/" "Types-Path-Tiny-" version ".tar.gz")) (sha256 - (base32 - "09nf167ssi4rgj8hhzylwp3zdx61njdpyfri43arcmk9aqn7f0pp")))) + (base32 "1072vwcbx2bldfg8xpxc9iqs3rzqd18yik60b432hsdwxpxcjgsr")))) (build-system perl-build-system) (propagated-inputs `(("perl-file-pushd" ,perl-file-pushd) From ba1c80526777694d59dd8613433a1c8b57788b6a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 13:12:48 +0100 Subject: [PATCH 619/694] gnu: perl-pathtools: Update to 3.75. * gnu/packages/perl.scm (perl-pathtools): Update to 3.75. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 502350a6c1..6864cb8a6b 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -6872,7 +6872,7 @@ (define-public perl-path-class (define-public perl-pathtools (package (name "perl-pathtools") - (version "3.74") + (version "3.75") (source (origin (method url-fetch) @@ -6880,7 +6880,7 @@ (define-public perl-pathtools "mirror://cpan/authors/id/X/XS/XSAWYERX/PathTools-" version ".tar.gz")) (sha256 - (base32 "04bfjdvn5p78hirljcinpxv8djcjn8nyg5gcmnmvz8sr9k2lqwi5")))) + (base32 "18j5z71xin9dsqddl6khm838d23p3843jcq7q0kwgy5ilqx50n55")))) (build-system perl-build-system) (arguments `(#:phases From 72d85afa0c63c9caaf5400b697f399268dc4f8e8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 13:22:04 +0100 Subject: [PATCH 620/694] gnu: perl-type-tiny: Update to 1.004004. * gnu/packages/perl.scm (perl-type-tiny): Update to 1.004004. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 6864cb8a6b..f8fe3d55e6 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -8822,15 +8822,14 @@ (define-public perl-type-tie (define-public perl-type-tiny (package (name "perl-type-tiny") - (version "1.002002") + (version "1.004004") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/T/TO/TOBYINK/" "Type-Tiny-" version ".tar.gz")) (sha256 - (base32 - "0b48v28rvl20969gyr62yg6gr6a2nj9qik0bixavbjdmk67hqnx8")))) + (base32 "1gk2f0zs2xq99nqn6wcgvl8l9qlq2cnab2lk7l08kpac03m824h8")))) (build-system perl-build-system) (native-inputs `(("perl-test-warnings" ,perl-test-warnings))) From db0525763759e50dd1c0de8e4a75bd621ed308ed Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 13:22:47 +0100 Subject: [PATCH 621/694] gnu: perl-data-tumbler: Update to 0.010. * gnu/packages/perl.scm (perl-data-tumbler): Update to 0.010. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index f8fe3d55e6..bede7cb8f4 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -2037,15 +2037,14 @@ (define-public perl-data-stream-bulk (define-public perl-data-tumbler (package (name "perl-data-tumbler") - (version "0.008") + (version "0.010") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/R/RE/REHSACK/" "Data-Tumbler-" version ".tar.gz")) (sha256 - (base32 - "13kww2xj30rkk8w9h50h4blypdb689zgils0zyah587kip0z6509")))) + (base32 "15pgvmf7mf9fxsg2l4l88xwvs41218d0bvawhlk15sx06qqp0kwb")))) (build-system perl-build-system) (native-inputs `(("perl-test-most" ,perl-test-most))) From 6618cfb796d052d5a98e17da7ada213b5397a186 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 13:24:00 +0100 Subject: [PATCH 622/694] gnu: perl-devel-hide: Update to 0.0010. * gnu/packages/perl.scm (perl-devel-hide): Update to 0.0010. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index bede7cb8f4..ac13db97db 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -2722,15 +2722,14 @@ (define-public perl-devel-globaldestruction (define-public perl-devel-hide (package (name "perl-devel-hide") - (version "0.0009") + (version "0.0010") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/F/FE/FERREIRA/Devel-Hide-" version ".tar.gz")) (sha256 - (base32 - "1phnzbw58v6551nhv6sg86m72nx9w5j4msh1hg4jvkakkq5w9pki")))) + (base32 "10jyv9nmv513hs75rls5yx2xn82513xnnhjir3dxiwgb1ykfyvvm")))) (build-system perl-build-system) (propagated-inputs `(("perl-test-pod" ,perl-test-pod) From fbbd91ebd42ba0677910fbb6289c7261aeea8c2d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 13:25:15 +0100 Subject: [PATCH 623/694] gnu: perl-libintl-perl: Update to 1.31. * gnu/packages/perl.scm (perl-libintl-perl): Update to 1.31. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index ac13db97db..a76d8fcfcf 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -4643,15 +4643,14 @@ (define-public perl-log-report (define-public perl-libintl-perl (package (name "perl-libintl-perl") - (version "1.29") + (version "1.31") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/G/GU/GUIDO/" "libintl-perl-" version ".tar.gz")) (sha256 - (base32 - "1cgvrgh4axd8jlr6497ndgphgvgnqc1axd306460hskdvc85z4vq")))) + (base32 "1afandrl44mq9c32r57xr489gkfswdgc97h8x86k98dz1byv3l6a")))) (build-system perl-build-system) (arguments `(#:phases From 848e41fea8ca5864d7df3ada07b2ca761f1bc08d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 13:28:19 +0100 Subject: [PATCH 624/694] gnu: perl-moosex-getopt: Update to 0.74. * gnu/packages/perl.scm (perl-moosex-getopt): Update to 0.74. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index a76d8fcfcf..68e132d771 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -5545,15 +5545,14 @@ (define-public perl-moosex-emulate-class-accessor-fast (define-public perl-moosex-getopt (package (name "perl-moosex-getopt") - (version "0.73") + (version "0.74") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/E/ET/ETHER/" "MooseX-Getopt-" version ".tar.gz")) (sha256 - (base32 - "19zm8brf930p0ymqn3w1y0ix29kb74m8nvhrhjvrg8cgz6vc5fyz")))) + (base32 "091crga5gjyhj2lz55w3ba37xq6pmjg5dx5xccsrzghy8cxxzq0x")))) (build-system perl-build-system) (native-inputs `(("perl-module-build" ,perl-module-build) From d841db3c79d08c8a205ce3a2d2e1164f3a27b14b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 13:35:51 +0100 Subject: [PATCH 625/694] gnu: perl-class-accessor-grouped: Update to 0.10014. * gnu/packages/perl.scm (perl-class-accessor-grouped): Update to 0.10014. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 68e132d771..eefaa0474f 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -908,15 +908,14 @@ (define-public perl-class-accessor-chained (define-public perl-class-accessor-grouped (package (name "perl-class-accessor-grouped") - (version "0.10012") + (version "0.10014") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/R/RI/RIBASUSHI/" "Class-Accessor-Grouped-" version ".tar.gz")) (sha256 - (base32 - "1zp74yv023q3macrf4rv3i82z8pkffqyhh7xk9xg8fbr63ikwqf4")))) + (base32 "1fy48hx56n5kdn1gz66awg465qf34r0n5jam64x7zxh9zhzb1m9m")))) (build-system perl-build-system) (native-inputs `(("perl-module-install" ,perl-module-install) From 9e1fb71df5d73c3983442ea7311676ae6a4353fb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 13:37:51 +0100 Subject: [PATCH 626/694] gnu: perl-text-csv-xs: Update to 1.39. * gnu/packages/perl.scm (perl-text-csv-xs): Update to 1.39. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index eefaa0474f..018bdc36c0 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -8217,15 +8217,14 @@ (define-public perl-text-csv (define-public perl-text-csv-xs (package (name "perl-text-csv-xs") - (version "1.25") + (version "1.39") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/H/HM/HMBRAND/" "Text-CSV_XS-" version ".tgz")) (sha256 - (base32 - "06zlfbqrwbl0g2g3bhk6046yy5pf2rz80fzcp8aj47rnswz2yx5k")))) + (base32 "1gcy1bxym6f7qsxivkl3c5p94r1bjhf9csy1x38a1gk8mx744kma")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/Text-CSV_XS") (synopsis "Rountines for manipulating CSV files") From 3515ed6fa713309d46d58eccfe7d5600a287537a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 13:41:59 +0100 Subject: [PATCH 627/694] gnu: perl-file-temp: Update to 0.2309. * gnu/packages/perl.scm (perl-file-temp): Update to 0.2309. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 018bdc36c0..11e89e7fc2 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -3747,15 +3747,14 @@ (define-public perl-file-slurp-tiny (define-public perl-file-temp (package (name "perl-file-temp") - (version "0.2304") + (version "0.2309") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/D/DA/DAGOLDEN/" "File-Temp-" version ".tar.gz")) (sha256 - (base32 - "1b11scbw77924awwdf5yw8sk8z0s2hskvpyyxws9yz4gwhim6h8k")))) + (base32 "0pr3wrxrk93wy7dz9gsb1sgl77icrs8rh2mah6wms5cdi2ll5ch1")))) (build-system perl-build-system) (propagated-inputs `(("perl-parent" ,perl-parent))) From 8e070507efeef4db749efc5f18024efb64a7afa6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 13:42:23 +0100 Subject: [PATCH 628/694] gnu: perl-list-someutils: Update to 0.56. * gnu/packages/perl.scm (perl-list-someutils): Update to 0.56. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 11e89e7fc2..71ea2e5815 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -4798,7 +4798,7 @@ (define-public perl-list-moreutils-xs (define-public perl-list-someutils (package (name "perl-list-someutils") - (version "0.52") + (version "0.56") (source (origin (method url-fetch) @@ -4807,8 +4807,7 @@ (define-public perl-list-someutils version ".tar.gz")) (sha256 - (base32 - "1b450jyxaa6q2yl0cdhknr3c2a5s7b9b18ccnwac625c681r130y")))) + (base32 "1xw9dzg949997b10y6zgzrmhmk2ap274qivnk0wc1033x2fdk9za")))) (build-system perl-build-system) (native-inputs `(("perl-test-leaktrace" ,perl-test-leaktrace))) From 39f7b8f0232f7a50d88ee523407fc984ff59237f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 14:00:38 +0100 Subject: [PATCH 629/694] gnu: perl-path-tiny: Update to 0.108. * gnu/packages/perl.scm (perl-path-tiny): Update to 0.108. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 71ea2e5815..8725ebda21 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -6896,14 +6896,14 @@ (define-public perl-pathtools (define-public perl-path-tiny (package (name "perl-path-tiny") - (version "0.104") + (version "0.108") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/D/DA/DAGOLDEN/" "Path-Tiny-" version ".tar.gz")) (sha256 (base32 - "1vxaczi44d2acfyyzwa7p6c5gx3rgm6c36zbdl40982axg7iv7y6")))) + "1x9zf8r3cynf4vqlycyyspsr70v4zw6bk9bkgvfpvsxkw8mlhj9w")))) (build-system perl-build-system) (arguments `(#:tests? #f)) ; Tests require additional test modules to be packaged From d98c9e0269a03cfb3630d25f9b9c7b42c95a61db Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 14:10:56 +0100 Subject: [PATCH 630/694] gnu: perl-file-path: Update to 2.16. * gnu/packages/perl.scm (perl-file-path): Update to 2.16. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 8725ebda21..3a5b8dfca4 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -3491,7 +3491,7 @@ (define-public perl-file-homedir (define-public perl-file-path (package (name "perl-file-path") - (version "2.13") + (version "2.16") (source (origin (method url-fetch) @@ -3500,8 +3500,7 @@ (define-public perl-file-path version ".tar.gz")) (sha256 - (base32 - "039gc0i5cbdmidl8j8x195yykwcdmzwawmpapnysvljl8l33jqwj")))) + (base32 "01gsysg9mjkh1ckk7jhj3y8vs291a5ynkgzhqmcz90f3b6dxdxr1")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/File-Path") (synopsis "Create or remove directory trees") From 55c4724f7a57688f13352468bff936fb685189de Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 14:11:27 +0100 Subject: [PATCH 631/694] gnu: perl-text-simpletable: Update to 2.07. * gnu/packages/perl.scm (perl-text-simpletable): Update to 2.07. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 3a5b8dfca4..8d02ad137e 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -8351,15 +8351,14 @@ (define-public perl-text-roman (define-public perl-text-simpletable (package (name "perl-text-simpletable") - (version "2.04") + (version "2.07") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/M/MR/MRAMBERG/" "Text-SimpleTable-" version ".tar.gz")) (sha256 - (base32 - "14sjmdcy7s73sk740g3ccmzmwhwd52x5ay3bjmibjlql1cag70ld")))) + (base32 "1v8r8qpzg283p2pqqr8dqrak2bxray1b2jmib0qk75jffqw3yv95")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/Text-SimpleTable") (synopsis "Simple ASCII tables") From d4f7a6de0707f116e72b7b4c030d558c576ecb08 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 15:46:59 +0100 Subject: [PATCH 632/694] gnu: dropbear: Don't use NAME in source URI. * gnu/packages/ssh.scm (dropbear)[source]: Hard-code NAME. --- gnu/packages/ssh.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index a75096b779..f5e069ff05 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -455,8 +455,8 @@ (define-public dropbear (source (origin (method url-fetch) (uri (string-append - "https://matt.ucc.asn.au/" name "/releases/" - name "-" version ".tar.bz2")) + "https://matt.ucc.asn.au/dropbear/releases/" + "dropbear-" version ".tar.bz2")) (patches (search-patches "dropbear-CVE-2018-15599.patch")) (sha256 (base32 From e190d12eae25fff8ab818a94c8fd5302bdc797dd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 16:02:35 +0100 Subject: [PATCH 633/694] gnu: dropbear: Update to 2019.77. * gnu/packages/ssh.scm (dropbear): Update to 2019.77. [source]: Remove patch. * gnu/packages/patches/dropbear-CVE-2018-15599.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - .../patches/dropbear-CVE-2018-15599.patch | 240 ------------------ gnu/packages/ssh.scm | 21 +- 3 files changed, 10 insertions(+), 252 deletions(-) delete mode 100644 gnu/packages/patches/dropbear-CVE-2018-15599.patch diff --git a/gnu/local.mk b/gnu/local.mk index d85679b2a8..594755f693 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -728,7 +728,6 @@ dist_patch_DATA = \ %D%/packages/patches/docker-fix-tests.patch \ %D%/packages/patches/dovecot-trees-support-dovecot-2.3.patch \ %D%/packages/patches/doxygen-test.patch \ - %D%/packages/patches/dropbear-CVE-2018-15599.patch \ %D%/packages/patches/dvd+rw-tools-add-include.patch \ %D%/packages/patches/efl-mesa-compat.patch \ %D%/packages/patches/elfutils-tests-ptrace.patch \ diff --git a/gnu/packages/patches/dropbear-CVE-2018-15599.patch b/gnu/packages/patches/dropbear-CVE-2018-15599.patch deleted file mode 100644 index a474552cd2..0000000000 --- a/gnu/packages/patches/dropbear-CVE-2018-15599.patch +++ /dev/null @@ -1,240 +0,0 @@ -Fix CVE-2018-15599: - -http://lists.ucc.gu.uwa.edu.au/pipermail/dropbear/2018q3/002108.html -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-15599 - -Patch copied from upstream source repository: - -https://github.com/mkj/dropbear/commit/52adbb34c32d3e2e1bcdb941e20a6f81138b8248 - -From 52adbb34c32d3e2e1bcdb941e20a6f81138b8248 Mon Sep 17 00:00:00 2001 -From: Matt Johnston -Date: Thu, 23 Aug 2018 23:43:12 +0800 -Subject: [PATCH] Wait to fail invalid usernames - ---- - auth.h | 6 +++--- - svr-auth.c | 19 +++++-------------- - svr-authpam.c | 26 ++++++++++++++++++++++---- - svr-authpasswd.c | 27 ++++++++++++++------------- - svr-authpubkey.c | 11 ++++++++++- - 5 files changed, 54 insertions(+), 35 deletions(-) - -diff --git a/auth.h b/auth.h -index da498f5b..98f54683 100644 ---- a/auth.h -+++ b/auth.h -@@ -37,9 +37,9 @@ void recv_msg_userauth_request(void); - void send_msg_userauth_failure(int partial, int incrfail); - void send_msg_userauth_success(void); - void send_msg_userauth_banner(const buffer *msg); --void svr_auth_password(void); --void svr_auth_pubkey(void); --void svr_auth_pam(void); -+void svr_auth_password(int valid_user); -+void svr_auth_pubkey(int valid_user); -+void svr_auth_pam(int valid_user); - - #if DROPBEAR_SVR_PUBKEY_OPTIONS_BUILT - int svr_pubkey_allows_agentfwd(void); -diff --git a/svr-auth.c b/svr-auth.c -index c19c0901..edde86bc 100644 ---- a/svr-auth.c -+++ b/svr-auth.c -@@ -149,10 +149,8 @@ void recv_msg_userauth_request() { - if (methodlen == AUTH_METHOD_PASSWORD_LEN && - strncmp(methodname, AUTH_METHOD_PASSWORD, - AUTH_METHOD_PASSWORD_LEN) == 0) { -- if (valid_user) { -- svr_auth_password(); -- goto out; -- } -+ svr_auth_password(valid_user); -+ goto out; - } - } - #endif -@@ -164,10 +162,8 @@ void recv_msg_userauth_request() { - if (methodlen == AUTH_METHOD_PASSWORD_LEN && - strncmp(methodname, AUTH_METHOD_PASSWORD, - AUTH_METHOD_PASSWORD_LEN) == 0) { -- if (valid_user) { -- svr_auth_pam(); -- goto out; -- } -+ svr_auth_pam(valid_user); -+ goto out; - } - } - #endif -@@ -177,12 +173,7 @@ void recv_msg_userauth_request() { - if (methodlen == AUTH_METHOD_PUBKEY_LEN && - strncmp(methodname, AUTH_METHOD_PUBKEY, - AUTH_METHOD_PUBKEY_LEN) == 0) { -- if (valid_user) { -- svr_auth_pubkey(); -- } else { -- /* pubkey has no failure delay */ -- send_msg_userauth_failure(0, 0); -- } -+ svr_auth_pubkey(valid_user); - goto out; - } - #endif -diff --git a/svr-authpam.c b/svr-authpam.c -index 05e4f3e5..d201bc96 100644 ---- a/svr-authpam.c -+++ b/svr-authpam.c -@@ -178,13 +178,14 @@ pamConvFunc(int num_msg, - * Keyboard interactive would be a lot nicer, but since PAM is synchronous, it - * gets very messy trying to send the interactive challenges, and read the - * interactive responses, over the network. */ --void svr_auth_pam() { -+void svr_auth_pam(int valid_user) { - - struct UserDataS userData = {NULL, NULL}; - struct pam_conv pamConv = { - pamConvFunc, - &userData /* submitted to pamvConvFunc as appdata_ptr */ - }; -+ const char* printable_user = NULL; - - pam_handle_t* pamHandlep = NULL; - -@@ -204,12 +205,23 @@ void svr_auth_pam() { - - password = buf_getstring(ses.payload, &passwordlen); - -+ /* We run the PAM conversation regardless of whether the username is valid -+ in case the conversation function has an inherent delay. -+ Use ses.authstate.username rather than ses.authstate.pw_name. -+ After PAM succeeds we then check the valid_user flag too */ -+ - /* used to pass data to the PAM conversation function - don't bother with - * strdup() etc since these are touched only by our own conversation - * function (above) which takes care of it */ -- userData.user = ses.authstate.pw_name; -+ userData.user = ses.authstate.username; - userData.passwd = password; - -+ if (ses.authstate.pw_name) { -+ printable_user = ses.authstate.pw_name; -+ } else { -+ printable_user = ""; -+ } -+ - /* Init pam */ - if ((rc = pam_start("sshd", NULL, &pamConv, &pamHandlep)) != PAM_SUCCESS) { - dropbear_log(LOG_WARNING, "pam_start() failed, rc=%d, %s", -@@ -242,7 +254,7 @@ void svr_auth_pam() { - rc, pam_strerror(pamHandlep, rc)); - dropbear_log(LOG_WARNING, - "Bad PAM password attempt for '%s' from %s", -- ses.authstate.pw_name, -+ printable_user, - svr_ses.addrstring); - send_msg_userauth_failure(0, 1); - goto cleanup; -@@ -253,12 +265,18 @@ void svr_auth_pam() { - rc, pam_strerror(pamHandlep, rc)); - dropbear_log(LOG_WARNING, - "Bad PAM password attempt for '%s' from %s", -- ses.authstate.pw_name, -+ printable_user, - svr_ses.addrstring); - send_msg_userauth_failure(0, 1); - goto cleanup; - } - -+ if (!valid_user) { -+ /* PAM auth succeeded but the username isn't allowed in for another reason -+ (checkusername() failed) */ -+ send_msg_userauth_failure(0, 1); -+ } -+ - /* successful authentication */ - dropbear_log(LOG_NOTICE, "PAM password auth succeeded for '%s' from %s", - ses.authstate.pw_name, -diff --git a/svr-authpasswd.c b/svr-authpasswd.c -index bdee2aa1..69c7d8af 100644 ---- a/svr-authpasswd.c -+++ b/svr-authpasswd.c -@@ -48,22 +48,14 @@ static int constant_time_strcmp(const char* a, const char* b) { - - /* Process a password auth request, sending success or failure messages as - * appropriate */ --void svr_auth_password() { -+void svr_auth_password(int valid_user) { - - char * passwdcrypt = NULL; /* the crypt from /etc/passwd or /etc/shadow */ - char * testcrypt = NULL; /* crypt generated from the user's password sent */ -- char * password; -+ char * password = NULL; - unsigned int passwordlen; -- - unsigned int changepw; - -- passwdcrypt = ses.authstate.pw_passwd; -- --#ifdef DEBUG_HACKCRYPT -- /* debugging crypt for non-root testing with shadows */ -- passwdcrypt = DEBUG_HACKCRYPT; --#endif -- - /* check if client wants to change password */ - changepw = buf_getbool(ses.payload); - if (changepw) { -@@ -73,12 +65,21 @@ void svr_auth_password() { - } - - password = buf_getstring(ses.payload, &passwordlen); -- -- /* the first bytes of passwdcrypt are the salt */ -- testcrypt = crypt(password, passwdcrypt); -+ if (valid_user) { -+ /* the first bytes of passwdcrypt are the salt */ -+ passwdcrypt = ses.authstate.pw_passwd; -+ testcrypt = crypt(password, passwdcrypt); -+ } - m_burn(password, passwordlen); - m_free(password); - -+ /* After we have got the payload contents we can exit if the username -+ is invalid. Invalid users have already been logged. */ -+ if (!valid_user) { -+ send_msg_userauth_failure(0, 1); -+ return; -+ } -+ - if (testcrypt == NULL) { - /* crypt() with an invalid salt like "!!" */ - dropbear_log(LOG_WARNING, "User account '%s' is locked", -diff --git a/svr-authpubkey.c b/svr-authpubkey.c -index aa6087c9..ff481c87 100644 ---- a/svr-authpubkey.c -+++ b/svr-authpubkey.c -@@ -79,7 +79,7 @@ static int checkfileperm(char * filename); - - /* process a pubkey auth request, sending success or failure message as - * appropriate */ --void svr_auth_pubkey() { -+void svr_auth_pubkey(int valid_user) { - - unsigned char testkey; /* whether we're just checking if a key is usable */ - char* algo = NULL; /* pubkey algo */ -@@ -102,6 +102,15 @@ void svr_auth_pubkey() { - keybloblen = buf_getint(ses.payload); - keyblob = buf_getptr(ses.payload, keybloblen); - -+ if (!valid_user) { -+ /* Return failure once we have read the contents of the packet -+ required to validate a public key. -+ Avoids blind user enumeration though it isn't possible to prevent -+ testing for user existence if the public key is known */ -+ send_msg_userauth_failure(0, 0); -+ goto out; -+ } -+ - /* check if the key is valid */ - if (checkpubkey(algo, algolen, keyblob, keybloblen) == DROPBEAR_FAILURE) { - send_msg_userauth_failure(0, 0); diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index f5e069ff05..bd26149872 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -451,18 +451,17 @@ (define-public et (define-public dropbear (package (name "dropbear") - (version "2018.76") - (source (origin - (method url-fetch) - (uri (string-append - "https://matt.ucc.asn.au/dropbear/releases/" - "dropbear-" version ".tar.bz2")) - (patches (search-patches "dropbear-CVE-2018-15599.patch")) - (sha256 - (base32 - "0rgavbzw7jrs5wslxm0dnwx2m409yzxd9hazd92r7kx8xikr3yzj")))) + (version "2019.77") + (source + (origin + (method url-fetch) + (uri (string-append + "https://matt.ucc.asn.au/dropbear/releases/" + "dropbear-" version ".tar.bz2")) + (sha256 + (base32 "13a55fcy2mx2pvsfj6dh9107k4wnbd9ybdyi3w3ivgikwvmph7yr")))) (build-system gnu-build-system) - (arguments `(#:tests? #f)) ; there is no "make check" or anything similar + (arguments `(#:tests? #f)) ; there is no "make check" or anything similar ;; TODO: Investigate unbundling libtommath and libtomcrypt or at least ;; cherry-picking important bug fixes from them. See ;; for more information. From 2b81eac01e5828c6fce61b3cafc0f78e7a0ab891 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 23 Mar 2019 15:04:44 +0100 Subject: [PATCH 634/694] graph: Add the 'reverse-bag' graph. Suggested by Julien Lepiller. * guix/scripts/graph.scm (%reverse-bag-node-type): New variable. (%node-types): Add it. * tests/graph.scm ("reverse bag DAG"): New test. * doc/guix.texi (Invoking guix graph): Document it. --- doc/guix.texi | 18 +++++++++++++++++- guix/scripts/graph.scm | 19 ++++++++++++++++++- tests/graph.scm | 28 +++++++++++++++++++++++++++- 3 files changed, 62 insertions(+), 3 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 94d7a29bdf..8fa714ee54 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -9290,7 +9290,9 @@ This shows the @emph{reverse} DAG of packages. For example: guix graph --type=reverse-package ocaml @end example -...@: yields the graph of packages that depend on OCaml. +...@: yields the graph of packages that @emph{explicitly} depend on OCaml (if +you are also interested in cases where OCaml is an implicit dependency, see +@code{reverse-bag} below.) Note that for core packages this can yield huge graphs. If all you want is to know the number of packages that depend on a given package, use @@ -9324,6 +9326,20 @@ dependencies. @item bag-with-origins Similar to @code{bag}, but also showing origins and their dependencies. +@item reverse-bag +This shows the @emph{reverse} DAG of packages. Unlike @code{reverse-package}, +it also takes implicit dependencies into account. For example: + +@example +guix graph -t reverse-bag dune +@end example + +@noindent +...@: yields the graph of all packages that depend on Dune, directly or +indirectly. Since Dune is an @emph{implicit} dependency of many packages +@i{via} @code{dune-build-system}, this shows a large number of packages, +whereas @code{reverse-package} would show very few if any. + @item derivation This is the most detailed representation: It shows the DAG of derivations (@pxref{Derivations}) and plain store items. Compared to diff --git a/guix/scripts/graph.scm b/guix/scripts/graph.scm index 8efeef3274..d0d353ff9e 100644 --- a/guix/scripts/graph.scm +++ b/guix/scripts/graph.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2016, 2017, 2018 Ludovic Courtès +;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -43,6 +43,7 @@ (define-module (guix scripts graph) %bag-node-type %bag-with-origins-node-type %bag-emerged-node-type + %reverse-bag-node-type %derivation-node-type %reference-node-type %referrer-node-type @@ -219,6 +220,21 @@ (define %bag-emerged-node-type bag-node-edges-sans-bootstrap) %store-monad)))) +(define %reverse-bag-node-type + ;; Type for the reverse traversal of package nodes via the "bag" + ;; representation, which includes implicit inputs. + (let* ((packages (delay (package-closure (fold-packages cons '())))) + (back-edges (delay (run-with-store #f ;store not actually needed + (node-back-edges %bag-node-type + (force packages)))))) + (node-type + (name "reverse-bag") + (description "the reverse DAG of packages, including implicit inputs") + (convert nodes-from-package) + (identifier bag-node-identifier) + (label node-full-name) + (edges (lift1 (force back-edges) %store-monad))))) + ;;; ;;; Derivation DAG. @@ -375,6 +391,7 @@ (define %node-types %bag-node-type %bag-with-origins-node-type %bag-emerged-node-type + %reverse-bag-node-type %derivation-node-type %reference-node-type %referrer-node-type diff --git a/tests/graph.scm b/tests/graph.scm index 4799d3bd0c..c4c5096226 100644 --- a/tests/graph.scm +++ b/tests/graph.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2016, 2017, 2018 Ludovic Courtès +;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -191,6 +191,32 @@ (define (edge->tuple source target) (string=? target (derivation-file-name g))))) edges))))))))) +(test-assert "reverse bag DAG" + (let-values (((dune bap ocaml-base) + (values (specification->package "dune") + (specification->package "bap") + (specification->package "ocaml-base"))) + ((backend nodes+edges) (make-recording-backend))) + (run-with-store %store + (export-graph (list dune) 'port + #:node-type %reverse-bag-node-type + #:backend backend)) + + (run-with-store %store + (mlet %store-monad ((dune-drv (package->derivation dune)) + (bap-drv (package->derivation bap)) + (ocaml-base-drv (package->derivation ocaml-base))) + ;; OCAML-BASE uses 'dune-build-system' so DUNE is a direct dependency. + ;; BAP is much higher in the stack but it should be there. + (let-values (((nodes edges) (nodes+edges))) + (return + (and (member `(,(derivation-file-name bap-drv) + ,(package-full-name bap)) + nodes) + (->bool (member (map derivation-file-name + (list dune-drv ocaml-base-drv)) + edges))))))))) + (test-assert "derivation DAG" (let-values (((backend nodes+edges) (make-recording-backend))) (run-with-store %store From a53ecfc897a5490744ecc1bc72cabc1d3f5c434f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 23 Mar 2019 15:10:37 +0100 Subject: [PATCH 635/694] graph: Factorize calls to 'fold-packages'. * guix/scripts/graph.scm (all-packages): New procedure. (%reverse-package-node-type, %reverse-bag-node-type): Use 'all-packages' instead of 'fold-packages'. --- guix/scripts/graph.scm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/guix/scripts/graph.scm b/guix/scripts/graph.scm index d0d353ff9e..8fe81ad64b 100644 --- a/guix/scripts/graph.scm +++ b/guix/scripts/graph.scm @@ -111,11 +111,21 @@ (define %package-node-type ;;; Reverse package DAG. ;;; +(define (all-packages) ;XXX: duplicated from (guix scripts refresh) + "Return the list of all the distro's packages." + (fold-packages (lambda (package result) + ;; Ignore deprecated packages. + (if (package-superseded package) + result + (cons package result))) + '() + #:select? (const #t))) ;include hidden packages + (define %reverse-package-node-type ;; For this node type we first need to compute the list of packages and the ;; list of back-edges. Since we want to do it only once, we use the ;; promises below. - (let* ((packages (delay (fold-packages cons '()))) + (let* ((packages (delay (all-packages))) (back-edges (delay (run-with-store #f ;store not actually needed (node-back-edges %package-node-type (force packages)))))) @@ -223,7 +233,7 @@ (define %bag-emerged-node-type (define %reverse-bag-node-type ;; Type for the reverse traversal of package nodes via the "bag" ;; representation, which includes implicit inputs. - (let* ((packages (delay (package-closure (fold-packages cons '())))) + (let* ((packages (delay (package-closure (all-packages)))) (back-edges (delay (run-with-store #f ;store not actually needed (node-back-edges %bag-node-type (force packages)))))) From a9f847adc3f9e996a83bc1a572e9221d4d128def Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Thu, 21 Mar 2019 00:22:00 +0000 Subject: [PATCH 636/694] gnu: libmygpo-qt: Move to new 'gpodder.scm' file. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/music.scm (libmygpo-qt): Move to 'gpodder.scm'. * gnu/packages/gpodder.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 1 + gnu/packages/gpodder.scm | 56 ++++++++++++++++++++++++++++++++++++++++ gnu/packages/music.scm | 31 +--------------------- 3 files changed, 58 insertions(+), 30 deletions(-) create mode 100644 gnu/packages/gpodder.scm diff --git a/gnu/local.mk b/gnu/local.mk index 594755f693..3f07629f4f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -212,6 +212,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/gobby.scm \ %D%/packages/golang.scm \ %D%/packages/gperf.scm \ + %D%/packages/gpodder.scm \ %D%/packages/gprolog.scm \ %D%/packages/gps.scm \ %D%/packages/graph.scm \ diff --git a/gnu/packages/gpodder.scm b/gnu/packages/gpodder.scm new file mode 100644 index 0000000000..c0150402c4 --- /dev/null +++ b/gnu/packages/gpodder.scm @@ -0,0 +1,56 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2019 Pierre Langlois +;;; +;;; 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 gpodder) + #:use-module (guix download) + #:use-module (guix packages) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix build-system cmake) + #:use-module (gnu packages) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages qt)) + +(define-public libmygpo-qt + (package + (name "libmygpo-qt") + (version "1.1.0") + (source (origin + (method url-fetch) + (uri (string-append "http://stefan.derkits.at/files/" + "libmygpo-qt/libmygpo-qt." version ".tar.gz")) + (sha256 + (base32 + "1kg18qrq2rsswgzhl65r3mlyx7kpqg4wwnbp4yiv6svvmadmlxl2")) + (patches (search-patches "libmygpo-qt-fix-qt-5.11.patch" + "libmygpo-qt-missing-qt5-modules.patch")))) + (build-system cmake-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("qt" ,qtbase))) + (arguments + `(#:configure-flags '("-DMYGPO_BUILD_TESTS=ON") + ;; TODO: Enable tests when https://github.com/gpodder/gpodder/issues/446 + ;; is fixed. + #:tests? #f)) + (home-page "http://wiki.gpodder.org/wiki/Libmygpo-qt") + (synopsis "Qt/C++ library wrapping the gpodder web service") + (description "@code{libmygpo-qt} is a Qt/C++ library wrapping the +@url{https://gpodder.net} APIs. It allows applications to discover, manage +and track podcasts.") + (license license:lgpl2.1+))) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index b93bcacfcd..5a2358f19a 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -88,6 +88,7 @@ (define-module (gnu packages music) #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) + #:use-module (gnu packages gpodder) #:use-module (gnu packages graphics) #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) @@ -4009,36 +4010,6 @@ (define-public sorcer the electronic or dubstep genre.") (license license:gpl3+))) -(define-public libmygpo-qt - (package - (name "libmygpo-qt") - (version "1.1.0") - (source (origin - (method url-fetch) - (uri (string-append "http://stefan.derkits.at/files/" - "libmygpo-qt/libmygpo-qt." version ".tar.gz")) - (sha256 - (base32 - "1kg18qrq2rsswgzhl65r3mlyx7kpqg4wwnbp4yiv6svvmadmlxl2")) - (patches (search-patches "libmygpo-qt-fix-qt-5.11.patch" - "libmygpo-qt-missing-qt5-modules.patch")))) - (build-system cmake-build-system) - (native-inputs - `(("pkg-config" ,pkg-config))) - (inputs - `(("qt" ,qtbase))) - (arguments - `(#:configure-flags '("-DMYGPO_BUILD_TESTS=ON") - ;; TODO: Enable tests when https://github.com/gpodder/gpodder/issues/446 - ;; is fixed. - #:tests? #f)) - (home-page "http://wiki.gpodder.org/wiki/Libmygpo-qt") - (synopsis "Qt/C++ library wrapping the gpodder web service") - (description "@code{libmygpo-qt} is a Qt/C++ library wrapping the -@url{https://gpodder.net} APIs. It allows applications to discover, manage -and track podcasts.") - (license license:lgpl2.1+))) - (define-public sonivox-eas (package (name "sonivox-eas") From 8f2b70775f51fa7367ee6dbaee6aeecfeda5b0ab Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Thu, 21 Mar 2019 00:22:01 +0000 Subject: [PATCH 637/694] gnu: Add python-podcastparser. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/podcast.scm (python-podcastparser): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/gpodder.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/gpodder.scm b/gnu/packages/gpodder.scm index c0150402c4..5b872908a5 100644 --- a/gnu/packages/gpodder.scm +++ b/gnu/packages/gpodder.scm @@ -21,7 +21,9 @@ (define-module (gnu packages gpodder) #:use-module (guix packages) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix build-system cmake) + #:use-module (guix build-system python) #:use-module (gnu packages) + #:use-module (gnu packages check) #:use-module (gnu packages pkg-config) #:use-module (gnu packages qt)) @@ -54,3 +56,24 @@ (define-public libmygpo-qt @url{https://gpodder.net} APIs. It allows applications to discover, manage and track podcasts.") (license license:lgpl2.1+))) + +(define-public python-podcastparser + (package + (name "python-podcastparser") + (version "0.6.4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "podcastparser" version)) + (sha256 + (base32 + "1ksj1gcmbnm5i43xhpqxbs2mqi6xzawwwkwbh9h6lwa1wxxvv247")))) + (native-inputs + `(("python-nose" ,python-nose))) + (build-system python-build-system) + (home-page "http://gpodder.org/podcastparser") + (synopsis "Simplified and fast RSS parser Python library") + (description "@code{podcastparser} is a library for the gPodder project to +provide an easy and reliable way of parsing RSS and Atom-based podcast feeds +in Python.") + (license license:isc))) From e57fb2852c8bf3bf20a4b49bfc1da43627c6afe3 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Thu, 21 Mar 2019 00:22:02 +0000 Subject: [PATCH 638/694] gnu: Add python-minimock. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/check.scm (python-minimock, python2-minimock): New variables. Signed-off-by: Ludovic Courtès --- gnu/packages/check.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 4229578f86..9a88a8d873 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -28,6 +28,7 @@ ;;; Copyright © 2016, 2017, 2018 Marius Bakke ;;; Copyright © 2017, 2018 Ludovic Courtès ;;; Copyright © 2018 Fis Trivial +;;; Copyright © 2019 Pierre Langlois ;;; ;;; This file is part of GNU Guix. ;;; @@ -549,6 +550,27 @@ (define-public python-parameterized (define-public python2-parameterized (package-with-python2 python-parameterized)) +(define-public python-minimock + (package + (name "python-minimock") + (version "1.2.8") + (source + (origin + (method url-fetch) + (uri (pypi-uri "MiniMock" version)) + (sha256 + (base32 + "0k2sxb1ibnyg05iblz7zhbv825f1zk9906rab7883iqgvzmdzpsz")))) + (build-system python-build-system) + (home-page "https://pypi.org/project/MiniMock") + (synopsis "Simple Python library for using mock objects") + (description "MiniMock is a simple library for building mock objects with +doctest.") + (license license:expat))) + +(define-public python2-minimock + (package-with-python2 python-minimock)) + (define-public python-mock (package (name "python-mock") From a506a4c3801838c0b75b58dd2ac8bb0ccf4279fb Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 23 Mar 2019 18:36:57 +0100 Subject: [PATCH 639/694] import: opam: Also update dune packages. * guix/import/opam.scm (opam-package?): Also accept packages that use the dune build system. --- guix/import/opam.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/import/opam.scm b/guix/import/opam.scm index 7b2e832e92..36028a01d6 100644 --- a/guix/import/opam.scm +++ b/guix/import/opam.scm @@ -292,7 +292,7 @@ (define (guix-package->opam-name package) (define (opam-package? package) "Return true if PACKAGE is an OCaml package from OPAM" (and - (equal? (build-system-name (package-build-system package)) 'ocaml) + (member (build-system-name (package-build-system package)) '(dune ocaml)) (not (string-prefix? "ocaml4" (package-name package))))) (define (latest-release package) From b6c01d147f9ab08a2a6bf22793e34221619abf35 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 14:20:10 +0100 Subject: [PATCH 640/694] gnu: perl-file-slurp: Update to 9999.26. * gnu/packages/perl.scm (perl-file-slurp): Update to 9999.26. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 8d02ad137e..05a0c5309a 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -3683,7 +3683,7 @@ (define-public perl-file-sharedir-install (define-public perl-file-slurp (package (name "perl-file-slurp") - (version "9999.25") + (version "9999.26") (source (origin (method url-fetch) @@ -3691,7 +3691,7 @@ (define-public perl-file-slurp "File-Slurp-" version ".tar.gz")) (sha256 (base32 - "1hg3bhf5m78d77p4174cnldd75ppyrvr5rkc8w289ihvwsx9gsn7")))) + "0c09ivl50sg9j75si6cahfp1wgvhqawakb6h5j6hlca6vwjqs9qy")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/File-Slurp") (synopsis "Reading/Writing/Modifying of complete files") From 590b1f92bbc0ab232af077979fe0d94d65ee98a5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 14:21:41 +0100 Subject: [PATCH 641/694] gnu: perl-sub-quote: Update to 2.006003. * gnu/packages/perl.scm (perl-sub-quote): Update to 2.006003. --- gnu/packages/perl.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 05a0c5309a..96701d9101 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -3690,8 +3690,7 @@ (define-public perl-file-slurp (uri (string-append "mirror://cpan/authors/id/C/CA/CAPOEIRAB/" "File-Slurp-" version ".tar.gz")) (sha256 - (base32 - "0c09ivl50sg9j75si6cahfp1wgvhqawakb6h5j6hlca6vwjqs9qy")))) + (base32 "0c09ivl50sg9j75si6cahfp1wgvhqawakb6h5j6hlca6vwjqs9qy")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/File-Slurp") (synopsis "Reading/Writing/Modifying of complete files") @@ -7720,7 +7719,7 @@ (define-public perl-sub-name (define-public perl-sub-quote (package (name "perl-sub-quote") - (version "2.005001") + (version "2.006003") (source (origin (method url-fetch) @@ -7728,8 +7727,7 @@ (define-public perl-sub-quote "mirror://cpan/authors/id/H/HA/HAARG/Sub-Quote-" version ".tar.gz")) (sha256 - (base32 - "01xsvfdpxzimsbrp9mqipsr93y83nhj21q05g8v1bw6yfl3lzayn")))) + (base32 "0xl1w55qilqc3xdqvmjzs5vjnjdc0d4633yw7hh1yd9zfxpkl7xy")))) (build-system perl-build-system) (native-inputs `(("perl-test-fatal" ,perl-test-fatal))) From f2af1ac555c1952e390a29a912d4ea689c315bea Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 14:22:55 +0100 Subject: [PATCH 642/694] gnu: perl-cache-fastmmap: Update to 1.47. * gnu/packages/perl.scm (perl-cache-fastmmap): Update to 1.47. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 96701d9101..dd25d87766 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -667,15 +667,14 @@ (define-public perl-cache-cache (define-public perl-cache-fastmmap (package (name "perl-cache-fastmmap") - (version "1.40") + (version "1.47") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/R/RO/ROBM/" "Cache-FastMmap-" version ".tar.gz")) (sha256 - (base32 - "0h3ckr04cdn6dvl40m4m97vl5ybf30v1lwhw3jvkr92kpksvq4hd")))) + (base32 "0fdni3iyjfnx8ldgrz3h6z6yxbklrx76klcghg6xvmzd878yqlmi")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/Cache-FastMmap") (synopsis "Shared memory interprocess cache via mmap") From 91ee177731e79624bb73f61cbc7cb0d6a7f3998e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 14:36:52 +0100 Subject: [PATCH 643/694] gnu: perl-moose: Update to 2.2011. * gnu/packages/perl.scm (perl-moose): Update to 2.2011. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index dd25d87766..7b81926782 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -5432,14 +5432,14 @@ (define-public perl-moo-2 (define-public perl-moose (package (name "perl-moose") - (version "2.2004") + (version "2.2011") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/E/ET/ETHER/" "Moose-" version ".tar.gz")) (sha256 (base32 - "1c6jx2lnrh2mi9wlj2c0sirj6345xmbpr34ax8d85mcginzq3j74")))) + "10ndq6jwj2iwhwqjs23g6nb1yrf3brgw41jjphxzk6zkv4shlgcp")))) (build-system perl-build-system) (native-inputs `(("perl-cpan-meta-check" ,perl-cpan-meta-check) From 58f29e40f956762303056ebe497eb52055935e7f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 14:49:32 +0100 Subject: [PATCH 644/694] gnu: perl-text-unidecode: Update to 1.30. * gnu/packages/perl.scm (perl-text-unidecode): Update to 1.30. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 7b81926782..187e01a0c4 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -8416,7 +8416,7 @@ (define-public perl-text-template (define-public perl-text-unidecode (package (name "perl-text-unidecode") - (version "1.23") + (version "1.30") (source (origin (method url-fetch) @@ -8424,7 +8424,7 @@ (define-public perl-text-unidecode "Text-Unidecode-" version ".tar.gz")) (sha256 (base32 - "1mnnq57amh0bs6z2ggkmgnn4hz8mqc9lfhr66xv2bsnlvhg7c7fb")))) + "1imii0p6wvhrxsr5z2zhazpx5vl4l4ybf1y2c5hy480xvi6z293c")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/Text-Unidecode") (synopsis "Provide plain ASCII transliterations of Unicode text") From bdd48dd799ffefc42c09489f377baebfab93a700 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 14:53:47 +0100 Subject: [PATCH 645/694] gnu: perl-unicode-linebreak: Update to 2019.001. * gnu/packages/perl.scm (perl-unicode-linebreak): Update to 2019.001. --- gnu/packages/perl.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 187e01a0c4..77255fa7ef 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -8423,8 +8423,7 @@ (define-public perl-text-unidecode (uri (string-append "mirror://cpan/authors/id/S/SB/SBURKE/" "Text-Unidecode-" version ".tar.gz")) (sha256 - (base32 - "1imii0p6wvhrxsr5z2zhazpx5vl4l4ybf1y2c5hy480xvi6z293c")))) + (base32 "1imii0p6wvhrxsr5z2zhazpx5vl4l4ybf1y2c5hy480xvi6z293c")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/Text-Unidecode") (synopsis "Provide plain ASCII transliterations of Unicode text") @@ -8967,14 +8966,14 @@ (define-public perl-unicode-collate (define-public perl-unicode-linebreak (package (name "perl-unicode-linebreak") - (version "2016.003") + (version "2019.001") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/N/NE/NEZUMI/" "Unicode-LineBreak-" version ".tar.gz")) (sha256 (base32 - "096wf5x99swx7l7yd8pm2aw50g596nf50rkq7250zjcc1acjskp6")))) + "12iinva5gqc9g7qzxrvmh45n714z0ad9g7wq2dxwgp6drbj64rs8")))) (build-system perl-build-system) (propagated-inputs `(("perl-mime-charset" ,perl-mime-charset))) From 5250d56446b3196c60f5c84059476d227209a878 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 14:55:19 +0100 Subject: [PATCH 646/694] gnu: perl-carp: Update to 1.50. * gnu/packages/perl.scm (perl-carp): Update to 1.50. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 77255fa7ef..cec8339254 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -729,7 +729,7 @@ (define-public perl-canary-stability (define-public perl-carp (package (name "perl-carp") - (version "1.38") + (version "1.50") (source (origin (method url-fetch) (uri (string-append @@ -737,7 +737,7 @@ (define-public perl-carp version ".tar.gz")) (sha256 (base32 - "00bijwwc0ix27h2ma3lvsf3b56biar96bl9dikxgx7cmpcycxad5")))) + "1ngbpjyd9qi7n4h5r3q3qibd8by7rfiv7364jqlv4lbd3973n9zm")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/Carp") (synopsis "Alternative warn and die for modules") From 42aa5c20b86bfea560839ea10a18e59af1c0de12 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 14:56:57 +0100 Subject: [PATCH 647/694] gnu: perl-class-c3-componentised: Update to 1.001002. * gnu/packages/perl.scm (perl-class-c3-componentised): Update to 1.001002. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index cec8339254..8c28c94ed9 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -977,15 +977,14 @@ (define-public perl-class-c3-adopt-next (define-public perl-class-c3-componentised (package (name "perl-class-c3-componentised") - (version "1.001000") + (version "1.001002") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/F/FR/FREW/" "Class-C3-Componentised-" version ".tar.gz")) (sha256 - (base32 - "1nzav8arxll0rya7r2vp032s3acliihbb9mjlfa13rywhh77bzvl")))) + (base32 "14wn1g45z3b5apqq7dcai5drk01hfyqydsd2m6hsxzhyvi3b2l9h")))) (build-system perl-build-system) (native-inputs `(("perl-module-install" ,perl-module-install) From fa2d19ccd603fa2c69aec85158e6057b901cb98f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 14:57:41 +0100 Subject: [PATCH 648/694] gnu: perl-crypt-openssl-random: Update to 0.15. * gnu/packages/tls.scm (perl-crypt-openssl-random): Update to 0.15. --- gnu/packages/tls.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 6ecb5673e6..9e3020be3f 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -765,7 +765,7 @@ (define-public perl-crypt-openssl-guess (define-public perl-crypt-openssl-random (package (name "perl-crypt-openssl-random") - (version "0.13") + (version "0.15") (source (origin (method url-fetch) @@ -774,8 +774,7 @@ (define-public perl-crypt-openssl-random version ".tar.gz")) (sha256 - (base32 - "0vmvrb3shrzjzri3qn524dzdasbq8zhhbpc1vmq8sx68n4jhizb0")))) + (base32 "1x6ffps8q7mnawmcfq740llzy7i10g3319vap0wiw4d33fm6z1zh")))) (build-system perl-build-system) (native-inputs `(("perl-crypt-openssl-guess" ,perl-crypt-openssl-guess))) From e4a69686abb3727ac41b7510fc5c4ce900083d62 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 16:44:04 +0100 Subject: [PATCH 649/694] gnu: perl-libwww: Update to 6.37. * gnu/packages/web.scm (perl-libwww): Update to 6.37. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 944459d4fd..88a849b2a6 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -3084,7 +3084,7 @@ (define-public perl-io-socket-ssl (define-public perl-libwww (package (name "perl-libwww") - (version "6.35") + (version "6.37") (source (origin (method url-fetch) (uri (string-append @@ -3092,7 +3092,7 @@ (define-public perl-libwww version ".tar.gz")) (sha256 (base32 - "0lsrr8r61b67f9wrynkhdhldw5yic4d7cd78zi52q59jgf6mg8nx")))) + "04a24cx9gs070rvlwf5kanz03y7nnq9k2nmpr01plnm059iprvf6")))) (build-system perl-build-system) (native-inputs `(("perl-test-fatal" ,perl-test-fatal) From 98db1c9bda44172f9ea8b6263b36795b0391b750 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 16:45:40 +0100 Subject: [PATCH 650/694] gnu: perl-html-lint: Update to 2.32. * gnu/packages/web.scm (perl-html-lint): Update to 2.32. --- gnu/packages/web.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 88a849b2a6..357b04f922 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -2572,15 +2572,14 @@ (define-public perl-html-scrubber (define-public perl-html-lint (package (name "perl-html-lint") - (version "2.26") + (version "2.32") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/P/PE/PETDANCE/" "HTML-Lint-" version ".tar.gz")) (sha256 - (base32 - "02vi1s4sw3hjnndxd6s91cp54iw5pg8n5kl9v0109dfxzn1n9bnl")))) + (base32 "0lk02xpfxcg7ij4dvpsa4wjlzhmiizj0jfr3rwmdpbj69nvc93br")))) (build-system perl-build-system) (propagated-inputs `(("perl-html-parser" ,perl-html-parser) From 1c769c97242d7bfca52733430aa1a8b951c1c885 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 16:50:16 +0100 Subject: [PATCH 651/694] gnu: perl-www-mechanize: Update to 1.91. * gnu/packages/web.scm (perl-www-mechanize): Update to 1.91. --- gnu/packages/web.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 357b04f922..c233ef7457 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -3763,15 +3763,14 @@ (define-public perl-www-curl (define-public perl-www-mechanize (package (name "perl-www-mechanize") - (version "1.89") + (version "1.91") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/O/OA/OALDERS/" "WWW-Mechanize-" version ".tar.gz")) (sha256 - (base32 - "1mxx362vqiniw8vi6k3j7v9b1s7012irhfcblcz1p6jz9cjqi7mh")))) + (base32 "0cb14m1vhaf0mgn2fqwi5hm72xhfi77hpq2g57swgy0w83x7m27b")))) (build-system perl-build-system) (native-inputs ;only for tests `(("perl-cgi" ,perl-cgi) From 4035551b492568840e6e536d81b7c72626c2ab4f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 16:56:15 +0100 Subject: [PATCH 652/694] gnu: perl-cgi-simple: Update to 1.21. * gnu/packages/web.scm (perl-cgi-simple): Update to 1.21. --- gnu/packages/web.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index c233ef7457..7c2a9d59e5 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -2266,15 +2266,14 @@ (define-public perl-cgi-session (define-public perl-cgi-simple (package (name "perl-cgi-simple") - (version "1.15") + (version "1.21") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/M/MA/MANWAR/" "CGI-Simple-" version ".tar.gz")) (sha256 - (base32 - "013dcy9k4sj9alkksk5aqz65ryxw0rxgg71c7w666y941gd8n46q")))) + (base32 "1wzc2igs4khmj7zfahvs87c24p9ks8hnqhhsyviyiix53xx2y6sg")))) (build-system perl-build-system) (native-inputs `(("perl-io-stringy" ,perl-io-stringy) ; for IO::Scalar From b7a3bb101bf50c86715e427c0abc0e6241e9af3b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 17:03:11 +0100 Subject: [PATCH 653/694] gnu: perl-test-tcp: Update to 2.19. * gnu/packages/web.scm (perl-test-tcp): Update to 2.19. --- gnu/packages/web.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 7c2a9d59e5..32111a133a 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -3498,15 +3498,14 @@ (define-public perl-plack-test-externalserver (define-public perl-test-tcp (package (name "perl-test-tcp") - (version "2.06") + (version "2.19") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/T/TO/TOKUHIROM/" "Test-TCP-" version ".tar.gz")) (sha256 - (base32 - "0acjwm21y2an4f3fasci9qa0isakh9cgp74fk0bzcdi506xmcjbi")))) + (base32 "14ahzklq3xgmwj58p9vdcfgpggrmh3nigq5mzqk4wakbb6fjs0fx")))) (build-system perl-build-system) (propagated-inputs `(("perl-test-sharedfork" ,perl-test-sharedfork))) From 5793d9fdc27f3bdfca313449545047d62465cf62 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 17:12:30 +0100 Subject: [PATCH 654/694] gnu: perl-plack-middleware-reverseproxy: Update to 0.16. * gnu/packages/web.scm (perl-plack-middleware-reverseproxy): Update to 0.16. --- gnu/packages/web.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 32111a133a..dab0fa2e4d 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -3451,7 +3451,7 @@ (define-public perl-plack-middleware-removeredundantbody (define-public perl-plack-middleware-reverseproxy (package (name "perl-plack-middleware-reverseproxy") - (version "0.15") + (version "0.16") (source (origin (method url-fetch) @@ -3459,8 +3459,7 @@ (define-public perl-plack-middleware-reverseproxy "Plack-Middleware-ReverseProxy-" version ".tar.gz")) (sha256 - (base32 - "1zmsccdy6wr5hxzj07r1nsmaymyibk87p95z0wzknjw10lwmqs9f")))) + (base32 "0a512n62pnk5ayj3zdzyj50iy1qi8nwh6ygks2h7nrh7gp9k2jc7")))) (build-system perl-build-system) (native-inputs `(("perl-module-install" ,perl-module-install))) From 73125149c11f07bec090771c3ad84b2281fe734d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 17:19:39 +0100 Subject: [PATCH 655/694] gnu: perl-test-www-mechanize: Update to 1.52. * gnu/packages/web.scm (perl-test-www-mechanize): Update to 1.52. --- gnu/packages/web.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index dab0fa2e4d..a678cbb8fc 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -3517,15 +3517,14 @@ (define-public perl-test-tcp (define-public perl-test-www-mechanize (package (name "perl-test-www-mechanize") - (version "1.50") + (version "1.52") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/P/PE/PETDANCE/" "Test-WWW-Mechanize-" version ".tar.gz")) (sha256 - (base32 - "097pl87vdbxbb56vawzvs6ikrlb8nz3dx223kjjbdn3jlli3jjhg")))) + (base32 "1jsywlbxhqw39ij7s8vmgff5vys58vlfaq27072awacnxc65aal4")))) (build-system perl-build-system) (propagated-inputs `(("perl-carp-assert-more" ,perl-carp-assert-more) From f44678f663616b368cecb72d6ce8dee501d059df Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 17:22:58 +0100 Subject: [PATCH 656/694] gnu: perl-plack-middleware-removeredundantbody: Update to 0.07. * gnu/packages/web.scm (perl-plack-middleware-removeredundantbody): Update to 0.07. --- gnu/packages/web.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index a678cbb8fc..5debfd32aa 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -3428,7 +3428,7 @@ (define-public perl-plack-middleware-methodoverride (define-public perl-plack-middleware-removeredundantbody (package (name "perl-plack-middleware-removeredundantbody") - (version "0.05") + (version "0.07") (source (origin (method url-fetch) @@ -3436,8 +3436,7 @@ (define-public perl-plack-middleware-removeredundantbody "Plack-Middleware-RemoveRedundantBody-" version ".tar.gz")) (sha256 - (base32 - "1n3wm0zi8dnk54jx937asl951lslj3jvw0fry4jpzsibg4f6wrx0")))) + (base32 "1hz3kgb5vw4r02gfk9i911f5ykvz55lrsx45bdcllk2bszal3f34")))) (build-system perl-build-system) (propagated-inputs `(("perl-plack" ,perl-plack))) From 5bbe07a0411853151ed030048df21a7918a031de Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 17:24:18 +0100 Subject: [PATCH 657/694] gnu: perl-finance-quote: Update to 1.47. * gnu/packages/web.scm (perl-finance-quote): Update to 1.47. --- gnu/packages/web.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 5debfd32aa..ee57173e50 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -2435,15 +2435,14 @@ (define-public perl-file-listing (define-public perl-finance-quote (package (name "perl-finance-quote") - (version "1.38") + (version "1.47") (source (origin (method url-fetch) (uri (string-append "https://cpan.metacpan.org/authors/id/E/EC/ECOCODE/" "Finance-Quote-" version ".tar.gz")) (sha256 - (base32 - "0zhqb27y4vdxn476s2kwm9zl2f970yjcyyybnjm9b406krr2fm59")) + (base32 "0gzbq85738f299jaw4nj3ljnka380j2y6yspmyl71rgfypqjvbr7")) (patches (search-patches "perl-finance-quote-unuse-mozilla-ca.patch")))) (build-system perl-build-system) From 22c31e07a53a9cd6dc3530507762b392ce1291db Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Mar 2019 17:31:26 +0100 Subject: [PATCH 658/694] gnu: perl-plack-test-externalserver: Update to 0.02. * gnu/packages/web.scm (perl-plack-test-externalserver): Update to 0.02. --- gnu/packages/web.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index ee57173e50..13c2eff7da 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -3473,15 +3473,14 @@ (define-public perl-plack-middleware-reverseproxy (define-public perl-plack-test-externalserver (package (name "perl-plack-test-externalserver") - (version "0.01") + (version "0.02") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/F/FL/FLORA/" "Plack-Test-ExternalServer-" version ".tar.gz")) (sha256 - (base32 - "1dbg1p3rgvvbkkpvca5jlc2mzx8iqyiybk88al93pvbca65h1g7h")))) + (base32 "1l1yj1l25679x7cbpd27ii7s1f1ajpkspif9xqnl21hczrbmrbsv")))) (build-system perl-build-system) (propagated-inputs `(("perl-plack" ,perl-plack))) From 38a3f4df8f823d8308f3814a64a9591716ef6704 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 23 Mar 2019 21:37:51 +0200 Subject: [PATCH 659/694] gnu: perl-libwww: Update source uri. This is a follow-up to e4a69686abb3727ac41b7510fc5c4ce900083d62. * gnu/packages/web.scm (perl-libwww)[source]: Update to new upstream uri. --- gnu/packages/web.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 13c2eff7da..f6701dca30 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -3085,7 +3085,7 @@ (define-public perl-libwww (source (origin (method url-fetch) (uri (string-append - "mirror://cpan/authors/id/E/ET/ETHER/libwww-perl-" + "mirror://cpan/authors/id/O/OA/OALDERS/libwww-perl-" version ".tar.gz")) (sha256 (base32 From cf3f12f6e541e263e03990019a18dceefa011bc5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 19 Mar 2019 20:44:33 +0200 Subject: [PATCH 660/694] gnu: Add libtommath-1.0. * gnu/packages/multiprecision.scm (libtommath-1.0): New variable. --- gnu/packages/multiprecision.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/multiprecision.scm b/gnu/packages/multiprecision.scm index 069fae62b4..6383976f00 100644 --- a/gnu/packages/multiprecision.scm +++ b/gnu/packages/multiprecision.scm @@ -346,3 +346,22 @@ (define-public libtommath simple to work with that provides fairly efficient routines that build out of the box without configuration.") (license unlicense))) + +(define-public libtommath-1.0 + (package + (inherit libtommath) + (version "1.0.1") + (outputs '("out")) + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/libtom/libtommath/releases/" + "download/v" version "/ltm-" version ".tar.xz")) + (sha256 + (base32 + "0sbccdwbkfc680id2fi0x067j23biqcjqilwkk7y9339knrjy0s7")))) + (arguments + (substitute-keyword-arguments (package-arguments libtommath) + ((#:phases phases) + `(modify-phases ,phases + (delete 'install-static-library))))))) From abc12b0d6ee61c6399993c8f0a7ed92841eb466a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 24 Feb 2019 20:15:49 +0200 Subject: [PATCH 661/694] gnu: Add moarvm. * gnu/packages/perl6.scm (moarvm): New variable. --- gnu/local.mk | 3 +- gnu/packages/perl6.scm | 96 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/perl6.scm diff --git a/gnu/local.mk b/gnu/local.mk index 3f07629f4f..f957b8af62 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -10,7 +10,7 @@ # Copyright © 2016, 2017, 2018, 2019 Ricardo Wurmus # Copyright © 2016 Ben Woodcroft # Copyright © 2016, 2017, 2018, 2019 Alex Vong -# Copyright © 2016, 2017 Efraim Flashner +# Copyright © 2016, 2017, 2018, 2019 Efraim Flashner # Copyright © 2016, 2017 Jan Nieuwenhuizen # Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice # Copyright © 2017, 2018 Clément Lassieur @@ -365,6 +365,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/perl-check.scm \ %D%/packages/perl-compression.scm \ %D%/packages/perl-web.scm \ + %D%/packages/perl6.scm \ %D%/packages/photo.scm \ %D%/packages/phabricator.scm \ %D%/packages/php.scm \ diff --git a/gnu/packages/perl6.scm b/gnu/packages/perl6.scm new file mode 100644 index 0000000000..6a5fa32ecc --- /dev/null +++ b/gnu/packages/perl6.scm @@ -0,0 +1,96 @@ +;;; 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 perl6) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix download) + #:use-module (guix packages) + #:use-module (guix build-system perl) + #:use-module (gnu packages bdw-gc) + #:use-module (gnu packages libevent) + #:use-module (gnu packages libffi) + #:use-module (gnu packages multiprecision) + #:use-module (gnu packages pkg-config)) + +(define-public moarvm + (package + (name "moarvm") + (version "2019.03") + (source + (origin + (method url-fetch) + (uri (string-append "https://moarvm.org/releases/MoarVM-" + version ".tar.gz")) + (sha256 + (base32 + "017w1zvr6yl0cgjfc1b3ddlc6vjw9q8p7alw1vvsckw95190xc14")) + (modules '((guix build utils))) + (snippet + '(begin + ;(delete-file-recursively "3rdparty/dynasm") ; JIT + (delete-file-recursively "3rdparty/dyncall") + (delete-file-recursively "3rdparty/freebsd") + (delete-file-recursively "3rdparty/libatomicops") + (delete-file-recursively "3rdparty/libuv") + (delete-file-recursively "3rdparty/libtommath") + (delete-file-recursively "3rdparty/msinttypes") + #t)))) + (build-system perl-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (pkg-config (assoc-ref inputs "pkg-config"))) + (setenv "LDFLAGS" (string-append "-Wl,-rpath=" out "/lib")) + (invoke "perl" "Configure.pl" + "--prefix" out + "--pkgconfig" (string-append pkg-config "/bin/pkg-config") + "--has-libtommath" + "--has-libatomic_ops" + "--has-libffi" + "--has-libuv"))))))) + (home-page "https://moarvm.org/") + ;; These should be inputs but moar.h can't find them when building rakudo + (propagated-inputs + `(("libatomic-ops" ,libatomic-ops) + ("libtommath" ,libtommath-1.0) + ("libuv" ,libuv))) + (inputs + `(("libffi" ,libffi))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (synopsis "VM for NQP And Rakudo Perl 6") + (description + "Short for \"Metamodel On A Runtime\", MoarVM is a modern virtual machine +built for the Rakudo Perl 6 compiler and the NQP Compiler Toolchain. Highlights +include: + +@itemize +@item Great Unicode support, with strings represented at grapheme level +@item Dynamic analysis of running code to identify hot functions and loops, and +perform a range of optimizations, including type specialization and inlining +@item Support for threads, a range of concurrency control constructs, and +asynchronous sockets, timers, processes, and more +@item Generational, parallel, garbage collection +@item Support for numerous language features, including first class functions, +exceptions, continuations, runtime loading of code, big integers and interfacing +with native libraries. +@end itemize") + (license license:artistic2.0))) From af2dec5bf360ec05cbdf9a074527ede1b1fdeb1e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 24 Feb 2019 20:27:23 +0200 Subject: [PATCH 662/694] gnu: Add nqp. * gnu/packages/perl6.scm (nqp): New variable. --- gnu/packages/perl6.scm | 65 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/gnu/packages/perl6.scm b/gnu/packages/perl6.scm index 6a5fa32ecc..3f7b813d3c 100644 --- a/gnu/packages/perl6.scm +++ b/gnu/packages/perl6.scm @@ -94,3 +94,68 @@ (define-public moarvm with native libraries. @end itemize") (license license:artistic2.0))) + +(define-public nqp + (package + (name "nqp") + (version "2019.03") + (source + (origin + (method url-fetch) + (uri (string-append "https://rakudo.perl6.org/downloads/nqp/nqp-" + version ".tar.gz")) + (sha256 + (base32 + "183zhll13fx416s3hkg4bkvib77kyr857h0nydgrl643fpacxp83")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "3rdparty") #t)))) + (build-system perl-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'patch-source-shebangs 'patch-more-shebangs + (lambda _ + (substitute* '("tools/build/install-jvm-runner.pl.in" + "tools/build/gen-js-cross-runner.pl" + "tools/build/gen-js-runner.pl" + "tools/build/install-js-runner.pl" + "tools/build/install-moar-runner.pl" + "tools/build/gen-moar-runner.pl" + "t/nqp/111-spawnprocasync.t" + "t/nqp/113-run-command.t") + (("/bin/sh") (which "sh"))) + #t)) + (add-after 'unpack 'patch-source-date + (lambda _ + (substitute* "tools/build/gen-version.pl" + (("gmtime") "gmtime(0)")) + #t)) + (add-after 'unpack 'remove-failing-test + ;; One subtest fails for unknown reasons + (lambda _ + (delete-file "t/nqp/019-file-ops.t") + #t)) + (replace 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (moar (assoc-ref inputs "moarvm"))) + (invoke "perl" "Configure.pl" + "--backends=moar" + "--with-moar" (string-append moar "/bin/moar") + "--prefix" out))))))) + (inputs + `(("moarvm" ,moarvm))) + (home-page "https://github.com/perl6/nqp") + (synopsis "Not Quite Perl") + (description "This is \"Not Quite Perl\" -- a lightweight Perl 6-like +environment for virtual machines. The key feature of NQP is that it's designed +to be a very small environment (as compared with, say, perl6 or Rakudo) and is +focused on being a high-level way to create compilers and libraries for virtual +machines like MoarVM, the JVM, and others. + +Unlike a full-fledged implementation of Perl 6, NQP strives to have as small a +runtime footprint as it can, while still providing a Perl 6 object model and +regular expression engine for the virtual machine.") + (license license:artistic2.0))) From f7f8e767cd55c3731b85ede8d329e501d32c097a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 24 Feb 2019 20:44:44 +0200 Subject: [PATCH 663/694] gnu: Add rakudo. * gnu/packages/perl6.scm (rakudo): New variable. --- gnu/packages/perl6.scm | 68 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 67 insertions(+), 1 deletion(-) diff --git a/gnu/packages/perl6.scm b/gnu/packages/perl6.scm index 3f7b813d3c..b6781936f1 100644 --- a/gnu/packages/perl6.scm +++ b/gnu/packages/perl6.scm @@ -25,7 +25,8 @@ (define-module (gnu packages perl6) #:use-module (gnu packages libevent) #:use-module (gnu packages libffi) #:use-module (gnu packages multiprecision) - #:use-module (gnu packages pkg-config)) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages tls)) (define-public moarvm (package @@ -159,3 +160,68 @@ (define-public nqp runtime footprint as it can, while still providing a Perl 6 object model and regular expression engine for the virtual machine.") (license license:artistic2.0))) + +(define-public rakudo + (package + (name "rakudo") + (version "2019.03.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://rakudo.perl6.org/downloads/rakudo/rakudo-" + version ".tar.gz")) + (sha256 + (base32 + "1nllf69v8xr6v3kkj7pmryg11n5m3ajfkr7j72pvhrgnjy8lv3r1")))) + (build-system perl-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-source-date + (lambda _ + (substitute* "tools/build/gen-version.pl" + (("gmtime") "gmtime(0)")) + #t)) + (add-after 'patch-source-shebangs 'patch-more-shebangs + (lambda _ + (substitute* '("tools/build/create-js-runner.pl" + "tools/build/create-moar-runner.p6" + "tools/build/create-jvm-runner.pl" + "src/core/Proc.pm6") + (("/bin/sh") (which "sh"))) + #t)) + (replace 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (nqp (assoc-ref inputs "nqp"))) + (invoke "perl" "./Configure.pl" + "--backend=moar" + "--with-nqp" (string-append nqp "/bin/nqp") + "--prefix" out)))) + ;; This is the recommended tool for distro maintainers to install perl6 + ;; modules systemwide. See: https://github.com/ugexe/zef/issues/117 + (add-after 'install 'install-dist-tool + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (dest (string-append out "/share/perl6/tools"))) + (install-file "tools/install-dist.p6" dest) + (substitute* (string-append dest "/install-dist.p6") + (("/usr/bin/env perl6") + (string-append out "/bin/perl6")))) + #t))))) + (inputs + `(("moarvm" ,moarvm) + ("nqp" ,nqp) + ("openssl" ,openssl))) + (home-page "https://rakudo.org/") + (native-search-paths + (list (search-path-specification + (variable "PERL6LIB") + (separator ",") + (files '("share/perl6/lib" + "share/perl6/site/lib" + "share/perl6/vendor/lib"))))) + (synopsis "Perl 6 Compiler") + (description "Rakudo Perl is a compiler that implements the Perl 6 +specification and runs on top of several virtual machines.") + (license license:artistic2.0))) From 4e4c3114653d23926aea7b658f6a2ba04bc0e2f3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 26 Feb 2019 14:27:49 +0200 Subject: [PATCH 664/694] build: Add rakudo-build-system. * guix/build-system/rakudo.scm, guix/build/rakudo-build-system.scm: New files. * Makefile.am (MODULES): Add them. * doc/guix.texi (Build System): Document it. --- Makefile.am | 3 + doc/guix.texi | 20 +++- guix/build-system/rakudo.scm | 155 +++++++++++++++++++++++++++++ guix/build/rakudo-build-system.scm | 145 +++++++++++++++++++++++++++ 4 files changed, 322 insertions(+), 1 deletion(-) create mode 100644 guix/build-system/rakudo.scm create mode 100644 guix/build/rakudo-build-system.scm diff --git a/Makefile.am b/Makefile.am index 9e49b079bf..4902f3afe7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,6 +13,7 @@ # Copyright © 2018 Julien Lepiller # Copyright © 2018 Oleg Pykhalov # Copyright © 2018 Alex Vong +# Copyright © 2019 Efraim Flashner # # This file is part of GNU Guix. # @@ -124,6 +125,7 @@ MODULES = \ guix/build-system/ocaml.scm \ guix/build-system/waf.scm \ guix/build-system/r.scm \ + guix/build-system/rakudo.scm \ guix/build-system/ruby.scm \ guix/build-system/scons.scm \ guix/build-system/texlive.scm \ @@ -164,6 +166,7 @@ MODULES = \ guix/build/python-build-system.scm \ guix/build/ocaml-build-system.scm \ guix/build/r-build-system.scm \ + guix/build/rakudo-build-system.scm \ guix/build/ruby-build-system.scm \ guix/build/scons-build-system.scm \ guix/build/texlive-build-system.scm \ diff --git a/doc/guix.texi b/doc/guix.texi index 8fa714ee54..d10fbce3a4 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -28,7 +28,7 @@ Copyright @copyright{} 2015, 2016, 2017 Leo Famulari@* Copyright @copyright{} 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus@* Copyright @copyright{} 2016 Ben Woodcroft@* Copyright @copyright{} 2016, 2017, 2018 Chris Marusich@* -Copyright @copyright{} 2016, 2017, 2018 Efraim Flashner@* +Copyright @copyright{} 2016, 2017, 2018, 2019 Efraim Flashner@* Copyright @copyright{} 2016 John Darrington@* Copyright @copyright{} 2016, 2017 ng0@* Copyright @copyright{} 2016, 2017, 2018, 2019 Jan Nieuwenhuizen@* @@ -6002,6 +6002,24 @@ are run after installation using the R function @code{tools::testInstalledPackage}. @end defvr +@defvr {Scheme Variable} rakudo-build-system +This variable is exported by @code{(guix build-system rakudo)} It +implements the build procedure used by @uref{https://rakudo.org/, +Rakudo} for @uref{https://perl6.org/, Perl6} packages. It installs the +package to @code{/gnu/store/@dots{}/NAME-VERSION/share/perl6} and +installs the binaries, library files and the resources, as well as wrap +the files under the @code{bin/} directory. Tests can be skipped by +passing @code{#f} to the @code{tests?} parameter. + +Which rakudo package is used can be specified with @code{rakudo}. +Which perl6-tap-harness package used for the tests can be specified with +@code{#:prove6} or removed by passing @code{#f} to the +@code{with-prove6?} parameter. +Which perl6-zef package used for tests and installing can be specified +with @code{#:zef} or removed by passing @code{#f} to the +@code{with-zef?} parameter. +@end defvr + @defvr {Scheme Variable} texlive-build-system This variable is exported by @code{(guix build-system texlive)}. It is used to build TeX packages in batch mode with a specified engine. The diff --git a/guix/build-system/rakudo.scm b/guix/build-system/rakudo.scm new file mode 100644 index 0000000000..a02e2bad3a --- /dev/null +++ b/guix/build-system/rakudo.scm @@ -0,0 +1,155 @@ +;;; 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 (guix build-system rakudo) + #:use-module (guix store) + #:use-module (guix utils) + #:use-module (guix derivations) + #:use-module (guix search-paths) + #:use-module (guix build-system) + #:use-module (guix build-system gnu) + #:use-module (guix packages) + #:use-module (ice-9 match) + #:export (%rakudo-build-system-modules + rakudo-build + rakudo-build-system)) + +;; Commentary: +;; +;; Standard build and install procedure for packages using the Rakudo +;; build system to be installed as system libraries. This is +;; implemented as an extension of `gnu-build-system'. +;; +;; Code: + +(define %rakudo-build-system-modules + ;; Build-side modules imported by default. + `((guix build rakudo-build-system) + ,@%gnu-build-system-modules)) + +(define (default-rakudo) + "Return the default Rakudo package." + + ;; Do not use `@' to avoid introducing circular dependencies. + (let ((module (resolve-interface '(gnu packages perl6)))) + (module-ref module 'rakudo))) + +(define (default-prove6) + "Return the default perl6-tap-harness package for tests." + (let ((module (resolve-interface '(gnu packages perl6)))) + (module-ref module 'perl6-tap-harness))) + +(define (default-zef) + "Return the default perl6-zef package." + (let ((module (resolve-interface '(gnu packages perl6)))) + (module-ref module 'perl6-zef))) + +(define* (lower name + #:key source inputs native-inputs outputs + system target + (rakudo (default-rakudo)) + (prove6 (default-prove6)) + (zef (default-zef)) + (with-prove6? #t) + (with-zef? #t) + #:allow-other-keys + #:rest arguments) + "Return a bag for NAME." + (define private-keywords + '(#:source #:target #:rakudo #:prove6 #:zef #:inputs #:native-inputs)) + + (and (not target) ;XXX: no cross-compilation + (bag + (name name) + (system system) + (host-inputs `(,@(if source + `(("source" ,source)) + '()) + ,@inputs + + ;; Keep the standard inputs of 'gnu-build-system'. + ,@(standard-packages))) + (build-inputs `(("rakudo" ,rakudo) + ,@(if with-prove6? + `(("perl6-tap-harness" ,prove6) + ,@(if with-zef? + `(("perl6-zef" ,zef)) + '())) + '()) + ,@native-inputs)) + (outputs outputs) + (build rakudo-build) + (arguments (strip-keyword-arguments private-keywords arguments))))) + +(define* (rakudo-build store name inputs + #:key + (search-paths '()) + (tests? #t) + (phases '(@ (guix build rakudo-build-system) + %standard-phases)) + (outputs '("out")) + (system (%current-system)) + (guile #f) + (with-zef? #t) + (with-prove6? #t) + (imported-modules %rakudo-build-system-modules) + (modules '((guix build rakudo-build-system) + (guix build utils)))) + "Build SOURCE using PERL6, and with INPUTS." + (define builder + `(begin + (use-modules ,@modules) + (rakudo-build #:name ,name + #:source ,(match (assoc-ref inputs "source") + (((? derivation? source)) + (derivation->output-path source)) + ((source) + source) + (source + source)) + #:search-paths ',(map search-path-specification->sexp + search-paths) + #:phases ,phases + #:system ,system + #:tests? ,tests? + #:outputs %outputs + #:inputs %build-inputs))) + + (define guile-for-build + (match guile + ((? package?) + (package-derivation store guile system #:graft? #f)) + (#f ; the default + (let* ((distro (resolve-interface '(gnu packages commencement))) + (guile (module-ref distro 'guile-final))) + (package-derivation store guile system #:graft? #f))))) + + (build-expression->derivation store name builder + #:system system + #:inputs inputs + #:modules imported-modules + #:outputs outputs + #:guile-for-build guile-for-build)) + +(define rakudo-build-system + (build-system + (name 'rakudo) + (description "The standard Rakudo build system") + (lower lower))) + +;;; rakudo.scm ends here diff --git a/guix/build/rakudo-build-system.scm b/guix/build/rakudo-build-system.scm new file mode 100644 index 0000000000..dbdeb1ccd2 --- /dev/null +++ b/guix/build/rakudo-build-system.scm @@ -0,0 +1,145 @@ +;;; 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 (guix build rakudo-build-system) + #:use-module ((guix build gnu-build-system) #:prefix gnu:) + #:use-module (guix build utils) + #:use-module (ice-9 ftw) + #:use-module (ice-9 match) + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-26) + #:export (%standard-phases + rakudo-build)) + +;; Commentary: +;; +;; Builder-side code of the standard Rakudo package build procedure. +;; +;; Code: + +(define* (check #:key tests? inputs with-prove6? #:allow-other-keys) + (if (and tests? (assoc-ref inputs "perl6-tap-harness")) + ;(if (and tests? with-prove6?) + (invoke "prove6" "-I=lib" "t/") + (format #t "test suite not run~%")) + #t) + +(define* (install #:key inputs outputs with-zef? #:allow-other-keys) + "Install a given Perl6 package." + (let* ((out (assoc-ref outputs "out")) + (perl6 (string-append out "/share/perl6"))) + (if (assoc-ref inputs "perl6-zef") + ;(if with-zef? + (begin + (let ((zef (string-append (assoc-ref inputs "perl6-zef") + "/bin/zef"))) + (setenv "HOME" (getcwd)) + (mkdir-p perl6) + (invoke zef "install" "--verbose" "." + ;; Don't install any of the following: + "--/depends" "--/build-depends" "--/test-depends" + (string-append "--install-to=" perl6)) + (delete-file (string-append perl6 "/repo.lock"))) + #t) + (begin + (let ((inst (string-append (assoc-ref inputs "rakudo") + "/share/perl6/tools/install-dist.p6"))) + (setenv "RAKUDO_RERESOLVE_DEPENDENCIES" "0") + (setenv "RAKUDO_MODULE_DEBUG" "1") ; be verbose while building + (invoke inst (string-append "--to=" perl6) "--for=site")))))) + +(define* (install-libs #:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (lock "lib/.precomp/.lock")) + (when (file-exists? lock) + (delete-file "lib/.precomp/.lock")) + (copy-recursively "lib" (string-append out "/share/perl6/lib")) + #t)) + +(define* (install-bins #:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (when (file-exists? "bin") + (for-each (lambda (file) + (install-file file (string-append out "/bin")) + (chmod (string-append out "/" file) #o555)) + (find-files "bin" ".*"))) + (when (file-exists? "sbin") + (for-each (lambda (file) + (install-file file (string-append out "/sbin")) + (chmod (string-append out "/" file) #o555)) + (find-files "sbin" ".*"))) + #t)) + +(define* (install-resources #:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (when (file-exists? "resources") + (copy-recursively "resources" + (string-append out "/share/perl6/resources"))) + #t)) + +(define* (wrap #:key inputs outputs #:allow-other-keys) + (define (list-of-files dir) + (map (cut string-append dir "/" <>) + (or (scandir dir (lambda (f) + (let ((s (stat (string-append dir "/" f)))) + (eq? 'regular (stat:type s))))) + '()))) + + (define bindirs + (append-map (match-lambda + ((_ . dir) + (list (string-append dir "/bin") + (string-append dir "/sbin")))) + outputs)) + + (let* ((out (assoc-ref outputs "out")) + (var `("PERL6LIB" "," prefix + ,(cons (string-append out "/share/perl6/lib," + out "/share/perl6/site/lib," + out "/share/perl6/vendor/lib") + (search-path-as-string->list + (or (getenv "PERL6LIB") "") #\,))))) + (for-each (lambda (dir) + (let ((files (list-of-files dir))) + (for-each (cut wrap-program <> var) + files))) + bindirs) + #t)) + +(define %standard-phases + ;; No need for 'bootstrap, 'configure or 'build. + (modify-phases gnu:%standard-phases + (delete 'bootstrap) + (delete 'configure) + (delete 'build) + (replace 'check check) + (replace 'install install) + (add-before 'install 'install-lib-dir install-libs) + (add-after 'install-lib-dir 'install-resources install-resources) + (add-after 'install-resources 'install-binaries install-bins) + ;; needs to be after 'install-binaries and all 'install phases + (add-after 'install 'wrap wrap))) + +(define* (rakudo-build #:key inputs (phases %standard-phases) + #:allow-other-keys #:rest args) + "Build the given Perl6 package, applying all of PHASES in order." + (apply gnu:gnu-build + #:inputs inputs #:phases phases + args)) + +;;; rakudo-build-system.scm ends here From d617087718fef101586840c38160801087215c47 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 26 Feb 2019 14:51:24 +0200 Subject: [PATCH 665/694] gnu: Add perl6-tap-harness. * gnu/packages/perl6.scm (perl6-tap-harness): New variable. --- gnu/packages/perl6.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/perl6.scm b/gnu/packages/perl6.scm index b6781936f1..8a1810612f 100644 --- a/gnu/packages/perl6.scm +++ b/gnu/packages/perl6.scm @@ -19,8 +19,10 @@ (define-module (gnu packages perl6) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix packages) #:use-module (guix build-system perl) + #:use-module (guix build-system rakudo) #:use-module (gnu packages bdw-gc) #:use-module (gnu packages libevent) #:use-module (gnu packages libffi) @@ -225,3 +227,33 @@ (define-public rakudo (description "Rakudo Perl is a compiler that implements the Perl 6 specification and runs on top of several virtual machines.") (license license:artistic2.0))) + +(define-public perl6-tap-harness + (package + (name "perl6-tap-harness") + (version "0.0.7") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/perl6/tap-harness6.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1lig8i0my3fgqvlay9532xslbf3iis2d7wz89gniwvwqffi2kh6r")))) + (build-system rakudo-build-system) + (arguments + '(#:with-zef? #f + #:with-prove6? #f + #:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "perl6" "-Ilib" "bin/prove6" "-l" "t")))))) + (home-page "https://github.com/perl6/tap-harness6/") + (synopsis "TAP harness for perl6") + (description "This module provides the @command{prove6} command which runs a +TAP based test suite and prints a report. The @command{prove6} command is a +minimal wrapper around an instance of this module.") + (license license:artistic2.0))) From 74809e9e6fc0cb3c9df30556f4f68209f8598045 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 26 Feb 2019 14:51:53 +0200 Subject: [PATCH 666/694] gnu: Add perl6-zef. * gnu/packages/perl6.scm (perl6-zef): New variable. --- gnu/packages/perl6.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/perl6.scm b/gnu/packages/perl6.scm index 8a1810612f..aea2809066 100644 --- a/gnu/packages/perl6.scm +++ b/gnu/packages/perl6.scm @@ -257,3 +257,34 @@ (define-public perl6-tap-harness TAP based test suite and prints a report. The @command{prove6} command is a minimal wrapper around an instance of this module.") (license license:artistic2.0))) + +(define-public perl6-zef + (package + (name "perl6-zef") + (version "0.6.7") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ugexe/zef.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "07n7g1xw2c4g860rs890gx85vyhdq0ysgwbrnzw6q905jph2bkv7")))) + (build-system rakudo-build-system) + (arguments + '(#:with-zef? #f + #:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (setenv "HOME" "/tmp") + (invoke "perl6" "-I." "bin/zef" "--debug" + "--tap-harness" "test" ".")))))) + (home-page "https://github.com/ugexe/zef") + (synopsis "Perl6 Module Management") + (description "Zef is a Perl 6 package (module) manager. It can be used to +download and install Perl 6 modules in your home directory or as a system-wide +module.") + (license license:artistic2.0))) From 60945c67bb04b910c25452a548952f07da27383b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 28 Feb 2019 09:11:53 +0200 Subject: [PATCH 667/694] gnu: Add perl6-uri. * gnu/packages/perl6.scm (perl6-uri): New variable. --- gnu/packages/perl6.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/perl6.scm b/gnu/packages/perl6.scm index aea2809066..c65ba8361b 100644 --- a/gnu/packages/perl6.scm +++ b/gnu/packages/perl6.scm @@ -258,6 +258,30 @@ (define-public perl6-tap-harness minimal wrapper around an instance of this module.") (license license:artistic2.0))) +(define-public perl6-uri + (package + (name "perl6-uri") + (version "0.1.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/perl6-community-modules/uri.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0h318g75jqn2ckw051g35iqyfxz1mps0jyg5z6pd857y3kacbkpl")))) + (build-system rakudo-build-system) + (arguments '(#:with-zef? #f)) + (home-page "https://github.com/perl6-community-modules/uri") + (synopsis "URI implementation using Perl 6") + (description "A URI implementation using Perl 6 grammars to implement RFC +3986 BNF. Currently only implements parsing. Includes @code{URI::Escape} to +(un?)escape characters that aren't otherwise allowed in a URI with % and a hex +character numbering.") + (license license:artistic2.0))) + (define-public perl6-zef (package (name "perl6-zef") From 61b436404553515b06e319ab8d2f91d6b40cd137 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 28 Feb 2019 10:01:38 +0200 Subject: [PATCH 668/694] gnu: Add perl6-json-fast. * gnu/packages/perl6.scm (perl6-json-fast): New variable. --- gnu/packages/perl6.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/perl6.scm b/gnu/packages/perl6.scm index c65ba8361b..fc09651541 100644 --- a/gnu/packages/perl6.scm +++ b/gnu/packages/perl6.scm @@ -228,6 +228,30 @@ (define-public rakudo specification and runs on top of several virtual machines.") (license license:artistic2.0))) +(define-public perl6-json-fast + (package + (name "perl6-json-fast") + (version "0.8") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/timo/json_fast.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1fif081gdxdnja14vkj523p9dyzdcdj81lmjv9fvfazvpagb6dg2")))) + (build-system rakudo-build-system) + (arguments '(#:with-zef? #f)) + (home-page "https://github.com/timo/json_fast") + (synopsis "Perl6 json parser") + (description "A naive imperative json parser in pure perl6 (but with direct +access to @code{nqp::} ops), to evaluate performance against @code{JSON::Tiny}. +It is a drop-in replacement for @code{JSON::Tiny}'s from-json and to-json subs, +but it offers a few extra features.") + (license license:artistic2.0))) + (define-public perl6-tap-harness (package (name "perl6-tap-harness") From bc7c6efeaa8f4146d28bc8061665ebe68f75aa9f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 28 Feb 2019 10:14:53 +0200 Subject: [PATCH 669/694] gnu: Add perl6-json-name. * gnu/packages/perl6.scm (perl6-json-name): New variable. --- gnu/packages/perl6.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/perl6.scm b/gnu/packages/perl6.scm index fc09651541..c2c1c50f70 100644 --- a/gnu/packages/perl6.scm +++ b/gnu/packages/perl6.scm @@ -252,6 +252,32 @@ (define-public perl6-json-fast but it offers a few extra features.") (license license:artistic2.0))) +(define-public perl6-json-name + (package + (name "perl6-json-name") + (version "0.0.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jonathanstowe/JSON-Name.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "130qwdpbj5qdlsdz05y0rksd79lzbq79scy47n6lnf21b0hz1qjc")))) + (build-system rakudo-build-system) + (arguments '(#:with-zef? #f)) + (home-page "https://github.com/jonathanstowe/JSON-Name") + (synopsis "Provides a trait to store an alternative JSON Name") + (description "This is released as a dependency of @code{JSON::Marshal} and +@code{JSON::Unmarshal} in order to save duplication, it is intended to store a +separate JSON name for an attribute where the name of the JSON attribute might be +changed, either for aesthetic reasons or the name is not a valid Perl identifier. +It will of course also be needed in classes thar are going to use +@code{JSON::Marshal} or @code{JSON::Unmarshal} for serialisation/de-serialisation.") + (license license:artistic2.0))) + (define-public perl6-tap-harness (package (name "perl6-tap-harness") From 56eea221374be83a0718d1c66873f85b2b30c448 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 28 Feb 2019 11:48:17 +0200 Subject: [PATCH 670/694] gnu: Add perl6-json-unmarshal. * gnu/packages/perl6.scm (perl6-json-unmarshal): New variable. --- gnu/packages/perl6.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/perl6.scm b/gnu/packages/perl6.scm index c2c1c50f70..d2f682096c 100644 --- a/gnu/packages/perl6.scm +++ b/gnu/packages/perl6.scm @@ -278,6 +278,33 @@ (define-public perl6-json-name @code{JSON::Marshal} or @code{JSON::Unmarshal} for serialisation/de-serialisation.") (license license:artistic2.0))) +(define-public perl6-json-unmarshal + ;; Last commit was May 2017 + (let ((commit "e1b6288c5f3165058f36c0f4e171cdf2dfd640da") + (revision "1")) + (package + (name "perl6-json-unmarshal") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tadzik/JSON-Unmarshal.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "14azsmzmwdn8k0gqcpvballharcvzylmlyrx2wmv4kpqfnz29fjc")))) + (build-system rakudo-build-system) + (propagated-inputs + `(("perl6-json-fast" ,perl6-json-fast) + ("perl6-json-name" ,perl6-json-name))) + (home-page "https://github.com/tadzik/JSON-Unmarshal") + (synopsis "Make JSON from an Object") + (description "This library provides a single exported subroutine to +create an object from a JSON representation of an object.") + (license license:expat)))) + (define-public perl6-tap-harness (package (name "perl6-tap-harness") From e1b3cf6891a5c24206ed01daf56fa28b71cb13e2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 28 Feb 2019 11:48:41 +0200 Subject: [PATCH 671/694] gnu: Add perl6-json-marshal. * gnu/packages/perl6.scm (perl6-json-marshal): New variable. --- gnu/packages/perl6.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/perl6.scm b/gnu/packages/perl6.scm index d2f682096c..83f4a35cd6 100644 --- a/gnu/packages/perl6.scm +++ b/gnu/packages/perl6.scm @@ -252,6 +252,33 @@ (define-public perl6-json-fast but it offers a few extra features.") (license license:artistic2.0))) +(define-public perl6-json-marshal + (package + (name "perl6-json-marshal") + (version "0.0.16") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jonathanstowe/JSON-Marshal.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0qy7j83h6gjzyyv74ncd92cd9h45rv8diaz3vldiv3b6fqwz4c6i")))) + (build-system rakudo-build-system) + (propagated-inputs + `(("perl6-json-fast" ,perl6-json-fast) + ("perl6-json-name" ,perl6-json-name))) + (native-inputs + `(("perl6-json-fast" ,perl6-json-fast))) + (home-page "https://github.com/jonathanstowe/JSON-Marshal") + (synopsis "Simple serialisation of objects to JSON") + (description "This library provides a single exported subroutine to create +a JSON representation of an object. It should round trip back into an object +of the same class using @code{JSON::Unmarshal}.") + (license license:artistic2.0))) + (define-public perl6-json-name (package (name "perl6-json-name") From ea856c08cdede46127003170052d833bc0f2f9b4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 9 Mar 2019 22:07:00 +0200 Subject: [PATCH 672/694] gnu: Add perl6-json-class. * gnu/packages/perl6.scm (perl6-json-class): New variable. --- gnu/packages/perl6.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/perl6.scm b/gnu/packages/perl6.scm index 83f4a35cd6..6ab6d71545 100644 --- a/gnu/packages/perl6.scm +++ b/gnu/packages/perl6.scm @@ -228,6 +228,37 @@ (define-public rakudo specification and runs on top of several virtual machines.") (license license:artistic2.0))) +(define-public perl6-json-class + (package + (name "perl6-json-class") + (version "0.0.12") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jonathanstowe/JSON-Class.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1zyzajc57j3m8q0nr72h9pw4w2nx92rafywlvysgphc5q9sb8np2")))) + (build-system rakudo-build-system) + (propagated-inputs + `(("perl6-json-marshal" ,perl6-json-marshal) + ("perl6-json-unmarshal" ,perl6-json-unmarshal))) + (native-inputs + `(("perl6-json-fast" ,perl6-json-fast))) + (home-page "https://github.com/jonathanstowe/JSON-Class") + (synopsis "Provide simple serialisation/deserialisation of objects to/from JSON") + (description "This is a simple role that provides methods to instantiate a +class from a JSON string that (hopefully,) represents it, and to serialise an +object of the class to a JSON string. The JSON created from an instance should +round trip to a new instance with the same values for the @quot{public +attributes}. @quot{Private} attributes (that is ones without accessors,) will +be ignored for both serialisation and de-serialisation. The exact behaviour +depends on that of @code{JSON::Marshal} and @code{JSON::Unmarshal} respectively.") + (license license:artistic2.0))) + (define-public perl6-json-fast (package (name "perl6-json-fast") From 505b979272e9a23f94a78b9bc9a7934eab941483 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 9 Mar 2019 22:14:39 +0200 Subject: [PATCH 673/694] gnu: Add perl6-meta6. * gnu/packages/perl6.scm (perl6-meta6): New variable. --- gnu/packages/perl6.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/perl6.scm b/gnu/packages/perl6.scm index 6ab6d71545..d41167d2bb 100644 --- a/gnu/packages/perl6.scm +++ b/gnu/packages/perl6.scm @@ -363,6 +363,40 @@ (define-public perl6-json-unmarshal create an object from a JSON representation of an object.") (license license:expat)))) +(define-public perl6-meta6 + (package + (name "perl6-meta6") + (version "0.0.23") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jonathanstowe/META6.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1xnlaamfbdlfb2zidim3bbc4mawsrg6qxhxi6gbld46z1cyry1cw")))) + (build-system rakudo-build-system) + (propagated-inputs + `(("perl6-json-class" ,perl6-json-class))) + (native-inputs + `(("perl6-json-fast" ,perl6-json-fast))) + (home-page "https://github.com/jonathanstowe/META6") + (synopsis "Do things with Perl 6 [META files]") + (description "This provides a representation of the Perl 6 META files +specification - the META file data can be read, created, parsed and written in a +manner that is conformant with the specification. + +Where they are known about it also makes allowance for @quot{customary} usage in +existing software (such as installers and so forth.) + +The intent of this is allow the generation and testing of META files for module +authors, so it can provide meta-information whether the attributes are mandatory +as per the spec and where known the places that @quot{customary} attributes are +used.") + (license license:artistic2.0))) + (define-public perl6-tap-harness (package (name "perl6-tap-harness") From 489f4933840297b2a0a13fab537632b59ce8bfc4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 10 Mar 2019 09:10:48 +0200 Subject: [PATCH 674/694] gnu: Add perl6-license-spdx. * gnu/packages/perl6.scm (perl6-license-spdx): New variable. --- gnu/packages/perl6.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/perl6.scm b/gnu/packages/perl6.scm index d41167d2bb..403727c3f6 100644 --- a/gnu/packages/perl6.scm +++ b/gnu/packages/perl6.scm @@ -363,6 +363,31 @@ (define-public perl6-json-unmarshal create an object from a JSON representation of an object.") (license license:expat)))) +(define-public perl6-license-spdx + (package + (name "perl6-license-spdx") + (version "3.4.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jonathanstowe/License-SPDX") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0dl263c3fbxk001gm5fisrzqz1dx182ipaa0x2qva2gxvl075xm8")))) + (build-system rakudo-build-system) + (propagated-inputs + `(("perl6-json-class" ,perl6-json-class))) + (home-page "https://github.com/jonathanstowe/License-SPDX") + (synopsis "Abstraction over the SPDX License List") + (description "This provides an abstraction over the SPDX License List as +provided in JSON format. Its primary raison d'être is to help the licence +checking of @code{Test::META} and to allow for the warning about deprecated +licences therein.") + (license license:artistic2.0))) + (define-public perl6-meta6 (package (name "perl6-meta6") From de032eed5c124021e510ba032a44a3bdd1a51327 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 10 Mar 2019 09:11:23 +0200 Subject: [PATCH 675/694] gnu: Add perl6-test-meta. * gnu/packages/perl6.scm (perl6-test-meta): New variable. --- gnu/packages/perl6.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/perl6.scm b/gnu/packages/perl6.scm index 403727c3f6..c1c1247540 100644 --- a/gnu/packages/perl6.scm +++ b/gnu/packages/perl6.scm @@ -452,6 +452,30 @@ (define-public perl6-tap-harness minimal wrapper around an instance of this module.") (license license:artistic2.0))) +(define-public perl6-test-meta + (package + (name "perl6-test-meta") + (version "0.0.14") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jonathanstowe/Test-META") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1mzrglb7lbiy5h9dlc7dyhvv9gppxmdmpmrv6nzbd695jzr38bri")))) + (build-system rakudo-build-system) + (propagated-inputs + `(("perl6-meta6" ,perl6-meta6) + ("perl6-uri" ,perl6-uri))) + (home-page "https://github.com/jonathanstowe/Test-META") + (synopsis "Test a distributions META file") + (description "This provides a simple mechanism for module authors to have +some confidence that they have a working distribution META description file.") + (license license:artistic2.0))) + (define-public perl6-uri (package (name "perl6-uri") From 1af3f970e9cb4ae8094177c4c2da4496b82f03e1 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 10 Mar 2019 16:55:03 +0200 Subject: [PATCH 676/694] gnu: Add perl6-xml-writer. * gnu/packages/perl6.scm (perl6-xml-writer): New variable. --- gnu/packages/perl6.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/perl6.scm b/gnu/packages/perl6.scm index c1c1247540..840f5a9c8b 100644 --- a/gnu/packages/perl6.scm +++ b/gnu/packages/perl6.scm @@ -500,6 +500,30 @@ (define-public perl6-uri character numbering.") (license license:artistic2.0))) +(define-public perl6-xml-writer + ;; Last commit was May 2017 + (let ((commit "4d30a9d8e06033ca97387971b653817becd5a759") + (revision "1")) + (package + (name "perl6-xml-writer") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/masak/xml-writer") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1kwrf7akp70kyzw1b90khp71a6hpilihwndy2jsjpffcd4hd4m4z")))) + (build-system rakudo-build-system) + (arguments '(#:with-zef? #f)) + (home-page "https://github.com/masak/xml-writer") + (synopsis "Perl 6 module to generate XML") + (description "@code{XML::Writer} is a module for creating XML in Perl 6.") + (license license:artistic2.0)))) + (define-public perl6-zef (package (name "perl6-zef") From 2bd04f9fc21a216f73c13e71e2f3defd1a6fdde1 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 10 Mar 2019 21:13:49 +0200 Subject: [PATCH 677/694] gnu: Add perl6-svg. * gnu/packages/perl6.scm (perl6-svg): New variable. --- gnu/packages/perl6.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/perl6.scm b/gnu/packages/perl6.scm index 840f5a9c8b..0db41da0c0 100644 --- a/gnu/packages/perl6.scm +++ b/gnu/packages/perl6.scm @@ -422,6 +422,34 @@ (define-public perl6-meta6 used.") (license license:artistic2.0))) +(define-public perl6-svg + ;; Latest commit, basically unchanged since August 2015 + (let ((commit "07190c0602aa276e5319f06aa0012452dbff3582") + (revision "1")) + (package + (name "perl6-svg") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/moritz/svg") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0mkjdhg7ajksdn61n8fqhyzfd7ly9myazsvpsm02a5c2q73hdygg")))) + (build-system rakudo-build-system) + (propagated-inputs + `(("perl6-xml-writer" ,perl6-xml-writer))) + (home-page "https://github.com/moritz/svg") + (synopsis "Perl 6 module to generate SVG") + (description "This is a Perl 6 module that makes it easy to write +@dfn{Scalable Vector Graphic files} (SVG). Right now it is a shallow wrapper +around @code{XML::Writer}, adding only the xmlns attributes that identifies an +XML file as SVG.") + (license license:artistic2.0)))) + (define-public perl6-tap-harness (package (name "perl6-tap-harness") From d02a30bd096f85ba8fad6dfb23cdb1c0f4c5dd43 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 10 Mar 2019 21:19:41 +0200 Subject: [PATCH 678/694] gnu: Add perl6-svg-plot. * gnu/packages/perl6.scm (perl6-svg-plot): New variable. --- gnu/packages/perl6.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/perl6.scm b/gnu/packages/perl6.scm index 0db41da0c0..393b533636 100644 --- a/gnu/packages/perl6.scm +++ b/gnu/packages/perl6.scm @@ -450,6 +450,33 @@ (define-public perl6-svg XML file as SVG.") (license license:artistic2.0)))) +(define-public perl6-svg-plot + ;; Latest commit + (let ((commit "062570a78fd38c3c6baba29dfe2fbb8ca014f4de") + (revision "1")) + (package + (name "perl6-svg-plot") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/moritz/svg-plot") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "095ga5hbg92jnmczxvhk1hjz14yr334zyf8cph4w5w5frcza44my")))) + (build-system rakudo-build-system) + (propagated-inputs + `(("perl6-svg" ,perl6-svg))) + (home-page "https://github.com/moritz/svg-plot") + (synopsis "Perl 6 charting and plotting library that produces SVG output") + (description "@code{SVG::Plot} is a simple 2D chart plotter for Perl 6. +It currently supports bars, stacked bars, lines and points (both equally spaced +with optional labels, or xy plots).") + (license license:artistic2.0)))) + (define-public perl6-tap-harness (package (name "perl6-tap-harness") From 4af100644097a4b0f9313247cd3b95429dcf5178 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 10 Mar 2019 21:25:00 +0200 Subject: [PATCH 679/694] gnu: Add perl6-terminal-ansicolor. * gnu/packages/perl6.scm (perl6-terminal-ansicolor): New variable. --- gnu/packages/perl6.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/perl6.scm b/gnu/packages/perl6.scm index 393b533636..fb594c790f 100644 --- a/gnu/packages/perl6.scm +++ b/gnu/packages/perl6.scm @@ -507,6 +507,28 @@ (define-public perl6-tap-harness minimal wrapper around an instance of this module.") (license license:artistic2.0))) +(define-public perl6-terminal-ansicolor + (package + (name "perl6-terminal-ansicolor") + (version "0.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tadzik/Terminal-ANSIColor.git") + ;; The commit where 0.5 was "tagged" + (commit "edded4a7116ce11cbc9fb5a83669c7ba119d0212"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1apm999azkyg5s35gid12wq019aqnvzrkz7qjmipd74mdxgr00x7")))) + (build-system rakudo-build-system) + (arguments '(#:with-zef? #f)) + (home-page "https://github.com/tadzik/Terminal-ANSIColor") + (synopsis "Colorize terminal output") + (description "This is a @code{Terminal::ANSIColor} module for Perl 6.") + (license license:expat))) + (define-public perl6-test-meta (package (name "perl6-test-meta") From 56930271b9935da40e84b928fa7db9d590c90f6e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 10 Mar 2019 21:32:56 +0200 Subject: [PATCH 680/694] gnu: Add perl6-oo-monitors. * gnu/packages/perl6.scm (perl6-oo-monitors): New variable. --- gnu/packages/perl6.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/perl6.scm b/gnu/packages/perl6.scm index fb594c790f..8c6c27a42d 100644 --- a/gnu/packages/perl6.scm +++ b/gnu/packages/perl6.scm @@ -422,6 +422,32 @@ (define-public perl6-meta6 used.") (license license:artistic2.0))) +(define-public perl6-oo-monitors + (package + (name "perl6-oo-monitors") + (version "1.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jnthn/oo-monitors") + ;; The commit where 1.1 was "tagged" + (commit "494db3a3852854f30a80c9bd1489a7d5e429e7c5"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1sbw2x54wwjjanghjnc7ipmplaw1srvbrphsdv4ym6cipnbmbj9x")))) + (build-system rakudo-build-system) + (arguments '(#:with-zef? #f)) + (home-page "https://github.com/jnthn/oo-monitors") + (synopsis "Monitors with condition variables for Perl 6") + (description "A monitor provides per-instance mutual exclusion for objects. +This means that for a given object instance, only one thread can ever be inside +its methods at a time. This is achieved by a lock being associated with each +object. The lock is acquired automatically at the entry to each method in the +monitor. Condition variables are also supported.") + (license license:artistic2.0))) + (define-public perl6-svg ;; Latest commit, basically unchanged since August 2015 (let ((commit "07190c0602aa276e5319f06aa0012452dbff3582") From 979df8c45256f88f8d1e7cf3c42ef407bf8ea2c3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 10 Mar 2019 21:40:56 +0200 Subject: [PATCH 681/694] gnu: Add perl6-test-mock. * gnu/packages/perl6.scm (perl6-test-mock): New variable. --- gnu/packages/perl6.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/perl6.scm b/gnu/packages/perl6.scm index 8c6c27a42d..cf8a400e8e 100644 --- a/gnu/packages/perl6.scm +++ b/gnu/packages/perl6.scm @@ -579,6 +579,33 @@ (define-public perl6-test-meta some confidence that they have a working distribution META description file.") (license license:artistic2.0))) +(define-public perl6-test-mock + (package + (name "perl6-test-mock") + (version "1.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jnthn/test-mock") + ;; The commit where 1.5 was "tagged" + (commit "6eddb42f73f40b9ac29c14badb41ce4a04d876f2"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "07yr3qimc8fl29p23562ayj2j9h53madcnf9sgqvgf2kcprh0zd2")))) + (build-system rakudo-build-system) + (propagated-inputs + `(("perl6-oo-monitors" ,perl6-oo-monitors))) + (home-page "https://github.com/jnthn/test-mock") + (synopsis "Module for simply generating and checking mock objects") + (description "@code{Test::Mock} is a module that works alongside the +standard Test module to help you write tests when you want to verify what +methods are called on an object, while still having calls to undefined methods +die. You get started just as normal with the test file, but also add a use +statement for @code{Test::Mock}.") + (license license:artistic2.0))) + (define-public perl6-uri (package (name "perl6-uri") From 63b9f87ae452f1882d90ca3d6c17ced377bd68a1 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 10 Mar 2019 21:50:05 +0200 Subject: [PATCH 682/694] gnu: Add perl6-grammar-profiler-simple. * gnu/packages/perl6.scm (perl6-grammar-profiler-simple): New variable. --- gnu/packages/perl6.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/perl6.scm b/gnu/packages/perl6.scm index cf8a400e8e..a0d9343ec6 100644 --- a/gnu/packages/perl6.scm +++ b/gnu/packages/perl6.scm @@ -228,6 +228,33 @@ (define-public rakudo specification and runs on top of several virtual machines.") (license license:artistic2.0))) +(define-public perl6-grammar-profiler-simple + ;; Last commit was June 2017 + (let ((commit "c0aca5fab323b2974821dabd6b89330c609e0b7d") + (revision "1")) + (package + (name "perl6-grammar-profiler-simple") + (version (git-version "0.02" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/perlpilot/Grammar-Profiler-Simple.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1qcsa4lmcilp3vp0jng0hrgzyzxin9ayg2wjvkcd0k6h7djx9dff")))) + (build-system rakudo-build-system) + (arguments '(#:with-zef? #f)) + (home-page "https://github.com/perlpilot/Grammar-Profiler-Simple") + (synopsis "Simple rule profiling for Perl 6 grammars") + (description "This module provides a simple profiler for Perl 6 grammars. +To enable profiling simply add use @code{Grammar::Profiler::Simple;} to your +code. Any grammar in the lexical scope of the use statement will automatically +have profiling information collected when the grammar is used.") + (license license:artistic2.0)))) + (define-public perl6-json-class (package (name "perl6-json-class") From c2bc5b2bc05ec2f6c7d5fff3fe2fb12422755f20 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 10 Mar 2019 21:57:16 +0200 Subject: [PATCH 683/694] gnu: Add perl6-grammar-debugger. * gnu/packages/perl6.scm (perl6-grammar-debugger): New variable. --- gnu/packages/perl6.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/perl6.scm b/gnu/packages/perl6.scm index a0d9343ec6..883eb44203 100644 --- a/gnu/packages/perl6.scm +++ b/gnu/packages/perl6.scm @@ -228,6 +228,35 @@ (define-public rakudo specification and runs on top of several virtual machines.") (license license:artistic2.0))) +(define-public perl6-grammar-debugger + ;; Last commit was September 2017 + (let ((commit "0375008027c8caa216bd869476ce59ae09b2a702") + (revision "1")) + (package + (name "perl6-grammar-debugger") + (version (git-version "1.0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jnthn/grammar-debugger") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0y826z3m276n7ia810hgcb3div67nxmx125m2fzlc16994zd5vm5")))) + (build-system rakudo-build-system) + (propagated-inputs + `(("perl6-terminal-ansicolor" ,perl6-terminal-ansicolor))) + (home-page "https://github.com/jnthn/grammar-debugger") + (synopsis "Simple tracing and debugging support for Perl 6 grammars") + (description "This module provides a simple debugger for grammars. Just +@code{use} it: use @code{Grammar::Debugger;} and any grammar in the lexical +scope of the use statement will automatically have debugging enabled. The +debugger will break execution when you first enter the grammar, and provide a +prompt.") + (license license:artistic2.0)))) + (define-public perl6-grammar-profiler-simple ;; Last commit was June 2017 (let ((commit "c0aca5fab323b2974821dabd6b89330c609e0b7d") From cdecb8d72dfd55d0179ed80706d6f2bb40e4d4d1 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 10 Mar 2019 22:17:47 +0200 Subject: [PATCH 684/694] gnu: Add perl6-mime-base64. * gnu/packages/perl6.scm (perl6-mime-base64): New variable. --- gnu/packages/perl6.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/perl6.scm b/gnu/packages/perl6.scm index 883eb44203..f67533854f 100644 --- a/gnu/packages/perl6.scm +++ b/gnu/packages/perl6.scm @@ -478,6 +478,28 @@ (define-public perl6-meta6 used.") (license license:artistic2.0))) +(define-public perl6-mime-base64 + (package + (name "perl6-mime-base64") + (version "1.2.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/perl6/Perl6-MIME-Base64") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0l67m8mvz3gxml425sd1ggfnhzh4lf754k7w8fngfr453s6lsza1")))) + (build-system rakudo-build-system) + (arguments '(#:with-zef? #f)) + (home-page "https://github.com/perl6/Perl6-MIME-Base64") + (synopsis "Encoding and decoding Base64 ASCII strings") + (description "This Perl 6 module implements encoding and decoding to and +from base64.") + (license license:artistic2.0))) + (define-public perl6-oo-monitors (package (name "perl6-oo-monitors") From f0f3f70b286d634ed53b2f21f5e5633488efd4e0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 10 Mar 2019 22:23:50 +0200 Subject: [PATCH 685/694] gnu: Add perl6-json. * gnu/packages/perl6.scm (perl6-json): New variable. --- gnu/packages/perl6.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/perl6.scm b/gnu/packages/perl6.scm index f67533854f..f227786e8d 100644 --- a/gnu/packages/perl6.scm +++ b/gnu/packages/perl6.scm @@ -284,6 +284,29 @@ (define-public perl6-grammar-profiler-simple have profiling information collected when the grammar is used.") (license license:artistic2.0)))) +(define-public perl6-json + (package + (name "perl6-json") + (version "1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/moritz/json") + ;; The commit where 1.0 was "tagged" + (commit "a5ef8c179350dae44ce7fb1abb684fc62c1c2b99"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1kzryxkqyr129rcckd4jh0dfxdgzv71qx8dpkpm1divbfjyknlay")))) + (build-system rakudo-build-system) + (arguments '(#:with-zef? #f)) + (home-page "https://github.com/moritz/json") + (synopsis "A minimal JSON (de)serializer") + (description "This module is a simple Perl 6 module for serializing and +deserializing JSON.") + (license license:artistic2.0))) + (define-public perl6-json-class (package (name "perl6-json-class") From 3a2694df80bc320d6c57c015ef5ee8b9b053667e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 23 Mar 2019 21:43:59 +0100 Subject: [PATCH 686/694] gnu: ffmpeg: Update to 4.1.2. * gnu/packages/video.scm (ffmpeg): Update to 4.1.2. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index fe60d11d26..50dd7e4a83 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -755,14 +755,14 @@ (define-public libva (define-public ffmpeg (package (name "ffmpeg") - (version "4.1.1") + (version "4.1.2") (source (origin (method url-fetch) (uri (string-append "https://ffmpeg.org/releases/ffmpeg-" version ".tar.xz")) (sha256 (base32 - "11id9pm4azfrhpa4vr2yaw31dzgd55kl1zsxwn24sczx9n14jdrp")))) + "0yrl6nij4b1pk1c4nbi80857dsd760gziiss2ls19awq8zj0lpxr")))) (build-system gnu-build-system) (inputs `(("fontconfig" ,fontconfig) From 5e7e193b71a39c7b31d7036aaef25644a4bc7206 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 23 Mar 2019 22:13:01 +0100 Subject: [PATCH 687/694] gnu: tdb: Update to 1.4.0. * gnu/packages/databases.scm (tdb): Update to 1.4.0. --- 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 301c4986c5..afc6d7a307 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1030,14 +1030,14 @@ (define-public sqlcrush (define-public tdb (package (name "tdb") - (version "1.3.18") + (version "1.4.0") (source (origin (method url-fetch) (uri (string-append "https://www.samba.org/ftp/tdb/tdb-" version ".tar.gz")) (sha256 (base32 - "1drnsdh1w0px35r0y7l7g59yvyr67mvcsdrli4wab0mwi07b8mn1")))) + "0d9d2f1c83gmmq30bkfs50yb8399mr9xjjzscma4kyq0ajf75861")))) (build-system gnu-build-system) (arguments '(#:phases From 42bdd5ef7c6be4af9cbe439bb6871420b516edab Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 23 Mar 2019 22:06:19 +0100 Subject: [PATCH 688/694] gnu: talloc: Update to 2.2.0. * gnu/packages/samba.scm (talloc): Update to 2.2.0. --- gnu/packages/samba.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index c8b1dbe266..66066c7d48 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -242,14 +242,14 @@ (define-public samba (define-public talloc (package (name "talloc") - (version "2.1.16") + (version "2.2.0") (source (origin (method url-fetch) (uri (string-append "https://www.samba.org/ftp/talloc/talloc-" version ".tar.gz")) (sha256 (base32 - "1aajda08yf7njgvg6r21ccxlvkarb9bwvf4jqh8yn3871a1zcnqr")))) + "1g1fqa37xkjp9lp6lrwxrbfgashcink769ll505zvcwnxx2nlvsw")))) (build-system gnu-build-system) (arguments '(#:phases From 7fd084aef5b89dca1fb08c07080444cf2121180e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 23 Mar 2019 22:06:36 +0100 Subject: [PATCH 689/694] gnu: tevent: Update to 0.10.0. * gnu/packages/samba.scm (tevent): Update to 0.10.0. --- gnu/packages/samba.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index 66066c7d48..0c9d8178c0 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -309,14 +309,14 @@ (define-public talloc/static (define-public tevent (package (name "tevent") - (version "0.9.39") + (version "0.10.0") (source (origin (method url-fetch) (uri (string-append "https://www.samba.org/ftp/tevent/tevent-" version ".tar.gz")) (sha256 (base32 - "1rnln76ngd2b8lgqvfa9iscy6jizwycj85nfp9zd46b1c760z3gn")))) + "1rm4d9245ya15wyrh9vqn1dnz14l2ic88mr46ykyc6kdrl99dwrk")))) (build-system gnu-build-system) (arguments '(#:phases From f92854fea150f0d47c4984f87bf21bd5f8051820 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 23 Mar 2019 22:06:55 +0100 Subject: [PATCH 690/694] gnu: ldb: Update to 1.6.3. * gnu/packages/samba.scm (ldb): Update to 1.6.3. --- gnu/packages/samba.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index 0c9d8178c0..f4bd0e3f11 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -345,14 +345,14 @@ (define-public tevent (define-public ldb (package (name "ldb") - (version "1.6.2") + (version "1.6.3") (source (origin (method url-fetch) (uri (string-append "https://www.samba.org/ftp/ldb/ldb-" version ".tar.gz")) (sha256 (base32 - "1kiwlra6nfkb5n870k2db41jrm59bq9lxqmil4v7ignblgsdfdwb")) + "01livdy3g073bm6xnc8zqnqrxg53sw8q66d1903z62hd6g87whsa")) (modules '((guix build utils))) (snippet '(begin From 0b4504f605cd2741e11ed320081be27ab3d41654 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 21 Mar 2019 23:36:12 +0100 Subject: [PATCH 691/694] gnu: gnome-shell: Use the test-only Xorg variant for tests. * gnu/packages/gnome.scm (gnome-shell)[native-inputs]: Change XORG-SERVER to XORG-SERVER-FOR-TESTS. --- gnu/packages/gnome.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 38edce3a2d..22f5f213c0 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5844,7 +5844,7 @@ (define-public gnome-shell ("sassc" ,sassc) ("xsltproc" ,libxslt) ;; For tests - ("xorg-server" ,xorg-server))) + ("xorg-server" ,xorg-server-for-tests))) (inputs `(("accountsservice" ,accountsservice) ("caribou" ,caribou) From 2261ef669b652ea340b444b4a3b0c5a8c11995cb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 23 Mar 2019 21:41:45 +0100 Subject: [PATCH 692/694] gnu: CUPS: Update to 2.2.11. * gnu/packages/cups.scm (cups-minimal): Update to 2.2.11. --- 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 fdd9e80bd4..d8458f98d5 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -186,7 +186,7 @@ (define-public cups-filters (define-public cups-minimal (package (name "cups-minimal") - (version "2.2.10") + (version "2.2.11") (source (origin (method url-fetch) @@ -194,7 +194,7 @@ (define-public cups-minimal version "/cups-" version "-source.tar.gz")) (sha256 (base32 - "1fq52aw1mini3ld2czv5gg37wbbvh4n7yc7wzzxvbs3zpfrv5j3p")))) + "0v5p10lyv8wv48s8ghkhjmdrxg6iwj8hn36v1ilkz46n7y0i107m")))) (build-system gnu-build-system) (arguments `(#:configure-flags From f67417a1b4d3fbd3a2e1593d32422e0d901ba367 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 23 Mar 2019 22:30:29 +0100 Subject: [PATCH 693/694] gnu: librsvg: Restore version 2.40.20. * gnu/packages/gnome.scm (librsvg): Downgrade to 2.40.20. (librsvg-next): New public variable. --- gnu/packages/gnome.scm | 66 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 22f5f213c0..cd31dbb5a8 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1310,6 +1310,72 @@ (define-public libgsf (license license:lgpl2.1))) (define-public librsvg + (package + (name "librsvg") + (version "2.40.20") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0ay9himvw1l1swcf3h1312d2iqzfl65kpbfgiyfykgvq7cydvx6g")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list "--disable-static" + "--enable-vala") ; needed for e.g. gnome-mines + #:phases + (modify-phases %standard-phases + (add-before 'configure 'pre-configure + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "gdk-pixbuf-loader/Makefile.in" + ;; By default the gdk-pixbuf loader is installed under + ;; gdk-pixbuf's prefix. Work around that. + (("gdk_pixbuf_moduledir = .*$") + (string-append "gdk_pixbuf_moduledir = " + "$(prefix)/lib/gdk-pixbuf-2.0/2.10.0/" + "loaders\n")) + ;; Drop the 'loaders.cache' file, it's in gdk-pixbuf+svg. + (("gdk_pixbuf_cache_file = .*$") + "gdk_pixbuf_cache_file = $(TMPDIR)/loaders.cache\n")) + #t)) + (add-before 'check 'remove-failing-tests + (lambda _ + (with-directory-excursion "tests/fixtures/reftests" + (for-each delete-file + '(;; This test fails on i686: + "svg1.1/masking-path-04-b.svg" + ;; This test fails on armhf: + "svg1.1/masking-mask-01-b.svg" + ;; This test fails on aarch64: + "bugs/777834-empty-text-children.svg"))) + #t))))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("vala" ,vala) + ("glib" ,glib "bin") ; glib-mkenums, etc. + ("gobject-introspection" ,gobject-introspection))) ; g-ir-compiler, etc. + (inputs + `(("pango" ,pango) + ("libcroco" ,libcroco) + ("bzip2" ,bzip2) + ("libgsf" ,libgsf) + ("libxml2" ,libxml2))) + (propagated-inputs + ;; librsvg-2.0.pc refers to all of that. + `(("cairo" ,cairo) + ("gdk-pixbuf" ,gdk-pixbuf) + ("glib" ,glib))) + (home-page "https://wiki.gnome.org/LibRsvg") + (synopsis "Render SVG files using Cairo") + (description + "Librsvg is a C library to render SVG files using the Cairo 2D graphics +library.") + (license license:lgpl2.0+))) + +(define-public librsvg-next (package (name "librsvg") (version "2.44.12") From 3374e9207f5244c20402a3c5513fe562140fef47 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 23 Mar 2019 22:38:08 +0100 Subject: [PATCH 694/694] gnu: imagemagick: Update to 6.9.10-34. * gnu/packages/imagemagick.scm (imagemagick): Update to 6.9.10-34. --- 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 0857fed5d6..7f3fc408e0 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-27") + (version "6.9.10-34") (source (origin (method url-fetch) (uri (string-append "mirror://imagemagick/ImageMagick-" version ".tar.xz")) (sha256 (base32 - "1skngh58lkpa2scc9rhjxvhyn6f7nlwd28hbwrxzlvvb7qil9jcq")))) + "1pm1lvbfw67780nch7w80dsvx7v8wbrpj43v3c9217dpz0l89442")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch")