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/packages/maths.scm | 18 +++++++-------- ...xmaxima-do-not-use-old-gnuplot-parameters.patch | 26 ++++++++++++++++++++++ 2 files changed, 34 insertions(+), 10 deletions(-) create mode 100644 gnu/packages/patches/wxmaxima-do-not-use-old-gnuplot-parameters.patch (limited to 'gnu/packages') 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(-) (limited to 'gnu/packages') 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(+) (limited to 'gnu/packages') 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(-) (limited to 'gnu/packages') 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(+) (limited to 'gnu/packages') 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(+) (limited to 'gnu/packages') 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(+) (limited to 'gnu/packages') 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(+) (limited to 'gnu/packages') 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(+) (limited to 'gnu/packages') 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(+) (limited to 'gnu/packages') 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(+) (limited to 'gnu/packages') 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(+) (limited to 'gnu/packages') 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(+) (limited to 'gnu/packages') 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(+) (limited to 'gnu/packages') 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(-) (limited to 'gnu/packages') 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(-) (limited to 'gnu/packages') 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(-) (limited to 'gnu/packages') 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(-) (limited to 'gnu/packages') 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(-) (limited to 'gnu/packages') 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(-) (limited to 'gnu/packages') 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(-) (limited to 'gnu/packages') 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 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(+) (limited to 'gnu/packages') 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(+) (limited to 'gnu/packages') 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(+) (limited to 'gnu/packages') 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 (limited to 'gnu/packages') 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(-) (limited to 'gnu/packages') 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 (limited to 'gnu/packages') 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(-) (limited to 'gnu/packages') 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(-) (limited to 'gnu/packages') 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(-) (limited to 'gnu/packages') 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(-) (limited to 'gnu/packages') 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(-) (limited to 'gnu/packages') 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(+) (limited to 'gnu/packages') 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(-) (limited to 'gnu/packages') 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(-) (limited to 'gnu/packages') 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(-) (limited to 'gnu/packages') 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(+) (limited to 'gnu/packages') 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 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(-) (limited to 'gnu/packages') 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(-) (limited to 'gnu/packages') 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(-) (limited to 'gnu/packages') 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(-) (limited to 'gnu/packages') 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(-) (limited to 'gnu/packages') 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(-) (limited to 'gnu/packages') 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(-) (limited to 'gnu/packages') 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(-) (limited to 'gnu/packages') 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(-) (limited to 'gnu/packages') 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(-) (limited to 'gnu/packages') 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(-) (limited to 'gnu/packages') 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(-) (limited to 'gnu/packages') 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(-) (limited to 'gnu/packages') 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(-) (limited to 'gnu/packages') 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(+) (limited to 'gnu/packages') 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(-) (limited to 'gnu/packages') 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(-) (limited to 'gnu/packages') 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(-) (limited to 'gnu/packages') 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(-) (limited to 'gnu/packages') 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(+) (limited to 'gnu/packages') 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(+) (limited to 'gnu/packages') 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 (