From 939680f3354b0266292a1d947879f6fe0ad5b3ae Mon Sep 17 00:00:00 2001 From: raingloom Date: Sat, 30 May 2020 12:52:00 +0200 Subject: gnu: go-golang-org-x-sys: Update to 0598657 * gnu/packages/golang.scm (go-golang-org-x-sys): Update to 0598657. Signed-off-by: Julien Lepiller --- gnu/packages/golang.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 0f81a752e4..35665223ef 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2020 Nicolas Goaziou ;;; Copyright © 2020 Ryan Prior +;;; Copyright © 2020 raingloom ;;; ;;; This file is part of GNU Guix. ;;; @@ -797,8 +798,8 @@ (define-public go-golang-org-x-sync (license license:bsd-3)))) (define-public go-golang-org-x-sys - (let ((commit "c709ea063b76879dc9915358f55d4d77c16ab6d5") - (revision "6")) + (let ((commit "05986578812163b26672dabd9b425240ae2bb0ad") + (revision "7")) (package (name "go-golang-org-x-sys") (version (git-version "0.0.0" revision commit)) @@ -810,7 +811,7 @@ (define-public go-golang-org-x-sys (file-name (git-file-name name version)) (sha256 (base32 - "15nq53a6kcqchng4j0d1pjw0m6hny6126nhjdwqw5n9dzh6a226d")))) + "1q2rxb6z5l6pmlckjsz2l0b8lw7bqgk6frhzbmi1dv0y5irb2ka7")))) (build-system go-build-system) (arguments `(#:import-path "golang.org/x/sys" -- cgit v1.2.3 From 6e085d6f17e831e88a35c275892bde32fdb11986 Mon Sep 17 00:00:00 2001 From: raingloom Date: Mon, 13 Jul 2020 04:15:28 +0200 Subject: gnu: Add go-github-com-arceliar-phony. * gnu/packages/golang.scm (go-github-com-arceliar-phony): New variable. Signed-off-by: Julien Lepiller --- gnu/packages/golang.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 35665223ef..c908a52453 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -5738,3 +5738,28 @@ (define-public gopkg-in-errgo-fmt-errors except that it adds convenience functions that use the fmt package to format error messages.") (license license:bsd-3))) + +(define-public go-github-com-arceliar-phony + (let ((commit "d0c68492aca0bd4b5c5c8e0452c9b4c8af923eaf") + (revision "0")) + (package + (name "go-github-com-arceliar-phony") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Arceliar/phony") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0876y0hlb1zh8hn0pxrb5zfdadvaqmqwlr66p19yl2a76galz992")))) + (arguments + '(#:import-path "github.com/Arceliar/phony")) + (build-system go-build-system) + (home-page "https://github.com/Arceliar/phony") + (synopsis "Very minimal actor model library") + (description "Phony is a very minimal actor model library for Go, +inspired by the causal messaging system in the Pony programming language.") + (license license:expat)))) -- cgit v1.2.3 From 4a28246d3080598d2f5b0a249607fc0ccbf81e83 Mon Sep 17 00:00:00 2001 From: raingloom Date: Mon, 13 Jul 2020 04:21:11 +0200 Subject: gnu: Add go-github-com-cheggaaa-pb. * gnu/packages/golang.scm (go-github-com-cheggaaa-pb): New variable. Signed-off-by: Julien Lepiller --- gnu/packages/golang.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index c908a52453..f76e49220a 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -5763,3 +5763,33 @@ (define-public go-github-com-arceliar-phony (description "Phony is a very minimal actor model library for Go, inspired by the causal messaging system in the Pony programming language.") (license license:expat)))) + +(define-public go-github-com-cheggaaa-pb + (package + (name "go-github-com-cheggaaa-pb") + (version "3.0.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cheggaaa/pb/") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0xhsv9yf3fz918ay6w0d87jnb3hk9vxvi16jk172kqq26x7jixd0")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/cheggaaa/pb/")) + (propagated-inputs + `(("go-github-com-fatih-color" ,go-github-com-fatih-color) + ("go-github-com-mattn-go-colorable" ,go-github-com-mattn-go-colorable) + ("go-github.com-mattn-go-runewidth" ,go-github.com-mattn-go-runewidth) + ("go-golang-org-x-sys" ,go-golang-org-x-sys))) + (native-inputs + `(("go-github-com-mattn-go-isatty" ,go-github-com-mattn-go-isatty))) + (home-page "https://github.com/cheggaaa/pb/") + (synopsis "Console progress bar for Go") + (description "This package is a Go library that draws progress bars on +the terminal.") + (license license:bsd-3))) -- cgit v1.2.3 From fd595f31e3301df7976951ceb9683e66f629c3dd Mon Sep 17 00:00:00 2001 From: raingloom Date: Mon, 13 Jul 2020 04:22:46 +0200 Subject: gnu: Add go-github-com-gologme-log. * gnu/packages/golang.scm (go-github-com-gologme-log): New variable. Signed-off-by: Julien Lepiller --- gnu/packages/golang.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index f76e49220a..bf99fd2d07 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -5793,3 +5793,31 @@ (define-public go-github-com-cheggaaa-pb (description "This package is a Go library that draws progress bars on the terminal.") (license license:bsd-3))) + +(define-public go-github-com-gologme-log + ;; this is the same as v1.2.0, only the LICENSE file changed + (let ((commit "720ba0b3ccf0a91bc6018c9967a2479f93f56a55")) + (package + (name "go-github-com-gologme-log") + (version "1.2.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gologme/log") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0z3gs5ngv2jszp42ypp3ai0pn410v3b2m674g73ma7vsbn2yjk1n")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/gologme/log")) + (home-page "https://github.com/gologme/log/") + (synopsis + "Fork of the golang built in log package to add support for levels") + (description "This package is a drop in replacement for the built-in Go +log package. All the functionality of the built-in package still exists and +is unchanged. This package contains a series of small enhancements and +additions.") + (license license:bsd-3)))) -- cgit v1.2.3 From 58af4c9621af02cc4e2bb5692d4b377084b0fcc6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 14 Oct 2020 00:46:30 +0200 Subject: Revert "gnu: python-chardet: Enable tests." This causes too many rebuilds for the master branch. This reverts commit 331aaf52806b27430c4efaf8f230097ede69e61a. --- gnu/local.mk | 1 - gnu/packages/patches/python-chardet-3.0.4-pytest.patch | 15 --------------- gnu/packages/python-xyz.scm | 5 +++-- 3 files changed, 3 insertions(+), 18 deletions(-) delete mode 100644 gnu/packages/patches/python-chardet-3.0.4-pytest.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index f3aeab36fd..d09875c583 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1491,7 +1491,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-argcomplete-1.11.1-fish31.patch \ %D%/packages/patches/python-axolotl-AES-fix.patch \ %D%/packages/patches/python-cairocffi-dlopen-path.patch \ - %D%/packages/patches/python-chardet-3.0.4-pytest.patch \ %D%/packages/patches/python-cross-compile.patch \ %D%/packages/patches/python2-larch-coverage-4.0a6-compatibility.patch \ %D%/packages/patches/python-configobj-setuptools.patch \ diff --git a/gnu/packages/patches/python-chardet-3.0.4-pytest.patch b/gnu/packages/patches/python-chardet-3.0.4-pytest.patch deleted file mode 100644 index d5bf7ccc28..0000000000 --- a/gnu/packages/patches/python-chardet-3.0.4-pytest.patch +++ /dev/null @@ -1,15 +0,0 @@ -Fix test failure with Pytest 4. - -Taken from upstream: -https://github.com/chardet/chardet/commit/440828f8faafdb58700c64a9ea8f6a30b154c08b - -diff --git a/test.py b/test.py ---- a/test.py -+++ b/test.py -@@ -59,5 +59,5 @@ def gen_test_params(): - full_path = join(path, file_name) - test_case = full_path, encoding - if full_path in EXPECTED_FAILURES: -- test_case = pytest.mark.xfail(test_case) -+ test_case = pytest.param(*test_case, marks=pytest.mark.xfail) - yield test_case diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 10fa9b54b4..47ad101e4d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10060,13 +10060,14 @@ (define-public python-chardet (uri (pypi-uri "chardet" version)) (sha256 (base32 - "1bpalpia6r5x1kknbk11p1fzph56fmmnp405ds8icksd3knr5aw4")) - (patches (search-patches "python-chardet-3.0.4-pytest.patch")))) + "1bpalpia6r5x1kknbk11p1fzph56fmmnp405ds8icksd3knr5aw4")))) (native-inputs `(("python-hypothesis" ,python-hypothesis) ("python-pytest" ,python-pytest) ("python-pytest-runner" ,python-pytest-runner))) (build-system python-build-system) + ;; XXX: Incompatible with Pytest 4: . + (arguments `(#:tests? #f)) (home-page "https://github.com/chardet/chardet") (synopsis "Universal encoding detector for Python 2 and 3") (description -- cgit v1.2.3 From 7e15ded6474bf3096f01fcd830337d66cb682669 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 13 Oct 2020 15:14:32 -0400 Subject: gnu: Add libbacktrace. * gnu/packages/debug.scm (libbacktrace): New variable. --- gnu/packages/debug.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm index 2f58f8e972..b55a4010e3 100644 --- a/gnu/packages/debug.scm +++ b/gnu/packages/debug.scm @@ -624,6 +624,31 @@ (define-public rr fun.") (license license:expat))) +(define-public libbacktrace + ;; There are no releases nor tags. + (let ((revision "1") + (commit "5009c113981431ae1843ebd29d6ad24eb32fc1b2")) + (package + (name "libbacktrace") + (version (git-version "1.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ianlancetaylor/libbacktrace") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0663zjpfpnsyv9h3pbp7cgmg9gz79n68bqpdl97y6i0jsx93v1zg")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags '("CFLAGS=-fPIC"))) + (home-page "https://github.com/ianlancetaylor/libbacktrace") + (synopsis "C library for producing symbolic backtraces") + (description "The @code{libbacktrace} library can be linked into a C/C++ +program to produce symbolic backtraces.") + (license license:expat)))) + (define-public mspdebug (package (name "mspdebug") -- cgit v1.2.3 From 9acf79b25861b75a92ea8c32eb926e465ba5b20a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 13 Oct 2020 15:15:59 -0400 Subject: gnu: Add libwuya. * gnu/packages/c.scm (libwuya): New variable. --- gnu/packages/c.scm | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index c1ae98ddd3..493d99387c 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -40,6 +40,7 @@ (define-module (gnu packages c) #:use-module (gnu packages perl) #:use-module (gnu packages texinfo) #:use-module (gnu packages guile) + #:use-module (gnu packages lua) #:use-module (gnu packages multiprecision) #:use-module (gnu packages pcre) #:use-module (gnu packages python) @@ -257,6 +258,64 @@ (define-public libhx checking casts and more.") (license license:lgpl2.1+))) +(define-public libwuya + ;; This commit is the one before "wuy_pool.h" was removed from libwuya, + ;; which libleak currently requires. + (let ((revision "1") + (commit "883502041044f4616cfbf75c8f2bb60059f704a9")) + (package + (name "libwuya") + (version (git-version "0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/WuBingzheng/libwuya") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1xrsqbgr13g2v0ag165ryp7xrwzv41xfygzk2a3445ca98c1qpdc")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ;no test suite + #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-lua-includes + (lambda _ + (substitute* '("wuy_cflua.h" "wuy_cflua.c") + ((" Date: Tue, 13 Oct 2020 11:21:40 -0400 Subject: gnu: Add libleak. * gnu/packages/debug.scm (libleak): New variable. --- gnu/packages/debug.scm | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm index b55a4010e3..9041cac4e2 100644 --- a/gnu/packages/debug.scm +++ b/gnu/packages/debug.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2019 Pkill -9 ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020 Morgan Smith +;;; Copyright © 2020 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -36,6 +37,7 @@ (define-module (gnu packages debug) #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages bison) + #:use-module (gnu packages c) #:use-module (gnu packages code) #:use-module (gnu packages compression) #:use-module (gnu packages flex) @@ -649,6 +651,53 @@ (define-public libbacktrace program to produce symbolic backtraces.") (license license:expat)))) +(define-public libleak + (package + (name "libleak") + (version "0.3.5") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/WuBingzheng/libleak") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1p8mb0hcfp8hdv1klv6rrpkn2zlhjxgkxbbjsk8kszxv7ijln87d")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ;no test suite + #:parallel-build? #f ;jobserver unavailable + #:phases (modify-phases %standard-phases + (add-after 'unpack 'unbundle-libwuya + (lambda _ + (substitute* "Makefile" + ((".*make -C libwuya.*") "")) + #t)) + (add-before 'build 'set-CC + (lambda _ + (setenv "CC" "gcc") + #t)) + (delete 'configure) ;no configure script + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out"))) + (install-file "libleak.so" (string-append out "/lib")) + #t)))))) + (inputs `(("libbacktrace" ,libbacktrace) + ("libwuya" ,libwuya))) + (home-page "https://github.com/WuBingzheng/libleak") + (synopsis "Memory leaks detection tool") + (description "The libleak tool detects memory leaks by hooking memory +functions such as @code{malloc}. It comes as a shared object to be pre-loaded +via @code{LD_PRELOAD} when launching the application. It prints the full call +stack at suspicious memory leak points. Modifying or recompiling the target +program is not required, and the detection can be enabled or disabled while +the target application is running. The overhead incurred by libleak is +smaller than that of other tools such as Valgrind, and it aims to be easier to +use than similar tools like @command{mtrace}.") + (license license:gpl2+))) + (define-public mspdebug (package (name "mspdebug") -- cgit v1.2.3 From ec7803981a74b733c58cbb63dea4ed724c24e2de Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 13 Oct 2020 23:22:04 -0400 Subject: gnu: Krita: Update to 4.4.0. * gnu/packages/kde.scm (krita): Update to 4.4.0. --- gnu/packages/kde.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 92d6c4534d..f38f64253b 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -374,7 +374,7 @@ (define-public kdiagram (define-public krita (package (name "krita") - (version "4.3.0") + (version "4.4.0") (source (origin (method url-fetch) (uri (string-append @@ -382,7 +382,7 @@ (define-public krita "/krita-" version ".tar.gz")) (sha256 (base32 - "1njbxv7b56if838gv7ydzm1sprgmaabnp0jlj0bxryxzfdy8hwfh")))) + "13r7x4gql5wp88hmpv9m6m3lh7gsybm4la48hqbjcb3iwiv86pzw")))) (build-system cmake-build-system) (arguments `(#:tests? #f -- cgit v1.2.3 From 71e35cb34db4006588dee4d93dc75dfa3d406276 Mon Sep 17 00:00:00 2001 From: Alex Griffin Date: Wed, 14 Oct 2020 01:52:36 -0500 Subject: gnu: kmonad: Update to 0.4.1. * gnu/packages/haskell-apps.scm (kmonad): Update to 0.4.1. --- gnu/packages/haskell-apps.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index 6c1ecb4ba3..1de8b040f1 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -628,7 +628,7 @@ (define-public hscolour (define-public kmonad (package (name "kmonad") - (version "0.4.0") + (version "0.4.1") (source (origin (method git-fetch) @@ -637,7 +637,7 @@ (define-public kmonad (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "064gnzzcm6fnxfiildbjmgbdxkhqvp61zrl6qhkl1pgbn27j1mll")))) + (base32 "1rp880zxvrznx0y1k464wjrds441dpsz94syhrkaw5dnmxf74yjd")))) (build-system haskell-build-system) (arguments `(#:phases -- cgit v1.2.3 From 7a5d13786b0d54a8d85932557b55dec1653f1402 Mon Sep 17 00:00:00 2001 From: Tim Gesthuizen Date: Tue, 13 Oct 2020 14:16:58 +0200 Subject: gnu: Add python-rfc6555. * gnu/packages/python-xyz.scm (python-rfc6555): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/python-xyz.scm | 46 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 47ad101e4d..d98be1c3b8 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -86,6 +86,7 @@ ;;; Copyright © 2020 Hendursaga ;;; Copyright © 2020 Malte Frank Gerdes ;;; Copyright © 2020 Joseph LaFreniere +;;; Copyright © 2020 Tim Gesthuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -15970,6 +15971,51 @@ (define-public python-rfc3987 (define-public python2-rfc3987 (package-with-python2 python-rfc3987)) +;; The latest commit contains fixes for building with both python3 and python2. +(define-public python-rfc6555 + (let ((commit "1a181b432312731f6742a5eb558dae4761d32361") + (revision "1")) + (package + (name "python-rfc6555") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sethmlarson/rfc6555") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1bxl17j9vs69cshcqnlwamr03hnykxqnwz3mdgi6x3s2k4q18npp")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (if tests? + ;; Other tests require network access. + (invoke "pytest" "tests/test_ipv6.py") + #t)))))) + (native-inputs + `(("python-pytest" ,python-pytest))) + (home-page "https://pypi.org/project/rfc6555/") + (synopsis "Python implementation of RFC 6555") + (description + "Python implementation of the Happy Eyeballs Algorithm described in RFC +6555. Provided with a single file and dead-simple API to allow easy vendoring +and integration into other projects.") + (properties `((python2-variant . ,(delay python2-rfc6555)))) + (license license:asl2.0)))) + +(define-public python2-rfc6555 + (let ((base (package-with-python2 + (strip-python2-variant python-rfc6555)))) + (package + (inherit base) + (propagated-inputs + `(("python2-selectors2" ,python2-selectors2)))))) + (define-public python-validators (package (name "python-validators") -- cgit v1.2.3 From d763e3c7461028c2e6575f1edeba4743f16e0878 Mon Sep 17 00:00:00 2001 From: Tim Gesthuizen Date: Tue, 13 Oct 2020 14:17:53 +0200 Subject: gnu: offlineimap: Update to 7.3.3. * gnu/packages/mail.scm (offlineimap): Update to 7.3.3. Signed-off-by: Efraim Flashner --- gnu/packages/mail.scm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index d2e62bd5ea..87c7529180 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -35,6 +35,7 @@ ;;; Copyright © 2020 Maxim Cournoyer ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020 Alexey Abramov +;;; Copyright © 2020 Tim Gesthuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -776,7 +777,7 @@ (define-public bogofilter (define-public offlineimap (package (name "offlineimap") - (version "7.2.4") + (version "7.3.3") (source (origin (method git-fetch) (uri (git-reference @@ -785,12 +786,14 @@ (define-public offlineimap (file-name (git-file-name name version)) (sha256 (base32 - "0h5q5nk2p2vx86w6rrbs7v70h81dpqqr68x6l3klzl3m0yj9agb1")))) + "1gg8ry67i20qapj4z20am9bm67m2q28kixcj7ja75m897vhzarnq")))) (build-system python-build-system) (native-inputs `(("asciidoc" ,asciidoc))) - (inputs `(("python2-pysqlite" ,python2-pysqlite) - ("python2-six" ,python2-six))) + (inputs + `(("python2-pysqlite" ,python2-pysqlite) + ("python2-rfc6555" ,python2-rfc6555) + ("python2-six" ,python2-six))) (arguments ;; The setup.py script expects python-2. `(#:python ,python-2 -- cgit v1.2.3 From 47fb72d2e500bffd167a95d6fa116755711a9bd3 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 14 Oct 2020 10:27:05 +0200 Subject: gnu: monero: Update to 0.17.1.0. * gnu/packages/finance.scm (monero): Update to 0.17.1.0. --- gnu/packages/finance.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index a10d79ad89..077568a0ed 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -555,7 +555,7 @@ (define-public monero ;; the system's dynamically linked library. (package (name "monero") - (version "0.17.0.1") + (version "0.17.1.0") (source (origin (method git-fetch) @@ -575,7 +575,7 @@ (define-public monero "external/unbound")) #t)) (sha256 - (base32 "1v0phvg5ralli4dr09a60nq032xqlci5d6v4zfq8304vgrn1ffgp")))) + (base32 "1cngniv7sndy8r0fcfgk737640k53q3kwd36g891p5igcb985qdw")))) (build-system cmake-build-system) (native-inputs `(("doxygen" ,doxygen) -- cgit v1.2.3 From 3df707778a29b7364fffe94c150a9f69467c47cf Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 14 Oct 2020 11:07:23 +0200 Subject: gnu: monero-gui: Update to 0.17.1.0. * gnu/packages/finance.scm (monero-gui): Update to 0.17.1.0. --- gnu/packages/finance.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 077568a0ed..7b1f93c139 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -665,7 +665,7 @@ (define-public monero (define-public monero-gui (package (name "monero-gui") - (version "0.17.0.1") + (version "0.17.1.0") (source (origin (method git-fetch) @@ -674,7 +674,7 @@ (define-public monero-gui (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1i9a3ampppyzsl4sllbqlr3w43sjpb3fdfxhb1j4n49p8g0jzmf3")))) + (base32 "07r78ipv4g3i6z822kq380vi3qwlb958rccsy6lyybkhj9y0rx84")))) (build-system qt-build-system) (native-inputs `(,@(package-native-inputs monero) -- cgit v1.2.3 From 4835d52efd6aedb14978089785a09baf2be31386 Mon Sep 17 00:00:00 2001 From: Josh Hoff Date: Sat, 10 Oct 2020 04:55:26 -0500 Subject: gnu: rxvt-unicode: Enable 256 colors I noticed urxvt has a termcap file for rxvt-256color, but that's not actually built. Signed-off-by: Efraim Flashner --- gnu/packages/xdisorg.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index d9c89053b9..ccfab58777 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -987,7 +987,8 @@ (define-public rxvt-unicode ;; This sets the destination when installing the necessary terminal ;; capability data, which are not provided by 'ncurses'. See ;; https://lists.gnu.org/archive/html/bug-ncurses/2009-10/msg00031.html - `(#:make-flags (list (string-append "TERMINFO=" + `(#:configure-flags (list "--enable-256-color") + #:make-flags (list (string-append "TERMINFO=" (assoc-ref %outputs "out") "/share/terminfo")) #:phases -- cgit v1.2.3 From 5436b673f53d27753b53ab8d94eea6153a20e483 Mon Sep 17 00:00:00 2001 From: Lulu Date: Wed, 14 Oct 2020 09:37:30 +0300 Subject: services: nginx: Fix typo in exported symbol. * gnu/services/web.scm: Fix typo in exported symbol. Signed-off-by: Julien Lepiller --- gnu/services/web.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/services/web.scm b/gnu/services/web.scm index c8ffc19d83..b2d1dcf0ee 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -90,7 +90,7 @@ (define-module (gnu services web) nginx-configuration nginx-configuration? - nginx-configuartion-nginx + nginx-configuration-nginx nginx-configuration-log-directory nginx-configuration-run-directory nginx-configuration-server-blocks -- cgit v1.2.3 From c8d07c5f1f76951b0284f1435b563e8fe14d5674 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 14 Oct 2020 14:53:54 +0200 Subject: gnu: Add ldacbt. * gnu/packages/audio.scm (ldacbt): New variable. --- gnu/packages/audio.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 0e93a7263e..9fe4f66ebf 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3965,6 +3965,27 @@ (define-public python-pyalsaaudio (define-public python2-pyalsaaudio (package-with-python2 python-pyalsaaudio)) +(define-public ldacbt + (package + (name "ldacbt") + (version "2.0.2.3") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/EHfive/ldacBT" + "/releases/download/v" version + "/ldacBT-" version ".tar.gz")) + (sha256 + (base32 + "1d65dms4klzql29abi15i90f41h523kl6mxrz9hi6p5vg37fxn2b")))) + (build-system cmake-build-system) + (arguments `(#:tests? #f)) ; no check target + (home-page "https://github.com/EHfive/ldacBT/") + (synopsis "LDAC Bluetooth encoder and ABR library") + (description "This package provides an encoder for the LDAC +high-resolution Bluetooth audio streaming codec for streaming at up to 990 +kbps at 24 bit/96 kHz.") + (license license:asl2.0))) + (define-public bluez-alsa (package (name "bluez-alsa") -- cgit v1.2.3 From a079f3eb2fad1a88e6cdfdd35996bf36e01ed4b0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 14 Oct 2020 14:54:13 +0200 Subject: gnu: bluez-alsa: Update to 3.0.0. * gnu/packages/audio.scm (bluez-alsa): Update to 3.0.0. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 9fe4f66ebf..c7df6af8e6 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3989,7 +3989,7 @@ (define-public ldacbt (define-public bluez-alsa (package (name "bluez-alsa") - (version "2.0.0") + (version "3.0.0") (source (origin ;; The tarballs are mere snapshots and don't contain a ;; bootstrapped build system. @@ -4000,7 +4000,7 @@ (define-public bluez-alsa (file-name (git-file-name name version)) (sha256 (base32 - "08mppgnjf1j2733bk9yf0cny6rfxxwiys0s62lz2zd2lpdl6d9lz")))) + "1jlsgxyqfhncfhx1sy3ry0dp6p95kd4agh7g2b7g51h0c4cv74h8")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 09b00a62b297edb92ac4dde6f4838261ac0cad16 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 14 Oct 2020 14:54:22 +0200 Subject: gnu: bluez-alsa: Add LDAC support. * gnu/packages/audio.scm (bluez-alsa)[arguments]: Enable LDAC support. [inputs]: Add ldacbt. --- gnu/packages/audio.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index c7df6af8e6..d271c4b6aa 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -4004,7 +4004,8 @@ (define-public bluez-alsa (build-system gnu-build-system) (arguments `(#:configure-flags - (list (string-append "--with-alsaplugindir=" + (list "--enable-ldac" + (string-append "--with-alsaplugindir=" (assoc-ref %outputs "out") "/lib/alsa-lib") (string-append "--with-dbusconfdir=" @@ -4020,6 +4021,7 @@ (define-public bluez-alsa ("bluez" ,bluez) ("dbus" ,dbus) ("glib" ,glib) + ("ldacbt" ,ldacbt) ("libbsd" ,libbsd) ("ncurses" ,ncurses) ("ortp" ,ortp) -- cgit v1.2.3 From 3c338135f1ec218f2cd19786a13b883ed36f12bb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 14 Oct 2020 15:22:29 +0200 Subject: gnu: slurm: Update to 20.02.5. * gnu/packages/parallel.scm (slurm): Update to 20.02.5. --- gnu/packages/parallel.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index 96968a5790..585be21607 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2015, 2016, 2017, 2018, 2020 Efraim Flashner ;;; Copyright © 2016 Pjotr Prins ;;; Copyright © 2016 Andreas Enge -;;; Copyright © 2016 Ricardo Wurmus +;;; Copyright © 2016, 2020 Ricardo Wurmus ;;; Copyright © 2016 Ben Woodcroft ;;; Copyright © 2017, 2018 Rutger Helling ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice @@ -108,7 +108,7 @@ (define-public parallel (define-public slurm (package (name "slurm") - (version "19.05.3-2") + (version "20.02.5") (source (origin (method url-fetch) (uri (string-append @@ -116,7 +116,7 @@ (define-public slurm version ".tar.bz2")) (sha256 (base32 - "0qj4blfymrd2ry2qmb58l3jbr4jwygc3adcfw7my27rippcijlyc")) + "08qp60rxsny6fcx58xim88avx7f7h7q1vpq3lfw6nlha04r7lan3")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From f73f3d01a28bf791815de24523ed6b1a2da1f179 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 14 Oct 2020 10:16:41 +0200 Subject: gnu: guix: Change Git URL. * gnu/packages/package-management.scm (guix)[source]: Change URL to non-dump HTTP server. --- gnu/packages/package-management.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 5cc2ae7fd1..13cb44e930 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -144,7 +144,7 @@ (define-public guix (source (origin (method git-fetch) (uri (git-reference - (url "https://git.savannah.gnu.org/r/guix.git") + (url "https://git.savannah.gnu.org/git/guix.git") (commit commit))) (sha256 (base32 -- cgit v1.2.3 From 57a7aa1ae3ef67c6e8becca766adfb4b4c8f59ac Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 14 Oct 2020 11:06:55 +0200 Subject: hurd-boot: Set /hurd/magic on /dev/fd. * gnu/build/hurd-boot.scm (set-hurd-device-translators)[devices]: Add "/dev/fd". --- gnu/build/hurd-boot.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/build/hurd-boot.scm b/gnu/build/hurd-boot.scm index 45d0040e60..e66d4d1ba8 100644 --- a/gnu/build/hurd-boot.scm +++ b/gnu/build/hurd-boot.scm @@ -211,6 +211,9 @@ (define devices ("dev/vcs" ("/hurd/console")) ("dev/tty" ("/hurd/magic" "tty") #o666) + ;; 'fd_to_filename' in libc expects it. + ("dev/fd" ("/hurd/magic" "--directory" "fd") #o555) + ("dev/tty1" ("/hurd/term" "/dev/tty1" "hurdio" "/dev/vcs/1/console") #o666) ("dev/tty2" ("/hurd/term" "/dev/tty2" "hurdio" "/dev/vcs/2/console") @@ -240,7 +243,6 @@ (define devices (for-each scope-set-translator devices) (false-if-EEXIST (symlink "/dev/random" (scope "dev/urandom"))) - (mkdir* "dev/fd") (false-if-EEXIST (symlink "/dev/fd/0" (scope "dev/stdin"))) (false-if-EEXIST (symlink "/dev/fd/1" (scope "dev/stdout"))) (false-if-EEXIST (symlink "/dev/fd/2" (scope "dev/stderr"))) -- cgit v1.2.3 From 281869e6f8d5b7ea6300c5b93acb324a6011585e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 14 Oct 2020 11:07:40 +0200 Subject: image: Use 'raise' from (srfi srfi-34). * gnu/system/image.scm: Use (srfi srfi-34) for 'raise'. (lookup-image-type-by-name): Remove extra newline in 'formatted-message' string. --- gnu/system/image.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/system/image.scm b/gnu/system/image.scm index 1b5ceb3553..bc6610b14c 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -53,6 +53,7 @@ (define-module (gnu system image) #:use-module ((srfi srfi-1) #:prefix srfi-1:) #:use-module (srfi srfi-11) #:use-module (srfi srfi-26) + #:use-module (srfi srfi-34) #:use-module (srfi srfi-35) #:use-module (rnrs bytevectors) #:use-module (ice-9 format) @@ -656,6 +657,6 @@ (define (lookup-image-type-by-name name) (eq? name (image-type-name image-type))) (force %image-types)) (raise - (formatted-message (G_ "~a: no such image type~%") name)))) + (formatted-message (G_ "~a: no such image type") name)))) ;;; image.scm ends here -- cgit v1.2.3 From 028119e9f5a0b31fe27334eb5de582d42d3ffd5d Mon Sep 17 00:00:00 2001 From: Niklas Eklund Date: Wed, 30 Sep 2020 15:34:36 +0200 Subject: gnu: Add emacs-gcmh. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs-xyz.scm (emacs-gcmh): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/emacs-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index cc97e051d0..4e0d657308 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1770,6 +1770,32 @@ (define-public emacs-aggressive-indent than @code{electric-indent-mode}.") (license license:gpl2+))) +(define-public emacs-gcmh + ;; No tagged release upstream. + (let ((commit "84c43a4c0b41a595ac6e299fa317d2831813e580") + (revision "0")) + (package + (name "emacs-gcmh") + (version (git-version "0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/koral/gcmh") + (commit commit))) + (sha256 + (base32 "1r3wiqhrzh7wvqy484nl031fd4bn4cpvkv9646s4cjgvnnnv7jz3")) + (file-name (git-file-name name version)))) + (build-system emacs-build-system) + (home-page "https://gitlab.com/koral/gcmh") + (synopsis "Emacs Garbage Collector Magic Hack") + (description + "This package enforces a sneaky @dfn{garbage collector} (GC) strategy +to minimize GC interference with the activity. During normal use a high GC +threshold is set. When idling GC is immediately triggered and a low threshold +is set.") + (license license:gpl3+)))) + (define-public emacs-ctrlf (package (name "emacs-ctrlf") -- cgit v1.2.3 From 3c1b0b92d1641616f4cb404740447b9565569e0b Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Sat, 10 Oct 2020 11:38:21 +0200 Subject: gnu: icedove: Update to 78.3.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnuzilla.scm (icedove): Update to 78.3.2. Signed-off-by: Ludovic Courtès --- gnu/packages/gnuzilla.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 365626a62a..af436a1dfd 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1157,11 +1157,11 @@ (define-public icecat (cpe-version . ,(first (string-split version #\-))))))) ;; Update this together with icecat! -(define %icedove-build-id "20200926000000") ;must be of the form YYYYMMDDhhmmss +(define %icedove-build-id "20201007000000") ;must be of the form YYYYMMDDhhmmss (define-public icedove (package (name "icedove") - (version "78.3.1") + (version "78.3.2") (source icecat-source) (properties `((cpe-name . "thunderbird_esr"))) @@ -1441,7 +1441,7 @@ (define-public icedove ;; in the Thunderbird release tarball. We don't use the release ;; tarball because it duplicates the Icecat sources and only adds the ;; "comm" directory, which is provided by this repository. - ,(let ((changeset "00912779d73faef4277c57fe99aa5259b11d244d")) + ,(let ((changeset "6ee0e0ff64f4ccda9c478426d0b5d15cd583f8e6")) (origin (method hg-fetch) (uri (hg-reference @@ -1450,7 +1450,7 @@ (define-public icedove (file-name (string-append "thunderbird-" version "-checkout")) (sha256 (base32 - "12isvk6q8miwn81kimrgcmjh4vsmdbbx93q9pafgxlx3p92s5v8h"))))) + "0w8p35x53g5anck69xnpn688600n2pyx9c7y640szl1ssdsgch82"))))) ("autoconf" ,autoconf-2.13) ("cargo" ,rust-1.41 "cargo") ("clang" ,clang) -- cgit v1.2.3 From fdfd0549ad8c81c89f8cd20b126fa435f5cdf0c4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 14 Oct 2020 15:08:49 +0200 Subject: gnu: perl-crypt-rijndael: Update to 1.15. * gnu/packages/perl.scm (perl-crypt-rijndael): Update to 1.15. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index d91e336d83..0aaf87cb3f 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -2213,7 +2213,7 @@ (define-public perl-crypt-randpasswd (define-public perl-crypt-rijndael (package (name "perl-crypt-rijndael") - (version "1.14") + (version "1.15") (source (origin (method url-fetch) @@ -2221,8 +2221,7 @@ (define-public perl-crypt-rijndael "mirror://cpan/authors/id/L/LE/LEONT/Crypt-Rijndael-" version ".tar.gz")) (sha256 - (base32 - "03l5nwq97a8q9na4dpd4m3r7vrwpranx225vw8xm40w7zvgw6lb4")))) + (base32 "0qs1b6ma4sj0ip5d8544fzgc1bbankc4qlmznp8hay8dk5arp650")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/Crypt-Rijndael") (synopsis "Crypt::CBC compliant Rijndael encryption module") -- cgit v1.2.3 From 2a30ca09291a28df4e45c7240fa603c8e505d87d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 14 Oct 2020 15:23:13 +0200 Subject: gnu: python-passlib: Update to 1.7.4. * gnu/packages/python-crypto.scm (python-passlib): Update to 1.7.4. --- gnu/packages/python-crypto.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index f39695a850..5474373622 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -141,13 +141,13 @@ (define-public python2-bcrypt (define-public python-passlib (package (name "python-passlib") - (version "1.7.2") + (version "1.7.4") (source (origin (method url-fetch) (uri (pypi-uri "passlib" version)) (sha256 - (base32 "1a5ngap7kq0b4azq8nlfg6xg5bcl1i0v1sbynhmbr631jgpnqrld")))) + (base32 "015y5qaw9qnxr29lg60dml1g5rbqd4586wy5n8m41ib55gvm1zfy")))) (build-system python-build-system) (native-inputs `(("python-nose" ,python-nose))) @@ -157,8 +157,8 @@ (define-public python-passlib `(#:phases (modify-phases %standard-phases (add-before 'check 'set-PYTHON_EGG_CACHE - ;; some tests require access to "$HOME/.cython" - (lambda* _ (setenv "PYTHON_EGG_CACHE" "/tmp") #t))))) + ;; Some tests require access to "$HOME/.cython". + (lambda _ (setenv "PYTHON_EGG_CACHE" "/tmp") #t))))) (home-page "https://bitbucket.org/ecollins/passlib") (synopsis "Comprehensive password hashing framework") (description -- cgit v1.2.3 From 3e0b02203036f41659d231fca24712ea67557103 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 14 Oct 2020 14:24:14 +0200 Subject: gnu: python-aiohttp: Update to 3.6.3. * gnu/packages/python-web.scm (python-aiohttp): Update to 3.6.3. --- gnu/packages/python-web.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 9813894b30..2c3b57b533 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -90,14 +90,13 @@ (define-module (gnu packages python-web) (define-public python-aiohttp (package (name "python-aiohttp") - (version "3.6.2") + (version "3.6.3") (source (origin (method url-fetch) (uri (pypi-uri "aiohttp" version)) (sha256 - (base32 - "09pkw6f1790prnrq0k8cqgnf1qy57ll8lpmc6kld09q7zw4vi6i5")) + (base32 "0i9n7h8n06m2d8ryqyk4fv1si1m44ibq7blbfaxq46vx7jydg339")) (patches (search-patches "python-aiohttp-3.6.2-no-warning-fail.patch")))) (build-system python-build-system) (arguments -- cgit v1.2.3 From ce7548e69112f67580f529ad78d4a053ed133b63 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 14 Oct 2020 14:30:44 +0200 Subject: gnu: libgphoto2: Update to 2.5.26. * gnu/packages/photo.scm (libgphoto2): Update to 2.5.26. --- gnu/packages/photo.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 5f97d7e214..328f40ff48 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2015, 2017 Andreas Enge ;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2017 Roel Janssen -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Leo Famulari ;;; Copyright © 2020 Sebastian Schott ;;; Copyright © 2020 Vincent Legoll @@ -238,14 +238,14 @@ (define-public libexif (define-public libgphoto2 (package (name "libgphoto2") - (version "2.5.25") + (version "2.5.26") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/gphoto/libgphoto/" version "/libgphoto2-" version ".tar.bz2")) (sha256 (base32 - "0fkz2rx7xlmr6zl6f56hhxps6bx16dwcw5pyd8c2icf273s9h3kw")))) + "1m5wxap3x9z6x8s2gj3sw9lqwlmbgz00dv6z3h3qk15prfizwh3p")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (inputs -- cgit v1.2.3 From 81f3adb4d192cc75eca465bc95883fff1f46e1a6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 14 Oct 2020 14:32:29 +0200 Subject: gnu: gphoto2: Update to 2.5.26. * gnu/packages/photo.scm (gphoto2): Update to 2.5.26. --- gnu/packages/photo.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 328f40ff48..dbe18a025a 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -269,14 +269,14 @@ (define-public libgphoto2 (define-public gphoto2 (package (name "gphoto2") - (version "2.5.23") + (version "2.5.26") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/gphoto/gphoto/" version "/gphoto2-" version ".tar.bz2")) (sha256 (base32 - "1laqwhxr0xhbykmp0dhd3j4rr2lhj5y228s31afnqxp700hhk1yz")))) + "0bxbcn31xalsvjp8fra324hf2105y3ps7zlyfz11v71j0lxj2lvn")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 642647ae9305c701b2191a4cbcf28ce583da7d1d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 14 Oct 2020 14:54:21 +0200 Subject: gnu: python-pgpy: Update to 0.5.3. * gnu/packages/python-crypto.scm (python-pgpy): Update to 0.5.3. --- gnu/packages/python-crypto.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 5474373622..a86151b485 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -1537,20 +1537,20 @@ (define-public python-privy (define-public python-pgpy (package (name "python-pgpy") - (version "0.5.2") + (version "0.5.3") (source (origin (method url-fetch) (uri (pypi-uri "PGPy" version)) (sha256 - (base32 - "0i4lqhzdwkjkim3wab0kqadx28z3r5ixlh6qxj4lif4gif56c0m7")))) + (base32 "11rrq15gmn6qbahli7czflfcngjl7zyybjlvk732my6axnf2d754")))) (build-system python-build-system) (native-inputs `(("python-cryptography" ,python-cryptography) ("python-pyasn1" ,python-pyasn1) ("python-singledispatch" ,python-singledispatch) - ("python-six" ,python-six))) + ("python-six" ,python-six) + ("python-wheel" ,python-wheel))) (home-page "https://github.com/SecurityInnovation/PGPy") (synopsis "Python implementation of OpenPGP") (description -- cgit v1.2.3 From ed0e8c7cc92df8deec15edd097c03a82cdc2e58b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 14 Oct 2020 14:56:40 +0200 Subject: gnu: python-pgpy: Run the tests. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-crypto.scm (python-pgpy)[arguments]: Replace the default ‘check’ phase. [native-inputs]: Add python-pytest. --- gnu/packages/python-crypto.scm | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index a86151b485..81a5c213da 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -1545,9 +1545,17 @@ (define-public python-pgpy (sha256 (base32 "11rrq15gmn6qbahli7czflfcngjl7zyybjlvk732my6axnf2d754")))) (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest"))))))) (native-inputs `(("python-cryptography" ,python-cryptography) ("python-pyasn1" ,python-pyasn1) + ("python-pytest" ,python-pytest) ("python-singledispatch" ,python-singledispatch) ("python-six" ,python-six) ("python-wheel" ,python-wheel))) -- cgit v1.2.3 From 9112ec6b72340b40fcf3bf6d6ed9e5e672732ba5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 14 Oct 2020 12:42:40 +0200 Subject: gnu: vim: Update to 8.2.1844. * gnu/packages/vim.scm (vim): Update to 8.2.1844. --- gnu/packages/vim.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index def1f870ca..92a192b66a 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -70,7 +70,7 @@ (define-module (gnu packages vim) (define-public vim (package (name "vim") - (version "8.2.1840") + (version "8.2.1844") (source (origin (method git-fetch) (uri (git-reference @@ -79,7 +79,7 @@ (define-public vim (file-name (git-file-name name version)) (sha256 (base32 - "0ly2kv1x3jqi363wjk694s8bi9q0xvw7yizf8pzanan8h2wy1r28")))) + "0a76ls7lizqg3lz624irkpq7rfm3x5rcq20vx217w34g9h6aggab")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit v1.2.3 From 2d0bea9c6d98a0dec99218935239dca8b676b86f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 14 Oct 2020 12:43:16 +0200 Subject: gnu: plantuml: Update to 1.2020.19. * gnu/packages/uml.scm (plantuml): Update to 1.2020.19. --- gnu/packages/uml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/uml.scm b/gnu/packages/uml.scm index 2bea4798f7..2202316016 100644 --- a/gnu/packages/uml.scm +++ b/gnu/packages/uml.scm @@ -31,14 +31,14 @@ (define-module (gnu packages uml) (define-public plantuml (package (name "plantuml") - (version "1.2020.17") + (version "1.2020.19") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/plantuml/" version "/plantuml-" version ".tar.gz")) (sha256 (base32 - "031xqzqi2jh2kms6qjy9sv9m5mjvk887jz54dnrkvw5zgn6kv4hp")))) + "0ja2f72x2qd11pkgh1qj6k03yq9ljwsvd6lh84nndwhrbdj5vns7")))) (build-system ant-build-system) (arguments `(#:tests? #f ; no tests -- cgit v1.2.3 From 79145ab4f2599d28a99ae2ff6527ea64c8e8b4e4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 14 Oct 2020 12:43:38 +0200 Subject: gnu: osinfo-db: Update to 20201011. * gnu/packages/virtualization.scm (osinfo-db): Update to 20201011. --- gnu/packages/virtualization.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 309a29ce86..f536616126 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1997,14 +1997,14 @@ (define-public osinfo-db-tools (define-public osinfo-db (package (name "osinfo-db") - (version "20200813") + (version "20201011") (source (origin (method url-fetch) (uri (string-append "https://releases.pagure.org/libosinfo/osinfo-db-" version ".tar.xz")) (sha256 (base32 - "127lr4kvdy2b2lil7i0gbbxcf8vap0r6hxhnbmms4p7h2h0sdgri")))) + "1zzx5gsqgzg2zki6h8vl0h7kpcrk5i2s1qhz7gcb18s7g99px8aj")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) -- cgit v1.2.3 From d3d1aec2ac742682cebf1c416afd9f6a889cc879 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 14 Oct 2020 12:52:41 +0200 Subject: gnu: oil: Update to 0.8.2. * gnu/packages/shells.scm (oil): Update to 0.8.2. --- gnu/packages/shells.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 3962a5be5c..9e400eb27e 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -814,14 +814,14 @@ (define-public mksh (define-public oil (package (name "oil") - (version "0.8.1") + (version "0.8.2") (source (origin (method url-fetch) (uri (string-append "https://www.oilshell.org/download/oil-" version ".tar.gz")) (sha256 - (base32 "1np17gvvz6zkr2rkvdb15wax45b1mcf2946bfyy3y77ann1zxsyj")))) + (base32 "1m49darrs38x60zqi3sy1mh4a47qvwcyf7djrkzqwzwxsczxybgr")))) (build-system gnu-build-system) (arguments `(#:strip-binaries? #f ; strip breaks the binary -- cgit v1.2.3 From cf4fafc46768eee2bef9758971d5c230c0eac029 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 13 Oct 2020 22:13:04 +0200 Subject: gnu: python-pastedeploy: Update to 2.1.1. * gnu/packages/python-web.scm (python-pastedeploy): Update to 2.1.1. --- gnu/packages/python-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 2c3b57b533..b8b7ce9d31 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2342,13 +2342,13 @@ (define-public python2-wsgiproxy2 (define-public python-pastedeploy (package (name "python-pastedeploy") - (version "2.1.0") + (version "2.1.1") (source (origin (method url-fetch) (uri (pypi-uri "PasteDeploy" version)) (sha256 - (base32 "16qsq5y6mryslmbp5pn35x4z8z3ndp5rpgl42h226879nrw9hmg7")))) + (base32 "05s88qdjdwd9d9qs13fap7nqgxs7qs5qfzzjbrc5va13k2mxdskd")))) (build-system python-build-system) (arguments '(#:test-target "pytest")) -- cgit v1.2.3 From bf476ea16a0e7f1cb1fbad4ae1e355cb9d9707bb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 13 Oct 2020 22:24:24 +0200 Subject: gnu: jasper: Update to 2.0.22. * gnu/packages/image.scm (jasper): Update to 2.0.22. [argument]: Remove obsolete field. --- gnu/packages/image.scm | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index ae0f831082..5f8711c869 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1409,7 +1409,7 @@ (define-public devil (define-public jasper (package (name "jasper") - (version "2.0.21") + (version "2.0.22") (source (origin (method git-fetch) (uri (git-reference @@ -1418,21 +1418,10 @@ (define-public jasper (file-name (git-file-name name version)) (sha256 (base32 - "0p3qr4j4pjs5vn5amm6ih9hb4wmm72marhmfw08svcs4rrr88p9y")))) + "1qw96mwwd9xw21jg5s7njqgbam566skj93i81aflijy40s31dfwz")))) (build-system cmake-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'disable-checking-disabled-things - (lambda _ - ;; The MIF codec was disabled for security reasons in JasPer 2.0.20 - ;; but its test suite still assumes that the format is supported. - (for-each delete-file - (find-files "data/test" "\\.mif$")) ; for run_test_1 - (substitute* "test/bin/run_test_2" - (("image_formats\\+=\\(mif\\)") "")) - #t))))) - (inputs `(("libjpeg" ,libjpeg-turbo))) + (inputs + `(("libjpeg" ,libjpeg-turbo))) (synopsis "JPEG-2000 library") (description "The JasPer Project is an initiative to provide a reference implementation of the codec specified in the JPEG-2000 Part-1 standard (i.e., -- cgit v1.2.3 From ea36db33924ec06450578d8febd6268e0ae439ba Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 14 Oct 2020 12:05:59 +0200 Subject: gnu: cpuid: Update to 20201006. * gnu/packages/linux.scm (cpuid): Update to 20201006. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 4b8bbfdc3d..1c71c159db 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -6427,14 +6427,14 @@ (define-public proot-static (define-public cpuid (package (name "cpuid") - (version "20200427") + (version "20201006") (source (origin (method url-fetch) (uri (string-append "http://www.etallen.com/cpuid/cpuid-" version ".src.tar.gz")) (sha256 (base32 - "1m31238z2ya8f8pzpyklwp0ksf5xicqrw1z941hhhx913wzldaf1")))) + "19jnkh57f979b78ak5mpxmdvnkgc33r55cw9shgd2hc380b3zi8k")))) (build-system gnu-build-system) (arguments '(#:make-flags '("CC=gcc") -- cgit v1.2.3 From 2bfe99b11ac89ea723fd5d8aed9d6cdac78d71d4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 14 Oct 2020 14:17:13 +0200 Subject: gnu: cpuid: Use CC-FOR-TARGET. This doesn't actually enable cross-compilation. * gnu/packages/linux.scm (cpuid)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/linux.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 1c71c159db..93db178b47 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -6437,7 +6437,8 @@ (define-public cpuid "19jnkh57f979b78ak5mpxmdvnkgc33r55cw9shgd2hc380b3zi8k")))) (build-system gnu-build-system) (arguments - '(#:make-flags '("CC=gcc") + '(#:make-flags + (list (string-append "CC=" ,(cc-for-target))) #:tests? #f ; no tests #:phases (modify-phases %standard-phases (delete 'configure) ; no configure script -- cgit v1.2.3 From 33c66110980adc4d582b7c86d4ce5759f3802579 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 14 Oct 2020 16:35:34 +0200 Subject: gnu: cuirass: Update to 0.0.1-52.38ee2c5. * gnu/packages/ci.scm (cuirass): Update to 0.0.1-52.38ee2c5. --- gnu/packages/ci.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index 3d303a29d8..f2cc028752 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -68,8 +68,8 @@ (define-public guile-sqlite3-dev (file-name (string-append name "-" version "-checkout"))))))) (define-public cuirass - (let ((commit "cb2c4e3d8f7eda187adf6da1fc35aef838c49828") - (revision "51")) + (let ((commit "38ee2c5b5b21404f383fc5066af8141785676e56") + (revision "52")) (package (name "cuirass") (version (git-version "0.0.1" revision commit)) @@ -81,7 +81,7 @@ (define-public cuirass (file-name (git-file-name name version)) (sha256 (base32 - "0f2di2pqqw8k4ii7h65kbzyf2d4w7nd5n3a93a8l9si4phf6a5c7")))) + "13z862i668v2c6w3ajb1mddkzfcdc16myjqz7gss59bykzag728p")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) -- cgit v1.2.3 From 2e0ab8c9916435c9905126c7a53e08f514027dd7 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Wed, 14 Oct 2020 19:01:53 +0100 Subject: gnu: lollypop: Update to 1.4.2. * gnu/packages/gnome.scm (lollypop): Update to 1.4.2. [inputs]: Add libhandy. --- gnu/packages/gnome.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4ef790d11b..d6ab0fb984 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10129,14 +10129,14 @@ (define-public gnome-planner (define-public lollypop (package (name "lollypop") - (version "1.2.32") + (version "1.4.2") (source (origin (method url-fetch) (uri (string-append "https://adishatz.org/lollypop/" "lollypop-" version ".tar.xz")) (sha256 - (base32 "1ng9492k8754vlqggbfsyzbmfdx4w17fzc4ad21fr92710na0w5a")))) + (base32 "1hfl68gkvqy5kxlmrsalz78mw1bs1yvqvy2rhg7pzgwiazsdvwzz")))) (build-system meson-build-system) (arguments `(#:imported-modules @@ -10171,6 +10171,7 @@ (define-public lollypop ("gst-plugins-base" ,gst-plugins-base) ("libnotify" ,libnotify) ("libsecret" ,libsecret) + ("libhandy" ,libhandy) ("libsoup" ,libsoup) ("python" ,python) ("python-beautifulsoup4" ,python-beautifulsoup4) -- cgit v1.2.3 From aeb22459144b7790efe063e0cdca67dced6ca3cc Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 14 Oct 2020 22:00:46 +0200 Subject: gnu: emacs-haskell-mode: Update to 17.2. * gnu/packages/emacs-xyz.scm (emacs-haskell-mode): Update to 17.2. --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 4e0d657308..09984bc704 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -936,16 +936,16 @@ (define-public emacs-unpackaged-el (define-public emacs-haskell-mode (package (name "emacs-haskell-mode") - (version "17.1") + (version "17.2") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/haskell/haskell-mode") - (commit (string-append "v" version)))) + (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0izcasi2v02zh08c863h43m8mmsldzy8pck43cllrfn0zf24v2qn")))) + (base32 "0zxbacqzr84krmhqpvzndnvlcjh1gs1x20ys0dykgd7chyhci5j5")))) (propagated-inputs `(("emacs-dash" ,emacs-dash))) (native-inputs -- cgit v1.2.3 From dd642517aee1e67045a5317c1eab247c88701f59 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 14 Oct 2020 22:34:14 +0200 Subject: gnu: musescore: Update to 3.5.1. * gnu/packages/music.scm (musescore): Update to 3.5.1. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 6693f34037..60a624d96d 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -4167,7 +4167,7 @@ (define-public lmms (define-public musescore (package (name "musescore") - (version "3.5") + (version "3.5.1") (source (origin (method git-fetch) @@ -4176,7 +4176,7 @@ (define-public musescore (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1s8767imzv9hclpzvvvsqb3iyiv4y2klr6agf95zwym2xafy8p26")) + (base32 "01jj6rbvbjxvmv6q13a22vfqp3id52a5mf2a1vzph2giz7pr313x")) (modules '((guix build utils))) (snippet ;; Un-bundle OpenSSL and remove unused libraries. -- cgit v1.2.3 From cb53c59dd19be8de2525d28bab59d91585dfe296 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sun, 11 Oct 2020 17:24:52 +0300 Subject: gnu: Add lua-resty-core. * gnu/packages/lua.scm (lua-resty-core): New variable. --- gnu/packages/lua.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index 5479b891bd..774df85170 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -880,3 +880,40 @@ (define-public selene "Selene is a simple C++11 header-only library enabling seamless interoperability between C++ and Lua programming language.") (license license:zlib))) + +(define-public lua-resty-core + (package + (name "lua-resty-core") + (version "0.1.17") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/openresty/lua-resty-core") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "11fyli6yrg7b91nv9v2sbrc6y7z3h9lgf4lrrhcjk2bb906576a0")))) + (build-system trivial-build-system) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let* ((luajit-major+minor ,(version-major+minor (package-version lua))) + (package-lua-resty (lambda (input output) + (mkdir-p (string-append output "/lib/lua")) + (copy-recursively (string-append input "/lib/resty") + (string-append output "/lib/lua/resty")) + (copy-recursively (string-append input "/lib/ngx") + (string-append output "/lib/ngx")) + (symlink (string-append output "/lib/lua/resty") + (string-append output "/lib/resty"))))) + (package-lua-resty (assoc-ref %build-inputs "source") + (assoc-ref %outputs "out"))) + #t))) + (home-page "https://github.com/openresty/lua-resty-core") + (synopsis "Lua API for NGINX") + (description "This package provides a FFI-based Lua API for +@code{ngx_http_lua_module} or @code{ngx_stream_lua_module}.") + (license license:bsd-2))) -- cgit v1.2.3 From 1263bd0dbf55f340e5292bcee00dd1f3d4eb6ef1 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sun, 11 Oct 2020 17:25:28 +0300 Subject: gnu: Add lua-resty-lrucache. * gnu/packages/lua.scm (lua-resty-lrucache): New variable. --- gnu/packages/lua.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index 774df85170..59d449dfe5 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -917,3 +917,38 @@ (define-public lua-resty-core (description "This package provides a FFI-based Lua API for @code{ngx_http_lua_module} or @code{ngx_stream_lua_module}.") (license license:bsd-2))) + +(define-public lua-resty-lrucache + (package + (name "lua-resty-lrucache") + (version "0.09") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/openresty/lua-resty-lrucache") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1mwiy55qs8bija1kpgizmqgk15ijizzv4sa1giaz9qlqs2kqd7q2")))) + (build-system trivial-build-system) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let* ((luajit-major+minor ,(version-major+minor (package-version lua))) + (package-lua-resty (lambda (input output) + (mkdir-p (string-append output "/lib/lua/" luajit-major+minor)) + (copy-recursively (string-append input "/lib/resty") + (string-append output "/lib/lua/" luajit-major+minor "/resty")) + (symlink (string-append output "/lib/lua/" luajit-major+minor "/resty") + (string-append output "/lib/resty"))))) + (package-lua-resty (assoc-ref %build-inputs "source") + (assoc-ref %outputs "out"))) + #t))) + (home-page "https://github.com/openresty/lua-resty-lrucache") + (synopsis "Lua LRU cache based on the LuaJIT FFI") + (description + "This package provides Lua LRU cache based on the LuaJIT FFI.") + (license license:bsd-2))) -- cgit v1.2.3 From 8688fd8fa1970c155f520dcc95afccecd3e10a2d Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sun, 11 Oct 2020 17:26:32 +0300 Subject: gnu: Add lua-resty-signal. * gnu/packages/lua.scm (lua-resty-signal): New variable. --- gnu/packages/lua.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index 59d449dfe5..60f88c1536 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -952,3 +952,43 @@ (define-public lua-resty-lrucache (description "This package provides Lua LRU cache based on the LuaJIT FFI.") (license license:bsd-2))) + +(define-public lua-resty-signal + (package + (name "lua-resty-signal") + (version "0.02") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/openresty/lua-resty-signal") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "13y1pqn45y49mhqwywasfdsid46d0c33yi6mrnracbnmvyxz1cif")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ;TODO: Run the test suite. + #:make-flags (list "CC=gcc" + (string-append "PREFIX=" %output)) + #:phases + (modify-phases %standard-phases + (delete 'configure) + (add-after 'install 'install-lua + (lambda* (#:key inputs outputs #:allow-other-keys) + (use-modules (guix build utils)) + (let* ((luajit-major+minor ,(version-major+minor (package-version lua))) + (package-lua-resty (lambda (input output) + (mkdir-p (string-append output "/lib/lua/" luajit-major+minor)) + (copy-recursively (string-append input "/lib/resty") + (string-append output "/lib/lua/" luajit-major+minor "/resty")) + (symlink (string-append output "/lib/lua/" luajit-major+minor "/resty") + (string-append output "/lib/resty"))))) + (package-lua-resty (assoc-ref inputs "source") + (assoc-ref outputs "out"))) + #t))))) + (home-page "https://github.com/openresty/lua-resty-signal") + (synopsis "Lua library for killing or sending signals to Linux processes") + (description "This package provides Lua library for killing or sending +signals to Linux processes.") + (license license:bsd-3))) -- cgit v1.2.3 From 0100fd06c947225b44ccc72069886cc8be10f6bc Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sun, 11 Oct 2020 17:26:53 +0300 Subject: gnu: Add lua-tablepool. * gnu/packages/lua.scm (lua-tablepool): New variable. --- gnu/packages/lua.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index 60f88c1536..d30692d2df 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -992,3 +992,35 @@ (define-public lua-resty-signal (description "This package provides Lua library for killing or sending signals to Linux processes.") (license license:bsd-3))) + +(define-public lua-tablepool + (package + (name "lua-tablepool") + (version "0.01") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/openresty/lua-tablepool") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "03yjj3w6znvj6843prg84m0lkrn49l901f9hj9bgy3cj9s0awl6y")))) + (build-system trivial-build-system) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let* ((luajit-major+minor ,(version-major+minor (package-version lua))) + (package-lua-resty (lambda (input output) + (mkdir-p (string-append output "/lib/lua/" luajit-major+minor)) + (copy-recursively (string-append input "/lib") + (string-append output "/lib"))))) + (package-lua-resty (assoc-ref %build-inputs "source") + (assoc-ref %outputs "out"))) + #t))) + (home-page "https://github.com/openresty/lua-tablepool") + (synopsis "Lua table recycling pools for LuaJIT") + (description "This package provides Lua table recycling pools for LuaJIT.") + (license license:bsd-2))) -- cgit v1.2.3 From 89c4122ec9b816e5d6902c3b17e912543fd21033 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sun, 11 Oct 2020 17:27:07 +0300 Subject: gnu: Add lua-resty-shell. * gnu/packages/lua.scm (lua-resty-shell): New variable. --- gnu/packages/lua.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index d30692d2df..2f21d85d0b 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -1024,3 +1024,38 @@ (define-public lua-tablepool (synopsis "Lua table recycling pools for LuaJIT") (description "This package provides Lua table recycling pools for LuaJIT.") (license license:bsd-2))) + +(define-public lua-resty-shell + (package + (name "lua-resty-shell") + (version "0.03") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/openresty/lua-resty-shell") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1s6g04ip4hr97r2pd8ry3alq063604s9a3l0hn9nsidh81ps4dp7")))) + (build-system trivial-build-system) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let* ((luajit-major+minor ,(version-major+minor (package-version lua))) + (package-lua-resty (lambda (input output) + (mkdir-p (string-append output "/lib/lua/" luajit-major+minor)) + (copy-recursively (string-append input "/lib/resty") + (string-append output "/lib/lua/" luajit-major+minor "/resty")) + (symlink (string-append output "/lib/lua/" luajit-major+minor "/resty") + (string-append output "/lib/resty"))))) + (package-lua-resty (assoc-ref %build-inputs "source") + (assoc-ref %outputs "out"))) + #t))) + (home-page "https://github.com/openresty/lua-resty-shell") + (synopsis "Lua module for nonblocking system shell command executions") + (description "This package provides Lua module for nonblocking system +shell command executions.") + (license license:bsd-3))) -- cgit v1.2.3 From 4b0e08beb2620336910197738df8ce1e36abda33 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sun, 11 Oct 2020 20:41:41 +0300 Subject: gnu: Add nginx-socket-cloexec. * gnu/packages/patches/nginx-socket-cloexec.patch: New file. * gnu/local.mk (dist_patch_DATA): Add this. * gnu/packages/web.scm (nginx-socket-cloexec): New variable. --- gnu/local.mk | 1 + gnu/packages/patches/nginx-socket-cloexec.patch | 185 ++++++++++++++++++++++++ gnu/packages/web.scm | 10 ++ 3 files changed, 196 insertions(+) create mode 100644 gnu/packages/patches/nginx-socket-cloexec.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index d09875c583..e29ff89d9e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1362,6 +1362,7 @@ dist_patch_DATA = \ %D%/packages/patches/nfs4-acl-tools-0.3.7-fixpaths.patch \ %D%/packages/patches/ngircd-handle-zombies.patch \ %D%/packages/patches/network-manager-plugin-path.patch \ + %D%/packages/patches/nginx-socket-cloexec.patch \ %D%/packages/patches/nsis-env-passthru.patch \ %D%/packages/patches/nss-increase-test-timeout.patch \ %D%/packages/patches/nss-pkgconfig.patch \ diff --git a/gnu/packages/patches/nginx-socket-cloexec.patch b/gnu/packages/patches/nginx-socket-cloexec.patch new file mode 100644 index 0000000000..985ce573b5 --- /dev/null +++ b/gnu/packages/patches/nginx-socket-cloexec.patch @@ -0,0 +1,185 @@ +diff --git a/auto/unix b/auto/unix +index 10835f6c..b5b33bb3 100644 +--- a/auto/unix ++++ b/auto/unix +@@ -990,3 +990,27 @@ ngx_feature_test='struct addrinfo *res; + if (getaddrinfo("localhost", NULL, NULL, &res) != 0) return 1; + freeaddrinfo(res)' + . auto/feature ++ ++ngx_feature="SOCK_CLOEXEC support" ++ngx_feature_name="NGX_HAVE_SOCKET_CLOEXEC" ++ngx_feature_run=no ++ngx_feature_incs="#include ++ #include " ++ngx_feature_path= ++ngx_feature_libs= ++ngx_feature_test="int fd; ++ fd = socket(AF_INET, SOCK_STREAM | SOCK_CLOEXEC, 0);" ++. auto/feature ++ ++ngx_feature="FD_CLOEXEC support" ++ngx_feature_name="NGX_HAVE_FD_CLOEXEC" ++ngx_feature_run=no ++ngx_feature_incs="#include ++ #include ++ #include " ++ngx_feature_path= ++ngx_feature_libs= ++ngx_feature_test="int fd; ++ fd = socket(AF_INET, SOCK_STREAM, 0); ++ fcntl(fd, F_SETFD, FD_CLOEXEC);" ++. auto/feature +diff --git a/src/core/ngx_resolver.c b/src/core/ngx_resolver.c +index cd55520c..438e0806 100644 +--- a/src/core/ngx_resolver.c ++++ b/src/core/ngx_resolver.c +@@ -4466,8 +4466,14 @@ ngx_tcp_connect(ngx_resolver_connection_t *rec) + ngx_event_t *rev, *wev; + ngx_connection_t *c; + ++#if (NGX_HAVE_SOCKET_CLOEXEC) ++ s = ngx_socket(rec->sockaddr->sa_family, SOCK_STREAM | SOCK_CLOEXEC, 0); ++ ++#else + s = ngx_socket(rec->sockaddr->sa_family, SOCK_STREAM, 0); + ++#endif ++ + ngx_log_debug1(NGX_LOG_DEBUG_EVENT, &rec->log, 0, "TCP socket %d", s); + + if (s == (ngx_socket_t) -1) { +@@ -4494,6 +4500,15 @@ ngx_tcp_connect(ngx_resolver_connection_t *rec) + goto failed; + } + ++#if (NGX_HAVE_FD_CLOEXEC) ++ if (ngx_cloexec(s) == -1) { ++ ngx_log_error(NGX_LOG_ALERT, &rec->log, ngx_socket_errno, ++ ngx_cloexec_n " failed"); ++ ++ goto failed; ++ } ++#endif ++ + rev = c->read; + wev = c->write; + +diff --git a/src/event/ngx_event.h b/src/event/ngx_event.h +index 19fec68..8c2f01a 100644 +--- a/src/event/ngx_event.h ++++ b/src/event/ngx_event.h +@@ -73,6 +73,9 @@ struct ngx_event_s { + /* to test on worker exit */ + unsigned channel:1; + unsigned resolver:1; ++#if (HAVE_SOCKET_CLOEXEC_PATCH) ++ unsigned skip_socket_leak_check:1; ++#endif + + unsigned cancelable:1; + +diff --git a/src/event/ngx_event_accept.c b/src/event/ngx_event_accept.c +index 77563709..5827b9d0 100644 +--- a/src/event/ngx_event_accept.c ++++ b/src/event/ngx_event_accept.c +@@ -62,7 +62,9 @@ ngx_event_accept(ngx_event_t *ev) + + #if (NGX_HAVE_ACCEPT4) + if (use_accept4) { +- s = accept4(lc->fd, &sa.sockaddr, &socklen, SOCK_NONBLOCK); ++ s = accept4(lc->fd, &sa.sockaddr, &socklen, ++ SOCK_NONBLOCK | SOCK_CLOEXEC); ++ + } else { + s = accept(lc->fd, &sa.sockaddr, &socklen); + } +@@ -202,6 +204,16 @@ ngx_event_accept(ngx_event_t *ev) + ngx_close_accepted_connection(c); + return; + } ++ ++#if (NGX_HAVE_FD_CLOEXEC) ++ if (ngx_cloexec(s) == -1) { ++ ngx_log_error(NGX_LOG_ALERT, ev->log, ngx_socket_errno, ++ ngx_cloexec_n " failed"); ++ ngx_close_accepted_connection(c); ++ return; ++ } ++#endif ++ + } + } + +diff --git a/src/event/ngx_event_connect.c b/src/event/ngx_event_connect.c +index c5bb8068..cf33b1d2 100644 +--- a/src/event/ngx_event_connect.c ++++ b/src/event/ngx_event_connect.c +@@ -38,8 +38,15 @@ ngx_event_connect_peer(ngx_peer_connection_t *pc) + + type = (pc->type ? pc->type : SOCK_STREAM); + ++#if (NGX_HAVE_SOCKET_CLOEXEC) ++ s = ngx_socket(pc->sockaddr->sa_family, type | SOCK_CLOEXEC, 0); ++ ++#else + s = ngx_socket(pc->sockaddr->sa_family, type, 0); + ++#endif ++ ++ + ngx_log_debug2(NGX_LOG_DEBUG_EVENT, pc->log, 0, "%s socket %d", + (type == SOCK_STREAM) ? "stream" : "dgram", s); + +@@ -80,6 +87,15 @@ ngx_event_connect_peer(ngx_peer_connection_t *pc) + goto failed; + } + ++#if (NGX_HAVE_FD_CLOEXEC) ++ if (ngx_cloexec(s) == -1) { ++ ngx_log_error(NGX_LOG_ALERT, pc->log, ngx_socket_errno, ++ ngx_cloexec_n " failed"); ++ ++ goto failed; ++ } ++#endif ++ + if (pc->local) { + + #if (NGX_HAVE_TRANSPARENT_PROXY) +diff --git a/src/os/unix/ngx_process_cycle.c b/src/os/unix/ngx_process_cycle.c +index c4376a5..48e8fa8 100644 +--- a/src/os/unix/ngx_process_cycle.c ++++ b/src/os/unix/ngx_process_cycle.c +@@ -1032,6 +1032,9 @@ ngx_worker_process_exit(ngx_cycle_t *cycle) + for (i = 0; i < cycle->connection_n; i++) { + if (c[i].fd != -1 + && c[i].read ++#if (HAVE_SOCKET_CLOEXEC_PATCH) ++ && !c[i].read->skip_socket_leak_check ++#endif + && !c[i].read->accept + && !c[i].read->channel + && !c[i].read->resolver) +diff --git a/src/os/unix/ngx_socket.h b/src/os/unix/ngx_socket.h +index fcc51533..d1eebf47 100644 +--- a/src/os/unix/ngx_socket.h ++++ b/src/os/unix/ngx_socket.h +@@ -38,6 +38,17 @@ int ngx_blocking(ngx_socket_t s); + + #endif + ++#if (NGX_HAVE_FD_CLOEXEC) ++ ++#define ngx_cloexec(s) fcntl(s, F_SETFD, FD_CLOEXEC) ++#define ngx_cloexec_n "fcntl(FD_CLOEXEC)" ++ ++/* at least FD_CLOEXEC is required to ensure connection fd is closed ++ * after execve */ ++#define HAVE_SOCKET_CLOEXEC_PATCH 1 ++ ++#endif ++ + int ngx_tcp_nopush(ngx_socket_t s); + int ngx_tcp_push(ngx_socket_t s); + diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index f291768e12..0c0e159f98 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -551,6 +551,16 @@ (define nginx-xslscript documentation.") (license license:bsd-2)))) +(define nginx-socket-cloexec + (package + (inherit nginx) + (name "nginx-socket-cloexec") ;required for lua-resty-shell + (source + (origin + (inherit (package-source nginx)) + (patches (append (search-patches "nginx-socket-cloexec.patch") + (origin-patches (package-source nginx)))))))) + (define-public lighttpd (package (name "lighttpd") -- cgit v1.2.3 From e835c03e4462dd7f675cbc101fbda5b076cbdd86 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sun, 11 Oct 2020 20:41:58 +0300 Subject: gnu: Add nginx-lua-module. * gnu/packages/web.scm (nginx-lua-module): New variable. --- gnu/packages/web.scm | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 0c0e159f98..97bd8c4a71 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -561,6 +561,69 @@ (define nginx-socket-cloexec (patches (append (search-patches "nginx-socket-cloexec.patch") (origin-patches (package-source nginx)))))))) +(define-public nginx-lua-module + (package + (inherit nginx) + (name "nginx-lua-module") + (version "0.10.15") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/openresty/lua-nginx-module") + (commit (string-append "v" version)))) + (file-name (git-file-name "lua-nginx-module" version)) + (sha256 + (base32 + "1j216isp0546hycklbr5wi8mlga5hq170hk7f2sm16sfavlkh5gz")))) + (build-system gnu-build-system) + (inputs + `(("nginx-sources" ,(package-source nginx-socket-cloexec)) + ("luajit" ,luajit) + ,@(package-inputs nginx))) + (arguments + (substitute-keyword-arguments + `(#:configure-flags '("--add-dynamic-module=.") + #:make-flags '("modules") + #:modules ((guix build utils) + (guix build gnu-build-system) + (ice-9 popen) + (ice-9 regex) + (ice-9 textual-ports)) + ,@(package-arguments nginx)) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'unpack-nginx-sources + (lambda* (#:key inputs native-inputs #:allow-other-keys) + (begin + ;; The nginx source code is part of the module’s source. + (format #t "decompressing nginx source code~%") + (let ((tar (assoc-ref inputs "tar")) + (nginx-srcs (assoc-ref inputs "nginx-sources"))) + (invoke (string-append tar "/bin/tar") + "xvf" nginx-srcs "--strip-components=1")) + #t))) + (add-before 'configure 'set-luajit-env + (lambda* (#:key inputs #:allow-other-keys) + (let ((luajit (assoc-ref inputs "luajit"))) + (setenv "LUAJIT_LIB" + (string-append luajit "/lib")) + (setenv "LUAJIT_INC" + (string-append luajit "/include/luajit-2.1")) + #t))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((modules-dir (string-append (assoc-ref outputs "out") "/etc/nginx/modules"))) + (mkdir-p modules-dir) + (copy-file "objs/ngx_http_lua_module.so" + (string-append modules-dir "/ngx_http_lua_module.so")) + #t))) + (delete 'fix-root-dirs) + (delete 'install-man-page))))) + (synopsis "NGINX module for Lua programming language support") + (description "This NGINX module provides a scripting support with Lua +programming language."))) + (define-public lighttpd (package (name "lighttpd") -- cgit v1.2.3 From 00014f769233facebd84f13a00b10032a22cb440 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sun, 11 Oct 2020 20:42:48 +0300 Subject: services: nginx: Add lua module. * gnu/services/web.scm () [lua-package-path, lua-package-cpath]: New record types. * gnu/services/web.scm (default-nginx-config): Use them. * doc/guix.texi (Web Services): Document this. * doc/guix-cookbook.texi (System Configuration): Document this. --- doc/guix-cookbook.texi | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++ doc/guix.texi | 24 ++++++++++++++++++++- gnu/services/web.scm | 25 +++++++++++++++++----- 3 files changed, 101 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/doc/guix-cookbook.texi b/doc/guix-cookbook.texi index affb68ca12..db3d7e505b 100644 --- a/doc/guix-cookbook.texi +++ b/doc/guix-cookbook.texi @@ -1353,6 +1353,7 @@ reference. * Running Guix on a Linode Server:: Running Guix on a Linode Server * Setting up a bind mount:: Setting up a bind mount in the file-systems definition. * Getting substitutes from Tor:: Configuring Guix daemon to get substitutes through Tor. +* Setting up NGINX with Lua:: Configuring NGINX web-server to load Lua modules. @end menu @node Customizing the Kernel @@ -2114,6 +2115,63 @@ sudo herd set-http-proxy guix-daemon http://localhost:9250 guix build --substitute-urls=https://bp7o7ckwlewr4slm.onion … @end example +@node Setting up NGINX with Lua +@section Setting up NGINX with Lua +@cindex nginx, lua, openresty, resty + +NGINX could be extended with Lua scripts. + +Guix provides NGINX service with ability to load Lua module and specific +Lua packages, and reply to requests by evaluating Lua scripts. + +The following example demonstrates system definition with configuration +to evaluate @file{index.lua} Lua script on HTTP request to +@uref{http://localhost/hello} endpoint: + +@example +local shell = require "resty.shell" + +local stdin = "" +local timeout = 1000 -- ms +local max_size = 4096 -- byte + +local ok, stdout, stderr, reason, status = + shell.run([[/run/current-system/profile/bin/ls /tmp]], stdin, timeout, max_size) + +ngx.say(stdout) +@end example + +@lisp +(use-modules (gnu)) +(use-service-modules #;… web) +(use-package-modules #;… lua) +(operating-system + ;; … + (services + ;; … + (service nginx-service-type + (nginx-configuration + (modules + (list + (file-append nginx-lua-module "/etc/nginx/modules/ngx_http_lua_module.so"))) + (lua-package-path (list lua-resty-core + lua-resty-lrucache + lua-resty-signal + lua-tablepool + lua-resty-shell)) + (lua-package-cpath (list lua-resty-signal)) + (server-blocks + (list (nginx-server-configuration + (server-name '("localhost")) + (listen '("80")) + (root "/etc") + (locations (list + (nginx-location-configuration + (uri "/hello") + (body (list #~(format #f "content_by_lua_file ~s;" + #$(local-file "index.lua")))))))))))))) +@end lisp + @c ********************************************************************* @node Advanced package management @chapter Advanced package management diff --git a/doc/guix.texi b/doc/guix.texi index ff33735c3a..2374c956e5 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -21984,7 +21984,29 @@ names of loadable modules, as in this example: (modules (list (file-append nginx-accept-language-module "\ -/etc/nginx/modules/ngx_http_accept_language_module.so"))) +/etc/nginx/modules/ngx_http_accept_language_module.so") + (file-append nginx-lua-module "\ +/etc/nginx/modules/ngx_http_lua_module.so"))) +@end lisp + +@item @code{lua-package-path} (default: @code{'()}) +List of nginx lua packages to load. This should be a list of package +names of loadable lua modules, as in this example: + +@lisp +(lua-package-path (list lua-resty-core + lua-resty-lrucache + lua-resty-signal + lua-tablepool + lua-resty-shell)) +@end lisp + +@item @code{lua-package-cpath} (default: @code{'()}) +List of nginx lua C packages to load. This should be a list of package +names of loadable lua C modules, as in this example: + +@lisp +(lua-package-cpath (list lua-resty-signal)) @end lisp @item @code{global-directives} (default: @code{'((events . ()))}) diff --git a/gnu/services/web.scm b/gnu/services/web.scm index b2d1dcf0ee..a74c6c54b4 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2020 Ricardo Wurmus ;;; Copyright © 2020 Tobias Geerinckx-Rice ;;; Copyright © 2020 Arun Isaac +;;; Copyright © 2020 Oleg Pykhalov ;;; ;;; This file is part of GNU Guix. ;;; @@ -525,6 +526,10 @@ (define-record-type* (modules nginx-configuration-modules (default '())) (global-directives nginx-configuration-global-directives (default '((events . ())))) + (lua-package-path nginx-lua-package-path ;list of + (default #f)) + (lua-package-cpath nginx-lua-package-cpath ;list of + (default #f)) (extra-content nginx-configuration-extra-content (default "")) (file nginx-configuration-file ;#f | string | file-like @@ -630,6 +635,8 @@ (define (default-nginx-config config) server-names-hash-bucket-max-size modules global-directives + lua-package-path + lua-package-cpath extra-content) (apply mixed-text-file "nginx.conf" (flatten @@ -646,11 +653,19 @@ (define (default-nginx-config config) " scgi_temp_path " run-directory "/scgi_temp;\n" " access_log " log-directory "/access.log;\n" " include " nginx "/share/nginx/conf/mime.types;\n" - (if server-names-hash-bucket-size - (string-append - " server_names_hash_bucket_size " - (number->string server-names-hash-bucket-size) - ";\n") + (if lua-package-path + #~(format #f " lua_package_path ~s;~%" + (string-join (map (lambda (path) + (string-append path "/lib/?.lua")) + '#$lua-package-path) + ";")) + "") + (if lua-package-cpath + #~(format #f " lua_package_cpath ~s;~%" + (string-join (map (lambda (cpath) + (string-append cpath "/lib/lua/?.lua")) + '#$lua-package-cpath) + ";")) "") (if server-names-hash-bucket-max-size (string-append -- cgit v1.2.3 From be0c94a3780c5a11ee50df31ebbfd950bcd00815 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 15 Oct 2020 09:13:07 +0300 Subject: gnu: nginx-lua-module: Use install-file. * gnu/packages/web.scm (nginx-lua-module)[arguments]: Use 'install-file' in custom 'install phase. --- gnu/packages/web.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 97bd8c4a71..647e481c0a 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -613,10 +613,9 @@ (define-public nginx-lua-module #t))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) - (let ((modules-dir (string-append (assoc-ref outputs "out") "/etc/nginx/modules"))) - (mkdir-p modules-dir) - (copy-file "objs/ngx_http_lua_module.so" - (string-append modules-dir "/ngx_http_lua_module.so")) + (let ((modules-dir (string-append (assoc-ref outputs "out") + "/etc/nginx/modules"))) + (install-file "objs/ngx_http_lua_module.so" modules-dir) #t))) (delete 'fix-root-dirs) (delete 'install-man-page))))) -- cgit v1.2.3 From ec2a8f602ee0fd2fac2210eeae6d1da091bb47e4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 15 Oct 2020 08:37:25 +0200 Subject: gnu: mpd: Update to 0.22. * gnu/packages/mpd.scm (mpd): Update to 0.22. [arguments]: Use "enabled" instead of "true". --- gnu/packages/mpd.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index f3e98ccb17..cb063150e2 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2016, 2018, 2019, 2020 Leo Famulari ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019 Evan Straw +;;; Copyright © 2020 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -93,7 +94,7 @@ (define-public libmpdclient (define-public mpd (package (name "mpd") - (version "0.21.26") + (version "0.22") (source (origin (method url-fetch) (uri @@ -102,10 +103,10 @@ (define-public mpd "/mpd-" version ".tar.xz")) (sha256 (base32 - "1sjfx9ln2zik5fr5mdjy1w184hgjn89v67i85z09x0m6qwhq5rpr")))) + "0xlhwdbnww7gjw474j54j94iwrzbzlqvnv6chlkga6yh4pcl5rvx")))) (build-system meson-build-system) (arguments - `(#:configure-flags '("-Ddocumentation=true"))) ;the default is 'false'... + `(#:configure-flags '("-Ddocumentation=enabled"))) (inputs `(("ao" ,ao) ("alsa-lib" ,alsa-lib) ("avahi" ,avahi) -- cgit v1.2.3 From d623ece56624fd7d611cdaf42f728b21d89fec5c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 15 Oct 2020 10:39:33 +0300 Subject: gnu: slurm: Re-arrange package inputs. * gnu/packages/parallel.scm (slurm)[inputs]: Move expect, perl, python-wrapper from here... [native-inputs]: ... to here. --- gnu/packages/parallel.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index 585be21607..b600a1e5b2 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -140,19 +140,19 @@ (define-public slurm #t)))) ;; FIXME: More optional inputs could be added, ;; in particular mysql and gtk+. - (inputs `(("expect" ,expect) - ("freeipmi" ,freeipmi) + (inputs `(("freeipmi" ,freeipmi) ("hwloc" ,hwloc-2 "lib") ("json-c" ,json-c) ("linux-pam" , linux-pam) ("munge" ,munge) ("numactl" ,numactl) - ("perl" ,perl) - ("python" ,python-wrapper) ("readline" ,readline))) (native-inputs `(("autoconf" ,autoconf) - ("pkg-config" ,pkg-config))) + ("expect" ,expect) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("python" ,python-wrapper))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 993b3af6405305adc0ca921ef59412d43b4f9d63 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Thu, 15 Oct 2020 10:06:12 +0200 Subject: gnu: cuirass: Update to 0.0.1-53.df2d136. * gnu/packages/ci.scm (cuirass): Update to 0.0.1-53.df2d136. --- gnu/packages/ci.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index f2cc028752..517b20f448 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -68,8 +68,8 @@ (define-public guile-sqlite3-dev (file-name (string-append name "-" version "-checkout"))))))) (define-public cuirass - (let ((commit "38ee2c5b5b21404f383fc5066af8141785676e56") - (revision "52")) + (let ((commit "df2d13621f4b2ace33a460746e704115b7b1541e") + (revision "53")) (package (name "cuirass") (version (git-version "0.0.1" revision commit)) @@ -81,7 +81,7 @@ (define-public cuirass (file-name (git-file-name name version)) (sha256 (base32 - "13z862i668v2c6w3ajb1mddkzfcdc16myjqz7gss59bykzag728p")))) + "1vgb1wl1rkijm1vv5chqllf4i5w1j7g02xqlaf2xmqjh2phy5dxa")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) -- cgit v1.2.3 From e6e076281e62518056987e9ddd3d96fccab20475 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 9 Oct 2020 12:47:34 +0300 Subject: system: Add %base-packages-disk-utilities. * gnu/system.scm (%base-packages-disk-utilities): New variable. --- gnu/system.scm | 36 +++++++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/system.scm b/gnu/system.scm index ab1b0ff3de..a56fdc6304 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2020 Florian Pelz ;;; Copyright © 2020 Maxim Cournoyer ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2020 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -38,24 +39,27 @@ (define-module (gnu system) #:use-module ((guix utils) #:select (substitute-keyword-arguments)) #:use-module (guix i18n) #:use-module (guix diagnostics) + #:use-module (gnu packages admin) #:use-module (gnu packages base) #:use-module (gnu packages bash) + #:use-module (gnu packages compression) #:use-module (gnu packages cross-base) + #:use-module (gnu packages cryptsetup) + #:use-module (gnu packages disk) + #:use-module (gnu packages file-systems) + #:use-module (gnu packages firmware) + #:use-module (gnu packages gawk) #:use-module (gnu packages guile) #:use-module (gnu packages guile-xyz) - #:use-module (gnu packages admin) #:use-module (gnu packages hurd) - #:use-module (gnu packages linux) - #:use-module (gnu packages pciutils) - #:use-module (gnu packages package-management) #:use-module (gnu packages less) - #:use-module (gnu packages zile) - #:use-module (gnu packages nano) - #:use-module (gnu packages gawk) + #:use-module (gnu packages linux) #:use-module (gnu packages man) + #:use-module (gnu packages nano) + #:use-module (gnu packages package-management) + #:use-module (gnu packages pciutils) #:use-module (gnu packages texinfo) - #:use-module (gnu packages compression) - #:use-module (gnu packages firmware) + #:use-module (gnu packages zile) #:use-module (gnu services) #:use-module (gnu services shepherd) #:use-module (gnu services base) @@ -159,6 +163,7 @@ (define-module (gnu system) %base-packages-interactive %base-packages-linux %base-packages-networking + %base-packages-disk-utilities %base-packages-utils %base-firmware %default-kernel-arguments)) @@ -728,6 +733,19 @@ (define %base-packages-networking ;; many people are familiar with, so keep it around. iw wireless-tools)) +(define %base-packages-disk-utilities + ;; A well-rounded set of packages for interacting with disks, partitions + ;; and filesystems. + (list parted gptfdisk ddrescue + ;; We used to provide fdisk from GNU fdisk, but as of version 2.0.0a + ;; it pulls Guile 1.8, which takes unreasonable space; furthermore + ;; util-linux's fdisk is already available, in %base-packages-linux. + cryptsetup mdadm + dosfstools + btrfs-progs + f2fs-tools + jfsutils)) + (define %base-packages ;; Default set of packages globally visible. It should include anything ;; required for basic administrator tasks. -- cgit v1.2.3 From 4170af491c8bc3b0a5308116a26e758d8ff245c5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 9 Oct 2020 12:51:26 +0300 Subject: install: Deduplicate packages with %base-package sets. * gnu/system.scm (%base-packages-interactive): Add nvi. * gnu/system/install.scm (installation-os)[packages]: Remove parted, gptfdisk, ddrescue, cryptsetup, mdadm, dosfstools, btrfs-progs, f2fs-tools, jfstools, openssh, wireless-tools, iw, wpa-supplicant-minimal, iproute, bash-completion, nvi. Add %base-packages-disk-utilities. --- gnu/system.scm | 2 ++ gnu/system/install.scm | 37 ++++++++++--------------------------- 2 files changed, 12 insertions(+), 27 deletions(-) (limited to 'gnu') diff --git a/gnu/system.scm b/gnu/system.scm index a56fdc6304..59dfeb99b4 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -56,6 +56,7 @@ (define-module (gnu system) #:use-module (gnu packages linux) #:use-module (gnu packages man) #:use-module (gnu packages nano) + #:use-module (gnu packages nvi) #:use-module (gnu packages package-management) #:use-module (gnu packages pciutils) #:use-module (gnu packages texinfo) @@ -715,6 +716,7 @@ (define %base-packages-linux (define %base-packages-interactive ;; Default set of common interactive packages. (list less zile nano + nvi man-db info-reader ;the standalone Info reader (no Perl) bash-completion diff --git a/gnu/system/install.scm b/gnu/system/install.scm index eb342665e5..7701297411 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2020 Florian Pelz +;;; Copyright © 2020 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -41,18 +42,13 @@ (define-module (gnu system install) #:use-module (gnu packages bash) #:use-module (gnu packages bootloaders) #:use-module (gnu packages certs) - #:use-module (gnu packages file-systems) + #:use-module (gnu packages compression) #:use-module (gnu packages fonts) #:use-module (gnu packages fontutils) #:use-module (gnu packages guile) #:use-module (gnu packages linux) - #:use-module (gnu packages ssh) - #:use-module (gnu packages cryptsetup) #:use-module (gnu packages package-management) - #:use-module (gnu packages disk) #:use-module (gnu packages texinfo) - #:use-module (gnu packages compression) - #:use-module (gnu packages nvi) #:use-module (gnu packages xorg) #:use-module (ice-9 match) #:use-module (srfi srfi-26) @@ -496,27 +492,14 @@ (define installation-os ;; Explicitly allow for empty passwords. (base-pam-services #:allow-empty-passwords? #t)) - (packages (cons* glibc ;for 'tzselect' & co. - parted gptfdisk ddrescue - fontconfig - font-dejavu font-gnu-unifont - grub ;mostly so xrefs to its manual work - cryptsetup - mdadm - dosfstools ;mkfs.fat, for the UEFI boot partition - btrfs-progs - f2fs-tools - jfsutils - openssh ;we already have sshd, having ssh/scp can help - wireless-tools iw wpa-supplicant-minimal iproute - ;; XXX: We used to have GNU fdisk here, but as of version - ;; 2.0.0a, that pulls Guile 1.8, which takes unreasonable - ;; space; furthermore util-linux's fdisk is already - ;; available here, so we keep that. - bash-completion - nvi ;:wq! - nss-certs ; To access HTTPS, use git, etc. - %base-packages)))) + (packages (append + (list glibc ; for 'tzselect' & co. + fontconfig + font-dejavu font-gnu-unifont + grub ; mostly so xrefs to its manual work + nss-certs) ; To access HTTPS, use git, etc. + %base-packages-disk-utilities + %base-packages)))) (define* (os-with-u-boot os board #:key (bootloader-target "/dev/mmcblk0") (triplet "arm-linux-gnueabihf")) -- cgit v1.2.3 From b168f2ba53b938e1b322c79e5bfa47fcc506b803 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 14 Oct 2020 21:15:28 -0400 Subject: gnu: claws-mail: Make some cosmetic changes. * gnu/packages/mail.scm (claws-mail): Make some cosmetic changes. Signed-off-by: Danny Milosavljevic --- gnu/packages/mail.scm | 111 +++++++++++++++++++++++++++----------------------- 1 file changed, 59 insertions(+), 52 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 87c7529180..2234168eeb 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1320,61 +1320,68 @@ (define-public claws-mail (package (name "claws-mail") (version "3.17.7") - (source (origin - (method url-fetch) - (uri (string-append - "https://www.claws-mail.org/releases/claws-mail-" version - ".tar.xz")) - (sha256 - (base32 - "1j6x09621wng0lavh53nwzh9vqjzpspl8kh5azh7kbihpi4ldfb0")))) + (source + (origin + (method url-fetch) + (uri + (string-append + "https://www.claws-mail.org/releases/claws-mail-" + version ".tar.xz")) + (sha256 + (base32 "1j6x09621wng0lavh53nwzh9vqjzpspl8kh5azh7kbihpi4ldfb0")))) (build-system gnu-build-system) - (native-inputs `(("pkg-config" ,pkg-config))) - (inputs `(("bogofilter" ,bogofilter) - ("curl" ,curl) - ("dbus-glib" ,dbus-glib) - ("enchant" ,enchant) - ("expat" ,expat) - ("ghostscript" ,ghostscript) - ("hicolor-icon-theme" ,hicolor-icon-theme) - ("gnupg" ,gnupg) - ("gnutls" ,gnutls) - ("gpgme" ,gpgme) - ("gtk" ,gtk+-2) - ("libarchive" ,libarchive) - ("libcanberra" ,libcanberra) - ("libetpan" ,libetpan) - ("libical" ,libical) - ("libnotify" ,libnotify) - ("libsm" ,libsm) - ("libxml2" ,libxml2) - ("perl" ,perl) - ("python-2" ,python-2) - ("mime-info" ,shared-mime-info) - ("startup-notification" ,startup-notification))) (arguments - '(#:configure-flags - '("--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 - ;; otherwise. - '("gtk_update_icon_cache=true") - #:phases (modify-phases %standard-phases - (add-before 'build 'patch-mime - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "src/procmime.c" - (("/usr/share/mime/globs") - (string-append (assoc-ref inputs "mime-info") - "/share/mime/globs")))))))) + `(#:configure-flags + (list + "--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 + ;; otherwise. + (list + "gtk_update_icon_cache=true") + #:phases + (modify-phases %standard-phases + (add-before 'build 'patch-mime + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/procmime.c" + (("/usr/share/mime/globs") + (string-append (assoc-ref inputs "mime-info") + "/share/mime/globs")))))))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("bogofilter" ,bogofilter) + ("curl" ,curl) + ("dbus-glib" ,dbus-glib) + ("enchant" ,enchant) + ("expat" ,expat) + ("ghostscript" ,ghostscript) + ("hicolor-icon-theme" ,hicolor-icon-theme) + ("gnupg" ,gnupg) + ("gnutls" ,gnutls) + ("gpgme" ,gpgme) + ("gtk" ,gtk+-2) + ("libarchive" ,libarchive) + ("libcanberra" ,libcanberra) + ("libetpan" ,libetpan) + ("libical" ,libical) + ("libnotify" ,libnotify) + ("libsm" ,libsm) + ("libxml2" ,libxml2) + ("perl" ,perl) + ("python-2" ,python-2) + ("mime-info" ,shared-mime-info) + ("startup-notification" ,startup-notification))) (synopsis "GTK-based Email client") - (description - "Claws-Mail is an email client (and news reader) based on GTK+. The -appearance and interface are designed to be familiar to new users coming from -other popular email clients, as well as experienced users. Almost all commands -are accessible with the keyboard. Plus, Claws-Mail is extensible via addons -which can add many functionalities to the base client.") + (description "Claws-Mail is an email client (and news reader) based on GTK+. +The appearance and interface are designed to be familiar to new users coming +from other popular email clients, as well as experienced users. Almost all +commands are accessible with the keyboard. Plus, Claws-Mail is extensible via +addons which can add many functionalities to the base client.") (home-page "https://www.claws-mail.org/") (license license:gpl3+))) ; most files are actually public domain or x11 -- cgit v1.2.3 From 7269a591361138ac6fc122d465e45e2b8c4944be Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 14 Oct 2020 21:18:29 -0400 Subject: gnu: claws-mail: Change build-system. * gnu/packages/mail.scm (claws-mail) [build-system]: Change from gnu-build-system to glib-or-gtk-build-system. Signed-off-by: Danny Milosavljevic --- gnu/packages/mail.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 2234168eeb..87e45fa988 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -142,6 +142,7 @@ (define-module (gnu packages mail) #:use-module (guix git-download) #:use-module (guix svn-download) #:use-module (guix utils) + #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) #:use-module (guix build-system guile) #:use-module (guix build-system perl) @@ -1329,7 +1330,7 @@ (define-public claws-mail version ".tar.xz")) (sha256 (base32 "1j6x09621wng0lavh53nwzh9vqjzpspl8kh5azh7kbihpi4ldfb0")))) - (build-system gnu-build-system) + (build-system glib-or-gtk-build-system) (arguments `(#:configure-flags (list -- cgit v1.2.3 From 057a8868fb9a38661adbf5e94b8a2b0803871dff Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 14 Oct 2020 10:32:13 -0400 Subject: gnu: libbacktrace: Correct license. * gnu/packages/debug.scm (libbacktrace)[license]: Correct from expat to bsd-3. --- gnu/packages/debug.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm index 9041cac4e2..9dc32c70f4 100644 --- a/gnu/packages/debug.scm +++ b/gnu/packages/debug.scm @@ -649,7 +649,7 @@ (define-public libbacktrace (synopsis "C library for producing symbolic backtraces") (description "The @code{libbacktrace} library can be linked into a C/C++ program to produce symbolic backtraces.") - (license license:expat)))) + (license license:bsd-3)))) (define-public libleak (package -- cgit v1.2.3 From aea459a50474b98f31f6ce7da9468a98958ef949 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Wed, 30 Sep 2020 17:49:32 +0200 Subject: gnu: unison: Build with ocaml-4.09. * gnu/packages/ocaml.scm (unison)[sources]: Add an upstream patch. [native-inputs]: Use ocaml-4.09. * gnu/packages/patches/unison-fix-ocaml-4.08.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/ocaml.scm | 5 +- gnu/packages/patches/unison-fix-ocaml-4.08.patch | 81 ++++++++++++++++++++++++ 3 files changed, 85 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/unison-fix-ocaml-4.08.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index e29ff89d9e..d41b65957e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1641,6 +1641,7 @@ dist_patch_DATA = \ %D%/packages/patches/ucx-tcp-iface-ioctl.patch \ %D%/packages/patches/udiskie-no-appindicator.patch \ %D%/packages/patches/ungoogled-chromium-system-nspr.patch \ + %D%/packages/patches/unison-fix-ocaml-4.08.patch \ %D%/packages/patches/unknown-horizons-python-3.8-distro.patch \ %D%/packages/patches/unzip-CVE-2014-8139.patch \ %D%/packages/patches/unzip-CVE-2014-8140.patch \ diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index d61948afc3..394db50150 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -861,12 +861,13 @@ (define-public unison (file-name (git-file-name name version)) (sha256 (base32 - "1bykiyc0dc5pkw8x370qkg2kygq9pq7yqzsgczd3y13b6ivm4sdq")))) + "1bykiyc0dc5pkw8x370qkg2kygq9pq7yqzsgczd3y13b6ivm4sdq")) + (patches (search-patches "unison-fix-ocaml-4.08.patch")))) (build-system gnu-build-system) (outputs '("out" "doc")) ; 1.9 MiB of documentation (native-inputs - `(("ocaml" ,ocaml-4.07) + `(("ocaml" ,ocaml-4.09) ;; For documentation ("ghostscript" ,ghostscript) ("texlive" ,texlive-tiny) diff --git a/gnu/packages/patches/unison-fix-ocaml-4.08.patch b/gnu/packages/patches/unison-fix-ocaml-4.08.patch new file mode 100644 index 0000000000..811f590721 --- /dev/null +++ b/gnu/packages/patches/unison-fix-ocaml-4.08.patch @@ -0,0 +1,81 @@ +This patch is taken from the opam repository: +https://github.com/ocaml/opam-repository/blob/master/packages/unison/unison.2.51.2/files/ocaml48.patch + +It fixes compatibility with changes introduced in OCaml 4.08. + +diff --git a/src/Makefile.OCaml b/src/Makefile.OCaml +index 7cefa2e..378fc8b 100644 +--- a/src/Makefile.OCaml ++++ b/src/Makefile.OCaml +@@ -272,7 +272,7 @@ endif + + # Gtk GUI + ifeq ($(UISTYLE), gtk) +- CAMLFLAGS+=-I +lablgtk ++ CAMLFLAGS+=-I $(LABLGTKLIB) + OCAMLOBJS+=pixmaps.cmo uigtk.cmo linkgtk.cmo + OCAMLLIBS+=lablgtk.cma + endif +@@ -282,7 +282,7 @@ OCAMLFIND := $(shell command -v ocamlfind 2> /dev/null) + + ifeq ($(UISTYLE), gtk2) + ifndef OCAMLFIND +- CAMLFLAGS+=-I +lablgtk2 ++ CAMLFLAGS+=-I $(LABLGTK2LIB) + else + CAMLFLAGS+=$(shell $(OCAMLFIND) query -i-format lablgtk2 ) + endif +diff --git a/src/files.ml b/src/files.ml +index 5ff1881..1d1fbcc 100644 +--- a/src/files.ml ++++ b/src/files.ml +@@ -734,7 +734,7 @@ let get_files_in_directory dir = + with End_of_file -> + dirh.System.closedir () + end; +- Sort.list (<) !files ++ List.sort String.compare !files + + let ls dir pattern = + Util.convertUnixErrorsToTransient +diff --git a/src/recon.ml b/src/recon.ml +index 2c619bb..2412c18 100644 +--- a/src/recon.ml ++++ b/src/recon.ml +@@ -661,8 +661,8 @@ let rec reconcile + + (* Sorts the paths so that they will be displayed in order *) + let sortPaths pathUpdatesList = +- Sort.list +- (fun (p1, _) (p2, _) -> Path.compare p1 p2 <= 0) ++ List.sort ++ Path.compare + pathUpdatesList + + let rec enterPath p1 p2 t = +diff --git a/src/system/system_generic.ml b/src/system/system_generic.ml +index 453027d..c2288b8 100755 +--- a/src/system/system_generic.ml ++++ b/src/system/system_generic.ml +@@ -47,7 +47,7 @@ let open_out_gen = open_out_gen + let chmod = Unix.chmod + let chown = Unix.chown + let utimes = Unix.utimes +-let link = Unix.link ++let link s d = Unix.link s d + let openfile = Unix.openfile + let opendir f = + let h = Unix.opendir f in +diff --git a/src/uigtk2.ml b/src/uigtk2.ml +index fbc5d8f..4e82cc2 100644 +--- a/src/uigtk2.ml ++++ b/src/uigtk2.ml +@@ -94,7 +94,7 @@ let icon = + let icon = + let p = GdkPixbuf.create ~width:48 ~height:48 ~has_alpha:true () in + Gpointer.blit +- (Gpointer.region_of_string Pixmaps.icon_data) (GdkPixbuf.get_pixels p); ++ (Gpointer.region_of_bytes Pixmaps.icon_data) (GdkPixbuf.get_pixels p); + p + + let leftPtrWatch = -- cgit v1.2.3 From 61949dbc8a475d2dd2c000b8fb0a8782b6ded02e Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Wed, 30 Sep 2020 17:45:43 +0200 Subject: gnu: camlp5: Update to 7.13. * gnu/packages/ocaml.scm (camlp5): Update to 7.13. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 394db50150..f5d7799ae5 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -541,7 +541,7 @@ (define-public opam (define-public camlp5 (package (name "camlp5") - (version "7.12") + (version "7.13") (source (origin (method git-fetch) @@ -550,7 +550,7 @@ (define-public camlp5 (commit (string-append "rel" (string-delete #\. version))))) (file-name (git-file-name name version)) (sha256 - (base32 "12ix5g15bys932hyf9gs637iz76m0ji9075d83jfdmx85q30llgf")))) + (base32 "1d9spy3f5ahixm8nxxk086kpslzva669a5scn49am0s7vx4i71kp")))) (build-system gnu-build-system) (inputs `(("ocaml" ,ocaml))) -- cgit v1.2.3 From 7ae38a0479d64e0d7d7c9a81dc18c6f6d17f9561 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Wed, 30 Sep 2020 17:53:56 +0200 Subject: gnu: ocaml-mccs: Update to 1.1+11. * gnu/packages/ocaml-mccs: Update to 1.1+11. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index f5d7799ae5..521df69d59 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -329,7 +329,7 @@ (define-public ocaml-cudf (define-public ocaml-mccs (package (name "ocaml-mccs") - (version "1.1+9") + (version "1.1+11") (source (origin (method git-fetch) (uri (git-reference @@ -338,7 +338,7 @@ (define-public ocaml-mccs (file-name (git-file-name name version)) (sha256 (base32 - "1i0hhkrqi7rqlainlg5pc4hibbx6b5dp3x99gmav8c3sbfvlk9mc")))) + "1gsad5cj03256i36wdjqk5pg51pyd48rpjazf0gfaakrn8lk438g")))) (build-system dune-build-system) (propagated-inputs `(("ocaml-cudf" ,ocaml-cudf))) (home-page "https://www.i3s.unice.fr/~cpjm/misc/") -- cgit v1.2.3 From bd8558a0e514c7a865bc6d2aeb02c01f942d027d Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Wed, 30 Sep 2020 17:58:48 +0200 Subject: gnu: ocaml-migrate-parsetree: Update to 1.7.3. * gnu/packages/ocaml.scm (ocaml-migrate-parsetree): Update to 1.7.3. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 521df69d59..ed692230bc 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1292,7 +1292,7 @@ (define-public ocaml4.07-dune (define-public ocaml-migrate-parsetree (package (name "ocaml-migrate-parsetree") - (version "1.4.0") + (version "1.7.3") (home-page "https://github.com/ocaml-ppx/ocaml-migrate-parsetree") (source (origin @@ -1303,7 +1303,7 @@ (define-public ocaml-migrate-parsetree (file-name (git-file-name name version)) (sha256 (base32 - "0sv1p4615l8gpbah4ya2c40yr6fbvahvv3ks7zhrsgcwcq2ljyr2")))) + "0336vz0galjnsazbmkxjwdv1qvdqsx2rgrvp778xgq2fzasz45cx")))) (build-system dune-build-system) (arguments `(#:tests? #f)) -- cgit v1.2.3 From f0c6fe314f6202dcb30f89a8d153a5a6dc8129b2 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Wed, 30 Sep 2020 18:02:50 +0200 Subject: gnu: ocaml-ppx-tools-versioned: Update to 5.4.0. * gnu/packages/ocaml.scm (ocaml-ppx-tools-versioned): Update to 5.4.0. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index ed692230bc..9ec9c82b16 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1321,7 +1321,7 @@ (define-public ocaml-migrate-parsetree (define-public ocaml-ppx-tools-versioned (package (name "ocaml-ppx-tools-versioned") - (version "5.2.3") + (version "5.4.0") (source (origin (method git-fetch) (uri (git-reference @@ -1330,7 +1330,7 @@ (define-public ocaml-ppx-tools-versioned (file-name (git-file-name name version)) (sha256 (base32 - "1hcmpnw26zf70a71r3d2c2c0mn8q084gdn1r36ynng6fv9hq6j0y")))) + "07lnj4yzwvwyh5fhpp1dxrys4ddih15jhgqjn59pmgxinbnddi66")))) (build-system dune-build-system) (arguments `(#:test-target ".")) -- cgit v1.2.3 From a8a8547abfc8e4c87f5e0945a167e756a1c05be5 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Wed, 30 Sep 2020 21:42:06 +0200 Subject: gnu: ocaml-qtest: Do not use deprecated jbuilder. * gnu/packages/ocaml.scm (ocaml-qtest): Remove #:jbuild argument. --- gnu/packages/ocaml.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 9ec9c82b16..97b5b26c70 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1213,8 +1213,7 @@ (define-public ocaml-qtest "0gddzan4vzs0vklsxhirdjrvx3rp7hhh2yr20vi13nq8rwkn9w29")))) (build-system dune-build-system) (arguments - `(#:jbuild? #t - #:test-target "tests")) + `(#:test-target "tests")) (propagated-inputs `(("ounit" ,ocaml-ounit) ("qcheck" ,ocaml-qcheck))) -- cgit v1.2.3 From 93304a0c8932d6037f6ef803c7bd42f6cdb1473a Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Wed, 30 Sep 2020 21:46:15 +0200 Subject: gnu: ocaml-bitstring: Do not use deprecated jbuilder. * gnu/packages/ocaml.scm (ocaml-bitstring): Remove #:jbuild argument. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 97b5b26c70..e85a73365d 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1362,8 +1362,8 @@ (define-public ocaml-bitstring (propagated-inputs `(("ocaml-ppx-tools-versioned" ,ocaml-ppx-tools-versioned))) (arguments - `(#:tests? #f; Tests fail to build - #:jbuild? #t)) + `(#:package "bitstring" + #:tests? #f)); Tests fail to build (home-page "https://github.com/xguerin/bitstring") (synopsis "Bitstrings and bitstring matching for OCaml") (description "Adds Erlang-style bitstrings and matching over bitstrings as -- cgit v1.2.3 From 2d00625f24687699cdb18331e0f4816cead20d46 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Wed, 30 Sep 2020 21:47:34 +0200 Subject: gnu: ocaml-lwt-log: Do not use deprecated jbuilder. * gnu/packages/ocaml.scm (ocaml-lwt-log): Remove #:jbuild argument. --- gnu/packages/ocaml.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index e85a73365d..13c31ef939 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1866,8 +1866,7 @@ (define-public ocaml-lwt-log "1n12i1rmn9cjn6p8yr6qn5dwbrwvym7ckr7bla04a1xnq8qlcyj7")))) (build-system dune-build-system) (arguments - `(#:tests? #f; require lwt_ppx - #:jbuild? #t)) + `(#:tests? #f)); require lwt_ppx (propagated-inputs `(("lwt" ,ocaml-lwt))) (properties `((upstream-name . "lwt_log"))) -- cgit v1.2.3 From 8ff5f39a9fe3c36df4c39e1b127641742867f07b Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Wed, 30 Sep 2020 21:48:53 +0200 Subject: gnu: ocaml-easy-format: Do not use deprecated jbuilder. * gnu/packages/ocaml.scm (ocaml-easy-format): Remove #:jbuild argument. --- gnu/packages/ocaml.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 13c31ef939..5aa95bf569 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2817,7 +2817,7 @@ (define-public ocaml-easy-format "1fc95q2ypck6m6rv3kiawwilh5ac93v2hcp823mj608d5kj79xkb")))) (build-system dune-build-system) (arguments - `(#:jbuild? #t + `(#:package "easy-format" #:phases (modify-phases %standard-phases (add-before 'build 'make-writable -- cgit v1.2.3 From 0a8eb6850d8447f737724c36decedfedc28e3024 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Wed, 30 Sep 2020 21:56:54 +0200 Subject: gnu: ocaml4.07-zed: Do not use deprecated jbuilder. * gnu/packages/ocaml.scm (ocaml4.07-zed): Remove #:jbuild argument. --- gnu/packages/ocaml.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 5aa95bf569..bad755516d 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3146,8 +3146,7 @@ (define-public ocaml4.07-zed (base32 "0pa9awinqr0plp4b2az78dwpvh01pwaljnn5ydg8mc6hi7rmir55")))) (build-system dune-build-system) (arguments - `(#:jbuild? #t - #:test-target "." + `(#:test-target "." #:ocaml ,ocaml-4.07 #:findlib ,ocaml4.07-findlib)) (propagated-inputs -- cgit v1.2.3 From 3b90075a40959d92cea2b1003adb9da47a85fb7c Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Wed, 30 Sep 2020 22:12:34 +0200 Subject: gnu: ocaml4.07-utop: Do not use deprecated jbuilder. * gnu/packages/ocaml.scm (ocaml4.07-utop): Remove #:jbuild argument. --- gnu/packages/ocaml.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index bad755516d..50bfc10fc3 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3211,8 +3211,7 @@ (define-public ocaml4.07-utop (base32 "1bl4943qpi3qy152dbdm5glhx19zsiylmn4rcxi8l66g58hikyjp")))) (build-system dune-build-system) (arguments - `(#:jbuild? #t - #:test-target "." + `(#:test-target "." #:ocaml ,ocaml-4.07 #:findlib ,ocaml4.07-findlib)) (native-inputs -- cgit v1.2.3 From 1f4b40227c62467bfaf91309ffc1eeca4a222ede Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Wed, 30 Sep 2020 22:15:42 +0200 Subject: gnu: ocaml4.07-merlin: Do not use deprecated jbuilder. * gnu/packages/ocaml.scm (ocaml4.07-merlin): Remove #:jbuild argument. --- gnu/packages/ocaml.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 50bfc10fc3..0515dc097c 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3761,7 +3761,7 @@ (define-public ocaml4.07-merlin (native-inputs `(("ocaml-findlib" ,ocaml-findlib))) (arguments - `(#:jbuild? #t + `(#:package "merlin" #:tests? #f ;; Errors in tests in version 3.2.2 #:ocaml ,ocaml-4.07 #:findlib ,ocaml4.07-findlib)) -- cgit v1.2.3 From 47ef85b588ebb4413844959822270c0ef4772cda Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Wed, 30 Sep 2020 22:16:51 +0200 Subject: gnu: ocaml4.07-ppx-expect: Do not use deprecated jbuilder. * gnu/packages/ocaml.scm (ocaml4.07-ppx-expect): Remove #:jbuild argument. --- gnu/packages/ocaml.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 0515dc097c..4dce8bbe1c 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4864,8 +4864,7 @@ (define-public ocaml4.07-ppx-expect "1wawsbjfkri4sw52n8xqrzihxc3xfpdicv3ahz83a1rsn4lb8j5q")))) (build-system dune-build-system) (arguments - `(#:jbuild? #t - #:ocaml ,ocaml-4.07 + `(#:ocaml ,ocaml-4.07 #:findlib ,ocaml4.07-findlib)) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) -- cgit v1.2.3 From 0f1362f049a129c0e0f2ee27dfd1a14287452a4c Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Wed, 30 Sep 2020 22:21:54 +0200 Subject: gnu: ocaml4.07-core: Do not use deprecated jbuilder. * gnu/packages/ocaml.scm (ocaml4.07-core): Remove #:jbuild argument. --- gnu/packages/ocaml.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 4dce8bbe1c..3910f5c20f 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5221,9 +5221,8 @@ (define-public ocaml4.07-core "0pzl8n09z4f3i7z2wq4cjxfqrr8mj6xcdp7rbg0nxap2zdhjgvrq")))) (build-system dune-build-system) (arguments - `(#:jbuild? #t - ;; Require a cyclic dependency: core_extended - #:tests? #f + `(#:package "core" + #:tests? #f; Require a cyclic dependency: core_extended #:ocaml ,ocaml-4.07 #:findlib ,ocaml4.07-findlib)) (propagated-inputs -- cgit v1.2.3 From 32fd3e9c0b2168753d4bba2464c60c40311bb3f4 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Wed, 30 Sep 2020 22:23:19 +0200 Subject: gnu: ocaml-tyxml: Do not use deprecated jbuilder. * gnu/packages/ocaml.scm (ocaml-tyxml): Remove #:jbuild argument. --- gnu/packages/ocaml.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 3910f5c20f..aa9230cd9e 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5370,7 +5370,7 @@ (define-public ocaml-tyxml ("ocaml-markup" ,ocaml-markup))) (native-inputs `(("ocaml-alcotest" ,ocaml-alcotest))) - (arguments `(#:jbuild? #t)) + (arguments `(#:package "tyxml")) (home-page "https://github.com/ocsigen/tyxml/") (synopsis "TyXML is a library for building correct HTML and SVG documents") (description "TyXML provides a set of convenient combinators that uses the -- cgit v1.2.3 From ef841e96b97c7ee9517219e6eb2f779cc4686a0d Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Wed, 30 Sep 2020 22:30:19 +0200 Subject: gnu: opam: Update to 2.0.7. * gnu/packages/ocaml.scm (opam): Update to 2.0.7. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index aa9230cd9e..756960d587 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -436,7 +436,7 @@ (define-public ocaml-opam-file-format (define-public opam (package (name "opam") - (version "2.0.6") + (version "2.0.7") (source (origin (method git-fetch) (uri (git-reference @@ -445,7 +445,7 @@ (define-public opam (file-name (git-file-name name version)) (sha256 (base32 - "1vyga2jllsfsikppxyzljm4isfnnnl8k0rb44h8xaddjzdg1d4m8")))) + "1p719ccn9wnzk6impsnwr809yh507h8f37dx9nn64b1hsyb5z8ax")))) (build-system ocaml-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From bd2ad4a1950b4cddfc63306143e7edb28b283c36 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Wed, 30 Sep 2020 23:38:35 +0200 Subject: gnu: ocaml-base64: Update to 3.4.0. * gnu/packages/ocaml.scm (ocaml-base64): Update to 3.4.0. --- gnu/packages/ocaml.scm | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 756960d587..81e923df63 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2233,7 +2233,7 @@ (define-public ocaml-ocurl (define-public ocaml-base64 (package (name "ocaml-base64") - (version "3.2.0") + (version "3.4.0") (source (origin (method git-fetch) (uri (git-reference @@ -2242,8 +2242,19 @@ (define-public ocaml-base64 (file-name (git-file-name name version)) (sha256 (base32 - "1ilw3zj0w6cq7i4pvr8m2kv5l5f2y9aldmv72drlwwns013b1gwy")))) + "0aa1m1sr8p1hgc10p96mij7p22r3qcysvzy6fz2jqamfgswchgqc")))) (build-system dune-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'build 'fix-dune + (lambda _ + ;; This package expects dune 2, which unbundled its configurator + ;; module. We still use dune 1, so we need to let it know we need + ;; its internal module. + (substitute* "config/dune" + (("dune-configurator") "dune.configurator")) + #t))))) (native-inputs `(("ocaml-alcotest" ,ocaml-alcotest) ("ocaml-bos" ,ocaml-bos) -- cgit v1.2.3 From 276be8f21cca7871bc81cf0efb8764052f873a59 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Wed, 30 Sep 2020 23:40:39 +0200 Subject: gnu: ocaml-logs: Update to 0.7.0. * gnu/packages/ocaml.scm (ocaml-logs): Update to 0.7.0. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 81e923df63..343e4610ac 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1879,14 +1879,14 @@ (define-public ocaml-lwt-log (define-public ocaml-logs (package (name "ocaml-logs") - (version "0.6.2") + (version "0.7.0") (source (origin (method url-fetch) (uri (string-append "http://erratique.ch/software/logs/releases/" "logs-" version ".tbz")) (sha256 (base32 - "1khbn7jqpid83zn8rvyh1x1sirls7zc878zj4fz985m5xlsfy853")))) + "1jnmd675wmsmdwyb5mx5b0ac66g4c6gpv5s4mrx2j6pb0wla1x46")))) (build-system ocaml-build-system) (arguments `(#:tests? #f -- cgit v1.2.3 From 0a86b93fae09dbc1b76d293bd1c4c02fb1a737b7 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Wed, 30 Sep 2020 23:42:40 +0200 Subject: gnu: ocaml-fmt: Update to 0.8.9. * gnu/packages/ocaml.scm (ocaml-fmt): Update to 0.8.9. --- gnu/packages/ocaml.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 343e4610ac..ac0ee2b888 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1594,23 +1594,23 @@ (define-public ocaml-cmdliner (define-public ocaml-fmt (package (name "ocaml-fmt") - (version "0.8.5") + (version "0.8.9") (source (origin (method url-fetch) (uri (string-append "http://erratique.ch/software/fmt/releases/fmt-" version ".tbz")) (sha256 (base32 - "1zj9azcxcn6skmb69ykgmi9z8c50yskwg03wqgh87lypgjdcz060")))) + "0gkkkj4x678vxdda4xaw2dd44qjacavsvn5nx8gydfwah6pjbkxk")))) (build-system ocaml-build-system) (native-inputs `(("ocamlbuild" ,ocamlbuild) ("opam" ,opam) ("topkg" ,ocaml-topkg))) (propagated-inputs - `(("result" ,ocaml-result) - ("ocaml-uchar" ,ocaml-uchar) - ("cmdliner" ,ocaml-cmdliner))) + `(("cmdliner" ,ocaml-cmdliner) + ("ocaml-stdlib-shims" ,ocaml-stdlib-shims) + ("ocaml-uchar" ,ocaml-uchar))) (arguments `(#:tests? #f #:build-flags (list "build" "--with-base-unix" "true" "--with-cmdliner" "true") -- cgit v1.2.3 From 01ec666e6c17759e78239cee7005fb2a6f72ab86 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Wed, 30 Sep 2020 23:47:30 +0200 Subject: gnu: ocaml-alcotest: Update to 1.0.0. --- gnu/packages/ocaml.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index ac0ee2b888..811402440e 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1659,14 +1659,14 @@ (define-public ocaml-astring (define-public ocaml-alcotest (package (name "ocaml-alcotest") - (version "0.8.5") + (version "1.0.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/mirage/alcotest/releases/" "download/" version "/alcotest-" version ".tbz")) (sha256 (base32 - "0szwjxvaahgynsx0apj81jxj3ki6yz4is9mh2wkcbx66qy7n6fvb")))) + "1a43ilhwnj58pq3bi78ni46l9wh6klmmgfc93i94mvyx48bzzayx")))) (build-system dune-build-system) (arguments `(#:package "alcotest" @@ -1677,8 +1677,10 @@ (define-public ocaml-alcotest `(("ocaml-astring" ,ocaml-astring) ("ocaml-cmdliner" ,ocaml-cmdliner) ("ocaml-fmt" ,ocaml-fmt) - ("ocaml-result" ,ocaml-result) - ("ocaml-uuidm" ,ocaml-uuidm))) + ("ocaml-re" ,ocaml-re) + ("ocaml-stdlib-shims" ,ocaml-stdlib-shims) + ("ocaml-uuidm" ,ocaml-uuidm) + ("ocaml-uutf" ,ocaml-uutf))) (home-page "https://github.com/mirage/alcotest") (synopsis "Lightweight OCaml test framework") (description "Alcotest exposes simple interface to perform unit tests. It -- cgit v1.2.3 From bc92fd22df2be0984a92939d9a3046439445eef5 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Wed, 30 Sep 2020 22:39:07 +0200 Subject: gnu: ocaml-result: Update to 1.5. * gnu/packages/ocaml.scm (ocaml-result): Update to 1.5. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 811402440e..e188a338e4 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1376,7 +1376,7 @@ (define-public ocaml-bitstring (define-public ocaml-result (package (name "ocaml-result") - (version "1.4") + (version "1.5") (source (origin (method git-fetch) (uri (git-reference @@ -1385,7 +1385,7 @@ (define-public ocaml-result (file-name (git-file-name name version)) (sha256 (base32 - "0hir97k9i72nfkm6kncxnqpyk400wlsxysbldgcvk0fd9pjnsc3p")))) + "166laj8qk7466sdl037c6cjs4ac571hglw4l5qpyll6df07h6a7q")))) (build-system dune-build-system) (arguments `(#:test-target ".")) -- cgit v1.2.3 From 171abdd8f5194af0a141c2f5e2d542c3c89a00b0 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Wed, 30 Sep 2020 22:42:47 +0200 Subject: gnu: Add ocaml-csexp. * gnu/packages/ocaml.scm (ocaml-csexp): New variable. --- gnu/packages/ocaml.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index e188a338e4..e01b0346b0 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1288,6 +1288,47 @@ (define-public dune (define-public ocaml4.07-dune (package-with-ocaml4.07 dune)) +(define-public ocaml-csexp + (package + (name "ocaml-csexp") + (version "1.3.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ocaml-dune/csexp") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "190zppgvdjgghmrnx67ayzzk86qdjy3yn5fcrcw08wsh93384pl0")))) + (build-system dune-build-system) + (arguments + `(#:tests? #f; FIXME: needs ppx_expect, but which version? + #:phases + (modify-phases %standard-phases + (add-before 'build 'chmod + (lambda _ + (for-each (lambda (file) (chmod file #o644)) (find-files "." ".*")) + #t))))) + (propagated-inputs + `(("dune" ,dune) + ("ocaml-result" ,ocaml-result))) + (home-page "https://github.com/ocaml-dune/csexp") + (synopsis "Parsing and printing of S-expressions in Canonical form") + (description "This library provides minimal support for Canonical +S-expressions. Canonical S-expressions are a binary encoding of +S-expressions that is super simple and well suited for communication +between programs. + +This library only provides a few helpers for simple applications. If +you need more advanced support, such as parsing from more fancy input +sources, you should consider copying the code of this library given +how simple parsing S-expressions in canonical form is. + +To avoid a dependency on a particular S-expression library, the only +module of this library is parameterised by the type of S-expressions.") + (license license:expat))) + (define-public ocaml-migrate-parsetree (package (name "ocaml-migrate-parsetree") -- cgit v1.2.3 From c49b94a56c5c42c04e5c73c4be2533badeae19d4 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Thu, 1 Oct 2020 14:33:00 +0200 Subject: gnu: ocaml-compiler-libs: Build only with OCaml 4.07. * gnu/packages/ocaml.scm (ocaml-compiler-libs): Rename to... (ocaml4.07-compiler-libs): ...to this. Use OCaml 4.07. --- gnu/packages/ocaml.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index e01b0346b0..7c7963970b 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3574,7 +3574,7 @@ (define-public ocaml4.07-ppx-inline-test `(("ocaml-base" ,ocaml4.07-base) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-compiler-libs" ,(package-with-ocaml4.07 ocaml-compiler-libs)) + ("ocaml-compiler-libs" ,ocaml4.07-compiler-libs) ("ocaml-sexplib0" ,ocaml4.07-sexplib0) ("ocaml-stdio" ,ocaml4.07-stdio) ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) @@ -4092,9 +4092,9 @@ (define-public ocaml4.07-base @url{https://github.com/janestreet/stdio, ocaml-stdio}.") (license license:expat))) -(define-public ocaml-compiler-libs +(define-public ocaml4.07-compiler-libs (package - (name "ocaml-compiler-libs") + (name "ocaml4.07-compiler-libs") (version "0.11.0") (home-page "https://github.com/janestreet/ocaml-compiler-libs") (source @@ -4109,7 +4109,10 @@ (define-public ocaml-compiler-libs "03jds7bszh8wwpfwxb3dg0gyr1j1872wxwx1xqhry5ir0i84bg0s")))) (build-system dune-build-system) (arguments - '(#:tests? #f)) ;no tests + `(#:tests? #f ;no tests + #:ocaml ,ocaml-4.07 + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (properties `((upstream-name . "ocaml-compiler-libs"))) (synopsis "Compiler libraries repackaged") (description "This package simply repackages the OCaml compiler libraries @@ -4192,7 +4195,7 @@ (define-public ocaml4.07-ppxlib (build-system dune-build-system) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) - ("ocaml-compiler-libs" ,(package-with-ocaml4.07 ocaml-compiler-libs)) + ("ocaml-compiler-libs" ,ocaml4.07-compiler-libs) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppx-derivers" ,(package-with-ocaml4.07 ocaml-ppx-derivers)) -- cgit v1.2.3 From f2df5a4bb200e4d7c7ed5c569bccc137b99840b3 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Thu, 1 Oct 2020 14:35:49 +0200 Subject: gnu: ocaml-jane-street-headers: Build only with OCaml 4.07. * gnu/packages/ocaml.scm (ocaml-jane-street-headers): Rename to... (ocaml4.07-jane-street-headers): ...to this. Use OCaml 4.07. --- gnu/packages/ocaml.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 7c7963970b..8fbc1fe359 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5158,9 +5158,9 @@ (define-public ocaml4.07-splittable-random cryptographic-quality randomness in favor of performance.") (license license:asl2.0))) -(define-public ocaml-jane-street-headers +(define-public ocaml4.07-jane-street-headers (package - (name "ocaml-jane-street-headers") + (name "ocaml4.07-jane-street-headers") (version "0.11.0") (source (origin (method url-fetch) @@ -5172,7 +5172,10 @@ (define-public ocaml-jane-street-headers "0afhzm08l9v883fhpqqh2lmy7az609pxif40bp7x1sk8c0yszqsh")))) (build-system dune-build-system) (arguments - `(#:test-target ".")) + `(#:test-target "." + #:ocaml ,ocaml-4.07 + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (home-page "https://github.com/janestreet/jane-street-headers") (synopsis "Jane Street C header files") (description "This package provides C header files shared between the @@ -5326,8 +5329,7 @@ (define-public ocaml4.07-core-kernel ("ocaml-bin-prot" ,ocaml4.07-bin-prot) ("ocaml-configurator" ,ocaml4.07-configurator) ("ocaml-fieldslib" ,ocaml4.07-fieldslib) - ("ocaml-jane-street-headers" - ,(package-with-ocaml4.07 ocaml-jane-street-headers)) + ("ocaml-jane-street-headers" ,ocaml4.07-jane-street-headers) ("ocaml-ppx-assert" ,ocaml4.07-ppx-assert) ("ocaml-ppx-base" ,ocaml4.07-ppx-base) ("ocaml-ppx-hash" ,ocaml4.07-ppx-hash) -- cgit v1.2.3 From 339c752d0542129dd7e55c2e67084a512fa6856f Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Thu, 1 Oct 2020 14:50:30 +0200 Subject: gnu: ocaml-4.07: Ensure build with ocaml4.7-dune. * gnu/packages/ocaml.scm (ocaml4.07-gen, ocaml4.07-sedlex) (ocaml4.07-ezjsonm, ocaml4.07-uri, ocaml4.07-charinfo-width) (ocaml4.07-zed, ocaml4.07-lambda-term, ocaml4.07-utop) (ocaml4.07-ppx-inline-test, ocaml4.07-earley, ocaml4.07-merlin) (ocaml4.07-sexplib0, ocaml4.07-parsexp, ocaml4.07-sexplib) (ocaml4.07-base, ocaml4.07-stdio, ocaml4.07-ppxlib, ocaml4.07-ppx-compare) (ocaml4.07-fieldslib, ocaml4.07-variantslib, ocaml4.07-ppx-fields-conv) (ocaml4.07-ppx-sexp-conv, ocaml4.07-ppx-variants-conv) (ocaml4.07-ppx-custom-printf, ocaml4.07-bin-prot, ocaml4.07-ppx-hash) (ocaml4.07-ppx-enumerate, ocaml4.07-ppx-bench, ocaml4.07-ppx-here) (ocaml4.07-ppx-typerep, ocaml4.07-ppx-sexp-value, ocaml4.07-ppx-sexp-message) (ocaml4.07-ppx-pipebang, ocaml4.07-ppx-optional, ocaml4.07-ppx-optcomp) (ocaml4.07-ppx-let, ocaml4.07-ppx-fail, ocaml4.07-ppx-assert) (ocaml4.07-ppx-expect, ocaml4.07-ppx-js-style, ocaml4.07-ppx-typerep-conv) (ocaml4.07-ppx-base, ocaml4.07-ppx-bin-prot, ocaml4.07-ppx-jane) (ocaml4.07-splittable-random, ocaml4.07-configurator, ocaml4.07-spawn) (ocaml4.07-core, ocaml4.07-core-kernel)[arguments]: Use ocaml4.07-dune. --- gnu/packages/ocaml.scm | 147 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 98 insertions(+), 49 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 8fbc1fe359..ead298b0c7 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2068,7 +2068,8 @@ (define-public ocaml4.07-gen `(#:tests? #f; no tests #:package "gen" #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-odoc" ,ocaml4.07-odoc))) (native-inputs @@ -2113,7 +2114,8 @@ (define-public ocaml4.07-sedlex (for-each (lambda (file) (chmod file #o644)) (find-files "." ".*")) #t))) #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (native-inputs `(("ocamlbuild" ,(package-with-ocaml4.07 ocamlbuild)))) (propagated-inputs @@ -2805,7 +2807,8 @@ (define-public ocaml4.07-ezjsonm `(#:package "ezjsonm" #:test-target "." #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (native-inputs `(("ocaml-alcotest" ,(package-with-ocaml4.07 ocaml-alcotest)))) (propagated-inputs @@ -2843,7 +2846,8 @@ (define-public ocaml4.07-uri (substitute* "lib/uri.ml" (("Re.get") "Re.Group.get"))))) #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (native-inputs `(("ocaml-ounit" ,(package-with-ocaml4.07 ocaml-ounit)) ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv))) @@ -3171,7 +3175,8 @@ (define-public ocaml4.07-charinfo-width (build-system dune-build-system) (arguments `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-result" ,(package-with-ocaml4.07 ocaml-result)) ("ocaml-camomile" ,(package-with-ocaml4.07 ocaml-camomile)))) @@ -3202,7 +3207,8 @@ (define-public ocaml4.07-zed (arguments `(#:test-target "." #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-camomile" ,(package-with-ocaml4.07 ocaml-camomile)) ("ocaml-charinfo-width" ,ocaml4.07-charinfo-width) @@ -3232,7 +3238,8 @@ (define-public ocaml4.07-lambda-term `(#:build-flags (list "--profile" "release") #:tests? #f #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-lwt" ,(package-with-ocaml4.07 ocaml-lwt)) ("ocaml-lwt-log" ,(package-with-ocaml4.07 ocaml-lwt-log)) @@ -3267,7 +3274,8 @@ (define-public ocaml4.07-utop (arguments `(#:test-target "." #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (native-inputs `(("cppo" ,(package-with-ocaml4.07 ocaml-cppo)))) (propagated-inputs @@ -3569,7 +3577,8 @@ (define-public ocaml4.07-ppx-inline-test ;see home page README for further information `(#:tests? #f #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (inputs `(("ocaml-base" ,ocaml4.07-base) ("ocaml-migrate-parsetree" @@ -3642,7 +3651,8 @@ (define-public ocaml4.07-earley (arguments `(#:test-target "." #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (synopsis "Parsing library based on Earley Algorithm") (description "Earley is a parser combinator library base on Earley's algorithm. It is intended to be used in conjunction with an OCaml syntax @@ -3818,7 +3828,8 @@ (define-public ocaml4.07-merlin `(#:package "merlin" #:tests? #f ;; Errors in tests in version 3.2.2 #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (synopsis "Context sensitive completion for OCaml in Vim and Emacs") (description "Merlin is an editor service that provides modern IDE features for OCaml. Emacs and Vim support is provided out-of-the-box. @@ -3964,7 +3975,8 @@ (define-public ocaml4.07-sexplib0 (arguments `(#:tests? #f ;no tests #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (synopsis "Library containing the definition of S-expressions and some base converters") (description "Part of Jane Street's Core library The Core suite of @@ -3990,7 +4002,8 @@ (define-public ocaml4.07-parsexp (build-system dune-build-system) (arguments `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (inputs `(("ocaml-sexplib0" ,ocaml4.07-sexplib0))) (synopsis "S-expression parsing library") @@ -4039,7 +4052,8 @@ (define-public ocaml4.07-sexplib (build-system dune-build-system) (arguments `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-num" ,(package-with-ocaml4.07 ocaml-num)) ("ocaml-parsexp" ,ocaml4.07-parsexp) @@ -4077,7 +4091,8 @@ (define-public ocaml4.07-base (lambda _ (invoke "dune" "build" "@install" "--profile=release")))) #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (synopsis "Full standard library replacement for OCaml") (description @@ -4142,7 +4157,8 @@ (define-public ocaml4.07-stdio (arguments `(#:tests? #f ;no tests #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (synopsis "Standard IO library for OCaml") (description "Stdio implements simple input/output functionalities for OCaml. It @@ -4223,7 +4239,8 @@ (define-public ocaml4.07-ppxlib all)))) #t))) #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (synopsis "Base library and tools for ppx rewriters") (description @@ -4262,7 +4279,8 @@ (define-public ocaml4.07-ppx-compare ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) (arguments `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (properties `((upstream-name . "ppx_compare"))) (home-page "https://github.com/janestreet/ppx_compare") (synopsis "Generation of comparison functions from types") @@ -4291,7 +4309,8 @@ (define-public ocaml4.07-fieldslib ;; No tests `(#:tests? #f #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) ("ocaml-migrate-parsetree" @@ -4322,7 +4341,8 @@ (define-public ocaml4.07-variantslib ;; No tests `(#:tests? #f #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) ("ocaml-migrate-parsetree" @@ -4356,7 +4376,8 @@ (define-public ocaml4.07-ppx-fields-conv ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) (arguments `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (properties `((upstream-name . "ppx_fields_conv"))) (home-page "https://github.com/janestreet/ppx_fields_conv") (synopsis "Generation of accessor and iteration functions for ocaml records") @@ -4387,7 +4408,8 @@ (define-public ocaml4.07-ppx-sexp-conv ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) (arguments `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (properties `((upstream-name . "ppx_sexp_conv"))) (home-page "https://github.com/janestreet/ppx_sexp_conv") (synopsis "Generation of S-expression conversion functions from type definitions") @@ -4417,7 +4439,8 @@ (define-public ocaml4.07-ppx-variants-conv ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) (arguments `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (properties `((upstream-name . "ppx_variants_conv"))) (home-page @@ -4449,7 +4472,8 @@ (define-public ocaml4.07-ppx-custom-printf ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) (arguments `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (properties `((upstream-name . "ppx_custom_printf"))) (home-page "https://github.com/janestreet/ppx_custom_printf") (synopsis "Printf-style format-strings for user-defined string conversion") @@ -4481,7 +4505,8 @@ (define-public ocaml4.07-bin-prot ,(package-with-ocaml4.07 ocaml-migrate-parsetree)))) (arguments `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (properties `((upstream-name . "bin_prot"))) (home-page "https://github.com/janestreet/bin_prot") (synopsis "Binary protocol generator") @@ -4547,7 +4572,8 @@ (define-public ocaml4.07-ppx-hash ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) (arguments `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (properties `((upstream-name . "ppx_hash"))) (home-page "https://github.com/janestreet/ppx_hash") (synopsis "Generation of hash functions from type expressions and definitions") @@ -4572,7 +4598,8 @@ (define-public ocaml4.07-ppx-enumerate (arguments `(#:tests? #f; no test suite #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) ("ocaml-migrate-parsetree" @@ -4603,7 +4630,8 @@ (define-public ocaml4.07-ppx-bench ;; No tests `(#:tests? #f #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test) ("ocaml-migrate-parsetree" @@ -4632,7 +4660,8 @@ (define-public ocaml4.07-ppx-here ;; broken tests `(#:tests? #f #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) ("ocaml-migrate-parsetree" @@ -4661,7 +4690,8 @@ (define-public ocaml4.07-typerep (arguments `(#:tests? #f #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base))) (home-page "https://github.com/janestreet/typerep") (synopsis "Typerep is a library for runtime types") @@ -4683,7 +4713,8 @@ (define-public ocaml4.07-ppx-sexp-value (build-system dune-build-system) (arguments `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) ("ocaml-ppx-here" ,ocaml4.07-ppx-here) @@ -4713,7 +4744,8 @@ (define-public ocaml4.07-ppx-sexp-message (build-system dune-build-system) (arguments `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) ("ocaml-ppx-here" ,ocaml4.07-ppx-here) @@ -4747,7 +4779,8 @@ (define-public ocaml4.07-ppx-pipebang ;; No tests `(#:tests? #f #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) @@ -4776,7 +4809,8 @@ (define-public ocaml4.07-ppx-optional ;; No tests `(#:tests? #f #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) ("ocaml-migrate-parsetree" @@ -4805,7 +4839,8 @@ (define-public ocaml4.07-ppx-optcomp (build-system dune-build-system) (arguments `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) ("ocaml-stdio" ,ocaml4.07-stdio) @@ -4833,7 +4868,8 @@ (define-public ocaml4.07-ppx-let (build-system dune-build-system) (arguments `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) ("ocaml-migrate-parsetree" @@ -4861,7 +4897,8 @@ (define-public ocaml4.07-ppx-fail (build-system dune-build-system) (arguments `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) ("ocaml-ppx-here" ,ocaml4.07-ppx-here) @@ -4890,7 +4927,8 @@ (define-public ocaml4.07-ppx-assert (build-system dune-build-system) (arguments `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) ("ocaml-ppx-compare" ,ocaml4.07-ppx-compare) @@ -4922,7 +4960,8 @@ (define-public ocaml4.07-ppx-expect (build-system dune-build-system) (arguments `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) ("ocaml-ppx-assert" ,ocaml4.07-ppx-assert) @@ -4965,7 +5004,8 @@ (define-public ocaml4.07-ppx-js-style ;; No tests `(#:tests? #f #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) ("ocaml-migrate-parsetree" @@ -4997,7 +5037,8 @@ (define-public ocaml4.07-ppx-typerep-conv (arguments `(#:test-target "." #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) ("ocaml-typerep" ,ocaml4.07-typerep) @@ -5027,7 +5068,8 @@ (define-public ocaml4.07-ppx-base (arguments `(#:test-target "." #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-ppx-compare" ,ocaml4.07-ppx-compare) ("ocaml-ppx-enumerate" ,ocaml4.07-ppx-enumerate) @@ -5064,7 +5106,8 @@ (define-public ocaml4.07-ppx-bin-prot ;; Cyclic dependency with ocaml-ppx-jane `(#:tests? #f #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) ("ocaml-bin-prot" ,ocaml4.07-bin-prot) @@ -5095,7 +5138,8 @@ (define-public ocaml4.07-ppx-jane (arguments `(#:test-target "." #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-ppx-assert" ,ocaml4.07-ppx-assert) ("ocaml-ppx-base" ,ocaml4.07-ppx-base) @@ -5140,7 +5184,8 @@ (define-public ocaml4.07-splittable-random (build-system dune-build-system) (arguments `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) ("ocaml-ppx-jane" ,ocaml4.07-ppx-jane) @@ -5199,7 +5244,8 @@ (define-public ocaml4.07-configurator ;; No tests `(#:tests? #f #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) ("ocaml-stdio" ,ocaml4.07-stdio))) @@ -5242,7 +5288,8 @@ (define-public ocaml4.07-spawn (("/bin/echo") (which "echo"))) #t))) #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (native-inputs `(("ocaml-ppx-expect" ,ocaml4.07-ppx-expect))) (home-page "https://github.com/janestreet/spawn") @@ -5284,7 +5331,8 @@ (define-public ocaml4.07-core `(#:package "core" #:tests? #f; Require a cyclic dependency: core_extended #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) ("ocaml-configurator" ,ocaml4.07-configurator) @@ -5323,7 +5371,8 @@ (define-public ocaml4.07-core-kernel ;; Cyclic dependency with ocaml-core `(#:tests? #f #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) ("ocaml-bin-prot" ,ocaml4.07-bin-prot) -- cgit v1.2.3 From 339177956affdc471832750a3805b74356487e93 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Thu, 1 Oct 2020 00:07:51 +0200 Subject: gnu: dune: Update to 2.7.1. * gnu/packages/ocaml.scm (dune): Update to 2.7.1. (ocaml4.07-dune): Keep version 1.11.3. (ocaml-result, ocaml-csexp): Use the bootstrap dune on dune dependencies. (ocaml-craml, ocaml-bitstring): Run "dune upgrade" before building. --- gnu/packages/ocaml.scm | 67 +++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 58 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index ead298b0c7..4cc530509a 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1253,10 +1253,10 @@ (define-public ocaml-stringext ;; where it says `mit'. (license license:expat))) -(define-public dune +(define dune-bootstrap (package (name "dune") - (version "1.11.3") + (version "2.7.1") (source (origin (method git-fetch) (uri (git-reference @@ -1265,17 +1265,19 @@ (define-public dune (file-name (git-file-name name version)) (sha256 (base32 - "0l4x0x2fz135pljv88zj8y6w1ninsqw0gn1mdxzprd6wbxbyn8wr")))) + "10qgx83fq8b522y9mpllrp0l5cgmr2bs5s7aix5img21hlbm34in")))) (build-system ocaml-build-system) (arguments `(#:tests? #f; require odoc - #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) + #:make-flags (list "release" + (string-append "PREFIX=" (assoc-ref %outputs "out")) (string-append "LIBDIR=" (assoc-ref %outputs "out") "/lib/ocaml/site-lib")) #:phases (modify-phases %standard-phases (replace 'configure (lambda* (#:key outputs #:allow-other-keys) + (mkdir-p "src/dune") (invoke "./configure") #t))))) (home-page "https://github.com/ocaml/dune") @@ -1285,8 +1287,41 @@ (define-public dune following a very simple s-expression syntax.") (license license:expat))) +(define-public dune-configurator + (package + (inherit dune-bootstrap) + (name "dune-configurator") + (build-system dune-build-system) + (arguments + `(#:package "dune-configurator" + #:dune ,dune-bootstrap + ; require ppx_expect + #:tests? #f)) + (propagated-inputs + `(("ocaml-csexp" ,ocaml-csexp))) + (synopsis "") + (description ""))) + +(define-public dune + (package + (inherit dune-bootstrap) + (propagated-inputs + `(("dune-configurator" ,dune-configurator))) + (properties `((ocaml4.07-variant . ,(delay ocaml4.07-dune)))))) + (define-public ocaml4.07-dune - (package-with-ocaml4.07 dune)) + (package + (inherit (package-with-ocaml4.07 dune-bootstrap)) + (version "1.11.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ocaml/dune") + (commit version))) + (file-name (git-file-name "dune" version)) + (sha256 + (base32 + "0l4x0x2fz135pljv88zj8y6w1ninsqw0gn1mdxzprd6wbxbyn8wr")))))) (define-public ocaml-csexp (package @@ -1304,6 +1339,7 @@ (define-public ocaml-csexp (build-system dune-build-system) (arguments `(#:tests? #f; FIXME: needs ppx_expect, but which version? + #:dune ,dune-bootstrap #:phases (modify-phases %standard-phases (add-before 'build 'chmod @@ -1311,8 +1347,7 @@ (define-public ocaml-csexp (for-each (lambda (file) (chmod file #o644)) (find-files "." ".*")) #t))))) (propagated-inputs - `(("dune" ,dune) - ("ocaml-result" ,ocaml-result))) + `(("ocaml-result" ,ocaml-result))) (home-page "https://github.com/ocaml-dune/csexp") (synopsis "Parsing and printing of S-expressions in Canonical form") (description "This library provides minimal support for Canonical @@ -1404,7 +1439,13 @@ (define-public ocaml-bitstring `(("ocaml-ppx-tools-versioned" ,ocaml-ppx-tools-versioned))) (arguments `(#:package "bitstring" - #:tests? #f)); Tests fail to build + #:tests? #f; Tests fail to build + #:phases + (modify-phases %standard-phases + (add-before 'build 'upgrade + (lambda _ + (invoke "dune" "upgrade") + #t))))) (home-page "https://github.com/xguerin/bitstring") (synopsis "Bitstrings and bitstring matching for OCaml") (description "Adds Erlang-style bitstrings and matching over bitstrings as @@ -1429,7 +1470,8 @@ (define-public ocaml-result "166laj8qk7466sdl037c6cjs4ac571hglw4l5qpyll6df07h6a7q")))) (build-system dune-build-system) (arguments - `(#:test-target ".")) + `(#:test-target "." + #:dune ,dune-bootstrap)) (home-page "https://github.com/janestreet/result") (synopsis "Compatibility Result module") (description "Uses the new result type defined in OCaml >= 4.03 while @@ -3789,6 +3831,13 @@ (define-public ocaml-craml (base32 "197xjp4vmzdymf2ndinw271ihpf45h04mx8gqj8ypspxdr5fj1a5")))) (build-system dune-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'build 'upgrade + (lambda _ + (invoke "dune" "upgrade") + #t))))) (inputs `(("ocaml-fmt" ,ocaml-fmt) ("ocaml-astring" ,ocaml-astring) -- cgit v1.2.3 From 78890b7aeea61d499d01d8f637cd2cc77bfb512f Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 14 Oct 2020 10:42:03 -0400 Subject: gnu: linux-libre: Update to 5.8.15. * gnu/packages/linux.scm (linux-libre-5.8-version): Update to 5.8.15. (linux-libre-5.8-pristine-source): Update hash. --- gnu/packages/linux.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 93db178b47..bf3fb56e9a 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -351,15 +351,15 @@ (define (%upstream-linux-source version hash) ;; The current "stable" kernel. That is, the most recently released major ;; version. -(define-public linux-libre-5.8-version "5.8.14") +(define-public linux-libre-5.8-version "5.8.15") (define deblob-scripts-5.8 (linux-libre-deblob-scripts linux-libre-5.8-version (base32 "07z7sglyrfh0706icqqf3shadf638pvyid9386r661ds5lbsa2mw") - (base32 "0j6jba5fcddqlb42f95gjl78jisfla4nswqila074gglcrbnl9q7"))) + (base32 "0z28yj4f7hhc253hssslm6xl9sg92agbiw50jxb9y72d8zp6sksq"))) (define-public linux-libre-5.8-pristine-source (let ((version linux-libre-5.8-version) - (hash (base32 "1bzh82jpwcxsdzp6p1r8qlq9v5x79flhnzyimkcll8wdh28pjxpf"))) + (hash (base32 "0hfnq4n902pws8sjxd1lsdxxa0v45g988imp73xnqfqv2d71r0bj"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.8))) -- cgit v1.2.3 From 7a34589246f0ce22829dc81fa86be112e635edd6 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 14 Oct 2020 10:44:26 -0400 Subject: gnu: linux-libre 5.4: Update to 5.4.71. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.71. (linux-libre-5.4-pristine-source): Update hash. --- gnu/packages/linux.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index bf3fb56e9a..1dae54ab7f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -367,15 +367,15 @@ (define-public linux-libre-5.8-pristine-source ;; The "longterm" kernels — the older releases with long-term upstream support. ;; Here are the support timelines: ;; -(define-public linux-libre-5.4-version "5.4.70") +(define-public linux-libre-5.4-version "5.4.71") (define deblob-scripts-5.4 (linux-libre-deblob-scripts linux-libre-5.4-version (base32 "0ckxn7k5zgcqk30dq943bnamr6a6zjbw2aqjl3x30f4kvh5f6k25") - (base32 "1b3q88i2qfdxyvpi9f7jds0qlb8hfpw87mgia096ax6822c2cmyb"))) + (base32 "1h6gbc9cfhb7dqx669iq26a23whka6km5av0ysk61aaz2z57vkrk"))) (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "01shqhibrxirl9bik8jwiag70n9n0l7782xh73gkb8jvbh4dicy0"))) + (hash (base32 "1ivcimngj5h7lxslkrdljpfw9hfvdhrm8wrp7gp4d3gk7kpljw3k"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit v1.2.3 From aa75d5163e2a614113dbf2f2dd73e2d422b934a3 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 14 Oct 2020 10:49:57 -0400 Subject: gnu: linux-libre 4.19: Update to 4.19.151. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.151. (linux-libre-4.19-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 1dae54ab7f..bc290398fd 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -380,7 +380,7 @@ (define-public linux-libre-5.4-pristine-source (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.150") +(define-public linux-libre-4.19-version "4.19.151") (define deblob-scripts-4.19 (linux-libre-deblob-scripts linux-libre-4.19-version @@ -388,7 +388,7 @@ (define deblob-scripts-4.19 (base32 "1jiaw0as1ippkrjdpd52657w5mz9qczg3y2hlra7m9k0xawwiqlf"))) (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "1kmsrinhy67vh34m6z3xinwg3v6z8jm7v1asq6rqqkba13phkxzj"))) + (hash (base32 "0vm3nsi9la3azxrsvndbd6fpz79pch7309f2144xyxszsk339cf7"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From a5d02c1634cdd7c3ab2df92f0af4666354fe8819 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 14 Oct 2020 10:58:00 -0400 Subject: gnu: linux-libre 4.14: Update to 4.14.201. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.201. (linux-libre-4.14-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index bc290398fd..578b4aa028 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -393,7 +393,7 @@ (define-public linux-libre-4.19-pristine-source (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.200") +(define-public linux-libre-4.14-version "4.14.201") (define deblob-scripts-4.14 (linux-libre-deblob-scripts linux-libre-4.14-version @@ -401,7 +401,7 @@ (define deblob-scripts-4.14 (base32 "1qij18inijj6c3ma8hv98yjagnzxdxyn134da9fd23ky8q6hbvky"))) (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "0f4sd4fqgm1wbhmrsib04ry5aza84mlc8747y5wm6jx34h14lh2x"))) + (hash (base32 "0nr3w5m7dz28v7qfhp99ih4c369qrhq751wfikbz8ga3di0dqa72"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit v1.2.3 From f5e0df37ad864c327737647eecbcdab45550a46d Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 14 Oct 2020 10:59:10 -0400 Subject: gnu: linux-libre 4.9: Update to 4.9.239. * gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.239. (linux-libre-4.9-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 578b4aa028..d8522414b4 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -406,7 +406,7 @@ (define-public linux-libre-4.14-pristine-source (%upstream-linux-source version hash) deblob-scripts-4.14))) -(define-public linux-libre-4.9-version "4.9.238") +(define-public linux-libre-4.9-version "4.9.239") (define deblob-scripts-4.9 (linux-libre-deblob-scripts linux-libre-4.9-version @@ -414,7 +414,7 @@ (define deblob-scripts-4.9 (base32 "0fxajshb75siq39lj5h8xvhdj8lcmddkslwlyj65rhlwk6g2r4b2"))) (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "0gsa2g5yjc7459ja107nla700ma32sg57dyj8q2xzi0yfw5zdsmi"))) + (hash (base32 "0lfbn5amykvwz1svvxayzhsz1dvm4mgzsnq1g0wqffclxm148hr3"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -- cgit v1.2.3 From 94e591633dbff4a6db7d6a86e664a36090ff3f68 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 14 Oct 2020 10:59:50 -0400 Subject: gnu: linux-libre: Update to 4.4.239. * gnu/packages/linux.scm (linux-libre-4.4-version): Update to 4.4.239. (linux-libre-4.4-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index d8522414b4..9d35187749 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -419,7 +419,7 @@ (define-public linux-libre-4.9-pristine-source (%upstream-linux-source version hash) deblob-scripts-4.9))) -(define-public linux-libre-4.4-version "4.4.238") +(define-public linux-libre-4.4-version "4.4.239") (define deblob-scripts-4.4 (linux-libre-deblob-scripts linux-libre-4.4-version @@ -427,7 +427,7 @@ (define deblob-scripts-4.4 (base32 "0hhin1jpfkd6nwrb6xqxjzl3hdxy4pn8a15hy2d3d83yw6pflbsf"))) (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) - (hash (base32 "0r1kb7p0zf0nkavvf9nr9hs7bdjym43cqv87hkp7vrqpbh1i8y06"))) + (hash (base32 "03myd9ngmjmnddh4iqqsgcfg9rd11vyvwym38yh4m1p08j1zbg0k"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.4))) -- cgit v1.2.3 From f43287aff06082c83649a1d0c0184b9ac347c3c8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice via Guix-patches via Date: Wed, 7 Oct 2020 00:52:17 +0200 Subject: gnu: linux-libre: Enable XDP sockets and their monitoring. * gnu/packages/aux-files/linux-libre/4.19-arm.conf: Enable AF_XDP sockets and the associated monitor interface. * gnu/packages/aux-files/linux-libre/4.19-arm64.conf: Likewise * gnu/packages/aux-files/linux-libre/4.19-i686.conf: Likewise * gnu/packages/aux-files/linux-libre/4.19-x86_64.conf: Likewise * gnu/packages/aux-files/linux-libre/5.4-arm.conf: Likewise * gnu/packages/aux-files/linux-libre/5.4-arm64.conf: Likewise * gnu/packages/aux-files/linux-libre/5.4-i686.conf: Likewise * gnu/packages/aux-files/linux-libre/5.4-x86_64.conf: Likewise * gnu/packages/aux-files/linux-libre/5.8-arm.conf: Likewise * gnu/packages/aux-files/linux-libre/5.8-arm64.conf: Likewise * gnu/packages/aux-files/linux-libre/5.8-i686.conf: Likewise * gnu/packages/aux-files/linux-libre/5.8-x86_64.conf: Likewise --- gnu/packages/aux-files/linux-libre/4.19-arm.conf | 3 ++- gnu/packages/aux-files/linux-libre/4.19-arm64.conf | 3 ++- gnu/packages/aux-files/linux-libre/4.19-i686.conf | 3 ++- gnu/packages/aux-files/linux-libre/4.19-x86_64.conf | 3 ++- gnu/packages/aux-files/linux-libre/5.4-arm.conf | 3 ++- gnu/packages/aux-files/linux-libre/5.4-arm64.conf | 3 ++- gnu/packages/aux-files/linux-libre/5.4-i686.conf | 3 ++- gnu/packages/aux-files/linux-libre/5.4-x86_64.conf | 3 ++- gnu/packages/aux-files/linux-libre/5.8-arm.conf | 3 ++- gnu/packages/aux-files/linux-libre/5.8-arm64.conf | 3 ++- gnu/packages/aux-files/linux-libre/5.8-i686.conf | 3 ++- gnu/packages/aux-files/linux-libre/5.8-x86_64.conf | 3 ++- 12 files changed, 24 insertions(+), 12 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/aux-files/linux-libre/4.19-arm.conf b/gnu/packages/aux-files/linux-libre/4.19-arm.conf index 32d288b0f4..ee5916b278 100644 --- a/gnu/packages/aux-files/linux-libre/4.19-arm.conf +++ b/gnu/packages/aux-files/linux-libre/4.19-arm.conf @@ -1023,7 +1023,8 @@ CONFIG_XFRM_IPCOMP=m CONFIG_NET_KEY=m CONFIG_NET_KEY_MIGRATE=y # CONFIG_SMC is not set -# CONFIG_XDP_SOCKETS is not set +CONFIG_XDP_SOCKETS=y +CONFIG_XDP_SOCKETS_DIAG=m CONFIG_INET=y CONFIG_IP_MULTICAST=y CONFIG_IP_ADVANCED_ROUTER=y diff --git a/gnu/packages/aux-files/linux-libre/4.19-arm64.conf b/gnu/packages/aux-files/linux-libre/4.19-arm64.conf index 76bd266ec6..852ae64ee1 100644 --- a/gnu/packages/aux-files/linux-libre/4.19-arm64.conf +++ b/gnu/packages/aux-files/linux-libre/4.19-arm64.conf @@ -966,7 +966,8 @@ CONFIG_XFRM_IPCOMP=m CONFIG_NET_KEY=m CONFIG_NET_KEY_MIGRATE=y # CONFIG_SMC is not set -# CONFIG_XDP_SOCKETS is not set +CONFIG_XDP_SOCKETS=y +CONFIG_XDP_SOCKETS_DIAG=m CONFIG_INET=y CONFIG_IP_MULTICAST=y CONFIG_IP_ADVANCED_ROUTER=y diff --git a/gnu/packages/aux-files/linux-libre/4.19-i686.conf b/gnu/packages/aux-files/linux-libre/4.19-i686.conf index 0fb07d5231..d01e74d8c7 100644 --- a/gnu/packages/aux-files/linux-libre/4.19-i686.conf +++ b/gnu/packages/aux-files/linux-libre/4.19-i686.conf @@ -1053,7 +1053,8 @@ CONFIG_XFRM_IPCOMP=m CONFIG_NET_KEY=m # CONFIG_NET_KEY_MIGRATE is not set # CONFIG_SMC is not set -# CONFIG_XDP_SOCKETS is not set +CONFIG_XDP_SOCKETS=y +CONFIG_XDP_SOCKETS_DIAG=m CONFIG_INET=y CONFIG_IP_MULTICAST=y CONFIG_IP_ADVANCED_ROUTER=y diff --git a/gnu/packages/aux-files/linux-libre/4.19-x86_64.conf b/gnu/packages/aux-files/linux-libre/4.19-x86_64.conf index 49a349f249..dd9469039c 100644 --- a/gnu/packages/aux-files/linux-libre/4.19-x86_64.conf +++ b/gnu/packages/aux-files/linux-libre/4.19-x86_64.conf @@ -1063,7 +1063,8 @@ CONFIG_XFRM_IPCOMP=m CONFIG_NET_KEY=m # CONFIG_NET_KEY_MIGRATE is not set # CONFIG_SMC is not set -# CONFIG_XDP_SOCKETS is not set +CONFIG_XDP_SOCKETS=y +CONFIG_XDP_SOCKETS_DIAG=m CONFIG_INET=y CONFIG_IP_MULTICAST=y CONFIG_IP_ADVANCED_ROUTER=y diff --git a/gnu/packages/aux-files/linux-libre/5.4-arm.conf b/gnu/packages/aux-files/linux-libre/5.4-arm.conf index 7c9ab94719..12654de3c6 100644 --- a/gnu/packages/aux-files/linux-libre/5.4-arm.conf +++ b/gnu/packages/aux-files/linux-libre/5.4-arm.conf @@ -1034,7 +1034,8 @@ CONFIG_XFRM_IPCOMP=m CONFIG_NET_KEY=m CONFIG_NET_KEY_MIGRATE=y # CONFIG_SMC is not set -# CONFIG_XDP_SOCKETS is not set +CONFIG_XDP_SOCKETS=y +CONFIG_XDP_SOCKETS_DIAG=m CONFIG_INET=y CONFIG_IP_MULTICAST=y CONFIG_IP_ADVANCED_ROUTER=y diff --git a/gnu/packages/aux-files/linux-libre/5.4-arm64.conf b/gnu/packages/aux-files/linux-libre/5.4-arm64.conf index 6520d1ddf2..45cfdaa85c 100644 --- a/gnu/packages/aux-files/linux-libre/5.4-arm64.conf +++ b/gnu/packages/aux-files/linux-libre/5.4-arm64.conf @@ -1008,7 +1008,8 @@ CONFIG_XFRM_IPCOMP=m CONFIG_NET_KEY=m CONFIG_NET_KEY_MIGRATE=y # CONFIG_SMC is not set -# CONFIG_XDP_SOCKETS is not set +CONFIG_XDP_SOCKETS=y +CONFIG_XDP_SOCKETS_DIAG=m CONFIG_INET=y CONFIG_IP_MULTICAST=y CONFIG_IP_ADVANCED_ROUTER=y diff --git a/gnu/packages/aux-files/linux-libre/5.4-i686.conf b/gnu/packages/aux-files/linux-libre/5.4-i686.conf index 3727f9d486..cc2d8dde01 100644 --- a/gnu/packages/aux-files/linux-libre/5.4-i686.conf +++ b/gnu/packages/aux-files/linux-libre/5.4-i686.conf @@ -1027,7 +1027,8 @@ CONFIG_XFRM_IPCOMP=m CONFIG_NET_KEY=m # CONFIG_NET_KEY_MIGRATE is not set # CONFIG_SMC is not set -# CONFIG_XDP_SOCKETS is not set +CONFIG_XDP_SOCKETS=y +CONFIG_XDP_SOCKETS_DIAG=m CONFIG_INET=y CONFIG_IP_MULTICAST=y CONFIG_IP_ADVANCED_ROUTER=y diff --git a/gnu/packages/aux-files/linux-libre/5.4-x86_64.conf b/gnu/packages/aux-files/linux-libre/5.4-x86_64.conf index be7a603af1..2e2804879a 100644 --- a/gnu/packages/aux-files/linux-libre/5.4-x86_64.conf +++ b/gnu/packages/aux-files/linux-libre/5.4-x86_64.conf @@ -1044,7 +1044,8 @@ CONFIG_XFRM_IPCOMP=m CONFIG_NET_KEY=m # CONFIG_NET_KEY_MIGRATE is not set # CONFIG_SMC is not set -# CONFIG_XDP_SOCKETS is not set +CONFIG_XDP_SOCKETS=y +CONFIG_XDP_SOCKETS_DIAG=m CONFIG_INET=y CONFIG_IP_MULTICAST=y CONFIG_IP_ADVANCED_ROUTER=y diff --git a/gnu/packages/aux-files/linux-libre/5.8-arm.conf b/gnu/packages/aux-files/linux-libre/5.8-arm.conf index bd274d1553..1e42bcdc82 100644 --- a/gnu/packages/aux-files/linux-libre/5.8-arm.conf +++ b/gnu/packages/aux-files/linux-libre/5.8-arm.conf @@ -1056,7 +1056,8 @@ CONFIG_XFRM_IPCOMP=m CONFIG_NET_KEY=m CONFIG_NET_KEY_MIGRATE=y # CONFIG_SMC is not set -# CONFIG_XDP_SOCKETS is not set +CONFIG_XDP_SOCKETS=y +CONFIG_XDP_SOCKETS_DIAG=m CONFIG_INET=y CONFIG_IP_MULTICAST=y CONFIG_IP_ADVANCED_ROUTER=y diff --git a/gnu/packages/aux-files/linux-libre/5.8-arm64.conf b/gnu/packages/aux-files/linux-libre/5.8-arm64.conf index 1e58a3c717..42cc1f2eb9 100644 --- a/gnu/packages/aux-files/linux-libre/5.8-arm64.conf +++ b/gnu/packages/aux-files/linux-libre/5.8-arm64.conf @@ -1048,7 +1048,8 @@ CONFIG_XFRM_IPCOMP=m CONFIG_NET_KEY=m CONFIG_NET_KEY_MIGRATE=y # CONFIG_SMC is not set -# CONFIG_XDP_SOCKETS is not set +CONFIG_XDP_SOCKETS=y +CONFIG_XDP_SOCKETS_DIAG=m CONFIG_INET=y CONFIG_IP_MULTICAST=y CONFIG_IP_ADVANCED_ROUTER=y diff --git a/gnu/packages/aux-files/linux-libre/5.8-i686.conf b/gnu/packages/aux-files/linux-libre/5.8-i686.conf index f73c41b6d5..d8f88f0570 100644 --- a/gnu/packages/aux-files/linux-libre/5.8-i686.conf +++ b/gnu/packages/aux-files/linux-libre/5.8-i686.conf @@ -1035,7 +1035,8 @@ CONFIG_XFRM_IPCOMP=m CONFIG_NET_KEY=m # CONFIG_NET_KEY_MIGRATE is not set # CONFIG_SMC is not set -# CONFIG_XDP_SOCKETS is not set +CONFIG_XDP_SOCKETS=y +CONFIG_XDP_SOCKETS_DIAG=m CONFIG_INET=y CONFIG_IP_MULTICAST=y CONFIG_IP_ADVANCED_ROUTER=y diff --git a/gnu/packages/aux-files/linux-libre/5.8-x86_64.conf b/gnu/packages/aux-files/linux-libre/5.8-x86_64.conf index cd2706357d..930008eeb9 100644 --- a/gnu/packages/aux-files/linux-libre/5.8-x86_64.conf +++ b/gnu/packages/aux-files/linux-libre/5.8-x86_64.conf @@ -1061,7 +1061,8 @@ CONFIG_XFRM_IPCOMP=m CONFIG_NET_KEY=m # CONFIG_NET_KEY_MIGRATE is not set # CONFIG_SMC is not set -# CONFIG_XDP_SOCKETS is not set +CONFIG_XDP_SOCKETS=y +CONFIG_XDP_SOCKETS_DIAG=m CONFIG_INET=y CONFIG_IP_MULTICAST=y CONFIG_IP_ADVANCED_ROUTER=y -- cgit v1.2.3 From a19983fb4d9e80e301a7b774b4637537b1506e3c Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Thu, 15 Oct 2020 14:58:26 +0200 Subject: gnu: xfce4-cpufreq-plugin: Update to 1.2.2. * gnu/packages/xfce.scm (xfce4-cpufreq-plugin): Update to 1.2.2. Signed-off-by: Christopher Baines --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index ed584d8959..2b9c13e6c9 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -1396,7 +1396,7 @@ (define-public xfce4-calculator-plugin (define-public xfce4-cpufreq-plugin (package (name "xfce4-cpufreq-plugin") - (version "1.2.1") + (version "1.2.2") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/panel-plugins/" @@ -1405,7 +1405,7 @@ (define-public xfce4-cpufreq-plugin "/xfce4-cpufreq-plugin-" version ".tar.bz2")) (sha256 (base32 - "1dgmx3ygil51s1az298ly0gybcw8ln1dz8q8y9k207a0vk049q65")))) + "16748wxy8aa5cxga0dbfrq7kv40alg5yx967r2l6vjapv2w083sh")))) (build-system gnu-build-system) (native-inputs `(("intltool" ,intltool) -- cgit v1.2.3 From 3e072a59be55107bdcde4d1eabe2c857a254ebcc Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Thu, 15 Oct 2020 12:20:41 +0200 Subject: gnu: Add tsukundere. * gnu/packages/game-development.scm (tsukundere): New variable. Signed-off-by: Christopher Baines --- gnu/packages/game-development.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 061dc13f69..96ed2f9da4 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -485,6 +485,35 @@ (define-public tiled ;; under BSD-2. (license license:gpl2+))) +(define-public tsukundere + (package + (name "tsukundere") + (version "0.2.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/leoprikler/tsukundere") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0qmqch8hh7vsa8qaz853vwbkz0krb106955dnz8dsl7skbm5jpn6")))) + (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf-wrapper) + ("automake" ,automake) + ("guile" ,guile-3.0) + ("pkg-config" ,pkg-config))) + (propagated-inputs + `(("guile-sdl2" ,guile3.0-sdl2))) + (home-page "https://gitlab.com/leoprikler/tsukundere") + (synopsis "Visual novel engine") + (description "Tsukundere is a game engine geared heavily towards the +development of visual novels, written on top of Guile-SDL2. It is still +experimental and at the time of writing contains little more than the Guile +modules, that make up its runtime.") + (license license:lgpl3+))) + (define-public sfml (package (name "sfml") -- cgit v1.2.3 From ae6a61d7311cde7ccb863bcff57e26f7674ebc18 Mon Sep 17 00:00:00 2001 From: Wiktor Żelazny Date: Wed, 14 Oct 2020 19:24:05 +0200 Subject: gnu: r-sf: Use proj instead of proj.4. This addresses segfaults while loading vector GIS data from a file. * gnu/packages/cran.scm (r-sf)[inputs]: Replace proj.4 with proj, and add sqlite. Signed-off-by: Christopher Baines --- gnu/packages/cran.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 59a409f8e9..252699c691 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -17,7 +17,7 @@ ;;; Copyright © 2018 Marius Bakke ;;; Copyright © 2018, 2019 Brett Gilio ;;; Copyright © 2019 Nicolò Balzarotti -;;; Copyright © 2019 Wiktor Żelazny +;;; Copyright © 2019, 2020 Wiktor Żelazny ;;; Copyright © 2019 Arne Babenhauserheide ;;; Copyright © 2019, 2020 Efraim Flashner ;;; Copyright © 2020 Todor Kondić @@ -90,6 +90,7 @@ (define-module (gnu packages cran) #:use-module (gnu packages pulseaudio) ;libsndfile #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages sqlite) #:use-module (gnu packages statistics) #:use-module (gnu packages tcl) #:use-module (gnu packages tls) @@ -13957,7 +13958,8 @@ (define-public r-sf (inputs `(("gdal" ,gdal) ("geos" ,geos) - ("proj" ,proj.4) + ("proj" ,proj) + ("sqlite" ,sqlite) ("zlib" ,zlib))) (propagated-inputs `(("r-classint" ,r-classint) -- cgit v1.2.3 From 62a7f3b84cec377a1359aeba0be6d1bf3e3123bb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 16 Oct 2020 00:02:13 +0300 Subject: gnu: mdk: Update to 1.2.11. * gnu/packages/education.scm (mdk): Update to 1.2.11. [native-inputs]: Move ncurses ... [inputs]: ... to here. --- gnu/packages/education.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index ff1a9e309d..5f5057223e 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2016 Danny Milosavljevic ;;; Copyright © 2016, 2017 Ricardo Wurmus ;;; Copyright © 2016 Hartmut Goebel -;;; Copyright © 2017, 2018, 2019 Efraim Flashner +;;; Copyright © 2017, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2019, 2020 Nicolas Goaziou ;;; Copyright © 2020 Robert Smith @@ -956,27 +956,27 @@ (define-public tuxmath (define-public mdk (package (name "mdk") - (version "1.2.10") + (version "1.2.11") (source (origin (method url-fetch) - (uri (string-append "mirror://gnu/mdk/v1.2.10/mdk-" + (uri (string-append "mirror://gnu/mdk/v" version "/mdk-" version ".tar.gz")) (sha256 (base32 - "1rwcq2b5vvv7318j92nxc5dayj27dpfhzc4rjiv4ccvsc0x35x5h")))) + "0rrac91ynya4jrhv14j9vvn21c5z80hi1zmmdxjb0d9zz6i7kjgb")))) (build-system gnu-build-system) (arguments `(#:configure-flags (list "--enable-gui=yes" "-with-readline=yes"))) (native-inputs `(("flex" ,flex) ("pkg-config" ,pkg-config) - ("intltool" ,intltool) - ("ncurses" ,ncurses))) + ("intltool" ,intltool))) (inputs `(("readline" ,readline) ("glib" ,glib) ("gtk+" ,gtk+) + ("ncurses" ,ncurses) ("pango" ,pango) ("libglade" ,libglade))) (home-page "https://www.gnu.org/software/mdk/") -- cgit v1.2.3 From 40541eaa0657785f27e6595e4e1b7a2ba4a1afde Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 16 Oct 2020 00:06:01 +0300 Subject: gnu: mdk: Fix indentation. * gnu/packages/education.scm (mdk): Fix package indentation. --- gnu/packages/education.scm | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 5f5057223e..81816ce7f0 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -958,28 +958,28 @@ (define-public mdk (name "mdk") (version "1.2.11") (source - (origin - (method url-fetch) - (uri (string-append "mirror://gnu/mdk/v" version "/mdk-" - version ".tar.gz")) - (sha256 + (origin + (method url-fetch) + (uri (string-append "mirror://gnu/mdk/v" version "/mdk-" + version ".tar.gz")) + (sha256 (base32 - "0rrac91ynya4jrhv14j9vvn21c5z80hi1zmmdxjb0d9zz6i7kjgb")))) - (build-system gnu-build-system) + "0rrac91ynya4jrhv14j9vvn21c5z80hi1zmmdxjb0d9zz6i7kjgb")))) + (build-system gnu-build-system) (arguments `(#:configure-flags (list "--enable-gui=yes" "-with-readline=yes"))) (native-inputs `(("flex" ,flex) ("pkg-config" ,pkg-config) ("intltool" ,intltool))) - (inputs - `(("readline" ,readline) - ("glib" ,glib) - ("gtk+" ,gtk+) - ("ncurses" ,ncurses) - ("pango" ,pango) - ("libglade" ,libglade))) - (home-page "https://www.gnu.org/software/mdk/") + (inputs + `(("readline" ,readline) + ("glib" ,glib) + ("gtk+" ,gtk+) + ("ncurses" ,ncurses) + ("pango" ,pango) + ("libglade" ,libglade))) + (home-page "https://www.gnu.org/software/mdk/") (synopsis "Virtual development environment for Knuth's MIX") (description "GNU MDK is the Mix Development Kit, an emulation of the pedagogical -- cgit v1.2.3 From 0ea23218ad5a625400fc478e24408e9fd1aec94a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 16 Oct 2020 00:07:10 +0300 Subject: gnu: mdk: Sort inputs alphabetically. * gnu/packages/education.scm (mdk)[native-inputs]: Sort inputs alphabetically. [inputs]: Same. --- gnu/packages/education.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 81816ce7f0..d91c086581 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -970,15 +970,15 @@ (define-public mdk `(#:configure-flags (list "--enable-gui=yes" "-with-readline=yes"))) (native-inputs `(("flex" ,flex) - ("pkg-config" ,pkg-config) - ("intltool" ,intltool))) + ("intltool" ,intltool) + ("pkg-config" ,pkg-config))) (inputs - `(("readline" ,readline) - ("glib" ,glib) + `(("glib" ,glib) ("gtk+" ,gtk+) + ("libglade" ,libglade) ("ncurses" ,ncurses) ("pango" ,pango) - ("libglade" ,libglade))) + ("readline" ,readline))) (home-page "https://www.gnu.org/software/mdk/") (synopsis "Virtual development environment for Knuth's MIX") (description -- cgit v1.2.3 From 2266f16296c4fdf67458bac1e5a96aff5c0bca9b Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Sun, 11 Oct 2020 17:25:32 +0200 Subject: gnu: zathura: Update to 0.4.7. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/pdf.scm (zathura): Update to 0.4.7. Signed-off-by: Ludovic Courtès --- gnu/packages/pdf.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 4c11111323..c9cce98e7f 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -18,6 +18,7 @@ ;;; Copyright © 2019 Ben Sturmfels ;;; Copyright © 2019,2020 Hartmut Goebel ;;; Copyright © 2020 Nicolas Goaziou +;;; Copyright © 2020 Michael Rohleder ;;; ;;; This file is part of GNU Guix. ;;; @@ -580,7 +581,7 @@ (define-public zathura-pdf-poppler (define-public zathura (package (name "zathura") - (version "0.4.5") + (version "0.4.7") (source (origin (method url-fetch) (uri @@ -588,7 +589,7 @@ (define-public zathura version ".tar.xz")) (sha256 (base32 - "0b3nrcvykkpv2vm99kijnic2gpfzva520bsjlihaxandzfm9ff8c")))) + "1rx1fk9s556fk59lmqgvhwrmv71ashh89bx9adjq46wq5gzdn4p0")))) (native-inputs `(("pkg-config" ,pkg-config) ("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") -- cgit v1.2.3 From 58f0bd2468c6de7f350aaaecbeb51021e77913c3 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Mon, 12 Oct 2020 11:16:59 +0200 Subject: gnu: go-ipfs: Update to 0.7.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/ipfs.scm (go-ipfs): Update to 0.7.0. Signed-off-by: Ludovic Courtès --- gnu/packages/ipfs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm index 222607b91a..417956a394 100644 --- a/gnu/packages/ipfs.scm +++ b/gnu/packages/ipfs.scm @@ -214,7 +214,7 @@ (define-public gx-go (define-public go-ipfs (package (name "go-ipfs") - (version "0.6.0") + (version "0.7.0") (source (origin (method url-fetch/tarbomb) @@ -222,7 +222,7 @@ (define-public go-ipfs "https://dist.ipfs.io/go-ipfs/v" version "/go-ipfs-source.tar.gz")) (sha256 - (base32 "14bgq2j2bjjy0pspy2lsj5dm3w9rmfha0l8kyq5ig86yhc4nzn80")) + (base32 "1fkzwm4qxxpmbjammk6s5qcyjxivfa0ydqz4mpz1w756c4jq0jf3")) (file-name (string-append name "-" version "-source")))) (build-system go-build-system) (arguments -- cgit v1.2.3 From 850a2f7417468b8894d17a5659fac83d06fcce41 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Mon, 12 Oct 2020 14:34:51 +0200 Subject: gnu: synapse: Update to 1.20.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/matrix.scm (synapse): Update to 1.20.1. Signed-off-by: Ludovic Courtès --- gnu/packages/matrix.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/matrix.scm b/gnu/packages/matrix.scm index 002c1b530d..83a0d478af 100644 --- a/gnu/packages/matrix.scm +++ b/gnu/packages/matrix.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2020 Alex ter Weele ;;; Copyright © 2020 Tobias Geerinckx-Rice +;;; Copyright © 2020 Michael Rohleder ;;; ;;; This file is part of GNU Guix. ;;; @@ -60,13 +61,13 @@ (define-public python-matrix-synapse-ldap3 (define-public synapse (package (name "synapse") - (version "1.14.0") + (version "1.20.1") (source (origin (method url-fetch) (uri (pypi-uri "matrix-synapse" version)) (sha256 (base32 - "09drdqcjvpk9s3hq5rx9yxsxq0wak5fg5gfaiqfnbnxav2c2v7kq")))) + "1sf36vwvy2f9jy6dldq6gqfmh60384i5j64s7yc131b4dp0n7lcw")))) (build-system python-build-system) ;; TODO Run tests with ‘PYTHONPATH=. trial3 tests’. (propagated-inputs -- cgit v1.2.3 From 4caa84e29927d0ae225860ef0027359f2aa8d56a Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Thu, 15 Oct 2020 23:58:26 +0200 Subject: gnu: emacs-with-editor: Update to 2.9.4-1. * gnu/packages/emacs-xyz.scm (emacs-with-editor): Update to 2.9.4-1. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 44 ++++++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 20 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 09984bc704..e3e61e3141 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -383,29 +383,33 @@ (define-public git-modes (license license:gpl3+))) (define-public emacs-with-editor - (package - (name "emacs-with-editor") - (version "2.9.4") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/magit/with-editor") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1z3214zjf3dassb31k14gq4nbr3q8g5x87ydfah28hm4j08v0wb3")))) - (build-system emacs-build-system) - (propagated-inputs - `(("emacs-dash" ,emacs-dash))) - (home-page "https://github.com/magit/with-editor") - (synopsis "Emacs library for using Emacsclient as EDITOR") - (description - "This package provides an Emacs library to use the Emacsclient as + ;; This commit fixes an (magit) issue with emacs 28, see + ;; https://lists.gnu.org/archive/html/help-gnu-emacs/2020-10/msg00211.html + (let ((commit "c4768f51c7415119519b4626d8643d60e584098c") + (revision "1")) + (package + (name "emacs-with-editor") + (version (git-version "2.9.4" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/magit/with-editor") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "01ysb9pnscpmingay6njdywkqgj4hn5l5d9igsg3x7p7061jwwix")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-dash" ,emacs-dash))) + (home-page "https://github.com/magit/with-editor") + (synopsis "Emacs library for using Emacsclient as EDITOR") + (description + "This package provides an Emacs library to use the Emacsclient as @code{$EDITOR} of child processes, making sure they know how to call home. For remote processes a substitute is provided, which communicates with Emacs on stdout instead of using a socket as the Emacsclient does.") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public emacs-libgit (let ((commit "0ef8b13aef011a98b7da756e4f1ce3bb18e4d55a") -- cgit v1.2.3 From 8154df5307bc3d27326e4a94c5b505a18c2723eb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 15 Oct 2020 02:36:02 +0200 Subject: gnu: knot: Build separate outputs. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/dns.scm (knot)[outputs]: New field adding :doc, :lib, and :tools outputs. [arguments]: Add #:configure-flags to install into :doc and :lib. Add a new ‘split-:tools’ phase to install into :tools. Add a new ‘break-circular-:lib->:out-reference’ phase to do just that. --- gnu/packages/dns.scm | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 1775660162..c5a6c98cb9 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -827,9 +827,15 @@ (define-public knot (delete-file-recursively "src/contrib/libbpf") #t)))) (build-system gnu-build-system) + (outputs (list "out" "doc" "lib" "tools")) (arguments `(#:configure-flags - (list "--sysconfdir=/etc" + (list (string-append "--docdir=" (assoc-ref %outputs "doc") + "/share/" ,name "-" ,version) + (string-append "--infodir=" (assoc-ref %outputs "doc") + "/share/info") + (string-append "--libdir=" (assoc-ref %outputs "lib") "/lib") + "--sysconfdir=/etc" "--localstatedir=/var" "--enable-dnstap" ; let tools read/write capture files "--enable-fastparser" ; disabled by default when .git/ exists @@ -844,7 +850,7 @@ (define-public knot (substitute* "configure.ac" (("enable_xdp=yes" match) (string-append match "\nlibbpf_LIBS=\"$libbpf_LIBS -lz\""))) - #t)) + #true)) (add-before 'bootstrap 'update-parser (lambda _ (with-directory-excursion "src" @@ -868,7 +874,26 @@ (define-public knot "install")))) (add-after 'install 'install-info (lambda _ - (invoke "make" "install-info")))))) + (invoke "make" "install-info"))) + (add-after 'install 'break-circular-:lib->:out-reference + (lambda* (#:key outputs #:allow-other-keys) + (let ((lib (assoc-ref outputs "lib"))) + (for-each (lambda (file) + (substitute* file + (("(prefix=).*" _ assign) + (string-append assign lib "\n")))) + (find-files lib "\\.pc$")) + #true))) + (add-after 'install 'split-:tools + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (tools (assoc-ref outputs "tools"))) + (mkdir-p (string-append tools "/share/man")) + (rename-file (string-append out "/bin") + (string-append tools "/bin")) + (rename-file (string-append out "/share/man/man1") + (string-append tools "/share/man/man1")) + #true)))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) -- cgit v1.2.3 From a97ea4ff2a407ec4c5bd3ffe55c9c59a1e8c37ea Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 15 Oct 2020 02:40:38 +0200 Subject: gnu: knot-resolver: Build with only knot:lib. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This saves 13.9 MiB (~7.5%) of total ‘guix size’. * gnu/packages/dns.scm (knot-resolver)[inputs]: Replace knot with knot:lib. --- gnu/packages/dns.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index c5a6c98cb9..a27b670d8c 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -986,7 +986,7 @@ (define-public knot-resolver (inputs `(("fstrm" ,fstrm) ("gnutls" ,gnutls) - ("knot" ,knot) + ("knot:lib" ,knot "lib") ("libuv" ,libuv) ("lmdb" ,lmdb) ("luajit" ,luajit) -- cgit v1.2.3 From 25bc6ffdd06521702094bb799dd300090ac0bc52 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 15 Oct 2020 19:52:26 +0200 Subject: gnu: asunder: Update to 2.9.7. * gnu/packages/cdrom.scm (asunder): Update to 2.9.7. --- gnu/packages/cdrom.scm | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index 6dee19fb29..766f62fc9f 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -737,16 +737,15 @@ (define-public geteltorito (define-public asunder (package (name "asunder") - (version "2.9.6") - (source (origin - (method url-fetch) - (uri - (string-append "http://www.littlesvr.ca/asunder/releases/asunder-" - version - ".tar.bz2")) - (sha256 - (base32 - "1ycnd82lh7qy1pcbngd4b41s16j9hnm2kyfrncg4cwr3bfk7yg7a")))) + (version "2.9.7") + (source + (origin + (method url-fetch) + (uri + (string-append "http://www.littlesvr.ca/asunder/releases/asunder-" + version ".tar.bz2")) + (sha256 + (base32 "1x3l308ss0iqhz90qyjb94gyd8b4piyrm2nzjmg5kf049k9prjf1")))) (build-system glib-or-gtk-build-system) (arguments '(#:out-of-source? #f -- cgit v1.2.3 From 7f4a81540acb58edf740841addcbe07bf3b1f904 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 15 Oct 2020 20:20:40 +0200 Subject: gnu: fakeroot: Update to 1.25.3. * gnu/packages/linux.scm (fakeroot): Update to 1.25.3. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 9d35187749..faeaf5dcea 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -7005,7 +7005,7 @@ (define-public genext2fs (define-public fakeroot (package (name "fakeroot") - (version "1.25.1") + (version "1.25.3") (source (origin ;; There are no tags in the repository, so take this snapshot. (method url-fetch) @@ -7014,7 +7014,7 @@ (define-public fakeroot (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1ianaacwpjcw02shfiyybkqh5r6il4lvxin10n4y66kw0p7i3kcm")))) + "0v4m3v1bdqvblwj3vqsb3mllgbci6dsgsydq6765nzvz6n1kd44f")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From ad8cdc7b89d8f2d4406c70d3833f77f2f4cb20e4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 15 Oct 2020 20:46:57 +0200 Subject: gnu: swaks: Use git source. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/mail.scm (swaks)[source]: Use GIT-FETCH and GIT-FILE-NAME. [argument]: Add a ‘set-build_version’ phase. Adjust the POD file name. --- gnu/packages/mail.scm | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 87e45fa988..e49a8bdae1 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -3233,13 +3233,13 @@ (define-public swaks (version "20190914.0") (source (origin - (method url-fetch) - (uri (string-append - "https://jetmore.org/john/code/swaks/files/swaks-" - version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/jetmore/swaks") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 - "12awq5z4sdd54cxprj834zajxhkpy4jwhzf1fhigcx1zbhdaacsp")))) + (base32 "0xd3952mm8r0nj32rhvciiaq8cx4hxvr7nqpv4njq18q6gv13qby")))) (build-system perl-build-system) (inputs `(("perl-io-socket-inet6" ,perl-io-socket-inet6) @@ -3250,10 +3250,15 @@ (define-public swaks `(#:tests? #f ; no tests #:phases (modify-phases %standard-phases + (add-after 'unpack 'set-build_version + (lambda _ + (substitute* "swaks" + (("\"DEVRELEASE\"") (format #f "\"~a\"" ,version))) + #true)) (delete 'configure) (replace 'build (lambda _ - (invoke "pod2man" "doc/ref.pod" "swaks.1"))) + (invoke "pod2man" "doc/base.pod" "swaks.1"))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) -- cgit v1.2.3 From f04a7ef5b6265a7c84aa41386fb99fe83ad024cb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 15 Oct 2020 20:58:42 +0200 Subject: gnu: swaks: Update to 20201014.0. * gnu/packages/mail.scm (swaks): Update to 20201014.0. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index e49a8bdae1..8e85c7b7eb 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -3230,7 +3230,7 @@ (define-public blists (define-public swaks (package (name "swaks") - (version "20190914.0") + (version "20201014.0") (source (origin (method git-fetch) @@ -3239,7 +3239,7 @@ (define-public swaks (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0xd3952mm8r0nj32rhvciiaq8cx4hxvr7nqpv4njq18q6gv13qby")))) + (base32 "131i2b1yxhnbqkfk4kky40pfanqw2c5lcgbnjhfqp5cvpawpk2ai")))) (build-system perl-build-system) (inputs `(("perl-io-socket-inet6" ,perl-io-socket-inet6) -- cgit v1.2.3 From 532db12edb6734dcd7cdfbb59a537c7921d53733 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 15 Oct 2020 21:34:46 +0200 Subject: gnu: perl-email-sender: Update to 1.300035. * gnu/packages/mail.scm (perl-email-sender): Update to 1.300035. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 8e85c7b7eb..5056098806 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1976,14 +1976,14 @@ (define-public perl-email-mime-encodings (define-public perl-email-sender (package (name "perl-email-sender") - (version "1.300034") + (version "1.300035") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/R/RJ/RJBS/" "Email-Sender-" version ".tar.gz")) (sha256 - (base32 "14aj9kqa9dr2bdhzn2qvjj2mffj8wjb5397z8qw7qg057fk3ib05")))) + (base32 "0yfssp3rqdx1dmgvnygarzgkpkhqm28r5sd0gh87ksk8yxndhjql")))) (build-system perl-build-system) (native-inputs `(("perl-capture-tiny" ,perl-capture-tiny))) -- cgit v1.2.3 From 16b0aa429ed065350180b5039937cf4d227e243d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 15 Oct 2020 21:35:32 +0200 Subject: gnu: praat: Update to 6.1.27. * gnu/packages/language.scm (praat): Update to 6.1.27. --- gnu/packages/language.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index 039854a2b1..5ccc94167c 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -1053,7 +1053,7 @@ (define-public link-grammar (define-public praat (package (name "praat") - (version "6.1.26") + (version "6.1.27") (source (origin (method git-fetch) (uri (git-reference @@ -1062,7 +1062,7 @@ (define-public praat (file-name (git-file-name name version)) (sha256 (base32 - "12y4x7c34ddlg22kc82n17if1dqm8lyap9jg0kh1vagkdm9dy02w")))) + "0wd2xy5shyk00d91yrif1c2xwzdl4i7qpdfa530f845yzn7k2ks1")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no test target -- cgit v1.2.3 From d605f58de5be0395b44a5989763f7e9ad81056ca Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 15 Oct 2020 21:43:56 +0200 Subject: gnu: xterm: Update to 361. * gnu/packages/xorg.scm (xterm): Update to 361. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 3db4cbae2c..0eda94bc47 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6110,7 +6110,7 @@ (define-public xmessage (define-public xterm (package (name "xterm") - (version "359") + (version "361") (source (origin (method url-fetch) (uri (list @@ -6120,7 +6120,7 @@ (define-public xterm "xterm-" version ".tgz"))) (sha256 (base32 - "0lcjifz027j99zf2dnms0h43xp5zznxr39safrpyarv59jlmdjii")))) + "0gv27akkfb796aww1snq3c2sxmi8vajgfxk83g60awp4slh0yqc5")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--enable-wide-chars" "--enable-load-vt-fonts" -- cgit v1.2.3 From 6688aed40869567ef0d37a5165e7870afea87087 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 15 Oct 2020 23:05:01 +0200 Subject: gnu: chirp: Update to 20201014. * gnu/packages/radio.scm (chirp): Update to 20201014. --- gnu/packages/radio.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index b10f75a6ce..a8f57b6c17 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -159,15 +159,14 @@ (define-public rtl-sdr (define-public chirp (package (name "chirp") - (version "20200430") + (version "20201014") (source (origin (method url-fetch) (uri (string-append "https://trac.chirp.danplanet.com/chirp_daily/daily-" version "/chirp-daily-" version ".tar.gz")) (sha256 - (base32 - "060fzplgmpfrk6wkfaasx7phpfk90mmylk6drbwzk4f9r1655vda")))) + (base32 "16x3ix2n7a9l7lln2pri1xfmhyfvvzxb0nr3h33iajqimbwckxj0")))) (build-system python-build-system) (inputs `(("python2-libxml2" ,python2-libxml2) -- cgit v1.2.3 From 6f19c32b0eeeb6b6647ef75c4c8b9e390d41fcd9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 15 Oct 2020 23:37:28 +0200 Subject: gnu: dmidecode: Update to 3.3. * gnu/packages/admin.scm (dmidecode): Update to 3.3. [arguments]: Restructure. Add CC to #:make-flags. --- gnu/packages/admin.scm | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 1b80eb8ab7..93430dceb7 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1809,21 +1809,24 @@ (define-public wakelan (define-public dmidecode (package (name "dmidecode") - (version "3.2") - (source (origin - (method url-fetch) - (uri (string-append - "mirror://savannah/dmidecode/dmidecode-" - version ".tar.xz")) - (sha256 - (base32 - "1pcfhcgs2ifdjwp7amnsr3lq95pgxpr150bjhdinvl505px0cw07")))) + (version "3.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://savannah/dmidecode/dmidecode-" + version ".tar.xz")) + (sha256 + (base32 "0m8lzg9rf1qssasiix672bxk5qwms90561g8hfkkhk31h2kkgiw2")))) (build-system gnu-build-system) (arguments - '(#:phases (modify-phases %standard-phases (delete 'configure)) - #:tests? #f ; no 'check' target - #:make-flags (list (string-append "prefix=" - (assoc-ref %outputs "out"))))) + `(#:tests? #f ; no 'check' target + #:make-flags + (list (string-append "CC=" ,(cc-for-target)) + (string-append "prefix=" + (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (delete 'configure)))) ; no configure script (home-page "https://www.nongnu.org/dmidecode/") (synopsis "Read hardware information from the BIOS") (description -- cgit v1.2.3 From e4089b897b195bce1d28efc4c4e3ca847e15ae89 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 14 Oct 2020 17:19:48 +0200 Subject: gnu: perl-role-tiny: Update to 2.001004. * gnu/packages/perl.scm (perl-role-tiny): Update to 2.001004. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 0aaf87cb3f..ad84d63785 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -8605,14 +8605,14 @@ (define-public perl-role-tiny (define-public perl-role-tiny-2 (package (inherit perl-role-tiny) - (version "2.001001") + (version "2.001004") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/H/HA/HAARG/" "Role-Tiny-" version ".tar.gz")) (sha256 - (base32 "16yryg3cr14xw201gm8k8ci00hs60fy8lk2xhnaqa85n5m68flk8")))))) + (base32 "11qn516352yhi794www3ykwa9xv2gxpfnhn9jcn10x0ahl95gflj")))))) (define-public perl-safe-isa (package -- cgit v1.2.3 From 7f73ca75fac1308ec6987d5b20987e97695f1325 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Oct 2020 06:00:34 +0200 Subject: gnu: cpuid: Fix typo. This is a left-behind fixup commit to 2bfe99b11ac89ea723fd5d8aed9d6cdac78d71d4. * gnu/packages/linux.scm (cpuid)[arguments]: Quasiquote. --- gnu/packages/linux.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index faeaf5dcea..9731b6fed6 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -6437,7 +6437,7 @@ (define-public cpuid "19jnkh57f979b78ak5mpxmdvnkgc33r55cw9shgd2hc380b3zi8k")))) (build-system gnu-build-system) (arguments - '(#:make-flags + `(#:make-flags (list (string-append "CC=" ,(cc-for-target))) #:tests? #f ; no tests #:phases (modify-phases %standard-phases -- cgit v1.2.3 From 24dd78a3cdd45d73d61c1133cac21f21c2331c2a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Oct 2020 06:03:47 +0200 Subject: gnu: perl-db-file: Update to 1.855. * gnu/packages/databases.scm (perl-db-file): Update to 1.855. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 45224a5ed3..4bd1c1e025 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2123,14 +2123,14 @@ (define-public guile-wiredtiger (define-public perl-db-file (package (name "perl-db-file") - (version "1.854") + (version "1.855") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/P/PM/PMQS/DB_File-" version ".tar.gz")) (sha256 - (base32 "0fv0any5am6vr6h1wcwhnraj70hd55fs4d8c2y7chsc9alf9di5y")))) + (base32 "0q599h7g4jkzks5dxf1zifx9k7l9vif26r2dlgkzxkg6bfif5zyr")))) (build-system perl-build-system) (inputs `(("bdb" ,bdb))) (native-inputs `(("perl-test-pod" ,perl-test-pod))) -- cgit v1.2.3 From 83fc59b46b8115c9f657e815f0acc46e926d5718 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 16 Oct 2020 15:38:32 +0300 Subject: gnu: docker-cli: Fix build. This is a follow-up to 6b793fa66218337a1f638466753cd5326a6a6c18. * gnu/packages/docker.scm (docker-cli)[arguments]: In custom 'install phase don't change directory to install 'docker' binary. --- gnu/packages/docker.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index e4fc88b8c0..8e68403ca4 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -658,8 +658,7 @@ (define-public docker-cli (string-append etc "/fish/completions")) (install-file "zsh/_docker" (string-append etc "/zsh/site-functions"))) - (chdir "build") - (install-file "docker" out-bin) + (install-file "build/docker" out-bin) #t)))))) (native-inputs `(("go" ,go) -- cgit v1.2.3 From 9a4c83bdb61d046617e87ad9b4c0e1d6b55b1810 Mon Sep 17 00:00:00 2001 From: Tim Howes Date: Wed, 14 Oct 2020 20:05:28 -0700 Subject: gnu: julia: Update to 1.5.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia.scm (libuv-julia): No change to libuv.version. (julia-patch): Update to 1.5.2. (llvm-julia)[inherit]: Update to use llvm-9. [source]: Apply patches for llvm-9 from deps/llvm.mk. (julia): Update to 1.5.2. [source]: Remove substitutions for precompile.jl and cmdlineargs.jl. Add a substitution for Dates/io tests. Set --depwarn=error for tests. [arguments]: Set LLVM_VER=9.0.1. Signed-off-by: Ludovic Courtès --- gnu/packages/julia.scm | 113 +++++++++++++++++++++---------------------------- 1 file changed, 49 insertions(+), 64 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm index 78488a4e99..65fa726d92 100644 --- a/gnu/packages/julia.scm +++ b/gnu/packages/julia.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus ;;; Copyright © 2016, 2020 Efraim Flashner ;;; Copyright © 2020 Nicolò Balzarotti +;;; Copyright © 2020 Tim Howes ;;; ;;; This file is part of GNU Guix. ;;; @@ -53,7 +54,7 @@ (define libuv-julia (let ((commit "35b1504507a7a4168caae3d78db54d1121b121e1") (revision "1")) ;; When upgrading Julia, also upgrade this. Get the commit from - ;; https://github.com/JuliaLang/julia/blob/v1.4.1/deps/libuv.version + ;; https://github.com/JuliaLang/julia/blob/v1.5.2/deps/libuv.version (package (inherit libuv) (name "libuv-julia") @@ -103,7 +104,7 @@ (define (julia-patch-url version name) "/deps/patches/" name ".patch")) (define (julia-patch name sha) - (let ((version "1.4.1")) + (let ((version "1.5.2")) (origin (method url-fetch) (uri (julia-patch-url version name)) (sha256 (base32 sha)) @@ -111,63 +112,52 @@ (define (julia-patch name sha) (define llvm-julia (package - (inherit llvm-8) + (inherit llvm-9) (name "llvm-julia") (source (origin - (inherit (package-source llvm-8)) + (inherit (package-source llvm-9)) ;; Those patches are inside the Julia source repo. ;; They are _not_ Julia specific (https://github.com/julialang/julia#llvm) ;; but they are required to build Julia. ;; Discussion: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=919628 (patches - (map (match-lambda - ((name hash) - (julia-patch name hash))) - (list - '("llvm-7.0-D44650" - "1h55kkmkiisfj6sk956if2bcj9s0v6n5czn8dxb870vp5nccj3ir") - '("llvm-6.0-DISABLE_ABI_CHECKS" - "014fawd1ba7yckalypfld22zgic87x9nx3cim42zrwygywd36pyg") - '("llvm-6.0-NVPTX-addrspaces" - "1qdi2zmrjsrj0h84zv2vyly2hjcn4f67mfy0s1q353g4v4jkscqc") - '("llvm-D27629-AArch64-large_model_6.0.1" - "1qrshmlqvnasdyc158vfn3hnbigqph3lsq7acb9w8lwkpnnm2j4z") - '("llvm8-D34078-vectorize-fdiv" - "19spqc3xsazn1xs9gpcgv9ldadfkv49rmc5khl7sf1dlmhgi4602") - '("llvm7-D50010-VNCoercion-ni" - "18scg6aa036xa1508s7q93w9dvc5gp69fz6yl6fkh4yffw4gymw6") - '("llvm-8.0-D50167-scev-umin" - "0g9w2x8yryjdkihnrf18x0yi5bi14c5p8wffda1w732dr5ckzk94") - '("llvm-D57118-powerpc" - "0vxz5s0s9b625v1rv8lg1566yhxh1i91ydzmvy5s7njvzc7p19aw") - '("llvm8-WASM-addrspaces" - "1176agj9hh7csdm2lnklb42zcdsb3q6lx9jiyp2shn4p2678y76q") - '("llvm-exegesis-mingw" - "0ph1cj1j7arvf1xq2xcr7qf9g0cpdl14fincgr67vpi520zvd3vp") - '("llvm-test-plugin-mingw" - "12z738cnahbf6n381im7i0hxp1m6k9hrnfjlmq9sac46nxly9gnj") - '("llvm-8.0-D66401-mingw-reloc" - "15v3p5sznn979cfnd7gdn3nd701fd7xd5aks6lnj1mslvljlq3ls") - '("llvm7-revert-D44485" - "0f59kq3p3mpwsbmskypbi4zn01l6ig0x7v2rjp08k2r8z8m6fa8n") - '("llvm-8.0-D63688-wasm-isLocal" - "0i9wi5n63ip3802z6m7aj3p07hkqjlmp4vg4wq3xkf9f6w9rksab") - '("llvm-8.0-D55758-tablegen-cond" - "1l08mg7qigravi7plsq3yzya80fljnp95n8faddr29wbr2qr0655") - '("llvm-8.0-D59389-refactor-wmma" - "0rgrwk4xlwpk7yai2j7xadcfws93rmk2hhh44fysa88imvrbp478") - '("llvm-8.0-D59393-mma-ptx63-fix" - "094jcsxbcx9fljj623mgmc0rjpk12s2rs0di0ck0hakzhr8mbv5n") - '("llvm-8.0-D66657-codegen-degenerate" - "1n1ddx19h90bbpimdyd9dh8fsm6gb93xxyqm4ljkxa1k3cx2vm72") - '("llvm-8.0-D71495-vectorize-freduce" - "1zff08wvji9lnpskk4b3p5zyjsy5hhy23ynxjqlj9dw7jvvfrf0p") - '("llvm-8.0-D75072-SCEV-add-type" - "0amlyyndsc90ml2k6prdahf24q0j23nfmlbqf8gcqcxpl5sqq3i6") - '("llvm-8.0-D65174-limit-merge-stores" - "1ls5114fhgip9rbqabqc16mi367ra0k75ngc1vyqqhq1ghm9x7y9")))))) + (map (match-lambda + ((name hash) + (julia-patch name hash))) + (list + '("llvm-D27629-AArch64-large_model_6.0.1" + "1qrshmlqvnasdyc158vfn3hnbigqph3lsq7acb9w8lwkpnnm2j4z") + '("llvm8-D34078-vectorize-fdiv" + "19spqc3xsazn1xs9gpcgv9ldadfkv49rmc5khl7sf1dlmhgi4602") + '("llvm-7.0-D44650" + "1h55kkmkiisfj6sk956if2bcj9s0v6n5czn8dxb870vp5nccj3ir") + '("llvm9-D50010-VNCoercion-ni" + "1s1d3sjsiq4vxg7ncy5cz56zgy5vcq6ls3iqaiqkvr23wyryqmdx") + '("llvm-exegesis-mingw" + "0ph1cj1j7arvf1xq2xcr7qf9g0cpdl14fincgr67vpi520zvd3vp") + '("llvm-test-plugin-mingw" + "12z738cnahbf6n381im7i0hxp1m6k9hrnfjlmq9sac46nxly9gnj") + '("llvm7-revert-D44485" + "0f59kq3p3mpwsbmskypbi4zn01l6ig0x7v2rjp08k2r8z8m6fa8n") + '("llvm-8.0-D66657-codegen-degenerate" + "1n1ddx19h90bbpimdyd9dh8fsm6gb93xxyqm4ljkxa1k3cx2vm72") + '("llvm-8.0-D71495-vectorize-freduce" + "1zff08wvji9lnpskk4b3p5zyjsy5hhy23ynxjqlj9dw7jvvfrf0p") + '("llvm-D75072-SCEV-add-type" + "029a3fywsm233vf48mscina24idd50dc75wr70lmimrhwnw27p0z") + '("llvm-9.0-D65174-limit-merge-stores" + "04bff1mnblfj9mxfdwr1qdnw3i3szmp60gnhxwas5y68qg33z6j0") + '("llvm9-D71443-PPC-MC-redef-symbol" + "1c93nv7rgc9jg5mqrnvv08xib1789qvlql94fwggh18mp3b9hbgy") + '("llvm-9.0-D78196" + "08a43hyg7yyqjq2vmfsmppf34xcz60wq6y9zw5fdyhw2h1mcnmns") + '("llvm-julia-tsan-custom-as" + "0awh40kf6lm4wn1nsjd1bmhfwq7rqj811szanp2xkpspykw9hg9s") + '("llvm-9.0-D85499" + "0vxlr35srvbvihlgrxq15v6dylp90vgi0qahj22j01jgqmdasjkm")))) + (patch-flags '("-p1")))) (arguments - (substitute-keyword-arguments (package-arguments llvm-8) + (substitute-keyword-arguments (package-arguments llvm-9) ((#:configure-flags flags) `(list ;; Taken from NixOS. Only way I could get libLLVM-6.0.so "-DCMAKE_BUILD_TYPE=Release" @@ -231,7 +221,7 @@ (define-public libwhich (define-public julia (package (name "julia") - (version "1.4.1") + (version "1.5.2") (source (origin (method url-fetch) (uri (string-append @@ -239,7 +229,7 @@ (define-public julia version "/julia-" version ".tar.gz")) (sha256 (base32 - "030aza3qj5zcinxbrbqgi7p64q6klwq2bhwccraarx7l0hg9lw3i")) + "08wazf3f1lb2c2c5s700kyak8llfqwki8xlnqyrbwmwxjj801p2n")) (patches (search-patches "julia-SOURCE_DATE_EPOCH-mtime.patch")))) (build-system gnu-build-system) @@ -344,16 +334,6 @@ (define-public julia "tests = filter(e->!in(e,[\"backtrace\",\"exceptions\",\"precompile\", \"client\",\"stacktraces\"]), testnames)")) - ;; precompile test is broken, fixed in - ;; fed29f893544d1dc8f86444c65d632c68168d0f3 - (substitute* "test/precompile.jl" - (("@test !isdefined\\(Base.Nothing.name.mt") - "# @test !isdefined(Base.Nothing.name.mt")) - ;; When HOME is not set, julia calls uv_os_homedir, which in - ;; turns call getpwuid_r. Add the HOME env variable to the - ;; external julia call to fix this - (substitute* "test/cmdlineargs.jl" - (("\"JULIA_PROJECT\"") "\"HOME\"=>\"/tmp\", \"JULIA_PROJECT\"")) ;; Marking the test as broken as it's a known bug: ;; https://github.com/JuliaLang/julia/issues/32377 (substitute* "stdlib/REPL/test/replcompletions.jl" @@ -361,11 +341,16 @@ (define-public julia ;; Dates has a similar bug: ;; https://github.com/JuliaLang/julia/issues/34655 (substitute* "stdlib/Dates/test/io.jl" + (("\"Dates.Date") "\"Date") (("\"Dates.Time") "\"Time")) ;; Upstream bug I found when packaging ;; https://github.com/JuliaLang/julia/issues/35785 (substitute* "test/file.jl" (("@test dirname\\(t\\) == d") "@test_broken dirname(t) == d")) + ;; Deprecation test fails with --depwarn=no + ;; https://github.com/JuliaLang/julia/issues/37673 + (substitute* "test/Makefile" + (("./runtests.jl") "--depwarn=error ./runtests.jl")) #t)) (add-after 'install 'make-wrapper (lambda* (#:key inputs outputs #:allow-other-keys) @@ -416,7 +401,7 @@ (define-public julia (assoc-ref %build-inputs "utf8proc") "/include") "USE_SYSTEM_LLVM=1" - "LLVM_VER=8.0.0" + "LLVM_VER=9.0.1" "USE_LLVM_SHLIB=1" "USE_SYSTEM_LIBUNWIND=1" -- cgit v1.2.3 From e39e8d97c17c7e7a008a4f4e125ae6b3844cc03a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 16 Oct 2020 14:32:50 +0200 Subject: gnu: runc, skopeo, docker-cli, umoci: Don't 'chdir' in build phases. This fixes breaks the 'install-license-files' phase added in 6b793fa66218337a1f638466753cd5326a6a6c18 and is generally not good practice. Reported by divoplade on #guix. * gnu/packages/virtualization.scm (runc)[arguments]: Use 'with-directory-excursion' instead of 'chdir' in build phases. (skopeo)[arguments]: Likewise. (umoci)[arguments]: Likewise. * gnu/packages/docker.scm (docker-cli)[arguments]: In 'install' phase, remove call to 'chdir' and adjust 'install-file' argument accordingly. --- gnu/packages/virtualization.scm | 45 ++++++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 21 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index f536616126..ac062dfa15 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1518,18 +1518,19 @@ (define-public runc "-xvf" source)))) (replace 'build (lambda* (#:key import-path #:allow-other-keys) - (chdir (string-append "src/" import-path)) - ;; XXX: requires 'go-md2man'. - ;; (invoke "make" "man") - (invoke "make"))) + (with-directory-excursion (string-append "src/" import-path) + ;; XXX: requires 'go-md2man'. + ;; (invoke "make" "man") + (invoke "make")))) ;; (replace 'check ;; (lambda _ ;; (invoke "make" "localunittest"))) (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (invoke "make" "install" "install-bash" - (string-append "PREFIX=" out)))))))) + (lambda* (#:key import-path outputs #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (let ((out (assoc-ref outputs "out"))) + (invoke "make" "install" "install-bash" + (string-append "PREFIX=" out))))))))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs @@ -1573,14 +1574,15 @@ (define-public umoci "-xvf" source)))) (replace 'build (lambda* (#:key import-path #:allow-other-keys) - (chdir (string-append "src/" import-path)) - ;; TODO: build manpages with 'go-md2man'. - (invoke "make" "SHELL=bash"))) + (with-directory-excursion (string-append "src/" import-path) + ;; TODO: build manpages with 'go-md2man'. + (invoke "make" "SHELL=bash")))) (replace 'install - (lambda* (#:key outputs #:allow-other-keys) + (lambda* (#:key import-path outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (bindir (string-append out "/bin"))) - (install-file "umoci" bindir) + (install-file (string-append "src/" import-path "/umoci") + bindir) #t)))))) (home-page "https://umo.ci/") (synopsis "Tool for modifying Open Container images") @@ -1617,19 +1619,20 @@ (define-public skopeo (arguments '(#:import-path "github.com/containers/skopeo" #:install-source? #f - #:tests? #f ; The tests require Docker + #:tests? #f ; The tests require Docker #:phases (modify-phases %standard-phases (replace 'build (lambda* (#:key import-path #:allow-other-keys) - (chdir (string-append "src/" import-path)) - ;; TODO: build manpages with 'go-md2man'. - (invoke "make" "bin/skopeo"))) + (with-directory-excursion (string-append "src/" import-path) + ;; TODO: build manpages with 'go-md2man'. + (invoke "make" "bin/skopeo")))) (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (invoke "make" "install-binary" "install-completions" - (string-append "PREFIX=" out)))))))) + (lambda* (#:key import-path outputs #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (let ((out (assoc-ref outputs "out"))) + (invoke "make" "install-binary" "install-completions" + (string-append "PREFIX=" out))))))))) (home-page "https://github.com/containers/skopeo") (synopsis "Interact with container images and container image registries") (description -- cgit v1.2.3 From 5dbfdf8be4dc6250ab8475874e232e653b042cbf Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 16 Oct 2020 14:57:25 +0200 Subject: services: provenance: Wrap config file name in 'assume-valid-file-name'. This gets rid of a pointless 'local-file' warning when running 'guix system reconfigure FILE' and FILE is a relative file name. * gnu/services.scm (provenance-entry): Wrap CONFIG-FILE in 'assume-valid-file-name'. --- gnu/services.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/services.scm b/gnu/services.scm index 11ba21e824..4b30399adc 100644 --- a/gnu/services.scm +++ b/gnu/services.scm @@ -461,7 +461,12 @@ (define channels (mbegin %store-monad (let ((config-file (cond ((string? config-file) - (local-file config-file "configuration.scm")) + ;; CONFIG-FILE has been passed typically via + ;; 'guix system reconfigure CONFIG-FILE' so we + ;; can assume it's valid: tell 'local-file' to + ;; not emit a warning. + (local-file (assume-valid-file-name config-file) + "configuration.scm")) ((not config-file) #f) (else -- cgit v1.2.3 From 27913a6d3862a858269ada931f51e0ba03912e8c Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 16 Oct 2020 14:59:28 +0200 Subject: gnu: gnuzilla: Use 'assume-valid-file-name' where appropriate. This avoids spurious 'local-file' warnings when running "make". * gnu/packages/gnuzilla.scm (icecat-source): Wrap 'search-patch' calls in 'assume-valid-file-name'. --- gnu/packages/gnuzilla.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index af436a1dfd..4dbe864598 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2015 Andreas Enge -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Mark H Weaver ;;; Copyright © 2015 Sou Bunnbu ;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner @@ -591,10 +591,14 @@ (define icecat-source (base32 "0266gp8vs4avlfdnr8dj7b47msxv1vkd0xpnifp04v4scvgj0yaj")))) + ;; 'search-patch' returns either a valid file name or #f, so wrap it + ;; in 'assume-valid-file-name' to avoid 'local-file' warnings. (gnuzilla-fixes-patch - (local-file (search-patch "icecat-use-older-reveal-hidden-html.patch"))) + (local-file (assume-valid-file-name + (search-patch "icecat-use-older-reveal-hidden-html.patch")))) (makeicecat-patch - (local-file (search-patch "icecat-makeicecat.patch")))) + (local-file (assume-valid-file-name + (search-patch "icecat-makeicecat.patch"))))) (origin (method computed-origin-method) -- cgit v1.2.3 From 1aa375528b17e6cb41d137dd46b3d2018a8058a4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Oct 2020 13:48:19 +0200 Subject: gnu: libressl: Update to 3.1.4. * gnu/packages/tls.scm (libressl): Update to 3.1.4. --- gnu/packages/tls.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index cfdef6a930..82e6321de6 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -544,14 +544,14 @@ (define-public openssl-1.0 (define-public libressl (package (name "libressl") - (version "3.0.2") + (version "3.1.4") (source (origin (method url-fetch) (uri (string-append "mirror://openbsd/LibreSSL/" "libressl-" version ".tar.gz")) (sha256 (base32 - "13ir2lpxz8y1m151k7lrx306498nzfhwlvgkgv97v5cvywmifyyz")))) + "1dnbbnr43jashxivnafmh9gnn57c7ayva788ba03z633k6f18k21")))) (build-system gnu-build-system) (arguments ;; Do as if 'getentropy' was missing since older Linux kernels lack it -- cgit v1.2.3 From 46fd582ff5870efd7d243d6d0fcdfaa9c7cf2edf Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Oct 2020 13:48:30 +0200 Subject: gnu: soundtouch: Update to 2.2. * gnu/packages/audio.scm (soundtouch): Update to 2.2. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index d271c4b6aa..e6b3dda299 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3304,7 +3304,7 @@ (define-public xmp (define-public soundtouch (package (name "soundtouch") - (version "2.1.2") + (version "2.2") (source (origin (method git-fetch) @@ -3313,7 +3313,7 @@ (define-public soundtouch (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "174wgm3s0inmbnkrlnspxjwm2014qhjhkbdqa5r8rbfi0nzqxzsz")))) + (base32 "12i6yg8vvqwyk412lxl2krbfby6hnxld8qxy0k4m5xp4g94jiq4p")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) -- cgit v1.2.3 From 214ff8f6dbe95de95918b56ee7ad19d2a7c99faf Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Oct 2020 14:03:36 +0200 Subject: gnu: tintin++: Update to 2.02.04. * gnu/packages/games.scm (tintin++): Update to 2.02.04. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index d473baa335..af13dc3c5a 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -5083,7 +5083,7 @@ (define-public supertux (define-public tintin++ (package (name "tintin++") - (version "2.02.02") + (version "2.02.04") (source (origin (method url-fetch) @@ -5091,7 +5091,7 @@ (define-public tintin++ (string-drop-right version 1) "/tintin-" version ".tar.gz")) (sha256 - (base32 "11ylbp8ip7dwmh4gzb53z147pcfxkl3lwhyy8ngyn2zc634vdn65")))) + (base32 "1w1y20vqcikg59gnbxjbhyq2yanwqz1a6wp8vd1qnmil240id4j7")))) (inputs `(("gnutls" ,gnutls) ("pcre" ,pcre) -- cgit v1.2.3 From 7969a6adf38bd8d6dcdf83575f28e57200cb4976 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Oct 2020 15:08:22 +0200 Subject: gnu: python-sqlalchemy: Update to 1.3.20. * gnu/packages/databases.scm (python-sqlalchemy): Update to 1.3.20. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 4bd1c1e025..f88f9e377d 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2635,13 +2635,13 @@ (define-public python2-pysqlite (define-public python-sqlalchemy (package (name "python-sqlalchemy") - (version "1.3.18") + (version "1.3.20") (source (origin (method url-fetch) (uri (pypi-uri "SQLAlchemy" version)) (sha256 - (base32 "1rwc6ss1cnz3kxx0p9p6xw0w79r8qw03lcc29k31yb3rcigvfbys")))) + (base32 "18b9am7bsqc4nj3d2h5r93i002apczxfvpfpcqbd6f0385zmrwnj")))) (build-system python-build-system) (native-inputs `(("python-cython" ,python-cython) ; for C extensions -- cgit v1.2.3 From 295d969c3899794bb27c1e296b583d1cc2ef5324 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Oct 2020 06:45:40 +0200 Subject: gnu: libostree: Update to 2020.7. * gnu/packages/package-management.scm (libostree): Update to 2020.7. --- gnu/packages/package-management.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 13cb44e930..ba338415ce 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1242,7 +1242,7 @@ (define-public msitools (define-public libostree (package (name "libostree") - (version "2020.6") + (version "2020.7") (source (origin (method url-fetch) @@ -1250,7 +1250,7 @@ (define-public libostree "https://github.com/ostreedev/ostree/releases/download/v" (version-major+minor version) "/libostree-" version ".tar.xz")) (sha256 - (base32 "0wk9fgj9jl25ns2hcgcb6j24k5mvfn13b02ka0p8l4hdh8c4hpc6")))) + (base32 "0clriq2ypz1fycd6mpjyrhzid44svzpzw0amnank593h69b216ax")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From 9e64b3bcec0382fc890b6163d421aaa91d844e6a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Oct 2020 06:27:24 +0200 Subject: gnu: ndctl: Update to 70.1. * gnu/packages/disk.scm (ndctl): Update to 70.1. --- gnu/packages/disk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 370f1bb01e..235df8ce9e 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -689,7 +689,7 @@ (define-public volume-key (define-public ndctl (package (name "ndctl") - (version "69") + (version "70.1") (source (origin (method git-fetch) (uri (git-reference @@ -698,7 +698,7 @@ (define-public ndctl (file-name (git-file-name name version)) (sha256 (base32 - "1l7p0ycj27d4z07gf9qp796xpg16kfsg3rwx6plhilbhip1as4w7")))) + "09ymdibcr18vpmyf2n0xrnzgccfvr7iy3p2l5lbh7cgz7djyl5wq")))) (build-system gnu-build-system) (native-inputs `(("asciidoc" ,asciidoc) -- cgit v1.2.3 From f6a0b54e9de1538b29bbaac666dcd75b06cb16cf Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Oct 2020 06:45:50 +0200 Subject: gnu: ethtool: Update to 5.9. * gnu/packages/networking.scm (ethtool): Update to 5.9. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 5c57ef2b6d..2d714082ca 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1041,14 +1041,14 @@ (define-public libndp (define-public ethtool (package (name "ethtool") - (version "5.8") + (version "5.9") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/software/network/" "ethtool/ethtool-" version ".tar.xz")) (sha256 (base32 - "0ikmz36bdfwxscsfcgjmyzg70hwr8i3wpdhcp1vmk3q4ip858frg")))) + "0vwam1ay184z237vnl8ivb0rdjjbljp9pj3kjzhc6yzq180k4aai")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 4d998aa643be1011315cba636e53e82fb5f8437e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Oct 2020 16:34:18 +0200 Subject: gnu: spread-sheet-widget: Update to 0.7. * gnu/packages/gtk.scm (spread-sheet-widget): Update to 0.7. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index e32bf7065d..8cd2824ce3 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1899,14 +1899,14 @@ (define-public graphene (define-public spread-sheet-widget (package (name "spread-sheet-widget") - (version "0.6") + (version "0.7") (source (origin (method url-fetch) (uri (string-append "https://alpha.gnu.org/gnu/ssw/" "spread-sheet-widget-" version ".tar.gz")) (sha256 - (base32 "08ck9l697xg8vpya5h07raq837i4pqxjqzx30vhscq4xpps2b8kj")))) + (base32 "09rzgp7gabnzab460x874a1ibgyjiibpwzsz5srn9zs6jv2jdxjb")))) (build-system gnu-build-system) (native-inputs `(("glib" ,glib "bin") ; for glib-genmarshal, etc. -- cgit v1.2.3 From eec4def4f6a4e6e67db96c8acfc5327d2c6d64d6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Oct 2020 16:39:37 +0200 Subject: gnu: gpxsee: Update to 7.34. * gnu/packages/gps.scm (gpxsee): Update to 7.34. --- gnu/packages/gps.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm index b136d95fe6..fcb6ffc9bb 100644 --- a/gnu/packages/gps.scm +++ b/gnu/packages/gps.scm @@ -179,7 +179,7 @@ (define-public gama (define-public gpxsee (package (name "gpxsee") - (version "7.30") + (version "7.34") (source (origin (method git-fetch) (uri (git-reference @@ -188,7 +188,7 @@ (define-public gpxsee (file-name (git-file-name name version)) (sha256 (base32 - "09gajwqc30r9a2sn972qdx3gx0gki9n0zafq986hn6zsr3z43mfs")))) + "0cdq2bqgkcqcyvasnrlgpl97b0kfi65iq2q6yy7dpp9xw4w764b1")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From 95328851aee375d9582a9fbf5c69e52dd15c06cd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Oct 2020 16:45:20 +0200 Subject: gnu: vim: Update to 8.2.1852. * gnu/packages/vim.scm (vim): Update to 8.2.1852. --- gnu/packages/vim.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 92a192b66a..05136981ea 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -70,7 +70,7 @@ (define-module (gnu packages vim) (define-public vim (package (name "vim") - (version "8.2.1844") + (version "8.2.1852") (source (origin (method git-fetch) (uri (git-reference @@ -79,7 +79,7 @@ (define-public vim (file-name (git-file-name name version)) (sha256 (base32 - "0a76ls7lizqg3lz624irkpq7rfm3x5rcq20vx217w34g9h6aggab")))) + "0nvcvvig5fc45smf4kh71jqyqafffgxzaizwqknk0h9vzl4k4h57")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit v1.2.3 From 834ab06477ff06ae8b3660bb6296ad0739036356 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Oct 2020 16:45:44 +0200 Subject: gnu: filters: Prepare for cross-compilation. * gnu/packages/toys.scm (filters)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/toys.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/toys.scm b/gnu/packages/toys.scm index 459c0c4953..eb727a4192 100644 --- a/gnu/packages/toys.scm +++ b/gnu/packages/toys.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019 Jesse Gibbons ;;; Copyright © 2019, 2020 Timotej Lazar ;;; Copyright © 2020 Efraim Flashner @@ -32,7 +32,8 @@ (define-module (gnu packages toys) #:use-module (guix download) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix packages)) + #:use-module (guix packages) + #:use-module (guix utils)) (define-public sl (package @@ -101,7 +102,8 @@ (define-public filters (build-system gnu-build-system) (arguments `(#:make-flags - (list "CC=gcc" (string-append "DESTDIR=" %output)) + (list (string-append "CC=" ,(cc-for-target)) + (string-append "DESTDIR=" %output)) #:phases (modify-phases %standard-phases (delete 'configure) -- cgit v1.2.3 From d7b83e2f8d8afebfb301db2e40b2f56e382d0510 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Oct 2020 16:47:41 +0200 Subject: gnu: filters: Replace git commit with equivalent tag. * gnu/packages/toys.scm (filters)[source]: Use tag. --- gnu/packages/toys.scm | 106 +++++++++++++++++++++++++------------------------- 1 file changed, 52 insertions(+), 54 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/toys.scm b/gnu/packages/toys.scm index eb727a4192..0d0035a86e 100644 --- a/gnu/packages/toys.scm +++ b/gnu/packages/toys.scm @@ -78,53 +78,51 @@ (define-public sl "See LICENSE in the distribution.")))) (define-public filters - (let ((version "2.55") - (commit "c5c291916b52ed9e6418448a8eee30475fb9adcf")) - (package - (name "filters") - (version "2.55") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://git.joeyh.name/filters") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1gaigpda1w9wxfh8an3sam1hpacc1bhxl696w4yj0vzhc6izqvxs")) - (modules '((guix build utils))) - (snippet '(begin - ;; kenny is under nonfree Artistic License (Perl) 1.0. - (delete-file "kenny") - (substitute* "Makefile" - (("kenny") - "")))))) - (build-system gnu-build-system) - (arguments - `(#:make-flags - (list (string-append "CC=" ,(cc-for-target)) - (string-append "DESTDIR=" %output)) - #:phases - (modify-phases %standard-phases - (delete 'configure) - (add-after 'unpack 'fix-install-directories - (lambda _ - (substitute* "Makefile" - (("/usr/games") - "/bin/") - (("/usr/share/") - "/share/")) - #t))) - #:tests? #f)) ; no test suite - (native-inputs - `(("bison" ,bison) - ("flex" ,flex))) - (inputs - `(("perl" ,perl))) - (home-page "https://joeyh.name/code/filters/") - (synopsis "Various amusing text filters") - (description - "The filters collection harks back to the late 1980s, when various text + (package + (name "filters") + (version "2.55") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.joeyh.name/filters") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1gaigpda1w9wxfh8an3sam1hpacc1bhxl696w4yj0vzhc6izqvxs")) + (modules '((guix build utils))) + (snippet '(begin + ;; kenny is under nonfree Artistic License (Perl) 1.0. + (delete-file "kenny") + (substitute* "Makefile" + (("kenny") + "")))))) + (build-system gnu-build-system) + (arguments + `(#:make-flags + (list (string-append "CC=" ,(cc-for-target)) + (string-append "DESTDIR=" %output)) + #:phases + (modify-phases %standard-phases + (delete 'configure) + (add-after 'unpack 'fix-install-directories + (lambda _ + (substitute* "Makefile" + (("/usr/games") + "/bin/") + (("/usr/share/") + "/share/")) + #t))) + #:tests? #f)) ; no test suite + (native-inputs + `(("bison" ,bison) + ("flex" ,flex))) + (inputs + `(("perl" ,perl))) + (home-page "https://joeyh.name/code/filters/") + (synopsis "Various amusing text filters") + (description + "The filters collection harks back to the late 1980s, when various text filters were written to munge written language in amusing ways. The earliest and best known were legends such as the Swedish Chef filter and B1FF. @@ -158,13 +156,13 @@ (define-public filters @end enumerate The GNU project hosts a similar collection of filters, the GNU talkfilters.") - (license ; see debian/copyright - (list license:gpl2+ ; most of the filters - license:gpl2 ; rasterman, ky00te.dir/* nethackify, pirate - license:gpl3+ ; scramble, scottish - license:public-domain ; jethro, kraut, ken, studly - license:gpl1+ ; cockney, jive, nyc only say "gpl" - license:expat))))) ; newspeak + (license ; see debian/copyright + (list license:gpl2+ ; most of the filters + license:gpl2 ; rasterman, ky00te.dir/* nethackify, pirate + license:gpl3+ ; scramble, scottish + license:public-domain ; jethro, kraut, ken, studly + license:gpl1+ ; cockney, jive, nyc only say "gpl" + license:expat)))) ; newspeak (define-public xsnow (package -- cgit v1.2.3 From dae2ac513d1e2eb242240ecd1551a700d20f54f5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Oct 2020 16:49:02 +0200 Subject: gnu: filters: Fix repository URL. * gnu/packages/toys.scm (filters)[source]: Use git://. --- gnu/packages/toys.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/toys.scm b/gnu/packages/toys.scm index 0d0035a86e..1ce3cde617 100644 --- a/gnu/packages/toys.scm +++ b/gnu/packages/toys.scm @@ -85,7 +85,7 @@ (define-public filters (origin (method git-fetch) (uri (git-reference - (url "https://git.joeyh.name/filters") + (url "git://git.joeyh.name/filters") (commit version))) (file-name (git-file-name name version)) (sha256 -- cgit v1.2.3 From 544672029213ae5ec79e2083a50e0e83edff18a6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Oct 2020 16:52:18 +0200 Subject: gnu: filters: Fix bogus use of DESTDIR. * gnu/packages/toys.scm (filters)[arguments]: Set and respect the standard prefix variable. --- gnu/packages/toys.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/toys.scm b/gnu/packages/toys.scm index 1ce3cde617..6387e84a3d 100644 --- a/gnu/packages/toys.scm +++ b/gnu/packages/toys.scm @@ -101,17 +101,17 @@ (define-public filters (arguments `(#:make-flags (list (string-append "CC=" ,(cc-for-target)) - (string-append "DESTDIR=" %output)) + (string-append "prefix=" (assoc-ref %outputs "out"))) #:phases (modify-phases %standard-phases (delete 'configure) - (add-after 'unpack 'fix-install-directories + (add-after 'unpack 'respect-prefix (lambda _ (substitute* "Makefile" (("/usr/games") - "/bin/") - (("/usr/share/") - "/share/")) + "$(prefix)/bin/") + (("/usr") + "$(prefix)")) #t))) #:tests? #f)) ; no test suite (native-inputs -- cgit v1.2.3 From 5c8e8bc556c32c1b6ead1638e4e7886f87acf255 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Oct 2020 16:56:58 +0200 Subject: gnu: dstat: Fix bogus use of DESTDIR. * gnu/packages/admin.scm (dstat)[arguments]: Set the standard prefix variable. --- gnu/packages/admin.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 93430dceb7..2cfa4a05e3 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2693,9 +2693,8 @@ (define-public dstat (build-system gnu-build-system) (arguments `(#:tests? #f ; no make check - #:make-flags (let ((out (assoc-ref %outputs "out"))) - (list (string-append "DESTDIR=" out) - "prefix=/")) + #:make-flags + (list (string-append "prefix=" (assoc-ref %outputs "out"))) #:phases (modify-phases %standard-phases (add-after 'unpack 'fix-python3-DeprecationWarning -- cgit v1.2.3 From 7b2b01e38984b23dca44b6d7e87a8f73a671f87c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Oct 2020 17:03:37 +0200 Subject: gnu: multitail: Remove bogus use of DESTDIR. * gnu/packages/logging.scm (multitail)[arguments]: Use the PREFIX variable instead. --- gnu/packages/logging.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm index bac9e18ea6..345a53385f 100644 --- a/gnu/packages/logging.scm +++ b/gnu/packages/logging.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2016, 2017, 2018 Ludovic Courtès ;;; Copyright © 2017 Stefan Reichör ;;; Copyright © 2017 Eric Bavier -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019 Gábor Boskovits ;;; Copyright © 2019 Meiyo Peng ;;; Copyright © 2020 Marius Bakke @@ -166,8 +166,7 @@ (define-public multitail (arguments `(#:make-flags (list "CC=gcc" - "PREFIX=" - (string-append "DESTDIR=" + (string-append "PREFIX=" (assoc-ref %outputs "out"))) #:phases (modify-phases %standard-phases -- cgit v1.2.3 From c887f7b3b85a2877926746110b9b394ce21212c7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Oct 2020 17:04:47 +0200 Subject: gnu: multitail: Cross-compile. * gnu/packages/logging.scm (multitail)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/logging.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm index 345a53385f..8b6d4961f8 100644 --- a/gnu/packages/logging.scm +++ b/gnu/packages/logging.scm @@ -165,7 +165,7 @@ (define-public multitail (build-system gnu-build-system) (arguments `(#:make-flags - (list "CC=gcc" + (list (string-append "CC=" ,(cc-for-target)) (string-append "PREFIX=" (assoc-ref %outputs "out"))) #:phases -- cgit v1.2.3 From d96241547dba3e4ab454dfd58257a4f411c5a041 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Oct 2020 17:07:18 +0200 Subject: gnu: multitail: Edit synopsis & description. * gnu/packages/logging.scm (multitail)[synopsis, description]: Fix typo & rephrase. --- gnu/packages/logging.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm index 8b6d4961f8..d7cd44b215 100644 --- a/gnu/packages/logging.scm +++ b/gnu/packages/logging.scm @@ -177,14 +177,14 @@ (define-public multitail (("ncursesw\\/panel.h") "panel.h") (("ncursesw\\/ncurses.h") "ncurses.h"))) #t)) - (delete 'configure)) + (delete 'configure)) ; no configure script #:tests? #f)) ; no test suite (make check just runs cppcheck) (inputs `(("ncurses" ,ncurses))) (home-page "https://vanheusden.com/multitail/") - (synopsis "Monitor multiple logfiles") + (synopsis "Monitor multiple log files") (description - "MultiTail allows you to monitor logfiles and command output in multiple -windows in a terminal, colorize, filter and merge.") + "MultiTail can monitor, color, filter, and merge log files and command +output in multiple windows in a terminal.") (license license:gpl2+))) (define-public spdlog -- cgit v1.2.3 From 88a099636fb1db32655380a24c698cf0aa6f78a4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Oct 2020 17:15:24 +0200 Subject: gnu: make-lua-ossl: Fix bogus use of DESTDIR. * gnu/packages/lua.scm (make-lua-ossl)[arguments]: Set the standard PREFIX variable. --- gnu/packages/lua.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index 2f21d85d0b..42ef24e381 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2016 doncatnip ;;; Copyright © 2016, 2017, 2019 Clément Lassieur ;;; Copyright © 2016 José Miguel Sánchez García -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Fis Trivial ;;; Copyright © 2020 Nicolas Goaziou ;;; Copyright © 2020 Simon South @@ -312,9 +312,8 @@ (define (make-lua-ossl name lua) (lua-api-version ,(version-major+minor (package-version lua)))) (list "CC=gcc" "CFLAGS='-D HAVE_SYS_SYSCTL_H=0'" ; sys/sysctl.h is deprecated - (string-append "DESTDIR=" out) - (string-append "LUA_APIS=" lua-api-version) - "prefix=")) + (string-append "prefix=" out) + (string-append "LUA_APIS=" lua-api-version))) #:phases (modify-phases %standard-phases (delete 'configure) -- cgit v1.2.3 From 1e39c865928fdf4166d152a49e789b26d99fca71 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Oct 2020 17:27:01 +0200 Subject: gnu: iproute2: Update to 5.9.0. * gnu/packages/linux.scm (iproute2): Update to 5.9.0. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 9731b6fed6..9078b52467 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2270,7 +2270,7 @@ (define-public ebtables (define-public iproute (package (name "iproute2") - (version "5.8.0") + (version "5.9.0") (source (origin (method url-fetch) (uri (string-append @@ -2278,7 +2278,7 @@ (define-public iproute version ".tar.xz")) (sha256 (base32 - "0vk4vickrpahdhl3zazr2qn2bf99v5549ncirjpwiy4h0a4izkfg")))) + "1kys6dmhrl43iaq95n5sh02p39d7bq8i5y672qrzgwnwpjaaqpd2")))) (build-system gnu-build-system) (arguments `( ;; There is a test suite, but it wants network namespaces and sudo. -- cgit v1.2.3 From 719246a51d47263c3b424a782d9703f59ce9fdc3 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Fri, 16 Oct 2020 20:02:51 +0300 Subject: gnu: containerd: Don't 'chdir' in build phases. This fixes breaks the 'install-license-files' phase added in 6b793fa66218337a1f638466753cd5326a6a6c18 and is generally not good practice. * gnu/packages/docker.scm (containerd): [arguments]: Use 'with-directory-excursion' instead of 'chdir' in build phases. --- gnu/packages/docker.scm | 61 ++++++++++++++++++++++++------------------------- 1 file changed, 30 insertions(+), 31 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 8e68403ca4..b130298a04 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -193,41 +193,40 @@ (define-public containerd `(#:import-path "github.com/containerd/containerd" #:phases (modify-phases %standard-phases - (add-before 'build 'chdir - (lambda _ - (chdir "src/github.com/containerd/containerd") - #t)) (add-after 'chdir 'patch-paths - (lambda* (#:key inputs outputs #:allow-other-keys) + (lambda* (#:key inputs import-path outputs #:allow-other-keys) ;; TODO: Patch "socat", "unpigz". - (substitute* "./runtime/v1/linux/runtime.go" - (("defaultRuntime[ \t]*=.*") - (string-append "defaultRuntime = \"" - (assoc-ref inputs "runc") - "/sbin/runc\"\n")) - (("defaultShim[ \t]*=.*") - (string-append "defaultShim = \"" - (assoc-ref outputs "out") - "/bin/containerd-shim\"\n"))) - (substitute* "./vendor/github.com/containerd/go-runc/runc.go" - (("DefaultCommand[ \t]*=.*") - (string-append "DefaultCommand = \"" - (assoc-ref inputs "runc") - "/sbin/runc\"\n"))) - (substitute* "vendor/github.com/containerd/continuity/testutil/loopback/loopback_linux.go" - (("exec\\.Command\\(\"losetup\"") ; ) - (string-append "exec.Command(\"" - (assoc-ref inputs "util-linux") - "/sbin/losetup\""))) ;) - #t)) + (with-directory-excursion (string-append "src/" import-path) + (substitute* "./runtime/v1/linux/runtime.go" + (("defaultRuntime[ \t]*=.*") + (string-append "defaultRuntime = \"" + (assoc-ref inputs "runc") + "/sbin/runc\"\n")) + (("defaultShim[ \t]*=.*") + (string-append "defaultShim = \"" + (assoc-ref outputs "out") + "/bin/containerd-shim\"\n"))) + (substitute* "./vendor/github.com/containerd/go-runc/runc.go" + (("DefaultCommand[ \t]*=.*") + (string-append "DefaultCommand = \"" + (assoc-ref inputs "runc") + "/sbin/runc\"\n"))) + (substitute* "vendor/github.com/containerd/continuity/testutil/loopback/loopback_linux.go" + (("exec\\.Command\\(\"losetup\"") ; ) + (string-append "exec.Command(\"" + (assoc-ref inputs "util-linux") + "/sbin/losetup\""))) ;) + #t))) (replace 'build - (lambda* (#:key (make-flags '()) #:allow-other-keys) - (apply invoke "make" make-flags))) + (lambda* (#:key import-path (make-flags '()) #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (apply invoke "make" make-flags)))) (replace 'install - (lambda* (#:key outputs (make-flags '()) #:allow-other-keys) - (let* ((out (assoc-ref outputs "out"))) - (apply invoke "make" (string-append "DESTDIR=" out) "install" - make-flags))))))) + (lambda* (#:key import-path outputs (make-flags '()) #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (let* ((out (assoc-ref outputs "out"))) + (apply invoke "make" (string-append "DESTDIR=" out) "install" + make-flags)))))))) (inputs `(("btrfs-progs" ,btrfs-progs) ("libseccomp" ,libseccomp) -- cgit v1.2.3 From bcf9732059d4463e136f5f21e2784e4bc3fe6dee Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Oct 2020 17:48:29 +0200 Subject: gnu: grass: Update to 7.8.4. * gnu/packages/geo.scm (grass): Update to 7.8.4. --- gnu/packages/geo.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 84d1bd981f..b094b55c2a 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1761,7 +1761,7 @@ (define-public opencpn license:zlib)))) (define-public grass - (let* ((version "7.8.2") + (let* ((version "7.8.4") (majorminor (string-join (list-head (string-split version #\.) 2) "")) (grassxx (string-append "grass" majorminor))) (package @@ -1773,7 +1773,7 @@ (define-public grass (uri (string-append "https://grass.osgeo.org/" grassxx "/source/grass-" version ".tar.gz")) (sha256 - (base32 "1fwsm99kz0bxvjk7442qq1h45ikrmhba8bqclafb61gqg1q6ymrk")))) + (base32 "1yfghvp522ijww3n3l5xarjbc21rm0gmlgr3lvwxrv23bvxmllyr")))) (build-system gnu-build-system) (inputs `(("bzip2" ,bzip2) -- cgit v1.2.3 From 6c03d15d7d84c00b02efea0a60e91f55f5541b57 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Oct 2020 21:07:06 +0200 Subject: gnu: grass: Fix start-up without python@3 in profile. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/geo.scm (grass)[arguments]: Rename ‘wrap-python’ phase to ‘python:wrap’. Add ‘wrap-with-python-interpreter’ phase. --- gnu/packages/geo.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index b094b55c2a..09afa658c7 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1865,8 +1865,14 @@ (define-public grass (symlink (string-append dir "/lib") (string-append out "/lib"))) #t)) - (add-after 'install-links 'wrap-python - (assoc-ref python:%standard-phases 'wrap))))) + (add-after 'install-links 'python:wrap + (assoc-ref python:%standard-phases 'wrap)) + (add-after 'python:wrap 'wrap-with-python-interpreter + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (wrap-program (string-append out "/bin/" ,grassxx) + `("GRASS_PYTHON" = (,(which "python3")))) + #t)))))) (synopsis "GRASS Geographic Information System") (description "GRASS (Geographic Resources Analysis Support System), is a Geographic -- cgit v1.2.3 From 6a5a477df46a0329cc867c4780b59cdf4340d034 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sat, 17 Oct 2020 00:40:45 +0300 Subject: services: docker: Fix missing containerd-shim binary. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit fixes error 'time="2020-10-16T…" level=error msg="Handler for POST /v1.40/containers/…/start returned error: failed to start shim: exec: \"containerd-shim\": executable file not found in $PATH: unknown"'. * gnu/services/docker.scm (containerd-shepherd-service): Add "containerd-shim" to PATH. --- gnu/services/docker.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/services/docker.scm b/gnu/services/docker.scm index e23014213b..7acfbea49f 100644 --- a/gnu/services/docker.scm +++ b/gnu/services/docker.scm @@ -84,7 +84,8 @@ (define (%docker-activation config) (define (containerd-shepherd-service config) (let* ((package (docker-configuration-containerd config)) - (debug? (docker-configuration-debug? config))) + (debug? (docker-configuration-debug? config)) + (containerd (docker-configuration-containerd config))) (shepherd-service (documentation "containerd daemon.") (provision '(containerd)) @@ -93,6 +94,9 @@ (define (containerd-shepherd-service config) #$@(if debug? '("--log-level=debug") '())) + ;; For finding containerd-shim binary. + #:environment-variables + (list (string-append "PATH=" #$containerd "/bin")) #:log-file "/var/log/containerd.log")) (stop #~(make-kill-destructor))))) -- cgit v1.2.3 From a25512fe82d99ae66d4aae5ed912194dbe1c89a6 Mon Sep 17 00:00:00 2001 From: AuPath Date: Fri, 16 Oct 2020 10:05:08 +0000 Subject: gnu: emacs-gdscript-mode: Update to 1.4.0. * gnu/packages/emacs-xyz.scm (emacs-gdscript-mode): Update to 1.4.0. Signed-off-by: Brett Gilio --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index e3e61e3141..2df05e995f 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3319,16 +3319,16 @@ (define-public emacs-minitest (define-public emacs-gdscript-mode (package (name "emacs-gdscript-mode") - (version "1.2.0") + (version "1.4.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/godotengine/emacs-gdscript-mode") - (commit (string-append "v" version)))) + (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "02by4bvdayldbjlz6jkp36m5rgcy2h5bwhqx2cj7wma6xf6cw3lf")))) + (base32 "09q0himrz7a6xgz0jmcl85qc5xhk5fwi6d2vw1n8qaiavm96ksdy")))) (build-system emacs-build-system) (home-page "https://github.com/godotengine/emacs-gdscript-mode") (synopsis "GDScript support and syntax highlighting in Emacs") -- cgit v1.2.3 From d2eb8900570bd8504c47f49646d31d658d50c7ca Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Fri, 16 Oct 2020 19:47:47 -0500 Subject: gnu: emacs-org-webring: Update to 1.9. * gnu/packages/emacs-xyz.scm (emacs-org-webring): Update to 1.9. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 2df05e995f..233b266be3 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -24832,7 +24832,7 @@ (define-public emacs-highlight (define-public emacs-org-webring (package (name "emacs-org-webring") - (version "1.6") + (version "1.9") (source (origin (method git-fetch) @@ -24842,7 +24842,7 @@ (define-public emacs-org-webring (file-name (git-file-name name version)) (sha256 (base32 - "00d7jqsbfa08rhyv3ry87rgy9ikv233spn4rz0d3riy0bp7b7j6b")))) + "09lm2h5d6xcdwilbmi6xs4qz33d0442m9iys9k36q9vhhakl7w4x")))) (build-system emacs-build-system) (arguments `(#:phases -- cgit v1.2.3 From 03267c4c3e3d14632161ea29a5a4db1ba78cec69 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Fri, 16 Oct 2020 20:55:06 -0500 Subject: gnu: emacs-org-journal: Update to 2.1.1. * gnu/packages/emacs-xyz.scm (emacs-org-journal): Update to 2.1.1. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 233b266be3..da11838ea9 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -24389,7 +24389,7 @@ (define-public emacs-csv (define-public emacs-org-journal (package (name "emacs-org-journal") - (version "2.0.0") + (version "2.1.1") (source (origin (method git-fetch) @@ -24398,7 +24398,7 @@ (define-public emacs-org-journal (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "18dqd0jy2x530lk0h4fcn9cld9qh4w7b3vxa60fpiia628vsv1dg")))) + (base32 "1p9i6v3bwi1ab576vc9qg1ki91197d6nkkg857s52zsan1zlkzzw")))) (build-system emacs-build-system) (home-page "https://github.com/bastibe/org-journal") (synopsis "Simple Org mode journaling mode") -- cgit v1.2.3 From 4e1380791af07d82481d2b7a8c43afac4cd31855 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Fri, 16 Oct 2020 21:03:20 -0500 Subject: gnu: swi-prolog: Update to 8.3.9. * gnu/packages/prolog.scm (swi-prolog): Update to 8.3.9. --- gnu/packages/prolog.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/prolog.scm b/gnu/packages/prolog.scm index 0e5f4b9b01..324b089f4b 100644 --- a/gnu/packages/prolog.scm +++ b/gnu/packages/prolog.scm @@ -86,7 +86,7 @@ (define-public gprolog (define-public swi-prolog (package (name "swi-prolog") - (version "8.3.5") + (version "8.3.9") (source (origin (method git-fetch) (uri (git-reference @@ -96,7 +96,7 @@ (define-public swi-prolog (file-name (git-file-name name version)) (sha256 (base32 - "14dga0gja45x1717fp1bwgf96nzc0zgb8x1lha0pb46jg1raa2da")))) + "0ixb8pc5s7q8q0njs8is1clpvik6jhhdcwnys7m9rpwdzgi10sjz")))) (build-system cmake-build-system) (arguments `(#:parallel-build? #t -- cgit v1.2.3 From 38e5bc92e9946e7a3a3b791bd5236aea37cd213a Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Fri, 16 Oct 2020 22:00:52 -0500 Subject: gnu: xlsxio: Update to 0.2.29. * gnu/packages/xml.scm (xlsxio): Update to 0.2.29. --- gnu/packages/xml.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 4fb3dc6985..97d42b2ae2 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -24,6 +24,7 @@ ;;; Copyright © 2019 Giacomo Leidi ;;; Copyright © 2020 Paul Garlick ;;; Copyright © 2020 Edouard Klein +;;; Copyright © 2020 Brett Gilio ;;; ;;; This file is part of GNU Guix. ;;; @@ -1432,7 +1433,7 @@ (define-public xerces-c (define-public xlsxio (package (name "xlsxio") - (version "0.2.26") + (version "0.2.29") (source (origin (method git-fetch) @@ -1441,7 +1442,7 @@ (define-public xlsxio (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0j8jral3yc2aib2ykp527lyb62a1d9p7qmfbszy7iy3s65pkma9b")))) + (base32 "0jr6ggzhd8aakdvppcl8scy9j9jafg82zbzr4ih996sz8lrj90fn")))) (native-inputs `(("expat" ,expat) ("make" ,gnu-make) -- cgit v1.2.3 From 201a507b7711e3aeebca9c7512c850c27d161e0b Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Fri, 16 Oct 2020 22:07:46 -0500 Subject: gnu: lynx: Update to 2.9.0dev.6. * gnu/packages/web-browsers.scm (lynx): Update to 2.9.0dev.6. --- gnu/packages/web-browsers.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 62d1352283..73d3873fdc 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -280,7 +280,7 @@ (define-public luakit (define-public lynx (package (name "lynx") - (version "2.8.9rel.1") + (version "2.9.0dev.6") (source (origin (method url-fetch) (uri (string-append @@ -288,7 +288,7 @@ (define-public lynx "/lynx" version ".tar.bz2")) (sha256 (base32 - "15cmyyma2kz1hfaa6mwjgli8zwdzq3jv0q2cl6nwzycjfwyijzrq")))) + "1cjkpwxc1r8x8q73bgh9a4skaph1bwa0anml6f6lvf7lh5zvxw3q")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("perl" ,perl))) -- cgit v1.2.3 From cba7a6f7df0d6df181434591b2e5df58dcc9a09d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 17 Oct 2020 15:07:17 +0200 Subject: gnu: python-base58: Update to 2.0.1. * gnu/packages/python-crypto.scm (python-base58): Update to 2.0.1. --- gnu/packages/python-crypto.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 81a5c213da..bad774aa03 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -91,14 +91,14 @@ (define-public python-potr (define-public python-base58 (package (name "python-base58") - (version "1.0.3") + (version "2.0.1") (source (origin (method url-fetch) (uri (pypi-uri "base58" version)) (sha256 (base32 - "0q1yr0n5jaf17xq98m7dma6z4rh8p19ch55l1s09gi3rk5ckqycs")))) + "0yfaqp76kbdb62hikr5n4jkkfjfmii89grwfy6sw3fmsv5hrap1n")))) (build-system python-build-system) (native-inputs `(("python-pyhamcrest" ,python-pyhamcrest))) -- cgit v1.2.3 From e97be4a3c750fceec1d4d691484de36c60f7c424 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Sat, 17 Oct 2020 15:26:33 +0200 Subject: gnu: qutebrowser: Update to 1.14.0. * gnu/packages/web-browsers.scm (qutebrowser): Update to 1.14.0. Signed-off-by: Brett Gilio --- gnu/packages/web-browsers.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 73d3873fdc..5aac5cb892 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -344,7 +344,7 @@ (define-public lynx (define-public qutebrowser (package (name "qutebrowser") - (version "1.13.1") + (version "1.14.0") (source (origin (method url-fetch) @@ -352,7 +352,7 @@ (define-public qutebrowser "qutebrowser/releases/download/v" version "/" "qutebrowser-" version ".tar.gz")) (sha256 - (base32 "1n72dvrv4dch4i07lsis76p7g16a039fwx8rk7w8q9f60wgqb5i8")))) + (base32 "0jip413yvyhdaywz0iadc32aaanjnhbx1d1vwzx3z1xbgc4i9svn")))) (build-system python-build-system) (native-inputs `(("python-attrs" ,python-attrs))) ; for tests -- cgit v1.2.3 From b75ef68a081d14be74a27f8581c9569d8af304d2 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 17 Oct 2020 21:59:46 +0200 Subject: gnu: python-duniterpy: Update to 0.60.0. * gnu/packages/finance.scm (python-duniterpy): Update to 0.60.0. --- gnu/packages/finance.scm | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 7b1f93c139..182d38c1a9 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -1034,26 +1034,18 @@ (define-public python2-stdnum (define-public python-duniterpy (package (name "python-duniterpy") - (version "0.57.0") + (version "0.60.0") (source (origin (method url-fetch) (uri (pypi-uri "duniterpy" version)) (sha256 - (base32 "0rw2c7r9gcqhymp82gbk1ky45zqbypsi2q5x4vdwjc6g00kh7h6l")))) + (base32 "0djn6ykmqbp8l2xbg6z8r7rkz9ijgygp2pr0gc6i7dsrlsqmjh32")))) (build-system python-build-system) (arguments - ;; FIXME: Tests fail with: "ModuleNotFoundError: No module named - ;; 'tests'". Not sure how to handle this. - `(#:tests? #f - #:phases - (modify-phases %standard-phases - ;; "setup.py" tries to open missing "requirements.txt". - (add-after 'unpack 'ignore-missing-file - (lambda _ - (substitute* "setup.py" - (("open\\('requirements\\.txt'\\)") "[]")) - #t))))) + ;; FIXME: Tests fail with: "TypeError: block_uid() missing 1 required + ;; positional argument: 'value'". + `(#:tests? #f)) (propagated-inputs `(("aiohttp" ,python-aiohttp) ("attrs" ,python-attrs) -- cgit v1.2.3 From a1b88219e8c18297cf27373a186d7adb9886f165 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 17 Oct 2020 22:37:36 +0200 Subject: gnu: python-asynctest: Fix build. * gnu/packages/python-xyz.scm (python-asynctest): Disabled all failing tests. Return #t at the end of the phase. --- gnu/packages/python-xyz.scm | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d98be1c3b8..6469e6726b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -20373,12 +20373,23 @@ (define-public python-asynctest (invoke "python" "-X" "dev" "-m" "unittest" "-v" "test"))) (add-after 'unpack 'disable-tests (lambda* _ - (substitute* "test/test_selector.py" - ;; XXX: This test fails for unknown reason inside the build - ;; environment. + ;; XXX: 7 tests fail out of 220. Disable them for now. + (substitute* (list "test/test_selector.py" + "test/test_mock.py") (("def test_events_watched_outside_test_are_ignored") "@unittest.skip('disabled by guix') - def test_events_watched_outside_test_are_ignored"))))))) + def test_events_watched_outside_test_are_ignored") + (("def test_awaited_from_autospec_mock.*" line) + (string-append line " return True\n")) + (("def test_create_autospec_on_coroutine_and_using_assert_methods.*" line) + (string-append line " return True\n")) + (("def test_patch_coroutine_with_multiple_scopes.*" line) + (string-append line " return True\n")) + (("def test_multiple_patches_on_coroutine.*" line) + (string-append line " return True\n")) + (("def test_patch_coroutine_only_when_running.*" line) + (string-append line " return True\n"))) + #t))))) (home-page "https://github.com/Martiusweb/asynctest") (synopsis "Extension of unittest for testing asyncio libraries") (description -- cgit v1.2.3 From 21fdf429a7bb6a7d371fcf1d5b5a892fb9c5cdfc Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Fri, 16 Oct 2020 19:15:41 +0200 Subject: gnu: xpra: Fix HTML server MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/patches/xpra-4.0.4-norequests.patch: Add file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/xorg.scm (xpra)[patches]: Apply it. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 1 + gnu/packages/patches/xpra-4.0.4-norequests.patch | 39 ++++++++++++++++++++++++ gnu/packages/xorg.scm | 3 +- 3 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/xpra-4.0.4-norequests.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index d41b65957e..111206f34e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1705,6 +1705,7 @@ dist_patch_DATA = \ %D%/packages/patches/xplanet-1.3.1-libimage_gif.c.patch \ %D%/packages/patches/xplanet-1.3.1-xpUtil-Add2017LeapSecond.cpp.patch \ %D%/packages/patches/xpra-4.0.1-systemd-run.patch \ + %D%/packages/patches/xpra-4.0.4-norequests.patch \ %D%/packages/patches/xsane-fix-memory-leak.patch \ %D%/packages/patches/xsane-fix-pdf-floats.patch \ %D%/packages/patches/xsane-fix-snprintf-buffer-length.patch \ diff --git a/gnu/packages/patches/xpra-4.0.4-norequests.patch b/gnu/packages/patches/xpra-4.0.4-norequests.patch new file mode 100644 index 0000000000..e545be7f1d --- /dev/null +++ b/gnu/packages/patches/xpra-4.0.4-norequests.patch @@ -0,0 +1,39 @@ +Remove python-requests dependency, r27626 upstream. + +--- a/xpra/net/websockets/common.py (revision 27625) ++++ b/xpra/net/websockets/common.py (revision 27626) +@@ -7,7 +7,6 @@ + import uuid + from hashlib import sha1 + from base64 import b64encode +-from requests.structures import CaseInsensitiveDict + + from xpra.os_util import strtobytes, bytestostr, monotonic_time + from xpra.log import Logger +@@ -77,7 +76,7 @@ + for line in lines: + parts = line.split(b": ", 1) + if len(parts)==2: +- headers[parts[0]] = parts[1] ++ headers[parts[0].lower()] = parts[1] + return headers + + def verify_response_headers(headers, key): +@@ -84,14 +83,13 @@ + log("verify_response_headers(%s)", headers) + if not headers: + raise Exception("no http headers found in response") +- headers = CaseInsensitiveDict(headers) +- upgrade = headers.get(b"Upgrade", b"") ++ upgrade = headers.get(b"upgrade", b"") + if upgrade!=b"websocket": + raise Exception("invalid http upgrade: '%s'" % upgrade) +- protocol = headers.get(b"Sec-WebSocket-Protocol", b"") ++ protocol = headers.get(b"sec-websocket-protocol", b"") + if protocol!=b"binary": + raise Exception("invalid websocket protocol: '%s'" % protocol) +- accept_key = headers.get(b"Sec-WebSocket-Accept", b"") ++ accept_key = headers.get(b"sec-websocket-accept", b"") + if not accept_key: + raise Exception("websocket accept key is missing") + expected_key = make_websocket_accept_hash(key) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 0eda94bc47..e912eb1be9 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6312,7 +6312,8 @@ (define-public xpra version ".tar.xz")) (sha256 (base32 "10alqdfmgml9ixdi1nyd9xlw8a5q0j8m2sv4g9p83pd6z1a0rpv2")) - (patches (search-patches "xpra-4.0.1-systemd-run.patch")))) + (patches (search-patches "xpra-4.0.1-systemd-run.patch" + "xpra-4.0.4-norequests.patch")))) (build-system python-build-system) ;; see also http://xpra.org/trac/wiki/Dependencies (inputs `( -- cgit v1.2.3 From 633b0242d08279f493d4812ead7e4f6efcf9924d Mon Sep 17 00:00:00 2001 From: Magali Lemes Date: Fri, 16 Oct 2020 15:51:07 -0300 Subject: gnu: Add r-calculus. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/cran.scm (r-calculus): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/cran.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 252699c691..fea560f7a1 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -30,6 +30,7 @@ ;;; Copyright © 2020 Vinicius Monego ;;; Copyright © 2020 Antoine Côté ;;; Copyright © 2020 Arun Isaac +;;; Copyright © 2020 Magali Lemes ;;; ;;; This file is part of GNU Guix. ;;; @@ -24598,3 +24599,32 @@ (define-public r-absfiltergsea Without filtering, users can perform (original) two-tailed or one-tailed absolute GSEA.") (license license:gpl2))) + +(define-public r-calculus + (package + (name "r-calculus") + (version "0.2.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "calculus" version)) + (sha256 + (base32 + "0hs7hzjl6xjza20v9zx9a1piywxa6w3h2rskr52d1dcbc0vwhinp")))) + (properties `((upstream-name . "calculus"))) + (build-system r-build-system) + (propagated-inputs + `(("r-rcpp" ,r-rcpp))) + (home-page "https://github.com/guidotti/calculus") + (synopsis "High dimensional numerical and symbolic calculus") + (description + "Efficient C++ optimized functions for numerical and symbolic calculus. +It includes basic symbolic arithmetic, tensor calculus, Einstein summing +convention, fast computation of the Levi-Civita symbol and generalized +Kronecker delta, Taylor series expansion, multivariate Hermite polynomials, +accurate high-order derivatives, differential operators (Gradient, Jacobian, +Hessian, Divergence, Curl, Laplacian) and numerical integration in arbitrary +orthogonal coordinate systems: cartesian, polar, spherical, cylindrical, +parabolic or user defined by custom scale factors.") + (license license:gpl3))) + -- cgit v1.2.3 From d14221bf65cfbe7f8f5b7cac44132087cab70bf5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 17 Oct 2020 20:55:22 +0200 Subject: gnu: ncmpc: Update to 0.41. * gnu/packages/mpd.scm (ncmpc): Update to 0.41. --- gnu/packages/mpd.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index cb063150e2..b0d3645b4a 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -185,7 +185,7 @@ (define-public mpd-mpc (define-public ncmpc (package (name "ncmpc") - (version "0.40") + (version "0.41") (source (origin (method url-fetch) (uri @@ -194,7 +194,7 @@ (define-public ncmpc "/ncmpc-" version ".tar.xz")) (sha256 (base32 - "1pfkf2zl55g7krrp4qi5m8j9h4m9vc3rnz65f7gb75pbmiy5iyh9")))) + "1b0kxidz3h3anc006cjrrbb281zl75f1qaip4m3672pczdc2lwwa")))) (build-system meson-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From d512990d157865e98be917b32797e4e4d4535cf5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 18 Oct 2020 09:37:54 +0300 Subject: gnu: vc-dwim: Update to 1.10. * gnu/packages/version-control.scm (vc-dwim): Update to 1.10. --- gnu/packages/version-control.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 68971c60f9..fe61bc8fce 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1901,14 +1901,14 @@ (define-public cvs-fast-export (define-public vc-dwim (package (name "vc-dwim") - (version "1.9") + (version "1.10") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/vc-dwim/vc-dwim-" version ".tar.xz")) (sha256 (base32 - "0mf1dd7wdqxsm4fcfinfd7iadzarmzvg747pbsbi32qpavpk8gdf")))) + "0am6axxdvkm2vwgg0gjrd930yv4dlsdbf0rdv0zh5bhy1ir64rph")))) (build-system gnu-build-system) (inputs `(("perl" ,perl))) (native-inputs -- cgit v1.2.3 From 4d405914ed02bd5672d5527cf4fa6e529e7faab6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 18 Oct 2020 10:14:02 +0300 Subject: gnu: newsboat-2.13: Build with json-c-0.13. * gnu/packages/syndication.scm (newsboat-2.13)[inputs]: Replace json-c with json-c@.013. --- gnu/packages/syndication.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index e174df0d9e..82d3fa3a21 100644 --- a/gnu/packages/syndication.scm +++ b/gnu/packages/syndication.scm @@ -165,6 +165,9 @@ (define-public newsboat-2.13 '("asciidoctor" "openssl")) ;; For building documentation. ("asciidoc" ,asciidoc))) + (inputs + `(("json-c" ,json-c-0.13) + ,@(alist-delete "json-c" (package-inputs newsboat)))) (arguments '(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From fe5b5f8cd057cce496b98b7fb3949b37dd3382e4 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Tue, 28 Jul 2020 13:36:09 +0200 Subject: gnu: Add ispell. * gnu/packages/aspell.scm (ispell): New variable. Co-authored-by: Jonathan Brielmaier Signed-off-by: Efraim Flashner --- gnu/packages/aspell.scm | 51 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/aspell.scm b/gnu/packages/aspell.scm index daefbd01bd..7d3c2ef1c3 100644 --- a/gnu/packages/aspell.scm +++ b/gnu/packages/aspell.scm @@ -9,6 +9,8 @@ ;;; Copyright © 2019 Jens Mølgaard ;;; Copyright © 2020 Timotej Lazar ;;; Copyright © 2020 Marcin Karpezo +;;; Copyright © 2020 Jonathan Brielmaier +;;; Copyright © 2020 Jakub Kądziołka ;;; ;;; This file is part of GNU Guix. ;;; @@ -33,7 +35,9 @@ (define-module (gnu packages aspell) #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages base) + #:use-module (gnu packages bison) #:use-module (gnu packages compression) + #:use-module (gnu packages ncurses) #:use-module (gnu packages perl) #:use-module (ice-9 match)) @@ -457,3 +461,50 @@ (define-word-list-dictionary hunspell-dict-en-gb-ize (define-word-list-dictionary hunspell-dict-en-us "en_US" (synopsis "Hunspell dictionary for United States English")) + +(define-public ispell + (package + (name "ispell") + (version "3.4.00") + (source + (origin + (method url-fetch) + (uri (string-append "https://www.cs.hmc.edu/~geoff/tars/ispell-" + version ".tar.gz")) + (sha256 + (base32 + "1hmfnz55qzfpz7lz0r3m4kkv31smir92ks9s5l1iiwimhr2jxi2x")))) + (build-system gnu-build-system) + (arguments + `(#:parallel-build? #f + #:tests? #f ; no tests + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; Based on local.h.linux + (let* ((grep (assoc-ref inputs "grep")) + (out (assoc-ref outputs "out"))) + (call-with-output-file "local.h" + (lambda (port) + (format port "#define MINIMENU~%") + (format port "#define USG~%") + (format port "#define HAS_RENAME~%") + (format port "#define CC \"gcc\"~%") + (format port "#define POUNDBANG \"#!~a\"~%" (which "sh")) + (format port "#define EGREPCMD \"~a/bin/grep -Ei\"~%" grep) + (format port "#define BINDIR \"~a/bin\"~%" out) + (format port "#define LIBDIR \"~a/lib/ispell\"~%" out) + (format port "#define MAN1DIR \"~a/share/man/man1\"~%" out) + (format port "#define MAN45DIR \"~a/share/man/man5\"~%" out)))) + #t))))) + (inputs + `(("grep" ,grep) + ("ncurses" ,ncurses))) + (native-inputs + `(("bison" ,bison))) + (synopsis "Interactive spell-checking tool for Unix") + (description "Ispell is an interactive spell-checking tool supporting many +European languages.") + (home-page "https://www.cs.hmc.edu/~geoff/ispell.html") + (license bsd-3))) -- cgit v1.2.3 From 545441735ada6d09894c2cf9bd3a1ca2353fed28 Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Tue, 28 Jul 2020 13:36:44 +0200 Subject: gnu: Add hunspell-dict-de. * gnu/packages/libreoffice.scm (hunspell-dict-de): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/libreoffice.scm | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 252087f36e..fdc62e8825 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2017, 2018, 2019 Marius Bakke ;;; Copyright © 2017 Rutger Helling ;;; Copyright © 2018, 2019 Ricardo Wurmus -;;; Copyright © 2018 Jonathan Brielmaier +;;; Copyright © 2018, 2020 Jonathan Brielmaier ;;; Copyright © 2019 Chris Marusich ;;; Copyright © 2020 Marcin Karpezo ;;; @@ -42,6 +42,7 @@ (define-module (gnu packages libreoffice) #:use-module (ice-9 match) #:use-module (gnu packages) #:use-module (gnu packages aidc) + #:use-module (gnu packages aspell) #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages bison) @@ -971,6 +972,41 @@ (define-public hunspell-dict-pl (license (list license:gpl2 license:mpl1.1 license:cc-by4.0 license:lgpl2.1 license:asl2.0)))) +(define-public hunspell-dict-de + (package + (name "hunspell-dict-de") + (version "20161207") + (source + (origin + (method url-fetch) + (uri (string-append "https://www.j3e.de/ispell/igerman98/dict/" + "igerman98-" version ".tar.bz2")) + (sha256 + (base32 "1a3055hp2bc4q4nlg3gmg0147p3a1zlfnc65xiv2v9pyql1nya8p")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags '("hunspell/de_DE.dic") + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'install ;no install target + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (share (string-append out "/share/hunspell/"))) + (install-file "hunspell/de_DE.aff" share) + (install-file "hunspell/de_DE.dic" share) + #t)))) + #:tests? #f)) ; no tests + (native-inputs + `(("hunspell" ,hunspell) + ("ispell" ,ispell) + ("perl" ,perl))) + (synopsis "Hunspell dictionary for German (de_DE)") + (description "This package provides a dictionary for the Hunspell +spell-checking library.") + (home-page "https://www.j3e.de/ispell/igerman98/") + (license (list license:gpl2 license:gpl3)))) + (define-public hyphen (package (name "hyphen") -- cgit v1.2.3 From 1e3024540645894098b0ca6be5abb0f9f1987269 Mon Sep 17 00:00:00 2001 From: BonfaceKilz Date: Thu, 15 Oct 2020 19:39:38 +0300 Subject: gnu: Add python2-openpyxl. * gnu/packages/python-xyz.scm (python2-openpyxl): New package. (python-openpyxl)[properties]: Add reference to python2-openpyxl. Signed-off-by: Efraim Flashner --- gnu/packages/python-xyz.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 6469e6726b..6360dc8f35 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1666,8 +1666,25 @@ (define-public python-openpyxl (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.") + (properties `((python2-variant . ,(delay python2-openpyxl)))) (license license:expat))) +(define-public python2-openpyxl + (let ((base (package-with-python2 + (strip-python2-variant python-openpyxl)))) + (package + (inherit base) + ;; This is the latest version that has python2 support + (version "2.6.4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "openpyxl" version)) + (sha256 + (base32 + "1qzjj8nwj4dn0mhq1j64f136afiqqb81lvqiikipz3g1g0b80lqx")))) + (arguments '(#:tests? #f))))) ; No test suite. + (define-public python-eventlet (package (name "python-eventlet") -- cgit v1.2.3 From 9d449b945bbad5b7c66ed874b347f7f0ffd012e1 Mon Sep 17 00:00:00 2001 From: Miguel Ángel Arruga Vivas Date: Mon, 21 Oct 2019 12:23:40 +0200 Subject: system: Add locale to boot-parameters. * gnu/system.scm (define-module)[export]: Add boot-parameters-locale. ()[locale]: New field. [boot-parameters-locale]: New accessor. (read-boot-parameters): Read locale field. (operating-system-boot-parameters): Provide operating-system locale to boot-parameters record. (opeating-system-boot-parameters-file): Likewise. * Makefile.am (SCM_TESTS): Add tests/boot-parameters.scm. * tests/boot-parameters.scm: New test file. --- Makefile.am | 1 + gnu/system.scm | 11 ++ tests/boot-parameters.scm | 256 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 268 insertions(+) create mode 100644 tests/boot-parameters.scm (limited to 'gnu') diff --git a/Makefile.am b/Makefile.am index a75d9c1ffc..c509562567 100644 --- a/Makefile.am +++ b/Makefile.am @@ -407,6 +407,7 @@ SCM_TESTS = \ tests/base16.scm \ tests/base32.scm \ tests/base64.scm \ + tests/boot-parameters.scm \ tests/bournish.scm \ tests/builders.scm \ tests/build-utils.scm \ diff --git a/gnu/system.scm b/gnu/system.scm index 59dfeb99b4..e8fe41cc24 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2016 Chris Marusich ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2019 Meiyo Peng +;;; Copyright © 2019 Miguel Ángel Arruga Vivas ;;; Copyright © 2020 Danny Milosavljevic ;;; Copyright © 2020 Brice Waegeneire ;;; Copyright © 2020 Florian Pelz @@ -148,6 +149,7 @@ (define-module (gnu system) boot-parameters-bootloader-menu-entries boot-parameters-store-device boot-parameters-store-mount-point + boot-parameters-locale boot-parameters-kernel boot-parameters-kernel-arguments boot-parameters-initrd @@ -297,6 +299,7 @@ (define-record-type* boot-parameters-bootloader-menu-entries) (store-device boot-parameters-store-device) (store-mount-point boot-parameters-store-mount-point) + (locale boot-parameters-locale) (kernel boot-parameters-kernel) (kernel-arguments boot-parameters-kernel-arguments) (initrd boot-parameters-initrd) @@ -374,6 +377,11 @@ (define device-sexp->device ((_ args) args) (#f '()))) + (locale + (match (assq 'locale rest) + ((_ locale) locale) + (#f #f))) + (store-device ;; Linux device names like "/dev/sda1" are not suitable GRUB device ;; identifiers, so we just filter them out. @@ -1284,6 +1292,7 @@ (define* (operating-system-boot-parameters os root-device (let* ((initrd (and (not (operating-system-hurd os)) (operating-system-initrd-file os))) (store (operating-system-store-file-system os)) + (locale (operating-system-locale os)) (bootloader (bootloader-configuration-bootloader (operating-system-bootloader os))) (bootloader-name (bootloader-name bootloader)) @@ -1302,6 +1311,7 @@ (define* (operating-system-boot-parameters os root-device (bootloader-name bootloader-name) (bootloader-menu-entries (bootloader-configuration-menu-entries (operating-system-bootloader os))) + (locale locale) (store-device (ensure-not-/dev (file-system-device store))) (store-mount-point (file-system-mount-point store))))) @@ -1354,6 +1364,7 @@ (define* (operating-system-boot-parameters-file os (or (and=> (operating-system-bootloader os) bootloader-configuration-menu-entries) '()))) + (locale #$(boot-parameters-locale params)) (store (device #$(device->sexp (boot-parameters-store-device params))) diff --git a/tests/boot-parameters.scm b/tests/boot-parameters.scm new file mode 100644 index 0000000000..d7e579bc89 --- /dev/null +++ b/tests/boot-parameters.scm @@ -0,0 +1,256 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2019, 2020 Miguel Ángel Arruga Vivas +;;; +;;; 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 . + +;;; Commentary: +;;; +;;; Test boot parameters value storage and compatibility. +;;; +;;; Code: + +(define-module (test-boot-parameters) + #:use-module (gnu bootloader) + #:use-module (gnu bootloader grub) + #:use-module (gnu system) + #:use-module (gnu system file-systems) + #:use-module (gnu system uuid) + #:use-module (guix gexp) + #:use-module (guix store) + #:use-module (guix tests) + #:use-module (srfi srfi-64) + #:use-module (rnrs bytevectors)) + +(define %default-label "GNU with Linux-libre 99.1.2") +(define %default-kernel-path + (string-append (%store-prefix) + "/zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz-linux-libre-99.1.2")) +(define %default-kernel + (string-append %default-kernel-path "/" (system-linux-image-file-name))) +(define %default-kernel-arguments '()) +(define %default-initrd-path + (string-append (%store-prefix) "/wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww-initrd")) +(define %default-initrd (string-append %default-initrd-path "/initrd.cpio.gz")) +(define %default-root-device (uuid "abcdef12-3456-7890-abcd-ef1234567890")) +(define %default-store-device (uuid "01234567-89ab-cdef-0123-456789abcdef")) +(define %default-store-mount-point (%store-prefix)) +(define %default-multiboot-modules '()) +(define %default-locale "es_ES.utf8") +(define %root-path "/") + +(define %grub-boot-parameters + (boot-parameters + (bootloader-name 'grub) + (bootloader-menu-entries '()) + (root-device %default-root-device) + (label %default-label) + (kernel %default-kernel) + (kernel-arguments %default-kernel-arguments) + (initrd %default-initrd) + (multiboot-modules %default-multiboot-modules) + (locale %default-locale) + (store-device %default-store-device) + (store-mount-point %default-store-mount-point))) + +(define %default-operating-system + (operating-system + (host-name "host") + (timezone "Europe/Berlin") + (locale %default-locale) + + (bootloader (bootloader-configuration + (bootloader grub-bootloader) + (target "/dev/sda"))) + (file-systems (cons* (file-system + (device %default-root-device) + (mount-point %root-path) + (type "ext4")) + (file-system + (device %default-store-device) + (mount-point %default-store-mount-point) + (type "btrfs")) + %base-file-systems)))) + +(define (quote-uuid uuid) + (list 'uuid (uuid-type uuid) (uuid-bytevector uuid))) + +;; Call read-boot-parameters with the desired string as input. +(define* (test-read-boot-parameters + #:key + (version 0) + (bootloader-name 'grub) + (bootloader-menu-entries '()) + (label %default-label) + (root-device (quote-uuid %default-root-device)) + (kernel %default-kernel) + (kernel-arguments %default-kernel-arguments) + (initrd %default-initrd) + (multiboot-modules %default-multiboot-modules) + (locale %default-locale) + (with-store #t) + (store-device + (quote-uuid %default-store-device)) + (store-mount-point %default-store-mount-point)) + (define (generate-boot-parameters) + (define (sexp-or-nothing fmt val) + (cond ((eq? 'false val) (format #false fmt #false)) + (val (format #false fmt val)) + (else ""))) + (format #false "(boot-parameters~a~a~a~a~a~a~a~a~a~a)" + (sexp-or-nothing " (version ~S)" version) + (sexp-or-nothing " (label ~S)" label) + (sexp-or-nothing " (root-device ~S)" root-device) + (sexp-or-nothing " (kernel ~S)" kernel) + (sexp-or-nothing " (kernel-arguments ~S)" kernel-arguments) + (sexp-or-nothing " (initrd ~S)" initrd) + (if with-store + (format #false " (store~a~a)" + (sexp-or-nothing " (device ~S)" store-device) + (sexp-or-nothing " (mount-point ~S)" + store-mount-point)) + "") + (sexp-or-nothing " (locale ~S)" locale) + (sexp-or-nothing " (bootloader-name ~a)" bootloader-name) + (sexp-or-nothing " (bootloader-menu-entries ~S)" + bootloader-menu-entries))) + (let ((str (generate-boot-parameters))) + (call-with-input-string str read-boot-parameters))) + +(test-begin "boot-parameters") + +;; XXX: +(test-assert "read, construction, mandatory fields" + (not (or (test-read-boot-parameters #:version #false) + (test-read-boot-parameters #:version 'false) + (test-read-boot-parameters #:version -1) + (test-read-boot-parameters #:version "0") + (test-read-boot-parameters #:root-device #false) + (test-read-boot-parameters #:kernel #false) + (test-read-boot-parameters #:label #false)))) + +(test-assert "read, construction, optional fields" + (and (test-read-boot-parameters #:bootloader-name #false) + (test-read-boot-parameters #:bootloader-menu-entries #false) + (test-read-boot-parameters #:kernel-arguments #false) + (test-read-boot-parameters #:with-store #false) + (test-read-boot-parameters #:store-device #false) + (test-read-boot-parameters #:store-device 'false) + (test-read-boot-parameters #:store-mount-point #false) + (test-read-boot-parameters #:multiboot-modules #false) + (test-read-boot-parameters #:locale #false) + (test-read-boot-parameters #:bootloader-name #false + #:kernel-arguments #false + #:with-store #false + #:locale #false))) + +(test-equal "read, default equality" + %grub-boot-parameters + (test-read-boot-parameters)) + +(test-equal "read, root-device, label" + (file-system-label "my-root") + (boot-parameters-root-device + (test-read-boot-parameters #:root-device '(file-system-label "my-root")))) + +(test-equal "read, root-device, /dev node" + "/dev/sda2" + (boot-parameters-root-device + (test-read-boot-parameters #:root-device "/dev/sda2"))) + +(test-equal "read, kernel, only store path" + %default-kernel + (boot-parameters-kernel + (test-read-boot-parameters #:kernel %default-kernel-path))) + +(test-equal "read, kernel, full-path" + %default-kernel + (boot-parameters-kernel + (test-read-boot-parameters #:kernel %default-kernel))) + +(test-assert "read, construction, missing initrd" + (not (boot-parameters-initrd (test-read-boot-parameters #:initrd #false)))) + +(test-equal "read, initrd, old format" + "/a/b" + (boot-parameters-initrd + (test-read-boot-parameters #:initrd (list 'string-append "/a" "/b")))) + + ;; Compatibility reasons specified in gnu/system.scm. +(test-eq "read, bootloader-name, default value" + 'grub + (boot-parameters-bootloader-name + (test-read-boot-parameters #:bootloader-name #false))) + +(test-eq "read, bootloader-menu-entries, default value" + '() + (boot-parameters-bootloader-menu-entries + (test-read-boot-parameters #:bootloader-menu-entries #false))) + +(test-eq "read, kernel-arguments, default value" + '() + (boot-parameters-kernel-arguments + (test-read-boot-parameters #:kernel-arguments #false))) + +(test-assert "read, store-device, filter /dev" + (not (boot-parameters-store-device + (test-read-boot-parameters #:store-device "/dev/sda3")))) + +(test-assert "read, no-store, filter /dev from root" + (not (boot-parameters-store-device + (test-read-boot-parameters #:root-device "/dev/sda3" + #:with-store #false)))) + +(test-assert "read, no store-device, filter /dev from root" + (not (boot-parameters-store-device + (test-read-boot-parameters #:root-device "/dev/sda3" + #:store-device #false)))) + +(test-assert "read, store-device #false, filter /dev from root" + (not (boot-parameters-store-device + (test-read-boot-parameters #:root-device "/dev/sda3" + #:store-device 'false)))) + +(test-equal "read, store-device, label (legacy)" + (file-system-label "my-store") + (boot-parameters-store-device + (test-read-boot-parameters #:store-device "my-store"))) + +(test-equal "read, store-device, from root" + %default-root-device + (boot-parameters-store-device + (test-read-boot-parameters #:with-store #false))) + +(test-equal "read, no store-mount-point, default" + %root-path + (boot-parameters-store-mount-point + (test-read-boot-parameters #:store-mount-point #false))) + +(test-equal "read, no store, default store-mount-point" + %root-path + (boot-parameters-store-mount-point + (test-read-boot-parameters #:with-store #false))) + +;; For whitebox testing +(define operating-system-boot-parameters + (@@ (gnu system) operating-system-boot-parameters)) + +(test-equal "from os, locale" + %default-locale + (boot-parameters-locale + (operating-system-boot-parameters %default-operating-system + %default-root-device))) + +(test-end "boot-parameters") -- cgit v1.2.3 From eaf096398349a484bd23fd829755f7dfaf237ab4 Mon Sep 17 00:00:00 2001 From: Miguel Ángel Arruga Vivas Date: Mon, 22 Apr 2019 14:44:22 +0200 Subject: system: Provide locale information to the bootloader. * gnu/machine/ssh.scm (roll-back-managed-host): Use locale information from boot-parameters. * gnu/system.scm (operating-system-bootcfg): Provide locale information to the bootloader. * guix/system/script.scm (reinstall-bootloader): Use locale information from boot-parameters. --- gnu/machine/ssh.scm | 3 +++ gnu/system.scm | 2 ++ guix/scripts/system.scm | 2 ++ 3 files changed, 7 insertions(+) (limited to 'gnu') diff --git a/gnu/machine/ssh.scm b/gnu/machine/ssh.scm index 35b42add48..5020bd362f 100644 --- a/gnu/machine/ssh.scm +++ b/gnu/machine/ssh.scm @@ -480,6 +480,8 @@ (define roll-back-failure (raise roll-back-failure))) (entries -> (map boot-parameters->menu-entry (list (second boot-parameters)))) + (locale -> (boot-parameters-locale + (second boot-parameters))) (old-entries -> (map boot-parameters->menu-entry (drop boot-parameters 2))) (bootloader -> (operating-system-bootloader @@ -489,6 +491,7 @@ (define roll-back-failure (bootloader-configuration-bootloader bootloader)) bootloader entries + #:locale locale #:old-entries old-entries))) (remote-result (machine-remote-eval machine remote-exp))) (when (eqv? 'error remote-result) diff --git a/gnu/system.scm b/gnu/system.scm index e8fe41cc24..a3122eaa65 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -1242,6 +1242,7 @@ (define* (operating-system-bootcfg os #:optional (old-entries '())) (let* ((file-systems (operating-system-file-systems os)) (root-fs (operating-system-root-file-system os)) (root-device (file-system-device root-fs)) + (locale (operating-system-locale os)) (params (operating-system-boot-parameters os root-device #:system-kernel-arguments? #t)) @@ -1254,6 +1255,7 @@ (define generate-config-file (generate-config-file bootloader-conf (list entry) #:old-entries old-entries + #:locale locale #:store-directory-prefix (btrfs-store-subvolume-file-name file-systems)))) diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index 939559e719..9ed5c26483 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -384,6 +384,7 @@ (define (reinstall-bootloader store number) ;; Make the specified system generation the default entry. (params (first (profile-boot-parameters %system-profile (list number)))) + (locale (boot-parameters-locale params)) (old-generations (delv number (reverse (generation-numbers %system-profile)))) (old-params (profile-boot-parameters @@ -396,6 +397,7 @@ (define (reinstall-bootloader store number) ((bootcfg (lower-object ((bootloader-configuration-file-generator bootloader) bootloader-config entries + #:locale locale #:old-entries old-entries))) (drvs -> (list bootcfg))) (mbegin %store-monad -- cgit v1.2.3 From cfe9c7eceb00d6975b8d7ba8286ba03f0a7e64b5 Mon Sep 17 00:00:00 2001 From: Miguel Ángel Arruga Vivas Date: Sat, 2 Nov 2019 18:18:45 +0100 Subject: system: Use locale information in grub.cfg. * gnu/bootloader/grub.scm (define-module): Add new dependency. (grub-configuration-file): Add locale keyword. (grub-configuration-file)[locale-config]: New variable with generated locale configuration when locale parameter has been provided. [builder]: Add locale-config. --- gnu/bootloader/grub.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'gnu') diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm index 516a7d48c8..611580a350 100644 --- a/gnu/bootloader/grub.scm +++ b/gnu/bootloader/grub.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2017, 2020 Mathieu Othacehe ;;; Copyright © 2019, 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2019 Miguel Ángel Arruga Vivas ;;; Copyright © 2020 Maxim Cournoyer ;;; Copyright © 2020 Stefan ;;; @@ -33,6 +34,7 @@ (define-module (gnu bootloader grub) #:use-module (gnu system uuid) #:use-module (gnu system file-systems) #:use-module (gnu system keyboard) + #:use-module (gnu system locale) #:use-module (gnu packages bootloaders) #:autoload (gnu packages gtk) (guile-cairo guile-rsvg) #:autoload (gnu packages xorg) (xkeyboard-config) @@ -334,6 +336,7 @@ (define (grub-root-search device file) (define* (grub-configuration-file config entries #:key + (locale #f) (system (%current-system)) (old-entries '()) store-directory-prefix) @@ -398,6 +401,20 @@ (define (sugar) #:store-directory-prefix store-directory-prefix #:port #~port))) + (define locale-config + #~(let ((locale #$(and locale + (locale-definition-source + (locale-name->definition locale))))) + (when locale + (format port "\ +# Localization configuration. +if search --file --set boot_partition /grub/grub.cfg; then + set locale_dir=(${boot_partition})/grub/locale +else + set locale_dir=/boot/grub/locale +fi +set lang=~a~%" locale)))) + (define keyboard-layout-config (let* ((layout (bootloader-configuration-keyboard-layout config)) (grub (bootloader-package @@ -422,6 +439,7 @@ (define builder # will be lost upon reconfiguration. ") #$(sugar) + #$locale-config #$keyboard-layout-config (format port " set default=~a -- cgit v1.2.3 From d76b668cd6595d08761fa75d749ec943e792ea6f Mon Sep 17 00:00:00 2001 From: Miguel Ángel Arruga Vivas Date: Fri, 16 Oct 2020 15:02:00 +0200 Subject: installer: Call setlocale after init gettext. * gnu/installer.scm (installer-program)[init-gettext]: Change locale from C, installed at the program start. --- gnu/installer.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/installer.scm b/gnu/installer.scm index c582a46c14..f401b242f8 100644 --- a/gnu/installer.scm +++ b/gnu/installer.scm @@ -308,7 +308,8 @@ (define init-gettext ;; translated. #~(begin (bindtextdomain "guix" (string-append #$guix "/share/locale")) - (textdomain "guix"))) + (textdomain "guix") + (setlocale LC_ALL ""))) (define set-installer-path ;; Add the specified binary to PATH for later use by the installer. -- cgit v1.2.3 From dcafa89cf0b9124d0567264eb2ef4d730b1e75bb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 18 Oct 2020 17:32:24 +0200 Subject: gnu: extempore: Inline custom package variants. Except novel ones without suitable replacements in Guix. * gnu/packages/music.scm (portmidi-for-extempore): Remove variable, and move to ... (extempore)[inputs]: ... here. * gnu/packages/llvm.scm (llvm-for-extempore): Likewise. * gnu/packages/image.scm (stb-image-for-extempore): Likewise. --- gnu/packages/image.scm | 27 ----------------- gnu/packages/llvm.scm | 14 --------- gnu/packages/music.scm | 79 +++++++++++++++++++++++++++++++++----------------- 3 files changed, 53 insertions(+), 67 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 5f8711c869..36d7dd606f 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1530,33 +1530,6 @@ (define-public steghide changed, making the embedding resistant against first-order statistical tests.") (license license:gpl2+))) -(define-public stb-image-for-extempore - (let ((revision "1") - (commit "152a250a702bf28951bb0220d63bc0c99830c498")) - (package - (name "stb-image-for-extempore") - (version (string-append "0-" revision "." (string-take commit 9))) - (source - (origin (method git-fetch) - (uri (git-reference - (url "https://github.com/extemporelang/stb") - (commit commit))) - (sha256 - (base32 - "0y0aa20pj9311x2ii06zg8xs34idg14hfgldqc5ymizc6cf1qiqv")) - (file-name (string-append name "-" version "-checkout")))) - (build-system cmake-build-system) - (arguments `(#:tests? #f)) ; no tests included - ;; Extempore refuses to build on architectures other than x86_64 - (supported-systems '("x86_64-linux")) - (home-page "https://github.com/extemporelang/stb") - (synopsis "Image library for Extempore") - (description - "This package is a collection of assorted single-file libraries. Of -all included libraries only the image loading and decoding library is -installed as @code{stb_image}.") - (license license:public-domain)))) - (define-public optipng (package (name "optipng") diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 358fbfff0a..147247331e 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -821,20 +821,6 @@ (define-public clang-3.5 "0846h8vn3zlc00jkmvrmy88gc6ql6014c02l4jv78fpvfigmgssg" #:patches '("clang-3.5-libc-search-path.patch"))) -(define-public llvm-for-extempore - (package (inherit llvm-3.8) - (name "llvm-for-extempore") - (source - (origin - (method url-fetch) - (uri (string-append "http://extempore.moso.com.au/extras/" - "llvm-3.8.0.src-patched-for-extempore.tar.xz")) - (sha256 - (base32 - "1svdl6fxn8l01ni8mpm0bd5h856ahv3h9sdzgmymr6fayckjvqzs")))) - ;; Extempore refuses to build on architectures other than x86_64 - (supported-systems '("x86_64-linux")))) - (define-public libcxx (package (name "libcxx") diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 60a624d96d..830bc4dfbe 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -30,6 +30,7 @@ ;;; Copyright © 2020 Giacomo Leidi ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020 Tanguy Le Carrour +;;; Copyright © 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -138,6 +139,7 @@ (define-module (gnu packages music) #:use-module (gnu packages rsync) #:use-module (gnu packages sdl) #:use-module (gnu packages sqlite) + #:use-module (gnu packages stb) #:use-module (gnu packages tcl) #:use-module (gnu packages texinfo) #:use-module (gnu packages tex) @@ -745,16 +747,64 @@ (define-public extempore " --mcpu=generic --attr=none"))) #t))))) (inputs - `(("llvm" ,llvm-for-extempore) + `(("llvm" + ,(package + (inherit llvm-3.8) + (name "llvm-for-extempore") + (source + (origin + (method url-fetch) + (uri (string-append "http://extempore.moso.com.au/extras/" + "llvm-3.8.0.src-patched-for-extempore.tar.xz")) + (sha256 + (base32 + "1svdl6fxn8l01ni8mpm0bd5h856ahv3h9sdzgmymr6fayckjvqzs")))))) ("libffi" ,libffi) ("jack" ,jack-1) ("libsndfile" ,libsndfile) ("glfw" ,glfw) ("apr" ,apr) - ("stb-image" ,stb-image-for-extempore) + ("stb-image" + ,(let ((revision "1") + (commit "152a250a702bf28951bb0220d63bc0c99830c498")) + (package + (inherit stb-image) + (name "stb-image-for-extempore") + (version (git-version "0" revision commit)) + (source + (origin (method git-fetch) + (uri (git-reference + (url "https://github.com/extemporelang/stb") + (commit commit))) + (sha256 + (base32 + "0y0aa20pj9311x2ii06zg8xs34idg14hfgldqc5ymizc6cf1qiqv")) + (file-name (git-file-name name version)))) + (build-system cmake-build-system) + (arguments `(#:tests? #f)) ;no tests included + (inputs '())))) ("kiss-fft" ,kiss-fft-for-extempore) ("nanovg" ,nanovg-for-extempore) - ("portmidi" ,portmidi-for-extempore) + ("portmidi" + ,(let ((version "217") + (revision "0") + (commit "8602f548f71daf5ef638b2f7d224753400cb2158")) + (package + (inherit portmidi) + (name "portmidi-for-extempore") + (version (git-version version revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/extemporelang/portmidi") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1qidzl1s3kzhczzm96rcd2ppn27a97k2axgfh1zhvyf0s52d7m4w")))) + (build-system cmake-build-system) + (arguments `(#:tests? #f)) ;no tests + (native-inputs '())))) ("assimp" ,assimp) ("alsa-lib" ,alsa-lib) ("portaudio" ,portaudio) @@ -2184,29 +2234,6 @@ (define-public portmidi using a system-independent interface.") (license license:expat))) -(define-public portmidi-for-extempore - (let ((version "217") - (revision "0") - (commit "8602f548f71daf5ef638b2f7d224753400cb2158")) - (package (inherit portmidi) - (name "portmidi-for-extempore") - (version (git-version version revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/extemporelang/portmidi") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1qidzl1s3kzhczzm96rcd2ppn27a97k2axgfh1zhvyf0s52d7m4w")))) - (build-system cmake-build-system) - (arguments `(#:tests? #f)) ; no tests - (native-inputs '()) - ;; Extempore refuses to build on architectures other than x86_64 - (supported-systems '("x86_64-linux")) - (home-page "https://github.com/extemporelang/portmidi/")))) - (define-public python-pyportmidi (package (name "python-pyportmidi") -- cgit v1.2.3 From f1db068adbaa78340c33822910f15ed357e9e36e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 18 Oct 2020 17:33:27 +0200 Subject: gnu: llvm.scm: Reorder variables. Keep all LLVM and Clang packages in order, define default versions last. --- gnu/packages/llvm.scm | 186 +++++++++++++++++++++++++------------------------- 1 file changed, 93 insertions(+), 93 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 147247331e..bb7981bfed 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -87,68 +87,6 @@ (define (llvm-uri component version) (string-append "https://releases.llvm.org/" version "/" component "-" version ".src.tar.xz"))) -(define-public llvm-10 - (package - (name "llvm") - (version "10.0.0") - (source - (origin - (method url-fetch) - (uri (llvm-uri "llvm" version)) - (sha256 - (base32 - "1pwgm6cr0xr5a0hrbqs1zvsvvjvy0yq1y47c96804wcs795s90yz")))) - (build-system cmake-build-system) - (outputs '("out" "opt-viewer")) - (native-inputs - `(("python" ,python-2) ;bytes->str conversion in clang>=3.7 needs python-2 - ("perl" ,perl))) - (inputs - `(("libffi" ,libffi))) - (propagated-inputs - `(("zlib" ,zlib))) ;to use output from llvm-config - (arguments - `(#:configure-flags '("-DCMAKE_SKIP_BUILD_RPATH=FALSE" - "-DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE" - "-DBUILD_SHARED_LIBS:BOOL=TRUE" - "-DLLVM_ENABLE_FFI:BOOL=TRUE" - "-DLLVM_REQUIRES_RTTI=1" ; For some third-party utilities - "-DLLVM_INSTALL_UTILS=ON") ; Needed for rustc. - - ;; Don't use '-g' during the build, to save space. - #:build-type "Release" - #:phases - (modify-phases %standard-phases - (add-before 'build 'shared-lib-workaround - ;; Even with CMAKE_SKIP_BUILD_RPATH=FALSE, llvm-tblgen - ;; doesn't seem to get the correct rpath to be able to run - ;; from the build directory. Set LD_LIBRARY_PATH as a - ;; workaround. - (lambda _ - (setenv "LD_LIBRARY_PATH" - (string-append (getcwd) "/lib")) - #t)) - (add-after 'install 'install-opt-viewer - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (opt-viewer-out (assoc-ref outputs "opt-viewer")) - (opt-viewer-share-dir (string-append opt-viewer-out "/share")) - (opt-viewer-dir (string-append opt-viewer-share-dir "/opt-viewer"))) - (mkdir-p opt-viewer-share-dir) - (rename-file (string-append out "/share/opt-viewer") - opt-viewer-dir)) - #t))))) - (home-page "https://www.llvm.org") - (synopsis "Optimizing compiler infrastructure") - (description - "LLVM is a compiler infrastructure designed for compile-time, link-time, -runtime, and idle-time optimization of programs from arbitrary programming -languages. It currently supports compilation of C and C++ programs, using -front-ends derived from GCC 4.0.1. A new front-end for the C family of -languages is in development. The compiler infrastructure includes mirror sets -of programming tools as well as libraries with equivalent functionality.") - (license license:asl2.0))) ;with LLVM exceptions, see LICENSE.txt - (define* (clang-runtime-from-llvm llvm hash #:optional (patches '())) (package @@ -512,6 +450,68 @@ (define (make-clang-toolchain clang) ("libc-debug" ,glibc "debug") ("libc-static" ,glibc "static"))))) +(define-public llvm-10 + (package + (name "llvm") + (version "10.0.0") + (source + (origin + (method url-fetch) + (uri (llvm-uri "llvm" version)) + (sha256 + (base32 + "1pwgm6cr0xr5a0hrbqs1zvsvvjvy0yq1y47c96804wcs795s90yz")))) + (build-system cmake-build-system) + (outputs '("out" "opt-viewer")) + (native-inputs + `(("python" ,python-2) ;bytes->str conversion in clang>=3.7 needs python-2 + ("perl" ,perl))) + (inputs + `(("libffi" ,libffi))) + (propagated-inputs + `(("zlib" ,zlib))) ;to use output from llvm-config + (arguments + `(#:configure-flags '("-DCMAKE_SKIP_BUILD_RPATH=FALSE" + "-DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE" + "-DBUILD_SHARED_LIBS:BOOL=TRUE" + "-DLLVM_ENABLE_FFI:BOOL=TRUE" + "-DLLVM_REQUIRES_RTTI=1" ; For some third-party utilities + "-DLLVM_INSTALL_UTILS=ON") ; Needed for rustc. + + ;; Don't use '-g' during the build, to save space. + #:build-type "Release" + #:phases + (modify-phases %standard-phases + (add-before 'build 'shared-lib-workaround + ;; Even with CMAKE_SKIP_BUILD_RPATH=FALSE, llvm-tblgen + ;; doesn't seem to get the correct rpath to be able to run + ;; from the build directory. Set LD_LIBRARY_PATH as a + ;; workaround. + (lambda _ + (setenv "LD_LIBRARY_PATH" + (string-append (getcwd) "/lib")) + #t)) + (add-after 'install 'install-opt-viewer + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (opt-viewer-out (assoc-ref outputs "opt-viewer")) + (opt-viewer-share-dir (string-append opt-viewer-out "/share")) + (opt-viewer-dir (string-append opt-viewer-share-dir "/opt-viewer"))) + (mkdir-p opt-viewer-share-dir) + (rename-file (string-append out "/share/opt-viewer") + opt-viewer-dir)) + #t))))) + (home-page "https://www.llvm.org") + (synopsis "Optimizing compiler infrastructure") + (description + "LLVM is a compiler infrastructure designed for compile-time, link-time, +runtime, and idle-time optimization of programs from arbitrary programming +languages. It currently supports compilation of C and C++ programs, using +front-ends derived from GCC 4.0.1. A new front-end for the C family of +languages is in development. The compiler infrastructure includes mirror sets +of programming tools as well as libraries with equivalent functionality.") + (license license:asl2.0))) ;with LLVM exceptions, see LICENSE.txt + (define-public clang-runtime-10 (clang-runtime-from-llvm llvm-10 @@ -564,39 +564,9 @@ (define-public clang-9 (define-public clang-toolchain-9 (make-clang-toolchain clang-9)) -;; Default LLVM and Clang version. -(define-public llvm llvm-9) -(define-public clang-runtime clang-runtime-9) -(define-public clang clang-9) -(define-public clang-toolchain clang-toolchain-9) - -(define-public lld - (package - (name "lld") - (version (package-version llvm-10)) - (source (origin - (method url-fetch) - (uri (llvm-uri "lld" version)) - (sha256 - (base32 - "026pwcbczcg0j5c9h7hxxrn3ki81ia9m9sfn0sy0bvzffv2xg85r")))) - (build-system cmake-build-system) - (inputs - `(("llvm" ,llvm-10))) - (arguments - `(#:build-type "Release" - ;; TODO: Tests require the lit tool, which isn't installed by the LLVM - ;; package. - #:tests? #f)) - (home-page "https://lld.llvm.org/") - (synopsis "Linker from the LLVM project") - (description "LLD is a high-performance linker, built as a set of reusable -components which highly leverage existing libraries in the larger LLVM Project.") - (license license:asl2.0))) ; With LLVM exception - (define-public llvm-8 (package - (inherit llvm) + (inherit llvm-9) (version "8.0.0") (source (origin (method url-fetch) @@ -821,6 +791,36 @@ (define-public clang-3.5 "0846h8vn3zlc00jkmvrmy88gc6ql6014c02l4jv78fpvfigmgssg" #:patches '("clang-3.5-libc-search-path.patch"))) +;; Default LLVM and Clang version. +(define-public llvm llvm-9) +(define-public clang-runtime clang-runtime-9) +(define-public clang clang-9) +(define-public clang-toolchain clang-toolchain-9) + +(define-public lld + (package + (name "lld") + (version (package-version llvm-10)) + (source (origin + (method url-fetch) + (uri (llvm-uri "lld" version)) + (sha256 + (base32 + "026pwcbczcg0j5c9h7hxxrn3ki81ia9m9sfn0sy0bvzffv2xg85r")))) + (build-system cmake-build-system) + (inputs + `(("llvm" ,llvm-10))) + (arguments + `(#:build-type "Release" + ;; TODO: Tests require the lit tool, which isn't installed by the LLVM + ;; package. + #:tests? #f)) + (home-page "https://lld.llvm.org/") + (synopsis "Linker from the LLVM project") + (description "LLD is a high-performance linker, built as a set of reusable +components which highly leverage existing libraries in the larger LLVM Project.") + (license license:asl2.0))) ; With LLVM exception + (define-public libcxx (package (name "libcxx") -- cgit v1.2.3 From 7f79358def1bba3f123f7abb20e521c558158d0e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 18 Oct 2020 17:34:54 +0200 Subject: gnu: LLVM, Clang: Add 11.0.0. * gnu/packages/patches/clang-11.0-libc-search-path.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/llvm.scm (llvm-11, clang-runtime-11, clang-11, clang-toolchain-11): New variables. --- gnu/local.mk | 1 + gnu/packages/llvm.scm | 39 +++++++++- .../patches/clang-11.0-libc-search-path.patch | 89 ++++++++++++++++++++++ 3 files changed, 126 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/clang-11.0-libc-search-path.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 111206f34e..5a79c79d6f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -861,6 +861,7 @@ dist_patch_DATA = \ %D%/packages/patches/clang-7.0-libc-search-path.patch \ %D%/packages/patches/clang-9.0-libc-search-path.patch \ %D%/packages/patches/clang-10.0-libc-search-path.patch \ + %D%/packages/patches/clang-11.0-libc-search-path.patch \ %D%/packages/patches/clang-runtime-asan-build-fixes.patch \ %D%/packages/patches/clang-runtime-esan-build-fixes.patch \ %D%/packages/patches/clang-runtime-9-libsanitizer-mode-field.patch \ diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index bb7981bfed..743b168de2 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -450,17 +450,17 @@ (define (make-clang-toolchain clang) ("libc-debug" ,glibc "debug") ("libc-static" ,glibc "static"))))) -(define-public llvm-10 +(define-public llvm-11 (package (name "llvm") - (version "10.0.0") + (version "11.0.0") (source (origin (method url-fetch) (uri (llvm-uri "llvm" version)) (sha256 (base32 - "1pwgm6cr0xr5a0hrbqs1zvsvvjvy0yq1y47c96804wcs795s90yz")))) + "0s94lwil98w7zb7cjrbnxli0z7gklb312pkw74xs1d6zk346hgwi")))) (build-system cmake-build-system) (outputs '("out" "opt-viewer")) (native-inputs @@ -512,6 +512,39 @@ (define-public llvm-10 of programming tools as well as libraries with equivalent functionality.") (license license:asl2.0))) ;with LLVM exceptions, see LICENSE.txt +(define-public clang-runtime-11 + (clang-runtime-from-llvm + llvm-11 + "0d5j5l8phwqjjscmk8rmqn0i2i0abl537gdbkagl8fjpzy1gyjip")) + +(define-public clang-11 + (clang-from-llvm llvm-11 clang-runtime-11 + "02ajkij85966vd150iy246mv16dsaph1kfi0y8wnncp8w6nar5hg" + #:patches '("clang-11.0-libc-search-path.patch") + #:tools-extra + (origin + (method url-fetch) + (uri (llvm-uri "clang-tools-extra" + (package-version llvm-11))) + (sha256 + (base32 + "02bcwwn54661madhq4nxc069s7p7pj5gpqi8ww50w3anbpviilzy"))))) + +(define-public clang-toolchain-11 + (make-clang-toolchain clang-11)) + +(define-public llvm-10 + (package + (inherit llvm-11) + (version "10.0.0") + (source + (origin + (method url-fetch) + (uri (llvm-uri "llvm" version)) + (sha256 + (base32 + "1pwgm6cr0xr5a0hrbqs1zvsvvjvy0yq1y47c96804wcs795s90yz")))))) + (define-public clang-runtime-10 (clang-runtime-from-llvm llvm-10 diff --git a/gnu/packages/patches/clang-11.0-libc-search-path.patch b/gnu/packages/patches/clang-11.0-libc-search-path.patch new file mode 100644 index 0000000000..c014de179d --- /dev/null +++ b/gnu/packages/patches/clang-11.0-libc-search-path.patch @@ -0,0 +1,89 @@ +Clang attempts to guess file names based on the OS and distro (yes!), +but unfortunately, that doesn't work for us. + +This patch makes it easy to insert libc's $libdir so that Clang passes the +correct absolute file name of crt1.o etc. to 'ld'. It also disables all +the distro-specific stuff and removes the hard-coded FHS directory names +to make sure Clang also works on non-Guix systems. + +diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp +--- a/lib/Driver/ToolChains/Gnu.cpp ++++ b/lib/Driver/ToolChains/Gnu.cpp +@@ -2797,7 +2797,7 @@ void Generic_GCC::AddMultilibPaths(const Driver &D, + // the cross. Note that GCC does include some of these directories in some + // configurations but this seems somewhere between questionable and simply + // a bug. +- if (StringRef(LibPath).startswith(SysRoot)) { ++ if (0) { + addPathIfExists(D, LibPath + "/" + MultiarchTriple, Paths); + addPathIfExists(D, LibPath + "/../" + OSLibDir, Paths); + } +@@ -2811,6 +2811,10 @@ void Generic_GCC::AddMultiarchPaths(const Driver &D, + // Try walking via the GCC triple path in case of biarch or multiarch GCC + // installations with strange symlinks. + if (GCCInstallation.isValid()) { ++ ++// The following code would end up adding things like ++// "/usr/lib/x86_64-unknown-linux-gnu/../../lib64" to the search path. ++#if 0 + addPathIfExists(D, + SysRoot + "/usr/lib/" + GCCInstallation.getTriple().str() + + "/../../" + OSLibDir, +@@ -2823,6 +2827,7 @@ void Generic_GCC::AddMultiarchPaths(const Driver &D, + D, GCCInstallation.getInstallPath() + BiarchSibling.gccSuffix(), + Paths); + } ++#endif // Guix + + // See comments above on the multilib variant for details of why this is + // included even from outside the sysroot. +diff --git a/lib/Driver/ToolChains/Linux.cpp b/lib/Driver/ToolChains/Linux.cpp +--- a/lib/Driver/ToolChains/Linux.cpp ++++ b/lib/Driver/ToolChains/Linux.cpp +@@ -219,6 +219,9 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) + + Generic_GCC::PushPPaths(PPaths); + ++// Comment out the distro-specific tweaks so that they don't bite when ++// using Guix on a foreign distro. ++#if 0 + Distro Distro(D.getVFS(), Triple); + + if (Distro.IsAlpineLinux() || Triple.isAndroid()) { +@@ -284,6 +287,7 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) + + if (IsAndroid || Distro.IsOpenSUSE()) + ExtraOpts.push_back("--enable-new-dtags"); ++#endif // Guix + + // The selection of paths to try here is designed to match the patterns which + // the GCC driver itself uses, as this is part of the GCC-compatible driver. +@@ -310,6 +314,8 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) + addPathIfExists(D, SysRoot + "/lib/" + MultiarchTriple, Paths); + addPathIfExists(D, SysRoot + "/lib/../" + OSLibDir, Paths); + ++// This requires the commented distro tweaks above. ++#if 0 + if (IsAndroid) { + // Android sysroots contain a library directory for each supported OS + // version as well as some unversioned libraries in the usual multiarch +@@ -338,6 +344,7 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) + addPathIfExists(D, SysRoot + "/" + OSLibDir + "/" + ABIName, Paths); + addPathIfExists(D, SysRoot + "/usr/" + OSLibDir + "/" + ABIName, Paths); + } ++#endif // Guix + + Generic_GCC::AddMultiarchPaths(D, SysRoot, OSLibDir, Paths); + +@@ -349,8 +356,9 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) + if (StringRef(D.Dir).startswith(SysRoot)) + addPathIfExists(D, D.Dir + "/../lib", Paths); + +- addPathIfExists(D, SysRoot + "/lib", Paths); +- addPathIfExists(D, SysRoot + "/usr/lib", Paths); ++ // Add libc's lib/ directory to the search path, so that crt1.o, crti.o, ++ // and friends can be found. ++ addPathIfExists(D, "@GLIBC_LIBDIR@", Paths); + } + + ToolChain::CXXStdlibType Linux::GetDefaultCXXStdlibType() const { -- cgit v1.2.3 From 8937cd05d33055382ddb5336ce6e7dc8f5ca8b22 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 18 Oct 2020 17:36:25 +0200 Subject: gnu: lld: Update to 11.0.0. * gnu/packages/llvm.scm (lld): Update to 11.0.0. [inputs]: Change from LLVM-10 to LLVM-11. --- gnu/packages/llvm.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 743b168de2..c500430dd5 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -833,16 +833,16 @@ (define-public clang-toolchain clang-toolchain-9) (define-public lld (package (name "lld") - (version (package-version llvm-10)) + (version "11.0.0") (source (origin (method url-fetch) (uri (llvm-uri "lld" version)) (sha256 (base32 - "026pwcbczcg0j5c9h7hxxrn3ki81ia9m9sfn0sy0bvzffv2xg85r")))) + "077xyh7sij6mhp4dc4kdcmp9whrpz332fa12rwxnzp3wgd5bxrzg")))) (build-system cmake-build-system) (inputs - `(("llvm" ,llvm-10))) + `(("llvm" ,llvm-11))) (arguments `(#:build-type "Release" ;; TODO: Tests require the lit tool, which isn't installed by the LLVM -- cgit v1.2.3 From 1c4cbeee36b0258a8c2476e5f878959d79fe27d9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 18 Oct 2020 17:37:10 +0200 Subject: gnu: gn: Update to 0.0-1819.e327ffd. * gnu/packages/build-tools.scm (gn): Update to 0.0-1819.e327ffd. --- gnu/packages/build-tools.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 5bbe70eaa1..85ff7bb352 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -111,8 +111,8 @@ (define-public bear (license license:gpl3+))) (define-public gn - (let ((commit "eb997b5ab9c3f1ba6a2c52072785884864a84eae") - (revision "1794")) ;as returned by `git describe`, used below + (let ((commit "e327ffdc503815916db2543ec000226a8df45163") + (revision "1819")) ;as returned by `git describe`, used below (package (name "gn") (version (git-version "0.0" revision commit)) @@ -122,7 +122,7 @@ (define-public gn (uri (git-reference (url home-page) (commit commit))) (sha256 (base32 - "1vfkcy34wqhg7wsk7jdzhgnnzwim10wgbxv5bnavxzjcs871i2xa")) + "0kvlfj3www84zp1vmxh76x8fdjm9hyk8lkh2vdsidafpmm75fphr")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From f01ec472b9c3ef9008e70e0cf41ca46c61137d8c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 18 Oct 2020 17:39:29 +0200 Subject: gnu: ungoogled-chromium: Update to 86.0.4240.75-0.c34a56d. * gnu/packages/chromium.scm (%preserved-third-party-files): Adjust for 86. Include bundled libc++, jsoncpp, re2 and libvpx for now. (gentoo-patch, chromium-gcc-patchset, %gentoo-patches, %gentoo-revision, xcb-proto/python2): Remove variables. (%debian-revision, %debian-patches): Update to debian/84.0.4147.105-1. Remove jsoncpp unbundling patch. (%ungoogled-revision, %ungoogled-origin): Update to c34a56db4c121238fface560. (%chromium-version, arch-patch, %arch-revision): New variables. (%arch-patches): Add more patches. (ungoogled-chromium-snippet): Don't apply GCC or Gentoo patches. Don't unbundle libvpx or re2. (ungoogled-chromium): Update to 86.0.4240.75-0.c34a56d. [arguments]: Adjust #:configure-flags and substitutions for 86. Add workaround for building with bundled libc++. Adjust install phase to take a hard coded list of files instead of using SCANDIR and REGEXP-EXEC. [native-inputs]: Change from CLANG-10 to CLANG-11. [inputs]: Remove JSONCPP, RE2 and XCB-PROTO/PYTHON2. --- gnu/packages/chromium.scm | 192 ++++++++++++++++++++-------------------------- 1 file changed, 82 insertions(+), 110 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index cc75c3201a..7bc69c7386 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -83,6 +83,9 @@ (define %preserved-third-party-files "base/third_party/symbolize" ;BSD-3 "base/third_party/xdg_mime" ;LGPL2.0+ or Academic 2.0 "base/third_party/xdg_user_dirs" ;Expat + ;; XXX: Chromium requires a newer C++ standard library. Remove this when + ;; the default GCC is 9 or later. + "buildtools/third_party/libc++" ;ASL2.0, with LLVM exceptions "chrome/third_party/mozilla_security_manager" ;MPL-1.1/GPL2+/LGPL2.1+ "courgette/third_party/bsdiff" ;BSD-2, BSD protection license "courgette/third_party/divsufsort" ;Expat @@ -111,7 +114,6 @@ (define %preserved-third-party-files "third_party/boringssl/src/third_party/fiat" ;Expat "third_party/breakpad" ;BSD-3 "third_party/brotli" ;Expat - "third_party/cacheinvalidation" ;ASL2.0 "third_party/catapult" ;BSD-3 "third_party/catapult/common/py_vulcanize/third_party/rcssmin" ;ASL2.0 "third_party/catapult/common/py_vulcanize/third_party/rjsmin" ;ASL2.0 @@ -139,9 +141,15 @@ (define %preserved-third-party-files "third_party/depot_tools/owners.py" ;BSD-3 "third_party/devtools-frontend" ;BSD-3 "third_party/devtools-frontend/src/front_end/third_party/acorn" ;Expat + "third_party/devtools-frontend/src/front_end/third_party/chromium" ;BSD-3 "third_party/devtools-frontend/src/front_end/third_party/codemirror" ;Expat "third_party/devtools-frontend/src/front_end/third_party/fabricjs" ;Expat + "third_party/devtools-frontend/src/front_end/third_party/i18n" ;ASL2.0 + "third_party/devtools-frontend/src/front_end/third_party/intl-messageformat" ;BSD-3 "third_party/devtools-frontend/src/front_end/third_party/lighthouse" ;ASL2.0 + "third_party/devtools-frontend/src/front_end/third_party/lit-html" ;BSD-3 + "third_party/devtools-frontend/src/front_end/third_party/lodash-isequal" ;Expat + "third_party/devtools-frontend/src/front_end/third_party/marked" ;Expat, BSD-3 "third_party/devtools-frontend/src/front_end/third_party/wasmparser" ;ASL2.0 "third_party/devtools-frontend/src/third_party/axe-core" ;MPL2.0 "third_party/devtools-frontend/src/third_party/pyjson5" ;ASL2.0 @@ -159,6 +167,8 @@ (define %preserved-third-party-files "third_party/iccjpeg" ;IJG "third_party/inspector_protocol" ;BSD-3 "third_party/jinja2" ;BSD-3 + ;; XXX: Unbundle this when switching back to libstdc++. + "third_party/jsoncpp" ;Public Domain or Expat "third_party/jstemplate" ;ASL2.0 "third_party/khronos" ;Expat, SGI "third_party/leveldatabase" ;BSD-3 @@ -175,6 +185,11 @@ (define %preserved-third-party-files "third_party/libsrtp" ;BSD-3 "third_party/libsync" ;ASL2.0 "third_party/libudev" ;LGPL2.1+ + + ;; FIXME: build/linux/unbundle/libvpx.gn does not work for all users. + "third_party/libvpx" ;BSD-3 + "third_party/libvpx/source/libvpx/third_party/x86inc" ;Expat + "third_party/libwebm" ;BSD-3 "third_party/libxml/chromium" ;BSD-3 "third_party/libyuv" ;BSD-3 @@ -186,6 +201,7 @@ (define %preserved-third-party-files "third_party/metrics_proto" ;BSD-3 "third_party/modp_b64" ;BSD-3 "third_party/nasm" ;BSD-2 + "third_party/nearby" ;ASL2.0 "third_party/node" ;Expat "third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2" ;BSD-2 "third_party/one_euro_filter" ;BSD-3 @@ -208,9 +224,13 @@ (define %preserved-third-party-files "third_party/protobuf/third_party/six" ;Expat "third_party/pyjson5" ;ASL2.0 "third_party/qcms" ;Expat + ;; XXX: System re2 cannot be used when Chromium uses libc++ because the re2 + ;; ABI relies on libstdc++ internals. See build/linux/unbundle/re2.gn. + "third_party/re2" ;BSD-3 "third_party/rnnoise" ;BSD-3 "third_party/s2cellid" ;ASL2.0 "third_party/schema_org" ;CC-BY-SA3.0 + "third_party/securemessage" ;ASL2.0 "third_party/skia" ;BSD-3 "third_party/skia/include/third_party/skcms" ;BSD-3 "third_party/skia/third_party/skcms" ;BSD-3 @@ -222,12 +242,13 @@ (define %preserved-third-party-files "third_party/sqlite" ;Public domain "third_party/swiftshader" ;ASL2.0 "third_party/swiftshader/third_party/astc-encoder" ;ASL2.0 - "third_party/swiftshader/third_party/llvm-7.0" ;NCSA + "third_party/swiftshader/third_party/llvm-10.0" ;ASL2.0, with LLVM exception "third_party/swiftshader/third_party/llvm-subzero" ;NCSA "third_party/swiftshader/third_party/marl" ;ASL2.0 "third_party/swiftshader/third_party/subzero" ;NCSA "third_party/swiftshader/third_party/SPIRV-Headers" ;X11-style "third_party/tcmalloc/chromium" ;BSD-3 + "third_party/ukey2" ;ASL2.0 "third_party/usb_ids" ;BSD-3 "third_party/usrsctp" ;BSD-2 "third_party/vulkan_memory_allocator" ;Expat @@ -246,8 +267,10 @@ (define %preserved-third-party-files "third_party/widevine/cdm/widevine_cdm_version.h" ;BSD-3 "third_party/widevine/cdm/widevine_cdm_common.h" ;BSD-3 "third_party/woff2" ;ASL2.0 + "third_party/xcbproto" ;X11 "third_party/xdg-utils" ;Expat "third_party/zlib/google" ;BSD-3 + "third_party/zxcvbn-cpp" ;Expat "url/third_party/mozilla" ;BSD-3, MPL1.1/GPL2+/LGPL2.1+ "v8/src/third_party/siphash" ;Public domain "v8/src/third_party/utf8-decoder" ;Expat @@ -258,27 +281,9 @@ (define %preserved-third-party-files (define %blacklisted-files ;; 'third_party/blink/perf_tests/resources/svg/HarveyRayner.svg' carries a ;; nonfree license according to LICENSES in the same directory. As we don't - ;; run the Blink performance tests, just remove everything to save ~24MiB. + ;; run the Blink performance tests, just remove everything to save ~70MiB. '("third_party/blink/perf_tests")) -(define (gentoo-patch name revision hash) - (origin - (method url-fetch) - (uri (string-append "https://gitweb.gentoo.org/repo/gentoo.git/plain" - "/www-client/chromium/files/" name "?id=" revision)) - (file-name (string-append "ungoogled-" name)) - (sha256 (base32 hash)))) - -;; This repository contains libstdc++ compatibility patches for Chromium. -(define (chromium-gcc-patchset commit hash) - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/stha09/chromium-patches") - (commit commit))) - (file-name (git-file-name "chromium-gcc-patches" commit)) - (sha256 (base32 hash)))) - (define (debian-patch name revision hash) (origin (method url-fetch) @@ -289,38 +294,34 @@ (define (debian-patch name revision hash) (string-append "ungoogled-chromium-" category "-" name)))) (sha256 (base32 hash)))) -(define %ungoogled-revision "57244cdfc21dc05910862152d91cc528103c988a") -(define %debian-revision "debian/83.0.4103.116-3") -(define %gentoo-revision "f3f649046d31ebdbc8c4a302b2384504eff78027") - -(define %gentoo-patches - ;; This patch is necessary for compatibility with FFmpeg 4.3. - (list (gentoo-patch "chromium-84-mediaalloc.patch" %gentoo-revision - "0snxdc4nb8ykzncz62vpsl8hgxpy24m17mycx67i2gckmrpslzzv"))) +(define (arch-patch name revision hash) + (origin + (method url-fetch) + (uri (string-append "https://raw.githubusercontent.com/archlinux" + "/svntogit-packages/" revision "/trunk/" name)) + (sha256 (base32 hash)))) -(define %chromium-gcc-patches - (chromium-gcc-patchset - "chromium-84-patchset-3" - "0l05gx3pn703n47anjwsl5sjcqw8kaxmivf7llax97kj3k6d127v")) +(define %chromium-version "86.0.4240.75") +(define %ungoogled-revision "c34a56db4c121238fface560e21531b6199ce5dd") +(define %debian-revision "debian/84.0.4147.105-1") +(define %arch-revision "2cbe439471932d30ff2c8ded6b3dfd51b312bbc9") (define %debian-patches (list (debian-patch "system/zlib.patch" %debian-revision - "0bp2vh1cgmwjrn1zkpphkd3bs662s23xwdhy3abm9cfjvwrj117n") - (debian-patch "system/jsoncpp.patch" %debian-revision - "0d95brl4a5y5w142yd0rvf59z513h7chsz0vnm034d6lqf22ahwf") + "09vqgs37w9ycc7par14wa7rnvmg9bm0z9pqg6fyl3iqvpghyjyr4") (debian-patch "system/openjpeg.patch" %debian-revision "0zd6v5njx1pc7i0y6mslxvpx5j4cq01mmyx55qcqx8qzkm0gm48j"))) (define %arch-patches - (list (origin - (method url-fetch) - (uri "https://git.archlinux.org/svntogit/packages.git/plain/trunk/\ -chromium-fix-vaapi-on-intel.patch?h=packages/chromium\ -&id=93b5b90621b4827084288197c6e0e09b987b372a") - (file-name "ungoogled-chromium-fix-vaapi-on-intel.patch") - (sha256 - (base32 - "16jbjjf4d9jp52rdrrxx5vm69nx3w0qrijgjpwapnmcif13z55g4"))))) + (list (arch-patch "check-for-enable-accelerated-video-decode-on-Linux.patch" + %arch-revision + "12qj23dcp2g2ivyfyj13m4fzf68nllb9djwcxf1h195gn8wkml03") + (arch-patch "only-fall-back-to-the-i965-driver-if-we-re-on-iHD.patch" + %arch-revision + "0073qjp0dp9kj2ix2j6cxrima01rpdpkcjj9crxlb9b43b4cc53m") + (arch-patch "fix-invalid-end-iterator-usage-in-CookieMonster.patch" + %arch-revision + "1p1wy3dfncw0hhz77a1km0xjhix69ksgbpa569qz86nv76jbgn39"))) (define %ungoogled-origin (origin @@ -331,7 +332,7 @@ (define %ungoogled-origin (string-take %ungoogled-revision 7))) (sha256 (base32 - "15a1xpmabdxr1mn61m0jm9a5l987rxdji8b1b6zy39mr636vcwfi")))) + "18p9a7qffmy8m03nqva7maalgil13lj2mn0s56v3crbs4wk4lalj")))) ;; This is a source 'snippet' that does the following: ;; *) Applies various patches for unbundling purposes and libstdc++ compatibility. @@ -354,20 +355,18 @@ (define ungoogled-chromium-snippet (for-each (lambda (patch) (invoke "patch" "-p1" "--force" "--input" patch "--no-backup-if-mismatch")) - (append - '#+%gentoo-patches '#+%debian-patches '#+%arch-patches - (find-files #$%chromium-gcc-patches "\\.patch$") - '#+(list (local-file - (search-patch - "ungoogled-chromium-system-nspr.patch"))))) + (append '#+%debian-patches '#+%arch-patches + '#+(list (local-file + (search-patch + "ungoogled-chromium-system-nspr.patch"))))) (with-directory-excursion #+%ungoogled-origin (format #t "Ungooglifying...~%") (force-output) (invoke "python" "utils/prune_binaries.py" chromium-dir "pruning.list") - (invoke "python" "utils/patches.py" "apply" - chromium-dir "patches") + (invoke "python" "utils/patches.py" "apply" chromium-dir + "patches") (invoke "python" "utils/domain_substitution.py" "apply" "-r" "domain_regex.list" "-f" "domain_substitution.list" "-c" "/tmp/domainscache.tar.gz" chromium-dir)) @@ -396,8 +395,8 @@ (define ungoogled-chromium-snippet (invoke "python" "build/linux/unbundle/replace_gn_files.py" "--system-libraries" "ffmpeg" "flac" "fontconfig" "freetype" "harfbuzz-ng" "icu" "libdrm" "libevent" - "libjpeg" "libpng" "libvpx" "libwebp" "libxml" - "libxslt" "openh264" "opus" "re2" "snappy" "zlib") + "libjpeg" "libpng" "libwebp" "libxml" "libxslt" + "openh264" "opus" "snappy" "zlib") #t)))) (define opus+custom @@ -412,16 +411,6 @@ (define opus+custom `(cons "--enable-custom-modes" ,flags)))))) -;; Chromium still has Python2-only code, so we need this special Python 2 -;; variant of xcb-proto. -(define xcb-proto/python2 - (package/inherit - xcb-proto - (name "python2-xcb-proto") - (native-inputs - `(("pkg-config" ,pkg-config) - ("python" ,python-2))))) - ;; 'make-ld-wrapper' can only work with an 'ld' executable, so we need ;; this trick to make it wrap 'lld'. (define (make-lld-wrapper lld) @@ -450,7 +439,7 @@ (define lld-wrapper (define-public ungoogled-chromium (package (name "ungoogled-chromium") - (version (string-append "84.0.4147.125-0." + (version (string-append %chromium-version "-0." (string-take %ungoogled-revision 7))) (synopsis "Graphical web browser") (source (origin @@ -460,7 +449,7 @@ (define-public ungoogled-chromium (car (string-split version #\-)) ".tar.xz")) (sha256 (base32 - "1xdg9pnnvbzasmra09rl7wdrir61rfcqml46jj7kv39drwk9chwq")) + "1ddw4p9zfdzhi5hrd8x14k4w326znljzprnpfi2f917rlpnl2ynx")) (modules '((guix build utils))) (snippet (force ungoogled-chromium-snippet)))) (build-system gnu-build-system) @@ -470,8 +459,6 @@ (define-public ungoogled-chromium #:validate-runpath? #f #:modules ((guix build gnu-build-system) (guix build utils) - (ice-9 ftw) - (ice-9 regex) (srfi srfi-26)) #:configure-flags ;; See tools/gn/docs/cookbook.md and @@ -486,7 +473,6 @@ (define-public ungoogled-chromium (string-append "max_jobs_per_link=" (number->string (parallel-job-count))) "clang_use_chrome_plugins=false" - "use_custom_libcxx=false" "use_sysroot=false" "goma_dir=\"\"" "enable_nacl=false" @@ -505,16 +491,13 @@ (define-public ungoogled-chromium "enable_vr=false" "enable_widevine=false" ;; Disable type-checking for the Web UI to avoid a Java dependency. - "closure_compile=false" + "enable_js_type_check=false" ;; Define a custom toolchain that simply looks up CC, AR and ;; friends from the environment. "custom_toolchain=\"//build/toolchain/linux/unbundle:default\"" "host_toolchain=\"//build/toolchain/linux/unbundle:default\"" - (string-append "xcbproto_path=\"" - (assoc-ref %build-inputs "xcb-proto") "/share/xcb\"") - ;; Prefer system libraries. "use_system_freetype=true" "use_system_harfbuzz=true" @@ -547,16 +530,13 @@ (define-public ungoogled-chromium ;; WebRTC stuff. "rtc_use_h264=true" ;; Don't use bundled sources. - "rtc_build_json=false" + "rtc_build_json=true" ;FIXME: libc++ std::string ABI difference "rtc_build_libevent=false" "rtc_build_libvpx=false" "rtc_build_opus=false" "rtc_build_ssl=false" "rtc_build_libsrtp=true" ;FIXME: fails to find headers "rtc_build_usrsctp=true" ;TODO: package this - (string-append "rtc_jsoncpp_root=\"" - (assoc-ref %build-inputs "jsoncpp") - "/include/jsoncpp/json\"") (string-append "rtc_ssl_root=\"" (assoc-ref %build-inputs "openssl") "/include/openssl\"")) @@ -564,12 +544,6 @@ (define-public ungoogled-chromium (modify-phases %standard-phases (add-after 'unpack 'patch-stuff (lambda _ - ;; Fix build with newer re2. Taken from: - ;; https://chromium-review.googlesource.com/c/chromium/src/+/2145261 - (substitute* "components/autofill/core/browser/address_rewriter.cc" - (("options\\.set_utf8\\(true\\)") - "options.set_encoding(RE2::Options::EncodingUTF8)")) - (substitute* '("base/process/launch_posix.cc" "base/third_party/dynamic_annotations/dynamic_annotations.c" @@ -615,10 +589,8 @@ (define-public ungoogled-chromium (substitute* "third_party/breakpad/breakpad/src/common/linux/libcurl_wrapper.h" - (("include \"third_party/curl") "include \"curl")) - - (substitute* "third_party/webrtc/rtc_base/strings/json.h" - (("#include \"third_party/jsoncpp/") "#include \"json/")) + (("include \"third_party/curl") + "include \"curl")) (substitute* '("components/viz/common/gpu/vulkan_context_provider.h" "components/viz/common/resources/resource_format_utils.h" @@ -628,17 +600,6 @@ (define-public ungoogled-chromium (substitute* "third_party/skia/include/gpu/vk/GrVkVulkan.h" (("include/third_party/vulkan/") "")) - ;; Building chromedriver embeds some files using the ZIP - ;; format which doesn't support timestamps before - ;; 1980. Therefore, advance the timestamps of the files - ;; which are included so that building chromedriver - ;; works. - (let ((circa-1980 (* 10 366 24 60 60))) - (for-each (lambda (file) - (utime file circa-1980 circa-1980)) - '("chrome/test/chromedriver/extension/background.js" - "chrome/test/chromedriver/extension/manifest.json"))) - #t)) (add-after 'patch-stuff 'add-absolute-references (lambda* (#:key inputs #:allow-other-keys) @@ -660,10 +621,23 @@ (define-public ungoogled-chromium (add-before 'configure 'prepare-build-environment (lambda* (#:key inputs #:allow-other-keys) - ;; Make sure the right build tools are used. + ;; Define the GN toolchain. (setenv "AR" "llvm-ar") (setenv "NM" "llvm-nm") (setenv "CC" "clang") (setenv "CXX" "clang++") + (let ((gcc (assoc-ref inputs "gcc"))) + ;; Remove the default compiler from CPLUS_INCLUDE_PATH to + ;; prevent header conflict with the bundled libcxx. + (setenv "CPLUS_INCLUDE_PATH" + (string-join + (delete (string-append gcc "/include/c++") + (string-split (getenv "CPLUS_INCLUDE_PATH") + #\:)) + ":")) + (format #t + "environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%" + (getenv "CPLUS_INCLUDE_PATH"))) + (setenv "CXXFLAGS" (string-join '(;; Do not optimize away null pointer safety checks. @@ -728,7 +702,10 @@ (define-public ungoogled-chromium (lib (string-append out "/lib")) (man (string-append out "/share/man/man1")) (applications (string-append out "/share/applications")) - (install-regexp (make-regexp "\\.(bin|pak|so)$")) + (libs '("chrome_100_percent.pak" + "chrome_200_percent.pak" + "resources.pak" + "v8_context_snapshot.bin")) (locales (string-append lib "/locales")) (resources (string-append lib "/resources")) (preferences (assoc-ref inputs "master-preferences")) @@ -753,9 +730,7 @@ (define-public ungoogled-chromium (copy-file preferences (string-append lib "/master_preferences")) (with-directory-excursion "out/Release" - (for-each (lambda (file) - (install-file file lib)) - (scandir "." (cut regexp-exec install-regexp <>))) + (for-each (cut install-file <> lib) libs) (copy-file "chrome" (string-append lib "/chromium")) (copy-recursively "locales" locales) @@ -785,7 +760,7 @@ (define-public ungoogled-chromium #t)))))) (native-inputs `(("bison" ,bison) - ("clang" ,clang-10) + ("clang" ,clang-11) ("gn" ,gn) ("gperf" ,gperf) ("ld-wrapper" ,(make-lld-wrapper lld)) @@ -817,7 +792,6 @@ (define-public ungoogled-chromium ("gtk+" ,gtk+) ("harfbuzz" ,harfbuzz) ("icu4c" ,icu4c-67) - ("jsoncpp" ,jsoncpp) ("lcms" ,lcms) ("libevent" ,libevent) ("libffi" ,libffi) @@ -851,13 +825,11 @@ (define-public ungoogled-chromium ("pango" ,pango) ("pciutils" ,pciutils) ("pulseaudio" ,pulseaudio) - ("re2" ,re2) ("snappy" ,snappy) ("speech-dispatcher" ,speech-dispatcher) ("udev" ,eudev) ("valgrind" ,valgrind) - ("vulkan-headers" ,vulkan-headers) - ("xcb-proto" ,xcb-proto/python2))) + ("vulkan-headers" ,vulkan-headers))) ;; Building Chromium takes ... a very long time. On a single core, a busy ;; mid-end x86 system may need more than 24 hours to complete the build. -- cgit v1.2.3 From 474efc823b17386cc96dfd565f4c2ac205c9e68a Mon Sep 17 00:00:00 2001 From: Joseph LaFreniere Date: Sat, 10 Oct 2020 11:56:02 -0500 Subject: gnu: Add python-grandalf. * gnu/packages/python-xyz.scm (python-grandalf): New variable. Signed-off-by: Marius Bakke --- gnu/packages/python-xyz.scm | 55 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 6360dc8f35..5fafcbc79d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6055,6 +6055,61 @@ (define-public python-grako (define-public python2-grako (package-with-python2 python-grako)) +(define-public python-grandalf + (package + (name "python-grandalf") + (version "0.7") + (source + (origin + ;; There's no source tarball on PyPI. + (method git-fetch) + (uri (git-reference + (url "https://github.com/bdcht/grandalf") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "03p8w8ljpb87qbyldm3s6b7qi30hfcn43h33iwlgqcf31fjsyr4g")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "python" "setup.py" "pytest")))))) + (native-inputs + `(("python-pytest" ,python-pytest) + ("python-pytest-runner" ,python-pytest-runner))) + (propagated-inputs + `(("python-numpy" ,python-numpy) + ("python-ply" ,python-ply))) + (home-page "https://github.com/bdcht/grandalf") + (synopsis "Graph and drawing algorithms framework") + (description + "Grandalf is a Python package made for experimentations with graphs +drawing algorithms. It is written in pure Python, and currently implements +two layouts: the Sugiyama hierarchical layout and the force-driven or energy +minimization approach. While not as fast or featured as graphviz or other +libraries like OGDF (C++), it provides a way to walk and draw graphs no larger +than thousands of nodes, while keeping the source code simple enough to tweak +and hack any part of it for experimental purpose. With a total of about 1500 +lines of Python, the code involved in drawing the Sugiyama (dot) layout fits +in less than 600 lines. The energy minimization approach is comprised of only +250 lines! + +Grandalf does only 2 not-so-simple things: +@itemize +@item computing the nodes (x,y) coordinates (based on provided nodes +dimensions, and a chosen layout) +@item routing the edges with lines or nurbs +@end itemize + +It doesn’t depend on any GTK/Qt/whatever graphics toolkit. This means that it +will help you find where to draw things like nodes and edges, but it’s up to +you to actually draw things with your favorite toolkit.") + ;; The user can choose either license. + (license (list license:gpl2 license:epl1.0)))) + (define-public python-gridmap (package (name "python-gridmap") -- cgit v1.2.3 From 68d425cda8be8356ab5e8aab54be0f19f08fedd0 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Mon, 12 Oct 2020 00:38:49 -0300 Subject: gnu: Add python-pykeepass. * gnu/packages/python-crypto.scm (python-pykeepass): New variable. Signed-off-by: Marius Bakke --- gnu/packages/python-crypto.scm | 48 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index bad774aa03..7084c3a4ec 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -61,6 +61,7 @@ (define-module (gnu packages python-crypto) #:use-module (gnu packages swig) #:use-module (gnu packages time) #:use-module (gnu packages tls) + #:use-module (gnu packages xml) #:use-module ((guix licenses) #:prefix license:) #:use-module (srfi srfi-1)) @@ -1060,6 +1061,53 @@ (define-public python2-m2crypto (propagated-inputs `(("python2-typing" ,python2-typing)))))) +(define-public python-pykeepass + (package + (name "python-pykeepass") + (version "3.2.0") + (source + (origin + (method git-fetch) + ;; Source tarball on PyPI doesn't include tests. + (uri (git-reference + (url "https://github.com/libkeepass/pykeepass") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1wxbfpy7467mlnfsvmh685fhfnq4fki9y7yc9cylp30r5n3hisaj")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'make-kdbx-writable + ;; Tests have to write to the .kdbx files in the test directory. + (lambda _ + (with-directory-excursion "tests" + (for-each make-file-writable (find-files ".")) + #t))) + (add-before 'build 'patch-requirements + (lambda _ + ;; Update requirements from dependency==version + ;; to dependency>=version. + (substitute* "setup.py" + (("==") ">=")) + #t))))) + (propagated-inputs + `(("python-argon2-cffi" ,python-argon2-cffi) + ("python-construct" ,python-construct) + ("python-dateutil" ,python-dateutil) + ("python-future" ,python-future) + ("python-lxml" ,python-lxml) + ("python-pycryptodome" ,python-pycryptodome))) + (home-page "https://github.com/libkeepass/pykeepass") + (synopsis "Python library to interact with keepass databases") + (description + "This library allows you to write entries to a KeePass database. It +supports KDBX3 and KDBX4.") + ;; There are no copyright headers in the source code. The LICENSE file + ;; indicates GPL3. + (license license:gpl3+))) + (define-public python-pylibscrypt (package (name "python-pylibscrypt") -- cgit v1.2.3 From 9cd61289055cb7869df1c803c5f1490788e3fcc7 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Mon, 12 Oct 2020 00:42:19 -0300 Subject: gnu: libpwquality: Enable Python binding. * gnu/packages/password-utils.scm (libpwquality)[arguments]: Enable Python binding. [native-inputs]: Add python-wrapper. Signed-off-by: Marius Bakke --- gnu/packages/password-utils.scm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 85dbeef28f..c178c2de8d 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -28,6 +28,7 @@ ;;; Copyright © 2020 Brice Waegeneire ;;; Copyright © 2020 Jean-Baptiste Note ;;; Copyright © 2020 Michael Rohleder +;;; Copyright © 2020 Vinicius Monego ;;; ;;; This file is part of GNU Guix. ;;; @@ -381,8 +382,17 @@ (define-public libpwquality "13hw532fmzc5xjpy75d74rlfdlxf2a8ibb4hyy9c0s92wsgf0qsj")))) (build-system gnu-build-system) (arguments - ;; XXX: have RUNPATH issue. - '(#:configure-flags '("--disable-python-bindings"))) + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'set-LDFLAGS + (lambda* (#:key inputs outputs #:allow-other-keys) + (setenv "LDFLAGS" + (string-append + "-Wl,-rpath=" + (assoc-ref outputs "out") "/lib")) + #t))))) + (native-inputs + `(("python" ,python-wrapper))) (inputs `(("cracklib" ,cracklib))) (synopsis "Password quality checker") -- cgit v1.2.3 From a8eb438e78224eb8acab0b1157c9327a4fbd47a2 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Mon, 12 Oct 2020 00:42:20 -0300 Subject: gnu: Add passwordsafe. * gnu/packages/gnome.scm (passwordsafe): New variable. Signed-off-by: Marius Bakke --- gnu/packages/gnome.scm | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d6ab0fb984..66fec1efdb 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10295,6 +10295,60 @@ (define-public cheese apply fancy special effects and lets you share the fun with others.") (license license:gpl2+))) +(define-public passwordsafe + (package + (name "passwordsafe") + (version "3.99.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.gnome.org/World/PasswordSafe") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0pi2l4gwf8paxm858mxrcsk5nr0c0zw5ycax40mghndb6b1qmmhf")))) + (build-system meson-build-system) + (arguments + `(#:glib-or-gtk? #t + #:phases + (modify-phases %standard-phases + (add-after 'glib-or-gtk-wrap 'python-and-gi-wrap + (lambda* (#:key outputs #:allow-other-keys) + (let ((prog (string-append (assoc-ref outputs "out") + "/bin/gnome-passwordsafe")) + (pylib (string-append (assoc-ref outputs "out") + "/lib/python" + ,(version-major+minor + (package-version python)) + "/site-packages"))) + (wrap-program prog + `("PYTHONPATH" = (,(getenv "PYTHONPATH") ,pylib)) + `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))) + #t)))))) + (native-inputs + `(("desktop-file-utils" ,desktop-file-utils) + ("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) + ("gtk+:bin" ,gtk+ "bin") + ("pkg-config" ,pkg-config))) + (inputs + `(("glib" ,glib) + ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) + ("gtk+" ,gtk+) + ("libhandy" ,libhandy-0.0) + ("libpwquality" ,libpwquality) + ("python-pygobject" ,python-pygobject) + ("python-pykeepass" ,python-pykeepass))) + (home-page "https://gitlab.gnome.org/World/PasswordSafe") + (synopsis "Password manager for the GNOME desktop") + (description + "Password Safe is a password manager which makes use of the KeePass v4 +format. It integrates perfectly with the GNOME desktop and provides an easy +and uncluttered interface for the management of password databases.") + (license license:gpl3+))) + (define-public sound-juicer (package (name "sound-juicer") -- cgit v1.2.3 From 48fe2e01d823e773158bb90da29f0e36f5dee6e0 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Mon, 12 Oct 2020 21:47:38 -0300 Subject: gnu: Add python-pyfavicon. * gnu/packages/python-xyz.scm (python-pyfavicon): New variable. Signed-off-by: Marius Bakke --- gnu/packages/python-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 5fafcbc79d..42352aae14 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17297,6 +17297,31 @@ (define-public python2-send2trash (string-append (getcwd) ":" (getenv "PYTHONPATH"))) #t)))))))) +(define-public python-pyfavicon + (package + (name "python-pyfavicon") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pyfavicon" version)) + (sha256 + (base32 "15wfpa99hvcfsv8j0m8iprmydi2p4qkhm86qfx485244y0ia5mgx")))) + (build-system python-build-system) + (arguments + ;; There are no tests in the PyPI tarball and the tests from the + ;; repository require online data. + '(#:tests? #f)) + (propagated-inputs + `(("python-aiohttp" ,python-aiohttp) + ("python-beautifulsoup4" ,python-beautifulsoup4) + ("python-pillow" ,python-pillow))) + (home-page "https://github.com/bilelmoussaoui/pyfavicon") + (synopsis "Async favicon fetcher") + (description + "@code{pyfavicon} is an async favicon fetcher.") + (license license:expat))) + (define-public python-yapf (package (name "python-yapf") -- cgit v1.2.3 From 6f8d776d2589e0f7bdebaba6aab984c1decae150 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Mon, 12 Oct 2020 21:53:22 -0300 Subject: gnu: Add python-pyotp. * gnu/packages/python-crypto.scm (python-pyotp): New variable. Signed-off-by: Marius Bakke --- gnu/packages/python-crypto.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 7084c3a4ec..b294613a5b 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -1181,6 +1181,26 @@ (define-public python-libnacl @code{NaCl} as well as being completely portable.") (license license:asl2.0))) +(define-public python-pyotp + (package + (name "python-pyotp") + (version "2.4.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pyotp" version)) + (sha256 + (base32 "0a1dx07y785xyl70h0vj6vssg13qfx11w04d0gz8h48qffsymv01")))) + (build-system python-build-system) + (home-page "https://github.com/pyauth/pyotp") + (synopsis "Python One Time Password Library") + (description + "PyOTP is a Python library for generating and verifying one-time +passwords. It can be used to implement two-factor (2FA) or multi-factor +(MFA) authentication methods in web applications and in other systems that +require users to log in.") + (license license:expat))) + (define-public python-scrypt (package (name "python-scrypt") -- cgit v1.2.3 From 945ec6c3ec6c3f5a8367cbdc4f618c2368112e46 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Mon, 12 Oct 2020 21:53:23 -0300 Subject: gnu: Add yoyo-migrations. * gnu/packages/databases.scm (yoyo-migrations): New variable. Signed-off-by: Marius Bakke --- gnu/packages/databases.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index f88f9e377d..1236f57018 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -44,6 +44,7 @@ ;;; Copyright © 2020 Lars-Dominik Braun ;;; Copyright © 2020 Guy Fleury Iteriteka ;;; Copyright © 2020 Michael Rohleder +;;; Copyright © 2020 Vinicius Monego ;;; ;;; This file is part of GNU Guix. ;;; @@ -128,6 +129,7 @@ (define-module (gnu packages databases) #:use-module (guix download) #:use-module (guix bzr-download) #:use-module (guix git-download) + #:use-module (guix hg-download) #:use-module (guix build-system emacs) #:use-module (guix build-system gnu) #:use-module (guix build-system go) @@ -2992,6 +2994,36 @@ (define-public python-sadisplay (define-public python2-sadisplay (package-with-python2 python-sadisplay)) +(define-public yoyo-migrations + (package + (name "yoyo-migrations") + (version "7.2.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://hg.sr.ht/~olly/yoyo") + (changeset (string-append "v" version "-release")))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 "0q2z9bgdj3wyix7yvqsayfs21grp5av8ilh411lgmjhigszkvhcq")))) + (build-system python-build-system) + (arguments + ;; XXX: Tests require a connection to some pgsql database and psycopg + ;; fails to connect to it. + '(#:tests? #f)) + (propagated-inputs + `(("python-sqlparse" ,python-sqlparse) + ("python-tabulate" ,python-tabulate))) + (home-page "https://ollycope.com/software/yoyo/latest/") + (synopsis "Database migrations with SQL") + (description + "Yoyo is a database schema migration tool. Migrations are written as SQL +files or Python scripts that define a list of migration steps.") + (license license:asl2.0))) + (define-public python-mysqlclient (package (name "python-mysqlclient") -- cgit v1.2.3 From 2f115f56faae949a6e3ed6baee57fd4472539b72 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Mon, 12 Oct 2020 21:53:24 -0300 Subject: gnu: Add python-pyzbar. * gnu/packages/python-xyz.scm (python-pyzbar): New variable. Signed-off-by: Marius Bakke --- gnu/packages/python-xyz.scm | 53 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 42352aae14..f95f7792f7 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -108,6 +108,7 @@ (define-module (gnu packages python-xyz) #:use-module (gnu packages) #:use-module (gnu packages algebra) #:use-module (gnu packages adns) + #:use-module (gnu packages aidc) #:use-module (gnu packages attr) #:use-module (gnu packages backup) #:use-module (gnu packages bash) @@ -17483,6 +17484,58 @@ (define-public python-isoweek (define-public python2-isoweek (package-with-python2 python-isoweek)) +(define-public python-pyzbar + (package + (name "python-pyzbar") + (version "0.1.8") + (source + (origin + ;; There's no source tarball on PyPI. + (method git-fetch) + (uri (git-reference + (url "https://github.com/NaturalHistoryMuseum/pyzbar") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1fqlfg5p2v9lzzzi0si2sz54lblprk6jjjhjw54b64lp58c1yhsl")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'remove-failing-test + (lambda _ + ;; This tests if find_library was called once, but we remove + ;; the call in the stage below to make the library find libzbar. + (delete-file "pyzbar/tests/test_zbar_library.py") + #t)) + (add-before 'build 'set-library-file-name + (lambda* (#:key inputs #:allow-other-keys) + (let ((libzbar (assoc-ref inputs "zbar"))) + (substitute* "pyzbar/zbar_library.py" + (("find_library\\('zbar'\\)") + (string-append "'" libzbar "/lib/libzbar.so.0'"))) + #t)))))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("python-numpy" ,python-numpy) + ("python-pillow" ,python-pillow))) + (inputs + `(("zbar" ,zbar))) + (home-page "https://github.com/NaturalHistoryMuseum/pyzbar/") + (synopsis "Read one-dimensional barcodes and QR codes") + (description + "Read one-dimensional barcodes and QR codes using the zbar library. + +Features: + +@itemize +@item Pure python +@item Works with PIL / Pillow images, OpenCV / numpy ndarrays, and raw bytes +@item Decodes locations of barcodes +@item No dependencies, other than the zbar library itself +@end itemize") + (license license:expat))) + (define-public python-tokenize-rt (package (name "python-tokenize-rt") -- cgit v1.2.3 From 094e234d3062e78c0a99c94a370a46581e813bc1 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Mon, 12 Oct 2020 21:53:25 -0300 Subject: gnu: Add authenticator. * gnu/packages/gnome.scm (authenticator): New variable. Signed-off-by: Marius Bakke --- gnu/packages/gnome.scm | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 66fec1efdb..9da58096b8 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -74,6 +74,7 @@ (define-module (gnu packages gnome) #:use-module (gnu packages) #:use-module (gnu packages admin) + #:use-module (gnu packages aidc) #:use-module (gnu packages aspell) #:use-module (gnu packages autotools) #:use-module (gnu packages avahi) @@ -9079,6 +9080,75 @@ (define-public byzanz (home-page "https://git.gnome.org/browse/byzanz") (license license:gpl2+)))) +(define-public authenticator + (package + (name "authenticator") + (version "3.32.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.gnome.org/World/Authenticator") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1c4r9rnrz5gazrfg0z2rcwax4nscs7z391bcjcl74k6ln3blwzpr")))) + (build-system meson-build-system) + (arguments + `(#:glib-or-gtk? #t + #:phases + (modify-phases %standard-phases + (add-after 'glib-or-gtk-wrap 'python-and-gi-wrap + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((prog (string-append (assoc-ref outputs "out") + "/bin/authenticator")) + (pylib (string-append (assoc-ref outputs "out") + "/lib/python" + ,(version-major+minor + (package-version python)) + "/site-packages"))) + (wrap-program prog + `("PYTHONPATH" = (,(getenv "PYTHONPATH") ,pylib)) + `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))) + #t)))))) + (native-inputs + `(("desktop-file-utils" ,desktop-file-utils) + ("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) + ("gtk+:bin" ,gtk+ "bin") + ("pkg-config" ,pkg-config))) + (inputs + `(("gsettings-desktop-schemas" ,gsettings-desktop-schemas) + ("gtk+" ,gtk+) + ("libhandy" ,libhandy-0.0) + ("libsecret" ,libsecret) + ("python-beautifulsoup4" ,python-beautifulsoup4) + ("python-pillow" ,python-pillow) + ("python-pyfavicon" ,python-pyfavicon) + ("python-pygobject" ,python-pygobject) + ("python-pyotp" ,python-pyotp) + ("python-pyzbar" ,python-pyzbar) + ("yoyo-migrations" ,yoyo-migrations) + ("zbar" ,zbar))) + (home-page "https://gitlab.gnome.org/World/Authenticator/") + (synopsis "Two-factor authentication application built for GNOME") + (description + "Authenticator is a two-factor authentication (2FA) application built for +the GNOME desktop environment. + +Features: + +@itemize +@item QR code scanner +@item Beautiful UI +@item Huge database of more than 560 supported services +@item Keep your PIN tokens secure by locking the application with a password +@item Automatically fetch an image for services using their favicon +@item The possibility to add new services +@end itemize") + (license license:gpl3+))) + (define-public gsound (package (name "gsound") -- cgit v1.2.3 From 6b98188171bae02cdc506ee53e704a033b6b820c Mon Sep 17 00:00:00 2001 From: Peng Mei Yu Date: Tue, 13 Oct 2020 16:22:16 +0800 Subject: gnu: Add ccal. * gnu/packages/calendar.scm (ccal): New variable. Signed-off-by: Marius Bakke --- gnu/packages/calendar.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm index 9987ae1bf8..1dde978d72 100644 --- a/gnu/packages/calendar.scm +++ b/gnu/packages/calendar.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 Tanguy Le Carrour +;;; Copyright © 2020 Peng Mei Yu ;;; ;;; This file is part of GNU Guix. ;;; @@ -339,3 +340,45 @@ (define-public confclerk ConfClerk is targeted at mobile devices but works on any system running Qt.") (license (list license:gpl2+ license:lgpl3)))) ; or cc-by3.0 for src/icons/* + +(define-public ccal + (package + (name "ccal") + (version "2.5.3") + (source (origin + (method url-fetch) + (uri (string-append "http://ccal.chinesebay.com/ccal/ccal-" + version ".tar.gz")) + (sha256 + (base32 + "15nza1d1lvk3dp0wcl53wsd32yhbgyzznha092mh5kh5z74vsk1x")))) + (build-system gnu-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* "Makefile" + (("/usr/local/bin") + (string-append out "/bin")) + (("/usr/local/man") + (string-append out "/share/man")))) + #t)) + (add-after 'install 'install-manuals + (lambda _ + (invoke "make" "install-man")))) + ;; no tests + #:tests? #f)) + (home-page "http://ccal.chinesebay.com/ccal/ccal.htm") + (synopsis "Command line program for Chinese calendar") + (description "@command{ccal} is a command line program which writes a +Gregorian calendar together with Chinese calendar to standard output. Its +usage is similar to the @command{cal} program. In addition to console output, +it can also generate Encapsulated Postscript and HTML table outputs for use in +do-it-yourself calendars and web pages. It supports both simplified and +traditional Chinese characters.") + ;; Both licenses are in use in various source files. Note that + ;; COPYING.LESSER specifies LGPL 3.0, but all source files say + ;; 'Lesser GPL version 2 or later'. + (license (list license:gpl2+ license:lgpl2.1+)))) -- cgit v1.2.3 From 2a4f3c1711fdb947e615b5a89e285421b3bf0925 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Fri, 16 Oct 2020 11:21:43 -0300 Subject: gnu: Add libebur128. * gnu/packages/audio.scm (libebur128): New variable. Signed-off-by: Marius Bakke --- gnu/packages/audio.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index e6b3dda299..8a0c0fce2b 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3060,6 +3060,32 @@ (define-public suil Suil currently supports every combination of Gtk, Qt, and X11.") (license license:isc))) +(define-public libebur128 + (package + (name "libebur128") + (version "1.2.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jiixyj/libebur128") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0n81rnm8dm1zmibkr2v3q79rsd609y0dbbsrbay18njcjva88p0g")))) + (build-system cmake-build-system) + (arguments + `(;; Tests require proprietary .wav files. See + ;; https://github.com/jiixyj/libebur128/issues/82. + #:tests? #f + #:configure-flags '("-DBUILD_STATIC_LIBS=OFF"))) + (home-page "https://github.com/jiixyj/libebur128") + (synopsis "Library implementing the EBU R 128 loudness standard") + (description + "@code{libebur128} is a C library that implements the EBU R 128 standard +for loudness normalisation.") + (license license:expat))) + (define-public timidity++ (package (name "timidity++") -- cgit v1.2.3