From 0dd1e277b125b469ee1cd10eb1f32a3423dfaab2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 21 Jan 2020 10:35:59 +0100 Subject: gnu: guile3.0-pfds: Do rename file extensions. * gnu/packages/guile-xyz.scm (guile3.0-pfds)[arguments]: Inherit from guile-pfds to include file extension renaming. --- gnu/packages/guile-xyz.scm | 43 +++++++++++-------------------------------- 1 file changed, 11 insertions(+), 32 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index e9a15babfb..58fab1ac7d 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -773,38 +773,17 @@ (define-public guile3.0-pfds (name "guile3.0-pfds") (native-inputs `(("guile" ,guile-3.0))) (arguments - '(#:source-directory "src" - #:compile-flags '("--r6rs") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'move-files-around - (lambda _ - ;; See bug #39210. - (substitute* '("fingertrees.sls" - "queues/private/condition.sls" - "deques/private/condition.sls") - (("&assertion") "&violation")) - ;; Move files under a pfds/ directory to reflect the module - ;; hierarchy. - (mkdir-p "src/pfds") - (for-each (lambda (file) - (rename-file file - (string-append "src/pfds/" - file))) - '("bbtrees.sls" - "deques" - "deques.sls" - "dlists.sls" - "fingertrees.sls" - "hamts.sls" - "heaps.sls" - "private" - "psqs.sls" - "queues" - "queues.sls" - "sequences.sls" - "sets.sls")) - #t))))))) + (substitute-keyword-arguments (package-arguments guile-pfds) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'work-around-guile-bug + (lambda _ + ;; See bug #39210. + (substitute* '("fingertrees.sls" + "queues/private/condition.sls" + "deques/private/condition.sls") + (("&assertion") "&violation")) + #t)))))))) (define-public guile-aa-tree (package -- cgit v1.2.3 From d77310cc3f6626baf2a11a8a8c6e4b7730c2f1b2 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Wed, 22 Jan 2020 01:08:19 +0100 Subject: nu: Add ocaml-lwt-react. * gnu/packages/ocaml.scm (ocaml-lwt-react): New variable. --- gnu/packages/ocaml.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 31e200f3d5..b51dc3b4f7 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1794,6 +1794,28 @@ (define-public ocaml-lwt locks or other synchronization primitives.") (license license:lgpl2.1))) +(define-public ocaml-lwt-react + (package + (inherit ocaml-lwt) + (name "ocaml-lwt-react") + (version "1.1.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ocsigen/lwt") + ;; Version from opam + (commit "4.3.0"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0f7036srqz7zmnz0n164734smgkrqz78r1i35cg30x31kkr3pnn4")))) + (arguments + `(#:package "lwt_react")) + (properties `((upstream-name . "lwt_react"))) + (propagated-inputs + `(("ocaml-lwt" ,ocaml-lwt) + ("ocaml-react" ,ocaml-react))))) + (define-public ocaml-lwt-log (package (name "ocaml-lwt-log") -- cgit v1.2.3 From 6c89e06626bfb679bf681ed3e6c04bba79e271cd Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Wed, 22 Jan 2020 01:10:27 +0100 Subject: gnu: ocaml-lambda-term: Add missing dependencies. * gnu/packages/ocaml.scm (ocaml-lambda-term)[propagated-inputs]: Add ocaml-lwt-react. [inputs]: Add libev. --- gnu/packages/ocaml.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index b51dc3b4f7..d41bd2af42 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3117,9 +3117,12 @@ (define-public ocaml-lambda-term `(#:build-flags (list "--profile" "release") #:tests? #f)) (propagated-inputs - `(("lwt" ,ocaml-lwt) - ("lwt-log" ,ocaml-lwt-log) - ("zed" ,ocaml-zed))) + `(("ocaml-lwt" ,ocaml-lwt) + ("ocaml-lwt-log" ,ocaml-lwt-log) + ("ocaml-lwt-react" ,ocaml-lwt-react) + ("ocaml-zed" ,ocaml-zed))) + (inputs + `(("libev" ,libev))) (home-page "https://github.com/diml/lambda-term") (synopsis "Terminal manipulation library for OCaml") (description "Lambda-Term is a cross-platform library for manipulating the -- cgit v1.2.3 From 092f815799265098f37cade35bf89664ec5f21e9 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Wed, 22 Jan 2020 01:12:09 +0100 Subject: guix: ocaml: Reuse package-with-ocaml4.01 with ocaml-4.07. * guix/build-system/guix.scm (package-with-ocaml4.01) (strip-ocaml4.01-variant): Rename to... (package-with-ocaml4.07, strip-ocaml4.07-variant): ... this and rename internal implementation. --- guix/build-system/ocaml.scm | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/guix/build-system/ocaml.scm b/guix/build-system/ocaml.scm index cbd33d9a89..de3e71a5aa 100644 --- a/guix/build-system/ocaml.scm +++ b/guix/build-system/ocaml.scm @@ -27,8 +27,8 @@ (define-module (guix build-system ocaml) #:use-module (ice-9 match) #:use-module (srfi srfi-1) #:export (%ocaml-build-system-modules - package-with-ocaml4.01 - strip-ocaml4.01-variant + package-with-ocaml4.07 + strip-ocaml4.07-variant default-findlib default-ocaml lower @@ -84,13 +84,13 @@ (define (default-dune-build-system) (let ((module (resolve-interface '(guix build-system dune)))) (module-ref module 'dune-build-system))) -(define (default-ocaml4.01) +(define (default-ocaml4.07) (let ((ocaml (resolve-interface '(gnu packages ocaml)))) - (module-ref ocaml 'ocaml-4.01))) + (module-ref ocaml 'ocaml-4.07))) -(define (default-ocaml4.01-findlib) +(define (default-ocaml4.07-findlib) (let ((module (resolve-interface '(gnu packages ocaml)))) - (module-ref module 'ocaml4.01-findlib))) + (module-ref module 'ocaml4.07-findlib))) (define* (package-with-explicit-ocaml ocaml findlib old-prefix new-prefix #:key variant-property) @@ -145,17 +145,17 @@ (define (cut? p) (package-mapping transform cut?)) -(define package-with-ocaml4.01 - (package-with-explicit-ocaml (delay (default-ocaml4.01)) - (delay (default-ocaml4.01-findlib)) - "ocaml-" "ocaml4.01-" - #:variant-property 'ocaml4.01-variant)) +(define package-with-ocaml4.07 + (package-with-explicit-ocaml (delay (default-ocaml4.07)) + (delay (default-ocaml4.07-findlib)) + "ocaml-" "ocaml4.07-" + #:variant-property 'ocaml4.07-variant)) -(define (strip-ocaml4.01-variant p) - "Remove the 'ocaml4.01-variant' property from P." +(define (strip-ocaml4.07-variant p) + "Remove the 'ocaml4.07-variant' property from P." (package (inherit p) - (properties (alist-delete 'ocaml4.01-variant (package-properties p))))) + (properties (alist-delete 'ocaml4.07-variant (package-properties p))))) (define* (lower name #:key source inputs native-inputs outputs system target -- cgit v1.2.3 From e3388d6361dedabb2f6df9cdd5cc98e6cac7f457 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Wed, 22 Jan 2020 01:15:47 +0100 Subject: gnu: Add ocaml4.07-findlib. * gnu/packages/ocaml.scm (ocaml4.07-findlib): New variable. --- gnu/packages/ocaml.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index d41bd2af42..8ef6effb1f 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -968,6 +968,14 @@ (define-public ocaml-findlib compilers that can directly deal with packages.") (license license:x11))) +(define-public ocaml4.07-findlib + (package + (inherit ocaml-findlib) + (name "ocaml4.07-findlib") + (inputs + `(("m4" ,m4) + ("ocaml" ,ocaml-4.07))))) + ;; note that some tests may hang for no obvious reason. (define-public ocaml-ounit (package -- cgit v1.2.3 From 8a9d52c7e9edf91dfe337a19178eced51dcab499 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 21 Jan 2020 22:35:38 -0500 Subject: gnu: Go: Update to 1.12.15. * gnu/packages/golang.scm (go-1.12): Update to 1.12.15. [arguments]: Adjust the 'prebuild' phase. --- gnu/packages/golang.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index f94251abaf..a6b5f2a4cf 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -220,7 +220,7 @@ (define-public go-1.12 (package (inherit go-1.4) (name "go") - (version "1.12.13") + (version "1.12.15") (source (origin (method url-fetch) @@ -228,7 +228,7 @@ (define-public go-1.12 name version ".src.tar.gz")) (sha256 (base32 - "19zmrhydd52vhdnzlhxqklzg1mnav434dcgw9wl4iajbvfwd70sk")))) + "1hw4xjywcl883dnvfbb92w85sy8n231fdri4aynj8xajgr0p9fla")))) (arguments (substitute-keyword-arguments (package-arguments go-1.4) ((#:phases phases) @@ -266,9 +266,6 @@ (define-public go-1.12 (("/bin/pwd") (which "pwd")) (("/bin/sh") (which "sh"))) - (substitute* "cmd/vendor/golang.org/x/sys/unix/syscall_unix_test.go" - (("/usr/bin") "/tmp")) - ;; Add libgcc to runpath (substitute* "cmd/link/internal/ld/lib.go" (("!rpath.set") "true")) -- cgit v1.2.3 From 6677f33d365001d341c79b354e26464c77411d38 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 22 Jan 2020 03:05:38 +0100 Subject: gnu: font-public-sans: Update to 1.008. * gnu/packages/fonts.scm (font-public-sans): Update to 1.008. --- gnu/packages/fonts.scm | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 1cb8b1c053..7d3330e17a 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -1479,22 +1479,16 @@ (define-public font-mononoki (define-public font-public-sans (package (name "font-public-sans") - (version "1.0.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/uswds/public-sans.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "12ccj7ph3pg962d52d3slbvd44gwfm6bb2846dxyf1xc5h2iwhdv")) - (modules '((guix build utils))) - (snippet - '(begin - ;; remove versions of predecessor font - (delete-file-recursively "fonts/_archive") - #t)))) + (version "1.008") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/uswds/public-sans.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1qhyxbjv1rnydfpqzd18fbiyz75p4sabphy8yj07hyq0hidp5xsf")))) (build-system font-build-system) (home-page "https://public-sans.digital.gov/") (synopsis "Neutral typeface for interfaces, text, and headings") -- cgit v1.2.3 From 542d64fd8439eed5c1d6acead86c2244a703e468 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 22 Jan 2020 03:05:54 +0100 Subject: gnu: librepcb: Update to 0.1.3. * gnu/packages/engineering.scm (librepcb): Update to 0.1.3. --- gnu/packages/engineering.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 3f4cdbd172..c4c0fd5304 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1961,21 +1961,20 @@ (define-public qucs-s (define-public librepcb (package (name "librepcb") - (version "0.1.2") + (version "0.1.3") (source (origin (method url-fetch) (uri (string-append "https://download.librepcb.org/releases/" version "/librepcb-" version "-source.zip")) (sha256 - (base32 - "1xgk0r3nxdd2cy7d1k165d005gsngnz1v2wbwivacw7gis0i8ip7")))) + (base32 "1ich849dsx2hmcwlwbry4mkg374n940l3hy6srh4qms2rm7vd7x0")))) (build-system gnu-build-system) (inputs `(("qtbase" ,qtbase) ("zlib" ,zlib))) (native-inputs - `(("qttools" ,qttools) ; for lrelease + `(("qttools" ,qttools) ; for lrelease ("unzip" ,unzip))) (arguments `(#:phases -- cgit v1.2.3 From 82f81ffac6d3cacfab33fa6bed3758eb974cb29f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 22 Jan 2020 05:27:50 +0100 Subject: gnu: gtkwave: Prefer mirror://sourceforge source URI. * gnu/packages/fpga.scm (gtkwave)[source]: Add URI. --- gnu/packages/fpga.scm | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index 988129f373..4411dfe895 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Danny Milosavljevic ;;; Copyright © 2016, 2017 Theodoros Foradis -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019 Amin Bandali ;;; ;;; This file is part of GNU Guix. @@ -302,13 +302,16 @@ (define-public gtkwave (package (name "gtkwave") (version "3.3.101") - (source (origin - (method url-fetch) - (uri (string-append "http://gtkwave.sourceforge.net/" - "gtkwave-" version ".tar.gz")) - (sha256 - (base32 - "1j6capxwgi8aj3sgqg1r7161icni9y8y93g1rl3bzd3s40jcyhsz")))) + (source + (origin + (method url-fetch) + (uri (list (string-append "mirror://sourceforge/gtkwave/" + "gtkwave-" version "/" + "gtkwave-" version ".tar.gz") + (string-append "http://gtkwave.sourceforge.net/" + "gtkwave-" version ".tar.gz"))) + (sha256 + (base32 "1j6capxwgi8aj3sgqg1r7161icni9y8y93g1rl3bzd3s40jcyhsz")))) (build-system gnu-build-system) (native-inputs `(("gperf" ,gperf) -- cgit v1.2.3 From 18a3f33ee626939aa8d49919acb943d0c09a6f6c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 22 Jan 2020 05:28:52 +0100 Subject: gnu: gtkwave: Update to 3.3.103. * gnu/packages/fpga.scm (gtkwave): Update to 3.3.103. --- gnu/packages/fpga.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index 4411dfe895..46c917b0d5 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -301,7 +301,7 @@ (define-public arachne-pnr (define-public gtkwave (package (name "gtkwave") - (version "3.3.101") + (version "3.3.103") (source (origin (method url-fetch) @@ -311,7 +311,7 @@ (define-public gtkwave (string-append "http://gtkwave.sourceforge.net/" "gtkwave-" version ".tar.gz"))) (sha256 - (base32 "1j6capxwgi8aj3sgqg1r7161icni9y8y93g1rl3bzd3s40jcyhsz")))) + (base32 "1xzaxqbabj4sb4n10yki5acglx3736pwl3kwlq4k7i96rzvsn9f3")))) (build-system gnu-build-system) (native-inputs `(("gperf" ,gperf) -- cgit v1.2.3 From e7472958c19070673402b110bf3ddab62fa019b6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 22 Jan 2020 06:16:48 +0100 Subject: gnu: babl: Update to 0.1.74. * gnu/packages/gimp.scm (babl): Update to 0.1.74. --- gnu/packages/gimp.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index 42a55cff33..e9dffc2a42 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2014, 2015 Ludovic Courtès ;;; Copyright © 2016, 2018 Ricardo Wurmus ;;; Copyright © 2016, 2017, 2018 Efraim Flashner -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 202 Tobias Geerinckx-Rice ;;; Copyright © 2018 Leo Famulari ;;; Copyright © 2018 Thorsten Wilms ;;; @@ -50,7 +50,7 @@ (define-module (gnu packages gimp) (define-public babl (package (name "babl") - (version "0.1.72") + (version "0.1.74") (source (origin (method url-fetch) (uri (list (string-append "https://download.gimp.org/pub/babl/" @@ -64,7 +64,7 @@ (define-public babl "/babl-" version ".tar.xz"))) (sha256 (base32 - "0hkagjrnza77aasa1kss5hvy37ndm50y6i7hkdn2z8hzgc4i3qb4")))) + "03nfcvy3453xkfvsfcnsfcjf2vg2pin09qnr9jlssdysa1lhnwcs")))) (build-system meson-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 9564967e991e23b75872cd9fe6d8c557ca0d3c95 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 22 Jan 2020 06:16:55 +0100 Subject: gnu: gegl: Update to 0.4.20. * gnu/packages/gimp.scm (gegl): Update to 0.4.20. --- gnu/packages/gimp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index e9dffc2a42..0991109510 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -89,7 +89,7 @@ (define-public babl (define-public gegl (package (name "gegl") - (version "0.4.18") + (version "0.4.20") (source (origin (method url-fetch) (uri (list (string-append "https://download.gimp.org/pub/gegl/" @@ -103,7 +103,7 @@ (define-public gegl "/gegl-" version ".tar.xz"))) (sha256 (base32 - "0r6akqnrkvxizyhyi8sv40mxm7j4bcwjb6mqjpxy0zzbbfsdyin9")))) + "1zrxnxlhn0jmshg4n2m2xlgi886w059ynkiiihm7rpi05fs8pg93")))) (build-system meson-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From cf7ca6fe9bab2e5b09d3a015458ab4b6690893d6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 22 Jan 2020 10:06:56 +0200 Subject: gnu: gnurl: Update to 7.67.0. * gnu/packages/gnunet.scm (gnurl): Update to 7.67.0. [inputs]: Remove libidn, add libidn2. [native-inputs]: Remove groff, python2. Add python. [arguments]: Remove unused 'test-target' and 'parallel-tests' flags. Update configure-flags. --- gnu/packages/gnunet.scm | 36 +++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index 43605dfc86..392b140503 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2013, 2014, 2015 Andreas Enge ;;; Copyright © 2014 Sree Harsha Totakura ;;; Copyright © 2015, 2017, 2018, 2019 Ludovic Courtès -;;; Copyright © 2015, 2017, 2019 Efraim Flashner +;;; Copyright © 2015, 2017, 2019, 2020 Efraim Flashner ;;; Copyright © 2016 Ricardo Wurmus ;;; Copyright © 2016 Mark H Weaver ;;; Copyright © 2016, 2017, 2018, 2019 ng0 @@ -179,31 +179,44 @@ (define-public libmicrohttpd (define-public gnurl (package (name "gnurl") - (version "7.63.0") + (version "7.67.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gnunet/" name "-" version ".tar.Z")) (sha256 (base32 - "021b3pdfnqywk5q07y48kxyz7g4jjg35dk3cv0ps0x50qjr4ix33")))) + "0ssjz2npr2zjvcpfz9qbaj92xc9ayg8wx4hyl132snl94qr2v670")))) (build-system gnu-build-system) (outputs '("out" - "doc")) ; 1.7 MiB of man3 pages + "doc")) ; 1.8 MiB of man3 pages (inputs `(("gnutls" ,gnutls/dane) - ("libidn" ,libidn) + ("libidn2" ,libidn2) ("zlib" ,zlib))) (native-inputs `(("libtool" ,libtool) - ("groff" ,groff) ("perl" ,perl) ("pkg-config" ,pkg-config) - ("python" ,python-2))) + ("python" ,python))) (arguments - `(#:configure-flags (list "--disable-ntlm-wb") - #:test-target "test" - #:parallel-tests? #f + `(#:configure-flags + ;; All of these produce errors during configure. + (list "--disable-ftp" + "--disable-file" + "--disable-ldap" + "--disable-rtsp" + "--disable-dict" + "--disable-telnet" + "--disable-tftp" + "--disable-pop3" + "--disable-imap" + "--disable-smb" + "--disable-smtp" + "--disable-gopher" + "--without-ssl" + "--without-libpsl" + "--without-librtmp" + "--disable-ntlm-wb") #:phases - ;; We have to patch runtests.pl in tests/ directory (modify-phases %standard-phases (add-after 'install 'move-man3-pages (lambda* (#:key outputs #:allow-other-keys) @@ -214,6 +227,7 @@ (define-public gnurl (rename-file (string-append out "/share/man/man3") (string-append doc "/share/man/man3")) #t))) + ;; We have to patch runtests.pl in tests/ directory (replace 'check (lambda _ (substitute* "tests/runtests.pl" -- cgit v1.2.3 From 0f654e63d619c2407728a15890fe674685e571da Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 22 Jan 2020 11:06:56 +0200 Subject: gnu: ocaml-mmap: Use a source file-name. * gnu/packages/ocaml.scm (ocaml-mmap)[source]: Add file-name field. --- gnu/packages/ocaml.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 8ef6effb1f..7c5a2f939b 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2015 David Hashe ;;; Copyright © 2016 Eric Bavier ;;; Copyright © 2016 Jan Nieuwenhuizen -;;; Copyright © 2016, 2018, 2019 Efraim Flashner +;;; Copyright © 2016, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2016-2020 Julien Lepiller ;;; Copyright © 2017 Ben Woodcroft ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice @@ -1756,6 +1756,7 @@ (define-public ocaml-mmap (uri (git-reference (url "https://github.com/mirage/mmap") (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 "1jaismy5d1bhbbanysmr2k79px0yv6ya265dri3949nha1l23i60")))) -- cgit v1.2.3 From 94c7ef932a5857020c2a5349ff1970b1809a080e Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Wed, 22 Jan 2020 11:40:01 +0100 Subject: gnu: Rename module gnutls to tls. * gnu/packages/tigervnc.scm: Rename to... * gnu/packages/vnc.scm: ... this. Change module name accordingly. Sort used modules. * gnu-system.am (GNU_SYSTEM_MODULES): Rename tigervnc module to vnc. --- gnu/local.mk | 2 +- gnu/packages/tigervnc.scm | 234 ---------------------------------------------- gnu/packages/vnc.scm | 234 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 235 insertions(+), 235 deletions(-) delete mode 100644 gnu/packages/tigervnc.scm create mode 100644 gnu/packages/vnc.scm diff --git a/gnu/local.mk b/gnu/local.mk index 626d91ce62..b10ad21520 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -493,7 +493,6 @@ GNU_SYSTEM_MODULES = \ %D%/packages/tex.scm \ %D%/packages/textutils.scm \ %D%/packages/text-editors.scm \ - %D%/packages/tigervnc.scm \ %D%/packages/time.scm \ %D%/packages/tls.scm \ %D%/packages/tmux.scm \ @@ -509,6 +508,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/video.scm \ %D%/packages/vim.scm \ %D%/packages/virtualization.scm \ + %D%/packages/vnc.scm \ %D%/packages/vpn.scm \ %D%/packages/vulkan.scm \ %D%/packages/w3m.scm \ diff --git a/gnu/packages/tigervnc.scm b/gnu/packages/tigervnc.scm deleted file mode 100644 index 903d8ccd02..0000000000 --- a/gnu/packages/tigervnc.scm +++ /dev/null @@ -1,234 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2019 Todor Kondić -;;; Copyright © 2020 Oleg Pykhalov -;;; -;;; This file is part of GNU Guix. -;;; -;;; GNU Guix is free software; you can redistribute it and/or modify it -;;; under the terms of the GNU General Public License as published by -;;; the Free Software Foundation; either version 3 of the License, or (at -;;; your option) any later version. -;;; -;;; GNU Guix is distributed in the hope that it will be useful, but -;;; WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with GNU Guix. If not, see . - -(define-module (gnu packages tigervnc) - #:use-module (gnu packages autotools) - #:use-module (gnu packages compression) - #:use-module (gnu packages gettext) - #:use-module (gnu packages tls) - #:use-module (gnu packages linux) - #:use-module (gnu packages xorg) - #:use-module (gnu packages fltk) - #:use-module (gnu packages image) - #:use-module (gnu packages cmake) - #:use-module (gnu packages perl) - #:use-module (gnu packages base) - #:use-module (gnu packages commencement) - #:use-module (guix build-system cmake) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix git-download) - #:use-module (guix utils) - #:use-module ((guix licenses) #:prefix license:)) - -(define-public tigervnc-client - (package - (name "tigervnc-client") - (version "1.10.1") - (source - (origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/TigerVNC/tigervnc.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "001n189d2f3psn7nxgl8188ml6f7jbk26cxn2835y3mnlk5lmhgr")))) - (build-system cmake-build-system) - (arguments - '(#:tests? #f ; Tests that do exists are not automated. - #:phases (modify-phases %standard-phases - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (with-directory-excursion "vncviewer" - (invoke "make" "install"))))))) - (native-inputs - `(("autoconf" ,autoconf) - ("gettext-minimal" ,gettext-minimal) - ("automake" ,automake))) - (inputs - `(("zlib" ,zlib) - ("gnutls" ,gnutls) - ("libjpeg-turbo" ,libjpeg-turbo) - ("fltk" ,fltk) - ("linux-pam" ,linux-pam) - ("libx11" ,libx11) - ("libxext" ,libxext) - ("libxtst" ,libxtst) - ("libxrandr" ,libxrandr) - ("libxdamage" ,libxdamage))) - (home-page "https://tigervnc.org/") - (synopsis "High-performance, platform-neutral -implementation of VNC (client)") - (description "TigerVNC is a client/server implementation of VNC (Virtual -Network Computing). It provides enough performance to run even 3D and video -applications. It also provides extensions for advanced authentication methods -and TLS encryption. This package installs only the VNC client, the -application which is needed to connect to VNC servers.") - (license license:gpl2))) - -;; A VNC server is, in fact, an X server so it seems like a good idea -;; to build on the work already done for xorg-server package. This is -;; not entirely compatible with the recommendation in BUILDING.txt -;; where the client is built first, then the source code of the X -;; server is copied into a subdir of the build directory, patched with -;; VNC additions and then build and installed as Xvnc. The procedure -;; was turned around, where TigerVNC code is downloaded and built -;; inside the Guix X server build dir. Also, the VNC patching process -;; for the X server is automated in a straightforward manner. -(define-public tigervnc-server - (package - (inherit xorg-server) - (name "tigervnc-server") - (version "1.10.1") - (native-inputs - `(("tigervnc-src" ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/TigerVNC/tigervnc.git") - (commit "v1.9.0"))) - (sha256 - (base32 - "0b47fg3741qs3zdpl2zr0s6jz46dypp2j6gqrappbzm3ywnnmm1x")))) - ("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool) - ("gettext-minimal" ,gettext-minimal) - ("font-util" ,font-util) - ("cmake" ,cmake) - ("gcc-toolchain" ,gcc-toolchain) - ("perl" ,perl) - ,@(package-native-inputs tigervnc-client) - ,@(package-inputs tigervnc-client) - ,@(package-native-inputs xorg-server))) - (inputs - `(("perl" ,perl) - ("coreutils" ,coreutils) - ("xauth" ,xauth) - ,@(package-inputs xorg-server))) - (propagated-inputs - `(("xauth" ,xauth) - ,@(package-propagated-inputs xorg-server))) - (arguments - (substitute-keyword-arguments - (package-arguments xorg-server) - ((#:configure-flags flags) - `(append '("--with-pic" ; Taken from BUILDING.txt - "--without-dtrace" - "--disable-static" - "--disable-dri2" - "--disable-xinerama" - "--disable-xvfb" - "--disable-xnest" - "--disable-xorg" - "--disable-dmx" - "--disable-xwin" - "--disable-xephyr" - "--disable-kdrive" - ;; "--disable-config-dbus" ; This was a warning. - "--disable-config-hal" - "--disable-config-udev" - "--disable-dri2" - ;; "--enable-install-libxf86config" ; This, too, was a warning. - "--enable-glx") - (delete "--enable-xephyr" ,flags))) - ((#:modules modules) - `(append '((ice-9 ftw) - (ice-9 match) - (guix build utils) - (guix build gnu-build-system)) - modules)) - ((#:phases phases) - `(modify-phases ,phases - (delete 'check) ;) - (add-after 'unpack 'copy-tvnc-xserver - (lambda _ - (let* - ((tvnc-src (assoc-ref %build-inputs "tigervnc-src")) - (tvnc-xserver (string-append tvnc-src "/unix/xserver"))) - (copy-recursively tvnc-xserver ".") - #t))) - (add-after 'copy-tvnc-xserver 'patch-xserver - (lambda _ - (let* - ((tvnc-src (assoc-ref %build-inputs "tigervnc-src")) - (xorg-server-version ,(package-version xorg-server)) - (which-patch (lambda () - (let* - ((patch-num (apply string-append - (list-head (string-split xorg-server-version - #\.) - 2))) - (fn (format "~a/unix/xserver~a.patch" tvnc-src patch-num))) - (when (not (file-exists? fn)) - (error (format "Patch file, ~a, -corresponding to the input xorg-server version, does not exist. Installation -will fail. " fn))) - - fn))) ; VNC patches for xserver have the - ; form xserverXY[Y].patch, where - ; X.Y[Y].Z is the Xorg server - ; version. - (xserver-patch (which-patch))) - (invoke "patch" "-p1" "-i" xserver-patch) - (invoke "autoreconf" "-fiv")))) - (add-before 'build 'build-tigervnc - (lambda _ - (let* ((out (assoc-ref %outputs "out")) - (tvnc-src (assoc-ref %build-inputs "tigervnc-src")) - (tvnc-build (string-append (getcwd) "/tigervnc-build"))) - (mkdir-p tvnc-build) - (with-directory-excursion tvnc-build - (invoke "cmake" "-G" "Unix Makefiles" - (string-append "-DCMAKE_INSTALL_PREFIX=" out) - tvnc-src) - (invoke "make" "-j" (number->string (parallel-job-count))))))) - (replace 'build - (lambda _ - (let* ((tvnc-src (assoc-ref %build-inputs "tigervnc-src")) - (tvnc-build (string-append (getcwd) "/tigervnc-build")) - (srcarg (string-append "TIGERVNC_SRCDIR=" tvnc-src)) - (buildarg (string-append "TIGERVNC_BUILDDIR=" tvnc-build))) - (invoke "make" srcarg buildarg "-j" - (number->string (parallel-job-count)))))) - (add-before 'install 'install-tigervnc-aux - (lambda _ - (let* ((out (assoc-ref %outputs 'out)) - (tvnc-src (assoc-ref %build-inputs "tigervnc-src")) - (tvnc-build (string-append (getcwd) "/tigervnc-build")) - (srcarg (string-append "TIGERVNC_SRCDIR=" tvnc-src)) - (buildarg (string-append "TIGERVNC_BUILDDIR=" tvnc-build))) - (with-directory-excursion (string-append tvnc-build "/unix") - (invoke "make" srcarg buildarg "install"))))) - (replace 'install - (lambda* _ - (let* ((tvnc-src (assoc-ref %build-inputs "tigervnc-src")) - (tvnc-build (string-append (getcwd) "/tigervnc-build")) - (srcarg (string-append "TIGERVNC_SRCDIR=" tvnc-src)) - (buildarg (string-append "TIGERVNC_BUILDDIR=" tvnc-build))) - (invoke "make" "install" srcarg buildarg)))))))) - (description "TigerVNC is a client/server implementation of VNC (Virtual -Network Computing). It provides enough performance to run even 3D and video -applications. It also provides extensions for advanced authentication methods -and TLS encryption. This package installs the VNC server, a program that will -enable users with VNC clients to log into a graphical session on the machine -where the server is installed."))) diff --git a/gnu/packages/vnc.scm b/gnu/packages/vnc.scm new file mode 100644 index 0000000000..e715e10d5a --- /dev/null +++ b/gnu/packages/vnc.scm @@ -0,0 +1,234 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2019 Todor Kondić +;;; Copyright © 2020 Oleg Pykhalov +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages vnc) + #:use-module (guix build-system cmake) + #:use-module (guix download) + #:use-module (guix git-download) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix utils) + #:use-module (gnu packages autotools) + #:use-module (gnu packages base) + #:use-module (gnu packages cmake) + #:use-module (gnu packages commencement) + #:use-module (gnu packages compression) + #:use-module (gnu packages fltk) + #:use-module (gnu packages gettext) + #:use-module (gnu packages image) + #:use-module (gnu packages linux) + #:use-module (gnu packages perl) + #:use-module (gnu packages tls) + #:use-module (gnu packages xorg)) + +(define-public tigervnc-client + (package + (name "tigervnc-client") + (version "1.10.1") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/TigerVNC/tigervnc.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "001n189d2f3psn7nxgl8188ml6f7jbk26cxn2835y3mnlk5lmhgr")))) + (build-system cmake-build-system) + (arguments + '(#:tests? #f ; Tests that do exists are not automated. + #:phases (modify-phases %standard-phases + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (with-directory-excursion "vncviewer" + (invoke "make" "install"))))))) + (native-inputs + `(("autoconf" ,autoconf) + ("gettext-minimal" ,gettext-minimal) + ("automake" ,automake))) + (inputs + `(("zlib" ,zlib) + ("gnutls" ,gnutls) + ("libjpeg-turbo" ,libjpeg-turbo) + ("fltk" ,fltk) + ("linux-pam" ,linux-pam) + ("libx11" ,libx11) + ("libxext" ,libxext) + ("libxtst" ,libxtst) + ("libxrandr" ,libxrandr) + ("libxdamage" ,libxdamage))) + (home-page "https://tigervnc.org/") + (synopsis "High-performance, platform-neutral +implementation of VNC (client)") + (description "TigerVNC is a client/server implementation of VNC (Virtual +Network Computing). It provides enough performance to run even 3D and video +applications. It also provides extensions for advanced authentication methods +and TLS encryption. This package installs only the VNC client, the +application which is needed to connect to VNC servers.") + (license license:gpl2))) + +;; A VNC server is, in fact, an X server so it seems like a good idea +;; to build on the work already done for xorg-server package. This is +;; not entirely compatible with the recommendation in BUILDING.txt +;; where the client is built first, then the source code of the X +;; server is copied into a subdir of the build directory, patched with +;; VNC additions and then build and installed as Xvnc. The procedure +;; was turned around, where TigerVNC code is downloaded and built +;; inside the Guix X server build dir. Also, the VNC patching process +;; for the X server is automated in a straightforward manner. +(define-public tigervnc-server + (package + (inherit xorg-server) + (name "tigervnc-server") + (version "1.10.1") + (native-inputs + `(("tigervnc-src" ,(origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/TigerVNC/tigervnc.git") + (commit "v1.9.0"))) + (sha256 + (base32 + "0b47fg3741qs3zdpl2zr0s6jz46dypp2j6gqrappbzm3ywnnmm1x")))) + ("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("gettext-minimal" ,gettext-minimal) + ("font-util" ,font-util) + ("cmake" ,cmake) + ("gcc-toolchain" ,gcc-toolchain) + ("perl" ,perl) + ,@(package-native-inputs tigervnc-client) + ,@(package-inputs tigervnc-client) + ,@(package-native-inputs xorg-server))) + (inputs + `(("perl" ,perl) + ("coreutils" ,coreutils) + ("xauth" ,xauth) + ,@(package-inputs xorg-server))) + (propagated-inputs + `(("xauth" ,xauth) + ,@(package-propagated-inputs xorg-server))) + (arguments + (substitute-keyword-arguments + (package-arguments xorg-server) + ((#:configure-flags flags) + `(append '("--with-pic" ; Taken from BUILDING.txt + "--without-dtrace" + "--disable-static" + "--disable-dri2" + "--disable-xinerama" + "--disable-xvfb" + "--disable-xnest" + "--disable-xorg" + "--disable-dmx" + "--disable-xwin" + "--disable-xephyr" + "--disable-kdrive" + ;; "--disable-config-dbus" ; This was a warning. + "--disable-config-hal" + "--disable-config-udev" + "--disable-dri2" + ;; "--enable-install-libxf86config" ; This, too, was a warning. + "--enable-glx") + (delete "--enable-xephyr" ,flags))) + ((#:modules modules) + `(append '((ice-9 ftw) + (ice-9 match) + (guix build utils) + (guix build gnu-build-system)) + modules)) + ((#:phases phases) + `(modify-phases ,phases + (delete 'check) ;) + (add-after 'unpack 'copy-tvnc-xserver + (lambda _ + (let* + ((tvnc-src (assoc-ref %build-inputs "tigervnc-src")) + (tvnc-xserver (string-append tvnc-src "/unix/xserver"))) + (copy-recursively tvnc-xserver ".") + #t))) + (add-after 'copy-tvnc-xserver 'patch-xserver + (lambda _ + (let* + ((tvnc-src (assoc-ref %build-inputs "tigervnc-src")) + (xorg-server-version ,(package-version xorg-server)) + (which-patch (lambda () + (let* + ((patch-num (apply string-append + (list-head (string-split xorg-server-version + #\.) + 2))) + (fn (format "~a/unix/xserver~a.patch" tvnc-src patch-num))) + (when (not (file-exists? fn)) + (error (format "Patch file, ~a, +corresponding to the input xorg-server version, does not exist. Installation +will fail. " fn))) + + fn))) ; VNC patches for xserver have the + ; form xserverXY[Y].patch, where + ; X.Y[Y].Z is the Xorg server + ; version. + (xserver-patch (which-patch))) + (invoke "patch" "-p1" "-i" xserver-patch) + (invoke "autoreconf" "-fiv")))) + (add-before 'build 'build-tigervnc + (lambda _ + (let* ((out (assoc-ref %outputs "out")) + (tvnc-src (assoc-ref %build-inputs "tigervnc-src")) + (tvnc-build (string-append (getcwd) "/tigervnc-build"))) + (mkdir-p tvnc-build) + (with-directory-excursion tvnc-build + (invoke "cmake" "-G" "Unix Makefiles" + (string-append "-DCMAKE_INSTALL_PREFIX=" out) + tvnc-src) + (invoke "make" "-j" (number->string (parallel-job-count))))))) + (replace 'build + (lambda _ + (let* ((tvnc-src (assoc-ref %build-inputs "tigervnc-src")) + (tvnc-build (string-append (getcwd) "/tigervnc-build")) + (srcarg (string-append "TIGERVNC_SRCDIR=" tvnc-src)) + (buildarg (string-append "TIGERVNC_BUILDDIR=" tvnc-build))) + (invoke "make" srcarg buildarg "-j" + (number->string (parallel-job-count)))))) + (add-before 'install 'install-tigervnc-aux + (lambda _ + (let* ((out (assoc-ref %outputs 'out)) + (tvnc-src (assoc-ref %build-inputs "tigervnc-src")) + (tvnc-build (string-append (getcwd) "/tigervnc-build")) + (srcarg (string-append "TIGERVNC_SRCDIR=" tvnc-src)) + (buildarg (string-append "TIGERVNC_BUILDDIR=" tvnc-build))) + (with-directory-excursion (string-append tvnc-build "/unix") + (invoke "make" srcarg buildarg "install"))))) + (replace 'install + (lambda* _ + (let* ((tvnc-src (assoc-ref %build-inputs "tigervnc-src")) + (tvnc-build (string-append (getcwd) "/tigervnc-build")) + (srcarg (string-append "TIGERVNC_SRCDIR=" tvnc-src)) + (buildarg (string-append "TIGERVNC_BUILDDIR=" tvnc-build))) + (invoke "make" "install" srcarg buildarg)))))))) + (description "TigerVNC is a client/server implementation of VNC (Virtual +Network Computing). It provides enough performance to run even 3D and video +applications. It also provides extensions for advanced authentication methods +and TLS encryption. This package installs the VNC server, a program that will +enable users with VNC clients to log into a graphical session on the machine +where the server is installed."))) -- cgit v1.2.3 From a789f654a0f370720b2c6b7856b9971dcc1d5eb1 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Mon, 20 Jan 2020 23:43:18 +0100 Subject: gnu: Add libvnc. * gnu/packages/vnc.scm (libvnc): New variable. gnu/packages/patches/libvnc-CVE-2018-20750.patch, gnu/packages/patches/libvnc-CVE-2019-15681.patch: New files. * gnu/local.mk: Add them. --- gnu/local.mk | 2 ++ gnu/packages/patches/libvnc-CVE-2018-20750.patch | 44 ++++++++++++++++++++++++ gnu/packages/patches/libvnc-CVE-2019-15681.patch | 23 +++++++++++++ gnu/packages/vnc.scm | 39 +++++++++++++++++++++ 4 files changed, 108 insertions(+) create mode 100644 gnu/packages/patches/libvnc-CVE-2018-20750.patch create mode 100644 gnu/packages/patches/libvnc-CVE-2019-15681.patch diff --git a/gnu/local.mk b/gnu/local.mk index b10ad21520..51272b2dc8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1124,6 +1124,8 @@ dist_patch_DATA = \ %D%/packages/patches/libutils-add-includes.patch \ %D%/packages/patches/libutils-remove-damaging-includes.patch \ %D%/packages/patches/libvdpau-va-gl-unbundle.patch \ + %D%/packages/patches/libvnc-CVE-2018-20750.patch \ + %D%/packages/patches/libvnc-CVE-2019-15681.patch \ %D%/packages/patches/libvpx-CVE-2016-2818.patch \ %D%/packages/patches/libvpx-use-after-free-in-postproc.patch \ %D%/packages/patches/libxslt-generated-ids.patch \ diff --git a/gnu/packages/patches/libvnc-CVE-2018-20750.patch b/gnu/packages/patches/libvnc-CVE-2018-20750.patch new file mode 100644 index 0000000000..146243670a --- /dev/null +++ b/gnu/packages/patches/libvnc-CVE-2018-20750.patch @@ -0,0 +1,44 @@ +From 09e8fc02f59f16e2583b34fe1a270c238bd9ffec Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Mon, 7 Jan 2019 10:40:01 +0100 +Subject: [PATCH] Limit lenght to INT_MAX bytes in + rfbProcessFileTransferReadBuffer() + +This ammends 15bb719c03cc70f14c36a843dcb16ed69b405707 fix for a heap +out-of-bound write access in rfbProcessFileTransferReadBuffer() when +reading a transfered file content in a server. The former fix did not +work on platforms with a 32-bit int type (expected by rfbReadExact()). + +CVE-2018-15127 + + +--- + libvncserver/rfbserver.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/libvncserver/rfbserver.c b/libvncserver/rfbserver.c +index 7af84906..f2edbeea 100644 +--- a/libvncserver/rfbserver.c ++++ b/libvncserver/rfbserver.c +@@ -88,6 +88,8 @@ + #include + /* strftime() */ + #include ++/* INT_MAX */ ++#include + + #ifdef LIBVNCSERVER_WITH_WEBSOCKETS + #include "rfbssl.h" +@@ -1472,8 +1474,11 @@ char *rfbProcessFileTransferReadBuffer(rfbClientPtr cl, uint32_t length) + 0XFFFFFFFF, i.e. SIZE_MAX for 32-bit systems. On 64-bit systems, a length of 0XFFFFFFFF + will safely be allocated since this check will never trigger and malloc() can digest length+1 + without problems as length is a uint32_t. ++ We also later pass length to rfbReadExact() that expects a signed int type and ++ that might wrap on platforms with a 32-bit int type if length is bigger ++ than 0X7FFFFFFF. + */ +- if(length == SIZE_MAX) { ++ if(length == SIZE_MAX || length > INT_MAX) { + rfbErr("rfbProcessFileTransferReadBuffer: too big file transfer length requested: %u", (unsigned int)length); + rfbCloseClient(cl); + return NULL; diff --git a/gnu/packages/patches/libvnc-CVE-2019-15681.patch b/gnu/packages/patches/libvnc-CVE-2019-15681.patch new file mode 100644 index 0000000000..e328d87920 --- /dev/null +++ b/gnu/packages/patches/libvnc-CVE-2019-15681.patch @@ -0,0 +1,23 @@ +From d01e1bb4246323ba6fcee3b82ef1faa9b1dac82a Mon Sep 17 00:00:00 2001 +From: Christian Beier +Date: Mon, 19 Aug 2019 22:32:25 +0200 +Subject: [PATCH] rfbserver: don't leak stack memory to the remote + +Thanks go to Pavel Cheremushkin of Kaspersky for reporting. +--- + libvncserver/rfbserver.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/libvncserver/rfbserver.c b/libvncserver/rfbserver.c +index 3bacc891..310e5487 100644 +--- a/libvncserver/rfbserver.c ++++ b/libvncserver/rfbserver.c +@@ -3724,6 +3724,8 @@ rfbSendServerCutText(rfbScreenInfoPtr rfbScreen,char *str, int len) + rfbServerCutTextMsg sct; + rfbClientIteratorPtr iterator; + ++ memset((char *)&sct, 0, sizeof(sct)); ++ + iterator = rfbGetClientIterator(rfbScreen); + while ((cl = rfbClientIteratorNext(iterator)) != NULL) { + sct.type = rfbServerCutText; diff --git a/gnu/packages/vnc.scm b/gnu/packages/vnc.scm index e715e10d5a..e1cba08952 100644 --- a/gnu/packages/vnc.scm +++ b/gnu/packages/vnc.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Todor Kondić ;;; Copyright © 2020 Oleg Pykhalov +;;; Copyright © 2020 Hartmut Goebel ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,6 +25,7 @@ (define-module (gnu packages vnc) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix utils) + #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages cmake) @@ -31,9 +33,12 @@ (define-module (gnu packages vnc) #:use-module (gnu packages compression) #:use-module (gnu packages fltk) #:use-module (gnu packages gettext) + #:use-module (gnu packages gnupg) #:use-module (gnu packages image) #:use-module (gnu packages linux) #:use-module (gnu packages perl) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages sdl) #:use-module (gnu packages tls) #:use-module (gnu packages xorg)) @@ -232,3 +237,37 @@ (define-public tigervnc-server and TLS encryption. This package installs the VNC server, a program that will enable users with VNC clients to log into a graphical session on the machine where the server is installed."))) + +(define-public libvnc + (package + (name "libvnc") + (version "0.9.12") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/LibVNC/libvncserver.git") + (commit (string-append "LibVNCServer-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1226hb179l914919f5nm2mlf8rhaarqbf48aa649p4rwmghyx9vm")) + (patches (search-patches "libvnc-CVE-2018-20750.patch" + "libvnc-CVE-2019-15681.patch")))) + (build-system cmake-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("gnutls" ,gnutls) + ("libgcrypt" ,libgcrypt) + ("libjpeg" ,libjpeg) + ("libpng" ,libpng) + ("lzo" ,lzo) + ("sdl2" ,sdl2))) + (home-page "https://libvnc.github.io/") + (synopsis "Cross-platform C libraries for implementing VNC server or +client") + (description "This package provides @code{LibVNCServer} and +@code{LibVNCClient}. These are cross-platform C libraries that allow you to +easily implement VNC server or client functionality in your program.") + (license ;; GPL for programs, FDL for documentation + (list license:gpl2+ license:fdl1.2+)))) -- cgit v1.2.3 From 870b9ff95fa60ce414d3e5b1cf15c86968b237d4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 22 Jan 2020 11:57:07 +0200 Subject: gnu: ponymix: Don't use unstable tarball. * gnu/packages/pulseaudio.scm (ponymix)[source]: Download using git-fetch. --- gnu/packages/pulseaudio.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index 8e67779e95..c58d479081 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015 Ludovic Courtès ;;; Copyright © 2014, 2015, 2016 Mark H Weaver -;;; Copyright © 2016 Efraim Flashner +;;; Copyright © 2016, 2020 Efraim Flashner ;;; Copyright © 2016 Ricardo Wurmus ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2017 Leo Famulari @@ -251,13 +251,14 @@ (define-public ponymix (name "ponymix") (version "5") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/falconindy/ponymix/" - "archive/" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/falconindy/ponymix/") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1c0ch98zry3c4ixywwynjid1n1nh4xl4l1p548giq2w3zwflaghn")) - (file-name (string-append name "-" version ".tar.gz")))) + "08yp7fprmzm6px5yx2rvzri0l60bra5h59l26pn0k071a37ks1rb")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; There is no test suite. -- cgit v1.2.3 From fa6abb0135f915229094d027ca923ab3d2d5872e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 22 Jan 2020 12:06:24 +0200 Subject: gnu: pulsemixer: Don't use unstable tarball. * gnu/packages/pulseaudio.scm (pulsemixer)[source]: Download using git-fetch. --- gnu/packages/pulseaudio.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index c58d479081..f4817041ff 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -287,13 +287,14 @@ (define-public pulsemixer (name "pulsemixer") (version "1.4.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/GeorgeFilipkin/" - "pulsemixer/archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/GeorgeFilipkin/pulsemixer") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1lpad90ifr2xfldyf39sbwx1v85rif2gm9w774gwwpjv53zfgk1g")))) + "0l5zawv36d46sj3k31k5w6imnnxzyn62r83wdhr7fp5mi3ls1h5x")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From a4b4c1aa0bb9a3f44545ef5db6184fd3bb5a1dfc Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 22 Jan 2020 12:07:45 +0200 Subject: gnu: pulsemixer: Update to 1.5.0. * gnu/packages/pulseaudio.scm (pulsemixer): Update to 1.5.0. --- gnu/packages/pulseaudio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index f4817041ff..5651127b38 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -285,7 +285,7 @@ (define-public ponymix (define-public pulsemixer (package (name "pulsemixer") - (version "1.4.0") + (version "1.5.0") (source (origin (method git-fetch) (uri (git-reference @@ -294,7 +294,7 @@ (define-public pulsemixer (file-name (git-file-name name version)) (sha256 (base32 - "0l5zawv36d46sj3k31k5w6imnnxzyn62r83wdhr7fp5mi3ls1h5x")))) + "162nfpyqn4gp45x332a73n07c118vispz3jicin4p67x3f8f0g3j")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From e1a94fe09cb81d0757b8c35356d3e5ad15f6f9f8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 22 Jan 2020 12:12:06 +0200 Subject: gnu: pass-rotate: Don't use unstable tarball. * gnu/packages/password-utils.scm (pass-rotate)[source]: Download using git-fetch. Reflow section. --- gnu/packages/password-utils.scm | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index e896e3db2d..3e6212f38b 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Steve Sprang -;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2015 Aljosha Papsch ;;; Copyright © 2016 Christopher Allan Webber ;;; Copyright © 2016 Jessica Tallon @@ -962,14 +962,15 @@ (define-public pass-rotate (name "pass-rotate") (version "0.1") (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/SirCmpwn/pass-rotate/archive/" - version ".tar.gz")) - (sha256 - (base32 - "1svm5nj8bczv2dg8lh2zqqhbsrljqsw9680r03qwgl9vlci90210")) - (file-name (string-append name "-" version ".tar.gz")))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/SirCmpwn/pass-rotate") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1m067vvdlc85csbpkp8aw4s3ags7q8s3jszrr32kmj9qhk5c254f")))) (build-system python-build-system) (inputs `(("python-beautifulsoup4" ,python-beautifulsoup4) -- cgit v1.2.3 From 659204ff2c15b2b8d6c0bb04c0d36bfcb5f18226 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 22 Jan 2020 12:14:02 +0200 Subject: gnu: pass-rotate: Update upstream location. * gnu/packages/password-utils.scm (pass-rotate)[source]: Update to new source uri. [home-page]: Update to new home-page. --- gnu/packages/password-utils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 3e6212f38b..98d7effd3c 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -965,7 +965,7 @@ (define-public pass-rotate (origin (method git-fetch) (uri (git-reference - (url "https://github.com/SirCmpwn/pass-rotate") + (url "https://github.com/ddevault/pass-rotate") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -977,7 +977,7 @@ (define-public pass-rotate ("python-docopt" ,python-docopt) ("python-html5lib" ,python-html5lib) ("python-requests" ,python-requests))) - (home-page "https://github.com/SirCmpwn/pass-rotate") + (home-page "https://github.com/ddevault/pass-rotate") (synopsis "Rotate password on online services") (description "pass-rotate is a command line utility and python library for rotating passwords on various web services. It makes it easier to rotate your -- cgit v1.2.3 From df58cc9c568b4f18af3a4eb8e19f501e2c8ba81c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 22 Jan 2020 12:18:05 +0200 Subject: gnu: pass-git-helper: Don't use unstable tarball. * gnu/packages/password-utils.scm (pass-git-helper)[source]: Download using git-fetch. --- gnu/packages/password-utils.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 98d7effd3c..3931e8a693 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -752,12 +752,14 @@ (define-public pass-git-helper (version "0.3.1") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/languitar/pass-git-helper/archive/release-" - version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/languitar/pass-git-helper") + (commit (string-append "release-" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0lz5ncy44pz7z1j2nnyildx8sq33zi3xvg5nkwg25n11nasqh2xn")))) + "0vyzmfzyr6ghaglr09px2q6k38zyv1hw25j14z7if7nncj1i4i5d")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From b70f9ad1654bb2e363257ff2365d56cce9f6f2e0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 22 Jan 2020 12:28:48 +0200 Subject: gnu: pass-git-helper: Update to 1.1.0. * gnu/packages/password-utils.scm (pass-git-helper): Update to 1.1.0. [arguments]: Update 'patch-pass-path phase. Add 'pre-check phase. [native-inputs]: Add python-pytest, python-pytest-mock. --- gnu/packages/password-utils.scm | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 3931e8a693..989d27a2e0 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -749,17 +749,17 @@ (define-public argon2 (define-public pass-git-helper (package (name "pass-git-helper") - (version "0.3.1") + (version "1.1.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/languitar/pass-git-helper") - (commit (string-append "release-" version)))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "0vyzmfzyr6ghaglr09px2q6k38zyv1hw25j14z7if7nncj1i4i5d")))) + "18nvwlp0w4aqj268wly60rnjzqw2d8jl0hbs6bkwp3hpzzz5g6yd")))) (build-system python-build-system) (arguments `(#:phases @@ -768,12 +768,19 @@ (define-public pass-git-helper (lambda* (#:key inputs #:allow-other-keys) (let* ((password-store (assoc-ref inputs "password-store")) (pass (string-append password-store "/bin/pass"))) - (substitute* "pass-git-helper" + (substitute* "passgithelper.py" (("'pass'") (string-append "'" pass "'"))) - #t)))))) + #t))) + (add-before 'check 'pre-check + (lambda _ + (setenv "HOME" (getcwd)) + #t))))) (inputs `(("python-pyxdg" ,python-pyxdg) ("password-store" ,password-store))) + (native-inputs + `(("python-pytest" ,python-pytest) + ("python-pytest-mock" ,python-pytest-mock))) (home-page "https://github.com/languitar/pass-git-helper") (synopsis "Git credential helper interfacing with pass") (description "pass-git-helper is a git credential helper which allows to -- cgit v1.2.3 From 54bcc27fb5fb1ecc9dca85380cb16913b3349d55 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 22 Jan 2020 12:39:18 +0200 Subject: gnu: pass-git-helper: Run test suite. * gnu/packages/password-utils.scm (pass-git-helper)[arguments]: Adjust custom 'patch-pass-path phase. Use custom 'check phase. --- gnu/packages/password-utils.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 989d27a2e0..2716997049 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -768,13 +768,14 @@ (define-public pass-git-helper (lambda* (#:key inputs #:allow-other-keys) (let* ((password-store (assoc-ref inputs "password-store")) (pass (string-append password-store "/bin/pass"))) - (substitute* "passgithelper.py" + (substitute* '("passgithelper.py" + "test_passgithelper.py") (("'pass'") (string-append "'" pass "'"))) #t))) - (add-before 'check 'pre-check + (replace 'check (lambda _ (setenv "HOME" (getcwd)) - #t))))) + (invoke "pytest")))))) (inputs `(("python-pyxdg" ,python-pyxdg) ("password-store" ,password-store))) -- cgit v1.2.3 From c600cf2a72fef7994f85a1e5c3f986a79a5024cc Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 22 Jan 2020 12:45:39 +0200 Subject: gnu: argon2: Don't use unstable tarball. * gnu/packages/password-utils.scm (argon2)[source]: Download using git-fetch. --- gnu/packages/password-utils.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 2716997049..af09f7b462 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -706,14 +706,14 @@ (define-public argon2 (version "20171227") (source (origin - (method url-fetch) - (uri - (string-append "https://github.com/P-H-C/phc-winner-argon2/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/P-H-C/phc-winner-argon2") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1n6w5y3va7lrcym7cxr0nikapldqm80wxjdns584bvplq5r03spa")))) + "1rzayv4ydxwb5fqyr1y8nz0wsb9r45mwl1wrq8hmikjrlqhhjn6f")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit v1.2.3 From fe109349d0cfb8d6c2cc8509ed6c4da86da0ca26 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 22 Jan 2020 13:04:47 +0200 Subject: gnu: argon2: Update to 20190702. * gnu/packages/password-utils.scm (argon2): Update to 20190702. [arguments]: Adjust make-flags. Remove 'patch-Makefile phase. --- gnu/packages/password-utils.scm | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index af09f7b462..eed0989452 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -703,7 +703,7 @@ (define-public rofi-pass (define-public argon2 (package (name "argon2") - (version "20171227") + (version "20190702") (source (origin (method git-fetch) @@ -713,31 +713,18 @@ (define-public argon2 (file-name (git-file-name name version)) (sha256 (base32 - "1rzayv4ydxwb5fqyr1y8nz0wsb9r45mwl1wrq8hmikjrlqhhjn6f")))) + "01rwanr4wmr9vm6c712x411wig543q195z2icn388z892a93lc7p")))) (build-system gnu-build-system) (arguments `(#:test-target "test" - #:make-flags '("CC=gcc" - "OPTTEST=1") ;disable CPU optimization + #:make-flags (list "CC=gcc" + (string-append "PREFIX=" (assoc-ref %outputs "out")) + "LIBRARY_REL=lib" + (string-append "ARGON2_VERSION=" ,version) + "OPTTEST=1") ; disable CPU optimization #:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-Makefile - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (substitute* "Makefile" - (("PREFIX = /usr") (string-append "PREFIX = " out))) - (substitute* "libargon2.pc" - (("prefix=/usr") (string-append "prefix=" out)) - (("@HOST_MULTIARCH@") "") - (("@UPSTREAM_VER@") ,version)) - #t))) - (delete 'configure) - (add-after 'install 'install-argon2.pc - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (install-file "libargon2.pc" - (string-append out "/lib/pkgconfig")) - #t)))))) + (delete 'configure)))) ; No configure script. (home-page "https://www.argon2.com/") (synopsis "Password hashing library") (description "Argon2 provides a key derivation function that was declared -- cgit v1.2.3 From 8a5c4384e059b83edb5869748706bad17ae5f8ff Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Wed, 22 Jan 2020 20:06:41 +0800 Subject: gnu: knot-resolver: Install but disable the default managed root TA. * gnu/packages/dns.scm (knot-resolver)[arguments]: Enable 'managed_ta', so 'icann-ca.pem' get installed. Add 'disable-default-ta' phase. --- gnu/packages/dns.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index e5148d5bc9..3091444ed6 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -680,11 +680,16 @@ (define-public knot-resolver "09ffmqx79lv5psr433x4n946njgsn071b9b7161pcb9bmrqz380c")))) (build-system meson-build-system) (arguments - '(#:configure-flags - '("-Dmanaged_ta=disabled" ; we'll manage the DNS root data ourself - "-Ddoc=enabled") + '(#:configure-flags '("-Ddoc=enabled") #:phases (modify-phases %standard-phases + (add-before 'configure 'disable-default-ta + (lambda _ + ;; Disable the default managed root TA, since we don't have + ;; write access to the keyfile and its directory in store. + (substitute* "daemon/lua/sandbox.lua.in" + (("^trust_anchors\\.add_file.*") "")) + #t)) (add-after 'build 'build-doc (lambda _ (invoke "ninja" "doc"))) -- cgit v1.2.3 From 244db6bbc88fae7ba3426c057cfecb8706015939 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Wed, 22 Jan 2020 20:13:13 +0800 Subject: services: knot-resolver: Manage a root TA at /var/cache/knot-resolver. * gnu/services/dns.scm (%kresd.conf): Add /var/cache/knot-resolver/root.keys as the root TA. --- gnu/services/dns.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/services/dns.scm b/gnu/services/dns.scm index 43b6261c07..a07946d085 100644 --- a/gnu/services/dns.scm +++ b/gnu/services/dns.scm @@ -658,6 +658,7 @@ (define-record-type* (define %kresd.conf (plain-file "kresd.conf" "-- -*- mode: lua -*- +trust_anchors.add_file('/var/cache/knot-resolver/root.keys') net = { '127.0.0.1', '::1' } user('knot-resolver', 'knot-resolver') modules = { 'hints > iterate', 'stats', 'predict' } -- cgit v1.2.3 From 115f6b9325c5991ca324094d1ce16be0124b3a4d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 22 Jan 2020 14:01:58 +0100 Subject: gnu: emacs-company: Update to 0.9.11. * gnu/packages/emacs-xyz.scm (emacs-company): Update to 0.9.11. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 583faa6372..f58a76ed1b 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3641,7 +3641,7 @@ (define-public emacs-butler (define-public emacs-company (package (name "emacs-company") - (version "0.9.10") + (version "0.9.11") (source (origin (method git-fetch) @@ -3650,7 +3650,7 @@ (define-public emacs-company (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0shmv48bq9l5xm60dwx9lqyq6b39y3d7qjxdlah7dpipv5vhra42")))) + (base32 "0x7ag716jp4xb7kmcmr8pqlxx1v0f2gkjx5gx34wxxqfrndwyx8i")))) (build-system emacs-build-system) (arguments `(#:phases -- cgit v1.2.3 From ca2045d6f9bd57f20c578074f69ec70c20b9e6ab Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 22 Jan 2020 14:02:38 +0100 Subject: gnu: emacs-company: Tiny fix in description. * gnu/packages/emacs-xyz.scm (emacs-company)[description]: Add a comma after "e.g." so Texinfo does not infer a full stop. --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f58a76ed1b..40839d4869 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3671,7 +3671,7 @@ (define-public emacs-company (description "Company is a modular completion mechanism. Modules for retrieving completion candidates are called back-ends, modules for displaying them are -front-ends. Company comes with many back-ends, e.g. @code{company-elisp}. +front-ends. Company comes with many back-ends, e.g., @code{company-elisp}. These are distributed in separate files and can be used individually.") (license license:gpl3+))) -- cgit v1.2.3 From f975f82d055e655699e64128ca654bcffd5f0d96 Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Wed, 22 Jan 2020 20:24:18 +0300 Subject: gnu: guile-daemon: Update to 0.1.3. * gnu/packages/guile-xyz.scm (guile-daemon): Update to 0.1.3. --- gnu/packages/guile-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 58fab1ac7d..b07599c068 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -418,7 +418,7 @@ (define-public guile-8sync (define-public guile-daemon (package (name "guile-daemon") - (version "0.1.2") + (version "0.1.3") (source (origin (method url-fetch) (uri (string-append "https://github.com/alezost/" name @@ -426,7 +426,7 @@ (define-public guile-daemon "/" name "-" version ".tar.gz")) (sha256 (base32 - "0hh6gq6b6phpxm0b1dkxyzj3f4sxdf7dji63609lzypa5v1ad2gv")))) + "08gaqrgjlly9k5si72vvpbr4xhq5v52l5ma5y6a7spid5dd057cy")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 10b44448c97a6fc0f01504954b9b485d498df914 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 22 Jan 2020 00:30:06 +0100 Subject: gnu: perl-cpanel-json-xs: Update to 4.18. * gnu/packages/perl.scm (perl-cpanel-json-xs): Update to 4.18. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 13f038d466..c6fd183ec1 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -1614,14 +1614,14 @@ (define-public perl-cpan-meta-check (define-public perl-cpanel-json-xs (package (name "perl-cpanel-json-xs") - (version "4.17") + (version "4.18") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/R/RU/RURBAN/" "Cpanel-JSON-XS-" version ".tar.gz")) (sha256 - (base32 "1yq6hwd6hayqrhaa2h90svqqvsc28k0g4bdip5nyxgm9r93sx07s")))) + (base32 "1dnnf6bjz0fi9hk8gzmsklmh5y0z137vk62k3d7s88q30maf3rk3")))) (build-system perl-build-system) (propagated-inputs `(("perl-common-sense" ,perl-common-sense))) -- cgit v1.2.3 From 9b0696d0e9ead077519f46ca2056bc14439ca8e9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 22 Jan 2020 17:25:22 +0100 Subject: gnu: perl-timedate: Update to 2.31. * gnu/packages/perl.scm (perl-timedate): Update to 2.31. [source](uri): Adjust accordingly. --- gnu/packages/perl.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index c6fd183ec1..c9b3b044cb 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -9133,15 +9133,15 @@ (define-public perl-time-piece (define-public perl-timedate (package (name "perl-timedate") - (version "2.30") + (version "2.31") (source (origin (method url-fetch) - (uri (string-append "mirror://cpan/authors/id/G/GB/GBARR/" + (uri (string-append "mirror://cpan/authors/id/A/AT/ATOOMIC/" "TimeDate-" version ".tar.gz")) (sha256 (base32 - "11lf54akr9nbivqkjrhvkmfdgkbhw85sq0q4mak56n6bf542bgbm")))) + "10ad6l4ii2iahdpw8h0xqwasc1jblan31h597q3js4j5nbnhywjw")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/TimeDate") (synopsis "Date parsing/formatting subroutines") -- cgit v1.2.3 From a54dfcc063f29ee51126153d57ea085309863f99 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 22 Jan 2020 17:46:37 +0100 Subject: gnu: perl-time-local: Update to 1.28. * gnu/packages/perl.scm (perl-time-local): Update to 1.28. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index c9b3b044cb..5a94fbe967 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -9090,7 +9090,7 @@ (define-public perl-time-hires (define-public perl-time-local (package (name "perl-time-local") - (version "1.2300") + (version "1.28") (source (origin (method url-fetch) @@ -9098,7 +9098,7 @@ (define-public perl-time-local "Time-Local-" version ".tar.gz")) (sha256 (base32 - "0jgvd6v93hlrcmy56yxbm4yrhzi8yvrq8c3xffpgh28af01wmb5j")))) + "03p1mxk75vmmi4l0ibpd05b6hncbh8afjhvss87vpp4rrkjvjy4j")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/Time-Local") (synopsis "Efficiently compute time from local and GMT time") -- cgit v1.2.3 From c7dd15596ffd09ab40629c89e7014e51a4d7e95e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 22 Jan 2020 17:57:04 +0100 Subject: gnu: perl-type-tiny: Update to 1.008003. * gnu/packages/perl.scm (perl-type-tiny): Update to 1.008003. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 5a94fbe967..98fc302ddd 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -9268,14 +9268,14 @@ (define-public perl-type-tie (define-public perl-type-tiny (package (name "perl-type-tiny") - (version "1.006000") + (version "1.008003") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/T/TO/TOBYINK/" "Type-Tiny-" version ".tar.gz")) (sha256 - (base32 "007xsx78cnjillbny7x9sjn1w6z8m22fmksmay710jhbvw9h19nm")))) + (base32 "1x80rlnh7kl4xgm4qvyfbgahcyla4wbyh3b759nm21czn8x6wkm4")))) (build-system perl-build-system) (native-inputs `(("perl-test-warnings" ,perl-test-warnings))) -- cgit v1.2.3 From 9aee5c45c1c85425559f5a33955cd3ec6ad97aee Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 21 Jan 2020 04:23:09 +0100 Subject: gnu: font-adobe-source-code-pro: Don't use unstable tarball. * gnu/packages/fonts.scm (font-adobe-source-code-pro)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/fonts.scm | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 7d3330e17a..d16b9a16f7 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -862,18 +862,18 @@ (define-public font-adobe-source-code-pro (package (name "font-adobe-source-code-pro") (version "2.030R-ro-1.050R-it") - (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/adobe-fonts/source-code-pro/archive/" - (regexp-substitute/global - ;; The upstream tag uses "/" between the roman and italic - ;; versions, so substitute our "-" separator here. - #f "R-ro-" version 'pre "R-ro/" 'post) ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0arhhsf3i7ss39ykn73d1j8k4n8vx7115xph6jwkd970p1cxvr54")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/adobe-fonts/source-code-pro.git") + (commit (regexp-substitute/global + ;; The upstream tag uses "/" between the roman and italic + ;; versions, so substitute our "-" separator here. + #f "R-ro-" version 'pre "R-ro/" 'post)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0hc5kflr8xzqgdm0c3gbgb1paygznxmnivkylid69ipc7wnicx1n")))) (build-system font-build-system) (home-page "https://github.com/adobe-fonts/source-code-pro") (synopsis -- cgit v1.2.3 From ed08e4ecaee2d14e1883ce8675d69aad53da51bc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 21 Jan 2020 04:27:51 +0100 Subject: gnu: font-adobe-source-sans-pro: Don't use unstable tarball. * gnu/packages/fonts.scm (font-adobe-source-sans-pro)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/fonts.scm | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index d16b9a16f7..dd635bab82 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -887,18 +887,18 @@ (define-public font-adobe-source-sans-pro (package (name "font-adobe-source-sans-pro") (version "2.040R-ro-1.090R-it") - (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/adobe-fonts/source-sans-pro/archive/" - (regexp-substitute/global - ;; The upstream tag uses "/" between the roman and italic - ;; versions, so substitute our "-" separator here. - #f "R-ro-" version 'pre "R-ro/" 'post) ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1wpbhd2idps53ph8rg1mhr3vz4lsgbpjprcq10nliwcxdz9d8lv0")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/adobe-fonts/source-sans-pro.git") + (commit (regexp-substitute/global + ;; The upstream tag uses "/" between the roman and italic + ;; versions, so substitute our "-" separator here. + #f "R-ro-" version 'pre "R-ro/" 'post)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1lzin2hfwidbvhps7shs201p1bpxy6220xmhhprv9fc8bknd4c45")))) (build-system font-build-system) (home-page "https://github.com/adobe-fonts/source-sans-pro") (synopsis -- cgit v1.2.3 From 31f41dbc1c162728901b9e940e42c0fd7b421d48 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 21 Jan 2020 04:29:29 +0100 Subject: gnu: font-adobe-source-serif-pro: Don't use unstable tarball. * gnu/packages/fonts.scm (font-adobe-source-serif-pro)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/fonts.scm | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index dd635bab82..358c72f07a 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -912,18 +912,18 @@ (define-public font-adobe-source-serif-pro (package (name "font-adobe-source-serif-pro") (version "2.007R-ro-1.007R-it") - (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/adobe-fonts/source-serif-pro/archive/" - (regexp-substitute/global - ;; The upstream tag uses "/" between the roman and italic - ;; versions, so substitute our "-" separator here. - #f "R-ro-" version 'pre "R-ro/" 'post) ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1sws9k26ldqk375qsigk1zv8cq1xlvadjwvv3dqrcc3qzm1c7hwc")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/adobe-fonts/source-serif-pro.git") + (commit (regexp-substitute/global + ;; The upstream tag uses "/" between the roman and italic + ;; versions, so substitute our "-" separator here. + #f "R-ro-" version 'pre "R-ro/" 'post)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1vvzfhjpi47m84bzkapylkd5fri8bdm8qng2hiylmmlw0wk4gpas")))) (build-system font-build-system) (home-page "https://github.com/adobe-fonts/source-serif-pro") (synopsis -- cgit v1.2.3 From f17bd3c6465b941ef62091a8701de8c0cf822f4d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 21 Jan 2020 18:36:39 +0100 Subject: gnu: bochs: Update to 2.6.11. * gnu/packages/virtualization.scm (bochs): Update to 2.6.11. --- gnu/packages/virtualization.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 51ba3c602a..fb3849e29f 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2017 Alex Vong ;;; Copyright © 2017 Andy Patterson ;;; Copyright © 2017, 2018, 2019 Rutger Helling -;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Danny Milosavljevic ;;; Copyright © 2018 Sou Bunnbu ;;; Copyright © 2018 Julien Lepiller @@ -1150,17 +1150,17 @@ (define-public bubblewrap (define-public bochs (package (name "bochs") - (version "2.6.10") + (version "2.6.11") (source (origin (method url-fetch) (uri (string-append "https://sourceforge.net/projects/bochs/files/bochs/" version "/bochs-" version ".tar.gz")) (sha256 - (base32 "1c3mw4b8wrjf8z44fvhycs95j1wd1c0b4khcv63giiia5j5q0gvj")))) + (base32 "0ql8q6y1k356li1g9gbvl21448mlxphxxi6kjb2b3pxvzd0pp2b3")))) (build-system gnu-build-system) (arguments - `(#:tests? #f)) ; No tests exist + `(#:tests? #f)) ; no tests exist (inputs `(("libxrandr" ,libxrandr))) (home-page "http://bochs.sourceforge.net/") -- cgit v1.2.3 From bc0eb34759113f1d9b99ff83416c64eb1b35e0ae Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 22 Jan 2020 19:08:21 +0100 Subject: gnu: alpine: Remove pre-built binaries from source. * gnu/packages/mail.scm (alpine)[source]: Add a snippet to hunt down and destroy pre-compiled objects. --- gnu/packages/mail.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 67afea68fb..64f679e662 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2748,7 +2748,13 @@ (define-public alpine (commit "abeb2c25935ef8c75f1e5deef0f81276754dc975"))) (file-name (git-file-name name version)) (sha256 - (base32 "0rqgbw08a5lj41dkp82aq480lqkc4bnxagna7wpqffi821n8gkwz")))) + (base32 "0rqgbw08a5lj41dkp82aq480lqkc4bnxagna7wpqffi821n8gkwz")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Remove pre-built binaries scattered across the source repository. + (for-each delete-file (find-files "." "\\.(dll|exe)")) + #t)))) (build-system gnu-build-system) (arguments `(#:make-flags (list "CC=gcc") -- cgit v1.2.3 From 9d3331fcc133e20ce74143d7f291dbcb5794505e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 22 Jan 2020 22:30:50 +0100 Subject: gnu: burp: Update to 2.3.20. * gnu/packages/backup.scm (burp): Update to 2.3.20. --- gnu/packages/backup.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 7a95ae77e0..0549e94d70 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -947,14 +947,14 @@ (define-public restic (define-public burp (package (name "burp") - (version "2.3.6") + (version "2.3.20") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/burp/burp-" version "/burp-" version ".tar.bz2")) (sha256 (base32 - "101nn30apcbmy9k0wksdf8d4ccw7sfcqzkasgg17a5y332x2imr9")))) + "0dm2y76z7pg17kfv6ahmh4mf2r3pg7mlwd69lvmjwssnd9vs1nn5")))) (build-system gnu-build-system) (inputs `(("librsync" ,librsync) -- cgit v1.2.3 From 95f2071a322e8d0ee1434f68e4298c88b2455401 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 22 Jan 2020 22:43:34 +0100 Subject: gnu: keyutils: Update to 1.6.1. * gnu/packages/crypto.scm (keyutils): Update to 1.6.1. --- gnu/packages/crypto.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 3eb2466e3c..f09ec710b2 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2015, 2017, 2018, 2019 Ricardo Wurmus ;;; Copyright © 2016, 2017, 2018, 2019 Leo Famulari ;;; Copyright © 2016 Lukas Gradl -;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2016, 2017, 2019 Eric Bavier ;;; Copyright © 2017 Pierre Langlois @@ -238,7 +238,7 @@ (define-public encfs (define-public keyutils (package (name "keyutils") - (version "1.6") + (version "1.6.1") (source (origin (method url-fetch) @@ -246,8 +246,7 @@ (define-public keyutils (string-append "https://people.redhat.com/dhowells/keyutils/keyutils-" version ".tar.bz2")) (sha256 - (base32 - "05bi5ja6f3h3kdi7p9dihlqlfrsmi1wh1r2bdgxc0180xh6g5bnk")) + (base32 "1kk4pmyflgplkgxn2bzpc069ph9c9jdd9ikcsyd5pnaimqi5gcf8")) (modules '((guix build utils))) ;; Create relative symbolic links instead of absolute ones to /lib/*. (snippet '(begin -- cgit v1.2.3 From 973218a3747ad564493a976da588d286fe7d4301 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 22 Jan 2020 23:16:29 +0100 Subject: gnu: memcached: Update to 1.5.20. * gnu/packages/databases.scm (memcached): Update to 1.5.20. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index e90fdfef7c..ea74852ffe 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -337,14 +337,14 @@ (define-public leveldb (define-public memcached (package (name "memcached") - (version "1.5.16") + (version "1.5.20") (source (origin (method url-fetch) (uri (string-append "https://memcached.org/files/memcached-" version ".tar.gz")) (sha256 - (base32 "0nnccb697jhdn5gqrh3phibzs6xr4nf4ryv7nmyv5vf11n4jr8j5")))) + (base32 "1r511qr95q0ywdaql3pdjiwzkfqxhhfzb13ilvl7mznfm4iv1myg")))) (build-system gnu-build-system) (inputs `(("libevent" ,libevent) -- cgit v1.2.3 From 737a3c12cd25f76e9fb4872e0a7a1ecb61aff131 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 22 Jan 2020 23:17:48 +0100 Subject: gnu: libmemcached: Fix build. * gnu/packages/databases.scm (libmemcached)[source]: Add patch. * gnu/packages/patches/libmemcached-build-with-gcc7.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/databases.scm | 4 +++- .../patches/libmemcached-build-with-gcc7.patch | 28 ++++++++++++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/libmemcached-build-with-gcc7.patch diff --git a/gnu/local.mk b/gnu/local.mk index 51272b2dc8..46d040c507 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1165,6 +1165,7 @@ dist_patch_DATA = \ %D%/packages/patches/mcrypt-CVE-2012-4409.patch \ %D%/packages/patches/mcrypt-CVE-2012-4426.patch \ %D%/packages/patches/mcrypt-CVE-2012-4527.patch \ + %D%/packages/patches/libmemcached-build-with-gcc7.patch \ %D%/packages/patches/mes-remove-store-name.patch \ %D%/packages/patches/mesa-skip-disk-cache-test.patch \ %D%/packages/patches/mescc-tools-boot.patch \ diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index ea74852ffe..ed1d1fe95b 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -370,7 +370,9 @@ (define-public libmemcached (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1842s4dxdh21gdr46q4dgxigidcs6dkqnbnqjwb9l8r0bqx5nb10")))) + "1842s4dxdh21gdr46q4dgxigidcs6dkqnbnqjwb9l8r0bqx5nb10")) + (patches + (search-patches "libmemcached-build-with-gcc7.patch")))) (build-system gnu-build-system) (native-inputs `(("memcached" ,memcached) diff --git a/gnu/packages/patches/libmemcached-build-with-gcc7.patch b/gnu/packages/patches/libmemcached-build-with-gcc7.patch new file mode 100644 index 0000000000..51e319d2c0 --- /dev/null +++ b/gnu/packages/patches/libmemcached-build-with-gcc7.patch @@ -0,0 +1,28 @@ +Author: Tobias Geerinckx-Rice +Date: Wed 22 Jan 22:58:13 CET 2020 +Subject: gnu: memcached: Fix build with GCC 7. + +Taken verbating from this bug report: +. + +diff -up ./clients/memflush.cc.old ./clients/memflush.cc +--- ./clients/memflush.cc.old 2017-02-12 10:12:59.615209225 +0100 ++++ ./clients/memflush.cc 2017-02-12 10:13:39.998382783 +0100 +@@ -39,7 +39,7 @@ int main(int argc, char *argv[]) + { + options_parse(argc, argv); + +- if (opt_servers == false) ++ if (!opt_servers) + { + char *temp; + +@@ -48,7 +48,7 @@ int main(int argc, char *argv[]) + opt_servers= strdup(temp); + } + +- if (opt_servers == false) ++ if (!opt_servers) + { + std::cerr << "No Servers provided" << std::endl; + exit(EXIT_FAILURE); -- cgit v1.2.3 From ee711c7c2136dadcae1315bc7e93b3f28bc507f4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 23 Jan 2020 00:10:05 +0100 Subject: gnu: gparted: Update to 1.1.0. * gnu/packages/disk.scm (gparted): Update to 1.1.0. --- gnu/packages/disk.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 8a17e8ddbb..a28033c0af 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -344,15 +344,14 @@ (define-public idle3-tools (define-public gparted (package (name "gparted") - (version "1.0.0") + (version "1.1.0") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/gparted/gparted/gparted-" version "/gparted-" version ".tar.gz")) (sha256 - (base32 - "0mdvn85jvy72ff7nds3dakx9kzknh8gx1z8i0w2sf970q03qp2z4")))) + (base32 "092rgwjh1825fal6v3yafq2wr0i61hh0a2n0j4296zn0zdx7pzp2")))) (build-system gnu-build-system) (arguments ;; Tests require access to paths outside the build container, such -- cgit v1.2.3 From 59fcf386f804ab76089682da746b606218fbc5af Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Thu, 23 Jan 2020 01:48:10 +0100 Subject: gnu: ocaml4.07-findlib: Fix building with ocaml 4.07. * gnu/packages/ocaml.scm (ocaml4.07-findlib): rename inputs to native-inputs. --- gnu/packages/ocaml.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 7c5a2f939b..098c116cf3 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -972,7 +972,7 @@ (define-public ocaml4.07-findlib (package (inherit ocaml-findlib) (name "ocaml4.07-findlib") - (inputs + (native-inputs `(("m4" ,m4) ("ocaml" ,ocaml-4.07))))) -- cgit v1.2.3 From d36fa50fbf8169018193774782fd21f1b13b9c0e Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 23 Jan 2020 02:23:32 +0100 Subject: gnu: gnome: Add missing inputs. * gnu/packages/gnome.scm (gnome)[propagated-inputs]: Add gnome-color-manager, gnome-initial-setup, gnome-user-share, rygel, sushi, gnome-weather. Signed-off-by: Danny Milosavljevic --- gnu/packages/gnome.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index cadd4d0655..e843bdfe08 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -42,7 +42,7 @@ ;;; Copyright © 2019 Maxim Cournoyer ;;; Copyright © 2019 Martin Becze ;;; Copyright © 2019 David Wilson -;;; Copyright © 2019 Raghav Gururajan +;;; Copyright © 2019, 2020 Raghav Gururajan ;;; Copyright © 2019 Jonathan Brielmaier ;;; Copyright © 2019 Leo Prikler ;;; Copyright © 2020 Oleg Pykhalov @@ -7861,9 +7861,11 @@ (define-public gnome ("glib-networking" ,glib-networking) ("gnome-backgrounds" ,gnome-backgrounds) ("gnome-bluetooth" ,gnome-bluetooth) + ("gnome-color-manager" ,gnome-color-manager) ("gnome-control-center" ,gnome-control-center) ("gnome-desktop" ,gnome-desktop) ("gnome-getting-started-docs" ,gnome-getting-started-docs) + ("gnome-initial-setup" ,gnome-initial-setup) ("gnome-keyring" ,gnome-keyring) ("gnome-menus" ,gnome-menus) ("gnome-session" ,gnome-session) @@ -7872,10 +7874,13 @@ (define-public gnome ("gnome-shell" ,gnome-shell) ("gnome-themes-extra" ,gnome-themes-extra) ("gnome-user-docs" ,gnome-user-docs) + ("gnome-user-share" ,gnome-user-share) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("gvfs" ,gvfs) ("mutter" ,mutter) ("orca" ,orca) + ("rygel" ,rygel) + ("sushi" ,sushi) ;; GNOME-Core-Utilities ("baobab" ,baobab) ("cheese" ,cheese) @@ -7884,6 +7889,7 @@ (define-public gnome ("evince" ,evince) ("file-roller" ,file-roller) ("gedit" ,gedit) + ; TODO: ("gnome-boxes" ,gnome-boxes) ("gnome-calculator" ,gnome-calculator) ("gnome-calendar" ,gnome-calendar) ("gnome-characters" ,gnome-characters) @@ -7892,9 +7898,12 @@ (define-public gnome ("gnome-disk-utility" ,gnome-disk-utility) ("gnome-font-viewer" ,gnome-font-viewer) ("gnome-maps" ,gnome-maps) + ; TODO: ("gnome-music" ,gnome-music) + ; TODO: ("gnome-photos" ,gnome-photos) ("gnome-screenshot" ,gnome-screenshot) ("gnome-system-monitor" ,gnome-system-monitor) ("gnome-terminal" ,gnome-terminal) + ("gnome-weather" ,gnome-weather) ("nautilus" ,nautilus) ("simple-scan" ,simple-scan) ("totem" ,totem) -- cgit v1.2.3 From c356e65610f287e740d3ec25cf5301f8e928a654 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 23 Jan 2020 04:57:11 +0100 Subject: gnu: bind: Update to 9.14.10. * gnu/packages/dns.scm (bind): Update to 9.14.10. --- gnu/packages/dns.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 3091444ed6..7c52722cb6 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -114,7 +114,7 @@ (define-public dnsmasq (define-public isc-bind (package (name "bind") - (version "9.14.9") + (version "9.14.10") (source (origin (method url-fetch) (uri (string-append @@ -122,7 +122,7 @@ (define-public isc-bind "/bind-" version ".tar.gz")) (sha256 (base32 - "0g2ph3hlw86yib8hv13qgkb4i84s9zv22r4k6yqlycm2izamwmr9")))) + "0nkkc2phkkzwgl922xg41gx5pc5f4safabqslaw3880hwdf8vfaa")))) (build-system gnu-build-system) (outputs `("out" "utils")) (inputs -- cgit v1.2.3 From 30adc9e0e14f56e45f5d4909c3105dce6d016778 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 22 Jan 2020 22:50:55 -0600 Subject: gnu: perl-term-readline-gnu: Fix library initialization. * gnu/packages/perl.scm (perl-term-readline-gnu)[arguments]: Patch library search directories into Makefile.PL so that the resulting Gnu.so library contains expected DT_NEEDED entries for libreadline and libncurses. --- gnu/packages/perl.scm | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 98fc302ddd..9fc3493a5d 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès ;;; Copyright © 2013, 2019 Andreas Enge ;;; Copyright © 2015, 2016, 2017, 2019 Ricardo Wurmus -;;; Copyright © 2015, 2016, 2017, 2019 Eric Bavier +;;; Copyright © 2015, 2016, 2017, 2019, 2020 Eric Bavier ;;; Copyright © 2015 Eric Dvorsak ;;; Copyright © 2016, 2018 Mark H Weaver ;;; Copyright © 2016 Jochem Raat @@ -8513,12 +8513,16 @@ (define-public perl-term-readline-gnu `(#:tests? #f ; Tests fail without other Term::ReadLine interfaces present #:phases (modify-phases %standard-phases (add-before 'configure 'patch-search-lib - (lambda _ + (lambda* (#:key inputs #:allow-other-keys) (substitute* "Makefile.PL" - ;; The configuration provides no way to pass - ;; additional directories to search for the ncurses - ;; library, so just skip the search. - (("&search_lib\\('-lncurses'\\)") "'-lncurses'"))))))) + ;; The configuration provides no way easy was to pass + ;; additional directories to search for libraries, so + ;; just patch in the flags. + (("-lreadline" &) + (format #f "-L~a/lib ~a" (assoc-ref inputs "readline") &)) + (("&search_lib\\('-lncurses'\\)") + (string-append "'-L" (assoc-ref inputs "ncurses") "/lib" + " -lncurses'")))))))) (home-page "https://metacpan.org/release/Term-ReadLine-Gnu") (synopsis "GNU Readline/History Library interface for Perl") (description "This module implements an interface to the GNU Readline -- cgit v1.2.3 From 7357b3d7a52eb5db1674012c50d308d792741c48 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Thu, 23 Jan 2020 00:36:59 -0600 Subject: gnu: libnslog: Use check@0.12. Tests fail with check@0.13 due to implementation changes. * gnu/packages/web.scm (libnslog)[native-inputs]: 'check' -> 'check-0.12'. --- gnu/packages/web.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index feeb3dac01..4bd71438c3 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4881,7 +4881,7 @@ (define-public libnslog (native-inputs `(("netsurf-buildsystem" ,netsurf-buildsystem) ("pkg-config" ,pkg-config) - ("check" ,check) ;for tests + ("check" ,check-0.12) ; For tests ("bison" ,bison) ("flex" ,flex))) (arguments netsurf-buildsystem-arguments) -- cgit v1.2.3 From 6e5fc6c7efe0d3a8465e419bfd2883c64ec0e509 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 20 Jan 2020 20:18:55 +0100 Subject: gnu: mes: Update to 0.22. * gnu/packages/mes.scm (mes): Update to 0.22. Remove store name patch. Add MES_PREFIX to native-search-paths. * gnu/packages/patches/mes-remove-store-name.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/mes.scm (mes-rb5): Depend on gzip instead of xz; this enables unpacking the now unpatched mes source. Update to check bin/mes-mescc-0.21. --- gnu/local.mk | 1 - gnu/packages/mes.scm | 21 ++-- gnu/packages/patches/mes-remove-store-name.patch | 121 ----------------------- 3 files changed, 13 insertions(+), 130 deletions(-) delete mode 100644 gnu/packages/patches/mes-remove-store-name.patch diff --git a/gnu/local.mk b/gnu/local.mk index 46d040c507..563c98b122 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1166,7 +1166,6 @@ dist_patch_DATA = \ %D%/packages/patches/mcrypt-CVE-2012-4426.patch \ %D%/packages/patches/mcrypt-CVE-2012-4527.patch \ %D%/packages/patches/libmemcached-build-with-gcc7.patch \ - %D%/packages/patches/mes-remove-store-name.patch \ %D%/packages/patches/mesa-skip-disk-cache-test.patch \ %D%/packages/patches/mescc-tools-boot.patch \ %D%/packages/patches/meson-for-build-rpath.patch \ diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 5d85c5ff51..347aef0a8c 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017, 2018, 2019 Jan Nieuwenhuizen +;;; Copyright © 2017, 2018, 2019, 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2017, 2018 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; @@ -143,15 +143,14 @@ (define-public mes-0.19 (define-public mes (package (inherit mes-0.19) - (version "0.21") + (version "0.22") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/mes/" "mes-" version ".tar.gz")) - (patches (search-patches "mes-remove-store-name.patch")) (sha256 (base32 - "104qxngxyl7pql8vqrnli3wfyx0ayfaqg8gjfhmk4qzrafs46slm")))) + "0p1jsrrmcbc0zrvbvnjbb6iyxr0in71km293q8qj6gnar6bw09av")))) (propagated-inputs `(("mescc-tools" ,mescc-tools) ("nyacc" ,nyacc))) @@ -161,7 +160,11 @@ (define-public mes (files '("include"))) (search-path-specification (variable "LIBRARY_PATH") - (files '("lib"))))))) + (files '("lib"))) + (search-path-specification + (variable "MES_PREFIX") + (separator #f) + (files '(""))))))) (define-public mes-rb5 ;; This is the Reproducible-Builds summit 5's Mes, also built on Debian @@ -176,6 +179,7 @@ (define-public mes-rb5 ("coreutils" ,coreutils) ("grep" ,grep) ("guile" ,guile-2.2) + ("gzip" ,gzip) ("libc" ,glibc) ("locales" ,glibc-utf8-locales) ("make" ,gnu-make) @@ -183,8 +187,7 @@ (define-public mes-rb5 ("mescc-tools" ,mescc-tools) ("nyacc" ,nyacc) ("sed" ,sed) - ("tar" ,tar) - ("xz" ,xz))) + ("tar" ,tar))) (supported-systems '("i686-linux")) (arguments `(#:implicit-inputs? #f @@ -215,10 +218,12 @@ (define-public mes-rb5 (invoke "sh" "bootstrap.sh"))) (replace 'check (lambda _ + (copy-file "bin/mes-mescc" "bin/mes-mescc-0.21") + (system* "sed" "-i" "s/0\\.22/0\\.21/" "bin/mes-mescc-0.21") (let ((sha256sum (read-delimited " " - (open-pipe* OPEN_READ "sha256sum" "src/mes")))) + (open-pipe* OPEN_READ "sha256sum" "bin/mes-mescc-0.21")))) (unless (equal? sha256sum diff --git a/gnu/packages/patches/mes-remove-store-name.patch b/gnu/packages/patches/mes-remove-store-name.patch deleted file mode 100644 index ad055c51f2..0000000000 --- a/gnu/packages/patches/mes-remove-store-name.patch +++ /dev/null @@ -1,121 +0,0 @@ -From d8f361705325cf91fc6c2ec84f281cdcd6bfa8b1 Mon Sep 17 00:00:00 2001 -From: Jan Nieuwenhuizen -Date: Tue, 3 Dec 2019 21:23:24 +0100 -Subject: [PATCH] core: Remove MES_PKGDATADIR. - -* configure: Do not add MES_PKGDATADIR to config.h. -* configure.sh: Likewise. -* simple.sh: Likewise. -* src/mes.c (open_boot): Do not use MES_PKGDATADIR; rely on -MES_PREFIX or cwd. ---- - configure | 1 - - configure.sh | 1 - - simple.sh | 2 -- - src/mes.c | 13 ------------- - 4 files changed, 17 deletions(-) - -diff --git a/configure b/configure -index 8edb2ce7b..12d8323f2 100755 ---- a/configure -+++ b/configure -@@ -666,7 +666,6 @@ See \"Porting GNU Mes\" in the manual, or try --with-courage\n" mes-system) - ")) - (display (string-append " - #define MES_VERSION \"" VERSION "\" --#define MES_PKGDATADIR \"" pkgdatadir "\" - "))))) - (substitute (string-append srcdest "build-aux/config.make.in") pairs #:target ".config.make")) - -diff --git a/configure.sh b/configure.sh -index 947ddd851..0139cbc36 100755 ---- a/configure.sh -+++ b/configure.sh -@@ -244,7 +244,6 @@ EOF - fi - cat >> include/mes/config.h < include/mes/config.h < include/mes/config.h < 1) -- { -- eputs (";;; pkgdatadir="); -- eputs (MES_PKGDATADIR); -- eputs ("\n"); -- } - if (getenv ("MES_BOOT")) - strcpy (boot, getenv ("MES_BOOT")); - else -@@ -1801,13 +1795,6 @@ open_boot () - __stdin = try_open_boot (file_name, boot, "MES_PREFIX/share/mes"); - } - } -- if (__stdin < 0) -- { -- strcpy (g_datadir, MES_PKGDATADIR); -- strcpy (file_name, g_datadir); -- strcpy (file_name + strlen (file_name), "/module/mes/"); -- __stdin = try_open_boot (file_name, boot, "pkgdatadir"); -- } - if (__stdin < 0) - { - g_datadir[0] = 0; --- -2.24.0 - -commit 2f6fab05b3f09df02aba70c3e21d5fedb45dc567 -Author: Jan Nieuwenhuizen -Date: Sun Nov 24 23:12:29 2019 +0100 - - core: Throw instead of segfault on non-existing input file. WIP. - - Reported by theruran. - - * src/posix.c (open_input_file): Call error instead of failing silently. - -diff --git a/src/posix.c b/src/posix.c -index 7ba2e9915..fd753232d 100644 ---- a/src/posix.c -+++ b/src/posix.c -@@ -188,7 +188,10 @@ current_input_port () - SCM - open_input_file (SCM file_name) - { -- return MAKE_NUMBER (mes_open (CSTRING (file_name), O_RDONLY, 0)); -+ int filedes = mes_open (CSTRING (file_name), O_RDONLY, 0); -+ if (filedes == -1) -+ error (cell_symbol_system_error, cons (MAKE_STRING0 ("No such file or directory"), file_name)); -+ return MAKE_NUMBER (filedes); - } - - SCM -- cgit v1.2.3 From 52d9cad485467a231664520fd7dc69b906dbc7c6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 23 Jan 2020 10:44:56 +0100 Subject: gnu: sassc/libsass-3.5: Hide. This follows up on commit bed24ecfcd68ca6fbc21f02b477cffff3b4c0450. Reported-by: Christopher Baines * gnu/packages/web.scm (sassc/libsass-3.5)[properties]: Hide package. --- gnu/packages/web.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 4bd71438c3..a0f46e3ee6 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1617,7 +1617,8 @@ (define-public sassc/libsass-3.5 (file-name (git-file-name name version)) (sha256 (base32 - "0830pjcvhzxh6yixj82x5k5r1xnadjqzi16kp53213icbly0r9ma")))))))))) + "0830pjcvhzxh6yixj82x5k5r1xnadjqzi16kp53213icbly0r9ma")))))))) + (properties '((hidden? . #t))))) (define-public perl-apache-logformat-compiler -- cgit v1.2.3 From 6bd072ff661031aa0bbace83fc34edea2d7268df Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 22 Jan 2020 11:56:19 +0100 Subject: installer: Make "TRANSLATORS" comment visible. * gnu/installer/newt/user.scm (run-root-password-page): Move "TRANSLATORS" comment right above 'G_' call. --- gnu/installer/newt/user.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/installer/newt/user.scm b/gnu/installer/newt/user.scm index b747886c55..b01d52172b 100644 --- a/gnu/installer/newt/user.scm +++ b/gnu/installer/newt/user.scm @@ -168,9 +168,9 @@ (define confirmation (try-again)))) (define (run-root-password-page) - ;; TRANSLATORS: Leave "root" untranslated: it refers to the name of the - ;; system administrator account. (define password + ;; TRANSLATORS: Leave "root" untranslated: it refers to the name of the + ;; system administrator account. (run-input-page (G_ "Please choose a password for the system \ administrator (\"root\").") (G_ "System administrator password") -- cgit v1.2.3 From f79313b3871ebe204c7b29fdb823666af06f48ff Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 22 Jan 2020 22:17:49 +0100 Subject: tests: Fix typo in comment. * gnu/tests.scm: Add missing word in commentary. --- gnu/tests.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/tests.scm b/gnu/tests.scm index cc72e56858..60e7ef30c0 100644 --- a/gnu/tests.scm +++ b/gnu/tests.scm @@ -61,7 +61,7 @@ (define-module (gnu tests) ;;; ;;; This module provides the infrastructure to run operating system tests. ;;; The most important part of that is tools to instrument the OS under test, -;;; essentially allowing to run in a virtual machine controlled by the host +;;; essentially allowing it to run in a virtual machine controlled by the host ;;; system--hence the name "marionette". ;;; ;;; Code: -- cgit v1.2.3 From 6e6aab0b6af0bf60b2c7276fa9ee6ca6da9aef88 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 23 Jan 2020 09:17:17 +0100 Subject: gnu: guile-next: Disable JIT on armhf-linux. * gnu/packages/guile.scm (guile-3.0)[arguments]: New field. --- gnu/packages/guile.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index c8c44b7fcb..289158ea1b 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -296,6 +296,14 @@ (define-public guile-3.0 (sha256 (base32 "0x8ca6q1qdmk29lh12gj6ngvgn7kp79w42rxfgwrpxm9jmjqs4y9")))) + (arguments + (substitute-keyword-arguments (package-arguments guile-2.2) + ;; XXX: On ARMv7, work around by disabling + ;; JIT. + ((#:configure-flags flags '()) + (if (target-arm32?) + `(cons "--disable-jit" ,flags) + flags)))) (native-search-paths (list (search-path-specification (variable "GUILE_LOAD_PATH") -- cgit v1.2.3 From 93d94134cc7268c6ad87581b8c3e2737e50d9a7d Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 23 Jan 2020 09:33:57 +0100 Subject: gnu: haunt: Add "guile3.0-haunt" variant. * gnu/packages/guile-xyz.scm (haunt)[source]: Add 'modules' and 'snippet'. [arguments]: In 'wrap-haunt' phase, assume that INPUTS might lack "guile-reader". (guile3.0-haunt): New variable. --- gnu/packages/guile-xyz.scm | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index b07599c068..09c12b97fd 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1955,7 +1955,15 @@ (define-public haunt version ".tar.gz")) (sha256 (base32 - "056z4znikk83nr5mr0x2ac3iinqbywa2bvb37mhr566a1q50isfc")))) + "056z4znikk83nr5mr0x2ac3iinqbywa2bvb37mhr566a1q50isfc")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Allow builds with Guile 3.0. + (substitute* "configure" + (("2\\.2 2\\.0") + "3.0 2.2 2.0")) + #t)))) (build-system gnu-build-system) (arguments `(#:modules ((ice-9 match) (ice-9 ftw) @@ -1970,8 +1978,11 @@ (define-public haunt (bin (string-append out "/bin")) (site (string-append out "/share/guile/site")) - (deps (list (assoc-ref inputs "guile-reader") - (assoc-ref inputs "guile-commonmark")))) + (guile-reader (assoc-ref inputs "guile-reader")) + (deps `(,@(if guile-reader + (list guile-reader) + '()) + ,(assoc-ref inputs "guile-commonmark")))) (match (scandir site) (("." ".." version) (let ((modules (string-append site "/" version)) @@ -2009,6 +2020,15 @@ (define-public haunt (home-page "http://haunt.dthompson.us") (license license:gpl3+))) +(define-public guile3.0-haunt + (package + (inherit haunt) + (name "guile3.0-haunt") + (inputs `(("guile" ,guile-3.0))) + (propagated-inputs + ;; XXX: Guile-Reader is currently unavailable for Guile 3.0 so strip it. + `(("guile-commonmark" ,guile3.0-commonmark))))) + (define-public guile2.0-haunt (package (inherit haunt) -- cgit v1.2.3 From 3de0d20b80248179f03ee54091c05c8896df1763 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 23 Jan 2020 09:34:56 +0100 Subject: gnu: mcron: Add "guile3.0-mcron" variant. * gnu/packages/guile-xyz.scm (mcron)[arguments]: In 'fix-finding-guile' phase, add "3.0". (guile3.0-mcron): New variable. --- gnu/packages/guile-xyz.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 09c12b97fd..c3c48456fb 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2132,7 +2132,7 @@ (define-public mcron (add-after 'unpack 'fix-finding-guile (lambda _ (substitute* "configure" - (("2\\.0") "2.2 2.0")) + (("2\\.0") "3.0 2.2 2.0")) #t)) (add-before 'check 'adjust-tests (lambda _ @@ -2162,6 +2162,12 @@ (define-public mcron format is also supported.") (license license:gpl3+))) +(define-public guile3.0-mcron + (package + (inherit mcron) + (name "guile3.0-mcron") + (inputs `(("guile" ,guile-3.0))))) + (define-public mcron2 ;; This was mthl's mcron development branch, and it became mcron 1.1. (deprecated-package "mcron2" mcron)) -- cgit v1.2.3 From 675f1940e92eeccf45cc222845077b72bab7593b Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 23 Jan 2020 11:07:46 +0100 Subject: gnu: guile-lib: Add "guile3.0-lib" variant. * gnu/packages/guile-xyz.scm (guile-lib)[source]: Add 'modules' and 'snippet'. (guile3.0-lib): New variable. --- gnu/packages/guile-xyz.scm | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index c3c48456fb..029054b90e 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1814,7 +1814,18 @@ (define-public guile-lib version ".tar.gz")) (sha256 (base32 - "0aizxdif5dpch9cvs8zz5g8ds5s4xhfnwza2il5ji7fv2h7ks7bd")))) + "0aizxdif5dpch9cvs8zz5g8ds5s4xhfnwza2il5ji7fv2h7ks7bd")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Work around miscompilation on Guile 3.0.0 at -O2: + ;; . + (substitute* "src/md5.scm" + (("\\(define f-ash ash\\)") + "(define f-ash (@ (guile) ash))\n") + (("\\(define f-add \\+\\)") + "(define f-add (@ (guile) +))\n")) + #t)))) (build-system gnu-build-system) (arguments '(#:make-flags @@ -1851,6 +1862,12 @@ (define-public guile2.0-lib (name "guile2.0-lib") (inputs `(("guile" ,guile-2.0))))) +(define-public guile3.0-lib + (package + (inherit guile-lib) + (name "guile3.0-lib") + (inputs `(("guile" ,guile-3.0))))) + (define-public guile-minikanren (package (name "guile-minikanren") -- cgit v1.2.3 From e4dbe0cd2e5645f3ae86b004c05fe20b06cb47fe Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 23 Jan 2020 11:10:14 +0100 Subject: gnu: guile-cairo: Add "guile3.0-cairo" variant. * gnu/packages/gtk.scm (guile-cairo)[source](snippet): Add #include everywhere #include appears. (guile3.0-cairo): New variable. --- gnu/packages/gtk.scm | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index a3e19827f5..6f7344c6e3 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 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, 2017, 2018, 2019 Mark H Weaver ;;; Copyright © 2014 Eric Bavier ;;; Copyright © 2015 Federico Beffa @@ -833,6 +833,12 @@ (define-public guile-cairo (string-append name "dir = " prefix "/guile/site/@GUILE_EFFECTIVE_VERSION@" suffix))) + + ;; Guile 2.x used to pull in and + ;; other headers but this is no longer the case in 3.0. + (substitute* (find-files "." "\\.[ch]$") + (("^ *# *include.*libguile\\.h.*$") + "#include \n#include \n")) #t))))) (build-system gnu-build-system) (inputs @@ -855,6 +861,22 @@ (define-public guile-cairo exceptions, macros, and a dynamic programming environment.") (license license:lgpl3+))) +(define-public guile3.0-cairo + (package + (inherit guile-cairo) + (name "guile3.0-cairo") + (arguments + (substitute-keyword-arguments (package-arguments guile-cairo) + ((#:configure-flags flags ''()) + ;; Uses of 'scm_t_uint8' & co. are deprecated; don't stop the build + ;; because of them. + `(cons "--disable-Werror" ,flags)))) + (inputs + `(("guile" ,guile-3.0) + ("guile-lib" ,guile3.0-lib) + ,@(fold alist-delete (package-inputs guile-cairo) + '("guile" "guile-lib")))))) + (define-public guile-rsvg ;; Use a recent snapshot that supports Guile 2.2 and beyond. (let ((commit "05c6a2fd67e4fea1a7c3ff776729dc931bae6678") -- cgit v1.2.3 From 46378df05010f3f9f54fe7d0f3a17c1abc238166 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 23 Jan 2020 11:15:39 +0100 Subject: gnu: guile-rsvg: Add "guile3.0-rsvg" variant. * gnu/packages/gtk.scm (guile3.0-rsvg): New variable. --- gnu/packages/gtk.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 6f7344c6e3..93e90fa450 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -924,6 +924,17 @@ (define-public guile-rsvg (home-page "http://wingolog.org/projects/guile-rsvg/") (license license:lgpl2.1+)))) +(define-public guile3.0-rsvg + (package + (inherit guile-rsvg) + (name "guile3.0-rsvg") + (inputs + `(("guile" ,guile-3.0) + ("guile-lib" ,guile3.0-lib) + ,@(fold alist-delete (package-inputs guile-rsvg) + '("guile" "guile-lib")))) + (propagated-inputs `(("guile-cairo" ,guile3.0-cairo))))) + (define-public guile-present (package (name "guile-present") -- cgit v1.2.3 From b93cde3d8cf52af02083cdc23e5819699f5aea67 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 23 Jan 2020 11:18:14 +0100 Subject: gnu: guile-present: Install .go files in /site-ccache. * gnu/packages/gtk.scm (guile-present)[source]: Add 'modules' and 'snippet'. --- gnu/packages/gtk.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 93e90fa450..6b61e9c7a9 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -946,7 +946,14 @@ (define-public guile-present (sha256 (base32 "1qam447m05sxxv6x8dlzg7qnyfc4dh8apjw1idpfhpns671gfr6m")) - (patches (search-patches "guile-present-coding.patch")))) + (patches (search-patches "guile-present-coding.patch")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Install .go files in the right place. + (substitute* "Makefile.in" + (("/ccache") "/site-ccache")) + #t)))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From 897186c1554e18a187429683d2eafdbfc0caac96 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 23 Jan 2020 11:22:20 +0100 Subject: gnu: guile-present: Pass the right module directories in scripts. * gnu/packages/gtk.scm (guile-present)[arguments]: In 'post-install' phase, remove hard-coded "2.0" and replace it by a computed effective version. Also, pass "/site-ccache" to -C. --- gnu/packages/gtk.scm | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 6b61e9c7a9..88c4b56e9d 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -84,7 +84,8 @@ (define-module (gnu packages gtk) #:use-module (gnu packages xorg) #:use-module (gnu packages xdisorg) #:use-module (srfi srfi-1) - #:use-module (srfi srfi-26)) + #:use-module (srfi srfi-26) + #:use-module (ice-9 match)) (define-public atk (package @@ -956,18 +957,22 @@ (define-public guile-present #t)))) (build-system gnu-build-system) (arguments - '(#:phases + `(#:phases (modify-phases %standard-phases (add-after 'install 'post-install (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin")) - (guile (assoc-ref inputs "guile"))) + (guile (assoc-ref inputs "guile")) + (version + ,(match (assoc "guile" (package-inputs this-package)) + (("guile" guile) + (version-major+minor (package-version guile)))))) (substitute* (find-files bin ".*") (("guile") (string-append guile "/bin/guile -L " - out "/share/guile/site/2.0 -C " - out "/share/guile/site/2.0 ")))) + out "/share/guile/site/" version " -C " + out "/lib/guile/" version "/site-ccache ")))) #t))))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("guile" ,guile-2.2))) -- cgit v1.2.3 From 2c9fd7636f1ec43c864516de4b1787df84572e9c Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 23 Jan 2020 11:26:08 +0100 Subject: gnu: guile-present: Add "guile3.0-present". * gnu/packages/gtk.scm (guile-present)[source](snippet): Add "3.0" to the supported Guile versions. (guile3.0-present): New variable. --- gnu/packages/gtk.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 88c4b56e9d..f934eabe27 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -951,6 +951,11 @@ (define-public guile-present (modules '((guix build utils))) (snippet '(begin + ;; Allow builds with Guile 3.0. + (substitute* "configure" + (("2\\.2 2\\.0") + "3.0 2.2 2.0")) + ;; Install .go files in the right place. (substitute* "Makefile.in" (("/ccache") "/site-ccache")) @@ -991,6 +996,16 @@ (define-public guile-present documents.") (license license:lgpl3+))) +(define-public guile3.0-present + (package + (inherit guile-present) + (name "guile3.0-present") + (inputs `(("guile" ,guile-3.0))) + (propagated-inputs + `(("guile-lib" ,guile3.0-lib) + ("guile-cairo" ,guile3.0-cairo) + ("guile-rsvg" ,guile3.0-rsvg))))) + (define-public guile-gnome (package (name "guile-gnome") -- cgit v1.2.3 From dc4fae11ab79d4eea91752dd4892184f504a8b25 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Thu, 23 Jan 2020 10:25:55 +0100 Subject: gnu: udiskie: Update to 2.0.4. * gnu/packages/freedesktop.scm (udiskie): Update to 2.0.4. * gnu/packages/patches/udiskie-no-appindicator.patch: Update for 2.0.4. --- gnu/packages/freedesktop.scm | 6 +- gnu/packages/patches/udiskie-no-appindicator.patch | 72 +++++++++++----------- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index ed221439b4..c4328386a5 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2018 Stefan Stefanović ;;; Copyright © 2019 Reza Alizadeh Majd -;;; Copyright © 2019 Guillaume Le Vaillant +;;; Copyright © 2019, 2020 Guillaume Le Vaillant ;;; Copyright © 2020 Jakub KÄ…dzioÅ‚ka ;;; ;;; This file is part of GNU Guix. @@ -1472,14 +1472,14 @@ (define-public uchardet (define-public udiskie (package (name "udiskie") - (version "1.7.7") + (version "2.0.4") (source (origin (method url-fetch) (uri (pypi-uri "udiskie" version)) (sha256 (base32 - "121g9dkr7drv9igpdbcbkj59x15mm72rzp3198bp50zj0lr4wbvi")) + "0gjjzz0k8dlsk03fl2882lbl88hbv031ww72qj02gr65yph0jqgc")) ;; Remove support for the libappindicator library of the ;; Unity desktop environment which is not in Guix. (patches (search-patches "udiskie-no-appindicator.patch")))) diff --git a/gnu/packages/patches/udiskie-no-appindicator.patch b/gnu/packages/patches/udiskie-no-appindicator.patch index c19099cdaa..df3efe104b 100644 --- a/gnu/packages/patches/udiskie-no-appindicator.patch +++ b/gnu/packages/patches/udiskie-no-appindicator.patch @@ -1,9 +1,9 @@ Remove the support for Unity's appindicator. -diff -Naur udiskie-1.7.7/completions/_udiskie udiskie-1.7.7a/completions/_udiskie ---- udiskie-1.7.7/completions/_udiskie 2019-02-17 18:28:58.000000000 +0100 -+++ udiskie-1.7.7a/completions/_udiskie 2019-10-29 14:21:04.556193639 +0100 -@@ -21,8 +21,6 @@ +diff -Naur udiskie-2.0.4/completions/zsh/_udiskie udiskie-2.0.4-new/completions/zsh/_udiskie +--- udiskie-2.0.4/completions/zsh/_udiskie 2020-01-21 01:12:40.000000000 +0100 ++++ udiskie-2.0.4-new/completions/zsh/_udiskie 2020-01-23 10:15:46.956141667 +0100 +@@ -18,8 +18,6 @@ '(-a)'{-A,--no-automount}"[disable automounting]" '(-N)'{-n,--notify}"[show popup notifications]" '(-n)'{-N,--no-notify}"[disable notifications]" @@ -12,14 +12,14 @@ diff -Naur udiskie-1.7.7/completions/_udiskie udiskie-1.7.7a/completions/_udiski '(-T -s)'{-t,--tray}"[show tray icon]" '(-T -t)'{-s,--smart-tray}"[auto hide tray icon]" '(-t -s)'{-T,--no-tray}"[disable tray icon]" -diff -Naur udiskie-1.7.7/doc/udiskie.8.txt udiskie-1.7.7a/doc/udiskie.8.txt ---- udiskie-1.7.7/doc/udiskie.8.txt 2019-02-17 18:28:58.000000000 +0100 -+++ udiskie-1.7.7a/doc/udiskie.8.txt 2019-10-29 14:21:52.304570344 +0100 -@@ -95,12 +95,6 @@ - *-F, \--no-file-manager*:: - Disable browsing. +diff -Naur udiskie-2.0.4/doc/udiskie.8.txt udiskie-2.0.4-new/doc/udiskie.8.txt +--- udiskie-2.0.4/doc/udiskie.8.txt 2020-01-21 01:12:40.000000000 +0100 ++++ udiskie-2.0.4-new/doc/udiskie.8.txt 2020-01-23 10:16:12.636290647 +0100 +@@ -92,12 +92,6 @@ + *--no-terminal*:: + Disable terminal action. --*-appindicator*:: +-*--appindicator*:: - Use AppIndicator3 for the status icon. Use this on Ubuntu/Unity if no icon is shown. - -*--no-appindicator*:: @@ -28,9 +28,9 @@ diff -Naur udiskie-1.7.7/doc/udiskie.8.txt udiskie-1.7.7a/doc/udiskie.8.txt *--password-cache MINUTES*:: Cache passwords for LUKS partitions and set the timeout. -diff -Naur udiskie-1.7.7/udiskie/appindicator.py udiskie-1.7.7a/udiskie/appindicator.py ---- udiskie-1.7.7/udiskie/appindicator.py 2019-02-17 18:28:58.000000000 +0100 -+++ udiskie-1.7.7a/udiskie/appindicator.py 1970-01-01 01:00:00.000000000 +0100 +diff -Naur udiskie-2.0.4/udiskie/appindicator.py udiskie-2.0.4-new/udiskie/appindicator.py +--- udiskie-2.0.4/udiskie/appindicator.py 2020-01-21 01:12:40.000000000 +0100 ++++ udiskie-2.0.4-new/udiskie/appindicator.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,61 +0,0 @@ -""" -Status icon using AppIndicator3. @@ -39,10 +39,10 @@ diff -Naur udiskie-1.7.7/udiskie/appindicator.py udiskie-1.7.7a/udiskie/appindic -from gi.repository import Gtk -from gi.repository import AppIndicator3 - --from udiskie.async_ import Async +-from .async_ import Future - - --class AppIndicatorIcon(object): +-class AppIndicatorIcon: - - """ - Show status icon using AppIndicator as backend. Replaces @@ -63,7 +63,7 @@ diff -Naur udiskie-1.7.7/udiskie/appindicator.py udiskie-1.7.7a/udiskie/appindic - dbusmenuserver = self._indicator.get_property('dbus-menu-server') - self._dbusmenuitem = dbusmenuserver.get_property('root-node') - self._conn = self._dbusmenuitem.connect('about-to-show', self._on_show) -- self.task = Async() +- self.task = Future() - menumaker._quit_action = self.destroy - # Populate menu initially, so libdbusmenu does not ignore the - # 'about-to-show': @@ -72,7 +72,7 @@ diff -Naur udiskie-1.7.7/udiskie/appindicator.py udiskie-1.7.7a/udiskie/appindic - def destroy(self): - self.show(False) - self._dbusmenuitem.disconnect(self._conn) -- self.task.callback() +- self.task.set_result(True) - - @property - def visible(self): @@ -93,10 +93,10 @@ diff -Naur udiskie-1.7.7/udiskie/appindicator.py udiskie-1.7.7a/udiskie/appindic - # repopulate: - self._maker(self._menu) - self._menu.show_all() -diff -Naur udiskie-1.7.7/udiskie/cli.py udiskie-1.7.7a/udiskie/cli.py ---- udiskie-1.7.7/udiskie/cli.py 2019-02-17 18:28:58.000000000 +0100 -+++ udiskie-1.7.7a/udiskie/cli.py 2019-10-29 14:18:22.678919186 +0100 -@@ -376,9 +376,6 @@ +diff -Naur udiskie-2.0.4/udiskie/cli.py udiskie-2.0.4-new/udiskie/cli.py +--- udiskie-2.0.4/udiskie/cli.py 2020-01-21 01:12:40.000000000 +0100 ++++ udiskie-2.0.4-new/udiskie/cli.py 2020-01-23 10:17:13.064810617 +0100 +@@ -287,9 +287,6 @@ -T, --no-tray Disable tray icon -m MENU, --menu MENU Tray menu [flat/nested] @@ -106,15 +106,15 @@ diff -Naur udiskie-1.7.7/udiskie/cli.py udiskie-1.7.7a/udiskie/cli.py --password-cache MINUTES Set password cache timeout --no-password-cache Disable password cache -@@ -400,7 +397,6 @@ +@@ -312,7 +309,6 @@ 'notify': True, 'tray': False, 'menu': 'flat', - 'appindicator': False, 'file_manager': 'xdg-open', + 'terminal': '', 'password_prompt': 'builtin:gui', - 'password_cache': False, -@@ -415,7 +411,6 @@ +@@ -328,7 +324,6 @@ '--no-tray': False, '--smart-tray': 'auto'}), 'menu': Value('--menu'), @@ -122,10 +122,10 @@ diff -Naur udiskie-1.7.7/udiskie/cli.py udiskie-1.7.7a/udiskie/cli.py 'file_manager': OptionalValue('--file-manager'), 'password_prompt': OptionalValue('--password-prompt'), 'password_cache': OptionalValue('--password-cache'), -@@ -541,11 +536,7 @@ - raise ValueError("Invalid menu: %s" % (options['menu'],)) +@@ -459,11 +454,7 @@ - menu_maker = udiskie.tray.UdiskieMenu(self, icons, actions, flat) + menu_maker = udiskie.tray.UdiskieMenu(self, icons, actions, flat, + config.quickmenu_actions) - if options['appindicator']: - import udiskie.appindicator - TrayIcon = udiskie.appindicator.AppIndicatorIcon @@ -135,10 +135,10 @@ diff -Naur udiskie-1.7.7/udiskie/cli.py udiskie-1.7.7a/udiskie/cli.py trayicon = TrayIcon(menu_maker, icons) return udiskie.tray.UdiskieStatusIcon(trayicon, menu_maker, smart) -diff -Naur udiskie-1.7.7/udiskie.egg-info/SOURCES.txt udiskie-1.7.7a/udiskie.egg-info/SOURCES.txt ---- udiskie-1.7.7/udiskie.egg-info/SOURCES.txt 2019-02-17 19:42:25.000000000 +0100 -+++ udiskie-1.7.7a/udiskie.egg-info/SOURCES.txt 2019-10-29 14:40:09.333315287 +0100 -@@ -24,7 +24,6 @@ +diff -Naur udiskie-2.0.4/udiskie.egg-info/SOURCES.txt udiskie-2.0.4-new/udiskie.egg-info/SOURCES.txt +--- udiskie-2.0.4/udiskie.egg-info/SOURCES.txt 2020-01-21 01:12:41.000000000 +0100 ++++ udiskie-2.0.4-new/udiskie.egg-info/SOURCES.txt 2020-01-23 10:17:50.657205798 +0100 +@@ -25,7 +25,6 @@ test/test_cache.py test/test_match.py udiskie/__init__.py @@ -146,10 +146,10 @@ diff -Naur udiskie-1.7.7/udiskie.egg-info/SOURCES.txt udiskie-1.7.7a/udiskie.egg udiskie/async_.py udiskie/automount.py udiskie/cache.py -@@ -46,4 +45,4 @@ - udiskie.egg-info/dependency_links.txt +@@ -47,4 +46,4 @@ udiskie.egg-info/entry_points.txt udiskie.egg-info/requires.txt --udiskie.egg-info/top_level.txt + udiskie.egg-info/top_level.txt +-udiskie.egg-info/zip-safe \ Pas de fin de ligne à la fin du fichier -+udiskie.egg-info/top_level.txt ++udiskie.egg-info/zip-safe -- cgit v1.2.3 From 09e745185bd6326a77a6fa045cdd82deb133402e Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Thu, 23 Jan 2020 10:49:35 +0100 Subject: gnu: xsecurelock: Fix strange character in description. * gnu/packages/xdisorg.scm (xsecurelock)[description]: Replace strange character by a space. --- gnu/packages/xdisorg.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 0f47821b7e..f60b2d040b 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -1895,7 +1895,7 @@ (define-public xsecurelock (home-page "https://github.com/google/xsecurelock") (synopsis "X11 screen lock utility with the primary goal of security") (description "@code{xsecurelock} is an X11 screen locker which uses -a modular design to avoid the usual pitfalls of screen locking utility design. +a modular design to avoid the usual pitfalls of screen locking utility design. As a consequence of the modular design, the usual screen locker service shouldn't be used with @code{xsecurelock}. Instead, you need to add a helper -- cgit v1.2.3 From 8c5cde2546b8bcca2285d5fa6545adeb5076b74e Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Thu, 23 Jan 2020 11:19:21 +0100 Subject: gnu: jgmenu: Update to 4.0.1. * gnu/packages/xdisorg.scm (jgmenu): Update to 4.0.1. [native-inputs]: Add cppcheck. [inputs]: Add glib and remove python. [arguments]: Remove fix-paths phase, add fix-tests phase and update configure phase. --- gnu/packages/xdisorg.scm | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index f60b2d040b..ecefab1dbb 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -1960,7 +1960,7 @@ (define-public autocutsel (define-public jgmenu (package (name "jgmenu") - (version "3.5") + (version "4.0.1") (source (origin (method git-fetch) @@ -1970,34 +1970,35 @@ (define-public jgmenu (file-name (git-file-name name version)) (sha256 (base32 - "0q0m3sskgmjv28gzvjkphgg3yhwzc9w9fj9i342pibb50impjazy")))) + "1q0rpg2d96sn3rrdi8m7bngnxxqyxilpjxi7skiw4gvpiv1akxjp")))) (build-system gnu-build-system) (native-inputs - `(("perl" ,perl) + `(("cppcheck" ,cppcheck) + ("perl" ,perl) ("pkg-config" ,pkg-config))) (inputs `(("cairo" ,cairo) + ("glib" ,glib) ("librsvg" ,librsvg) ("libx11" ,libx11) ("libxml2" ,libxml2) ("libxrandr" ,libxrandr) - ("pango" ,pango) - ("python" ,python))) + ("pango" ,pango))) (arguments - '(#:phases (modify-phases %standard-phases - (add-after 'unpack 'fix-paths - (lambda* (#:key inputs #:allow-other-keys) - (let ((python (assoc-ref inputs "python"))) - (substitute* "src/jgmenu-pmenu.py" - (("#!/usr/bin/env python3") - (string-append "#!" python "/bin/python3"))) - #t))) - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (setenv "prefix" out) - (setenv "CC" "gcc") - #t)))))) + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-tests + (lambda _ + (substitute* "scripts/cppcheck-wrapper.sh" + (("--library=/usr/share/cppcheck/cfg/gnu\\.cfg") + "")) + #t)) + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (setenv "CC" "gcc") + (invoke "./configure" + (string-append "--prefix=" (assoc-ref outputs "out"))) + #t))))) (synopsis "Simple X11 menu") (description "This is a simple menu for X11 designed for scripting and tweaking. It -- cgit v1.2.3 From 236861847fdb098b43a99c61c562329a2fdc765c Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Wed, 15 Jan 2020 19:24:23 +0000 Subject: gnu: python-fenics-dijitso: Update to 2019.1.0. * gnu/packages/simulation.scm (python-fenics-dijitso): Update to 2019.1.0. --- gnu/packages/simulation.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index edc8d6e190..81b6e9affa 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017, 2018 Paul Garlick +;;; Copyright © 2017, 2018, 2019, 2020 Paul Garlick ;;; ;;; This file is part of GNU Guix. ;;; @@ -241,14 +241,14 @@ (define-public openfoam (define-public python-fenics-dijitso (package (name "python-fenics-dijitso") - (version "2018.1.0") + (version "2019.1.0") (source (origin (method url-fetch) (uri (pypi-uri "fenics-dijitso" version)) (sha256 (base32 - "1qax2f52qsjbd1h5lk5i5shp448qlakxabjjybrfc1w823p0yql9")))) + "0lhqsq8ypdak0ahr2jnyvg07yrqp6wicjxi6k56zx24wp3qg60sc")))) (build-system python-build-system) (inputs `(("openmpi" ,openmpi) -- cgit v1.2.3 From def588d2508644b127c49cde192c791420e113f1 Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Thu, 16 Jan 2020 12:54:38 +0000 Subject: gnu: python-fenics-ufl: Update to 2019.1.0. * gnu/packages/simulation.scm (python-fenics-ufl): Update to 2019.1.0. --- gnu/packages/simulation.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index 81b6e9affa..0595ad505d 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -292,14 +292,14 @@ (define-public python-fenics-dijitso (define-public python-fenics-ufl (package (name "python-fenics-ufl") - (version "2018.1.0") + (version "2019.1.0") (source (origin (method url-fetch) (uri (pypi-uri "fenics-ufl" version)) (sha256 (base32 - "1fq8yc86s1s3c8c0b1rc2vf265q0hrkzg57100fg1nghcz0p4vla")))) + "10dz8x3lm68x2w3kkqcjask38h0zkhhak26jdbkppr8g9y8wny7p")))) (build-system python-build-system) (inputs `(("python-numpy" ,python-numpy))) -- cgit v1.2.3 From 4dfb22c1e3c48151a1236b54637a23843b484bdc Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Fri, 17 Jan 2020 19:03:39 +0000 Subject: gnu: python-fenics-fiat: Update to 2019.1.0. * gnu/packages/simulation.scm (python-fenics-fiat): Update to 2019.1.0. --- gnu/packages/simulation.scm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index 0595ad505d..3384c4dc55 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -329,14 +329,14 @@ (define-public python-fenics-ufl (define-public python-fenics-fiat (package (name "python-fenics-fiat") - (version "2018.1.0") + (version "2019.1.0") (source (origin (method url-fetch) (uri (pypi-uri "fenics-fiat" version)) (sha256 (base32 - "0fmjd93r6bwf6xs8csw86qzphrnr66xwv7f372w59gmq8mg6rljc")))) + "13sc7lma3d2mh43an7i4kkdbbk4cmvxjk45wi43xnjd7qc38zg4b")))) (build-system python-build-system) (native-inputs `(("python-pytest" ,python-pytest))) @@ -351,7 +351,15 @@ (define-public python-fenics-fiat (setenv "PYTHONPATH" (string-append (getcwd) ":" (getenv "PYTHONPATH"))) (with-directory-excursion "test" - (invoke "py.test" "unit/")) + ;; FIXME: three FIAT test modules are known to fail + ;; with recent versions of pytest (>= 4). These are + ;; skipped for FIAT version 2019.1.0 pending an + ;; upstream pull request. For details see request #59 + ;; at https://bitbucket.org/fenics-project/fiat/. + (invoke "py.test" "unit/" + "--ignore=unit/test_fiat.py" + "--ignore=unit/test_quadrature.py" + "--ignore=unit/test_reference_element.py")) #t))))) (home-page "https://bitbucket.org/fenics-project/fiat/") (synopsis "Tabulation of finite element function spaces") -- cgit v1.2.3 From ec8dff89804320ba9ac237b9e479dac8c217552e Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Mon, 20 Jan 2020 11:21:24 +0000 Subject: gnu: python-fenics-ffc: Update to 2019.1.0.post0. * gnu/packages/simulation.scm (python-fenics-ffc): Update to 2019.1.0.post0. --- gnu/packages/simulation.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index 3384c4dc55..8ab58c29b4 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -379,14 +379,14 @@ (define-public python-fenics-fiat (define-public python-fenics-ffc (package (name "python-fenics-ffc") - (version "2018.1.0") + (version "2019.1.0.post0") (source (origin (method url-fetch) (uri (pypi-uri "fenics-ffc" version)) (sha256 (base32 - "1b2ia5vlkw298x7rf0k2p3ihlpwkwgc98p3s6sbpds3hqmfrzdz9")))) + "1f2a44ha65fg3a1prrbrsz4dgvibsv0j5c3pi2m52zi93bhwwgg9")))) (build-system python-build-system) (native-inputs `(("python-pytest" ,python-pytest))) -- cgit v1.2.3 From 09ecd9a7944ca8af017a92228442d8ec84c15f58 Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Wed, 22 Jan 2020 15:14:05 +0000 Subject: gnu: fenics-dolfin: Update to 2019.1.0.post0. * gnu/packages/simulation.scm (fenics-dolfin): Update to 2019.1.0.post0. [source](snippet): Remove three substitutions that are no longer needed. [native-inputs]: Use compatible version of CATCH. [arguments]: Use CMAKE version 3.15.5 to avoid EXCLUDE_FROM_ALL regression. See . --- gnu/packages/simulation.scm | 33 +++++++-------------------------- 1 file changed, 7 insertions(+), 26 deletions(-) diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index 8ab58c29b4..5c1931631f 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -431,7 +431,7 @@ (define-public python-fenics-ffc (define-public fenics-dolfin (package (name "fenics-dolfin") - (version "2018.1.0.post1") + (version "2019.1.0.post0") (source (origin (method url-fetch) @@ -441,7 +441,7 @@ (define-public fenics-dolfin (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "12zkk8j3xsg6l8p0ggwsl03084vlcivw4h99b7z9kndg7k89b3ya")) + "1m91hwcq5gfj4qqswp8l8kj58nia48f0n4kq13w0xqj4biq7rla0")) (modules '((guix build utils))) (snippet '(begin @@ -452,30 +452,10 @@ (define-public fenics-dolfin (("#include.*") "#include \n")) (substitute* "test/unit/cpp/CMakeLists.txt" - ;; Add extra include directories required by the unit tests. - (("(^target_link_libraries.*)" line) - (string-append line "\n" - "target_include_directories(" - "unittests PRIVATE " - "${DOLFIN_SOURCE_DIR} " - "${DOLFIN_SOURCE_DIR}/dolfin " - "${DOLFIN_BINARY_DIR})\n")) + ;; Specify directory to find the header file. (("(^set\\(CATCH_INCLUDE_DIR ).*(/catch\\))" _ front back) (string-append front - "$ENV{CATCH_DIR}" - "/include" back "\n"))) - (substitute* "demo/CMakeLists.txt" - ;; Add extra include directories required by the demo tests. - (("(^#find_package.*)" line) - (string-append line "\n" - "include_directories(" - "${DOLFIN_SOURCE_DIR} " - "${DOLFIN_SOURCE_DIR}/dolfin " - "${DOLFIN_BINARY_DIR})\n"))) - (substitute* "dolfin/nls/PETScSNESSolver.cpp" - ;; Remove SNESTEST mapping. The SNESTEST symbol was removed - ;; from PETSc at version 3.10.3. - ((".*SNESTEST.*") "" )) + "$ENV{CATCH_DIR}/include" back "\n"))) #t)))) (build-system cmake-build-system) (inputs @@ -492,14 +472,15 @@ (define-public fenics-dolfin ("sundials" ,sundials-openmpi) ("zlib" ,zlib))) (native-inputs - `(("catch" ,catch-framework2) + `(("catch" ,catch-framework2-1) ("pkg-config" ,pkg-config))) (propagated-inputs `(("ffc" ,python-fenics-ffc) ("petsc" ,petsc-openmpi) ("slepc" ,slepc-openmpi))) (arguments - `(#:configure-flags + `(#:cmake ,cmake-3.15.5 + #:configure-flags `("-DDOLFIN_ENABLE_DOCS:BOOL=OFF" "-DDOLFIN_ENABLE_HDF5:BOOL=ON" "-DDOLFIN_ENABLE_MPI:BOOL=ON" -- cgit v1.2.3 From 37bb0d1eafb3f08a204aed8c928cbf7cbc69cd19 Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Thu, 23 Jan 2020 16:00:29 +0000 Subject: gnu: fenics: Update to 2019.1.0.post0. * gnu/packages/simulation.scm (fenics): Update to 2019.1.0.post0. [arguments]: In the 'pre-check' phase, add three more demos to the list of demos that are skipped. --- gnu/packages/simulation.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index 5c1931631f..2f07e996a2 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -633,12 +633,20 @@ (define-public fenics ,%openmpi-setup) (add-before 'check 'pre-check (lambda _ - ;; Exclude tests that require meshes supplied by git-lfs. + ;; Exclude three tests that generate + ;; 'NotImplementedError' in matplotlib version 3.1.2. + ;; See + ;; . + ;; Also exclude tests that require meshes supplied by + ;; git-lfs. (substitute* "demo/test.py" (("(.*stem !.*)" line) (string-append line "\n" "excludeList = [\n" + "'built-in-meshes', \n" + "'hyperelasticity', \n" + "'elasticity', \n" "'multimesh-quadrature', \n" "'multimesh-marking', \n" "'mixed-poisson-sphere', \n" -- cgit v1.2.3 From 48446f0f94036e87c55e6e883abf9d75de5d1868 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 23 Jan 2020 10:58:44 -0500 Subject: gnu: wxmaxima: Update to 20.01.3. * gnu/packages/maths.scm (wxmaxima): Update to 20.01.3. [home-page]: Update URL. --- gnu/packages/maths.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 8f4478b6bb..9241966d24 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2982,7 +2982,7 @@ (define-public maxima (define-public wxmaxima (package (name "wxmaxima") - (version "19.11.1") + (version "20.01.3") (source (origin (method git-fetch) @@ -2991,7 +2991,7 @@ (define-public wxmaxima (commit (string-append "Version-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "16xizaddb27432n1083y89ir5zdqvllsgbwrzzk4jc2rw1ldxfsv")))) + (base32 "18fj2m1qwlbavivpixph112wq9hxy3hh7c8q07djc3bhrzf2a7v7")))) (build-system cmake-build-system) (native-inputs `(("gettext" ,gettext-minimal))) @@ -3025,7 +3025,7 @@ (define-public wxmaxima ,(string-append (assoc-ref inputs "adwaita-icon-theme") "/share")))) #t))))) - (home-page "https://andrejv.github.io/wxmaxima/") + (home-page "https://wxmaxima-developers.github.io/wxmaxima/") (synopsis "Graphical user interface for the Maxima computer algebra system") (description "wxMaxima is a graphical user interface for the Maxima computer algebra -- cgit v1.2.3 From a78364e91cca5faefc3d24619813487053bd6542 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Thu, 23 Jan 2020 21:58:04 +0100 Subject: gnu: Add ne. * gnu/packages/text-editors.scm (ne): New variable. --- gnu/packages/text-editors.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 863ac7e584..607df4bb03 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -60,6 +60,7 @@ (define-module (gnu packages text-editors) #:use-module (gnu packages regex) #:use-module (gnu packages ruby) #:use-module (gnu packages terminals) + #:use-module (gnu packages texinfo) #:use-module (gnu packages xml)) (define-public vis @@ -717,3 +718,45 @@ (define-public fe @item Compose function for Latin 1 characters @end itemize") (license license:gpl2+))) + +(define-public ne + (package + (name "ne") + (version "3.2.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/vigna/ne.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0h6d08cnwrk96ss83i9bragwwanph6x54sm3ak1z81146dsqsiif")))) + (build-system gnu-build-system) + (native-inputs + `(("perl" ,perl) + ("texinfo" ,texinfo))) + (inputs + `(("ncurses" ,ncurses))) + (arguments + `(#:tests? #f + #:make-flags + (list "CC=gcc" + (string-append "PREFIX=" (assoc-ref %outputs "out")) + (string-append "LDFLAGS=-L" (assoc-ref %build-inputs "ncurses") + "/lib")) + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda _ + (substitute* "src/makefile" + (("-lcurses") "-lncurses")) + #t))))) + (home-page "http://ne.di.unimi.it/") + (synopsis "Text editor with menu bar") + (description "This package provides a modeless text editor with menu bar. +It supports syntax highlighting, regular expressions, configurable menus, +keybindings, autocomplete and unlimited undo. It can pipe a marked block +of text through any command line filter. It can also open very large binary +files. It was originally developed on the Amiga 3000T.") + (license license:gpl3+))) -- cgit v1.2.3 From 43190ac64c5181841d68beade4d19e792f4f38a2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 23 Jan 2020 22:37:34 +0100 Subject: gnu: evolution-data-server: Fix build with libical 3.0.7. * gnu/packages/patches/evolution-data-server-libical-compat.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/gnome.scm (evolution-data-server)[source](patches): Add it. --- gnu/local.mk | 1 + gnu/packages/gnome.scm | 3 +- .../evolution-data-server-libical-compat.patch | 36 ++++++++++++++++++++++ 3 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/evolution-data-server-libical-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index 448e70aa38..af030781a5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -838,6 +838,7 @@ dist_patch_DATA = \ %D%/packages/patches/eudev-rules-directory.patch \ %D%/packages/patches/evilwm-lost-focus-bug.patch \ %D%/packages/patches/evolution-data-server-locales.patch \ + %D%/packages/patches/evolution-data-server-libical-compat.patch \ %D%/packages/patches/exiv2-CVE-2017-14860.patch \ %D%/packages/patches/exiv2-CVE-2017-14859-14862-14864.patch \ %D%/packages/patches/extundelete-e2fsprogs-1.44.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index cadd4d0655..ba5181c756 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6256,7 +6256,8 @@ (define-public evolution-data-server (uri (string-append "mirror://gnome/sources/" name "/" (version-major+minor version) "/" name "-" version ".tar.xz")) - (patches (search-patches "evolution-data-server-locales.patch")) + (patches (search-patches "evolution-data-server-locales.patch" + "evolution-data-server-libical-compat.patch")) (sha256 (base32 "0zsc9xwy6ixk3x0dx69ax5isrdw8qxjdxg2i5fr95s40nss7rxl3")))) diff --git a/gnu/packages/patches/evolution-data-server-libical-compat.patch b/gnu/packages/patches/evolution-data-server-libical-compat.patch new file mode 100644 index 0000000000..a988519ea0 --- /dev/null +++ b/gnu/packages/patches/evolution-data-server-libical-compat.patch @@ -0,0 +1,36 @@ +Prevent test failure and possible data loss due to API change in libical 3.0.7. + +https://gitlab.gnome.org/GNOME/evolution-data-server/issues/185 +https://lists.infradead.org/pipermail/libical-devel/2020-January/000907.html + +Adapted from upstream: + +https://gitlab.gnome.org/GNOME/evolution-data-server/commit/77384ab552c19bf374dbeda53dc37f98d07bd4ec + +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -108,7 +108,7 @@ + + set(gcr_minimum_version 3.4) + set(libgdata_minimum_version 0.15.1) +-set(libical_minimum_version 2.0) ++set(libical_minimum_version 3.0.7) + set(libsecret_minimum_version 0.5) + set(libxml_minimum_version 2.0.0) + set(sqlite_minimum_version 3.7.17) +diff --git a/src/calendar/libedata-cal/e-cal-meta-backend.c b/src/calendar/libedata-cal/e-cal-meta-backend.c +index 7501f2a43dcc3af91e93e89751caf76e77c2ac23..93f4806ba2c5193f746e9fae5bf74d08ad05f8bf 100644 +--- a/src/calendar/libedata-cal/e-cal-meta-backend.c ++++ b/src/calendar/libedata-cal/e-cal-meta-backend.c +@@ -3958,9 +3958,8 @@ + gchar *base64; + + base64 = g_base64_encode ((const guchar *) content, len); +- new_attach = icalattach_new_from_data (base64, NULL, NULL); ++ new_attach = icalattach_new_from_data (base64, (GFunc) g_free, NULL); + g_free (content); +- g_free (base64); + + ecmb_remove_all_but_filename_parameter (prop); + -- cgit v1.2.3 From 84436be094776b8b9a5893eb7fb4888bd7ca8b79 Mon Sep 17 00:00:00 2001 From: JoJo Date: Wed, 15 Jan 2020 15:43:03 +0100 Subject: gnu: Add ghc-llvm-hs-pure. * gnu/packages/haskell-xyz.scm (ghc-llvm-hs-pure): New variable. Signed-off-by: Leo Famulari --- gnu/packages/haskell-xyz.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index fd2f11ce72..aaabc02c13 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -23,6 +23,7 @@ ;;; Copyright © 2019 Kyle Meyer ;;; Copyright © 2019 Alex Griffin ;;; Copyright © 2020 Brett Gilio +;;; Copyright © 2020 JoJo ;;; ;;; This file is part of GNU Guix. ;;; @@ -6704,6 +6705,35 @@ (define-public ghc-listlike can handle infinite lists.") (license license:bsd-3))) +(define-public ghc-llvm-hs-pure + (package + (name "ghc-llvm-hs-pure") + (version "9.0.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/llvm-hs-pure/" + "llvm-hs-pure-" version ".tar.gz")) + (sha256 + (base32 + "0pxb5ah8r5pzpz2ibqw3g9g1isigb4z7pbzfrwr8kmcjn74ab3kf")))) + (build-system haskell-build-system) + (inputs + `(("ghc-attoparsec" ,ghc-attoparsec) + ("ghc-fail" ,ghc-fail) + ("ghc-unordered-containers" ,ghc-unordered-containers))) + (native-inputs + `(("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-hunit" ,ghc-tasty-hunit) + ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck))) + (home-page "https://github.com/llvm-hs/llvm-hs/") + (synopsis "Pure Haskell LLVM functionality (no FFI)") + (description "llvm-hs-pure is a set of pure Haskell types and functions +for interacting with LLVM. It includes an algebraic datatype (ADT) to represent +LLVM IR. The llvm-hs package builds on this one with FFI bindings to LLVM, but +llvm-hs-pure does not require LLVM to be available.") + (license license:bsd-3))) + (define-public ghc-logging-facade (package (name "ghc-logging-facade") -- cgit v1.2.3 From e3ee802379f33aa3fae0a40be33fe6a4f2ae34d2 Mon Sep 17 00:00:00 2001 From: JoJo Date: Wed, 15 Jan 2020 15:43:44 +0100 Subject: gnu: Add ghc-llvm-hs. * gnu/packages/haskell-xyz.scm (ghc-llvm-hs): New variable. Signed-off-by: Leo Famulari --- gnu/packages/haskell-xyz.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index aaabc02c13..94e9a22115 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -55,6 +55,7 @@ (define-module (gnu packages haskell-xyz) #:use-module (gnu packages haskell-web) #:use-module (gnu packages libffi) #:use-module (gnu packages linux) + #:use-module (gnu packages llvm) #:use-module (gnu packages lua) #:use-module (gnu packages maths) #:use-module (gnu packages ncurses) @@ -6734,6 +6735,43 @@ (define-public ghc-llvm-hs-pure llvm-hs-pure does not require LLVM to be available.") (license license:bsd-3))) +(define-public ghc-llvm-hs + (package + (name "ghc-llvm-hs") + (version "9.0.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/llvm-hs/llvm-hs-" + version ".tar.gz")) + (sha256 + (base32 + "0723xgh45h9cyxmmjsvxnsp8bpn1ljy4qgh7a7vqq3sj9d6wzq00")))) + (build-system haskell-build-system) + (inputs + `(("ghc-attoparsec" ,ghc-attoparsec) + ("ghc-exceptions" ,ghc-exceptions) + ("ghc-utf8-string" ,ghc-utf8-string) + ("ghc-llvm-hs-pure" ,ghc-llvm-hs-pure) + ("llvm" ,llvm-9))) + (native-inputs + `(("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-hunit" ,ghc-tasty-hunit) + ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-temporary" ,ghc-temporary) + ("ghc-pretty-show" ,ghc-pretty-show) + ("ghc-temporary" ,ghc-temporary))) + (home-page "https://github.com/llvm-hs/llvm-hs/") + (synopsis "General purpose LLVM bindings for Haskell") + (description "llvm-hs is a set of Haskell bindings for LLVM. Unlike other +current Haskell bindings, it uses an algebraic datatype (ADT) to represent LLVM +IR, and so offers two advantages: it handles almost all of the stateful +complexities of using the LLVM API to build IR; and it supports moving IR not +only from Haskell into LLVM C++ objects, but the other direction - from LLVM C++ +into Haskell.") + (license license:bsd-3))) + (define-public ghc-logging-facade (package (name "ghc-logging-facade") -- cgit v1.2.3 From df8a9c7496c82f56560ce5e84c2c27c83010e64d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 14 Jan 2020 18:40:21 +0100 Subject: gnu: gsasl: Update to 1.8.1. * gnu/packages/gsasl.scm (gsasl): Update to 1.8.1. [source](modules, snippet): Remove. [inputs]: Add LIBGCRYPT. --- gnu/packages/gsasl.scm | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/gnu/packages/gsasl.scm b/gnu/packages/gsasl.scm index c1a0360b0e..0b13596fad 100644 --- a/gnu/packages/gsasl.scm +++ b/gnu/packages/gsasl.scm @@ -23,6 +23,7 @@ (define-module (gnu packages gsasl) #:use-module (gnu packages) #:use-module (gnu packages compression) #:use-module (gnu packages libidn) + #:use-module (gnu packages gnupg) #:use-module (gnu packages nettle) #:use-module (gnu packages kerberos) #:use-module (gnu packages tls) @@ -77,30 +78,23 @@ (define-public gss (define-public gsasl (package (name "gsasl") - (version "1.8.0") + (version "1.8.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gsasl/gsasl-" version ".tar.gz")) - (sha256 (base32 - "1rci64cxvcfr8xcjpqc4inpfq7aw4snnsbf5xz7d30nhvv8n40ii")) - (modules '((guix build utils))) - (snippet - '(begin - ;; The gnulib test-lock test is prone to writer starvation - ;; with our glibc@2.25, which prefers readers, so disable it. - ;; The gnulib commit b20e8afb0b2 should fix this once - ;; incorporated here. - (substitute* "tests/Makefile.in" - (("test-lock\\$\\(EXEEXT\\) ") "")) - #t)))) + (sha256 + (base32 + "1lnqfbaajkj1r2fx1db1qgcxy69pfgbyq7xd2kpvyxhra4m1dnjd")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-gssapi-impl=mit"))) - (inputs `(("libidn" ,libidn) - ("libntlm" ,libntlm) - ("mit-krb5" ,mit-krb5) - ("zlib" ,zlib))) + (inputs + `(("libgcrypt" ,libgcrypt) + ("libidn" ,libidn) + ("libntlm" ,libntlm) + ("mit-krb5" ,mit-krb5) + ("zlib" ,zlib))) (propagated-inputs ;; Propagate GnuTLS because libgnutls.la reads `-lnettle', and Nettle is a ;; propagated input of GnuTLS. -- cgit v1.2.3 From 10214fa9f637a6c780ccca1710413e67fe9b3d83 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 23 Jan 2020 19:21:01 +0100 Subject: gnu: gsasl: Do not build 'libgsasl.a'. * gnu/packages/gsasl.scm (gsasl)[arguments]: Add "--disable-static" to #:configure-flags. --- gnu/packages/gsasl.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gsasl.scm b/gnu/packages/gsasl.scm index 0b13596fad..a796f9aa82 100644 --- a/gnu/packages/gsasl.scm +++ b/gnu/packages/gsasl.scm @@ -88,7 +88,8 @@ (define-public gsasl "1lnqfbaajkj1r2fx1db1qgcxy69pfgbyq7xd2kpvyxhra4m1dnjd")))) (build-system gnu-build-system) (arguments - `(#:configure-flags '("--with-gssapi-impl=mit"))) + `(#:configure-flags '("--with-gssapi-impl=mit" + "--disable-static"))) (inputs `(("libgcrypt" ,libgcrypt) ("libidn" ,libidn) -- cgit v1.2.3 From 82a2bd3a4ee09c04b51b948f1e952402d6a26f88 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 23 Jan 2020 19:21:50 +0100 Subject: gnu: libqmi: Update to 1.24.4. * gnu/packages/freedesktop.scm (libqmi): Update to 1.24.4. --- gnu/packages/freedesktop.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index c4328386a5..01466b8ec5 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -986,7 +986,7 @@ (define-public libmbim (define-public libqmi (package (name "libqmi") - (version "1.22.4") + (version "1.24.4") (source (origin (method url-fetch) (uri (string-append @@ -994,7 +994,7 @@ (define-public libqmi "libqmi-" version ".tar.xz")) (sha256 (base32 - "1wgrrb9vb3myl8xgck8ik86876ycbg8crylybs3ssi21vrxqwnsc")))) + "12licfsszr6qxpg9b2b04qm2glk8d42fcy32zr8jzwrgr7gbl5h3")))) (build-system gnu-build-system) (inputs `(("libgudev" ,libgudev))) -- cgit v1.2.3