From 0458ab53f6ab58c42f379b8e7d55d130df4232e3 Mon Sep 17 00:00:00 2001 From: Jane Baines Date: Sat, 24 Feb 2018 19:13:58 +0000 Subject: gnu: python-django: Update to 1.11.10. * gnu/packages/django.scm (python-django)[version]: Update to version 1.11.10. [arguments]: Patch test helper to add python-pytz to the PYTHONPATH. [inputs]: Remove python-pytz. [propagated-inputs]: Add python-pytz. Signed-off-by: Christopher Baines --- gnu/packages/django.scm | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index 3864cc884b..0b447b5176 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -36,16 +36,19 @@ (define-public python-django (package (name "python-django") - (version "1.10.8") + (version "1.11.10") (source (origin (method url-fetch) (uri (pypi-uri "Django" version)) (sha256 (base32 - "1fwqqh2zbcy9dy0lnvk338s11llnnfz2k56bf84w0wv56ayq7vyl")))) + "1ndc7axr7cz8jwhr4mz16fvwd0jcd6i81q2wi9nl172s71kkaf12")))) (build-system python-build-system) (arguments - '(#:phases + '(#:modules ((srfi srfi-1) + (guix build python-build-system) + (guix build utils)) + #:phases (modify-phases %standard-phases (add-before 'check 'set-tzdir (lambda* (#:key inputs #:allow-other-keys) @@ -56,9 +59,19 @@ "/share/zoneinfo")) #t)) (replace 'check - (lambda _ + (lambda* (#:key inputs #:allow-other-keys) (setenv "PYTHONPATH" (string-append ".:" (getenv "PYTHONPATH"))) + (substitute* "tests/admin_scripts/tests.py" + (("python_path = \\[") + (string-append "python_path = ['" + (find (lambda (entry) + (string-prefix? + (assoc-ref inputs "python-pytz") + entry)) + (string-split (getenv "PYTHONPATH") + #\:)) + "', "))) (zero? (system* "python" "tests/runtests.py"))))))) ;; TODO: Install extras/django_bash_completion. (native-inputs @@ -75,10 +88,11 @@ ("python-numpy" ,python-numpy) ("python-pillow" ,python-pillow) ("python-pyyaml" ,python-pyyaml) - ("python-pytz" ,python-pytz) ;; optional for tests: ("python-selenium" ,python-selenium) ("python-sqlparse" ,python-sqlparse) ("python-tblib" ,python-tblib))) + (propagated-inputs + `(("python-pytz" ,python-pytz))) (home-page "http://www.djangoproject.com/") (synopsis "High-level Python Web framework") (description -- cgit v1.2.3 From cd5e084342de3d39951413e33491d70e579ad912 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 24 Feb 2018 22:00:05 +0200 Subject: gnu: imlib2: Update to 1.5.0. * gnu/packages/image.scm (imlib2): Update to 1.5.0. --- gnu/packages/image.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 93114d8e07..5943457f94 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2014, 2017 John Darrington ;;; Copyright © 2016 Leo Famulari ;;; Copyright © 2016, 2017 Leo Famulari -;;; Copyright © 2016, 2017 Efraim Flashner +;;; Copyright © 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2016 Eric Bavier ;;; Copyright © 2016, 2017 Arun Isaac @@ -633,7 +633,7 @@ compose, and analyze GIF images.") (define-public imlib2 (package (name "imlib2") - (version "1.4.10") + (version "1.5.0") (source (origin (method url-fetch) (uri (string-append @@ -641,7 +641,7 @@ compose, and analyze GIF images.") "/imlib2-" version ".tar.bz2")) (sha256 (base32 - "0wm2q2xlkbm71k7mw2jyzbxgzylrkcj5yh6nq58w5gybhp98qs9z")))) + "0kg28b5wp886hiy12v7abdybrvlymb7g3nvg0ysn2y8h883s5w8m")))) (build-system gnu-build-system) (native-inputs `(("pkgconfig" ,pkg-config))) -- cgit v1.2.3 From e8ee100e8eb46224d5549dffc707cfeb96ad0e21 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 24 Feb 2018 20:29:50 +0100 Subject: gnu: libraw: Update to 0.18.8. * gnu/packages/photo.scm (libraw): Update to 0.18.8. --- gnu/packages/photo.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index e41131fcda..788dcf36fc 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -67,14 +67,14 @@ (define-public libraw (package (name "libraw") - (version "0.18.7") + (version "0.18.8") (source (origin (method url-fetch) (uri (string-append "https://www.libraw.org/data/LibRaw-" version ".tar.gz")) (sha256 (base32 - "0wap67mb03fl2himbs20yncnnrr71mszsfm2v4spks58c714gqw7")))) + "1qi0fkw2zmd0yplrf79z7lgpz0hxl45dj5rdgpaj7283jzys9b2n")))) (build-system gnu-build-system) (home-page "https://www.libraw.org") (synopsis "Raw image decoder") -- cgit v1.2.3 From 0181df537ffb4e4273b2ca005738fdb7bd3d73f5 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 24 Feb 2018 00:01:21 -0500 Subject: gnu: wxmaxima: Update to 18.02.0. * gnu/packages/maths.scm (wxmaxima): Update to 18.02.0. [source]: Add patch. [build-system]: Use the cmake-build-system. [native-inputs]: Remove autoconf and automake. [arguments]: Disable tests, remove 'autoconf' phase. * gnu/packages/patches/wxmaxima-do-not-use-old-gnuplot-parameters.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 3 ++- gnu/packages/maths.scm | 18 +++++++-------- ...xmaxima-do-not-use-old-gnuplot-parameters.patch | 26 ++++++++++++++++++++++ 3 files changed, 36 insertions(+), 11 deletions(-) create mode 100644 gnu/packages/patches/wxmaxima-do-not-use-old-gnuplot-parameters.patch diff --git a/gnu/local.mk b/gnu/local.mk index a10f3150e9..2f8f7b7e3a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -4,7 +4,7 @@ # Copyright © 2016 Mathieu Lirzin # Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Mark H Weaver # Copyright © 2016 Chris Marusich -# Copyright © 2016, 2017 Kei Kebreau +# Copyright © 2016, 2017, 2018 Kei Kebreau # Copyright © 2016, 2017 Rene Saavedra # Copyright © 2016 Adonay "adfeno" Felipe Nogueira # Copyright © 2016, 2017 Ricardo Wurmus @@ -1160,6 +1160,7 @@ dist_patch_DATA = \ %D%/packages/patches/wpa-supplicant-fix-zeroed-keys.patch \ %D%/packages/patches/wpa-supplicant-fix-nonce-reuse.patch \ %D%/packages/patches/wpa-supplicant-krack-followups.patch \ + %D%/packages/patches/wxmaxima-do-not-use-old-gnuplot-parameters.patch \ %D%/packages/patches/xboing-CVE-2004-0149.patch \ %D%/packages/patches/xcb-proto-python3-print.patch \ %D%/packages/patches/xcb-proto-python3-whitespace.patch \ diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 25e1d5a312..b20cec5440 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2489,7 +2489,7 @@ point numbers.") (define-public wxmaxima (package (name "wxmaxima") - (version "17.10.1") + (version "18.02.0") (source (origin (method url-fetch) @@ -2498,12 +2498,12 @@ point numbers.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0qlzc31cqkwpfgrb9cif9bcnkj3rq487plg4rns7jxv6pq4609v1")))) - (build-system gnu-build-system) + "03kr2rgfp4hcf3is8m8d8f9hj660c3xgrc50vrrfpixx4syh6wvj")) + (patches + (search-patches "wxmaxima-do-not-use-old-gnuplot-parameters.patch")))) + (build-system cmake-build-system) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("gettext" ,gettext-minimal))) + `(("gettext" ,gettext-minimal))) (inputs `(("wxwidgets" ,wxwidgets) ("maxima" ,maxima) @@ -2512,11 +2512,9 @@ point numbers.") ("gtk+" ,gtk+) ("shared-mime-info" ,shared-mime-info))) (arguments - `(#:phases + `(#:tests? #f ; no check target + #:phases (modify-phases %standard-phases - (add-after 'unpack 'autoconf - (lambda _ - (zero? (system* "sh" "bootstrap")))) (add-after 'install 'wrap-program (lambda* (#:key inputs outputs #:allow-other-keys) (wrap-program (string-append (assoc-ref outputs "out") diff --git a/gnu/packages/patches/wxmaxima-do-not-use-old-gnuplot-parameters.patch b/gnu/packages/patches/wxmaxima-do-not-use-old-gnuplot-parameters.patch new file mode 100644 index 0000000000..345101bd3a --- /dev/null +++ b/gnu/packages/patches/wxmaxima-do-not-use-old-gnuplot-parameters.patch @@ -0,0 +1,26 @@ +This fixes the wxplot2d plotting issue found at +https://github.com/andrejv/wxmaxima/issues/973. + +From 5a0693c97ceaa4935b908f1e478126896952f399 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Gunter=20K=C3=B6nigsmann?= +Date: Mon, 19 Feb 2018 05:37:35 +0100 +Subject: [PATCH] Seems I accidentally made wxMaxima to default to parameters + for old gnuplots. Resolves #973 + +--- + data/wxmathml.lisp.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/data/wxmathml.lisp.in b/data/wxmathml.lisp.in +index a32e3fc3..4e19acaf 100644 +--- a/data/wxmathml.lisp.in ++++ b/data/wxmathml.lisp.in +@@ -43,7 +43,7 @@ + (defvar $wxsubscripts t + "Recognize TeX-style subscripts") + (defvar $wxplot_pngcairo nil "Use gnuplot's pngcairo terminal for new plots?") +-(defmvar $wxplot_old_gnuplot t) ++(defmvar $wxplot_old_gnuplot nil) + + (defun $wxstatusbar (status) + (format t "~a~%" status)) -- cgit v1.2.3 From 3422e10ededa47ed7e71cc4fd55aab4cf65ea905 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 25 Feb 2018 11:45:17 +0100 Subject: gnu: Update java-testng to 6.14.3. * gnu/packages/java.scm (java-testng): Update to 6.14.3. --- gnu/packages/java.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 47220fc75c..94c806b99e 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -6959,7 +6959,7 @@ those in Perl and JavaScript.") (define-public java-testng (package (name "java-testng") - (version "6.14.2") + (version "6.14.3") (source (origin (method git-fetch) (uri (git-reference @@ -6968,7 +6968,7 @@ those in Perl and JavaScript.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0ngj88dpbqqdx9084cmiasmn9q3v5dgx45qbvxpip47nxc5x14xy")))) + "0y6vq30i5g276kw0v2bhbvci22ijg7ax49ap2611yqlhbs4d6dqv")))) (build-system ant-build-system) (arguments `(#:jdk ,icedtea-8; java.util.function -- cgit v1.2.3 From 3214afabff01f7aae1d4790059a6f40763023711 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 10 Feb 2018 21:53:53 +0100 Subject: gnu: Add java-plexus-component-annotations. * gnu/packages/java.scm (java-plexus-component-annotations): New variable. --- gnu/packages/java.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 94c806b99e..5f8f7fdb55 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2660,6 +2660,20 @@ archives (jar).") `(("archiver" ,java-plexus-archiver) ("hamcrest" ,java-hamcrest-core))))) +(define-public java-plexus-component-annotations + (package + (inherit java-plexus-container-default) + (name "java-plexus-component-annotations") + (arguments + `(#:jar-name "plexus-component-annotations.jar" + #:source-dir "plexus-component-annotations/src/main/java" + #:tests? #f)); no tests + (inputs '()) + (native-inputs '()) + (synopsis "Plexus descriptors generator") + (description "This package is a Maven plugin to generate Plexus descriptors +from source tags and class annotations."))) + (define-public java-asm (package (name "java-asm") -- cgit v1.2.3 From a7ad92ade94d456f991062aedede9fd1ecd64b07 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Wed, 14 Feb 2018 22:11:34 +0100 Subject: gnu: Make java-plexus-container-default-bootstrap private. * gnu/packages/java.scm (java-plexus-container-default-bootstrap): Make private. --- gnu/packages/java.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 5f8f7fdb55..7312d4703d 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2483,7 +2483,7 @@ mechanism of Java. It is especially useful for dynamic loading of application components.") (license license:asl2.0))) -(define-public java-plexus-container-default-bootstrap +(define java-plexus-container-default-bootstrap (package (name "java-plexus-container-default-bootstrap") (version "1.7.1") -- cgit v1.2.3 From 4f77ba17c663881c0657c838fbcb2a98e9137aa5 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 10 Feb 2018 22:02:24 +0100 Subject: gnu: Add java-plexus-cipher. * gnu/packages/java.scm (java-plexus-cipher): New variable. --- gnu/packages/java.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 7312d4703d..57370db76e 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2674,6 +2674,42 @@ archives (jar).") (description "This package is a Maven plugin to generate Plexus descriptors from source tags and class annotations."))) +(define-public java-plexus-cipher + (package + (name "java-plexus-cipher") + (version "1.7") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/codehaus-plexus/plexus-cipher" + "/archive/plexus-cipher-" version ".tar.gz")) + (sha256 + (base32 + "1j3r8xzlxlk340snkjp6lk2ilkxlkn8qavsfiq01f43xmvv8ymk3")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "plexus-cipher.jar" + #:source-dir "src/main/java" + #:jdk ,icedtea-8 + #:tests? #f; FIXME: requires sisu-inject-bean + #:phases + (modify-phases %standard-phases + (add-before 'build 'copy-resources + (lambda _ + (copy-recursively "src/main/resources" "build/classes") + (mkdir-p "build/classes/META-INF/sisu") + (with-output-to-file "build/classes/META-INF/sisu/javax.inject.Named" + (lambda _ + (display "org.sonatype.plexus.components.cipher.DefaultPlexusCipher\n"))) + #t))))) + (inputs + `(("java-cdi-api" ,java-cdi-api) + ("java-javax-inject" ,java-javax-inject))) + (home-page "https://github.com/sonatype/plexus-cipher") + (synopsis "Encryption/decryption Component") + (description "Plexus-cipher contains a component to deal with encryption +and decryption.") + (license license:asl2.0))) + (define-public java-asm (package (name "java-asm") -- cgit v1.2.3 From 239126d48b960013cc368a3f3636e760e0adb8fd Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 10 Feb 2018 23:00:09 +0100 Subject: gnu: Add java-plexus-compiler-api. * gnu/packages/java.scm (java-plexus-compiler-api): New variable. --- gnu/packages/java.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 57370db76e..45904ff84a 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2710,6 +2710,35 @@ from source tags and class annotations."))) and decryption.") (license license:asl2.0))) +(define-public java-plexus-compiler-api + (package + (name "java-plexus-compiler-api") + (version "2.8.2") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/codehaus-plexus/plexus-compiler" + "/archive/plexus-compiler-" version ".tar.gz")) + (sha256 + (base32 + "0g3x26pymcdnfnwv2a1i57pd5s26f5zqfi1rdy98z1bn01klx25k")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "plexus-compiler-api.jar" + #:source-dir "plexus-compiler-api/src/main/java" + #:jdk ,icedtea-8 + #:test-dir "plexus-compiler-api/src/test")) + (inputs + `(("java-plexus-container-default" ,java-plexus-container-default) + ("java-plexus-util" ,java-plexus-utils))) + (native-inputs + `(("java-junit" ,java-junit))) + (home-page "https://github.com/codehaus-plexus/plexus-compiler") + (synopsis "Plexus Compilers component's API to manipulate compilers") + (description "This package contains the API used by components to manipulate +compilers.") + (license (list license:asl2.0 + license:expat)))) + (define-public java-asm (package (name "java-asm") -- cgit v1.2.3 From f8a519fa3f8af3e3be842d84be49897d0bd9fd06 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 10 Feb 2018 23:09:20 +0100 Subject: gnu: Add java-plexus-compiler-javac. gnu/packages/java.scm (java-plexus-compiler-javac): New variable. --- gnu/packages/java.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 45904ff84a..dc8523369a 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2739,6 +2739,26 @@ compilers.") (license (list license:asl2.0 license:expat)))) +(define-public java-plexus-compiler-javac + (package + (inherit java-plexus-compiler-api) + (name "java-plexus-compiler-javac") + (arguments + `(#:jar-name "plexus-compiler-javac.jar" + #:source-dir "plexus-compilers/plexus-compiler-javac/src/main/java" + #:jdk ,icedtea-8 + #:tests? #f; depends on compiler-test -> maven-core -> ... -> this package. + #:test-dir "plexus-compilers/plexus-compiler-javac/src/test")) + (inputs + `(("java-plexus-compiler-api" ,java-plexus-compiler-api) + ("java-plexus-utils" ,java-plexus-utils) + ("java-plexus-container-default" ,java-plexus-container-default))) + (native-inputs + `(("java-junit" ,java-junit))) + (synopsis "Javac Compiler support for Plexus Compiler component") + (description "This package contains the Javac Compiler support for Plexus +Compiler component."))) + (define-public java-asm (package (name "java-asm") -- cgit v1.2.3 From 8f524749bc26601d4dc781978104718adb7addc8 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 10 Feb 2018 22:42:43 +0100 Subject: gnu: Add java-sisu-build-api. * gnu/packages/java.scm (java-sisu-build-api): New variable. --- gnu/packages/java.scm | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index dc8523369a..bbc39831ef 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2759,6 +2759,61 @@ compilers.") (description "This package contains the Javac Compiler support for Plexus Compiler component."))) +(define-public java-sisu-build-api + (package + (name "java-sisu-build-api") + (version "0.0.7") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/sonatype/sisu-build-api/" + "archive/plexus-build-api-" version ".tar.gz")) + (sha256 + (base32 + "1c3rrpma3x634xp2rm2p5iskfhzdyc7qfbhjzr70agrl1jwghgy2")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "sisu-build-api.jar" + #:source-dir "src/main/java" + #:jdk ,icedtea-8 + #:tests? #f; FIXME: how to run the tests? + #:phases + (modify-phases %standard-phases + (add-before 'build 'copy-resources + (lambda _ + (copy-recursively "src/main/resources" "build/classes") + (substitute* (find-files "build/classes") + (("\\$\\{project.version\\}") ,version)) + #t)) + (add-before 'build 'generate-plexus-compontent + (lambda _ + (mkdir-p "build/classes/META-INF/plexus") + ;; This file is required for plexus to inject this package. + ;; FIXME: how is it generated? + (with-output-to-file "build/classes/META-INF/plexus/components.xml" + (lambda _ + (display + "\n + \n + \n + org.sonatype.plexus.build.incremental.BuildContext\n + default\n + org.sonatype.plexus.build.incremental.DefaultBuildContext\n + Filesystem based non-incremental build context implementation\n +which behaves as if all files were just created.\n + \n + \n +\n"))) + #t))))) + (inputs + `(("java-plexus-utils" ,java-plexus-utils) + ("java-plexus-container-default" ,java-plexus-container-default))) + (home-page "https://github.com/sonatype/sisu-build-api/") + (synopsis "Base build API for maven") + (description "This package contains the base build API for maven and +a default implementation of it. This API is about scanning files in a +project and determining what files need to be rebuilt.") + (license license:asl2.0))) + (define-public java-asm (package (name "java-asm") -- cgit v1.2.3 From b26c8b618457943075eaf5d33592af0eabf53cc8 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 10 Feb 2018 22:51:17 +0100 Subject: gnu: Add java-modello-core. * gnu/packages/java.scm (java-modello-core): New variable. --- gnu/packages/java.scm | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index bbc39831ef..d7a1299a7f 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2814,6 +2814,69 @@ a default implementation of it. This API is about scanning files in a project and determining what files need to be rebuilt.") (license license:asl2.0))) +(define-public java-modello-core + (package + (name "java-modello-core") + (version "1.9.1") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/codehaus-plexus/modello" + "/archive/modello-" version ".tar.gz")) + (sha256 + (base32 + "0l2pvns8pmlrmjm3iknp7gpg3654y1m8qhy55b19sdwdchdcyxfh")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "modello-core.jar" + #:source-dir "modello-core/src/main/java" + #:test-dir "modello-core/src/test" + #:main-class "org.codehaus.modello.ModelloCli" + #:jdk ,icedtea-8 + #:phases + (modify-phases %standard-phases + (add-before 'build 'copy-resources + (lambda _ + (mkdir-p "build/classes/META-INF/plexus") + (copy-file "modello-core/src/main/resources/META-INF/plexus/components.xml" + "build/classes/META-INF/plexus/components.xml") + #t)) + (add-before 'check 'fix-tests + (lambda _ + (with-directory-excursion "modello-core/src/test/java/org/codehaus" + (substitute* '("modello/core/DefaultModelloCoreTest.java" + "modello/core/io/ModelReaderTest.java") + (("src/test") "modello-core/src/test"))) + #t))))) + (inputs + `(("java-plexus-utils" ,java-plexus-utils) + ("java-plexus-container-default" ,java-plexus-container-default) + ("java-sisu-build-api" ,java-sisu-build-api))) + (native-inputs + `(("java-junit" ,java-junit) + ("java-plexus-classworlds" ,java-plexus-classworlds) + ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect) + ("java-guava" ,java-guava))) + (home-page "http://codehaus-plexus.github.io/modello/") + (synopsis "Framework for code generation from a simple model") + (description "Modello is a framework for code generation from a simple model. + +Modello generates code from a simple model format: based on a plugin +architecture, various types of code and descriptors can be generated from the +single model, including Java POJOs, XML/JSON/YAML marshallers/unmarshallers, +XSD and documentation.") + (license (list + license:expat + ;; Although this package uses only files licensed under expat, + ;; other parts of the source are licensed under different + ;; licenses. We include them to be inherited by other packages. + license:asl2.0 + ;; Some files in modello-plugin-java are licensed under a + ;; 5-clause BSD license. + (license:non-copyleft + (string-append "file:///modello-plugins/modello-plugin-java/" + "src/main/java/org/codehaus/modello/plugin/" + "java/javasource/JNaming.java")))))) + (define-public java-asm (package (name "java-asm") -- cgit v1.2.3 From fc620befd4d4236db8f446dba2e0f3abcd4c0cfb Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 10 Feb 2018 22:52:22 +0100 Subject: gnu: Add java-modello-plugins-java. * gnu/packages/java.scm (java-modello-plugins-java): New variable. --- gnu/packages/java.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index d7a1299a7f..05cf91999b 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2877,6 +2877,30 @@ XSD and documentation.") "src/main/java/org/codehaus/modello/plugin/" "java/javasource/JNaming.java")))))) +(define-public java-modello-plugins-java + (package + (inherit java-modello-core) + (name "java-modello-plugins-java") + (arguments + `(#:jar-name "modello-plugins-java.jar" + #:source-dir "modello-plugins/modello-plugin-java/src/main/java" + #:test-dir "modello-plugins/modello-plugin-java/src/test" + #:jdk ,icedtea-8 + #:tests? #f; requires maven-model, which depends on this package + #:phases + (modify-phases %standard-phases + (add-before 'build 'copy-resources + (lambda _ + (mkdir-p "build/classes") + (copy-recursively "modello-plugins/modello-plugin-java/src/main/resources" + "build/classes") + #t))))) + (inputs + `(("java-modello-core" ,java-modello-core) + ,@(package-inputs java-modello-core))) + (synopsis "Modello Java Plugin") + (description "Modello Java Plugin generates Java objects for the model."))) + (define-public java-asm (package (name "java-asm") -- cgit v1.2.3 From a0ce95ba8f6beb79fe77fe4f199dbe49e243bbbc Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 10 Feb 2018 22:53:12 +0100 Subject: gnu: Add java-modello-plugins-xml. * gnu/packages/java.scm (java-modello-plugins-xml): New variable. --- gnu/packages/java.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 05cf91999b..6d77967de6 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2901,6 +2901,38 @@ XSD and documentation.") (synopsis "Modello Java Plugin") (description "Modello Java Plugin generates Java objects for the model."))) +(define-public java-modello-plugins-xml + (package + (inherit java-modello-core) + (name "java-modello-plugins-xml") + (arguments + `(#:jar-name "modello-plugins-xml.jar" + #:source-dir "modello-plugins/modello-plugin-xml/src/main/java" + #:test-dir "modello-plugins/modello-plugin-xml/src/test" + #:jdk ,icedtea-8 + #:phases + (modify-phases %standard-phases + (add-before 'build 'copy-resources + (lambda _ + (mkdir-p "build/classes") + (copy-recursively + "modello-plugins/modello-plugin-xml/src/main/resources" + "build/classes") + #t)) + (add-before 'check 'fix-paths + (lambda _ + (with-directory-excursion "modello-plugins/modello-plugin-xml/src/test" + (substitute* + "java/org/codehaus/modello/plugins/xml/XmlModelloPluginTest.java" + (("src/test") "modello-plugins/modello-plugin-xml/src/test")))))))) + (inputs + `(("java-modello-core" ,java-modello-core) + ("java-modello-plugins-java" ,java-modello-plugins-java) + ,@(package-inputs java-modello-core))) + (synopsis "Modello XML Plugin") + (description "Modello XML Plugin contains shared code for every plugins +working on XML representation of the model."))) + (define-public java-asm (package (name "java-asm") -- cgit v1.2.3 From e470856017a705d4ba1881363717579e62f28671 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 10 Feb 2018 23:23:38 +0100 Subject: gnu: Add java-modello-test. gnu/packages/java.scm (java-modello-test): New variable. --- gnu/packages/java.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 6d77967de6..f8bb5e58f7 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2933,6 +2933,25 @@ XSD and documentation.") (description "Modello XML Plugin contains shared code for every plugins working on XML representation of the model."))) +(define-public java-modello-test + (package + (inherit java-modello-core) + (name "java-modello-test") + (arguments + `(#:jar-name "modello-test.jar" + #:source-dir "modello-test/src/main/java" + #:tests? #f; no tests + #:jdk ,icedtea-8)) + (inputs + `(("java-plexus-utils" ,java-plexus-utils) + ("java-plexus-compiler-api" ,java-plexus-compiler-api) + ("java-plexus-compiler-javac" ,java-plexus-compiler-javac) + ("java-plexus-container-default" ,java-plexus-container-default))) + (synopsis "Modello test package") + (description "The modello test package contains the basis to create +Modello generator unit-tests, including sample models and xml files to test +every feature for every plugin."))) + (define-public java-asm (package (name "java-asm") -- cgit v1.2.3 From 36607d3bfe1f0d26773ffaefd22b4968c6237999 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 10 Feb 2018 23:30:59 +0100 Subject: gnu: Add java-modello-plugins-xpp3. gnu/packages/java.scm (java-modello-plugins-xpp3): New variable. --- gnu/packages/java.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index f8bb5e58f7..93b343f62f 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2952,6 +2952,38 @@ working on XML representation of the model."))) Modello generator unit-tests, including sample models and xml files to test every feature for every plugin."))) +(define-public java-modello-plugins-xpp3 + (package + (inherit java-modello-core) + (name "java-modello-plugins-xpp3") + (arguments + `(#:jar-name "modello-plugins-xpp3.jar" + #:source-dir "modello-plugins/modello-plugin-xpp3/src/main/java" + #:test-dir "modello-plugins/modello-plugin-xpp3/src/test" + ;; One of the test dependencies is maven-model which depends on this package. + #:tests? #f + #:jdk ,icedtea-8 + #:phases + (modify-phases %standard-phases + (add-before 'build 'copy-resources + (lambda _ + (mkdir-p "build/classes") + (copy-recursively "modello-plugins/modello-plugin-xpp3/src/main/resources" + "build/classes") + #t))))) + (inputs + `(("java-modello-core" ,java-modello-core) + ("java-modello-plugins-java" ,java-modello-plugins-java) + ("java-modello-plugins-xml" ,java-modello-plugins-xml) + ,@(package-inputs java-modello-core))) + (native-inputs + `(("java-xmlunit" ,java-xmlunit) + ("java-modello-test" ,java-modello-test) + ,@(package-native-inputs java-modello-core))) + (synopsis "Modello XPP3 Plugin") + (description "The modello XPP3 plugin generates XML readers and writers based +on the XPP3 API (XML Pull Parser)."))) + (define-public java-asm (package (name "java-asm") -- cgit v1.2.3 From 0aa85081d6319b582d53e9113be41cbe1a59f2a8 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 10 Feb 2018 23:46:31 +0100 Subject: gnu: Add java-plexus-sec-dispatcher. * gnu/packages/java.scm (java-plexus-sec-dispatcher): New variable. --- gnu/packages/java.scm | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 93b343f62f..2b7a76fda3 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2759,6 +2759,94 @@ compilers.") (description "This package contains the Javac Compiler support for Plexus Compiler component."))) +(define-public java-plexus-sec-dispatcher + (package + (name "java-plexus-sec-dispatcher") + (version "1.4") ;; Newest release listed at the Maven Central Repository. + (source (origin + ;; This project doesn't tag releases or publish tarballs, so we take + ;; the "prepare release plexus-sec-dispatcher-1.4" git commit. + (method url-fetch) + (uri (string-append "https://github.com/sonatype/plexus-sec-dispatcher/" + "archive/7db8f88048.tar.gz")) + (sha256 + (base32 + "1smfrk4n7xbrsxpxcp2j4i0j8q86j73w0w6xg7qz83dp6dagdjgp")) + (file-name (string-append name "-" version ".tar.gz")))) + (arguments + `(#:jar-name "plexus-sec-dispatcher.jar" + #:source-dir "src/main/java" + #:jdk ,icedtea-8 + #:phases + (modify-phases %standard-phases + (add-before 'build 'generate-models + (lambda* (#:key inputs #:allow-other-keys) + (define (modello-single-mode file version mode) + (zero? (system* "java" + "org.codehaus.modello.ModelloCli" + file mode "src/main/java" version + "false" "true"))) + (let ((file "src/main/mdo/settings-security.mdo")) + (and + (modello-single-mode file "1.0.0" "java") + (modello-single-mode file "1.0.0" "xpp3-reader") + (modello-single-mode file "1.0.0" "xpp3-writer"))))) + (add-before 'build 'generate-components.xml + (lambda _ + (mkdir-p "build/classes/META-INF/plexus") + (with-output-to-file "build/classes/META-INF/plexus/components.xml" + (lambda _ + (display + "\n + \n + \n + org.sonatype.plexus.components.sec.dispatcher.SecDispatcher\n + default\n + org.sonatype.plexus.components.sec.dispatcher.DefaultSecDispatcher\n + \n + \n + \n + org.sonatype.plexus.components.cipher.PlexusCipher\n + _cipher\n + \n + \n + org.sonatype.plexus.components.sec.dispatcher.PasswordDecryptor\n + _decryptors\n + \n + \n + \n + <_configuration-file>~/.settings-security.xml\n + \n + \n + \n +\n"))))) + (add-before 'check 'fix-paths + (lambda _ + (copy-recursively "src/test/resources" "target")))))) + (inputs + `(("java-plexus-cipher" ,java-plexus-cipher))) + (native-inputs + `(("java-modello-core" ,java-modello-core) + ;; for modello: + ("java-plexus-container-default" ,java-plexus-container-default) + ("java-plexus-classworlds" ,java-plexus-classworlds) + ("java-plexus-utils" ,java-plexus-utils) + ("java-guava" ,java-guava) + ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect) + ("java-sisu-build-api" ,java-sisu-build-api) + ;; modello plugins: + ("java-modellop-plugins-java" ,java-modello-plugins-java) + ("java-modellop-plugins-xml" ,java-modello-plugins-xml) + ("java-modellop-plugins-xpp3" ,java-modello-plugins-xpp3) + ;; for tests + ("java-junit" ,java-junit))) + (build-system ant-build-system) + (home-page "https://github.com/sonatype/plexus-sec-dispatcher") + (synopsis "Plexus Security Dispatcher Component") + (description "This package is the Plexus Security Dispatcher Component. +This component decrypts a string passed to it.") + (license license:asl2.0))) + (define-public java-sisu-build-api (package (name "java-sisu-build-api") -- cgit v1.2.3 From 9d2749f62f1479d2d88cb8270fb20ba2bb146b33 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 25 Feb 2018 16:56:06 +0100 Subject: gnu: kodi: Update to 18.0_alpha-8.ec16dbc. * gnu/packages/kodi.scm (libdvdnav/kodi): Update to 6.0.0-Leia-Alpha-1. (libdvdread/kodi): Update to 6.0.0-Leia-Alpha-1. (libdvdcss/kodi): Update to 1.4.1-Leia-Alpha-1. (kodi): Update to 18.0_alpha-8.ec16dbc. [version]: Use GIT-VERSION. [source](file-name): Use GIT-FILE-NAME. [arguments]: Adjust substitution. [home-page]: Use HTTPS. --- gnu/packages/kodi.scm | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm index dab2a7c692..ad66a846d4 100644 --- a/gnu/packages/kodi.scm +++ b/gnu/packages/kodi.scm @@ -128,7 +128,7 @@ generator library for C++.") ;; of the standard build process. To make things easier, we bootstrap ;; and patch shebangs here, so we don't have to worry about it later. (define libdvdnav/kodi - (let ((commit "981488f7f27554b103cca10c1fbeba027396c94a")) + (let ((commit "6.0.0-Leia-Alpha-1")) (package (name "libdvdnav-bootstrapped") (version commit) @@ -140,7 +140,7 @@ generator library for C++.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "089pswc51l3avh95zl4cpsh7gh1innh7b2y4xgx840mcmy46ycr8")))) + "1xiyfgf8v8aknlxlzsvk6pbzkhclz0hbh3s1b0w6ivkng2k310j9")))) (build-system gnu-build-system) (arguments '(#:tests? #f @@ -165,7 +165,7 @@ generator library for C++.") (license license:gpl2+)))) (define libdvdread/kodi - (let ((commit "17d99db97e7b8f23077b342369d3c22a6250affd")) + (let ((commit "6.0.0-Leia-Alpha-1")) (package (name "libdvdread-bootstrapped") (version commit) @@ -177,7 +177,7 @@ generator library for C++.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1gr5aq1cjr3as9mnwrw29cxn4m6f6pfrxdahkdcjy70q3ldg90sl")))) + "1c3g18n2vwhgcfz3dka1pmw58bnv2ram7xjvizfiykb3sgi9zfwp")))) (build-system gnu-build-system) (arguments '(#:tests? #f @@ -202,7 +202,7 @@ generator library for C++.") (license (list license:gpl2+ license:lgpl2.1+))))) (define libdvdcss/kodi - (let ((commit "2f12236bc1c92f73c21e973363f79eb300de603f")) + (let ((commit "1.4.1-Leia-Alpha-1")) (package (name "libdvdcss-bootstrapped") (version commit) @@ -214,7 +214,7 @@ generator library for C++.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "198r0q73i55ga1dvyqq9nfcri0zq08b94hy8671lg14i3izx44dd")))) + "0adafwsawxssj3nilkql447v0l4a2584rdpmy5rfjmznh91lykgh")))) (build-system gnu-build-system) (arguments '(#:tests? #f @@ -241,20 +241,20 @@ generator library for C++.") (define-public kodi ;; We package the git version because the current released ;; version was cut while the cmake transition was in turmoil. - (let ((commit "67fd70f01a363002881f3519b50765b756716e3b") - (revision "7")) + (let ((commit "ec16dbca4dcf2923f53f819695a6d47c52e68d74") + (revision "8")) (package (name "kodi") - (version (string-append "18.0_alpha-" revision "-" (string-take commit 7))) + (version (git-version "18.0_alpha" revision commit)) (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/xbmc/xbmc.git") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 - "12975n4r982kmxc0r9w24n3lrj7aj3cs4fjkdjnn0r9jbnvfxhs3")) + "1rxg752cl59124cfpfwmyjldn6qpq5jginxddpzvgagfadf10i4d")) (snippet '(begin (use-modules (guix build utils)) @@ -267,7 +267,6 @@ generator library for C++.") ;; "tools/depend/native/TexturePacker" ;; "lib/gtest" ;; "lib/cpluff" - ;; "lib/libexif" ;; "lib/libUPnP" "lib/libUPnP/Neptune/ThirdParty" "project/Win32BuildSetup/tools/7z")) @@ -318,7 +317,7 @@ generator library for C++.") ;; to make them writable before the build process starts. (("autoreconf -vif") "chmod -R u+w .")) - (substitute* "xbmc/linux/LinuxTimezone.cpp" + (substitute* "xbmc/platform/linux/LinuxTimezone.cpp" (("/usr/share/zoneinfo") (string-append (assoc-ref inputs "tzdata") "/share/zoneinfo"))) @@ -420,7 +419,7 @@ generator library for C++.") (description "Kodi is a media center application for playing videos, music, games, etc. Kodi is highly customizable and features a theme and plug-in system.") - (home-page "http://kodi.tv") + (home-page "https://kodi.tv") ;; XBMC is largely GPL2+, with some library components as LGPL2.1+, but ;; there are some other licenses spread throughout. (license (list license:gpl2+ license:lgpl2.1+ -- cgit v1.2.3 From a2f0b01221c7256ca0bbb2ad9895c53168176a60 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 25 Feb 2018 17:56:21 +0100 Subject: gnu: fribidi: Update to 1.0.1. * gnu/packages/fribidi.scm (fribidi): Update to 1.0.1. [source](uri): Change to new GitHub URI. [home-page]: Update to redirected URL. --- gnu/packages/fribidi.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/fribidi.scm b/gnu/packages/fribidi.scm index 735fdab8e8..c8a91be4ef 100644 --- a/gnu/packages/fribidi.scm +++ b/gnu/packages/fribidi.scm @@ -26,15 +26,16 @@ (define-public fribidi (package (name "fribidi") - (version "0.19.7") + (version "1.0.1") (source (origin (method url-fetch) (uri - (string-append "http://fribidi.org/download/" name "-" version + (string-append "https://github.com/fribidi/fribidi/releases" + "/download/v" version "/fribidi-" version ".tar.bz2")) (sha256 - (base32 "13jsb5qadlhsaxkbrb49nqslmbh904vvzhsm5mm2ghmv29i2l8h8")))) + (base32 "1r3ll7apx4b8bhvdkwi71y06df9kvr4q3asvajswvdlh0pbq5cf1")))) (build-system gnu-build-system) (synopsis "Implementation of the Unicode bidirectional algorithm") @@ -42,5 +43,5 @@ "GNU FriBidi is an implementation of the Unicode Bidirectional Algorithm. This algorithm is used to properly display text in left-to-right or right-to-left ordering as necessary.") - (home-page "http://fribidi.org/") + (home-page "https://github.com/fribidi/fribidi") (license lgpl2.1+))) -- cgit v1.2.3 From 20a792b5536e26a9545435df26336fb882e10bc9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 24 Feb 2018 22:27:43 +0200 Subject: gnu: recode: Update to 3.7. * gnu/packages/textutils.scm (recode): Update to 3.7. [source]: Update source uri and download type. Add snippet to remove cythonized source. [native-inputs]: Add python2-cython. [arguments]: Remove custom phases. [home-page]: Update to new upstream. [license]: Update license. --- gnu/packages/textutils.scm | 41 +++++++++++++++++------------------------ 1 file changed, 17 insertions(+), 24 deletions(-) diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 3284be243e..7e001ed493 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2015 Roel Janssen ;;; Copyright © 2016 Jelle Licht ;;; Copyright © 2016 Alex Griffin -;;; Copyright © 2016 Efraim Flashner +;;; Copyright © 2016, 2018 Efraim Flashner ;;; Copyright © 2016 ng0 ;;; Copyright © 2016 Marius Bakke ;;; Copyright © 2017 Eric Bavier @@ -83,32 +83,25 @@ to DOS format and vice versa.") (define-public recode (package (name "recode") - ;; Last beta release (3.7-beta2) is from 2008; last commit from Feb 2014. - ;; So we use that commit instead. - (version "3.7.0.201402") + (version "3.7") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/pinard/Recode.git") - (commit "2d7092a9999194fc0e9449717a8048c8d8e26c18"))) + (method url-fetch) + (uri (string-append "https://github.com/rrthomas/recode/releases/" + "download/v" version "/" name "-" version ".tar.gz")) (sha256 - (base32 "1wssv8z6g3ryrw33sksz4rjhlnhgvvdqszw1ggl4rcwks34n86zm")) - (file-name (string-append name "-" version "-checkout")))) + (base32 + "0r4yhf7i7zp2nl2apyzz7r3i2in12n385hmr8zcfr18ly0ly530q")) + (modules '((guix build utils))) + (snippet + `(begin + (delete-file "tests/Recode.c") + #t)))) (build-system gnu-build-system) - (native-inputs `(("python" ,python-2))) - (arguments - '(#:phases - (modify-phases %standard-phases - (add-before 'check 'pre-check - (lambda _ - (substitute* "tests/setup.py" - (("([[:space:]]*)include_dirs=.*" all space) - (string-append all space "library_dirs=['../src/.libs'],\n"))) - ;; The test extension 'Recode.so' lacks RUNPATH for 'librecode.so'. - (setenv "LD_LIBRARY_PATH" (string-append (getcwd) "/src/.libs")) - #t))))) - (home-page "https://github.com/pinard/Recode") + (native-inputs + `(("python" ,python-2) + ("python2-cython" ,python2-cython))) + (home-page "https://github.com/rrthomas/recode") (synopsis "Text encoding converter") (description "The Recode library converts files between character sets and usages. It recognises or produces over 200 different character sets (or about @@ -116,7 +109,7 @@ usages. It recognises or produces over 200 different character sets (or about any pair. When exact transliteration are not possible, it gets rid of offending characters or falls back on approximations. The recode program is a handy front-end to the library.") - (license license:gpl2+))) + (license license:gpl3+))) (define-public enca (package -- cgit v1.2.3 From 1462b456577ca315dd910f52baaf1e7750d9f281 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 24 Feb 2018 23:59:45 +0200 Subject: gnu: enca: Update to 1.19. * gnu/packages/textutils.scm (enca): Update to 1.19. [inputs]: Remove recode. [arguments]: Allow parallel tests. --- gnu/packages/textutils.scm | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 7e001ed493..1417bea4e5 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -114,22 +114,18 @@ handy front-end to the library.") (define-public enca (package (name "enca") - (version "1.16") + (version "1.19") (source (origin (method url-fetch) (uri (string-append "https://github.com/nijel/enca/archive/" version ".tar.gz")) (sha256 - (base32 "1xik00x0yvhswsw2isnclabhv536xk1s42cf5z54gfbpbhc7ni8l")) + (base32 "099z526i7qgij7q1w3lvhl88iv3jc3nqxca2i09h6s08ghyrmzf4")) (file-name (string-append name "-" version ".tar.gz")))) (build-system gnu-build-system) - (inputs `(("recode" ,recode))) - - ;; Both 'test-convert-64.sh' and 'test-convert-filter.sh' manipulate a - ;; 'test.tmp' file, so they have to run in sequence. - (arguments '(#:parallel-tests? #f)) - + ;; enca-1.19 tests fail with recent recode. + ;(inputs `(("recode" ,recode))) (home-page "https://github.com/nijel/enca") (synopsis "Text encoding detection tool") (description "Enca (Extremely Naive Charset Analyser) consists of libenca, -- cgit v1.2.3 From 04ab38b7ee11bd6497fce6ce4bf4ebc689c1cff6 Mon Sep 17 00:00:00 2001 From: Andy Patterson Date: Sun, 18 Feb 2018 22:08:15 -0500 Subject: gnu: ccl: Update to 1.11.5. * gnu/packages/lisp.scm (ccl): Update to 1.11.5. [inputs]: Update ccl to its new hosting location. Signed-off-by: Marius Bakke --- gnu/packages/lisp.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 020abc7494..5f9a24500c 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -435,7 +435,7 @@ statistical profiler, a code coverage tool, and many other extensions.") (define-public ccl (package (name "ccl") - (version "1.11") + (version "1.11.5") (source #f) (build-system gnu-build-system) ;; CCL consists of a "lisp kernel" and "heap image", both of which are @@ -448,7 +448,7 @@ statistical profiler, a code coverage tool, and many other extensions.") ,(origin (method url-fetch) (uri (string-append - "ftp://ftp.clozure.com/pub/release/" version + "https://github.com/Clozure/ccl/releases/download/v" version "/ccl-" version "-" (match (%current-system) ((or "i686-linux" "x86_64-linux") "linuxx86") @@ -461,9 +461,9 @@ statistical profiler, a code coverage tool, and many other extensions.") (base32 (match (%current-system) ((or "i686-linux" "x86_64-linux") - "0w3dmj7q9kqyra3yrf1lxclnjz151yvf5s5q8ayllvmvqbl8bs08") + "0hs1f3z7crgzvinpj990kv9gvbsipxvcvwbmk54n51nasvc5025q") ("armhf-linux" - "1x487aaz2rqcb6k301sy2p39a1m4qdhg6z9p9fb76ssipqgr38b4") + "0p0l1dzsygb6i1xxgbipjpxkn46xhq3jm41a34ga1qqp4x8lkr62") (_ "")))))))) (native-inputs `(("m4" ,m4) -- cgit v1.2.3 From 543cf6fd3729b81c4ea939d93d563a70490793c1 Mon Sep 17 00:00:00 2001 From: Andy Patterson Date: Sun, 18 Feb 2018 22:20:06 -0500 Subject: gnu: cl-bordeaux-threads: Update to commit 354abb0a. This commit includes a fix which makes the package compatible asdf 3.3.1. * gnu/packages/lisp.scm (sbcl-bordeaux-threads): Update to commit 354abb0a. Signed-off-by: Marius Bakke --- gnu/packages/lisp.scm | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 5f9a24500c..f05d7eec78 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -726,27 +726,29 @@ interactive development model in mind.") (sbcl-package->ecl-package sbcl-fiveam)) (define-public sbcl-bordeaux-threads - (package - (name "sbcl-bordeaux-threads") - (version "0.8.5") - (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/sionescu/bordeaux-threads/archive/v" - version ".tar.gz")) - (sha256 - (base32 "10ryrcx832fwqdawb6jmknymi7wpdzhi30qzx7cbrk0cpnka71w2")) - (file-name - (string-append "bordeaux-threads-" version ".tar.gz")))) - (inputs `(("alexandria" ,sbcl-alexandria))) - (native-inputs `(("fiveam" ,sbcl-fiveam))) - (build-system asdf-build-system/sbcl) - (synopsis "Portable shared-state concurrency library for Common Lisp") - (description "BORDEAUX-THREADS is a proposed standard for a minimal + (let ((commit "354abb0ae9f1d9324001e1a8abab3128d7420e0e") + (revision "1")) + (package + (name "sbcl-bordeaux-threads") + (version (git-version "0.8.5" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sionescu/bordeaux-threads.git") + (commit commit))) + (sha256 + (base32 "1hcfp21l6av1xj6z7r77sp6h4mwf9vvx4s745803sysq2qy2mwnq")) + (file-name + (git-file-name "bordeaux-threads" version)))) + (inputs `(("alexandria" ,sbcl-alexandria))) + (native-inputs `(("fiveam" ,sbcl-fiveam))) + (build-system asdf-build-system/sbcl) + (synopsis "Portable shared-state concurrency library for Common Lisp") + (description "BORDEAUX-THREADS is a proposed standard for a minimal MP/Threading interface. It is similar to the CLIM-SYS threading and lock support.") - (home-page "https://common-lisp.net/project/bordeaux-threads/") - (license license:x11))) + (home-page "https://common-lisp.net/project/bordeaux-threads/") + (license license:x11)))) (define-public cl-bordeaux-threads (sbcl-package->cl-source-package sbcl-bordeaux-threads)) -- cgit v1.2.3 From e5f9540691b2ea5cace3d1d03aeb53f9a14381d7 Mon Sep 17 00:00:00 2001 From: Alex Vong Date: Wed, 21 Feb 2018 17:04:54 +0800 Subject: gnu: emacs-ahungry-theme: Update to 1.10.0. * gnu/packages/emacs.scm (emacs-ahungry-theme): Update to 1.10.0. Signed-off-by: Marius Bakke --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 81e6885f66..b7b088d42e 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -2990,14 +2990,14 @@ package provides a light and a dark variant.") (define-public emacs-ahungry-theme (package (name "emacs-ahungry-theme") - (version "1.8.0") + (version "1.10.0") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/ahungry-theme-" version ".tar")) (sha256 (base32 - "14dhnrlbjzrxk5ligf0z2im5bgnxpjqqzqcrmqg5355xrgpbpb7v")))) + "14q5yw56n82qph09bk7wmj5b1snhh9w0nk5s1l7yn9ldg71xq6pm")))) (build-system emacs-build-system) (home-page "https://github.com/ahungry/color-theme-ahungry") (synopsis "Ahungry color theme for Emacs") -- cgit v1.2.3 From acc55e836604f6d201ba2378864cae92bc765f69 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 26 Feb 2018 01:24:08 +0100 Subject: nls: Update 'pt_BR' translation. --- po/guix/pt_BR.po | 1738 ++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 1151 insertions(+), 587 deletions(-) diff --git a/po/guix/pt_BR.po b/po/guix/pt_BR.po index 0c59e11d68..317f5213f7 100644 --- a/po/guix/pt_BR.po +++ b/po/guix/pt_BR.po @@ -2,14 +2,14 @@ # Copyright (C) 2016 Free Software Foundation, Inc. # Copyright (C) 2016 Ludovic Courtès # This file is distributed under the same license as the guix package. -# Rafael Fontenelle , 2013, 2016. +# Rafael Fontenelle , 2013, 2016, 2018. msgid "" msgstr "" -"Project-Id-Version: guix 0.12.0\n" +"Project-Id-Version: guix 0.14.0\n" "Report-Msgid-Bugs-To: ludo@gnu.org\n" -"POT-Creation-Date: 2016-12-18 15:32+0100\n" -"PO-Revision-Date: 2016-12-18 17:13-0200\n" -"Last-Translator: Rafael Fontenelle \n" +"POT-Creation-Date: 2017-11-28 08:56+0100\n" +"PO-Revision-Date: 2018-02-24 07:29-0200\n" +"Last-Translator: Rafael Fontenelle \n" "Language-Team: Brazilian Portuguese \n" "Language: pt_BR\n" "MIME-Version: 1.0\n" @@ -19,140 +19,185 @@ msgstr "" "X-Generator: Virtaal 1.0.0-beta1\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -#: gnu/packages.scm:79 +#: gnu.scm:82 +#, scheme-format +msgid "module ~a not found" +msgstr "módulo ~a não localizado" + +#: gnu.scm:100 +msgid "" +"You may use @command{guix package --show=foo | grep location} to search\n" +"for the location of package @code{foo}.\n" +"If you get the line @code{location: gnu/packages/bar.scm:174:2},\n" +"add @code{bar} to the @code{use-package-modules} form." +msgstr "" +"Você pode usara @command{guix package --show=foo | grep location} para pesquisar\n" +"pela localização do pacote @code{foo}.\n" +"Se você obtiver a linha @code{location: gnu/packages/bar.scm:174:2},\n" +"adicione @code{bar} à forma @code{use-package-modules}." + +#: gnu.scm:108 +#, scheme-format +msgid "Try adding @code{(use-package-modules ~a)}." +msgstr "Tente adicionar @code{(use-package-modules ~a)}." + +#: gnu.scm:123 +#, scheme-format +msgid "" +"You may use @command{guix system search ~a} to search for a service\n" +"matching @code{~a}.\n" +"If you get the line @code{location: gnu/services/foo.scm:188:2},\n" +"add @code{foo} to the @code{use-service-modules} form." +msgstr "" +"Você pode usar @command{guix system search ~a} para pesquisar por um serviço\n" +"correspondendo a @code{~a}.\n" +"Se você obtiver a linha @code{location: gnu/services/foo.scm:188:2},\n" +"adicione @code{foo} à forma @code{use-service-modules}." + +#: gnu.scm:132 +#, scheme-format +msgid "Try adding @code{(use-service-modules ~a)}." +msgstr "Tente adicionar @code{(use-service-modules ~a)}." + +#: gnu/packages.scm:92 #, scheme-format msgid "~a: patch not found" msgstr "~a: patch não localizado" -#: gnu/packages.scm:95 +#: gnu/packages.scm:108 #, scheme-format msgid "could not find bootstrap binary '~a' for system '~a'" msgstr "não foi possível localizar binário de inicialização \"~a\" para o sistema \"~a\"" -#: gnu/packages.scm:147 -#, scheme-format -msgid "cannot access `~a': ~a~%" -msgstr "não foi possível acessar \"~a\": ~a~%" - -#: gnu/packages.scm:301 +#: gnu/packages.scm:240 #, scheme-format msgid "ambiguous package specification `~a'~%" msgstr "especificação ambígua de pacote \"~a\"~%" -#: gnu/packages.scm:302 -#, scheme-format -msgid "choosing ~a from ~a~%" -msgstr "escolhendo ~a de ~a~%" - -#: gnu/packages.scm:306 +#: gnu/packages.scm:241 #, scheme-format -msgid "deprecated NAME-VERSION syntax; use NAME@VERSION instead~%" -msgstr "sintaxe NOME-VERSÃO obsoleta; em vez disso, use NOME@VERSÃO~%" +msgid "choosing ~a@~a from ~a~%" +msgstr "escolhendo ~a@~a de ~a~%" -#: gnu/packages.scm:311 guix/scripts/package.scm:272 +#: gnu/packages.scm:246 guix/scripts/package.scm:271 #, scheme-format msgid "package '~a' has been superseded by '~a'~%" msgstr "pacote \"~a\" foi substituído por \"~a\"~%" -#: gnu/packages.scm:318 +#: gnu/packages.scm:253 #, scheme-format msgid "~A: package not found for version ~a~%" msgstr "~A: pacote não encontrado para versão ~a~%" -#: gnu/packages.scm:328 +#: gnu/packages.scm:254 #, scheme-format msgid "~A: unknown package~%" msgstr "~A: pacote desconhecido~%" -#: gnu/packages.scm:356 +#: gnu/packages.scm:282 #, scheme-format msgid "package `~a' lacks output `~a'~%" msgstr "pacote \"~a\" carece de mensagem de saída \"~a\"~%" -#: gnu/services.scm:542 +#: gnu/services.scm:235 +#, scheme-format +msgid "~a: no value specified for service of type '~a'" +msgstr "~a: nenhum valor especificado para um serviço do tipo \"~a\"" + +#: gnu/services.scm:650 #, scheme-format -msgid "no target of type '~a' for service ~s" -msgstr "nenhum alvo do tipo \"~a\" para o serviço ~s" +msgid "no target of type '~a' for service '~a'" +msgstr "nenhum alvo do tipo \"~a\" para o serviço \"~a\"" -#: gnu/services.scm:553 gnu/services.scm:614 +#: gnu/services.scm:662 gnu/services.scm:723 #, scheme-format msgid "more than one target service of type '~a'" msgstr "mais de um serviço alvo do tipo \"~a\"" -#: gnu/services.scm:604 +#: gnu/services.scm:713 #, scheme-format msgid "service of type '~a' not found" msgstr "serviço do tipo \"~a\" não localizado" -#: gnu/system.scm:522 +#: gnu/system.scm:305 +#, scheme-format +msgid "unrecognized boot parameters for '~a'~%" +msgstr "parâmetros de inicialização não reconhecidos para \"~a\"~%" + +#: gnu/system.scm:695 #, scheme-format msgid "using a string for file '~a' is deprecated; use 'plain-file' instead~%" msgstr "usando um texto para arquivo \"~a\" está obsoleto; em vez disso, use \"plain-file\"~%" -#: gnu/system.scm:538 +#: gnu/system.scm:711 #, scheme-format msgid "using a monadic value for '~a' is deprecated; use 'plain-file' instead~%" msgstr "usando um valor monádico para \"~a\" está obsoleto; em vez disso, use \"plain-file\"~%" -#: gnu/system.scm:680 +#: gnu/system.scm:856 #, scheme-format msgid "~a: invalid locale name" msgstr "~a: nome de localidade inválido" -#: gnu/system.scm:860 -msgid "/" -msgstr "/" - -#: gnu/system.scm:862 -#, scheme-format -msgid "unrecognized boot parameters for '~a'~%" -msgstr "parâmetros de inicialização não reconhecidos para \"~a\"~%" - -#: gnu/services/shepherd.scm:165 +#: gnu/services/shepherd.scm:166 #, scheme-format msgid "service '~a' provided more than once" msgstr "serviço \"~a\" fornecido mais de uma vez" -#: gnu/services/shepherd.scm:180 +#: gnu/services/shepherd.scm:181 #, scheme-format msgid "service '~a' requires '~a', which is not provided by any service" msgstr "serviço \"~a\" requer \"~a\", o que não é fornecido por nenhum serviço" -#: gnu/system/shadow.scm:220 +#: gnu/system/shadow.scm:231 #, scheme-format msgid "supplementary group '~a' of user '~a' is undeclared" msgstr "grupo suplementar \"~a\" do usuário \"~a\" não está declarado" -#: gnu/system/shadow.scm:230 +#: gnu/system/shadow.scm:241 #, scheme-format msgid "primary group '~a' of user '~a' is undeclared" msgstr "grupo primário \"~a\" do usuário \"~a\" não está declarado" -#: guix/scripts.scm:53 +#: guix/scripts.scm:56 #, scheme-format msgid "invalid argument: ~a~%" msgstr "argumento inválido: ~a~%" -#: guix/scripts.scm:79 guix/scripts/download.scm:133 guix/scripts/gc.scm:164 +#: guix/scripts.scm:84 guix/scripts/download.scm:135 #: guix/scripts/import/cran.scm:82 guix/scripts/import/elpa.scm:77 -#: guix/scripts/pull.scm:219 guix/scripts/lint.scm:1042 -#: guix/scripts/publish.scm:556 guix/scripts/edit.scm:81 -#: guix/scripts/graph.scm:436 +#: guix/scripts/publish.scm:844 guix/scripts/edit.scm:81 #, scheme-format msgid "~A: unrecognized option~%" msgstr "~A: opção não reconhecida~%" -#: guix/scripts/build.scm:121 +#: guix/scripts.scm:179 +#, scheme-format +msgid "Your Guix installation is ~a day old.\n" +msgid_plural "Your Guix installation is ~a days old.\n" +msgstr[0] "Sua instalação do Guix tem ~a dia.\n" +msgstr[1] "Sua instalação do Guix tem ~a dias.\n" + +#: guix/scripts.scm:184 +#, scheme-format +msgid "" +"Consider running 'guix pull' followed by\n" +"'~a' to get up-to-date packages and security updates.\n" +msgstr "" +"Considere executar \"guix pull\" seguido de\n" +"\"~a\" para obter pacotes atualizados e atualizações de segurança.\n" + +#: guix/scripts/build.scm:124 #, scheme-format msgid "failed to create GC root `~a': ~a~%" msgstr "falha ao criar raiz de GC \"~a\": ~a~%" -#: guix/scripts/build.scm:196 +#: guix/scripts/build.scm:206 #, scheme-format msgid "invalid replacement specification: ~s~%" msgstr "especificação de substituição inválida: ~s~%" -#: guix/scripts/build.scm:253 +#: guix/scripts/build.scm:263 msgid "" "\n" " --with-source=SOURCE\n" @@ -162,7 +207,7 @@ msgstr "" " --with-source=FONTE\n" " usa FONTE ao compilar o pacote correspondente" -#: guix/scripts/build.scm:256 +#: guix/scripts/build.scm:266 msgid "" "\n" " --with-input=PACKAGE=REPLACEMENT\n" @@ -172,7 +217,7 @@ msgstr "" " --with-input=PACOTE=SUBSTITUIÇÃO\n" " substitui a dependência PACOTE por SUBSTITUIÇÃO" -#: guix/scripts/build.scm:259 +#: guix/scripts/build.scm:269 msgid "" "\n" " --with-graft=PACKAGE=REPLACEMENT\n" @@ -182,12 +227,12 @@ msgstr "" " --with-graft=PACOTE=SUBSTITUIÇÃO\n" " insere SUBSTITUIÇÃO em pacotes referindo-se a PACOTE" -#: guix/scripts/build.scm:284 +#: guix/scripts/build.scm:294 #, scheme-format msgid "transformation '~a' had no effect on ~a~%" msgstr "a transformação \"~a\" não obteve efeito em ~a~%" -#: guix/scripts/build.scm:302 +#: guix/scripts/build.scm:312 msgid "" "\n" " -L, --load-path=DIR prepend DIR to the package module search path" @@ -196,7 +241,7 @@ msgstr "" " -L, --load-path=DIR insere DIR no início do caminho de pesquisa do\n" " módulo do pacote" -#: guix/scripts/build.scm:304 +#: guix/scripts/build.scm:314 msgid "" "\n" " -K, --keep-failed keep build tree of failed builds" @@ -204,7 +249,7 @@ msgstr "" "\n" " -K, --keep-failed mantém a árvore de compilado de pacotes falhos" -#: guix/scripts/build.scm:306 +#: guix/scripts/build.scm:316 msgid "" "\n" " -k, --keep-going keep going when some of the derivations fail" @@ -212,7 +257,7 @@ msgstr "" "\n" " -k, --keep-going continua mesmo se algumas das derivações falharem" -#: guix/scripts/build.scm:308 +#: guix/scripts/build.scm:318 msgid "" "\n" " -n, --dry-run do not build the derivations" @@ -220,7 +265,7 @@ msgstr "" "\n" " -n, --dry-run não compila as derivações" -#: guix/scripts/build.scm:310 +#: guix/scripts/build.scm:320 msgid "" "\n" " --fallback fall back to building when the substituter fails" @@ -228,7 +273,7 @@ msgstr "" "\n" " --fallback volta para compilação quando o substituto falhar" -#: guix/scripts/build.scm:312 +#: guix/scripts/build.scm:322 msgid "" "\n" " --no-substitutes build instead of resorting to pre-built substitutes" @@ -237,7 +282,7 @@ msgstr "" " --no-substitutes compila, em vez de recorrer a substitutos\n" " pré-construídos" -#: guix/scripts/build.scm:314 guix/scripts/size.scm:220 +#: guix/scripts/build.scm:324 guix/scripts/size.scm:232 msgid "" "\n" " --substitute-urls=URLS\n" @@ -247,7 +292,7 @@ msgstr "" " --substitute-urls=URLS\n" " obtém substituto a partir das URLS se autorizadas" -#: guix/scripts/build.scm:317 +#: guix/scripts/build.scm:327 msgid "" "\n" " --no-grafts do not graft packages" @@ -255,7 +300,7 @@ msgstr "" "\n" " --no-grafts não faz gráficos de pacotes" -#: guix/scripts/build.scm:319 +#: guix/scripts/build.scm:329 msgid "" "\n" " --no-build-hook do not attempt to offload builds via the build hook" @@ -264,7 +309,7 @@ msgstr "" " --no-build-hook não tenta descarregar compilações via hook de\n" " compilação" -#: guix/scripts/build.scm:321 +#: guix/scripts/build.scm:331 msgid "" "\n" " --max-silent-time=SECONDS\n" @@ -275,7 +320,7 @@ msgstr "" " marca a compilação como falha após transcorridos\n" " SEGUNDOS de silêncio" -#: guix/scripts/build.scm:324 +#: guix/scripts/build.scm:334 msgid "" "\n" " --timeout=SECONDS mark the build as failed after SECONDS of activity" @@ -285,7 +330,7 @@ msgstr "" " marca a compilação como falha após transcorridos\n" " SEGUNDOS de atividade" -#: guix/scripts/build.scm:326 +#: guix/scripts/build.scm:336 msgid "" "\n" " --verbosity=LEVEL use the given verbosity LEVEL" @@ -293,7 +338,7 @@ msgstr "" "\n" " --verbosity=NÍVEL usa o NÍVEL de detalhamento dado" -#: guix/scripts/build.scm:328 +#: guix/scripts/build.scm:338 msgid "" "\n" " --rounds=N build N times in a row to detect non-determinism" @@ -302,7 +347,7 @@ msgstr "" " --rounds=N compila N vezes de uma vez para detectar\n" " não determinismo" -#: guix/scripts/build.scm:330 +#: guix/scripts/build.scm:340 msgid "" "\n" " -c, --cores=N allow the use of up to N CPU cores for the build" @@ -310,7 +355,7 @@ msgstr "" "\n" " -c, --cores=N permite uso de até N núcleos de CPU para compilação" -#: guix/scripts/build.scm:332 +#: guix/scripts/build.scm:342 msgid "" "\n" " -M, --max-jobs=N allow at most N build jobs" @@ -318,12 +363,12 @@ msgstr "" "\n" " -M, --max-jobs=N permite no máximo N trabalhos de compilação" -#: guix/scripts/build.scm:438 guix/scripts/build.scm:445 +#: guix/scripts/build.scm:448 guix/scripts/build.scm:455 #, scheme-format msgid "not a number: '~a' option argument: ~a~%" msgstr "não é um número: argumento da opção \"~a\": ~a~%" -#: guix/scripts/build.scm:465 +#: guix/scripts/build.scm:474 msgid "" "Usage: guix build [OPTION]... PACKAGE-OR-DERIVATION...\n" "Build the given PACKAGE-OR-DERIVATION and return their output paths.\n" @@ -331,7 +376,7 @@ msgstr "" "Uso: guix build [OPÇÃO]... PACOTE-OU-DERIVAÇÃO...\n" "Compila o PACOTE-OU-DERIVAÇÃO dado e returna seus caminhos de saída.\n" -#: guix/scripts/build.scm:467 +#: guix/scripts/build.scm:476 msgid "" "\n" " -e, --expression=EXPR build the package or derivation EXPR evaluates to" @@ -339,7 +384,7 @@ msgstr "" "\n" " -e, --expression=EXPR compila o pacote ou derivação que EXPR corresponder" -#: guix/scripts/build.scm:469 +#: guix/scripts/build.scm:478 msgid "" "\n" " -f, --file=FILE build the package or derivation that the code within\n" @@ -349,7 +394,7 @@ msgstr "" " -f, --file=ARQUIVO compila o pacote ou derivação que o código dentro\n" " de ARQUIVO avaliar" -#: guix/scripts/build.scm:472 +#: guix/scripts/build.scm:481 msgid "" "\n" " -S, --source build the packages' source derivations" @@ -357,7 +402,7 @@ msgstr "" "\n" " -S, --source compila as derivações de fontes do pacote" -#: guix/scripts/build.scm:474 +#: guix/scripts/build.scm:483 msgid "" "\n" " --sources[=TYPE] build source derivations; TYPE may optionally be one\n" @@ -367,7 +412,7 @@ msgstr "" " --sources[=TIPO] compila derivações de fonte; como opção, TIPO pode\n" " um entre \"package\", \"all\" (padrão) ou \"transitive\"" -#: guix/scripts/build.scm:477 +#: guix/scripts/build.scm:486 guix/scripts/pack.scm:338 msgid "" "\n" " -s, --system=SYSTEM attempt to build for SYSTEM--e.g., \"i686-linux\"" @@ -375,7 +420,7 @@ msgstr "" "\n" " -s, --system=SISTEMA tenta compilar para SISTEMA (ex.: \"i686-linux\")" -#: guix/scripts/build.scm:479 +#: guix/scripts/build.scm:488 guix/scripts/pack.scm:340 msgid "" "\n" " --target=TRIPLET cross-build for TRIPLET--e.g., \"armel-linux-gnu\"" @@ -383,7 +428,7 @@ msgstr "" "\n" " --target=TRIO compilação cruzada para TRIO (ex: \"armel-linux-gnu\")" -#: guix/scripts/build.scm:481 +#: guix/scripts/build.scm:490 msgid "" "\n" " -d, --derivations return the derivation paths of the given packages" @@ -391,7 +436,7 @@ msgstr "" "\n" " -d, --derivations retorna os caminhos de derivação dos pacotes dados" -#: guix/scripts/build.scm:483 +#: guix/scripts/build.scm:492 msgid "" "\n" " --check rebuild items to check for non-determinism issues" @@ -400,7 +445,15 @@ msgstr "" " --check recompila itens para verificar questões de\n" " não determinismo" -#: guix/scripts/build.scm:485 +#: guix/scripts/build.scm:494 +msgid "" +"\n" +" --repair repair the specified items" +msgstr "" +"\n" +" --repair conserta os itens especificados" + +#: guix/scripts/build.scm:496 msgid "" "\n" " -r, --root=FILE make FILE a symlink to the result, and register it\n" @@ -410,7 +463,7 @@ msgstr "" " -r, --root=ARQUIVO faz do ARQUIVO um link simbólico para o resultado\n" " e o registra, como um coletor de lixo" -#: guix/scripts/build.scm:488 +#: guix/scripts/build.scm:499 msgid "" "\n" " -q, --quiet do not show the build log" @@ -418,7 +471,7 @@ msgstr "" "\n" " -q, --quiet não mostra o log de compilação" -#: guix/scripts/build.scm:490 +#: guix/scripts/build.scm:501 msgid "" "\n" " --log-file return the log file names for the given derivations" @@ -427,15 +480,17 @@ msgstr "" " --log-file retorna o os nomes de arquivos de log para as\n" " derivações fornecidas" -#: guix/scripts/build.scm:497 guix/scripts/download.scm:81 -#: guix/scripts/package.scm:419 guix/scripts/gc.scm:74 -#: guix/scripts/hash.scm:59 guix/scripts/import.scm:91 -#: guix/scripts/import/cran.scm:47 guix/scripts/pull.scm:83 -#: guix/scripts/substitute.scm:836 guix/scripts/system.scm:748 -#: guix/scripts/lint.scm:991 guix/scripts/publish.scm:74 -#: guix/scripts/edit.scm:44 guix/scripts/size.scm:228 -#: guix/scripts/graph.scm:416 guix/scripts/challenge.scm:182 -#: guix/scripts/container.scm:33 guix/scripts/container/exec.scm:43 +#: guix/scripts/build.scm:508 guix/scripts/download.scm:83 +#: guix/scripts/package.scm:425 guix/scripts/gc.scm:74 +#: guix/scripts/hash.scm:59 guix/scripts/import.scm:92 +#: guix/scripts/import/cran.scm:47 guix/scripts/pull.scm:110 +#: guix/scripts/substitute.scm:889 guix/scripts/system.scm:870 +#: guix/scripts/lint.scm:1090 guix/scripts/publish.scm:94 +#: guix/scripts/edit.scm:44 guix/scripts/size.scm:243 +#: guix/scripts/graph.scm:432 guix/scripts/challenge.scm:241 +#: guix/scripts/copy.scm:122 guix/scripts/pack.scm:349 +#: guix/scripts/weather.scm:156 guix/scripts/container.scm:33 +#: guix/scripts/container/exec.scm:43 msgid "" "\n" " -h, --help display this help and exit" @@ -443,15 +498,17 @@ msgstr "" "\n" " -h, --help exibe esta ajuda e sai" -#: guix/scripts/build.scm:499 guix/scripts/download.scm:83 -#: guix/scripts/package.scm:421 guix/scripts/gc.scm:76 -#: guix/scripts/hash.scm:61 guix/scripts/import.scm:93 -#: guix/scripts/import/cran.scm:49 guix/scripts/pull.scm:85 -#: guix/scripts/substitute.scm:838 guix/scripts/system.scm:750 -#: guix/scripts/lint.scm:995 guix/scripts/publish.scm:76 -#: guix/scripts/edit.scm:46 guix/scripts/size.scm:230 -#: guix/scripts/graph.scm:418 guix/scripts/challenge.scm:184 -#: guix/scripts/container.scm:35 guix/scripts/container/exec.scm:45 +#: guix/scripts/build.scm:510 guix/scripts/download.scm:85 +#: guix/scripts/package.scm:427 guix/scripts/gc.scm:76 +#: guix/scripts/hash.scm:61 guix/scripts/import.scm:94 +#: guix/scripts/import/cran.scm:49 guix/scripts/pull.scm:112 +#: guix/scripts/substitute.scm:891 guix/scripts/system.scm:872 +#: guix/scripts/lint.scm:1094 guix/scripts/publish.scm:96 +#: guix/scripts/edit.scm:46 guix/scripts/size.scm:245 +#: guix/scripts/graph.scm:434 guix/scripts/challenge.scm:243 +#: guix/scripts/copy.scm:124 guix/scripts/pack.scm:351 +#: guix/scripts/weather.scm:158 guix/scripts/container.scm:35 +#: guix/scripts/container/exec.scm:45 msgid "" "\n" " -V, --version display version information and exit" @@ -459,7 +516,7 @@ msgstr "" "\n" " -V, --version exibe informações da versão e sai" -#: guix/scripts/build.scm:526 +#: guix/scripts/build.scm:537 #, scheme-format msgid "" "invalid argument: '~a' option argument: ~a, ~\n" @@ -468,22 +525,27 @@ msgstr "" "argumento inválido: argumento da opção \"~a\": ~a, ~\n" "deve ser um entre \"package\", \"all\" ou \"transitive\"~%" -#: guix/scripts/build.scm:573 +#: guix/scripts/build.scm:590 #, scheme-format msgid "~s: not something we can build~%" msgstr "~s: não é algo que podemos compilar~%" -#: guix/scripts/build.scm:627 +#: guix/scripts/build.scm:644 #, scheme-format msgid "~a: warning: package '~a' has no source~%" msgstr "~a: aviso: pacote \"~a\" não possui fontes~%" -#: guix/scripts/build.scm:661 +#: guix/scripts/build.scm:678 #, scheme-format msgid "no build log for '~a'~%" msgstr "nenhum log de compilação para \"~a\"~%" -#: guix/scripts/download.scm:67 +#: guix/discovery.scm:88 +#, scheme-format +msgid "cannot access `~a': ~a~%" +msgstr "não foi possível acessar \"~a\": ~a~%" + +#: guix/scripts/download.scm:69 msgid "" "Usage: guix download [OPTION] URL\n" "Download the file at URL to the store or to the given file, and print its\n" @@ -499,7 +561,7 @@ msgstr "" "Suporte a formatos: \"nix-base32\" (padrão), \"base32\" e \"base16\"\n" "(\"hex\" e \"hexadecimal\" também podem ser usados).\n" -#: guix/scripts/download.scm:73 guix/scripts/hash.scm:54 +#: guix/scripts/download.scm:75 guix/scripts/hash.scm:54 msgid "" "\n" " -f, --format=FMT write the hash in the given format" @@ -507,7 +569,7 @@ msgstr "" "\n" " -f, --format=FMT escreve o hash no formato FMT dado" -#: guix/scripts/download.scm:75 +#: guix/scripts/download.scm:77 msgid "" "\n" " --no-check-certificate\n" @@ -517,7 +579,7 @@ msgstr "" " --no-check-certificate\n" " não valida o certificado de servidores HTTPS " -#: guix/scripts/download.scm:78 +#: guix/scripts/download.scm:80 msgid "" "\n" " -o, --output=FILE download to FILE" @@ -525,92 +587,97 @@ msgstr "" "\n" " -o, --output=ARQUIVO baixa para ARQUIVO" -#: guix/scripts/download.scm:101 guix/scripts/hash.scm:82 +#: guix/scripts/download.scm:103 guix/scripts/hash.scm:82 #, scheme-format msgid "unsupported hash format: ~a~%" msgstr "sem suporte ao formato de hash: ~a~%" -#: guix/scripts/download.scm:136 guix/scripts/package.scm:879 -#: guix/scripts/publish.scm:558 +#: guix/scripts/download.scm:138 guix/scripts/package.scm:906 +#: guix/scripts/publish.scm:846 #, scheme-format msgid "~A: extraneous argument~%" msgstr "~A: argumento estranho~%" -#: guix/scripts/download.scm:144 +#: guix/scripts/download.scm:146 #, scheme-format msgid "no download URI was specified~%" msgstr "nenhuma URI de download foi especificada~%" -#: guix/scripts/download.scm:146 +#: guix/scripts/download.scm:151 #, scheme-format msgid "~a: failed to parse URI~%" msgstr "~a: falha ao analisar URI~%" -#: guix/scripts/download.scm:156 +#: guix/scripts/download.scm:161 #, scheme-format msgid "~a: download failed~%" msgstr "~a: falha no download~%" -#: guix/scripts/package.scm:107 +#: guix/scripts/package.scm:112 #, scheme-format msgid "Try \"info '(guix) Invoking guix package'\" for more information.~%" msgstr "Tente \"info '(guix) Invoking guix package'\" para mais informações.~%" -#: guix/scripts/package.scm:129 +#: guix/scripts/package.scm:134 #, scheme-format msgid "error: while creating directory `~a': ~a~%" msgstr "erro: ao criar diretório \"~a\": ~a~%" -#: guix/scripts/package.scm:133 +#: guix/scripts/package.scm:138 #, scheme-format msgid "Please create the `~a' directory, with you as the owner.~%" msgstr "Por favor, crie o diretório \"~a\", com você sendo o proprietário.~%" -#: guix/scripts/package.scm:140 +#: guix/scripts/package.scm:145 #, scheme-format msgid "error: directory `~a' is not owned by you~%" msgstr "erro: diretório \"~a\" não tem você como proprietário~%" -#: guix/scripts/package.scm:143 +#: guix/scripts/package.scm:148 #, scheme-format msgid "Please change the owner of `~a' to user ~s.~%" msgstr "Por favor, altere o proprietário d \"~a\" para o usuário ~s.~%" -#: guix/scripts/package.scm:178 +#: guix/scripts/package.scm:183 #, scheme-format msgid "not removing generation ~a, which is current~%" msgstr "não será removida a geração ~a, que é o atual~%" # geração, criação? -#: guix/scripts/package.scm:185 +#: guix/scripts/package.scm:190 #, scheme-format msgid "no matching generation~%" msgstr "nenhuma geração correspondente~%" -#: guix/scripts/package.scm:188 guix/scripts/package.scm:699 -#: guix/scripts/system.scm:549 +#: guix/scripts/package.scm:193 guix/scripts/package.scm:716 +#: guix/scripts/system.scm:558 #, scheme-format msgid "invalid syntax: ~a~%" msgstr "sintaxe inválida: ~a~%" -#: guix/scripts/package.scm:214 +#: guix/scripts/package.scm:219 #, scheme-format msgid "nothing to be done~%" msgstr "nada para ser feito~%" -#: guix/scripts/package.scm:228 +#: guix/scripts/package.scm:233 #, scheme-format msgid "~a package in profile~%" msgid_plural "~a packages in profile~%" msgstr[0] "~a pacote no perfil~%" msgstr[1] "~a pacotes no perfil~%" -#: guix/scripts/package.scm:344 +#: guix/scripts/package.scm:313 +#, scheme-format +msgid "package '~a' no longer exists~%" +msgstr "o pacote \"~a\" não existe mais~%" + +#: guix/scripts/package.scm:351 #, scheme-format msgid "The following environment variable definitions may be needed:~%" msgstr "As seguintes definições de variável de ambiente podem ser necessárias:~%" -#: guix/scripts/package.scm:360 +#: guix/scripts/package.scm:366 msgid "" "Usage: guix package [OPTION]...\n" "Install, remove, or upgrade packages in a single transaction.\n" @@ -618,7 +685,7 @@ msgstr "" "Uso: guix package [OPÇÃO]...\n" "Instala, remove ou atualiza pacotes em uma única transação.\n" -#: guix/scripts/package.scm:362 +#: guix/scripts/package.scm:368 msgid "" "\n" " -i, --install PACKAGE ...\n" @@ -628,7 +695,7 @@ msgstr "" " -i, --install PACOTE ...\n" " instala PACOTEs" -#: guix/scripts/package.scm:365 +#: guix/scripts/package.scm:371 msgid "" "\n" " -e, --install-from-expression=EXP\n" @@ -638,7 +705,7 @@ msgstr "" " -e, --install-from-expression=EXP\n" " instala o pacote que EXPR corresponder" -#: guix/scripts/package.scm:368 +#: guix/scripts/package.scm:374 msgid "" "\n" " -f, --install-from-file=FILE\n" @@ -647,10 +714,10 @@ msgid "" msgstr "" "\n" " -f, --install-from-file=ARQUIVO\n" -" instala o pacote que o código dentro de\n" -" ARQUIVO corresponder" +" instala o pacote cujo código dentro do ARQUIVO\n" +" corresponder" -#: guix/scripts/package.scm:372 +#: guix/scripts/package.scm:378 msgid "" "\n" " -r, --remove PACKAGE ...\n" @@ -660,7 +727,7 @@ msgstr "" " -r, --remove PACOTE ...\n" " remove PACOTEs" -#: guix/scripts/package.scm:375 +#: guix/scripts/package.scm:381 msgid "" "\n" " -u, --upgrade[=REGEXP] upgrade all the installed packages matching REGEXP" @@ -669,7 +736,7 @@ msgstr "" " -u, --upgrade[=REGEXP] atualiza todos os pacotes instalados correspondendo\n" " à REGEXP" -#: guix/scripts/package.scm:377 +#: guix/scripts/package.scm:383 msgid "" "\n" " -m, --manifest=FILE create a new profile generation with the manifest\n" @@ -679,7 +746,7 @@ msgstr "" " -m, --manifest=ARQUIVO cria a geração de um novo perfil com o manifesto\n" " do ARQUIVO" -#: guix/scripts/package.scm:380 +#: guix/scripts/package.scm:386 msgid "" "\n" " --do-not-upgrade[=REGEXP] do not upgrade any packages matching REGEXP" @@ -687,7 +754,7 @@ msgstr "" "\n" " --do-not-upgrade[=REGEXP] não atualiza pacotes correspondente a REGEXP" -#: guix/scripts/package.scm:382 +#: guix/scripts/package.scm:388 msgid "" "\n" " --roll-back roll back to the previous generation" @@ -695,7 +762,7 @@ msgstr "" "\n" " --roll-back reverte para a geração anterior" -#: guix/scripts/package.scm:384 +#: guix/scripts/package.scm:390 msgid "" "\n" " --search-paths[=KIND]\n" @@ -705,7 +772,7 @@ msgstr "" " --search-paths[=TIPO]\n" " exibe definições necessárias de variável de ambiente" -#: guix/scripts/package.scm:387 +#: guix/scripts/package.scm:393 msgid "" "\n" " -l, --list-generations[=PATTERN]\n" @@ -715,7 +782,7 @@ msgstr "" " -l, --list-generations[=PADRÃO]\n" " lista criações correspondendo a PADRÃO" -#: guix/scripts/package.scm:390 +#: guix/scripts/package.scm:396 msgid "" "\n" " -d, --delete-generations[=PATTERN]\n" @@ -725,7 +792,7 @@ msgstr "" " -d, --delete-generations[=PADRÃO]\n" " exclui gerações correspondendo a PADRÃO" -#: guix/scripts/package.scm:393 +#: guix/scripts/package.scm:399 msgid "" "\n" " -S, --switch-generation=PATTERN\n" @@ -735,7 +802,7 @@ msgstr "" " -S, --switch-generations=PADRÃO\n" " alterna para a geração correspondendo a PADRÃO" -#: guix/scripts/package.scm:396 +#: guix/scripts/package.scm:402 msgid "" "\n" " -p, --profile=PROFILE use PROFILE instead of the user's default profile" @@ -743,7 +810,7 @@ msgstr "" "\n" " -p, --profile=PERFIL usa PERFIL em vez do perfil padrão do usuário" -#: guix/scripts/package.scm:399 +#: guix/scripts/package.scm:405 msgid "" "\n" " --bootstrap use the bootstrap Guile to build the profile" @@ -751,7 +818,7 @@ msgstr "" "\n" " --bootstrap usa a inicialização do Guile para compilar o perfil" -#: guix/scripts/package.scm:401 guix/scripts/pull.scm:76 +#: guix/scripts/package.scm:407 guix/scripts/pull.scm:98 msgid "" "\n" " --verbose produce verbose output" @@ -759,7 +826,7 @@ msgstr "" "\n" " --verbose produz uma saída mais detalhada" -#: guix/scripts/package.scm:404 +#: guix/scripts/package.scm:410 msgid "" "\n" " -s, --search=REGEXP search in synopsis and description using REGEXP" @@ -767,7 +834,7 @@ msgstr "" "\n" " -s, --search=REGEXP pesquisa na sinopse e descrição usando REGEXP" -#: guix/scripts/package.scm:406 +#: guix/scripts/package.scm:412 msgid "" "\n" " -I, --list-installed[=REGEXP]\n" @@ -777,7 +844,7 @@ msgstr "" " -I, --list-installed[=REGEXP]\n" " lista pacotes instalados correspondentes a REGEXP" -#: guix/scripts/package.scm:409 +#: guix/scripts/package.scm:415 msgid "" "\n" " -A, --list-available[=REGEXP]\n" @@ -787,7 +854,7 @@ msgstr "" " -A, --list-available[=REGEXP]\n" " lista pacotes disponíveis correspondentes a REGEXP" -#: guix/scripts/package.scm:412 +#: guix/scripts/package.scm:418 msgid "" "\n" " --show=PACKAGE show details about PACKAGE" @@ -795,23 +862,33 @@ msgstr "" "\n" " --show=PACOTE mostra detalhes sobre o PACOTE" -#: guix/scripts/package.scm:507 +#: guix/scripts/package.scm:470 +#, scheme-format +msgid "upgrade regexp '~a' looks like a command-line option~%" +msgstr "a regexp de atualização \"~a\" se parece com uma opção de linha de comando~%" + +#: guix/scripts/package.scm:473 +#, scheme-format +msgid "is this intended?~%" +msgstr "isso é intencional?~%" + +#: guix/scripts/package.scm:518 #, scheme-format msgid "~a: unsupported kind of search path~%" msgstr "~a: sem suporte ao tipo de caminho de pesquisa~%" # geração, criação? -#: guix/scripts/package.scm:790 +#: guix/scripts/package.scm:815 #, scheme-format msgid "cannot switch to generation '~a'~%" msgstr "não foi possível alternar para a geração \"~a\"~%" -#: guix/scripts/package.scm:806 +#: guix/scripts/package.scm:831 #, scheme-format msgid "would install new manifest from '~a' with ~d entries~%" msgstr "instalaria novo manifesto a partir de \"~a\" com entradas ~d~%" -#: guix/scripts/package.scm:808 +#: guix/scripts/package.scm:833 #, scheme-format msgid "installing new manifest from '~a' with ~d entries~%" msgstr "instalando novo manifesto a partir de \"~a\" com entradas ~d~%" @@ -934,20 +1011,20 @@ msgstr "" msgid "invalid amount of storage: ~a~%" msgstr "quantidade inválida de armazenamento: ~a~%" -#: guix/scripts/gc.scm:191 +#: guix/scripts/gc.scm:185 msgid "already ~h bytes available on ~a, nothing to do~%" msgstr "~h bytes já disponíveis em ~a, nada para fazer~%" -#: guix/scripts/gc.scm:194 +#: guix/scripts/gc.scm:188 msgid "freeing ~h bytes~%" msgstr "liberando ~h bytes~%" -#: guix/scripts/gc.scm:206 +#: guix/scripts/gc.scm:200 #, scheme-format msgid "extraneous arguments: ~{~a ~}~%" msgstr "argumentos estranhos: ~{~a ~}~%" -#: guix/scripts/gc.scm:226 guix/scripts/gc.scm:229 +#: guix/scripts/gc.scm:220 guix/scripts/gc.scm:223 msgid "freed ~h bytes~%" msgstr "~h bytes liberados~%" @@ -981,23 +1058,18 @@ msgstr "" "\n" " -r, --recursive computa o hash no AQUIVO recursivamente" -#: guix/scripts/hash.scm:109 -#, scheme-format -msgid "unrecognized option: ~a~%" -msgstr "opção não reconhecida: ~a~%" - -#: guix/scripts/hash.scm:152 guix/ui.scm:478 +#: guix/scripts/hash.scm:150 guix/ui.scm:326 guix/ui.scm:601 guix/ui.scm:654 #, scheme-format msgid "~a~%" msgstr "~a~%" -#: guix/scripts/hash.scm:155 guix/scripts/system.scm:879 -#: guix/scripts/system.scm:886 guix/scripts/system.scm:893 +#: guix/scripts/hash.scm:153 guix/scripts/system.scm:1022 +#: guix/scripts/system.scm:1031 guix/scripts/system.scm:1038 #, scheme-format msgid "wrong number of arguments~%" msgstr "número errado de argumentos~%" -#: guix/scripts/import.scm:85 +#: guix/scripts/import.scm:86 msgid "" "Usage: guix import IMPORTER ARGS ...\n" "Run IMPORTER with ARGS.\n" @@ -1005,21 +1077,21 @@ msgstr "" "Uso: guix import IMPORTADOR ARGUMENTOS ...\n" "Executa IMPORTADOR com ARGUMENTOS.\n" -#: guix/scripts/import.scm:88 +#: guix/scripts/import.scm:89 msgid "IMPORTER must be one of the importers listed below:\n" msgstr "IMPORTADOR deve ser um dos importadores listados abaixo:\n" -#: guix/scripts/import.scm:102 +#: guix/scripts/import.scm:103 #, scheme-format msgid "guix import: missing importer name~%" msgstr "guix: import: faltando o nome de um importador~%" -#: guix/scripts/import.scm:122 +#: guix/scripts/import.scm:123 #, scheme-format msgid "'~a' import failed~%" msgstr "importação de \"~a\" falhou~%" -#: guix/scripts/import.scm:123 +#: guix/scripts/import.scm:124 #, scheme-format msgid "~a: invalid importer~%" msgstr "~a: importador inválido~%" @@ -1092,7 +1164,26 @@ msgstr "" msgid "failed to download package '~a'~%" msgstr "falha ao baixar localidade: \"~a\"~%" -#: guix/scripts/pull.scm:74 +#: guix/scripts/pull.scm:60 +#, scheme-format +msgid "" +"Guile-Git is missing but it is now required by 'guix pull'.\n" +"Install it by running:\n" +"\n" +" guix package -i ~a\n" +" export GUILE_LOAD_PATH=$HOME/.guix-profile/share/guile/site/~a:$GUILE_LOAD_PATH\n" +" export GUILE_LOAD_COMPILED_PATH=$HOME/.guix-profile/lib/guile/~a/site-ccache:$GUILE_LOAD_COMPILED_PATH\n" +"\n" +msgstr "" +"Guile-Git está faltando, mas agora é necessário por \"guix pull\".\n" +"Instale-o executando:\n" +"\n" +" guix package -i ~a\n" +" export GUILE_LOAD_PATH=$HOME/.guix-profile/share/guile/site/~a:$GUILE_LOAD_PATH\n" +" export GUILE_LOAD_COMPILED_PATH=$HOME/.guix-profile/lib/guile/~a/site-ccache:$GUILE_LOAD_COMPILED_PATH\n" +"\n" + +#: guix/scripts/pull.scm:96 msgid "" "Usage: guix pull [OPTION]...\n" "Download and deploy the latest version of Guix.\n" @@ -1100,179 +1191,188 @@ msgstr "" "Uso: guix pull [OPÇÃO]...\n" "Baixa e implanta a última versão do Guix.\n" -#: guix/scripts/pull.scm:78 +#: guix/scripts/pull.scm:100 msgid "" "\n" -" --url=URL download the Guix tarball from URL" +" --url=URL download from the Git repository at URL" msgstr "" "\n" -" --url=URL baixa o tarball do Guix a partir da URL" +" --url=URL baixa do repositório Git na URL" -#: guix/scripts/pull.scm:80 +#: guix/scripts/pull.scm:102 msgid "" "\n" -" --bootstrap use the bootstrap Guile to build the new Guix" +" --commit=COMMIT download the specified COMMIT" msgstr "" "\n" -" --bootstrap usa inicialização do Guile para compilar o novo Guix" - -#: guix/scripts/pull.scm:134 -msgid "tarball did not produce a single source directory" -msgstr "tarball não produziu um diretório fonte" +" --commit=COMMIT baixa o COMMIT especificado" -#: guix/scripts/pull.scm:152 -#, scheme-format -msgid "unpacking '~a'...~%" -msgstr "desempacotando \"~a\"...~%" +#: guix/scripts/pull.scm:104 +msgid "" +"\n" +" --branch=BRANCH download the tip of the specified BRANCH" +msgstr "" +"\n" +" --branch=RAMO baixa a dica do RAMO especificado" -#: guix/scripts/pull.scm:161 -msgid "failed to unpack source code" -msgstr "falha ao desempacotar o código fonte" +#: guix/scripts/pull.scm:106 +msgid "" +"\n" +" --bootstrap use the bootstrap Guile to build the new Guix" +msgstr "" +"\n" +" --bootstrap usa inicialização do Guile para compilar o novo Guix" -#: guix/scripts/pull.scm:204 +#: guix/scripts/pull.scm:192 msgid "Guix already up to date\n" msgstr "Guix já está atualizado\n" -#: guix/scripts/pull.scm:209 +#: guix/scripts/pull.scm:197 #, scheme-format msgid "updated ~a successfully deployed under `~a'~%" -msgstr "~a atualizado foi implantado com sucesso em \"~a\"~%" +msgstr "~a atualizado foi implantado com sucesso sob \"~a\"~%" -#: guix/scripts/pull.scm:212 +#: guix/scripts/pull.scm:200 #, scheme-format msgid "failed to update Guix, check the build log~%" msgstr "falha ao atualizar Guix; verifique o log de compilação~%" -#: guix/scripts/pull.scm:221 +#: guix/scripts/pull.scm:216 +#, scheme-format +msgid "cannot enforce use of the Let's Encrypt certificates~%" +msgstr "não foi possível forçar o uso de certificados Let's Encrypt~%" + +#: guix/scripts/pull.scm:218 +#, scheme-format +msgid "please upgrade Guile-Git~%" +msgstr "por favor, atualize o Guile-Git~%" + +#: guix/scripts/pull.scm:226 +#, scheme-format +msgid "Git error ~a~%" +msgstr "erro no Git ~a~%" + +#: guix/scripts/pull.scm:228 #, scheme-format -msgid "~A: unexpected argument~%" -msgstr "~A: argumento inesperado~%" +msgid "Git error: ~a~%" +msgstr "erro no Git: ~a~%" -#: guix/scripts/pull.scm:230 -msgid "failed to download up-to-date source, exiting\n" -msgstr "falha ao baixar fonte atualizada; saindo\n" +#: guix/scripts/pull.scm:262 +#, scheme-format +msgid "Updating from Git repository at '~a'...~%" +msgstr "Atualizando a partir do repositório Git \"~a\"...~%" + +#: guix/scripts/pull.scm:271 +#, scheme-format +msgid "Building from Git commit ~a...~%" +msgstr "Compilando a partir do commit Git ~a...~%" -#: guix/scripts/substitute.scm:112 +#: guix/scripts/substitute.scm:125 #, scheme-format msgid "authentication and authorization of substitutes disabled!~%" msgstr "autenticação e autorização de substitutos desabilitado!~%" -#: guix/scripts/substitute.scm:187 +#: guix/scripts/substitute.scm:200 #, scheme-format msgid "download from '~a' failed: ~a, ~s~%" msgstr "download de \"~a\" falhou: ~a, ~s~%" -#: guix/scripts/substitute.scm:200 +#: guix/scripts/substitute.scm:213 #, scheme-format msgid "while fetching ~a: server is somewhat slow~%" msgstr "enquanto obtinha ~a: servidor está um pouco lento~%" -#: guix/scripts/substitute.scm:202 +#: guix/scripts/substitute.scm:215 #, scheme-format msgid "try `--no-substitutes' if the problem persists~%" -msgstr "Tente \"--no-substitutes\" se o problema persistir~%" +msgstr "tente \"--no-substitutes\" se o problema persistir~%" -#: guix/scripts/substitute.scm:220 +#: guix/scripts/substitute.scm:233 #, scheme-format msgid "unsupported substitute URI scheme: ~a~%" msgstr "sem suporte ao esquema de URI de substituto: ~a~%" -#: guix/scripts/substitute.scm:254 +#: guix/scripts/substitute.scm:268 #, scheme-format msgid "while fetching '~a': ~a (~s)~%" msgstr "enquanto obtinha \"~a\": ~a (~s)~%" -#: guix/scripts/substitute.scm:259 +#: guix/scripts/substitute.scm:273 #, scheme-format msgid "ignoring substitute server at '~s'~%" msgstr "ignorando servidor substituto em \"~s\"~%" -#: guix/scripts/substitute.scm:309 +#: guix/scripts/substitute.scm:323 #, scheme-format msgid "signature version must be a number: ~s~%" msgstr "a versão de assinatura deve ser um número: ~s~%" -#: guix/scripts/substitute.scm:313 +#: guix/scripts/substitute.scm:327 #, scheme-format msgid "unsupported signature version: ~a~%" msgstr "sem suporte à versão da assinatura: ~a~%" -#: guix/scripts/substitute.scm:321 +#: guix/scripts/substitute.scm:335 #, scheme-format msgid "signature is not a valid s-expression: ~s~%" msgstr "a assinatura não é uma expressão-s válida: ~s~%" -#: guix/scripts/substitute.scm:325 +#: guix/scripts/substitute.scm:339 #, scheme-format msgid "invalid format of the signature field: ~a~%" msgstr "formato inválido do campo de assinatura: ~a~%" -#: guix/scripts/substitute.scm:360 +#: guix/scripts/substitute.scm:374 #, scheme-format msgid "invalid signature for '~a'~%" msgstr "assinatura inválida para \"~a\"~%" -#: guix/scripts/substitute.scm:362 +#: guix/scripts/substitute.scm:376 #, scheme-format msgid "hash mismatch for '~a'~%" msgstr "hash incompatível para \"~a\"~%" -#: guix/scripts/substitute.scm:364 +#: guix/scripts/substitute.scm:378 #, scheme-format msgid "'~a' is signed with an unauthorized key~%" msgstr "\"~a\" está assinado com uma chave não autorizada~%" -#: guix/scripts/substitute.scm:366 +#: guix/scripts/substitute.scm:380 #, scheme-format msgid "signature on '~a' is corrupt~%" msgstr "a assinatura em \"~a\" está corrompida~%" -#: guix/scripts/substitute.scm:404 -#, scheme-format -msgid "substitute at '~a' lacks a signature~%" -msgstr "o substituto em \"~a\" carece de uma assinatura~%" - -#: guix/scripts/substitute.scm:411 -#, scheme-format -msgid "Found valid signature for ~a~%" -msgstr "Localizada assinatura válida para ~a~%" - -#: guix/scripts/substitute.scm:414 -#, scheme-format -msgid "From ~a~%" -msgstr "De ~a~%" - -#: guix/scripts/substitute.scm:454 +#: guix/scripts/substitute.scm:465 #, scheme-format msgid "'~a' does not name a store item~%" msgstr "\"~a\" não é o nome de um item do armazenamento~%" -#: guix/scripts/substitute.scm:600 +#: guix/scripts/substitute.scm:629 #, scheme-format msgid "updating list of substitutes from '~a'... ~5,1f%" msgstr "atualizando a lista de substitutos de \"~a\"... ~5,1f%" -#: guix/scripts/substitute.scm:655 +#: guix/scripts/substitute.scm:693 #, scheme-format msgid "~s: unsupported server URI scheme~%" msgstr "~s: sem suporte ao esquema de URI de servidor~%" -#: guix/scripts/substitute.scm:665 +#: guix/scripts/substitute.scm:703 #, scheme-format msgid "'~a' uses different store '~a'; ignoring it~%" -msgstr "\"~a\" usa um armazenamento diferente \"~a\"" +msgstr "\"~a\" usa um armazenamento diferente \"~a\"; ignorando-o~%" -#: guix/scripts/substitute.scm:810 +#: guix/scripts/substitute.scm:863 #, scheme-format msgid "host name lookup error: ~a~%" msgstr "erro na busca pelo nome da máquina: ~a~%" -#: guix/scripts/substitute.scm:815 +#: guix/scripts/substitute.scm:868 #, scheme-format msgid "TLS error in procedure '~a': ~a~%" msgstr "erro TLS no procedimento \"~a\": ~a~%" -#: guix/scripts/substitute.scm:826 +#: guix/scripts/substitute.scm:879 msgid "" "Usage: guix substitute [OPTION]...\n" "Internal tool to substitute a pre-built binary to a local build.\n" @@ -1281,7 +1381,7 @@ msgstr "" "Ferramenta interna para substituir um binário pré-compilado para\n" "uma compilação local.\n" -#: guix/scripts/substitute.scm:828 +#: guix/scripts/substitute.scm:881 msgid "" "\n" " --query report on the availability of substitutes for the\n" @@ -1292,7 +1392,7 @@ msgstr "" " nomes de arquivos de armazenamento passados na\n" " entrada padrão" -#: guix/scripts/substitute.scm:831 +#: guix/scripts/substitute.scm:884 msgid "" "\n" " --substitute STORE-FILE DESTINATION\n" @@ -1302,21 +1402,28 @@ msgstr "" "\n" " --substitute ARQUIVO-ARMAZENAMENTO DESTINO\n" " baixa ARQUIVO-ARMAZENAMENTO e armazena-o como um\n" -" Nar no arquivo DESTINO" +" Nar no arquivo DESTINO" -#. TRANSLATORS: The second part of this message looks like -#. "(4.1MiB installed)"; it shows the size of the package once -#. installed. -#: guix/scripts/substitute.scm:904 +#: guix/scripts/substitute.scm:949 #, scheme-format -msgid "Downloading ~a~:[~*~; (~a installed)~]...~%" -msgstr "Baixando ~a~:[~*~; (~a instalado)~]...~%" +msgid "no valid substitute for '~a'~%" +msgstr "nenhum substituto válido para \"~a\"~%" -#: guix/scripts/substitute.scm:961 +#: guix/scripts/substitute.scm:956 +#, scheme-format +msgid "Downloading ~a...~%" +msgstr "Baixando ~a...~%" + +#: guix/scripts/substitute.scm:1012 msgid "ACL for archive imports seems to be uninitialized, substitutes may be unavailable\n" msgstr "ACL para importações de pacote parece não estar inicializado, substitutos podem estar indisponíveis\n" -#: guix/scripts/substitute.scm:1057 +#: guix/scripts/substitute.scm:1066 +#, scheme-format +msgid "~a: invalid URI~%" +msgstr "~a: URI inválido~%" + +#: guix/scripts/substitute.scm:1126 #, scheme-format msgid "~a: unrecognized options~%" msgstr "~a: opções desconhecidas~%" @@ -1355,142 +1462,152 @@ msgstr "" msgid "wrong arguments" msgstr "argumentos errados" -#: guix/scripts/system.scm:109 +#: guix/scripts/system.scm:135 #, scheme-format msgid "failed to register '~a' under '~a'~%" msgstr "falha ao registrar \"~a\" sob \"~a\"~%" -#: guix/scripts/system.scm:142 +#: guix/scripts/system.scm:174 #, scheme-format -msgid "failed to install GRUB on device '~a'~%" -msgstr "falha ao instalar GRUB no dispositivo \"~a\"~%" +msgid "failed to install bootloader ~a~%" +msgstr "falha ao instalar carregador de inicialização ~a~%" -#: guix/scripts/system.scm:160 +#: guix/scripts/system.scm:194 #, scheme-format msgid "initializing the current root file system~%" msgstr "inicialização do sistema de arquivos raiz atual~%" -#: guix/scripts/system.scm:174 +#: guix/scripts/system.scm:208 #, scheme-format msgid "not running as 'root', so the ownership of '~a' may be incorrect!~%" msgstr "execução como não \"root\", então o dono de \"~a\" pode estar incorreto!~%" -#: guix/scripts/system.scm:238 +#: guix/scripts/system.scm:253 #, scheme-format msgid "while talking to shepherd: ~a~%" msgstr "enquanto falava com o shepherd: ~a~%" -#: guix/scripts/system.scm:245 +#: guix/scripts/system.scm:260 #, scheme-format msgid "service '~a' could not be found~%" msgstr "o serviço \"~a\" não pôde ser localizado~%" -#: guix/scripts/system.scm:248 +#: guix/scripts/system.scm:263 #, scheme-format msgid "service '~a' does not have an action '~a'~%" msgstr "o serviço \"~a\" não possui uma ação \"~a\"~%" -#: guix/scripts/system.scm:252 +#: guix/scripts/system.scm:267 #, scheme-format msgid "exception caught while executing '~a' on service '~a':~%" msgstr "exceção encontrada ao executar \"~a\" no serviço \"~a\":~%" -#: guix/scripts/system.scm:260 +#: guix/scripts/system.scm:275 #, scheme-format msgid "something went wrong: ~s~%" msgstr "algo deu errado: ~s~%" -#: guix/scripts/system.scm:263 +#: guix/scripts/system.scm:278 #, scheme-format msgid "shepherd error~%" msgstr "erro do shepherd~%" -#: guix/scripts/system.scm:280 +#: guix/scripts/system.scm:295 #, scheme-format msgid "failed to obtain list of shepherd services~%" msgstr "falha ao obter lista de serviços do shepherd~%" -#: guix/scripts/system.scm:300 +#: guix/scripts/system.scm:315 #, scheme-format msgid "unloading service '~a'...~%" msgstr "descarregando serviço \"~a\"...~%" -#: guix/scripts/system.scm:308 +#: guix/scripts/system.scm:323 #, scheme-format msgid "loading new services:~{ ~a~}...~%" msgstr "carregando novos serviços:~{ ~a~}...~%" -#: guix/scripts/system.scm:332 +#: guix/scripts/system.scm:347 #, scheme-format msgid "activating system...~%" msgstr "ativando sistema...~%" # geração, criação? -#: guix/scripts/system.scm:425 +#: guix/scripts/system.scm:423 #, scheme-format msgid "cannot switch to system generation '~a'~%" msgstr "não foi possível alternar para a geração do sistema \"~a\"~%" -#: guix/scripts/system.scm:459 -#, scheme-format -msgid "failed to re-install GRUB configuration file: '~a'~%" -msgstr "falha ao reinstalar o arquivo de configuração do GRUB: \"~a\"~%" - -#: guix/scripts/system.scm:489 +#: guix/scripts/system.scm:494 msgid "the DAG of services" msgstr "o DAG de serviços" -#: guix/scripts/system.scm:502 +#: guix/scripts/system.scm:507 msgid "the dependency graph of shepherd services" msgstr "o gráfico de dependência de serviços do shepherd" -#: guix/scripts/system.scm:526 +#: guix/scripts/system.scm:531 #, scheme-format msgid " file name: ~a~%" msgstr " nome de arquivo: ~a~%" -#: guix/scripts/system.scm:527 +#: guix/scripts/system.scm:532 #, scheme-format msgid " canonical file name: ~a~%" msgstr " nome de arquivo canônico: ~a~%" #. TRANSLATORS: Please preserve the two-space indentation. -#: guix/scripts/system.scm:529 +#: guix/scripts/system.scm:534 #, scheme-format msgid " label: ~a~%" msgstr " rótulo: ~a~%" -#: guix/scripts/system.scm:530 +#: guix/scripts/system.scm:535 +#, scheme-format +msgid " bootloader: ~a~%" +msgstr " carregador de inicialização: ~a~%" + +#: guix/scripts/system.scm:536 #, scheme-format msgid " root device: ~a~%" msgstr " dispositivo raiz: ~a~%" -#: guix/scripts/system.scm:531 +#: guix/scripts/system.scm:540 #, scheme-format msgid " kernel: ~a~%" msgstr " kernel: ~a~%" -#: guix/scripts/system.scm:588 +#: guix/scripts/system.scm:600 +#, scheme-format +msgid "~a: error: file system with label '~a' not found~%" +msgstr "~a: erro: sistema de arquivos com rótulo \"~a\" não localizado~%" + +#: guix/scripts/system.scm:606 +#, scheme-format +msgid "~a: error: file system with UUID '~a' not found~%" +msgstr "~a: erro: sistema de arquivos com UUID \"~a\" não localizado~%" + +#: guix/scripts/system.scm:658 #, scheme-format msgid "~a not found: 'guix pull' was never run~%" msgstr "~a não localizado: \"guix pull\" nunca foi executado~%" -#: guix/scripts/system.scm:589 +#: guix/scripts/system.scm:659 #, scheme-format msgid "Consider running 'guix pull' before 'reconfigure'.~%" msgstr "Considere executar \"guix pull\" antes de \"reconfigure\".~%" -#: guix/scripts/system.scm:590 +#: guix/scripts/system.scm:660 #, scheme-format msgid "Failing to do that may downgrade your system!~%" msgstr "Falhar em fazer isso pode fazer um downgrade de seu sistema!~%" -#: guix/scripts/system.scm:661 +#: guix/scripts/system.scm:767 #, scheme-format msgid "initializing operating system under '~a'...~%" msgstr "inicializando sistema operacional sob \"~a\"...~%" -#: guix/scripts/system.scm:700 +#: guix/scripts/system.scm:812 msgid "" "Usage: guix system [OPTION ...] ACTION [ARG ...] [FILE]\n" "Build the operating system declared in FILE according to ACTION.\n" @@ -1500,63 +1617,67 @@ msgstr "" "Compilação do sistema operacional declarado em ARQUIVO de acordo com AÇÃO.\n" "Algumas AÇÕES fornecem suporte adicional a ARGUMENTOS.\n" -#: guix/scripts/system.scm:704 guix/scripts/container.scm:28 +#: guix/scripts/system.scm:816 guix/scripts/container.scm:28 msgid "The valid values for ACTION are:\n" msgstr "Os valores válidos para AÇÃO são:\n" -#: guix/scripts/system.scm:706 +#: guix/scripts/system.scm:818 +msgid " search search for existing service types\n" +msgstr " search pesquisa por tipos de serviços existentes\n" + +#: guix/scripts/system.scm:820 msgid " reconfigure switch to a new operating system configuration\n" msgstr " reconfigure alterna para configuração de um novo sistema operacional\n" -#: guix/scripts/system.scm:708 +#: guix/scripts/system.scm:822 msgid " roll-back switch to the previous operating system configuration\n" msgstr " roll-back alterna para a configuração de sistema operacional anterior\n" -#: guix/scripts/system.scm:710 +#: guix/scripts/system.scm:824 msgid " switch-generation switch to an existing operating system configuration\n" msgstr " switch-generation alterna para uma configuração de sistema operacional existente\n" -#: guix/scripts/system.scm:712 +#: guix/scripts/system.scm:826 msgid " list-generations list the system generations\n" msgstr " list-generations lista as gerações do sistema\n" -#: guix/scripts/system.scm:714 +#: guix/scripts/system.scm:828 msgid " build build the operating system without installing anything\n" msgstr " build compila o sistema operacional sem instalador nada\n" -#: guix/scripts/system.scm:716 +#: guix/scripts/system.scm:830 msgid " container build a container that shares the host's store\n" msgstr "" " container compila um contêiner que compartilha o armazenamento\n" " da máquina\n" -#: guix/scripts/system.scm:718 +#: guix/scripts/system.scm:832 msgid " vm build a virtual machine image that shares the host's store\n" msgstr "" " vm compila uma imagem de máquina virtual que compartilha\n" " o armazenamento da máquina\n" -#: guix/scripts/system.scm:720 +#: guix/scripts/system.scm:834 msgid " vm-image build a freestanding virtual machine image\n" msgstr " vm-image compila uma imagem de máquina virtual independente\n" -#: guix/scripts/system.scm:722 +#: guix/scripts/system.scm:836 msgid " disk-image build a disk image, suitable for a USB stick\n" msgstr " disk-image compila uma imagem de disco, adequada para pendrive USB\n" -#: guix/scripts/system.scm:724 +#: guix/scripts/system.scm:838 msgid " init initialize a root file system to run GNU\n" msgstr " init inicializa um sistema de arquivos raiz para executar GNU\n" -#: guix/scripts/system.scm:726 +#: guix/scripts/system.scm:840 msgid " extension-graph emit the service extension graph in Dot format\n" msgstr " extension-graph emite o gráfico da extensão de serviço no formato Dot\n" -#: guix/scripts/system.scm:728 +#: guix/scripts/system.scm:842 msgid " shepherd-graph emit the graph of shepherd services in Dot format\n" msgstr " shepherd-graph emite o gráfico de serviços do shepherd no formato Dot\n" -#: guix/scripts/system.scm:732 +#: guix/scripts/system.scm:846 msgid "" "\n" " -d, --derivation return the derivation of the given system" @@ -1564,7 +1685,7 @@ msgstr "" "\n" " -d, --derivation retorna a derivação do sistema dado" -#: guix/scripts/system.scm:734 +#: guix/scripts/system.scm:848 msgid "" "\n" " --on-error=STRATEGY\n" @@ -1574,7 +1695,19 @@ msgstr "" " --on-error=ESTRATÉGIA\n" " aplica ESTRATÉGIA ao ocorrer um erro ao ler ARQUIVO" -#: guix/scripts/system.scm:737 +#: guix/scripts/system.scm:851 +msgid "" +"\n" +" --file-system-type=TYPE\n" +" for 'disk-image', produce a root file system of TYPE\n" +" (one of 'ext4', 'iso9660')" +msgstr "" +"\n" +" --file-system-type=TIPO\n" +" para \"disk-image\", produz um sistema de arquivos\n" +" raiz do TIPO (um entre \"ext4\", \"iso9660\")" + +#: guix/scripts/system.scm:855 msgid "" "\n" " --image-size=SIZE for 'vm-image', produce an image of SIZE" @@ -1582,15 +1715,15 @@ msgstr "" "\n" " --image-size=TAM para \"vm-image\", produz uma imagem de TAM" -#: guix/scripts/system.scm:739 +#: guix/scripts/system.scm:857 msgid "" "\n" -" --no-grub for 'init', do not install GRUB" +" --no-bootloader for 'init', do not install a bootloader" msgstr "" "\n" -" --no-grub para \"init\", não instala GRUB" +" --no-bootloader para \"init\", não instala um carregador de inic." -#: guix/scripts/system.scm:741 +#: guix/scripts/system.scm:859 msgid "" "\n" " --share=SPEC for 'vm', share host file system according to SPEC" @@ -1599,7 +1732,20 @@ msgstr "" " --share=ESPEC para \"vm\", compartilha o sistema de arquivos do\n" " hospedeiro de acordo com ESPEC" -#: guix/scripts/system.scm:743 +#: guix/scripts/system.scm:861 +msgid "" +"\n" +" -r, --root=FILE for 'vm', 'vm-image', 'disk-image', 'container',\n" +" and 'build', make FILE a symlink to the result, and\n" +" register it as a garbage collector root" +msgstr "" +"\n" +" -r, --root=ARQUIVO para \"vm\", \"vm-image\", \"disk-image\", \"container\",\n" +" e \"build\", faz do ARQUIVO um link simbólico para\n" +" o resultado e o registra, como um coletor de lixo\n" +" central" + +#: guix/scripts/system.scm:865 msgid "" "\n" " --expose=SPEC for 'vm', expose host file system according to SPEC" @@ -1608,7 +1754,7 @@ msgstr "" " --expose=ESPEC para \"vm\", expõe o sistema de arquivos do\n" " hospedeiro de acordo com ESPEC" -#: guix/scripts/system.scm:745 +#: guix/scripts/system.scm:867 msgid "" "\n" " --full-boot for 'vm', make a full boot sequence" @@ -1617,45 +1763,49 @@ msgstr "" " --full-boot para \"vm\", faz uma sequência completa de\n" " inicialização" -#: guix/scripts/system.scm:830 +#: guix/scripts/system.scm:959 #, scheme-format msgid "no configuration file specified~%" msgstr "nenhum arquivo de configuração especificado~%" -#: guix/scripts/system.scm:912 +#: guix/scripts/system.scm:1057 #, scheme-format msgid "~a: unknown action~%" msgstr "~a: ação desconhecida~%" -#: guix/scripts/system.scm:927 +#: guix/scripts/system.scm:1072 #, scheme-format msgid "wrong number of arguments for action '~a'~%" msgstr "número errado de argumentos para a ação \"~a\"~%" -#: guix/scripts/system.scm:932 +#: guix/scripts/system.scm:1077 #, scheme-format msgid "guix system: missing command name~%" msgstr "guix system: faltando um nome de comando~%" -#: guix/scripts/system.scm:934 +#: guix/scripts/system.scm:1079 #, scheme-format msgid "Try 'guix system --help' for more information.~%" msgstr "Tente \"guix system --help\" para mais informações.~%" -#: guix/scripts/lint.scm:133 +#: guix/scripts/system/search.scm:64 guix/ui.scm:1057 guix/ui.scm:1071 +msgid "unknown" +msgstr "desconhecido" + +#: guix/scripts/lint.scm:138 #, scheme-format msgid "Available checkers:~%" msgstr "Verificadores disponíveis:~%" -#: guix/scripts/lint.scm:157 +#: guix/scripts/lint.scm:162 msgid "description should not be empty" msgstr "a descrição deve não estar vazia" -#: guix/scripts/lint.scm:167 +#: guix/scripts/lint.scm:172 msgid "Texinfo markup in description is invalid" -msgstr "Marcação Texinfo na descrição é inválida" +msgstr "a marcação Texinfo na descrição é inválida" -#: guix/scripts/lint.scm:177 +#: guix/scripts/lint.scm:182 #, scheme-format msgid "" "description should not contain ~\n" @@ -1666,15 +1816,15 @@ msgstr "" #. TRANSLATORS: '@code' is Texinfo markup and must be kept #. as is. -#: guix/scripts/lint.scm:190 +#: guix/scripts/lint.scm:195 msgid "use @code or similar ornament instead of quotes" msgstr "use @code ou ornamento similar em vez de aspas" -#: guix/scripts/lint.scm:197 +#: guix/scripts/lint.scm:202 msgid "description should start with an upper-case letter or digit" msgstr "a descrição deve iniciar com uma letra maiúscula ou dígito" -#: guix/scripts/lint.scm:213 +#: guix/scripts/lint.scm:218 #, scheme-format msgid "" "sentences in description should be followed ~\n" @@ -1683,225 +1833,256 @@ msgstr "" "sentenças nas descrição devem ser seguidas ~\n" "por dois espaços; possível infração~p em ~{~a~^, ~}" -#: guix/scripts/lint.scm:231 +#: guix/scripts/lint.scm:236 #, scheme-format msgid "invalid description: ~s" msgstr "a descrição inválida: ~s" -#: guix/scripts/lint.scm:256 +#: guix/scripts/lint.scm:281 #, scheme-format msgid "'~a' should probably be a native input" msgstr "\"~a\" provavelmente é uma entrada nativa" -#: guix/scripts/lint.scm:280 +#: guix/scripts/lint.scm:297 #, scheme-format msgid "'~a' should probably not be an input at all" msgstr "\"~a\" provavelmente deve não ser uma entrada" -#: guix/scripts/lint.scm:306 +#: guix/scripts/lint.scm:314 msgid "synopsis should not be empty" msgstr "a sinopse deve não estar vazia" -#: guix/scripts/lint.scm:314 +#: guix/scripts/lint.scm:322 msgid "no period allowed at the end of the synopsis" msgstr "nenhum ponto permitido ao final da sinopse" -#: guix/scripts/lint.scm:326 +#: guix/scripts/lint.scm:334 msgid "no article allowed at the beginning of the synopsis" msgstr "nenhum artigo permitido no início da sinopse" -#: guix/scripts/lint.scm:333 +#: guix/scripts/lint.scm:341 msgid "synopsis should be less than 80 characters long" msgstr "a sinopse deve ser menor que 80 caracteres" -#: guix/scripts/lint.scm:339 +#: guix/scripts/lint.scm:347 msgid "synopsis should start with an upper-case letter or digit" msgstr "a sinopse deve iniciar com uma letra maiúscula ou dígito" -#: guix/scripts/lint.scm:346 +#: guix/scripts/lint.scm:354 msgid "synopsis should not start with the package name" msgstr "a sinopse deve não iniciar com o nome do pacote" -#: guix/scripts/lint.scm:360 +#: guix/scripts/lint.scm:364 +msgid "Texinfo markup in synopsis is invalid" +msgstr "Marcação Texinfo na sinopse é inválida" + +#: guix/scripts/lint.scm:383 #, scheme-format msgid "invalid synopsis: ~s" msgstr "sinopse inválida: ~s" -#: guix/scripts/lint.scm:459 +#: guix/scripts/lint.scm:502 #, scheme-format msgid "URI ~a returned suspiciously small file (~a bytes)" msgstr "a URI ~a retornou um arquivo suspeitosamente pequeno (~a bytes)" -#: guix/scripts/lint.scm:468 guix/scripts/lint.scm:480 +#: guix/scripts/lint.scm:512 +#, scheme-format +msgid "permanent redirect from ~a to ~a" +msgstr "redirecionamento permanente de ~a para ~a" + +#: guix/scripts/lint.scm:519 +#, scheme-format +msgid "invalid permanent redirect from ~a" +msgstr "redirecionamento permanente inválido de ~a" + +#: guix/scripts/lint.scm:526 guix/scripts/lint.scm:538 #, scheme-format msgid "URI ~a not reachable: ~a (~s)" msgstr "a URI ~a não é alcançável: ~a (~s)" -#: guix/scripts/lint.scm:487 +#: guix/scripts/lint.scm:545 #, scheme-format msgid "URI ~a domain not found: ~a" msgstr "o domínio da URI ~a não foi localizado: ~a" -#: guix/scripts/lint.scm:495 +#: guix/scripts/lint.scm:553 #, scheme-format msgid "URI ~a unreachable: ~a" msgstr "URI ~a inalcançável: ~a" -#: guix/scripts/lint.scm:504 guix/scripts/lint.scm:761 +#: guix/scripts/lint.scm:562 #, scheme-format msgid "TLS certificate error: ~a" msgstr "erro de certificado TLS: ~a" -#: guix/scripts/lint.scm:525 +#: guix/scripts/lint.scm:583 msgid "invalid value for home page" msgstr "valor inválido para página inicial" -#: guix/scripts/lint.scm:528 +#: guix/scripts/lint.scm:586 #, scheme-format msgid "invalid home page URL: ~s" msgstr "URL de página inicial inválida: ~s" -#: guix/scripts/lint.scm:548 +#: guix/scripts/lint.scm:606 msgid "file names of patches should start with the package name" msgstr "nomes de arquivos de patches devem iniciar com o nome do pacote" -#: guix/scripts/lint.scm:587 +#: guix/scripts/lint.scm:644 #, scheme-format msgid "~a: ~a: proposed synopsis: ~s~%" msgstr "~a: ~a: sinopse proposta: ~s~%" -#: guix/scripts/lint.scm:600 +#: guix/scripts/lint.scm:657 #, scheme-format msgid "~a: ~a: proposed description:~% \"~a\"~%" msgstr "~a: ~a: descrição proposta:~% \"~a\"~%" -#: guix/scripts/lint.scm:642 +#: guix/scripts/lint.scm:699 msgid "all the source URIs are unreachable:" msgstr "todas as URIs fontes estão inalcançáveis:" -#: guix/scripts/lint.scm:665 +#: guix/scripts/lint.scm:721 msgid "the source file name should contain the package name" msgstr "o nome de arquivo fonte deve conter o nome do pacote" -#: guix/scripts/lint.scm:681 +#: guix/scripts/lint.scm:737 #, scheme-format msgid "URL should be 'mirror://~a/~a'" msgstr "a URL deve ser \"mirror://~a/~a\"" -#: guix/scripts/lint.scm:699 guix/scripts/lint.scm:703 +#: guix/scripts/lint.scm:755 guix/scripts/lint.scm:759 #, scheme-format msgid "failed to create derivation: ~a" msgstr "falha ao criar a derivação: ~a" -#: guix/scripts/lint.scm:717 +#: guix/scripts/lint.scm:773 #, scheme-format msgid "failed to create derivation: ~s~%" msgstr "falha ao criar a derivação: ~s~%" -#: guix/scripts/lint.scm:727 +#: guix/scripts/lint.scm:783 msgid "invalid license field" msgstr "campo de licença inválido" -#: guix/scripts/lint.scm:744 +#: guix/scripts/lint.scm:799 #, scheme-format -msgid "failed to retrieve CVE vulnerabilities from ~s: ~a (~s)~%" -msgstr "falha ao obter vulnerabilidades CVE de ~s: ~a (~s)~%" +msgid "~a: HTTP GET error for ~a: ~a (~s)~%" +msgstr "~a: erro HTTP GET para ~a: ~a (~s)~%" -#: guix/scripts/lint.scm:749 guix/scripts/lint.scm:758 -#: guix/scripts/lint.scm:763 +#: guix/scripts/lint.scm:809 #, scheme-format -msgid "assuming no CVE vulnerabilities~%" -msgstr "presumindo haver nenhuma vulnerabilidade CVE~%" +msgid "~a: host lookup failure: ~a~%" +msgstr "~a: falha ao procurar o host: ~a~%" -#: guix/scripts/lint.scm:756 +#: guix/scripts/lint.scm:814 #, scheme-format -msgid "failed to lookup NIST host: ~a~%" -msgstr "falha ao procurar o servidor do NIST: ~a~%" +msgid "~a: TLS certificate error: ~a" +msgstr "~a: erro de certificado TLS: ~a" + +#: guix/scripts/lint.scm:829 +msgid "while retrieving CVE vulnerabilities" +msgstr "ao obter vulnerabilidades CVE" -#: guix/scripts/lint.scm:801 +#: guix/scripts/lint.scm:866 #, scheme-format msgid "probably vulnerable to ~a" msgstr "provavelmente vulnerável a ~a" -#: guix/scripts/lint.scm:816 +#: guix/scripts/lint.scm:873 +#, scheme-format +msgid "while retrieving upstream info for '~a'" +msgstr "ao obter informações do upstream para \"~a\"" + +#: guix/scripts/lint.scm:881 +#, scheme-format +msgid "can be upgraded to ~a" +msgstr "pode ser atualizado para ~a" + +#: guix/scripts/lint.scm:896 #, scheme-format msgid "tabulation on line ~a, column ~a" msgstr "tabulação na linha ~a, coluna ~a" -#: guix/scripts/lint.scm:825 +#: guix/scripts/lint.scm:905 #, scheme-format msgid "trailing white space on line ~a" msgstr "espaço ao final da linha ~a" -#: guix/scripts/lint.scm:835 +#: guix/scripts/lint.scm:915 #, scheme-format msgid "line ~a is way too long (~a characters)" msgstr "a linha ~a está grande demais (~a caracteres)" -#: guix/scripts/lint.scm:846 +#: guix/scripts/lint.scm:926 #, scheme-format msgid "line ~a: parentheses feel lonely, move to the previous or next line" msgstr "linha ~a: parênteses está solitário, mova-o para a linha anterior ou a seguinte" -#: guix/scripts/lint.scm:901 +#: guix/scripts/lint.scm:996 msgid "Validate package descriptions" msgstr "Valida descrições dos pacotes" -#: guix/scripts/lint.scm:905 +#: guix/scripts/lint.scm:1000 msgid "Validate synopsis & description of GNU packages" msgstr "Valida sinopse & descrição de pacotes GNU" -#: guix/scripts/lint.scm:909 +#: guix/scripts/lint.scm:1004 msgid "Identify inputs that should be native inputs" msgstr "Identifica entradas que devem ser nativas" -#: guix/scripts/lint.scm:913 +#: guix/scripts/lint.scm:1008 msgid "Identify inputs that should be inputs at all" msgstr "Identifica entradas que devem ser entradas" -#: guix/scripts/lint.scm:917 +#: guix/scripts/lint.scm:1012 msgid "Validate file names and availability of patches" msgstr "Valida nomes de arquivos e disponibilidade de patches" -#: guix/scripts/lint.scm:921 +#: guix/scripts/lint.scm:1016 msgid "Validate home-page URLs" msgstr "Valida URLs de site" #. TRANSLATORS: is the name of a data type and must not be #. translated. -#: guix/scripts/lint.scm:927 +#: guix/scripts/lint.scm:1022 msgid "Make sure the 'license' field is a or a list thereof" msgstr "Certifica que o campo \"license\" é um ou uma lista disto" -#: guix/scripts/lint.scm:932 +#: guix/scripts/lint.scm:1027 msgid "Validate source URLs" msgstr "Valida URLs fonte" -#: guix/scripts/lint.scm:936 +#: guix/scripts/lint.scm:1031 msgid "Suggest 'mirror://' URLs" msgstr "Sugere URLs \"mirror://\"" -#: guix/scripts/lint.scm:940 +#: guix/scripts/lint.scm:1035 msgid "Validate file names of sources" msgstr "Valida nomes de arquivos dos fontes" -#: guix/scripts/lint.scm:944 +#: guix/scripts/lint.scm:1039 msgid "Report failure to compile a package to a derivation" msgstr "Relata falha ao compilar um pacote para uma derivação" -#: guix/scripts/lint.scm:948 +#: guix/scripts/lint.scm:1043 msgid "Validate package synopses" msgstr "Valida sinopses do pacotes" -#: guix/scripts/lint.scm:952 +#: guix/scripts/lint.scm:1047 msgid "Check the Common Vulnerabilities and Exposures (CVE) database" msgstr "Verifica o banco de dados de Vulnerabilidades e Exposições Comuns (CVE)" -#: guix/scripts/lint.scm:957 +#: guix/scripts/lint.scm:1052 +msgid "Check the package for new upstream releases" +msgstr "Verifica o pacote por novos lançamentos do upstream" + +#: guix/scripts/lint.scm:1056 msgid "Look for formatting issues in the source" msgstr "Procura por problemas de formatação no fonte" -#: guix/scripts/lint.scm:985 +#: guix/scripts/lint.scm:1084 msgid "" "Usage: guix lint [OPTION]... [PACKAGE]...\n" "Run a set of checkers on the specified package; if none is specified,\n" @@ -1911,7 +2092,7 @@ msgstr "" "Executa uma série de verificadores no pacote especificado; se nenhum\n" "for especificado, executa-os em todos pacote.\n" -#: guix/scripts/lint.scm:988 +#: guix/scripts/lint.scm:1087 msgid "" "\n" " -c, --checkers=CHECKER1,CHECKER2...\n" @@ -1921,7 +2102,7 @@ msgstr "" " -c, --checkers=CHECKER1,CHECKER2...\n" " executa apenas os verificadores especificados" -#: guix/scripts/lint.scm:993 +#: guix/scripts/lint.scm:1092 msgid "" "\n" " -l, --list-checkers display the list of available lint checkers" @@ -1929,12 +2110,12 @@ msgstr "" "\n" " -l, --list-checkers exibe a lista de verificações lint disponíveis" -#: guix/scripts/lint.scm:1013 +#: guix/scripts/lint.scm:1112 #, scheme-format msgid "~a: invalid checker~%" msgstr "~a: verificador inválido~%" -#: guix/scripts/publish.scm:58 +#: guix/scripts/publish.scm:68 #, scheme-format msgid "" "Usage: guix publish [OPTION]...\n" @@ -1943,15 +2124,15 @@ msgstr "" "Uso: guix publish [OPÇÃO]...\n" "Publica ~a por HTTP.\n" -#: guix/scripts/publish.scm:60 +#: guix/scripts/publish.scm:70 msgid "" "\n" " -p, --port=PORT listen on PORT" msgstr "" "\n" -" -p, --port=PORTA Ouve na PORTA" +" -p, --port=PORTA ouve na PORTA" -#: guix/scripts/publish.scm:62 +#: guix/scripts/publish.scm:72 msgid "" "\n" " --listen=HOST listen on the network interface for HOST" @@ -1959,7 +2140,7 @@ msgstr "" "\n" " --listen=MÁQUINA ouve na interface de rede pela MÁQUINA" -#: guix/scripts/publish.scm:64 +#: guix/scripts/publish.scm:74 msgid "" "\n" " -u, --user=USER change privileges to USER as soon as possible" @@ -1967,7 +2148,7 @@ msgstr "" "\n" " -u, --user=USUÁRIO altera privilégios para o USUÁRIO assim que possível" -#: guix/scripts/publish.scm:66 +#: guix/scripts/publish.scm:76 msgid "" "\n" " -C, --compression[=LEVEL]\n" @@ -1977,8 +2158,24 @@ msgstr "" " -C, --compression[=NÍVEL]\n" " comprime pacotes no NÍVEL" +#: guix/scripts/publish.scm:79 +msgid "" +"\n" +" -c, --cache=DIRECTORY cache published items to DIRECTORY" +msgstr "" +"\n" +" -c, --cache=DIRETÓRIO itens de cache publicados para DIRETÓRIO" + +#: guix/scripts/publish.scm:81 +msgid "" +"\n" +" --workers=N use N workers to bake items" +msgstr "" +"\n" +" --workers=N usa N trabalhos para preparar itens" + # Abreviei segundos para a linha caber em 80 caracteres -- Rafael -#: guix/scripts/publish.scm:69 +#: guix/scripts/publish.scm:83 msgid "" "\n" " --ttl=TTL announce narinfos can be cached for TTL seconds" @@ -1986,7 +2183,31 @@ msgstr "" "\n" " --ttl=TTL anuncia que narinfos podem usar cache por TTL segs." -#: guix/scripts/publish.scm:71 +#: guix/scripts/publish.scm:85 +msgid "" +"\n" +" --nar-path=PATH use PATH as the prefix for nar URLs" +msgstr "" +"\n" +" --nar-path=CAMINHO usa CAMINHO como o prefixo para URLs nar" + +#: guix/scripts/publish.scm:87 +msgid "" +"\n" +" --public-key=FILE use FILE as the public key for signatures" +msgstr "" +"\n" +" --public-key=ARQUIVO usa ARQUIVO como chave pública para assinaturas" + +#: guix/scripts/publish.scm:89 +msgid "" +"\n" +" --private-key=FILE use FILE as the private key for signatures" +msgstr "" +"\n" +" --private-key=ARQUIVO usa ARQUIVO como chave privada para assinaturas" + +#: guix/scripts/publish.scm:91 msgid "" "\n" " -r, --repl[=PORT] spawn REPL server on PORT" @@ -1994,37 +2215,37 @@ msgstr "" "\n" " -r, --repl[=PORTA] faz um servidor de REPL na PORTA" -#: guix/scripts/publish.scm:87 +#: guix/scripts/publish.scm:107 #, scheme-format msgid "lookup of host '~a' failed: ~a~%" msgstr "a procura da máquina \"~a\" falhou: ~a~%" -#: guix/scripts/publish.scm:125 +#: guix/scripts/publish.scm:152 #, scheme-format msgid "lookup of host '~a' returned nothing" msgstr "a procura da máquina \"~a\" retornou nada" -#: guix/scripts/publish.scm:138 +#: guix/scripts/publish.scm:165 #, scheme-format msgid "zlib support is missing; compression disabled~%" msgstr "suporte a zlib está faltando; compressão desabilitada~%" -#: guix/scripts/publish.scm:145 +#: guix/scripts/publish.scm:179 #, scheme-format msgid "~a: invalid duration~%" msgstr "~a: duração inválida~%" -#: guix/scripts/publish.scm:544 +#: guix/scripts/publish.scm:832 #, scheme-format msgid "user '~a' not found: ~a~%" msgstr "usuário \"~a\" não localizado: ~a~%" -#: guix/scripts/publish.scm:581 +#: guix/scripts/publish.scm:873 #, scheme-format msgid "server running as root; consider using the '--user' option!~%" msgstr "servidor executado como root; considere usar a opção \"--user\"!~%" -#: guix/scripts/publish.scm:583 +#: guix/scripts/publish.scm:878 #, scheme-format msgid "publishing ~a on ~a, port ~d~%" msgstr "publicando ~a em ~a, porta ~d~%" @@ -2057,19 +2278,19 @@ msgstr "falha ao iniciar \"~a\": ~a~%" msgid "no available substitute information for '~a'~%" msgstr "nenhuma informação de substituto disponível para \"~a\"~%" -#: guix/scripts/size.scm:85 +#: guix/scripts/size.scm:99 msgid "store item" msgstr "item do armazenamento" -#: guix/scripts/size.scm:85 +#: guix/scripts/size.scm:99 msgid "total" msgstr "total" -#: guix/scripts/size.scm:85 +#: guix/scripts/size.scm:99 msgid "self" msgstr "próprio" -#: guix/scripts/size.scm:96 +#: guix/scripts/size.scm:107 #, scheme-format msgid "total: ~,1f MiB~%" msgstr "total: ~,1f MB~%" @@ -2077,27 +2298,36 @@ msgstr "total: ~,1f MB~%" #. TRANSLATORS: This is the title of a graph, meaning that the graph #. represents a profile of the store (the "store" being the place where #. packages are stored.) -#: guix/scripts/size.scm:209 +#: guix/scripts/size.scm:221 msgid "store profile" msgstr "perfil do armazenamento" -#: guix/scripts/size.scm:218 +#: guix/scripts/size.scm:230 msgid "" "Usage: guix size [OPTION]... PACKAGE\n" "Report the size of PACKAGE and its dependencies.\n" msgstr "" -"Uso: guix size [OPÇÃO]... PACOTES...\n" +"Uso: guix size [OPÇÃO]... PACOTE...\n" "Relata o tamanho do PACOTE e suas dependências.\n" -#: guix/scripts/size.scm:223 +#: guix/scripts/size.scm:235 msgid "" "\n" " -s, --system=SYSTEM consider packages for SYSTEM--e.g., \"i686-linux\"" msgstr "" "\n" -" -s, --system=SISTEMA considera pacotes para SISTEMA (ex.: \"i686-linux\")" +" -s, --system=SISTEMA considera pacotes para SISTEMA--ex.: \"i686-linux\"" + +#. TRANSLATORS: "closure" and "self" must not be translated. +#: guix/scripts/size.scm:238 +msgid "" +"\n" +" --sort=KEY sort according to KEY--\"closure\" or \"self\"" +msgstr "" +"\n" +" --sort=CHAVE ordena conforme a CHAVE--\"closure\" ou \"self\"" -#: guix/scripts/size.scm:225 +#: guix/scripts/size.scm:240 msgid "" "\n" " -m, --map-file=FILE write to FILE a graphical map of disk usage" @@ -2105,93 +2335,102 @@ msgstr "" "\n" " -m, --map-file=ARQUIVO escreve para ARQUIVO um mapa gráfico do uso do disco" -#: guix/scripts/size.scm:279 +#: guix/scripts/size.scm:271 +#, scheme-format +msgid "~a: invalid sorting key~%" +msgstr "~a: chave de ordenação inválida~%" + +#: guix/scripts/size.scm:306 msgid "missing store item argument\n" msgstr "faltando argumento de item do armazenamento\n" -#: guix/scripts/graph.scm:83 +#: guix/scripts/graph.scm:84 #, scheme-format msgid "~a: invalid argument (package name expected)" msgstr "~a: argumento inválido (esperava-se nome de pacote)" -#: guix/scripts/graph.scm:94 +#: guix/scripts/graph.scm:95 msgid "the DAG of packages, excluding implicit inputs" msgstr "o DAG dos pacotes, excluindo entradas implícitas" -#: guix/scripts/graph.scm:151 +#: guix/scripts/graph.scm:121 +msgid "the reverse DAG of packages" +msgstr "o DAG reverso de pacotes" + +#: guix/scripts/graph.scm:171 msgid "the DAG of packages, including implicit inputs" msgstr "o DAG dos pacotes, incluindo entradas implícitas" -#: guix/scripts/graph.scm:161 +#: guix/scripts/graph.scm:181 msgid "the DAG of packages and origins, including implicit inputs" msgstr "o DAG dos pacotes e origens, incluindo entradas implícitas" -#: guix/scripts/graph.scm:192 +#: guix/scripts/graph.scm:211 msgid "same as 'bag', but without the bootstrap nodes" msgstr "mesmo que \"bag\", mas sem o nós de inicialização" -#: guix/scripts/graph.scm:238 +#: guix/scripts/graph.scm:253 msgid "the DAG of derivations" msgstr "o DAG de derivações" -#: guix/scripts/graph.scm:250 +#: guix/scripts/graph.scm:265 msgid "unsupported argument for derivation graph" msgstr "sem suporte ao argumento para gráfico de derivação" -#: guix/scripts/graph.scm:276 +#: guix/scripts/graph.scm:291 msgid "unsupported argument for this type of graph" msgstr "sem suporte ao argumento para esse tipo de gráfico" -#: guix/scripts/graph.scm:289 +#: guix/scripts/graph.scm:304 #, scheme-format msgid "references for '~a' are not known~%" msgstr "referências para \"~a\" não são conhecidas~%" -#: guix/scripts/graph.scm:296 +#: guix/scripts/graph.scm:311 msgid "the DAG of run-time dependencies (store references)" msgstr "o DAG de dependências de tempo real (referências de armazenamento)" -#: guix/scripts/graph.scm:312 +#: guix/scripts/graph.scm:327 msgid "the DAG of referrers in the store" msgstr "o DAG de referências no armazenamento" -#: guix/scripts/graph.scm:338 +#: guix/scripts/graph.scm:354 #, scheme-format msgid "~a: unknown node type~%" msgstr "~a: tipo de nó desconhecido~%" -#: guix/scripts/graph.scm:345 +#: guix/scripts/graph.scm:361 #, scheme-format msgid "~a: unknown backend~%" msgstr "~a: backend desconhecido~%" -#: guix/scripts/graph.scm:349 +#: guix/scripts/graph.scm:365 msgid "The available node types are:\n" msgstr "Os tipos de nós disponíveis são:\n" -#: guix/scripts/graph.scm:359 +#: guix/scripts/graph.scm:375 msgid "The available backend types are:\n" msgstr "Os tipos de backends disponíveis são:\n" #. TRANSLATORS: Here 'dot' is the name of a program; it must not be #. translated. -#: guix/scripts/graph.scm:403 +#: guix/scripts/graph.scm:419 msgid "" "Usage: guix graph PACKAGE...\n" -"Emit a Graphviz (dot) representation of the dependencies of PACKAGE...\n" +"Emit a representation of the dependency graph of PACKAGE...\n" msgstr "" "Uso: guix graph PACOTE...\n" -"Emite uma representação em Graphviz (dot) das dependências do PACOTE...\n" +"Emite uma representação do gráfico de dependências do PACOTE...\n" -#: guix/scripts/graph.scm:405 +#: guix/scripts/graph.scm:421 msgid "" "\n" " -b, --backend=TYPE produce a graph with the given backend TYPE" msgstr "" "\n" -" -b, --backend=TIPO produz um grafo com backend do tipo TIPO" +" -b, --backend=TIPO produz um grafo com backend do TIPO" -#: guix/scripts/graph.scm:407 +#: guix/scripts/graph.scm:423 msgid "" "\n" " --list-backends list the available graph backends" @@ -2199,7 +2438,7 @@ msgstr "" "\n" " --list-backends lista os backends de gráficos disponíveis" -#: guix/scripts/graph.scm:409 +#: guix/scripts/graph.scm:425 msgid "" "\n" " -t, --type=TYPE represent nodes of the given TYPE" @@ -2207,7 +2446,7 @@ msgstr "" "\n" " -t, --type=TIPO representa nós do TIPO dado" -#: guix/scripts/graph.scm:411 +#: guix/scripts/graph.scm:427 msgid "" "\n" " --list-types list the available graph types" @@ -2215,7 +2454,7 @@ msgstr "" "\n" " --list-types lista os tipos de gráficos disponíveis" -#: guix/scripts/graph.scm:413 +#: guix/scripts/graph.scm:429 guix/scripts/pack.scm:336 msgid "" "\n" " -e, --expression=EXPR consider the package EXPR evaluates to" @@ -2223,42 +2462,58 @@ msgstr "" "\n" " -e, --expression=EXPR considera o pacote que EXPR corresponder" -#: guix/scripts/challenge.scm:105 +#: guix/scripts/challenge.scm:191 #, scheme-format -msgid "~a: no substitute at '~a'~%" -msgstr "~a: nenhum substituto em \"~a\"'~%" +msgid " local hash: ~a~%" +msgstr " hash local: ~a~%" -#: guix/scripts/challenge.scm:121 +#: guix/scripts/challenge.scm:192 #, scheme-format -msgid "no substitutes for '~a'~%" -msgstr "nenhum substituto para \"~a\"'~%" +msgid " no local build for '~a'~%" +msgstr " nenhuma compilação local para \"~a\"~%" -#: guix/scripts/challenge.scm:138 guix/scripts/challenge.scm:158 +#: guix/scripts/challenge.scm:194 #, scheme-format -msgid "no local build for '~a'~%" -msgstr "nenhuma compilação local para \"~a\"~%" +msgid " ~50a: ~a~%" +msgstr " ~50a: ~a~%" -#: guix/scripts/challenge.scm:155 +#: guix/scripts/challenge.scm:202 #, scheme-format msgid "~a contents differ:~%" -msgstr "conteúdo de ~a diverge:~%" +msgstr "conteúdo de ~a diverge:~%" -#: guix/scripts/challenge.scm:157 +#: guix/scripts/challenge.scm:205 #, scheme-format -msgid " local hash: ~a~%" -msgstr " hash local: ~a~%" +msgid "could not challenge '~a': no local build~%" +msgstr "não foi possível desafiar \"~a\": nenhuma compilação local~%" -#: guix/scripts/challenge.scm:162 +#: guix/scripts/challenge.scm:207 #, scheme-format -msgid " ~50a: ~a~%" -msgstr " ~50a: ~a~%" +msgid "could not challenge '~a': no substitutes~%" +msgstr "não foi possível desafiar \"~a\": nenhum substituto~%" -#: guix/scripts/challenge.scm:166 +#: guix/scripts/challenge.scm:210 #, scheme-format -msgid " ~50a: unavailable~%" -msgstr " ~50a: indisponível~%" +msgid "~a contents match:~%" +msgstr "conteúdo de ~a corresponde:~%" + +#: guix/scripts/challenge.scm:219 +msgid "~h store items were analyzed:~%" +msgstr "~h itens de armazenamento foram analisados:~%" -#: guix/scripts/challenge.scm:176 +#: guix/scripts/challenge.scm:220 +msgid " - ~h (~,1f%) were identical~%" +msgstr " - ~h (~,1f%) eram idênticos~%" + +#: guix/scripts/challenge.scm:222 +msgid " - ~h (~,1f%) differed~%" +msgstr " - ~h (~,1f%) divergiram~%" + +#: guix/scripts/challenge.scm:224 +msgid " - ~h (~,1f%) were inconclusive~%" +msgstr " - ~h (~,1f%) foram inconclusivos~%" + +#: guix/scripts/challenge.scm:233 msgid "" "Usage: guix challenge [PACKAGE...]\n" "Challenge the substitutes for PACKAGE... provided by one or more servers.\n" @@ -2266,7 +2521,7 @@ msgstr "" "Uso: guix challenge [PACOTE...]\n" "Compara os substitutos por PACOTE... fornecido por um ou mais servidores.\n" -#: guix/scripts/challenge.scm:178 +#: guix/scripts/challenge.scm:235 msgid "" "\n" " --substitute-urls=URLS\n" @@ -2276,23 +2531,205 @@ msgstr "" " --substitute-urls=URLS\n" " compara resultados da compilação com os de URLS" -#: guix/gnu-maintenance.scm:555 +#: guix/scripts/challenge.scm:238 +msgid "" +"\n" +" -v, --verbose show details about successful comparisons" +msgstr "" +"\n" +" -v, --verbose mostra detalhes sobre comparações bem-sucedidas" + +#: guix/scripts/copy.scm:59 +#, scheme-format +msgid "~a: invalid TCP port number~%" +msgstr "~a: número de porta TCP inválido~%" + +#: guix/scripts/copy.scm:61 +#, scheme-format +msgid "~a: invalid SSH specification~%" +msgstr "~a: especificação SSH inválida~%" + +#: guix/scripts/copy.scm:113 +msgid "" +"Usage: guix copy [OPTION]... ITEMS...\n" +"Copy ITEMS to or from the specified host over SSH.\n" +msgstr "" +"Uso: guix copy [OPÇÃO]... ITENS...\n" +"Copia ITENS para ou da máquina especificada por SSH.\n" + +#: guix/scripts/copy.scm:115 +msgid "" +"\n" +" --to=HOST send ITEMS to HOST" +msgstr "" +"\n" +" --to=MÁQUINA envia ITENS para MÁQUINA" + +#: guix/scripts/copy.scm:117 +msgid "" +"\n" +" --from=HOST receive ITEMS from HOST" +msgstr "" +"\n" +" --from=MÁQUINA recebe ITENS da MÁQUINA" + +#: guix/scripts/copy.scm:168 +#, scheme-format +msgid "use '--to' or '--from'~%" +msgstr "use \"--to\" ou \"--from\"~%" + +#: guix/scripts/pack.scm:76 +#, scheme-format +msgid "~a: compressor not found~%" +msgstr "~a: compressor não encontrado~%" + +#: guix/scripts/pack.scm:318 +#, scheme-format +msgid "~a: invalid symlink specification~%" +msgstr "~a: especificação de link simbólico inválida~%" + +#: guix/scripts/pack.scm:328 +msgid "" +"Usage: guix pack [OPTION]... PACKAGE...\n" +"Create a bundle of PACKAGE.\n" +msgstr "" +"Uso: guix pack [OPÇÃO]... PACOTE...\n" +"Cria um pacote de PACOTE.\n" + +#: guix/scripts/pack.scm:334 +msgid "" +"\n" +" -f, --format=FORMAT build a pack in the given FORMAT" +msgstr "" +"\n" +" -f, --format=FORMATO compila um pacote no FORMATO dado" + +#: guix/scripts/pack.scm:342 +msgid "" +"\n" +" -C, --compression=TOOL compress using TOOL--e.g., \"lzip\"" +msgstr "" +"\n" +" -C, --compression=FERRAMENTA\n" +" comprime usando FERRAMENTA--ex. \"lzip\"" + +#: guix/scripts/pack.scm:344 +msgid "" +"\n" +" -S, --symlink=SPEC create symlinks to the profile according to SPEC" +msgstr "" +"\n" +" -S, --symlink=ESPEC cria link simbólicos para o perfil conforme ESPEC" + +#: guix/scripts/pack.scm:346 +msgid "" +"\n" +" --localstatedir include /var/guix in the resulting pack" +msgstr "" +"\n" +" --localstatedir inclui /var/guix no pacote resultante" + +#: guix/scripts/pack.scm:390 +#, scheme-format +msgid "~a: unknown pack format" +msgstr "~a: formato de pacote desconhecido" + +#: guix/scripts/weather.scm:74 +msgid "computing ~h package derivations for ~a...~%" +msgstr "computando ~h derivações de pacote para ~a...~%" + +#: guix/scripts/weather.scm:110 +msgid "looking for ~h store items on ~a...~%" +msgstr "procurando por ~h itens de armazenamento em ~a…~%" + +#: guix/scripts/weather.scm:120 +msgid " ~2,1f% substitutes available (~h out of ~h)~%" +msgstr " ~2,1f% substitutos disponíveis (~h de ~h)~%" + +#: guix/scripts/weather.scm:126 +#, scheme-format +msgid " unknown substitute sizes~%" +msgstr " tamanhos de substituto desconhecido~%" + +#: guix/scripts/weather.scm:129 +msgid " ~,1h MiB of nars (compressed)~%" +msgstr " ~,1h MiB de nars (comprimidos)~%" + +#: guix/scripts/weather.scm:130 +msgid " at least ~,1h MiB of nars (compressed)~%" +msgstr " pelo menos ~,1h MiB de nars (comprimidos)~%" + +#: guix/scripts/weather.scm:132 +msgid " ~,1h MiB on disk (uncompressed)~%" +msgstr " ~,1h MiB no disco (comprimidos)~%" + +#: guix/scripts/weather.scm:134 +msgid " ~,3h seconds per request (~,1h seconds in total)~%" +msgstr " ~,3h segundos por requisição (~,1h segundos no total)~%" + +#: guix/scripts/weather.scm:136 +msgid " ~,1h requests per second~%" +msgstr " ~,1h requisições por segundo~%" + +#: guix/scripts/weather.scm:145 +msgid "" +"Usage: guix weather [OPTIONS]\n" +"Report the availability of substitutes.\n" +msgstr "" +"Uso: guix weather [OPÇÕES]\n" +"Relata a disponibilidade de substitutos.\n" + +#: guix/scripts/weather.scm:147 +msgid "" +"\n" +" --substitute-urls=URLS\n" +" check for available substitutes at URLS" +msgstr "" +"\n" +" --substitute-urls=URLS\n" +" verifica por substitutos disponíveis nas URLS" + +#: guix/scripts/weather.scm:150 +msgid "" +"\n" +" -m, --manifest=MANIFEST\n" +" look up substitutes for packages specified in MANIFEST" +msgstr "" +"\n" +" -m, --manifest=MANIFESTO\n" +" procura substitutos para os pacotes especificados\n" +" no MANIFESTO" + +#: guix/scripts/weather.scm:153 +msgid "" +"\n" +" -s, --system=SYSTEM consider substitutes for SYSTEM--e.g., \"i686-linux\"" +msgstr "" +"\n" +" -s, --system=SISTEMA considera substitutos para SISTEMA--ex.: \"i686-linux\"" + +#: guix/scripts/weather.scm:177 +#, scheme-format +msgid "~a: invalid URL~%" +msgstr "~a: URL inválido~%" + +#: guix/gnu-maintenance.scm:567 msgid "Updater for GNU packages" msgstr "Atualizador para pacotes GNU" -#: guix/gnu-maintenance.scm:562 -msgid "Updater for GNOME packages" -msgstr "Atualizador para pacotes GNOME" +#: guix/gnu-maintenance.scm:576 +msgid "Updater for GNU packages only available via FTP" +msgstr "Atualizador para pacotes GNU só disponíveis via FTP" -#: guix/gnu-maintenance.scm:569 +#: guix/gnu-maintenance.scm:585 msgid "Updater for KDE packages" msgstr "Atualizador para pacotes KDE" -#: guix/gnu-maintenance.scm:576 +#: guix/gnu-maintenance.scm:592 msgid "Updater for X.org packages" msgstr "Atualizador para pacotes X.org" -#: guix/gnu-maintenance.scm:583 +#: guix/gnu-maintenance.scm:599 msgid "Updater for packages hosted on kernel.org" msgstr "Atualizador para pacotes hospedados no kernel.org" @@ -2331,115 +2768,145 @@ msgstr "" msgid "~a: extraneous argument~%" msgstr "~a: argumento estranho~%" -#: guix/scripts/container/exec.scm:80 +#: guix/scripts/container/exec.scm:87 #, scheme-format msgid "no pid specified~%" msgstr "nenhum pid especificado~%" -#: guix/scripts/container/exec.scm:83 +#: guix/scripts/container/exec.scm:90 #, scheme-format msgid "no command specified~%" msgstr "nenhum comando foi especificado~%" -#: guix/scripts/container/exec.scm:86 +#: guix/scripts/container/exec.scm:93 #, scheme-format msgid "no such process ~d~%" msgstr "processo inexistente ~d~%" -#: guix/scripts/container/exec.scm:94 +#: guix/scripts/container/exec.scm:105 #, scheme-format msgid "exec failed with status ~d~%" msgstr "execução falhou com status ~d~%" -#: guix/upstream.scm:212 +#: guix/upstream.scm:249 #, scheme-format msgid "signature verification failed for `~a'~%" msgstr "verificação de assinatura falhou para \"~a\"~%" -#: guix/upstream.scm:214 +#: guix/upstream.scm:251 #, scheme-format msgid "(could be because the public key is not in your keyring)~%" msgstr "(pode ser porque a chave pública não está no seu chaveiro)~%" -#: guix/upstream.scm:246 -msgid "gz" -msgstr "gz" - -#: guix/upstream.scm:293 +#: guix/upstream.scm:330 #, scheme-format msgid "~a: could not locate source file" msgstr "~a: não foi possível localizar um arquivo fonte" -#: guix/upstream.scm:298 +#: guix/upstream.scm:335 #, scheme-format msgid "~a: ~a: no `version' field in source; skipping~%" -msgstr "~a: ~a: sem o campo \"version\" no fonte; pulando~%" +msgstr "~a: ~a: sem o campo \"version\" no fonte; ignorando~%" -#: guix/ui.scm:239 +#: guix/ui.scm:159 +#, scheme-format +msgid "~a: unbound variable" +msgstr "~a: variável não vinculada" + +#: guix/ui.scm:235 msgid "entering debugger; type ',bt' for a backtrace\n" msgstr "entrando no depurador; digite \",bt\" para o \"backtrace\"\n" -#: guix/ui.scm:255 guix/ui.scm:272 +#: guix/ui.scm:284 +#, scheme-format +msgid "hint: ~a~%" +msgstr "dica: ~a~%" + +#: guix/ui.scm:294 guix/ui.scm:342 guix/ui.scm:349 #, scheme-format msgid "failed to load '~a': ~a~%" msgstr "falha ao carregar \"~a\": ~a~%" -#: guix/ui.scm:258 +#: guix/ui.scm:301 +#, scheme-format +msgid "~amissing closing parenthesis~%" +msgstr "~afaltando parêntese de fechamento~%" + +#: guix/ui.scm:306 guix/ui.scm:322 guix/ui.scm:596 #, scheme-format msgid "~a: error: ~a~%" msgstr "~a: erro: ~a~%" -#: guix/ui.scm:261 guix/ui.scm:530 +#: guix/ui.scm:314 +msgid "Did you forget a @code{use-modules} form?" +msgstr "Você se esqueceu de uma forma @code{use-modules}?" + +#: guix/ui.scm:316 +#, scheme-format +msgid "Try adding @code{(use-modules ~a)}." +msgstr "Tente adicionar @code{(use-modules ~a)}." + +#: guix/ui.scm:329 guix/ui.scm:657 #, scheme-format msgid "exception thrown: ~s~%" msgstr "excepção lançada: ~s~%" -#: guix/ui.scm:263 guix/ui.scm:281 +#: guix/ui.scm:333 guix/ui.scm:355 #, scheme-format msgid "failed to load '~a':~%" msgstr "falha ao carregar \"~a\":~%" -#: guix/ui.scm:275 +#: guix/ui.scm:345 #, scheme-format msgid "~a: warning: ~a~%" msgstr "~a: aviso: ~a~%" -#: guix/ui.scm:278 +#: guix/ui.scm:352 #, scheme-format msgid "failed to load '~a': exception thrown: ~s~%" msgstr "falha ao carregar \"~a\": exceção lançada: ~s~%" -#: guix/ui.scm:290 +#: guix/ui.scm:364 #, scheme-format msgid "failed to install locale: ~a~%" msgstr "falha ao instalar localidade: ~a~%" -#: guix/ui.scm:309 +#. TRANSLATORS: Translate "(C)" to the copyright symbol +#. (C-in-a-circle), if this symbol is available in the user's +#. locale. Otherwise, do not translate "(C)"; leave it as-is. */ +#: guix/ui.scm:394 +msgid "(C)" +msgstr "(C)" + +#: guix/ui.scm:395 +msgid "the Guix authors\n" +msgstr "os autores do Guix\n" + +#: guix/ui.scm:396 msgid "" -"Copyright (C) 2016 the Guix authors\n" "License GPLv3+: GNU GPL version 3 or later \n" "This is free software: you are free to change and redistribute it.\n" "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -"Copyright (C) 2016 os autores do Guix\n" "Licença GPLv3+: GNU GPLv3 ou posterior \n" -"Esse é um software livre: você é livre para modificar ou redistribuí-lo .\n" +"Esse é um software livre: você é livre para modificar ou redistribuí-lo.\n" "NÃO HÁ GARANTIA, na máxima extensão permitida pela lei.\n" #. TRANSLATORS: The placeholder indicates the bug-reporting address for this #. package. Please add another line saying "Report translation bugs to #. ...\n" with the address for translation bugs (typically your translation #. team's web or email address). -#: guix/ui.scm:321 +#: guix/ui.scm:408 #, scheme-format msgid "" "\n" "Report bugs to: ~a." msgstr "" "\n" -"Relate erros para: ~a." +"Relate erros para: ~a.\n" +"Relate erros de tradução para: ldpbr-translation@lists.sourceforge.net." -#: guix/ui.scm:323 +#: guix/ui.scm:410 #, scheme-format msgid "" "\n" @@ -2448,7 +2915,7 @@ msgstr "" "\n" "Site do ~a: <~a>" -#: guix/ui.scm:325 +#: guix/ui.scm:412 msgid "" "\n" "General help using GNU software: " @@ -2456,199 +2923,231 @@ msgstr "" "\n" "Ajuda em geral usando softwares GNU: " -#: guix/ui.scm:370 +#: guix/ui.scm:457 #, scheme-format msgid "'~a' is not a valid regular expression: ~a~%" msgstr "\"~a\" não é uma expressão regular válida: ~a~%" -#: guix/ui.scm:376 +#: guix/ui.scm:463 #, scheme-format msgid "~a: invalid number~%" msgstr "~a: número inválido~%" -#: guix/ui.scm:393 +#: guix/ui.scm:480 #, scheme-format msgid "invalid number: ~a~%" msgstr "número inválido: ~a~%" -#: guix/ui.scm:416 +#: guix/ui.scm:503 #, scheme-format msgid "unknown unit: ~a~%" msgstr "unidade desconhecida: ~a~%" -#: guix/ui.scm:433 +#: guix/ui.scm:520 #, scheme-format msgid "~a:~a:~a: package `~a' has an invalid input: ~s~%" msgstr "~a:~a:~a: o pacote \"~a\" tem uma entrada inválida: ~s~%" -#: guix/ui.scm:440 +#: guix/ui.scm:527 #, scheme-format msgid "~a: ~a: build system `~a' does not support cross builds~%" msgstr "~a: ~a: o sistema de compilação de \"~a\" não oferece suporte a compilações cruzadas~%" -#: guix/ui.scm:445 +#: guix/ui.scm:533 +#, scheme-format +msgid "~s: invalid G-expression input~%" +msgstr "~s: entrada de expressão G inválida~%" + +#: guix/ui.scm:536 #, scheme-format msgid "profile '~a' does not exist~%" msgstr "o perfil \"~a\" não existe~%" -#: guix/ui.scm:448 +#: guix/ui.scm:539 #, scheme-format msgid "generation ~a of profile '~a' does not exist~%" msgstr "a geração ~a do perfil \"~a\" não existe~%" -#: guix/ui.scm:455 +#: guix/ui.scm:548 +#, scheme-format +msgid " ... propagated from ~a@~a~%" +msgstr " ... propagado de ~a@~a~%" + +#: guix/ui.scm:553 +#, scheme-format +msgid "profile contains conflicting entries for ~a:~a~%" +msgstr "o perfil contém entradas conflitantes para ~a:~a~%" + +#: guix/ui.scm:556 +#, scheme-format +msgid " first entry: ~a@~a:~a ~a~%" +msgstr " primeira entrada: ~a@~a:~a ~a~%" + +#: guix/ui.scm:562 +#, scheme-format +msgid " second entry: ~a@~a:~a ~a~%" +msgstr " segunda entrada: ~a@~a:~a ~a~%" + +#: guix/ui.scm:573 #, scheme-format msgid "corrupt input while restoring '~a' from ~s~%" msgstr "entrada corrompida ao restaurar \"~a\" de ~s~%" -#: guix/ui.scm:457 +#: guix/ui.scm:575 #, scheme-format msgid "corrupt input while restoring archive from ~s~%" msgstr "entrada corrompida ao restaurar um pacote de ~s~%" -#: guix/ui.scm:460 +#: guix/ui.scm:578 #, scheme-format msgid "failed to connect to `~a': ~a~%" msgstr "falha ao conectar em \"~a\": ~a~%" -#: guix/ui.scm:465 +#: guix/ui.scm:583 #, scheme-format msgid "build failed: ~a~%" msgstr "compilação falhou: ~a~%" -#: guix/ui.scm:468 +#: guix/ui.scm:586 #, scheme-format msgid "reference to invalid output '~a' of derivation '~a'~%" msgstr "referência a uma saída inválida \"~a\" da derivação \"~a\"~%" -#: guix/ui.scm:472 +#: guix/ui.scm:590 #, scheme-format msgid "file '~a' could not be found in these directories:~{ ~a~}~%" msgstr "o arquivo \"~a\" não pôde ser localizado nesses diretórios:~{ ~a~}~%" -#: guix/ui.scm:484 +#: guix/ui.scm:607 #, scheme-format msgid "~a: ~a~%" msgstr "~a: ~a~%" -#: guix/ui.scm:519 +#: guix/ui.scm:642 #, scheme-format msgid "failed to read expression ~s: ~s~%" msgstr "falha ao ler a expressão ~s: ~s~%" -#: guix/ui.scm:525 +#: guix/ui.scm:648 #, scheme-format msgid "failed to evaluate expression '~a':~%" msgstr "falha ao avaliar a expressão \"~a\":~%" -#: guix/ui.scm:528 +#: guix/ui.scm:651 #, scheme-format msgid "syntax error: ~a~%" msgstr "erro de sintaxe: ~a~%" -#: guix/ui.scm:542 +#: guix/ui.scm:669 #, scheme-format msgid "expression ~s does not evaluate to a package~%" msgstr "a expressão ~s não corresponde a um pacote~%" -#: guix/ui.scm:604 +#: guix/ui.scm:688 +msgid "at least ~,1h MB needed but only ~,1h MB available in ~a~%" +msgstr "pelo menos ~,1h MB necessário, mas apenas ~,1h MB disponível em ~a~%" + +#: guix/ui.scm:756 #, scheme-format msgid "~:[The following derivation would be built:~%~{ ~a~%~}~;~]" msgid_plural "~:[The following derivations would be built:~%~{ ~a~%~}~;~]" msgstr[0] "~:[A seguinte derivação seria compilada:~%~{ ~a~%~}~;~]" msgstr[1] "~:[As seguintes derivações seriam compiladas:~%~{ ~a~%~}~;~]" -#: guix/ui.scm:609 +#. TRANSLATORS: "MB" is for "megabyte"; it should be +#. translated to the corresponding abbreviation. +#: guix/ui.scm:764 +msgid "~:[~,1h MB would be downloaded:~%~{ ~a~%~}~;~]" +msgstr "~:[~,1h MB seria baixado:~%~{ ~a~%~}~;~]" + +#: guix/ui.scm:769 #, scheme-format msgid "~:[The following file would be downloaded:~%~{ ~a~%~}~;~]" msgid_plural "~:[The following files would be downloaded:~%~{ ~a~%~}~;~]" msgstr[0] "~:[O seguinte arquivo seria baixado:~%~{ ~a~%~}~;~]" msgstr[1] "~:[Os seguintes arquivos seriam baixados:~%~{ ~a~%~}~;~]" -#: guix/ui.scm:615 +#: guix/ui.scm:776 #, scheme-format msgid "~:[The following derivation will be built:~%~{ ~a~%~}~;~]" msgid_plural "~:[The following derivations will be built:~%~{ ~a~%~}~;~]" msgstr[0] "~:[A seguinte derivação será compilada:~%~{ ~a~%~}~;~]" msgstr[1] "~:[As seguintes derivações serão compiladas:~%~{ ~a~%~}~;~]" -#: guix/ui.scm:620 +#. TRANSLATORS: "MB" is for "megabyte"; it should be +#. translated to the corresponding abbreviation. +#: guix/ui.scm:784 +msgid "~:[~,1h MB will be downloaded:~%~{ ~a~%~}~;~]" +msgstr "~:[~,1h MB será baixado:~%~{ ~a~%~}~;~]" + +#: guix/ui.scm:789 #, scheme-format msgid "~:[The following file will be downloaded:~%~{ ~a~%~}~;~]" msgid_plural "~:[The following files will be downloaded:~%~{ ~a~%~}~;~]" msgstr[0] "~:[O seguinte arquivo será baixado:~%~{ ~a~%~}~;~]" msgstr[1] "~:[Os seguintes arquivos serão baixados:~%~{ ~a~%~}~;~]" -#: guix/ui.scm:675 +#: guix/ui.scm:849 #, scheme-format msgid "The following package would be removed:~%~{~a~%~}~%" msgid_plural "The following packages would be removed:~%~{~a~%~}~%" msgstr[0] "O seguinte pacote seria removido:~%~{~a~%~}~%" msgstr[1] "Os seguintes pacotes seriam removidos:~%~{~a~%~}~%" -#: guix/ui.scm:680 +#: guix/ui.scm:854 #, scheme-format msgid "The following package will be removed:~%~{~a~%~}~%" msgid_plural "The following packages will be removed:~%~{~a~%~}~%" msgstr[0] "O seguinte pacote será removido:~%~{~a~%~}~%" msgstr[1] "Os seguintes pacotes serão removidos:~%~{~a~%~}~%" -#: guix/ui.scm:693 +#: guix/ui.scm:867 #, scheme-format msgid "The following package would be downgraded:~%~{~a~%~}~%" msgid_plural "The following packages would be downgraded:~%~{~a~%~}~%" msgstr[0] "O seguinte pacote sofreria um downgrade:~%~{~a~%~}~%" msgstr[1] "Os seguintes pacotes sofreriam um downgrade:~%~{~a~%~}~%" -#: guix/ui.scm:698 +#: guix/ui.scm:872 #, scheme-format msgid "The following package will be downgraded:~%~{~a~%~}~%" msgid_plural "The following packages will be downgraded:~%~{~a~%~}~%" msgstr[0] "O seguinte pacote sofrerá um downgrade:~%~{~a~%~}~%" msgstr[1] "Os seguintes pacotes sofrerão um downgrade:~%~{~a~%~}~%" -#: guix/ui.scm:711 +#: guix/ui.scm:885 #, scheme-format msgid "The following package would be upgraded:~%~{~a~%~}~%" msgid_plural "The following packages would be upgraded:~%~{~a~%~}~%" msgstr[0] "O seguinte pacote seria atualizado:~%~{~a~%~}~%" msgstr[1] "Os seguintes pacotes seriam atualizados:~%~{~a~%~}~%" -#: guix/ui.scm:716 +#: guix/ui.scm:890 #, scheme-format msgid "The following package will be upgraded:~%~{~a~%~}~%" msgid_plural "The following packages will be upgraded:~%~{~a~%~}~%" msgstr[0] "O seguinte pacote será atualizado:~%~{~a~%~}~%" msgstr[1] "Os seguintes pacotes serão atualizados:~%~{~a~%~}~%" -#: guix/ui.scm:727 +#: guix/ui.scm:901 #, scheme-format msgid "The following package would be installed:~%~{~a~%~}~%" msgid_plural "The following packages would be installed:~%~{~a~%~}~%" msgstr[0] "O seguinte pacote seria instalado:~%~{~a~%~}~%" msgstr[1] "Os seguintes pacotes seriam instalados:~%~{~a~%~}~%" -#: guix/ui.scm:732 +#: guix/ui.scm:906 #, scheme-format msgid "The following package will be installed:~%~{~a~%~}~%" msgid_plural "The following packages will be installed:~%~{~a~%~}~%" msgstr[0] "O seguinte pacote será instalado:~%~{~a~%~}~%" msgstr[1] "Os seguintes pacotes serão instalados:~%~{~a~%~}~%" -#: guix/ui.scm:749 +#: guix/ui.scm:923 msgid "" msgstr "" -#: guix/ui.scm:768 -#, scheme-format -msgid "failed to create configuration directory `~a': ~a~%" -msgstr "falha ao criar o diretório de compilação \"~a\": ~a~%" - -#: guix/ui.scm:891 guix/ui.scm:905 -msgid "unknown" -msgstr "desconhecido" - -#: guix/ui.scm:1063 +#: guix/ui.scm:1285 #, scheme-format msgid "Generation ~a\t~a" msgstr "Geração ~a\t~a" @@ -2656,28 +3155,28 @@ msgstr "Geração ~a\t~a" #. TRANSLATORS: The word "current" here is an adjective for #. "Generation", as in "current generation". Use the appropriate #. gender where applicable. -#: guix/ui.scm:1073 +#: guix/ui.scm:1295 #, scheme-format msgid "~a\t(current)~%" msgstr "~a\t(atual)~%" # geração, criação? -#: guix/ui.scm:1116 +#: guix/ui.scm:1338 #, scheme-format msgid "switched from generation ~a to ~a~%" msgstr "trocado da geração ~a para ~a~%" -#: guix/ui.scm:1132 +#: guix/ui.scm:1354 #, scheme-format msgid "deleting ~a~%" msgstr "excluindo ~a~%" -#: guix/ui.scm:1163 +#: guix/ui.scm:1385 #, scheme-format msgid "Try `guix --help' for more information.~%" msgstr "Tente \"guix --help\" para mais informações.~%" -#: guix/ui.scm:1191 +#: guix/ui.scm:1413 msgid "" "Usage: guix COMMAND ARGS...\n" "Run COMMAND with ARGS.\n" @@ -2685,33 +3184,34 @@ msgstr "" "Uso: guix COMANDO ARGUMENTOS...\n" "Executa COMANDO com ARGUMENTOS.\n" -#: guix/ui.scm:1194 +#: guix/ui.scm:1416 msgid "COMMAND must be one of the sub-commands listed below:\n" msgstr "COMANDO deve ser um dos subcomandos listados abaixo:\n" -#: guix/ui.scm:1214 +#: guix/ui.scm:1436 #, scheme-format msgid "guix: ~a: command not found~%" msgstr "guix: ~a: comando não encontrado~%" -#: guix/ui.scm:1233 +#: guix/ui.scm:1466 #, scheme-format msgid "guix: missing command name~%" msgstr "guix: faltando um nome de comando~%" -#: guix/ui.scm:1241 +#: guix/ui.scm:1474 #, scheme-format msgid "guix: unrecognized option '~a'~%" msgstr "guix: opção \"~a\" desconhecida~%" -#: guix/http-client.scm:270 +#: guix/http-client.scm:269 #, scheme-format msgid "following redirection to `~a'...~%" msgstr "seguindo redirecionamento para \"~a\"...~%" -#: guix/http-client.scm:279 -msgid "download failed" -msgstr "download falhou" +#: guix/http-client.scm:281 +#, scheme-format +msgid "~a: HTTP download failed: ~a (~s)" +msgstr "~a: download HTTP falhou: ~a (~s)" #: guix/nar.scm:155 msgid "signature is not a valid s-expression" @@ -2755,133 +3255,200 @@ msgstr "arquivo importado carece de uma assinatura" msgid "invalid inter-file archive mark" msgstr "marca inválida de pacote interarquivo" -#: nix/nix-daemon/guix-daemon.cc:61 +#: nix/nix-daemon/guix-daemon.cc:66 msgid "guix-daemon -- perform derivation builds and store accesses" msgstr "guix-daemon -- realiza compilações de derivação e acessos a armazenamento" -#: nix/nix-daemon/guix-daemon.cc:63 +#: nix/nix-daemon/guix-daemon.cc:68 msgid "This program is a daemon meant to run in the background. It serves requests sent over a Unix-domain socket. It accesses the store, and builds derivations on behalf of its clients." msgstr "Esse programa é um daemon feito para executar em segundo plano. Ele atende a requisições enviadas por um soquete. Ele acessa o armazenamento e compila derivações em nome de seus clientes." -#: nix/nix-daemon/guix-daemon.cc:87 +#: nix/nix-daemon/guix-daemon.cc:94 msgid "SYSTEM" msgstr "SISTEMA" -#: nix/nix-daemon/guix-daemon.cc:88 +#: nix/nix-daemon/guix-daemon.cc:95 msgid "assume SYSTEM as the current system type" msgstr "presume SISTEMA como o tipo de sistema atual" -#: nix/nix-daemon/guix-daemon.cc:89 nix/nix-daemon/guix-daemon.cc:92 +#: nix/nix-daemon/guix-daemon.cc:96 nix/nix-daemon/guix-daemon.cc:99 msgid "N" msgstr "N" -#: nix/nix-daemon/guix-daemon.cc:90 +#: nix/nix-daemon/guix-daemon.cc:97 msgid "use N CPU cores to build each derivation; 0 means as many as available" msgstr "usa N núcleos de CPU para compilar cada derivação; 0 significa todos disponíveis" -#: nix/nix-daemon/guix-daemon.cc:93 +#: nix/nix-daemon/guix-daemon.cc:100 msgid "allow at most N build jobs" msgstr "permite no máximo N trabalhos de compilação" -#: nix/nix-daemon/guix-daemon.cc:95 +#: nix/nix-daemon/guix-daemon.cc:101 nix/nix-daemon/guix-daemon.cc:103 +msgid "SECONDS" +msgstr "SEGUNDOS" + +#: nix/nix-daemon/guix-daemon.cc:102 +msgid "mark builds as failed after SECONDS of activity" +msgstr "marca compilações como falha após SEGUNDOS de atividade" + +#: nix/nix-daemon/guix-daemon.cc:104 +msgid "mark builds as failed after SECONDS of silence" +msgstr "marca compilações como falha após SEGUNDOS de silêncio" + +#: nix/nix-daemon/guix-daemon.cc:106 msgid "disable chroot builds" msgstr "desabilita compilações em chroot" -#: nix/nix-daemon/guix-daemon.cc:96 +#: nix/nix-daemon/guix-daemon.cc:107 msgid "DIR" msgstr "DIR" -#: nix/nix-daemon/guix-daemon.cc:97 +#: nix/nix-daemon/guix-daemon.cc:108 msgid "add DIR to the build chroot" msgstr "adiciona DIR ao chroot de compilação" -#: nix/nix-daemon/guix-daemon.cc:98 +#: nix/nix-daemon/guix-daemon.cc:109 msgid "GROUP" msgstr "GRUPO" -#: nix/nix-daemon/guix-daemon.cc:99 +#: nix/nix-daemon/guix-daemon.cc:110 msgid "perform builds as a user of GROUP" msgstr "realiza compilações como um usuário de GRUPO" -#: nix/nix-daemon/guix-daemon.cc:101 +#: nix/nix-daemon/guix-daemon.cc:112 msgid "do not use substitutes" msgstr "não usa substitutos" -#: nix/nix-daemon/guix-daemon.cc:102 +#: nix/nix-daemon/guix-daemon.cc:113 msgid "URLS" msgstr "URLS" -#: nix/nix-daemon/guix-daemon.cc:103 +#: nix/nix-daemon/guix-daemon.cc:114 msgid "use URLS as the default list of substitute providers" msgstr "usa URLS como lista padrão de fornecedores de substituto" -#: nix/nix-daemon/guix-daemon.cc:105 +#: nix/nix-daemon/guix-daemon.cc:116 msgid "do not use the 'build hook'" msgstr "não usa o \"hook de compilação\"" -#: nix/nix-daemon/guix-daemon.cc:107 +#: nix/nix-daemon/guix-daemon.cc:118 msgid "cache build failures" msgstr "armazena em cache as falhas de compilação" -#: nix/nix-daemon/guix-daemon.cc:109 +#: nix/nix-daemon/guix-daemon.cc:120 msgid "build each derivation N times in a row" msgstr "compila cada derivação N vezes de uma vez" -#: nix/nix-daemon/guix-daemon.cc:111 +#: nix/nix-daemon/guix-daemon.cc:122 msgid "do not keep build logs" msgstr "não mantém logs de compilação" -#: nix/nix-daemon/guix-daemon.cc:113 +#: nix/nix-daemon/guix-daemon.cc:124 msgid "disable compression of the build logs" msgstr "desabilita compressão de logs de compilação" -#: nix/nix-daemon/guix-daemon.cc:118 +#: nix/nix-daemon/guix-daemon.cc:129 msgid "disable automatic file \"deduplication\" in the store" msgstr "desabilita \"deduplicação\" automática de arquivo no armazenamento" -#: nix/nix-daemon/guix-daemon.cc:128 +#: nix/nix-daemon/guix-daemon.cc:139 msgid "impersonate Linux 2.6" msgstr "personifica Linux 2.6" -#: nix/nix-daemon/guix-daemon.cc:132 +#: nix/nix-daemon/guix-daemon.cc:143 msgid "tell whether the GC must keep outputs of live derivations" msgstr "diz se o GC deve manter as saídas das derivações vivas" -#: nix/nix-daemon/guix-daemon.cc:135 +#: nix/nix-daemon/guix-daemon.cc:146 msgid "tell whether the GC must keep derivations corresponding to live outputs" msgstr "diz se o GC deve manter as derivações correspondentes às saídas vivas" -#: nix/nix-daemon/guix-daemon.cc:138 +#: nix/nix-daemon/guix-daemon.cc:149 msgid "SOCKET" msgstr "SOQUETE" -#: nix/nix-daemon/guix-daemon.cc:139 +#: nix/nix-daemon/guix-daemon.cc:150 msgid "listen for connections on SOCKET" msgstr "ouve conexões no SOQUETE" -#: nix/nix-daemon/guix-daemon.cc:141 +#: nix/nix-daemon/guix-daemon.cc:152 msgid "produce debugging output" msgstr "produz saída de depuração" -#: nix/nix-daemon/guix-daemon.cc:201 -#, c-format -msgid "error: %s: invalid number of rounds\n" -msgstr "erro: %s: número inválido de vezes\n" +#~ msgid "deprecated NAME-VERSION syntax; use NAME@VERSION instead~%" +#~ msgstr "sintaxe NOME-VERSÃO obsoleta; em vez disso, use NOME@VERSÃO~%" + +#~ msgid "/" +#~ msgstr "/" + +#~ msgid "unrecognized option: ~a~%" +#~ msgstr "opção não reconhecida: ~a~%" + +#~ msgid "tarball did not produce a single source directory" +#~ msgstr "tarball não produziu um diretório fonte" + +#~ msgid "unpacking '~a'...~%" +#~ msgstr "desempacotando \"~a\"...~%" + +#~ msgid "failed to unpack source code" +#~ msgstr "falha ao desempacotar o código fonte" + +#~ msgid "~A: unexpected argument~%" +#~ msgstr "~A: argumento inesperado~%" + +#~ msgid "failed to download up-to-date source, exiting\n" +#~ msgstr "falha ao baixar fonte atualizada; saindo\n" + +#~ msgid "substitute at '~a' lacks a signature~%" +#~ msgstr "o substituto em \"~a\" carece de uma assinatura~%" + +#~ msgid "Found valid signature for ~a~%" +#~ msgstr "Localizada assinatura válida para ~a~%" + +#~ msgid "From ~a~%" +#~ msgstr "De ~a~%" + +#~ msgid "Downloading ~a~:[~*~; (~a installed)~]...~%" +#~ msgstr "Baixando ~a~:[~*~; (~a instalado)~]...~%" -#: nix/nix-daemon/guix-daemon.cc:220 nix/nix-daemon/guix-daemon.cc:396 -#, c-format -msgid "error: %s\n" -msgstr "erro: %s\n" +#~ msgid "failed to install GRUB on device '~a'~%" +#~ msgstr "falha ao instalar GRUB no dispositivo \"~a\"~%" -#: nix/nix-daemon/guix-daemon.cc:281 -#, c-format -msgid "error: libgcrypt version mismatch\n" -msgstr "erro: versão do libgcrypt não confere\n" +#~ msgid "failed to re-install GRUB configuration file: '~a'~%" +#~ msgstr "falha ao reinstalar o arquivo de configuração do GRUB: \"~a\"~%" -#: nix/nix-daemon/guix-daemon.cc:372 -#, c-format -msgid "warning: daemon is running as root, so using `--build-users-group' is highly recommended\n" -msgstr "aviso: daemon está sendo executado como root, então o uso de \"--build-users-group\" é fortemente recomendado\n" +#~ msgid "assuming no CVE vulnerabilities~%" +#~ msgstr "presumindo haver nenhuma vulnerabilidade CVE~%" + +#~ msgid "failed to lookup NIST host: ~a~%" +#~ msgstr "falha ao procurar o servidor do NIST: ~a~%" + +#~ msgid "~a: no substitute at '~a'~%" +#~ msgstr "~a: nenhum substituto em \"~a\"'~%" + +#~ msgid "Updater for GNOME packages" +#~ msgstr "Atualizador para pacotes GNOME" + +#~ msgid "gz" +#~ msgstr "gz" + +#~ msgid "failed to create configuration directory `~a': ~a~%" +#~ msgstr "falha ao criar o diretório de compilação \"~a\": ~a~%" + +#~ msgid "download failed" +#~ msgstr "download falhou" + +#~ msgid "error: %s: invalid number of rounds\n" +#~ msgstr "erro: %s: número inválido de vezes\n" + +#~ msgid "error: %s\n" +#~ msgstr "erro: %s\n" + +#~ msgid "error: libgcrypt version mismatch\n" +#~ msgstr "erro: versão do libgcrypt não confere\n" + +#~ msgid "warning: daemon is running as root, so using `--build-users-group' is highly recommended\n" +#~ msgstr "aviso: daemon está sendo executado como root, então o uso de \"--build-users-group\" é fortemente recomendado\n" #~ msgid "unsupported argument for reference graph" #~ msgstr "sem suporte ao argumento para gráfico de referência" @@ -3295,9 +3862,6 @@ msgstr "aviso: daemon está sendo executado como root, então o uso de \"--build #~ msgid "failed to build the empty profile~%" #~ msgstr "falha ao compilar o perfil vazio~%" -#~ msgid "looking for the latest release of GNU ~a..." -#~ msgstr "procurando pelo último lançamento do GNU ~a..." - #~ msgid "~a: note: using ~a but ~a is available upstream~%" #~ msgstr "~a: nota: usando ~a, mas ~a está disponível no upstream~%" -- cgit v1.2.3 From 9f29ecc1b1d1da57afea71cf1a028a84a9399003 Mon Sep 17 00:00:00 2001 From: Alex ter Weele Date: Tue, 20 Feb 2018 18:49:41 -0600 Subject: gnu: ghc-edit-distance: Allow newer version of QuickCheck. * gnu/packages/haskell.scm (ghc-edit-distance)[arguments]: Allow running tests with newer version of QuickCheck. Signed-off-by: Marius Bakke --- gnu/packages/haskell.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index e62c405ab7..737b7a4cd1 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -5755,6 +5755,8 @@ representations of current time.") (sha256 (base32 "0jkca97zyv23yyilp3jydcrzxqhyk27swhzh82llvban5zp8b21y")))) (build-system haskell-build-system) + (arguments + `(#:configure-flags (list "--allow-newer=QuickCheck"))) (inputs `(("ghc-random" ,ghc-random) ("ghc-test-framework" ,ghc-test-framework) -- cgit v1.2.3 From abfec9b375a78144ece06b36a033412a105dccaf Mon Sep 17 00:00:00 2001 From: Alex ter Weele Date: Tue, 20 Feb 2018 18:51:16 -0600 Subject: gnu: ghc-hashtables: Allow newer version of vector. * gnu/packages/haskell.scm (ghc-hashtables)[arguments]: Allow newer version of vector. Signed-off-by: Marius Bakke --- gnu/packages/haskell.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 737b7a4cd1..dbb9ebc808 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -7360,6 +7360,8 @@ Haskell, using gnuplot for rendering.") (sha256 (base32 "1b6w9xznk42732vpd8ili60k12yq190xnajgga0iwbdpyg424lgg")))) (build-system haskell-build-system) + (arguments + `(#:configure-flags (list "--allow-newer=vector"))) (inputs `(("ghc-hashable" ,ghc-hashable) ("ghc-primitive" ,ghc-primitive) -- cgit v1.2.3 From 7df5669f3903b58cd5587ee8660dd12a18756bd0 Mon Sep 17 00:00:00 2001 From: Alex ter Weele Date: Tue, 20 Feb 2018 18:53:26 -0600 Subject: gnu: Add ghc-uri-encode. * gnu/packages/haskell-web.scm (ghc-uri-encode): New variable. Signed-off-by: Marius Bakke --- gnu/packages/haskell-web.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index a24ee4b7c0..f1b50b29bd 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -866,3 +866,26 @@ of a JSON value into a @code{Data.Aeson.Value}.") (description "HTTP multipart split out of the cgi package, for Haskell.") (license license:bsd-3))) + +(define-public ghc-uri-encode + (package + (name "ghc-uri-encode") + (version "1.5.0.5") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/uri-encode/uri-encode-" + version ".tar.gz")) + (sha256 + (base32 + "11miwb5vvnn17m92ykz1pzg9x6s8fbpz3mmsyqs2s4b3mn55haz8")))) + (build-system haskell-build-system) + (inputs + `(("ghc-text" ,ghc-text) + ("ghc-utf8-string" ,ghc-utf8-string) + ("ghc-network-uri" ,ghc-network-uri))) + (home-page "https://hackage.haskell.org/package/uri-encode") + (synopsis "Unicode aware uri-encoding") + (description "Unicode aware uri-encoding for Haskell.") + (license license:bsd-3))) -- cgit v1.2.3 From f61682e7ea87db3eed7e67adacd1d3f8c1b7c119 Mon Sep 17 00:00:00 2001 From: Alex ter Weele Date: Tue, 20 Feb 2018 18:55:06 -0600 Subject: gnu: Add agda. * gnu/packages/agda.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add adga.scm. Signed-off-by: Marius Bakke --- gnu/local.mk | 1 + gnu/packages/agda.scm | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 87 insertions(+) create mode 100644 gnu/packages/agda.scm diff --git a/gnu/local.mk b/gnu/local.mk index 2f8f7b7e3a..8acb3cea47 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -52,6 +52,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/acl.scm \ %D%/packages/admin.scm \ %D%/packages/adns.scm \ + %D%/packages/agda.scm \ %D%/packages/algebra.scm \ %D%/packages/aidc.scm \ %D%/packages/android.scm \ diff --git a/gnu/packages/agda.scm b/gnu/packages/agda.scm new file mode 100644 index 0000000000..6aa230116c --- /dev/null +++ b/gnu/packages/agda.scm @@ -0,0 +1,86 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2018 Alex ter Weele +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages agda) + #:use-module (gnu packages haskell) + #:use-module (gnu packages haskell-check) + #:use-module (gnu packages haskell-web) + #:use-module (guix build-system haskell) + #:use-module (guix build-system trivial) + #:use-module (guix download) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages)) + +(define-public agda + (package + (name "agda") + (version "2.5.3") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/Agda/Agda-" + version ".tar.gz")) + (sha256 + (base32 + "0r80vw7vnvbgq47y50v050malv7zvv2p2kg6f47i04r0b2ix855a")))) + (build-system haskell-build-system) + (inputs + `(("cpphs" ,cpphs) + ("ghc-alex" ,ghc-alex) + ("ghc-async" ,ghc-async) + ("ghc-blaze-html" ,ghc-blaze-html) + ("ghc-boxes" ,ghc-boxes) + ("ghc-data-hash" ,ghc-data-hash) + ("ghc-edisoncore" ,ghc-edisoncore) + ("ghc-edit-distance" ,ghc-edit-distance) + ("ghc-equivalence" ,ghc-equivalence) + ("ghc-geniplate-mirror" ,ghc-geniplate-mirror) + ("ghc-gitrev" ,ghc-gitrev) + ("ghc-happy" ,ghc-happy) + ("ghc-hashable" ,ghc-hashable) + ("ghc-hashtables" ,ghc-hashtables) + ("ghc-ieee754" ,ghc-ieee754) + ("ghc-monadplus" ,ghc-monadplus) + ("ghc-mtl" ,ghc-mtl) + ("ghc-murmur-hash" ,ghc-murmur-hash) + ("ghc-uri-encode" ,ghc-uri-encode) + ("ghc-parallel" ,ghc-parallel) + ("ghc-regex-tdfa" ,ghc-regex-tdfa) + ("ghc-stm" ,ghc-stm) + ("ghc-strict" ,ghc-strict) + ("ghc-text" ,ghc-text) + ("ghc-unordered-containers" ,ghc-unordered-containers) + ("ghc-zlib" ,ghc-zlib))) + (home-page "http://wiki.portal.chalmers.se/agda/") + (synopsis + "Dependently typed functional programming language and proof assistant") + (description + "Agda is a dependently typed functional programming language: it has +inductive families, which are similar to Haskell's GADTs, but they can be +indexed by values and not just types. It also has parameterised modules, +mixfix operators, Unicode characters, and an interactive Emacs interface (the +type checker can assist in the development of your code). Agda is also a +proof assistant: it is an interactive system for writing and checking proofs. +Agda is based on intuitionistic type theory, a foundational system for +constructive mathematics developed by the Swedish logician Per Martin-Löf. It +has many similarities with other proof assistants based on dependent types, +such as Coq, Epigram and NuPRL.") + ;; Agda is distributed under the MIT license, and a couple of + ;; source files are BSD-3. See LICENSE for details. + (license (list license:expat license:bsd-3)))) -- cgit v1.2.3 From f58764d8ed633a8ad1c9f2578be7bbde36ed7ce7 Mon Sep 17 00:00:00 2001 From: ng0 Date: Sun, 25 Feb 2018 13:34:28 +0000 Subject: gnu: neomutt: Update to 20180223. * gnu/packages/mail.scm (neomutt): Update to 20180223. [native-inputs]: Use 'docbook-xml-4.2'. [arguments]: Remove 'fix-docbook' phases. Signed-off-by: Marius Bakke --- gnu/packages/mail.scm | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 6e8f9a74ae..9fbfddbec1 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -296,7 +296,7 @@ operating systems.") (define-public neomutt (package (name "neomutt") - (version "20171215") + (version "20180223") (source (origin (method url-fetch) @@ -304,7 +304,7 @@ operating systems.") "/archive/" name "-" version ".tar.gz")) (sha256 (base32 - "1df1c2ynvivna42ifj1lxmgb0bbfih0ggn1afyniadzjm6cnxdvz")))) + "1fr7158xhrhasylyxp709g9mdbggdmni3qn3baxvczfg2w003fhh")))) (build-system gnu-build-system) (inputs `(("cyrus-sasl" ,cyrus-sasl) @@ -325,7 +325,7 @@ operating systems.") ("gettext-minimal" ,gettext-minimal) ("pkg-config" ,pkg-config) ("docbook-xsl" ,docbook-xsl) - ("docbook-xml" ,docbook-xml) + ("docbook-xml" ,docbook-xml-4.2) ("w3m" ,w3m) ("tcl" ,tcl))) (arguments @@ -368,18 +368,6 @@ operating systems.") (modify-phases %standard-phases ;; TODO: autosetup is meant to be included in the source, ;; but we should package autosetup and use our own version of it. - (add-before 'configure 'fix-docbook - (lambda* (#:key inputs #:allow-other-keys) - (substitute* '("doc/chunk.xsl" "doc/manual.xml.tail" - "doc/html.xsl" "doc/manual.xml.head") - (("http://docbook.sourceforge.net/release/xsl/current/") - (string-append (assoc-ref inputs "docbook-xsl") - "/xml/xsl/docbook-xsl-" - ,(package-version docbook-xsl) "/")) - (("http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd") - (string-append (assoc-ref inputs "docbook-xml") - "/xml/dtd/docbook/docbookx.dtd"))) - #t)) (add-before 'configure 'fix-sasl-test (lambda _ ;; Upstream suggestion to fix the failing sasl autosetup test. -- cgit v1.2.3 From 2115bde3024b685087af70a20d7846498d6c9985 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 26 Feb 2018 02:39:15 +0100 Subject: gnu: python-parse: Update to 1.8.2. * gnu/packages/patches/python-parse-too-many-fields.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/python.scm (python-parse): Update to 1.8.2. [source](patches): Remove. [arguments]: Use INVOKE instead of SYSTEM*. --- gnu/local.mk | 1 - .../patches/python-parse-too-many-fields.patch | 52 ---------------------- gnu/packages/python.scm | 7 ++- 3 files changed, 3 insertions(+), 57 deletions(-) delete mode 100644 gnu/packages/patches/python-parse-too-many-fields.patch diff --git a/gnu/local.mk b/gnu/local.mk index 8acb3cea47..72fbf90f83 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1031,7 +1031,6 @@ dist_patch_DATA = \ %D%/packages/patches/python2-larch-coverage-4.0a6-compatibility.patch \ %D%/packages/patches/python-networkx2-reproducible-build.patch \ %D%/packages/patches/python-nose-timer-drop-ordereddict.patch \ - %D%/packages/patches/python-parse-too-many-fields.patch \ %D%/packages/patches/python-pillow-fix-failing-tests.patch \ %D%/packages/patches/python2-rdflib-drop-sparqlwrapper.patch \ %D%/packages/patches/python-statsmodels-fix-tests.patch \ diff --git a/gnu/packages/patches/python-parse-too-many-fields.patch b/gnu/packages/patches/python-parse-too-many-fields.patch deleted file mode 100644 index 9db6b91a7f..0000000000 --- a/gnu/packages/patches/python-parse-too-many-fields.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 32f15cfefb7c7b6476360ac65cba807aa3dfccfa Mon Sep 17 00:00:00 2001 -From: David King -Date: Mon, 14 Dec 2015 09:58:19 +0000 -Subject: [PATCH] Fix test_too_many_fields with Python 3.5 - -taken from https://github.com/r1chardj0n3s/parse/pull/34 - -Python versions before 3.5 had a limit of 100 groups in regular -expressions. This limit was removed during 3.5 development: - -http://bugs.python.org/issue22437 -https://hg.python.org/cpython/rev/0b85ea4bd1af - -The test_too_many_fields test asserts that the limit exists by -attempting to parse a string with 15 fields, which triggers the 100 -named groups limit. - -Adjust the test so that if first checks to see whether the limit of 100 -named groups exists, and only assert that parsing 15 fields fails if -that is the case. ---- - test_parse.py | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/test_parse.py b/test_parse.py -index c524349..1d50568 100755 ---- a/test_parse.py -+++ b/test_parse.py -@@ -6,6 +6,7 @@ - - import unittest - from datetime import datetime, time -+import re - - import parse - -@@ -624,8 +625,13 @@ def test_mixed_type_variant(self): - self.assertEqual(r.fixed[21], 'spam') - - def test_too_many_fields(self): -- p = parse.compile('{:ti}' * 15) -- self.assertRaises(parse.TooManyFields, p.parse, '') -+ # Python 3.5 removed the limit of 100 named groups in a regular expression, -+ # so only test for the exception if the limit exists. -+ try: -+ re.compile("".join("(?P{n}-)".format(n=i) for i in range(101))) -+ except AssertionError: -+ p = parse.compile('{:ti}' * 15) -+ self.assertRaises(parse.TooManyFields, p.parse, '') - - - class TestSearch(unittest.TestCase): diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 3c816cda53..14a79a9b22 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1431,21 +1431,20 @@ backported for previous versions of Python from 2.4 to 3.3.") (define-public python-parse (package (name "python-parse") - (version "1.6.6") + (version "1.8.2") (source (origin (method url-fetch) (uri (pypi-uri "parse" version)) (sha256 (base32 - "0y31i3mwgv35qn0kzzjn9q8jqfdqmbi6sr6yfvn8rq4lqjm5lhvi")) - (patches (search-patches "python-parse-too-many-fields.patch")))) + "1lj9v1q4imszyhvipb6drsm3xdl35nan011mqxxas1yaypixsj40")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases (replace 'check - (lambda _ (zero? (system* "python" "test_parse.py"))))))) + (lambda _ (invoke "python" "test_parse.py")))))) (home-page "https://github.com/r1chardj0n3s/parse") (synopsis "Parse strings") (description -- cgit v1.2.3 From 557f8f212e9bfc28ce689a2ccbcc91c8dafe01b2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 26 Feb 2018 02:42:17 +0100 Subject: gnu: python-parse-type: Update to 0.4.2. * gnu/packages/python.scm (python-parse-type): Update to 0.4.2. [source](uri): Use PYPI-URI. [arguments]: Remove field. --- gnu/packages/python.scm | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 14a79a9b22..2129cbec07 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1386,26 +1386,15 @@ backported for previous versions of Python from 2.4 to 3.3.") (define-public python-parse-type (package (name "python-parse-type") - (version "0.3.4") + (version "0.4.2") (source (origin (method url-fetch) - (uri (string-append "https://pypi.python.org/packages/source/p/" - "parse_type/parse_type-" version ".tar.gz")) + (uri (pypi-uri "parse_type" version)) (sha256 (base32 - "0iv1c34npr4iynwpgv1vkjx9rjd18a85ir8c01gc5f7wp8iv7l1x")))) + "0g3b6gsdwnm8dpkh2vn34q6dzxm9gl908ggyzcv31n9xbp3vv5pm")))) (build-system python-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-tests - (lambda _ - (substitute* "tests/test_parse_type_parse.py" - ;; Newer Python versions don't have the problem this test tests. - (("self[.]assertRaises[(]parse.TooManyFields, p.parse, ''[)]") - "")) - #t))))) (propagated-inputs `(("python-six" ,python-six) ("python-parse" ,python-parse))) -- cgit v1.2.3 From b8509387d1e303b24204213c09fe82f35899ebff Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 26 Feb 2018 03:01:48 +0100 Subject: gnu: python-pathpy: Update to 11.0. * gnu/packages/python.scm (python-pathpy): Update to 11.0. [source](uri): Use PYPI-URI. [outputs]: Remove field. [arguments]: Set #:tests? #f. Remove #:phases. --- gnu/packages/python.scm | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 2129cbec07..1b5e3836d9 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4270,15 +4270,14 @@ them as the version argument or in a SCM managed file.") (define-public python-pathpy (package (name "python-pathpy") - (version "8.1.1") + (version "11.0") (source (origin (method url-fetch) - (uri (string-append "https://pypi.python.org/packages/source/p/" - "path.py/path.py-" version ".tar.gz")) + (uri (pypi-uri "path.py" version)) (sha256 - (base32 "1p8s1l2vfkqhqxdhqlj0g1jjw4f1as2frr35sjcpjjpd5a89y41f")))) - (outputs '("out" "doc")) + (base32 "12s84maimiz61980q065rjgi8ang6xw2wwm64m0lmfks51dlw4qn")))) + ;; (outputs '("out" "doc")) (build-system python-build-system) (propagated-inputs `(("python-appdirs" ,python-appdirs))) @@ -4289,22 +4288,24 @@ them as the version argument or in a SCM managed file.") ("python-pytest" ,python-pytest) ("python-pytest-runner" ,python-pytest-runner))) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'build 'build-doc - (lambda _ - (setenv "LANG" "en_US.UTF-8") - (zero? (system* "python" "setup.py" "build_sphinx")))) - (add-after 'install 'install-doc - (lambda* (#:key outputs #:allow-other-keys) - (let* ((data (string-append (assoc-ref outputs "doc") "/share")) - (doc (string-append data "/doc/" ,name "-" ,version)) - (html (string-append doc "/html"))) - (mkdir-p html) - (for-each (lambda (file) - (copy-file file (string-append doc "/" file))) - '("README.rst" "CHANGES.rst")) - (copy-recursively "build/sphinx/html" html))))))) + ;; FIXME: Documentation and tests require "jaraco.packaging". + `(#:tests? #f)) + ;; #:phases + ;; (modify-phases %standard-phases + ;; (add-after 'build 'build-doc + ;; (lambda _ + ;; (setenv "LANG" "en_US.UTF-8") + ;; (zero? (system* "python" "setup.py" "build_sphinx")))) + ;; (add-after 'install 'install-doc + ;; (lambda* (#:key outputs #:allow-other-keys) + ;; (let* ((data (string-append (assoc-ref outputs "doc") "/share")) + ;; (doc (string-append data "/doc/" ,name "-" ,version)) + ;; (html (string-append doc "/html"))) + ;; (mkdir-p html) + ;; (for-each (lambda (file) + ;; (copy-file file (string-append doc "/" file))) + ;; '("README.rst" "CHANGES.rst")) + ;; (copy-recursively "build/sphinx/html" html))))))) (home-page "https://github.com/jaraco/path.py") (synopsis "Python module wrapper for built-in os.path") (description -- cgit v1.2.3 From eddb9dacd2943301c7d1bc3cbad8df6ddab09c5a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 26 Feb 2018 03:05:58 +0100 Subject: gnu: behave: Update to 1.2.6. * gnu/packages/check.scm (behave): Update to 1.2.6. [source](uri): Adjust file extension. [native-inputs]: Add PYTHON-PATHPY and PYTHON-PYTEST. --- gnu/packages/check.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 8e1eb127b2..fbd2ac4f80 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1629,18 +1629,20 @@ backported from Python 2.7 for Python 2.4+.") (define-public behave (package (name "behave") - (version "1.2.5") + (version "1.2.6") (source (origin (method url-fetch) - (uri (pypi-uri "behave" version ".tar.bz2")) + (uri (pypi-uri "behave" version)) (sha256 (base32 - "1iypp6z46r19n4xmgx6m1lwmlpfjh8vapq8izigrqlaarvp2y64c")))) + "11hsz365qglvpp1m1w16239c3kiw15lw7adha49lqaakm8kj6rmr")))) (build-system python-build-system) (native-inputs `(("python-mock" ,python-mock) ("python-nose" ,python-nose) - ("python-pyhamcrest" ,python-pyhamcrest))) + ("python-pathpy" ,python-pathpy) + ("python-pyhamcrest" ,python-pyhamcrest) + ("python-pytest" ,python-pytest))) (propagated-inputs `(("python-six" ,python-six) ("python-parse" ,python-parse) -- cgit v1.2.3 From ed519b3c1fc8b3a57d86318018e93ff8822fcccd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 26 Feb 2018 04:23:46 +0100 Subject: gnu: python-pickleshare: Update to 0.7.4. * gnu/packages/databases.scm (python-pickleshare): Update to 0.7.4. [source](uri): Use PYPI-URI. [propagated-inputs]: Remove. [properties]: Delay python2 variant. (python2-pickleshare)[propagated-inputs]: Add PYTHON2-PATHLIB2. --- gnu/packages/databases.scm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 29b6ca1698..98686910d1 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2240,17 +2240,14 @@ SQLAlchemy Database Toolkit for Python.") (define-public python-pickleshare (package (name "python-pickleshare") - (version "0.5") + (version "0.7.4") (source (origin (method url-fetch) - (uri (string-append "https://pypi.python.org/packages/source/p/" - "pickleshare/pickleshare-" version ".tar.gz")) + (uri (pypi-uri "pickleshare" version)) (sha256 - (base32 "11ljr90j3p6qswdrbl7p4cjb2i93f6vn0vx9anzpshsx0d2mggn0")))) + (base32 "0yvk14dzxk7g6qpr7iw23vzqbsr0dh4ij4xynkhnzpfz4xr2bac4")))) (build-system python-build-system) - (propagated-inputs - `(("python-pathpy" ,python-pathpy))) (home-page "https://github.com/vivainio/pickleshare") (synopsis "Tiny key value database with concurrency support") (description @@ -2261,10 +2258,15 @@ value in database is immediately visible to other processes accessing the same database. Concurrency is possible because the values are stored in separate files. Hence the “database” is a directory where all files are governed by PickleShare.") + (properties `((python2-variant . ,(delay python2-pickleshare)))) (license license:expat))) (define-public python2-pickleshare - (package-with-python2 python-pickleshare)) + (let ((pickleshare (package-with-python2 + (strip-python2-variant python-pickleshare)))) + (package (inherit pickleshare) + (propagated-inputs `(("python2-pathlib2" ,python2-pathlib2) + ,@(package-propagated-inputs pickleshare)))))) (define-public python-apsw (package -- cgit v1.2.3 From 76397e12ada2832279fbd37dc89d1484adb5b4b1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 26 Feb 2018 04:35:38 +0100 Subject: gnu: python2-pathlib2: Propagate python2-six. * gnu/packages/python.scm (python2-pathlib2)[native-inputs]: Move to ... [propagated-inputs] ... here. --- gnu/packages/python.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 1b5e3836d9..82108baed1 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -8074,7 +8074,7 @@ anymore.") ;; standard library. (arguments `(#:python ,python-2)) - (native-inputs + (propagated-inputs `(("python2-six" ,python2-six))) (home-page "https://pypi.python.org/pypi/pathlib2/") (synopsis "Object-oriented file system paths - backport of standard -- cgit v1.2.3 From ff856cfdccd544394740fc5826cc0ef9ea54d247 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 26 Feb 2018 04:40:40 +0100 Subject: gnu: python-pickleshare: Run the tests. * gnu/packages/databases.scm (python-pickleshare)[arguments]: Replace CHECK-PHASE. [native-inputs]: Add PYTHON-PYTEST. --- gnu/packages/databases.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 98686910d1..56984af6e2 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2248,6 +2248,13 @@ SQLAlchemy Database Toolkit for Python.") (sha256 (base32 "0yvk14dzxk7g6qpr7iw23vzqbsr0dh4ij4xynkhnzpfz4xr2bac4")))) (build-system python-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "pytest")))))) + (native-inputs + `(("python-pytest" ,python-pytest))) (home-page "https://github.com/vivainio/pickleshare") (synopsis "Tiny key value database with concurrency support") (description -- cgit v1.2.3 From f160557b955a27c681d4482e7b541966e31e3c78 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 26 Feb 2018 04:47:22 +0100 Subject: gnu: python-ipython: Update to 5.5.0. * gnu/packages/python.scm (python-ipython): Update to 5.5.0. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 82108baed1..19f43dc27c 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4496,13 +4496,13 @@ installing @code{kernelspec}s for use with Jupyter frontends.") (define-public python-ipython (package (name "python-ipython") - (version "5.3.0") + (version "5.5.0") (source (origin (method url-fetch) (uri (pypi-uri "ipython" version ".tar.gz")) (sha256 - (base32 "079wyjir4a9qx6kvx096b1asm63djbidk65z3ykcbnlngmg62pmz")))) + (base32 "03qmzpfy00if10i9k8fjkam1s4xg22j73f933x5d228z9n4rwik6")))) (build-system python-build-system) (outputs '("out" "doc")) (propagated-inputs -- cgit v1.2.3 From ea3f45a5a0d9f55ca1df2c7f9d9fd45d624dd1a1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 26 Feb 2018 04:47:44 +0100 Subject: gnu: python2-pathlib2: Update to 2.3.0. * gnu/packages/python.scm (python2-pathlib2): Update to 2.3.0. [propagated-inputs]: Add PYTHON2-SCANDIR. --- gnu/packages/python.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 19f43dc27c..5b8c5081fc 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -8061,13 +8061,13 @@ anymore.") (define-public python2-pathlib2 (package (name "python2-pathlib2") - (version "2.1.0") + (version "2.3.0") (source (origin (method url-fetch) (uri (pypi-uri "pathlib2" version)) (sha256 (base32 - "0p050msg5c8d0kadv702jnfshaxrb0il765cpkgnhn6mq5hakcyy")))) + "1cx5gs2v9j2vnzmcrbq5l8fq2mwrr1h6pyf1sjdji2w1bavm09fk")))) (build-system python-build-system) ;; We only need the the Python 2 variant, since for Python 3 our minimum ;; version is 3.4 which already includes this package as part of the @@ -8075,7 +8075,8 @@ anymore.") (arguments `(#:python ,python-2)) (propagated-inputs - `(("python2-six" ,python2-six))) + `(("python2-scandir" ,python2-scandir) + ("python2-six" ,python2-six))) (home-page "https://pypi.python.org/pypi/pathlib2/") (synopsis "Object-oriented file system paths - backport of standard pathlib module") -- cgit v1.2.3 From 71a2d4176bdf7d88fd9d342b95ae74ed9685ec8d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 26 Feb 2018 05:01:16 +0100 Subject: gnu: python-scandir: Update to 1.7. * gnu/packages/python.scm (python-scandir): Update to 1.7. [description]: Mention that the Python3 variant is obsolete. --- gnu/packages/python.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 5b8c5081fc..64f48fd352 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -11083,13 +11083,13 @@ It supports both normal and Unicode strings.") (define-public python-scandir (package (name "python-scandir") - (version "1.4") + (version "1.7") (source (origin (method url-fetch) (uri (pypi-uri "scandir" version)) (sha256 - (base32 "0yjrgp0mxp3d8bjkq2m1ac2ys8n76wykksvgyjrnil9gr3fx7a5d")))) + (base32 "0gbnhjzg42rj87ljv9kb648rfxph69ly3c8r9841dxy4d7l5pmdj")))) (build-system python-build-system) (home-page "https://github.com/benhoyt/scandir") (synopsis "Directory iteration function") @@ -11098,7 +11098,9 @@ It supports both normal and Unicode strings.") returning a list of bare filenames, it yields DirEntry objects that include file type and stat information along with the name. Using scandir() increases the speed of os.walk() by 2-20 times (depending on the platform and file -system) by avoiding unnecessary calls to os.stat() in most cases.") +system) by avoiding unnecessary calls to os.stat() in most cases. + +This package is part of the Python standard library since version 3.5.") (license license:bsd-3))) (define-public python2-scandir -- cgit v1.2.3 From cb723be5b98a57ae4f909022d1ce2b5d3bcdaabf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 26 Feb 2018 05:03:22 +0100 Subject: gnu: python-scandir: Run the test suite. * gnu/packages/python.scm (python-scandir)[arguments]: Replace CHECK-PHASE. --- gnu/packages/python.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 64f48fd352..4946d9afd7 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -11091,6 +11091,11 @@ It supports both normal and Unicode strings.") (sha256 (base32 "0gbnhjzg42rj87ljv9kb648rfxph69ly3c8r9841dxy4d7l5pmdj")))) (build-system python-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "python" "test/run_tests.py")))))) (home-page "https://github.com/benhoyt/scandir") (synopsis "Directory iteration function") (description -- cgit v1.2.3 From 1d84d7bf6052c0c80bd212d4524876576e9817d4 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 15 Feb 2018 16:13:36 +0100 Subject: build: Require Guile >= 2.0.13. * README, configure.ac, doc/guix.texi (Requirements): Increase minimum Guile version from 2.0.9 to 2.0.13. * config-daemon.ac: Remove use of 'GUIX_CHECK_UNBUFFERED_CBIP'. * m4/guix.m4 (GUIX_CHECK_UNBUFFERED_CBIP): Remove. * guix/build/download.scm (current-http-proxy): Remove. * guix/build/syscalls.scm (%libc-errno-pointer, errno): Remove. (syscall->procedure): Use #:return-errno unconditionally. * guix/hash.scm (open-sha256-input-port)[unbuffered]: Remove outdated comment. * guix/http-client.scm (when-guile<=2.0.5-or-otherwise-broken): Remove. : Remove 'when-guile<=2.0.5-or-otherwise-broken' block. * guix/scripts/substitute.scm (fetch): Remove 'guile-version>?' conditional. * tests/hash.scm (supports-unbuffered-cbip?): Remove. : Remove 'test-skip' call. --- README | 2 +- config-daemon.ac | 5 -- configure.ac | 2 +- doc/guix.texi | 2 +- guix/build/download.scm | 10 +-- guix/build/syscalls.scm | 48 +------------- guix/hash.scm | 3 +- guix/http-client.scm | 154 +------------------------------------------- guix/scripts/substitute.scm | 18 ++---- m4/guix.m4 | 17 ----- tests/hash.scm | 11 +--- 11 files changed, 14 insertions(+), 258 deletions(-) diff --git a/README b/README index d96a43bbef..243a6c058c 100644 --- a/README +++ b/README @@ -20,7 +20,7 @@ Guix is based on the [[https://nixos.org/nix/][Nix]] package manager. GNU Guix currently depends on the following packages: - - [[https://gnu.org/software/guile/][GNU Guile 2.2.x or 2.0.x]], version 2.0.9 or later + - [[https://gnu.org/software/guile/][GNU Guile 2.2.x or 2.0.x]], version 2.0.13 or later - [[https://gnupg.org/][GNU libgcrypt]] - [[https://www.gnu.org/software/make/][GNU Make]] - [[https://www.gnutls.org][GnuTLS]] compiled with guile support enabled. diff --git a/config-daemon.ac b/config-daemon.ac index 80d84cbdbc..524b10b303 100644 --- a/config-daemon.ac +++ b/config-daemon.ac @@ -132,11 +132,6 @@ if test "x$guix_build_daemon" = "xyes"; then AC_DEFINE_UNQUOTED([GUIX_SUBSTITUTE_URLS], ["$guix_substitute_urls"], [Default list of substitute URLs used by 'guix-daemon'.]) - dnl Check whether the 'offload' build hook can be built (uses - dnl 'restore-file-set', which requires unbuffered custom binary input - dnl ports from Guile >= 2.0.10.) - GUIX_CHECK_UNBUFFERED_CBIP - dnl Check for Guile-SSH, which is required by 'guix offload'. GUIX_CHECK_GUILE_SSH diff --git a/configure.ac b/configure.ac index 398846f64b..5872a84823 100644 --- a/configure.ac +++ b/configure.ac @@ -98,7 +98,7 @@ if test "x$GUILD" = "x"; then fi if test "x$GUILE_EFFECTIVE_VERSION" = "x2.0"; then - PKG_CHECK_MODULES([GUILE], [guile-2.0 >= 2.0.9]) + PKG_CHECK_MODULES([GUILE], [guile-2.0 >= 2.0.13]) fi dnl Installation directories for .scm and .go files. diff --git a/doc/guix.texi b/doc/guix.texi index 691164502b..f9d7e13e21 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -601,7 +601,7 @@ in the Guix source tree for additional details. GNU Guix depends on the following packages: @itemize -@item @url{http://gnu.org/software/guile/, GNU Guile}, version 2.0.9 or +@item @url{http://gnu.org/software/guile/, GNU Guile}, version 2.0.13 or later, including 2.2.x; @item @url{http://gnupg.org/, GNU libgcrypt}; @item diff --git a/guix/build/download.scm b/guix/build/download.scm index 1b630a9d6d..315a3554ec 100644 --- a/guix/build/download.scm +++ b/guix/build/download.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; @@ -321,14 +321,6 @@ host name without trailing dot." ((uri? uri-or-string) uri-or-string) (else (error "Invalid URI" uri-or-string)))) -(define current-http-proxy - ;; XXX: Add a dummy definition for Guile < 2.0.10; this is used in - ;; 'open-socket-for-uri'. - (or (and=> (module-variable (resolve-interface '(web client)) - 'current-http-proxy) - variable-ref) - (const #f))) - (define* (open-socket-for-uri uri-or-string #:key timeout) "Return an open input/output port for a connection to URI. When TIMEOUT is not #f, it must be a (possibly inexact) number denoting the maximum duration diff --git a/guix/build/syscalls.scm b/guix/build/syscalls.scm index 0cb630cfb3..25726b885e 100644 --- a/guix/build/syscalls.scm +++ b/guix/build/syscalls.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014, 2015, 2016, 2017 Ludovic Courtès +;;; Copyright © 2014, 2015, 2016, 2017, 2018 Ludovic Courtès ;;; Copyright © 2015 David Thompson ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2017 Mathieu Othacehe @@ -350,39 +350,6 @@ expansion-time error is raised if FIELD does not exist in TYPE." ;;; FFI. ;;; -(define %libc-errno-pointer - ;; Glibc's 'errno' pointer, for use with Guile < 2.0.12. - (let ((errno-loc (false-if-exception - (dynamic-func "__errno_location" (dynamic-link))))) - (and errno-loc - (let ((proc (pointer->procedure '* errno-loc '()))) - (proc))))) - -(define errno ;for Guile < 2.0.12 - (if %libc-errno-pointer - (let ((bv (pointer->bytevector %libc-errno-pointer (sizeof int)))) - (lambda () - "Return the current errno." - ;; XXX: We assume that nothing changes 'errno' while we're doing all this. - ;; In particular, that means that no async must be running here. - - ;; Use one of the fixed-size native-ref procedures because they are - ;; optimized down to a single VM instruction, which reduces the risk - ;; that we fiddle with 'errno' (needed on Guile 2.0.5, libc 2.11.) - (let-syntax ((ref (lambda (s) - (syntax-case s () - ((_ bv) - (case (sizeof int) - ((4) - #'(bytevector-s32-native-ref bv 0)) - ((8) - #'(bytevector-s64-native-ref bv 0)) - (else - (error "unsupported 'int' size" - (sizeof int))))))))) - (ref bv)))) - (lambda () 0))) - (define (call-with-restart-on-EINTR thunk) (let loop () (catch 'system-error @@ -406,17 +373,8 @@ the returned procedure is called." (lambda () (let ((ptr (dynamic-func name (dynamic-link)))) ;; The #:return-errno? facility was introduced in Guile 2.0.12. - ;; Support older versions of Guile by catching 'wrong-number-of-args'. - (catch 'wrong-number-of-args - (lambda () - (pointer->procedure return-type ptr argument-types - #:return-errno? #t)) - (lambda (key . rest) - (let ((proc (pointer->procedure return-type ptr argument-types))) - (lambda args - (let ((result (apply proc args)) - (err (errno))) - (values result err)))))))) + (pointer->procedure return-type ptr argument-types + #:return-errno? #t))) (lambda args (lambda _ (error (format #f "~a: syscall->procedure failed: ~s" diff --git a/guix/hash.scm b/guix/hash.scm index 44e4472580..773b9d4777 100644 --- a/guix/hash.scm +++ b/guix/hash.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2018 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -159,7 +159,6 @@ data read from PORT. The thunk always returns the same value." (define (unbuffered port) ;; Guile <= 2.0.9 does not support 'setvbuf' on custom binary input ports. - ;; If you get a wrong-type-arg error here, the fix is to upgrade Guile. :-) (setvbuf port _IONBF) port) diff --git a/guix/http-client.scm b/guix/http-client.scm index bab31875d1..e8a2a23fc5 100644 --- a/guix/http-client.scm +++ b/guix/http-client.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2012, 2015 Free Software Foundation, Inc. ;;; Copyright © 2017 Tobias Geerinckx-Rice @@ -69,158 +69,6 @@ (reason http-get-error-reason)) ; string -(define-syntax when-guile<=2.0.5-or-otherwise-broken - (lambda (s) - (syntax-case s () - ((_ body ...) - ;; Always emit BODY, regardless of VERSION, because sometimes this code - ;; might be compiled with a recent Guile and run with 2.0.5---e.g., - ;; when using "guix pull". - #'(begin body ...))))) - -(when-guile<=2.0.5-or-otherwise-broken - ;; Backport of Guile commits 312e79f8 ("Add HTTP Chunked Encoding support to - ;; web modules."), 00d3ecf2 ("http: Do not buffer HTTP chunks."), and 53b8d5f - ;; ("web: Gracefully handle premature EOF when reading chunk header.") - - (use-modules (ice-9 rdelim)) - - (define %web-http - (resolve-module '(web http))) - - ;; Chunked Responses - (define (read-chunk-header port) - "Read a chunk header from PORT and return the size in bytes of the - upcoming chunk." - (match (read-line port) - ((? eof-object?) - ;; Connection closed prematurely: there's nothing left to read. - 0) - (str - (let ((extension-start (string-index str - (lambda (c) - (or (char=? c #\;) - (char=? c #\return)))))) - (string->number (if extension-start ; unnecessary? - (substring str 0 extension-start) - str) - 16))))) - - (define* (make-chunked-input-port port #:key (keep-alive? #f)) - "Returns a new port which translates HTTP chunked transfer encoded -data from PORT into a non-encoded format. Returns eof when it has -read the final chunk from PORT. This does not necessarily mean -that there is no more data on PORT. When the returned port is -closed it will also close PORT, unless the KEEP-ALIVE? is true." - (define (close) - (unless keep-alive? - (close-port port))) - - (define chunk-size 0) ;size of the current chunk - (define remaining 0) ;number of bytes left from the current chunk - (define finished? #f) ;did we get all the chunks? - - (define (read! bv idx to-read) - (define (loop to-read num-read) - (cond ((or finished? (zero? to-read)) - num-read) - ((zero? remaining) ;get a new chunk - (let ((size (read-chunk-header port))) - (set! chunk-size size) - (set! remaining size) - (if (zero? size) - (begin - (set! finished? #t) - num-read) - (loop to-read num-read)))) - (else ;read from the current chunk - (let* ((ask-for (min to-read remaining)) - (read (get-bytevector-n! port bv (+ idx num-read) - ask-for))) - (if (eof-object? read) - (begin ;premature termination - (set! finished? #t) - num-read) - (let ((left (- remaining read))) - (set! remaining left) - (when (zero? left) - ;; We're done with this chunk; read CR and LF. - (get-u8 port) (get-u8 port)) - (loop (- to-read read) - (+ num-read read)))))))) - (loop to-read 0)) - - (make-custom-binary-input-port "chunked input port" read! #f #f close)) - - ;; Chunked encoding support in Guile <= 2.0.11 would load whole chunks in - ;; memory---see . - (when (module-variable %web-http 'read-chunk-body) - (module-set! %web-http 'make-chunked-input-port make-chunked-input-port)) - - (define (make-delimited-input-port port len keep-alive?) - "Return an input port that reads from PORT, and makes sure that -exactly LEN bytes are available from PORT. Closing the returned port -closes PORT, unless KEEP-ALIVE? is true." - (define bytes-read 0) - - (define (fail) - ((@@ (web response) bad-response) - "EOF while reading response body: ~a bytes of ~a" - bytes-read len)) - - (define (read! bv start count) - ;; Read at most LEN bytes in total. HTTP/1.1 doesn't say what to do - ;; when a server provides more than the Content-Length, but it seems - ;; wise to just stop reading at LEN. - (let ((count (min count (- len bytes-read)))) - (let loop ((ret (get-bytevector-n! port bv start count))) - (cond ((eof-object? ret) - (if (= bytes-read len) - 0 ; EOF - (fail))) - ((and (zero? ret) (> count 0)) - ;; Do not return zero since zero means EOF, so try again. - (loop (get-bytevector-n! port bv start count))) - (else - (set! bytes-read (+ bytes-read ret)) - ret))))) - - (define close - (and (not keep-alive?) - (lambda () - (close-port port)))) - - (make-custom-binary-input-port "delimited input port" read! #f #f close)) - - (define (read-header-line port) - "Read an HTTP header line and return it without its final CRLF or LF. -Raise a 'bad-header' exception if the line does not end in CRLF or LF, -or if EOF is reached." - (match (%read-line port) - (((? string? line) . #\newline) - ;; '%read-line' does not consider #\return a delimiter; so if it's - ;; there, remove it. We are more tolerant than the RFC in that we - ;; tolerate LF-only endings. - (if (string-suffix? "\r" line) - (string-drop-right line 1) - line)) - ((line . _) ;EOF or missing delimiter - ((@@ (web http) bad-header) 'read-header-line line)))) - - (unless (guile-version>? "2.0.11") - ;; Guile <= 2.0.9 had a bug whereby 'response-body-port' would read more - ;; than what 'content-length' says. See Guile commit 802a25b. - ;; Guile <= 2.0.11 had a bug whereby the 'close' method of the response - ;; body port would fail with wrong-arg-num. See Guile commit 5a10e41. - (module-set! (resolve-module '(web response)) - 'make-delimited-input-port make-delimited-input-port) - - ;; Guile <= 2.0.11 was affected by . See Guile - ;; commit 4c7732c. - (when (module-variable %web-http 'read-line*) - (module-set! %web-http 'read-line* read-header-line)))) - - (define* (http-fetch uri #:key port (text? #f) (buffered? #t) keep-alive? (verify-certificate? #t) (headers '((user-agent . "GNU Guile")))) diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm index 2fd2bf8104..8e1119fb49 100755 --- a/guix/scripts/substitute.scm +++ b/guix/scripts/substitute.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès ;;; Copyright © 2014 Nikita Karetnikov ;;; ;;; This file is part of GNU Guix. @@ -212,15 +212,7 @@ provide." (begin (warning (G_ "while fetching ~a: server is somewhat slow~%") (uri->string uri)) - (warning (G_ "try `--no-substitutes' if the problem persists~%")) - - ;; Before Guile v2.0.9-39-gfe51c7b, EINTR was reported to the user, - ;; and thus PORT had to be closed and re-opened. This is not the - ;; case afterward. - (unless (or (guile-version>? "2.0.9") - (version>? (version) "2.0.9.39")) - (when port - (close-connection port)))) + (warning (G_ "try `--no-substitutes' if the problem persists~%"))) (begin (when (or (not port) (port-closed? port)) (set! port (guix:open-connection-for-uri @@ -571,10 +563,8 @@ initial connection on which HTTP requests are sent." ;; XXX: Do our own caching to work around inefficiencies when ;; communicating over TLS: . (let-values (((buffer get) (open-bytevector-output-port))) - ;; On Guile > 2.0.9, inherit the HTTP proxying property from P. - (when (module-variable (resolve-interface '(web http)) - 'http-proxy-port?) - (set-http-proxy-port?! buffer (http-proxy-port? p))) + ;; Inherit the HTTP proxying property from P. + (set-http-proxy-port?! buffer (http-proxy-port? p)) (for-each (cut write-request <> buffer) (at-most 1000 requests)) diff --git a/m4/guix.m4 b/m4/guix.m4 index 721285b014..8e174e92e5 100644 --- a/m4/guix.m4 +++ b/m4/guix.m4 @@ -136,23 +136,6 @@ AC_DEFUN([GUIX_ASSERT_GUILE_FEATURES], [ done ]) -dnl GUIX_CHECK_UNBUFFERED_CBIP -dnl -dnl Check whether 'setbvuf' works on custom binary input ports (CBIPs), as is -dnl the case starting with Guile 2.0.10. -AC_DEFUN([GUIX_CHECK_UNBUFFERED_CBIP], [ - AC_CACHE_CHECK([whether Guile's custom binary input ports support 'setvbuf'], - [ac_cv_guix_cbips_support_setvbuf], - [if "$GUILE" -c "(use-modules (rnrs io ports)) \ - (let ((p (make-custom-binary-input-port \"cbip\" pk #f #f #f))) \ - (setvbuf p _IONBF))" >&5 2>&1 - then - ac_cv_guix_cbips_support_setvbuf=yes - else - ac_cv_guix_cbips_support_setvbuf=no - fi]) -]) - dnl GUIX_ASSERT_SYNTAX_OBJECT_EQUAL dnl dnl Guile 2.2.1 was a brown-paper-bag release where 'equal?' wouldn't work diff --git a/tests/hash.scm b/tests/hash.scm index b189e435c8..b4cf2b61d6 100644 --- a/tests/hash.scm +++ b/tests/hash.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2017 Ludovic Courtès +;;; Copyright © 2013, 2014, 2017, 2018 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -37,13 +37,6 @@ (base16-string->bytevector "b94d27b9934d3e08a52e52d7da7dabfac484efe37a5380ee9088f7ace2efcde9")) -(define (supports-unbuffered-cbip?) - "Return #t if unbuffered custom binary input ports (CBIPs) are supported. -In Guile <= 2.0.9, CBIPs were always fully buffered, so the -'open-sha256-input-port' does not work there." - (false-if-exception - (setvbuf (make-custom-binary-input-port "foo" pk #f #f #f) _IONBF))) - (test-begin "hash") @@ -77,8 +70,6 @@ In Guile <= 2.0.9, CBIPs were always fully buffered, so the (equal? (sha256 contents) (call-with-input-file file port-sha256)))) -(test-skip (if (supports-unbuffered-cbip?) 0 4)) - (test-equal "open-sha256-input-port, empty" `("" ,%empty-sha256) (let-values (((port get) -- cgit v1.2.3 From ecbea1bcb1e349eb66140cb3b83329f9699c357a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 26 Feb 2018 19:47:54 +0100 Subject: gnu: automake: Add 1.16. * gnu/packages/autotools.scm (automake-1.16): New variable. --- gnu/packages/autotools.scm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm index 355e66f42a..846e318aa1 100644 --- a/gnu/packages/autotools.scm +++ b/gnu/packages/autotools.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012 Nikita Karetnikov -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès ;;; Copyright © 2015 Mathieu Lirzin ;;; Copyright © 2014 Manolis Fragkiskos Ragkousis ;;; Copyright © 2015, 2017 Mark H Weaver @@ -315,6 +315,21 @@ intuitive format and then Automake works with Autoconf to produce a robust Makefile, simplifying the entire process for the developer.") (license gpl2+))) ; some files are under GPLv3+ +(define-public automake-1.16 + ;; Make this the default on the next rebuild cycle. + (package + (inherit automake) + (version "1.16") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/automake/automake-" + version ".tar.xz")) + (sha256 + (base32 + "12jvcmkcmd5p14b41w9f7ixd3sca97pymd6lqbkwnl8qn6bjv3zr")) + (patches + (search-patches "automake-skip-amhello-tests.patch")))))) + (define-public libtool (package (name "libtool") -- cgit v1.2.3 From 54d82c81d558b593f1f515ac6c735fd48e5929ca Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 24 Feb 2018 13:51:13 +0100 Subject: gnu: libfilezilla: Update to 0.12.1. * gnu/packages/ftp.scm (libfilezilla): Update to 0.12.1. --- gnu/packages/ftp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ftp.scm b/gnu/packages/ftp.scm index a70398f678..4ad6bcbf1b 100644 --- a/gnu/packages/ftp.scm +++ b/gnu/packages/ftp.scm @@ -173,7 +173,7 @@ as required.") (define-public libfilezilla (package (name "libfilezilla") - (version "0.12.0") + (version "0.12.1") (source (origin (method url-fetch) @@ -181,7 +181,7 @@ as required.") name "/" name "-" version ".tar.bz2")) (sha256 (base32 - "14zag4mhwp5mbir63j1k01jys973kmrivznmm78v6qa92l64jn0a")))) + "1gbqm42dd0m3fvqz3bk53889479dvn8679zp6ba8a9q2br2wkvv0")))) (build-system gnu-build-system) (native-inputs `(("cppunit" ,cppunit) -- cgit v1.2.3 From d5a352937aad9e1afbf042889d5134a5bea30423 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 24 Feb 2018 15:00:27 +0100 Subject: gnu: youtube-dl: Update to 2018.02.22. * gnu/packages/video.scm (youtube-dl): Update to 2018.02.22. --- 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 bf7a3960d4..8008cdd608 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1157,7 +1157,7 @@ access to mpv's powerful playback capabilities.") (define-public youtube-dl (package (name "youtube-dl") - (version "2018.02.11") + (version "2018.02.22") (source (origin (method url-fetch) (uri (string-append "https://yt-dl.org/downloads/" @@ -1165,7 +1165,7 @@ access to mpv's powerful playback capabilities.") version ".tar.gz")) (sha256 (base32 - "0zg34spkfiwjq55jrk417ifdcyvrj80gdbc338rdpfw2s6ibggv8")))) + "112qmwrkd0cpyx2h20k6y07lw7iixvj8yya7r97h3k1y1py9vbz8")))) (build-system python-build-system) (arguments ;; The problem here is that the directory for the man page and completion -- cgit v1.2.3 From 7ed1abfa81ff87cfeb2043b953f79b4b894e8de6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 24 Feb 2018 15:10:44 +0100 Subject: gnu: gource: Update to 0.48. * gnu/packages/version-control.scm (gource): Update to 0.48. --- gnu/packages/version-control.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 91698b5f7f..7a0f37b4e7 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1768,7 +1768,7 @@ network protocols, and core version control algorithms.") (define-public gource (package (name "gource") - (version "0.47") + (version "0.48") (source (origin (method url-fetch) (uri (string-append @@ -1776,7 +1776,7 @@ network protocols, and core version control algorithms.") "/gource-" version "/gource-" version ".tar.gz")) (sha256 (base32 - "1llqwdnfa1pff8bxk27qsqff1fcg0a9kfdib0rn7p28vl21n1cgj")))) + "04qxcm05qiyr9rg2kv6abfy7kkzqr8ziw4iyp1d14lniv93m61dp")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 383ad03e832ec52c3e24780cb188e5ec71ae7620 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 24 Feb 2018 15:02:22 +0100 Subject: gnu: tinc: Update to 1.0.33. * gnu/packages/vpn.scm (tinc): Update to 1.0.33. --- gnu/packages/vpn.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index d7f5dc6597..952f12ce55 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2014 Eric Bavier ;;; Copyright © 2015 Jeff Mickey ;;; Copyright © 2016, 2017 Efraim Flashner -;;; Copyright © 2016, 2017 Tobias Geerinckx-Rice +;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2017 Julien Lepiller ;;; ;;; This file is part of GNU Guix. @@ -272,14 +272,14 @@ traversing network address translators (NATs) and firewalls.") (define-public tinc (package (name "tinc") - (version "1.0.28") + (version "1.0.33") (source (origin (method url-fetch) (uri (string-append "http://tinc-vpn.org/packages/" name "-" version ".tar.gz")) (sha256 (base32 - "0i5kx3hza359nclyhb60kxlzqyx0phmg175350hww28g6scjcl0b")))) + "1x0hpfz13vn4pl6dcpnls6xq3rfcbdsg90awcfn53ijb8k35svvz")))) (build-system gnu-build-system) (arguments '(#:configure-flags -- cgit v1.2.3 From 74b977d7259db7684dad52d4f01635df5ac80873 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 24 Feb 2018 15:30:50 +0100 Subject: gnu: libdvbpsi: Update to 1.3.2. * gnu/packages/video.scm (libdvbpsi): Update to 1.3.2. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 8008cdd608..a1ead1d609 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2475,7 +2475,7 @@ RTSP or SIP clients and servers.") (define-public libdvbpsi (package (name "libdvbpsi") - (version "1.3.1") + (version "1.3.2") (source (origin (method url-fetch) (uri (string-append @@ -2483,7 +2483,7 @@ RTSP or SIP clients and servers.") version "/libdvbpsi-" version ".tar.bz2")) (sha256 (base32 - "0824r08kaspbrrg2dd5d46s475zb7j59brqkm2y6x3mdsnpng0yn")))) + "1zn5hfv4qbahmydbwh59a3b480s3m5ss27r6ml35gqdip7r3jkmc")))) (build-system gnu-build-system) (home-page "https://www.videolan.org/developers/libdvbpsi.html") (synopsis "Library for decoding and generation of MPEG TS and DVB PSI -- cgit v1.2.3 From 24a300b1bde7099b482bb4b8b7ecc27a5249a1e0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 26 Feb 2018 01:15:57 +0100 Subject: gnu: dvdstyler: Remove hard-coded version string. * gnu/packages/cdrom.scm (dvdstyler)[arguments]: Remove a hard-coded version string from the docbook-xsl search path. --- gnu/packages/cdrom.scm | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index 598b584cb3..672064db12 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2016 Marius Bakke ;;; Copyright © 2017 John Darrington ;;; Copyright © 2017 Thomas Danckaert -;;; Copyright © 2017 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2017 ng0 ;;; ;;; This file is part of GNU Guix. @@ -360,14 +360,15 @@ capacity is user-selectable.") "0lwc0hn94m9r8fi07sjqz3fr618l6lnw3zsakxw7nlgnxbjsk7pi")))) (build-system gnu-build-system) (arguments - `(#:configure-flags (list (string-append "XMLTO=" - (assoc-ref %build-inputs "xmlto") - "/bin/xmlto" - " --searchpath " - (assoc-ref %build-inputs "docbook-xsl") - "/xml/xsl/docbook-xsl-1.79.1/htmlhelp:" - (assoc-ref %build-inputs "docbook-xml") - "/xml/dtd/docbook")) + `(#:configure-flags + (list (string-append "XMLTO=" + (assoc-ref %build-inputs "xmlto") + "/bin/xmlto --searchpath " + (assoc-ref %build-inputs "docbook-xsl") + "/xml/xsl/docbook-xsl-" ,(package-version docbook-xsl) + "/htmlhelp:" + (assoc-ref %build-inputs "docbook-xml") + "/xml/dtd/docbook")) #:phases (modify-phases %standard-phases (add-after 'install 'wrap-program -- cgit v1.2.3 From 6f8d1f72743e2faa44b28a80fafb35254279fd1b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 26 Feb 2018 06:49:41 +0100 Subject: gnu: perl-http-server-simple: Update to 0.52. * gnu/packages/web.scm (perl-http-server-simple): Update to 0.52. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 801741dd22..5bcdf28f7d 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -2848,7 +2848,7 @@ environment from an HTTP::Request.") (define-public perl-http-server-simple (package (name "perl-http-server-simple") - (version "0.51") + (version "0.52") (source (origin (method url-fetch) @@ -2856,7 +2856,7 @@ environment from an HTTP::Request.") "HTTP-Server-Simple-" version ".tar.gz")) (sha256 (base32 - "1yvd2g57z2kq00q5i3zzfi15k98qgbif3vghjsda6v612agmrp5r")))) + "0k6bg7k6mjixfzxdkkdrhqvaqmdhjszx0zsk8g0bimiby6j9z4yq")))) (build-system perl-build-system) (propagated-inputs `(("perl-cgi" ,perl-cgi))) -- cgit v1.2.3 From 12505baed9dfa179a8cb47e128a8e028d1699d3d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 26 Feb 2018 06:50:17 +0100 Subject: gnu: perl-net-smtp-ssl: Update to 1.04. * gnu/packages/web.scm (perl-net-smtp-ssl): Update to 1.04. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 5bcdf28f7d..d597d2bfb6 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -3208,7 +3208,7 @@ or to multiple server ports.") (define-public perl-net-smtp-ssl (package (name "perl-net-smtp-ssl") - (version "1.03") + (version "1.04") (source (origin (method url-fetch) @@ -3216,7 +3216,7 @@ or to multiple server ports.") "Net-SMTP-SSL-" version ".tar.gz")) (sha256 (base32 - "05y94mb1vdw32mvwb0cp2h4ggh32f8j8nwwfjb8kjwxvfkfhyp9h")))) + "001a6dcfahf7kkyirqkc8jd4fh4fkal7n7vm9c4dblqrvmdc8abv")))) (build-system perl-build-system) (propagated-inputs `(("perl-io-socket-ssl" ,perl-io-socket-ssl))) -- cgit v1.2.3 From 73a3e98f01973b1f92fe9a1b905c6d14c4d8f5ae Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 25 Feb 2018 15:48:36 +0100 Subject: gnu: perl-xml-libxslt: Update to 1.96. * gnu/packages/xml.scm (perl-xml-libxslt): Update to 1.96. --- 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 cc5e19af27..820083e7cb 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -425,7 +425,7 @@ XML parser and the high performance DOM implementation.") (define-public perl-xml-libxslt (package (name "perl-xml-libxslt") - (version "1.95") + (version "1.96") (source (origin (method url-fetch) @@ -433,7 +433,7 @@ XML parser and the high performance DOM implementation.") "XML-LibXSLT-" version ".tar.gz")) (sha256 (base32 - "0dggycql18kfxzkb1kw3yc7gslxlrrgyyn2r2ygsylycb89j3jpi")))) + "0wyl8klgr65j8y8fzgwz9jlvfjwvxazna8j3dg9gksd2v973fpia")))) (build-system perl-build-system) (inputs `(("libxslt" ,libxslt))) -- cgit v1.2.3 From 3c4bbb4c52418c8daf8b0e4605e3912685c9f44a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 24 Feb 2018 13:33:42 +0100 Subject: gnu: polkit: Update phase & snippet style. * gnu/packages/polkit.scm (polkit)[source]: End snippet with #t. [arguments]: Substitute INVOKE for SYSTEM* and end phases with #t. --- gnu/packages/polkit.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/gnu/packages/polkit.scm b/gnu/packages/polkit.scm index 0e38dd61ee..8fe37097e1 100644 --- a/gnu/packages/polkit.scm +++ b/gnu/packages/polkit.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2017 Huang Ying +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -77,7 +78,8 @@ ;; Set the setuid helper's real location. (substitute* "src/polkitagent/polkitagentsession.c" (("PACKAGE_PREFIX \"/lib/polkit-1/polkit-agent-helper-1\"") - "\"/run/setuid-programs/polkit-agent-helper-1\"")))))) + "\"/run/setuid-programs/polkit-agent-helper-1\"")) + #t)))) (build-system gnu-build-system) (inputs `(("expat" ,expat) @@ -105,7 +107,8 @@ (("@INTROSPECTION_GIRDIR@") (string-append out "/share/gir-1.0/")) (("@INTROSPECTION_TYPELIBDIR@") - (string-append out "/lib/girepository-1.0/")))))) + (string-append out "/lib/girepository-1.0/"))) + #t))) (replace 'install (lambda* (#:key outputs (make-flags '()) #:allow-other-keys) @@ -113,12 +116,12 @@ ;; to install in /etc, and to instead install the skeletons in the ;; output directory. (let ((out (assoc-ref outputs "out"))) - (zero? (apply system* - "make" "install" + (invoke "make" "install" (string-append "sysconfdir=" out "/etc") (string-append "polkit_actiondir=" out "/share/polkit-1/actions") - make-flags)))))))) + make-flags) + #t)))))) (home-page "http://www.freedesktop.org/wiki/Software/polkit/") (synopsis "Authorization API for privilege management") (description "Polkit is an application-level toolkit for defining and -- cgit v1.2.3 From 57e7d7486ba17d7b5407ebc429ce8553460371ea Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 24 Feb 2018 13:44:26 +0100 Subject: gnu: Use HTTPS for supported freedesktop.org home pages. * gnu/packages/fontutils.scm (fontconfig)[home-page]: Use HTTPS. * gnu/packages/freedesktop.scm (python-pyxdg, accountsservice) (modem-manager, telepathy-mission-control, telepathy-mission-control) (colord-gtk, desktop-file-utils)[home-page]: Likewise. * gnu/packages/ghostscript.scm (libspectre)[home-page]: Likewise. * gnu/packages/glib.scm (dbus, dbus-glib, telepathy-glib)[home-page]: Likewise. * gnu/packages/gnome.scm (shared-mime-info, hicolor-icon-theme) (libxklavier, colord, upower)[home-page]: Likewise. * gnu/packages/gstreamer.scm (orc, python-gst)[home-page]: Likewise. * gnu/packages/libcanberra.scm (sound-theme-freedesktop)[home-page]: Likewise. * gnu/packages/libreoffice.scm (libexttextcat)[home-page]: Likewise. * gnu/packages/polkit.scm (polkit-gnome, polkit-gnome)[home-page]: Likewise. * gnu/packages/pulseaudio.scm (pavucontrol)[home-page]: Likewise. * gnu/packages/python.scm (python-dbus)[home-page]: Likewise. * gnu/packages/xdisorg.scm (startup-notification)[home-page]: Likewise. --- gnu/packages/fontutils.scm | 2 +- gnu/packages/freedesktop.scm | 14 +++++++------- gnu/packages/ghostscript.scm | 2 +- gnu/packages/glib.scm | 6 +++--- gnu/packages/gnome.scm | 10 +++++----- gnu/packages/gstreamer.scm | 4 ++-- gnu/packages/libcanberra.scm | 2 +- gnu/packages/libreoffice.scm | 2 +- gnu/packages/polkit.scm | 4 ++-- gnu/packages/pulseaudio.scm | 2 +- gnu/packages/python.scm | 2 +- gnu/packages/xdisorg.scm | 2 +- 12 files changed, 26 insertions(+), 26 deletions(-) diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index a04441a005..a5e8c79371 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -290,7 +290,7 @@ high quality, anti-aliased and subpixel rendered text on a display.") ; The exact license is more X11-style than BSD-style. (license (license:non-copyleft "file://COPYING" "See COPYING in the distribution.")) - (home-page "http://www.freedesktop.org/wiki/Software/fontconfig"))) + (home-page "https://www.freedesktop.org/wiki/Software/fontconfig"))) (define-public t1lib (package diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 63adb4d076..3c83e668b0 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -409,7 +409,7 @@ manager for the current system.") `(("shared-mime-info" ,shared-mime-info) ;for tests ("hicolor-icon-theme" ,hicolor-icon-theme) ;for tests ("python-nose" ,python-nose))) - (home-page "http://freedesktop.org/wiki/Software/pyxdg") + (home-page "https://www.freedesktop.org/wiki/Software/pyxdg") (synopsis "Implementations of freedesktop.org standards in Python") (description "PyXDG is a collection of implementations of freedesktop.org standards in @@ -740,7 +740,7 @@ message bus.") (inputs `(("shadow" ,shadow) ("polkit" ,polkit))) - (home-page "http://www.freedesktop.org/wiki/Software/AccountsService/") + (home-page "https://www.freedesktop.org/wiki/Software/AccountsService/") (synopsis "D-Bus interface for user account query and manipulation") (description "The AccountService project provides a set of D-Bus interfaces for querying @@ -840,7 +840,7 @@ which speak the Qualcomm MSM Interface (QMI) protocol.") ("libqmi" ,libqmi) ("polkit" ,polkit))) (synopsis "Mobile broadband modems manager") - (home-page "http://www.freedesktop.org/wiki/Software/ModemManager/") + (home-page "https://www.freedesktop.org/wiki/Software/ModemManager/") (description "ModemManager is a DBus-activated daemon which controls mobile broadband (2G/3G/4G) devices and connections. Whether built-in devices, USB @@ -882,7 +882,7 @@ modems and setup connections with them.") ("sqlite" ,sqlite) ("telepathy-glib" ,telepathy-glib))) (synopsis "Telepathy logger library") - (home-page "http://telepathy.freedesktop.org/") + (home-page "https://telepathy.freedesktop.org/") (description "Telepathy logger is a headless observer client that logs information received by the Telepathy framework. It features pluggable backends to log @@ -909,7 +909,7 @@ different sorts of messages in different formats.") ("python-dbus" ,python2-dbus))) (propagated-inputs `(("telepathy-glib" ,telepathy-glib))) - (home-page "http://telepathy.freedesktop.org/") + (home-page "https://telepathy.freedesktop.org/") (synopsis "Telepathy IRC connection manager") (description "Idle is an IRC connection manager for the Telepathy framework. This @@ -971,7 +971,7 @@ share connections to real-time communication services without conflicting.") `(("colord" ,colord) ("gtk+" ,gtk+))) (synopsis "GTK integration for libcolord") - (home-page "http://www.freedesktop.org/software/colord/") + (home-page "https://www.freedesktop.org/software/colord/") (description "This is a GTK+ convenience library for interacting with colord. It is useful for both applications which need colour management and applications that @@ -1068,7 +1068,7 @@ to applications simultaneously competing for fingerprint readers.") `(("pkg-config" ,pkg-config))) (inputs `(("glib" ,glib))) - (home-page "http://www.freedesktop.org/wiki/Software/desktop-file-utils/") + (home-page "https://www.freedesktop.org/wiki/Software/desktop-file-utils/") (synopsis "Utilities for working with desktop entries") (description "This package contains a few command line utilities for working with diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm index 0561387931..6d2dd4c008 100644 --- a/gnu/packages/ghostscript.scm +++ b/gnu/packages/ghostscript.scm @@ -362,4 +362,4 @@ Ghostscript. It currently includes the 35 standard PostScript fonts.") It provides a convenient easy to use API for handling and rendering Postscript documents.") (license license:gpl2+) - (home-page "http://www.freedesktop.org/wiki/Software/libspectre"))) + (home-page "https://www.freedesktop.org/wiki/Software/libspectre"))) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index d32472b85e..45d0d891c4 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -124,7 +124,7 @@ ;; '--autolaunch'. ("libx11" ,libx11))) - (home-page "http://dbus.freedesktop.org/") + (home-page "https://www.freedesktop.org/wiki/Software/dbus/") (synopsis "Message bus for inter-process communication (IPC)") (description "D-Bus is a message bus system, a simple way for applications to @@ -461,7 +461,7 @@ translated.") (native-inputs `(("glib" ,glib "bin") ("pkg-config" ,pkg-config))) - (home-page "http://dbus.freedesktop.org/doc/dbus-glib/") + (home-page "https://dbus.freedesktop.org/doc/dbus-glib/") (synopsis "D-Bus GLib bindings") (description "GLib bindings for D-Bus. The package is obsolete and superseded @@ -662,7 +662,7 @@ useful for C++.") `(("dbus" ,dbus) ("dbus-glib" ,dbus-glib) ("glib" ,glib))) - (home-page "http://telepathy.freedesktop.org/wiki/") + (home-page "https://telepathy.freedesktop.org/wiki/") (synopsis "GLib Real-time communications framework over D-Bus") (description "Telepathy is a flexible, modular communications framework that enables real-time communication over D-Bus via pluggable protocol diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 43a3489021..f52f3227d1 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -947,7 +947,7 @@ guidelines.") (native-inputs `(("intltool" ,intltool) ("pkg-config" ,pkg-config))) - (home-page "http://freedesktop.org/wiki/Software/shared-mime-info") + (home-page "https://www.freedesktop.org/wiki/Software/shared-mime-info") (synopsis "Database of common MIME types") (description "The shared-mime-info package contains the core database of common types @@ -972,7 +972,7 @@ database is translated at Transifex.") (build-system gnu-build-system) (arguments `(#:tests? #f)) ; no check target - (home-page "http://icon-theme.freedesktop.org/releases/") + (home-page "https://icon-theme.freedesktop.org/releases/") (synopsis "Freedesktop icon theme") (description @@ -2322,7 +2322,7 @@ and objects.") ("libxkbfile" ,libxkbfile) ("xkbcomp" ,xkbcomp) ("xkeyboard-config" ,xkeyboard-config))) - (home-page "http://www.freedesktop.org/wiki/Software/LibXklavier/") + (home-page "https://www.freedesktop.org/wiki/Software/LibXklavier/") (synopsis "High-level API for X Keyboard Extension") (description "LibXklavier is a library providing high-level API for X Keyboard @@ -2828,7 +2828,7 @@ keyboard shortcuts.") ("sqlite" ,sqlite) ("polkit" ,polkit) ("sane-backends" ,sane-backends))) - (home-page "http://www.freedesktop.org/software/colord/") + (home-page "https://www.freedesktop.org/software/colord/") (synopsis "Color management service") (description "Colord is a system service that makes it easy to manage, install and generate color profiles to accurately color manage input and @@ -2964,7 +2964,7 @@ faster results and to avoid unnecessary server load.") `(("dbus-glib" ,dbus-glib) ("libgudev" ,libgudev) ("libusb" ,libusb))) - (home-page "http://upower.freedesktop.org/") + (home-page "https://upower.freedesktop.org/") (synopsis "System daemon for managing power devices") (description "UPower is an abstraction for enumerating power devices, diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 5fad28952b..4ec5765bb1 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -87,7 +87,7 @@ "testsuite/exec_opcodes_sys.c") (("if \\(error\\) return 1;") "if (error) return 77;"))))))) - (home-page "http://gstreamer.freedesktop.org/modules/orc.html") + (home-page "https://gstreamer.freedesktop.org/modules/orc.html") (synopsis "Oil runtime compiler") (description "Orc is a just-in-time compiler implemented as a library and set of @@ -405,7 +405,7 @@ distribution problems in some jurisdictions, e.g. due to patent threats.") ("ffmpeg" ,ffmpeg) ("orc" ,orc) ("zlib" ,zlib))) - (home-page "http://gstreamer.freedesktop.org/") + (home-page "https://gstreamer.freedesktop.org/") (synopsis "Plugins for the GStreamer multimedia library") (description "This GStreamer plugin supports a large number of audio and video diff --git a/gnu/packages/libcanberra.scm b/gnu/packages/libcanberra.scm index b4ed90ebb4..e9d6ce594c 100644 --- a/gnu/packages/libcanberra.scm +++ b/gnu/packages/libcanberra.scm @@ -130,7 +130,7 @@ sounds for various system events.") ;; The license of the various sounds is given in the 'CREDITS' file. (license (list cc-by-sa4.0 cc-by3.0 gpl2 gpl2+)) - (home-page "http://www.freedesktop.org/wiki/Specifications/sound-theme-spec/"))) + (home-page "https://www.freedesktop.org/wiki/Specifications/sound-theme-spec/"))) (define-public python-pycanberra (package diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 9b60c06a8d..b7c675d274 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -428,7 +428,7 @@ standard 21.0.2.") (sha256 (base32 "1j6sjwkyhqvsgyw938bxxfwkzzi1mahk66g5342lv6j89jfvrz8k")))) (build-system gnu-build-system) - (home-page "http://www.freedesktop.org/wiki/Software/libexttextcat/") + (home-page "https://www.freedesktop.org/wiki/Software/libexttextcat/") (synopsis "Text Categorization library") (description "Libexttextcat is an N-Gram-Based Text Categorization library primarily intended for language guessing.") diff --git a/gnu/packages/polkit.scm b/gnu/packages/polkit.scm index 8fe37097e1..76a1aa21c4 100644 --- a/gnu/packages/polkit.scm +++ b/gnu/packages/polkit.scm @@ -122,7 +122,7 @@ out "/share/polkit-1/actions") make-flags) #t)))))) - (home-page "http://www.freedesktop.org/wiki/Software/polkit/") + (home-page "https://www.freedesktop.org/wiki/Software/polkit/") (synopsis "Authorization API for privilege management") (description "Polkit is an application-level toolkit for defining and handling the policy that allows unprivileged processes to speak to @@ -186,5 +186,5 @@ easily with PolicyKit.") (description "PolicyKit-gnome provides a D-Bus session bus service that is used to bring up authentication dialogs used for obtaining privileges.") - (home-page "http://www.freedesktop.org/wiki/Software/polkit/") + (home-page "https://www.freedesktop.org/wiki/Software/polkit/") (license lgpl2.0+))) diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index 249afd3f68..903b22529d 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -229,7 +229,7 @@ sound server.") (native-inputs `(("intltool" ,intltool) ("pkg-config" ,pkg-config))) - (home-page "http://freedesktop.org/software/pulseaudio/pavucontrol/") + (home-page "https://www.freedesktop.org/software/pulseaudio/pavucontrol/") (synopsis "PulseAudio volume control") (description "PulseAudio Volume Control (pavucontrol) provides a GTK+ diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 4946d9afd7..4ccd6a7359 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4762,7 +4762,7 @@ toolkit. Use it to build trees of widgets.") (synopsis "Python bindings for D-bus") (description "python-dbus provides bindings for libdbus, the reference implementation of D-Bus.") - (home-page "http://www.freedesktop.org/wiki/Software/DBusBindings/") + (home-page "https://www.freedesktop.org/wiki/Software/DBusBindings/") (license license:expat))) (define-public python2-dbus diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index be2ee2d086..a3630b3cb9 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -406,7 +406,7 @@ tracking.") (inputs `(("libx11" ,libx11) ("xcb-util" ,xcb-util))) - (home-page "http://www.freedesktop.org/wiki/Software/startup-notification/") + (home-page "https://www.freedesktop.org/wiki/Software/startup-notification/") (synopsis "Application startup notification and feedback library") (description "Startup-notification contains a reference implementation of the startup -- cgit v1.2.3 From 4ff3484f1e7d0dccd67a94ae805d4ea41cdf675c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 25 Feb 2018 16:31:50 +0100 Subject: gnu: libpsl: Update to 0.20.0. * gnu/packages/web.scm (libpsl): Update to 0.20.0. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index d597d2bfb6..b5a54f686b 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -796,7 +796,7 @@ for efficient socket-like bidirectional reliable communication channels.") (define-public libpsl (package (name "libpsl") - (version "0.19.1") + (version "0.20.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/rockdaboot/libpsl/" @@ -804,7 +804,7 @@ for efficient socket-like bidirectional reliable communication channels.") "/libpsl-" version ".tar.gz")) (sha256 (base32 - "0ydwi9m39qv6k7zagqx2kzxzf59ipxj9r0c71xmwngdx3fslclbk")))) + "0rsjm6mb71nnj6ikr2dq5qmny314v3j7m07zz1i7m6v8hxxm98i7")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 9de33cc726cb4d050ea722ec6a8ceb7613d676a2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 24 Feb 2018 14:45:38 +0100 Subject: gnu: ruby-ffi: Update to 1.9.22. * gnu/packages/libffi.scm (ruby-ffi): Update to 1.9.22. --- gnu/packages/libffi.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libffi.scm b/gnu/packages/libffi.scm index 948dabb41e..e5e4023450 100644 --- a/gnu/packages/libffi.scm +++ b/gnu/packages/libffi.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2016, 2017 Ben Woodcroft ;;; Copyright © 2017 Marius Bakke +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -152,13 +153,13 @@ conversions for values passed between the two languages.") (define-public ruby-ffi (package (name "ruby-ffi") - (version "1.9.18") + (version "1.9.22") (source (origin (method url-fetch) (uri (rubygems-uri "ffi" version)) (sha256 (base32 - "034f52xf7zcqgbvwbl20jwdyjwznvqnwpbaps9nk18v9lgb1dpx0")))) + "17lvnpmllg4mlzf25lxbmfzk4l6rsddlxwwdkbs4d9v5gv154529")))) (build-system ruby-build-system) ;; FIXME: Before running tests the build system attempts to build libffi ;; from sources. -- cgit v1.2.3 From 0ae079ec2abdd64a937b80dcd59d6a75545ac3b0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 25 Feb 2018 17:46:16 +0100 Subject: gnu: Add nghttp2. * gnu/packages/web.scm (nghttp2): New public variable. --- gnu/packages/web.scm | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index b5a54f686b..26768ccc1e 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -60,6 +60,7 @@ #:use-module (guix build-system ant) #:use-module (guix build-system scons) #:use-module (gnu packages) + #:use-module (gnu packages adns) #:use-module (gnu packages apr) #:use-module (gnu packages check) #:use-module (gnu packages cran) @@ -83,8 +84,10 @@ #:use-module (gnu packages gtk) #:use-module (gnu packages java) #:use-module (gnu packages javascript) + #:use-module (gnu packages jemalloc) #:use-module (gnu packages image) #:use-module (gnu packages imagemagick) + #:use-module (gnu packages libevent) #:use-module (gnu packages libidn) #:use-module (gnu packages libunistring) #:use-module (gnu packages lisp) @@ -6343,3 +6346,84 @@ derivation by David Revoy from the original MonsterID by Andreas Gohr.") ;; expat for the code, CC-BY 4.0 for the artwork (license (list l:expat l:cc-by4.0)))) + +(define-public nghttp2 + (package + (name "nghttp2") + (version "1.30.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/nghttp2/nghttp2/" + "releases/download/v" version "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1b2j7il0wp8hi4jl3cah7fkshmg29cchdski9cw74gx5496gp6h8")))) + (build-system gnu-build-system) + (outputs (list "out" + "lib")) ; only libnghttp2 + (native-inputs + `(("pkg-config" ,pkg-config) + + ;; Required by tests. + ("cunit" ,cunit) + ("tzdata" ,tzdata))) + (inputs + ;; Required to build the tools (i.e. without ‘--enable-lib-only’). + `(("c-ares" ,c-ares) + ("jansson" ,jansson) ; for HPACK tools + ("jemalloc" ,jemalloc) ; fight nghttpd{,x} heap fragmentation + ("libev" ,libev) + ("libxml2" ,libxml2) ; for ‘nghttp -a’ + ("openssl" ,openssl))) + (arguments + `(#:configure-flags + (list (string-append "--libdir=" (assoc-ref %outputs "lib") "/lib") + "--enable-app" ; build all the tools + "--enable-hpack-tools" ; ...all the tools + "--disable-examples" + "--disable-static") ; don't bother building .a files + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'break-circular-reference + ;; libnghttp2.pc by default retains a reference to the ‘out’ output, + ;; which is not allowed. Break this cycle. While we could install + ;; only the library to ‘out’ and move everything else to a separate + ;; output, this would inconvenience the majority of (human) users. + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "lib/libnghttp2.pc.in" + (("@prefix@") + (assoc-ref outputs "lib"))) + #t)) + (add-before 'check 'set-timezone-directory + (lambda* (#:key inputs #:allow-other-keys) + (setenv "TZDIR" (string-append (assoc-ref inputs "tzdata") + "/share/zoneinfo")) + #t))))) + (home-page "https://nghttp2.org/") + (synopsis "HTTP/2 protocol client, proxy, server, and library") + (description + "nghttp2 implements the Hypertext Transfer Protocol, version +2 (@dfn{HTTP/2}). + +A reusable C library provides the HTTP/2 framing layer, with several tools built +on top of it: + +@itemize +@item @command{nghttp}, a command-line HTTP/2 client. It exposes many advanced +and low-level aspects of the protocol and is useful for debugging. +@item @command{nghttpd}, a fast, multi-threaded HTTP/2 static web server that +serves files from a local directory. +@item @command{nghttpx}, a fast, multi-threaded HTTP/2 reverse proxy that can be +deployed in front of existing web servers that don't support HTTP/2. +Both @command{nghttpd} and @command{nghttpx} can fall back to HTTP/1.1 for +backwards compatibilty with clients that don't speak HTTP/2. +@item @command{h2load} for benchmarking (only!) your own HTTP/2 servers. +@item HTTP/2 uses a header compression method called @dfn{HPACK}. +nghttp2 provides a HPACK encoder and decoder as part of its public API. +@item @command{deflatehd} converts JSON data or HTTP/1-style header fields to +compressed JSON header blocks. +@item @command{inflatehd} converts such compressed headers back to JSON pairs. +@end itemize\n") + (license l:expat))) -- cgit v1.2.3 From 4e501d064204d059d9d0e5af0533c055433f7b63 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 25 Feb 2018 19:28:36 +0100 Subject: gnu: perl-scalar-list-utils: Update to 1.50. * gnu/packages/perl.scm (perl-scalar-list-utils): Update to 1.50. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index cef42847c6..7512dfaf1f 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -8961,7 +8961,7 @@ files, using JSON::PP and/or CPAN::Meta::YAML.") (define-public perl-scalar-list-utils (package (name "perl-scalar-list-utils") - (version "1.47") + (version "1.50") (source (origin (method url-fetch) @@ -8969,7 +8969,7 @@ files, using JSON::PP and/or CPAN::Meta::YAML.") "Scalar-List-Utils-" version ".tar.gz")) (sha256 (base32 - "1qgg6zxqwziva5j1k5gjks4xmhmgklm551ni3zb74sd9f9rk90y4")))) + "0x9n0617gjjcqa4nk5biiwkxdi90xpdfg6z07gjr009qjg3bkah6")))) (build-system perl-build-system) (home-page "http://search.cpan.org/dist/Scalar-List-Utils/") (synopsis "Common Scalar and List utility subroutines") -- cgit v1.2.3 From b737530569844d1538a45f209460fedc0edf7497 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 24 Feb 2018 14:12:20 +0100 Subject: gnu: python-cffi: Update to 1.11.4. * gnu/packages/libffi.scm (python-cffi): Update to 1.11.4. --- gnu/packages/libffi.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libffi.scm b/gnu/packages/libffi.scm index e5e4023450..e5e93eb916 100644 --- a/gnu/packages/libffi.scm +++ b/gnu/packages/libffi.scm @@ -80,13 +80,13 @@ conversions for values passed between the two languages.") (define-public python-cffi (package (name "python-cffi") - (version "1.11.2") + (version "1.11.4") (source (origin (method url-fetch) (uri (pypi-uri "cffi" version)) (sha256 - (base32 "19h0wwz9cww74gw8cyq0izj8zkhjyzjw2d3ks1c3f1y4q28xv1xb")))) + (base32 "07fiy4wqg8g08x38r04ydjr8n6g0g74gb8si8b6jhymijalq746z")))) (build-system python-build-system) (outputs '("out" "doc")) (inputs -- cgit v1.2.3 From fc38e317cde56897b575c5af2d7787d889323193 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 24 Feb 2018 14:36:48 +0100 Subject: gnu: python-cffi: Update phase style. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/libffi.scm (python-cffi)[arguments]: Substitute INVOKE for SYSTEM*, end phases with #t, and remove unneeded bits from the ‘install-doc’ phase. --- gnu/packages/libffi.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/libffi.scm b/gnu/packages/libffi.scm index e5e93eb916..dd6b2237f9 100644 --- a/gnu/packages/libffi.scm +++ b/gnu/packages/libffi.scm @@ -122,7 +122,8 @@ conversions for values passed between the two languages.") "linker_so='gcc -shared')"))) (substitute* "testing/cffi0/test_ownlib.py" (("'cc testownlib") "'gcc testownlib")) - (zero? (system* "py.test" "-v" "c/" "testing/")))) + (invoke "py.test" "-v" "c/" "testing/") + #t)) (add-before 'check 'disable-failing-test ;; This is assumed to be a libffi issue: ;; https://bitbucket.org/cffi/cffi/issues/312/tests-failed-with-armv8 @@ -131,15 +132,14 @@ conversions for values passed between the two languages.") (("ret.left") "ownlib.left")) #t)) (add-after 'install 'install-doc - (lambda* (#:key outputs #:allow-other-keys) - (let* ((data (string-append (assoc-ref outputs "doc") "/share")) - (doc (string-append data "/doc/" ,name "-" ,version)) + (lambda* (#:key outputs (make-flags '()) #:allow-other-keys) + (let* ((doc (string-append (assoc-ref outputs "doc") + "/share/doc/" ,name "-" ,version)) (html (string-append doc "/html"))) (with-directory-excursion "doc" - (system* "make" "html") + (apply invoke "make" "html" make-flags) (mkdir-p html) (copy-recursively "build/html" html)) - (copy-file "LICENSE" (string-append doc "/LICENSE")) #t)))))) (home-page "https://cffi.readthedocs.org") (synopsis "Foreign function interface for Python") -- cgit v1.2.3 From d504de2655e553e7b826af63fe9a66516ddf2ea5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 26 Feb 2018 20:11:56 +0100 Subject: gnu: assword: Update to 0.11. * gnu/packages/password-utils.scm (assword): Update to 0.11. --- gnu/packages/password-utils.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index f83c05a25b..e8639c02e1 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2016 Alex Griffin ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2017, 2018 Clément Lassieur -;;; Copyright © 2017 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2017 Jelle Licht ;;; Copyright © 2017 Eric Bavier ;;; Copyright © 2017 Nicolas Goaziou @@ -271,7 +271,7 @@ random passwords that pass the checks.") (define-public assword (package (name "assword") - (version "0.10") + (version "0.11") (source (origin (method url-fetch) (uri (list @@ -280,7 +280,7 @@ random passwords that pass the checks.") "assword_" version ".orig.tar.gz"))) (sha256 (base32 - "0l6170y6my1gprqkazvzabgjkrkr9v2q7z48vjflna4r323yqira")))) + "03gkb6kvsghznbcw5l7nmrc6mn3ixkjd5jcs96ni4zs9l47jf7yp")))) (arguments `(;; irritatingly, tests do run but not there are two problems: ;; - "import gtk" fails for unknown reasons here despite it the -- cgit v1.2.3 From c74b8b41cf18ecb52f17bb069980aa7ba46661fb Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Sat, 24 Feb 2018 11:51:27 +0100 Subject: gnu: Add emacs-esxml. * gnu/packages/emacs.scm (emacs-esxml): New variable. --- gnu/packages/emacs.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index b7b088d42e..4a56325e4f 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -3559,6 +3559,28 @@ The purpose of this library is to wrap all the quirks and hassle of @code{package.el} into a sane API.") (license license:gpl3+))) +(define-public emacs-esxml + (package + (name "emacs-esxml") + (version "0.3.4") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/tali713/esxml/archive/" + version ".tar.gz")) + (sha256 + (base32 + "01yk4ibbln3ykrin2124hfdi53fsp9gv7j49qw93s2ls52c9zb2f")))) + (build-system emacs-build-system) + (home-page "https://github.com/tali713/esxml") + (synopsis "Elisp library for working with XML, ESXML and SXML") + (description + "This library provides two formats for XML code generation. The primary +form is esxml. This is the form that is returned by such functions as +@code{libxml-parse-xml-region} and it is used internally by emacs in many +xml-related libraries.") + (license license:gpl3+))) + (define-public emacs-queue (package (name "emacs-queue") -- cgit v1.2.3 From 5815e3bc943b380b647ecb6c147cef0c015f853c Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Sat, 24 Feb 2018 11:52:21 +0100 Subject: gnu: Add emacs-nov. * gnu/packages/emacs.scm (emacs-nov): New variable. --- gnu/packages/emacs.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 4a56325e4f..e96dca66b2 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -3581,6 +3581,41 @@ form is esxml. This is the form that is returned by such functions as xml-related libraries.") (license license:gpl3+))) +(define-public emacs-nov + (package + (name "emacs-nov") + (version "0.2.2") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/wasamasa/nov.el/archive/" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0pc07cr2qfa66pxyxhvgrxiwssykisj25yjxvx3qr4v7bp5qmms7")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-dash" ,emacs-dash) + ("emacs-esxml" ,emacs-esxml))) + (home-page "https://github.com/wasamasa/nov.el") + (synopsis "Major mode for reading EPUB files in Emacs") + (description + "This package provides a major mode for reading EPUB documents. +Features: +@itemize +@item Basic navigation (jump to table of contents (TOC), previous/next chapter) +@item Remembering and restoring the last read position +@item Jump to next chapter when scrolling beyond end +@item Renders EPUB2 (.ncx) and EPUB3 (