From 4d52e0f66791250deae4890ac12a4789b1290a88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 23 Jan 2020 15:34:41 +0100 Subject: compile: Remove incorrect exports. This is a followup to fed36328129def5f10b1d1f3e4ea8886916fd22a. * guix/build/compile.scm: Remove exports of '%lightweight-optimizations' and '%default-optimizations'. * guix/self.scm: Remove unused (guix build compile) module. --- guix/build/compile.scm | 6 ++---- guix/self.scm | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/guix/build/compile.scm b/guix/build/compile.scm index 3781e148ce..4b6472784c 100644 --- a/guix/build/compile.scm +++ b/guix/build/compile.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2013, 2014, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer ;;; ;;; This file is part of GNU Guix. @@ -29,9 +29,7 @@ #:use-module (guix build utils) #:use-module (language tree-il optimize) #:use-module (language cps optimize) - #:export (%default-optimizations - %lightweight-optimizations - compile-files)) + #:export (compile-files)) ;;; Commentary: ;;; diff --git a/guix/self.scm b/guix/self.scm index 207e80d842..f9015148d6 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2017, 2018, 2019, 2020 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,7 +28,6 @@ #:use-module (guix sets) #:use-module (guix modules) #:use-module ((guix build utils) #:select (find-files)) - #:use-module ((guix build compile) #:select (%lightweight-optimizations)) #:use-module (srfi srfi-1) #:use-module (srfi srfi-9) #:use-module (srfi srfi-35) -- cgit v1.2.3 From 370891d5655a92eda596df5a03abed53511df386 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 23 Jan 2020 22:35:43 +0100 Subject: derivations: Inline 'find' in 'coalesce-duplicate-inputs'. Previously the first argument to 'find' would show up high in profiles of 'package-derivation'. This speeds things up a big, especially on Guile 3. * guix/derivations.scm (coalesce-duplicate-inputs)[find]: New procedure. --- guix/derivations.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/guix/derivations.scm b/guix/derivations.scm index 480a65c78b..f6d6f7db25 100644 --- a/guix/derivations.scm +++ b/guix/derivations.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2016, 2017 Mathieu Lirzin ;;; ;;; This file is part of GNU Guix. @@ -240,6 +240,13 @@ the store." "Return a list of inputs, such that when INPUTS contains the same DRV twice, they are coalesced, with their sub-derivations merged. This is needed because Nix itself keeps only one of them." + (define (find pred lst) ;inlinable copy of 'find' + (let loop ((lst lst)) + (match lst + (() #f) + ((head . tail) + (if (pred head) head (loop tail)))))) + (fold (lambda (input result) (match input (($ (= derivation-file-name path) sub-drvs) -- cgit v1.2.3 From 8234fe653e61d0090138cbd4c48d877568355439 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 23 Jan 2020 22:43:17 +0100 Subject: self: Build with Guile 3.0. * guix/self.scm (specification->package): Return the "guile3.0-" variants. (guix-derivation): Change 'guile' to (specification->package "guile"). Pass "3.0" as #:guile-version. --- guix/self.scm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/guix/self.scm b/guix/self.scm index f9015148d6..6b633f9bc0 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -48,13 +48,13 @@ (let ((ref (lambda (module variable) (module-ref (resolve-interface module) variable)))) (match-lambda - ("guile" (ref '(gnu packages commencement) 'guile-final)) - ("guile-json" (ref '(gnu packages guile) 'guile-json-3)) - ("guile-ssh" (ref '(gnu packages ssh) 'guile-ssh)) - ("guile-git" (ref '(gnu packages guile) 'guile-git)) - ("guile-sqlite3" (ref '(gnu packages guile) 'guile-sqlite3)) - ("guile-gcrypt" (ref '(gnu packages gnupg) 'guile-gcrypt)) - ("gnutls" (ref '(gnu packages tls) 'gnutls)) + ("guile" (ref '(gnu packages guile) 'guile-3.0)) + ("guile-json" (ref '(gnu packages guile) 'guile3.0-json)) + ("guile-ssh" (ref '(gnu packages ssh) 'guile3.0-ssh)) + ("guile-git" (ref '(gnu packages guile) 'guile3.0-git)) + ("guile-sqlite3" (ref '(gnu packages guile) 'guile3.0-sqlite3)) + ("guile-gcrypt" (ref '(gnu packages gnupg) 'guile3.0-gcrypt)) + ("gnutls" (ref '(gnu packages tls) 'guile3.0-gnutls)) ("zlib" (ref '(gnu packages compression) 'zlib)) ("lzlib" (ref '(gnu packages compression) 'lzlib)) ("gzip" (ref '(gnu packages compression) 'gzip)) @@ -1120,9 +1120,9 @@ is not supported." version)) (define guile - ;; When PULL-VERSION >= 1, produce a self-contained Guix and use Guile 2.2 - ;; unconditionally. - (default-guile)) + ;; When PULL-VERSION >= 1, produce a self-contained Guix and use the + ;; current Guile unconditionally. + (specification->package "guile")) (when (and (< pull-version 1) (not (string=? (package-version guile) guile-version))) @@ -1141,7 +1141,7 @@ is not supported." (shorten version)) #:pull-version pull-version #:guile-version (if (>= pull-version 1) - "2.2" guile-version) + "3.0" guile-version) #:guile-for-build guile))) (if guix (lower-object guix) -- cgit v1.2.3 From 039cb8e6b11928639915eba40a9ead1bed1fef5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 23 Jan 2020 23:33:22 +0100 Subject: news: Add entry for Guile 3.0. * etc/news.scm: Add entry for Guile 3.0. --- etc/news.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/etc/news.scm b/etc/news.scm index e0894ca7ab..1b40a13f46 100644 --- a/etc/news.scm +++ b/etc/news.scm @@ -1,6 +1,6 @@ ;; GNU Guix news, for use by 'guix pull'. ;; -;; Copyright © 2019 Ludovic Courtès +;; Copyright © 2019, 2020 Ludovic Courtès ;; ;; Copying and distribution of this file, with or without modification, are ;; permitted in any medium without royalty provided the copyright notice and @@ -9,6 +9,14 @@ (channel-news (version 0) + (entry (commit "8234fe653e61d0090138cbd4c48d877568355439") + (title (en "Guix now runs on Guile 3.0")) + (body (en "The Guix revision you just pulled runs on version 3.0 of +GNU@tie{}Guile (previously it would run on version 2.2). Guile 3.0 improves +performance through the use of just-in-time (JIT) native code generation. The +switch should be entirely transparent to you. See +@uref{https://gnu.org/software/guile} for more information on Guile 3.0."))) + (entry (commit "828a39da68a9169ef1d9f9ff02a1c66b1bcbe884") (title (en "New @option{--diff} option for @command{guix challenge}") (de "Neue @option{--diff}-Option für @command{guix challenge}")) -- cgit v1.2.3 From 44e70dee184c4e4190349def71dc07f05822f591 Mon Sep 17 00:00:00 2001 From: Mike Rosset Date: Thu, 16 Jan 2020 11:48:26 -0800 Subject: gnu: tuxguitar: Build and install ALSA plugin. * gnu/packages/music.scm (tuxguitar): Allows MIDI sound output when using a synthesizer like TiMidity++. [inputs]: Add alsa-lib. [arguments]: No longer change build directory context between phases. Install desktop, mime and manual files during the "install" phase. Signed-off-by: Kei Kebreau --- gnu/packages/music.scm | 90 +++++++++++++++++++++++++++++++++----------------- 1 file changed, 59 insertions(+), 31 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index ad369bd3a8..41952d405b 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1749,58 +1749,84 @@ is subjective.") #:tests? #f ; no tests #:phases (modify-phases %standard-phases - (add-after 'unpack 'enter-dir - (lambda _ (chdir "TuxGuitar-lib") #t)) - (add-after 'build 'build-libraries + (replace 'build (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((initial-classpath (getenv "CLASSPATH")) (build-dir (lambda (dir) - (chdir "..") - (setenv "CLASSPATH" - (string-join (cons initial-classpath - (find-files (getcwd) "\\.jar$")) - ":")) - (chdir dir) - (if (file-exists? "build.xml") - ((assoc-ref %standard-phases 'build) - #:build-target "build") - (begin - ;; Generate default build.xml. - ((@@ (guix build ant-build-system) default-build.xml) - (string-append (string-downcase dir) ".jar") - (string-append (assoc-ref outputs "out") - "/share/java")) - ((assoc-ref %standard-phases 'build))))))) - (map build-dir '("TuxGuitar-editor-utils" + (setenv + "CLASSPATH" + (string-join (cons initial-classpath + (find-files (getcwd) "\\.jar$")) + ":")) + (with-directory-excursion dir + (if (file-exists? "build.xml") + ((assoc-ref %standard-phases 'build) + #:build-target "build") + (begin + ;; Generate default build.xml. + ((@@ (guix build ant-build-system) + default-build.xml) + (string-append (string-downcase dir) ".jar") + (string-append (assoc-ref outputs "out") + "/share/java")) + ((assoc-ref %standard-phases 'build)))))))) + (map build-dir '("TuxGuitar-lib" + "TuxGuitar-editor-utils" "TuxGuitar-ui-toolkit" "TuxGuitar-ui-toolkit-swt" - "TuxGuitar-awt-graphics"))))) - (add-after 'build-libraries 'build-application + "TuxGuitar-viewer" + "TuxGuitar" + "TuxGuitar-gm-utils" + "TuxGuitar-alsa" + "TuxGuitar-midi" + "TuxGuitar-midi-ui")) + #t))) + (add-after 'build 'build-jni (lambda _ - (chdir "../TuxGuitar") - ((assoc-ref %standard-phases 'build) - #:build-target "build"))) + (setenv "CC" "gcc") + (setenv "CFLAGS" (string-append + "-fpic -I" + (getcwd) + "/build-scripts/native-modules/common-include")) + (invoke "make" "-C" "./TuxGuitar-alsa/jni" "-f" "GNUmakefile"))) (replace 'install (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin")) (share (string-append out "/share")) + (jni-lib (string-append out "/lib")) (lib (string-append share "/java")) - (swt (assoc-ref inputs "java-swt"))) + (swt (assoc-ref inputs "java-swt")) + (mime (string-append share "/mime/packages")) + (app (string-append share "/applications")) + (man (string-append share "/man/man1"))) + (mkdir-p bin) ;; Install all jars. (for-each (lambda (file) (install-file file lib)) - (find-files ".." "\\.jar$")) + (find-files "." "\\.jar$")) + + ;; Install jni libraries + (for-each (lambda (file) + (install-file file jni-lib)) + (find-files "." "\\-jni.so$")) ;; Install all resources. - (copy-recursively "share" share) + (copy-recursively "./TuxGuitar/share" share) + + ;; Install desktop and mime files + (install-file "./misc/tuxguitar.xml" mime) + (install-file "./misc/tuxguitar.desktop" app) + + ;; Install manaual + (install-file "./misc/tuxguitar.1" man) ;; Create wrapper. (call-with-output-file (string-append bin "/tuxguitar") (lambda (port) - (let ((classpath (string-join (append (find-files lib "\\.jar$") - (find-files swt "\\.jar$")) + (let ((classpath (string-join (append (find-files lib "\\.jar$") + (find-files swt "\\.jar$")) ":"))) (format port @@ -1810,12 +1836,14 @@ is subjective.") " -Dtuxguitar.home.path=" out " -Dtuxguitar.share.path=" out "/share" " -Dswt.library.path=" swt "/lib" + " -Djava.library.path=" out "/lib" " org.herac.tuxguitar.app.TGMainSingleton" " \"$1\" \"$2\""))))) (chmod (string-append bin "/tuxguitar") #o555) #t)))))) (inputs - `(("java-swt" ,java-swt))) + `(("alsa-lib" ,alsa-lib) + ("java-swt" ,java-swt))) (home-page "http://tuxguitar.com.ar/") (synopsis "Multitrack tablature editor and player") (description -- cgit v1.2.3 From cf5c44a30807bc74982d7cacc4d264b4635e40dd Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 23 Jan 2020 23:14:04 -0500 Subject: gnu: linux-libre: Update deblob scripts. * gnu/packages/linux.scm (deblob-scripts-5.4, deblob-scripts-4.19) (deblob-scripts-4.14, deblob-scripts-4.9, deblob-scripts-4.4): Update to 5.4.14, 4.19.98, 4.14.167, 4.9.211, and 4.4.211, respectively, and update hashes. --- gnu/packages/linux.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 829bb09447..8c7d163372 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -189,33 +189,33 @@ defconfig. Return the appropriate make target if applicable, otherwise return (define deblob-scripts-5.4 (linux-libre-deblob-scripts - "5.4.4" + "5.4.14" (base32 "0ckxn7k5zgcqk30dq943bnamr6a6zjbw2aqjl3x30f4kvh5f6k25") - (base32 "09hy3jqb8lny861pxjbjvzg90imi8p7z10j14xp0rclxmyb81rk3"))) + (base32 "121px6030s89jh975sw0whwq315al6px1s7ildz3asql97bjdgc8"))) (define deblob-scripts-4.19 (linux-libre-deblob-scripts - "4.19.90" + "4.19.98" (base32 "02zs405awaxydbapka4nz8h6lmnc0dahgczqsrs5s2bmzjyyqkcy") - (base32 "0xpcl6pd1280gm81bivz45dfhy6v16j0hghxhjynmcbasgnx8vpd"))) + (base32 "1w2wgxblpq09i33qmqgw5v3r5rm9vkkygr6m0sgv4zgczk9s29wr"))) (define deblob-scripts-4.14 (linux-libre-deblob-scripts - "4.14.159" + "4.14.167" (base32 "091jk9jkn9jf39bxpc7395bhcb7p96nkg3a8047380ki06lnfxh6") - (base32 "0yd0c3qxk5rm686j4kd5v4zppjj3k9ivqnv46z4p3xh1gqmhv7cz"))) + (base32 "1qij18inijj6c3ma8hv98yjagnzxdxyn134da9fd23ky8q6hbvky"))) (define deblob-scripts-4.9 (linux-libre-deblob-scripts - "4.9.206" + "4.9.211" (base32 "1wvldzlv7q2xdbadas87dh593nxr4a8p5n0f8zpm72lja6w18hmg") - (base32 "0is8gn4qdd7h5l6lacvhqdch26lmrbgxfm8ab7fx8n85ha7y358w"))) + (base32 "0fxajshb75siq39lj5h8xvhdj8lcmddkslwlyj65rhlwk6g2r4b2"))) (define deblob-scripts-4.4 (linux-libre-deblob-scripts - "4.4.206" + "4.4.211" (base32 "0x2j1i88am54ih2mk7gyl79g25l9zz4r08xhl482l3fvjj2irwbw") - (base32 "12ac4g3ky8yma8sylmxvvysqvd4hnaqjiwmxrxb6wlxggfd7zkbx"))) + (base32 "0hhin1jpfkd6nwrb6xqxjzl3hdxy4pn8a15hy2d3d83yw6pflbsf"))) (define* (computed-origin-method gexp-promise hash-algo hash #:optional (name "source") -- cgit v1.2.3 From bbc87d09d07716d7940b48e8a39d6a6a88a7c32d Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 23 Jan 2020 23:08:32 -0500 Subject: gnu: linux-libre@4.4: Update to 4.4.211. * gnu/packages/linux.scm (linux-libre-4.4-version): Update to 4.4.211. (linux-libre-4.4-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8c7d163372..f74468180a 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -389,10 +389,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.9))) -(define-public linux-libre-4.4-version "4.4.210") +(define-public linux-libre-4.4-version "4.4.211") (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) - (hash (base32 "1pg754s3138d2lq5y2zd1z7dagdy8pl4ifmp0754sa1rkjd3h0ns"))) + (hash (base32 "1f6qz4bvjn18cfcg3wwfsl75aw2kxwn28r228kdic9aibhy6rpvp"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.4))) -- cgit v1.2.3 From fad00f1a75bafbdf0caea808a27e1366abf462be Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 23 Jan 2020 23:09:31 -0500 Subject: gnu: linux-libre@4.9: Update to 4.9.211. * gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.211. (linux-libre-4.9-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index f74468180a..5d6ce29ab4 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -381,10 +381,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.14))) -(define-public linux-libre-4.9-version "4.9.210") +(define-public linux-libre-4.9-version "4.9.211") (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "04skcbbp1yv54hwipa1pjx04lb21013r0lh2swycq0kdhc1m54d0"))) + (hash (base32 "1gmi27ih5ys1wxbrnc4a5dr9vw9ngccs9xpa2p0gsk4pbn6n15r5"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -- cgit v1.2.3 From 666581fd57771d1bc55183ed5af686348b8a9dc6 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 23 Jan 2020 23:10:02 -0500 Subject: gnu: linux-libre@4.14: Update to 4.14.167. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.167. (linux-libre-4.14-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 5d6ce29ab4..e5eb99476f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -373,10 +373,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.166") +(define-public linux-libre-4.14-version "4.14.167") (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "003wax7dsahlv1iv9yqhkjbxx20crmwyd9464cx974i03a0vzclb"))) + (hash (base32 "0hzyb5k6adhg4vkhix21kg7z6gdzyk1dnzylvbsz9yh2m73qzdrb"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit v1.2.3 From e0376b60e1bf216091f2e7dab1f9392bd17f5c55 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 23 Jan 2020 23:10:38 -0500 Subject: gnu: linux-libre@4.19: Update to 4.19.98. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.98. (linux-libre-4.19-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e5eb99476f..8d072c6254 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -365,10 +365,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.97") +(define-public linux-libre-4.19-version "4.19.98") (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "1nln2ksfm0ddkqdmhvxwzqq96av1myx89kr1wxs54m2yw0la7clg"))) + (hash (base32 "0dr9vnaaycq77r49mj001zvkxhdyxkgh27dbjsaxcq1dq8xv3zli"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From c4bdd78a6ac9b3442817084c7e9298b09234db01 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 23 Jan 2020 23:11:14 -0500 Subject: gnu: linux-libre: Update to 5.4.14. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.14. (linux-libre-5.4-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8d072c6254..e5cc773ecc 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -357,10 +357,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." "linux-" version ".tar.xz")) (sha256 hash))) -(define-public linux-libre-5.4-version "5.4.13") +(define-public linux-libre-5.4-version "5.4.14") (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "1mva73ywb2r5lrmzp5m7hyy0zpgxdg91nw42c1z1sz3ydpcjkys9"))) + (hash (base32 "1w6pr0lcpkzjq4n0hnrj02ycdwzvz8lrgy23715zl5pmxsq1h7jk"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit v1.2.3 From 9be1f2b77c93034378938a08f4b02a693a305913 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 24 Jan 2020 10:07:58 +0200 Subject: gnu: openspin: Don't use unstable tarball. * gnu/packages/embedded.scm (openspin)[source]: Download using git-fetch. --- gnu/packages/embedded.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index 1f73e78fe0..b35c0a663c 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2016, 2017, 2018, 2019 Ricardo Wurmus ;;; Copyright © 2016, 2017 Theodoros Foradis ;;; Copyright © 2016 David Craven -;;; Copyright © 2017 Efraim Flashner +;;; Copyright © 2017, 2020 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2019 Clément Lassieur ;;; @@ -753,13 +753,14 @@ Propeller micro-controller development.") (name "openspin") (version "1.00.78") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/parallaxinc/" - "OpenSpin/archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/parallaxinc/OpenSpin") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1k2dbz1v604g4r2d9qhckg2m8dnhiya760mbsqfsg4waxal87yb7")))) + "0ghk8hj4717ydhqzx2pfs6737s1cxng6sgg2xgbkwvcfclxdbrd0")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests -- cgit v1.2.3 From 02aab3df21d4f43076f4d34c600cb55dff448dab Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 24 Jan 2020 10:16:07 +0200 Subject: gnu: spin2cpp: Don't use unstable tarball. * gnu/packages/embedded.scm (spin2cpp)[source]: Download using git-fetch. --- gnu/packages/embedded.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index b35c0a663c..43075603c8 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -827,13 +827,14 @@ upload binaries to a Parallax Propeller micro-controller.") (name "spin2cpp") (version "3.6.4") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/totalspectrum/spin2cpp/" - "archive/v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/totalspectrum/spin2cpp") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "05qak187sn0xg7vhrxw27b19xhmid1b8ab8kax3gv0faavzablfw")))) + "0wznqvsckzzz4hdy2rpvj6jqpxw4yn7i0c7zxfm6i46k8gg9327b")))) (build-system gnu-build-system) (arguments `(#:tests? #f ;; The tests assume that a micro-controller is connected. -- cgit v1.2.3 From fe1506a0ca5c48ef927bc207a6d08c7573c1ae25 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 24 Jan 2020 10:24:12 +0200 Subject: gnu: stlink: Don't use unstable tarball. * gnu/packages/embedded.scm (stlink)[source]: Download using git-fetch. --- gnu/packages/embedded.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index 43075603c8..d5ea86225e 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -1262,13 +1262,14 @@ and displaying decoded target responses. (version "1.5.1") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/texane/stlink/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/texane/stlink") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "01z1cz1a5xbbhd163qrqcgp4bi1k145pb80jmwdz50g7sfzmy570")))) + "1d5gxiqpsm8fc105cxlp27af9fk339fap5h6nay21x5a7n61jgyc")))) (build-system cmake-build-system) (arguments `(#:tests? #f ;no tests -- cgit v1.2.3 From cc17b07a02b021cb1f6f1b0914f7aed4c3a7304c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 24 Jan 2020 10:26:53 +0200 Subject: gnu: jimtcl: Don't use unstable tarball. * gnu/packages/embedded.scm (jimtcl)[source]: Download using git-fetch. --- gnu/packages/embedded.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index d5ea86225e..b655a88129 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -461,14 +461,14 @@ SEGGER J-Link and compatible devices.") (name "jimtcl") (version "0.77") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/msteveb/jimtcl" - "/archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/msteveb/jimtcl") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1cmk3qscqckg70chjyimzxa2qcka4qac0j4wq908kiijp45cax08")))) + "06d9gdgvi6cwd6pjg3xig0kkjqm6kgq3am8yq1xnksyz2n09f0kp")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From fd7ad899486cce2f8c88e429fb7488c755ab1811 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 24 Jan 2020 10:31:18 +0200 Subject: gnu: jimtcl: Update to 0.79. * gnu/packages/embedded.scm (jimtcl): Update to 0.79. [home-page]: Update home-page. --- gnu/packages/embedded.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index b655a88129..08c8533812 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -459,7 +459,7 @@ SEGGER J-Link and compatible devices.") (define-public jimtcl (package (name "jimtcl") - (version "0.77") + (version "0.79") (source (origin (method git-fetch) (uri (git-reference @@ -468,7 +468,7 @@ SEGGER J-Link and compatible devices.") (file-name (git-file-name name version)) (sha256 (base32 - "06d9gdgvi6cwd6pjg3xig0kkjqm6kgq3am8yq1xnksyz2n09f0kp")))) + "1k88hz0v3bi19xdvlp0i9nsx38imzwpjh632w7326zwbv2wldf0h")))) (build-system gnu-build-system) (arguments `(#:phases @@ -479,7 +479,7 @@ SEGGER J-Link and compatible devices.") (let ((out (assoc-ref outputs "out"))) (invoke "./configure" (string-append "--prefix=" out)))))))) - (home-page "http://jim.tcl.tk") + (home-page "http://jim.tcl.tk/index.html") (synopsis "Small footprint Tcl implementation") (description "Jim is a small footprint implementation of the Tcl programming language.") -- cgit v1.2.3 From 4250a9638d1d0bfeed8f1bcb6ae31919132d8927 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Fri, 24 Jan 2020 02:17:39 -0800 Subject: gnu: pinfo: Fix spelling of "additionally". * gnu/packages/texinfo (pinfo)[description]: Fix typo. --- gnu/packages/texinfo.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm index 44800b3961..6f0aeac534 100644 --- a/gnu/packages/texinfo.scm +++ b/gnu/packages/texinfo.scm @@ -233,6 +233,6 @@ Texi2HTML.") "Pinfo is an Info file viewer. Pinfo is similar in use to the Lynx web browser. You just move across info nodes, and select links, follow them, etc. It supports many colors. Pinfo also supports viewing of manual pages -- they -are colorized like in the midnight commander's viewer, and additionaly they +are colorized like in the midnight commander's viewer, and additionally they are hypertextualized.") (license gpl2+))) -- cgit v1.2.3 From a6d35eb4553e33b2dd6c829060232656c6b21d47 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Fri, 24 Jan 2020 02:20:00 -0800 Subject: gnu: ocaml-mmap: Fix spelling of "function". * gnu/packages/ocaml (ocaml-mmap)[description]: Fix typo. --- 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 098c116cf3..a278504ae0 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1765,7 +1765,7 @@ through Transport Layer Security (@dfn{TLS}) encrypted connections.") (synopsis "File mapping for OCaml") (description "This project provides a @command{Mmap.map_file} function for mapping files in memory. This function is the same as the -@command{Unix.map_file} funciton added in OCaml >= 4.06.") +@command{Unix.map_file} function added in OCaml >= 4.06.") (license (list license:qpl license:lgpl2.0)))) (define-public ocaml-lwt -- cgit v1.2.3 From a8d73e699eaf81f7cba94a22cea4e1ed6365dad8 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Fri, 24 Jan 2020 02:22:20 -0800 Subject: gnu: ghc-time-compat: Fix typo "This package". * gnu/packages/haskell-xyz (ghc-time-compat)[description]: Fix typo. --- gnu/packages/haskell-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 94e9a22115..af940f02fc 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -11742,7 +11742,7 @@ function which generates instances.") ("1" "0k8ph4sydaiqp8dav4if6hpiaq8h1xsr93khmdr7a1mmfwdxr64r"))) (home-page "https://github.com/phadej/time-compat") (synopsis "Compatibility package for time") - (description "This packages tries to compat as many @code{time} + (description "This package tries to compat as many @code{time} features as possible.") (license license:bsd-3))) -- cgit v1.2.3 From 41d06fff1f1ff2c2af1c66a07ffcafcb4bc051c6 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Fri, 24 Jan 2020 02:24:43 -0800 Subject: gnu: emacs-helm-clojuredocs: Fix typo "This package". * gnu/packages/emacs-xyz (emacs-helm-clojuredocs)[description]: Fix typo. --- 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 40839d4869..ece8d35a22 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -20998,7 +20998,7 @@ data format @code{edn}. See @url{https://github.com/edn-format/edn}.") `(("emacs-helm" ,emacs-helm) ("emacs-edn" ,emacs-edn))) (synopsis "Search help on clojuredocs.org with Helm") - (description "This packages provides a Helm interface to lookup Clojure + (description "This package provides a Helm interface to lookup Clojure documentation on @url{https://clojuredocs.org} with Helm. Two function are exposed: -- cgit v1.2.3 From 57c844bea7b9ba65771e33995d76c791084206f4 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Fri, 24 Jan 2020 02:27:53 -0800 Subject: gnu: rust-which-2.0: Fix spelling of "executable". * gnu/packages/crates-io (rust-which-2.0)[description]: Fix typo. --- gnu/packages/crates-io.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 19a84f5cdb..348a7b8d57 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13582,7 +13582,7 @@ attribute that is not in the shared backend crate.") (synopsis "Rust equivalent of Unix command \"which\"") (description "This package provides a Rust equivalent of Unix command \"which\". -Locate installed execuable in cross platforms.") +Locate installed executable in cross platforms.") (license license:expat))) (define-public rust-widestring-0.4 -- cgit v1.2.3 From b36d13287313b1170943ee885a8c5d17f28253fe Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Fri, 24 Jan 2020 02:29:10 -0800 Subject: gnu: rust-rust-argon2-0.5: Fix spelling of "contains". * gnu/packages/crates-io (rust-rust-argon2-0.5)[description]: Fix typo. --- gnu/packages/crates-io.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 348a7b8d57..8e1ff51e5c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9544,7 +9544,7 @@ uses finite automata and guarantees linear time matching on all inputs.") (("rust-hex" ,rust-hex-0.3)))) (home-page "https://github.com/sru-systems/rust-argon2") (synopsis "Rust implementation of the Argon2 password hashing function") - (description "This package contans a rust implementation of the Argon2 + (description "This package contains a rust implementation of the Argon2 password hashing function.") (license (list license:expat license:asl2.0)))) -- cgit v1.2.3 From d16a1c935626839a2338f447dda632427b3fc04c Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Fri, 24 Jan 2020 02:30:35 -0800 Subject: gnu: rust-serde-bytes-0.11: Fix spelling of "handle". * gnu/packages/crates-io (rust-serde-bytes-0.11)[synopsis]: Fix typo. --- gnu/packages/crates-io.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 8e1ff51e5c..8155bd7a94 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10219,7 +10219,7 @@ proven statistical guarantees.") ("rust-serde-test" ,rust-serde-test-1.0)))) (home-page "https://github.com/serde-rs/bytes") (synopsis - "Hanlde of integer arrays and vectors for Serde") + "Handle of integer arrays and vectors for Serde") (description "Optimized handling of @code{&[u8]} and @code{Vec} for Serde.") (license (list license:expat license:asl2.0)))) -- cgit v1.2.3 From 5b98473a1ffa84b27df292b3190b31e07441cb67 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Fri, 24 Jan 2020 02:32:37 -0800 Subject: gnu: r-biocset: Fix spelling of "ability". * gnu/packages/bioconductor (r-biocset)[description]: Fix typo. --- gnu/packages/bioconductor.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index e2b4f6ea7f..562e151fef 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -7349,7 +7349,7 @@ analytics on packages.") (description "BiocSet displays different biological sets in a triple tibble format. These three tibbles are @code{element}, @code{set}, and @code{elementset}. -The user has the abilty to activate one of these three tibbles to perform +The user has the ability to activate one of these three tibbles to perform common functions from the @code{dplyr} package. Mapping functionality and accessing web references for elements/sets are also available in BiocSet.") (license license:artistic2.0))) -- cgit v1.2.3 From cd17ac4483d93383c03eeb8445e82b9a4e105e57 Mon Sep 17 00:00:00 2001 From: Florian Pelz Date: Fri, 24 Jan 2020 16:39:45 +0100 Subject: news: Add 'de' translation. * etc/news.scm: Add 'de' translation. --- etc/news.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/etc/news.scm b/etc/news.scm index 1b40a13f46..03f77ed857 100644 --- a/etc/news.scm +++ b/etc/news.scm @@ -10,12 +10,20 @@ (version 0) (entry (commit "8234fe653e61d0090138cbd4c48d877568355439") - (title (en "Guix now runs on Guile 3.0")) + (title (en "Guix now runs on Guile 3.0") + (de "Guix läuft jetzt auf Guile 3.0")) (body (en "The Guix revision you just pulled runs on version 3.0 of GNU@tie{}Guile (previously it would run on version 2.2). Guile 3.0 improves performance through the use of just-in-time (JIT) native code generation. The switch should be entirely transparent to you. See -@uref{https://gnu.org/software/guile} for more information on Guile 3.0."))) +@uref{https://gnu.org/software/guile} for more information on Guile 3.0.") + (de "Die Guix-Version, die Sie gerade gepullt haben, läuft auf +Version 3.0 von GNU@tie{}Guile (und nicht mehr auf Version 2.2). Guile 3.0 +verbessert die Rechenleistung, indem native Maschinenbefehle „just in time“ +erzeugt werden (JIT-Kompilierung). Der Wechsel sollte für Sie völlig +transparent sein und Guix verhält sich gleich. Siehe +@uref{https://gnu.org/software/guile} für weitere Informationen zu Guile +3.0."))) (entry (commit "828a39da68a9169ef1d9f9ff02a1c66b1bcbe884") (title (en "New @option{--diff} option for @command{guix challenge}") -- cgit v1.2.3 From 77c4ef1af9f6ad14f131539650d427fc85e91fe9 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 24 Jan 2020 18:06:02 +0100 Subject: gnu: emacs-xr: Update to 1.14. * gnu/packages/emacs-xyz.scm (emacs-xr): Update to 1.14. --- gnu/packages/emacs-xyz.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index ece8d35a22..ef6a25580a 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -959,15 +959,13 @@ in certain cases. It also enables recursion for anonymous functions.") (define-public emacs-xr (package (name "emacs-xr") - (version "1.13") + (version "1.14") (source (origin (method url-fetch) - (uri (string-append - "https://elpa.gnu.org/packages/xr-" version ".tar")) + (uri (string-append "https://elpa.gnu.org/packages/xr-" version ".tar")) (sha256 - (base32 - "1km4x92pii8c4bcimks4xzhmwpypdf183z0zh7raj062jz4jb74r")))) + (base32 "1hfl7jvimgdgi2mwsx9laxcywp4n6k6vfkanjwm3sf27awqz7ngs")))) (build-system emacs-build-system) (home-page "https://elpa.gnu.org/packages/xr.html") (synopsis "Convert string regexp to rx notation") -- cgit v1.2.3 From 762867313cb26bee32fafb6821a7ef7584c537c2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 24 Jan 2020 18:18:47 +0100 Subject: =?UTF-8?q?news:=20Add=20=E2=80=98nl=E2=80=99=20translation.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * * etc/news.scm: Add ‘nl’ translation. --- etc/news.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/etc/news.scm b/etc/news.scm index 03f77ed857..6b58e7742b 100644 --- a/etc/news.scm +++ b/etc/news.scm @@ -11,7 +11,8 @@ (entry (commit "8234fe653e61d0090138cbd4c48d877568355439") (title (en "Guix now runs on Guile 3.0") - (de "Guix läuft jetzt auf Guile 3.0")) + (de "Guix läuft jetzt auf Guile 3.0") + (nl "Guix draait nu op Guile 3.0")) (body (en "The Guix revision you just pulled runs on version 3.0 of GNU@tie{}Guile (previously it would run on version 2.2). Guile 3.0 improves performance through the use of just-in-time (JIT) native code generation. The @@ -23,7 +24,13 @@ verbessert die Rechenleistung, indem native Maschinenbefehle „just in time“ erzeugt werden (JIT-Kompilierung). Der Wechsel sollte für Sie völlig transparent sein und Guix verhält sich gleich. Siehe @uref{https://gnu.org/software/guile} für weitere Informationen zu Guile -3.0."))) +3.0.") + (nl "De Guix die u net heeft gepulld gebruikt versie 3.0 van +GNU@tie{}Guile (voorheen was dat versie 2.2). Guile@tie{}3.0 draait dezelfde +programma's doorgaans sneller door ze ‘just-in-time’ (JIT) te vertalen naar +machine-instructies. De omschakeling zou voor u volledig naadloos moeten +zijn. Lees @uref{https://gnu.org/software/guile} voor meer informatie over +Guile@tie{}3.0."))) (entry (commit "828a39da68a9169ef1d9f9ff02a1c66b1bcbe884") (title (en "New @option{--diff} option for @command{guix challenge}") -- cgit v1.2.3 From 1b0290255399cdd695a4a669d886036654bf3a57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20K=C4=85dzio=C5=82ka?= Date: Wed, 22 Jan 2020 18:47:32 +0100 Subject: gnu: Add megacmd. * gnu/packages/sync.scm (megacmd): New variable. Signed-off-by: Christopher Baines --- gnu/packages/sync.scm | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index 0921c00b56..0bde5d0a2c 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2018 Ludovic Courtès ;;; Copyright © 2018, 2019 Nicolas Goaziou ;;; Copyright © 2019 Clément Lassieur +;;; Copyright © 2020 Jakub Kądziołka ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,6 +25,7 @@ (define-module (gnu packages sync) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix build-system cmake) + #:use-module (guix build-system gnu) #:use-module (guix build-system go) #:use-module (guix build-system meson) #:use-module (guix download) @@ -31,21 +33,73 @@ #:use-module (guix packages) #:use-module (gnu packages) #:use-module (gnu packages acl) + #:use-module (gnu packages adns) + #:use-module (gnu packages autotools) #:use-module (gnu packages check) #:use-module (gnu packages compression) + #:use-module (gnu packages crypto) #:use-module (gnu packages curl) #:use-module (gnu packages golang) + #:use-module (gnu packages image) #:use-module (gnu packages linux) #:use-module (gnu packages lua) + #:use-module (gnu packages pcre) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages qt) + #:use-module (gnu packages readline) #:use-module (gnu packages rsync) #:use-module (gnu packages selinux) #:use-module (gnu packages sphinx) #:use-module (gnu packages sqlite) #:use-module (gnu packages tls)) +(define-public megacmd + (package + (name "megacmd") + (version "1.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/meganz/MEGAcmd.git") + (commit (string-append version "_Linux")) + (recursive? #t))) + (sha256 + (base32 + "004j8m3xs6slx03g2g6wzr97myl2v3zc09wxnfar5c62a625pd53")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + ;; XXX: Disabling tests because they depend on libgtest.la from googletest, + ;; which is not installed for unclear reasons. + (arguments + `(#:tests? #f + #:configure-flags '("--with-pcre"))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool))) + (inputs + `(("c-ares" ,c-ares) + ("crypto++" ,crypto++) + ("curl" ,curl) + ("freeimage" ,freeimage) + ("gtest" ,googletest) + ("openssl" ,openssl) + ("pcre" ,pcre) + ("readline" ,readline) + ("sodium" ,libsodium) + ("sqlite3" ,sqlite) + ("zlib" ,zlib))) + (home-page "https://mega.nz/cmd") + (synopsis + "Command Line Interactive and Scriptable Application to access mega.nz") + (description "MEGAcmd provides non UI access to MEGA services. It intends +to offer all the functionality of a MEGA account via commands. It features +synchronization, backup of local folders into a MEGA account and a +webdav/streaming server.") + (license (list license:bsd-2 license:gpl3+)))) + (define-public owncloud-client (package (name "owncloud-client") -- cgit v1.2.3 From 3e67182fb1b928a695718441124bec14a86ec7be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20K=C4=85dzio=C5=82ka?= Date: Thu, 23 Jan 2020 16:20:00 +0100 Subject: gnu: Add megatools. * gnu/packages/sync.scm (megatools): New variable. (megacmd)[description]: Cross-reference the two packages in the description. Signed-off-by: Christopher Baines --- gnu/packages/sync.scm | 43 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index 0bde5d0a2c..d4a48c48c5 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -39,6 +39,8 @@ #:use-module (gnu packages compression) #:use-module (gnu packages crypto) #:use-module (gnu packages curl) + #:use-module (gnu packages documentation) + #:use-module (gnu packages glib) #:use-module (gnu packages golang) #:use-module (gnu packages image) #:use-module (gnu packages linux) @@ -97,9 +99,48 @@ (description "MEGAcmd provides non UI access to MEGA services. It intends to offer all the functionality of a MEGA account via commands. It features synchronization, backup of local folders into a MEGA account and a -webdav/streaming server.") +webdav/streaming server. + +See also: megatools, a third-party alternative more commonly packaged in other +distributions.") (license (list license:bsd-2 license:gpl3+)))) +(define-public megatools + (package + (name "megatools") + (version "1.10.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://megatools.megous.com/builds/megatools-" + version ".tar.gz")) + (sha256 + (base32 + "12n32w5mqvpk0hvh9yg9qkj9i0g2wp7jp9rq28bnqs94iv3897hp")))) + (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ;; For documentation + ("asciidoc" ,asciidoc))) + (inputs + `(("curl" ,curl) + ("glib" ,glib) + ("openssl" ,openssl))) + (home-page "https://megatools.megous.com/") + (synopsis "Command line client application for mega.nz") + (description "Megatools is a collection of programs for accessing the mega.nz service +from the command line. + +Megatools allow you to copy individual files as well as entire directory trees to and from +the cloud. You can also perform streaming downloads for example to preview videos and +audio files, without needing to download the entire file first. + +Megatools are robust and optimized for fast operation - as fast as Mega servers allow. +Memory requirements and CPU utilization are kept at minimum. + +See also: megacmd, the official tool set by MEGA.") + (license license:gpl2))) + (define-public owncloud-client (package (name "owncloud-client") -- cgit v1.2.3 From 4b506a3f2b598c123a81ebcf7f5d91da37947655 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 24 Jan 2020 20:21:27 +0100 Subject: gnu: wine: Update to 5.0. * gnu/packages/wine.scm (wine): Update to 5.0. --- gnu/packages/wine.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 258980803a..26d6e50f50 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2016 Ricardo Wurmus ;;; Copyright © 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2017, 2018, 2019 Rutger Helling -;;; Copyright © 2017 Nicolas Goaziou +;;; Copyright © 2017, 2020 Nicolas Goaziou ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2019 Pierre Neidhardt ;;; @@ -76,15 +76,15 @@ (define-public wine (package (name "wine") - (version "4.0.3") - (source (origin - (method url-fetch) - (uri (string-append "https://dl.winehq.org/wine/source/" - (version-major+minor version) - "/wine-" version ".tar.xz")) - (sha256 - (base32 - "1nhgw1wm613ln9dhjm0d03zs5adcmnqr2b50p21jbmm5k2gns0i5")))) + (version "5.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://dl.winehq.org/wine/source/" + (version-major+minor version) + "/wine-" version ".tar.xz")) + (sha256 + (base32 "1d0kcy338radq07hrnzcpc9lc9j2fvzjh37q673002x8d6x5058q")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("gettext" ,gettext-minimal) -- cgit v1.2.3 From ffa37422ac67aacf31fe2e01baf93916a5d1ea87 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 24 Jan 2020 20:21:45 +0100 Subject: gnu: wine: Add FAudio input. * gnu/packages/wine.scm (wine)[inputs]: Add FAudio. --- gnu/packages/wine.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 26d6e50f50..a3022e045b 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -96,6 +96,7 @@ ("dbus" ,dbus) ("cups" ,cups) ("eudev" ,eudev) + ("faudio" ,faudio) ("fontconfig" ,fontconfig) ("freetype" ,freetype) ("glu" ,glu) -- cgit v1.2.3 From b8088be058e572818d00a538da2970e24880af69 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 24 Jan 2020 20:22:01 +0100 Subject: gnu: wine-staging: Update to 5.0. * gnu/packages/wine.scm (wine-staging-patchset-data): Update to 5.0. (wine-staging): Update to 5.0. [inputs]: Remove faudio, inherited from wine. --- gnu/packages/wine.scm | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index a3022e045b..ca5c969fff 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -323,7 +323,7 @@ integrate Windows applications into your desktop.") (define-public wine-staging-patchset-data (package (name "wine-staging-patchset-data") - (version "4.18") + (version "5.0") (source (origin (method git-fetch) @@ -332,7 +332,7 @@ integrate Windows applications into your desktop.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "03z0haf47mpm2aj9cji3wma4jy6j12wz10kkbgmbgrkkrc5lcqc2")))) + (base32 "054m2glvav29qnlgr3p36kahyv3kbxzba82djzqpc7cmsrin0d3f")))) (build-system trivial-build-system) (native-inputs `(("bash" ,bash) @@ -369,18 +369,21 @@ integrate Windows applications into your desktop.") (inherit wine) (name "wine-staging") (version (package-version wine-staging-patchset-data)) - (source (origin - (method url-fetch) - (uri (string-append - "https://dl.winehq.org/wine/source/" - (version-major version) ".x" - "/wine-" version ".tar.xz")) - (file-name (string-append name "-" version ".tar.xz")) - (sha256 - (base32 - "0chf6vdy41kg75liibkb862442zwi8dbjzf6l5arcy2z4580a2yi")))) - (inputs `(("autoconf" ,autoconf) ; for autoreconf - ("faudio" ,faudio) + (source + (origin + (method url-fetch) + (uri (let ((dir (string-append + (version-major version) + (if (string-suffix? ".0" (version-major+minor version)) + ".0" + ".x")))) + (string-append + "https://dl.winehq.org/wine/source/" dir + "/wine-" version ".tar.xz"))) + (file-name (string-append name "-" version ".tar.xz")) + (sha256 + (base32 "1d0kcy338radq07hrnzcpc9lc9j2fvzjh37q673002x8d6x5058q")))) + (inputs `(("autoconf" ,autoconf) ; for autoreconf ("ffmpeg" ,ffmpeg) ("gtk+" ,gtk+) ("libva" ,libva) -- cgit v1.2.3 From 049bdae52795f01030cb99d6fb271dc4b4ce9a7d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 24 Jan 2020 22:47:22 +0100 Subject: gnu: ode: Disable tests. * gnu/packages/game-development.scm (ode): Tests are failing or other systems than x86_64, so we disable them. --- gnu/packages/game-development.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index ee8dea23b5..72637a7929 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1998,7 +1998,8 @@ a.k.a. XenoCollide) as described in Game Programming Gems 7.") #t)))) (build-system cmake-build-system) (arguments - `(#:configure-flags '("-DODE_WITH_LIBCCD_SYSTEM=ON") + `(#:tests? #f ;tests fail on all systems but x86_64 + #:configure-flags '("-DODE_WITH_LIBCCD_SYSTEM=ON") #:phases (modify-phases %standard-phases (add-after 'unpack 'unbundle-libccd -- cgit v1.2.3 From 690f90857c70de7bc36ce88def2d796086d6d039 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Fri, 24 Jan 2020 16:18:42 -0600 Subject: gnu: tdlib: Update to 1.5.5. * gnu/packages/messaging.scm (tdlib): Update to 1.5.5. --- gnu/packages/messaging.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 839f718134..81569d29b9 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1949,9 +1949,9 @@ Telegram messenger.") (license license:gpl2+))) (define-public tdlib - (let ((commit "80c35676a2eb1e9b71db355ee217bba79fbdce31") + (let ((commit "5efaf8c3b523797373c487d972ea514364e5eac2") (revision "1") - (version "1.5.4")) + (version "1.5.5")) (package (name "tdlib") (version (git-version version revision commit)) @@ -1962,7 +1962,7 @@ Telegram messenger.") (commit commit))) (sha256 (base32 - "09c0pygqirapgxxzcc3sr0x67qhz8cx2klznrbdyi0118r9s8a7a")) + "1grflgvqqxbf84yi09j60a1cpbcrv85yhj9a735agi32hgd51whi")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments -- cgit v1.2.3 From efff7e19fa0c37143c38a2fe596f2ef0d41429a3 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Fri, 24 Jan 2020 16:19:05 -0600 Subject: gnu: emacs-telega: Update to 0.5.10. * gnu/packages/emacs-xyz.scm (emacs-telega): Update to 0.5.10. --- gnu/packages/emacs-xyz.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index ef6a25580a..782fa7ade7 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -20420,9 +20420,9 @@ fish-completion. It can be used in both Eshell and M-x shell.") ;; This package has versions newer than indicated on MELPA. ;; Get the current version from `telega-version` in telega.el. ;; or by running M-x telega-version. - (let ((commit "69565cc4de72e28148c8041de8930a122a39b800") - (revision "4") - (version "0.5.4")) + (let ((commit "f6728934988140839a71550c9c18b65424ba6225") + (revision "0") + (version "0.5.10")) (package (name "emacs-telega") (version (git-version version revision commit)) @@ -20434,7 +20434,7 @@ fish-completion. It can be used in both Eshell and M-x shell.") (commit commit))) (sha256 (base32 - "0blvj07f1sbdmp68qwlwgnhnv42ib0mjai5ndf8scbi12drn4rmk")) + "1ijz1isxzssbhz6bxrqmn6wv2apx5rhvd9sbsclv1gaiz3wmkj7i")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 2aa1e76519199d800a334e7ef8883be34ea3dd62 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Fri, 24 Jan 2020 16:31:13 -0600 Subject: gnu: swi-prolog: Update to 8.1.21. * gnu/packages/prolog.scm (swi-prolog): Update to 8.1.21. --- gnu/packages/prolog.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/prolog.scm b/gnu/packages/prolog.scm index ca280f77fa..00b471fb6a 100644 --- a/gnu/packages/prolog.scm +++ b/gnu/packages/prolog.scm @@ -86,7 +86,7 @@ manner. It also features an interactive interpreter.") (define-public swi-prolog (package (name "swi-prolog") - (version "8.1.20") + (version "8.1.21") (source (origin (method git-fetch) (uri (git-reference @@ -96,7 +96,7 @@ manner. It also features an interactive interpreter.") (file-name (git-file-name name version)) (sha256 (base32 - "0blpw5g0gszi83wmvyhlh7pk4wlyx00vgaj6qr3ris36cdl8j10a")))) + "1axdiz37dllw0ih58ffm0m95dfxqfzwahl48hpzq90rz4swcr1lq")))) (build-system cmake-build-system) (arguments `(#:parallel-build? #t -- cgit v1.2.3 From a07d5e558b5403dad0a59776b950b6b02169c249 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 24 Jan 2020 10:13:10 +0100 Subject: ui: Do not display error messages with bare format strings. On Guile 3, with, say, an error in ~/.guile, we'd get: $ guix repl guix repl: error: Unbound variable: ~S * guix/ui.scm (call-with-error-handling): Add '&exception-with-kind-and-args' case. --- guix/ui.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/guix/ui.scm b/guix/ui.scm index 4857a88827..a47dafecd4 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -770,6 +770,17 @@ directories:~{ ~a~}~%") (gettext (condition-message c) %gettext-domain)) (display-hint (condition-fix-hint c)) (exit 1)) + + ;; On Guile 3.0.0, exceptions such as 'unbound-variable' come are + ;; compound and include a '&message'. However, that message only + ;; contains the format string. Thus, special-case it here to + ;; avoid displaying a bare format string. + ((cond-expand + (guile-3 + ((exception-predicate &exception-with-kind-and-args) c)) + (else #f)) + (raise c)) + ((message-condition? c) ;; Normally '&message' error conditions have an i18n'd message. (leave (G_ "~a~%") -- cgit v1.2.3 From 09238d618a511de80de189ff3ff18bfa0f280bb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 24 Jan 2020 18:13:38 +0100 Subject: guix build, archive, graph: Disable absolute file port name canonicalization. This avoids an 'lstat' storm. Specifically: ./pre-inst-env strace -c guix build -nd libreoffice goes from 1,711 to 214 'lstat' calls. * guix/scripts/build.scm (options->things-to-build): When SPEC matches 'derivation-path?', call 'canonicalize-path'. (guix-build): Remove 'with-fluids' for %FILE-PORT-NAME-CANONICALIZATION. * guix/scripts/archive.scm (guix-archive): Remove 'with-fluids' for %FILE-PORT-NAME-CANONICALIZATION. * guix/scripts/graph.scm (guix-graph): Likewise. --- guix/scripts/archive.scm | 65 +++++++++++------------ guix/scripts/build.scm | 131 ++++++++++++++++++++++++----------------------- guix/scripts/graph.scm | 27 +++++----- 3 files changed, 109 insertions(+), 114 deletions(-) diff --git a/guix/scripts/archive.scm b/guix/scripts/archive.scm index 2b4d39c7b8..4f39920fe7 100644 --- a/guix/scripts/archive.scm +++ b/guix/scripts/archive.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2019 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2019, 2020 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -371,36 +371,33 @@ output port." (cons line result))))) (with-error-handling - ;; Ask for absolute file names so that .drv file names passed from the - ;; user to 'read-derivation' are absolute when it returns. - (with-fluids ((%file-port-name-canonicalization 'absolute)) - (let ((opts (parse-command-line args %options (list %default-options)))) - (parameterize ((%graft? (assoc-ref opts 'graft?))) - (cond ((assoc-ref opts 'generate-key) - => - generate-key-pair) - ((assoc-ref opts 'authorize) - (authorize-key)) - (else - (with-status-verbosity (assoc-ref opts 'verbosity) - (with-store store - (set-build-options-from-command-line store opts) - (cond ((assoc-ref opts 'export) - (export-from-store store opts)) - ((assoc-ref opts 'import) - (import-paths store (current-input-port))) - ((assoc-ref opts 'missing) - (let* ((files (lines (current-input-port))) - (missing (remove (cut valid-path? store <>) - files))) - (format #t "~{~a~%~}" missing))) - ((assoc-ref opts 'list) - (list-contents (current-input-port))) - ((assoc-ref opts 'extract) - => - (lambda (target) - (restore-file (current-input-port) target))) - (else - (leave - (G_ "either '--export' or '--import' \ -must be specified~%"))))))))))))) + (let ((opts (parse-command-line args %options (list %default-options)))) + (parameterize ((%graft? (assoc-ref opts 'graft?))) + (cond ((assoc-ref opts 'generate-key) + => + generate-key-pair) + ((assoc-ref opts 'authorize) + (authorize-key)) + (else + (with-status-verbosity (assoc-ref opts 'verbosity) + (with-store store + (set-build-options-from-command-line store opts) + (cond ((assoc-ref opts 'export) + (export-from-store store opts)) + ((assoc-ref opts 'import) + (import-paths store (current-input-port))) + ((assoc-ref opts 'missing) + (let* ((files (lines (current-input-port))) + (missing (remove (cut valid-path? store <>) + files))) + (format #t "~{~a~%~}" missing))) + ((assoc-ref opts 'list) + (list-contents (current-input-port))) + ((assoc-ref opts 'extract) + => + (lambda (target) + (restore-file (current-input-port) target))) + (else + (leave + (G_ "either '--export' or '--import' \ +must be specified~%")))))))))))) diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm index bf307d1421..f054fc2bce 100644 --- a/guix/scripts/build.scm +++ b/guix/scripts/build.scm @@ -809,7 +809,11 @@ build---packages, gexps, derivations, and so on." (cond ((derivation-path? spec) (catch 'system-error (lambda () - (list (read-derivation-from-file spec))) + ;; Ask for absolute file names so that .drv file + ;; names passed from the user to 'read-derivation' + ;; are absolute when it returns. + (let ((spec (canonicalize-path spec))) + (list (read-derivation-from-file spec)))) (lambda args ;; Non-existent .drv files can be substituted down ;; the road, so don't error out. @@ -927,67 +931,64 @@ needed." (list %default-options))) (with-error-handling - ;; Ask for absolute file names so that .drv file names passed from the - ;; user to 'read-derivation' are absolute when it returns. - (with-fluids ((%file-port-name-canonicalization 'absolute)) - (with-status-verbosity (assoc-ref opts 'verbosity) - (with-store store - ;; Set the build options before we do anything else. - (set-build-options-from-command-line store opts) - - (parameterize ((current-terminal-columns (terminal-columns))) - (let* ((mode (assoc-ref opts 'build-mode)) - (drv (options->derivations store opts)) - (urls (map (cut string-append <> "/log") - (if (assoc-ref opts 'substitutes?) - (or (assoc-ref opts 'substitute-urls) - ;; XXX: This does not necessarily match the - ;; daemon's substitute URLs. - %default-substitute-urls) - '()))) - (items (filter-map (match-lambda - (('argument . (? store-path? file)) - ;; If FILE is a .drv that's not in - ;; store, keep it so that it can be - ;; substituted. - (and (or (not (derivation-path? file)) - (not (file-exists? file))) - file)) - (_ #f)) - opts)) - (roots (filter-map (match-lambda - (('gc-root . root) root) - (_ #f)) - opts))) - - (unless (or (assoc-ref opts 'log-file?) - (assoc-ref opts 'derivations-only?)) - (show-what-to-build store drv - #:use-substitutes? - (assoc-ref opts 'substitutes?) - #:dry-run? (assoc-ref opts 'dry-run?) - #:mode mode)) - - (cond ((assoc-ref opts 'log-file?) - ;; Pass 'show-build-log' the output file names, not the - ;; derivation file names, because there can be several - ;; derivations leading to the same output. - (for-each (cut show-build-log store <> urls) - (delete-duplicates - (append (map derivation->output-path drv) - items)))) - ((assoc-ref opts 'derivations-only?) - (format #t "~{~a~%~}" (map derivation-file-name drv)) - (for-each (cut register-root store <> <>) - (map (compose list derivation-file-name) drv) - roots)) - ((not (assoc-ref opts 'dry-run?)) - (and (build-derivations store (append drv items) - mode) - (for-each show-derivation-outputs drv) - (for-each (cut register-root store <> <>) - (map (lambda (drv) - (map cdr - (derivation->output-paths drv))) - drv) - roots))))))))))) + (with-status-verbosity (assoc-ref opts 'verbosity) + (with-store store + ;; Set the build options before we do anything else. + (set-build-options-from-command-line store opts) + + (parameterize ((current-terminal-columns (terminal-columns))) + (let* ((mode (assoc-ref opts 'build-mode)) + (drv (options->derivations store opts)) + (urls (map (cut string-append <> "/log") + (if (assoc-ref opts 'substitutes?) + (or (assoc-ref opts 'substitute-urls) + ;; XXX: This does not necessarily match the + ;; daemon's substitute URLs. + %default-substitute-urls) + '()))) + (items (filter-map (match-lambda + (('argument . (? store-path? file)) + ;; If FILE is a .drv that's not in + ;; store, keep it so that it can be + ;; substituted. + (and (or (not (derivation-path? file)) + (not (file-exists? file))) + file)) + (_ #f)) + opts)) + (roots (filter-map (match-lambda + (('gc-root . root) root) + (_ #f)) + opts))) + + (unless (or (assoc-ref opts 'log-file?) + (assoc-ref opts 'derivations-only?)) + (show-what-to-build store drv + #:use-substitutes? + (assoc-ref opts 'substitutes?) + #:dry-run? (assoc-ref opts 'dry-run?) + #:mode mode)) + + (cond ((assoc-ref opts 'log-file?) + ;; Pass 'show-build-log' the output file names, not the + ;; derivation file names, because there can be several + ;; derivations leading to the same output. + (for-each (cut show-build-log store <> urls) + (delete-duplicates + (append (map derivation->output-path drv) + items)))) + ((assoc-ref opts 'derivations-only?) + (format #t "~{~a~%~}" (map derivation-file-name drv)) + (for-each (cut register-root store <> <>) + (map (compose list derivation-file-name) drv) + roots)) + ((not (assoc-ref opts 'dry-run?)) + (and (build-derivations store (append drv items) + mode) + (for-each show-derivation-outputs drv) + (for-each (cut register-root store <> <>) + (map (lambda (drv) + (map cdr + (derivation->output-paths drv))) + drv) + roots)))))))))) diff --git a/guix/scripts/graph.scm b/guix/scripts/graph.scm index 53f407b2fc..fca1e3777c 100644 --- a/guix/scripts/graph.scm +++ b/guix/scripts/graph.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2019 Simon Tournier ;;; ;;; This file is part of GNU Guix. @@ -552,20 +552,17 @@ Emit a representation of the dependency graph of PACKAGE...\n")) (read/eval-package-expression exp))) (_ #f)) opts))) - ;; Ask for absolute file names so that .drv file names passed from the - ;; user to 'read-derivation' are absolute when it returns. - (with-fluids ((%file-port-name-canonicalization 'absolute)) - (run-with-store store - ;; XXX: Since grafting can trigger unsolicited builds, disable it. - (mlet %store-monad ((_ (set-grafting #f)) - (nodes (mapm %store-monad - (node-type-convert type) - items))) - (export-graph (concatenate nodes) - (current-output-port) - #:node-type type - #:backend backend)) - #:system (assq-ref opts 'system)))))) + (run-with-store store + ;; XXX: Since grafting can trigger unsolicited builds, disable it. + (mlet %store-monad ((_ (set-grafting #f)) + (nodes (mapm %store-monad + (node-type-convert type) + items))) + (export-graph (concatenate nodes) + (current-output-port) + #:node-type type + #:backend backend)) + #:system (assq-ref opts 'system))))) #t) ;;; graph.scm ends here -- cgit v1.2.3 From 01e5d63c87b6b110f0632597e89a6a7476fc7d1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 24 Jan 2020 22:39:47 +0100 Subject: serialization: 'read-byte-string' makes a single read(2) call. On "guix build libreoffice -nd", this reduces the number of read(2) system calls from 10,434 to 8092. * guix/serialization.scm (sub-bytevector): New procedure. (read-byte-string): Make a single 'get-bytevector-n*' call and use 'sub-bytevector'. --- guix/serialization.scm | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/guix/serialization.scm b/guix/serialization.scm index 9452303730..836ad06caf 100644 --- a/guix/serialization.scm +++ b/guix/serialization.scm @@ -27,6 +27,7 @@ #:use-module ((ice-9 rdelim) #:prefix rdelim:) #:use-module (ice-9 match) #:use-module (ice-9 ftw) + #:use-module (system foreign) #:export (write-int read-int write-long-long read-long-long write-padding @@ -80,6 +81,17 @@ (port port))))) bv)) +(define (sub-bytevector bv len) + "Return a bytevector that aliases the first LEN bytes of BV." + (define max (bytevector-length bv)) + (cond ((= len max) bv) + ((< len max) + ;; Yes, this is safe because the result of each conversion procedure + ;; has its life cycle synchronized with that of its argument. + (pointer->bytevector (bytevector->pointer bv) len)) + (else + (error "sub-bytevector called to get a super bytevector")))) + (define (write-int n p) (let ((b (make-bytevector 8 0))) (bytevector-u32-set! b 0 n (endianness little)) @@ -119,10 +131,9 @@ (define (read-byte-string p) (let* ((len (read-int p)) (m (modulo len 8)) - (bv (get-bytevector-n* p len))) - (or (zero? m) - (get-bytevector-n* p (- 8 m))) - bv)) + (pad (if (zero? m) 0 (- 8 m))) + (bv (get-bytevector-n* p (+ len pad)))) + (sub-bytevector bv len))) (define (read-string p) (utf8->string (read-byte-string p))) -- cgit v1.2.3 From 6713589d6beca4bdc3b7acbeb4e8975ef3ceb7cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 24 Jan 2020 23:03:07 +0100 Subject: gnu: guile-ics: Add "guile3.0-ics" variant. * gnu/packages/guile-xyz.scm (guile-ics)[source]: Add 'modules' and 'snippet'. (guile3.0-ics): New variable. --- gnu/packages/guile-xyz.scm | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 029054b90e..835539aec9 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1493,7 +1493,15 @@ provides tight coupling to Guix.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0qjjvadr7gibdq9jvwkmlkb4afsw9n2shfj9phpiadinxk3p4m2g")))) + "0qjjvadr7gibdq9jvwkmlkb4afsw9n2shfj9phpiadinxk3p4m2g")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Allow builds with Guile 3.0. + (substitute* "configure.ac" + (("^GUILE_PKG.*") + "GUILE_PKG([3.0 2.2 2.0])\n")) + #t)))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf-wrapper) @@ -1513,6 +1521,14 @@ pure Scheme. The library can be used to read and write iCalendar data. The library is shipped with documentation in Info format and usage examples.") (license license:gpl3+))) +(define-public guile3.0-ics + (package + (inherit guile-ics) + (name "guile3.0-ics") + (inputs `(("guile" ,guile-3.0) + ,@(alist-delete "guile" (package-inputs guile-ics)))) + (propagated-inputs `(("guile-lib" ,guile3.0-lib))))) + (define-public guile-wisp (package (name "guile-wisp") -- cgit v1.2.3 From 69002b216e49d98a7caa183ffa36c546e75589c3 Mon Sep 17 00:00:00 2001 From: Josh Holland Date: Mon, 13 Jan 2020 14:41:00 +0000 Subject: gnu: python-pygments: Update to 2.5.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-pygments): Update to 2.5.2. [home-page]: Follow redirect to https. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 715a0109f7..89be80f7fc 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2638,19 +2638,19 @@ reStructuredText.") (define-public python-pygments (package (name "python-pygments") - (version "2.4.2") + (version "2.5.2") (source (origin (method url-fetch) (uri (pypi-uri "Pygments" version)) (sha256 (base32 - "15v2sqm5g12bqa0c7wikfh9ck2nl97ayizy1hpqhmws5gqalq748")))) + "1zmhnswy0wxfn0xprs9aqsvx2c3kmzfn2wx14q8cv3vpkxdamj4q")))) (build-system python-build-system) (arguments ;; FIXME: Tests require sphinx, which depends on this. '(#:tests? #f)) - (home-page "http://pygments.org/") + (home-page "https://pygments.org/") (synopsis "Syntax highlighting") (description "Pygments is a syntax highlighting package written in Python.") -- cgit v1.2.3 From 0ef7e44439c6e1b87bea5cdc39f1fa07e62edba4 Mon Sep 17 00:00:00 2001 From: Josh Holland Date: Mon, 13 Jan 2020 14:41:02 +0000 Subject: gnu: httpie: Update to 2.0.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-web.scm (httpie): Update to 2.0.0. Signed-off-by: Ludovic Courtès --- gnu/packages/python-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 7808b7631e..8f33201fd3 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -310,14 +310,14 @@ other HTTP libraries.") (define-public httpie (package (name "httpie") - (version "1.0.3") + (version "2.0.0") (source (origin (method url-fetch) (uri (pypi-uri "httpie" version)) (sha256 (base32 - "103fcigpxf4nqmrdqjnyz7d9n4n16906slwmmqqc0gkxv8hnw6vd")))) + "02bw20cwv3a1lzrn919dk25dq4v81x6q786zlrqsqzhsdxszj14c")))) (build-system python-build-system) (arguments ;; The tests attempt to access external web servers, so we cannot run them. -- cgit v1.2.3 From f528df99f1e99fa32f7cc6d291262192234ec758 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 20 Jan 2020 11:34:01 -0500 Subject: gnu: QEMU: Fix CVE-2020-{7039,7211}. * gnu/packages/patches/qemu-CVE-2020-7039.patch, gnu/packages/patches/qemu-CVE-2020-7211.patch: New files. * gnu/local.mk (dist_patch_DATA): Add them. * gnu/packages/virtualization.scm (qemu)[source]: Use them. --- gnu/local.mk | 2 + gnu/packages/patches/qemu-CVE-2020-7039.patch | 173 ++++++++++++++++++++++++++ gnu/packages/patches/qemu-CVE-2020-7211.patch | 49 ++++++++ gnu/packages/virtualization.scm | 2 + 4 files changed, 226 insertions(+) create mode 100644 gnu/packages/patches/qemu-CVE-2020-7039.patch create mode 100644 gnu/packages/patches/qemu-CVE-2020-7211.patch diff --git a/gnu/local.mk b/gnu/local.mk index 563c98b122..2cb400d84b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1336,6 +1336,8 @@ dist_patch_DATA = \ %D%/packages/patches/python-unittest2-remove-argparse.patch \ %D%/packages/patches/python-waitress-fix-tests.patch \ %D%/packages/patches/qemu-glibc-2.27.patch \ + %D%/packages/patches/qemu-CVE-2020-7039.patch \ + %D%/packages/patches/qemu-CVE-2020-7211.patch \ %D%/packages/patches/qt4-ldflags.patch \ %D%/packages/patches/qtbase-use-TZDIR.patch \ %D%/packages/patches/qtscript-disable-tests.patch \ diff --git a/gnu/packages/patches/qemu-CVE-2020-7039.patch b/gnu/packages/patches/qemu-CVE-2020-7039.patch new file mode 100644 index 0000000000..ffebda68ab --- /dev/null +++ b/gnu/packages/patches/qemu-CVE-2020-7039.patch @@ -0,0 +1,173 @@ +Fix CVE-2020-7039: + +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-7039 + +Patches copied from upstream dependency repository: + +https://gitlab.freedesktop.org/slirp/libslirp/commit/2655fffed7a9e765bcb4701dd876e9dab975f289 +https://gitlab.freedesktop.org/slirp/libslirp/commit/ce131029d6d4a405cb7d3ac6716d03e58fb4a5d9 +https://gitlab.freedesktop.org/slirp/libslirp/commit/82ebe9c370a0e2970fb5695aa19aa5214a6a1c80 + +From 2655fffed7a9e765bcb4701dd876e9dab975f289 Mon Sep 17 00:00:00 2001 +From: Samuel Thibault +Date: Wed, 8 Jan 2020 00:58:48 +0100 +Subject: [PATCH] tcp_emu: Fix oob access + +The main loop only checks for one available byte, while we sometimes +need two bytes. +--- + CHANGELOG.md | 1 + + src/tcp_subr.c | 7 +++++++ + 2 files changed, 8 insertions(+) + +#diff --git a/CHANGELOG.md b/CHANGELOG.md +#index 00d0ce2..5cf94a8 100644 +#--- a/CHANGELOG.md +#+++ b/CHANGELOG.md +#@@ -20,6 +20,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 +# ### Fixed +# +# - ncsi: fix checksum OOB memory access +#+ - `tcp_emu()`: fix OOB accesses +# +# ## [4.1.0] - 2019-12-02 +# +diff --git a/src/tcp_subr.c b/src/tcp_subr.c +index 382aa38..9c1bdec 100644 +--- a/slirp/src/tcp_subr.c ++++ b/slirp/src/tcp_subr.c +@@ -871,6 +871,9 @@ int tcp_emu(struct socket *so, struct mbuf *m) + break; + + case 5: ++ if (bptr == m->m_data + m->m_len - 1) ++ return 1; /* We need two bytes */ ++ + /* + * The difference between versions 1.0 and + * 2.0 is here. For future versions of +@@ -886,6 +889,10 @@ int tcp_emu(struct socket *so, struct mbuf *m) + /* This is the field containing the port + * number that RA-player is listening to. + */ ++ ++ if (bptr == m->m_data + m->m_len - 1) ++ return 1; /* We need two bytes */ ++ + lport = (((uint8_t *)bptr)[0] << 8) + ((uint8_t *)bptr)[1]; + if (lport < 6970) + lport += 256; /* don't know why */ +-- +2.24.1 + +From ce131029d6d4a405cb7d3ac6716d03e58fb4a5d9 Mon Sep 17 00:00:00 2001 +From: Prasad J Pandit +Date: Thu, 9 Jan 2020 15:12:27 +0530 +Subject: [PATCH] slirp: use correct size while emulating IRC commands + +While emulating IRC DCC commands, tcp_emu() uses 'mbuf' size +'m->m_size' to write DCC commands via snprintf(3). This may +lead to OOB write access, because 'bptr' points somewhere in +the middle of 'mbuf' buffer, not at the start. Use M_FREEROOM(m) +size to avoid OOB access. + +Reported-by: Vishnu Dev TJ +Signed-off-by: Prasad J Pandit +Reviewed-by: Samuel Thibault +Message-Id: <20200109094228.79764-2-ppandit@redhat.com> +--- + src/tcp_subr.c | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/src/tcp_subr.c b/src/tcp_subr.c +index 9c1bdec..ee7a938 100644 +--- a/slirp/src/tcp_subr.c ++++ b/slirp/src/tcp_subr.c +@@ -763,7 +763,8 @@ int tcp_emu(struct socket *so, struct mbuf *m) + return 1; + } + m->m_len = bptr - m->m_data; /* Adjust length */ +- m->m_len += snprintf(bptr, m->m_size, "DCC CHAT chat %lu %u%c\n", ++ m->m_len += snprintf(bptr, M_FREEROOM(m), ++ "DCC CHAT chat %lu %u%c\n", + (unsigned long)ntohl(so->so_faddr.s_addr), + ntohs(so->so_fport), 1); + } else if (sscanf(bptr, "DCC SEND %256s %u %u %u", buff, &laddr, &lport, +@@ -773,8 +774,8 @@ int tcp_emu(struct socket *so, struct mbuf *m) + return 1; + } + m->m_len = bptr - m->m_data; /* Adjust length */ +- m->m_len += +- snprintf(bptr, m->m_size, "DCC SEND %s %lu %u %u%c\n", buff, ++ m->m_len += snprintf(bptr, M_FREEROOM(m), ++ "DCC SEND %s %lu %u %u%c\n", buff, + (unsigned long)ntohl(so->so_faddr.s_addr), + ntohs(so->so_fport), n1, 1); + } else if (sscanf(bptr, "DCC MOVE %256s %u %u %u", buff, &laddr, &lport, +@@ -784,8 +785,8 @@ int tcp_emu(struct socket *so, struct mbuf *m) + return 1; + } + m->m_len = bptr - m->m_data; /* Adjust length */ +- m->m_len += +- snprintf(bptr, m->m_size, "DCC MOVE %s %lu %u %u%c\n", buff, ++ m->m_len += snprintf(bptr, M_FREEROOM(m), ++ "DCC MOVE %s %lu %u %u%c\n", buff, + (unsigned long)ntohl(so->so_faddr.s_addr), + ntohs(so->so_fport), n1, 1); + } +-- +2.24.1 + +From 82ebe9c370a0e2970fb5695aa19aa5214a6a1c80 Mon Sep 17 00:00:00 2001 +From: Prasad J Pandit +Date: Thu, 9 Jan 2020 15:12:28 +0530 +Subject: [PATCH] slirp: use correct size while emulating commands + +While emulating services in tcp_emu(), it uses 'mbuf' size +'m->m_size' to write commands via snprintf(3). Use M_FREEROOM(m) +size to avoid possible OOB access. + +Signed-off-by: Prasad J Pandit +Signed-off-by: Samuel Thibault +Message-Id: <20200109094228.79764-3-ppandit@redhat.com> +--- + src/tcp_subr.c | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +diff --git a/src/tcp_subr.c b/src/tcp_subr.c +index ee7a938..177dfd2 100644 +--- a/slirp/src/tcp_subr.c ++++ b/slirp/src/tcp_subr.c +@@ -681,7 +681,7 @@ int tcp_emu(struct socket *so, struct mbuf *m) + n4 = (laddr & 0xff); + + m->m_len = bptr - m->m_data; /* Adjust length */ +- m->m_len += snprintf(bptr, m->m_size - m->m_len, ++ m->m_len += snprintf(bptr, M_FREEROOM(m), + "ORT %d,%d,%d,%d,%d,%d\r\n%s", n1, n2, n3, n4, + n5, n6, x == 7 ? buff : ""); + return 1; +@@ -716,8 +716,7 @@ int tcp_emu(struct socket *so, struct mbuf *m) + n4 = (laddr & 0xff); + + m->m_len = bptr - m->m_data; /* Adjust length */ +- m->m_len += +- snprintf(bptr, m->m_size - m->m_len, ++ m->m_len += snprintf(bptr, M_FREEROOM(m), + "27 Entering Passive Mode (%d,%d,%d,%d,%d,%d)\r\n%s", + n1, n2, n3, n4, n5, n6, x == 7 ? buff : ""); + +@@ -743,8 +742,8 @@ int tcp_emu(struct socket *so, struct mbuf *m) + if (m->m_data[m->m_len - 1] == '\0' && lport != 0 && + (so = tcp_listen(slirp, INADDR_ANY, 0, so->so_laddr.s_addr, + htons(lport), SS_FACCEPTONCE)) != NULL) +- m->m_len = +- snprintf(m->m_data, m->m_size, "%d", ntohs(so->so_fport)) + 1; ++ m->m_len = snprintf(m->m_data, M_ROOM(m), ++ "%d", ntohs(so->so_fport)) + 1; + return 1; + + case EMU_IRC: +-- +2.24.1 + diff --git a/gnu/packages/patches/qemu-CVE-2020-7211.patch b/gnu/packages/patches/qemu-CVE-2020-7211.patch new file mode 100644 index 0000000000..2885dda411 --- /dev/null +++ b/gnu/packages/patches/qemu-CVE-2020-7211.patch @@ -0,0 +1,49 @@ +Fix CVE-2020-7211: + +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-7211 + +Patch copied from upstream dependency repository: + +https://gitlab.freedesktop.org/slirp/libslirp/commit/14ec36e107a8c9af7d0a80c3571fe39b291ff1d4 + +From 14ec36e107a8c9af7d0a80c3571fe39b291ff1d4 Mon Sep 17 00:00:00 2001 +From: Prasad J Pandit +Date: Mon, 13 Jan 2020 17:44:31 +0530 +Subject: [PATCH] slirp: tftp: restrict relative path access + +tftp restricts relative or directory path access on Linux systems. +Apply same restrictions on Windows systems too. It helps to avoid +directory traversal issue. + +Fixes: https://bugs.launchpad.net/qemu/+bug/1812451 +Reported-by: Peter Maydell +Signed-off-by: Prasad J Pandit +Reviewed-by: Samuel Thibault +Message-Id: <20200113121431.156708-1-ppandit@redhat.com> +--- + src/tftp.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/src/tftp.c b/src/tftp.c +index 093c2e0..e52e71b 100644 +--- a/slirp/src/tftp.c ++++ b/slirp/src/tftp.c +@@ -344,8 +344,13 @@ static void tftp_handle_rrq(Slirp *slirp, struct sockaddr_storage *srcsas, + k += 6; /* skipping octet */ + + /* do sanity checks on the filename */ +- if (!strncmp(req_fname, "../", 3) || +- req_fname[strlen(req_fname) - 1] == '/' || strstr(req_fname, "/../")) { ++ if ( ++#ifdef G_OS_WIN32 ++ strstr(req_fname, "..\\") || ++ req_fname[strlen(req_fname) - 1] == '\\' || ++#endif ++ strstr(req_fname, "../") || ++ req_fname[strlen(req_fname) - 1] == '/') { + tftp_send_error(spt, 2, "Access violation", tp); + return; + } +-- +2.24.1 + diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index fb3849e29f..4528d4ebb8 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -114,6 +114,8 @@ (method url-fetch) (uri (string-append "https://download.qemu.org/qemu-" version ".tar.xz")) + (patches (search-patches "qemu-CVE-2020-7039.patch" + "qemu-CVE-2020-7211.patch")) (sha256 (base32 "1lm1jndfpc5sydwrxyiz5sms414zkcg9jdl0zx318qbjsayxnvzd")))) -- cgit v1.2.3 From 0411aca8480a7ba0da5c2fd332dd4c81542e3aca Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 23 Jan 2020 15:18:27 -0500 Subject: gnu: QEMU: Install the manual pages. * gnu/packages/virtualization.scm (qemu)[arguments]: Add '--enable-docs' to #:configure-flags. [native-inputs]: Add python-sphinx. (qemu-minimal-2.10)[native-inputs]: Remove python-sphinx. --- gnu/packages/virtualization.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 4528d4ebb8..3001c4ee50 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -75,6 +75,7 @@ #:use-module (gnu packages pulseaudio) #:use-module (gnu packages selinux) #:use-module (gnu packages sdl) + #:use-module (gnu packages sphinx) #:use-module (gnu packages spice) #:use-module (gnu packages texinfo) #:use-module (gnu packages textutils) @@ -125,6 +126,7 @@ ;; boot_sector_test: assertion failed (signature == SIGNATURE): (0x00000000 == 0x0000dead) #:parallel-tests? #f #:configure-flags (list "--enable-usb-redir" "--enable-opengl" + "--enable-docs" (string-append "--smbd=" (assoc-ref %outputs "out") "/libexec/samba-wrapper") @@ -234,6 +236,7 @@ exec smbd $@"))) ("bison" ,bison) ("pkg-config" ,pkg-config) ("python-wrapper" ,python-wrapper) + ("python-sphinx" ,python-sphinx) ("texinfo" ,texinfo))) (home-page "https://www.qemu.org") (synopsis "Machine emulator and virtualizer") @@ -295,7 +298,7 @@ server and embedded PowerPC, and S390 guests.") ;; qemu-minimal-2.10 needs Python 2. Remove below once no longer necessary. (native-inputs `(("python-2" ,python-2) ,@(fold alist-delete (package-native-inputs qemu) - '("python-wrapper")))) + '("python-wrapper" "python-sphinx")))) (inputs (fold alist-delete (package-inputs qemu) ;; Disable seccomp support, because it's not required for the GRUB -- cgit v1.2.3 From 3778b3d9d013a443eec7990c31f47f887f72fe59 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 19 Jan 2020 18:25:06 -0500 Subject: gnu: QEMU: Update to 4.2.0. * gnu/packages/virtualization.scm (qemu): Update to 4.2.0. [source]: Use new patch. * gnu/packages/patches/qemu-fix-documentation-build-failure.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + .../qemu-fix-documentation-build-failure.patch | 43 ++++++++++++++++++++++ gnu/packages/virtualization.scm | 7 ++-- 3 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/qemu-fix-documentation-build-failure.patch diff --git a/gnu/local.mk b/gnu/local.mk index 2cb400d84b..bc011c09fb 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1338,6 +1338,7 @@ dist_patch_DATA = \ %D%/packages/patches/qemu-glibc-2.27.patch \ %D%/packages/patches/qemu-CVE-2020-7039.patch \ %D%/packages/patches/qemu-CVE-2020-7211.patch \ + %D%/packages/patches/qemu-fix-documentation-build-failure.patch \ %D%/packages/patches/qt4-ldflags.patch \ %D%/packages/patches/qtbase-use-TZDIR.patch \ %D%/packages/patches/qtscript-disable-tests.patch \ diff --git a/gnu/packages/patches/qemu-fix-documentation-build-failure.patch b/gnu/packages/patches/qemu-fix-documentation-build-failure.patch new file mode 100644 index 0000000000..c913c553b2 --- /dev/null +++ b/gnu/packages/patches/qemu-fix-documentation-build-failure.patch @@ -0,0 +1,43 @@ +Fix a build failure caused by a texinfo bug: + +qemu-doc.texi:41: @menu reference to nonexistent node `QEMU Guest Agent' + +Patch copied from upstream source repository: + +https://git.qemu.org/?p=qemu.git;a=commitdiff;h=80bc935eaaf93e5b9a4efe97abd7c51d645f2612 + +From 80bc935eaaf93e5b9a4efe97abd7c51d645f2612 Mon Sep 17 00:00:00 2001 +From: Thomas Huth +Date: Mon, 16 Dec 2019 14:29:41 +0100 +Subject: [PATCH] qemu-doc: Remove the unused "Guest Agent" node +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The node has been removed from the texi file some months ago, so we +should remove it from the menu section, too. + +Fixes: 27a296fce982 ("qemu-ga: Convert invocation documentation to rST") +Signed-off-by: Thomas Huth +Reviewed-by: Philippe Mathieu-Daudé +Message-Id: <20191216132941.25729-1-thuth@redhat.com> +Signed-off-by: Laurent Vivier +--- + qemu-doc.texi | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/qemu-doc.texi b/qemu-doc.texi +index eea91a2d1e..39f950471f 100644 +--- a/qemu-doc.texi ++++ b/qemu-doc.texi +@@ -38,7 +38,6 @@ + * Introduction:: + * QEMU PC System emulator:: + * QEMU System emulator for non PC targets:: +-* QEMU Guest Agent:: + * QEMU User space emulator:: + * System requirements:: + * Security:: +-- +2.24.1 + diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 3001c4ee50..b7e4dfe0c4 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -110,16 +110,17 @@ (define-public qemu (package (name "qemu") - (version "4.1.1") + (version "4.2.0") (source (origin (method url-fetch) (uri (string-append "https://download.qemu.org/qemu-" version ".tar.xz")) (patches (search-patches "qemu-CVE-2020-7039.patch" - "qemu-CVE-2020-7211.patch")) + "qemu-CVE-2020-7211.patch" + "qemu-fix-documentation-build-failure.patch")) (sha256 (base32 - "1lm1jndfpc5sydwrxyiz5sms414zkcg9jdl0zx318qbjsayxnvzd")))) + "1w38hzlw7xp05gcq1nhga7hxvndxy6dfcnzi7q2il8ff110isj6k")))) (build-system gnu-build-system) (arguments '(;; Running tests in parallel can occasionally lead to failures, like: -- cgit v1.2.3 From f32ca55778eb049e83210aedcbeb4df2c98e587a Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 24 Jan 2020 15:45:34 -0500 Subject: gnu: WebKitGTK: Update to 2.26.3. * gnu/packages/webkit.scm (webkitgtk): Update to 2.26.3. --- gnu/packages/webkit.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index b0b0d79a05..8ceee90018 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -121,14 +121,14 @@ engine that uses Wayland for graphics output.") (define-public webkitgtk (package (name "webkitgtk") - (version "2.26.2") + (version "2.26.3") (source (origin (method url-fetch) (uri (string-append "https://www.webkitgtk.org/releases/" "webkitgtk-" version ".tar.xz")) (sha256 (base32 - "04k5h0sid9azsqz9pyq436v1rx4lnfrhvmcgmicqb0c0g9iz103b")))) + "04g6y0sv04d20bw401myq3k828ikysjhx383ly81vh9wji9i3mdd")))) (build-system cmake-build-system) (outputs '("out" "doc")) (arguments -- cgit v1.2.3 From 0edbb65d5cde814a1abf00d06ae5a758eddfa0e5 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 24 Jan 2020 21:02:41 +0100 Subject: gnu: Add bitcoin-unlimited. * gnu/packages/finance.scm (bitcoin-unlimited): New variable. --- gnu/packages/finance.scm | 74 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 378491227c..ddc73efa8a 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -1301,3 +1301,77 @@ entity management.") (license:non-copyleft "file://COPYING" "See COPYING in the distribution.")))) + +(define-public bitcoin-unlimited + (package + (name "bitcoin-unlimited") + (version "1.7.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/BitcoinUnlimited/BitcoinUnlimited.git") + (commit (string-append "bucash" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "05rcd73mg2fb2zb6b1imzspck6jhcy3xymrr7n24kwjrzmvihdpx")))) + (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config) + ("python" ,python) ; for the tests + ("util-linux" ,util-linux) ; provides the hexdump command for tests + ("qttools" ,qttools))) + (inputs + `(("bdb" ,bdb-4.8) + ("boost" ,boost) + ("libevent" ,libevent) + ("miniupnpc" ,miniupnpc) + ("openssl" ,openssl) + ("protobuf" ,protobuf) + ("qrencode" ,qrencode) + ("qtbase" ,qtbase) + ("zeromq" ,zeromq) + ("zlib" ,zlib))) + (arguments + `(#:configure-flags + (list + ;; Boost is not found unless specified manually. + (string-append "--with-boost=" + (assoc-ref %build-inputs "boost")) + ;; XXX: The configure script looks up Qt paths by + ;; `pkg-config --variable=host_bins Qt5Core`, which fails to pick + ;; up executables residing in 'qttools', so we specify them here. + (string-append "ac_cv_path_LRELEASE=" + (assoc-ref %build-inputs "qttools") + "/bin/lrelease") + (string-append "ac_cv_path_LUPDATE=" + (assoc-ref %build-inputs "qttools") + "/bin/lupdate")) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-tests + (lambda _ + ;; TODO: Find why utilprocess_tests never ends. Disable for now. + (substitute* "src/test/utilprocess_tests.cpp" + (("#if \\(BOOST_OS_LINUX && \\(BOOST_VERSION >= 106500\\)\\)") + "#if 0")) + #t)) + (add-before 'configure 'make-qt-deterministic + (lambda _ + ;; Make Qt deterministic. + (setenv "QT_RCC_SOURCE_DATE_OVERRIDE" "1") + #t)) + (add-before 'check 'set-home + (lambda _ + (setenv "HOME" (getenv "TMPDIR")) ; tests write to $HOME + #t))))) + (home-page "https://www.bitcoinunlimited.info/") + (synopsis "Client for the Bitcoin Cash protocol") + (description + "Bitcoin Unlimited is a client for the Bitcoin Cash peer-to-peer +electronic cash system. This package provides a command line client and +a Qt GUI.") + (license license:expat))) -- cgit v1.2.3 From 8fe54fa806b61ebdab7073d8f50b3c316fc1a475 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 25 Jan 2020 14:55:04 +0100 Subject: gnu: Remove python2-debian. This trivial package fails to build and has no users in Guix. * gnu/packages/python-xyz.scm (python2-debian): Remove variable. --- gnu/packages/python-xyz.scm | 3 --- 1 file changed, 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 89be80f7fc..11e2a28df4 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7599,9 +7599,6 @@ Debian-related files, such as: ;; Modules are either GPLv2+ or GPLv3+. (license license:gpl3+))) -(define-public python2-debian - (package-with-python2 python-debian)) - (define-public python-nbformat (package (name "python-nbformat") -- cgit v1.2.3 From 6469af6f89b74701daf17724a3ac4c295f27c08a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 25 Jan 2020 14:55:34 +0100 Subject: gnu: python-pympler: Update to 0.8. * gnu/packages/python-xyz.scm (python-pympler): Update to 0.8. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 11e2a28df4..9739953b13 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2244,13 +2244,13 @@ JavaScript-like message boxes. Types of dialog boxes include: (package (name "python-pympler") (home-page "https://pythonhosted.org/Pympler/") - (version "0.7") + (version "0.8") (source (origin (method url-fetch) (uri (pypi-uri "Pympler" version)) (sha256 (base32 - "0ki7bqp1h9l1xc2k1h4vjyzsgs20i8ingvcdhszyi72s28wyf4bs")))) + "08mrpnb6cv2nvfncvr8a9a8bpwhnasa924anapnjvnaw5jcd4k7p")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 170d5844dd9e565c6b28c774403cda21981643f8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 25 Jan 2020 14:56:00 +0100 Subject: gnu: python-parso: Update to 0.5.2. * gnu/packages/python-xyz.scm (python-parso): Update to 0.5.2. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9739953b13..231c380fb8 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15145,14 +15145,14 @@ time-based (TOTP) passwords.") (define-public python-parso (package (name "python-parso") - (version "0.5.1") + (version "0.5.2") (source (origin (method url-fetch) (uri (pypi-uri "parso" version)) (sha256 (base32 - "171a9ivhxwsd52h1cgsz40zgzpgzscn7yqb7sdjhy8m1lzj0wsv6")))) + "1qgvrkpma7vylrk047mxxvqd66nwqk978n3ig2w8iz9m3bgjbksm")))) (native-inputs `(("python-pytest" ,python-pytest))) (build-system python-build-system) -- cgit v1.2.3 From f52fe7c3f29dfd0804c9d1f297b91287eabcdfb2 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 30 Dec 2019 11:25:40 +0100 Subject: bootloader: grub: Add gfxmode (resolution) override. * gnu/bootloader/grub.scm (): Add `gfxmode' entry. (eye-candy): Use it. * doc/guix.texi (Bootloader Configuration): Document it. --- doc/guix.texi | 28 ++++++++++++++++++++++++++-- gnu/bootloader/grub.scm | 19 +++++++++++++++---- 2 files changed, 41 insertions(+), 6 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index d674b9484f..3141c4582f 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -26101,9 +26101,22 @@ must @emph{not} be an OS device name such as @file{/dev/sda1}. @end table @end deftp +@cindex HDPI +@cindex HiDPI +@cindex resolution @c FIXME: Write documentation once it's stable. -For now only GRUB has theme support. GRUB themes are created using -the @code{grub-theme} form, which is not documented yet. +For now only GRUB has theme support. GRUB themes are created using +the @code{grub-theme} form, which is not fully documented yet. + +@deftp {Data Type} grub-theme +Data type representing the configuration of the GRUB theme. + +@table @asis +@item @code{gfxmode} (default: @code{'("auto")}) +The GRUB @code{gfxmode} to set (a list of screen resolution strings, see +@pxref{gfxmode,,, grub, GNU GRUB manual}). +@end table +@end deftp @defvr {Scheme Variable} %default-theme This is the default GRUB theme used by the operating system if no @@ -26114,6 +26127,17 @@ It comes with a fancy background image displaying the GNU and Guix logos. @end defvr +For example, to override the default resolution, you may use something +like + +@lisp +(bootloader + (grub-configuration + ;; @dots{} + (theme (grub-theme + (inherit %default-theme) + (gfxmode '("1024x786x32" "auto")))))) +@end lisp @node Invoking guix system @section Invoking @code{guix system} diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm index f13685ac9d..b99f5fa4f4 100644 --- a/gnu/bootloader/grub.scm +++ b/gnu/bootloader/grub.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2016 Chris Marusich ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2017 Mathieu Othacehe +;;; Copyright © 2019 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -88,7 +89,9 @@ denoting a file name." (color-normal grub-theme-color-normal (default '((fg . cyan) (bg . blue)))) (color-highlight grub-theme-color-highlight - (default '((fg . white) (bg . blue))))) + (default '((fg . white) (bg . blue)))) + (gfxmode grub-gfxmode + (default '("auto")))) ;list of string (define %background-image (grub-image @@ -149,8 +152,16 @@ system string---e.g., \"x86_64-linux\"." ;; most other modern architectures have no other mode and therefore don't ;; need to be switched. (if (string-match "^(x86_64|i[3-6]86)-" system) - " - # Leave 'gfxmode' to 'auto'. + (string-append + " +" + (let ((gfxmode (and=> + (and=> config bootloader-configuration-theme) + grub-gfxmode))) + (if gfxmode + (string-append "set gfxmode=" (string-join gfxmode ";")) + "# Leave 'gfxmode' to 'auto'.")) + " insmod video_bochs insmod video_cirrus insmod gfxterm @@ -166,7 +177,7 @@ system string---e.g., \"x86_64-linux\"." insmod vbe insmod vga fi -" +") "")) (define (setup-gfxterm config font-file) -- cgit v1.2.3 From df6ce9fcb455ac59372f1025e450005ea3190614 Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Fri, 24 Jan 2020 21:24:27 -0500 Subject: gnu: youtube-dl: Update to 2020.01.24. * gnu/packages/video.scm (youtube-dl): Update to 2020.01.24. Signed-off-by: Arun Isaac --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index ee7108753f..e7586f4c61 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1543,7 +1543,7 @@ To load this plugin, specify the following option when starting mpv: (define-public youtube-dl (package (name "youtube-dl") - (version "2020.01.15") + (version "2020.01.24") (source (origin (method url-fetch) (uri (string-append "https://github.com/ytdl-org/youtube-dl/" @@ -1551,7 +1551,7 @@ To load this plugin, specify the following option when starting mpv: version ".tar.gz")) (sha256 (base32 - "0dyjc8nxyg9ry2ylmblh3fwavpais3mdfj6ndw4i0yc2vkw12rsm")))) + "1zrnbjnwv315f9a83lk5c0gl4ianvp6q2kinxvqlv604sabcq78b")))) (build-system python-build-system) (arguments ;; The problem here is that the directory for the man page and completion -- cgit v1.2.3 From 5b7fdc8289ce0adf85e881bc23d3537121b41193 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 25 Jan 2020 19:33:57 +0100 Subject: gnu: ode: Selectively disable tests. * gnu/packages/game-development.scm (ode)[arguments]: Run tests only on x86_64. --- gnu/packages/game-development.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 72637a7929..13006f3509 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1998,7 +1998,10 @@ a.k.a. XenoCollide) as described in Game Programming Gems 7.") #t)))) (build-system cmake-build-system) (arguments - `(#:tests? #f ;tests fail on all systems but x86_64 + ;; Tests fail on all systems but x86_64. + `(#:tests? ,(string=? "x86_64-linux" + (or (%current-target-system) + (%current-system))) #:configure-flags '("-DODE_WITH_LIBCCD_SYSTEM=ON") #:phases (modify-phases %standard-phases -- cgit v1.2.3 From 704719edade1368f798c9301f3a8197a0df5c930 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Sat, 25 Jan 2020 10:35:47 -0800 Subject: gnu: Add emacs-eshell-toggle. * gnu/packages/emacs-xyz.scm (emacs-eshell-toggle): New variable. --- gnu/packages/emacs-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 782fa7ade7..7a561c77f3 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -20632,6 +20632,31 @@ each slide with left/right keys.") execution of buffer-exposing commands.") (license license:gpl3+))) +(define-public emacs-eshell-toggle + (let ((commit "ddfbe0a693497c4d4bc5494a19970ba4f6ab9033") + (revision "1")) + (package + (name "emacs-eshell-toggle") + (version (git-version "0.10.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/4DA/eshell-toggle.git") + (commit commit))) + (sha256 + (base32 + "0xqrp8pwbmfxjdqipgpw5nw633mvhjjjm3k3j9sh9xdpmw05hhws")) + (file-name (git-file-name name version)))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-dash" ,emacs-dash))) + (home-page "https://github.com/4DA/eshell-toggle") + (synopsis "Show and hide an @code{eshell} instance") + (description "This package toggles an @code{eshell} instance for the +current buffer.") + (license license:gpl3+)))) + (define-public emacs-repl-toggle (package (name "emacs-repl-toggle") -- cgit v1.2.3 From c1d79b49d10f37b38c70e2609ee6b00e93079e08 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 25 Jan 2020 22:50:04 +0100 Subject: gnu: python-duniterpy: Update to 0.56.0. * gnu/packages/finance.scm (python-duniterpy): Update to 0.56.0. [source]: Move source to Pypi. [arguments]: Add phase to work around a missing file. Remove phases building documentation since they are not applicable anymore. [native-inputs]: Remove it, since it is not applicable in Pypi package. [inputs]: Replace "python-attr" with "python-attrs". --- gnu/packages/finance.scm | 35 ++++++++++++----------------------- 1 file changed, 12 insertions(+), 23 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index ddc73efa8a..70d6291ed9 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Eric Bavier ;;; Copyright © 2018 Adriano Peluso -;;; Copyright © 2018, 2019 Nicolas Goaziou +;;; Copyright © 2018, 2019, 2020 Nicolas Goaziou ;;; Copyright © 2018 Arun Isaac ;;; Copyright © 2019, 2020 Guillaume Le Vaillant ;;; Copyright © 2019 Tanguy Le Carrour @@ -1009,40 +1009,29 @@ Luhn and family of ISO/IEC 7064 check digit algorithms. ") (define-public python-duniterpy (package (name "python-duniterpy") - (version "0.55.1") + (version "0.56.0") (source (origin - (method git-fetch) - ;; Pypi's default URI is missing "requirements.txt" file. - (uri (git-reference - (url "https://git.duniter.org/clients/python/duniterpy.git") - (commit version))) - (file-name (git-file-name name version)) + (method url-fetch) + (uri (pypi-uri "duniterpy" version)) (sha256 - (base32 - "07zsbbkzmnvyv5v0vw2d42vw3ar4iqhlidy9376ysk4ldlj1igf7")))) + (base32 "1h8d8cnr6k5sw4cqy8r82zy4ldzpvn4nlk2221lz2haqq7xm4s5z")))) (build-system python-build-system) (arguments - ;; Tests fail with "AttributeError: module 'attr' has no attribute 's'". + ;; FIXME: Tests fail with: "ModuleNotFoundError: No module named + ;; 'tests'". Not sure how to handle this. `(#:tests? #f #:phases (modify-phases %standard-phases - (add-after 'build 'build-documentation + ;; "setup.py" tries to open missing "requirements.txt". + (add-after 'unpack 'ignore-missing-file (lambda _ - (invoke "make" "docs"))) - (add-after 'build-documentation 'install-documentation - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (doc (string-append out "/share/doc/" ,name))) - (mkdir-p doc) - (copy-recursively "docs/_build/html" doc)) + (substitute* "setup.py" + (("open\\('requirements\\.txt'\\)") "[]")) #t))))) - (native-inputs - `(("sphinx" ,python-sphinx) - ("sphinx-rtd-theme" ,python-sphinx-rtd-theme))) (propagated-inputs `(("aiohttp" ,python-aiohttp) - ("attr" ,python-attr) + ("attrs" ,python-attrs) ("base58" ,python-base58) ("jsonschema" ,python-jsonschema) ("libnacl" ,python-libnacl) -- cgit v1.2.3 From 293bc15d3b3c012c5859630ddd2f9d31ca234d52 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 25 Jan 2020 22:50:12 +0100 Subject: gnu: silkaj: Update to 0.7.6. * gnu/packages/finance.scm (silkaj): Update to 0.7.6. [source]: Move to Pypi. [home-page]: Update home page. --- gnu/packages/finance.scm | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 70d6291ed9..ccd079c9d6 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -1056,17 +1056,13 @@ main features are: (define-public silkaj (package (name "silkaj") - (version "0.7.3") + (version "0.7.6") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://git.duniter.org/clients/python/silkaj.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) + (method url-fetch) + (uri (pypi-uri "silkaj" version)) (sha256 - (base32 - "0yk2574yb0d0k0rg7qf0pkmjidblsad04x8hhqpy9k80rvgjcr5w")))) + (base32 "0hrn0jwg415z7wjkp0myvw85wszlfi18f56j03075xxakr4dmi2j")))) (build-system python-build-system) (arguments `(#:tests? #f)) ;no test @@ -1077,7 +1073,7 @@ main features are: ("pynacl" ,python-pynacl) ("tabulate" ,python-tabulate) ("texttable" ,python-texttable))) - (home-page "https://silkaj.duniter.org/") + (home-page "https://git.duniter.org/clients/python/silkaj") (synopsis "Command line client for Duniter network") (description "@code{Silkaj} is a command line client for the @uref{https://github.com/duniter/duniter/, Duniter} network. -- cgit v1.2.3 From 3212b96491935313444aa88b65728277d391afcd Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 25 Jan 2020 23:38:52 +0100 Subject: gnu: musescore: Update to 3.4.1. * gnu/packages/music.scm (musescore): Update to 3.4.1. [source]: Remove unnecessary snippet. [arguments]: Do not build telemetry module. --- gnu/packages/music.scm | 48 ++++++++++++++++++++++-------------------------- 1 file changed, 22 insertions(+), 26 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 41952d405b..63e2686617 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2016 Alex Griffin ;;; Copyright © 2017 ng0 ;;; Copyright © 2017 Rodger Fox -;;; Copyright © 2017, 2018, 2019 Nicolas Goaziou +;;; Copyright © 2017, 2018, 2019, 2020 Nicolas Goaziou ;;; Copyright © 2017, 2018, 2019 Pierre Langlois ;;; Copyright © 2017 Arun Isaac ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice @@ -3878,34 +3878,30 @@ audio samples and various soft sythesizers. It can receive input from a MIDI ke (define-public musescore (package (name "musescore") - (version "3.3.4") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/musescore/MuseScore.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1jwj89v69nhyawj8x7niwznm1vgvp51dhzw6ggnarc3wdvp6qq8y")) - (modules '((guix build utils))) - (snippet - ;; Un-bundle OpenSSL and remove unused libraries. - '(begin - (substitute* "thirdparty/kQOAuth/CMakeLists.txt" - (("-I \\$\\{PROJECT_SOURCE_DIR\\}/thirdparty/openssl/include ") - "")) - (substitute* "thirdparty/kQOAuth/kqoauthutils.cpp" - (("#include Date: Sat, 25 Jan 2020 23:49:07 +0100 Subject: gnu: mgba: Update to 0.8.0. * gnu/packages/emulators.scm (mgba): Update to 0.8.0. --- gnu/packages/emulators.scm | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index f805c8b969..140a8087ec 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2015, 2018 David Thompson ;;; Copyright © 2016 Manolis Fragkiskos Ragkousis ;;; Copyright © 2016, 2017, 2018 Efraim Flashner -;;; Copyright © 2017, 2018, 2019 Nicolas Goaziou +;;; Copyright © 2017, 2018, 2019, 2020 Nicolas Goaziou ;;; Copyright © 2017, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2017, 2018, 2019 Rutger Helling ;;; Copyright © 2019 Pierre Neidhardt @@ -405,26 +405,26 @@ Super Game Boy, BS-X Satellaview, and Sufami Turbo.") (define-public mgba (package (name "mgba") - (version "0.7.3") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/mgba-emu/mgba.git") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1wrmwh50rv8bd328r8cisrihq6h90kx2bfb0vmjfbsd3l1jvgrgm")) - (modules '((guix build utils))) - (snippet - ;; Make sure we don't use the bundled software. - '(begin - (for-each - (lambda (subdir) - (let ((lib-subdir (string-append "src/third-party/" subdir))) - (delete-file-recursively lib-subdir))) - '("libpng" "lzma" "sqlite3" "zlib")) - #t)))) + (version "0.8.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mgba-emu/mgba.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0m3rgcdv32ms98j7rrmk2hphvn462bwsd6xfz2ssy05398pj4ljh")) + (modules '((guix build utils))) + (snippet + ;; Make sure we don't use the bundled software. + '(begin + (for-each + (lambda (subdir) + (let ((lib-subdir (string-append "src/third-party/" subdir))) + (delete-file-recursively lib-subdir))) + '("libpng" "lzma" "sqlite3" "zlib")) + #t)))) (build-system cmake-build-system) (arguments `(#:tests? #f ;no "test" target -- cgit v1.2.3 From 7de4ea828c79020df0332a59f54b6b5ed5d6a757 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sat, 25 Jan 2020 23:53:25 +0000 Subject: gnu: cuirass: Update to 0.0.1-28.b9031db. * gnu/packages/ci.scm (cuirass): Update to 0.0.1-28.b9031db. --- gnu/packages/ci.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index 2006dc5173..24de11b713 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -47,8 +47,8 @@ #:use-module (guix build-system gnu)) (define-public cuirass - (let ((commit "46f73b6b7c05389c67b02d32c8946ca665611cba") - (revision "27")) + (let ((commit "b9031db946ff89a39e1507b430f64402b0e9572a") + (revision "28")) (package (name "cuirass") (version (string-append "0.0.1-" revision "." (string-take commit 7))) @@ -60,7 +60,7 @@ (file-name (string-append name "-" version)) (sha256 (base32 - "1zw4g4y0cc76i0s0hdc7jbyhwkn8pz03k6x02dslq42000cyjgi2")))) + "103smfbdpgaw17xw3vc9cb3nfisrx64k71rpzn8g35f3jz7bxdcf")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) -- cgit v1.2.3 From 99b23feeb9d06f07b4a04af624a69ed12637b112 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Sun, 26 Jan 2020 14:21:03 +0800 Subject: gnu: public-inbox: Update to 1.2.0-0.05a06f3. * gnu/packages/mail.scm (public-inbox): Update to 1.2.0-0.05a06f3. --- gnu/packages/mail.scm | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 64f679e662..49d04ba7a2 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -87,6 +87,7 @@ #:use-module (gnu packages libidn) #:use-module (gnu packages libunistring) #:use-module (gnu packages linux) + #:use-module (gnu packages lsof) #:use-module (gnu packages lua) #:use-module (gnu packages m4) #:use-module (gnu packages man) @@ -3120,11 +3121,11 @@ related tools to process winmail.dat files.") (license gpl2+))) (define-public public-inbox - (let ((commit "3cf66514aea9e958999973b9f104473b6d800fbe") + (let ((commit "05a06f3262a2ddbf46adb85169e13ce9127e4524") (revision "0")) (package (name "public-inbox") - (version (git-version "1.0.0" revision commit)) + (version (git-version "1.2.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -3132,7 +3133,7 @@ related tools to process winmail.dat files.") (commit commit))) (sha256 (base32 - "1sxycwlm2n6p544gn9f0vf3xs6gz8vdswdhs2ha6fka8mgabvmdh")) + "06cclxg46gsls3x19l9s8s9x8gkjghm6gd4jb1v9ng6fds6xi2fg")) (file-name (git-file-name name version)))) (build-system perl-build-system) (arguments @@ -3149,6 +3150,9 @@ related tools to process winmail.dat files.") (lambda _ (substitute* "t/spawn.t" (("\\['env'\\]") (string-append "['" (which "env") "']"))) + (substitute* "t/ds-leak.t" + (("/bin/sh") (which "sh"))) + (invoke "./certs/create-certs.perl") #t)) (add-after 'install 'wrap-programs (lambda* (#:key inputs outputs #:allow-other-keys) @@ -3168,10 +3172,12 @@ related tools to process winmail.dat files.") #t))))) (native-inputs `(("git" ,git) - ("xapian" ,xapian))) + ("xapian" ,xapian) + ;; For testing. + ("lsof" ,lsof) + ("openssl" ,openssl))) (inputs - `(("perl-danga-socket" ,perl-danga-socket) - ("perl-dbd-sqlite" ,perl-dbd-sqlite) + `(("perl-dbd-sqlite" ,perl-dbd-sqlite) ("perl-dbi" ,perl-dbi) ("perl-email-address-xs" ,perl-email-address-xs) ("perl-email-mime-contenttype" ,perl-email-mime-contenttype) -- cgit v1.2.3 From c67f2a76946d9189e331edd1608c2f2f19701ce7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 26 Jan 2020 10:32:39 +0100 Subject: gnu: freehdl: Fix build. * gnu/packages/engineering.scm (freehdl)[native-inputs]: Add gcc-5. --- gnu/packages/engineering.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index c4c0fd5304..4db8109249 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1699,6 +1699,7 @@ parallel computing platforms. It also supports serial execution.") ("libtool" ,libtool))) (native-inputs `(("pkg-config-native" ,pkg-config) + ("gcc" ,gcc-5) ("libtool-native" ,libtool))) (home-page "http://www.freehdl.seul.org/") (synopsis "VHDL simulator") -- cgit v1.2.3 From 195e1c1b080e41f5405d820a4f02fc7b20194ace Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 26 Jan 2020 11:05:35 +0100 Subject: gnu: guile-gi: Update to 0.2.2. * gnu/packages/guile-xyz.scm (guile-gi): Update to 0.2.2. --- gnu/packages/guile-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 835539aec9..d8b458bd66 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2014, 2015, 2018 Mark H Weaver ;;; Copyright © 2015, 2017 Christopher Allan Webber ;;; Copyright © 2016 Alex Sassmannshausen -;;; Copyright © 2016, 2017, 2018, 2019 Ricardo Wurmus +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus ;;; Copyright © 2016 Erik Edrosa ;;; Copyright © 2016, 2019 Eraim Flashner ;;; Copyright © 2016, 2017 Alex Kost @@ -2504,14 +2504,14 @@ list of components. This module takes care of that for you.") (define-public guile-gi (package (name "guile-gi") - (version "0.2.1") + (version "0.2.2") (source (origin (method url-fetch) (uri (string-append "http://lonelycactus.com/tarball/guile_gi-" version ".tar.gz")) (sha256 (base32 - "1ah5bmkzplsmkrk7v9vlxlqch7i91qv4cq2d2nar9xshbpcrj484")))) + "1v82kz8mz7wgq6w5llaz8a2wwdnl8vk2667dpjwjxscl0qyxsy6y")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-gnu-filesystem-hierarchy") -- cgit v1.2.3 From bfb51f5e5ae9df3fbdbbeaa5b32ada64f21e0c7c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 26 Jan 2020 13:09:35 +0100 Subject: gnu: Add guile3.0-gi. * gnu/packages/guile-xyz.scm (guile3.0-gi): New variable. --- gnu/packages/guile-xyz.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index d8b458bd66..e015503372 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2546,6 +2546,14 @@ libraries, such as GTK+3. Its README comes with the disclaimer: This is pre-alpha code.") (license license:gpl3+))) +(define-public guile3.0-gi + (package + (inherit guile-gi) + (name "guile3.0-gi") + (native-inputs + `(("guile" ,guile-3.0) + ,@(package-native-inputs guile-gi))))) + (define-public guile-srfi-159 (let ((commit "1bd98abda2ae4ef8f36761a167903e55c6bda7bb") (revision "0")) -- cgit v1.2.3 From 504b9ba7f953397512e24933c9b46d4fe6e300c0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 26 Jan 2020 12:18:26 +0200 Subject: gnu: vim-fugitive: Update to 3.2. * gnu/packages/vim.scm (vim-fugitive): Update to 3.2. --- gnu/packages/vim.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 9331959cb3..b5952e3e21 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Cyril Roelandt -;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2017 Marius Bakke @@ -501,7 +501,7 @@ trouble using them, because you do not have to remember each snippet name.") (define-public vim-fugitive (package (name "vim-fugitive") - (version "3.1") + (version "3.2") (source (origin (method git-fetch) @@ -511,7 +511,7 @@ trouble using them, because you do not have to remember each snippet name.") (file-name (git-file-name name version)) (sha256 (base32 - "0d9jhmidmy5c60iy9x47gqr675n5wp9wrzln83r8ima1fz7vvbgs")))) + "1jbn5jxadccmcz01j94d0i1bp74cixr0fpxxf1h0aqdf1ljk3d7n")))) (build-system gnu-build-system) (arguments '(#:tests? #f -- cgit v1.2.3 From 89c756012c7f28dc7b4e52316f81168984f14293 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 26 Jan 2020 11:39:23 +0200 Subject: gnu: font-mathjax: Don't use unstable tarball. * gnu/packages/javascript.scm (font-mathjax)[source]: Download using git-fetch. [arguments]: Adjust for change in source. [native-inputs]: Remove gzip, tar. (js-mathjax)[source]: Adjust for change in source. --- gnu/packages/javascript.scm | 39 ++++++++++++++------------------------- 1 file changed, 14 insertions(+), 25 deletions(-) diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm index 83fa5ede4c..6868a37f86 100644 --- a/gnu/packages/javascript.scm +++ b/gnu/packages/javascript.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2017 Arun Isaac ;;; Copyright © 2017, 2019 Ricardo Wurmus ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice -;;; Copyright © 2017, 2018, 2019 Efraim Flashner +;;; Copyright © 2017, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2018 Nicolas Goaziou ;;; ;;; This file is part of GNU Guix. @@ -40,14 +40,14 @@ (version "2.7.2") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/mathjax/MathJax/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/mathjax/MathJax") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1r72di4pg4i6pfhcskkxqmf1158m81ki6a7lbw6nz4zh7xw23hy4")))) + "127j12g7v2hx6k7r00b8cp49s7nkrwhxy6l8p03pw34xpxbgbimm")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) @@ -55,20 +55,11 @@ (begin (use-modules (guix build utils) (ice-9 match)) - (set-path-environment-variable - "PATH" '("bin") (map (match-lambda - ((_ . input) - input)) - %build-inputs)) (let ((install-directory (string-append %output "/share/fonts/mathjax"))) (mkdir-p install-directory) - (invoke "tar" "-C" install-directory "-xvf" - (assoc-ref %build-inputs "source") - ,(string-append "MathJax-" version "/fonts") - "--strip" "2"))))) - (native-inputs - `(("gzip" ,gzip) - ("tar" ,tar))) + (copy-recursively (string-append (assoc-ref %build-inputs "source") + "/fonts") + install-directory))))) (home-page "https://www.mathjax.org/") (synopsis "Fonts for MathJax") (description "This package contains the fonts required for MathJax.") @@ -96,10 +87,8 @@ (list (assoc-ref %build-inputs "glibc-utf8-locales"))) (setenv "LANG" "en_US.UTF-8") (let ((install-directory (string-append %output "/share/javascript/mathjax"))) - (invoke "tar" "xvf" (assoc-ref %build-inputs "source") - ,(string-append "MathJax-" (package-version font-mathjax) - "/unpacked") - "--strip" "2") + (copy-recursively (string-append (assoc-ref %build-inputs "source") "/unpacked") + "MathJax-unpacked") (mkdir-p install-directory) (symlink (string-append (assoc-ref %build-inputs "font-mathjax") "/share/fonts/mathjax") @@ -108,8 +97,8 @@ (for-each (lambda (file) (let ((installed (string-append install-directory - ;; remove prefix "." - (string-drop file 1)))) + ;; remove prefix "./MathJax-unpacked" + (string-drop file 18)))) (format #t "~a -> ~a~%" file installed) (cond ((string-match "\\.js$" file) -- cgit v1.2.3 From e272783bdb792bce28cd70f8b4c51d53658a0c7b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 26 Jan 2020 12:48:56 +0100 Subject: gnu: python-elementpath: Update to 1.4.0. * gnu/packages/xml.scm (python-elementpath): Update to 1.4.0. --- gnu/packages/xml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 9984e92f17..b931707acc 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -2054,14 +2054,14 @@ modular implementation of XML-RPC for C and C++.") (define-public python-elementpath (package (name "python-elementpath") - (version "1.3.3") + (version "1.4.0") (source (origin (method url-fetch) (uri (pypi-uri "elementpath" version)) (sha256 (base32 - "1rb8892zli74wk1c4hyg77ja9wglq9hplgxwak1rmj3s9p6xnf0p")))) + "15h7d41v48q31hzjay7qzixdv531hnga3h35hksk7x52pgqcrkz7")))) (build-system python-build-system) (home-page "https://github.com/sissaschool/elementpath") -- cgit v1.2.3 From f8a94609d3c068d9bbd01632652941fba0b3e937 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 26 Jan 2020 12:49:17 +0100 Subject: gnu: python-xmlschema: Update to 1.1.0. * gnu/packages/xml.scm (python-xmlschema): Update to 1.1.0. [source]: Change to GIT-FETCH. [arguments]: Adjust test invokation. --- gnu/packages/xml.scm | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index b931707acc..5e40ba1ec2 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -2108,13 +2108,17 @@ libxml2 and libxslt.") (define-public python-xmlschema (package (name "python-xmlschema") - (version "1.0.18") + (version "1.1.0") (source (origin - (method url-fetch) - (uri (pypi-uri "xmlschema" version)) + ;; Unit tests are not distributed with the PyPI archive. + (method git-fetch) + (uri (git-reference + (url "https://github.com/sissaschool/xmlschema") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1inwqwr7d3qah9xf9rfzkpva433jpr4n7n43zybf2gdpz4q1g0ry")))) + "1h8321jb6q3dhlh3608y3f3sbbzfd3jg1psyirxkrm4w5xs3lbvy")))) (build-system python-build-system) (arguments '(#:phases @@ -2126,7 +2130,7 @@ libxml2 and libxslt.") (setenv "PYTHONPATH" (string-append "./build/lib:" (getenv "PYTHONPATH"))) - (invoke "python" "xmlschema/tests/test_all.py")) + (invoke "python" "-m" "unittest" "-v")) (format #t "test suite not run~%")) #t))))) (native-inputs -- cgit v1.2.3 From c17fb659070765acba1b8f568f2639adf48ccd1e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 26 Jan 2020 13:19:44 +0100 Subject: gnu: libofx: Disable parallel build. * gnu/packages/finance.scm (libofx)[arguments]: Add #:parallel-build?. --- gnu/packages/finance.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index ccd079c9d6..190e5cbbdc 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -1209,7 +1209,8 @@ a client based on Qt. This is a fork of Bitcoin Core."))) "1jx56ma351p8af8dvavygjwf6ipa7qbgq7bpdsymwj27apdnixfy")))) (build-system gnu-build-system) (arguments - '(#:configure-flags + '(#:parallel-build? #f ;fails with -j64 + #:configure-flags (list (string-append "--with-opensp-includes=" (assoc-ref %build-inputs "opensp") "/include/OpenSP")))) -- cgit v1.2.3 From 6f85a9c45f7f82e0cc750cae8050d61b4a2384a6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 26 Jan 2020 14:26:47 +0100 Subject: gnu: ir: Update to 1.3.4. * gnu/packages/audio.scm (ir): Update to 1.3.4. [source]: Fetch via git. [home-page]: Update. [arguments]: Pass INSTDIR. --- gnu/packages/audio.scm | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 5c1285cce9..95222a5d81 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer ;;; Copyright © 2015 Andreas Enge ;;; Copyright © 2015 Alex Kost @@ -1512,25 +1512,23 @@ well suited to all musical instruments and vocals.") (define-public ir (package (name "ir") - (version "1.3.2") + (version "1.3.4") (source (origin - (method url-fetch) - ;; The original home-page is gone. Download the tarball from an - ;; archive mirror instead. - (uri (list (string-append - "https://web.archive.org/web/20150803095032/" - "http://factorial.hu/system/files/ir.lv2-" - version ".tar.gz") - (string-append - "https://mirrors.kernel.org/gentoo/distfiles/ir.lv2-" - version ".tar.gz"))) + (method git-fetch) + (uri (git-reference + (url "https://github.com/tomszilagyi/ir.lv2") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1jh2z01l9m4ar7yz0n911df07dygc7n4cl59p7qdjbh0nvkm747g")))) + "0svmjhg4r6wy5ci5rwz43ybll7yxjv7nnj7nyqscbzhr3gi5aib0")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests - #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:make-flags + (list (string-append "PREFIX=" (assoc-ref %outputs "out")) + (string-append "INSTDIR=" + (assoc-ref %outputs "out") "/lib/lv2")) #:phases (modify-phases %standard-phases (delete 'configure)))) ; no configure script (inputs @@ -1546,9 +1544,7 @@ well suited to all musical instruments and vocals.") (list (search-path-specification (variable "LV2_PATH") (files '("lib/lv2"))))) - ;; Link to an archived copy of the home-page since the original is gone. - (home-page (string-append "https://web.archive.org/web/20150803095032/" - "http://factorial.hu/plugins/lv2/ir")) + (home-page "https://tomszilagyi.github.io/plugins/ir.lv2") (synopsis "LV2 convolution reverb") (description "IR is a low-latency, real-time, high performance signal convolver -- cgit v1.2.3 From cf07ec200c0921ede70082f0c78988553e94fd6c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 26 Jan 2020 15:51:23 +0100 Subject: gnu: kobodeluxe: Provide missing dependency. * gnu/packages/games.scm (kobodeluxe)[inputs]: Add GLU. --- gnu/packages/games.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index f348cafb67..c05503cabb 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4177,7 +4177,9 @@ symbols, it still needs graphics to render the non-euclidean world.") (list (string-append "CPPFLAGS=-I" (assoc-ref %build-inputs "sdl-union") "/include/SDL")))) - (inputs `(("sdl-union" ,(sdl-union (list sdl sdl-image))))) + (inputs + `(("glu" ,glu) + ("sdl-union" ,(sdl-union (list sdl sdl-image))))) (synopsis "Shooter with space station destruction") (description "Kobo Deluxe is an enhanced version of Akira Higuchi's XKobo graphical game -- cgit v1.2.3 From 3cb8cb666069804551148b9c49ebaea6b3a9973e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 26 Jan 2020 16:18:20 +0100 Subject: gnu: ghmm: Fix missing module import. This is a follow-up to commit 9c2563a80b6f1d8fb8677f5314e6180ea9916aa5. * gnu/packages/machine-learning.scm (ghmm)[arguments]: Add #:modules. --- gnu/packages/machine-learning.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 719401d69a..36df9fad0c 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -206,6 +206,8 @@ classification.") (arguments `(#:imported-modules (,@%gnu-build-system-modules (guix build python-build-system)) + #:modules ((guix build python-build-system) + ,@%gnu-build-system-modules) #:phases (modify-phases %standard-phases (add-after 'unpack 'enter-dir -- cgit v1.2.3 From 9a5edd02405b9ee70bc2f93b91483e8da2eadfd3 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Sun, 26 Jan 2020 18:03:23 +0100 Subject: services: Fix typo in spice-vdagent-service. * gnu/services/spice.scm (spice-vdagent-service): Fix typo. Signed-off-by: Danny Milosavljevic --- gnu/services/spice.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/services/spice.scm b/gnu/services/spice.scm index 2f9dfd57ac..8a835fe78e 100644 --- a/gnu/services/spice.scm +++ b/gnu/services/spice.scm @@ -72,7 +72,7 @@ (define* (spice-vdagent-service #:optional (config (spice-vdagent-configuration))) - "Start the @command{vdagentd} and @command{vdagent} deamons + "Start the @command{vdagentd} and @command{vdagent} daemons from @var{spice-vdagent} to enable guest window resizing and clipboard sharing." (service spice-vdagent-service-type config)) -- cgit v1.2.3 From 43b4f936b907c340efc3d5a485939a4e01ef4fce Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 12 Jan 2020 23:24:47 +0100 Subject: gnu: Add python-pyenchant. * gnu/packages/enchant.scm (python-pyenchant): New variable. --- gnu/packages/enchant.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/enchant.scm b/gnu/packages/enchant.scm index bcf2507e86..25825997bb 100644 --- a/gnu/packages/enchant.scm +++ b/gnu/packages/enchant.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2014 Marek Benc ;;; Copyright © 2018 Marius Bakke ;;; Copyright © 2019 Tobias Geerinckx-Rice +;;; Copyright © 2020 Julien Lepiller ;;; ;;; This file is part of GNU Guix. ;;; @@ -23,10 +24,12 @@ #:use-module (gnu packages aspell) #:use-module (gnu packages check) #:use-module (gnu packages glib) + #:use-module (gnu packages libreoffice) #:use-module (gnu packages pkg-config) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) + #:use-module (guix build-system python) #:use-module (guix licenses) #:use-module (srfi srfi-1)) @@ -86,3 +89,35 @@ working\".") (sha256 (base32 "0zq9yw1xzk8k9s6x83n1f9srzcwdavzazn3haln4nhp9wxxrxb1g")))))) + +(define-public python-pyenchant + (package + (name "python-pyenchant") + (version "2.0.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "pyenchant" version)) + (sha256 + (base32 + "1872ckgdip8nj9rnh167m0gsj5754qfg2hjxzsl1s06f5akwscgw")))) + (build-system python-build-system) + (arguments + `(#:tests? #f; FIXME: Dictionary for language 'en_US' could not be found + #:phases + (modify-phases %standard-phases + (add-before 'build 'setlib + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "enchant/_enchant.py" + (("/opt/local/lib/libenchant.dylib\"") + (string-append "/opt/local/lib/libenchant.dylib\"\n" + " yield \"" (assoc-ref inputs "enchant") + "/lib/libenchant-2.so\"")))))))) + (inputs + `(("enchant" ,enchant))) + (home-page "https://github.com/pyenchant/pyenchant") + (synopsis "Spellchecking library for Python") + (description "PyEnchant is a spellchecking library for Python, based on the +Enchant library. PyEnchant combines all the functionality of the underlying +Enchant library with the flexibility of Python. It also provides some +higher-level functionality than is available in the C API.") + (license lgpl2.1+))) -- cgit v1.2.3 From 7261bdca4edf800a2e329369fefd3f2d43f0bf03 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 12 Jan 2020 23:30:11 +0100 Subject: gnu: Add python-check-manifest. * gnu/packages/python-xyz.scm (python-check-manifest): New variable. --- gnu/packages/python-xyz.scm | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 231c380fb8..f8d107d5c1 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -31,7 +31,7 @@ ;;; Copyright © 2016 Dylan Jeffers ;;; Copyright © 2016, 2017, 2019 Alex Vong ;;; Copyright © 2016, 2017, 2018 Arun Isaac -;;; Copyright © 2016, 2017, 2018 Julien Lepiller +;;; Copyright © 2016, 2017, 2018, 2020 Julien Lepiller ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2016, 2017 Thomas Danckaert ;;; Copyright © 2017 Carlo Zancanaro @@ -17312,3 +17312,25 @@ tests.") GSSAPI C libraries. While it focuses on the Kerberos mechanism, it should also be useable with other GSSAPI mechanisms.") (license license:isc))) + +(define-public python-check-manifest + (package + (name "python-check-manifest") + (version "0.37") + (source + (origin + (method url-fetch) + (uri (pypi-uri "check-manifest" version)) + (sha256 + (base32 + "0lk45ifdv2cpkl6ayfyix7jwmnxa1rha7xvb0ih5999k115wzqs4")))) + (build-system python-build-system) + (native-inputs + `(("python-mock" ,python-mock) + ("git" ,git))) + (home-page "https://github.com/mgedmin/check-manifest") + (synopsis "Check MANIFEST.in in a Python source package for completeness") + (description "Python package can include a MANIFEST.in file to help with +sending package files to the Python Package Index. This package checks that +file to ensure it completely and accurately describes your project.") + (license license:expat))) -- cgit v1.2.3 From 9532c0bb17f32ec2f22b7f87508a645bd2bcd935 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 12 Jan 2020 23:33:50 +0100 Subject: gnu: Add python-codacy-coverage. * gnu/packages/python-check.scm (python-codacy-coverage): New variable. --- gnu/packages/python-check.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index a4d065d5e7..d322121b79 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2019 Efraim Flashner ;;; Copyright © 2019 Maxim Cournoyer ;;; Copyright © 2019 Hartmut Goebel +;;; Copyright © 2020 Julien Lepiller ;;; ;;; This file is part of GNU Guix. ;;; @@ -289,3 +290,26 @@ testing framework.") (description "This package provides a virtualenv fixture for the py.test framework.") (license license:expat))) + +(define-public python-codacy-coverage + (package + (name "python-codacy-coverage") + (version "1.3.11") + (source + (origin + (method url-fetch) + (uri (pypi-uri "codacy-coverage" version)) + (sha256 + (base32 + "1g0c0w56xdkmqb8slacyw5qhzrkp814ng3ddh2lkiij58y9m2imr")))) + (build-system python-build-system) + (arguments + `(#:tests? #f)); no tests + (propagated-inputs + `(("python-check-manifest" ,python-check-manifest))) + (home-page "https://github.com/codacy/python-codacy-coverage") + (synopsis "Codacy coverage reporter for Python") + (description "This package analyses Python test suites and reports how much +of the code is covered by them. This tool is part of the Codacy suite for +analysing code quality.") + (license license:expat))) -- cgit v1.2.3 From 18d18ee139b6e8f678670125edb05c6e901d38a8 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 12 Jan 2020 23:47:20 +0100 Subject: gnu: Add python-translation-finder. * gnu/packages/python-web.scm (python-translation-finder): New variable. --- gnu/packages/python-web.scm | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 8f33201fd3..08f4307588 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2016, 2017 Marius Bakke ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus ;;; Copyright © 2017 Roel Janssen -;;; Copyright © 2016, 2017 Julien Lepiller +;;; Copyright © 2016, 2017, 2020 Julien Lepiller ;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2014, 2017 Eric Bavier ;;; Copyright © 2014, 2015 Mark H Weaver @@ -67,6 +67,7 @@ #:use-module (gnu packages python-check) #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages serialization) #:use-module (gnu packages sphinx) #:use-module (gnu packages texinfo) #:use-module (gnu packages tls) @@ -3431,3 +3432,40 @@ Unicorn project. The Gunicorn server is broadly compatible with various web frameworks, simply implemented, light on server resources, and fairly speedy.") (license license:expat))) + +(define-public python-translation-finder + (package + (name "python-translation-finder") + (version "1.7") + (source + (origin + (method url-fetch) + (uri (pypi-uri "translation-finder" version)) + (sha256 + (base32 + "1pcy9z8gmb8x41gjhw9x0lkr0d2mv5mdxcs2hwg6q8mxs857j589")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'build 'remove-failing-test + (lambda _ + (delete-file "translation_finder/test_api.py") + #t))))) + (propagated-inputs + `(("python-chardet" ,python-chardet) + ("python-pathlib2" ,python-pathlib2) + ("python-ruamel.yaml" ,python-ruamel.yaml) + ("python-six" ,python-six))) + (native-inputs + `(("python-codecov" ,python-codecov) + ("python-codacy-coverage" ,python-codacy-coverage) + ("python-pytest-cov" ,python-pytest-cov) + ("python-pytest-runner" ,python-pytest-runner) + ("python-twine" ,python-twine))) + (home-page "https://weblate.org/") + (synopsis "Translation file finder for Weblate") + (description "This package provides a function to find translation file in +the source code of a project. It supports many translation file formats and +is part of the Weblate translation platform.") + (license license:gpl3+))) -- cgit v1.2.3 From 63f76ab29e69ef503ab1fb5e11255ba2caa02a3c Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 12 Jan 2020 23:49:47 +0100 Subject: gnu: add python-httmock. * gnu/packages/python-check.scm (python-httmock): New variable. --- gnu/packages/python-check.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index d322121b79..a69619b96a 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -313,3 +313,25 @@ framework.") of the code is covered by them. This tool is part of the Codacy suite for analysing code quality.") (license license:expat))) + +(define-public python-httmock + (package + (name "python-httmock") + (version "1.3.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "httmock" version)) + (sha256 + (base32 + "1zj1fcm0n6f0wr9mr0hmlqz9430fnr5cdwd5jkcvq9j44bnsrfz0")))) + (build-system python-build-system) + (arguments + `(#:tests? #f)); no tests + (propagated-inputs + `(("python-requests" ,python-requests))) + (home-page "https://github.com/patrys/httmock") + (synopsis "Mocking library for requests.") + (description "This package provides a library for replying fake data to +Python software under test, when they make an HTTP query.") + (license license:asl2.0))) -- cgit v1.2.3 From ad429e0de74eb087097ed383e2cda046321e5dc2 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 12 Jan 2020 23:53:59 +0100 Subject: gnu: Add python-gitlab. * gnu/packages/python-web.scm (python-gitlab): New variable. --- gnu/packages/python-web.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 08f4307588..9464021d82 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -3469,3 +3469,28 @@ and fairly speedy.") the source code of a project. It supports many translation file formats and is part of the Weblate translation platform.") (license license:gpl3+))) + +(define-public python-gitlab + (package + (name "python-gitlab") + (version "1.15.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "python-gitlab" version)) + (sha256 + (base32 + "0zl6kz8v8cg1bcy2r78b2snb0lpw0b573gdx2x1ps0nhsh75l4j5")))) + (build-system python-build-system) + (propagated-inputs + `(("python-requests" ,python-requests) + ("python-six" ,python-six))) + (native-inputs + `(("python-httmock" ,python-httmock) + ("python-mock" ,python-mock))) + (home-page + "https://github.com/python-gitlab/python-gitlab") + (synopsis "Interact with GitLab API") + (description "This package provides an extended library for interacting +with GitLab instances through their API.") + (license license:lgpl3+))) -- cgit v1.2.3 From b487b7b5bb7702209b719d155f6938c08bd2f1e3 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 13 Jan 2020 00:02:43 +0100 Subject: gnu: Add python-android-stringslib. * gnu/packages/python-xyz.scm (python-android-stringslib): New variable. --- gnu/packages/python-xyz.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f8d107d5c1..70b51af84b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17334,3 +17334,26 @@ also be useable with other GSSAPI mechanisms.") sending package files to the Python Package Index. This package checks that file to ensure it completely and accurately describes your project.") (license license:expat))) + +(define-public python-android-stringslib + (package + (name "python-android-stringslib") + (version "0.1.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://framagit.org/tyreunom/python-android-strings-lib") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0gij55qzzq1h83kfpvhai1vf78kkhyvxa6l17m2nl24454lhfin4")))) + (build-system python-build-system) + (arguments + `(#:tests? #f)) + (home-page "https://framagit.org/tyreunom/python-android-strings-lib") + (synopsis "Android strings.xml support") + (description "Android Strings Lib provides support for android's strings.xml +files. These files are used to translate strings in android apps.") + (license license:expat))) -- cgit v1.2.3 From 87435943d1cf082b64fd2ee581e9db85b373ddb9 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 13 Jan 2020 00:13:14 +0100 Subject: gnu: Add python-pathtools. * gnu/packages/python-xyz.scm (python-pathtools): New variable. --- gnu/packages/python-xyz.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 70b51af84b..6e9722c1fe 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17357,3 +17357,21 @@ file to ensure it completely and accurately describes your project.") (description "Android Strings Lib provides support for android's strings.xml files. These files are used to translate strings in android apps.") (license license:expat))) + +(define-public python-pathtools + (package + (name "python-pathtools") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pathtools" version)) + (sha256 + (base32 + "1h7iam33vwxk8bvslfj4qlsdprdnwf8bvzhqh3jq5frr391cadbw")))) + (build-system python-build-system) + (home-page "https://github.com/gorakhargosh/pathtools") + (synopsis "File system general utilities") + (description "This package provides pattern matching and various utilities +for file systems paths.") + (license license:expat))) -- cgit v1.2.3 From 2cb4ee2787281b0c155ab4794fa1251652251d3b Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 13 Jan 2020 00:14:21 +0100 Subject: gnu: Add python-iocapture. * gnu/packages/python-xyz.scm (python-iocapture): New variable. --- gnu/packages/python-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 6e9722c1fe..cd68b49572 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17375,3 +17375,25 @@ files. These files are used to translate strings in android apps.") (description "This package provides pattern matching and various utilities for file systems paths.") (license license:expat))) + +(define-public python-iocapture + (package + (name "python-iocapture") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "iocapture" version)) + (sha256 + (base32 + "1s3ywdr0l3kfrrqi079iv16g0rp75akkvx0j07vx9p5w10c0wrw6")))) + (build-system python-build-system) + (native-inputs + `(("python-flexmock" ,python-flexmock) + ("python-pytest-cov" ,python-pytest-cov) + ("python-six" ,python-six))) + (home-page "https://github.com/oinume/iocapture") + (synopsis "stdout and stderr capture in Python") + (description "This package allows Python developpers to capture their standard +output and standard error.") + (license license:expat))) -- cgit v1.2.3 From fb4db07467fb764e7df64a4aacae13eaaf7f912c Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 13 Jan 2020 00:15:21 +0100 Subject: gnu: Add python-argh. * gnu/packages/python-xyz.scm (python-argh): New variable. --- gnu/packages/python-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index cd68b49572..f8f2c95966 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17397,3 +17397,25 @@ for file systems paths.") (description "This package allows Python developpers to capture their standard output and standard error.") (license license:expat))) + +(define-public python-argh + (package + (name "python-argh") + (version "0.26.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "argh" version)) + (sha256 + (base32 + "0rdv0n2aa181mkrybwvl3czkrrikgzd4y2cri6j735fwhj65nlz9")))) + (build-system python-build-system) + (native-inputs + `(("python-iocapture" ,python-iocapture) + ("python-mock" ,python-mock) + ("python-pytest" ,python-pytest))) + (home-page "https://github.com/neithere/argh/") + (synopsis "Argparse wrapper with natural syntax") + (description "This package provides a parser for dealing with command-line +arguments in Python.") + (license license:lgpl3))) -- cgit v1.2.3 From 7dec888f4fc08c69720978c1dd239a0d0f9089ff Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 13 Jan 2020 00:21:53 +0100 Subject: gnu: Add python-watchdog. * gnu/packages/python-xyz.scm (python-watchdog): New variable. --- gnu/packages/python-xyz.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f8f2c95966..dbd95d9fca 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17419,3 +17419,37 @@ output and standard error.") (description "This package provides a parser for dealing with command-line arguments in Python.") (license license:lgpl3))) + +(define-public python-watchdog + (package + (name "python-watchdog") + (version "0.9.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "watchdog" version)) + (sha256 + (base32 + "07cnvvlpif7a6cg4rav39zq8fxa5pfqawchr46433pij0y6napwn")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'remove-failing + (lambda _ + (delete-file "tests/test_inotify_buffer.py") + (delete-file "tests/test_snapshot_diff.py") + #t))))) + (propagated-inputs + `(("python-argh" ,python-argh) + ("python-pathtools" ,python-pathtools) + ("python-pyyaml" ,python-pyyaml))) + (native-inputs + `(("python-pytest-cov" ,python-pytest-cov) + ("python-pytest-timeout" ,python-pytest-timeout))) + (home-page "https://github.com/gorakhargosh/watchdog") + (synopsis "Filesystem events monitoring") + (description "This package provides a way to monitor filesystem events +such as a file modification and trigger an action. This is similar to inotify, +but portable.") + (license license:asl2.0))) -- cgit v1.2.3 From 2cbede5935eb6a40173bbdf30a9ad22bf7574c22 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 13 Jan 2020 00:22:13 +0100 Subject: gnu: Add offlate. * gnu/packages/python-xyz.scm (offlate): New variable. --- gnu/packages/python-xyz.scm | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index dbd95d9fca..91f36bf3ee 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -97,6 +97,7 @@ #:use-module (gnu packages crypto) #:use-module (gnu packages databases) #:use-module (gnu packages dbm) + #:use-module (gnu packages enchant) #:use-module (gnu packages file) #:use-module (gnu packages fontutils) #:use-module (gnu packages gcc) @@ -17453,3 +17454,47 @@ arguments in Python.") such as a file modification and trigger an action. This is similar to inotify, but portable.") (license license:asl2.0))) + +(define-public offlate + (package + (name "offlate") + (version "0.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://framagit.org/tyreunom/offlate") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "13pqnbl05wcyldfvl75fp89vjgwsvxyc69vhnb17kkha2rc2k1h7")))) + (build-system python-build-system) + (arguments + ;; No tests + `(#:tests? #f)) + (propagated-inputs + `(("python-android-stringslib" ,python-android-stringslib) + ("python-dateutil" ,python-dateutil) + ("python-gitlab" ,python-gitlab) + ("python-lxml" ,python-lxml) + ("python-polib" ,python-polib) + ("python-pyenchant" ,python-pyenchant) + ("python-pygit2" ,python-pygit2) + ("python-pygithub" ,python-pygithub) + ("python-pyqt" ,python-pyqt) + ("python-requests" ,python-requests) + ("python-ruamel.yaml" ,python-ruamel.yaml) + ("python-translation-finder" ,python-translation-finder) + ("python-watchdog" ,python-watchdog))) + (native-inputs + `(("qttools" ,qttools))) + (home-page "https://framagit.org/tyreunom/offlate") + (synopsis "Offline translation interface for online translation tools") + (description "Offlate offers a unified interface for different translation +file formats, as well as many different online translation platforms. You can +use it to get work from online platforms, specialized such as the Translation +Project, or not such a gitlab instance when your upstream doesn't use any +dedicated platform. The tool proposes a unified interface for any format and +an upload option to send your work back to the platform.") + (license license:gpl3+))) -- cgit v1.2.3 From 3fad9a692311cc3165aac95b70e881bf8fb092ff Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 26 Jan 2020 19:24:38 +0100 Subject: gnu: Add qemacs. * gnu/packages/text-editors.scm (qemacs): New variable. --- gnu/packages/text-editors.scm | 107 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 607df4bb03..3e5035f0de 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -305,6 +305,113 @@ Wordstar-, EMACS-, Pico, Nedit or vi-like key bindings. e3 can be used on OpenBSD team.") (license license:public-domain))) +(define-public qemacs + (package + (name "qemacs") + (version "0.3.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://bellard.org/qemacs/" + "qemacs-" version ".tar.gz")) + (sha256 + (base32 "156z4wpj49i6j388yjird5qvrph7hz0grb4r44l4jf3q8imadyrg")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ;no test + #:phases + (modify-phases %standard-phases + (add-before 'build 'build-qhtml + ;; Build fails without first creating qHTML library. + (lambda _ (invoke "make" "-C" "libqhtml"))) + (add-before 'install 'fix-man-pages-directory + ;; Install in $out/share/man instead of $out/man. + (lambda _ + (substitute* "Makefile" + (("/man/man1" all) (string-append "/share" all))) + #t)) + (add-before 'install 'create-directories + ;; Ensure directories exist before installing files. + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (for-each (lambda (d) (mkdir-p (string-append out d))) + '("/bin" "/share/man/man1" "/share/qe")) + #t))) + (add-after 'install 'install-extra-documentation + ;; Install sample configuration file, Info, and HTML manual. + (lambda* (#:key outputs #:allow-other-keys) + (let* ((share (string-append (assoc-ref outputs "out") "/share")) + (doc (string-append share "/doc/" ,name "-" ,version)) + (html (string-append share "/html")) + (info (string-append share "/info")) + (makeinfo (string-append (assoc-ref %build-inputs "texinfo") + "/bin/makeinfo"))) + ;; First fix Texinfo documentation, create appropriate + ;; directories, then generate Info and HTML files there. + (substitute* "qe-doc.texi" + (("^M-([{}])" _ bracket) (string-append "M-@" bracket))) + (for-each (lambda (d) (mkdir-p d)) (list html info)) + (invoke makeinfo "qe-doc.texi" "-o" info) + (invoke makeinfo "qe-doc.texi" "--html" "--no-split" "-o" html) + ;; Install sample configuration file. + (install-file "config.eg" doc) + #t)))))) + (native-inputs + `(("texinfo" ,texinfo))) + (inputs + `(("libx11" ,libx11) + ("libxext" ,libxext) + ("libxv" ,libxv))) + (home-page "https://bellard.org/qemacs/") + (synopsis "Small but powerful text editor") + (description "QEmacs (for Quick Emacs) is a very small but +powerful editor. It has features that even big editors lack: + +@itemize + +@item Full screen editor with an Emacs look and feel with all Emacs +common features: multi-buffer, multi-window, command mode, universal +argument, keyboard macros, config file with C-like syntax, minibuffer +with completion and history. + +@item Can edit files of hundreds of Megabytes without being slow by +using a highly optimized internal representation and by mmaping the +file. + +@item Full Unicode support, including multi charset handling (8859-x, +UTF8, SJIS, EUC-JP, ...) and bidirectional editing respecting the +Unicode bidi algorithm. Arabic and Indic scripts handling (in +progress). + +@item WYSIWYG HTML/XML/CSS2 mode graphical editing. Also supports +Lynx like rendering on VT100 terminals. + +@item WYSIWYG DocBook mode based on XML/CSS2 renderer. + +@item C mode: coloring with immediate update. Emacs like auto-indent. + +@item Shell mode: colorized VT100 emulation so that your shell work +exactly as you expect. Compile mode with next/prev error. + +@item Input methods for most languages, including Chinese (input +methods come from the Yudit editor). + +@item Hexadecimal editing mode with insertion and block commands. +Unicode hexa editing is also supported. + +@item Works on any VT100 terminals without termcap. UTF8 VT100 +support included with double width glyphs. + +@item X11 support. Support multiple proportional fonts at the same +time (as XEmacs). X Input methods supported. Xft extension supported +for anti aliased font display. + +@item Small! Full version (including HTML/XML/CSS2/DocBook rendering +and all charsets): 200KB big. Basic version (without bidir/unicode +scripts/input/X11/C/Shell/HTML/Dired): 49KB. +@end itemize") + (license license:lgpl2.1+))) + (define-public ghostwriter (package (name "ghostwriter") -- cgit v1.2.3 From fb85b967f65f709e09ecbe6521b9307ebd913405 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 26 Jan 2020 19:25:19 +0100 Subject: gnu: Add missing modules. * gnu/packages/text-editors.scm: Add missing modules. --- gnu/packages/text-editors.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 3e5035f0de..922de86eb1 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -61,7 +61,8 @@ #:use-module (gnu packages ruby) #:use-module (gnu packages terminals) #:use-module (gnu packages texinfo) - #:use-module (gnu packages xml)) + #:use-module (gnu packages xml) + #:use-module (gnu packages xorg)) (define-public vis (package -- cgit v1.2.3 From af46f6e40afa932e3fe8e1b07b09f9bcbb7e33e3 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 26 Jan 2020 13:33:49 -0500 Subject: gnu: linux-libre: Update to 5.4.15. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.15. (linux-libre-5.4-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e5cc773ecc..9b0dfd8eb7 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -357,10 +357,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." "linux-" version ".tar.xz")) (sha256 hash))) -(define-public linux-libre-5.4-version "5.4.14") +(define-public linux-libre-5.4-version "5.4.15") (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "1w6pr0lcpkzjq4n0hnrj02ycdwzvz8lrgy23715zl5pmxsq1h7jk"))) + (hash (base32 "1ccldlwj89qd22cl06706w7xzm8n69m6kg8ic0s5ns0ghlpj41v4"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit v1.2.3 From 3d11114d229035440b49dccd964a2efa7ad5874f Mon Sep 17 00:00:00 2001 From: Joseph LaFreniere Date: Mon, 6 Jan 2020 20:56:35 -0600 Subject: gnu: Add emacs-vterm. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs-xyz.scm (emacs-vterm): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/emacs-xyz.scm | 70 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 69 insertions(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 7a561c77f3..9870964ec0 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -46,7 +46,7 @@ ;;; Copyright © 2019 Brian Leung ;;; Copyright © 2019 mikadoZero ;;; Copyright © 2019 Gabriel Hondet -;;; Copyright © 2019 LaFreniere, Joseph +;;; Copyright © 2019, 2020 Joseph LaFreniere ;;; Copyright © 2019 Amar Singh ;;; Copyright © 2019 Baptiste Strazzulla ;;; Copyright © 2019 Giacomo Leidi @@ -105,6 +105,7 @@ #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) #:use-module (gnu packages telephony) + #:use-module (gnu packages terminals) #:use-module (gnu packages tex) #:use-module (gnu packages texinfo) #:use-module (gnu packages tcl) @@ -17399,6 +17400,73 @@ next, volume) and display and control the current playlist as well as your stored playlists.") (license license:gpl3+))) +(define-public emacs-vterm + (let ((version "0") + (revision "1") + (commit "7d7381fa8104b55b70148cf147523d9ab7f01fcd")) + (package + (name "emacs-vterm") + (version (git-version version revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/akermu/emacs-libvterm.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "04a2jlhmr20ipgzpnba3yryw3ly7qdxjgaw10dwn9wxy1yqmapz1")))) + (build-system emacs-build-system) + (arguments + `(#:modules ((guix build emacs-build-system) + ((guix build cmake-build-system) #:prefix cmake:) + (guix build emacs-utils) + (guix build utils)) + #:imported-modules (,@%emacs-build-system-modules + (guix build cmake-build-system)) + #:phases + (modify-phases %standard-phases + (add-before 'add-source-to-load-path 'remove-vterm-module-make + (lambda* (#:key outputs #:allow-other-keys) + ;; Remove the Emacs Lisp file. + (delete-file "vterm-module-make.el") + ;; Remove references to the removed file. + (make-file-writable "vterm.el") + (emacs-substitute-sexps "vterm.el" + ("(or (require 'vterm-module nil t)" + `(module-load + ,(string-append (assoc-ref outputs "out") + "/lib/vterm-module.so")))) + #t)) + (add-after 'build 'configure + ;; Run cmake. + (lambda* (#:key outputs #:allow-other-keys) + ((assoc-ref cmake:%standard-phases 'configure) + #:outputs outputs + #:out-of-source? #f + #:configure-flags '("-DUSE_SYSTEM_LIBVTERM=ON")) + #t)) + (add-after 'configure 'make + ;; Run make. + (lambda* (#:key (make-flags '()) outputs #:allow-other-keys) + ;; Compile the shared object file. + (apply invoke "make" "all" make-flags) + ;; Move the file into /lib. + (install-file + "vterm-module.so" + (string-append (assoc-ref outputs "out") "/lib")) + #t))) + #:tests? #f)) + (native-inputs + `(("cmake" ,cmake-minimal) + ("libtool" ,libtool) + ("libvterm" ,libvterm))) + (home-page "https://github.com/akermu/emacs-libvterm") + (synopsis "Emacs libvterm integration") + (description "This package implements a bridge to @code{libvterm} to +display a terminal in an Emacs buffer.") + (license license:gpl3+)))) + (define-public emacs-simple-mpc ;; There have been no releases. (let ((commit "bee8520e81292b4c7353e45b193f9a13b482f5b2") -- cgit v1.2.3 From 98dd9ff8006bde715cd25dbd75caceee28b2aa5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 26 Jan 2020 23:11:25 +0100 Subject: gnu: mailutils: Add "guile3.0-mailutils" variant. * gnu/packages/mail.scm (mailutils)[arguments]: In #:configure-flags, replace hard-coded "2.2" with the 'version-major+minor' of the "guile" input. (guile3.0-mailutils): New variable. --- gnu/packages/mail.scm | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 49d04ba7a2..c503b631dc 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2014, 2015, 2017 Mark H Weaver ;;; Copyright © 2014 Ian Denhardt ;;; Copyright © 2014 Sou Bunnbu @@ -137,7 +137,9 @@ #:use-module (guix build-system guile) #:use-module (guix build-system perl) #:use-module (guix build-system python) - #:use-module (guix build-system trivial)) + #:use-module (guix build-system trivial) + #:use-module (srfi srfi-1) + #:use-module (ice-9 match)) (define-public mailutils (package @@ -152,7 +154,7 @@ "1wkn9ch664477r4d8jk9153w5msljsbj99907k7zgzpmywbs6ba7")))) (build-system gnu-build-system) (arguments - '(#:phases + `(#:phases (modify-phases %standard-phases (add-before 'check 'prepare-test-suite (lambda _ @@ -200,12 +202,18 @@ #t))) ;; TODO: Add `--with-sql'. - #:configure-flags (list "--sysconfdir=/etc" - - ;; Add "/2.2" to the installation directory. - (string-append "--with-guile-site-dir=" - (assoc-ref %outputs "out") - "/share/guile/site/2.2")) + #:configure-flags + (list "--sysconfdir=/etc" + + ;; Add "/X.Y" to the installation directory. + (string-append "--with-guile-site-dir=" + (assoc-ref %outputs "out") + "/share/guile/site/" + ,(match (assoc "guile" + (package-inputs this-package)) + (("guile" guile) + (version-major+minor + (package-version guile)))))) #:parallel-tests? #f)) (native-inputs @@ -238,6 +246,14 @@ software.") ;; Libraries are under LGPLv3+, and programs under GPLv3+. (list gpl3+ lgpl3+)))) +(define-public guile3.0-mailutils + (package + (inherit mailutils) + (name "guile3.0-mailutils") + (inputs + `(("guile" ,guile-3.0) + ,@(alist-delete "guile" (package-inputs mailutils)))))) + (define-public nullmailer (package (name "nullmailer") -- cgit v1.2.3 From 5c03516a6bc6bff69b99ec8d29a87603685f7041 Mon Sep 17 00:00:00 2001 From: Prafulla Giri Date: Tue, 21 Jan 2020 12:25:24 +0545 Subject: guix-install.sh: Export INFOPATH to contain updated guix info-pages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * etc/guix-install.sh (sys_create_init_profile): Export INFOPATH to include the updated info-pages from ~/.config/guix/current/share/info. This also makes sure that both /usr/bin/info and $GUIX_PROFILE/bin/info can read guix info pages without throwing "no menu item 'guix' in node dir(Top)" error. Signed-off-by: Ludovic Courtès --- etc/guix-install.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index b57d71981f..ff97c78549 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -398,7 +398,12 @@ sys_create_init_profile() cat <<"EOF" > /etc/profile.d/guix.sh # _GUIX_PROFILE: `guix pull` profile _GUIX_PROFILE="$HOME/.config/guix/current" -[ -L $_GUIX_PROFILE ] && export PATH="$_GUIX_PROFILE/bin${PATH:+:}$PATH" +if [ -L $_GUIX_PROFILE ]; then + export PATH="$_GUIX_PROFILE/bin${PATH:+:}$PATH" + # Export INFOPATH so that the updated info pages can be found + # and read by both /usr/bin/info and/or $GUIX_PROFILE/bin/info + export INFOPATH="$_GUIX_PROFILE/share/info${INFOPATH:+:}$INFOPATH" +fi # GUIX_PROFILE: User's default profile GUIX_PROFILE="$HOME/.guix-profile" -- cgit v1.2.3 From 29ba58c0ef3c1e4a6154a133203c9c09d138fd32 Mon Sep 17 00:00:00 2001 From: Prafulla Giri Date: Tue, 21 Jan 2020 12:34:10 +0545 Subject: guix-install.sh: Create /etc/profile.d if it does not exist MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * etc/guix-install.sh (sys_create_init_profile): Add code to create /etc/profile.d if it somehow does not exist; the function still carries on because it is possible that /etc/profile is still configured to read the *.sh files from /etc/profile.d, if they exist. Signed-off-by: Ludovic Courtès --- etc/guix-install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index ff97c78549..0e677c2b90 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -395,6 +395,7 @@ sys_authorize_build_farms() sys_create_init_profile() { # Create /etc/profile.d/guix.sh for better desktop integration + [ -d "/etc/profile.d" ] || mkdir /etc/profile.d # Just in case cat <<"EOF" > /etc/profile.d/guix.sh # _GUIX_PROFILE: `guix pull` profile _GUIX_PROFILE="$HOME/.config/guix/current" -- cgit v1.2.3 From 7ff169d04f52b15393b33a97959e2cd6a5957e26 Mon Sep 17 00:00:00 2001 From: Alexander Krotov Date: Wed, 22 Jan 2020 02:01:33 +0300 Subject: guix-install.sh: Correctly treat empty or unset $XDG_DATA_DIRS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If $XDG_DATA_DIRS is unset, default value of "/usr/local/share:/usr/share" is used according to XDG Base Directory Specification. However, /etc/profile.d/guix.sh treats this value as empty list when appending its own directory, so after installing Guix on the system, launchers such as Rofi stop searching for .desktop files in /usr/share/applications/ and can't launch applications other than those installed with Guix. This patch fixes the bug in generated /etc/profile.d/guix.sh * etc/guix-install.sh (sys_create_init_profile): Use default value of /usr/local/share:/usr/share/ before appending if $XDG_DATA_DIRS is not set. Signed-off-by: Ludovic Courtès --- etc/guix-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 0e677c2b90..bfd3842933 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -415,7 +415,7 @@ export GUIX_PROFILE GUIX_LOCPATH eval `guix package --search-paths=prefix 2> /dev/null` # set XDG_DATA_DIRS to include Guix installations -export XDG_DATA_DIRS="$GUIX_PROFILE/share${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS" +export XDG_DATA_DIRS="$GUIX_PROFILE/share:${XDG_DATA_DIRS:-/usr/local/share/:/usr/share/}" EOF } -- cgit v1.2.3 From 3293b1bce9193b50e1ef15e52f4cbc2ac0875a49 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 26 Jan 2020 22:51:43 +0100 Subject: Revert "gnu: Add python-argh." This package was already in Guix since commit db6bd842aa4a6254b185740bda36f01c83cd9779. This reverts commit fb4db07467fb764e7df64a4aacae13eaaf7f912c. --- gnu/packages/python-xyz.scm | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 91f36bf3ee..e8caab2f01 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17399,28 +17399,6 @@ for file systems paths.") output and standard error.") (license license:expat))) -(define-public python-argh - (package - (name "python-argh") - (version "0.26.2") - (source - (origin - (method url-fetch) - (uri (pypi-uri "argh" version)) - (sha256 - (base32 - "0rdv0n2aa181mkrybwvl3czkrrikgzd4y2cri6j735fwhj65nlz9")))) - (build-system python-build-system) - (native-inputs - `(("python-iocapture" ,python-iocapture) - ("python-mock" ,python-mock) - ("python-pytest" ,python-pytest))) - (home-page "https://github.com/neithere/argh/") - (synopsis "Argparse wrapper with natural syntax") - (description "This package provides a parser for dealing with command-line -arguments in Python.") - (license license:lgpl3))) - (define-public python-watchdog (package (name "python-watchdog") -- cgit v1.2.3 From fed17bcad9b35dba73502048e1729b0b66d5694d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 26 Jan 2020 22:53:43 +0100 Subject: Revert "gnu: Add python-iocapture." This package was already in Guix since commit dbcef44a0bdc5472cd49cd02d9d11a9c5ff037c9. This reverts commit 2cb4ee2787281b0c155ab4794fa1251652251d3b. --- gnu/packages/python-xyz.scm | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e8caab2f01..0f5b02c730 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17377,28 +17377,6 @@ files. These files are used to translate strings in android apps.") for file systems paths.") (license license:expat))) -(define-public python-iocapture - (package - (name "python-iocapture") - (version "0.1.2") - (source - (origin - (method url-fetch) - (uri (pypi-uri "iocapture" version)) - (sha256 - (base32 - "1s3ywdr0l3kfrrqi079iv16g0rp75akkvx0j07vx9p5w10c0wrw6")))) - (build-system python-build-system) - (native-inputs - `(("python-flexmock" ,python-flexmock) - ("python-pytest-cov" ,python-pytest-cov) - ("python-six" ,python-six))) - (home-page "https://github.com/oinume/iocapture") - (synopsis "stdout and stderr capture in Python") - (description "This package allows Python developpers to capture their standard -output and standard error.") - (license license:expat))) - (define-public python-watchdog (package (name "python-watchdog") -- cgit v1.2.3 From 435c2c39aa364d43facc61967eba833165adc966 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 26 Jan 2020 22:56:04 +0100 Subject: Revert "gnu: Add python-pathtools." This package was already in Guix since commit dbcef44a0bdc5472cd49cd02d9d11a9c5ff037c9. This reverts commit 87435943d1cf082b64fd2ee581e9db85b373ddb9. --- gnu/packages/python-xyz.scm | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 0f5b02c730..2af2b2011c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17359,24 +17359,6 @@ file to ensure it completely and accurately describes your project.") files. These files are used to translate strings in android apps.") (license license:expat))) -(define-public python-pathtools - (package - (name "python-pathtools") - (version "0.1.2") - (source - (origin - (method url-fetch) - (uri (pypi-uri "pathtools" version)) - (sha256 - (base32 - "1h7iam33vwxk8bvslfj4qlsdprdnwf8bvzhqh3jq5frr391cadbw")))) - (build-system python-build-system) - (home-page "https://github.com/gorakhargosh/pathtools") - (synopsis "File system general utilities") - (description "This package provides pattern matching and various utilities -for file systems paths.") - (license license:expat))) - (define-public python-watchdog (package (name "python-watchdog") -- cgit v1.2.3