branch master updated (feb5c55 -> d0d2b0f)
efraim pushed a change to branch master in repository guix. from feb5c55 gnu: youtube-dl: Update to 2016.06.14. new d0d2b0f gnu: parallel: Update to 20160522. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/parallel.scm |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
01/01: gnu: parallel: Update to 20160522.
efraim pushed a commit to branch master in repository guix. commit d0d2b0f9cd156d6ce90600ec59dc4cbe17a68c4f Author: Efraim Flashner Date: Tue Jun 14 10:08:14 2016 +0300 gnu: parallel: Update to 20160522. * gnu/packages/parallel.scm (parallel): Update to 20160522. --- gnu/packages/parallel.scm |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index b0984a8..d1f49ab 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014 Eric Bavier ;;; Copyright © 2015 Mark H Weaver -;;; Copyright © 2015 Efraim Flashner +;;; Copyright © 2015, 2016 Efraim Flashner ;;; Copyright © 2016 Pjotr Prins ;;; Copyright © 2016 Andreas Enge ;;; Copyright © 2016 Ricardo Wurmus @@ -44,7 +44,7 @@ (define-public parallel (package (name "parallel") -(version "20160222") +(version "20160522") (source (origin (method url-fetch) @@ -52,7 +52,7 @@ version ".tar.bz2")) (sha256 (base32 -"1sjmvinwr9j2a0jdk9y9nf2x4hhzcbl529slkwpz0vva0cwybywd" +"03r07ksxw5xx946x9s26ivifgldr8bc9bz6da4wfrd0dx4546xyy" (build-system gnu-build-system) (inputs `(("perl" ,perl))) (home-page "http://www.gnu.org/software/parallel/";)
branch core-updates updated (9f44dfc -> 28206a8)
civodul pushed a change to branch core-updates in repository guix. from 9f44dfc build: Update list of libxslt patches. new 28206a8 gnu: automake: Adjust test to ignore new gzip warnings. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/local.mk |1 + gnu/packages/autotools.scm|3 ++- gnu/packages/patches/automake-test-gzip-warning.patch | 17 + 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/automake-test-gzip-warning.patch
01/01: gnu: automake: Adjust test to ignore new gzip warnings.
civodul pushed a commit to branch core-updates in repository guix. commit 28206a8ebfad9f6cfa786d3cfd00ee1c1dfbbc65 Author: Ludovic Courtès Date: Tue Jun 14 09:41:38 2016 +0200 gnu: automake: Adjust test to ignore new gzip warnings. * gnu/packages/patches/automake-test-gzip-warning.patch: New file. * gnu/packages/autotools.scm (automake)[source]: Use it. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk |1 + gnu/packages/autotools.scm|3 ++- gnu/packages/patches/automake-test-gzip-warning.patch | 17 + 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/gnu/local.mk b/gnu/local.mk index b734576..cdb76cb 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -435,6 +435,7 @@ dist_patch_DATA = \ %D%/packages/patches/audacity-fix-ffmpeg-binding.patch \ %D%/packages/patches/automake-skip-amhello-tests.patch \ %D%/packages/patches/automake-regexp-syntax.patch\ + %D%/packages/patches/automake-test-gzip-warning.patch\ %D%/packages/patches/avahi-localstatedir.patch \ %D%/packages/patches/avidemux-install-to-lib.patch \ %D%/packages/patches/avrdude-fix-libusb.patch\ diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm index de7f1f6..21ed0e6 100644 --- a/gnu/packages/autotools.scm +++ b/gnu/packages/autotools.scm @@ -218,7 +218,8 @@ output is indexed in many ways to simplify browsing.") "0dl6vfi2lzz8alnklwxzfz624b95hb1ipjvd3mk177flmddcf24r")) (patches (search-patches "automake-regexp-syntax.patch" - "automake-skip-amhello-tests.patch" + "automake-skip-amhello-tests.patch" + "automake-test-gzip-warning.patch" (build-system gnu-build-system) (native-inputs `(("autoconf" ,(autoconf-wrapper)) diff --git a/gnu/packages/patches/automake-test-gzip-warning.patch b/gnu/packages/patches/automake-test-gzip-warning.patch new file mode 100644 index 000..bcc9c20 --- /dev/null +++ b/gnu/packages/patches/automake-test-gzip-warning.patch @@ -0,0 +1,17 @@ +Adjust test to ignore gzip 1.8+ warnings. + +--- automake-1.15/t/distcheck-no-prefix-or-srcdir-override.sh 2016-06-14 00:36:26.554218552 +0200 automake-1.15/t/distcheck-no-prefix-or-srcdir-override.sh 2016-06-14 00:37:52.903157770 +0200 +@@ -49,7 +49,11 @@ grep "cannot find sources.* in foobar" s + + ./configure + run_make -E -O distcheck +-test ! -s stderr ++ ++# Gzip 1.8+ emits warnings like "gzip: warning: GZIP environment ++# variable is deprecated"; filter them out. ++test `grep -v '^gzip: warning' stderr | wc -l` -eq 0 ++ + # Sanity check: the flags have been actually seen. + $PERL -e 'undef $/; $_ = <>; s/ \\\n/ /g; print;' t + grep '/configure .* --srcdir am-src' t || exit 99
branch master updated (d0d2b0f -> 6138ded)
efraim pushed a change to branch master in repository guix. from d0d2b0f gnu: parallel: Update to 20160522. new e831256 gnu: perl-xml-simple: Update to 2.22. new 54c3c14 gnu: perl-xml-libxml: Update to 2.0125. new cf4a713 gnu: perl-test-deep: Update to 1.120. new 67abcc0 gnu: perl-image-exiftool: Update to 10.20. new 0e8186e gnu: perl-exporter-lite: Update to 0.08. new 6138ded gnu: perl-dbi: Update to 1.636. The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/databases.scm |6 +++--- gnu/packages/perl.scm | 15 +++ gnu/packages/photo.scm |7 +++ gnu/packages/xml.scm | 17 + 4 files changed, 22 insertions(+), 23 deletions(-)
02/06: gnu: perl-xml-libxml: Update to 2.0125.
efraim pushed a commit to branch master in repository guix. commit 54c3c140ce14bafdf13d2f6846191d746c71f301 Author: Efraim Flashner Date: Tue Jun 14 14:29:03 2016 +0300 gnu: perl-xml-libxml: Update to 2.0125. * gnu/packages/xml.scm (perl-xml-libxml): Update to 2.0125. --- gnu/packages/xml.scm |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 5ef27d0..81a71bd 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -230,7 +230,7 @@ module.") (define-public perl-xml-libxml (package (name "perl-xml-libxml") -(version "2.0118") +(version "2.0125") (source (origin (method url-fetch) @@ -238,7 +238,7 @@ module.") "XML-LibXML-" version ".tar.gz")) (sha256 (base32 - "170c8dbk4p6jw9is0cria73021yp3hpmhb19p9j0zg2yxwkawr6c" + "1mvbv1pwpdqni9ia9b6brg8brnnvfxr8j5x872qsngc92gipyh01" (build-system perl-build-system) (propagated-inputs `(("perl-xml-namespacesupport" ,perl-xml-namespacesupport) @@ -248,7 +248,7 @@ module.") (home-page "http://search.cpan.org/dist/XML-LibXML";) (synopsis "Perl interface to libxml2") (description "This module implements a Perl interface to the libxml2 -library which provides interfaces for parsing and manipulating XML files. This +library which provides interfaces for parsing and manipulating XML files. This module allows Perl programmers to make use of the highly capable validating XML parser and the high performance DOM implementation.") (license (package-license perl
05/06: gnu: perl-exporter-lite: Update to 0.08.
efraim pushed a commit to branch master in repository guix. commit 0e8186eb12ff94897210d1631fa189952248bbd3 Author: Efraim Flashner Date: Tue Jun 14 15:04:09 2016 +0300 gnu: perl-exporter-lite: Update to 0.08. * gnu/packages/perl.scm (perl-exporter-lite): Update to 0.08. [home-page]: Update it. --- gnu/packages/perl.scm |7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index fc3bf55..e7e7967 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -2038,22 +2038,21 @@ in your modules in a \"Java-esque\" manner.") (define-public perl-exporter-lite (package (name "perl-exporter-lite") -(version "0.06") +(version "0.08") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/N/NE/NEILB/" "Exporter-Lite-" version ".tar.gz")) (sha256 (base32 -"0k4gkvid4fr8yvwj0axdx5111mzfw2iipls3qllxr364fqhmclpj" +"1hns15imih8z2h6zv3m1wwmv9fiysacsb52y94v6zf2cmw4kjny0" (build-system perl-build-system) (synopsis "Lightweight exporting of functions and variables") (description "Exporter::Lite is an alternative to Exporter, intended to provide a lightweight subset of the most commonly-used functionality. It supports import(), @@EXPORT and @@EXPORT_OK and not a whole lot else.") -(home-page (string-append "http://search.cpan.org/~neilb/"; - "Exporter-Lite-" version)) +(home-page "http://search.cpan.org/dist/Exporter-Lite";) (license (package-license perl (define-public perl-exporter-tiny
03/06: gnu: perl-test-deep: Update to 1.120.
efraim pushed a commit to branch master in repository guix. commit cf4a71322b45d2b42732977f042593f425590232 Author: Efraim Flashner Date: Tue Jun 14 14:31:58 2016 +0300 gnu: perl-test-deep: Update to 1.120. * gnu/packages/perl.scm (perl-test-deep): Update to 1.120. [home-page]: Update it. --- gnu/packages/perl.scm |8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index a517581..fc3bf55 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2015 Eric Dvorsak ;;; Copyright © 2016 Mark H Weaver ;;; Copyright © 2016 Jochem Raat +;;; Copyright © 2016 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -4955,14 +4956,14 @@ called as methods, which usually isn't want you want.") (define-public perl-test-deep (package (name "perl-test-deep") -(version "0.114") +(version "1.120") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/R/RJ/RJBS/" "Test-Deep-" version ".tar.gz")) (sha256 (base32 -"09yr47vw7vj27sdik312x08938higcij8ybyq8k67mlccx8cpqf0" +"1kdy06r0yg7zwarqglc9163vbfb0sfc4s6ld4pw5q7i9f7mghzi0" (build-system perl-build-system) (inputs `(("perl-test-tester" ,perl-test-tester) ("perl-test-nowarnings" ,perl-test-nowarnings))) @@ -4972,8 +4973,7 @@ called as methods, which usually isn't want you want.") that the values match, that arrays and hashes have the same elements and that references are blessed into the correct class. It also handles circular data structures without getting caught in an infinite loop.") -(home-page (string-append "http://search.cpan.org/~rjbs/"; - "Test-Deep-" version)) +(home-page "http://search.cpan.org/dist/Test-Deep";) (license gpl1+))) ; or "Artistic License" (define-public perl-test-differences
06/06: gnu: perl-dbi: Update to 1.636.
efraim pushed a commit to branch master in repository guix. commit 6138dedec97762564b0e9e4083ecf0ee09399470 Author: Efraim Flashner Date: Tue Jun 14 15:06:48 2016 +0300 gnu: perl-dbi: Update to 1.636. * gnu/packages/databases.scm (perl-dbi): Update to 1.636. [home-page]: Update it. --- gnu/packages/databases.scm |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 3458b3b..3a81a8e 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -553,7 +553,7 @@ extremely small.") (define-public perl-dbi (package (name "perl-dbi") -(version "1.631") +(version "1.636") (source (origin (method url-fetch) (uri (string-append @@ -561,11 +561,11 @@ extremely small.") version ".tar.gz")) (sha256 (base32 -"04fmrnchhwi7jx4niaiv93vmi343hdm3xj04w9zr2m9hhqh782np" +"0v37vnr5p0bx396cj0lb5kb69jbryq2mspp602hbgd04gklxqzcg" (build-system perl-build-system) (synopsis "Database independent interface for Perl") (description "This package provides an database interface for Perl.") -(home-page "http://search.cpan.org/~timb/DBI-1.631/DBI.pm";) +(home-page "http://search.cpan.org/dist/DBI";) (license (package-license perl (define-public perl-dbix-class
01/06: gnu: perl-xml-simple: Update to 2.22.
efraim pushed a commit to branch master in repository guix. commit e831256ff5c31a61c4239734f5b2f81fbdfd Author: Efraim Flashner Date: Tue Jun 14 14:08:07 2016 +0300 gnu: perl-xml-simple: Update to 2.22. * gnu/packages/xml.scm (perl-xml-simple): Update to 2.22. [propagated-inputs]: Add perl-xml-sax. [home-page]: Update it. --- gnu/packages/xml.scm | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index e62bfa7..5ef27d0 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2015 Sou Bunnbu ;;; Copyright © 2015, 2016 Ricardo Wurmus ;;; Copyright © 2015 Mark H Weaver -;;; Copyright © 2015 Efraim Flashner +;;; Copyright © 2015, 2016 Efraim Flashner ;;; Copyright © 2015 Raimon Grau ;;; Copyright © 2016 Leo Famulari ;;; @@ -355,7 +355,7 @@ callback.") (define-public perl-xml-simple (package (name "perl-xml-simple") -(version "2.20") +(version "2.22") (source (origin (method url-fetch) (uri (string-append @@ -363,17 +363,18 @@ callback.") version ".tar.gz")) (sha256 (base32 - "0jj3jiray1l4pi9wkjcpxjc3v431whdwx5aqnhgdm4i7h3817zsw" + "0jgbk30jizafpl7078jhw1di1yh08gf8d85dsvjllr595vr0widr" (build-system perl-build-system) (propagated-inputs - `(("perl-xml-parser" ,perl-xml-parser))) + `(("perl-xml-parser" ,perl-xml-parser) + ("perl-xml-sax" ,perl-xml-sax))) (license (package-license perl)) (synopsis "Perl module for easy reading/writing of XML files") (description "The XML::Simple module provides a simple API layer on top of an underlying XML parsing module (either XML::Parser or one of the SAX2 parser modules).") -(home-page "http://search.cpan.org/~grantm/XML-Simple-2.20/lib/XML/Simple.pm";))) +(home-page "http://search.cpan.org/dist/XML-Simple";))) (define-public perl-xml-regexp (package
04/06: gnu: perl-image-exiftool: Update to 10.20.
efraim pushed a commit to branch master in repository guix. commit 67abcc05ba72a65ccc986c61647ddf2af8c1d2c2 Author: Efraim Flashner Date: Tue Jun 14 15:01:35 2016 +0300 gnu: perl-image-exiftool: Update to 10.20. * gnu/packages/photo.scm (perl-image-exiftool): Update to 10.20. [home-page]: Update it. --- gnu/packages/photo.scm |7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 4b21926..38bd9c3 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -162,7 +162,7 @@ MTP, and much more.") (define-public perl-image-exiftool (package (name "perl-image-exiftool") -(version "9.70") +(version "10.20") (source (origin (method url-fetch) (uri (string-append @@ -170,7 +170,7 @@ MTP, and much more.") version ".tar.gz")) (sha256 (base32 -"074yxjgy50iacnjakdvac37wvrzrqmabkn0nzk0n70y3hssli7d5" +"0akdnxvb23ibcwa63ncibaj5m5k56cb34x8gy90z9lqcjl0f4sph" (build-system perl-build-system) (arguments '(#:phases (alist-cons-after @@ -184,8 +184,7 @@ MTP, and much more.") (wrap-program (string-append out "/bin/exiftool") `("PERL5LIB" prefix (,lib) %standard-phases))) -(home-page - "http://search.cpan.org/~exiftool/Image-ExifTool-9.70/lib/Image/ExifTool.pod";) +(home-page "http://search.cpan.org/dist/Image-ExifTool";) (synopsis "Program and Perl library to manipulate EXIF tags") (description "This package provides the 'exiftool' command and the 'Image::ExifTool'
branch core-updates updated (28206a8 -> f828ff5)
davexunit pushed a change to branch core-updates in repository guix. from 28206a8 gnu: automake: Adjust test to ignore new gzip warnings. new f828ff5 gnu: boost: Allow for customizable build flags. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/boost.scm | 80 1 file changed, 40 insertions(+), 40 deletions(-)
01/01: gnu: boost: Allow for customizable build flags.
davexunit pushed a commit to branch core-updates in repository guix. commit f828ff5b148e4e083001c25d2e9c3b52c0e87da3 Author: David Thompson Date: Wed Jun 8 12:07:39 2016 -0400 gnu: boost: Allow for customizable build flags. * gnu/packages/boost.scm (boost)[arguments]: Extract build flags to #:make-flags argument. --- gnu/packages/boost.scm | 80 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index 0a644e8..882f9cc 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -51,50 +51,50 @@ ("python" ,python-2) ("tcsh" ,tcsh))) (arguments - (let ((build-flags -`("threading=multi" "link=shared" + `(#:tests? #f + #:make-flags + (list "threading=multi" "link=shared" - ;; Set the RUNPATH to $libdir so that the libs find each other. - (string-append "linkflags=-Wl,-rpath=" - (assoc-ref outputs "out") "/lib") + ;; Set the RUNPATH to $libdir so that the libs find each other. + (string-append "linkflags=-Wl,-rpath=" +(assoc-ref %outputs "out") "/lib") - ;; Boost's 'context' library is not yet supported on mips64, so - ;; we disable it. The 'coroutine' library depends on 'context', - ;; so we disable that too. - ,@(if (string-prefix? "mips64" (or (%current-target-system) - (%current-system))) -'("--without-context" - "--without-coroutine" "--without-coroutine2") -'() - `(#:tests? #f - #:phases - (modify-phases %standard-phases - (replace -'configure -(lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) -(substitute* '("libs/config/configure" - "libs/spirit/classic/phoenix/test/runtest.sh" - "tools/build/doc/bjam.qbk" - "tools/build/src/engine/execunix.c" - "tools/build/src/engine/Jambase" - "tools/build/src/engine/jambase.c") - (("/bin/sh") (which "sh"))) + ;; Boost's 'context' library is not yet supported on mips64, so + ;; we disable it. The 'coroutine' library depends on 'context', + ;; so we disable that too. + ,@(if (string-prefix? "mips64" (or (%current-target-system) +(%current-system))) + '("--without-context" + "--without-coroutine" "--without-coroutine2") + '())) + #:phases + (modify-phases %standard-phases + (replace + 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* '("libs/config/configure" + "libs/spirit/classic/phoenix/test/runtest.sh" + "tools/build/doc/bjam.qbk" + "tools/build/src/engine/execunix.c" + "tools/build/src/engine/Jambase" + "tools/build/src/engine/jambase.c") + (("/bin/sh") (which "sh"))) -(setenv "SHELL" (which "sh")) -(setenv "CONFIG_SHELL" (which "sh")) + (setenv "SHELL" (which "sh")) + (setenv "CONFIG_SHELL" (which "sh")) -(zero? (system* "./bootstrap.sh" -(string-append "--prefix=" out) -"--with-toolset=gcc") - (replace -'build -(lambda* (#:key outputs #:allow-other-keys) - (zero? (system* "./b2" ,@build-flags - (replace -'install -(lambda* (#:key outputs #:allow-other-keys) - (zero? (system* "./b2" "install" ,@build-flags + (zero? (system* "./bootstrap.sh" + (string-append "--prefix=" out) + "--with-toolset=gcc") + (replace + 'build + (lambda* (#:key outputs make-flags #:allow-other-keys) + (zero? (apply system* "./b2" make-flags + (replace + 'install + (lambda* (#:key outputs make-flags #:allow-other-keys) + (zero? (apply system* "./b2" "install" make-flags))) (home-page "http://boost.org";) (synopsis "Peer-reviewed portable C++ source libraries")
branch master updated (6138ded -> 4f54a63)
rekado pushed a change to branch master in repository guix. from 6138ded gnu: perl-dbi: Update to 1.636. new 4f54a63 gnu: julia: Use unbundled release tarball. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/julia.scm | 62 +--- 1 file changed, 59 insertions(+), 3 deletions(-)
01/01: gnu: julia: Use unbundled release tarball.
rekado pushed a commit to branch master in repository guix. commit 4f54a63e1e71bf9a48e66bd4459809b699889620 Author: Ricardo Wurmus Date: Wed May 25 17:11:57 2016 +0200 gnu: julia: Use unbundled release tarball. * gnu/packages/julia.scm (julia)[source]: Use smaller tarball without bundled sources. [inputs]: Add inputs for rmath-julia, suitesparse, objconv, dsfmt, and virtualenv. [arguments]: Add phase "prepare-deps" to copy tarballs to their expected locations. --- gnu/packages/julia.scm | 62 +--- 1 file changed, 59 insertions(+), 3 deletions(-) diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm index d358a00..1cda5d8 100644 --- a/gnu/packages/julia.scm +++ b/gnu/packages/julia.scm @@ -73,10 +73,10 @@ (method url-fetch) (uri (string-append "https://github.com/JuliaLang/julia/releases/download/v"; -version "/julia-" version "-full.tar.gz")) +version "/julia-" version ".tar.gz")) (sha256 (base32 -"1nbi78fav5f4zj5332iwm4mfk0qhd5qh61z881q69rvp7b163wyb" +"09gc6yf3v4in0qwhrbgjrjgvblp941di0mli4zax22mvf4dzc7s4" (build-system gnu-build-system) (arguments `(#:test-target "test" @@ -92,6 +92,19 @@ #:phases (modify-phases %standard-phases (delete 'configure) + (add-after 'unpack 'prepare-deps + (lambda* (#:key inputs #:allow-other-keys) + (copy-file (assoc-ref inputs "rmath-julia") +"deps/Rmath-julia-0.1.tar.gz") + (copy-file (assoc-ref inputs "dsfmt") +"deps/dsfmt-2.2.3.tar.gz") + (copy-file (assoc-ref inputs "objconv") +"deps/objconv.zip") + (copy-file (assoc-ref inputs "suitesparse") +"deps/SuiteSparse-4.4.2.tar.gz") + (copy-file (assoc-ref inputs "virtualenv") +"deps/virtualenv-1.11.6.tar.gz") + #t)) (add-after 'unpack 'hardcode-soname-map ;; ./src/ccall.cpp creates a map from library names to paths using the ;; output of "/sbin/ldconfig -p". Since ldconfig is not used in Guix, @@ -249,7 +262,50 @@ ("mpfr" ,mpfr) ("wget" ,wget) ("which" ,which) - ("gmp" ,gmp))) + ("gmp" ,gmp) + ;; FIXME: The following inputs are downloaded from upstream to allow us + ;; to use the lightweight Julia release tarball. Ideally, these inputs + ;; would eventually be replaced with proper Guix packages. + ("rmath-julia" +,(origin + (method url-fetch) + (uri "https://api.github.com/repos/JuliaLang/Rmath-julia/tarball/v0.1";) + (file-name "rmath-julia-0.1.tar.gz") + (sha256 +(base32 + "0ai5dhjc43zcvangz123ryxmlbm51s21rg13bllwyn98w67arhb4" + ("suitesparse" +,(origin + (method url-fetch) + (uri "http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-4.4.2.tar.gz";) + (sha256 +(base32 + "1dg0qsv07n71nbn9cgcvn73933rgy1jnxw5bfqkwfq3bidk44cqc" + ("objconv" +,(origin + (method url-fetch) + (uri "http://www.agner.org/optimize/objconv.zip";) + (sha256 +(base32 + "1fi7qa2sd9vb35dvkgripjf0fayzg2qmff215f8agfqfiwd1g8qs" + ("dsfmt" +,(origin + (method url-fetch) + (uri (string-append + "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/"; + "SFMT/dSFMT-src-2.2.3.tar.gz")) + (sha256 +(base32 + "03kaqbjbi6viz0n33dk5jlf6ayxqlsq4804n7kwkndiga9s4hd42" + ("virtualenv" +,(origin + (method url-fetch) + (uri (string-append "https://pypi.python.org/packages/24/cc/"; + "a3cdf0a49ffcaef483b7e2511476aa520cf7260c199a6928fda6c43ba916/" + "virtualenv-1.11.6.tar.gz")) + (sha256 +(base32 + "1xq4prmg25n9cz5zcvbqx68lmc3kl39by582vd8pzs9f3qalqyiy")) (native-inputs `(("perl" ,perl) ("patchelf" ,patchelf)
01/02: gnu: mit-krb5: Disable parallel build and testing.
civodul pushed a commit to branch core-updates in repository guix. commit a083b5cb21f18e124460f887cb0eee8aca28d6cd Author: Ludovic Courtès Date: Tue Jun 14 21:20:30 2016 +0200 gnu: mit-krb5: Disable parallel build and testing. * gnu/packages/mit-krb5.scm (mit-krb5)[arguments]: Pass #:parallel-build? #f and #:parallel-tests? #f. --- gnu/packages/mit-krb5.scm |9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/packages/mit-krb5.scm b/gnu/packages/mit-krb5.scm index 5651637..e7f46ff 100644 --- a/gnu/packages/mit-krb5.scm +++ b/gnu/packages/mit-krb5.scm @@ -49,7 +49,14 @@ `(("bison" ,bison) ("perl" ,perl))) (arguments - `(#:phases + `(;; Work around "No rule to make target '../../include/gssapi/gssapi.h', + ;; needed by 'authgss_prot.so'." + #:parallel-build? #f + + ;; Likewise with tests. + #:parallel-tests? #f + + #:phases (modify-phases %standard-phases (add-after 'unpack 'enter-source-directory (lambda _
02/02: gnu: mit-krb5: Update to 1.14.2.
civodul pushed a commit to branch core-updates in repository guix. commit 65efa9ba9c54bf0eb145a20e5d7c34f7d16a2b46 Author: Ludovic Courtès Date: Tue Jun 14 21:21:18 2016 +0200 gnu: mit-krb5: Update to 1.14.2. * gnu/packages/mit-krb5.scm (mit-krb5): Update to 1.14.2. [source]: Remove 'patches'. * gnu/packages/patches/mit-krb5-CVE-2015-8629.patch, gnu/packages/patches/mit-krb5-CVE-2015-8630.patch, gnu/packages/patches/mit-krb5-CVE-2015-8631.patch, gnu/packages/patches/mit-krb5-init-context-null-spnego.patch: Remove. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. --- gnu/local.mk |4 - gnu/packages/mit-krb5.scm |9 +- gnu/packages/patches/mit-krb5-CVE-2015-8629.patch | 51 -- gnu/packages/patches/mit-krb5-CVE-2015-8630.patch | 81 --- gnu/packages/patches/mit-krb5-CVE-2015-8631.patch | 576 .../mit-krb5-init-context-null-spnego.patch| 49 -- 6 files changed, 2 insertions(+), 768 deletions(-) diff --git a/gnu/local.mk b/gnu/local.mk index cdb76cb..ec88bd8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -648,10 +648,6 @@ dist_patch_DATA = \ %D%/packages/patches/mcrypt-CVE-2012-4426.patch \ %D%/packages/patches/mcrypt-CVE-2012-4527.patch \ %D%/packages/patches/mhash-keygen-test-segfault.patch\ - %D%/packages/patches/mit-krb5-CVE-2015-8629.patch\ - %D%/packages/patches/mit-krb5-CVE-2015-8630.patch\ - %D%/packages/patches/mit-krb5-CVE-2015-8631.patch\ - %D%/packages/patches/mit-krb5-init-context-null-spnego.patch \ %D%/packages/patches/mpc123-initialize-ao.patch \ %D%/packages/patches/mplayer2-theora-fix.patch \ %D%/packages/patches/module-init-tools-moduledir.patch \ diff --git a/gnu/packages/mit-krb5.scm b/gnu/packages/mit-krb5.scm index e7f46ff..43cc376 100644 --- a/gnu/packages/mit-krb5.scm +++ b/gnu/packages/mit-krb5.scm @@ -30,7 +30,7 @@ (define-public mit-krb5 (package (name "mit-krb5") -(version "1.13.3") +(version "1.14.2") (source (origin (method url-fetch) (uri (string-append "http://web.mit.edu/kerberos/dist/krb5/"; @@ -38,12 +38,7 @@ "/krb5-" version ".tar.gz")) (sha256 (base32 -"1gpscn78lv48dxccxq9ncyj53w9l2a15xmngjfa1wylvmn7g0jjx")) - (patches - (search-patches "mit-krb5-init-context-null-spnego.patch" - "mit-krb5-CVE-2015-8629.patch" - "mit-krb5-CVE-2015-8630.patch" - "mit-krb5-CVE-2015-8631.patch" +"09wbv969ak4fqlqr1ip5bi62fny1zlp1vwjarvj6a6cdfzkdgjkb" (build-system gnu-build-system) (native-inputs `(("bison" ,bison) diff --git a/gnu/packages/patches/mit-krb5-CVE-2015-8629.patch b/gnu/packages/patches/mit-krb5-CVE-2015-8629.patch deleted file mode 100644 index a296d8c..000 --- a/gnu/packages/patches/mit-krb5-CVE-2015-8629.patch +++ /dev/null @@ -1,51 +0,0 @@ -Copied from Fedora. -http://pkgs.fedoraproject.org/cgit/rpms/krb5.git/tree/krb5-CVE-2015-8629.patch?h=f22 - -From df17a1224a3406f57477bcd372c61e04c0e5a5bb Mon Sep 17 00:00:00 2001 -From: Greg Hudson -Date: Fri, 8 Jan 2016 12:45:25 -0500 -Subject: [PATCH 1/3] Verify decoded kadmin C strings [CVE-2015-8629] - -In xdr_nullstring(), check that the decoded string is terminated with -a zero byte and does not contain any internal zero bytes. - -CVE-2015-8629: - -In all versions of MIT krb5, an authenticated attacker can cause -kadmind to read beyond the end of allocated memory by sending a string -without a terminating zero byte. Information leakage may be possible -for an attacker with permission to modify the database. - -CVSSv2 Vector: AV:N/AC:H/Au:S/C:P/I:N/A:N/E:POC/RL:OF/RC:C - -ticket: 8341 (new) -target_version: 1.14-next -target_version: 1.13-next -tags: pullup - src/lib/kadm5/kadm_rpc_xdr.c | 9 - - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/src/lib/kadm5/kadm_rpc_xdr.c b/src/lib/kadm5/kadm_rpc_xdr.c -index 2bef858..ba67084 100644 a/src/lib/kadm5/kadm_rpc_xdr.c -+++ b/src/lib/kadm5/kadm_rpc_xdr.c -@@ -64,7 +64,14 @@ bool_t xdr_nullstring(XDR *xdrs, char **objp) - return FALSE; - } - } --return (xdr_opaque(xdrs, *objp, size)); -+if (!xdr_opaque(xdrs, *objp, size)) -+return FALSE; -+/* Check that the unmarshalled bytes are a C string. */ -+if ((*objp)[size - 1] != '\0') -+return FALSE; -+if (memchr(*objp, '\0', size - 1) != NULL) -+return FALSE; -+return TRUE; - - case XDR_ENCODE: - if (size != 0) --- -2.7.0.rc3 - d
branch core-updates updated (f828ff5 -> 65efa9b)
civodul pushed a change to branch core-updates in repository guix. from f828ff5 gnu: boost: Allow for customizable build flags. new a083b5c gnu: mit-krb5: Disable parallel build and testing. new 65efa9b gnu: mit-krb5: Update to 1.14.2. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/local.mk |4 - gnu/packages/mit-krb5.scm | 18 +- gnu/packages/patches/mit-krb5-CVE-2015-8629.patch | 51 -- gnu/packages/patches/mit-krb5-CVE-2015-8630.patch | 81 --- gnu/packages/patches/mit-krb5-CVE-2015-8631.patch | 576 .../mit-krb5-init-context-null-spnego.patch| 49 -- 6 files changed, 10 insertions(+), 769 deletions(-) delete mode 100644 gnu/packages/patches/mit-krb5-CVE-2015-8629.patch delete mode 100644 gnu/packages/patches/mit-krb5-CVE-2015-8630.patch delete mode 100644 gnu/packages/patches/mit-krb5-CVE-2015-8631.patch delete mode 100644 gnu/packages/patches/mit-krb5-init-context-null-spnego.patch
branch master updated (4f54a63 -> 266785d)
steap pushed a change to branch master in repository guix. from 4f54a63 gnu: julia: Use unbundled release tarball. new 266785d import: pypi: read requirements from wheels. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: doc/guix.texi|4 +- guix/import/pypi.scm | 113 ++ tests/pypi.scm | 78 +- 3 files changed, 166 insertions(+), 29 deletions(-)
01/01: import: pypi: read requirements from wheels.
steap pushed a commit to branch master in repository guix. commit 266785d21e9ed3fcbecebea302231cf35e303d66 Author: Cyril Roelandt Date: Sun Dec 27 03:26:11 2015 +0100 import: pypi: read requirements from wheels. * doc/guix.tex (Invoking guix import): Mention that the pypi importer works better with "unzip". * guix/import/pypi.scm (latest-wheel-release, wheel-url->extracted-directory): New procedures. * tests/pypi.scm (("pypi->guix-package, wheels"): New test. --- doc/guix.texi|4 +- guix/import/pypi.scm | 113 ++ tests/pypi.scm | 78 +- 3 files changed, 166 insertions(+), 29 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 46d9e77..0a30b52 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -4545,7 +4545,9 @@ Import metadata from the @uref{https://pypi.python.org/, Python Package Index}@footnote{This functionality requires Guile-JSON to be installed. @xref{Requirements}.}. Information is taken from the JSON-formatted description available at @code{pypi.python.org} and usually includes all -the relevant information, including package dependencies. +the relevant information, including package dependencies. For maximum +efficiency, it is recommended to install the @command{unzip} utility, so +that the importer can unzip Python wheels and gather data from them. The command below imports metadata for the @code{itsdangerous} Python package: diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm index de30f4b..70ef507 100644 --- a/guix/import/pypi.scm +++ b/guix/import/pypi.scm @@ -71,6 +71,16 @@ or #f on failure." (raise (condition (&missing-source-error (package pypi-package))) +(define (latest-wheel-release pypi-package) + "Return the url of the wheel for the latest release of pypi-package, +or #f if there isn't any." + (let ((releases (assoc-ref* pypi-package "releases" + (assoc-ref* pypi-package "info" "version" +(or (find (lambda (release) +(string=? "bdist_wheel" (assoc-ref release "packagetype"))) + releases) +#f))) + (define (python->package-name name) "Given the NAME of a package on PyPI, return a Guix-compliant name for the package." @@ -88,6 +98,11 @@ package on PyPI." ;; '/' + package name + '/' + ... (substring source-url 42 (string-rindex source-url #\/ +(define (wheel-url->extracted-directory wheel-url) + (match (string-split (basename wheel-url) #\-) +((name version _ ...) + (string-append name "-" version ".dist-info" + (define (maybe-inputs package-inputs) "Given a list of PACKAGE-INPUTS, tries to generate the 'inputs' field of a package definition." @@ -97,10 +112,10 @@ package definition." ((package-inputs ...) `((inputs (,'quasiquote ,package-inputs)) -(define (guess-requirements source-url tarball) - "Given SOURCE-URL and a TARBALL of the package, return a list of the required -packages specified in the requirements.txt file. TARBALL will be extracted in -the current directory, and will be deleted." +(define (guess-requirements source-url wheel-url tarball) + "Given SOURCE-URL, WHEEL-URL and a TARBALL of the package, return a list of +the required packages specified in the requirements.txt file. TARBALL will be +extracted in the current directory, and will be deleted." (define (tarball-directory url) ;; Given the URL of the package's tarball, return the name of the directory @@ -147,26 +162,69 @@ cannot determine package dependencies")) (loop (cons (python->package-name (clean-requirement line)) result)) - (let ((dirname (tarball-directory source-url))) -(if (string? dirname) -(let* ((req-file (string-append dirname "/requirements.txt")) - (exit-code (system* "tar" "xf" tarball req-file))) - ;; TODO: support more formats. - (if (zero? exit-code) - (dynamic-wind -(const #t) -(lambda () - (read-requirements req-file)) -(lambda () - (delete-file req-file) - (rmdir dirname))) - (begin -(warning (_ "'tar xf' failed with exit code ~a\n") - exit-code) -'( -'( + (define (read-wheel-metadata wheel-archive) +;; Given WHEEL-ARCHIVE, a ZIP Python wheel archive, return the package's +;; requirements. +(let* ((dirname (wheel-url->extracted-directory wheel-url)) + (json-file (string-append dirname "/metadata.json"))) + (and (zero? (system* "unzip" "-q" wheel-archive json-file)) + (dynamic-wind + (const #t) + (lambda () + (call-with-input-file json-file + (lambda (port) +